diff options
1512 files changed, 38030 insertions, 17049 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index f4706dd4f2..180504d286 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -54,7 +54,10 @@ else (STANDALONE) endif (WINDOWS) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) - if (LINUX AND VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) - endif (LINUX AND VIEWER) + if (LINUX) + if (VIEWER) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) + endif (VIEWER) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) + endif (LINUX) endif (STANDALONE) diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index efe9ad74d3..7ce57a5572 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -38,12 +38,12 @@ else (STANDALONE) debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) endif (MSVC71) elseif (DARWIN) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt) + set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt) + set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt) elseif (LINUX) - set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) - set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) + set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt) + set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt) + set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt) endif (WINDOWS) endif (STANDALONE) diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 0d334837d4..0ca432da18 100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -24,7 +24,6 @@ elseif (LINUX) gmodule-2.0 dl gthread-2.0 - rt glib-2.0 ) endif (STANDALONE) diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake new file mode 100644 index 0000000000..f8087a8083 --- /dev/null +++ b/indra/cmake/PulseAudio.cmake @@ -0,0 +1,28 @@ +# -*- cmake -*- +include(Prebuilt) + +if (STANDALONE) + include(FindPkgConfig) + + pkg_check_modules(PULSEAUDIO REQUIRED libpulse-mainloop-glib) + +elseif (LINUX) + use_prebuilt_binary(pulseaudio) + set(PULSEAUDIO_FOUND ON FORCE BOOL) + set(PULSEAUDIO_INCLUDE_DIRS + ${LIBS_PREBUILT_DIR}/include + ) + # We don't need to explicitly link against pulseaudio itself, because + # the viewer probes for the system's copy at runtime. + set(PULSEAUDIO_LIBRARIES + # none needed! + ) +endif (STANDALONE) + +if (PULSEAUDIO_FOUND) + set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.") +endif (PULSEAUDIO_FOUND) + +if (PULSEAUDIO) + add_definitions(-DLL_PULSEAUDIO_ENABLED=1) +endif (PULSEAUDIO) diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 4b19e28066..ab62a0d0af 100644 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -54,12 +54,5 @@ target_link_libraries(linux-crash-logger ${DB_LIBRARIES} ) -add_custom_command( - OUTPUT linux-crash-logger-stripped - COMMAND strip - ARGS --strip-debug -o linux-crash-logger-stripped linux-crash-logger - DEPENDS linux-crash-logger - ) - -add_custom_target(linux-crash-logger-strip-target ALL - DEPENDS linux-crash-logger-stripped) +add_custom_target(linux-crash-logger-target ALL + DEPENDS linux-crash-logger) diff --git a/indra/linux_updater/CMakeLists.txt b/indra/linux_updater/CMakeLists.txt index 9fe32ecb46..00a78b2a8f 100644 --- a/indra/linux_updater/CMakeLists.txt +++ b/indra/linux_updater/CMakeLists.txt @@ -47,12 +47,5 @@ target_link_libraries(linux-updater ${LLCOMMON_LIBRARIES} ) -add_custom_command( - OUTPUT linux-updater-stripped - COMMAND strip - ARGS --strip-debug -o linux-updater-stripped linux-updater - DEPENDS linux-updater - ) - -add_custom_target(linux-updater-strip-target ALL - DEPENDS linux-updater-stripped) +add_custom_target(linux-updater-target ALL + DEPENDS linux-updater) diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index a28c94d00d..b92ccd1d77 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -202,12 +202,12 @@ void LLAudioEngine::updateInternetStream() } // virtual -int LLAudioEngine::isInternetStreamPlaying() +LLAudioEngine::LLAudioPlayState LLAudioEngine::isInternetStreamPlaying() { if (mStreamingAudioImpl) - return mStreamingAudioImpl->isPlaying(); + return (LLAudioEngine::LLAudioPlayState) mStreamingAudioImpl->isPlaying(); - return 0; // Stopped + return LLAudioEngine::AUDIO_STOPPED; // Stopped } @@ -592,7 +592,7 @@ LLAudioBuffer * LLAudioEngine::getFreeBuffer() if (buffer_id >= 0) { - llinfos << "Taking over unused buffer " << buffer_id << llendl; + lldebugs << "Taking over unused buffer " << buffer_id << llendl; //llinfos << "Flushing unused buffer!" << llendl; mBuffers[buffer_id]->mAudioDatap->mBufferp = NULL; delete mBuffers[buffer_id]; diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 457fd93abe..d287104204 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -91,6 +91,15 @@ public: AUDIO_TYPE_COUNT = 4 // last }; + enum LLAudioPlayState + { + // isInternetStreamPlaying() returns an *int*, with + // 0 = stopped, 1 = playing, 2 = paused. + AUDIO_STOPPED = 0, + AUDIO_PLAYING = 1, + AUDIO_PAUSED = 2 + }; + LLAudioEngine(); virtual ~LLAudioEngine(); @@ -156,7 +165,7 @@ public: void stopInternetStream(); void pauseInternetStream(int pause); void updateInternetStream(); // expected to be called often - int isInternetStreamPlaying(); + LLAudioPlayState isInternetStreamPlaying(); // use a value from 0.0 to 1.0, inclusive void setInternetStreamGain(F32 vol); std::string getInternetStreamURL(); diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index a77bd211f3..f1b9091298 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -43,7 +43,8 @@ typedef enum e_chat_source_type { CHAT_SOURCE_SYSTEM = 0, CHAT_SOURCE_AGENT = 1, - CHAT_SOURCE_OBJECT = 2 + CHAT_SOURCE_OBJECT = 2, + CHAT_SOURCE_UNKNOWN = 3 } EChatSourceType; typedef enum e_chat_type @@ -68,7 +69,8 @@ typedef enum e_chat_audible_level typedef enum e_chat_style { CHAT_STYLE_NORMAL, - CHAT_STYLE_IRC + CHAT_STYLE_IRC, + CHAT_STYLE_HISTORY }EChatStyle; // A piece of chat diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index c2c45bec9a..f1dda1b2e2 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -122,7 +122,6 @@ public: U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes }; - LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info); LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info); LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info); diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 1b0e03cb2a..411977474b 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -65,6 +65,27 @@ LLWorkerThread::~LLWorkerThread() // ~LLQueuedThread() will be called here } +//called only in destructor. +void LLWorkerThread::clearDeleteList() +{ + // Delete any workers in the delete queue (should be safe - had better be!) + if (!mDeleteList.empty()) + { + llwarns << "Worker Thread: " << mName << " destroyed with " << mDeleteList.size() + << " entries in delete list." << llendl; + + mDeleteMutex->lock(); + for (delete_list_t::iterator iter = mDeleteList.begin(); iter != mDeleteList.end(); ++iter) + { + (*iter)->mRequestHandle = LLWorkerThread::nullHandle(); + (*iter)->clearFlags(LLWorkerClass::WCF_HAVE_WORK); + delete *iter ; + } + mDeleteList.clear() ; + mDeleteMutex->unlock() ; + } +} + // virtual S32 LLWorkerThread::update(U32 max_time_ms) { @@ -320,7 +341,20 @@ bool LLWorkerClass::checkWork(bool aborting) if (mRequestHandle != LLWorkerThread::nullHandle()) { LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle); - llassert_always(workreq); + if(!workreq) + { + if(mWorkerThread->isQuitting() || mWorkerThread->isStopped()) //the mWorkerThread is not running + { + mRequestHandle = LLWorkerThread::nullHandle(); + clearFlags(WCF_HAVE_WORK); + return true ; + } + else + { + llassert_always(workreq); + } + } + LLQueuedThread::status_t status = workreq->getStatus(); if (status == LLWorkerThread::STATUS_ABORTED) { diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h index a1e85d2ecc..1756ebab6b 100644 --- a/indra/llcommon/llworkerthread.h +++ b/indra/llcommon/llworkerthread.h @@ -80,6 +80,9 @@ public: S32 mParam; }; +protected: + void clearDeleteList() ; + private: typedef std::list<LLWorkerClass*> delete_list_t; delete_list_t mDeleteList; diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 5649b4cab7..7d0de18c7c 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -157,8 +157,9 @@ U8* LLImageBase::allocateData(S32 size) llerrs << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,mComponents) << llendl; } } - else if (size <= 0 || (size > 4096*4096*16 && sSizeOverride == FALSE)) + if (size < 1 || (size > 4096*4096*16 && sSizeOverride == FALSE)) { + llinfos << "width: " << mWidth << " height: " << mHeight << " components: " << mComponents << llendl ; llerrs << "LLImageBase::allocateData: bad size: " << size << llendl; } diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index d2e5034734..9683252dc4 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -479,7 +479,7 @@ BOOL LLPermissions::setNextOwnerBits(const LLUUID& agent, const LLUUID& group, B return ownership; } -BOOL LLPermissions::allowOperationBy(PermissionBit op, const LLUUID& requester, const LLUUID& group) const +bool LLPermissions::allowOperationBy(PermissionBit op, const LLUUID& requester, const LLUUID& group) const { if(requester.isNull()) { diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index d5a0881c8f..fa20d5c214 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -149,7 +149,7 @@ public: const LLUUID& getGroup() const { return mGroup; } // return the agent_id of the last agent owner. Only returns - // LLUUID::null if there has never been a previous owner. + // LLUUID::null if there has never been a previous owner (*note: this is apparently not true, say for textures in inventory, it may return LLUUID::null even if there was a previous owner). const LLUUID& getLastOwner() const { return mLastOwner; } U32 getMaskBase() const { return mMaskBase; } @@ -272,18 +272,18 @@ public: // They also return true if the object isn't owned, or the // requesting agent is a system agent. See llpermissionsflags.h // for bits. - BOOL allowOperationBy(PermissionBit op, const LLUUID& agent, const LLUUID& group = LLUUID::null) const; + bool allowOperationBy(PermissionBit op, const LLUUID& agent, const LLUUID& group = LLUUID::null) const; - inline BOOL allowModifyBy(const LLUUID &agent_id) const; - inline BOOL allowCopyBy(const LLUUID& agent_id) const; - inline BOOL allowMoveBy(const LLUUID& agent_id) const; - inline BOOL allowModifyBy(const LLUUID &agent_id, const LLUUID& group) const; - inline BOOL allowCopyBy(const LLUUID& agent_id, const LLUUID& group) const; - inline BOOL allowMoveBy(const LLUUID &agent_id, const LLUUID &group) const; + inline bool allowModifyBy(const LLUUID &agent_id) const; + inline bool allowCopyBy(const LLUUID& agent_id) const; + inline bool allowMoveBy(const LLUUID& agent_id) const; + inline bool allowModifyBy(const LLUUID &agent_id, const LLUUID& group) const; + inline bool allowCopyBy(const LLUUID& agent_id, const LLUUID& group) const; + inline bool allowMoveBy(const LLUUID &agent_id, const LLUUID &group) const; // This somewhat specialized function is meant for testing if the // current owner is allowed to transfer to the specified agent id. - inline BOOL allowTransferTo(const LLUUID &agent_id) const; + inline bool allowTransferTo(const LLUUID &agent_id) const; // // DEPRECATED. @@ -336,38 +336,38 @@ public: }; // Inlines -BOOL LLPermissions::allowModifyBy(const LLUUID& agent, const LLUUID& group) const +bool LLPermissions::allowModifyBy(const LLUUID& agent, const LLUUID& group) const { return allowOperationBy(PERM_MODIFY, agent, group); } -BOOL LLPermissions::allowCopyBy(const LLUUID& agent, const LLUUID& group) const +bool LLPermissions::allowCopyBy(const LLUUID& agent, const LLUUID& group) const { return allowOperationBy(PERM_COPY, agent, group); } -BOOL LLPermissions::allowMoveBy(const LLUUID& agent, const LLUUID& group) const +bool LLPermissions::allowMoveBy(const LLUUID& agent, const LLUUID& group) const { return allowOperationBy(PERM_MOVE, agent, group); } -BOOL LLPermissions::allowModifyBy(const LLUUID& agent) const +bool LLPermissions::allowModifyBy(const LLUUID& agent) const { return allowOperationBy(PERM_MODIFY, agent, LLUUID::null); } -BOOL LLPermissions::allowCopyBy(const LLUUID& agent) const +bool LLPermissions::allowCopyBy(const LLUUID& agent) const { return allowOperationBy(PERM_COPY, agent, LLUUID::null); } -BOOL LLPermissions::allowMoveBy(const LLUUID& agent) const +bool LLPermissions::allowMoveBy(const LLUUID& agent) const { return allowOperationBy(PERM_MOVE, agent, LLUUID::null); } -BOOL LLPermissions::allowTransferTo(const LLUUID &agent_id) const +bool LLPermissions::allowTransferTo(const LLUUID &agent_id) const { if (mIsGroupOwned) { diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 192c6157a8..34348230b6 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -4521,15 +4521,65 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build) if (!partial_build) { - int idxs[] = {0,1,(grid_size+1)+1,(grid_size+1)+1,(grid_size+1),0}; - for(int gx = 0;gx<grid_size;gx++){ - for(int gy = 0;gy<grid_size;gy++){ - if (mTypeMask & TOP_MASK){ - for(int i=5;i>=0;i--)mIndices.push_back(vtop+(gy*(grid_size+1))+gx+idxs[i]); - }else{ - for(int i=0;i<6;i++)mIndices.push_back(vtop+(gy*(grid_size+1))+gx+idxs[i]); + mTriStrip.clear(); + S32 idxs[] = {0,1,(grid_size+1)+1,(grid_size+1)+1,(grid_size+1),0}; + for(S32 gx = 0;gx<grid_size;gx++) + { + + for(S32 gy = 0;gy<grid_size;gy++) + { + if (mTypeMask & TOP_MASK) + { + for(S32 i=5;i>=0;i--) + { + mIndices.push_back(vtop+(gy*(grid_size+1))+gx+idxs[i]); + } + + if (gy == 0) + { + mTriStrip.push_back((gx+1)*(grid_size+1)); + mTriStrip.push_back((gx+1)*(grid_size+1)); + mTriStrip.push_back(gx*(grid_size+1)); + } + + mTriStrip.push_back(gy+1+(gx+1)*(grid_size+1)); + mTriStrip.push_back(gy+1+gx*(grid_size+1)); + + + if (gy == grid_size-1) + { + mTriStrip.push_back(gy+1+gx*(grid_size+1)); + } + } + else + { + for(S32 i=0;i<6;i++) + { + mIndices.push_back(vtop+(gy*(grid_size+1))+gx+idxs[i]); + } + + if (gy == 0) + { + mTriStrip.push_back(gx*(grid_size+1)); + mTriStrip.push_back(gx*(grid_size+1)); + mTriStrip.push_back((gx+1)*(grid_size+1)); + } + + mTriStrip.push_back(gy+1+gx*(grid_size+1)); + mTriStrip.push_back(gy+1+(gx+1)*(grid_size+1)); + + if (gy == grid_size-1) + { + mTriStrip.push_back(gy+1+(gx+1)*(grid_size+1)); + } } } + + } + + if (mTriStrip.size()%2 == 1) + { + mTriStrip.push_back(mTriStrip[mTriStrip.size()-1]); } } @@ -4771,6 +4821,8 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) pt2--; } } + + makeTriStrip(); } else { @@ -4875,67 +4927,108 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) pt2--; } } + + makeTriStrip(); } } else { // Not hollow, generate the triangle fan. + U16 v1 = 2; + U16 v2 = 1; + if (mTypeMask & TOP_MASK) { - if (mTypeMask & OPEN_MASK) - { - // SOLID OPEN TOP - // Generate indices - // This is a tri-fan, so we reuse the same first point for all triangles. - for (S32 i = 0; i < (num_vertices - 2); i++) - { - mIndices[3*i] = num_vertices - 1; - mIndices[3*i+1] = i; - mIndices[3*i+2] = i + 1; - } - } - else - { - // SOLID CLOSED TOP - for (S32 i = 0; i < (num_vertices - 2); i++) - { - //MSMSM fix these caps but only for the un-cut case - mIndices[3*i] = num_vertices - 1; - mIndices[3*i+1] = i; - mIndices[3*i+2] = i + 1; - } - } + v1 = 1; + v2 = 2; + } + + for (S32 i = 0; i < (num_vertices - 2); i++) + { + mIndices[3*i] = num_vertices - 1; + mIndices[3*i+v1] = i; + mIndices[3*i+v2] = i + 1; + } + + //make tri strip + if (mTypeMask & OPEN_MASK) + { + makeTriStrip(); } else { - if (mTypeMask & OPEN_MASK) + S32 j = num_vertices-2; + if (mTypeMask & TOP_MASK) { - // SOLID OPEN BOTTOM - // Generate indices - // This is a tri-fan, so we reuse the same first point for all triangles. - for (S32 i = 0; i < (num_vertices - 2); i++) + mTriStrip.push_back(0); + for (S32 i = 0; i <= j; ++i) { - mIndices[3*i] = num_vertices - 1; - mIndices[3*i+1] = i + 1; - mIndices[3*i+2] = i; + mTriStrip.push_back(i); + if (i != j) + { + mTriStrip.push_back(j); + } + --j; } } else { - // SOLID CLOSED BOTTOM - for (S32 i = 0; i < (num_vertices - 2); i++) + mTriStrip.push_back(j); + for (S32 i = 0; i <= j; ++i) { - //MSMSM fix these caps but only for the un-cut case - mIndices[3*i] = num_vertices - 1; - mIndices[3*i+1] = i + 1; - mIndices[3*i+2] = i; + if (i != j) + { + mTriStrip.push_back(j); + } + mTriStrip.push_back(i); + --j; } } + + mTriStrip.push_back(mTriStrip[mTriStrip.size()-1]); + + if (mTriStrip.size()%2 == 1) + { + mTriStrip.push_back(mTriStrip[mTriStrip.size()-1]); + } } } + return TRUE; } +void LLVolumeFace::makeTriStrip() +{ + for (U32 i = 0; i < mIndices.size(); i+=3) + { + U16 i0 = mIndices[i]; + U16 i1 = mIndices[i+1]; + U16 i2 = mIndices[i+2]; + + if ((i/3)%2 == 1) + { + mTriStrip.push_back(i0); + mTriStrip.push_back(i0); + mTriStrip.push_back(i1); + mTriStrip.push_back(i2); + mTriStrip.push_back(i2); + } + else + { + mTriStrip.push_back(i2); + mTriStrip.push_back(i2); + mTriStrip.push_back(i1); + mTriStrip.push_back(i0); + mTriStrip.push_back(i0); + } + } + + if (mTriStrip.size()%2 == 1) + { + mTriStrip.push_back(mTriStrip[mTriStrip.size()-1]); + } +} + void LLVolumeFace::createBinormals() { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -5136,9 +5229,14 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build) if (!partial_build) { + mTriStrip.clear(); + // Now we generate the indices. for (t = 0; t < (mNumT-1); t++) { + //prepend terminating index to strip + mTriStrip.push_back(mNumS*t); + for (s = 0; s < (mNumS-1); s++) { mIndices[cur_index++] = s + mNumS*t; //bottom left @@ -5148,6 +5246,14 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build) mIndices[cur_index++] = s+1 + mNumS*t; //bottom right mIndices[cur_index++] = s+1 + mNumS*(t+1); //top right + if (s == 0) + { + mTriStrip.push_back(s+mNumS*t); + mTriStrip.push_back(s+mNumS*(t+1)); + } + mTriStrip.push_back(s+1+mNumS*t); + mTriStrip.push_back(s+1+mNumS*(t+1)); + mEdge[cur_edge++] = (mNumS-1)*2*t+s*2+1; //bottom left/top right neighbor face if (t < mNumT-2) { //top right/top left neighbor face mEdge[cur_edge++] = (mNumS-1)*2*(t+1)+s*2+1; @@ -5188,6 +5294,13 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build) } mEdge[cur_edge++] = (mNumS-1)*2*t+s*2; //top right/bottom left neighbor face } + //append terminating vertex to strip + mTriStrip.push_back(mNumS-1+mNumS*(t+1)); + } + + if (mTriStrip.size()%2 == 1) + { + mTriStrip.push_back(mTriStrip[mTriStrip.size()-1]); } } diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 871b334452..d9f80f0e30 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -798,7 +798,8 @@ public: BOOL create(LLVolume* volume, BOOL partial_build = FALSE); void createBinormals(); - + void makeTriStrip(); + class VertexData { public: @@ -839,6 +840,7 @@ public: std::vector<VertexData> mVertices; std::vector<U16> mIndices; + std::vector<U16> mTriStrip; std::vector<S32> mEdge; private: diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 22fad792da..a86bbbffff 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -270,6 +270,14 @@ F32 LLFontFreetype::getXAdvance(llwchar wch) const return (F32)mFontBitmapCachep->getMaxCharWidth(); } +F32 LLFontFreetype::getXAdvance(const LLFontGlyphInfo* glyph) const +{ + if (mFTFace == NULL) + return 0.0; + + return glyph->mXAdvance; +} + F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const { if (mFTFace == NULL) @@ -289,6 +297,21 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const return delta.x*(1.f/64.f); } +F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const +{ + if (mFTFace == NULL) + return 0.0; + + U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0; + U32 right_glyph = right_glyph_info ? right_glyph_info->mGlyphIndex : 0; + + FT_Vector delta; + + llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); + + return delta.x*(1.f/64.f); +} + BOOL LLFontFreetype::hasGlyph(llwchar wch) const { llassert(!mIsFallback); diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h index 7a5d029038..f60d09316d 100644 --- a/indra/llrender/llfontfreetype.h +++ b/indra/llrender/llfontfreetype.h @@ -128,7 +128,9 @@ public: }; F32 getXAdvance(llwchar wc) const; + F32 getXAdvance(const LLFontGlyphInfo* glyph) const; F32 getXKerning(llwchar char_left, llwchar char_right) const; // Get the kerning between the two characters + F32 getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const; // Get the kerning between the two characters LLFontGlyphInfo* getGlyphInfo(llwchar wch) const; diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index b6a6b448ee..768f042e69 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -151,14 +151,16 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons } } - gGL.pushMatrix(); - glLoadIdentity(); - gGL.translatef(floorf(sCurOrigin.mX*sScaleX), floorf(sCurOrigin.mY*sScaleY), sCurOrigin.mZ); + gGL.pushUIMatrix(); + + gGL.loadUIIdentity(); + + gGL.translateUI(floorf(sCurOrigin.mX*sScaleX), floorf(sCurOrigin.mY*sScaleY), sCurOrigin.mZ); // this code snaps the text origin to a pixel grid to start with F32 pixel_offset_x = llround((F32)sCurOrigin.mX) - (sCurOrigin.mX); F32 pixel_offset_y = llround((F32)sCurOrigin.mY) - (sCurOrigin.mY); - gGL.translatef(-pixel_offset_x, -pixel_offset_y, 0.f); + gGL.translateUI(-pixel_offset_x, -pixel_offset_y, 0.f); LLFastTimer t(FTM_RENDER_FONTS); @@ -246,14 +248,18 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons } - // Remember last-used texture to avoid unnecesssary bind calls. - LLImageGL *last_bound_texture = NULL; + const LLFontGlyphInfo* next_glyph = NULL; for (i = begin_offset; i < begin_offset + length; i++) { llwchar wch = wstr[i]; - const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch); + const LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } if (!fgi) { llerrs << "Missing Glyph Info" << llendl; @@ -261,12 +267,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons } // Per-glyph bitmap texture. LLImageGL *image_gl = mFontFreetype->getFontBitmapCache()->getImageGL(fgi->mBitmapNum); - if (last_bound_texture != image_gl) - { - gGL.getTexUnit(0)->bind(image_gl); - last_bound_texture = image_gl; - } - + gGL.getTexUnit(0)->bind(image_gl); + if ((start_x + scaled_max_pixels) < (cur_x + fgi->mXBearing + fgi->mWidth)) { // Not enough room for this character. @@ -295,7 +297,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons if (next_char && (next_char < LAST_CHARACTER)) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(next_char); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. @@ -330,10 +333,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons // recursively render ellipses at end of string // we've already reserved enough room - gGL.pushMatrix(); - //glLoadIdentity(); - //gGL.translatef(sCurOrigin.mX, sCurOrigin.mY, 0.0f); - //glScalef(sScaleX, sScaleY, 1.f); + gGL.pushUIMatrix(); renderUTF8(std::string("..."), 0, cur_x / sScaleX, (F32)y, @@ -344,10 +344,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons S32_MAX, max_pixels, right_x, FALSE); - gGL.popMatrix(); + gGL.popUIMatrix(); } - gGL.popMatrix(); + gGL.popUIMatrix(); return chars_drawn; } @@ -435,14 +435,21 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars F32 cur_x = 0; const S32 max_index = begin_offset + max_chars; + const LLFontGlyphInfo* next_glyph = NULL; + F32 width_padding = 0.f; for (S32 i = begin_offset; i < max_index && wchars[i] != 0; i++) { llwchar wch = wchars[i]; - const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch); + const LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } - F32 advance = mFontFreetype->getXAdvance(wch); + F32 advance = mFontFreetype->getXAdvance(fgi); // for the last character we want to measure the greater of its width and xadvance values // so keep track of the difference between these values for the each character we measure @@ -459,7 +466,8 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars && (next_char < LAST_CHARACTER)) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(next_char); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. cur_x = (F32)llround(cur_x); @@ -492,6 +500,8 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch // avoid S32 overflow when max_pixels == S32_MAX by staying in floating point F32 scaled_max_pixels = ceil(max_pixels * sScaleX); F32 width_padding = 0.f; + + LLFontGlyphInfo* next_glyph = NULL; S32 i; for (i=0; (i < max_chars); i++) @@ -534,8 +544,13 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch in_word = TRUE; } } - - LLFontGlyphInfo* fgi = mFontFreetype->getGlyphInfo(wch); + + LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } // account for glyphs that run beyond the starting point for the next glyphs width_padding = llmax( 0.f, // always use positive padding amount @@ -554,7 +569,8 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch if (((i+1) < max_chars) && wchars[i+1]) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, wchars[i+1]); + next_glyph = mFontFreetype->getGlyphInfo(wchars[i+1]); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. @@ -660,6 +676,8 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t const S32 max_index = begin_offset + llmin(S32_MAX - begin_offset, max_chars); F32 scaled_max_pixels = max_pixels * sScaleX; + + const LLFontGlyphInfo* next_glyph = NULL; S32 pos; for (pos = begin_offset; pos < max_index; pos++) @@ -669,7 +687,15 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t { break; // done } - F32 char_width = mFontFreetype->getXAdvance(wch); + + const LLFontGlyphInfo* glyph = next_glyph; + next_glyph = NULL; + if(!glyph) + { + glyph = mFontFreetype->getGlyphInfo(wch); + } + + F32 char_width = mFontFreetype->getXAdvance(glyph); if (round) { @@ -695,11 +721,12 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t if (((pos + 1) < max_index) && (wchars[(pos + 1)])) { - llwchar next_char = wchars[pos + 1]; // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(wchars[pos + 1]); + cur_x += mFontFreetype->getXKerning(glyph, next_glyph); } + // Round after kerning. cur_x = llround(cur_x); } diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 595b8577ff..656f690db5 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -49,6 +49,9 @@ F64 gGLLastProjection[16]; F64 gGLProjection[16]; S32 gGLViewport[4]; +U32 LLRender::sUICalls = 0; +U32 LLRender::sUIVerts = 0; + static const U32 LL_NUM_TEXTURE_LAYERS = 16; static GLenum sGLTextureType[] = @@ -90,7 +93,9 @@ static GLenum sGLBlendFactor[] = GL_DST_ALPHA, GL_SRC_ALPHA, GL_ONE_MINUS_DST_ALPHA, - GL_ONE_MINUS_SRC_ALPHA + GL_ONE_MINUS_SRC_ALPHA, + + GL_ZERO // 'BF_UNDEF' }; LLTexUnit::LLTexUnit(S32 index) @@ -255,10 +260,9 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind) return false ; } - gGL.flush(); - if ((mCurrTexture != texture->getTexName()) || forceBind) { + gGL.flush(); activate(); enable(texture->getTarget()); mCurrTexture = texture->getTexName(); @@ -445,6 +449,8 @@ void LLTexUnit::setTextureBlendType(eTextureBlendType type) return; } + gGL.flush(); + activate(); mCurrBlendType = type; S32 scale_amount = 1; @@ -759,6 +765,8 @@ LLRender::LLRender() mCurrAlphaFunc = CF_DEFAULT; mCurrAlphaFuncVal = 0.01f; + mCurrBlendSFactor = BF_UNDEF; + mCurrBlendDFactor = BF_UNDEF; } LLRender::~LLRender() @@ -821,6 +829,80 @@ void LLRender::popMatrix() glPopMatrix(); } +void LLRender::translateUI(F32 x, F32 y, F32 z) +{ + if (mUIOffset.empty()) + { + llerrs << "Need to push a UI translation frame before offsetting" << llendl; + } + + mUIOffset.front().mV[0] += x; + mUIOffset.front().mV[1] += y; + mUIOffset.front().mV[2] += z; +} + +void LLRender::scaleUI(F32 x, F32 y, F32 z) +{ + if (mUIScale.empty()) + { + llerrs << "Need to push a UI transformation frame before scaling." << llendl; + } + + mUIScale.front().scaleVec(LLVector3(x,y,z)); +} + +void LLRender::pushUIMatrix() +{ + mUIOffset.push_front(mUIOffset.front()); + if (mUIScale.empty()) + { + mUIScale.push_front(LLVector3(1,1,1)); + } + else + { + mUIScale.push_front(mUIScale.front()); + } +} + +void LLRender::popUIMatrix() +{ + if (mUIOffset.empty()) + { + llerrs << "UI offset stack blown." << llendl; + } + mUIOffset.pop_front(); + mUIScale.pop_front(); +} + +LLVector3 LLRender::getUITranslation() +{ + if (mUIOffset.empty()) + { + llerrs << "UI offset stack empty." << llendl; + } + return mUIOffset.front(); +} + +LLVector3 LLRender::getUIScale() +{ + if (mUIScale.empty()) + { + llerrs << "UI scale stack empty." << llendl; + } + return mUIScale.front(); +} + + +void LLRender::loadUIIdentity() +{ + if (mUIOffset.empty()) + { + llerrs << "Need to push UI translation frame before clearing offset." << llendl; + } + mUIOffset.front().setVec(0,0,0); + mUIScale.front().setVec(1,1,1); +} + void LLRender::setColorMask(bool writeColor, bool writeAlpha) { setColorMask(writeColor, writeColor, writeColor, writeAlpha); @@ -843,29 +925,28 @@ void LLRender::setColorMask(bool writeColorR, bool writeColorG, bool writeColorB void LLRender::setSceneBlendType(eBlendType type) { - flush(); switch (type) { case BT_ALPHA: - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + blendFunc(BF_SOURCE_ALPHA, BF_ONE_MINUS_SOURCE_ALPHA); break; case BT_ADD: - glBlendFunc(GL_ONE, GL_ONE); + blendFunc(BF_ONE, BF_ONE); break; case BT_ADD_WITH_ALPHA: - glBlendFunc(GL_SRC_ALPHA, GL_ONE); + blendFunc(BF_SOURCE_ALPHA, BF_ONE); break; case BT_MULT: - glBlendFunc(GL_DST_COLOR, GL_ZERO); + blendFunc(BF_DEST_COLOR, BF_ZERO); break; case BT_MULT_ALPHA: - glBlendFunc(GL_DST_ALPHA, GL_ZERO); + blendFunc(BF_DEST_ALPHA, BF_ZERO); break; case BT_MULT_X2: - glBlendFunc(GL_DST_COLOR, GL_SRC_COLOR); + blendFunc(BF_DEST_COLOR, BF_SOURCE_COLOR); break; case BT_REPLACE: - glBlendFunc(GL_ONE, GL_ZERO); + blendFunc(BF_ONE, BF_ZERO); break; default: llerrs << "Unknown Scene Blend Type: " << type << llendl; @@ -891,8 +972,15 @@ void LLRender::setAlphaRejectSettings(eCompareFunc func, F32 value) void LLRender::blendFunc(eBlendFactor sfactor, eBlendFactor dfactor) { - flush(); - glBlendFunc(sGLBlendFactor[sfactor], sGLBlendFactor[dfactor]); + llassert(sfactor < BF_UNDEF); + llassert(dfactor < BF_UNDEF); + if (mCurrBlendSFactor != sfactor || mCurrBlendDFactor != dfactor) + { + mCurrBlendSFactor = sfactor; + mCurrBlendDFactor = dfactor; + flush(); + glBlendFunc(sGLBlendFactor[sfactor], sGLBlendFactor[dfactor]); + } } LLTexUnit* LLRender::getTexUnit(U32 index) @@ -1012,6 +1100,12 @@ void LLRender::flush() } #endif + if (!mUIOffset.empty()) + { + sUICalls++; + sUIVerts += mCount; + } + mBuffer->setBuffer(immediate_mask); mBuffer->drawArrays(mMode, 0, mCount); @@ -1031,7 +1125,16 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z) return; } - mVerticesp[mCount] = LLVector3(x,y,z); + if (mUIOffset.empty()) + { + mVerticesp[mCount] = LLVector3(x,y,z); + } + else + { + LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.front()).scaledVec(mUIScale.front()); + mVerticesp[mCount] = vert; + } + mCount++; if (mCount < 4096) { diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 0121a190ee..a90fbd4a5c 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -270,7 +270,9 @@ public: BF_DEST_ALPHA, BF_SOURCE_ALPHA, BF_ONE_MINUS_DEST_ALPHA, - BF_ONE_MINUS_SOURCE_ALPHA + BF_ONE_MINUS_SOURCE_ALPHA, + + BF_UNDEF } eBlendFactor; LLRender(); @@ -286,6 +288,14 @@ public: void pushMatrix(); void popMatrix(); + void translateUI(F32 x, F32 y, F32 z); + void scaleUI(F32 x, F32 y, F32 z); + void pushUIMatrix(); + void popUIMatrix(); + void loadUIIdentity(); + LLVector3 getUITranslation(); + LLVector3 getUIScale(); + void flush(); void begin(const GLuint& mode); @@ -333,7 +343,9 @@ public: }; public: - + static U32 sUICalls; + static U32 sUIVerts; + private: bool mDirty; U32 mCount; @@ -350,7 +362,14 @@ private: std::vector<LLTexUnit*> mTexUnits; LLTexUnit* mDummyTexUnit; + eBlendFactor mCurrBlendSFactor; + eBlendFactor mCurrBlendDFactor; + F32 mMaxAnisotropy; + + std::list<LLVector3> mUIOffset; + std::list<LLVector3> mUIScale; + }; extern F64 gGLModelView[16]; diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 853f6f173d..532b6b6524 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -209,6 +209,16 @@ set(llui_HEADER_FILES set_source_files_properties(${llui_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) +SET(llurlentry_TEST_DEPENDENCIES + llurlmatch.cpp + llurlregistry.cpp + ) + +set_source_files_properties(llurlentry.cpp + PROPERTIES LL_TEST_ADDITIONAL_SOURCE_FILES + "${llurlentry_TEST_DEPENDENCIES}" + ) + list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES}) add_library (llui ${llui_SOURCE_FILES}) diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index d0c73fbfbc..2ed1082f56 100644 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -118,7 +118,6 @@ BOOL LLAccordionCtrl::postBuild() scrollbar_size, getRect().getHeight() - 1); - LLScrollbar::Params sbparams; sbparams.name("scrollable vertical"); sbparams.rect(scroll_rect); @@ -338,36 +337,55 @@ void LLAccordionCtrl::addCollapsibleCtrl(LLView* view) } - -void LLAccordionCtrl::arrange() +void LLAccordionCtrl::arrangeSinge() { - if( mAccordionTabs.size() == 0) - { - //We do not arrange if we do not have what should be arranged - return; - } - - //Calculate params S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel + S32 panel_height; - - if(mAccordionTabs.size() == 1) + S32 collapsed_height = 0; + + for(size_t i=0;i<mAccordionTabs.size();++i) { - LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]); - - LLRect panel_rect = accordion_tab->getRect(); + LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]); - S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN; + if(accordion_tab->getVisible() == false) //skip hidden accordion tabs + continue; + if(!accordion_tab->isExpanded() ) + { + collapsed_height+=mAccordionTabs[i]->getRect().getHeight(); + } + } - ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height); + S32 expanded_height = getRect().getHeight() - BORDER_MARGIN - collapsed_height; + + for(size_t i=0;i<mAccordionTabs.size();++i) + { + LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]); - show_hide_scrollbar(getRect().getWidth(),getRect().getHeight()); - return; - + if(accordion_tab->getVisible() == false) //skip hidden accordion tabs + continue; + if(!accordion_tab->isExpanded() ) + { + panel_height = accordion_tab->getRect().getHeight(); + } + else + { + panel_height = expanded_height; + } + ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height); + panel_top-=mAccordionTabs[i]->getRect().getHeight(); } +} + +void LLAccordionCtrl::arrangeMultiple() +{ + S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter + S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel + S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel + //Calculate params for(size_t i = 0; i < mAccordionTabs.size(); i++ ) { LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]); @@ -415,7 +433,40 @@ void LLAccordionCtrl::arrange() show_hide_scrollbar(getRect().getWidth(),getRect().getHeight()); updateLayout(getRect().getWidth(),getRect().getHeight()); +} + + +void LLAccordionCtrl::arrange() +{ + if( mAccordionTabs.size() == 0) + { + //We do not arrange if we do not have what should be arranged + return; + } + + if(mAccordionTabs.size() == 1) + { + S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel + S32 panel_width = getRect().getWidth() - 4; // Top coordinate of the first panel + + LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]); + + LLRect panel_rect = accordion_tab->getRect(); + + S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN; + + ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height); + + show_hide_scrollbar(getRect().getWidth(),getRect().getHeight()); + return; + + } + + if(mSingleExpansion) + arrangeSinge (); + else + arrangeMultiple (); } //--------------------------------------------------------------------------------- diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h index d57a42df32..7c29e545b7 100644 --- a/indra/llui/llaccordionctrl.h +++ b/indra/llui/llaccordionctrl.h @@ -105,6 +105,9 @@ public: void reset (); private: + void arrangeSinge(); + void arrangeMultiple(); + // Calc Splitter's height that is necessary to display all child content S32 calcRecuiredHeight(); S32 getRecuiredHeight() const { return mInnerRect.getHeight(); } diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index daa9e08f14..1067c3f1d5 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -33,8 +33,9 @@ #include "linden_common.h" #include "lluictrl.h" - +#include "llscrollbar.h" #include "llaccordionctrltab.h" +#include "lllocalcliprect.h" #include "lltextbox.h" @@ -46,6 +47,8 @@ static const S32 HEADER_HEIGHT = 20; static const S32 HEADER_IMAGE_LEFT_OFFSET = 5; static const S32 HEADER_TEXT_LEFT_OFFSET = 30; static const F32 AUTO_OPEN_TIME = 1.f; +static const S32 VERTICAL_MULTIPLE = 16; +static const S32 PARENT_BORDER_MARGIN = 5; static LLDefaultChildRegistry::Register<LLAccordionCtrlTab> t1("accordion_tab"); @@ -277,6 +280,7 @@ LLAccordionCtrlTab::Params::Params() ,header_image_pressed("header_image_pressed") ,header_image_focused("header_image_focused") ,header_text_color("header_text_color") + ,fit_panel("fit_panel",true) { mouse_opaque(false); } @@ -293,6 +297,9 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p) ,mPaddingTop(p.padding_top) ,mPaddingBottom(p.padding_bottom) ,mCanOpenClose(true) + ,mFitPanel(p.fit_panel) + ,mContainerPanel(NULL) + ,mScrollbar(NULL) { mStoredOpenCloseState = false; mWasStateStored = false; @@ -321,54 +328,42 @@ void LLAccordionCtrlTab::setDisplayChildren(bool display) mExpandedHeight : HEADER_HEIGHT); setRect(rect); - for(child_list_const_iter_t it = getChildList()->begin(); - getChildList()->end() != it; ++it) - { - LLView* child = *it; - if(DD_HEADER_NAME == child->getName()) - continue; + if(mContainerPanel) + mContainerPanel->setVisible(getDisplayChildren()); - child->setVisible(getDisplayChildren()); + if(mDisplayChildren) + { + adjustContainerPanel(); } + else + { + if(mScrollbar) + mScrollbar->setVisible(false); + } + } void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */) { LLRect headerRect; - LLUICtrl::reshape(width, height, TRUE); - headerRect.setLeftTopAndSize( 0,height,width,HEADER_HEIGHT); mHeader->setRect(headerRect); mHeader->reshape(headerRect.getWidth(), headerRect.getHeight()); - for(child_list_const_iter_t it = getChildList()->begin(); - getChildList()->end() != it; ++it) - { - LLView* child = *it; - if(DD_HEADER_NAME == child->getName()) - continue; - if(!child->getVisible()) - continue; - - LLRect childRect = child->getRect(); - S32 childWidth = width - getPaddingLeft() - getPaddingRight(); - S32 childHeight = height - getHeaderHeight() - getPaddingTop() - getPaddingBottom(); + if(!mDisplayChildren) + return; - child->reshape(childWidth,childHeight); - - childRect.setLeftTopAndSize( - getPaddingLeft(), - childHeight + getPaddingBottom(), - childWidth, - childHeight); + LLRect childRect; - child->setRect(childRect); - - break;//suppose that there is only one panel - } + childRect.setLeftTopAndSize( + getPaddingLeft(), + height - getHeaderHeight() - getPaddingTop(), + width - getPaddingLeft() - getPaddingRight(), + height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() ); + adjustContainerPanel(childRect); } void LLAccordionCtrlTab::changeOpenClose(bool is_open) @@ -439,7 +434,7 @@ void LLAccordionCtrlTab::setAccordionView(LLView* panel) } -LLView* LLAccordionCtrlTab::getAccordionView() +LLView* LLAccordionCtrlTab::findContainerView() { for(child_list_const_iter_t it = getChildList()->begin(); getChildList()->end() != it; ++it) @@ -474,6 +469,43 @@ void LLAccordionCtrlTab::setHeaderVisible(bool value) BOOL LLAccordionCtrlTab::postBuild() { mHeader->setVisible(mHeaderVisible); + + static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); + + LLRect scroll_rect; + scroll_rect.setOriginAndSize( + getRect().getWidth() - scrollbar_size, + 1, + scrollbar_size, + getRect().getHeight() - 1); + + mContainerPanel = findContainerView(); + + if(!mFitPanel) + { + LLScrollbar::Params sbparams; + sbparams.name("scrollable vertical"); + sbparams.rect(scroll_rect); + sbparams.orientation(LLScrollbar::VERTICAL); + sbparams.doc_size(getRect().getHeight()); + sbparams.doc_pos(0); + sbparams.page_size(getRect().getHeight()); + sbparams.step_size(VERTICAL_MULTIPLE); + sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM); + sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2)); + + + mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams); + LLView::addChild( mScrollbar ); + mScrollbar->setFollowsRight(); + mScrollbar->setFollowsTop(); + mScrollbar->setFollowsBottom(); + + mScrollbar->setVisible(false); + } + + mContainerPanel->setVisible(mDisplayChildren); + return LLUICtrl::postBuild(); } bool LLAccordionCtrlTab::notifyChildren (const LLSD& info) @@ -562,6 +594,12 @@ BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent) if( !header->hasFocus() ) return LLUICtrl::handleKey(key, mask, called_from_parent); + if ( (key == KEY_RETURN )&& mask == MASK_NONE) + { + changeOpenClose(getDisplayChildren()); + return TRUE; + } + if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE) { if(getDisplayChildren() == false) @@ -622,6 +660,7 @@ void LLAccordionCtrlTab::storeOpenCloseState() mStoredOpenCloseState = getDisplayChildren(); mWasStateStored = true; } + void LLAccordionCtrlTab::restoreOpenCloseState() { if(!mWasStateStored) @@ -632,3 +671,195 @@ void LLAccordionCtrlTab::restoreOpenCloseState() } mWasStateStored = false; } + +void LLAccordionCtrlTab::adjustContainerPanel () +{ + S32 width = getRect().getWidth(); + S32 height = getRect().getHeight(); + + LLRect child_rect; + child_rect.setLeftTopAndSize( + getPaddingLeft(), + height - getHeaderHeight() - getPaddingTop(), + width - getPaddingLeft() - getPaddingRight(), + height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() ); + + adjustContainerPanel(child_rect); +} + +void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect) +{ + if(!mContainerPanel) + return; + + if(!mFitPanel) + { + show_hide_scrollbar(child_rect); + updateLayout(child_rect); + } + else + { + mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight()); + mContainerPanel->setRect(child_rect); + } +} + +S32 LLAccordionCtrlTab::getChildViewHeight() +{ + if(!mContainerPanel) + return 0; + return mContainerPanel->getRect().getHeight(); +} + +void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect) +{ + if(getChildViewHeight() > child_rect.getHeight() ) + showScrollbar(child_rect); + else + hideScrollbar(child_rect); +} +void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect) +{ + if(!mContainerPanel || !mScrollbar) + return; + bool was_visible = mScrollbar->getVisible(); + mScrollbar->setVisible(true); + + static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); + + { + ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size, + child_rect.getHeight()-PARENT_BORDER_MARGIN, + scrollbar_size, + child_rect.getHeight()-2*PARENT_BORDER_MARGIN); + } + + LLRect orig_rect = mContainerPanel->getRect(); + + mScrollbar->setPageSize(child_rect.getHeight()); + mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos()); + + if(was_visible) + { + S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1); + mScrollbar->setDocPos(scroll_pos); + } + else//shrink child panel + { + updateLayout(child_rect); + } + +} + +void LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect ) +{ + if(!mContainerPanel || !mScrollbar) + return; + + if(mScrollbar->getVisible() == false) + return; + mScrollbar->setVisible(false); + mScrollbar->setDocPos(0); + + //shrink child panel + updateLayout(child_rect); +} + +void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*) +{ + LLRect child_rect; + + S32 width = getRect().getWidth(); + S32 height = getRect().getHeight(); + + child_rect.setLeftTopAndSize( + getPaddingLeft(), + height - getHeaderHeight() - getPaddingTop(), + width - getPaddingLeft() - getPaddingRight(), + height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() ); + + updateLayout(child_rect); +} + +void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child) +{ + if (child && child->getVisible() && child->getRect().isValid()) + { + LLRect screen_rect; + localRectToScreen(child->getRect(),&screen_rect); + + if ( root_rect.overlaps(screen_rect) && LLUI::sDirtyRect.overlaps(screen_rect)) + { + glMatrixMode(GL_MODELVIEW); + LLUI::pushMatrix(); + { + LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom, 0.f); + child->draw(); + + } + LLUI::popMatrix(); + } + } +} + +void LLAccordionCtrlTab::draw() +{ + if(mFitPanel) + LLUICtrl::draw(); + else + { + LLRect root_rect = getRootView()->getRect(); + drawChild(root_rect,mHeader); + drawChild(root_rect,mScrollbar ); + { + LLRect child_rect; + + S32 width = getRect().getWidth(); + S32 height = getRect().getHeight(); + + child_rect.setLeftTopAndSize( + getPaddingLeft(), + height - getHeaderHeight() - getPaddingTop(), + width - getPaddingLeft() - getPaddingRight(), + height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() ); + + LLLocalClipRect clip(child_rect); + drawChild(root_rect,mContainerPanel); + } + + + gGL.getTexUnit(0)->disable(); + } +} + +void LLAccordionCtrlTab::updateLayout ( const LLRect& child_rect ) +{ + LLView* child = getAccordionView(); + if(!mContainerPanel) + return; + + S32 panel_top = child_rect.getHeight(); + S32 panel_width = child_rect.getWidth(); + + static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); + if(mScrollbar->getVisible() != false) + { + panel_top+=mScrollbar->getDocPos(); + panel_width-=scrollbar_size; + } + + //set sizes for first panels and dragbars + LLRect panel_rect = child->getRect(); + ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight()); +} +void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height) +{ + if(!panel) + return; + LLRect panel_rect = panel->getRect(); + panel_rect.setLeftTopAndSize( left, top, width, height); + panel->reshape( width, height, 1); + panel->setRect(panel_rect); +} + + diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h index 2e0260ab16..462ccc6d53 100644 --- a/indra/llui/llaccordionctrltab.h +++ b/indra/llui/llaccordionctrltab.h @@ -41,6 +41,7 @@ class LLUICtrlFactory; class LLUIImage; class LLButton; class LLTextBox; +class LLScrollbar; @@ -84,6 +85,8 @@ public: Optional<bool> header_visible; + Optional<bool> fit_panel; + Optional<S32> padding_left; Optional<S32> padding_right; Optional<S32> padding_top; @@ -107,7 +110,7 @@ public: //set LLAccordionCtrlTab panel void setAccordionView(LLView* panel); - LLView* getAccordionView(); + LLView* getAccordionView() { return mContainerPanel; }; bool getCollapsible() {return mCollapsible;}; @@ -123,6 +126,8 @@ public: S32 notify(const LLSD& info); bool notifyChildren(const LLSD& info); + void draw(); + void storeOpenCloseState (); void restoreOpenCloseState (); @@ -164,9 +169,26 @@ public: void showAndFocusHeader(); -private: + void setFitPanel( bool fit ) { mFitPanel = true; } - +protected: + void adjustContainerPanel (const LLRect& child_rect); + void adjustContainerPanel (); + S32 getChildViewHeight (); + + void onScrollPosChangeCallback(S32, LLScrollbar*); + + void show_hide_scrollbar (const LLRect& child_rect); + void showScrollbar (const LLRect& child_rect); + void hideScrollbar (const LLRect& child_rect); + + void updateLayout ( const LLRect& child_rect ); + void ctrlSetLeftTopAndSize (LLView* panel, S32 left, S32 top, S32 width, S32 height); + + void drawChild(const LLRect& root_rect,LLView* child); + + LLView* findContainerView (); +private: class LLAccordionCtrlTabHeader; LLAccordionCtrlTabHeader* mHeader; //Header @@ -176,6 +198,7 @@ private: bool mHeaderVisible; bool mCanOpenClose; + bool mFitPanel; S32 mPaddingLeft; S32 mPaddingRight; @@ -185,6 +208,8 @@ private: bool mStoredOpenCloseState; bool mWasStateStored; + LLScrollbar* mScrollbar; + LLView* mContainerPanel; LLUIColor mDropdownBGColor; }; diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 8f35db1007..59b551a16d 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -216,6 +216,7 @@ public: void setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white); void setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white); LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; } + LLFontGL::HAlign getImageOverlayHAlign() const { return mImageOverlayAlignment; } void autoResize(); // resize with label of current btn state void resize(LLUIString label); // resize with label input @@ -257,6 +258,8 @@ public: void setForcePressedState(bool b) { mForcePressedState = b; } + void setAutoResize(bool auto_resize) { mAutoResize = auto_resize; } + protected: LLPointer<LLUIImage> getImageUnselected() const { return mImageUnselected; } LLPointer<LLUIImage> getImageSelected() const { return mImageSelected; } diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 9d23daf56d..c1d512e148 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -160,7 +160,7 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p) createLineEditor(p); - setTopLostCallback(boost::bind(&LLComboBox::hideList, this)); + mTopLostSignalConnection = setTopLostCallback(boost::bind(&LLComboBox::hideList, this)); } void LLComboBox::initFromParams(const LLComboBox::Params& p) @@ -187,6 +187,9 @@ BOOL LLComboBox::postBuild() LLComboBox::~LLComboBox() { // children automatically deleted, including mMenu, mButton + + // explicitly disconect this signal, since base class destructor might fire top lost + mTopLostSignalConnection.disconnect(); } @@ -320,15 +323,19 @@ void LLComboBox::setValue(const LLSD& value) LLScrollListItem* item = mList->getFirstSelected(); if (item) { - setLabel( mList->getSelectedItemLabel() ); + setLabel(getSelectedItemLabel()); } mLastSelectedIndex = mList->getFirstSelectedIndex(); } + else + { + mLastSelectedIndex = -1; + } } const std::string LLComboBox::getSimple() const { - const std::string res = mList->getSelectedItemLabel(); + const std::string res = getSelectedItemLabel(); if (res.empty() && mAllowTextEntry) { return mTextEntry->getText(); @@ -407,7 +414,7 @@ BOOL LLComboBox::remove(S32 index) if (index < mList->getItemCount()) { mList->deleteSingleItem(index); - setLabel(mList->getSelectedItemLabel()); + setLabel(getSelectedItemLabel()); return TRUE; } return FALSE; @@ -448,7 +455,7 @@ BOOL LLComboBox::setCurrentByIndex( S32 index ) BOOL found = mList->selectNthItem( index ); if (found) { - setLabel(mList->getSelectedItemLabel()); + setLabel(getSelectedItemLabel()); mLastSelectedIndex = index; } return found; @@ -612,16 +619,14 @@ void LLComboBox::showList() mList->setFocus(TRUE); - // register ourselves as a "top" control - // effectively putting us into a special draw layer - // and not affecting the bounding rectangle calculation - gFocusMgr.setTopCtrl(this); - // Show the list and push the button down mButton->setToggleState(TRUE); mList->setVisible(TRUE); + LLUI::addPopup(this); + setUseBoundingRect(TRUE); +// updateBoundingRect(); } void LLComboBox::hideList() @@ -644,10 +649,8 @@ void LLComboBox::hideList() mList->mouseOverHighlightNthItem(-1); setUseBoundingRect(FALSE); - if( gFocusMgr.getTopCtrl() == this ) - { - gFocusMgr.setTopCtrl(NULL); - } + LLUI::removePopup(this); +// updateBoundingRect(); } } @@ -703,19 +706,12 @@ void LLComboBox::onListMouseUp() void LLComboBox::onItemSelected(const LLSD& data) { - const std::string name = mList->getSelectedItemLabel(); + setValue(data); - S32 cur_id = getCurrentIndex(); - mLastSelectedIndex = cur_id; - if (cur_id != -1) + if (mAllowTextEntry && mLastSelectedIndex != -1) { - setLabel(name); - - if (mAllowTextEntry) - { - gFocusMgr.setKeyboardFocus(mTextEntry); - mTextEntry->selectAll(); - } + gFocusMgr.setKeyboardFocus(mTextEntry); + mTextEntry->selectAll(); } // hiding the list reasserts the old value stored in the text editor/dropdown button @@ -912,7 +908,7 @@ void LLComboBox::updateSelection() } else if (mList->selectItemByPrefix(left_wstring, FALSE)) { - LLWString selected_item = utf8str_to_wstring(mList->getSelectedItemLabel()); + LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel()); LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size()); mTextEntry->setText(wstring_to_utf8str(wtext)); mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size()); @@ -1014,7 +1010,7 @@ BOOL LLComboBox::setCurrentByID(const LLUUID& id) if (found) { - setLabel(mList->getSelectedItemLabel()); + setLabel(getSelectedItemLabel()); mLastSelectedIndex = mList->getFirstSelectedIndex(); } @@ -1030,7 +1026,7 @@ BOOL LLComboBox::setSelectedByValue(const LLSD& value, BOOL selected) BOOL found = mList->setSelectedByValue(value, selected); if (found) { - setLabel(mList->getSelectedItemLabel()); + setLabel(getSelectedItemLabel()); } return found; } @@ -1069,3 +1065,42 @@ BOOL LLComboBox::selectItemRange( S32 first, S32 last ) { return mList->selectItemRange(first, last); } + + +static LLDefaultChildRegistry::Register<LLIconsComboBox> register_icons_combo_box("icons_combo_box"); + +LLIconsComboBox::Params::Params() +: icon_column("icon_column", ICON_COLUMN), + label_column("label_column", LABEL_COLUMN) +{} + +LLIconsComboBox::LLIconsComboBox(const LLIconsComboBox::Params& p) +: LLComboBox(p), + mIconColumnIndex(p.icon_column), + mLabelColumnIndex(p.label_column) +{} + +void LLIconsComboBox::setValue(const LLSD& value) +{ + BOOL found = mList->selectByValue(value); + if (found) + { + LLScrollListItem* item = mList->getFirstSelected(); + if (item) + { + setLabel(getSelectedItemLabel()); + } + mLastSelectedIndex = mList->getFirstSelectedIndex(); + } + else + { + mLastSelectedIndex = -1; + } +} + +const std::string LLIconsComboBox::getSelectedItemLabel(S32 column) const +{ + mButton->setImageOverlay(LLComboBox::getSelectedItemLabel(mIconColumnIndex), mButton->getImageOverlayHAlign()); + + return LLComboBox::getSelectedItemLabel(mLabelColumnIndex); +} diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 4f27588467..965061ead2 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -150,7 +150,7 @@ public: // Get name of current item. Returns an empty string if not found. const std::string getSimple() const; // Get contents of column x of selected row - const std::string getSelectedItemLabel(S32 column = 0) const; + virtual const std::string getSelectedItemLabel(S32 column = 0) const; // Sets the label, which doesn't have to exist in the label. // This is probably a UI abuse. @@ -221,6 +221,7 @@ protected: LLPointer<LLUIImage> mArrowImage; LLUIString mLabel; BOOL mHasAutocompletedText; + S32 mLastSelectedIndex; private: BOOL mAllowTextEntry; @@ -230,6 +231,38 @@ private: commit_callback_t mPrearrangeCallback; commit_callback_t mTextEntryCallback; commit_callback_t mSelectionCallback; - S32 mLastSelectedIndex; + boost::signals2::connection mTopLostSignalConnection; +}; + +// A combo box with icons for the list of items. +class LLIconsComboBox +: public LLComboBox +{ +public: + struct Params + : public LLInitParam::Block<Params, LLComboBox::Params> + { + Optional<S32> icon_column, + label_column; + Params(); + }; + + /*virtual*/ void setValue(const LLSD& value); + /*virtual*/ const std::string getSelectedItemLabel(S32 column = 0) const; + +private: + enum EColumnIndex + { + ICON_COLUMN = 0, + LABEL_COLUMN + }; + + friend class LLUICtrlFactory; + LLIconsComboBox(const Params&); + virtual ~LLIconsComboBox() {}; + + S32 mIconColumnIndex; + S32 mLabelColumnIndex; }; + #endif diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index a4f69e7ac1..badbddc3cc 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -300,7 +300,8 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, b S32 paragraph_offset = 0; //Offset into the paragraph text. // Wrap lines that are longer than the view is wide. - while( paragraph_offset < (S32)mParagraphText.length() ) + while( paragraph_offset < (S32)mParagraphText.length() && + mParagraphText[paragraph_offset] != 0) { S32 skip_chars; // skip '\n' // Figure out if a word-wrapped line fits here. diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index a94f0206a6..3d8670fef2 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -95,7 +95,7 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname) LLDockableFloater* instance = dynamic_cast<LLDockableFloater*> (LLFloaterReg::findInstance(name)); // if floater closed or docked - if (instance == NULL || instance != NULL && instance->isDocked()) + if (instance == NULL || (instance && instance->isDocked())) { LLFloaterReg::toggleInstance(name, key); // restore button toggle state @@ -202,10 +202,6 @@ void LLDockableFloater::setDocked(bool docked, bool pop_on_undock) translate(0, UNDOCK_LEAP_HEIGHT); } } - else - { - docked = false; - } LLFloater::setDocked(docked, pop_on_undock); } @@ -223,10 +219,10 @@ void LLDockableFloater::draw() LLFloater::draw(); } -void LLDockableFloater::setDockControl(LLDockControl* dockControl, bool docked /* = true */) +void LLDockableFloater::setDockControl(LLDockControl* dockControl) { mDockControl.reset(dockControl); - setDocked(docked && mDockControl.get() != NULL && mDockControl.get()->isDockVisible()); + setDocked(isDocked()); } const LLUIImagePtr& LLDockableFloater::getDockTongue() diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 4d747390af..2b1ce99ae2 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -127,7 +127,7 @@ private: void resetInstance(); protected: - void setDockControl(LLDockControl* dockControl, bool docked = true); + void setDockControl(LLDockControl* dockControl); const LLUIImagePtr& getDockTongue(); private: diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index d836a5f4cd..d738b10130 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -162,7 +162,9 @@ bool LLDockControl::isDockVisible() { case LEFT: // to keep compiler happy break; + case BOTTOM: case TOP: + { // check is dock inside parent rect LLRect dockParentRect = mDockWidget->getParent()->calcScreenRect(); @@ -173,6 +175,9 @@ bool LLDockControl::isDockVisible() } break; } + default: + break; + } } } @@ -255,6 +260,42 @@ void LLDockControl::moveDockable() mDockTongueY = dockRect.mTop; break; + case BOTTOM: + x = dockRect.getCenterX() - dockableRect.getWidth() / 2; + y = dockRect.mBottom; + // unique docking used with dock tongue, so add tongue height o the Y coordinate + if (use_tongue) + { + y -= mDockTongue->getHeight(); + } + + // check is dockable inside root view rect + if (x < rootRect.mLeft) + { + x = rootRect.mLeft; + } + if (x + dockableRect.getWidth() > rootRect.mRight) + { + x = rootRect.mRight - dockableRect.getWidth(); + } + + // calculate dock tongue position + dockParentRect = mDockWidget->getParent()->calcScreenRect(); + if (dockRect.getCenterX() < dockParentRect.mLeft) + { + mDockTongueX = dockParentRect.mLeft - mDockTongue->getWidth() / 2; + } + else if (dockRect.getCenterX() > dockParentRect.mRight) + { + mDockTongueX = dockParentRect.mRight - mDockTongue->getWidth() / 2;; + } + else + { + mDockTongueX = dockRect.getCenterX() - mDockTongue->getWidth() / 2; + } + mDockTongueY = dockRect.mBottom - mDockTongue->getHeight(); + + break; } // move dockable diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h index 550955c4c5..a5caf68001 100644 --- a/indra/llui/lldockcontrol.h +++ b/indra/llui/lldockcontrol.h @@ -47,8 +47,9 @@ class LLDockControl public: enum DocAt { - TOP - ,LEFT + TOP, + LEFT, + BOTTOM }; public: diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 2481249f91..2e5aeec41d 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -492,6 +492,12 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask) { if (!item_pair) return; + if (!item_pair->first) + { + llwarning("Attempt to selet an item pair containing null panel item", 0); + return; + } + setFocus(TRUE); bool select_item = !isSelected(item_pair); diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index a55915af35..33895ac22a 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -527,10 +527,7 @@ void LLFloater::setVisible( BOOL visible ) if( !visible ) { - if( gFocusMgr.childIsTopCtrl( this ) ) - { - gFocusMgr.setTopCtrl(NULL); - } + LLUI::removePopup(this); if( gFocusMgr.childHasMouseCapture( this ) ) { @@ -704,10 +701,7 @@ void LLFloater::reshape(S32 width, S32 height, BOOL called_from_parent) void LLFloater::releaseFocus() { - if( gFocusMgr.childIsTopCtrl( this ) ) - { - gFocusMgr.setTopCtrl(NULL); - } + LLUI::removePopup(this); setFocus(FALSE); @@ -1360,7 +1354,7 @@ void LLFloater::bringToFront( S32 x, S32 y ) // virtual void LLFloater::setVisibleAndFrontmost(BOOL take_focus) { - gFocusMgr.setTopCtrl(NULL); + LLUI::clearPopups(); setVisible(TRUE); setFrontmost(take_focus); } @@ -1554,7 +1548,12 @@ void LLFloater::onClickClose( LLFloater* self ) { if (!self) return; - self->closeFloater(false); + self->onClickCloseBtn(); +} + +void LLFloater::onClickCloseBtn() +{ + closeFloater(false); } @@ -1565,43 +1564,34 @@ void LLFloater::draw() // draw background if( isBackgroundVisible() ) { + drawShadow(this); + S32 left = LLPANEL_BORDER_WIDTH; S32 top = getRect().getHeight() - LLPANEL_BORDER_WIDTH; S32 right = getRect().getWidth() - LLPANEL_BORDER_WIDTH; S32 bottom = LLPANEL_BORDER_WIDTH; - static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0); - static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow"); - LLColor4 shadow_color = shadow_color_cached; - F32 shadow_offset = (F32)shadow_offset_S32; - - if (!isBackgroundOpaque()) - { - shadow_offset *= 0.2f; - shadow_color.mV[VALPHA] *= 0.5f; - } - gl_drop_shadow(left, top, right, bottom, - shadow_color % alpha, - llround(shadow_offset)); - LLUIImage* image = NULL; LLColor4 color; + LLColor4 overlay_color; if (isBackgroundOpaque()) { // NOTE: image may not be set image = getBackgroundImage(); color = getBackgroundColor(); + overlay_color = getBackgroundImageOverlay(); } else { image = getTransparentImage(); color = getTransparentColor(); + overlay_color = getTransparentImageOverlay(); } if (image) { // We're using images for this floater's backgrounds - image->draw(getLocalRect(), UI_VERTEX_COLOR % alpha); + image->draw(getLocalRect(), overlay_color % alpha); } else { @@ -1666,6 +1656,29 @@ void LLFloater::draw() } } +void LLFloater::drawShadow(LLPanel* panel) +{ + F32 alpha = panel->getDrawContext().mAlpha; + S32 left = LLPANEL_BORDER_WIDTH; + S32 top = panel->getRect().getHeight() - LLPANEL_BORDER_WIDTH; + S32 right = panel->getRect().getWidth() - LLPANEL_BORDER_WIDTH; + S32 bottom = LLPANEL_BORDER_WIDTH; + + static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0); + static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow"); + LLColor4 shadow_color = shadow_color_cached; + F32 shadow_offset = (F32)shadow_offset_S32; + + if (!panel->isBackgroundOpaque()) + { + shadow_offset *= 0.2f; + shadow_color.mV[VALPHA] *= 0.5f; + } + gl_drop_shadow(left, top, right, bottom, + shadow_color % alpha, + llround(shadow_offset)); +} + void LLFloater::setCanMinimize(BOOL can_minimize) { // if removing minimize/restore button programmatically, @@ -2376,10 +2389,17 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out LLRect new_rect; new_rect.setLeftTopAndSize(view_rect.mLeft,view_rect.mTop,new_width, new_height); - floater->reshape( new_width, new_height, TRUE ); - floater->setRect(new_rect); + floater->setShape(new_rect); + + if (floater->followsRight()) + { + floater->translate(old_width - new_width, 0); + } - floater->translateIntoRect( getLocalRect(), false ); + if (floater->followsTop()) + { + floater->translate(0, old_height - new_height); + } } } @@ -2482,10 +2502,7 @@ void LLFloaterView::syncFloaterTabOrder() if (modal_dialog) { // If we have a visible modal dialog, make sure that it has focus - if( gFocusMgr.getTopCtrl() != modal_dialog ) - { - gFocusMgr.setTopCtrl( modal_dialog ); - } + LLUI::addPopup(modal_dialog); if( !gFocusMgr.childHasKeyboardFocus( modal_dialog ) ) { @@ -2794,3 +2811,15 @@ bool LLFloater::isShown(const LLFloater* floater) { return floater && floater->isShown(); } + +/* static */ +bool LLFloater::isMinimized(const LLFloater* floater) +{ + return floater && floater->isMinimized(); +} + +/* static */ +bool LLFloater::isVisible(const LLFloater* floater) +{ + return floater && floater->getVisible(); +} diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 2166d8db8a..97d2bda594 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -194,6 +194,8 @@ public: /// The static isShown() can accept a NULL pointer (which of course /// returns false). When non-NULL, it calls the non-static isShown(). static bool isShown(const LLFloater* floater); + static bool isVisible(const LLFloater* floater); + static bool isMinimized(const LLFloater* floater); BOOL isFirstLook() { return mFirstLook; } // EXT-2653: This function is necessary to prevent overlapping for secondary showed toasts BOOL isFrontmost(); BOOL isDependent() { return !mDependeeHandle.isDead(); } @@ -222,6 +224,7 @@ public: virtual BOOL handleScrollWheel(S32 x, S32 y, S32 mask); virtual void draw(); + virtual void drawShadow(LLPanel* panel); virtual void onOpen(const LLSD& key) {} virtual void onClose(bool app_quitting) {} @@ -306,6 +309,8 @@ protected: void destroy() { die(); } // Don't call this directly. You probably want to call closeFloater() + virtual void onClickCloseBtn(); + private: void setForeground(BOOL b); // called only by floaterview void cleanupHandles(); // remove handles to dead floaters @@ -345,6 +350,7 @@ protected: LLResizeBar* mResizeBar[4]; LLResizeHandle* mResizeHandle[4]; + LLButton* mButtons[BUTTON_COUNT]; private: LLRect mExpandedRect; @@ -378,7 +384,6 @@ private: handle_set_t mDependents; bool mButtonsEnabled[BUTTON_COUNT]; - LLButton* mButtons[BUTTON_COUNT]; F32 mButtonScale; BOOL mAutoFocus; LLHandle<LLFloater> mSnappedTo; diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 5de3934c8a..7588d8ab7a 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -272,11 +272,11 @@ bool LLFloaterReg::toggleInstance(const std::string& name, const LLSD& key) } //static -// returns true if the instance exists and is visible +// returns true if the instance exists and is visible (doesnt matter minimized or not) bool LLFloaterReg::instanceVisible(const std::string& name, const LLSD& key) { LLFloater* instance = findInstance(name, key); - return LLFloater::isShown(instance); + return LLFloater::isVisible(instance); } //static @@ -463,3 +463,12 @@ bool LLFloaterReg::floaterInstanceVisible(const LLSD& sdname) return instanceVisible(name, key); } +//static +bool LLFloaterReg::floaterInstanceMinimized(const LLSD& sdname) +{ + LLSD key; + std::string name = sdname.asString(); + parse_name_key(name, key); + LLFloater* instance = findInstance(name, key); + return LLFloater::isShown(instance); +} diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h index 8a11d5c3f2..5cacf76771 100644 --- a/indra/llui/llfloaterreg.h +++ b/indra/llui/llfloaterreg.h @@ -134,6 +134,7 @@ public: static void hideFloaterInstance(const LLSD& sdname); static void toggleFloaterInstance(const LLSD& sdname); static bool floaterInstanceVisible(const LLSD& sdname); + static bool floaterInstanceMinimized(const LLSD& sdname); // Typed find / get / show template <class T> diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 35fbc7b0a8..b3af258456 100644 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -38,8 +38,6 @@ const F32 FOCUS_FADE_TIME = 0.3f; -// NOTE: the LLFocusableElement implementation has been moved here from lluictrl.cpp. - LLFocusableElement::LLFocusableElement() : mFocusLostCallback(NULL), mFocusReceivedCallback(NULL), @@ -124,8 +122,7 @@ boost::signals2::connection LLFocusableElement::setTopLostCallback(const focus_s LLFocusMgr gFocusMgr; LLFocusMgr::LLFocusMgr() - : - mLockedView( NULL ), +: mLockedView( NULL ), mMouseCaptor( NULL ), mKeyboardFocus( NULL ), mLastKeyboardFocus( NULL ), @@ -133,16 +130,11 @@ LLFocusMgr::LLFocusMgr() mKeystrokesOnly(FALSE), mTopCtrl( NULL ), mAppHasFocus(TRUE) // Macs don't seem to notify us that we've gotten focus, so default to true - #ifdef _DEBUG - , mMouseCaptorName("none") - , mKeyboardFocusName("none") - , mTopCtrlName("none") - #endif { } -void LLFocusMgr::releaseFocusIfNeeded( const LLView* view ) +void LLFocusMgr::releaseFocusIfNeeded( LLView* view ) { if( childHasMouseCapture( view ) ) { @@ -162,10 +154,7 @@ void LLFocusMgr::releaseFocusIfNeeded( const LLView* view ) } } - if( childIsTopCtrl( view ) ) - { - setTopCtrl( NULL ); - } + LLUI::removePopup(view); } @@ -248,11 +237,6 @@ void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL return; } - #ifdef _DEBUG - LLUICtrl* focus_ctrl = dynamic_cast<LLUICtrl*>(new_focus); - mKeyboardFocusName = focus_ctrl ? focus_ctrl->getName() : std::string("none"); - #endif - // If we've got a default keyboard focus, and the caller is // releasing keyboard focus, move to the default. if (mDefaultKeyboardFocus != NULL && mKeyboardFocus == NULL) @@ -334,20 +318,12 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* f if( mKeyboardFocus == focus ) { mKeyboardFocus = NULL; - #ifdef _DEBUG - mKeyboardFocusName = std::string("none"); - #endif } } void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor ) { - //if (mFocusLocked) - //{ - // return; - //} - if( new_captor != mMouseCaptor ) { LLMouseHandler* old_captor = mMouseCaptor; @@ -370,24 +346,14 @@ void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor ) old_captor->onMouseCaptureLost(); } - #ifdef _DEBUG - mMouseCaptorName = new_captor ? new_captor->getName() : std::string("none"); - #endif } } void LLFocusMgr::removeMouseCaptureWithoutCallback( const LLMouseHandler* captor ) { - //if (mFocusLocked) - //{ - // return; - //} if( mMouseCaptor == captor ) { mMouseCaptor = NULL; - #ifdef _DEBUG - mMouseCaptorName = std::string("none"); - #endif } } @@ -416,10 +382,6 @@ void LLFocusMgr::setTopCtrl( LLUICtrl* new_top ) { mTopCtrl = new_top; - #ifdef _DEBUG - mTopCtrlName = new_top ? new_top->getName() : std::string("none"); - #endif - if (old_top) { old_top->onTopLost(); @@ -432,9 +394,6 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( const LLUICtrl* top_view ) if( mTopCtrl == top_view ) { mTopCtrl = NULL; - #ifdef _DEBUG - mTopCtrlName = std::string("none"); - #endif } } @@ -478,9 +437,9 @@ void LLFocusMgr::setAppHasFocus(BOOL focus) } // release focus from "top ctrl"s, which generally hides them - if (!focus && mTopCtrl) + if (!focus) { - setTopCtrl(NULL); + LLUI::clearPopups(); } mAppHasFocus = focus; } diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h index 83ecd1d301..86d3ccf111 100644 --- a/indra/llui/llfocusmgr.h +++ b/indra/llui/llfocusmgr.h @@ -65,10 +65,10 @@ public: virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); + virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere protected: virtual void onFocusReceived(); virtual void onFocusLost(); - virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere focus_signal_t* mFocusLostCallback; focus_signal_t* mFocusReceivedCallback; focus_signal_t* mFocusChangedCallback; @@ -119,7 +119,7 @@ public: BOOL childIsTopCtrl( const LLView* parent ) const; // All Three - void releaseFocusIfNeeded( const LLView* top_view ); + void releaseFocusIfNeeded( LLView* top_view ); void lockFocus(); void unlockFocus(); BOOL focusLocked() const { return mLockedView != NULL; } @@ -149,12 +149,6 @@ private: typedef std::map<LLHandle<LLView>, LLHandle<LLView> > focus_history_map_t; focus_history_map_t mFocusHistory; - - #ifdef _DEBUG - std::string mMouseCaptorName; - std::string mKeyboardFocusName; - std::string mTopCtrlName; - #endif }; extern LLFocusMgr gFocusMgr; diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h index 899f6b9326..8ade327044 100644 --- a/indra/llui/llhandle.h +++ b/indra/llui/llhandle.h @@ -67,6 +67,13 @@ public: return *this; } + template<typename Subclass> + LLHandle<T>& operator =(const LLHandle<Subclass>& other) + { + mTombStone = other.mTombStone; + return *this; + } + bool isDead() const { return mTombStone->getTarget() == NULL; diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index ede32084d0..75342afbe2 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -218,6 +218,86 @@ void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type, llassert(0); } } +LLKeywords::WStringMapIndex::WStringMapIndex(const WStringMapIndex& other) +{ + if(other.mOwner) + { + copyData(other.mData, other.mLength); + } + else + { + mOwner = false; + mLength = other.mLength; + mData = other.mData; + } +} + +LLKeywords::WStringMapIndex::WStringMapIndex(const LLWString& str) +{ + copyData(str.data(), str.size()); +} + +LLKeywords::WStringMapIndex::WStringMapIndex(const llwchar *start, size_t length): +mData(start), mLength(length), mOwner(false) +{ +} + +LLKeywords::WStringMapIndex::~WStringMapIndex() +{ + if(mOwner) + delete[] mData; +} + +void LLKeywords::WStringMapIndex::copyData(const llwchar *start, size_t length) +{ + llwchar *data = new llwchar[length]; + memcpy((void*)data, (const void*)start, length * sizeof(llwchar)); + + mOwner = true; + mLength = length; + mData = data; +} + +bool LLKeywords::WStringMapIndex::operator<(const LLKeywords::WStringMapIndex &other) const +{ + // NOTE: Since this is only used to organize a std::map, it doesn't matter if it uses correct collate order or not. + // The comparison only needs to strictly order all possible strings, and be stable. + + bool result = false; + const llwchar* self_iter = mData; + const llwchar* self_end = mData + mLength; + const llwchar* other_iter = other.mData; + const llwchar* other_end = other.mData + other.mLength; + + while(true) + { + if(other_iter >= other_end) + { + // We've hit the end of other. + // This covers two cases: other being shorter than self, or the strings being equal. + // In either case, we want to return false. + result = false; + break; + } + else if(self_iter >= self_end) + { + // self is shorter than other. + result = true; + break; + } + else if(*self_iter != *other_iter) + { + // The current character differs. The strings are not equal. + result = *self_iter < *other_iter; + break; + } + + self_iter++; + other_iter++; + } + + return result; +} LLColor3 LLKeywords::readColor( const std::string& s ) { @@ -429,7 +509,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW S32 seg_len = p - cur; if( seg_len > 0 ) { - LLWString word( cur, 0, seg_len ); + WStringMapIndex word( cur, seg_len ); word_token_map_t::iterator map_iter = mWordTokenMap.find(word); if( map_iter != mWordTokenMap.end() ) { diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index 53377869ca..e5b66dfa56 100644 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -92,8 +92,33 @@ public: const std::string& key, const LLColor3& color, const std::string& tool_tip = LLStringUtil::null); - - typedef std::map<LLWString, LLKeywordToken*> word_token_map_t; + + // This class is here as a performance optimization. + // The word token map used to be defined as std::map<LLWString, LLKeywordToken*>. + // This worked, but caused a performance bottleneck due to memory allocation and string copies + // because it's not possible to search such a map without creating an LLWString. + // Using this class as the map index instead allows us to search using segments of an existing + // text run without copying them first, which greatly reduces overhead in LLKeywords::findSegments(). + class WStringMapIndex + { + public: + // copy constructor + WStringMapIndex(const WStringMapIndex& other); + // constructor from a string (copies the string's data into the new object) + WStringMapIndex(const LLWString& str); + // constructor from pointer and length + // NOTE: does NOT copy data, caller must ensure that the lifetime of the pointer exceeds that of the new object! + WStringMapIndex(const llwchar *start, size_t length); + ~WStringMapIndex(); + bool operator<(const WStringMapIndex &other) const; + private: + void copyData(const llwchar *start, size_t length); + const llwchar *mData; + size_t mLength; + bool mOwner; + }; + + typedef std::map<WStringMapIndex, LLKeywordToken*> word_token_map_t; typedef word_token_map_t::const_iterator keyword_iterator_t; keyword_iterator_t begin() const { return mWordTokenMap.begin(); } keyword_iterator_t end() const { return mWordTokenMap.end(); } diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index dc79550eb4..4512091371 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -49,9 +49,11 @@ static LLDefaultChildRegistry::Register<LLLayoutStack> register_layout_stack("la // struct LLLayoutStack::LayoutPanel { - LayoutPanel(LLPanel* panelp, ELayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize) : mPanel(panelp), + LayoutPanel(LLPanel* panelp, ELayoutOrientation orientation, S32 min_width, S32 min_height, S32 max_width, S32 max_height, BOOL auto_resize, BOOL user_resize) : mPanel(panelp), mMinWidth(min_width), mMinHeight(min_height), + mMaxWidth(max_width), + mMaxHeight(max_height), mAutoResize(auto_resize), mUserResize(user_resize), mOrientation(orientation), @@ -112,6 +114,11 @@ struct LLLayoutStack::LayoutPanel LLPanel* mPanel; S32 mMinWidth; S32 mMinHeight; + + // mMaxWidth & mMaxHeight are added to make configurable max width of the nearby chat bar. EXT-5589 + // they are not processed by LLLayoutStack but they can be if necessary + S32 mMaxWidth; + S32 mMaxHeight; BOOL mAutoResize; BOOL mUserResize; BOOL mCollapsed; @@ -261,10 +268,14 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o { const S32 DEFAULT_MIN_WIDTH = 0; const S32 DEFAULT_MIN_HEIGHT = 0; + const S32 DEFAULT_MAX_WIDTH = S32_MAX; + const S32 DEFAULT_MAX_HEIGHT = S32_MAX; const BOOL DEFAULT_AUTO_RESIZE = TRUE; S32 min_width = DEFAULT_MIN_WIDTH; S32 min_height = DEFAULT_MIN_HEIGHT; + S32 max_width = DEFAULT_MAX_WIDTH; + S32 max_height = DEFAULT_MAX_HEIGHT; BOOL auto_resize = DEFAULT_AUTO_RESIZE; LLXMLNodePtr output_child; @@ -281,6 +292,10 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o DEFAULT_MIN_WIDTH, output_child); get_attribute_s32_and_write(child_node, "min_height", &min_height, DEFAULT_MIN_HEIGHT, output_child); + get_attribute_s32_and_write(child_node, "max_width", &max_width, + DEFAULT_MAX_WIDTH, output_child); + get_attribute_s32_and_write(child_node, "max_height", &max_height, + DEFAULT_MAX_HEIGHT, output_child); get_attribute_bool_and_write(child_node, "auto_resize", &auto_resize, DEFAULT_AUTO_RESIZE, output_child); @@ -293,7 +308,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o if (panelp) { panelp->setFollowsNone(); - layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize); + layout_stackp->addPanel(panelp, min_width, min_height, max_width, max_height, auto_resize, user_resize); } } else @@ -309,7 +324,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o if (new_child) { // put child in new embedded panel - layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize); + layout_stackp->addPanel(panelp, min_width, min_height, max_width, max_height, auto_resize, user_resize); // resize panel to contain widget and move widget to be contained in panel panelp->setRect(new_child->getRect()); new_child->setOrigin(0, 0); @@ -359,14 +374,14 @@ S32 LLLayoutStack::getDefaultWidth(S32 cur_width) return cur_width; } -void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate, S32 index) +void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, S32 max_width, S32 max_height, BOOL auto_resize, BOOL user_resize, EAnimate animate, S32 index) { // panel starts off invisible (collapsed) if (animate == ANIMATE) { panel->setVisible(FALSE); } - LayoutPanel* embedded_panel = new LayoutPanel(panel, mOrientation, min_width, min_height, auto_resize, user_resize); + LayoutPanel* embedded_panel = new LayoutPanel(panel, mOrientation, min_width, min_height, max_width, max_height, auto_resize, user_resize); mPanels.insert(mPanels.begin() + llclamp(index, 0, (S32)mPanels.size()), embedded_panel); @@ -437,6 +452,19 @@ bool LLLayoutStack::getPanelMinSize(const std::string& panel_name, S32* min_widt return NULL != panel; } +bool LLLayoutStack::getPanelMaxSize(const std::string& panel_name, S32* max_widthp, S32* max_heightp) +{ + LayoutPanel* panel = findEmbeddedPanelByName(panel_name); + + if (panel) + { + if (max_widthp) *max_widthp = panel->mMaxWidth; + if (max_heightp) *max_heightp = panel->mMaxHeight; + } + + return NULL != panel; +} + static LLFastTimer::DeclareTimer FTM_UPDATE_LAYOUT("Update LayoutStacks"); void LLLayoutStack::updateLayout(BOOL force_resize) { diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index c4f10038f8..e454454fe2 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -74,7 +74,7 @@ public: ANIMATE } EAnimate; - void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX); + void addPanel(LLPanel* panel, S32 min_width, S32 min_height, S32 max_width, S32 max_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX); void removePanel(LLPanel* panel); void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE); S32 getNumPanels() { return mPanels.size(); } @@ -89,6 +89,14 @@ public: * @returns true if specified by panel_name internal panel exists, false otherwise. */ bool getPanelMinSize(const std::string& panel_name, S32* min_widthp, S32* min_heightp); + + /** + * Gets maximal width and/or height of the specified by name panel. + * + * If it is necessary to get only the one dimension pass NULL for another one. + * @returns true if specified by panel_name internal panel exists, false otherwise. + */ + bool getPanelMaxSize(const std::string& panel_name, S32* max_width, S32* max_height); void updateLayout(BOOL force_resize = FALSE); diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index d18abbfb2f..0d56c5ed31 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -657,11 +657,38 @@ LLMenuItemVerticalSeparatorGL::LLMenuItemVerticalSeparatorGL( void ) // Class LLMenuItemTearOffGL //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LLMenuItemTearOffGL::LLMenuItemTearOffGL(const LLMenuItemTearOffGL::Params& p) -: LLMenuItemGL(p), - mParentHandle(p.parent_floater_handle) +: LLMenuItemGL(p) { } +// Returns the first floater ancestor if there is one +LLFloater* LLMenuItemTearOffGL::getParentFloater() +{ + LLView* parent_view = getMenu(); + + while (parent_view) + { + if (dynamic_cast<LLFloater*>(parent_view)) + { + return dynamic_cast<LLFloater*>(parent_view); + } + + bool parent_is_menu = dynamic_cast<LLMenuGL*>(parent_view) && !dynamic_cast<LLMenuBarGL*>(parent_view); + + if (parent_is_menu) + { + // use menu parent + parent_view = dynamic_cast<LLMenuGL*>(parent_view)->getParentMenuItem(); + } + else + { + // just use regular view parent + parent_view = parent_view->getParent(); + } + } + + return NULL; +} void LLMenuItemTearOffGL::onCommit() { @@ -680,7 +707,7 @@ void LLMenuItemTearOffGL::onCommit() getMenu()->needsArrange(); - LLFloater* parent_floater = mParentHandle.get(); + LLFloater* parent_floater = getParentFloater(); LLFloater* tear_off_menu = LLTearOffMenu::create(getMenu()); if (tear_off_menu) @@ -1671,7 +1698,6 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p) mSpilloverMenu(NULL), mJumpKey(p.jump_key), mCreateJumpKeys(p.create_jump_keys), - mParentFloaterHandle(p.parent_floater), mNeedsArrange(FALSE), mShortcutPad(p.shortcut_pad) { @@ -1699,7 +1725,7 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p) void LLMenuGL::initFromParams(const LLMenuGL::Params& p) { LLUICtrl::initFromParams(p); - setCanTearOff(p.can_tear_off, p.parent_floater); + setCanTearOff(p.can_tear_off); } // Destroys the object @@ -1711,12 +1737,11 @@ LLMenuGL::~LLMenuGL( void ) mJumpKeys.clear(); } -void LLMenuGL::setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle ) +void LLMenuGL::setCanTearOff(BOOL tear_off) { if (tear_off && mTearOffItem == NULL) { LLMenuItemTearOffGL::Params p; - p.parent_floater_handle = parent_floater_handle; mTearOffItem = LLUICtrlFactory::create<LLMenuItemTearOffGL>(p); addChildInBack(mTearOffItem); } @@ -2233,7 +2258,6 @@ void LLMenuGL::createSpilloverBranch() LLMenuGL::Params p; p.name("More"); p.label("More"); // *TODO: Translate - p.parent_floater(mParentFloaterHandle); p.bg_color(mBackgroundColor); p.bg_visible(true); p.can_tear_off(false); diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 8441aaadd4..39d1986461 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -355,7 +355,6 @@ class LLMenuGL public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<LLHandle<LLFloater> > parent_floater; Optional<KEY> jump_key; Optional<bool> horizontal_layout, can_tear_off, @@ -430,7 +429,7 @@ public: void setBackgroundColor( const LLUIColor& color ) { mBackgroundColor = color; } const LLUIColor& getBackgroundColor() const { return mBackgroundColor; } void setBackgroundVisible( BOOL b ) { mBgVisible = b; } - void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>()); + void setCanTearOff(BOOL tear_off); // add a separator to this menu virtual BOOL addSeparator(); @@ -553,7 +552,6 @@ private: class LLMenuItemTearOffGL* mTearOffItem; class LLMenuItemBranchGL* mSpilloverBranch; LLMenuGL* mSpilloverMenu; - LLHandle<LLFloater> mParentFloaterHandle; KEY mJumpKey; BOOL mCreateJumpKeys; S32 mShortcutPad; @@ -814,7 +812,6 @@ class LLMenuItemTearOffGL : public LLMenuItemGL public: struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params> { - Optional<LLHandle<LLFloater> > parent_floater_handle; Params() { name = "tear off"; @@ -823,13 +820,12 @@ public: }; LLMenuItemTearOffGL( const Params& ); - + virtual void onCommit(void); virtual void draw(void); virtual U32 getNominalHeight() const; -private: - LLHandle<LLFloater> mParentHandle; + LLFloater* getParentFloater(); }; diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp index 387af05935..6cff68c20b 100644 --- a/indra/llui/llmodaldialog.cpp +++ b/indra/llui/llmodaldialog.cpp @@ -111,7 +111,7 @@ void LLModalDialog::onOpen(const LLSD& key) // This is a modal dialog. It sucks up all mouse and keyboard operations. gFocusMgr.setMouseCapture( this ); - gFocusMgr.setTopCtrl( this ); + LLUI::addPopup(this); setFocus(TRUE); sModalStack.push_front( this ); @@ -153,7 +153,7 @@ void LLModalDialog::setVisible( BOOL visible ) gFocusMgr.setMouseCapture( this ); // The dialog view is a root view - gFocusMgr.setTopCtrl( this ); + LLUI::addPopup(this); setFocus( TRUE ); } else @@ -291,7 +291,7 @@ void LLModalDialog::onAppFocusGained() // This is a modal dialog. It sucks up all mouse and keyboard operations. gFocusMgr.setMouseCapture( instance ); instance->setFocus(TRUE); - gFocusMgr.setTopCtrl( instance ); + LLUI::addPopup(instance); instance->centerOnScreen(); } diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index d963cf4c98..0cd052eefa 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -80,6 +80,8 @@ LLPanel::Params::Params() background_opaque("background_opaque", false), bg_opaque_color("bg_opaque_color"), bg_alpha_color("bg_alpha_color"), + bg_opaque_image_overlay("bg_opaque_image_overlay"), + bg_alpha_image_overlay("bg_alpha_image_overlay"), bg_opaque_image("bg_opaque_image"), bg_alpha_image("bg_alpha_image"), min_width("min_width", 100), @@ -103,6 +105,8 @@ LLPanel::LLPanel(const LLPanel::Params& p) mBgOpaque(p.background_opaque), mBgOpaqueColor(p.bg_opaque_color()), mBgAlphaColor(p.bg_alpha_color()), + mBgOpaqueImageOverlay(p.bg_opaque_image_overlay), + mBgAlphaImageOverlay(p.bg_alpha_image_overlay), mBgOpaqueImage(p.bg_opaque_image()), mBgAlphaImage(p.bg_alpha_image()), mDefaultBtn(NULL), @@ -199,7 +203,7 @@ void LLPanel::draw() // opaque, in-front look if (mBgOpaqueImage.notNull()) { - mBgOpaqueImage->draw( local_rect, UI_VERTEX_COLOR % alpha ); + mBgOpaqueImage->draw( local_rect, mBgOpaqueImageOverlay % alpha ); } else { @@ -212,7 +216,7 @@ void LLPanel::draw() // transparent, in-back look if (mBgAlphaImage.notNull()) { - mBgAlphaImage->draw( local_rect, UI_VERTEX_COLOR % alpha ); + mBgAlphaImage->draw( local_rect, mBgAlphaImageOverlay % alpha ); } else { @@ -481,6 +485,8 @@ void LLPanel::initFromParams(const LLPanel::Params& p) setTransparentColor(p.bg_alpha_color().get()); mBgOpaqueImage = p.bg_opaque_image(); mBgAlphaImage = p.bg_alpha_image(); + mBgOpaqueImageOverlay = p.bg_opaque_image_overlay; + mBgAlphaImageOverlay = p.bg_alpha_image_overlay; } static LLFastTimer::DeclareTimer FTM_PANEL_SETUP("Panel Setup"); diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 4e53fd7ea3..03e3dc0c0e 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -77,7 +77,9 @@ public: background_opaque; Optional<LLUIColor> bg_opaque_color, - bg_alpha_color; + bg_alpha_color, + bg_opaque_image_overlay, + bg_alpha_image_overlay; // opaque image is for "panel in foreground" look Optional<LLUIImage*> bg_opaque_image, bg_alpha_image; @@ -137,6 +139,8 @@ public: const LLColor4& getTransparentColor() const { return mBgAlphaColor; } LLPointer<LLUIImage> getBackgroundImage() const { return mBgOpaqueImage; } LLPointer<LLUIImage> getTransparentImage() const { return mBgAlphaImage; } + LLColor4 getBackgroundImageOverlay() { return mBgOpaqueImageOverlay; } + LLColor4 getTransparentImageOverlay() { return mBgAlphaImageOverlay; } void setBackgroundVisible( BOOL b ) { mBgVisible = b; } BOOL isBackgroundVisible() const { return mBgVisible; } void setBackgroundOpaque(BOOL b) { mBgOpaque = b; } @@ -262,6 +266,8 @@ private: BOOL mBgOpaque; // use opaque color or image LLUIColor mBgOpaqueColor; LLUIColor mBgAlphaColor; + LLUIColor mBgOpaqueImageOverlay; + LLUIColor mBgAlphaImageOverlay; LLPointer<LLUIImage> mBgOpaqueImage; // "panel in front" look LLPointer<LLUIImage> mBgAlphaImage; // "panel in back" look LLViewBorder* mBorder; diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp index 3df09d124a..00214d451c 100644 --- a/indra/llui/llresizehandle.cpp +++ b/indra/llui/llresizehandle.cpp @@ -124,7 +124,7 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) { // Make sure the mouse in still over the application. We don't want to make the parent // so big that we can't see the resize handle any more. - + S32 screen_x; S32 screen_y; localPointToScreen(x, y, &screen_x, &screen_y); @@ -136,9 +136,10 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) if( resizing_view ) { // undock floater when user resize it - if (((LLFloater*)getParent())->isDocked()) + LLFloater* floater_parent = dynamic_cast<LLFloater*>(getParent()); + if (floater_parent && floater_parent->isDocked()) { - ((LLFloater*)getParent())->setDocked(false, false); + floater_parent->setDocked(false, false); } // Resize the parent @@ -146,61 +147,68 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) LLRect scaled_rect = orig_rect; S32 delta_x = screen_x - mDragLastScreenX; S32 delta_y = screen_y - mDragLastScreenY; - - if(delta_x == 0 && delta_y == 0) - return FALSE; - LLCoordGL mouse_dir; // use hysteresis on mouse motion to preserve user intent when mouse stops moving mouse_dir.mX = (screen_x == mLastMouseScreenX) ? mLastMouseDir.mX : screen_x - mLastMouseScreenX; mouse_dir.mY = (screen_y == mLastMouseScreenY) ? mLastMouseDir.mY : screen_y - mLastMouseScreenY; - mLastMouseScreenX = screen_x; mLastMouseScreenY = screen_y; mLastMouseDir = mouse_dir; - S32 new_width = orig_rect.getWidth(); - S32 new_height = orig_rect.getHeight(); + S32 x_multiple = 1; + S32 y_multiple = 1; + switch( mCorner ) + { + case LEFT_TOP: + x_multiple = -1; + y_multiple = 1; + break; + case LEFT_BOTTOM: + x_multiple = -1; + y_multiple = -1; + break; + case RIGHT_TOP: + x_multiple = 1; + y_multiple = 1; + break; + case RIGHT_BOTTOM: + x_multiple = 1; + y_multiple = -1; + break; + } - S32 new_pos_x = orig_rect.mLeft; - S32 new_pos_y = orig_rect.mTop; + S32 new_width = orig_rect.getWidth() + x_multiple * delta_x; + if( new_width < mMinWidth ) + { + new_width = mMinWidth; + delta_x = x_multiple * (mMinWidth - orig_rect.getWidth()); + } + + S32 new_height = orig_rect.getHeight() + y_multiple * delta_y; + if( new_height < mMinHeight ) + { + new_height = mMinHeight; + delta_y = y_multiple * (mMinHeight - orig_rect.getHeight()); + } switch( mCorner ) { - case LEFT_TOP: - new_width-=delta_x; - new_height+=delta_y; - new_pos_x+=delta_x; - new_pos_y+=delta_y; + case LEFT_TOP: + scaled_rect.translate(delta_x, 0); break; case LEFT_BOTTOM: - new_width-=delta_x; - new_height-=delta_y; - new_pos_x+=delta_x; + scaled_rect.translate(delta_x, delta_y); break; case RIGHT_TOP: - new_width+=delta_x; - new_height+=delta_y; - new_pos_y+=delta_y; break; case RIGHT_BOTTOM: - new_width+=delta_x; - new_height-=delta_y; + scaled_rect.translate(0, delta_y); break; } - new_width = llmax(new_width,mMinWidth); - new_height = llmax(new_height,mMinHeight); - - LLRect::tCoordType screen_width = resizing_view->getParent()->getSnapRect().getWidth(); - LLRect::tCoordType screen_height = resizing_view->getParent()->getSnapRect().getHeight(); - - new_width = llmin(new_width, screen_width); - new_height = llmin(new_height, screen_height); - // temporarily set new parent rect - scaled_rect.setLeftTopAndSize(new_pos_x,new_pos_y,new_width,new_height); - + scaled_rect.mRight = scaled_rect.mLeft + new_width; + scaled_rect.mTop = scaled_rect.mBottom + new_height; resizing_view->setRect(scaled_rect); LLView* snap_view = NULL; @@ -251,11 +259,7 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) resizing_view->setRect(orig_rect); // translate and scale to new shape - resizing_view->reshape(scaled_rect.getWidth(),scaled_rect.getHeight()); - resizing_view->setRect(scaled_rect); - //set shape to handle dependent floaters... - resizing_view->handleReshape(scaled_rect, false); - + resizing_view->setShape(scaled_rect, true); // update last valid mouse cursor position based on resized view's actual size LLRect new_rect = resizing_view->getRect(); diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index 3cc92baa8d..d17be8b94a 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -185,6 +185,8 @@ LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p) { sCount++; + mTextWidth = getWidth(); + // initialize rounded rect image if (!mRoundedRectImage) { @@ -340,7 +342,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col 0, LLFontGL::NO_SHADOW, string_chars, - getWidth(), + getTextWidth(), &right_x, TRUE); } diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h index 5fecf5aade..b1c8901fc4 100644 --- a/indra/llui/llscrolllistcell.h +++ b/indra/llui/llscrolllistcell.h @@ -151,11 +151,16 @@ public: /*virtual*/ const std::string & getToolTip() const; /*virtual*/ BOOL needsToolTip() const; + S32 getTextWidth() const { return mTextWidth;} + void setTextWidth(S32 value) { mTextWidth = value;} + virtual void setWidth(S32 width) { LLScrollListCell::setWidth(width); mTextWidth = width; } + void setText(const LLStringExplicit& text); void setFontStyle(const U8 font_style); private: LLUIString mText; + S32 mTextWidth; const LLFontGL* mFont; LLColor4 mColor; U8 mUseColor; diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 478e270c98..18ec5b51dd 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -71,8 +71,9 @@ static LLDefaultChildRegistry::Register<LLScrollListCtrl> r("scroll_list"); // local structures & classes. struct SortScrollListItem { - SortScrollListItem(const std::vector<std::pair<S32, BOOL> >& sort_orders) + SortScrollListItem(const std::vector<std::pair<S32, BOOL> >& sort_orders,const LLScrollListCtrl::sort_signal_t* sort_signal) : mSortOrders(sort_orders) + , mSortSignal(sort_signal) {} bool operator()(const LLScrollListItem* i1, const LLScrollListItem* i2) @@ -85,12 +86,20 @@ struct SortScrollListItem S32 col_idx = it->first; BOOL sort_ascending = it->second; + S32 order = sort_ascending ? 1 : -1; // ascending or descending sort for this column? + const LLScrollListCell *cell1 = i1->getColumn(col_idx); const LLScrollListCell *cell2 = i2->getColumn(col_idx); - S32 order = sort_ascending ? 1 : -1; // ascending or descending sort for this column? if (cell1 && cell2) { - sort_result = order * LLStringUtil::compareDict(cell1->getValue().asString(), cell2->getValue().asString()); + if(mSortSignal) + { + sort_result = order * (*mSortSignal)(col_idx,i1, i2); + } + else + { + sort_result = order * LLStringUtil::compareDict(cell1->getValue().asString(), cell2->getValue().asString()); + } if (sort_result != 0) { break; // we have a sort order! @@ -100,8 +109,10 @@ struct SortScrollListItem return sort_result < 0; } + typedef std::vector<std::pair<S32, BOOL> > sort_order_t; + const LLScrollListCtrl::sort_signal_t* mSortSignal; const sort_order_t& mSortOrders; }; @@ -169,6 +180,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) mOnSortChangedCallback( NULL ), mHighlightedItem(-1), mBorder(NULL), + mSortCallback(NULL), mPopupMenu(NULL), mNumDynamicWidthColumns(0), mTotalStaticColumnWidth(0), @@ -309,6 +321,8 @@ bool LLScrollListCtrl::preProcessChildNode(LLXMLNodePtr child) LLScrollListCtrl::~LLScrollListCtrl() { + delete mSortCallback; + std::for_each(mItemList.begin(), mItemList.end(), DeletePointer()); if( gEditMenuHandler == this ) @@ -540,7 +554,7 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r std::stable_sort( mItemList.begin(), mItemList.end(), - SortScrollListItem(single_sort_column)); + SortScrollListItem(single_sort_column,mSortCallback)); // ADD_SORTED just sorts by first column... // this might not match user sort criteria, so flag list as being in unsorted state @@ -616,7 +630,9 @@ void LLScrollListCtrl::calcColumnWidths() LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex); if (!cellp) continue; - column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth); + // get text value width only for text cells + column->mMaxContentWidth = cellp->isText() ? + llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth) : column->mMaxContentWidth; } max_item_width += column->mMaxContentWidth; @@ -1388,6 +1404,8 @@ void LLScrollListCtrl::drawItems() LLGLSUIDefault gls_ui; + F32 alpha = getDrawContext().mAlpha; + { LLLocalClipRect clip(mItemListRect); @@ -1463,7 +1481,7 @@ void LLScrollListCtrl::drawItems() bg_color = mBgReadOnlyColor.get(); } - item->draw(item_rect, fg_color, bg_color, highlight_color, mColumnPadding); + item->draw(item_rect, fg_color % alpha, bg_color% alpha, highlight_color % alpha, mColumnPadding); cur_y -= mLineHeight; } @@ -2393,7 +2411,7 @@ void LLScrollListCtrl::updateSort() const std::stable_sort( mItemList.begin(), mItemList.end(), - SortScrollListItem(mSortColumns)); + SortScrollListItem(mSortColumns,mSortCallback)); mSorted = true; } @@ -2409,7 +2427,7 @@ void LLScrollListCtrl::sortOnce(S32 column, BOOL ascending) std::stable_sort( mItemList.begin(), mItemList.end(), - SortScrollListItem(sort_column)); + SortScrollListItem(sort_column,mSortCallback)); } void LLScrollListCtrl::dirtyColumns() diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index d2d2379328..ebdc82115f 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -73,6 +73,30 @@ public: // *TODO: Add callbacks to Params typedef boost::function<void (void)> callback_t; + + template<typename T> struct maximum + { + typedef T result_type; + + template<typename InputIterator> + T operator()(InputIterator first, InputIterator last) const + { + // If there are no slots to call, just return the + // default-constructed value + if(first == last ) return T(); + T max_value = *first++; + while (first != last) { + if (max_value < *first) + max_value = *first; + ++first; + } + + return max_value; + } + }; + + + typedef boost::signals2::signal<S32 (S32,const LLScrollListItem*,const LLScrollListItem*),maximum<S32> > sort_signal_t; struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { @@ -195,7 +219,10 @@ public: void deselectAllItems(BOOL no_commit_on_change = FALSE); // by default, go ahead and commit on selection change void clearHighlightedItems(); - void mouseOverHighlightNthItem( S32 index ); + + virtual void mouseOverHighlightNthItem( S32 index ); + + S32 getHighlightedItemInx() const { return mHighlightedItem; } void setDoubleClickCallback( callback_t cb ) { mOnDoubleClickCallback = cb; } void setMaximumSelectCallback( callback_t cb) { mOnMaximumSelectCallback = cb; } @@ -362,6 +389,13 @@ public: void setNeedsSort(bool val = true) { mSorted = !val; } void dirtyColumns(); // some operation has potentially affected column layout or ordering + boost::signals2::connection setSortCallback(sort_signal_t::slot_type cb ) + { + if (!mSortCallback) mSortCallback = new sort_signal_t(); + return mSortCallback->connect(cb); + } + + protected: // "Full" interface: use this when you're creating a list that has one or more of the following: // * contains icons @@ -474,6 +508,8 @@ private: typedef std::pair<S32, BOOL> sort_column_t; std::vector<sort_column_t> mSortColumns; + + sort_signal_t* mSortCallback; }; // end class LLScrollListCtrl #endif // LL_SCROLLLISTCTRL_H diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index 491eeeab54..ec2ad5e5fa 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -44,17 +44,28 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p) S32 srch_btn_top = p.search_button.top_pad + p.search_button.rect.height; S32 srch_btn_right = p.search_button.rect.width + p.search_button.left_pad; LLRect srch_btn_rect(p.search_button.left_pad, srch_btn_top, srch_btn_right, p.search_button.top_pad); + + S32 clr_btn_top = p.clear_button.rect.bottom + p.clear_button.rect.height; + S32 clr_btn_right = getRect().getWidth() - p.clear_button.pad_right; + S32 clr_btn_left = clr_btn_right - p.clear_button.rect.width; + LLRect clear_btn_rect(clr_btn_left, clr_btn_top, clr_btn_right, p.clear_button.rect.bottom); + S32 text_pad_left = p.text_pad_left; + S32 text_pad_right = p.text_pad_right; if (p.search_button_visible) text_pad_left += srch_btn_rect.getWidth(); + if (p.clear_button_visible) + text_pad_right = getRect().getWidth() - clr_btn_left + p.clear_button.pad_left; + // Set up line editor. LLLineEditor::Params line_editor_params(p); line_editor_params.name("filter edit box"); line_editor_params.rect(getLocalRect()); line_editor_params.follows.flags(FOLLOWS_ALL); line_editor_params.text_pad_left(text_pad_left); + line_editor_params.text_pad_right(text_pad_right); line_editor_params.revert_on_esc(false); line_editor_params.commit_callback.function(boost::bind(&LLUICtrl::onCommit, this)); line_editor_params.keystroke_callback(boost::bind(&LLSearchEditor::handleKeystroke, this)); @@ -82,10 +93,6 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p) // Set up clear button. LLButton::Params clr_btn_params(p.clear_button); clr_btn_params.name(std::string("clear button")); - S32 clr_btn_top = clr_btn_params.rect.bottom + clr_btn_params.rect.height; - S32 clr_btn_right = getRect().getWidth() - clr_btn_params.pad_right; - S32 clr_btn_left = clr_btn_right - clr_btn_params.rect.width; - LLRect clear_btn_rect(clr_btn_left, clr_btn_top, clr_btn_right, p.clear_button.rect.bottom); clr_btn_params.rect(clear_btn_rect) ; clr_btn_params.follows.flags(FOLLOWS_RIGHT|FOLLOWS_TOP); clr_btn_params.tab_stop(false); @@ -156,7 +163,7 @@ void LLSearchEditor::setFocus( BOOL b ) void LLSearchEditor::onClearButtonClick(const LLSD& data) { setText(LLStringUtil::null); - mSearchEditor->doDelete(); // force keystroke callback + mSearchEditor->onCommit(); // force keystroke callback } void LLSearchEditor::handleKeystroke() diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index e810b6fe8f..30fc7babae 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -172,6 +172,10 @@ public: } } + LLIconCtrl* getIconCtrl() const + { + return mIcon; + } private: LLIconCtrl* mIcon; @@ -214,7 +218,8 @@ LLTabContainer::Params::Params() last_tab("last_tab"), use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), - use_ellipses("use_ellipses") + use_ellipses("use_ellipses"), + font_halign("halign") { name(std::string("tab_container")); mouse_opaque = false; @@ -492,15 +497,15 @@ void LLTabContainer::draw() if( mIsVertical && has_scroll_arrows ) { // Redraw the arrows so that they appears on top. - gGL.pushMatrix(); - gGL.translatef((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f); + gGL.pushUIMatrix(); + gGL.translateUI((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f); mPrevArrowBtn->draw(); - gGL.popMatrix(); + gGL.popUIMatrix(); - gGL.pushMatrix(); - gGL.translatef((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f); + gGL.pushUIMatrix(); + gGL.translateUI((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f); mNextArrowBtn->draw(); - gGL.popMatrix(); + gGL.popUIMatrix(); } } @@ -950,7 +955,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) LLRect tab_panel_rect; if (!getTabsHidden() && mIsVertical) { - tab_panel_rect = LLRect(mMinTabWidth + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad, + tab_panel_rect = LLRect(mMinTabWidth + mRightTabBtnOffset + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad, getRect().getHeight() - LLPANEL_BORDER_WIDTH, getRect().getWidth() - LLPANEL_BORDER_WIDTH, LLPANEL_BORDER_WIDTH); @@ -1628,6 +1633,7 @@ void LLTabContainer::setTabImage(LLPanel* child, LLIconCtrl* icon) if(button) { button->setIcon(icon); + reshapeTuple(tuple); } } } @@ -1638,12 +1644,22 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple) if (!mIsVertical) { + S32 image_overlay_width = 0; + + if(mCustomIconCtrlUsed) + { + LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton); + LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL; + image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0; + } + else + { + image_overlay_width = tuple->mButton->getImageOverlay().notNull() ? + tuple->mButton->getImageOverlay()->getImage()->getWidth(0) : 0; + } // remove current width from total tab strip width mTotalTabWidth -= tuple->mButton->getRect().getWidth(); - S32 image_overlay_width = tuple->mButton->getImageOverlay().notNull() ? - tuple->mButton->getImageOverlay()->getImage()->getWidth(0) : 0; - tuple->mPadding = image_overlay_width; tuple->mButton->reshape(llclamp(mFont->getWidth(tuple->mButton->getLabelSelected()) + tab_padding + tuple->mPadding, mMinTabWidth, mMaxTabWidth), diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index b84e6f45fb..851fb966ec 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1445,10 +1445,10 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i } // Finds the text segment (if any) at the give local screen position -LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y ) +LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line) { // Find the cursor position at the requested local screen position - S32 offset = getDocIndexFromLocalCoord( x, y, FALSE ); + S32 offset = getDocIndexFromLocalCoord( x, y, FALSE, hit_past_end_of_line); segment_set_t::iterator seg_iter = getSegIterContaining(offset); if (seg_iter != mSegments.end()) { @@ -1788,7 +1788,7 @@ const LLWString& LLTextBase::getWText() const // will be put to its right. If round is false, the cursor will always be put to the // character's left. -S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const +S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line) const { // Figure out which line we're nearest to. LLRect visible_region = getVisibleDocumentRect(); @@ -1817,7 +1817,7 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round S32 text_width, text_height; segmentp->getDimensions(line_seg_offset, segment_line_length, text_width, text_height); if (local_x < start_x + text_width // cursor to left of right edge of text - || segmentp->getEnd() >= line_iter->mDocIndexEnd - 1) // or this segment wraps to next line + || (hit_past_end_of_line && (segmentp->getEnd() >= line_iter->mDocIndexEnd - 1))) // or this segment wraps to next line { // Figure out which character we're nearest to. S32 offset; @@ -2402,8 +2402,12 @@ BOOL LLNormalTextSegment::handleHover(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - LLUI::getWindow()->setCursor(UI_CURSOR_HAND); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + LLUI::getWindow()->setCursor(UI_CURSOR_HAND); + return TRUE; + } } return FALSE; } @@ -2412,8 +2416,12 @@ BOOL LLNormalTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF()); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF()); + return TRUE; + } } return FALSE; } @@ -2422,8 +2430,12 @@ BOOL LLNormalTextSegment::handleMouseDown(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - // eat mouse down event on hyperlinks, so we get the mouse up - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + // eat mouse down event on hyperlinks, so we get the mouse up + return TRUE; + } } return FALSE; @@ -2433,8 +2445,12 @@ BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - LLUrlAction::clickAction(getStyle()->getLinkHREF()); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + LLUrlAction::clickAction(getStyle()->getLinkHREF()); + return TRUE; + } } return FALSE; diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 3dda6f4cc8..5b24c63557 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -48,6 +48,7 @@ class LLContextMenu; class LLTextSegment; +class LLNormalTextSegment; typedef LLPointer<LLTextSegment> LLTextSegmentPtr; @@ -61,6 +62,9 @@ class LLTextBase protected LLEditMenuHandler { public: + friend class LLTextSegment; + friend class LLNormalTextSegment; + struct LineSpacingParams : public LLInitParam::Choice<LineSpacingParams> { Alternative<F32> multiple; @@ -165,7 +169,7 @@ public: S32 getVPad() { return mVPad; } S32 getHPad() { return mHPad; } - S32 getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const; + S32 getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line = true) const; LLRect getLocalRectFromDocIndex(S32 pos) const; LLRect getDocRectFromDocIndex(S32 pos) const; @@ -275,7 +279,7 @@ protected: // manage segments void getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const; void getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp ); - LLTextSegmentPtr getSegmentAtLocalPos( S32 x, S32 y ); + LLTextSegmentPtr getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line = true); segment_set_t::iterator getSegIterContaining(S32 index); segment_set_t::const_iterator getSegIterContaining(S32 index) const; void clearSegments(); diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index ce5f1bd082..7d230f7d42 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2524,9 +2524,9 @@ void LLTextEditor::loadKeywords(const std::string& filename, void LLTextEditor::updateSegments() { - LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING); - if (mKeywords.isLoaded()) + if (mReflowIndex < S32_MAX && mKeywords.isLoaded()) { + LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING); // HACK: No non-ascii keywords for now segment_vec_t segment_list; mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this); diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 173fde8e76..ed7fd02e14 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -129,12 +129,6 @@ BOOL LLToolTipView::handleScrollWheel( S32 x, S32 y, S32 clicks ) return FALSE; } -void LLToolTipView::onMouseLeave(S32 x, S32 y, MASK mask) -{ - LLToolTipMgr::instance().blockToolTips(); -} - - void LLToolTipView::drawStickyRect() { gl_rect_2d(LLToolTipMgr::instance().getMouseNearRect(), LLColor4::white, false); diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h index c0811c56c3..24e32b9b24 100644 --- a/indra/llui/lltooltip.h +++ b/indra/llui/lltooltip.h @@ -56,8 +56,6 @@ public: /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); - /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); - void drawStickyRect(); /*virtual*/ void draw(); diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 76f07373b4..5121ef5351 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -39,6 +39,7 @@ // Linden library includes #include "v2math.h" +#include "m3math.h" #include "v4color.h" #include "llrender.h" #include "llrect.h" @@ -85,6 +86,9 @@ std::list<std::string> gUntranslated; /*static*/ LLHelp* LLUI::sHelpImpl = NULL; /*static*/ std::vector<std::string> LLUI::sXUIPaths; /*static*/ LLFrameTimer LLUI::sMouseIdleTimer; +/*static*/ LLUI::add_popup_t LLUI::sAddPopupFunc; +/*static*/ LLUI::remove_popup_t LLUI::sRemovePopupFunc; +/*static*/ LLUI::clear_popups_t LLUI::sClearPopupsFunc; // register filtereditor here static LLDefaultChildRegistry::Register<LLFilterEditor> register_filter_editor("filter_editor"); @@ -180,19 +184,19 @@ void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, const LL void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, S32 pixel_offset, BOOL filled) { - gGL.pushMatrix(); + gGL.pushUIMatrix(); left += LLFontGL::sCurOrigin.mX; right += LLFontGL::sCurOrigin.mX; bottom += LLFontGL::sCurOrigin.mY; top += LLFontGL::sCurOrigin.mY; - glLoadIdentity(); + gGL.loadUIIdentity(); gl_rect_2d(llfloor((F32)left * LLUI::sGLScaleFactor.mV[VX]) - pixel_offset, llfloor((F32)top * LLUI::sGLScaleFactor.mV[VY]) + pixel_offset, llfloor((F32)right * LLUI::sGLScaleFactor.mV[VX]) + pixel_offset, llfloor((F32)bottom * LLUI::sGLScaleFactor.mV[VY]) - pixel_offset, filled); - gGL.popMatrix(); + gGL.popUIMatrix(); } @@ -508,9 +512,9 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA); } - gGL.pushMatrix(); + gGL.pushUIMatrix(); { - gGL.translatef((F32)x, (F32)y, 0.f); + gGL.translateUI((F32)x, (F32)y, 0.f); gGL.getTexUnit(0)->bind(image); @@ -637,7 +641,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex } gGL.end(); } - gGL.popMatrix(); + gGL.popUIMatrix(); if (solid_color) { @@ -660,39 +664,72 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre LLGLSUIDefault gls_ui; - gGL.pushMatrix(); + + gGL.getTexUnit(0)->bind(image); + + gGL.color4fv(color.mV); + + if (degrees == 0.f) { - gGL.translatef((F32)x, (F32)y, 0.f); - if( degrees ) + gGL.pushUIMatrix(); + gGL.translateUI((F32)x, (F32)y, 0.f); + + gGL.begin(LLRender::QUADS); { - F32 offset_x = F32(width/2); - F32 offset_y = F32(height/2); - gGL.translatef( offset_x, offset_y, 0.f); - glRotatef( degrees, 0.f, 0.f, 1.f ); - gGL.translatef( -offset_x, -offset_y, 0.f ); + gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop); + gGL.vertex2i(width, height ); + + gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop); + gGL.vertex2i(0, height ); + + gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom); + gGL.vertex2i(0, 0); + + gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom); + gGL.vertex2i(width, 0); } + gGL.end(); + gGL.popUIMatrix(); + } + else + { + gGL.pushUIMatrix(); + gGL.translateUI((F32)x, (F32)y, 0.f); + + F32 offset_x = F32(width/2); + F32 offset_y = F32(height/2); + + gGL.translateUI(offset_x, offset_y, 0.f); + LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD); + gGL.getTexUnit(0)->bind(image); gGL.color4fv(color.mV); gGL.begin(LLRender::QUADS); { + LLVector3 v; + + v = LLVector3(offset_x, offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop); - gGL.vertex2i(width, height ); + gGL.vertex2f(v.mV[0], v.mV[1] ); + v = LLVector3(-offset_x, offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop); - gGL.vertex2i(0, height ); + gGL.vertex2f(v.mV[0], v.mV[1] ); + v = LLVector3(-offset_x, -offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom); - gGL.vertex2i(0, 0); + gGL.vertex2f(v.mV[0], v.mV[1] ); + v = LLVector3(offset_x, -offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom); - gGL.vertex2i(width, 0); + gGL.vertex2f(v.mV[0], v.mV[1] ); } gGL.end(); + gGL.popUIMatrix(); } - gGL.popMatrix(); } @@ -747,9 +784,9 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F end_angle += F_TWO_PI; } - gGL.pushMatrix(); + gGL.pushUIMatrix(); { - gGL.translatef(center_x, center_y, 0.f); + gGL.translateUI(center_x, center_y, 0.f); // Inexact, but reasonably fast. F32 delta = (end_angle - start_angle) / steps; @@ -780,15 +817,15 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F } gGL.end(); } - gGL.popMatrix(); + gGL.popUIMatrix(); } void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled) { - gGL.pushMatrix(); + gGL.pushUIMatrix(); { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gGL.translatef(center_x, center_y, 0.f); + gGL.translateUI(center_x, center_y, 0.f); // Inexact, but reasonably fast. F32 delta = F_TWO_PI / steps; @@ -819,7 +856,7 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled } gGL.end(); } - gGL.popMatrix(); + gGL.popUIMatrix(); } // Renders a ring with sides (tube shape) @@ -846,9 +883,9 @@ void gl_deep_circle( F32 radius, F32 depth, S32 steps ) void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor4& side_color, S32 steps, BOOL render_center ) { - gGL.pushMatrix(); + gGL.pushUIMatrix(); { - gGL.translatef(0.f, 0.f, -width / 2); + gGL.translateUI(0.f, 0.f, -width / 2); if( render_center ) { gGL.color4fv(center_color.mV); @@ -857,11 +894,11 @@ void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor else { gl_washer_2d(radius, radius - width, steps, side_color, side_color); - gGL.translatef(0.f, 0.f, width); + gGL.translateUI(0.f, 0.f, width); gl_washer_2d(radius - width, radius, steps, side_color, side_color); } } - gGL.popMatrix(); + gGL.popUIMatrix(); } // Draw gray and white checkerboard with black border @@ -1050,9 +1087,9 @@ void gl_segmented_rect_2d_tex(const S32 left, S32 width = llabs(right - left); S32 height = llabs(top - bottom); - gGL.pushMatrix(); + gGL.pushUIMatrix(); - gGL.translatef((F32)left, (F32)bottom, 0.f); + gGL.translateUI((F32)left, (F32)bottom, 0.f); LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height); if (border_uv_scale.mV[VX] > 0.5f) @@ -1193,7 +1230,7 @@ void gl_segmented_rect_2d_tex(const S32 left, } gGL.end(); - gGL.popMatrix(); + gGL.popUIMatrix(); } void gl_segmented_rect_2d_fragment_tex(const S32 left, @@ -1210,9 +1247,9 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left, S32 width = llabs(right - left); S32 height = llabs(top - bottom); - gGL.pushMatrix(); + gGL.pushUIMatrix(); - gGL.translatef((F32)left, (F32)bottom, 0.f); + gGL.translateUI((F32)left, (F32)bottom, 0.f); LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height); if (border_uv_scale.mV[VX] > 0.5f) @@ -1383,7 +1420,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left, } gGL.end(); - gGL.popMatrix(); + gGL.popUIMatrix(); } void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& border_width, @@ -1573,6 +1610,13 @@ void LLUI::cleanupClass() sImageProvider->cleanUp(); } +void LLUI::setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t& remove_popup, const clear_popups_t& clear_popups) +{ + sAddPopupFunc = add_popup; + sRemovePopupFunc = remove_popup; + sClearPopupsFunc = clear_popups; +} + //static void LLUI::dirtyRect(LLRect rect) { @@ -1591,7 +1635,7 @@ void LLUI::dirtyRect(LLRect rect) //static void LLUI::translate(F32 x, F32 y, F32 z) { - gGL.translatef(x,y,z); + gGL.translateUI(x,y,z); LLFontGL::sCurOrigin.mX += (S32) x; LLFontGL::sCurOrigin.mY += (S32) y; LLFontGL::sCurOrigin.mZ += z; @@ -1600,14 +1644,14 @@ void LLUI::translate(F32 x, F32 y, F32 z) //static void LLUI::pushMatrix() { - gGL.pushMatrix(); + gGL.pushUIMatrix(); LLFontGL::sOriginStack.push_back(LLFontGL::sCurOrigin); } //static void LLUI::popMatrix() { - gGL.popMatrix(); + gGL.popUIMatrix(); LLFontGL::sCurOrigin = *LLFontGL::sOriginStack.rbegin(); LLFontGL::sOriginStack.pop_back(); } @@ -1615,7 +1659,7 @@ void LLUI::popMatrix() //static void LLUI::loadIdentity() { - glLoadIdentity(); + gGL.loadUIIdentity(); LLFontGL::sCurOrigin.mX = 0; LLFontGL::sCurOrigin.mY = 0; LLFontGL::sCurOrigin.mZ = 0; @@ -1843,6 +1887,34 @@ LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname) return *sSettingGroups["config"]; // default group } +//static +void LLUI::addPopup(LLView* viewp) +{ + if (sAddPopupFunc) + { + sAddPopupFunc(viewp); + } +} + +//static +void LLUI::removePopup(LLView* viewp) +{ + if (sRemovePopupFunc) + { + sRemovePopupFunc(viewp); + } +} + +//static +void LLUI::clearPopups() +{ + if (sClearPopupsFunc) + { + sClearPopupsFunc(); + } +} + + //static // spawn_x and spawn_y are top left corner of view in screen GL coordinates void LLUI::positionViewNearMouse(LLView* view, S32 spawn_x, S32 spawn_y) @@ -1894,7 +1966,9 @@ namespace LLInitParam blue("blue"), alpha("alpha"), control("") - {} + { + setBlockFromValue(); + } void TypedParam<LLUIColor>::setValueFromBlock() const { @@ -1939,7 +2013,9 @@ namespace LLInitParam size("size"), style("style") { + setBlockFromValue(); addSynonym(name, ""); + setBlockFromValue(); } void TypedParam<const LLFontGL*>::setValueFromBlock() const @@ -1979,7 +2055,9 @@ namespace LLInitParam bottom("bottom"), width("width"), height("height") - {} + { + setBlockFromValue(); + } void TypedParam<LLRect>::setValueFromBlock() const { @@ -2064,6 +2142,7 @@ namespace LLInitParam x("x"), y("y") { + setBlockFromValue(); } void TypedParam<LLCoordGL>::setValueFromBlock() const diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 5840e76f5c..30f3623ded 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -160,12 +160,17 @@ public: // Methods // typedef std::map<std::string, LLControlGroup*> settings_map_t; + typedef boost::function<void(LLView*)> add_popup_t; + typedef boost::function<void(LLView*)> remove_popup_t; + typedef boost::function<void(void)> clear_popups_t; + static void initClass(const settings_map_t& settings, LLImageProviderInterface* image_provider, LLUIAudioCallback audio_callback = NULL, const LLVector2 *scale_factor = NULL, const std::string& language = LLStringUtil::null); static void cleanupClass(); + static void setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t&, const clear_popups_t& ); static void pushMatrix(); static void popMatrix(); @@ -208,6 +213,10 @@ public: static void resetMouseIdleTimer() { sMouseIdleTimer.reset(); } static LLWindow* getWindow() { return sWindow; } + static void addPopup(LLView*); + static void removePopup(LLView*); + static void clearPopups(); + // Ensures view does not overlap mouse cursor, but is inside // the view's parent rectangle. Used for tooltips, inspectors. // Optionally override the view's default X/Y, which are relative to the @@ -227,6 +236,9 @@ private: static LLImageProviderInterface* sImageProvider; static std::vector<std::string> sXUIPaths; static LLFrameTimer sMouseIdleTimer; + static add_popup_t sAddPopupFunc; + static remove_popup_t sRemovePopupFunc; + static clear_popups_t sClearPopupsFunc; }; @@ -426,8 +438,8 @@ namespace LLInitParam { typedef BlockValue<const LLFontGL*> super_t; public: - Mandatory<std::string> name; - Optional<std::string> size, + Optional<std::string> name, + size, style; TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count); diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h index bdfc44262d..4ea0738026 100644 --- a/indra/llui/lluiimage.h +++ b/indra/llui/lluiimage.h @@ -109,6 +109,7 @@ namespace LLInitParam TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count) : super_t(descriptor, name, value, func, min_count, max_count) { + setBlockFromValue(); } void setValueFromBlock() const; diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 92b7816bdd..35428e4227 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -34,6 +34,8 @@ #include "linden_common.h" #include "llurlentry.h" #include "lluri.h" +#include "llurlmatch.h" +#include "llurlregistry.h" #include "llcachename.h" #include "lltrans.h" @@ -232,7 +234,7 @@ std::string LLUrlEntryHTTPNoProtocol::getUrl(const std::string &string) const LLUrlEntrySLURL::LLUrlEntrySLURL() { // see http://slurl.com/about.php for details on the SLURL format - mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/\\S+/?(\\d+)?/?(\\d+)?/?(\\d+)?/?\\S*", + mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_slurl.xml"; mTooltip = LLTrans::getString("TooltipSLURL"); @@ -287,7 +289,7 @@ std::string LLUrlEntrySLURL::getLabel(const std::string &url, const LLUrlLabelCa std::string LLUrlEntrySLURL::getLocation(const std::string &url) const { // return the part of the Url after slurl.com/secondlife/ - const std::string search_string = "secondlife"; + const std::string search_string = "/secondlife"; size_t pos = url.find(search_string); if (pos == std::string::npos) { @@ -308,6 +310,7 @@ LLUrlEntryAgent::LLUrlEntryAgent() boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_agent.xml"; mIcon = "Generic_Person"; + mTooltip = LLTrans::getString("TooltipAgentUrl"); mColor = LLUIColorTable::instance().getColor("AgentLinkColor"); } @@ -602,6 +605,20 @@ std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const return getUrlFromWikiLink(string); } +std::string LLUrlEntrySLLabel::getTooltip(const std::string &string) const +{ + // return a tooltip corresponding to the URL type instead of the generic one (EXT-4574) + std::string url = getUrl(string); + LLUrlMatch match; + if (LLUrlRegistry::instance().findUrl(url, match)) + { + return match.getTooltip(); + } + + // unrecognized URL? should not happen + return LLUrlEntryBase::getTooltip(string); +} + // // LLUrlEntryWorldMap Describes secondlife:///<location> URLs // diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 3abada0f24..c947ef7259 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -83,7 +83,7 @@ public: LLUIColor getColor() const { return mColor; } /// Given a matched Url, return a tooltip string for the hyperlink - std::string getTooltip() const { return mTooltip; } + virtual std::string getTooltip(const std::string &string) const { return mTooltip; } /// Return the name of a XUI file containing the context menu items std::string getMenuName() const { return mMenuName; } @@ -257,6 +257,7 @@ public: LLUrlEntrySLLabel(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); /*virtual*/ std::string getUrl(const std::string &string) const; + /*virtual*/ std::string getTooltip(const std::string &string) const; }; /// diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 722dbe41b3..faa02e1904 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -174,7 +174,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match.setValues(match_start, match_end, match_entry->getUrl(url), match_entry->getLabel(url, cb), - match_entry->getTooltip(), + match_entry->getTooltip(url), match_entry->getIcon(), match_entry->getColor(), match_entry->getMenuName(), diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 63e627ceb5..d34083a384 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -73,9 +73,9 @@ S32 LLView::sLastBottomXML = S32_MIN; std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack; -#if LL_DEBUG +//#if LL_DEBUG BOOL LLView::sIsDrawing = FALSE; -#endif +//#endif // Compiler optimization, generate extern template template class LLView* LLView::getChild<class LLView>( @@ -150,6 +150,10 @@ LLView::~LLView() { dirtyRect(); //llinfos << "Deleting view " << mName << ":" << (void*) this << llendl; + if (LLView::sIsDrawing) + { + llwarns << "Deleting view " << mName << " during UI draw() phase" << llendl; + } // llassert(LLView::sIsDrawing == FALSE); // llassert_always(sDepth == 0); // avoid deleting views while drawing! It can subtly break list iterators @@ -592,11 +596,6 @@ void LLView::setVisible(BOOL visible) { if ( mVisible != visible ) { - if( !visible && (gFocusMgr.getTopCtrl() == this) ) - { - gFocusMgr.setTopCtrl( NULL ); - } - mVisible = visible; // notify children of visibility change if root, or part of visible hierarchy diff --git a/indra/llui/llview.h b/indra/llui/llview.h index c4d7313743..efae00f0e5 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -171,9 +171,9 @@ private: // widgets in general are not copyable LLView(const LLView& other) {}; public: -#if LL_DEBUG +//#if LL_DEBUG static BOOL sIsDrawing; -#endif +//#endif enum ESoundFlags { SILENT = 0, diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp index 30717f87de..bd9c43c97f 100644 --- a/indra/llui/llviewborder.cpp +++ b/indra/llui/llviewborder.cpp @@ -125,14 +125,6 @@ void LLViewBorder::draw() llassert( FALSE ); // not implemented } } - else - if( STYLE_TEXTURE == mStyle ) - { - if( mTexture ) - { - drawTextures(); - } - } LLView::draw(); } @@ -255,56 +247,6 @@ void LLViewBorder::drawTwoPixelLines() gl_line_2d(left+1, bottom+1, right-1, bottom+1); } -void LLViewBorder::drawTextures() -{ - //LLGLSUIDefault gls_ui; - - //llassert( FALSE ); // TODO: finish implementing - - //gGL.color4fv(UI_VERTEX_COLOR.mV); - - //gGL.getTexUnit(0)->bind(mTexture); - //gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP); - - //drawTextureTrapezoid( 0.f, mBorderWidth, getRect().getWidth(), 0, 0 ); - //drawTextureTrapezoid( 90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 ); - //drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(), (F32)getRect().getWidth(),(F32)getRect().getHeight() ); - //drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0, (F32)getRect().getHeight() ); -} - - -void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y ) -{ - gGL.pushMatrix(); - { - gGL.translatef(start_x, start_y, 0.f); - glRotatef( degrees, 0, 0, 1 ); - - gGL.begin(LLRender::QUADS); - { - // width, width /---------\ length-width, width // - // / \ // - // / \ // - // /---------------\ // - // 0,0 length, 0 // - - gGL.texCoord2f( 0, 0 ); - gGL.vertex2i( 0, 0 ); - - gGL.texCoord2f( (GLfloat)length, 0 ); - gGL.vertex2i( length, 0 ); - - gGL.texCoord2f( (GLfloat)(length - width), (GLfloat)width ); - gGL.vertex2i( length - width, width ); - - gGL.texCoord2f( (GLfloat)width, (GLfloat)width ); - gGL.vertex2i( width, width ); - } - gGL.end(); - } - gGL.popMatrix(); -} - BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style) { if (node->hasAttribute("bevel_style")) diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h index 92fd569325..342e84fd93 100644 --- a/indra/llui/llviewborder.h +++ b/indra/llui/llviewborder.h @@ -99,8 +99,7 @@ private: void drawOnePixelLines(); void drawTwoPixelLines(); void drawTextures(); - void drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y ); - + EBevel mBevel; EStyle mStyle; LLUIColor mHighlightLight; diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 1c6c9e6e9d..b77deb003f 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -407,3 +407,30 @@ BOOL LLWindowManager::isWindowValid(LLWindow *window) { return sWindowList.find(window) != sWindowList.end(); } + +S32 LLDisplayInfo::getDisplayWidth() const +{ +#if LL_WINDOWS + return LLWindowWin32::getDisplayWidth(); +#elif LL_DARWIN + return LLWindowMacOSX::getDisplayWidth(); +#elif LL_SDL + return LLWindowSDL::getDisplayWidth(); +#else + return 1024; //*FIXME +#endif +} + +S32 LLDisplayInfo::getDisplayHeight() const +{ +#if LL_WINDOWS + return LLWindowWin32::getDisplayHeight(); +#elif LL_DARWIN + return LLWindowMacOSX::getDisplayHeight(); +#elif LL_SDL + return LLWindowSDL::getDisplayHeight(); +#else + return 768; //*FIXME +#endif +} + diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 55b221e716..b769f5071b 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -281,4 +281,19 @@ extern const std::string gURLProtocolWhitelistHandler[]; void simpleEscapeString ( std::string& stringIn ); +//============================================================================= +// +// CLASS LLDisplayInfo +class LLDisplayInfo + +/*! @brief Class to query the information about some display settings +*/ +{ +public: + LLDisplayInfo(){}; ///< Default constructor + + S32 getDisplayWidth() const; ///< display width + S32 getDisplayHeight() const; ///< display height +}; + #endif // _LL_window_h_ diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index ed5d7b1e74..ed8c874dcb 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -40,4 +40,5 @@ void setupCocoa(); CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); OSErr releaseImageCursor(CursorRef ref); OSErr setImageCursor(CursorRef ref); - +void getScreenSize(int* width, int* height); +void getVisibleScreen(int *x, int *y, int* width, int* height); diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm index 59b25e1726..5cab2619fd 100644 --- a/indra/llwindow/llwindowmacosx-objc.mm +++ b/indra/llwindow/llwindowmacosx-objc.mm @@ -116,3 +116,22 @@ OSErr setImageCursor(CursorRef ref) return noErr; } +void getScreenSize(int* width, int* height) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSRect screen_rect = [[NSScreen mainScreen] frame]; + if (width) *width = (int)(screen_rect.size.width); + if (height) *height = (int)(screen_rect.size.height); + [pool release]; +} + +void getVisibleScreen(int *x, int *y, int* width, int* height) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSRect visible_rect = [[NSScreen mainScreen] visibleFrame]; + if (width) *width = (int)(visible_rect.size.width); + if (height) *height = (int)(visible_rect.size.height); + if (x) *x = (int)(visible_rect.origin.x); + if (y) *y = (int)(visible_rect.origin.y); + [pool release]; +} diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index ad97bc45fc..924acaf148 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1122,7 +1122,33 @@ BOOL LLWindowMacOSX::getMaximized() BOOL LLWindowMacOSX::maximize() { - // TODO + if (mWindow) + { + // *HACK: Because Mac OSX doesn't have a concept of a "maximized" window, we just + // stretch it out to the visible screen size. + Rect win_rect; + + int visible_x; + int visible_y; + int visible_width; + int visible_height; + int screen_width; + int screen_height; + + getScreenSize(&screen_width, &screen_height); + getVisibleScreen(&visible_x, &visible_y, &visible_width, &visible_height); + + int mac_os_menu_bar_height = screen_height - (visible_height + visible_y); + ::SetRect(&win_rect, + visible_x, + mac_os_menu_bar_height, + visible_width + visible_x, + visible_height + mac_os_menu_bar_height); + + ::SetWindowBounds(mWindow, kWindowStructureRgn, &win_rect); + + return TRUE; + } return FALSE; } @@ -3464,6 +3490,26 @@ MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers) return mask; } +// static +S32 LLWindowMacOSX::getDisplayWidth() +{ + S32 width = 1024; + // Need to invoke cocoa before use getScreenSize() + setupCocoa(); + getScreenSize(&width, NULL); + return width; +} + +// static +S32 LLWindowMacOSX::getDisplayHeight() +{ + S32 height = 768; + // Need to invoke cocoa before use getScreenSize() + setupCocoa(); + getScreenSize(NULL, &height); + return height; +} + #if LL_OS_DRAGDROP_ENABLED OSErr LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow, diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 7c6b324029..86036a261c 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -123,6 +123,8 @@ public: // Provide native key event data /*virtual*/ LLSD getNativeKeyData(); + static S32 getDisplayWidth(); + static S32 getDisplayHeight(); protected: LLWindowMacOSX(LLWindowCallbacks* callbacks, diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 7cd06c9c37..cb4e04511c 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -187,6 +187,47 @@ Display* LLWindowSDL::get_SDL_Display(void) } #endif // LL_X11 +// static +S32 LLWindowSDL::getDisplayWidth() +{ +#if LL_GTK + if (LLWindowSDL::ll_try_gtk_init()) + { + return gdk_screen_width(); + } +#endif // LL_GTK + +#if LL_X11 + Display *display = XOpenDisplay(NULL); + int screen_num = DefaultScreen(display); + S32 width = DisplayWidth(display, screen_num); + XCloseDisplay(display); + return width; +#endif //LL_X11 + + return 1024; +} + +// static +S32 LLWindowSDL::getDisplayHeight() +{ +#if LL_GTK + if (LLWindowSDL::ll_try_gtk_init()) + { + return gdk_screen_height(); + } +#endif // LL_GTK + +#if LL_X11 + Display *display = XOpenDisplay(NULL); + int screen_num = DefaultScreen(display); + S32 height = DisplayHeight(display, screen_num); + XCloseDisplay(display); + return height; +#endif //LL_X11 + + return 768; +} LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks, const std::string& title, S32 x, S32 y, S32 width, @@ -909,7 +950,68 @@ BOOL LLWindowSDL::getMaximized() if (mWindow) { - // TODO +#if LL_X11 + if (mSDL_Display) + { + maybe_lock_display(); + + // Return data in the specified format, XA_ATOM. + U8* prop; + // Actual format of the property. + int format; + // Actual number of items stored in the prop return data. + unsigned long nitems; + // Number of bytes remaining to be read in the property if a partial read was performed. + unsigned long bytes_after; + // Atom identifier that defines the actual type of the property. + Atom type; + + // Atom used to obtain list of hints describing the window state. + Atom wm_state = XInternAtom(mSDL_Display, "_NET_WM_STATE", False); + + // Atoms indicates that the window is vertically/horizontally maximized. + Atom max_vert = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_VERT", False); + Atom max_horz = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_HORZ", False); + + // How many atoms in which we interested are present in list of hints. + U32 pass = 0; + + do + { + nitems = 0; + bytes_after = 0; + type = None; + if ( (XGetWindowProperty (mSDL_Display, + mSDL_XWindowID, + wm_state, + 0, UINT_MAX, + False, XA_ATOM, + &type, &format, + &nitems, &bytes_after, + &prop) == Success) + && type != None ) + { + Atom *atoms = (Atom *)prop; + for (unsigned long i=0; i<nitems; ++i) + { + if (atoms[i] == max_horz) + ++pass; + else if (atoms[i] == max_vert) + ++pass; + } + XFree (atoms); + } + else + { + break; + } + } while (bytes_after > 0); + + result = (pass == 2); + + maybe_unlock_display(); + } +#endif // LL_X11 } return(result); @@ -917,7 +1019,103 @@ BOOL LLWindowSDL::getMaximized() BOOL LLWindowSDL::maximize() { - // TODO +#if LL_X11 + if (mSDL_Display && !mFullscreen) + { + maybe_lock_display(); + + BOOL is_maximize_allowed = FALSE; + + // Check if maximize is allowed + { + // Return data in the specified format, XA_ATOM. + U8* prop; + // Actual format of the property. + int format; + // Actual number of items stored in the prop return data. + unsigned long nitems; + // Number of bytes remaining to be read in the property if a partial read was performed. + unsigned long bytes_after; + // Atom identifier that defines the actual type of the property. + Atom type; + + // Atom used to obtain a list of atoms indicating user operations that the Window Manager supports for this window. + Atom allowed_act = XInternAtom(mSDL_Display, "_NET_WM_ALLOWED_ACTIONS", False); + + // Atoms that indicates that the window may be vertically/horizontally maximized. + Atom max_vert_act = XInternAtom(mSDL_Display, "_NET_WM_ACTION_MAXIMIZE_HORZ", False); + Atom max_horz_act = XInternAtom(mSDL_Display, "_NET_WM_ACTION_MAXIMIZE_VERT", False); + + // How many atoms in which we interested are present in list of hints. + U32 pass = 0; + + do + { + nitems = 0; + bytes_after = 0; + type = None; + if ( (XGetWindowProperty (mSDL_Display, + mSDL_XWindowID, + allowed_act, + 0, UINT_MAX, + False, XA_ATOM, + &type, &format, + &nitems, &bytes_after, + &prop) == Success) + && type != None ) + { + Atom *atoms = (Atom *)prop; + for (unsigned long i=0; i<nitems; ++i) + { + if (atoms[i] == max_vert_act) + ++pass; + else if (atoms[i] == max_horz_act) + ++pass; + } + XFree (atoms); + } + else + { + break; + } + } while (bytes_after > 0); + + is_maximize_allowed = (pass == 2); + } + + // Send maximize event to X11 system + if (is_maximize_allowed) + { + XEvent xev; + + // Atom describing the window state. + Atom wm_state = XInternAtom(mSDL_Display, "_NET_WM_STATE", False); + + // Atoms indicates that the window is vertically/horizontally maximized. + Atom max_vert = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_VERT", False); + Atom max_horz = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_HORZ", False); + + memset(&xev, 0, sizeof(xev)); + xev.type = ClientMessage; + xev.xclient.window = mSDL_XWindowID; + xev.xclient.message_type = wm_state; + xev.xclient.format = 32; + xev.xclient.data.l[0] = 1; // add/set property + xev.xclient.data.l[1] = max_vert; + xev.xclient.data.l[2] = max_horz; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + + XSendEvent(mSDL_Display, + DefaultRootWindow(mSDL_Display), + False, + SubstructureNotifyMask, &xev); + } + + maybe_unlock_display(); + return is_maximize_allowed; + } +#endif // LL_X11 return FALSE; } @@ -1597,12 +1795,83 @@ U32 LLWindowSDL::SDLCheckGrabbyKeys(SDLKey keysym, BOOL gain) return mGrabbyKeyFlags; } + +void check_vm_bloat() +{ +#if LL_LINUX + // watch our own VM and RSS sizes, warn if we bloated rapidly + FILE *fp = fopen("/proc/self/stat", "r"); + if (fp) + { + static long long last_vm_size = 0; + static long long last_rss_size = 0; + const long long significant_vm_difference = 250 * 1024*1024; + const long long significant_rss_difference = 50 * 1024*1024; + + ssize_t res; + size_t dummy; + char *ptr; + for (int i=0; i<22; ++i) // parse past the values we don't want + { + ptr = NULL; + res = getdelim(&ptr, &dummy, ' ', fp); + free(ptr); + } + // 23rd space-delimited entry is vsize + ptr = NULL; + res = getdelim(&ptr, &dummy, ' ', fp); + llassert(ptr); + long long this_vm_size = atoll(ptr); + free(ptr); + // 24th space-delimited entry is RSS + ptr = NULL; + res = getdelim(&ptr, &dummy, ' ', fp); + llassert(ptr); + long long this_rss_size = getpagesize() * atoll(ptr); + free(ptr); + + llinfos << "VM SIZE IS NOW " << (this_vm_size/(1024*1024)) << " MB, RSS SIZE IS NOW " << (this_rss_size/(1024*1024)) << " MB" << llendl; + + if (llabs(last_vm_size - this_vm_size) > + significant_vm_difference) + { + if (this_vm_size > last_vm_size) + { + llwarns << "VM size grew by " << (this_vm_size - last_vm_size)/(1024*1024) << " MB in last frame" << llendl; + } + else + { + llinfos << "VM size shrank by " << (last_vm_size - this_vm_size)/(1024*1024) << " MB in last frame" << llendl; + } + } + + if (llabs(last_rss_size - this_rss_size) > + significant_rss_difference) + { + if (this_rss_size > last_rss_size) + { + llwarns << "RSS size grew by " << (this_rss_size - last_rss_size)/(1024*1024) << " MB in last frame" << llendl; + } + else + { + llinfos << "RSS size shrank by " << (last_rss_size - this_rss_size)/(1024*1024) << " MB in last frame" << llendl; + } + } + + last_rss_size = this_rss_size; + last_vm_size = this_vm_size; + + fclose(fp); + } +#endif // LL_LINUX +} + + // virtual void LLWindowSDL::processMiscNativeEvents() { #if LL_GTK // Pump GTK events to avoid starvation for: - // * Embedded Gecko // * DBUS servicing // * Anything else which quietly hooks into the default glib/GTK loop if (ll_try_gtk_init()) @@ -1628,6 +1897,12 @@ void LLWindowSDL::processMiscNativeEvents() setlocale(LC_ALL, saved_locale.c_str() ); } #endif // LL_GTK + + // hack - doesn't belong here - but this is just for debugging + if (getenv("LL_DEBUG_BLOAT")) + { + check_vm_bloat(); + } } void LLWindowSDL::gatherInput() diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index e6bdd46a77..2311a361fa 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -148,6 +148,9 @@ public: static Display* get_SDL_Display(void); #endif // LL_X11 + static S32 getDisplayWidth(); + static S32 getDisplayHeight(); + protected: LLWindowSDL(LLWindowCallbacks* callbacks, const std::string& title, int x, int y, int width, int height, U32 flags, diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index c80392ad45..4be5d06c2b 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -3714,5 +3714,16 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList() return std::vector<std::string>(); } +// static +S32 LLWindowWin32::getDisplayWidth() +{ + return ::GetSystemMetrics(SM_CXVIRTUALSCREEN); +} + +// static +S32 LLWindowWin32::getDisplayHeight() +{ + return ::GetSystemMetrics(SM_CYVIRTUALSCREEN); +} #endif // LL_WINDOWS diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 9d57735772..c221ec0192 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -120,6 +120,9 @@ public: static std::vector<std::string> getDynamicFallbackFontList(); + static S32 getDisplayWidth(); + static S32 getDisplayHeight(); + protected: LLWindowWin32(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index fb0a04dc58..2ead5a4a57 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -137,7 +137,7 @@ namespace LLInitParam } - bool BaseBlock::validateBlock(bool silent) const + bool BaseBlock::validateBlock(bool emit_errors) const { const BlockDescriptor& block_data = getBlockDescriptor(); for (BlockDescriptor::param_validation_list_t::const_iterator it = block_data.mValidationList.begin(); it != block_data.mValidationList.end(); ++it) @@ -145,7 +145,7 @@ namespace LLInitParam const Param* param = getParamFromHandle(it->first); if (!it->second(param)) { - if (!silent) + if (emit_errors) { llwarns << "Invalid param \"" << getParamName(block_data, param) << "\"" << llendl; } @@ -458,7 +458,7 @@ namespace LLInitParam // take all provided params from other and apply to self // NOTE: this requires that "other" is of the same derived type as this - bool BaseBlock::overwriteFromImpl(BlockDescriptor& block_data, const BaseBlock& other) + bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite) { bool param_changed = false; BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end(); @@ -471,27 +471,7 @@ namespace LLInitParam if (merge_func) { Param* paramp = getParamFromHandle(it->mParamHandle); - param_changed |= merge_func(*paramp, *other_paramp, true); - } - } - return param_changed; - } - - // take all provided params that are not already provided, and apply to self - bool BaseBlock::fillFromImpl(BlockDescriptor& block_data, const BaseBlock& other) - { - bool param_changed = false; - BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end(); - for (BlockDescriptor::all_params_list_t::const_iterator it = block_data.mAllParams.begin(); - it != end_it; - ++it) - { - const Param* other_paramp = other.getParamFromHandle(it->mParamHandle); - ParamDescriptor::merge_func_t merge_func = it->mMergeFunc; - if (merge_func) - { - Param* paramp = getParamFromHandle(it->mParamHandle); - param_changed |= merge_func(*paramp, *other_paramp, false); + param_changed |= merge_func(*paramp, *other_paramp, overwrite); } } return param_changed; diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index d264cea3b2..c9c1d4af90 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -407,7 +407,7 @@ namespace LLInitParam class BaseBlock { public: - // "Multiple" constraint types + // "Multiple" constraint types, put here in root class to avoid ambiguity during use struct AnyAmount { static U32 minCount() { return 0; } @@ -452,7 +452,7 @@ namespace LLInitParam bool submitValue(const Parser::name_stack_t& name_stack, Parser& p, bool silent=false); param_handle_t getHandleFromParam(const Param* param) const; - bool validateBlock(bool silent = false) const; + bool validateBlock(bool emit_errors = true) const; Param* getParamFromHandle(const param_handle_t param_handle) { @@ -500,10 +500,7 @@ namespace LLInitParam // take all provided params from other and apply to self - bool overwriteFromImpl(BlockDescriptor& block_data, const BaseBlock& other); - - // take all provided params that are not already provided, and apply to self - bool fillFromImpl(BlockDescriptor& block_data, const BaseBlock& other); + bool merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite); // can be updated in getters mutable S32 mChangeVersion; @@ -805,7 +802,7 @@ namespace LLInitParam if (Param::getProvided() && mData.mValidatedVersion < T::getLastChangeVersion()) { // a sub-block is "provided" when it has been filled in enough to be valid - mData.mValidated = T::validateBlock(true); + mData.mValidated = T::validateBlock(false); mData.mValidatedVersion = T::getLastChangeVersion(); } return Param::getProvided() && mData.mValidated; @@ -1236,7 +1233,7 @@ namespace LLInitParam it != mValues.end(); ++it) { - if(it->validateBlock(true)) count++; + if(it->validateBlock(false)) count++; } return count; } @@ -1286,7 +1283,7 @@ namespace LLInitParam bool overwriteFrom(const self_t& other) { mCurChoice = other.mCurChoice; - return BaseBlock::overwriteFromImpl(blockDescriptor(), other); + return BaseBlock::merge(blockDescriptor(), other, true); } // take all provided params that are not already provided, and apply to self @@ -1413,13 +1410,13 @@ namespace LLInitParam // take all provided params from other and apply to self bool overwriteFrom(const self_t& other) { - return BaseBlock::overwriteFromImpl(blockDescriptor(), other); + return BaseBlock::merge(blockDescriptor(), other, true); } // take all provided params that are not already provided, and apply to self bool fillFrom(const self_t& other) { - return BaseBlock::fillFromImpl(blockDescriptor(), other); + return BaseBlock::merge(blockDescriptor(), other, false); } protected: Block() @@ -1710,7 +1707,7 @@ namespace LLInitParam // if cached value is stale, regenerate from params if (Param::getProvided() && mData.mLastParamVersion < BaseBlock::getLastChangeVersion()) { - if (block_t::validateBlock(true)) + if (block_t::validateBlock(false)) { static_cast<const DERIVED*>(this)->setValueFromBlock(); // clear stale keyword associated with old value @@ -1769,7 +1766,7 @@ namespace LLInitParam if (Param::getProvided() && (mData.mLastParamVersion < BaseBlock::getLastChangeVersion())) { // go ahead and issue warnings at this point if any param is invalid - if(block_t::validateBlock(false)) + if(block_t::validateBlock(true)) { static_cast<const DERIVED*>(this)->setValueFromBlock(); mData.clearKey(); @@ -1797,25 +1794,23 @@ namespace LLInitParam private: static bool mergeWith(Param& dst, const Param& src, bool overwrite) { - const self_t& src_param = static_cast<const self_t&>(src); + const self_t& src_typed_param = static_cast<const self_t&>(src); self_t& dst_typed_param = static_cast<self_t&>(dst); - if (src_param.isProvided() + if (src_typed_param.isProvided() && (overwrite || !dst_typed_param.isProvided())) { // assign individual parameters - if (overwrite) - { - dst_typed_param.BaseBlock::overwriteFromImpl(block_t::blockDescriptor(), src_param); - } - else - { - dst_typed_param.BaseBlock::fillFromImpl(block_t::blockDescriptor(), src_param); - } + dst_typed_param.BaseBlock::merge(block_t::blockDescriptor(), src_typed_param, overwrite); + // then copy actual value - dst_typed_param.mData.mValue = src_param.get(); + dst_typed_param.mData.mValue = src_typed_param.get(); dst_typed_param.mData.clearKey(); dst_typed_param.setProvided(true); + + // Propagate value back to block params since the value was updated during this merge. + // This will result in mData.mValue and the block params being in sync. + static_cast<DERIVED&>(dst_typed_param).setBlockFromValue(); return true; } return false; diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index 26173314a7..4c2dd64bb6 100644 --- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp @@ -141,6 +141,7 @@ private: // Very GStreamer-specific GMainLoop *mPump; // event pump for this media GstElement *mPlaybin; + GstElement *mVisualizer; GstSLVideo *mVideoSink; }; @@ -159,6 +160,7 @@ MediaPluginGStreamer010::MediaPluginGStreamer010( mSeekDestination(0.0), mPump ( NULL ), mPlaybin ( NULL ), + mVisualizer ( NULL ), mVideoSink ( NULL ), mCommand ( COMMAND_NONE ) { @@ -686,6 +688,33 @@ MediaPluginGStreamer010::load() this); llgst_object_unref (bus); + // get a visualizer element (bonus feature!) + char* vis_name = getenv("LL_GST_VIS_NAME"); + if (!vis_name || + (vis_name && std::string(vis_name)!="none")) + { + if (vis_name) + { + mVisualizer = llgst_element_factory_make (vis_name, "vis"); + } + if (!mVisualizer) + { + mVisualizer = llgst_element_factory_make ("libvisual_jess", "vis"); + if (!mVisualizer) + { + mVisualizer = llgst_element_factory_make ("goom", "vis"); + if (!mVisualizer) + { + mVisualizer = llgst_element_factory_make ("libvisual_lv_scope", "vis"); + if (!mVisualizer) + { + // That's okay, we don't NEED this. + } + } + } + } + } + if (NULL == getenv("LL_GSTREAMER_EXTERNAL")) { // instantiate a custom video sink mVideoSink = @@ -702,6 +731,11 @@ MediaPluginGStreamer010::load() g_object_set(mPlaybin, "video-sink", mVideoSink, NULL); } + if (mVisualizer) + { + g_object_set(mPlaybin, "vis-plugin", mVisualizer, NULL); + } + return true; } @@ -724,6 +758,12 @@ MediaPluginGStreamer010::unload () mPlaybin = NULL; } + if (mVisualizer) + { + llgst_object_unref (GST_OBJECT (mVisualizer)); + mVisualizer = NULL; + } + if (mPump) { g_main_loop_quit(mPump); diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 4512c22b5d..9f66a77c64 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -14,10 +14,12 @@ include(Linking) include(PluginAPI) include(MediaPluginBase) include(FindOpenGL) +include(PulseAudio) include(WebKitLibPlugin) include_directories( + ${PULSEAUDIO_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS} ${MEDIA_PLUGIN_BASE_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} @@ -34,25 +36,27 @@ set(media_plugin_webkit_SOURCE_FILES media_plugin_webkit.cpp ) -add_library(media_plugin_webkit - SHARED - ${media_plugin_webkit_SOURCE_FILES} -) - set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} ${WEBKIT_PLUGIN_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES} + ${PULSEAUDIO_LIBRARIES} ) if (LINUX) + list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK ) endif (LINUX) +add_library(media_plugin_webkit + SHARED + ${media_plugin_webkit_SOURCE_FILES} +) + target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) add_dependencies(media_plugin_webkit diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp new file mode 100644 index 0000000000..52ab766f7f --- /dev/null +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -0,0 +1,488 @@ +/** + * @file linux_volume_catcher.cpp + * @brief A Linux-specific, PulseAudio-specific hack to detect and volume-adjust new audio sources + * + * @cond + * $LicenseInfo:firstyear=2010&license=viewergpl$ + * + * Copyright (c) 2010, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + * @endcond + */ + +/* + The high-level design is as follows: + 1) Connect to the PulseAudio daemon + 2) Watch for the creation of new audio players connecting to the daemon (this includes ALSA clients running on the PulseAudio emulation layer, such as Flash plugins) + 3) Examine any new audio player's PID to see if it belongs to our own process + 4) If so, tell PA to adjust the volume of that audio player ('sink input' in PA parlance) + 5) Keep a list of all living audio players that we care about, adjust the volumes of all of them when we get a new setVolume() call + */ + +#include "linden_common.h" + +#include "linux_volume_catcher.h" + + +#if LL_PULSEAUDIO_ENABLED + +extern "C" { +#include <glib.h> + +#include <pulse/introspect.h> +#include <pulse/context.h> +#include <pulse/subscribe.h> +#include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic polling implementation seems broken. + +#include "apr_pools.h" +#include "apr_dso.h" +} + +//////////////////////////////////////////////////// + +#define DEBUGMSG(...) do {} while(0) +#define INFOMSG(...) do {} while(0) +#define WARNMSG(...) do {} while(0) + +#define LL_PA_SYM(REQUIRED, PASYM, RTN, ...) RTN (*ll##PASYM)(__VA_ARGS__) = NULL +#include "linux_volume_catcher_pa_syms.inc" +#include "linux_volume_catcher_paglib_syms.inc" +#undef LL_PA_SYM + +static bool sSymsGrabbed = false; +static apr_pool_t *sSymPADSOMemoryPool = NULL; +static apr_dso_handle_t *sSymPADSOHandleG = NULL; + +bool grab_pa_syms(std::string pulse_dso_name) +{ + if (sSymsGrabbed) + { + // already have grabbed good syms + return true; + } + + bool sym_error = false; + bool rtn = false; + apr_status_t rv; + apr_dso_handle_t *sSymPADSOHandle = NULL; + +#define LL_PA_SYM(REQUIRED, PASYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##PASYM, sSymPADSOHandle, #PASYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #PASYM); if (REQUIRED) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #PASYM, (void*)ll##PASYM);}while(0) + + //attempt to load the shared library + apr_pool_create(&sSymPADSOMemoryPool, NULL); + + if ( APR_SUCCESS == (rv = apr_dso_load(&sSymPADSOHandle, + pulse_dso_name.c_str(), + sSymPADSOMemoryPool) )) + { + INFOMSG("Found DSO: %s", pulse_dso_name.c_str()); + +#include "linux_volume_catcher_pa_syms.inc" +#include "linux_volume_catcher_paglib_syms.inc" + + if ( sSymPADSOHandle ) + { + sSymPADSOHandleG = sSymPADSOHandle; + sSymPADSOHandle = NULL; + } + + rtn = !sym_error; + } + else + { + INFOMSG("Couldn't load DSO: %s", pulse_dso_name.c_str()); + rtn = false; // failure + } + + if (sym_error) + { + WARNMSG("Failed to find necessary symbols in PulseAudio libraries."); + } +#undef LL_PA_SYM + + sSymsGrabbed = rtn; + return rtn; +} + + +void ungrab_pa_syms() +{ + // should be safe to call regardless of whether we've + // actually grabbed syms. + + if ( sSymPADSOHandleG ) + { + apr_dso_unload(sSymPADSOHandleG); + sSymPADSOHandleG = NULL; + } + + if ( sSymPADSOMemoryPool ) + { + apr_pool_destroy(sSymPADSOMemoryPool); + sSymPADSOMemoryPool = NULL; + } + + // NULL-out all of the symbols we'd grabbed +#define LL_PA_SYM(REQUIRED, PASYM, RTN, ...) do{ll##PASYM = NULL;}while(0) +#include "linux_volume_catcher_pa_syms.inc" +#include "linux_volume_catcher_paglib_syms.inc" +#undef LL_PA_SYM + + sSymsGrabbed = false; +} +//////////////////////////////////////////////////// + +// PulseAudio requires a chain of callbacks with C linkage +extern "C" { + void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *i, int eol, void *userdata); + void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata); + void callback_context_state(pa_context *context, void *userdata); +} + + +class LinuxVolumeCatcherImpl +{ +public: + LinuxVolumeCatcherImpl(); + ~LinuxVolumeCatcherImpl(); + + void setVolume(F32 volume); + void pump(void); + + // for internal use - can't be private because used from our C callbacks + + bool loadsyms(std::string pulse_dso_name); + void init(); + void cleanup(); + + void update_all_volumes(F32 volume); + void update_index_volume(U32 index, F32 volume); + void connected_okay(); + + std::set<U32> mSinkInputIndices; + std::map<U32,U32> mSinkInputNumChannels; + F32 mDesiredVolume; + pa_glib_mainloop *mMainloop; + pa_context *mPAContext; + bool mConnected; + bool mGotSyms; +}; + +LinuxVolumeCatcherImpl::LinuxVolumeCatcherImpl() + : mDesiredVolume(0.0f), + mMainloop(NULL), + mPAContext(NULL), + mConnected(false), + mGotSyms(false) +{ + init(); +} + +LinuxVolumeCatcherImpl::~LinuxVolumeCatcherImpl() +{ + cleanup(); +} + +bool LinuxVolumeCatcherImpl::loadsyms(std::string pulse_dso_name) +{ + return grab_pa_syms(pulse_dso_name); +} + +void LinuxVolumeCatcherImpl::init() +{ + // try to be as defensive as possible because PA's interface is a + // bit fragile and (for our purposes) we'd rather simply not function + // than crash + + // we cheat and rely upon libpulse-mainloop-glib.so.0 to pull-in + // libpulse.so.0 - this isn't a great assumption, and the two DSOs should + // probably be loaded separately. Our Linux DSO framework needs refactoring, + // we do this sort of thing a lot with practically identical logic... + mGotSyms = loadsyms("libpulse-mainloop-glib.so.0"); + if (!mGotSyms) return; + + mMainloop = llpa_glib_mainloop_new(g_main_context_default()); + if (mMainloop) + { + pa_mainloop_api *api = llpa_glib_mainloop_get_api(mMainloop); + if (api) + { + pa_proplist *proplist = llpa_proplist_new(); + if (proplist) + { + llpa_proplist_sets(proplist, PA_PROP_APPLICATION_ICON_NAME, "multimedia-player"); + llpa_proplist_sets(proplist, PA_PROP_APPLICATION_ID, "com.secondlife.viewer.mediaplugvoladjust"); + llpa_proplist_sets(proplist, PA_PROP_APPLICATION_NAME, "SL Plugin Volume Adjuster"); + llpa_proplist_sets(proplist, PA_PROP_APPLICATION_VERSION, "1"); + + // plain old pa_context_new() is broken! + mPAContext = llpa_context_new_with_proplist(api, NULL, proplist); + llpa_proplist_free(proplist); + } + } + } + + // Now we've set up a PA context and mainloop, try connecting the + // PA context to a PA daemon. + if (mPAContext) + { + llpa_context_set_state_callback(mPAContext, callback_context_state, this); + pa_context_flags_t cflags = (pa_context_flags)0; // maybe add PA_CONTEXT_NOAUTOSPAWN? + if (llpa_context_connect(mPAContext, NULL, cflags, NULL) >= 0) + { + // Okay! We haven't definitely connected, but we + // haven't definitely failed yet. + } + else + { + // Failed to connect to PA manager... we'll leave + // things like that. Perhaps we should try again later. + } + } +} + +void LinuxVolumeCatcherImpl::cleanup() +{ + mConnected = false; + + if (mGotSyms && mPAContext) + { + llpa_context_disconnect(mPAContext); + llpa_context_unref(mPAContext); + } + mPAContext = NULL; + + if (mGotSyms && mMainloop) + { + llpa_glib_mainloop_free(mMainloop); + } + mMainloop = NULL; +} + +void LinuxVolumeCatcherImpl::setVolume(F32 volume) +{ + mDesiredVolume = volume; + + if (!mGotSyms) return; + + if (mConnected && mPAContext) + { + update_all_volumes(mDesiredVolume); + } + + pump(); +} + +void LinuxVolumeCatcherImpl::pump() +{ + gboolean may_block = FALSE; + g_main_context_iteration(g_main_context_default(), may_block); +} + +void LinuxVolumeCatcherImpl::connected_okay() +{ + pa_operation *op; + + // fetch global list of existing sinkinputs + if ((op = llpa_context_get_sink_input_info_list(mPAContext, + callback_discovered_sinkinput, + this))) + { + llpa_operation_unref(op); + } + + // subscribe to future global sinkinput changes + llpa_context_set_subscribe_callback(mPAContext, + callback_subscription_alert, + this); + if ((op = llpa_context_subscribe(mPAContext, (pa_subscription_mask_t) + (PA_SUBSCRIPTION_MASK_SINK_INPUT), + NULL, NULL))) + { + llpa_operation_unref(op); + } +} + +void LinuxVolumeCatcherImpl::update_all_volumes(F32 volume) +{ + for (std::set<U32>::iterator it = mSinkInputIndices.begin(); + it != mSinkInputIndices.end(); ++it) + { + update_index_volume(*it, volume); + } +} + +void LinuxVolumeCatcherImpl::update_index_volume(U32 index, F32 volume) +{ + static pa_cvolume cvol; + llpa_cvolume_set(&cvol, mSinkInputNumChannels[index], + llpa_sw_volume_from_linear(volume)); + + pa_context *c = mPAContext; + uint32_t idx = index; + const pa_cvolume *cvolumep = &cvol; + pa_context_success_cb_t cb = NULL; // okay as null + void *userdata = NULL; // okay as null + + pa_operation *op; + if ((op = llpa_context_set_sink_input_volume(c, idx, cvolumep, cb, userdata))) + { + llpa_operation_unref(op); + } +} + + +void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *sii, int eol, void *userdata) +{ + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); + llassert(impl); + + if (0 == eol) + { + pa_proplist *proplist = sii->proplist; + pid_t sinkpid = atoll(llpa_proplist_gets(proplist, PA_PROP_APPLICATION_PROCESS_ID)); + + if (sinkpid == getpid()) // does the discovered sinkinput belong to this process? + { + bool is_new = (impl->mSinkInputIndices.find(sii->index) == + impl->mSinkInputIndices.end()); + + impl->mSinkInputIndices.insert(sii->index); + impl->mSinkInputNumChannels[sii->index] = sii->channel_map.channels; + + if (is_new) + { + // new! + impl->update_index_volume(sii->index, impl->mDesiredVolume); + } + else + { + // seen it already, do nothing. + } + } + } +} + +void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata) +{ + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); + llassert(impl); + + switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { + case PA_SUBSCRIPTION_EVENT_SINK_INPUT: + if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == + PA_SUBSCRIPTION_EVENT_REMOVE) + { + // forget this sinkinput, if we were caring about it + impl->mSinkInputIndices.erase(index); + impl->mSinkInputNumChannels.erase(index); + } + else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == + PA_SUBSCRIPTION_EVENT_NEW) + { + // ask for more info about this new sinkinput + pa_operation *op; + if ((op = llpa_context_get_sink_input_info(impl->mPAContext, index, callback_discovered_sinkinput, impl))) + { + llpa_operation_unref(op); + } + } + else + { + // property change on this sinkinput - we don't care. + } + break; + + default:; + } +} + +void callback_context_state(pa_context *context, void *userdata) +{ + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); + llassert(impl); + + switch (llpa_context_get_state(context)) + { + case PA_CONTEXT_READY: + impl->mConnected = true; + impl->connected_okay(); + break; + case PA_CONTEXT_TERMINATED: + impl->mConnected = false; + break; + case PA_CONTEXT_FAILED: + impl->mConnected = false; + break; + default:; + } +} + +///////////////////////////////////////////////////// + +LinuxVolumeCatcher::LinuxVolumeCatcher() +{ + pimpl = new LinuxVolumeCatcherImpl(); +} + +LinuxVolumeCatcher::~LinuxVolumeCatcher() +{ + delete pimpl; + pimpl = NULL; +} + +void LinuxVolumeCatcher::setVolume(F32 volume) +{ + llassert(pimpl); + pimpl->setVolume(volume); +} + +void LinuxVolumeCatcher::pump() +{ + llassert(pimpl); + pimpl->pump(); +} + +#else // !LL_PULSEAUDIO_ENABLED + +// stub. + +LinuxVolumeCatcher::LinuxVolumeCatcher() +{ + pimpl = NULL; +} + +LinuxVolumeCatcher::~LinuxVolumeCatcher() +{ +} + +void LinuxVolumeCatcher::setVolume(F32 volume) +{ +} + +void LinuxVolumeCatcher::pump() +{ +} + +#endif // LL_PULSEAUDIO_ENABLED diff --git a/indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc b/indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc new file mode 100644 index 0000000000..d806b48428 --- /dev/null +++ b/indra/media_plugins/webkit/linux_volume_catcher_pa_syms.inc @@ -0,0 +1,21 @@ +// required symbols to grab +LL_PA_SYM(true, pa_context_connect, int, pa_context *c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api); +LL_PA_SYM(true, pa_context_disconnect, void, pa_context *c); +LL_PA_SYM(true, pa_context_get_sink_input_info, pa_operation*, pa_context *c, uint32_t idx, pa_sink_input_info_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_get_sink_input_info_list, pa_operation*, pa_context *c, pa_sink_input_info_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_get_state, pa_context_state_t, pa_context *c); +LL_PA_SYM(true, pa_context_new_with_proplist, pa_context*, pa_mainloop_api *mainloop, const char *name, pa_proplist *proplist); +LL_PA_SYM(true, pa_context_set_sink_input_volume, pa_operation*, pa_context *c, uint32_t idx, const pa_cvolume *volume, pa_context_success_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_set_state_callback, void, pa_context *c, pa_context_notify_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_set_subscribe_callback, void, pa_context *c, pa_context_subscribe_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_subscribe, pa_operation*, pa_context *c, pa_subscription_mask_t m, pa_context_success_cb_t cb, void *userdata); +LL_PA_SYM(true, pa_context_unref, void, pa_context *c); +LL_PA_SYM(true, pa_cvolume_set, pa_cvolume*, pa_cvolume *a, unsigned channels, pa_volume_t v); +LL_PA_SYM(true, pa_operation_unref, void, pa_operation *o); +LL_PA_SYM(true, pa_proplist_free, void, pa_proplist* p); +LL_PA_SYM(true, pa_proplist_gets, const char*, pa_proplist *p, const char *key); +LL_PA_SYM(true, pa_proplist_new, pa_proplist*, void); +LL_PA_SYM(true, pa_proplist_sets, int, pa_proplist *p, const char *key, const char *value); +LL_PA_SYM(true, pa_sw_volume_from_linear, pa_volume_t, double v); + +// optional symbols to grab diff --git a/indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc b/indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc new file mode 100644 index 0000000000..abf628c96c --- /dev/null +++ b/indra/media_plugins/webkit/linux_volume_catcher_paglib_syms.inc @@ -0,0 +1,6 @@ +// required symbols to grab +LL_PA_SYM(true, pa_glib_mainloop_free, void, pa_glib_mainloop* g); +LL_PA_SYM(true, pa_glib_mainloop_get_api, pa_mainloop_api*, pa_glib_mainloop* g); +LL_PA_SYM(true, pa_glib_mainloop_new, pa_glib_mainloop *, GMainContext *c); + +// optional symbols to grab diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 688d3bcd3d..e66ac3049f 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -43,11 +43,22 @@ #include "llpluginmessageclasses.h" #include "media_plugin_base.h" +// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified +#if LL_LINUX +# define LL_QTWEBKIT_USES_PIXMAPS 1 +#else +# define LL_QTWEBKIT_USES_PIXMAPS 0 +#endif // LL_LINUX + +#if LL_LINUX +# include "linux_volume_catcher.h" +#endif // LL_LINUX + #if LL_WINDOWS -#include <direct.h> +# include <direct.h> #else -#include <unistd.h> -#include <stdlib.h> +# include <unistd.h> +# include <stdlib.h> #endif #if LL_WINDOWS @@ -102,6 +113,10 @@ private: F32 mBackgroundG; F32 mBackgroundB; +#if LL_LINUX + LinuxVolumeCatcher mLinuxVolumeCatcher; +#endif // LL_LINUX + void setInitState(int state) { // std::cerr << "changing init state to " << state << std::endl; @@ -114,6 +129,10 @@ private: { LLQtWebKit::getInstance()->pump( milliseconds ); +#if LL_LINUX + mLinuxVolumeCatcher.pump(); +#endif // LL_LINUX + checkEditState(); if(mInitState == INIT_STATE_NAVIGATE_COMPLETE) @@ -130,7 +149,11 @@ private: { const unsigned char* browser_pixels = LLQtWebKit::getInstance()->grabBrowserWindow( mBrowserWindowId ); - unsigned int buffer_size = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ) * LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId ); + unsigned int rowspan = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ); + unsigned int height = LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId ); +#if !LL_QTWEBKIT_USES_PIXMAPS + unsigned int buffer_size = rowspan * height; +#endif // !LL_QTWEBKIT_USES_PIXMAPS // std::cerr << "webkit plugin: updating" << std::endl; @@ -138,7 +161,16 @@ private: if ( mPixels && browser_pixels ) { // std::cerr << " memcopy of " << buffer_size << " bytes" << std::endl; + +#if LL_QTWEBKIT_USES_PIXMAPS + // copy the pixel data upside-down because of the co-ord system + for (int y=0; y<height; ++y) + { + memcpy( &mPixels[(height-y-1)*rowspan], &browser_pixels[y*rowspan], rowspan ); + } +#else memcpy( mPixels, browser_pixels, buffer_size ); +#endif // LL_QTWEBKIT_USES_PIXMAPS } if ( mWidth > 0 && mHeight > 0 ) @@ -246,8 +278,10 @@ private: // append details to agent string LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" ); +#if !LL_QTWEBKIT_USES_PIXMAPS // don't flip bitmap LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true ); +#endif // !LL_QTWEBKIT_USES_PIXMAPS // set background color // convert background color channels from [0.0, 1.0] to [0, 255]; @@ -281,6 +315,7 @@ private: return false; }; + void setVolume(F32 vol); //////////////////////////////////////////////////////////////////////////////// // virtual @@ -664,7 +699,11 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) message.setValueS32("default_height", 1024); message.setValueS32("depth", mDepth); message.setValueU32("internalformat", GL_RGBA); +#if LL_QTWEBKIT_USES_PIXMAPS + message.setValueU32("format", GL_BGRA_EXT); // I hope this isn't system-dependant... is it? If so, we'll have to check the root window's pixel layout or something... yuck. +#else message.setValueU32("format", GL_RGBA); +#endif // LL_QTWEBKIT_USES_PIXMAPS message.setValueU32("type", GL_UNSIGNED_BYTE); message.setValueBoolean("coords_opengl", true); sendMessage(message); @@ -732,6 +771,14 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) // std::cerr << "MediaPluginWebKit::receiveMessage: unknown base message: " << message_name << std::endl; } } + else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) + { + if(message_name == "set_volume") + { + F32 volume = message_in.getValueReal("volume"); + setVolume(volume); + } + } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) { if(message_name == "size_change") @@ -998,6 +1045,13 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) } } +void MediaPluginWebKit::setVolume(F32 volume) +{ +#if LL_LINUX + mLinuxVolumeCatcher.setVolume(volume); +#endif // LL_LINUX +} + int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data) { MediaPluginWebKit *self = new MediaPluginWebKit(host_send_func, host_user_data); diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b74530e49a..8ad3b2085d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -183,7 +183,6 @@ set(viewer_SOURCE_FILES llfloatermediasettings.cpp llfloatermemleak.cpp llfloaternamedesc.cpp - llfloaternearbymedia.cpp llfloaternotificationsconsole.cpp llfloateropenobject.cpp llfloaterparcel.cpp @@ -323,6 +322,7 @@ set(viewer_SOURCE_FILES llpanelmediasettingspermissions.cpp llpanelmediasettingssecurity.cpp llpanelme.cpp + llpanelnearbymedia.cpp llpanelobject.cpp llpanelobjectinventory.cpp llpaneloutfitsinventory.cpp @@ -347,6 +347,7 @@ set(viewer_SOURCE_FILES llpatchvertexarray.cpp llplacesinventorybridge.cpp llplacesinventorypanel.cpp + llpopupview.cpp llpolymesh.cpp llpolymorph.cpp llpreview.cpp @@ -683,7 +684,6 @@ set(viewer_HEADER_FILES llfloatermediasettings.h llfloatermemleak.h llfloaternamedesc.h - llfloaternearbymedia.h llfloaternotificationsconsole.h llfloateropenobject.h llfloaterparcel.h @@ -818,6 +818,7 @@ set(viewer_HEADER_FILES llpanelmediasettingspermissions.h llpanelmediasettingssecurity.h llpanelme.h + llpanelnearbymedia.h llpanelobject.h llpanelobjectinventory.h llpaneloutfitsinventory.h @@ -844,6 +845,7 @@ set(viewer_HEADER_FILES llplacesinventorypanel.h llpolymesh.h llpolymorph.h + llpopupview.h llpreview.h llpreviewanim.h llpreviewgesture.h @@ -1624,13 +1626,6 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH if (LINUX) - add_custom_command( - OUTPUT secondlife-stripped - COMMAND strip - ARGS --strip-debug -o secondlife-stripped ${VIEWER_BINARY_NAME} - DEPENDS ${VIEWER_BINARY_NAME} - ) - set(product SecondLife-${ARCH}-${viewer_VERSION}) add_custom_command( @@ -1650,15 +1645,15 @@ if (LINUX) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched - DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) if (NOT INSTALL) add_custom_target(package ALL DEPENDS ${product}.tar.bz2) - add_dependencies(package linux-crash-logger-strip-target) - add_dependencies(package linux-updater-strip-target) + add_dependencies(package linux-crash-logger-target) + add_dependencies(package linux-updater-target) check_message_template(package) endif (NOT INSTALL) endif (LINUX) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d0c2f3cb34..8edf766132 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4,13 +4,13 @@ <key>AFKTimeout</key> <map> <key>Comment</key> - <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string> + <string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <real>300.0</real> + <real>0</real> </map> <key>AdvanceSnapshot</key> <map> @@ -197,7 +197,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.5</real> </map> <key>AudioLevelMic</key> <map> @@ -219,7 +219,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.5</real> </map> <key>AudioLevelRolloff</key> <map> @@ -241,7 +241,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.5</real> </map> <key>AudioLevelUI</key> <map> @@ -3607,7 +3607,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://lecs.viewer-sidebar.secondlife.com.s3.amazonaws.com/sidebar.html?p=[AUTH_TOKEN]&lang=[LANGUAGE]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]</string> + <string>https://viewer-sidebar.secondlife.com/sidebar.html?p=[AUTH_TOKEN]&lang=[LANGUAGE]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]&firstlogin=[FIRST_LOGIN]</string> </map> <key>SearchURL</key> <map> @@ -3618,7 +3618,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://search.secondlife.com/viewer/[CATEGORY]?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]</string> + <string>http://search.secondlife.com/viewer/[CATEGORY]?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> <key>HighResSnapshot</key> <map> @@ -4328,7 +4328,7 @@ <key>LoginLocation</key> <map> <key>Comment</key> - <string>Login at same location you last logged out</string> + <string>Login location ('last', 'home')</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -4578,6 +4578,50 @@ <key>Value</key> <integer>0</integer> </map> + <key>MediaShowOnOthers</key> + <map> + <key>Comment</key> + <string>Whether or not to show media on other avatars</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>MediaShowOutsideParcel</key> + <map> + <key>Comment</key> + <string>Whether or not to show media from outside the current parcel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>MediaShowWithinParcel</key> + <map> + <key>Comment</key> + <string>Whether or not to show media within the current parcel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>MediaTentativeAutoPlay</key> + <map> + <key>Comment</key> + <string>This is a tentative flag that may be temporarily set off by the user, until she teleports</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>MemoryLogFrequency</key> <map> <key>Comment</key> @@ -5055,7 +5099,9 @@ <map> <key>Comment</key> <string>Default width of buttons in the toast. - Note if required width will be less then this one, a button will be reshaped to default size , otherwise to required</string> + Notes: + If required width will be less then this one, a button will be reshaped to default size , otherwise to required + Change of this parameter will affect the layout of buttons in notification toast.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -5314,7 +5360,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>PerAccountSettingsFile</key> <map> @@ -5446,7 +5492,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.9</real> </map> <key>PlainTextChatHistory</key> @@ -5508,7 +5554,7 @@ <key>PreferredMaturity</key> <map> <key>Comment</key> - <string>Setting for the user's preferred maturity level.</string> + <string>Setting for the user's preferred maturity level (consts in indra_constants.h)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -7397,6 +7443,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>RenderUseTriStrips</key> + <map> + <key>Comment</key> + <string>Use triangle strips for rendering prims.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderUseFarClip</key> <map> <key>Comment</key> @@ -10068,7 +10125,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>UseFreezeFrame</key> <map> @@ -10347,17 +10404,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>VoiceDefaultInternalLevel</key> - <map> - <key>Comment</key> - <string>Internal level of voice set by default. Is equivalent to 0.5 (from 0.0-1.0 range) external voice level (internal = 400 * external^2).</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>100</integer> - </map> <key>VoiceEarLocation</key> <map> <key>Comment</key> diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index 887dab66d1..aa0e21ea8f 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -47,8 +47,10 @@ ATI ASUS EAH26xx .*ATI.*ASUS.*EAH26.* 3 1 ATI ASUS EAH34xx .*ATI.*ASUS.*EAH34.* 1 1 ATI ASUS EAH36xx .*ATI.*ASUS.*EAH36.* 3 1 ATI ASUS EAH38xx .*ATI.*ASUS.*EAH38.* 3 1 +ATI ASUS EAH45xx .*ATI.*ASUS.*EAH45.* 1 1 ATI ASUS EAH48xx .*ATI.*ASUS.*EAH48.* 3 1 -ATI Radeon X1xxx .*ATI.*ASUS.*X1.* 2 1 +ATI ASUS EAH57xx .*ATI.*ASUS.*EAH57.* 3 1 +ATI Radeon X1xxx .*ATI.*ASUS.*X1.* 3 1 ATI Radeon X7xx .*ATI.*ASUS.*X7.* 1 1 ATI Radeon X500 .*ATI.*Diamond X5.* 1 1 ATI Radeon X13xx .*ATI.*Diamond X13.* 1 1 @@ -95,10 +97,16 @@ ATI Radeon HD 3300 .*ATI.*Radeon HD.*33.* 1 1 ATI Radeon HD 3400 .*ATI.*Radeon HD.*34.* 1 1 ATI Radeon HD 3600 .*ATI.*Radeon HD.*36.* 3 1 ATI Radeon HD 3800 .*ATI.*Radeon HD.*38.* 3 1 +ATI Radeon HD 4200 .*ATI.*Radeon HD 42.* 1 1 ATI Radeon HD 4300 .*ATI.*Radeon HD 43.* 1 1 -ATI Radeon HD 4500 .*ATI.*Radeon HD 45.* 2 1 -ATI Radeon HD 4600 .*ATI.*Radeon HD 46.* 3 1 +ATI Radeon HD 4500 .*ATI.*Radeon HD 45.* 3 1 +ATI Radeon HD 4600 .*ATI.*Radeon HD.*46.* 3 1 +ATI Radeon HD 4700 .*ATI.*Radeon HD 47.* 3 1 ATI Radeon HD 4800 .*ATI.*Radeon.*HD.*48.* 3 1 +ATI Radeon HD 5600 .*ATI.*Radeon.*HD.*56.* 3 1 +ATI Radeon HD 5700 .*ATI.*Radeon.*HD.*57.* 3 1 +ATI Radeon HD 5800 .*ATI.*Radeon.*HD.*58.* 3 1 +ATI Radeon HD 5900 .*ATI.*Radeon.*HD.*59.* 3 1 ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 0 0 ATI Radeon 2100 .*ATI.*Radeon 21.* 0 1 ATI Radeon 3100 .*ATI.*Radeon 31.* 1 1 @@ -152,13 +160,17 @@ Intel 945G .*Intel.*945G.* 0 1 Intel 950 .*Intel.*950.* 0 1 Intel 965 .*Intel.*965.* 0 1 Intel G33 .*Intel.*G33.* 0 0 +Intel G41 .*Intel.*G41.* 0 1 Intel G45 .*Intel.*G45.* 0 1 Intel Bear Lake .*Intel.*Bear Lake.* 0 0 Intel Broadwater .*Intel.*Broadwater.* 0 0 Intel Brookdale .*Intel.*Brookdale.* 0 0 Intel Cantiga .*Intel.*Cantiga.* 0 0 Intel Eaglelake .*Intel.*Eaglelake.* 0 1 +Intel Mobile 4 Series .*Intel.*Mobile.*4 Series.* 0 1 +Intel Media Graphics HD .*Intel.*Media.*Graphics.*HD.* 0 1 Intel Montara .*Intel.*Montara.* 0 0 +Intel Pineview .*Intel.*Pineview.* 0 1 Intel Springdale .*Intel.*Springdale.* 0 0 Matrox .*Matrox.* 0 0 Mesa .*Mesa.* 0 0 diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico Binary files differindex 1e00530c90..efe6c4f323 100644 --- a/indra/newview/installers/windows/install_icon.ico +++ b/indra/newview/installers/windows/install_icon.ico diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico Binary files differindex c4ec6c70bd..05e1546860 100644 --- a/indra/newview/installers/windows/uninstall_icon.ico +++ b/indra/newview/installers/windows/uninstall_icon.ico diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt index 92d321d8c0..e01b9e4bc6 100644 --- a/indra/newview/linux_tools/client-readme.txt +++ b/indra/newview/linux_tools/client-readme.txt @@ -15,7 +15,7 @@ Life itself - please see <http://www.secondlife.com/whatis/>. 5.3. Blank window after minimizing it 5.4. Audio 5.5. 'Alt' key for camera controls doesn't work - 5.6. In-world streaming movie/music playback + 5.6. In-world streaming movie, music and Flash playback 6. Advanced Troubleshooting 6.1. Audio 6.2. OpenGL @@ -169,12 +169,15 @@ SOLUTION:- Some window managers eat the Alt key for their own purposes; you example, the 'Windows' key!) which will allow the Alt key to function properly with mouse actions in Second Life and other applications. -PROBLEM 6:- In-world movie and/or music playback doesn't work for me. +PROBLEM 6:- In-world movie, music, or Flash playback doesn't work for me. SOLUTION:- You need to have a working installation of GStreamer 0.10; this is usually an optional package for most versions of Linux. If you have installed GStreamer 0.10 and you can play some music/movies but not others then you need to install a wider selection of GStreamer plugins, either - from your vendor or an appropriate third party. + from your vendor (i.e. the 'Ugly' plugins) or an appropriate third party. + For Flash playback, you need to have Flash 10 installed for your normal + web browser (for example, Firefox). PulseAudio is required for Flash + volume control / muting to fully function inside Second Life. 6. ADVANCED TROUBLESHOOTING diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index f84102e1fb..d2df968544 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -41,16 +41,8 @@ ## driver bug, try enabling this option and report whether it helps: #export LL_ATI_MOUSE_CURSOR_BUG=x -## - If you experience crashes with streaming video and music, you can -## disable these by enabling this option: -#export LL_DISABLE_GSTREAMER=x - -## - GStreamer is automatically disabled - for now - on 64-bit systems due -## to common fatal incompatibilities; remove/comment these lines if you want -## to try anyway. if [ "`uname -m`" = "x86_64" ]; then - export LL_DISABLE_GSTREAMER=x - echo '64-bit Linux detected: Disabling GStreamer (streaming video and music) by default; edit ./secondlife to re-enable.' + echo '64-bit Linux detected.' fi ## Everything below this line is just for advanced troubleshooters. diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3675be16e9..c5d7f6f118 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3018,6 +3018,9 @@ void LLAgent::endAnimationUpdateUI() //----------------------------------------------------------------------------- void LLAgent::updateCamera() { + static LLFastTimer::DeclareTimer ftm("Camera"); + LLFastTimer t(ftm); + //Ventrella - changed camera_skyward to the new global "mCameraUpVector" mCameraUpVector = LLVector3::z_axis; //LLVector3 camera_skyward(0.f, 0.f, 1.f); @@ -4836,11 +4839,16 @@ void LLAgent::onAnimStop(const LLUUID& id) } } -BOOL LLAgent::isGodlike() const +bool LLAgent::isGodlike() const { return mAgentAccess.isGodlike(); } +bool LLAgent::isGodlikeWithoutAdminMenuFakery() const +{ + return mAgentAccess.isGodlikeWithoutAdminMenuFakery(); +} + U8 LLAgent::getGodLevel() const { return mAgentAccess.getGodLevel(); @@ -5837,15 +5845,22 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * mesgsys->getUUIDFast(_PREHASH_WearableData, _PREHASH_TextureID, texture_id, texture_block); mesgsys->getU8Fast(_PREHASH_WearableData, _PREHASH_TextureIndex, texture_index, texture_block); - if (texture_id.notNull() - && (S32)texture_index < BAKED_NUM_INDICES + if ((S32)texture_index < BAKED_NUM_INDICES && gAgentQueryManager.mActiveCacheQueries[texture_index] == query_id) { - //llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl; - avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); - //avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); - gAgentQueryManager.mActiveCacheQueries[texture_index] = 0; - num_results++; + if (texture_id.notNull()) + { + //llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl; + avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); + //avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); + gAgentQueryManager.mActiveCacheQueries[texture_index] = 0; + num_results++; + } + else + { + // no cache of this bake. request upload. + avatarp->requestLayerSetUpload((EBakedTextureIndex)texture_index); + } } } diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 1573fd7131..f2df1992e7 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -888,7 +888,8 @@ private: // God //-------------------------------------------------------------------- public: - BOOL isGodlike() const; + bool isGodlike() const; + bool isGodlikeWithoutAdminMenuFakery() const; U8 getGodLevel() const; void setAdminOverride(BOOL b); void setGodLevel(U8 god_level); diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp index eb978eb6c1..915dabb935 100644 --- a/indra/newview/llagentaccess.cpp +++ b/indra/newview/llagentaccess.cpp @@ -69,12 +69,21 @@ bool LLAgentAccess::isGodlike() const #endif } +bool LLAgentAccess::isGodlikeWithoutAdminMenuFakery() const +{ +#ifdef HACKED_GODLIKE_VIEWER + return true; +#else + return mGodLevel > GOD_NOT; +#endif +} + U8 LLAgentAccess::getGodLevel() const { #ifdef HACKED_GODLIKE_VIEWER return GOD_MAINTENANCE; #else - if(mAdminOverride) return GOD_FULL; + if(mAdminOverride) return GOD_FULL; // :( return mGodLevel; #endif } diff --git a/indra/newview/llagentaccess.h b/indra/newview/llagentaccess.h index 93d2f0a371..49da5f44cc 100644 --- a/indra/newview/llagentaccess.h +++ b/indra/newview/llagentaccess.h @@ -48,6 +48,7 @@ public: void setGodLevel(U8 god_level); bool isGodlike() const; + bool isGodlikeWithoutAdminMenuFakery() const; U8 getGodLevel() const; diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 68ee9cd612..6ab1361dd1 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -119,9 +119,9 @@ protected: void importedFolderDone(void); void contentsDone(void); enum ELibraryOutfitFetchStep mCurrFetchStep; - typedef std::vector< std::pair< LLUUID, std::string > > cloth_folder_vec_t; - cloth_folder_vec_t mLibraryClothingFolders; - cloth_folder_vec_t mImportedClothingFolders; + typedef std::vector<LLUUID> clothing_folder_vec_t; + clothing_folder_vec_t mLibraryClothingFolders; + clothing_folder_vec_t mImportedClothingFolders; bool mOutfitsPopulated; LLUUID mClothingID; LLUUID mLibraryClothingID; @@ -245,6 +245,7 @@ void LLAgentWearables::setAvatarObject(LLVOAvatarSelf *avatar) // wearables LLAgentWearables::createStandardWearablesAllDoneCallback::~createStandardWearablesAllDoneCallback() { + llinfos << "destructor - all done?" << llendl; gAgentWearables.createStandardWearablesAllDone(); } @@ -271,10 +272,16 @@ LLAgentWearables::addWearableToAgentInventoryCallback::addWearableToAgentInvento mTodo(todo), mCB(cb) { + llinfos << "constructor" << llendl; } void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& inv_item) { + if (mTodo & CALL_CREATESTANDARDDONE) + { + llinfos << "callback fired, inv_item " << inv_item.asString() << llendl; + } + if (inv_item.isNull()) return; @@ -286,6 +293,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i } if (mTodo & CALL_RECOVERDONE) { + LLAppearanceManager::instance().addCOFItemLink(inv_item,false); gAgentWearables.recoverMissingWearableDone(); } /* @@ -293,6 +301,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i */ if (mTodo & CALL_CREATESTANDARDDONE) { + LLAppearanceManager::instance().addCOFItemLink(inv_item,false); gAgentWearables.createStandardWearablesDone(mType, mIndex); } if (mTodo & CALL_MAKENEWOUTFITDONE) @@ -310,6 +319,8 @@ void LLAgentWearables::addWearabletoAgentInventoryDone(const S32 type, const LLUUID& item_id, LLWearable* wearable) { + llinfos << "type " << type << " index " << index << " item " << item_id.asString() << llendl; + if (item_id.isNull()) return; @@ -665,13 +676,13 @@ const LLWearable* LLAgentWearables::getWearableFromItemID(const LLUUID& item_id) return NULL; } -const LLWearable* LLAgentWearables::getWearableFromAssetID(const LLUUID& asset_id) const +LLWearable* LLAgentWearables::getWearableFromAssetID(const LLUUID& asset_id) { for (S32 i=0; i < WT_COUNT; i++) { for (U32 j=0; j < getWearableCount((EWearableType)i); j++) { - const LLWearable * curr_wearable = getWearable((EWearableType)i, j); + LLWearable * curr_wearable = getWearable((EWearableType)i, j); if (curr_wearable && (curr_wearable->getAssetID() == asset_id)) { return curr_wearable; @@ -1038,7 +1049,7 @@ void LLAgentWearables::onInitialWearableAssetArrived(LLWearable* wearable, void* { return; } - + if (wearable) { llassert(type == wearable->getType()); @@ -1057,6 +1068,7 @@ void LLAgentWearables::onInitialWearableAssetArrived(LLWearable* wearable, void* // Somehow the asset doesn't exist in the database. gAgentWearables.recoverMissingWearable(type,index); } + gInventory.notifyObservers(); @@ -1138,6 +1150,80 @@ void LLAgentWearables::addLocalTextureObject(const EWearableType wearable_type, wearable->setLocalTextureObject(texture_type, lto); } +class OnWearableItemCreatedCB: public LLInventoryCallback +{ +public: + OnWearableItemCreatedCB(): + mWearablesAwaitingItems(WT_COUNT,NULL) + { + llinfos << "created callback" << llendl; + } + /* virtual */ void fire(const LLUUID& inv_item) + { + llinfos << "One item created " << inv_item.asString() << llendl; + LLViewerInventoryItem *item = gInventory.getItem(inv_item); + mItemsToLink.put(item); + updatePendingWearable(inv_item); + } + ~OnWearableItemCreatedCB() + { + llinfos << "All items created" << llendl; + LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy; + LLAppearanceManager::instance().linkAll(LLAppearanceManager::instance().getCOF(), + mItemsToLink, + link_waiter); + } + void addPendingWearable(LLWearable *wearable) + { + if (!wearable) + { + llwarns << "no wearable" << llendl; + return; + } + EWearableType type = wearable->getType(); + if (type<WT_COUNT) + { + mWearablesAwaitingItems[type] = wearable; + } + else + { + llwarns << "invalid type " << type << llendl; + } + } + void updatePendingWearable(const LLUUID& inv_item) + { + LLViewerInventoryItem *item = gInventory.getItem(inv_item); + if (!item) + { + llwarns << "no item found" << llendl; + return; + } + if (!item->isWearableType()) + { + llwarns << "non-wearable item found" << llendl; + return; + } + if (item && item->isWearableType()) + { + EWearableType type = item->getWearableType(); + if (type < WT_COUNT) + { + LLWearable *wearable = mWearablesAwaitingItems[type]; + if (wearable) + wearable->setItemID(inv_item); + } + else + { + llwarns << "invalid wearable type " << type << llendl; + } + } + } + +private: + LLInventoryModel::item_array_t mItemsToLink; + std::vector<LLWearable*> mWearablesAwaitingItems; +}; + void LLAgentWearables::createStandardWearables(BOOL female) { llwarns << "Creating Standard " << (female ? "female" : "male") @@ -1167,35 +1253,34 @@ void LLAgentWearables::createStandardWearables(BOOL female) FALSE //WT_SKIRT }; + LLPointer<LLInventoryCallback> cb = new OnWearableItemCreatedCB; for (S32 i=0; i < WT_COUNT; i++) { - bool once = false; - LLPointer<LLRefCount> donecb = NULL; if (create[i]) { - if (!once) - { - once = true; - donecb = new createStandardWearablesAllDoneCallback; - } llassert(getWearableCount((EWearableType)i) == 0); LLWearable* wearable = LLWearableList::instance().createNewWearable((EWearableType)i); - U32 index = pushWearable((EWearableType)i,wearable); + ((OnWearableItemCreatedCB*)(&(*cb)))->addPendingWearable(wearable); // no need to update here... - LLPointer<LLInventoryCallback> cb = - new addWearableToAgentInventoryCallback( - donecb, - i, - index, - wearable, - addWearableToAgentInventoryCallback::CALL_CREATESTANDARDDONE); - addWearableToAgentInventory(cb, wearable, LLUUID::null, FALSE); + LLUUID category_id = LLUUID::null; + create_inventory_item(gAgent.getID(), + gAgent.getSessionID(), + category_id, + wearable->getTransactionID(), + wearable->getName(), + wearable->getDescription(), + wearable->getAssetType(), + LLInventoryType::IT_WEARABLE, + wearable->getType(), + wearable->getPermissions().getMaskNextOwner(), + cb); } } } void LLAgentWearables::createStandardWearablesDone(S32 type, U32 index) { + llinfos << "type " << type << " index " << index << llendl; if (mAvatarObject) { mAvatarObject->updateVisualParams(); @@ -1206,6 +1291,8 @@ void LLAgentWearables::createStandardWearablesAllDone() { // ... because sendAgentWearablesUpdate will notify inventory // observers. + llinfos << "all done?" << llendl; + mWearablesLoaded = TRUE; checkWearablesLoaded(); @@ -1576,7 +1663,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it const LLDynamicArray< LLWearable* >& wearables, BOOL remove) { - lldebugs << "setWearableOutfit() start" << llendl; + llinfos << "setWearableOutfit() start" << llendl; BOOL wearables_to_remove[WT_COUNT]; wearables_to_remove[WT_SHAPE] = FALSE; @@ -1673,6 +1760,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it if (mAvatarObject) { mAvatarObject->updateVisualParams(); + mAvatarObject->invalidateAll(); } // Start rendering & update the server @@ -2152,7 +2240,7 @@ void LLAgentWearables::updateServer() void LLAgentWearables::populateMyOutfitsFolder(void) { - llinfos << "starting outfit populate" << llendl; + llinfos << "starting outfit population" << llendl; LLLibraryOutfitsFetch* outfits = new LLLibraryOutfitsFetch(); @@ -2224,17 +2312,28 @@ void LLLibraryOutfitsFetch::folderDone(void) LLInventoryModel::item_array_t wearable_array; gInventory.collectDescendents(mMyOutfitsID, cat_array, wearable_array, LLInventoryModel::EXCLUDE_TRASH); - // Early out if we already have items in My Outfits. if (cat_array.count() > 0 || wearable_array.count() > 0) { mOutfitsPopulated = true; return; } - + mClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING); mLibraryClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING, false, true); - + + // If Library->Clothing->Initial Outfits exists, use that. + LLNameCategoryCollector matchFolderFunctor("Initial Outfits"); + gInventory.collectDescendentsIf(mLibraryClothingID, + cat_array, wearable_array, + LLInventoryModel::EXCLUDE_TRASH, + matchFolderFunctor); + if (cat_array.count() > 0) + { + const LLViewerInventoryCategory *cat = cat_array.get(0); + mLibraryClothingID = cat->getUUID(); + } + mCompleteFolders.clear(); // Get the complete information on the items in the inventory. @@ -2265,31 +2364,28 @@ void LLLibraryOutfitsFetch::outfitsDone(void) { const LLViewerInventoryCategory *cat = iter->get(); - // Get the names and id's of every outfit in the library, except for ruth and other "misc" outfits. - if (cat->getName() != "More Outfits" && cat->getName() != "Ruth") + // Get the names and id's of every outfit in the library, skip "Ruth" + // because it's a low quality legacy outfit + if (cat->getName() != "Ruth") { // Get the name of every outfit in the library folders.push_back(cat->getUUID()); - mLibraryClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName())); + mLibraryClothingFolders.push_back(cat->getUUID()); } } - - // Collect the contents of your Inventory Clothing folder cat_array.clear(); wearable_array.clear(); - gInventory.collectDescendents(mClothingID, cat_array, wearable_array, - LLInventoryModel::EXCLUDE_TRASH); // Check if you already have an "Imported Library Clothing" folder - for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin(); - iter != cat_array.end(); - ++iter) + LLNameCategoryCollector matchFolderFunctor(mImportedClothingName); + gInventory.collectDescendentsIf(mClothingID, + cat_array, wearable_array, + LLInventoryModel::EXCLUDE_TRASH, + matchFolderFunctor); + if (cat_array.size() > 0) { - const LLViewerInventoryCategory *cat = iter->get(); - if (cat->getName() == mImportedClothingName) - { - mImportedClothingID = cat->getUUID(); - } + const LLViewerInventoryCategory *cat = cat_array.get(0); + mImportedClothingID = cat->getUUID(); } mCompleteFolders.clear(); @@ -2327,31 +2423,59 @@ private: LLLibraryOutfitsFetch * mLibraryOutfitsFetcher; }; +// Copy the clothing folders from the library into the imported clothing folder void LLLibraryOutfitsFetch::libraryDone(void) { - // Copy the clothing folders from the library into the imported clothing folder if necessary. - if (mImportedClothingID == LLUUID::null) + if (mImportedClothingID != LLUUID::null) { - gInventory.removeObserver(this); - LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this); - mImportedClothingID = gInventory.createNewCategory(mClothingID, - LLFolderType::FT_NONE, - mImportedClothingName); + // Skip straight to fetching the contents of the imported folder + importedFolderFetch(); + return; + } + + // Remove observer; next autopopulation step will be triggered externally by LLLibraryOutfitsCopyDone. + gInventory.removeObserver(this); + + LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this); + mImportedClothingID = gInventory.createNewCategory(mClothingID, + LLFolderType::FT_NONE, + mImportedClothingName); + // Copy each folder from library into clothing unless it already exists. + for (clothing_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin(); + iter != mLibraryClothingFolders.end(); + ++iter) + { + const LLUUID& src_folder_id = (*iter); // Library clothing folder ID + const LLViewerInventoryCategory *cat = gInventory.getCategory(src_folder_id); + if (!cat) + { + llwarns << "Library folder import for uuid:" << src_folder_id << " failed to find folder." << llendl; + continue; + } - for (cloth_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin(); - iter != mLibraryClothingFolders.end(); - ++iter) + if (!LLAppearanceManager::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id)) { - LLUUID folder_id = gInventory.createNewCategory(mImportedClothingID, - LLFolderType::FT_NONE, - iter->second); - LLAppearanceManager::getInstance()->shallowCopyCategoryContents(iter->first, folder_id, copy_waiter); + llinfos << "Skipping non-outfit folder name:" << cat->getName() << llendl; + continue; } - } - else - { - // Skip straight to fetching the contents of the imported folder - importedFolderFetch(); + + // Don't copy the category if it already exists. + LLNameCategoryCollector matchFolderFunctor(cat->getName()); + LLInventoryModel::cat_array_t cat_array; + LLInventoryModel::item_array_t wearable_array; + gInventory.collectDescendentsIf(mImportedClothingID, + cat_array, wearable_array, + LLInventoryModel::EXCLUDE_TRASH, + matchFolderFunctor); + if (cat_array.size() > 0) + { + continue; + } + + LLUUID dst_folder_id = gInventory.createNewCategory(mImportedClothingID, + LLFolderType::FT_NONE, + cat->getName()); + LLAppearanceManager::getInstance()->shallowCopyCategoryContents(src_folder_id, dst_folder_id, copy_waiter); } } @@ -2388,7 +2512,7 @@ void LLLibraryOutfitsFetch::importedFolderDone(void) // Get the name of every imported outfit folders.push_back(cat->getUUID()); - mImportedClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName())); + mImportedClothingFolders.push_back(cat->getUUID()); } mCompleteFolders.clear(); @@ -2404,17 +2528,25 @@ void LLLibraryOutfitsFetch::contentsDone(void) LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t wearable_array; - for (cloth_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin(); + for (clothing_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin(); folder_iter != mImportedClothingFolders.end(); ++folder_iter) { + const LLUUID &folder_id = (*folder_iter); + const LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id); + if (!cat) + { + llwarns << "Library folder import for uuid:" << folder_id << " failed to find folder." << llendl; + continue; + } + // First, make a folder in the My Outfits directory. - LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, folder_iter->second); + LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, cat->getName()); cat_array.clear(); wearable_array.clear(); // Collect the contents of each imported clothing folder, so we can create new outfit links for it - gInventory.collectDescendents(folder_iter->first, cat_array, wearable_array, + gInventory.collectDescendents(folder_id, cat_array, wearable_array, LLInventoryModel::EXCLUDE_TRASH); for (LLInventoryModel::item_array_t::const_iterator wearable_iter = wearable_array.begin(); @@ -2484,7 +2616,7 @@ class LLFetchAndLinkObserver: public LLInventoryFetchObserver public: LLFetchAndLinkObserver(LLInventoryFetchObserver::item_ref_t& ids): m_ids(ids), - LLInventoryFetchObserver(true) + LLInventoryFetchObserver(true) // retry for missing items { } ~LLFetchAndLinkObserver() @@ -2493,7 +2625,9 @@ public: virtual void done() { gInventory.removeObserver(this); + // Link to all fetched items in COF. + LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy; for (LLInventoryFetchObserver::item_ref_t::iterator it = m_ids.begin(); it != m_ids.end(); ++it) @@ -2505,8 +2639,13 @@ public: llwarns << "fetch failed!" << llendl; continue; } - link_inventory_item(gAgent.getID(), item->getLinkedUUID(), LLAppearanceManager::instance().getCOF(), item->getName(), - LLAssetType::AT_LINK, LLPointer<LLInventoryCallback>(NULL)); + + link_inventory_item(gAgent.getID(), + item->getLinkedUUID(), + LLAppearanceManager::instance().getCOF(), + item->getName(), + LLAssetType::AT_LINK, + link_waiter); } } private: @@ -2529,11 +2668,13 @@ void LLInitialWearablesFetch::processWearablesMessage() #ifdef USE_CURRENT_OUTFIT_FOLDER ids.push_back(wearable_data->mItemID); #endif - // Fetch the wearables - LLWearableList::instance().getAsset(wearable_data->mAssetID, - LLStringUtil::null, - LLWearableDictionary::getAssetType(wearable_data->mType), - LLAgentWearables::onInitialWearableAssetArrived, (void*)(wearable_data)); +#if 0 +// // Fetch the wearables +// LLWearableList::instance().getAsset(wearable_data->mAssetID, +// LLStringUtil::null, +// LLWearableDictionary::getAssetType(wearable_data->mType), +// LLAgentWearables::onInitialWearableAssetArrived, (void*)(wearable_data)); +#endif } else { diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 858540a5f5..a6b73997a6 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -89,7 +89,7 @@ public: const LLUUID getWearableItemID(EWearableType type, U32 index /*= 0*/) const; const LLUUID getWearableAssetID(EWearableType type, U32 index /*= 0*/) const; const LLWearable* getWearableFromItemID(const LLUUID& item_id) const; - const LLWearable* getWearableFromAssetID(const LLUUID& asset_id) const; + LLWearable* getWearableFromAssetID(const LLUUID& asset_id); LLInventoryItem* getWearableInventoryItem(EWearableType type, U32 index /*= 0*/); // MULTI-WEARABLE: assuming one per type. static BOOL selfHasWearable(EWearableType type); diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index eb4a47664b..f686eccf37 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -301,50 +301,52 @@ void LLOutfitFetch::done() delete this; } -class LLUpdateAppearanceOnDestroy: public LLInventoryCallback +LLUpdateAppearanceOnDestroy::LLUpdateAppearanceOnDestroy(): + mFireCount(0) { -public: - LLUpdateAppearanceOnDestroy(): - mFireCount(0) - { - } +} - virtual ~LLUpdateAppearanceOnDestroy() +LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy() +{ + llinfos << "done update appearance on destroy" << llendl; + + if (!LLApp::isExiting()) { - llinfos << "done update appearance on destroy" << llendl; - - if (!LLApp::isExiting()) - { - LLAppearanceManager::instance().updateAppearanceFromCOF(); - } + LLAppearanceManager::instance().updateAppearanceFromCOF(); } +} - /* virtual */ void fire(const LLUUID& inv_item) - { - llinfos << "callback fired" << llendl; - mFireCount++; - } -private: - U32 mFireCount; -}; +void LLUpdateAppearanceOnDestroy::fire(const LLUUID& inv_item) +{ + llinfos << "callback fired" << llendl; + mFireCount++; +} struct LLFoundData { - LLFoundData() : mAssetType(LLAssetType::AT_NONE), mWearable(NULL) {} + LLFoundData() : + mAssetType(LLAssetType::AT_NONE), + mWearableType(WT_INVALID), + mWearable(NULL) {} + LLFoundData(const LLUUID& item_id, - const LLUUID& asset_id, - const std::string& name, - LLAssetType::EType asset_type) : + const LLUUID& asset_id, + const std::string& name, + const LLAssetType::EType& asset_type, + const EWearableType& wearable_type + ) : mItemID(item_id), mAssetID(asset_id), mName(name), mAssetType(asset_type), + mWearableType(wearable_type), mWearable( NULL ) {} LLUUID mItemID; LLUUID mAssetID; std::string mName; LLAssetType::EType mAssetType; + EWearableType mWearableType; LLWearable* mWearable; }; @@ -355,14 +357,26 @@ public: LLWearableHoldingPattern(); ~LLWearableHoldingPattern(); - bool pollCompletion(); + bool pollFetchCompletion(); + void onFetchCompletion(); bool isFetchCompleted(); bool isTimedOut(); + + void checkMissingWearables(); + bool pollMissingWearables(); + bool isMissingCompleted(); + void recoverMissingWearable(EWearableType type); + void clearCOFLinksForMissingWearables(); + + void onAllComplete(); typedef std::list<LLFoundData> found_list_t; found_list_t mFoundList; LLInventoryModel::item_array_t mObjItems; LLInventoryModel::item_array_t mGestItems; + typedef std::set<S32> type_set_t; + type_set_t mTypesToRecover; + type_set_t mTypesToLink; S32 mResolved; LLTimer mWaitTime; bool mFired; @@ -389,16 +403,103 @@ bool LLWearableHoldingPattern::isTimedOut() return mWaitTime.getElapsedTimeF32() > max_wait_time; } -bool LLWearableHoldingPattern::pollCompletion() +void LLWearableHoldingPattern::checkMissingWearables() +{ + std::vector<S32> found_by_type(WT_COUNT,0); + std::vector<S32> requested_by_type(WT_COUNT,0); + for (found_list_t::iterator it = mFoundList.begin(); it != mFoundList.end(); ++it) + { + LLFoundData &data = *it; + if (data.mWearableType < WT_COUNT) + requested_by_type[data.mWearableType]++; + if (data.mWearable) + found_by_type[data.mWearableType]++; + } + + for (S32 type = 0; type < WT_COUNT; ++type) + { + llinfos << "type " << type << " requested " << requested_by_type[type] << " found " << found_by_type[type] << llendl; + if (found_by_type[type] > 0) + continue; + if ( + // Need to recover if at least one wearable of that type + // was requested but none was found (prevent missing + // pants) + (requested_by_type[type] > 0) || + // or if type is a body part and no wearables were found. + ((type == WT_SHAPE) || (type == WT_SKIN) || (type == WT_HAIR) || (type == WT_EYES))) + { + mTypesToRecover.insert(type); + mTypesToLink.insert(type); + recoverMissingWearable((EWearableType)type); + llwarns << "need to replace " << type << llendl; + } + } + + if (!pollMissingWearables()) + { + mWaitTime.reset(); + doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollMissingWearables,this)); + } +} + +void LLWearableHoldingPattern::onAllComplete() +{ + // Activate all gestures in this folder + if (mGestItems.count() > 0) + { + llinfos << "Activating " << mGestItems.count() << " gestures" << llendl; + + LLGestureManager::instance().activateGestures(mGestItems); + + // Update the inventory item labels to reflect the fact + // they are active. + LLViewerInventoryCategory* catp = + gInventory.getCategory(LLAppearanceManager::instance().getCOF()); + + if (catp) + { + gInventory.updateCategory(catp); + gInventory.notifyObservers(); + } + } + + // Update wearables. + llinfos << "Updating agent wearables with " << mResolved << " wearable items " << llendl; + LLAppearanceManager::instance().updateAgentWearables(this, false); + + // Update attachments to match those requested. + LLVOAvatar* avatar = gAgent.getAvatarObject(); + if( avatar ) + { + llinfos << "Updating " << mObjItems.count() << " attachments" << llendl; + LLAgentWearables::userUpdateAttachments(mObjItems); + } + + if (isFetchCompleted() && isMissingCompleted()) + { + // Only safe to delete if all wearable callbacks and all missing wearables completed. + delete this; + } +} + +void LLWearableHoldingPattern::onFetchCompletion() +{ + checkMissingWearables(); +} + +// Runs as an idle callback until all wearables are fetched (or we time out). +bool LLWearableHoldingPattern::pollFetchCompletion() { bool completed = isFetchCompleted(); bool timed_out = isTimedOut(); bool done = completed || timed_out; - - llinfos << "polling, done status: " << completed << " timed out? " << timed_out << " elapsed " << mWaitTime.getElapsedTimeF32() << llendl; if (done) { + llinfos << "polling, done status: " << completed << " timed out " << timed_out + << " elapsed " << mWaitTime.getElapsedTimeF32() << llendl; + mFired = true; if (timed_out) @@ -406,46 +507,196 @@ bool LLWearableHoldingPattern::pollCompletion() llwarns << "Exceeded max wait time for wearables, updating appearance based on what has arrived" << llendl; } - // Activate all gestures in this folder - if (mGestItems.count() > 0) + onFetchCompletion(); + } + return done; +} + +class RecoveredItemLinkCB: public LLInventoryCallback +{ +public: + RecoveredItemLinkCB(EWearableType type, LLWearable *wearable, LLWearableHoldingPattern* holder): + mHolder(holder), + mWearable(wearable), + mType(type) + { + } + void fire(const LLUUID& item_id) + { + llinfos << "Recovered item link for type " << mType << llendl; + mHolder->mTypesToLink.erase(mType); + // Add wearable to FoundData for actual wearing + LLViewerInventoryItem *item = gInventory.getItem(item_id); + LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL; + + if (linked_item) { - llinfos << "Activating " << mGestItems.count() << " gestures" << llendl; + gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); - LLGestureManager::instance().activateGestures(mGestItems); - - // Update the inventory item labels to reflect the fact - // they are active. - LLViewerInventoryCategory* catp = - gInventory.getCategory(LLAppearanceManager::instance().getCOF()); - - if (catp) + if (item) { - gInventory.updateCategory(catp); - gInventory.notifyObservers(); + LLFoundData found(linked_item->getUUID(), + linked_item->getAssetUUID(), + linked_item->getName(), + linked_item->getType(), + linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID + ); + found.mWearable = mWearable; + mHolder->mFoundList.push_front(found); } + else + { + llwarns << "inventory item not found for recovered wearable" << llendl; + } + } + else + { + llwarns << "inventory link not found for recovered wearable" << llendl; } + } +private: + LLWearableHoldingPattern* mHolder; + LLWearable *mWearable; + EWearableType mType; +}; - // Update wearables. - llinfos << "Updating agent wearables with " << mResolved << " wearable items " << llendl; - LLAppearanceManager::instance().updateAgentWearables(this, false); - - // Update attachments to match those requested. - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if( avatar ) +class RecoveredItemCB: public LLInventoryCallback +{ +public: + RecoveredItemCB(EWearableType type, LLWearable *wearable, LLWearableHoldingPattern* holder): + mHolder(holder), + mWearable(wearable), + mType(type) + { + } + void fire(const LLUUID& item_id) + { + llinfos << "Recovered item for type " << mType << llendl; + LLViewerInventoryItem *itemp = gInventory.getItem(item_id); + mWearable->setItemID(item_id); + LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder); + mHolder->mTypesToRecover.erase(mType); + llassert(itemp); + if (itemp) { - llinfos << "Updating " << mObjItems.count() << " attachments" << llendl; - LLAgentWearables::userUpdateAttachments(mObjItems); + link_inventory_item( gAgent.getID(), + item_id, + LLAppearanceManager::instance().getCOF(), + itemp->getName(), + LLAssetType::AT_LINK, + cb); } + } +private: + LLWearableHoldingPattern* mHolder; + LLWearable *mWearable; + EWearableType mType; +}; + +void LLWearableHoldingPattern::recoverMissingWearable(EWearableType type) +{ + // Try to recover by replacing missing wearable with a new one. + LLNotificationsUtil::add("ReplacedMissingWearable"); + lldebugs << "Wearable " << LLWearableDictionary::getTypeLabel(type) + << " could not be downloaded. Replaced inventory item with default wearable." << llendl; + LLWearable* wearable = LLWearableList::instance().createNewWearable(type); + + // Add a new one in the lost and found folder. + const LLUUID lost_and_found_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); + LLPointer<LLInventoryCallback> cb = new RecoveredItemCB(type,wearable,this); + + create_inventory_item(gAgent.getID(), + gAgent.getSessionID(), + lost_and_found_id, + wearable->getTransactionID(), + wearable->getName(), + wearable->getDescription(), + wearable->getAssetType(), + LLInventoryType::IT_WEARABLE, + wearable->getType(), + wearable->getPermissions().getMaskNextOwner(), + cb); +} + +bool LLWearableHoldingPattern::isMissingCompleted() +{ + return mTypesToLink.size()==0 && mTypesToRecover.size()==0; +} - if (completed) +void LLWearableHoldingPattern::clearCOFLinksForMissingWearables() +{ + for (found_list_t::iterator it = mFoundList.begin(); it != mFoundList.end(); ++it) + { + LLFoundData &data = *it; + if ((data.mWearableType < WT_COUNT) && (!data.mWearable)) { - // Only safe to delete if all wearable callbacks completed. - delete this; + // Wearable link that was never resolved; remove links to it from COF + llinfos << "removing link for unresolved item " << data.mItemID.asString() << llendl; + LLAppearanceManager::instance().removeCOFItemLinks(data.mItemID,false); } } +} + +bool LLWearableHoldingPattern::pollMissingWearables() +{ + bool timed_out = isTimedOut(); + bool missing_completed = isMissingCompleted(); + bool done = timed_out || missing_completed; + + llinfos << "polling missing wearables, waiting for items " << mTypesToRecover.size() + << " links " << mTypesToLink.size() + << " wearables, timed out " << timed_out + << " elapsed " << mWaitTime.getElapsedTimeF32() + << " done " << done << llendl; + + if (done) + { + clearCOFLinksForMissingWearables(); + onAllComplete(); + } return done; } +static void onWearableAssetFetch(LLWearable* wearable, void* data) +{ + LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data; + holder->mResolved += 1; // just counting callbacks, not successes. + llinfos << "onWearableAssetFetch, resolved count " << holder->mResolved << " of requested " << holder->mFoundList.size() << llendl; + if (wearable) + { + llinfos << "wearable found, type " << wearable->getType() << " asset " << wearable->getAssetID() << llendl; + } + else + { + llwarns << "no wearable found" << llendl; + } + + if (holder->mFired) + { + llwarns << "called after holder fired" << llendl; + return; + } + + if (!wearable) + { + return; + } + + for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin(); + iter != holder->mFoundList.end(); ++iter) + { + LLFoundData& data = *iter; + if(wearable->getAssetID() == data.mAssetID) + { + data.mWearable = wearable; + // Failing this means inventory or asset server are corrupted in a way we don't handle. + llassert((data.mWearableType < WT_COUNT) && (wearable->getType() == data.mWearableType)); + break; + } + } +} + + static void removeDuplicateItems(LLInventoryModel::item_array_t& items) { LLInventoryModel::item_array_t new_items; @@ -473,30 +724,6 @@ static void removeDuplicateItems(LLInventoryModel::item_array_t& items) items = new_items; } -static void onWearableAssetFetch(LLWearable* wearable, void* data) -{ - LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data; - if (holder->mFired) - { - llwarns << "called after holder fired" << llendl; - } - - if(wearable) - { - for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin(); - iter != holder->mFoundList.end(); ++iter) - { - LLFoundData& data = *iter; - if(wearable->getAssetID() == data.mAssetID) - { - data.mWearable = wearable; - break; - } - } - } - holder->mResolved += 1; -} - const LLUUID LLAppearanceManager::getCOF() const { return gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT); @@ -581,47 +808,91 @@ void LLAppearanceManager::shallowCopyCategory(const LLUUID& src_id, const LLUUID void LLAppearanceManager::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, LLPointer<LLInventoryCallback> cb) { - LLInventoryModel::cat_array_t cats; - LLInventoryModel::item_array_t items; - gInventory.collectDescendents(src_id, cats, items, - LLInventoryModel::EXCLUDE_TRASH); - for (S32 i = 0; i < items.count(); ++i) - { - const LLViewerInventoryItem* item = items.get(i).get(); - if (item->getActualType() == LLAssetType::AT_LINK) - { - link_inventory_item(gAgent.getID(), - item->getLinkedUUID(), - dst_id, - item->getName(), - LLAssetType::AT_LINK, cb); - } - else if (item->getActualType() == LLAssetType::AT_LINK_FOLDER) + LLInventoryModel::cat_array_t* cats; + LLInventoryModel::item_array_t* items; + gInventory.getDirectDescendentsOf(src_id, cats, items); + for (LLInventoryModel::item_array_t::const_iterator iter = items->begin(); + iter != items->end(); + ++iter) + { + const LLViewerInventoryItem* item = (*iter); + switch (item->getActualType()) { - LLViewerInventoryCategory *catp = item->getLinkedCategory(); - // Skip copying outfit links. - if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT) + case LLAssetType::AT_LINK: { link_inventory_item(gAgent.getID(), item->getLinkedUUID(), dst_id, item->getName(), - LLAssetType::AT_LINK_FOLDER, cb); + LLAssetType::AT_LINK, cb); + break; + } + case LLAssetType::AT_LINK_FOLDER: + { + LLViewerInventoryCategory *catp = item->getLinkedCategory(); + // Skip copying outfit links. + if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT) + { + link_inventory_item(gAgent.getID(), + item->getLinkedUUID(), + dst_id, + item->getName(), + LLAssetType::AT_LINK_FOLDER, cb); + } + break; } + case LLAssetType::AT_CLOTHING: + case LLAssetType::AT_OBJECT: + case LLAssetType::AT_BODYPART: + case LLAssetType::AT_GESTURE: + { + copy_inventory_item(gAgent.getID(), + item->getPermissions().getOwner(), + item->getUUID(), + dst_id, + item->getName(), + cb); + break; + } + default: + // Ignore non-outfit asset types + break; } - else + } +} + +BOOL LLAppearanceManager::getCanMakeFolderIntoOutfit(const LLUUID& folder_id) +{ + // These are the wearable items that are required for considering this + // folder as containing a complete outfit. + U32 required_wearables = 0; + required_wearables |= 1LL << WT_SHAPE; + required_wearables |= 1LL << WT_SKIN; + required_wearables |= 1LL << WT_HAIR; + required_wearables |= 1LL << WT_EYES; + + // These are the wearables that the folder actually contains. + U32 folder_wearables = 0; + LLInventoryModel::cat_array_t* cats; + LLInventoryModel::item_array_t* items; + gInventory.getDirectDescendentsOf(folder_id, cats, items); + for (LLInventoryModel::item_array_t::const_iterator iter = items->begin(); + iter != items->end(); + ++iter) + { + const LLViewerInventoryItem* item = (*iter); + if (item->isWearableType()) { - copy_inventory_item( - gAgent.getID(), - item->getPermissions().getOwner(), - item->getUUID(), - dst_id, - item->getName(), - cb); + const EWearableType wearable_type = item->getWearableType(); + folder_wearables |= 1LL << wearable_type; } } + + // If the folder contains the required wearables, return TRUE. + return ((required_wearables & folder_wearables) == required_wearables); } + void LLAppearanceManager::purgeBaseOutfitLink(const LLUUID& category) { LLInventoryModel::cat_array_t cats; @@ -718,7 +989,8 @@ void LLAppearanceManager::linkAll(const LLUUID& category, void LLAppearanceManager::updateCOF(const LLUUID& category, bool append) { - llinfos << "starting" << llendl; + LLViewerInventoryCategory *pcat = gInventory.getCategory(category); + llinfos << "starting, cat " << (pcat ? pcat->getName() : "[UNKNOWN]") << llendl; const LLUUID cof = getCOF(); @@ -893,6 +1165,9 @@ void LLAppearanceManager::updateAppearanceFromCOF() // wearables can be resolved immediately, then the // callback will be called (and this object deleted) // before the final getNextData(). + + // BAP future cleanup - no point having found_container when + // mFoundList already has all the info. LLDynamicArray<LLFoundData> found_container; for(S32 i = 0; i < wear_items.count(); ++i) { @@ -903,7 +1178,21 @@ void LLAppearanceManager::updateAppearanceFromCOF() LLFoundData found(linked_item->getUUID(), linked_item->getAssetUUID(), linked_item->getName(), - linked_item->getType()); + linked_item->getType(), + linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID + ); + +#if 0 + // Fault injection: uncomment this block to test asset + // fetch failures (should be replaced by new defaults in + // lost&found). + if (found.mWearableType == WT_SHAPE || found.mWearableType == WT_JACKET) + { + found.mAssetID.generate(); // Replace with new UUID, guaranteed not to exist in DB + + } +#endif + holder->mFoundList.push_front(found); found_container.put(found); } @@ -923,7 +1212,9 @@ void LLAppearanceManager::updateAppearanceFromCOF() for(S32 i = 0; i < found_container.count(); ++i) { LLFoundData& found = found_container.get(i); - + + llinfos << "waiting for onWearableAssetFetch callback, asset " << found.mAssetID.asString() << llendl; + // Fetch the wearables about to be worn. LLWearableList::instance().getAsset(found.mAssetID, found.mName, @@ -933,9 +1224,9 @@ void LLAppearanceManager::updateAppearanceFromCOF() } - if (!holder->pollCompletion()) + if (!holder->pollFetchCompletion()) { - doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollCompletion,holder)); + doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollFetchCompletion,holder)); } } diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 28b51ee0f6..9d6cd34ad7 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -60,6 +60,9 @@ public: void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, LLPointer<LLInventoryCallback> cb); + // Return whether this folder contains minimal contents suitable for making a full outfit. + BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id); + // Copy all items in a category. void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, LLPointer<LLInventoryCallback> cb); @@ -151,6 +154,18 @@ public: BOOL getIsProtectedCOFItem(const LLUUID& obj_id) const; }; +class LLUpdateAppearanceOnDestroy: public LLInventoryCallback +{ +public: + LLUpdateAppearanceOnDestroy(); + virtual ~LLUpdateAppearanceOnDestroy(); + /* virtual */ void fire(const LLUUID& inv_item); + +private: + U32 mFireCount; +}; + + #define SUPPORT_ENSEMBLES 0 LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id,const std::string& name); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 00a9e4d745..bdfe0d9142 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -304,7 +304,8 @@ static std::string gLaunchFileOnQuit; // Used on Win32 for other apps to identify our window (eg, win_setup) const char* const VIEWER_WINDOW_CLASSNAME = "Second Life"; - +static const S32 FIRST_RUN_WINDOW_WIDTH = 1024; +static const S32 FIRST_RUN_WINDOW_HIGHT = 768; //---------------------------------------------------------------------------- // List of entries from strings.xml to always replace @@ -702,9 +703,9 @@ bool LLAppViewer::init() settings_map["account"] = &gSavedPerAccountSettings; LLUI::initClass(settings_map, - LLUIImageList::getInstance(), - ui_audio_callback, - &LLUI::sGLScaleFactor); + LLUIImageList::getInstance(), + ui_audio_callback, + &LLUI::sGLScaleFactor); // Setup paths and LLTrans after LLUI::initClass has been called LLUI::setupPaths(); @@ -1515,7 +1516,7 @@ bool LLAppViewer::cleanup() LLAvatarIconIDCache::getInstance()->save(); llinfos << "Shutting down Threads" << llendflush; - + // Let threads finish LLTimer idleTimer; idleTimer.reset(); @@ -1529,19 +1530,26 @@ bool LLAppViewer::cleanup() pending += LLVFSThread::updateClass(0); pending += LLLFSThread::updateClass(0); F64 idle_time = idleTimer.getElapsedTimeF64(); - if (!pending || idle_time >= max_idle_time) + if(!pending) + { + break ; //done + } + else if(idle_time >= max_idle_time) { llwarns << "Quitting with pending background tasks." << llendl; break; } } - + // Delete workers first // shotdown all worker threads before deleting them in case of co-dependencies sTextureCache->shutdown(); sTextureFetch->shutdown(); sImageDecodeThread->shutdown(); + sTextureFetch->shutDownTextureCacheThread() ; + sTextureFetch->shutDownImageDecodeThread() ; + delete sTextureCache; sTextureCache = NULL; delete sTextureFetch; @@ -2362,12 +2370,35 @@ bool LLAppViewer::initWindow() // store setting in a global for easy access and modification gNoRender = gSavedSettings.getBOOL("DisableRendering"); + S32 window_x = gSavedSettings.getS32("WindowX"); + S32 window_y = gSavedSettings.getS32("WindowY"); + S32 window_width = gSavedSettings.getS32("WindowWidth"); + S32 window_height = gSavedSettings.getS32("WindowHeight"); + + bool show_maximized = gSavedSettings.getBOOL("WindowMaximized"); + + bool first_run = gSavedSettings.getBOOL("FirstLoginThisInstall"); + + if (first_run)//for first login + { + window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded + window_height = FIRST_RUN_WINDOW_HIGHT; + + //if screen resolution is lower then 1024*768 then show maximized + LLDisplayInfo display_info; + if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH + || display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HIGHT) + { + show_maximized = true; + } + } + // always start windowed BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); gViewerWindow = new LLViewerWindow(gWindowTitle, VIEWER_WINDOW_CLASSNAME, - gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), - gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), + window_x, window_y, + window_width, window_height, FALSE, ignorePixelDepth); LLNotificationsUI::LLNotificationManager::getInstance(); @@ -2378,7 +2409,7 @@ bool LLAppViewer::initWindow() gViewerWindow->toggleFullscreen(FALSE); } - if (gSavedSettings.getBOOL("WindowMaximized")) + if (show_maximized) { gViewerWindow->mWindow->maximize(); gViewerWindow->getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio")); @@ -3593,13 +3624,15 @@ void LLAppViewer::idle() { // Handle pending gesture processing + static LLFastTimer::DeclareTimer ftm("Agent Position"); + LLFastTimer t(ftm); LLGestureManager::instance().update(); gAgent.updateAgentPosition(gFrameDTClamped, yaw, current_mouse.mX, current_mouse.mY); } { - LLFastTimer t(FTM_OBJECTLIST_UPDATE); // Actually "object update" + LLFastTimer t(FTM_OBJECTLIST_UPDATE); if (!(logoutRequestSent() && hasSavedFinalSnapshot())) { @@ -3633,6 +3666,8 @@ void LLAppViewer::idle() // { + static LLFastTimer::DeclareTimer ftm("HUD Effects"); + LLFastTimer t(ftm); LLSelectMgr::getInstance()->updateEffects(); LLHUDManager::getInstance()->cleanupEffects(); LLHUDManager::getInstance()->sendEffects(); @@ -3889,7 +3924,7 @@ void LLAppViewer::sendLogoutRequest() static F32 CheckMessagesMaxTime = CHECK_MESSAGES_DEFAULT_MAX_TIME; #endif -static LLFastTimer::DeclareTimer FTM_IDLE_NETWORK("Network"); +static LLFastTimer::DeclareTimer FTM_IDLE_NETWORK("Idle Network"); void LLAppViewer::idleNetwork() { diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index f8f8f50cd6..80d9b14345 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -392,7 +392,12 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze) _exit(1); } - // TODO:palmer REMOVE THIS VERY SOON. THIS WILL NOT BE IN VIEWER 2.0 + // TODO from palmer: Find a better way to handle managing old crash logs + // when this is a separate imbedable module. Ideally just sort crash stack + // logs based on date, and grab the latest one as opposed to deleting them + // for thoughts on what the module would look like. + // See: https://wiki.lindenlab.com/wiki/Viewer_Crash_Reporter_Round_4 + // Remove the crash stack log from previous executions. // Since we've started logging a new instance of the app, we can assume // The old crash stack is invalid for the next crash report. diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 1d75374930..e6666c7f83 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -50,6 +50,7 @@ #include "llfloatergroups.h" #include "llfloaterreg.h" #include "llfloaterpay.h" +#include "llfloaterworldmap.h" #include "llinventorymodel.h" // for gInventory.findCategoryUUIDForType #include "llimview.h" // for gIMMgr #include "llmutelist.h" @@ -317,6 +318,20 @@ void LLAvatarActions::showProfile(const LLUUID& id) } // static +void LLAvatarActions::showOnMap(const LLUUID& id) +{ + std::string name; + if (!gCacheName->getFullName(id, name)) + { + gCacheName->get(id, FALSE, boost::bind(&LLAvatarActions::showOnMap, id)); + return; + } + + gFloaterWorldMap->trackAvatar(id, name); + LLFloaterReg::showInstance("world_map"); +} + +// static void LLAvatarActions::pay(const LLUUID& id) { LLNotification::Params params("BusyModePay"); diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 16a58718a2..a7f3acad4f 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -99,6 +99,11 @@ public: static void showProfile(const LLUUID& id); /** + * Show avatar on world map. + */ + static void showOnMap(const LLUUID& id); + + /** * Give money to the avatar. */ static void pay(const LLUUID& id); diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 6784e6693b..45c540b3a3 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -183,6 +183,15 @@ void LLAvatarList::sortByName() sort(); } +void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/) +{ + mDirty = val; + if(mDirty && force_refresh) + { + refresh(); + } +} + ////////////////////////////////////////////////////////////////////////// // PROTECTED SECTION ////////////////////////////////////////////////////////////////////////// @@ -329,7 +338,7 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is { LLAvatarListItem* item = new LLAvatarListItem(); item->setName(name); - item->setAvatarId(id, mIgnoreOnlineStatus); + item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus); item->setOnline(mIgnoreOnlineStatus ? true : is_online); item->showLastInteractionTime(mShowLastInteractionTime); diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index aeed4fee08..00c72f1f9d 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -73,11 +73,13 @@ public: virtual void clear(); void setNameFilter(const std::string& filter); - void setDirty(bool val = true) { mDirty = val; } + void setDirty(bool val = true, bool force_refresh = false); uuid_vector_t& getIDs() { return mIDs; } bool contains(const LLUUID& id); void setContextMenu(LLAvatarListItem::ContextMenu* menu) { mContextMenu = menu; } + void setSessionID(const LLUUID& session_id) { mSessionID = session_id; } + const LLUUID& getSessionID() { return mSessionID; } void toggleIcons(); void setSpeakingIndicatorsVisible(bool visible); @@ -119,6 +121,7 @@ private: std::string mIconParamName; std::string mNameFilter; uuid_vector_t mIDs; + LLUUID mSessionID; LLAvatarListItem::ContextMenu* mContextMenu; diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 846b2843dd..9645e75e60 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -211,14 +211,14 @@ void LLAvatarListItem::setState(EItemState item_style) mAvatarIcon->setColor(item_icon_color_map[item_style]); } -void LLAvatarListItem::setAvatarId(const LLUUID& id, bool ignore_status_changes) +void LLAvatarListItem::setAvatarId(const LLUUID& id, const LLUUID& session_id, bool ignore_status_changes) { if (mAvatarId.notNull()) LLAvatarTracker::instance().removeParticularFriendObserver(mAvatarId, this); mAvatarId = id; mAvatarIcon->setValue(id); - mSpeakingIndicator->setSpeakerId(id); + mSpeakingIndicator->setSpeakerId(id, session_id); // We'll be notified on avatar online status changes if (!ignore_status_changes && mAvatarId.notNull()) @@ -526,21 +526,30 @@ void LLAvatarListItem::updateChildren() LLView* LLAvatarListItem::getItemChildView(EAvatarListItemChildIndex child_view_index) { LLView* child_view = mAvatarName; - if (child_view_index < 0 || ALIC_COUNT <= child_view_index) - { - LL_WARNS("AvatarItemReshape") << "Child view index is out of range: " << child_view_index << LL_ENDL; - return child_view; - } + switch (child_view_index) { - case ALIC_ICON: child_view = mAvatarIcon; break; - case ALIC_NAME: child_view = mAvatarName; break; - case ALIC_INTERACTION_TIME: child_view = mLastInteractionTime; break; - case ALIC_SPEAKER_INDICATOR: child_view = mSpeakingIndicator; break; - case ALIC_INFO_BUTTON: child_view = mInfoBtn; break; - case ALIC_PROFILE_BUTTON: child_view = mProfileBtn; break; + case ALIC_ICON: + child_view = mAvatarIcon; + break; + case ALIC_NAME: + child_view = mAvatarName; + break; + case ALIC_INTERACTION_TIME: + child_view = mLastInteractionTime; + break; + case ALIC_SPEAKER_INDICATOR: + child_view = mSpeakingIndicator; + break; + case ALIC_INFO_BUTTON: + child_view = mInfoBtn; + break; + case ALIC_PROFILE_BUTTON: + child_view = mProfileBtn; + break; default: LL_WARNS("AvatarItemReshape") << "Unexpected child view index is passed: " << child_view_index << LL_ENDL; + // leave child_view untouched } return child_view; diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 426d80e0a8..cecb64add7 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -100,7 +100,7 @@ public: void setName(const std::string& name); void setHighlight(const std::string& highlight); void setState(EItemState item_style); - void setAvatarId(const LLUUID& id, bool ignore_status_changes = false); + void setAvatarId(const LLUUID& id, const LLUUID& session_id, bool ignore_status_changes = false); void setLastInteractionTime(U32 secs_since); //Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly void setShowProfileBtn(bool show); diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 93b708f299..b88be53d79 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -60,6 +60,38 @@ namespace const std::string& PANEL_MOVEMENT_NAME = "movement_panel"; const std::string& PANEL_CAMERA_NAME = "cam_panel"; const std::string& PANEL_GESTURE_NAME = "gesture_panel"; + + S32 get_panel_min_width(LLLayoutStack* stack, LLPanel* panel) + { + S32 minimal_width = 0; + llassert(stack); + if ( stack && panel && panel->getVisible() ) + { + stack->getPanelMinSize(panel->getName(), &minimal_width, NULL); + } + return minimal_width; + } + + S32 get_panel_max_width(LLLayoutStack* stack, LLPanel* panel) + { + S32 max_width = 0; + llassert(stack); + if ( stack && panel && panel->getVisible() ) + { + stack->getPanelMaxSize(panel->getName(), &max_width, NULL); + } + return max_width; + } + + S32 get_curr_width(LLUICtrl* ctrl) + { + S32 cur_width = 0; + if ( ctrl && ctrl->getVisible() ) + { + cur_width = ctrl->getRect().getWidth(); + } + return cur_width; + } } class LLBottomTrayLite @@ -329,7 +361,7 @@ void LLBottomTray::setVisible(BOOL visible) { mBottomTrayLite->setVisible(visible); } - else + else { LLPanel::setVisible(visible); } @@ -401,6 +433,18 @@ void LLBottomTray::showSnapshotButton(BOOL visible) setTrayButtonVisibleIfPossible(RS_BUTTON_SNAPSHOT, visible); } +void LLBottomTray::toggleMovementControls() +{ + if (mMovementButton) + mMovementButton->onCommit(); +} + +void LLBottomTray::toggleCameraControls() +{ + if (mCamButton) + mCamButton->onCommit(); +} + BOOL LLBottomTray::postBuild() { @@ -639,7 +683,7 @@ S32 LLBottomTray::processWidthDecreased(S32 delta_width) } const S32 chatbar_panel_width = mNearbyChatBar->getRect().getWidth(); - const S32 chatbar_panel_min_width = mNearbyChatBar->getMinWidth(); + const S32 chatbar_panel_min_width = get_panel_min_width(mToolbarStack, mNearbyChatBar); if (still_should_be_processed && chatbar_panel_width > chatbar_panel_min_width) { // we have some space to decrease chatbar panel @@ -712,11 +756,11 @@ void LLBottomTray::processWidthIncreased(S32 delta_width) if (delta_width <= 0) return; const S32 chiclet_panel_width = mChicletPanel->getParent()->getRect().getWidth(); - const S32 chiclet_panel_min_width = mChicletPanel->getMinWidth(); + static const S32 chiclet_panel_min_width = mChicletPanel->getMinWidth(); const S32 chatbar_panel_width = mNearbyChatBar->getRect().getWidth(); - const S32 chatbar_panel_min_width = mNearbyChatBar->getMinWidth(); - const S32 chatbar_panel_max_width = mNearbyChatBar->getMaxWidth(); + static const S32 chatbar_panel_min_width = get_panel_min_width(mToolbarStack, mNearbyChatBar); + static const S32 chatbar_panel_max_width = get_panel_max_width(mToolbarStack, mNearbyChatBar); const S32 chatbar_available_shrink_width = chatbar_panel_width - chatbar_panel_min_width; const S32 available_width_chiclet = chiclet_panel_width - chiclet_panel_min_width; @@ -893,13 +937,12 @@ void LLBottomTray::processShrinkButtons(S32* required_width, S32* buttons_freed_ } else { - // - mSpeakBtn->setLabelVisible(false); S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_shrink_width = panel_width - panel_min_width; if (possible_shrink_width > 0) { + mSpeakBtn->setLabelVisible(false); mSpeakPanel->reshape(panel_width - possible_shrink_width, mSpeakPanel->getRect().getHeight()); *required_width += possible_shrink_width; @@ -974,18 +1017,18 @@ void LLBottomTray::processExtendButtons(S32* available_width) if (*available_width > 0) { - processExtendButton(RS_BUTTON_CAMERA, available_width); + processExtendButton(RS_BUTTON_MOVEMENT, available_width); } if (*available_width > 0) { - processExtendButton(RS_BUTTON_MOVEMENT, available_width); + processExtendButton(RS_BUTTON_CAMERA, available_width); } if (*available_width > 0) { S32 panel_max_width = mObjectDefaultWidthMap[RS_BUTTON_SPEAK]; S32 panel_width = mSpeakPanel->getRect().getWidth(); S32 possible_extend_width = panel_max_width - panel_width; - if (possible_extend_width > 0 && possible_extend_width <= *available_width) + if (possible_extend_width >= 0 && possible_extend_width <= *available_width) // HACK: this button doesn't change size so possible_extend_width will be 0 { mSpeakBtn->setLabelVisible(true); mSpeakPanel->reshape(panel_max_width, mSpeakPanel->getRect().getHeight()); @@ -1094,58 +1137,131 @@ void LLBottomTray::setTrayButtonVisible(EResizeState shown_object_type, bool vis if (mDummiesMap.count(shown_object_type)) { - mDummiesMap[shown_object_type]->setVisible(visible); + // Hide/show layout panel for dummy icon. + mDummiesMap[shown_object_type]->getParent()->setVisible(visible); } } void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible, bool raise_notification) { - bool can_be_set = true; - - if (visible) + if (!setVisibleAndFitWidths(shown_object_type, visible) && visible && raise_notification) { - LLPanel* panel = mStateProcessedObjectMap[shown_object_type]; - if (NULL == panel) - { - lldebugs << "There is no object to process for state: " << shown_object_type << llendl; - return; - } + LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown", + LLSD(), + LLSD(), + LLNotificationFunctorRegistry::instance().DONOTHING); + } +} - const S32 dummy_width = mDummiesMap.count(shown_object_type) ? mDummiesMap[shown_object_type]->getRect().getWidth() : 0; +bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible) +{ + LLPanel* cur_panel = mStateProcessedObjectMap[object_type]; + if (NULL == cur_panel) + { + lldebugs << "There is no object to process for state: " << object_type << llendl; + return false; + } - const S32 chatbar_panel_width = mNearbyChatBar->getRect().getWidth(); - const S32 chatbar_panel_min_width = mNearbyChatBar->getMinWidth(); + const S32 dummy_width = mDummiesMap.count(object_type) + ? mDummiesMap[object_type]->getParent()->getRect().getWidth() + : 0; - const S32 chiclet_panel_width = mChicletPanel->getParent()->getRect().getWidth(); - const S32 chiclet_panel_min_width = mChicletPanel->getMinWidth(); + bool is_set = true; - const S32 available_width = (chatbar_panel_width - chatbar_panel_min_width) - + (chiclet_panel_width - chiclet_panel_min_width); + if (visible) + { + // Assume that only chiclet panel can be auto-resized and + // don't take into account width of dummy widgets + const S32 available_width = + mChicletPanel->getParent()->getRect().getWidth() - + mChicletPanel->getMinWidth() - + dummy_width; + + S32 preferred_width = mObjectDefaultWidthMap[object_type]; + S32 current_width = cur_panel->getRect().getWidth(); + S32 result_width = 0; + bool decrease_width = false; + + // Mark this button to be shown + mResizeState |= object_type; + + if (preferred_width > 0 && available_width >= preferred_width) + { + result_width = preferred_width; + } + else if (available_width >= current_width) + { + result_width = current_width; + } + else + { + // Calculate the possible shrunk width as difference between current and minimal widths + const S32 chatbar_shrunk_width = + mNearbyChatBar->getRect().getWidth() - get_panel_min_width(mToolbarStack, mNearbyChatBar); + + const S32 sum_of_min_widths = + get_panel_min_width(mToolbarStack, mStateProcessedObjectMap[RS_BUTTON_CAMERA]) + + get_panel_min_width(mToolbarStack, mStateProcessedObjectMap[RS_BUTTON_MOVEMENT]) + + get_panel_min_width(mToolbarStack, mStateProcessedObjectMap[RS_BUTTON_GESTURES]) + + get_panel_min_width(mToolbarStack, mSpeakPanel); + + const S32 sum_of_curr_widths = + get_curr_width(mStateProcessedObjectMap[RS_BUTTON_CAMERA]) + + get_curr_width(mStateProcessedObjectMap[RS_BUTTON_MOVEMENT]) + + get_curr_width(mStateProcessedObjectMap[RS_BUTTON_GESTURES]) + + get_curr_width(mSpeakPanel); + + const S32 possible_shrunk_width = + chatbar_shrunk_width + (sum_of_curr_widths - sum_of_min_widths); + + // Minimal width of current panel + S32 minimal_width = 0; + mToolbarStack->getPanelMinSize(cur_panel->getName(), &minimal_width, NULL); + + if ( (available_width + possible_shrunk_width) >= minimal_width) + { + // There is enough space for minimal width, but set the result_width + // to preferred_width so buttons widths decreasing will be done in predefined order + result_width = (preferred_width > 0) ? preferred_width : current_width; + decrease_width = true; + } + else + { + // Nothing can be done, give up... + return false; + } + } - const S32 required_width = panel->getRect().getWidth() + dummy_width; - can_be_set = available_width >= required_width; - } + if (result_width != current_width) + { + cur_panel->reshape(result_width, cur_panel->getRect().getHeight()); + current_width = result_width; + } - if (can_be_set) - { - setTrayButtonVisible(shown_object_type, visible); + is_set = processShowButton(object_type, ¤t_width); - // if we hide the button mark it NOT to show while future bottom tray extending - if (!visible) + // Shrink buttons if needed + if (is_set && decrease_width) { - mResizeState &= ~shown_object_type; + processWidthDecreased( -result_width - dummy_width ); } } else { - // mark this button to show it while future bottom tray extending - mResizeState |= shown_object_type; - if ( raise_notification ) - LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown", - LLSD(), - LLSD(), - LLNotificationFunctorRegistry::instance().DONOTHING); + const S32 delta_width = get_curr_width(cur_panel); + + setTrayButtonVisible(object_type, false); + + // Mark button NOT to show while future bottom tray extending + mResizeState &= ~object_type; + + // Extend other buttons if need + if (delta_width) + { + processWidthIncreased(delta_width + dummy_width); + } } + return is_set; } //EOF diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index ee0eb13218..18c14e5e19 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -94,6 +94,9 @@ public: void showCameraButton(BOOL visible); void showSnapshotButton(BOOL visible); + void toggleMovementControls(); + void toggleCameraControls(); + void onMouselookModeIn(); void onMouselookModeOut(); @@ -173,6 +176,14 @@ private: */ void setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible, bool raise_notification = true); + /** + * Sets passed visibility to required button and fit widths of shown + * buttons(notice that method can shrink widths to + * allocate needed room in bottom tray). + * Returns true if visibility of required button was set. + */ + bool setVisibleAndFitWidths(EResizeState object_type, bool visible); + MASK mResizeState; typedef std::map<EResizeState, LLPanel*> state_object_map_t; diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 76e058a1c3..c8552de66a 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -115,6 +115,9 @@ LLCallFloater::LLCallFloater(const LLSD& key) mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL); LLVoiceClient::getInstance()->addObserver(this); LLTransientFloaterMgr::getInstance()->addControlView(this); + + // force docked state since this floater doesn't save it between recreations + setDocked(true); } LLCallFloater::~LLCallFloater() diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index dac4390fa7..0a8ea7de39 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -260,6 +260,10 @@ private: * @see sOnCurrentChannelChanged() */ static LLVoiceChannel* sCurrentVoiceCanel; + + /* virtual */ + LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::IM; } + boost::signals2::connection mVoiceChannelStateChangeConnection; }; diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index c3bda26aac..79a2631c31 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -682,17 +682,24 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) } BOOL notify = FALSE; LLSD args; + LLSD payload; for(S32 i = 0; i < count; ++i) { msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_AgentID, agent_id, i); + payload["FROM_ID"] = agent_id; info = getBuddyInfo(agent_id); if(info) { setBuddyOnline(agent_id,online); if(chat_notify) { - notify = TRUE; - args["NAME_SLURL"] = LLSLURL::buildCommand("agent", agent_id, "about"); + std::string first, last; + if(gCacheName->getName(agent_id, first, last)) + { + notify = TRUE; + args["FIRST"] = first; + args["LAST"] = last; + } } } else @@ -719,13 +726,13 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) notification = LLNotificationsUtil::add("FriendOnline", args, - LLSD().with("respond_on_mousedown", TRUE), + payload.with("respond_on_mousedown", TRUE), boost::bind(&LLAvatarActions::startIM, agent_id)); } else { notification = - LLNotificationsUtil::add("FriendOffline", args); + LLNotificationsUtil::add("FriendOffline", args, payload); } // If there's an open IM session with this agent, send a notification there too. diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 9368d9cb7c..e1c96d4a16 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -66,7 +66,8 @@ static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history"); const static std::string NEW_LINE(rawstr_to_utf8("\n")); -const static U32 LENGTH_OF_TIME_STR = std::string("12:00").length(); +const static std::string SLURL_APP_AGENT = "secondlife:///app/agent/"; +const static std::string SLURL_ABOUT = "/about"; // support for secondlife:///app/objectim/{UUID}/ SLapps class LLObjectIMHandler : public LLCommandHandler @@ -115,34 +116,6 @@ public: return LLPanel::handleMouseUp(x,y,mask); } - //*TODO remake it using mouse enter/leave and static LLHandle<LLIconCtrl> to add/remove as a child - BOOL handleToolTip(S32 x, S32 y, MASK mask) - { - LLTextBase* name = getChild<LLTextBase>("user_name"); - if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom) - { - - // Spawn at right side of the name textbox. - LLRect sticky_rect = name->calcScreenRect(); - S32 icon_x = llmin(sticky_rect.mLeft + name->getTextBoundingRect().getWidth() + 7, sticky_rect.mRight - 3); - - LLToolTip::Params params; - params.background_visible(false); - params.click_callback(boost::bind(&LLChatHistoryHeader::onHeaderPanelClick, this, 0, 0, 0)); - params.delay_time(0.0f); // spawn instantly on hover - params.image(LLUI::getUIImage("Info_Small")); - params.message(""); - params.padding(0); - params.pos(LLCoordGL(icon_x, sticky_rect.mTop - 2)); - params.sticky_rect(sticky_rect); - - LLToolTipMgr::getInstance()->show(params); - return TRUE; - } - - return LLPanel::handleToolTip(x, y, mask); - } - void onObjectIconContextMenuItemClicked(const LLSD& userdata) { std::string level = userdata.asString(); @@ -176,12 +149,7 @@ public: } else if (level == "add") { - std::string name; - name.assign(getFirstName()); - name.append(" "); - name.append(getLastName()); - - LLAvatarActions::requestFriendshipDialog(getAvatarId(), name); + LLAvatarActions::requestFriendshipDialog(getAvatarId(), mFrom); } else if (level == "remove") { @@ -202,7 +170,10 @@ public: menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_object_icon.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); mPopupMenuHandleObject = menu->getHandle(); - setDoubleClickCallback(boost::bind(&LLChatHistoryHeader::onHeaderPanelClick, this, _2, _3, _4)); + setDoubleClickCallback(boost::bind(&LLChatHistoryHeader::showInspector, this)); + + setMouseEnterCallback(boost::bind(&LLChatHistoryHeader::showInfoCtrl, this)); + setMouseLeaveCallback(boost::bind(&LLChatHistoryHeader::hideInfoCtrl, this)); return LLPanel::postBuild(); } @@ -236,8 +207,10 @@ public: return LLPanel::handleRightMouseDown(x,y,mask); } - void onHeaderPanelClick(S32 x, S32 y, MASK mask) + void showInspector() { + if (mAvatarID.isNull() && CHAT_SOURCE_SYSTEM != mSourceType) return; + if (mSourceType == CHAT_SOURCE_OBJECT) { LLFloaterReg::showInstance("inspect_object", LLSD().with("object_id", mAvatarID)); @@ -249,9 +222,18 @@ public: //if chat source is system, you may add "else" here to define behaviour. } + static void onClickInfoCtrl(LLUICtrl* info_ctrl) + { + if (!info_ctrl) return; + + LLChatHistoryHeader* header = dynamic_cast<LLChatHistoryHeader*>(info_ctrl->getParent()); + if (!header) return; + + header->showInspector(); + } + + const LLUUID& getAvatarId () const { return mAvatarID;} - const std::string& getFirstName() const { return mFirstName; } - const std::string& getLastName () const { return mLastName; } void setup(const LLChat& chat,const LLStyle::Params& style_params) { @@ -261,7 +243,7 @@ public: gCacheName->get(mAvatarID, FALSE, boost::bind(&LLChatHistoryHeader::nameUpdatedCallback, this, _1, _2, _3, _4)); //*TODO overly defensive thing, source type should be maintained out there - if(chat.mFromID.isNull() || chat.mFromName == SYSTEM_FROM) + if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM) { mSourceType = CHAT_SOURCE_SYSTEM; } @@ -272,9 +254,11 @@ public: userName->setColor(style_params.color()); userName->setValue(chat.mFromName); + mFrom = chat.mFromName; if (chat.mFromName.empty() || CHAT_SOURCE_SYSTEM == mSourceType) { - userName->setValue(LLTrans::getString("SECOND_LIFE")); + mFrom = LLTrans::getString("SECOND_LIFE"); + userName->setValue(mFrom); } @@ -297,6 +281,9 @@ public: break; case CHAT_SOURCE_SYSTEM: icon->setValue(LLSD("SL_Logo")); + break; + case CHAT_SOURCE_UNKNOWN: + icon->setValue(LLSD("Unknown_Icon")); } } @@ -334,8 +321,7 @@ public: { if (id != mAvatarID) return; - mFirstName = first; - mLastName = last; + mFrom = first + " " + last; } protected: static const S32 PADDING = 20; @@ -344,9 +330,9 @@ protected: { if(mSourceType == CHAT_SOURCE_SYSTEM) showSystemContextMenu(x,y); - if(mSourceType == CHAT_SOURCE_AGENT) + if(mAvatarID.notNull() && mSourceType == CHAT_SOURCE_AGENT) showAvatarContextMenu(x,y); - if(mSourceType == CHAT_SOURCE_OBJECT && SYSTEM_FROM != mFrom) + if(mAvatarID.notNull() && mSourceType == CHAT_SOURCE_OBJECT && SYSTEM_FROM != mFrom) showObjectContextMenu(x,y); } @@ -390,6 +376,33 @@ protected: } } + void showInfoCtrl() + { + if (mAvatarID.isNull() || mFrom.empty() || SYSTEM_FROM == mFrom) return; + + if (!sInfoCtrl) + { + sInfoCtrl = LLUICtrlFactory::createFromFile<LLUICtrl>("inspector_info_ctrl.xml", NULL, LLPanel::child_registry_t::instance()); + sInfoCtrl->setCommitCallback(boost::bind(&LLChatHistoryHeader::onClickInfoCtrl, sInfoCtrl)); + } + + LLTextBase* name = getChild<LLTextBase>("user_name"); + LLRect sticky_rect = name->getRect(); + S32 icon_x = llmin(sticky_rect.mLeft + name->getTextBoundingRect().getWidth() + 7, sticky_rect.mRight - 3); + sInfoCtrl->setOrigin(icon_x, sticky_rect.getCenterY() - sInfoCtrl->getRect().getHeight() / 2 ) ; + addChild(sInfoCtrl); + } + + void hideInfoCtrl() + { + if (!sInfoCtrl) return; + + if (sInfoCtrl->getParent() == this) + { + removeChild(sInfoCtrl); + } + } + private: void setTimeField(const LLChat& chat) { @@ -418,16 +431,17 @@ protected: LLHandle<LLView> mPopupMenuHandleAvatar; LLHandle<LLView> mPopupMenuHandleObject; + static LLUICtrl* sInfoCtrl; + LLUUID mAvatarID; EChatSourceType mSourceType; - std::string mFirstName; - std::string mLastName; std::string mFrom; LLUUID mSessionID; S32 mMinUserNameWidth; }; +LLUICtrl* LLChatHistoryHeader::sInfoCtrl = NULL; LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) : LLUICtrl(p), @@ -440,7 +454,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mTopSeparatorPad(p.top_separator_pad), mBottomSeparatorPad(p.bottom_separator_pad), mTopHeaderPad(p.top_header_pad), - mBottomHeaderPad(p.bottom_header_pad) + mBottomHeaderPad(p.bottom_header_pad), + mIsLastMessageFromLog(false) { LLTextEditor::Params editor_params(p); editor_params.rect = getLocalRect(); @@ -476,7 +491,7 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p) panel_p.background_visible = false; panel_p.has_border = false; panel_p.mouse_opaque = false; - stackp->addPanel(LLUICtrlFactory::create<LLPanel>(panel_p), 0, 30, true, false, LLLayoutStack::ANIMATE); + stackp->addPanel(LLUICtrlFactory::create<LLPanel>(panel_p), 0, 30, S32_MAX, S32_MAX, true, false, LLLayoutStack::ANIMATE); panel_p.name = "new_text_notice_holder"; LLRect new_text_notice_rect = getLocalRect(); @@ -494,7 +509,7 @@ void LLChatHistory::initFromParams(const LLChatHistory::Params& p) mMoreChatText = LLUICtrlFactory::create<LLTextBox>(text_p, mMoreChatPanel); mMoreChatText->setClickedCallback(boost::bind(&LLChatHistory::onClickMoreText, this)); - stackp->addPanel(mMoreChatPanel, 0, 0, false, false, LLLayoutStack::ANIMATE); + stackp->addPanel(mMoreChatPanel, 0, 0, S32_MAX, S32_MAX, false, false, LLLayoutStack::ANIMATE); } @@ -607,8 +622,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL style_params.font.style = "ITALIC"; } - //*HACK we graying out chat history by graying out messages that contains full date in a time string - bool message_from_log = chat.mTimeStr.length() > LENGTH_OF_TIME_STR; + bool message_from_log = chat.mChatStyle == CHAT_STYLE_HISTORY; + // We graying out chat history by graying out messages that contains full date in a time string if (message_from_log) { style_params.color(LLColor4::grey); @@ -622,7 +637,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if (utf8str_trim(chat.mFromName).size() != 0) { // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text. - if ( chat.mSourceType == CHAT_SOURCE_OBJECT ) + if ( chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mFromID.notNull()) { // for object IMs, create a secondlife:///app/objectim SLapp std::string url = LLSLURL::buildCommand("objectim", chat.mFromID, ""); @@ -677,7 +692,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL && mLastFromID == chat.mFromID && mLastMessageTime.notNull() && (new_message_time.secondsSinceEpoch() - mLastMessageTime.secondsSinceEpoch()) < 60.0 - && mLastMessageTimeStr.size() == chat.mTimeStr.size()) //*HACK to distinguish between current and previous chat session's histories + && mIsLastMessageFromLog == message_from_log) //distinguish between current and previous chat session's histories { view = getSeparator(); p.top_pad = mTopSeparatorPad; @@ -711,7 +726,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL mLastFromName = chat.mFromName; mLastFromID = chat.mFromID; mLastMessageTime = new_message_time; - mLastMessageTimeStr = chat.mTimeStr; + mIsLastMessageFromLog = message_from_log; } if (chat.mNotifId.notNull()) @@ -726,22 +741,26 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL notify_box->setFollowsRight(); notify_box->setFollowsTop(); - LLButton* accept_button = notify_box->getChild<LLButton> ("Accept", - TRUE); - if (accept_button != NULL) - { - accept_button->setFollowsNone(); - accept_button->setOrigin(2*HPAD, accept_button->getRect().mBottom); - } - - LLButton* decline_button = notify_box->getChild<LLButton> ( - "Decline", TRUE); - if (accept_button != NULL && decline_button != NULL) + ctrl_list_t ctrls = notify_box->getControlPanel()->getCtrlList(); + S32 offset = 0; + for (ctrl_list_t::iterator it = ctrls.begin(); it != ctrls.end(); it++) { - decline_button->setFollowsNone(); - decline_button->setOrigin(4*HPAD - + accept_button->getRect().getWidth(), - decline_button->getRect().mBottom); + LLButton * button = dynamic_cast<LLButton*> (*it); + if (button != NULL) + { + button->setOrigin( offset, + button->getRect().mBottom); + button->setLeftHPad(2 * HPAD); + button->setRightHPad(2 * HPAD); + // set zero width before perform autoResize() + button->setRect(LLRect(button->getRect().mLeft, + button->getRect().mTop, button->getRect().mLeft, + button->getRect().mBottom)); + button->setAutoResize(true); + button->autoResize(); + offset += 2 * HPAD + button->getRect().getWidth(); + button->setFollowsNone(); + } } LLTextEditor* text_editor = notify_box->getChild<LLTextEditor>("text_editor_box", TRUE); @@ -779,6 +798,26 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL else { std::string message = irc_me ? chat.mText.substr(3) : chat.mText; + + + //MESSAGE TEXT PROCESSING + //*HACK getting rid of redundant sender names in system notifications sent using sender name (see EXT-5010) + if (use_plain_text_chat_history && gAgentID != chat.mFromID && chat.mFromID.notNull()) + { + std::string slurl_about = SLURL_APP_AGENT + chat.mFromID.asString() + SLURL_ABOUT; + if (message.length() > slurl_about.length() && + message.compare(0, slurl_about.length(), slurl_about) == 0) + { + message = message.substr(slurl_about.length(), message.length()-1); + } + } + + if (irc_me && !use_plain_text_chat_history) + { + message = chat.mFromName + message; + } + + mEditor->appendText(message, FALSE, style_params); } mEditor->blockUndo(); diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 32600bb71d..950b32861b 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -128,7 +128,8 @@ class LLChatHistory : public LLUICtrl std::string mLastFromName; LLUUID mLastFromID; LLDate mLastMessageTime; - std::string mLastMessageTimeStr; + bool mIsLastMessageFromLog; + //std::string mLastMessageTimeStr; std::string mMessageHeaderFilename; std::string mMessageSeparatorFilename; diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index e164aa8fc4..81edb55f93 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -144,6 +144,7 @@ void LLNearbyChatToastPanel::init(LLSD& notification) std::string messageText = notification["message"].asString(); // UTF-8 line of text std::string fromName = notification["from"].asString(); // agent or object name mFromID = notification["from_id"].asUUID(); // agent id or object id + mFromName = fromName; int sType = notification["source"].asInteger(); mSourceType = (EChatSourceType)sType; diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index 4d730573d9..b28c9dbc4b 100644 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -60,6 +60,7 @@ public: static LLNearbyChatToastPanel* createInstance(); const LLUUID& getFromID() const { return mFromID;} + const std::string& getFromName() const { return mFromName; } //void addText (const std::string& message , const LLStyle::Params& input_params = LLStyle::Params()); //void setMessage (const LLChat& msg); @@ -84,9 +85,11 @@ public: virtual void draw(); + //*TODO REMOVE, why a dup of getFromID? const LLUUID& messageID() const { return mFromID;} private: LLUUID mFromID; // agent id or object id + std::string mFromName; EChatSourceType mSourceType; diff --git a/indra/newview/llclassifiedstatsresponder.cpp b/indra/newview/llclassifiedstatsresponder.cpp index ecd1879090..95f17aa7ba 100644 --- a/indra/newview/llclassifiedstatsresponder.cpp +++ b/indra/newview/llclassifiedstatsresponder.cpp @@ -43,11 +43,12 @@ #include "llview.h" #include "message.h" -LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id) -: mClassifiedPanelHandle(classified_panel_handle), +LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLUUID classified_id) +: mClassifiedID(classified_id) { } + /*virtual*/ void LLClassifiedStatsResponder::result(const LLSD& content) { @@ -58,17 +59,12 @@ void LLClassifiedStatsResponder::result(const LLSD& content) S32 search_map = content["search_map_clicks"].asInteger(); S32 search_profile = content["search_profile_clicks"].asInteger(); - LLPanelClassified* classified_panelp = (LLPanelClassified*)mClassifiedPanelHandle.get(); - - if(classified_panelp) - { - classified_panelp->setClickThrough(mClassifiedID, - teleport + search_teleport, - map + search_map, - profile + search_profile, - true); - } - + LLPanelClassifiedInfo::setClickThrough( + mClassifiedID, + teleport + search_teleport, + map + search_map, + profile + search_profile, + true); } /*virtual*/ @@ -77,5 +73,3 @@ void LLClassifiedStatsResponder::error(U32 status, const std::string& reason) llinfos << "LLClassifiedStatsResponder::error(" << status << ": " << reason << ")" << llendl; } - - diff --git a/indra/newview/llclassifiedstatsresponder.h b/indra/newview/llclassifiedstatsresponder.h index 9c52ed5ae1..4a74f7b129 100644 --- a/indra/newview/llclassifiedstatsresponder.h +++ b/indra/newview/llclassifiedstatsresponder.h @@ -40,7 +40,7 @@ class LLClassifiedStatsResponder : public LLHTTPClient::Responder { public: - LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id); + LLClassifiedStatsResponder(LLUUID classified_id); //If we get back a normal response, handle it here virtual void result(const LLSD& content); //If we get back an error (not found, etc...), handle it here @@ -48,7 +48,6 @@ public: virtual void error(U32 status, const std::string& reason); protected: - LLHandle<LLView> mClassifiedPanelHandle; LLUUID mClassifiedID; }; diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index 169a963d0d..f113cc49d4 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -81,11 +81,13 @@ void LLDebugView::init() r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); + mFastTimerView = new LLFastTimerView(r); mFastTimerView->setFollowsTop(); mFastTimerView->setFollowsLeft(); mFastTimerView->setVisible(FALSE); // start invisible addChild(mFastTimerView); + mFastTimerView->setRect(rect); r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f)); diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 9fbc3408d7..38eda5bd2e 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -386,8 +386,6 @@ void LLDrawable::makeActive() mParent->makeActive(); } - gPipeline.setActive(this, TRUE); - //all child objects must also be active llassert_always(mVObjp); @@ -434,7 +432,6 @@ void LLDrawable::makeStatic(BOOL warning_enabled) if (isState(ACTIVE)) { clearState(ACTIVE); - gPipeline.setActive(this, FALSE); if (mParent.notNull() && mParent->isActive() && warning_enabled) { diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 95ddacb722..ef946ac49e 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -496,8 +496,8 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) params.mGroup->rebuildMesh(); } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); } if (params.mTextureMatrix && texture && params.mTexture.notNull()) diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 7be6e82251..875c9ac6a9 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -251,8 +251,8 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) params.mGroup->rebuildMesh(); } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); } } } @@ -381,8 +381,8 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask) } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); if (params.mTextureMatrix && params.mTexture.notNull()) { diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 03a8b108e2..d09d4a412f 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -560,8 +560,8 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL params.mGroup->rebuildMesh(); } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); } } @@ -1231,8 +1231,8 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture) params.mGroup->rebuildMesh(); } params.mVertexBuffer->setBuffer(mask); - params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset); - gPipeline.addTrianglesDrawn(params.mCount/3); + params.mVertexBuffer->drawRange(params.mDrawMode, params.mStart, params.mEnd, params.mCount, params.mOffset); + gPipeline.addTrianglesDrawn(params.mCount, params.mDrawMode); if (params.mTextureMatrix) { if (mShiny) diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 5521fb05a8..1a5d55d793 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -115,7 +115,7 @@ void LLDrawPoolTree::render(S32 pass) LLFace *face = *iter; face->mVertexBuffer->setBuffer(LLDrawPoolTree::VERTEX_DATA_MASK); face->mVertexBuffer->drawRange(LLRender::TRIANGLES, 0, face->mVertexBuffer->getRequestedVerts()-1, face->mVertexBuffer->getRequestedIndices(), 0); - gPipeline.addTrianglesDrawn(face->mVertexBuffer->getRequestedIndices()/3); + gPipeline.addTrianglesDrawn(face->mVertexBuffer->getRequestedIndices()); } } } @@ -237,7 +237,7 @@ void LLDrawPoolTree::renderForSelect() face->mVertexBuffer->setBuffer(LLDrawPoolTree::VERTEX_DATA_MASK); face->mVertexBuffer->drawRange(LLRender::TRIANGLES, 0, face->mVertexBuffer->getRequestedVerts()-1, face->mVertexBuffer->getRequestedIndices(), 0); - gPipeline.addTrianglesDrawn(face->mVertexBuffer->getRequestedIndices()/3); + gPipeline.addTrianglesDrawn(face->mVertexBuffer->getRequestedIndices()); } } } diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 3818ee6f78..362010d65a 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -35,6 +35,7 @@ #include "llscrollcontainer.h" #include "llwindow.h" +#include "llviewerwindow.h" static LLDefaultChildRegistry::Register<LLExpandableTextBox> t1("expandable_text"); @@ -382,7 +383,7 @@ void LLExpandableTextBox::expandTextBox() setFocus(TRUE); // this lets us receive top_lost event(needed to collapse text box) // it also draws text box above all other ui elements - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); mExpanded = true; } @@ -401,10 +402,7 @@ void LLExpandableTextBox::collapseTextBox() updateTextBoxRect(); - if(gFocusMgr.getTopCtrl() == this) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(this); } void LLExpandableTextBox::onFocusLost() diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 58316ddb98..9d4a8aef76 100644 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -144,6 +144,7 @@ public: */ /*virtual*/ void onTopLost(); + /** * Draws text box, collapses text box if its expanded and its parent's position changed */ diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 80acc71a41..9de69a8173 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -870,7 +870,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, llpushcallstacks ; const LLVolumeFace &vf = volume.getVolumeFace(f); S32 num_vertices = (S32)vf.mVertices.size(); - S32 num_indices = (S32)vf.mIndices.size(); + S32 num_indices = LLPipeline::sUseTriStrips ? (S32)vf.mTriStrip.size() : (S32) vf.mIndices.size(); if (mVertexBuffer.notNull()) { @@ -1063,9 +1063,19 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, if (full_rebuild) { mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex); - for (U16 i = 0; i < num_indices; i++) + if (LLPipeline::sUseTriStrips) { - *indicesp++ = vf.mIndices[i] + index_offset; + for (U32 i = 0; i < (U32) num_indices; i++) + { + *indicesp++ = vf.mTriStrip[i] + index_offset; + } + } + else + { + for (U32 i = 0; i < (U32) num_indices; i++) + { + *indicesp++ = vf.mIndices[i] + index_offset; + } } } @@ -1617,8 +1627,13 @@ S32 LLFace::pushVertices(const U16* index_array) const { if (mIndicesCount) { - mVertexBuffer->drawRange(LLRender::TRIANGLES, mGeomIndex, mGeomIndex+mGeomCount-1, mIndicesCount, mIndicesIndex); - gPipeline.addTrianglesDrawn(mIndicesCount/3); + U32 render_type = LLRender::TRIANGLES; + if (mDrawInfo) + { + render_type = mDrawInfo->mDrawMode; + } + mVertexBuffer->drawRange(render_type, mGeomIndex, mGeomIndex+mGeomCount-1, mIndicesCount, mIndicesIndex); + gPipeline.addTrianglesDrawn(mIndicesCount, render_type); } return mIndicesCount; diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 4fa97e789b..8bc3b5a75f 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -44,6 +44,7 @@ #include "llfontgl.h" #include "llsdserialize.h" #include "lltooltip.h" +#include "llbutton.h" #include "llappviewer.h" #include "llviewertexturelist.h" @@ -99,6 +100,8 @@ LLFastTimerView::LLFastTimerView(const LLRect& rect) FTV_NUM_TIMERS = LLFastTimer::NamedTimer::instanceCount(); mPrintStats = -1; mAverageCyclesPerTimer = 0; + setCanMinimize(false); + setCanClose(true); } @@ -139,6 +142,18 @@ LLFastTimer::NamedTimer* LLFastTimerView::getLegendID(S32 y) BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask) { + + { + S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft; + S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom; + if(mButtons[BUTTON_CLOSE]->getVisible() + && mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y) ) + { + return LLFloater::handleMouseDown(x, y, mask);; + } + } + + if (x < mBarRect.mLeft) { LLFastTimer::NamedTimer* idp = getLegendID(y); @@ -188,6 +203,15 @@ BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLFastTimerView::handleMouseUp(S32 x, S32 y, MASK mask) { + { + S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft; + S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom; + if(mButtons[BUTTON_CLOSE]->getVisible() + && mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y) ) + { + return LLFloater::handleMouseUp(x, y, mask);; + } + } return FALSE; } @@ -1191,5 +1215,8 @@ void LLFastTimerView::doAnalysis(std::string baseline, std::string target, std:: return ; } } - +void LLFastTimerView::onClickCloseBtn() +{ + setVisible(false); +} diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index f5c8f23818..ac06990913 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -63,7 +63,9 @@ public: LLFastTimer::NamedTimer* getLegendID(S32 y); F64 getTime(const std::string& name); - + +protected: + virtual void onClickCloseBtn(); private: typedef std::vector<std::vector<S32> > bar_positions_t; bar_positions_t mBarStart; diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index aea2de8e92..561965d021 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -51,6 +51,9 @@ /*static*/ F32 LLVolumeImplFlexible::sUpdateFactor = 1.0f; +static LLFastTimer::DeclareTimer FTM_FLEXIBLE_REBUILD("Rebuild"); +static LLFastTimer::DeclareTimer FTM_DO_FLEXIBLE_UPDATE("Update"); + // LLFlexibleObjectData::pack/unpack now in llprimitive.cpp //----------------------------------------------- @@ -194,7 +197,6 @@ void LLVolumeImplFlexible::remapSections(LLFlexibleObjectSection *source, S32 so } } - //----------------------------------------------------------------------------- void LLVolumeImplFlexible::setAttributesOfAllSections(LLVector3* inScale) { @@ -363,6 +365,7 @@ inline S32 log2(S32 x) void LLVolumeImplFlexible::doFlexibleUpdate() { + LLFastTimer ftm(FTM_DO_FLEXIBLE_UPDATE); LLVolume* volume = mVO->getVolume(); LLPath *path = &volume->getPath(); if (mSimulateRes == 0) @@ -693,7 +696,10 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable) } volume->updateRelativeXform(); - doFlexibleUpdate(); + { + LLFastTimer t(FTM_DO_FLEXIBLE_UPDATE); + doFlexibleUpdate(); + } // Object may have been rotated, which means it needs a rebuild. See SL-47220 BOOL rotated = FALSE; @@ -710,7 +716,10 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable) volume->regenFaces(); volume->mDrawable->setState(LLDrawable::REBUILD_VOLUME); volume->dirtySpatialGroup(); - doFlexibleRebuild(); + { + LLFastTimer t(FTM_FLEXIBLE_REBUILD); + doFlexibleRebuild(); + } volume->genBBoxes(isVolumeGlobal()); } else if (!mUpdated || rotated) diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index 13a7888f60..975c888a2b 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -71,7 +71,7 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) { LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl; std::string name = check->getName(); - if( name == "touch_only") + if(name == "touch_only") { LLPipeline::toggleRenderScriptedTouchBeacons(NULL); // Don't allow both to be ON at the same time. Toggle the other one off if both now on. @@ -81,7 +81,9 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) { LLPipeline::setRenderScriptedBeacons(FALSE); getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE)); + getChild<LLCheckBoxCtrl>("scripted")->setValue(FALSE); getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline + getChild<LLCheckBoxCtrl>("touch_only")->setValue(TRUE); } } else if(name == "scripted") @@ -94,7 +96,9 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) { LLPipeline::setRenderScriptedTouchBeacons(FALSE); getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE)); + getChild<LLCheckBoxCtrl>("touch_only")->setValue(FALSE); getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline + getChild<LLCheckBoxCtrl>("scripted")->setValue(TRUE); } } else if(name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get()); @@ -110,7 +114,9 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) { LLPipeline::setRenderBeacons(TRUE); getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE)); + getChild<LLCheckBoxCtrl>("beacons")->setValue(TRUE); getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline + getChild<LLCheckBoxCtrl>("highlights")->setValue(FALSE); } } else if(name == "beacons") @@ -123,7 +129,9 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) { LLPipeline::setRenderHighlights(TRUE); getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE)); + getChild<LLCheckBoxCtrl>("highlights")->setValue(TRUE); getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline + getChild<LLCheckBoxCtrl>("beacons")->setValue(FALSE); } } } diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 9b88923e7e..d37bc01885 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -82,7 +82,10 @@ public: virtual ~LLFloaterBuyLandUI(); /*virtual*/ void onClose(bool app_quitting); - + + // Left padding for maturity rating icon. + static const S32 ICON_PAD = 2; + private: class SelectionObserver : public LLParcelObserver { @@ -501,6 +504,25 @@ void LLFloaterBuyLandUI::updateCovenantInfo() { std::string region_name_txt = region->getName() + " ("+rating +")"; region_name->setText(region_name_txt); + + LLIconCtrl* rating_icon = getChild<LLIconCtrl>("rating_icon"); + LLRect rect = rating_icon->getRect(); + S32 icon_left_pad = region_name->getRect().mLeft + region_name->getTextBoundingRect().getWidth() + ICON_PAD; + rating_icon->setRect(rect.setOriginAndSize(icon_left_pad, rect.mBottom, rect.getWidth(), rect.getHeight())); + + switch(sim_access) + { + case SIM_ACCESS_PG: + rating_icon->setValue(getString("icon_PG")); + break; + + case SIM_ACCESS_ADULT: + rating_icon->setValue(getString("icon_R")); + break; + + default: + rating_icon->setValue(getString("icon_M")); + } } LLTextBox* region_type = getChild<LLTextBox>("region_type_text"); diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index ecb6254f8a..d0188352c7 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -241,6 +241,7 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) BOOL LLFloaterCamera::postBuild() { setIsChrome(TRUE); + setTitleVisible(TRUE); // restore title visibility after chrome applying mRotate = getChild<LLJoystickCameraRotate>(ORBIT); mZoom = getChild<LLPanelCameraZoom>(ZOOM); @@ -295,6 +296,31 @@ void LLFloaterCamera::setMode(ECameraControlMode mode) updateState(); } +void LLFloaterCamera::setModeTitle(const ECameraControlMode mode) +{ + std::string title; + switch(mode) + { + case CAMERA_CTRL_MODE_ORBIT: + title = getString("orbit_mode_title"); + break; + case CAMERA_CTRL_MODE_PAN: + title = getString("pan_mode_title"); + break; + case CAMERA_CTRL_MODE_AVATAR_VIEW: + title = getString("avatar_view_mode_title"); + break; + case CAMERA_CTRL_MODE_FREE_CAMERA: + title = getString("free_mode_title"); + break; + default: + // title should be provided for all modes + llassert(false); + break; + } + setTitle(title); +} + void LLFloaterCamera::switchMode(ECameraControlMode mode) { setMode(mode); @@ -354,6 +380,10 @@ void LLFloaterCamera::updateState() childSetVisible(ZOOM, CAMERA_CTRL_MODE_AVATAR_VIEW != mCurrMode); childSetVisible(PRESETS, CAMERA_CTRL_MODE_AVATAR_VIEW == mCurrMode); + updateCameraPresetButtons(); + setModeTitle(mCurrMode); + + //hiding or showing the panel with controls by reshaping the floater bool showControls = CAMERA_CTRL_MODE_FREE_CAMERA != mCurrMode; if (showControls == childIsVisible(CONTROLS)) return; @@ -384,6 +414,16 @@ void LLFloaterCamera::updateState() } } +void LLFloaterCamera::updateCameraPresetButtons() +{ + ECameraPreset preset = (ECameraPreset) gSavedSettings.getU32("CameraPreset"); + + childSetValue("rear_view", preset == CAMERA_PRESET_REAR_VIEW); + childSetValue("group_view", preset == CAMERA_PRESET_GROUP_VIEW); + childSetValue("front_view", preset == CAMERA_PRESET_FRONT_VIEW); + childSetValue("mouselook_view", gAgent.cameraMouselook()); +} + void LLFloaterCamera::onClickCameraPresets(const LLSD& param) { std::string name = param.asString(); @@ -405,4 +445,7 @@ void LLFloaterCamera::onClickCameraPresets(const LLSD& param) gAgent.changeCameraToMouselook(); } + LLFloaterCamera* camera_floater = LLFloaterCamera::findInstance(); + if (camera_floater) + camera_floater->updateCameraPresetButtons(); } diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 45d5e9a845..b268839165 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -100,9 +100,15 @@ private: /* sets a new mode preserving previous one and updates ui*/ void setMode(ECameraControlMode mode); + /** set title appropriate to passed mode */ + void setModeTitle(const ECameraControlMode mode); + /* updates the state (UI) according to the current mode */ void updateState(); + /* update camera preset buttons toggle state according to the currently selected preset */ + void updateCameraPresetButtons(); + void onClickBtn(ECameraControlMode mode); void assignButton2Mode(ECameraControlMode mode, const std::string& button_name); diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp index 64efa10ef9..97ebab3425 100644 --- a/indra/newview/llfloaterevent.cpp +++ b/indra/newview/llfloaterevent.cpp @@ -58,6 +58,7 @@ #include "llviewercontrol.h" #include "llweb.h" #include "llworldmap.h" +#include "llworldmapmessage.h" #include "lluictrlfactory.h" #include "lltrans.h" @@ -215,16 +216,15 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **) std::string desc = floater->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z); floater->mTBLocation->setText(desc); - if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE) - { - floater->childSetVisible("event_mature_yes", TRUE); - floater->childSetVisible("event_mature_no", FALSE); - } - else - { - floater->childSetVisible("event_mature_yes", FALSE); - floater->childSetVisible("event_mature_no", TRUE); - } + floater->childSetVisible("rating_icon_m", FALSE); + floater->childSetVisible("rating_icon_r", FALSE); + floater->childSetVisible("rating_icon_pg", FALSE); + floater->childSetValue("rating_value", floater->getString("unknown")); + + //for some reason there's not adult flags for now, so see if region is adult and then + //set flags + LLWorldMapMessage::url_callback_t cb = boost::bind( ®ionInfoCallback, floater->mEventInfo.mID, _1); + LLWorldMapMessage::getInstance()->sendNamedRegionRequest(floater->mEventInfo.mSimName, cb, std::string("unused"), false); if (floater->mEventInfo.mUnixTime < time_corrected()) { @@ -249,6 +249,39 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **) } } +//static +void LLFloaterEvent::regionInfoCallback(U32 event_id, U64 region_handle) +{ + LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromHandle(region_handle); + LLFloaterEvent* floater = LLFloaterReg::getTypedInstance<LLFloaterEvent>("event"); + + if (sim_info && floater && (event_id == floater->getEventID())) + { + // update the event with the maturity info + if (sim_info->isAdult()) + { + floater->childSetVisible("rating_icon_m", FALSE); + floater->childSetVisible("rating_icon_r", TRUE); + floater->childSetVisible("rating_icon_pg", FALSE); + floater->childSetValue("rating_value", floater->getString("adult")); + + } + else if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE) + { + floater->childSetVisible("rating_icon_m", TRUE); + floater->childSetVisible("rating_icon_r", FALSE); + floater->childSetVisible("rating_icon_pg", FALSE); + floater->childSetValue("rating_value", floater->getString("moderate")); + } + else + { + floater->childSetVisible("rating_icon_m", FALSE); + floater->childSetVisible("rating_icon_r", FALSE); + floater->childSetVisible("rating_icon_pg", TRUE); + floater->childSetValue("rating_value", floater->getString("general")); + } + } +} void LLFloaterEvent::draw() { diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h index 54aaaf6a0f..4126236964 100644 --- a/indra/newview/llfloaterevent.h +++ b/indra/newview/llfloaterevent.h @@ -70,7 +70,8 @@ protected: static void onClickNotify(void*); void onClickDeleteEvent(); -// static bool callbackCreateEventWebPage(const LLSD& notification, const LLSD& response); + static void regionInfoCallback(U32 event_id, U64 region_handle); + protected: U32 mEventID; diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 5294f09e64..eb56f387cd 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -213,6 +213,9 @@ void LLFloaterGodTools::showPanel(const std::string& panel_name) // static void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) { + llassert(msg); + if (!msg) return; + LLHost host = msg->getSender(); if (host != gAgent.getRegionHost()) { @@ -270,8 +273,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) if ( gAgent.isGodlike() && LLFloaterReg::instanceVisible("god_tools") && god_tools->mPanelRegionTools - && god_tools->mPanelObjectTools - && msg ) + && god_tools->mPanelObjectTools) { LLPanelRegionTools* rtool = god_tools->mPanelRegionTools; god_tools->mCurrentHost = host; diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 61568df12e..9917593c91 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -688,6 +688,9 @@ BOOL LLImagePreviewAvatar::render() mNeedsUpdate = FALSE; LLVOAvatar* avatarp = mDummyAvatar; + gGL.pushUIMatrix(); + gGL.loadUIIdentity(); + glMatrixMode(GL_PROJECTION); gGL.pushMatrix(); glLoadIdentity(); @@ -696,6 +699,7 @@ BOOL LLImagePreviewAvatar::render() glMatrixMode(GL_MODELVIEW); gGL.pushMatrix(); glLoadIdentity(); + LLGLSUIDefault def; gGL.color4f(0.15f, 0.2f, 0.3f, 1.f); @@ -741,6 +745,7 @@ BOOL LLImagePreviewAvatar::render() avatarPoolp->renderAvatars(avatarp); // renders only one avatar } + gGL.popUIMatrix(); gGL.color4f(1,1,1,1); return TRUE; } diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index e62e2c99a7..844f0ac509 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -41,6 +41,7 @@ #include "llpanelmaininventory.h" #include "llresmgr.h" #include "llviewerfoldertype.h" +#include "lltransientfloatermgr.h" ///---------------------------------------------------------------------------- /// LLFloaterInventory @@ -49,10 +50,12 @@ LLFloaterInventory::LLFloaterInventory(const LLSD& key) : LLFloater(key) { + LLTransientFloaterMgr::getInstance()->addControlView(this); } LLFloaterInventory::~LLFloaterInventory() { + LLTransientFloaterMgr::getInstance()->removeControlView(this); } BOOL LLFloaterInventory::postBuild() diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp index 3753dcaaa8..85186cee6b 100644 --- a/indra/newview/llfloaterlagmeter.cpp +++ b/indra/newview/llfloaterlagmeter.cpp @@ -64,7 +64,7 @@ BOOL LLFloaterLagMeter::postBuild() setIsChrome(TRUE); // were we shrunk last time? - if (gSavedSettings.getBOOL("LagMeterShrunk")) + if (isShrunk()) { onClickShrink(); } @@ -122,6 +122,7 @@ BOOL LLFloaterLagMeter::postBuild() mStringArgs["[SERVER_FRAME_RATE_WARNING]"] = getString("server_frame_rate_warning_fps"); // childSetAction("minimize", onClickShrink, this); + updateControls(isShrunk()); // if expanded append colon to the labels (EXT-4079) return TRUE; } @@ -130,7 +131,7 @@ LLFloaterLagMeter::~LLFloaterLagMeter() // save shrunk status for next time // gSavedSettings.setBOOL("LagMeterShrunk", mShrunk); // expand so we save the large window rectangle - if (gSavedSettings.getBOOL("LagMeterShrunk")) + if (isShrunk()) { onClickShrink(); } @@ -312,17 +313,15 @@ void LLFloaterLagMeter::determineServer() } } - -void LLFloaterLagMeter::onClickShrink() // toggle "LagMeterShrunk" +void LLFloaterLagMeter::updateControls(bool shrink) { // LLFloaterLagMeter * self = (LLFloaterLagMeter*)data; LLButton * button = getChild<LLButton>("minimize"); S32 delta_width = mMaxWidth -mMinWidth; LLRect r = getRect(); - bool shrunk = gSavedSettings.getBOOL("LagMeterShrunk"); - if(shrunk) + if(!shrink) { setTitle(getString("max_title_msg", mStringArgs) ); // make left edge appear to expand @@ -368,5 +367,16 @@ void LLFloaterLagMeter::onClickShrink() // toggle "LagMeterShrunk" // self->childSetVisible("server_help", self->mShrunk); // self->mShrunk = !self->mShrunk; - gSavedSettings.setBOOL("LagMeterShrunk", !gSavedSettings.getBOOL("LagMeterShrunk")); +} + +BOOL LLFloaterLagMeter::isShrunk() +{ + return gSavedSettings.getBOOL("LagMeterShrunk"); +} + +void LLFloaterLagMeter::onClickShrink() // toggle "LagMeterShrunk" +{ + bool shrunk = isShrunk(); + updateControls(!shrunk); + gSavedSettings.setBOOL("LagMeterShrunk", !shrunk); } diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h index 592630636a..5416bca790 100644 --- a/indra/newview/llfloaterlagmeter.h +++ b/indra/newview/llfloaterlagmeter.h @@ -51,6 +51,8 @@ private: void determineClient(); void determineNetwork(); void determineServer(); + void updateControls(bool shrink); + BOOL isShrunk(); void onClickShrink(); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 26c6db9652..26a179074d 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -86,6 +86,7 @@ static std::string OWNER_ONLINE = "0"; static std::string OWNER_OFFLINE = "1"; static std::string OWNER_GROUP = "2"; +static std::string MATURITY = "[MATURITY]"; // constants used in callbacks below - syntactic sugar. static const BOOL BUY_GROUP_LAND = TRUE; @@ -102,6 +103,22 @@ public: virtual void changed() { LLFloaterLand::refreshAll(); } }; +// class needed to get full access to textbox inside checkbox, because LLCheckBoxCtrl::setLabel() has string as its argument. +// It was introduced while implementing EXT-4706 +class LLCheckBoxWithTBAcess : public LLCheckBoxCtrl +{ +public: + LLTextBox* getTextBox() + { + return mLabel; + } +}; + +// inserts maturity info(icon and text) into target textbox +// names_floater - pointer to floater which contains strings with maturity icons filenames +// str_to_parse is string in format "txt1[MATURITY]txt2" where maturity icon and text will be inserted instead of [MATURITY] +void insert_maturity_into_textbox(LLTextBox* target_textbox, LLFloater* names_floater, std::string str_to_parse); + //--------------------------------------------------------------------------- // LLFloaterLand //--------------------------------------------------------------------------- @@ -554,7 +571,7 @@ void LLPanelLandGeneral::refresh() if (regionp) { - mContentRating->setText(regionp->getSimAccessString()); + insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY); mLandType->setText(regionp->getSimProductName()); } @@ -2058,8 +2075,14 @@ void LLPanelLandOptions::refresh() { // not teen so fill in the data for the maturity control mMatureCtrl->setVisible(TRUE); - mMatureCtrl->setLabel(getString("mature_check_mature")); - mMatureCtrl->setToolTip(getString("mature_check_mature_tooltip")); + LLStyle::Params style; + style.image(LLUI::getUIImage(gFloaterView->getParentFloater(this)->getString("maturity_icon_moderate"))); + LLCheckBoxWithTBAcess* fullaccess_mature_ctrl = (LLCheckBoxWithTBAcess*)mMatureCtrl; + fullaccess_mature_ctrl->getTextBox()->setText(std::string("icon"),style); + fullaccess_mature_ctrl->getTextBox()->appendText(getString("mature_check_mature"), false); + fullaccess_mature_ctrl->setToolTip(getString("mature_check_mature_tooltip")); + fullaccess_mature_ctrl->reshape(fullaccess_mature_ctrl->getRect().getWidth(), fullaccess_mature_ctrl->getRect().getHeight(), FALSE); + // they can see the checkbox, but its disposition depends on the // state of the region LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); @@ -2460,19 +2483,26 @@ void LLPanelLandAccess::refresh() } } + LLCheckBoxWithTBAcess* maturity_checkbox = (LLCheckBoxWithTBAcess*) getChild<LLCheckBoxCtrl>( "public_access"); LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); if(region) { - std::string region_access = "("; - region_access += region->getSimAccessString(); - region_access += ")"; - childSetLabelArg( "public_access", "[MATURITY]", region_access ); + LLTextBox* maturity_textbox = maturity_checkbox->getTextBox(); + insert_maturity_into_textbox(maturity_textbox, gFloaterView->getParentFloater(this), getString("allow_public_access")); + maturity_checkbox->reshape(maturity_checkbox->getRect().getWidth(), maturity_checkbox->getRect().getHeight(), FALSE); } else { - childSetLabelArg( "public_access", "[MATURITY]", std::string() ); - } + std::string maturity_string = getString("allow_public_access"); + size_t maturity_pos = maturity_string.find(MATURITY); + if (maturity_pos != std::string::npos) + { + maturity_string.replace(maturity_pos, MATURITY.length(), std::string("")); + } + + maturity_checkbox->setLabel(maturity_string); + } if(parcel->getRegionDenyAnonymousOverride()) { @@ -2858,7 +2888,7 @@ void LLPanelLandCovenant::refresh() LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text"); if (region_maturity) { - region_maturity->setText(region->getSimAccessString()); + insert_maturity_into_textbox(region_maturity, gFloaterView->getParentFloater(this), MATURITY); } LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); @@ -2939,3 +2969,51 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name) if (editor) editor->setText(name); } } + +// inserts maturity info(icon and text) into target textbox +// names_floater - pointer to floater which contains strings with maturity icons filenames +// str_to_parse is string in format "txt1[MATURITY]txt2" where maturity icon and text will be inserted instead of [MATURITY] +void insert_maturity_into_textbox(LLTextBox* target_textbox, LLFloater* names_floater, std::string str_to_parse) +{ + LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); + if (!region) + return; + + LLStyle::Params style; + + U8 sim_access = region->getSimAccess(); + + switch(sim_access) + { + case SIM_ACCESS_PG: + style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_general"))); + break; + + case SIM_ACCESS_ADULT: + style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_adult"))); + break; + + case SIM_ACCESS_MATURE: + style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_moderate"))); + break; + + default: + break; + } + + size_t maturity_pos = str_to_parse.find(MATURITY); + + if (maturity_pos == std::string::npos) + { + return; + } + + std::string text_before_rating = str_to_parse.substr(0, maturity_pos); + std::string text_after_rating = str_to_parse.substr(maturity_pos + MATURITY.length()); + + target_textbox->setText(text_before_rating); + // any text may be here instead of "icon" except "" + target_textbox->appendText(std::string("icon"), false, style); + target_textbox->appendText(LLViewerParcelMgr::getInstance()->getSelectionRegion()->getSimAccessString(), false); + target_textbox->appendText(text_after_rating, false); +} diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp index 62ec17f89a..ee68faf84b 100644 --- a/indra/newview/llfloatermediasettings.cpp +++ b/indra/newview/llfloatermediasettings.cpp @@ -242,6 +242,12 @@ void LLFloaterMediaSettings::onBtnApply( void* userdata ) sInstance->commitFields(); sInstance->apply(); + + sInstance->mInitialValues.clear(); + sInstance->mPanelMediaSettingsGeneral->getValues( sInstance->mInitialValues ); + sInstance->mPanelMediaSettingsSecurity->getValues( sInstance->mInitialValues ); + sInstance->mPanelMediaSettingsPermissions->getValues( sInstance->mInitialValues ); + } //////////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp index 94b5ebba00..b744bff084 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -210,7 +210,7 @@ void LLFloaterNotificationConsole::addChannel(const std::string& name, bool open { LLLayoutStack& stack = getChildRef<LLLayoutStack>("notification_channels"); LLNotificationChannelPanel* panelp = new LLNotificationChannelPanel(name); - stack.addPanel(panelp, 0, NOTIFICATION_PANEL_HEADER_HEIGHT, TRUE, TRUE, LLLayoutStack::ANIMATE); + stack.addPanel(panelp, 0, NOTIFICATION_PANEL_HEADER_HEIGHT, S32_MAX, S32_MAX, TRUE, TRUE, LLLayoutStack::ANIMATE); LLButton& header_button = panelp->getChildRef<LLButton>("header"); header_button.setToggleState(!open); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 43111d76f7..8bffe9bf57 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -315,19 +315,16 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.ClickEnablePopup", boost::bind(&LLFloaterPreference::onClickEnablePopup, this)); mCommitCallbackRegistrar.add("Pref.ClickDisablePopup", boost::bind(&LLFloaterPreference::onClickDisablePopup, this)); mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this)); - mCommitCallbackRegistrar.add("Pref.UpdateMeterText", boost::bind(&LLFloaterPreference::updateMeterText, this, _1)); mCommitCallbackRegistrar.add("Pref.HardwareSettings", boost::bind(&LLFloaterPreference::onOpenHardwareSettings, this)); mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this)); mCommitCallbackRegistrar.add("Pref.VertexShaderEnable", boost::bind(&LLFloaterPreference::onVertexShaderEnable, this)); mCommitCallbackRegistrar.add("Pref.WindowedMod", boost::bind(&LLFloaterPreference::onCommitWindowedMode, this)); mCommitCallbackRegistrar.add("Pref.UpdateSliderText", boost::bind(&LLFloaterPreference::onUpdateSliderText,this, _1,_2)); - mCommitCallbackRegistrar.add("Pref.ParcelMediaAutoPlayEnable", boost::bind(&LLFloaterPreference::onCommitParcelMediaAutoPlayEnable, this)); - mCommitCallbackRegistrar.add("Pref.MediaEnabled", boost::bind(&LLFloaterPreference::onCommitMediaEnabled, this)); - mCommitCallbackRegistrar.add("Pref.MusicEnabled", boost::bind(&LLFloaterPreference::onCommitMusicEnabled, this)); mCommitCallbackRegistrar.add("Pref.QualityPerformance", boost::bind(&LLFloaterPreference::onChangeQuality, this, _2)); mCommitCallbackRegistrar.add("Pref.applyUIColor", boost::bind(&LLFloaterPreference::applyUIColor, this ,_1, _2)); mCommitCallbackRegistrar.add("Pref.getUIColor", boost::bind(&LLFloaterPreference::getUIColor, this ,_1, _2)); - + mCommitCallbackRegistrar.add("Pref.MaturitySettings", boost::bind(&LLFloaterPreference::onChangeMaturity, this)); + sSkin = gSavedSettings.getString("SkinCurrent"); gSavedSettings.getControl("AvatarNameTagMode")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2)); @@ -339,6 +336,10 @@ BOOL LLFloaterPreference::postBuild() gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2)); + gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLIMFloater::processChatHistoryStyleUpdate, _2)); + + gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2)); + LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab"))) tabcontainer->selectFirstTab(); @@ -514,7 +515,8 @@ void LLFloaterPreference::onOpen(const LLSD& key) // if we have no agent, we can't let them choose anything // if we have an agent, then we only let them choose if they have a choice bool can_choose_maturity = - gAgent.getID().notNull() && (gAgent.isMature() || gAgent.isGodlike()); + gAgent.getID().notNull() && + (gAgent.isMature() || gAgent.isGodlike()); LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox"); @@ -536,6 +538,9 @@ void LLFloaterPreference::onOpen(const LLSD& key) childSetText("maturity_desired_textbox", maturity_combo->getSelectedItemLabel()); childSetVisible("maturity_desired_combobox", false); } + + // Display selected maturity icons. + onChangeMaturity(); // Enabled/disabled popups, might have been changed by user actions // while preferences floater was closed. @@ -666,7 +671,8 @@ void LLFloaterPreference::refreshEnabledGraphics() LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences"); if(instance) { - instance->refreshEnabledState(); + instance->refresh(); + //instance->refreshEnabledState(); } LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings"); if (hardware_settings) @@ -675,21 +681,6 @@ void LLFloaterPreference::refreshEnabledGraphics() } } -void LLFloaterPreference::updateMeterText(LLUICtrl* ctrl) -{ - // get our UI widgets - LLSliderCtrl* slider = (LLSliderCtrl*) ctrl; - - LLTextBox* m1 = getChild<LLTextBox>("DrawDistanceMeterText1"); - LLTextBox* m2 = getChild<LLTextBox>("DrawDistanceMeterText2"); - - // toggle the two text boxes based on whether we have 1 or two digits - F32 val = slider->getValueF32(); - bool two_digits = val < 100; - m1->setVisible(two_digits); - m2->setVisible(!two_digits); -} - void LLFloaterPreference::onClickBrowserClearCache() { LLNotificationsUtil::add("ConfirmClearBrowserCache", LLSD(), LLSD(), callback_clear_browser_cache); @@ -956,29 +947,6 @@ void LLFloaterPreference::disableUnavailableSettings() } } -void LLFloaterPreference::onCommitParcelMediaAutoPlayEnable() -{ - BOOL autoplay = getChild<LLCheckBoxCtrl>("autoplay_enabled")->get(); - - gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, autoplay); - - lldebugs << "autoplay now = " << int(autoplay) << llendl; -} - -void LLFloaterPreference::onCommitMediaEnabled() -{ - LLCheckBoxCtrl *media_enabled_ctrl = getChild<LLCheckBoxCtrl>("media_enabled"); - bool enabled = media_enabled_ctrl->get(); - gSavedSettings.setBOOL("AudioStreamingMedia", enabled); -} - -void LLFloaterPreference::onCommitMusicEnabled() -{ - LLCheckBoxCtrl *music_enabled_ctrl = getChild<LLCheckBoxCtrl>("music_enabled"); - bool enabled = music_enabled_ctrl->get(); - gSavedSettings.setBOOL("AudioStreamingMusic", enabled); -} - void LLFloaterPreference::refresh() { LLPanel::refresh(); @@ -1017,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting() if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|") { llwarns << "cleaning old BusyModeResponse" << llendl; - gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse")); + //LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885) + gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault")); } } @@ -1248,7 +1217,19 @@ void LLFloaterPreference::applyResolution() refresh(); } +void LLFloaterPreference::onChangeMaturity() +{ + U8 sim_access = gSavedSettings.getU32("PreferredMaturity"); + + getChild<LLIconCtrl>("rating_icon_general")->setVisible(sim_access == SIM_ACCESS_PG + || sim_access == SIM_ACCESS_MATURE + || sim_access == SIM_ACCESS_ADULT); + + getChild<LLIconCtrl>("rating_icon_moderate")->setVisible(sim_access == SIM_ACCESS_MATURE + || sim_access == SIM_ACCESS_ADULT); + getChild<LLIconCtrl>("rating_icon_adult")->setVisible(sim_access == SIM_ACCESS_ADULT); +} void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param) @@ -1308,7 +1289,7 @@ BOOL LLPanelPreference::postBuild() if (hasChild("media_enabled")) { bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia"); - getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled); getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled); } @@ -1316,7 +1297,11 @@ BOOL LLPanelPreference::postBuild() { getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic")); } - + if (hasChild("voice_call_friends_only_check")) + { + getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2)); + } + apply(); return true; } diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 93b39d72bc..71aa5d3189 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -134,8 +134,9 @@ public: void onCommitMediaEnabled(); void onCommitMusicEnabled(); void applyResolution(); + void onChangeMaturity(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); - void getUIColor(LLUICtrl* ctrl, const LLSD& param); + void getUIColor(LLUICtrl* ctrl, const LLSD& param); void buildPopupLists(); static void refreshSkin(void* data); diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index fdf128945e..122bdc8bc7 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -557,7 +557,7 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id) // virtual void LLPanelScriptLimitsRegionMemory::setErrorStatus(U32 status, const std::string& reason) { - llerrs << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl; + llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl; } // callback from the name cache with an owner name to add to the list diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index a7401fdb6f..76caa0cf91 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -118,11 +118,9 @@ void LLFloaterSearch::onOpen(const LLSD& key) void LLFloaterSearch::onClose(bool app_quitting) { - if (! app_quitting) - { - // Show the blank home page ready for the next onOpen() - mBrowser->navigateHome(); - } + // tear down the web view so we don't show the previous search + // result when the floater is opened next time + destroy(); } void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) @@ -158,11 +156,6 @@ void LLFloaterSearch::search(const LLSD &key) return; } - // display the blank home page first, to clear the display of - // any previous search results while the new results load. - // The home page is set in floater_search.xml as start_url. - mBrowser->navigateHome(); - // reset the god level warning as we're sending the latest state childHide("refresh_search"); mSearchGodLevel = gAgent.getGodLevel(); diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp index 9895665026..eae6121e79 100644 --- a/indra/newview/llfloatersellland.cpp +++ b/indra/newview/llfloatersellland.cpp @@ -170,6 +170,7 @@ BOOL LLFloaterSellLandUI::postBuild() childSetAction("sell_btn", doSellLand, this); childSetAction("show_objects", doShowObjects, this); center(); + getChild<LLUICtrl>("profile_scroll")->setTabStop(true); return TRUE; } diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index e2b083a29b..7c42a581ff 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1523,7 +1523,9 @@ void LLFloaterTools::updateMediaSettings() mMediaSettings[ base_key + std::string( LLPanelContents::TENTATIVE_SUFFIX ) ] = ! identical; // Auto play - value_bool = default_media_data.getAutoPlay(); + //value_bool = default_media_data.getAutoPlay(); + // set default to auto play TRUE -- angela EXT-5172 + value_bool = true; struct functor_getter_auto_play : public LLSelectedTEGetFunctor< bool > { functor_getter_auto_play(const LLMediaEntry& entry) : mMediaEntry(entry) {} @@ -1534,7 +1536,8 @@ void LLFloaterTools::updateMediaSettings() if ( object->getTE(face) ) if ( object->getTE(face)->getMediaData() ) return object->getTE(face)->getMediaData()->getAutoPlay(); - return mMediaEntry.getAutoPlay(); + //return mMediaEntry.getAutoPlay(); set default to auto play TRUE -- angela EXT-5172 + return true; }; const LLMediaEntry &mMediaEntry; @@ -1547,7 +1550,9 @@ void LLFloaterTools::updateMediaSettings() // Auto scale - value_bool = default_media_data.getAutoScale(); + // set default to auto scale TRUE -- angela EXT-5172 + //value_bool = default_media_data.getAutoScale(); + value_bool = true; struct functor_getter_auto_scale : public LLSelectedTEGetFunctor< bool > { functor_getter_auto_scale(const LLMediaEntry& entry): mMediaEntry(entry) {} @@ -1558,8 +1563,9 @@ void LLFloaterTools::updateMediaSettings() if ( object->getTE(face) ) if ( object->getTE(face)->getMediaData() ) return object->getTE(face)->getMediaData()->getAutoScale(); - return mMediaEntry.getAutoScale();; - }; + // return mMediaEntry.getAutoScale(); set default to auto scale TRUE -- angela EXT-5172 + return true; + }; const LLMediaEntry &mMediaEntry; diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index f4d4ea3553..67c0b530eb 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -359,9 +359,7 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks) { if (!isMinimized() && isFrontmost()) { - LLRect area; - childGetRect("search_results", area); - if(!area.pointInRect(x, y)) + if(mPanel->pointInView(x, y)) { F32 slider_value = (F32)childGetValue("zoom slider").asReal(); slider_value += ((F32)clicks * -0.3333f); @@ -788,8 +786,11 @@ void LLFloaterWorldMap::friendsChanged() if(avatar_id.notNull()) { LLCtrlSelectionInterface *iface = childGetSelectionInterface("friend combo"); - if(!iface || !iface->setCurrentByID(avatar_id) || - !t.getBuddyInfo(avatar_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) || gAgent.isGodlike()) + const LLRelationship* buddy_info = t.getBuddyInfo(avatar_id); + if(!iface || + !iface->setCurrentByID(avatar_id) || + (buddy_info && !buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) || + gAgent.isGodlike()) { LLTracker::stopTracking(NULL); } diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 8dbdfff635..23062bafec 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -179,6 +179,7 @@ LLFolderView::LLFolderView(const Params& p) mSourceID(p.task_id), mRenameItem( NULL ), mNeedsScroll( FALSE ), + mEnableScroll( true ), mPinningSelectedItem(FALSE), mNeedsAutoSelect( FALSE ), mAutoSelectOverride(FALSE), @@ -222,7 +223,7 @@ LLFolderView::LLFolderView(const Params& p) // Escape is handled by reverting the rename, not commiting it (default behavior) LLLineEditor::Params params; params.name("ren"); - params.rect(getRect()); + params.rect(rect); params.font(getLabelFontForStyle(LLFontGL::NORMAL)); params.max_length_bytes(DB_INV_ITEM_NAME_STR_LEN); params.commit_callback.function(boost::bind(&LLFolderView::commitRename, this, _2)); @@ -234,13 +235,19 @@ LLFolderView::LLFolderView(const Params& p) // Textbox LLTextBox::Params text_p; - LLRect new_r(5, 13-50, 300, 0-50); - text_p.name(std::string(p.name)); + LLFontGL* font = getLabelFontForStyle(mLabelStyle); + LLRect new_r = LLRect(rect.mLeft + ICON_PAD, + rect.mTop - TEXT_PAD, + rect.mRight, + rect.mTop - TEXT_PAD - llfloor(font->getLineHeight())); text_p.rect(new_r); - text_p.font(getLabelFontForStyle(mLabelStyle)); + text_p.name(std::string(p.name)); + text_p.font(font); text_p.visible(false); text_p.allow_html(true); mStatusTextBox = LLUICtrlFactory::create<LLTextBox> (text_p); + mStatusTextBox->setFollowsLeft(); + mStatusTextBox->setFollowsTop(); //addChild(mStatusTextBox); @@ -278,10 +285,7 @@ LLFolderView::~LLFolderView( void ) LLView::deleteViewByHandle(mPopupMenuHandle); - if(mRenamer == gFocusMgr.getTopCtrl()) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(mRenamer); mAutoOpenItems.removeAllNodes(); clearSelection(); @@ -413,6 +417,11 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen S32 total_width = LEFT_PAD; S32 running_height = mDebugFilters ? llceil(LLFontGL::getFontMonospace()->getLineHeight()) : 0; S32 target_height = running_height; + if(!mHasVisibleChildren)// is there any filtered items ? + { + //Nope. We need to display status textbox, let's reserve some place for it + target_height += mStatusTextBox->getTextPixelHeight(); + } S32 parent_item_height = getRect().getHeight(); for (folders_t::iterator iter = mFolders.begin(); @@ -828,11 +837,14 @@ void LLFolderView::sanitizeSelection() void LLFolderView::clearSelection() { - if (mSelectedItems.size() > 0) + for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); + item_it != mSelectedItems.end(); + ++item_it) { - recursiveDeselect(FALSE); - mSelectedItems.clear(); + (*item_it)->setUnselected(); } + + mSelectedItems.clear(); mSelectThisID.setNull(); } @@ -960,7 +972,7 @@ void LLFolderView::finishRenamingItem( void ) mRenameItem->rename( mRenamer->getText() ); } - gFocusMgr.setTopCtrl( NULL ); + gViewerWindow->removePopup(mRenamer); if( mRenameItem ) { @@ -977,7 +989,7 @@ void LLFolderView::closeRenamer( void ) // will commit current name (which could be same as original name) mRenamer->setFocus( FALSE ); mRenamer->setVisible( FALSE ); - gFocusMgr.setTopCtrl( NULL ); + gViewerWindow->removePopup(mRenamer); if( mRenameItem ) { @@ -1409,7 +1421,7 @@ void LLFolderView::startRenamingSelectedItem( void ) mRenamer->setFocus( TRUE ); mRenamer->setTopLostCallback(boost::bind(onRenamerLost, _1)); mRenamer->setFocusLostCallback(boost::bind(onRenamerLost, _1)); - gFocusMgr.setTopCtrl( mRenamer ); + gViewerWindow->addPopup(mRenamer); } } @@ -1625,7 +1637,11 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask ) LLFolderViewItem* parent_folder = last_selected->getParentFolder(); if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder()) { - setSelection(parent_folder, FALSE, TRUE); + // Don't change selectin to hidden folder. See EXT-5328. + if (!parent_folder->getHidden()) + { + setSelection(parent_folder, FALSE, TRUE); + } } else { @@ -1886,7 +1902,7 @@ void LLFolderView::deleteAllChildren() { if(mRenamer == gFocusMgr.getTopCtrl()) { - gFocusMgr.setTopCtrl(NULL); + gViewerWindow->removePopup(mRenamer); } LLView::deleteViewByHandle(mPopupMenuHandle); mPopupMenuHandle = LLHandle<LLView>(); @@ -1898,7 +1914,7 @@ void LLFolderView::deleteAllChildren() void LLFolderView::scrollToShowSelection() { - if (mSelectedItems.size()) + if (mEnableScroll && mSelectedItems.size()) { mNeedsScroll = TRUE; } @@ -2148,6 +2164,15 @@ void LLFolderView::doIdle() LLSelectFirstFilteredItem filter; applyFunctorRecursively(filter); } + + // Open filtered folders for folder views with mAutoSelectOverride=TRUE. + // Used by LLPlacesFolderView. + if (mAutoSelectOverride && !mFilter->getFilterSubString().empty()) + { + LLOpenFilteredFolders filter; + applyFunctorRecursively(filter); + } + scrollToShowSelection(); } diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index faf6a9cf23..38255b3cea 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -269,6 +269,7 @@ public: void dumpSelectionInformation(); virtual S32 notify(const LLSD& info) ; + void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; } private: void updateRenamerPosition(); @@ -300,6 +301,7 @@ protected: LLLineEditor* mRenamer; BOOL mNeedsScroll; + bool mEnableScroll; BOOL mPinningSelectedItem; LLRect mScrollConstraintRect; BOOL mNeedsAutoSelect; diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 76607e4874..d3e3d2b57b 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -121,7 +121,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p) mHasVisibleChildren(FALSE), mIndentation(0), mItemHeight(p.item_height), - mNumDescendantsSelected(0), mPassedFilter(FALSE), mLastFilterGeneration(-1), mStringMatchOffset(std::string::npos), @@ -497,22 +496,6 @@ BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selecte return FALSE; } -void LLFolderViewItem::recursiveDeselect(BOOL deselect_self) -{ - if (mIsSelected && deselect_self) - { - mIsSelected = FALSE; - - // update ancestors' count of selected descendents - LLFolderViewFolder* parent_folder = getParentFolder(); - while(parent_folder) - { - parent_folder->mNumDescendantsSelected--; - parent_folder = parent_folder->getParentFolder(); - } - } -} - BOOL LLFolderViewItem::isMovable() { @@ -1459,7 +1442,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } for (items_t::iterator iter = mItems.begin(); @@ -1470,7 +1452,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } if(openitem && child_selected) @@ -1503,14 +1484,6 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, folders_t::iterator fit = iter++; if((*fit)->changeSelection(selection, selected)) { - if (selected) - { - mNumDescendantsSelected++; - } - else - { - mNumDescendantsSelected--; - } rv = TRUE; } } @@ -1520,14 +1493,6 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, items_t::iterator iit = iter++; if((*iit)->changeSelection(selection, selected)) { - if (selected) - { - mNumDescendantsSelected++; - } - else - { - mNumDescendantsSelected--; - } rv = TRUE; } } @@ -1544,7 +1509,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie { folders_t::iterator fit = iter++; num_selected += (*fit)->extendSelection(selection, last_selected, selected_items); - mNumDescendantsSelected += num_selected; } // handle selection of our immediate children... @@ -1637,7 +1601,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (item->changeSelection(item, TRUE)) { selected_items.put(item); - mNumDescendantsSelected++; num_selected++; } } @@ -1648,7 +1611,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (selection->changeSelection(selection, TRUE)) { selected_items.put(selection); - mNumDescendantsSelected++; num_selected++; } } @@ -1656,47 +1618,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie return num_selected; } -void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self) -{ - // make sure we don't have negative values - llassert(mNumDescendantsSelected >= 0); - - if (mIsSelected && deselect_self) - { - mIsSelected = FALSE; - - // update ancestors' count of selected descendents - LLFolderViewFolder* parent_folder = getParentFolder(); - while(parent_folder) - { - parent_folder->mNumDescendantsSelected--; - parent_folder = parent_folder->getParentFolder(); - } - } - - if (0 == mNumDescendantsSelected) - { - return; - } - - for (items_t::iterator iter = mItems.begin(); - iter != mItems.end();) - { - items_t::iterator iit = iter++; - LLFolderViewItem* item = (*iit); - item->recursiveDeselect(TRUE); - } - - for (folders_t::iterator iter = mFolders.begin(); - iter != mFolders.end();) - { - folders_t::iterator fit = iter++; - LLFolderViewFolder* folder = (*fit); - folder->recursiveDeselect(TRUE); - } - -} - void LLFolderViewFolder::destroyView() { for (items_t::iterator iter = mItems.begin(); @@ -1730,8 +1651,6 @@ BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item) { if(item->remove()) { - //RN: this seem unneccessary as remove() moves to trash - //removeView(item); return TRUE; } return FALSE; @@ -1746,7 +1665,6 @@ void LLFolderViewFolder::removeView(LLFolderViewItem* item) return; } // deselect without traversing hierarchy - item->recursiveDeselect(TRUE); getRoot()->removeFromSelectionList(item); extractItem(item); delete item; diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index be8e73a5a9..655ad89e99 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -150,7 +150,6 @@ protected: BOOL mHasVisibleChildren; S32 mIndentation; S32 mItemHeight; - S32 mNumDescendantsSelected; BOOL mPassedFilter; S32 mLastFilterGeneration; std::string::size_type mStringMatchOffset; @@ -231,9 +230,6 @@ public: // this method is used to group select items virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; } - // this method is used to group select items - virtual void recursiveDeselect(BOOL deselect_self); - // gets multiple-element selection virtual BOOL getSelectionList(std::set<LLUUID> &selection) const {return TRUE;} @@ -246,10 +242,10 @@ public: // destroys this item recursively virtual void destroyView(); - S32 getNumSelectedDescendants() { return mNumDescendantsSelected; } - BOOL isSelected() { return mIsSelected; } + void setUnselected() { mIsSelected = FALSE; } + void setIsCurSelection(BOOL select) { mIsCurSelection = select; } BOOL getIsCurSelection() { return mIsCurSelection; } @@ -441,8 +437,6 @@ public: // this method is used to group select items virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items); - virtual void recursiveDeselect(BOOL deselect_self); - // Returns true is this object and all of its children can be removed. virtual BOOL isRemovable(); diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp index ac060cef15..18f81fe506 100644 --- a/indra/newview/llfriendcard.cpp +++ b/indra/newview/llfriendcard.cpp @@ -44,24 +44,28 @@ // Constants; -static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "InvFolder Friends"; -static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "InvFolder All"; +static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "Friends"; +static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "All"; // helper functions -// NOTE: Usage of LLTrans::getString(); in next two functions to set localized -// folders' names is caused by a hack in the LLFolderViewItem::refreshFromListener() -// method for protected asset types. -// So, localized names will be got from the strings with "InvFolder LABEL_NAME" -// in the strings.xml +// NOTE: For now Friends & All folders are created as protected folders of the LLFolderType::FT_CALLINGCARD type. +// So, their names will be processed in the LLFolderViewItem::refreshFromListener() to be localized +// using "InvFolder LABEL_NAME" as LLTrans::findString argument. + +// We must use in this file their hard-coded names to ensure found them on different locales. EXT-5829. +// These hard-coded names will be stored in InventoryItems but shown localized in FolderViewItems + +// If hack in the LLFolderViewItem::refreshFromListener() to localize protected folder is removed +// or these folders are not protected these names should be localized in another place/way. inline const std::string get_friend_folder_name() { - return LLTrans::getString(INVENTORY_STRING_FRIENDS_SUBFOLDER); + return INVENTORY_STRING_FRIENDS_SUBFOLDER; } inline const std::string get_friend_all_subfolder_name() { - return LLTrans::getString(INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER); + return INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER; } void move_from_to_arrays(LLInventoryModel::cat_array_t& from, LLInventoryModel::cat_array_t& to) @@ -350,9 +354,9 @@ const LLUUID& LLFriendCardsManager::findFriendAllSubfolderUUIDImpl() const return findChildFolderUUID(friendFolderUUID, friendAllSubfolderName); } -const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const +const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const { - LLNameCategoryCollector matchFolderFunctor(localizedName); + LLNameCategoryCollector matchFolderFunctor(nonLocalizedName); return get_folder_uuid(parentFolderUUID, matchFolderFunctor); } diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h index b94d5ec2c0..1cda52c1d7 100644 --- a/indra/newview/llfriendcard.h +++ b/indra/newview/llfriendcard.h @@ -120,7 +120,7 @@ private: return (mBuddyIDSet.end() != mBuddyIDSet.find(avatarID)); } - const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const; + const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const; const LLUUID& findFriendFolderUUIDImpl() const; const LLUUID& findFriendAllSubfolderUUIDImpl() const; const LLUUID& findFriendCardInventoryUUIDImpl(const LLUUID& avatarID); diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 750a9d478f..8569e208eb 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -897,19 +897,21 @@ void LLViewerObjectList::renderObjectBeacons() S32 last_line_width = -1; // gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width) - for (S32 i = 0; i < mDebugBeacons.count(); i++) + BOOL flush = FALSE; + for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter) { - const LLDebugBeacon &debug_beacon = mDebugBeacons[i]; + const LLDebugBeacon &debug_beacon = *iter; LLColor4 color = debug_beacon.mColor; color.mV[3] *= 0.25f; S32 line_width = debug_beacon.mLineWidth; if (line_width != last_line_width) { - if (i > 0) + if (flush) { gGL.end(); - gGL.flush(); } + flush = TRUE; + gGL.flush(); glLineWidth( (F32)line_width ); last_line_width = line_width; gGL.begin(LLRender::LINES); @@ -936,18 +938,20 @@ void LLViewerObjectList::renderObjectBeacons() S32 last_line_width = -1; // gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width) - for (S32 i = 0; i < mDebugBeacons.count(); i++) + BOOL flush = FALSE; + for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter) { - const LLDebugBeacon &debug_beacon = mDebugBeacons[i]; + const LLDebugBeacon &debug_beacon = *iter; S32 line_width = debug_beacon.mLineWidth; if (line_width != last_line_width) { - if (i > 0) + if (flush) { gGL.end(); - gGL.flush(); } + flush = TRUE; + gGL.flush(); glLineWidth( (F32)line_width ); last_line_width = line_width; gGL.begin(LLRender::LINES); @@ -969,9 +973,9 @@ void LLViewerObjectList::renderObjectBeacons() gGL.flush(); glLineWidth(1.f); - for (S32 i = 0; i < mDebugBeacons.count(); i++) + for (std::vector<LLDebugBeacon>::iterator iter = mDebugBeacons.begin(); iter != mDebugBeacons.end(); ++iter) { - LLDebugBeacon &debug_beacon = mDebugBeacons[i]; + LLDebugBeacon &debug_beacon = *iter; if (debug_beacon.mString == "") { continue; diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 1ed1113f4d..8a056f836f 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -127,7 +127,7 @@ BOOL LLGroupList::handleRightMouseDown(S32 x, S32 y, MASK mask) BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); LLMenuGL* context_menu = (LLMenuGL*)mContextMenuHandle.get(); - if (context_menu) + if (context_menu && size() > 0) { context_menu->buildDrawLabels(); context_menu->updateParent(LLMenuGL::sMenuContainer); @@ -287,7 +287,7 @@ bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata) return gAgent.getGroupID() != selected_group_id; if (userdata.asString() == "call") - return LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); + return real_group_selected && LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); return real_group_selected; } diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h index f3ac676edd..0e9da25c58 100644 --- a/indra/newview/llgrouplist.h +++ b/indra/newview/llgrouplist.h @@ -74,6 +74,11 @@ public: void setNameFilter(const std::string& filter); void toggleIcons(); bool getIconsVisible() const { return mShowIcons; } + + // *WORKAROUND: two methods to overload appropriate Params due to localization issue: + // no_groups_msg & no_filtered_groups_msg attributes are not defined as translatable in VLT. See EXT-5931 + void setNoGroupsMsg(const std::string& msg) { mNoGroupsMsg = msg; } + void setNoFilteredGroupsMsg(const std::string& msg) { mNoFilteredGroupsMsg = msg; } private: void setDirty(bool val = true) { mDirty = val; } diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 4db75bbd8a..aeac3841f9 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -56,6 +56,16 @@ #include "lluictrlfactory.h" #include <boost/regex.hpp> +#if LL_MSVC +// disable boost::lexical_cast warning +#pragma warning (disable:4702) +#endif + +#include <boost/lexical_cast.hpp> + +#if LL_MSVC +#pragma warning(pop) // Restore all warnings to the previous state +#endif const U32 MAX_CACHED_GROUPS = 10; @@ -833,12 +843,13 @@ static void formatDateString(std::string &date_string) const regex expression("([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})"); if (regex_match(date_string.c_str(), result, expression)) { - std::string year = result[3]; - std::string month = result[1]; - std::string day = result[2]; + // convert matches to integers so that we can pad them with zeroes on Linux + S32 year = boost::lexical_cast<S32>(result[3]); + S32 month = boost::lexical_cast<S32>(result[1]); + S32 day = boost::lexical_cast<S32>(result[2]); // ISO 8601 date format - date_string = llformat("%02s/%02s/%04s", month.c_str(), day.c_str(), year.c_str()); + date_string = llformat("%04d/%02d/%02d", year, month, day); } } @@ -1721,13 +1732,11 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, { LLUUID& ejected_member_id = (*it); - llwarns << "LLGroupMgr::sendGroupMemberEjects -- ejecting member" << ejected_member_id << llendl; - // Can't use 'eject' to leave a group. - if ((*it) == gAgent.getID()) continue; + if (ejected_member_id == gAgent.getID()) continue; // Make sure they are in the group, and we need the member data - LLGroupMgrGroupData::member_list_t::iterator mit = group_datap->mMembers.find(*it); + LLGroupMgrGroupData::member_list_t::iterator mit = group_datap->mMembers.find(ejected_member_id); if (mit != group_datap->mMembers.end()) { // Add them to the message @@ -1751,22 +1760,23 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, start_message = true; } + LLGroupMemberData* member_data = (*mit).second; + // Clean up groupmgr - for (LLGroupMemberData::role_list_t::iterator rit = (*mit).second->roleBegin(); - rit != (*mit).second->roleEnd(); ++rit) + for (LLGroupMemberData::role_list_t::iterator rit = member_data->roleBegin(); + rit != member_data->roleEnd(); ++rit) { if ((*rit).first.notNull() && (*rit).second!=0) { (*rit).second->removeMember(ejected_member_id); - - llwarns << "LLGroupMgr::sendGroupMemberEjects - removing member from role " << llendl; } } - group_datap->mMembers.erase(*it); + group_datap->mMembers.erase(ejected_member_id); - llwarns << "LLGroupMgr::sendGroupMemberEjects - deleting memnber data " << llendl; - delete (*mit).second; + // member_data was introduced and is used here instead of (*mit).second to avoid crash because of invalid iterator + // It becomes invalid after line with erase above. EXT-4778 + delete member_data; } } @@ -1774,8 +1784,6 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, { gAgent.sendReliableMessage(); } - - llwarns << "LLGroupMgr::sendGroupMemberEjects - done " << llendl; } void LLGroupMgr::sendGroupRoleChanges(const LLUUID& group_id) diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp index a02dc3355b..325c9c260c 100644 --- a/indra/newview/llhudrender.cpp +++ b/indra/newview/llhudrender.cpp @@ -121,24 +121,24 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent, glMatrixMode(GL_PROJECTION); glPushMatrix(); glMatrixMode(GL_MODELVIEW); - + gGL.pushMatrix(); LLUI::pushMatrix(); gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight()); gViewerWindow->setup3DViewport(); - //gViewerWindow->setup2DRender(); - + winX -= world_view_rect.mLeft; winY -= world_view_rect.mBottom; LLUI::loadIdentity(); + glLoadIdentity(); LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f)); - //glRotatef(angle * RAD_TO_DEG, axis.mV[VX], axis.mV[VY], axis.mV[VZ]); - //glScalef(right_scale, up_scale, 1.f); F32 right_x; font.render(wstr, 0, 0, 0, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x); + LLUI::popMatrix(); - + gGL.popMatrix(); + glMatrixMode(GL_PROJECTION); glPopMatrix(); glMatrixMode(GL_MODELVIEW); diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 8ad94b957d..8d1d27444b 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -555,7 +555,7 @@ void LLHUDText::renderText(BOOL for_select) } } /// Reset the default color to white. The renderer expects this to be the default. - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f); if (for_select) { gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE); diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 94b540a7e1..77eaebb0bc 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -112,6 +112,8 @@ LLIMFloater::LLIMFloater(const LLUUID& session_id) setOverlapsScreenChannel(true); LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this); + + setDocked(true); } void LLIMFloater::onFocusLost() @@ -125,12 +127,6 @@ void LLIMFloater::onFocusReceived() { LLIMModel::getInstance()->setActiveSessionID(mSessionID); - // return focus to the input field when active tab in the multitab container is clicked. - if (isChatMultiTab() && mInputEditor) - { - mInputEditor->setFocus(TRUE); - } - LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true); } @@ -442,7 +438,7 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id) void LLIMFloater::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); static S32 right_padding = 0; if (right_padding == 0) { @@ -489,11 +485,19 @@ void LLIMFloater::setVisible(BOOL visible) channel->redrawToasts(); } - if (visible && mChatHistory && mInputEditor) + BOOL is_minimized = visible && isChatMultiTab() + ? LLIMFloaterContainer::getInstance()->isMinimized() + : !visible; + + if (!is_minimized && mChatHistory && mInputEditor) { //only if floater was construced and initialized from xml updateMessages(); - mInputEditor->setFocus(TRUE); + //prevent steal focus when IM opened in multitab mode + if (!isChatMultiTab()) + { + mInputEditor->setFocus(TRUE); + } } if(!visible) @@ -514,6 +518,13 @@ BOOL LLIMFloater::getVisible() // Treat inactive floater as invisible. bool is_active = im_container->getActiveFloater() == this; + + //torn off floater is always inactive + if (!is_active && getHost() != im_container) + { + return LLTransientDockableFloater::getVisible(); + } + // getVisible() returns TRUE when Tabbed IM window is minimized. return is_active && !im_container->isMinimized() && im_container->getVisible(); } @@ -618,12 +629,14 @@ void LLIMFloater::updateMessages() LLUUID from_id = msg["from_id"].asUUID(); std::string from = msg["from"].asString(); std::string message = msg["message"].asString(); + bool is_history = msg["is_history"].asBoolean(); LLChat chat; chat.mFromID = from_id; chat.mSessionID = mSessionID; chat.mFromName = from; chat.mTimeStr = time; + chat.mChatStyle = is_history ? CHAT_STYLE_HISTORY : chat.mChatStyle; // process offer notification if (msg.has("notification_id")) @@ -663,15 +676,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void* //in disconnected state IM input editor should be disabled self->mInputEditor->setEnabled(!gDisconnected); } - - // when IM Floater is a part of the multitab container LLTabContainer set focus to the first - // child on tab button's mouse up. This leads input field lost focus. See EXT-3852. - if (isChatMultiTab()) - { - // So, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child. - // do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is. - gFocusMgr.setMouseCapture(NULL); - } } // static diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 49521b5987..9eb11a6ac4 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -39,6 +39,7 @@ #include "llavatariconctrl.h" #include "llgroupiconctrl.h" #include "llagent.h" +#include "lltransientfloatermgr.h" // // LLIMFloaterContainer @@ -47,9 +48,13 @@ LLIMFloaterContainer::LLIMFloaterContainer(const LLSD& seed) : LLMultiFloater(seed) { mAutoResize = FALSE; + LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this); } -LLIMFloaterContainer::~LLIMFloaterContainer(){} +LLIMFloaterContainer::~LLIMFloaterContainer() +{ + LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this); +} BOOL LLIMFloaterContainer::postBuild() { @@ -110,8 +115,8 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, icon_params.avatar_id = avatar_id; icon = LLUICtrlFactory::instance().createWidget<LLAvatarIconCtrl>(icon_params); - mSessions[avatar_id] = floaterp; - floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, avatar_id)); + mSessions[session_id] = floaterp; + floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id)); } mTabContainer->setTabImage(floaterp, icon); } @@ -123,7 +128,7 @@ void LLIMFloaterContainer::onCloseFloater(LLUUID& id) void LLIMFloaterContainer::onNewMessageReceived(const LLSD& data) { - LLUUID session_id = data["from_id"].asUUID(); + LLUUID session_id = data["session_id"].asUUID(); LLFloater* floaterp = get_ptr_in_map(mSessions, session_id); LLFloater* current_floater = LLMultiFloater::getActiveFloater(); @@ -145,4 +150,20 @@ LLIMFloaterContainer* LLIMFloaterContainer::getInstance() return LLFloaterReg::getTypedInstance<LLIMFloaterContainer>("im_container"); } +void LLIMFloaterContainer::setMinimized(BOOL b) +{ + if (isMinimized() == b) return; + + LLMultiFloater::setMinimized(b); + // Hide minimized floater (see EXT-5315) + setVisible(!b); + + if (isMinimized()) return; + + if (getActiveFloater()) + { + getActiveFloater()->setVisible(TRUE); + } +} + // EOF diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 46c0617c01..f6cdc25ebd 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -63,6 +63,8 @@ public: static LLIMFloaterContainer* getInstance(); + virtual void setMinimized(BOOL b); + private: typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t; avatarID_panel_map_t mSessions; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1641e2a0e2..2dfc57532a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -378,7 +378,7 @@ void LLIMModel::LLIMSession::sessionInitReplyReceived(const LLUUID& new_session_ } } -void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time) +void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time, const bool is_history) { LLSD message; message["from"] = from; @@ -386,6 +386,7 @@ void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& f message["message"] = utf8_text; message["time"] = time; message["index"] = (LLSD::Integer)mMsgs.size(); + message["is_history"] = is_history; mMsgs.push_front(message); @@ -414,7 +415,7 @@ void LLIMModel::LLIMSession::addMessagesFromHistory(const std::list<LLSD>& histo std::string timestamp = msg[IM_TIME]; std::string text = msg[IM_TEXT]; - addMessage(from, from_id, text, timestamp); + addMessage(from, from_id, text, timestamp, true); it++; } @@ -428,11 +429,11 @@ void LLIMModel::LLIMSession::chatFromLogFile(LLLogChat::ELogLineType type, const if (type == LLLogChat::LOG_LINE) { - self->addMessage("", LLSD(), msg["message"].asString(), ""); + self->addMessage("", LLSD(), msg["message"].asString(), "", true); } else if (type == LLLogChat::LOG_LLSD) { - self->addMessage(msg["from"].asString(), msg["from_id"].asUUID(), msg["message"].asString(), msg["time"].asString()); + self->addMessage(msg["from"].asString(), msg["from_id"].asUUID(), msg["message"].asString(), msg["time"].asString(), true); } } @@ -972,7 +973,42 @@ void LLIMModel::sendMessage(const std::string& utf8_text, } // Add the recipient to the recent people list. - LLRecentPeople::instance().add(other_participant_id); + bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(other_participant_id) == NULL; + + if (is_not_group_id) + { + +#if 0 + //use this code to add only online members + LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(im_session_id); + LLSpeakerMgr::speaker_list_t speaker_list; + speaker_mgr->getSpeakerList(&speaker_list, true); + for(LLSpeakerMgr::speaker_list_t::iterator it = speaker_list.begin(); it != speaker_list.end(); it++) + { + const LLPointer<LLSpeaker>& speakerp = *it; + + LLRecentPeople::instance().add(speakerp->mID); + } +#else + LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(im_session_id); + if( session == 0)//??? shouldn't really happen + { + LLRecentPeople::instance().add(other_participant_id); + } + else + { + for(std::vector<LLUUID>::iterator it = session->mInitialTargetIDs.begin(); + it!=session->mInitialTargetIDs.end();++it) + { + const LLUUID id = *it; + + LLRecentPeople::instance().add(id); + } + } +#endif + } + + } void session_starter_helper( @@ -1493,6 +1529,8 @@ LLCallDialog::LLCallDialog(const LLSD& payload) mLifetime(DEFAULT_LIFETIME) { setAutoFocus(FALSE); + // force docked state since this floater doesn't save it between recreations + setDocked(true); } void LLCallDialog::getAllowedRect(LLRect& rect) @@ -1548,7 +1586,7 @@ void LLCallDialog::onOpen(const LLSD& key) LLDockableFloater::onOpen(key); // it should be over the all floaters. EXT-5116 - gFloaterView->bringToFront(this); + gFloaterView->bringToFront(this, FALSE); } void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 8e53edaab0..c4a8dd076e 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -84,7 +84,7 @@ public: void sessionInitReplyReceived(const LLUUID& new_session_id); void addMessagesFromHistory(const std::list<LLSD>& history); - void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time); + void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time, const bool is_history = false); void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction); /** @deprecated */ diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index b2cdc0738f..14bc4376fe 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -51,6 +51,7 @@ #include "llviewermenu.h" #include "llvoiceclient.h" #include "llviewerobjectlist.h" +#include "lltransientfloatermgr.h" // Linden libraries #include "llfloater.h" @@ -71,7 +72,7 @@ class LLFetchAvatarData; // Avatar Inspector, a small information window used when clicking // on avatar names in the 2D UI and in the ambient inspector widget for // the 3D world. -class LLInspectAvatar : public LLInspect +class LLInspectAvatar : public LLInspect, LLTransientFloater { friend class LLFloaterReg; @@ -97,6 +98,8 @@ public: // gear menu is not open /* virtual */ void onMouseLeave(S32 x, S32 y, MASK mask); + virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::GLOBAL; } + private: // Make network requests for all the data to display in this view. // Used on construction and if avatar id changes. @@ -120,6 +123,7 @@ private: void onClickTeleport(); void onClickInviteToGroup(); void onClickPay(); + void onClickShare(); void onToggleMute(); void onClickReport(); void onClickFreeze(); @@ -213,6 +217,7 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd) mCommitCallbackRegistrar.add("InspectAvatar.Teleport", boost::bind(&LLInspectAvatar::onClickTeleport, this)); mCommitCallbackRegistrar.add("InspectAvatar.InviteToGroup", boost::bind(&LLInspectAvatar::onClickInviteToGroup, this)); mCommitCallbackRegistrar.add("InspectAvatar.Pay", boost::bind(&LLInspectAvatar::onClickPay, this)); + mCommitCallbackRegistrar.add("InspectAvatar.Share", boost::bind(&LLInspectAvatar::onClickShare, this)); mCommitCallbackRegistrar.add("InspectAvatar.ToggleMute", boost::bind(&LLInspectAvatar::onToggleMute, this)); mCommitCallbackRegistrar.add("InspectAvatar.Freeze", boost::bind(&LLInspectAvatar::onClickFreeze, this)); @@ -235,6 +240,9 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd) // can't make the properties request until the widgets are constructed // as it might return immediately, so do it in postBuild. + + LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this); + LLTransientFloater::init(this); } LLInspectAvatar::~LLInspectAvatar() @@ -243,6 +251,8 @@ LLInspectAvatar::~LLInspectAvatar() // view delete mPropertiesRequest; mPropertiesRequest = NULL; + + LLTransientFloaterMgr::getInstance()->removeControlView(this); } /*virtual*/ @@ -678,6 +688,12 @@ void LLInspectAvatar::onClickPay() closeFloater(); } +void LLInspectAvatar::onClickShare() +{ + LLAvatarActions::share(mAvatarID); + closeFloater(); +} + void LLInspectAvatar::onToggleMute() { LLMute mute(mAvatarID, mAvatarName, LLMute::AGENT); diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ec2be0e8e9..27a40c6ba0 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -31,6 +31,9 @@ */ #include "llviewerprecompiledheaders.h" +// external projects +#include "lltransfersourceasset.h" + #include "llinventorybridge.h" #include "llagent.h" @@ -293,12 +296,27 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener* LLMessageSystem* msg = gMessageSystem; const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH); LLViewerInventoryItem* item = NULL; - LLViewerInventoryCategory* cat = NULL; std::vector<LLUUID> move_ids; LLInventoryModel::update_map_t update; bool start_new_message = true; S32 count = batch.count(); S32 i; + + // first, hide any 'preview' floaters that correspond to the items + // being deleted. + for(i = 0; i < count; ++i) + { + bridge = (LLInvFVBridge*)(batch.get(i)); + if(!bridge || !bridge->isItemRemovable()) continue; + item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID()); + if(item) + { + LLPreview::hide(item->getUUID()); + } + } + + // do the inventory move to trash + for(i = 0; i < count; ++i) { bridge = (LLInvFVBridge*)(batch.get(i)); @@ -308,7 +326,6 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener* { if(item->getParentUUID() == trash_id) continue; move_ids.push_back(item->getUUID()); - LLPreview::hide(item->getUUID()); --update[item->getParentUUID()]; ++update[trash_id]; if(start_new_message) @@ -340,11 +357,12 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener* gInventory.accountForUpdate(update); update.clear(); } + for(i = 0; i < count; ++i) { bridge = (LLInvFVBridge*)(batch.get(i)); if(!bridge || !bridge->isItemRemovable()) continue; - cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID()); + LLViewerInventoryCategory* cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID()); if(cat) { if(cat->getParentUUID() == trash_id) continue; @@ -568,7 +586,16 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, if (show_asset_id) { items.push_back(std::string("Copy Asset UUID")); - if ( (! ( isItemPermissive() || gAgent.isGodlike() ) ) + + bool is_asset_knowable = false; + + LLViewerInventoryItem* inv_item = gInventory.getItem(mUUID); + if (inv_item) + { + is_asset_knowable = is_asset_id_knowable(inv_item->getType()); + } + if ( !is_asset_knowable // disable menu item for Inventory items with unknown asset. EXT-5308 + || (! ( isItemPermissive() || gAgent.isGodlike() ) ) || (flags & FIRST_SELECTED_ITEM) == 0) { disabled_items.push_back(std::string("Copy Asset UUID")); @@ -1050,9 +1077,9 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, else if ("copy_uuid" == action) { // Single item only - LLInventoryItem* item = model->getItem(mUUID); + LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if(!item) return; - LLUUID asset_id = item->getAssetUUID(); + LLUUID asset_id = item->getProtectedAssetUUID(); std::string buffer; asset_id.toString(buffer); @@ -1092,7 +1119,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, void LLItemBridge::selectItem() { - LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem(); + LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if(item && !item->isComplete()) { item->fetchFromServer(); @@ -1101,7 +1128,7 @@ void LLItemBridge::selectItem() void LLItemBridge::restoreItem() { - LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem(); + LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); if(item) { LLInventoryModel* model = getInventoryModel(); @@ -1116,7 +1143,7 @@ void LLItemBridge::restoreToWorld() //Similar functionality to the drag and drop rez logic bool remove_from_inventory = false; - LLViewerInventoryItem* itemp = (LLViewerInventoryItem*)getItem(); + LLViewerInventoryItem* itemp = static_cast<LLViewerInventoryItem*>(getItem()); if (itemp) { LLMessageSystem* msg = gMessageSystem; @@ -1409,11 +1436,7 @@ BOOL LLItemBridge::isItemPermissive() const LLViewerInventoryItem* item = getItem(); if(item) { - U32 mask = item->getPermissions().getMaskBase(); - if((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) - { - return TRUE; - } + return item->getIsFullPerm(); } return FALSE; } @@ -1910,7 +1933,7 @@ bool LLFindCOFValidItems::operator()(LLInventoryCategory* cat, // - links to attachments // - links to gestures // - links to ensemble folders - LLViewerInventoryItem *linked_item = ((LLViewerInventoryItem*)item)->getLinkedItem(); // BAP - safe? + LLViewerInventoryItem *linked_item = ((LLViewerInventoryItem*)item)->getLinkedItem(); if (linked_item) { LLAssetType::EType type = linked_item->getType(); @@ -1921,7 +1944,7 @@ bool LLFindCOFValidItems::operator()(LLInventoryCategory* cat, } else { - LLViewerInventoryCategory *linked_category = ((LLViewerInventoryItem*)item)->getLinkedCategory(); // BAP - safe? + LLViewerInventoryCategory *linked_category = ((LLViewerInventoryItem*)item)->getLinkedCategory(); // BAP remove AT_NONE support after ensembles are fully working? return (linked_category && ((linked_category->getPreferredType() == LLFolderType::FT_NONE) || @@ -2947,8 +2970,6 @@ void LLFolderBridge::modifyOutfit(BOOL append) LLViewerInventoryCategory* cat = getCategory(); if(!cat) return; - // BAP - was: - // wear_inventory_category_on_avatar( cat, append ); LLAppearanceManager::instance().wearInventoryCategory( cat, FALSE, append ); } diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 326f2a5577..83a466a243 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url) U32 folder_count=0; U32 max_batch_size=5; - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; LLSD body; LLSD body_lib; diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index ca9b942629..8097985ade 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -290,8 +290,12 @@ void LLInventoryPanel::modelChanged(U32 mask) if(bridge) { // Clear the display name first, so it gets properly re-built during refresh() bridge->clearDisplayName(); + + view_item->refresh(); + + // Set the new tooltip with the new display name. + view_item->setToolTip(bridge->getDisplayName()); } - view_item->refresh(); } } @@ -677,6 +681,21 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, return handled; } +// virtual +void LLInventoryPanel::onMouseEnter(S32 x, S32 y, MASK mask) +{ + LLPanel::onMouseEnter(x, y, mask); + // don't auto-scroll a list when cursor is over Inventory. See EXT-3981. + mFolders->setEnableScroll(false); +} + +// virtual +void LLInventoryPanel::onMouseLeave(S32 x, S32 y, MASK mask) +{ + LLPanel::onMouseLeave(x, y, mask); + mFolders->setEnableScroll(true); +} + void LLInventoryPanel::onFocusLost() { // inventory no longer handles cut/copy/paste/delete diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index f312b588b9..928a458b84 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel // Data //-------------------------------------------------------------------- public: - static const std::string DEFAULT_SORT_ORDER; - static const std::string RECENTITEMS_SORT_ORDER; - static const std::string INHERIT_SORT_ORDER; - struct Filter : public LLInitParam::Block<Filter> { Optional<U32> sort_order; @@ -122,6 +118,10 @@ public: void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); + + void onMouseEnter(S32 x, S32 y, MASK mask); + void onMouseLeave(S32 x, S32 y, MASK mask); + // LLUICtrl methods /*virtual*/ void onFocusLost(); /*virtual*/ void onFocusReceived(); @@ -138,8 +138,6 @@ public: U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); } void setFilterSubString(const std::string& string); const std::string getFilterSubString() { return mFolders->getFilterSubString(); } - void setSortOrder(U32 order); - U32 getSortOrder() { return mFolders->getSortOrder(); } void setSinceLogoff(BOOL sl); void setHoursAgo(U32 hours); BOOL getSinceLogoff(); @@ -178,7 +176,6 @@ protected: LLInventoryModel* mInventory; LLInventoryObserver* mInventoryObserver; BOOL mAllowMultiSelect; - std::string mSortOrderSetting; LLFolderView* mFolders; LLScrollContainer* mScroller; @@ -192,6 +189,20 @@ protected: */ const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder; + + //-------------------------------------------------------------------- + // Sorting + //-------------------------------------------------------------------- +public: + static const std::string DEFAULT_SORT_ORDER; + static const std::string RECENTITEMS_SORT_ORDER; + static const std::string INHERIT_SORT_ORDER; + + void setSortOrder(U32 order); + U32 getSortOrder() const { return mFolders->getSortOrder(); } +private: + std::string mSortOrderSetting; + //-------------------------------------------------------------------- // Hidden folders //-------------------------------------------------------------------- diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index df93930d33..7906d9b20f 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -63,6 +63,7 @@ void LLLocationHistory::addItem(const LLLocationHistoryItem& item) { mItems.erase(mItems.begin(), mItems.end()-max_items); } llassert((S32)mItems.size() <= max_items); + mChangedSignal(ADD); } /* @@ -87,9 +88,10 @@ bool LLLocationHistory::touchItem(const LLLocationHistoryItem& item) { void LLLocationHistory::removeItems() { mItems.clear(); + mChangedSignal(CLEAR); } -bool LLLocationHistory::getMatchingItems(std::string substring, location_list_t& result) const +bool LLLocationHistory::getMatchingItems(const std::string& substring, location_list_t& result) const { // *TODO: an STL algorithm would look nicer result.clear(); @@ -160,7 +162,7 @@ void LLLocationHistory::load() return; } - removeItems(); + mItems.clear();// need to use a direct call of clear() method to avoid signal invocation // add each line in the file to the list std::string line; @@ -179,5 +181,5 @@ void LLLocationHistory::load() file.close(); - mLoadedSignal(); + mChangedSignal(LOAD); } diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h index 5f9976f87a..fb71fbaa0f 100644 --- a/indra/newview/lllocationhistory.h +++ b/indra/newview/lllocationhistory.h @@ -41,11 +41,13 @@ #include <boost/function.hpp> class LLSD; - +/** + * This enum is responsible for identifying of history item. + */ enum ELocationType { - TYPED_REGION_SURL//region name or surl - ,LANDMARK // name of landmark - ,TELEPORT_HISTORY + TYPED_REGION_SLURL//item added after the user had typed a region name or slurl + ,LANDMARK // item has been loaded from landmark folder + ,TELEPORT_HISTORY // item from session teleport history }; class LLLocationHistoryItem { @@ -109,9 +111,16 @@ class LLLocationHistory: public LLSingleton<LLLocationHistory> LOG_CLASS(LLLocationHistory); public: + enum EChangeType + { + ADD + ,CLEAR + ,LOAD + }; + typedef std::vector<LLLocationHistoryItem> location_list_t; - typedef boost::function<void()> loaded_callback_t; - typedef boost::signals2::signal<void()> loaded_signal_t; + typedef boost::function<void(EChangeType event)> history_changed_callback_t; + typedef boost::signals2::signal<void(EChangeType event)> history_changed_signal_t; LLLocationHistory(); @@ -120,8 +129,8 @@ public: void removeItems(); size_t getItemCount() const { return mItems.size(); } const location_list_t& getItems() const { return mItems; } - bool getMatchingItems(std::string substring, location_list_t& result) const; - boost::signals2::connection setLoadedCallback(loaded_callback_t cb) { return mLoadedSignal.connect(cb); } + bool getMatchingItems(const std::string& substring, location_list_t& result) const; + boost::signals2::connection setChangedCallback(history_changed_callback_t cb) { return mChangedSignal.connect(cb); } void save() const; void load(); @@ -131,7 +140,7 @@ private: location_list_t mItems; std::string mFilename; /// File to store the history to. - loaded_signal_t mLoadedSignal; + history_changed_signal_t mChangedSignal; }; #endif diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index f48c96190f..4100e2fc61 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -52,7 +52,6 @@ #include "llinventoryobserver.h" #include "lllandmarkactions.h" #include "lllandmarklist.h" -#include "lllocationhistory.h" #include "llteleporthistory.h" #include "llsidetray.h" #include "llslurl.h" @@ -358,14 +357,29 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) getTextEntry()->setRightMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4)); updateWidgetlayout(); + // Connecting signal for updating location on "Show Coordinates" setting change. + LLControlVariable* coordinates_control = gSavedSettings.getControl("NavBarShowCoordinates").get(); + if (coordinates_control) + { + mCoordinatesControlConnection = coordinates_control->getSignal()->connect(boost::bind(&LLLocationInputCtrl::refreshLocation, this)); + } + + // Connecting signal for updating parcel icons on "Show Parcel Properties" setting change. + LLControlVariable* parcel_properties_control = gSavedSettings.getControl("NavBarShowParcelProperties").get(); + if (parcel_properties_control) + { + mParcelPropertiesControlConnection = parcel_properties_control->getSignal()->connect(boost::bind(&LLLocationInputCtrl::refreshParcelIcons, this)); + } + // - Make the "Add landmark" button updated when either current parcel gets changed // or a landmark gets created or removed from the inventory. // - Update the location string on parcel change. mParcelMgrConnection = LLViewerParcelMgr::getInstance()->addAgentParcelChangedCallback( boost::bind(&LLLocationInputCtrl::onAgentParcelChange, this)); - - mLocationHistoryConnection = LLLocationHistory::getInstance()->setLoadedCallback( - boost::bind(&LLLocationInputCtrl::onLocationHistoryLoaded, this)); + // LLLocationHistory instance is being created before the location input control, so we have to update initial state of button manually. + mButton->setEnabled(LLLocationHistory::instance().getItemCount() > 0); + mLocationHistoryConnection = LLLocationHistory::getInstance()->setChangedCallback( + boost::bind(&LLLocationInputCtrl::onLocationHistoryChanged, this,_1)); mRemoveLandmarkObserver = new LLRemoveLandmarkObserver(this); mAddLandmarkObserver = new LLAddLandmarkObserver(this); @@ -391,6 +405,8 @@ LLLocationInputCtrl::~LLLocationInputCtrl() LLViewerParcelMgr::getInstance()->removeObserver(mParcelChangeObserver); delete mParcelChangeObserver; + mCoordinatesControlConnection.disconnect(); + mParcelPropertiesControlConnection.disconnect(); mParcelMgrConnection.disconnect(); mLocationHistoryConnection.disconnect(); } @@ -457,6 +473,7 @@ BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask) void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor) { KEY key = gKeyboard->currentKey(); + MASK mask = gKeyboard->currentMask(TRUE); if (line_editor->getText().empty()) { @@ -464,7 +481,7 @@ void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor) hideList(); } // Typing? (moving cursor should not affect showing the list) - else if (key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END) + else if (mask != MASK_CONTROL && key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END) { prearrangeList(line_editor->getText()); if (mList->getItemCount() != 0) @@ -560,7 +577,7 @@ void LLLocationInputCtrl::reshape(S32 width, S32 height, BOOL called_from_parent if (isHumanReadableLocationVisible) { - positionMaturityIcon(); + refreshMaturityIcon(); } } @@ -603,9 +620,13 @@ void LLLocationInputCtrl::onLandmarkLoaded(LLLandmark* lm) updateAddLandmarkButton(); } -void LLLocationInputCtrl::onLocationHistoryLoaded() +void LLLocationInputCtrl::onLocationHistoryChanged(LLLocationHistory::EChangeType event) { - rebuildLocationHistory(); + if(event == LLLocationHistory::LOAD) + { + rebuildLocationHistory(); + } + mButton->setEnabled(LLLocationHistory::instance().getItemCount() > 0); } void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data) @@ -648,7 +669,7 @@ void LLLocationInputCtrl::onLocationPrearrange(const LLSD& data) value["item_type"] = TELEPORT_HISTORY; value["global_pos"] = result->mGlobalPos.getValue(); std::string region_name = result->mTitle.substr(0, result->mTitle.find(',')); - //TODO*: add Surl to teleportitem or parse region name from title + //TODO*: add slurl to teleportitem or parse region name from title value["tooltip"] = LLSLURL::buildSLURLfromPosGlobal(region_name, result->mGlobalPos, false); add(result->getTitle(), value); @@ -716,32 +737,7 @@ void LLLocationInputCtrl::refreshLocation() setText(location_name); isHumanReadableLocationVisible = true; - // Updating maturity rating icon. - LLViewerRegion* region = gAgent.getRegion(); - if (!region) - return; - - U8 sim_access = region->getSimAccess(); - switch(sim_access) - { - case SIM_ACCESS_PG: - mMaturityIcon->setValue(mIconMaturityGeneral->getName()); - mMaturityIcon->setVisible(TRUE); - break; - - case SIM_ACCESS_ADULT: - mMaturityIcon->setValue(mIconMaturityAdult->getName()); - mMaturityIcon->setVisible(TRUE); - break; - - default: - mMaturityIcon->setVisible(FALSE); - } - - if (mMaturityIcon->getVisible()) - { - positionMaturityIcon(); - } + refreshMaturityIcon(); } // returns new right edge @@ -763,16 +759,19 @@ void LLLocationInputCtrl::refreshParcelIcons() // Our "cursor" moving right to left S32 x = mAddLandmarkBtn->getRect().mLeft; - static LLUICachedControl<bool> show_properties("NavBarShowParcelProperties", false); - if (show_properties) - { - LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance(); + LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance(); + + LLViewerRegion* agent_region = gAgent.getRegion(); + LLParcel* agent_parcel = vpm->getAgentParcel(); + if (!agent_region || !agent_parcel) + return; + + mForSaleBtn->setVisible(vpm->canAgentBuyParcel(agent_parcel, false)); - LLViewerRegion* agent_region = gAgent.getRegion(); - LLParcel* agent_parcel = vpm->getAgentParcel(); - if (!agent_region || !agent_parcel) - return; + x = layout_widget(mForSaleBtn, x); + if (gSavedSettings.getBOOL("NavBarShowParcelProperties")) + { LLParcel* current_parcel; LLViewerRegion* selection_region = vpm->getSelectionRegion(); LLParcel* selected_parcel = vpm->getParcelSelection()->getParcel(); @@ -792,7 +791,6 @@ void LLLocationInputCtrl::refreshParcelIcons() current_parcel = agent_parcel; } - bool allow_buy = vpm->canAgentBuyParcel(current_parcel, false); bool allow_voice = vpm->allowAgentVoice(agent_region, current_parcel); bool allow_fly = vpm->allowAgentFly(agent_region, current_parcel); bool allow_push = vpm->allowAgentPush(agent_region, current_parcel); @@ -801,7 +799,6 @@ void LLLocationInputCtrl::refreshParcelIcons() bool allow_damage = vpm->allowAgentDamage(agent_region, current_parcel); // Most icons are "block this ability" - mForSaleBtn->setVisible(allow_buy); mParcelIcon[VOICE_ICON]->setVisible( !allow_voice ); mParcelIcon[FLY_ICON]->setVisible( !allow_fly ); mParcelIcon[PUSH_ICON]->setVisible( !allow_push ); @@ -809,11 +806,10 @@ void LLLocationInputCtrl::refreshParcelIcons() mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts ); mParcelIcon[DAMAGE_ICON]->setVisible( allow_damage ); mDamageText->setVisible(allow_damage); - - x = layout_widget(mForSaleBtn, x); + // Padding goes to left of both landmark star and for sale btn x -= mAddLandmarkHPad; - + // Slide the parcel icons rect from right to left, adjusting rectangles for (S32 i = 0; i < ICON_COUNT; ++i) { @@ -825,7 +821,6 @@ void LLLocationInputCtrl::refreshParcelIcons() } else { - mForSaleBtn->setVisible(false); for (S32 i = 0; i < ICON_COUNT; ++i) { mParcelIcon[i]->setVisible(false); @@ -833,10 +828,13 @@ void LLLocationInputCtrl::refreshParcelIcons() mDamageText->setVisible(false); } - S32 left_pad, right_pad; - mTextEntry->getTextPadding(&left_pad, &right_pad); - right_pad = mTextEntry->getRect().mRight - x; - mTextEntry->setTextPadding(left_pad, right_pad); + if (mTextEntry) + { + S32 left_pad, right_pad; + mTextEntry->getTextPadding(&left_pad, &right_pad); + right_pad = mTextEntry->getRect().mRight - x; + mTextEntry->setTextPadding(left_pad, right_pad); + } } void LLLocationInputCtrl::refreshHealth() @@ -855,6 +853,36 @@ void LLLocationInputCtrl::refreshHealth() } } +void LLLocationInputCtrl::refreshMaturityIcon() +{ + // Updating maturity rating icon. + LLViewerRegion* region = gAgent.getRegion(); + if (!region) + return; + + U8 sim_access = region->getSimAccess(); + switch(sim_access) + { + case SIM_ACCESS_PG: + mMaturityIcon->setValue(mIconMaturityGeneral->getName()); + mMaturityIcon->setVisible(TRUE); + break; + + case SIM_ACCESS_ADULT: + mMaturityIcon->setValue(mIconMaturityAdult->getName()); + mMaturityIcon->setVisible(TRUE); + break; + + default: + mMaturityIcon->setVisible(FALSE); + } + + if (mMaturityIcon->getVisible()) + { + positionMaturityIcon(); + } +} + void LLLocationInputCtrl::positionMaturityIcon() { const LLFontGL* font = mTextEntry->getFont(); @@ -874,7 +902,7 @@ void LLLocationInputCtrl::positionMaturityIcon() mMaturityIcon->setVisible(rect.mRight < mTextEntry->getRect().getWidth() - right_pad); } -void LLLocationInputCtrl::rebuildLocationHistory(std::string filter) +void LLLocationInputCtrl::rebuildLocationHistory(const std::string& filter) { LLLocationHistory::location_list_t filtered_items; const LLLocationHistory::location_list_t* itemsp = NULL; @@ -896,7 +924,7 @@ void LLLocationInputCtrl::rebuildLocationHistory(std::string filter) LLSD value; value["tooltip"] = it->getToolTip(); //location history can contain only typed locations - value["item_type"] = TYPED_REGION_SURL; + value["item_type"] = TYPED_REGION_SLURL; value["global_pos"] = it->mGlobalPos.getValue(); add(it->getLocation(), value); } @@ -1005,7 +1033,6 @@ void LLLocationInputCtrl::onLocationContextMenuItemClicked(const LLSD& userdata) { gSavedSettings.setBOOL("NavBarShowParcelProperties", !gSavedSettings.getBOOL("NavBarShowParcelProperties")); - refreshParcelIcons(); } else if (item == "landmark") { diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index caa62daa1b..f790140f07 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -36,6 +36,7 @@ #include "llcombobox.h" #include "lliconctrl.h" // Params #include "lltextbox.h" // Params +#include "lllocationhistory.h" class LLLandmark; @@ -135,9 +136,10 @@ private: void refreshParcelIcons(); // Refresh the value in the health percentage text field void refreshHealth(); + void refreshMaturityIcon(); void positionMaturityIcon(); - void rebuildLocationHistory(std::string filter = ""); + void rebuildLocationHistory(const std::string& filter = LLStringUtil::null); bool findTeleportItemsByTitle(const LLTeleportHistoryItem& item, const std::string& filter); void setText(const LLStringExplicit& text); void updateAddLandmarkButton(); @@ -147,7 +149,7 @@ private: void changeLocationPresentation(); void onInfoButtonClicked(); - void onLocationHistoryLoaded(); + void onLocationHistoryChanged(LLLocationHistory::EChangeType event); void onLocationPrearrange(const LLSD& data); void onTextEditorRightClicked(S32 x, S32 y, MASK mask); void onLandmarkLoaded(LLLandmark* lm); @@ -174,6 +176,8 @@ private: LLRemoveLandmarkObserver* mRemoveLandmarkObserver; LLParcelChangeObserver* mParcelChangeObserver; + boost::signals2::connection mCoordinatesControlConnection; + boost::signals2::connection mParcelPropertiesControlConnection; boost::signals2::connection mParcelMgrConnection; boost::signals2::connection mLocationHistoryConnection; LLUIImage* mLandmarkImageOn; diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 96ce01c05f..be8b2363ad 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -39,12 +39,27 @@ #include "llviewercontrol.h" #include "llinstantmessage.h" +#include "llsingleton.h" // for LLSingleton #include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/regex.hpp> #include <boost/regex/v4/match_results.hpp> +#if LL_MSVC +// disable warning about boost::lexical_cast unreachable code +// when it fails to parse the string +#pragma warning (disable:4702) +#endif + +#include <boost/date_time/gregorian/gregorian.hpp> +#if LL_MSVC +#pragma warning(pop) // Restore all warnings to the previous state +#endif + +#include <boost/date_time/posix_time/posix_time.hpp> +#include <boost/date_time/local_time_adjustor.hpp> + const S32 LOG_RECALL_SIZE = 2048; const static std::string IM_TIME("time"); @@ -69,6 +84,8 @@ const static std::string MULTI_LINE_PREFIX(" "); * Katar Ivercourt is Offline * [3:00] Katar Ivercourt is Offline * [2009/11/20 3:01] Corba ProductEngine is Offline + * + * Note: "You" was used as an avatar names in viewers of previous versions */ const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$"); @@ -78,11 +95,96 @@ const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+ */ const static boost::regex NAME_AND_TEXT("(You:|Second Life:|[^\\s:]+\\s*[:]{1}|\\S+\\s+[^\\s:]+[:]{1})?(\\s*)(.*)"); +//is used to parse complex object names like "Xstreet SL Terminal v2.2.5 st" +const static std::string NAME_TEXT_DIVIDER(": "); + +// is used for timestamps adjusting +const static char* DATE_FORMAT("%Y/%m/%d %H:%M"); +const static char* TIME_FORMAT("%H:%M"); + const static int IDX_TIMESTAMP = 1; const static int IDX_STUFF = 2; const static int IDX_NAME = 1; const static int IDX_TEXT = 3; +using namespace boost::posix_time; +using namespace boost::gregorian; + +class LLLogChatTimeScanner: public LLSingleton<LLLogChatTimeScanner> +{ +public: + LLLogChatTimeScanner() + { + // Note, date/time facets will be destroyed by string streams + mDateStream.imbue(std::locale(mDateStream.getloc(), new date_input_facet(DATE_FORMAT))); + mTimeStream.imbue(std::locale(mTimeStream.getloc(), new time_facet(TIME_FORMAT))); + mTimeStream.imbue(std::locale(mTimeStream.getloc(), new time_input_facet(DATE_FORMAT))); + } + + date getTodayPacificDate() + { + typedef boost::date_time::local_adjustor<ptime, -8, no_dst> pst; + typedef boost::date_time::local_adjustor<ptime, -7, no_dst> pdt; + time_t t_time = time(NULL); + ptime p_time = LLStringOps::getPacificDaylightTime() + ? pdt::utc_to_local(from_time_t(t_time)) + : pst::utc_to_local(from_time_t(t_time)); + struct tm s_tm = to_tm(p_time); + return date_from_tm(s_tm); + } + + void checkAndCutOffDate(std::string& time_str) + { + // Cuts off the "%Y/%m/%d" from string for todays timestamps. + // Assume that passed string has at least "%H:%M" time format. + date log_date(not_a_date_time); + date today(getTodayPacificDate()); + + // Parse the passed date + mDateStream.str(LLStringUtil::null); + mDateStream << time_str; + mDateStream >> log_date; + mDateStream.clear(); + + days zero_days(0); + days days_alive = today - log_date; + + if ( days_alive == zero_days ) + { + // Yep, today's so strip "%Y/%m/%d" info + ptime stripped_time(not_a_date_time); + + mTimeStream.str(LLStringUtil::null); + mTimeStream << time_str; + mTimeStream >> stripped_time; + mTimeStream.clear(); + + time_str.clear(); + + mTimeStream.str(LLStringUtil::null); + mTimeStream << stripped_time; + mTimeStream >> time_str; + mTimeStream.clear(); + } + + LL_DEBUGS("LLChatLogParser") + << " log_date: " + << log_date + << " today: " + << today + << " days alive: " + << days_alive + << " new time: " + << time_str + << LL_ENDL; + } + + +private: + std::stringstream mDateStream; + std::stringstream mTimeStream; +}; + //static std::string LLLogChat::makeLogFileName(std::string filename) { @@ -160,10 +262,19 @@ void LLLogChat::saveHistory(const std::string& filename, if (gSavedPerAccountSettings.getBOOL("LogTimestamp")) item["time"] = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")); - item["from"] = from; item["from_id"] = from_id; item["message"] = line; + //adding "Second Life:" for all system messages to make chat log history parsing more reliable + if (from.empty() && from_id.isNull()) + { + item["from"] = SYSTEM_FROM; + } + else + { + item["from"] = from; + } + file << LLChatLogFormatter(item) << std::endl; file.close(); @@ -363,7 +474,8 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im) boost::trim(timestamp); timestamp.erase(0, 1); timestamp.erase(timestamp.length()-1, 1); - im[IM_TIME] = timestamp; + LLLogChatTimeScanner::instance().checkAndCutOffDate(timestamp); + im[IM_TIME] = timestamp; } else { @@ -398,6 +510,18 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im) im[IM_FROM_ID] = LLUUID::null; } + //possibly a case of complex object names consisting of 3+ words + if (!has_name) + { + U32 divider_pos = stuff.find(NAME_TEXT_DIVIDER); + if (divider_pos != std::string::npos && divider_pos < (stuff.length() - NAME_TEXT_DIVIDER.length())) + { + im[IM_FROM] = stuff.substr(0, divider_pos); + im[IM_TEXT] = stuff.substr(divider_pos + NAME_TEXT_DIVIDER.length()); + return true; + } + } + if (!has_name) { //text is mandatory diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 1be3430e07..e3817eecc4 100644 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -35,6 +35,7 @@ #include "llloginhandler.h" // viewer includes +#include "lllogininstance.h" // to check if logged in yet #include "llpanellogin.h" // save_password_to_disk() #include "llstartup.h" // getStartupState() #include "llurlsimstring.h" @@ -169,6 +170,13 @@ bool LLLoginHandler::handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) { + // do nothing if we are already logged in + if (LLLoginInstance::getInstance()->authSuccess()) + { + LL_WARNS_ONCE("SLURL") << "Already logged in! Ignoring login SLapp." << LL_ENDL; + return true; + } + if (tokens.size() == 1 && tokens[0].asString() == "show") { diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 501a137b42..05cb6ddc4a 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -80,8 +80,8 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) : mForceUpdate( false ), mOpenLinksInExternalBrowser( false ), mOpenLinksInInternalBrowser( false ), - mTrusted( false ), mHomePageUrl( "" ), + mTrusted(false), mIgnoreUIScale( true ), mAlwaysRefresh( false ), mMediaSource( 0 ), @@ -183,6 +183,10 @@ void LLMediaCtrl::setOpenInInternalBrowser( bool valIn ) //////////////////////////////////////////////////////////////////////////////// void LLMediaCtrl::setTrusted( bool valIn ) { + if(mMediaSource) + { + mMediaSource->setTrustedBrowser(valIn); + } mTrusted = valIn; } @@ -632,6 +636,7 @@ bool LLMediaCtrl::ensureMediaSourceExists() mMediaSource->setVisible( getVisible() ); mMediaSource->addObserver( this ); mMediaSource->setBackgroundColor( getBackgroundColor() ); + mMediaSource->setTrustedBrowser(mTrusted); if(mClearCache) { mMediaSource->clearCache(); @@ -724,14 +729,14 @@ void LLMediaCtrl::draw() LLGLSUIDefault gls_ui; LLGLDisable gls_alphaTest( GL_ALPHA_TEST ); - gGL.pushMatrix(); + gGL.pushUIMatrix(); { if (mIgnoreUIScale) { - glLoadIdentity(); + gGL.loadUIIdentity(); // font system stores true screen origin, need to scale this by UI scale factor // to get render origin for this view (with unit scale) - gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), + gGL.translateUI(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), LLFontGL::sCurOrigin.mZ); } @@ -825,7 +830,7 @@ void LLMediaCtrl::draw() gGL.end(); gGL.setSceneBlendType(LLRender::BT_ALPHA); } - gGL.popMatrix(); + gGL.popUIMatrix(); } else @@ -946,7 +951,6 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) case MEDIA_EVENT_CLICK_LINK_NOFOLLOW: { LL_DEBUGS("Media") << "Media event: MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << LL_ENDL; - onClickLinkNoFollow(self); }; break; @@ -1064,15 +1068,6 @@ void LLMediaCtrl::clickLinkWithTarget(const std::string& url, const S32& target_ //////////////////////////////////////////////////////////////////////////////// // -void LLMediaCtrl::onClickLinkNoFollow( LLPluginClassMedia* self ) -{ - // let the dispatcher handle blocking/throttling of SLURLs - std::string url = self->getClickURL(); - LLURLDispatcher::dispatch(url, this, mTrusted); -} - -//////////////////////////////////////////////////////////////////////////////// -// std::string LLMediaCtrl::getCurrentNavUrl() { return mCurrentNavUrl; diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 60e0c4073b..e55d2f7cd0 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -164,7 +164,6 @@ public: // handlers for individual events (could be done inside the switch in handleMediaEvent, they're just individual functions for clarity) void onClickLinkHref( LLPluginClassMedia* self ); - void onClickLinkNoFollow( LLPluginClassMedia* self ); protected: void convertInputCoords(S32& x, S32& y); diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 4bf2bac649..1853b511be 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -77,7 +77,6 @@ LLFloaterMove::LLFloaterMove(const LLSD& key) mTurnRightButton(NULL), mMoveUpButton(NULL), mMoveDownButton(NULL), - mStopFlyingButton(NULL), mModeActionsPanel(NULL), mCurrentMode(MM_WALK) { @@ -87,6 +86,7 @@ LLFloaterMove::LLFloaterMove(const LLSD& key) BOOL LLFloaterMove::postBuild() { setIsChrome(TRUE); + setTitleVisible(TRUE); // restore title visibility after chrome applying LLDockableFloater::postBuild(); @@ -112,8 +112,6 @@ BOOL LLFloaterMove::postBuild() mMoveDownButton->setHeldDownCallback(boost::bind(&LLFloaterMove::moveDown, this)); - mStopFlyingButton = getChild<LLButton>("stop_fly_btn"); - mModeActionsPanel = getChild<LLPanel>("panel_modes"); LLButton* btn; @@ -126,11 +124,6 @@ BOOL LLFloaterMove::postBuild() btn = getChild<LLButton>("mode_fly_btn"); btn->setCommitCallback(boost::bind(&LLFloaterMove::onFlyButtonClick, this)); - btn = getChild<LLButton>("stop_fly_btn"); - btn->setCommitCallback(boost::bind(&LLFloaterMove::onStopFlyingButtonClick, this)); - - - showFlyControls(false); initModeTooltips(); @@ -250,6 +243,12 @@ void LLFloaterMove::setSittingMode(BOOL bSitting) else { LLPanelStandStopFlying::clearStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STAND); + + // show "Stop Flying" button if needed. EXT-871 + if (gAgent.getFlying()) + { + LLPanelStandStopFlying::setStandStopFlyingMode(LLPanelStandStopFlying::SSFM_STOP_FLYING); + } } enableInstance(!bSitting); } @@ -298,10 +297,6 @@ void LLFloaterMove::onFlyButtonClick() { setMovementMode(MM_FLY); } -void LLFloaterMove::onStopFlyingButtonClick() -{ - setMovementMode(gAgent.getAlwaysRun() ? MM_RUN : MM_WALK); -} void LLFloaterMove::setMovementMode(const EMovementMode mode) { @@ -347,16 +342,13 @@ void LLFloaterMove::updateButtonsWithMovementMode(const EMovementMode newMode) showFlyControls(MM_FLY == newMode); setModeTooltip(newMode); setModeButtonToggleState(newMode); + setModeTitle(newMode); } void LLFloaterMove::showFlyControls(bool bShow) { mMoveUpButton->setVisible(bShow); mMoveDownButton->setVisible(bShow); - - // *TODO: mantipov: mStopFlyingButton from the FloaterMove is not used now. - // It was not completly removed until functionality is reviewed by LL - mStopFlyingButton->setVisible(FALSE); } void LLFloaterMove::initModeTooltips() @@ -414,11 +406,30 @@ void LLFloaterMove::setModeTooltip(const EMovementMode mode) } } +void LLFloaterMove::setModeTitle(const EMovementMode mode) +{ + std::string title; + switch(mode) + { + case MM_WALK: + title = getString("walk_title"); + break; + case MM_RUN: + title = getString("run_title"); + break; + case MM_FLY: + title = getString("fly_title"); + break; + default: + // title should be provided for all modes + llassert(false); + break; + } + setTitle(title); +} + /** * Updates position of the floater to be center aligned with Move button. - * - * Because Tip floater created as dependent floater this method - * must be called before "showQuickTips()" to get Tip floater be positioned at the right side of the floater */ void LLFloaterMove::updatePosition() { @@ -684,10 +695,6 @@ void LLPanelStandStopFlying::onStandButtonClick() gAgent.setControlFlags(AGENT_CONTROL_STAND_UP); setFocus(FALSE); // EXT-482 - - BOOL fly = gAgent.getFlying(); - mStopFlyingButton->setVisible(fly); - setVisible(fly); } void LLPanelStandStopFlying::onStopFlyingButtonClick() diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 06463f02af..dcca8308d9 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -86,13 +86,12 @@ private: void onWalkButtonClick(); void onRunButtonClick(); void onFlyButtonClick(); - void onStopFlyingButtonClick(); void initMovementMode(); void setMovementMode(const EMovementMode mode); void showFlyControls(bool bShow); void initModeTooltips(); void setModeTooltip(const EMovementMode mode); - void showQuickTips(const EMovementMode mode); + void setModeTitle(const EMovementMode mode); void initModeButtonMap(); void setModeButtonToggleState(const EMovementMode mode); void updateButtonsWithMovementMode(const EMovementMode newMode); @@ -108,7 +107,6 @@ public: LLButton* mMoveUpButton; LLButton* mMoveDownButton; private: - LLButton* mStopFlyingButton; LLPanel* mModeActionsPanel; typedef std::map<LLView*, std::string> control_tooltip_map_t; diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 114fef8712..883d4cdf4b 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -47,6 +47,8 @@ static LLDefaultChildRegistry::Register<LLNameListCtrl> r("name_list"); +static const S32 info_icon_size = 16; + void LLNameListCtrl::NameTypeNames::declareValues() { declare("INDIVIDUAL", LLNameListCtrl::INDIVIDUAL); @@ -138,6 +140,29 @@ void LLNameListCtrl::showInspector(const LLUUID& avatar_id, bool is_group) LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", avatar_id)); } +void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) +{ + if (getHighlightedItemInx()!= target_index) + { + if(getHighlightedItemInx()!=-1) + { + LLScrollListItem* item = getItemList()[getHighlightedItemInx()]; + LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex)); + if(cell) + cell->setTextWidth(cell->getTextWidth() + info_icon_size); + } + if(target_index != -1) + { + LLScrollListItem* item = getItemList()[target_index]; + LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex)); + if(cell) + cell->setTextWidth(cell->getTextWidth() - info_icon_size); + } + } + + LLScrollListCtrl::mouseOverHighlightNthItem(target_index); +} + //virtual BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) { @@ -164,7 +189,7 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) // Spawn at right side of cell LLPointer<LLUIImage> icon = LLUI::getUIImage("Info_Small"); - LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 ); + LLCoordGL pos( sticky_rect.mRight - info_icon_size, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 ); // Should we show a group or an avatar inspector? bool is_group = hit_item->getValue()["is_group"].asBoolean(); diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 23b1cb6897..1c26ee5db4 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -120,6 +120,8 @@ public: void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; } /*virtual*/ void updateColumns(); + + /*virtual*/ void mouseOverHighlightNthItem( S32 index ); private: void showInspector(const LLUUID& avatar_id, bool is_group); diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 46cab0d868..e11df06d86 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -449,8 +449,20 @@ void LLNavigationBar::onLocationSelection() // Will not teleport to empty location. if (typed_location.empty()) return; - + //get selected item from combobox item LLSD value = mCmbLocation->getSelectedValue(); + if(value.isUndefined() && !mCmbLocation->getTextEntry()->isDirty()) + { + // At this point we know that: there is no selected item in list and text field has NOT been changed + // So there is no sense to try to change the location + return; + } + /* since navbar list support autocompletion it contains several types of item: landmark, teleport hystory item, + * typed by user slurl or region name. Let's find out which type of item the user has selected + * to make decision about adding this location into typed history. see mSaveToLocationHistory + * Note: + * Only TYPED_REGION_SLURL item will be added into LLLocationHistory + */ if(value.has("item_type")) { @@ -480,7 +492,7 @@ void LLNavigationBar::onLocationSelection() case TELEPORT_HISTORY: //in case of teleport item was selected, teleport by position too. - case TYPED_REGION_SURL: + case TYPED_REGION_SLURL: if(value.has("global_pos")) { gAgent.teleportViaLocation(LLVector3d(value["global_pos"])); @@ -492,7 +504,7 @@ void LLNavigationBar::onLocationSelection() break; } } - //Let's parse surl or region name + //Let's parse slurl or region name std::string region_name; LLVector3 local_coords(128, 128, 0); @@ -505,7 +517,17 @@ void LLNavigationBar::onLocationSelection() local_coords.set(x, y, z); else return; - }else + } + // we have to do this check after previous, because LLUrlRegistry contains handlers for slurl too + //but we need to know whether typed_location is a simple http url. + else if (LLUrlRegistry::instance().isUrl(typed_location)) + { + // display http:// URLs in the media browser, or + // anything else is sent to the search floater + LLWeb::loadURL(typed_location); + return; + } + else { // assume that an user has typed the {region name} or possible {region_name, parcel} region_name = typed_location.substr(0,typed_location.find(',')); @@ -531,7 +553,7 @@ void LLNavigationBar::onTeleportFinished(const LLVector3d& global_agent_pos) return; LLLocationHistory* lh = LLLocationHistory::getInstance(); - //TODO*: do we need convert surl into readable format? + //TODO*: do we need convert slurl into readable format? std::string location; /*NOTE: * We can't use gAgent.getPositionAgent() in case of local teleport to build location. @@ -543,7 +565,7 @@ void LLNavigationBar::onTeleportFinished(const LLVector3d& global_agent_pos) std::string tooltip (LLSLURL::buildSLURLfromPosGlobal(gAgent.getRegion()->getName(), global_agent_pos, false)); LLLocationHistoryItem item (location, - global_agent_pos, tooltip,TYPED_REGION_SURL);// we can add into history only TYPED location + global_agent_pos, tooltip,TYPED_REGION_SLURL);// we can add into history only TYPED location //Touch it, if it is at list already, add new location otherwise if ( !lh->touchItem(item) ) { lh->addItem(item); @@ -621,20 +643,7 @@ void LLNavigationBar::onRegionNameResponse( // Invalid location? if (!region_handle) { - // handle any secondlife:// SLapps, or - // display http:// URLs in the media browser, or - // anything else is sent to the search floater - if (LLUrlRegistry::instance().isUrl(typed_location)) - { - if (! LLURLDispatcher::dispatchFromTextEditor(typed_location)) - { - LLWeb::loadURL(typed_location); - } - } - else - { - invokeSearch(typed_location); - } + invokeSearch(typed_location); return; } diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 8fc11d3929..c8d5d782b7 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -278,6 +278,13 @@ void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue) nearby_chat->updateChatHistoryStyle(); } +bool isTwoWordsName(const std::string& name) +{ + //checking for a single space + S32 pos = name.find(' ', 0); + return std::string::npos != pos && name.rfind(' ', name.length()) == pos && 0 != pos && name.length()-1 != pos; +} + void LLNearbyChat::loadHistory() { LLSD do_not_log; @@ -303,6 +310,19 @@ void LLNearbyChat::loadHistory() chat.mFromID = from_id; chat.mText = msg[IM_TEXT].asString(); chat.mTimeStr = msg[IM_TIME].asString(); + chat.mChatStyle = CHAT_STYLE_HISTORY; + + chat.mSourceType = CHAT_SOURCE_AGENT; + if (from_id.isNull() && SYSTEM_FROM == from) + { + chat.mSourceType = CHAT_SOURCE_SYSTEM; + + } + else if (from_id.isNull()) + { + chat.mSourceType = isTwoWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT; + } + addMessage(chat, true, do_not_log); it++; diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index ad98a29fb2..483756b16e 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -407,32 +407,6 @@ BOOL LLNearbyChatBar::handleKeyHere( KEY key, MASK mask ) return handled; } -S32 LLNearbyChatBar::getMinWidth() const -{ - static S32 min_width = -1; - - if (min_width < 0) - { - const std::string& s = getString("min_width"); - min_width = !s.empty() ? atoi(s.c_str()) : 300; - } - - return min_width; -} - -S32 LLNearbyChatBar::getMaxWidth() const -{ - static S32 max_width = -1; - - if (max_width < 0) - { - const std::string& s = getString("max_width"); - max_width = !s.empty() ? atoi(s.c_str()) : 510; - } - - return max_width; -} - BOOL LLNearbyChatBar::matchChatTypeTrigger(const std::string& in_str, std::string* out_str) { U32 in_len = in_str.length(); diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index d9a7403611..559c1ee091 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -117,9 +117,6 @@ public: static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate); static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate); - S32 getMinWidth() const; - S32 getMaxWidth() const; - protected: static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str); static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata); diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 29e3c66684..08ae93c3a6 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -34,6 +34,7 @@ #include "llnearbychathandler.h" +#include "llbottomtray.h" #include "llchatitemscontainerctrl.h" #include "llnearbychat.h" #include "llrecentpeople.h" @@ -175,10 +176,11 @@ void LLNearbyChatScreenChannel::addNotification(LLSD& notification) if(m_active_toasts.size()) { LLUUID fromID = notification["from_id"].asUUID(); // agent id or object id + std::string from = notification["from"].asString(); LLToast* toast = m_active_toasts[0]; LLNearbyChatToastPanel* panel = dynamic_cast<LLNearbyChatToastPanel*>(toast->getPanel()); - if(panel && panel->messageID() == fromID && panel->canAddText()) + if(panel && panel->messageID() == fromID && panel->getFromName() == from && panel->canAddText()) { panel->addMessage(notification); toast->reshapeToPanel(); @@ -282,7 +284,7 @@ void LLNearbyChatScreenChannel::showToastsBottom() gFloaterView->sendChildToBack(toast); } - bottom = toast->getRect().mTop; + bottom = toast->getRect().mTop - toast->getTopPad(); } } } @@ -319,9 +321,9 @@ LLNearbyChatHandler::~LLNearbyChatHandler() void LLNearbyChatHandler::initChannel() { LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); + LLView* chat_box = LLBottomTray::getInstance()->getChildView("chat_box"); S32 channel_right_bound = nearby_chat->getRect().mRight; - S32 channel_width = nearby_chat->getRect().mRight; - mChannel->init(channel_right_bound - channel_width, channel_right_bound); + mChannel->init(chat_box->getRect().mLeft, channel_right_bound); } diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 234fe13217..05623198ab 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -153,6 +153,18 @@ void LLNetMap::draw() // Prepare a scissor region F32 rotation = 0; + gGL.pushMatrix(); + gGL.pushUIMatrix(); + + LLVector3 offset = gGL.getUITranslation(); + LLVector3 scale = gGL.getUIScale(); + + glLoadIdentity(); + gGL.loadUIIdentity(); + + glScalef(scale.mV[0], scale.mV[1], scale.mV[2]); + gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]); + { LLLocalClipRect clip(getLocalRect()); { @@ -435,6 +447,9 @@ void LLNetMap::draw() } } + gGL.popMatrix(); + gGL.popUIMatrix(); + LLUICtrl::draw(); } diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h index 5f4768e321..a163b6fd62 100644 --- a/indra/newview/llnotificationhandler.h +++ b/indra/newview/llnotificationhandler.h @@ -122,9 +122,17 @@ protected: class LLSysHandler : public LLEventHandler { public: + LLSysHandler(); virtual ~LLSysHandler() {}; virtual bool processNotification(const LLSD& notify)=0; + +protected : + static void init(); + void removeExclusiveNotifications(const LLNotificationPtr& notif); + + typedef std::list< std::set<std::string> > exclusive_notif_sets; + static exclusive_notif_sets sExclusiveNotificationGroups; }; /** @@ -171,6 +179,7 @@ public: protected: virtual void onDeleteToast(LLToast* toast); + virtual void onRejectToast(const LLUUID& id); virtual void initChannel(); }; @@ -334,11 +343,6 @@ public: * Adds notification panel to the IM floater. */ static void addNotifPanelToIM(const LLNotificationPtr& notification); - - /** - * Reloads IM floater messages. - */ - static void reloadIMFloaterMessages(const LLNotificationPtr& notification); }; } diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index b8e0892b02..88bb769109 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -43,6 +43,75 @@ using namespace LLNotificationsUI; +// static +std::list< std::set<std::string> > LLSysHandler::sExclusiveNotificationGroups; + +// static +void LLSysHandler::init() +{ + std::set<std::string> online_offline_group; + online_offline_group.insert("FriendOnline"); + online_offline_group.insert("FriendOffline"); + + sExclusiveNotificationGroups.push_back(online_offline_group); +} + +LLSysHandler::LLSysHandler() +{ + if(sExclusiveNotificationGroups.empty()) + { + init(); + } +} + +void LLSysHandler::removeExclusiveNotifications(const LLNotificationPtr& notif) +{ + LLScreenChannel* channel = dynamic_cast<LLScreenChannel *>(mChannel); + if (channel == NULL) + { + return; + } + + class ExclusiveMatcher: public LLScreenChannel::Matcher + { + public: + ExclusiveMatcher(const std::set<std::string>& excl_group, + const std::string& from_name) : + mExclGroup(excl_group), mFromName(from_name) + { + } + bool matches(const LLNotificationPtr notification) const + { + for (std::set<std::string>::const_iterator it = mExclGroup.begin(); it + != mExclGroup.end(); it++) + { + std::string from_name = LLHandlerUtil::getSubstitutionName(notification); + if (notification->getName() == *it && from_name == mFromName) + { + return true; + } + } + return false; + } + private: + const std::set<std::string>& mExclGroup; + const std::string& mFromName; + }; + + + for (exclusive_notif_sets::iterator it = sExclusiveNotificationGroups.begin(); it + != sExclusiveNotificationGroups.end(); it++) + { + std::set<std::string> group = *it; + std::set<std::string>::iterator g_it = group.find(notif->getName()); + if (g_it != group.end()) + { + channel->killMatchedToasts(ExclusiveMatcher(group, + LLHandlerUtil::getSubstitutionName(notif))); + } + } +} + const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM( "ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER( @@ -54,6 +123,8 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), OFFER_FRIENDSHIP("OfferFriendship"), FRIENDSHIP_ACCEPTED("FriendshipAccepted"), FRIENDSHIP_OFFERED("FriendshipOffered"), + FRIENDSHIP_ACCEPTED_BYME("FriendshipAcceptedByMe"), + FRIENDSHIP_DECLINED_BYME("FriendshipDeclinedByMe"), FRIEND_ONLINE("FriendOnline"), FRIEND_OFFLINE("FriendOffline"), SERVER_OBJECT_MESSAGE("ServerObjectMessage"), TELEPORT_OFFERED("TeleportOffered"); @@ -66,6 +137,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification) || PAYMENT_RECIVED == notification->getName() || OFFER_FRIENDSHIP == notification->getName() || FRIENDSHIP_OFFERED == notification->getName() + || FRIENDSHIP_ACCEPTED_BYME == notification->getName() + || FRIENDSHIP_DECLINED_BYME == notification->getName() || SERVER_OBJECT_MESSAGE == notification->getName() || INVENTORY_ACCEPTED == notification->getName() || INVENTORY_DECLINED == notification->getName(); @@ -94,7 +167,8 @@ bool LLHandlerUtil::canSpawnIMSession(const LLNotificationPtr& notification) // static bool LLHandlerUtil::canAddNotifPanelToIM(const LLNotificationPtr& notification) { - return OFFER_FRIENDSHIP == notification->getName(); + return OFFER_FRIENDSHIP == notification->getName() + || USER_GIVE_ITEM == notification->getName(); } @@ -199,6 +273,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup( llwarns << "Group notice for unkown group: " << payload["group_id"].asUUID() << llendl; + return; } const std::string group_name = groupData.mName; @@ -220,6 +295,7 @@ void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChat { LLChat chat_msg(notification->getMessage()); chat_msg.mSourceType = type; + chat_msg.mFromName = SYSTEM_FROM; nearby_chat->addMessage(chat_msg); } } @@ -242,9 +318,15 @@ LLUUID LLHandlerUtil::spawnIMSession(const std::string& name, const LLUUID& from // static std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notification) { - return notification->getSubstitutions().has("NAME") + std::string res = notification->getSubstitutions().has("NAME") ? notification->getSubstitutions()["NAME"] : notification->getSubstitutions()["[NAME]"]; + if (res.empty()) + { + LLUUID from_id = notification->getPayload()["FROM_ID"]; + gCacheName->getFullName(from_id, res); + } + return res; } // static @@ -264,31 +346,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) offer["from_id"] = notification->getPayload()["from_id"]; offer["from"] = name; offer["time"] = LLLogChat::timestamp(true); + offer["index"] = (LLSD::Integer)session->mMsgs.size(); session->mMsgs.push_front(offer); LLIMFloater::show(session_id); } - -// static -void LLHandlerUtil::reloadIMFloaterMessages( - const LLNotificationPtr& notification) -{ - LLUUID from_id = notification->getPayload()["from_id"]; - LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, from_id); - LLIMFloater* im_floater = LLFloaterReg::findTypedInstance<LLIMFloater>( - "impanel", session_id); - if (im_floater != NULL) - { - LLIMModel::LLIMSession * session = LLIMModel::getInstance()->findIMSession( - session_id); - if(session != NULL) - { - session->mMsgs.clear(); - std::list<LLSD> chat_history; - LLLogChat::loadAllHistory(session->mHistoryFileName, chat_history); - session->addMessagesFromHistory(chat_history); - } - - im_floater->reloadMessages(); - } -} diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 8c13b0fafa..8ebd5de258 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -155,10 +155,6 @@ bool LLOfferHandler::processNotification(const LLSD& notify) } else { - if (LLHandlerUtil::canAddNotifPanelToIM(notification)) - { - LLHandlerUtil::reloadIMFloaterMessages(notification); - } mChannel->killToastByNotificationID(notification->getID()); } } diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 83a2215ac6..4e2c5085ed 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -40,9 +40,41 @@ #include "lltoastnotifypanel.h" #include "llviewercontrol.h" #include "llviewerwindow.h" +#include "llnotificationmanager.h" using namespace LLNotificationsUI; +class LLOnlineStatusToast : public LLToastPanel +{ +public: + + struct Params + { + LLNotificationPtr notification; + LLUUID avatar_id; + std::string message; + + Params() {} + }; + + LLOnlineStatusToast(Params& p) : LLToastPanel(p.notification) + { + LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status_toast.xml"); + + childSetValue("avatar_icon", p.avatar_id); + childSetValue("message", p.message); + + if (p.notification->getPayload().has("respond_on_mousedown") + && p.notification->getPayload()["respond_on_mousedown"] ) + { + setMouseDownCallback(boost::bind(&LLNotification::respond, p.notification, + p.notification->getResponseTemplate())); + } + + // set line max count to 2 in case of a very long name + snapToMessageHeight(getChild<LLTextBox>("message"), 2); + } +}; //-------------------------------------------------------------------------- LLTipHandler::LLTipHandler(e_notification_type type, const LLSD& id) @@ -51,6 +83,10 @@ LLTipHandler::LLTipHandler(e_notification_type type, const LLSD& id) // Getting a Channel for our notifications mChannel = LLChannelManager::getInstance()->createNotificationChannel(); + + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); + if(channel) + channel->setOnRejectToastCallback(boost::bind(&LLTipHandler::onRejectToast, this, _1)); } //-------------------------------------------------------------------------- @@ -114,7 +150,19 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLHandlerUtil::spawnIMSession(name, from_id); } - LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification); + LLToastPanel* notify_box = NULL; + if("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName()) + { + LLOnlineStatusToast::Params p; + p.notification = notification; + p.message = notification->getMessage(); + p.avatar_id = notification->getPayload()["FROM_ID"]; + notify_box = new LLOnlineStatusToast(p); + } + else + { + notify_box = new LLToastNotifyPanel(notification); + } LLToast::Params p; p.notif_id = notification->getID(); @@ -124,6 +172,8 @@ bool LLTipHandler::processNotification(const LLSD& notify) p.is_tip = true; p.can_be_stored = false; + removeExclusiveNotifications(notification); + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); if(channel) channel->addToast(p); @@ -142,4 +192,14 @@ void LLTipHandler::onDeleteToast(LLToast* toast) //-------------------------------------------------------------------------- +void LLTipHandler::onRejectToast(const LLUUID& id) +{ + LLNotificationPtr notification = LLNotifications::instance().find(id); + if (notification + && LLNotificationManager::getInstance()->getHandlerForNotification( + notification->getType()) == this) + { + LLNotifications::instance().cancel(notification); + } +} diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 9857e37bc3..d6d48a4ead 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -247,7 +247,7 @@ void LLOutputMonitorCtrl::draw() gl_rect_2d(0, monh, monw, 0, sColorBound, FALSE); } -void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) +void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id/* = LLUUID::null*/) { if (speaker_id.isNull() && mSpeakerId.notNull()) { @@ -263,7 +263,7 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) } mSpeakerId = speaker_id; - LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this); + LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this, session_id); //mute management if (mAutoUpdate) @@ -303,7 +303,7 @@ void LLOutputMonitorCtrl::switchIndicator(bool switch_on) } // otherwise remember necessary state and mark itself as dirty. - // State will be applied i next draw when parents chain became visible. + // State will be applied in next draw when parents chain becomes visible. else { LL_DEBUGS("SpeakingIndicator") << "Indicator is not in visible chain, parent won't be notified: " << mSpeakerId << LL_ENDL; @@ -317,7 +317,7 @@ void LLOutputMonitorCtrl::switchIndicator(bool switch_on) ////////////////////////////////////////////////////////////////////////// void LLOutputMonitorCtrl::notifyParentVisibilityChanged() { - LL_DEBUGS("SpeakingIndicator") << "Notify parent that visibility was changed: " << mSpeakerId << " ,new_visibility: " << getVisible() << LL_ENDL; + LL_DEBUGS("SpeakingIndicator") << "Notify parent that visibility was changed: " << mSpeakerId << ", new_visibility: " << getVisible() << LL_ENDL; LLSD params = LLSD().with("visibility_changed", getVisible()); diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 2bbfa251e9..b7454a5066 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -86,7 +86,15 @@ public: void setIsTalking(bool val) { mIsTalking = val; } - void setSpeakerId(const LLUUID& speaker_id); + /** + * Sets avatar UUID to interact with voice channel. + * + * @param speaker_id LLUUID of an avatar whose voice level is displayed. + * @param session_id session UUID for which indicator should be shown only. Passed to LLSpeakingIndicatorManager + * If this parameter is set registered indicator will be shown only in voice channel + * which has the same session id (EXT-5562). + */ + void setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id = LLUUID::null); //called by mute list virtual void onChange(); diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index d7c558d188..57b478ffef 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -47,8 +47,6 @@ #include "lltooldraganddrop.h" #include "llscrollcontainer.h" #include "llavatariconctrl.h" -#include "llweb.h" -#include "llfloaterworldmap.h" #include "llfloaterreg.h" #include "llnotificationsutil.h" #include "llvoiceclient.h" @@ -352,8 +350,10 @@ LLPanelAvatarNotes::~LLPanelAvatarNotes() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); + } } } @@ -447,26 +447,25 @@ void LLPanelProfileTab::scrollToTop() void LLPanelProfileTab::onMapButtonClick() { - std::string name; - gCacheName->getFullName(getAvatarId(), name); - gFloaterWorldMap->trackAvatar(getAvatarId(), name); - LLFloaterReg::showInstance("world_map"); + LLAvatarActions::showOnMap(getAvatarId()); } void LLPanelProfileTab::updateButtons() { - bool is_avatar_online = LLAvatarTracker::instance().isBuddyOnline(getAvatarId()); + bool is_buddy_online = LLAvatarTracker::instance().isBuddyOnline(getAvatarId()); if(LLAvatarActions::isFriend(getAvatarId())) { - childSetEnabled("teleport", is_avatar_online); + childSetEnabled("teleport", is_buddy_online); } else { childSetEnabled("teleport", true); } - bool enable_map_btn = is_avatar_online && gAgent.isGodlike() || is_agent_mappable(getAvatarId()); + bool enable_map_btn = (is_buddy_online && + is_agent_mappable(getAvatarId())) + || gAgent.isGodlike(); childSetEnabled("show_on_map_btn", enable_map_btn); } @@ -486,7 +485,6 @@ LLPanelAvatarProfile::LLPanelAvatarProfile() BOOL LLPanelAvatarProfile::postBuild() { - childSetActionTextbox("homepage_edit", boost::bind(&LLPanelAvatarProfile::onHomepageTextboxClicked, this)); childSetCommitCallback("add_friend",(boost::bind(&LLPanelAvatarProfile::onAddFriendButtonClick,this)),NULL); childSetCommitCallback("im",(boost::bind(&LLPanelAvatarProfile::onIMButtonClick,this)),NULL); childSetCommitCallback("call",(boost::bind(&LLPanelAvatarProfile::onCallButtonClick,this)),NULL); @@ -507,8 +505,8 @@ BOOL LLPanelAvatarProfile::postBuild() LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable; enable.add("Profile.EnableGod", boost::bind(&enable_god)); - enable.add("Profile.CheckItem", boost::bind(&LLPanelAvatarProfile::checkOverflowMenuItem, this, _2)); - enable.add("Profile.EnableItem", boost::bind(&LLPanelAvatarProfile::enableOverflowMenuItem, this, _2)); + enable.add("Profile.EnableBlock", boost::bind(&LLPanelAvatarProfile::enableBlock, this)); + enable.add("Profile.EnableUnblock", boost::bind(&LLPanelAvatarProfile::enableUnblock, this)); mProfileMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_profile_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); @@ -685,26 +683,6 @@ void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data) childSetValue("acc_status_text", caption_text); } -bool LLPanelAvatarProfile::checkOverflowMenuItem(const LLSD& param) -{ - std::string item = param.asString(); - - if (item == "is_blocked") - return LLAvatarActions::isBlocked(getAvatarId()); - - return false; -} - -bool LLPanelAvatarProfile::enableOverflowMenuItem(const LLSD& param) -{ - std::string item = param.asString(); - - if (item == "can_block") - return LLAvatarActions::canBlock(getAvatarId()); - - return false; -} - void LLPanelAvatarProfile::pay() { LLAvatarActions::pay(getAvatarId()); @@ -720,6 +698,16 @@ void LLPanelAvatarProfile::toggleBlock() LLAvatarActions::toggleBlock(getAvatarId()); } +bool LLPanelAvatarProfile::enableBlock() +{ + return LLAvatarActions::canBlock(getAvatarId()) && !LLAvatarActions::isBlocked(getAvatarId()); +} + +bool LLPanelAvatarProfile::enableUnblock() +{ + return LLAvatarActions::isBlocked(getAvatarId()); +} + void LLPanelAvatarProfile::kick() { LLAvatarActions::kick(getAvatarId()); @@ -742,20 +730,6 @@ void LLPanelAvatarProfile::csr() LLAvatarActions::csr(getAvatarId(), name); } -void LLPanelAvatarProfile::onUrlTextboxClicked(const std::string& url) -{ - LLWeb::loadURL(url); -} - -void LLPanelAvatarProfile::onHomepageTextboxClicked() -{ - std::string url = childGetValue("homepage_edit").asString(); - if(!url.empty()) - { - onUrlTextboxClicked(url); - } -} - void LLPanelAvatarProfile::onAddFriendButtonClick() { LLAvatarActions::requestFriendshipDialog(getAvatarId()); @@ -803,8 +777,10 @@ LLPanelAvatarProfile::~LLPanelAvatarProfile() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); + } } } diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h index 52b4255e34..2bd23b6e9c 100644 --- a/indra/newview/llpanelavatar.h +++ b/indra/newview/llpanelavatar.h @@ -202,13 +202,11 @@ protected: void unfreeze(); void csr(); - bool checkOverflowMenuItem(const LLSD& param); - bool enableOverflowMenuItem(const LLSD& param); + bool enableBlock(); + bool enableUnblock(); bool enableGod(); - void onUrlTextboxClicked(const std::string& url); - void onHomepageTextboxClicked(); void onAddFriendButtonClick(); void onIMButtonClick(); void onCallButtonClick(); diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 8ca044f72b..021e1f5159 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -41,6 +41,7 @@ #include "lldir.h" #include "lldispatcher.h" #include "llfloaterreg.h" +#include "llhttpclient.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llparcel.h" @@ -72,6 +73,7 @@ #include "llviewerwindow.h" // for window width, height #include "llappviewer.h" // abortQuit() #include "lltrans.h" +#include "llscrollcontainer.h" #include "llstatusbar.h" const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$ @@ -82,6 +84,7 @@ const S32 DECLINE_TO_STATE = 0; //static std::list<LLPanelClassified*> LLPanelClassified::sAllPanels; +std::list<LLPanelClassifiedInfo*> LLPanelClassifiedInfo::sAllPanels; // "classifiedclickthrough" // strings[0] = classified_id @@ -102,15 +105,32 @@ public: S32 teleport_clicks = atoi(strings[1].c_str()); S32 map_clicks = atoi(strings[2].c_str()); S32 profile_clicks = atoi(strings[3].c_str()); - LLPanelClassified::setClickThrough(classified_id, teleport_clicks, - map_clicks, - profile_clicks, - false); + + LLPanelClassifiedInfo::setClickThrough( + classified_id, teleport_clicks, map_clicks, profile_clicks, false); + return true; } }; static LLDispatchClassifiedClickThrough sClassifiedClickThrough; +// Just to debug errors. Can be thrown away later. +class LLClassifiedClickMessageResponder : public LLHTTPClient::Responder +{ + LOG_CLASS(LLClassifiedClickMessageResponder); + +public: + // If we get back an error (not found, etc...), handle it here + virtual void errorWithContent( + U32 status, + const std::string& reason, + const LLSD& content) + { + llwarns << "Sending click message failed (" << status << "): [" << reason << "]" << llendl; + llwarns << "Content: [" << content << "]" << llendl; + } +}; + /* Re-expose this if we need to have classified ad HTML detail pages. JC @@ -496,7 +516,7 @@ void LLPanelClassified::sendClassifiedInfoRequest() if (!url.empty()) { llinfos << "Classified stat request via capability" << llendl; - LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(((LLView*)this)->getHandle(), mClassifiedID)); + LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(mClassifiedID)); } } } @@ -1152,11 +1172,25 @@ void LLPanelClassified::setDefaultAccessCombo() LLPanelClassifiedInfo::LLPanelClassifiedInfo() : LLPanel() , mInfoLoaded(false) -{ + , mScrollingPanel(NULL) + , mScrollContainer(NULL) + , mScrollingPanelMinHeight(0) + , mScrollingPanelWidth(0) + , mSnapshotStreched(false) + , mTeleportClicksOld(0) + , mMapClicksOld(0) + , mProfileClicksOld(0) + , mTeleportClicksNew(0) + , mMapClicksNew(0) + , mProfileClicksNew(0) + , mSnapshotCtrl(NULL) +{ + sAllPanels.push_back(this); } LLPanelClassifiedInfo::~LLPanelClassifiedInfo() { + sAllPanels.remove(this); } // static @@ -1173,6 +1207,15 @@ BOOL LLPanelClassifiedInfo::postBuild() childSetAction("show_on_map_btn", boost::bind(&LLPanelClassifiedInfo::onMapClick, this)); childSetAction("teleport_btn", boost::bind(&LLPanelClassifiedInfo::onTeleportClick, this)); + mScrollingPanel = getChild<LLPanel>("scroll_content_panel"); + mScrollContainer = getChild<LLScrollContainer>("profile_scroll"); + + mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight(); + mScrollingPanelWidth = mScrollingPanel->getRect().getWidth(); + + mSnapshotCtrl = getChild<LLTextureCtrl>("classified_snapshot"); + mSnapshotRect = getDefaultSnapshotRect(); + return TRUE; } @@ -1186,9 +1229,32 @@ void LLPanelClassifiedInfo::setEditClassifiedCallback(const commit_callback_t& c getChild<LLButton>("edit_btn")->setClickedCallback(cb); } +void LLPanelClassifiedInfo::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */) +{ + LLPanel::reshape(width, height, called_from_parent); + + if (!mScrollContainer || !mScrollingPanel) + return; + + static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); + + S32 scroll_height = mScrollContainer->getRect().getHeight(); + if (mScrollingPanelMinHeight >= scroll_height) + { + mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight); + } + else + { + mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height); + } + + mSnapshotRect = getDefaultSnapshotRect(); + stretchSnapshot(); +} + void LLPanelClassifiedInfo::onOpen(const LLSD& key) { - LLUUID avatar_id = key["avatar_id"]; + LLUUID avatar_id = key["classified_creator_id"]; if(avatar_id.isNull()) { return; @@ -1203,14 +1269,35 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key) resetData(); resetControls(); + scrollToTop(); setClassifiedId(key["classified_id"]); - setClassifiedName(key["name"]); - setDescription(key["desc"]); - setSnapshotId(key["snapshot_id"]); + setClassifiedName(key["classified_name"]); + setDescription(key["classified_desc"]); + setSnapshotId(key["classified_snapshot_id"]); + setFromSearch(key["from_search"]); + + llinfos << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << llendl; LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this); LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId()); + gGenericDispatcher.addHandler("classifiedclickthrough", &sClassifiedClickThrough); + + // While we're at it let's get the stats from the new table if that + // capability exists. + std::string url = gAgent.getRegion()->getCapability("SearchStatRequest"); + if (!url.empty()) + { + llinfos << "Classified stat request via capability" << llendl; + LLSD body; + body["classified_id"] = getClassifiedId(); + LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(getClassifiedId())); + } + + // Update classified click stats. + // *TODO: Should we do this when opening not from search? + sendClickMessage("profile"); + setInfoLoaded(false); } @@ -1226,20 +1313,32 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t setSnapshotId(c_info->snapshot_id); setParcelId(c_info->parcel_id); setPosGlobal(c_info->pos_global); + setSimName(c_info->sim_name); + setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global)); childSetValue("category", LLClassifiedInfo::sCategories[c_info->category]); static std::string mature_str = getString("type_mature"); static std::string pg_str = getString("type_pg"); static LLUIString price_str = getString("l$_price"); + static std::string date_fmt = getString("date_fmt"); bool mature = is_cf_mature(c_info->flags); childSetValue("content_type", mature ? mature_str : pg_str); - childSetValue("auto_renew", is_cf_auto_renew(c_info->flags)); + getChild<LLIconCtrl>("content_type_moderate")->setVisible(mature); + getChild<LLIconCtrl>("content_type_general")->setVisible(!mature); + + std::string auto_renew_str = is_cf_auto_renew(c_info->flags) ? + getString("auto_renew_on") : getString("auto_renew_off"); + childSetValue("auto_renew", auto_renew_str); price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing)); childSetValue("price_for_listing", LLSD(price_str)); + std::string date_str = date_fmt; + LLStringUtil::format(date_str, LLSD().with("datetime", (S32) c_info->creation_date)); + childSetText("creation_date", date_str); + setInfoLoaded(true); } } @@ -1252,23 +1351,38 @@ void LLPanelClassifiedInfo::resetData() setClassifiedLocation(LLStringUtil::null); setClassifiedId(LLUUID::null); setSnapshotId(LLUUID::null); - mPosGlobal.clearVec(); - childSetValue("category", LLStringUtil::null); - childSetValue("content_type", LLStringUtil::null); + setPosGlobal(LLVector3d::zero); + setParcelId(LLUUID::null); + setSimName(LLStringUtil::null); + setFromSearch(false); + + // reset click stats + mTeleportClicksOld = 0; + mMapClicksOld = 0; + mProfileClicksOld = 0; + mTeleportClicksNew = 0; + mMapClicksNew = 0; + mProfileClicksNew = 0; + + childSetText("category", LLStringUtil::null); + childSetText("content_type", LLStringUtil::null); + childSetText("click_through_text", LLStringUtil::null); + childSetText("price_for_listing", LLStringUtil::null); + childSetText("auto_renew", LLStringUtil::null); + childSetText("creation_date", LLStringUtil::null); + childSetText("click_through_text", LLStringUtil::null); + getChild<LLIconCtrl>("content_type_moderate")->setVisible(FALSE); + getChild<LLIconCtrl>("content_type_general")->setVisible(FALSE); } void LLPanelClassifiedInfo::resetControls() { - if(getAvatarId() == gAgent.getID()) - { - childSetEnabled("edit_btn", TRUE); - childSetVisible("edit_btn", TRUE); - } - else - { - childSetEnabled("edit_btn", FALSE); - childSetVisible("edit_btn", FALSE); - } + bool is_self = getAvatarId() == gAgent.getID(); + + childSetEnabled("edit_btn", is_self); + childSetVisible("edit_btn", is_self); + childSetVisible("price_layout_panel", is_self); + childSetVisible("clickthrough_layout_panel", is_self); } void LLPanelClassifiedInfo::setClassifiedName(const std::string& name) @@ -1296,9 +1410,27 @@ void LLPanelClassifiedInfo::setClassifiedLocation(const std::string& location) childSetValue("classified_location", location); } +std::string LLPanelClassifiedInfo::getClassifiedLocation() +{ + return childGetValue("classified_location").asString(); +} + void LLPanelClassifiedInfo::setSnapshotId(const LLUUID& id) { - childSetValue("classified_snapshot", id); + mSnapshotCtrl->setValue(id); + mSnapshotStreched = false; +} + +void LLPanelClassifiedInfo::draw() +{ + LLPanel::draw(); + + // Stretch in draw because it takes some time to load a texture, + // going to try to stretch snapshot until texture is loaded + if(!mSnapshotStreched) + { + stretchSnapshot(); + } } LLUUID LLPanelClassifiedInfo::getSnapshotId() @@ -1307,6 +1439,69 @@ LLUUID LLPanelClassifiedInfo::getSnapshotId() } // static +void LLPanelClassifiedInfo::setClickThrough( + const LLUUID& classified_id, + S32 teleport, + S32 map, + S32 profile, + bool from_new_table) +{ + llinfos << "Click-through data for classified " << classified_id << " arrived: [" + << teleport << ", " << map << ", " << profile << "] (" + << (from_new_table ? "new" : "old") << ")" << llendl; + + for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter) + { + LLPanelClassifiedInfo* self = *iter; + if (self->getClassifiedId() != classified_id) + { + continue; + } + + // *HACK: Skip LLPanelClassifiedEdit instances: they don't display clicks data. + // Those instances should not be in the list at all. + if (typeid(*self) != typeid(LLPanelClassifiedInfo)) + { + continue; + } + + llinfos << "Updating classified info panel" << llendl; + + // We need to check to see if the data came from the new stat_table + // or the old classified table. We also need to cache the data from + // the two separate sources so as to display the aggregate totals. + + if (from_new_table) + { + self->mTeleportClicksNew = teleport; + self->mMapClicksNew = map; + self->mProfileClicksNew = profile; + } + else + { + self->mTeleportClicksOld = teleport; + self->mMapClicksOld = map; + self->mProfileClicksOld = profile; + } + + static LLUIString ct_str = self->getString("click_through_text_fmt"); + + ct_str.setArg("[TELEPORT]", llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld)); + ct_str.setArg("[MAP]", llformat("%d", self->mMapClicksNew + self->mMapClicksOld)); + ct_str.setArg("[PROFILE]", llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld)); + + self->childSetText("click_through_text", ct_str.getString()); + // *HACK: remove this when there is enough room for click stats in the info panel + self->childSetToolTip("click_through_text", ct_str.getString()); + + llinfos << "teleport: " << llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld) + << ", map: " << llformat("%d", self->mMapClicksNew + self->mMapClicksOld) + << ", profile: " << llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld) + << llendl; + } +} + +// static std::string LLPanelClassifiedInfo::createLocationText( const std::string& original_name, const std::string& sim_name, @@ -1337,8 +1532,100 @@ std::string LLPanelClassifiedInfo::createLocationText( return location_text; } +void LLPanelClassifiedInfo::stretchSnapshot() +{ + // *NOTE dzaporozhan + // Could be moved to LLTextureCtrl + + LLViewerFetchedTexture* texture = mSnapshotCtrl->getTexture(); + + if(!texture) + { + return; + } + + if(0 == texture->getOriginalWidth() || 0 == texture->getOriginalHeight()) + { + // looks like texture is not loaded yet + return; + } + + LLRect rc = mSnapshotRect; + // *HACK dzaporozhan + // LLTextureCtrl uses BTN_HEIGHT_SMALL as bottom for texture which causes + // drawn texture to be smaller than expected. (see LLTextureCtrl::draw()) + // Lets increase texture height to force texture look as expected. + rc.mBottom -= BTN_HEIGHT_SMALL; + + F32 t_width = texture->getFullWidth(); + F32 t_height = texture->getFullHeight(); + + F32 ratio = llmin<F32>( (rc.getWidth() / t_width), (rc.getHeight() / t_height) ); + + t_width *= ratio; + t_height *= ratio; + + rc.setCenterAndSize(rc.getCenterX(), rc.getCenterY(), llfloor(t_width), llfloor(t_height)); + mSnapshotCtrl->setShape(rc); + + mSnapshotStreched = true; +} + +LLRect LLPanelClassifiedInfo::getDefaultSnapshotRect() +{ + // Using scroll container makes getting default rect a hard task + // because rect in postBuild() and in first reshape() is not the same. + // Using snapshot_panel makes it easier to reshape snapshot. + return getChild<LLUICtrl>("snapshot_panel")->getLocalRect(); +} + +void LLPanelClassifiedInfo::scrollToTop() +{ + LLScrollContainer* scrollContainer = findChild<LLScrollContainer>("profile_scroll"); + if (scrollContainer) + scrollContainer->goToTop(); +} + +// static +// *TODO: move out of the panel +void LLPanelClassifiedInfo::sendClickMessage( + const std::string& type, + bool from_search, + const LLUUID& classified_id, + const LLUUID& parcel_id, + const LLVector3d& global_pos, + const std::string& sim_name) +{ + // You're allowed to click on your own ads to reassure yourself + // that the system is working. + LLSD body; + body["type"] = type; + body["from_search"] = from_search; + body["classified_id"] = classified_id; + body["parcel_id"] = parcel_id; + body["dest_pos_global"] = global_pos.getValue(); + body["region_name"] = sim_name; + + std::string url = gAgent.getRegion()->getCapability("SearchStatTracking"); + llinfos << "Sending click msg via capability (url=" << url << ")" << llendl; + llinfos << "body: [" << body << "]" << llendl; + LLHTTPClient::post(url, body, new LLClassifiedClickMessageResponder()); +} + +void LLPanelClassifiedInfo::sendClickMessage(const std::string& type) +{ + sendClickMessage( + type, + fromSearch(), + getClassifiedId(), + getParcelId(), + getPosGlobal(), + getSimName()); +} + void LLPanelClassifiedInfo::onMapClick() { + sendClickMessage("map"); LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal()); LLFloaterReg::showInstance("world_map", "center"); } @@ -1347,6 +1634,7 @@ void LLPanelClassifiedInfo::onTeleportClick() { if (!getPosGlobal().isExactlyZero()) { + sendClickMessage("teleport"); gAgent.teleportViaLocation(getPosGlobal()); LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal()); } @@ -1355,6 +1643,7 @@ void LLPanelClassifiedInfo::onTeleportClick() void LLPanelClassifiedInfo::onExit() { LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this); + gGenericDispatcher.addHandler("classifiedclickthrough", NULL); // deregister our handler } ////////////////////////////////////////////////////////////////////////// @@ -1367,7 +1656,9 @@ static const S32 CB_ITEM_PG = 1; LLPanelClassifiedEdit::LLPanelClassifiedEdit() : LLPanelClassifiedInfo() , mIsNew(false) + , mIsNewWithErrors(false) , mCanClose(false) + , mPublishFloater(NULL) { } @@ -1419,22 +1710,17 @@ BOOL LLPanelClassifiedEdit::postBuild() childSetAction("save_changes_btn", boost::bind(&LLPanelClassifiedEdit::onSaveClick, this)); childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelClassifiedEdit::onSetLocationClick, this)); + mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelClassifiedEdit::onTextureSelected, this)); + return TRUE; } -void LLPanelClassifiedEdit::onOpen(const LLSD& key) +void LLPanelClassifiedEdit::fillIn(const LLSD& key) { - LLUUID classified_id = key["classified_id"]; - - mIsNew = classified_id.isNull(); + setAvatarId(gAgent.getID()); - if(mIsNew) + if(key.isUndefined()) { - setAvatarId(gAgent.getID()); - - resetData(); - resetControls(); - setPosGlobal(gAgent.getPositionGlobal()); LLUUID snapshot_id = LLUUID::null; @@ -1457,22 +1743,55 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key) childSetValue("classified_name", makeClassifiedName()); childSetValue("classified_desc", desc); setSnapshotId(snapshot_id); - setClassifiedLocation(createLocationText(getLocationNotice(), region_name, getPosGlobal())); - // server will set valid parcel id setParcelId(LLUUID::null); + } + else + { + setClassifiedId(key["classified_id"]); + setClassifiedName(key["name"]); + setDescription(key["desc"]); + setSnapshotId(key["snapshot_id"]); + setCategory((U32)key["category"].asInteger()); + setContentType((U32)key["content_type"].asInteger()); + setClassifiedLocation(key["location_text"]); + childSetValue("auto_renew", key["auto_renew"]); + childSetValue("price_for_listing", key["price_for_listing"].asInteger()); + } +} + +void LLPanelClassifiedEdit::onOpen(const LLSD& key) +{ + mIsNew = key.isUndefined(); + + scrollToTop(); + + // classified is not created yet + bool is_new = isNew() || isNewWithErrors(); + + if(is_new) + { + resetData(); + resetControls(); - enableVerbs(true); - enableEditing(true); + fillIn(key); + + if(isNew()) + { + LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this); + } } else { LLPanelClassifiedInfo::onOpen(key); - enableVerbs(false); - enableEditing(false); } + std::string save_btn_label = is_new ? getString("publish_label") : getString("save_label"); + childSetLabelArg("save_changes_btn", "[LABEL]", save_btn_label); + + enableVerbs(is_new); + enableEditing(is_new); resetDirty(); setInfoLoaded(false); } @@ -1484,6 +1803,14 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t LLAvatarClassifiedInfo* c_info = static_cast<LLAvatarClassifiedInfo*>(data); if(c_info && getClassifiedId() == c_info->classified_id) { + // see LLPanelClassifiedEdit::sendUpdate() for notes + mIsNewWithErrors = false; + // for just created classified - panel will probably be closed when we get here. + if(!getVisible()) + { + return; + } + enableEditing(true); setClassifiedName(c_info->name); @@ -1492,18 +1819,23 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t setPosGlobal(c_info->pos_global); setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global)); - getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category + 1); - getChild<LLComboBox>("category")->resetDirty(); + // *HACK see LLPanelClassifiedEdit::sendUpdate() + setCategory(c_info->category - 1); bool mature = is_cf_mature(c_info->flags); bool auto_renew = is_cf_auto_renew(c_info->flags); - getChild<LLComboBox>("content_type")->setCurrentByIndex(mature ? CB_ITEM_MATURE : CB_ITEM_PG); + setContentType(mature ? CB_ITEM_MATURE : CB_ITEM_PG); childSetValue("auto_renew", auto_renew); childSetValue("price_for_listing", c_info->price_for_listing); + childSetEnabled("price_for_listing", isNew()); resetDirty(); setInfoLoaded(true); + enableVerbs(false); + + // for just created classified - in case user opened edit panel before processProperties() callback + childSetLabelArg("save_changes_btn", "[LABEL]", getString("save_label")); } } } @@ -1534,19 +1866,24 @@ void LLPanelClassifiedEdit::resetDirty() LLPanelClassifiedInfo::resetDirty(); getChild<LLUICtrl>("classified_snapshot")->resetDirty(); getChild<LLUICtrl>("classified_name")->resetDirty(); - getChild<LLUICtrl>("classified_desc")->resetDirty(); + + LLTextEditor* desc = getChild<LLTextEditor>("classified_desc"); + // call blockUndo() to really reset dirty(and make isDirty work as intended) + desc->blockUndo(); + desc->resetDirty(); + getChild<LLUICtrl>("category")->resetDirty(); getChild<LLUICtrl>("content_type")->resetDirty(); getChild<LLUICtrl>("auto_renew")->resetDirty(); getChild<LLUICtrl>("price_for_listing")->resetDirty(); } -void LLPanelClassifiedEdit::setSaveCallback(const commit_callback_t& cb) +void LLPanelClassifiedEdit::setSaveCallback(const commit_signal_t::slot_type& cb) { - getChild<LLButton>("save_changes_btn")->setClickedCallback(cb); + mSaveButtonClickedSignal.connect(cb); } -void LLPanelClassifiedEdit::setCancelCallback(const commit_callback_t& cb) +void LLPanelClassifiedEdit::setCancelCallback(const commit_signal_t::slot_type& cb) { getChild<LLButton>("cancel_btn")->setClickedCallback(cb); } @@ -1556,9 +1893,10 @@ void LLPanelClassifiedEdit::resetControls() LLPanelClassifiedInfo::resetControls(); getChild<LLComboBox>("category")->setCurrentByIndex(0); - getChild<LLComboBox>("content_type")->setCurrentByIndex(0); + getChild<LLIconsComboBox>("content_type")->setCurrentByIndex(0); childSetValue("auto_renew", false); childSetValue("price_for_listing", MINIMUM_PRICE_FOR_LISTING); + childSetEnabled("price_for_listing", TRUE); } bool LLPanelClassifiedEdit::canClose() @@ -1566,20 +1904,54 @@ bool LLPanelClassifiedEdit::canClose() return mCanClose; } +void LLPanelClassifiedEdit::draw() +{ + LLPanel::draw(); + + // Need to re-stretch on every draw because LLTextureCtrl::onSelectCallback + // does not trigger callbacks when user navigates through images. + stretchSnapshot(); +} + +void LLPanelClassifiedEdit::stretchSnapshot() +{ + LLPanelClassifiedInfo::stretchSnapshot(); + + getChild<LLUICtrl>("edit_icon")->setShape(mSnapshotCtrl->getRect()); +} + +U32 LLPanelClassifiedEdit::getContentType() +{ + LLComboBox* ct_cb = getChild<LLComboBox>("content_type"); + return ct_cb->getCurrentIndex(); +} + +void LLPanelClassifiedEdit::setContentType(U32 content_type) +{ + LLIconsComboBox* ct_cb = getChild<LLIconsComboBox>("content_type"); + ct_cb->setCurrentByIndex(content_type); + ct_cb->resetDirty(); +} + +bool LLPanelClassifiedEdit::getAutoRenew() +{ + return childGetValue("auto_renew").asBoolean(); +} + void LLPanelClassifiedEdit::sendUpdate() { LLAvatarClassifiedInfo c_data; if(getClassifiedId().isNull()) { - LLUUID id; - id.generate(); - setClassifiedId(id); + setClassifiedId(LLUUID::generateNewID()); } c_data.agent_id = gAgent.getID(); c_data.classified_id = getClassifiedId(); - c_data.category = getCategory(); + // *HACK + // Categories on server start with 1 while combo-box index starts with 0 + c_data.category = getCategory() + 1; c_data.name = getClassifiedName(); c_data.description = getDescription(); c_data.parcel_id = getParcelId(); @@ -1589,19 +1961,34 @@ void LLPanelClassifiedEdit::sendUpdate() c_data.price_for_listing = getPriceForListing(); LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoUpdate(&c_data); + + if(isNew()) + { + // Lets assume there will be some error. + // Successful sendClassifiedInfoUpdate will trigger processProperties and + // let us know there was no error. + mIsNewWithErrors = true; + } } U32 LLPanelClassifiedEdit::getCategory() { LLComboBox* cat_cb = getChild<LLComboBox>("category"); - return cat_cb->getCurrentIndex() + 1; + return cat_cb->getCurrentIndex(); +} + +void LLPanelClassifiedEdit::setCategory(U32 category) +{ + LLComboBox* cat_cb = getChild<LLComboBox>("category"); + cat_cb->setCurrentByIndex(category); + cat_cb->resetDirty(); } U8 LLPanelClassifiedEdit::getFlags() { bool auto_renew = childGetValue("auto_renew").asBoolean(); - LLComboBox* content_cb = getChild<LLComboBox>("content_type"); + LLComboBox* content_cb = getChild<LLIconsComboBox>("content_type"); bool mature = content_cb->getCurrentIndex() == CB_ITEM_MATURE; return pack_classified_flags_request(auto_renew, false, mature, false); @@ -1653,6 +2040,11 @@ S32 LLPanelClassifiedEdit::getPriceForListing() return childGetValue("price_for_listing").asInteger(); } +void LLPanelClassifiedEdit::setPriceForListing(S32 price) +{ + childSetValue("price_for_listing", price); +} + void LLPanelClassifiedEdit::onSetLocationClick() { setPosGlobal(gAgent.getPositionGlobal()); @@ -1687,18 +2079,51 @@ void LLPanelClassifiedEdit::onSaveClick() notifyInvalidName(); return; } - if(isNew()) + if(isNew() || isNewWithErrors()) { if(gStatusBar->getBalance() < getPriceForListing()) { LLNotificationsUtil::add("ClassifiedInsufficientFunds"); return; } + + mPublishFloater = LLFloaterReg::findTypedInstance<LLPublishClassifiedFloater>( + "publish_classified", LLSD()); + + if(!mPublishFloater) + { + mPublishFloater = LLFloaterReg::getTypedInstance<LLPublishClassifiedFloater>( + "publish_classified", LLSD()); + + mPublishFloater->setPublishClickedCallback(boost::bind + (&LLPanelClassifiedEdit::onPublishFloaterPublishClicked, this)); + } + + // set spinner value before it has focus or value wont be set + mPublishFloater->setPrice(getPriceForListing()); + mPublishFloater->openFloater(mPublishFloater->getKey()); + mPublishFloater->center(); + } + else + { + doSave(); } +} +void LLPanelClassifiedEdit::doSave() +{ mCanClose = true; sendUpdate(); resetDirty(); + + mSaveButtonClickedSignal(this, LLSD()); +} + +void LLPanelClassifiedEdit::onPublishFloaterPublishClicked() +{ + setPriceForListing(mPublishFloater->getPrice()); + + doSave(); } std::string LLPanelClassifiedEdit::getLocationNotice() @@ -1745,4 +2170,52 @@ void LLPanelClassifiedEdit::onTexturePickerMouseLeave(LLUICtrl* ctrl) ctrl->setVisible(FALSE); } +void LLPanelClassifiedEdit::onTextureSelected() +{ + setSnapshotId(mSnapshotCtrl->getValue().asUUID()); +} + +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////// + +LLPublishClassifiedFloater::LLPublishClassifiedFloater(const LLSD& key) + : LLFloater(key) +{ +} + +LLPublishClassifiedFloater::~LLPublishClassifiedFloater() +{ +} + +BOOL LLPublishClassifiedFloater::postBuild() +{ + LLFloater::postBuild(); + + childSetAction("publish_btn", boost::bind(&LLFloater::closeFloater, this, false)); + childSetAction("cancel_btn", boost::bind(&LLFloater::closeFloater, this, false)); + + return TRUE; +} + +void LLPublishClassifiedFloater::setPrice(S32 price) +{ + childSetValue("price_for_listing", price); +} + +S32 LLPublishClassifiedFloater::getPrice() +{ + return childGetValue("price_for_listing").asInteger(); +} + +void LLPublishClassifiedFloater::setPublishClickedCallback(const commit_signal_t::slot_type& cb) +{ + getChild<LLButton>("publish_btn")->setClickedCallback(cb); +} + +void LLPublishClassifiedFloater::setCancelClickedCallback(const commit_signal_t::slot_type& cb) +{ + getChild<LLButton>("cancel_btn")->setClickedCallback(cb); +} + //EOF diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index e46806f576..1157649a16 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -55,6 +55,7 @@ class LLTextEditor; class LLTextureCtrl; class LLUICtrl; class LLMessageSystem; +class LLScrollContainer; // *TODO deprecated, should be removed. // New class implemented in ticket EXT-2095 @@ -201,8 +202,26 @@ private: void* mUserData; }; +class LLPublishClassifiedFloater : public LLFloater +{ +public: + LLPublishClassifiedFloater(const LLSD& key); + virtual ~LLPublishClassifiedFloater(); + + /*virtual*/ BOOL postBuild(); + + void setPrice(S32 price); + S32 getPrice(); + + void setPublishClickedCallback(const commit_signal_t::slot_type& cb); + void setCancelClickedCallback(const commit_signal_t::slot_type& cb); + +private: +}; + class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver { + LOG_CLASS(LLPanelClassifiedInfo); public: static LLPanelClassifiedInfo* create(); @@ -237,6 +256,8 @@ public: void setClassifiedLocation(const std::string& location); + std::string getClassifiedLocation(); + void setPosGlobal(const LLVector3d& pos) { mPosGlobal = pos; } LLVector3d& getPosGlobal() { return mPosGlobal; } @@ -245,14 +266,41 @@ public: LLUUID getParcelId() { return mParcelId; } + void setSimName(const std::string& sim_name) { mSimName = sim_name; } + + std::string getSimName() { return mSimName; } + + void setFromSearch(bool val) { mFromSearch = val; } + + bool fromSearch() { return mFromSearch; } + bool getInfoLoaded() { return mInfoLoaded; } void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; } + static void setClickThrough( + const LLUUID& classified_id, + S32 teleport, + S32 map, + S32 profile, + bool from_new_table); + + static void sendClickMessage( + const std::string& type, + bool from_search, + const LLUUID& classified_id, + const LLUUID& parcel_id, + const LLVector3d& global_pos, + const std::string& sim_name); + void setExitCallback(const commit_callback_t& cb); void setEditClassifiedCallback(const commit_callback_t& cb); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + + /*virtual*/ void draw(); + protected: LLPanelClassifiedInfo(); @@ -266,21 +314,52 @@ protected: const std::string& sim_name, const LLVector3d& pos_global); + void stretchSnapshot(); + void sendClickMessage(const std::string& type); + + LLRect getDefaultSnapshotRect(); + + void scrollToTop(); + void onMapClick(); void onTeleportClick(); void onExit(); + bool mSnapshotStreched; + LLRect mSnapshotRect; + LLTextureCtrl* mSnapshotCtrl; + private: LLUUID mAvatarId; LLUUID mClassifiedId; LLVector3d mPosGlobal; LLUUID mParcelId; + std::string mSimName; + bool mFromSearch; bool mInfoLoaded; + + LLScrollContainer* mScrollContainer; + LLPanel* mScrollingPanel; + + S32 mScrollingPanelMinHeight; + S32 mScrollingPanelWidth; + + // Needed for stat tracking + S32 mTeleportClicksOld; + S32 mMapClicksOld; + S32 mProfileClicksOld; + S32 mTeleportClicksNew; + S32 mMapClicksNew; + S32 mProfileClicksNew; + + typedef std::list<LLPanelClassifiedInfo*> panel_list_t; + static panel_list_t sAllPanels; }; class LLPanelClassifiedEdit : public LLPanelClassifiedInfo { + LOG_CLASS(LLPanelClassifiedEdit); public: static LLPanelClassifiedEdit* create(); @@ -289,6 +368,8 @@ public: /*virtual*/ BOOL postBuild(); + void fillIn(const LLSD& key); + /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void processProperties(void* data, EAvatarProcessorType type); @@ -297,31 +378,47 @@ public: /*virtual*/ void resetDirty(); - void setSaveCallback(const commit_callback_t& cb); + void setSaveCallback(const commit_signal_t::slot_type& cb); - void setCancelCallback(const commit_callback_t& cb); + void setCancelCallback(const commit_signal_t::slot_type& cb); /*virtual*/ void resetControls(); bool isNew() { return mIsNew; } + bool isNewWithErrors() { return mIsNewWithErrors; } + bool canClose(); + void draw(); + + void stretchSnapshot(); + + U32 getCategory(); + + void setCategory(U32 category); + + U32 getContentType(); + + void setContentType(U32 content_type); + + bool getAutoRenew(); + + S32 getPriceForListing(); + protected: LLPanelClassifiedEdit(); void sendUpdate(); - U32 getCategory(); - void enableVerbs(bool enable); void enableEditing(bool enable); std::string makeClassifiedName(); - S32 getPriceForListing(); + void setPriceForListing(S32 price); U8 getFlags(); @@ -335,12 +432,23 @@ protected: void onChange(); void onSaveClick(); + void doSave(); + + void onPublishFloaterPublishClicked(); + void onTexturePickerMouseEnter(LLUICtrl* ctrl); void onTexturePickerMouseLeave(LLUICtrl* ctrl); + void onTextureSelected(); + private: bool mIsNew; + bool mIsNewWithErrors; bool mCanClose; + + LLPublishClassifiedFloater* mPublishFloater; + + commit_signal_t mSaveButtonClickedSignal; }; #endif // LL_LLPANELCLASSIFIED_H diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index ce4078409a..706787e824 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -102,8 +102,10 @@ LLPanelGroup::LLPanelGroup() LLPanelGroup::~LLPanelGroup() { LLGroupMgr::getInstance()->removeObserver(this); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver(this); + } } void LLPanelGroup::onOpen(const LLSD& key) @@ -335,7 +337,7 @@ void LLPanelGroup::update(LLGroupChange gc) childSetToolTip("group_name",gdatap->mName); LLGroupData agent_gdatap; - bool is_member = gAgent.getGroupData(mID,agent_gdatap); + bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); bool join_btn_visible = !is_member && gdatap->mOpenEnrollment; mButtonJoin->setVisible(join_btn_visible); @@ -464,7 +466,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id) } LLGroupData agent_gdatap; - bool is_member = gAgent.getGroupData(mID,agent_gdatap); + bool is_member = gAgent.getGroupData(mID,agent_gdatap) || gAgent.isGodlike(); tab_roles->setVisible(is_member); tab_notices->setVisible(is_member); diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 555e277ce5..517204b232 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -111,6 +111,8 @@ BOOL LLPanelGroupGeneral::postBuild() { mListVisibleMembers->setDoubleClickCallback(openProfile, this); mListVisibleMembers->setContextMenu(LLScrollListCtrl::MENU_AVATAR); + + mListVisibleMembers->setSortCallback(boost::bind(&LLPanelGroupGeneral::sortMembersList,this,_1,_2,_3)); } // Options @@ -944,4 +946,18 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id) activate(); } +S32 LLPanelGroupGeneral::sortMembersList(S32 col_idx,const LLScrollListItem* i1,const LLScrollListItem* i2) +{ + const LLScrollListCell *cell1 = i1->getColumn(col_idx); + const LLScrollListCell *cell2 = i2->getColumn(col_idx); + + if(col_idx == 2) + { + if(LLStringUtil::compareDict(cell1->getValue().asString(),"Online") == 0 ) + return 1; + if(LLStringUtil::compareDict(cell2->getValue().asString(),"Online") == 0 ) + return -1; + } + return LLStringUtil::compareDict(cell1->getValue().asString(), cell2->getValue().asString()); +} diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h index 7e90e43cf9..6245018871 100644 --- a/indra/newview/llpanelgroupgeneral.h +++ b/indra/newview/llpanelgroupgeneral.h @@ -83,6 +83,8 @@ private: static void onReceiveNotices(LLUICtrl* ctrl, void* data); static void openProfile(void* data); + S32 sortMembersList(S32,const LLScrollListItem*,const LLScrollListItem*); + static bool joinDlgCB(const LLSD& notification, const LLSD& response); void updateMembers(); diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 6210973dae..5f913d5469 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -652,6 +652,9 @@ void LLPanelGroupNotices::setGroupID(const LLUUID& id) LLGroupDropTarget* target = getChild<LLGroupDropTarget> ("drop_target"); target->setPanel (this); target->setGroup (mGroupID); + + if(mViewMessage) + mViewMessage->clear(); activate(); } diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 8e305a5674..c34f0633b9 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -112,8 +112,10 @@ void LLPanelChatControlPanel::updateButtons(bool is_call_started) LLPanelChatControlPanel::~LLPanelChatControlPanel() { mVoiceChannelStateChangeConnection.disconnect(); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver(this); + } } BOOL LLPanelChatControlPanel::postBuild() diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 40ea75ea7a..45a8dc4cbe 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -69,6 +69,10 @@ static const std::string TRASH_BUTTON_NAME = "trash_btn"; // helper functions static void filter_list(LLPlacesInventoryPanel* inventory_list, const std::string& string); static bool category_has_descendents(LLPlacesInventoryPanel* inventory_list); +static void collapse_all_folders(LLFolderView* root_folder); +static void expand_all_folders(LLFolderView* root_folder); +static bool has_expanded_folders(LLFolderView* root_folder); +static bool has_collapsed_folders(LLFolderView* root_folder); /** * Functor counting expanded and collapsed folders in folder view tree to know @@ -683,31 +687,29 @@ void LLLandmarksPanel::updateListCommands() // keep Options & Add Landmark buttons always enabled mListCommands->childSetEnabled(ADD_FOLDER_BUTTON_NAME, add_folder_enabled); mListCommands->childSetEnabled(TRASH_BUTTON_NAME, trash_enabled); - mListCommands->childSetEnabled(OPTIONS_BUTTON_NAME,getCurSelectedItem() != NULL); } void LLLandmarksPanel::onActionsButtonClick() { + LLMenuGL* menu = mGearFolderMenu; + LLFolderViewItem* cur_item = NULL; if(mCurrentSelectedList) - cur_item = mCurrentSelectedList->getRootFolder()->getCurSelectedItem(); - - if(!cur_item) - return; - - LLFolderViewEventListener* listenerp = cur_item->getListener(); - - LLMenuGL* menu =NULL; - if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK) - { - menu = mGearLandmarkMenu; - } - else if (listenerp->getInventoryType() == LLInventoryType::IT_CATEGORY) { - mGearFolderMenu->getChild<LLMenuItemCallGL>("expand")->setVisible(!cur_item->isOpen()); - mGearFolderMenu->getChild<LLMenuItemCallGL>("collapse")->setVisible(cur_item->isOpen()); - menu = mGearFolderMenu; + cur_item = mCurrentSelectedList->getRootFolder()->getCurSelectedItem(); + if(!cur_item) + return; + + LLFolderViewEventListener* listenerp = cur_item->getListener(); + if(!listenerp) + return; + + if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK) + { + menu = mGearLandmarkMenu; + } } + showActionMenu(menu,OPTIONS_BUTTON_NAME); } @@ -805,26 +807,33 @@ void LLLandmarksPanel::onClipboardAction(const LLSD& userdata) const void LLLandmarksPanel::onFoldingAction(const LLSD& userdata) { - if(!mCurrentSelectedList) return; - - LLFolderView* root_folder = mCurrentSelectedList->getRootFolder(); std::string command_name = userdata.asString(); if ("expand_all" == command_name) { - root_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN); - root_folder->arrangeAll(); + expand_all_folders(mFavoritesInventoryPanel->getRootFolder()); + expand_all_folders(mLandmarksInventoryPanel->getRootFolder()); + expand_all_folders(mMyInventoryPanel->getRootFolder()); + expand_all_folders(mLibraryInventoryPanel->getRootFolder()); + + for (accordion_tabs_t::const_iterator iter = mAccordionTabs.begin(); iter != mAccordionTabs.end(); ++iter) + { + (*iter)->changeOpenClose(false); + } } else if ("collapse_all" == command_name) { - root_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN); + collapse_all_folders(mFavoritesInventoryPanel->getRootFolder()); + collapse_all_folders(mLandmarksInventoryPanel->getRootFolder()); + collapse_all_folders(mMyInventoryPanel->getRootFolder()); + collapse_all_folders(mLibraryInventoryPanel->getRootFolder()); - // The top level folder is invisible, it must be open to - // display its sub-folders. - root_folder->openTopLevelFolders(); - root_folder->arrangeAll(); + for (accordion_tabs_t::const_iterator iter = mAccordionTabs.begin(); iter != mAccordionTabs.end(); ++iter) + { + (*iter)->changeOpenClose(true); + } } - else if ( "sort_by_date" == command_name) + else if ("sort_by_date" == command_name) { mSortByDate = !mSortByDate; updateSortOrder(mLandmarksInventoryPanel, mSortByDate); @@ -833,7 +842,10 @@ void LLLandmarksPanel::onFoldingAction(const LLSD& userdata) } else { - root_folder->doToSelected(&gInventory, userdata); + if(mCurrentSelectedList) + { + mCurrentSelectedList->getRootFolder()->doToSelected(&gInventory, userdata); + } } } @@ -853,53 +865,87 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const { std::string command_name = userdata.asString(); - - LLPlacesFolderView* rootFolderView = mCurrentSelectedList ? + LLPlacesFolderView* root_folder_view = mCurrentSelectedList ? static_cast<LLPlacesFolderView*>(mCurrentSelectedList->getRootFolder()) : NULL; - if (NULL == rootFolderView) return false; - - // disable some commands for multi-selection. EXT-1757 - if (rootFolderView->getSelectedCount() > 1) + if ("collapse_all" == command_name) { - if ( "teleport" == command_name - || "more_info" == command_name - || "rename" == command_name - || "show_on_map" == command_name - || "copy_slurl" == command_name - ) + bool disable_collapse_all = !has_expanded_folders(mFavoritesInventoryPanel->getRootFolder()) + && !has_expanded_folders(mLandmarksInventoryPanel->getRootFolder()) + && !has_expanded_folders(mMyInventoryPanel->getRootFolder()) + && !has_expanded_folders(mLibraryInventoryPanel->getRootFolder()); + if (disable_collapse_all) { - return false; + for (accordion_tabs_t::const_iterator iter = mAccordionTabs.begin(); iter != mAccordionTabs.end(); ++iter) + { + if ((*iter)->isExpanded()) + { + disable_collapse_all = false; + break; + } + } } + return !disable_collapse_all; } + else if ("expand_all" == command_name) + { + bool disable_expand_all = !has_collapsed_folders(mFavoritesInventoryPanel->getRootFolder()) + && !has_collapsed_folders(mLandmarksInventoryPanel->getRootFolder()) + && !has_collapsed_folders(mMyInventoryPanel->getRootFolder()) + && !has_collapsed_folders(mLibraryInventoryPanel->getRootFolder()); + if (disable_expand_all) + { + for (accordion_tabs_t::const_iterator iter = mAccordionTabs.begin(); iter != mAccordionTabs.end(); ++iter) + { + if (!(*iter)->isExpanded()) + { + disable_expand_all = false; + break; + } + } + } - // disable some commands for Favorites accordion. EXT-1758 - if (mCurrentSelectedList == mFavoritesInventoryPanel) + return !disable_expand_all; + } + else if ("sort_by_date" == command_name) { - if ( "expand_all" == command_name - || "collapse_all" == command_name - || "sort_by_date" == command_name - ) + // disable "sort_by_date" for Favorites accordion because + // it has its own items order. EXT-1758 + if (mCurrentSelectedList == mFavoritesInventoryPanel) + { return false; + } } - - LLCheckFolderState checker; - rootFolderView->applyFunctorRecursively(checker); - - // We assume that the root folder is always expanded so we enable "collapse_all" - // command when we have at least one more expanded folder. - if (checker.getExpandedFolders() < 2 && "collapse_all" == command_name) + else if (!root_folder_view) { return false; } - - if (checker.getCollapsedFolders() < 1 && "expand_all" == command_name) + else if ( "paste" == command_name + || "rename" == command_name + || "cut" == command_name + || "copy" == command_name + || "delete" == command_name + || "collapse" == command_name + || "expand" == command_name + ) { - return false; + return canSelectedBeModified(command_name); } - - if("category" == command_name) + else if ( "teleport" == command_name + || "more_info" == command_name + || "rename" == command_name + || "show_on_map" == command_name + || "copy_slurl" == command_name + ) + { + // disable some commands for multi-selection. EXT-1757 + if (root_folder_view->getSelectedCount() > 1) + { + return false; + } + } + else if("category" == command_name) { // we can add folder only in Landmarks Accordion if (mCurrentSelectedList == mLandmarksInventoryPanel) @@ -909,10 +955,6 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const } else return false; } - else if("paste" == command_name || "rename" == command_name || "cut" == command_name || "delete" == command_name) - { - return canSelectedBeModified(command_name); - } else if("create_pick" == command_name) { std::set<LLUUID> selection; @@ -970,6 +1012,9 @@ bool LLLandmarksPanel::canSelectedBeModified(const std::string& command_name) co { // validate own rules first + LLFolderViewItem* selected = getCurSelectedItem(); + if (!selected) return false; + // nothing can be modified in Library if (mLibraryInventoryPanel == mCurrentSelectedList) return false; @@ -996,24 +1041,41 @@ bool LLLandmarksPanel::canSelectedBeModified(const std::string& command_name) co } // then ask LLFolderView permissions + + LLFolderView* root_folder = mCurrentSelectedList->getRootFolder(); + + if ("copy" == command_name) + { + return root_folder->canCopy(); + } + else if ("collapse" == command_name) + { + return selected->isOpen(); + } + else if ("expand" == command_name) + { + return !selected->isOpen(); + } + if (can_be_modified) { - LLFolderViewItem* selected = getCurSelectedItem(); + LLFolderViewEventListener* listenerp = selected->getListener(); + if ("cut" == command_name) { - can_be_modified = mCurrentSelectedList->getRootFolder()->canCut(); + can_be_modified = root_folder->canCut(); } else if ("rename" == command_name) { - can_be_modified = selected ? selected->getListener()->isItemRenameable() : false; + can_be_modified = listenerp ? listenerp->isItemRenameable() : false; } else if ("delete" == command_name) { - can_be_modified = selected ? selected->getListener()->isItemRemovable(): false; + can_be_modified = listenerp ? listenerp->isItemRemovable() : false; } else if("paste" == command_name) { - return mCurrentSelectedList->getRootFolder()->canPaste(); + can_be_modified = root_folder->canPaste(); } else { @@ -1197,4 +1259,54 @@ static bool category_has_descendents(LLPlacesInventoryPanel* inventory_list) return false; } + +static void collapse_all_folders(LLFolderView* root_folder) +{ + if (!root_folder) + return; + + root_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN); + + // The top level folder is invisible, it must be open to + // display its sub-folders. + root_folder->openTopLevelFolders(); + root_folder->arrangeAll(); +} + +static void expand_all_folders(LLFolderView* root_folder) +{ + if (!root_folder) + return; + + root_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN); + root_folder->arrangeAll(); +} + +static bool has_expanded_folders(LLFolderView* root_folder) +{ + LLCheckFolderState checker; + root_folder->applyFunctorRecursively(checker); + + // We assume that the root folder is always expanded so we enable "collapse_all" + // command when we have at least one more expanded folder. + if (checker.getExpandedFolders() < 2) + { + return false; + } + + return true; +} + +static bool has_collapsed_folders(LLFolderView* root_folder) +{ + LLCheckFolderState checker; + root_folder->applyFunctorRecursively(checker); + + if (checker.getCollapsedFolders() < 1) + { + return false; + } + + return true; +} // EOF diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 6358bd6f23..f1ce1a18b5 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -155,14 +155,14 @@ private: void doCreatePick(LLLandmark* landmark); private: - LLPlacesInventoryPanel* mFavoritesInventoryPanel; - LLPlacesInventoryPanel* mLandmarksInventoryPanel; - LLPlacesInventoryPanel* mMyInventoryPanel; - LLPlacesInventoryPanel* mLibraryInventoryPanel; + LLPlacesInventoryPanel* mFavoritesInventoryPanel; + LLPlacesInventoryPanel* mLandmarksInventoryPanel; + LLPlacesInventoryPanel* mMyInventoryPanel; + LLPlacesInventoryPanel* mLibraryInventoryPanel; LLMenuGL* mGearLandmarkMenu; LLMenuGL* mGearFolderMenu; LLMenuGL* mMenuAdd; - LLPlacesInventoryPanel* mCurrentSelectedList; + LLPlacesInventoryPanel* mCurrentSelectedList; LLInventoryObserver* mInventoryObserver; LLPanel* mListCommands; diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 43f4024bac..7bd03167fd 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -232,6 +232,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, if(sim_string.empty()) { LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); + sim_string = LLURLSimString::sInstance.mSimString; } if (!sim_string.empty()) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 1895993a8e..421c9df9a1 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -117,7 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory() // Controls // *TODO: Just use persistant settings for each of these - U32 sort_order = gSavedSettings.getU32("InventorySortOrder"); + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER); BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE ); BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME ); BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP ); @@ -145,7 +145,7 @@ BOOL LLPanelMainInventory::postBuild() if (mActivePanel) { // "All Items" is the previous only view, so it gets the InventorySortOrder - mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder")); + mActivePanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER)); mActivePanel->getFilter()->markDefault(); mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState); mActivePanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mActivePanel, _1, _2)); @@ -420,10 +420,8 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string ) gInventory.startBackgroundFetch(); - std::string uppercase_search_string = search_string; - LLStringUtil::toUpper(uppercase_search_string); - mFilterSubString = uppercase_search_string; - if (mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty()) + mFilterSubString = search_string; + if (mActivePanel->getFilterSubString().empty() && mFilterSubString.empty()) { // current filter and new filter empty, do nothing return; @@ -437,7 +435,7 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string ) } // set new filter string - mActivePanel->setFilterSubString(mFilterSubString); + setFilterSubString(mFilterSubString); } @@ -1003,7 +1001,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) } const LLUUID item_id = current_item->getListener()->getUUID(); LLViewerInventoryItem *item = gInventory.getItem(item_id); - item->regenerateLink(); + if (item) + { + item->regenerateLink(); + } active_panel->setSelection(item_id, TAKE_FOCUS_NO); } if (command_name == "find_original") diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index 64a265219b..f601a8d51c 100644 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -206,7 +206,7 @@ void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable) { LLPanelMediaSettingsGeneral *self =(LLPanelMediaSettingsGeneral *)userdata; self->mAutoLoop->clear(); - self->mAutoPlay->setValue(LLSD(TRUE)); // set default value for auto play to true; + self->mAutoPlay->clear(); self->mAutoScale->clear(); self->mAutoZoom ->clear(); self->mCurrentURL->clear(); diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp new file mode 100644 index 0000000000..4f2d6374ca --- /dev/null +++ b/indra/newview/llpanelnearbymedia.cpp @@ -0,0 +1,1222 @@ +/** + * @file llpanelnearbymedia.cpp + * @brief Management interface for muting and controlling nearby media + * + * $LicenseInfo:firstyear=2005&license=viewergpl$ + * + * Copyright (c) 2005-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llpanelnearbymedia.h" + +#include "llaudioengine.h" +#include "llcheckboxctrl.h" +#include "llcombobox.h" +#include "llresizebar.h" +#include "llresizehandle.h" +#include "llscrolllistctrl.h" +#include "llscrolllistitem.h" +#include "llscrolllistcell.h" +#include "llslider.h" +#include "llsliderctrl.h" +#include "llagent.h" +#include "llagentui.h" +#include "llbutton.h" +#include "lltextbox.h" +#include "llviewermedia.h" +#include "llviewerparcelmedia.h" +#include "llviewerregion.h" +#include "llviewermediafocus.h" +#include "llviewerparcelmgr.h" +#include "llparcel.h" +#include "llpluginclassmedia.h" +#include "llvovolume.h" +#include "llstatusbar.h" +#include "llsdutil.h" + +#include "llfloaterreg.h" +#include "llfloaterpreference.h" // for the gear icon +#include "lltabcontainer.h" + +#include <stringize.h> + +extern LLControlGroup gSavedSettings; + +static const LLUUID PARCEL_MEDIA_LIST_ITEM_UUID = LLUUID("CAB5920F-E484-4233-8621-384CF373A321"); +static const LLUUID PARCEL_AUDIO_LIST_ITEM_UUID = LLUUID("DF4B020D-8A24-4B95-AB5D-CA970D694822"); + +// +// LLPanelNearByMedia +// + +LLPanelNearByMedia::LLPanelNearByMedia() +: mMediaList(NULL), + mEnableAllCtrl(NULL), + mAllMediaDisabled(false), + mDebugInfoVisible(false), + mParcelMediaItem(NULL), + mParcelAudioItem(NULL) +{ + mHoverTimer.stop(); + + mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) && + gSavedSettings.getBOOL("MediaTentativeAutoPlay"); + + mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll", boost::bind(&LLPanelNearByMedia::onClickEnableAll, this)); + mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll", boost::bind(&LLPanelNearByMedia::onClickDisableAll, this)); + mCommitCallbackRegistrar.add("MediaListCtrl.GoMediaPrefs", boost::bind(&LLPanelNearByMedia::onAdvancedButtonClick, this)); + mCommitCallbackRegistrar.add("MediaListCtrl.MoreLess", boost::bind(&LLPanelNearByMedia::onMoreLess, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Stop", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaStop, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Play", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaPlay, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Pause", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaPause, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Mute", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaMute, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Volume", boost::bind(&LLPanelNearByMedia::onCommitSelectedMediaVolume, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Zoom", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaZoom, this)); + mCommitCallbackRegistrar.add("SelectedMediaCtrl.Unzoom", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaUnzoom, this)); + + LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml"); +} + +LLPanelNearByMedia::~LLPanelNearByMedia() +{ +} + +BOOL LLPanelNearByMedia::postBuild() +{ + LLPanel::postBuild(); + + const S32 RESIZE_BAR_THICKNESS = 6; + LLResizeBar::Params p; + p.rect = LLRect(0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0); + p.name = "resizebar_bottom"; + p.min_size = getRect().getHeight(); + p.side = LLResizeBar::BOTTOM; + p.resizing_view = this; + addChild( LLUICtrlFactory::create<LLResizeBar>(p) ); + + p.rect = LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0); + p.name = "resizebar_left"; + p.min_size = getRect().getWidth(); + p.side = LLResizeBar::LEFT; + addChild( LLUICtrlFactory::create<LLResizeBar>(p) ); + + LLResizeHandle::Params resize_handle_p; + resize_handle_p.rect = LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ); + resize_handle_p.mouse_opaque(false); + resize_handle_p.min_width(getRect().getWidth()); + resize_handle_p.min_height(getRect().getHeight()); + resize_handle_p.corner(LLResizeHandle::LEFT_BOTTOM); + addChild(LLUICtrlFactory::create<LLResizeHandle>(resize_handle_p)); + + mNearbyMediaPanel = getChild<LLUICtrl>("nearby_media_panel"); + mMediaList = getChild<LLScrollListCtrl>("media_list"); + mEnableAllCtrl = getChild<LLUICtrl>("all_nearby_media_enable_btn"); + mDisableAllCtrl = getChild<LLUICtrl>("all_nearby_media_disable_btn"); + mShowCtrl = getChild<LLComboBox>("show_combo"); + + // Dynamic (selection-dependent) controls + mStopCtrl = getChild<LLUICtrl>("stop"); + mPlayCtrl = getChild<LLUICtrl>("play"); + mPauseCtrl = getChild<LLUICtrl>("pause"); + mMuteCtrl = getChild<LLUICtrl>("mute"); + mVolumeSliderCtrl = getChild<LLUICtrl>("volume_slider_ctrl"); + mZoomCtrl = getChild<LLUICtrl>("zoom"); + mUnzoomCtrl = getChild<LLUICtrl>("unzoom"); + mVolumeSlider = getChild<LLSlider>("volume_slider"); + mMuteBtn = getChild<LLButton>("mute_btn"); + + mEmptyNameString = getString("empty_item_text"); + mParcelMediaName = getString("parcel_media_name"); + mParcelAudioName = getString("parcel_audio_name"); + mPlayingString = getString("playing_suffix"); + + mMediaList->setDoubleClickCallback(onZoomMedia, this); + mMediaList->sortByColumnIndex(PROXIMITY_COLUMN, TRUE); + mMediaList->sortByColumnIndex(VISIBILITY_COLUMN, FALSE); + + refreshList(); + updateControls(); + updateColumns(); + + LLView* minimized_controls = getChildView("minimized_controls"); + mMoreRect = getRect(); + mLessRect = getRect(); + mLessRect.mBottom = minimized_controls->getRect().mBottom; + + getChild<LLUICtrl>("more_less_btn")->setValue(false); + onMoreLess(); + + return TRUE; +} + +/*virtual*/ +void LLPanelNearByMedia::onMouseEnter(S32 x, S32 y, MASK mask) +{ + mHoverTimer.stop(); + LLPanel::onMouseEnter(x,y,mask); +} + + +/*virtual*/ +void LLPanelNearByMedia::onMouseLeave(S32 x, S32 y, MASK mask) +{ + mHoverTimer.start(); + LLPanel::onMouseLeave(x,y,mask); +} + +/*virtual*/ +void LLPanelNearByMedia::onTopLost() +{ + setVisible(FALSE); +} + + +/*virtual*/ +void LLPanelNearByMedia::handleVisibilityChange ( BOOL new_visibility ) +{ + if (new_visibility) + { + mHoverTimer.start(); // timer will be stopped when mouse hovers over panel + } + else + { + mHoverTimer.stop(); + } +} + +/*virtual*/ +void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent) +{ + LLPanel::reshape(width, height, called_from_parent); + + LLButton* more_less_btn = getChild<LLButton>("more_less_btn"); + if (more_less_btn->getValue().asBoolean()) + { + mMoreRect = getRect(); + } + +} + +const F32 AUTO_CLOSE_FADE_TIME_START= 4.0f; +const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f; + +/*virtual*/ +void LLPanelNearByMedia::draw() +{ + // keep bottom of panel on screen + LLRect screen_rect = calcScreenRect(); + if (screen_rect.mBottom < 0) + { + LLRect new_rect = getRect(); + new_rect.mBottom += 0 - screen_rect.mBottom; + setShape(new_rect); + } + + refreshList(); + updateControls(); + + F32 alpha = mHoverTimer.getStarted() + ? clamp_rescale(mHoverTimer.getElapsedTimeF32(), AUTO_CLOSE_FADE_TIME_START, AUTO_CLOSE_FADE_TIME_END, 1.f, 0.f) + : 1.0f; + LLViewDrawContext context(alpha); + + LLPanel::draw(); + + if (alpha == 0.f) + { + setVisible(false); + } +} + +/*virtual*/ +BOOL LLPanelNearByMedia::handleHover(S32 x, S32 y, MASK mask) +{ + LLPanel::handleHover(x, y, mask); + + // If we are hovering over this panel, make sure to clear any hovered media + // ID. Note that the more general solution would be to clear this ID when + // the mouse leaves the in-scene view, but that proved to be problematic. + // See EXT-5517 + LLViewerMediaFocus::getInstance()->clearHover(); + + // Always handle + return true; +} + +bool LLPanelNearByMedia::getParcelAudioAutoStart() +{ + return mParcelAudioAutoStart; +} + +LLScrollListItem* LLPanelNearByMedia::addListItem(const LLUUID &id) +{ + if (NULL == mMediaList) return NULL; + + // Just set up the columns -- the values will be filled in by updateListItem(). + + LLSD row; + row["id"] = id; + + LLSD &columns = row["columns"]; + + columns[CHECKBOX_COLUMN]["column"] = "media_checkbox_ctrl"; + columns[CHECKBOX_COLUMN]["type"] = "checkbox"; + //if(mDebugInfoVisible) + { + columns[PROXIMITY_COLUMN]["column"] = "media_proximity"; + columns[PROXIMITY_COLUMN]["value"] = ""; + columns[VISIBILITY_COLUMN]["column"] = "media_visibility"; + columns[VISIBILITY_COLUMN]["value"] = ""; + columns[CLASS_COLUMN]["column"] = "media_class"; + columns[CLASS_COLUMN]["type"] = "text"; + columns[CLASS_COLUMN]["value"] = ""; + } + columns[NAME_COLUMN]["column"] = "media_name"; + columns[NAME_COLUMN]["type"] = "text"; + columns[NAME_COLUMN]["value"] = ""; + //if(mDebugInfoVisible) + { + columns[DEBUG_COLUMN]["column"] = "media_debug"; + columns[DEBUG_COLUMN]["type"] = "text"; + columns[DEBUG_COLUMN]["value"] = ""; + } + + LLScrollListItem* new_item = mMediaList->addElement(row); + if (NULL != new_item) + { + LLScrollListCheck* scroll_list_check = dynamic_cast<LLScrollListCheck*>(new_item->getColumn(CHECKBOX_COLUMN)); + if (scroll_list_check) + { + LLCheckBoxCtrl *check = scroll_list_check->getCheckBox(); + check->setCommitCallback(boost::bind(&LLPanelNearByMedia::onCheckItem, this, _1, id)); + } + } + return new_item; +} + +void LLPanelNearByMedia::updateListItem(LLScrollListItem* item, LLViewerMediaImpl* impl) +{ + std::string item_name; + std::string item_tooltip; + std::string debug_str; + LLPanelNearByMedia::MediaClass media_class = MEDIA_CLASS_ALL; + + getNameAndUrlHelper(impl, item_name, item_tooltip, mEmptyNameString); + // Focused + if (impl->hasFocus()) + { + media_class = MEDIA_CLASS_FOCUSED; + } + // Is attached to another avatar? + else if (impl->isAttachedToAnotherAvatar()) + { + media_class = MEDIA_CLASS_ON_OTHERS; + } + // Outside agent parcel + else if (!impl->isInAgentParcel()) + { + media_class = MEDIA_CLASS_OUTSIDE_PARCEL; + } + else { + // inside parcel + media_class = MEDIA_CLASS_WITHIN_PARCEL; + } + + if(mDebugInfoVisible) + { + debug_str += llformat("%g/", (float)impl->getInterest()); + + // proximity distance is actually distance squared -- display it as straight distance. + debug_str += llformat("%g/", fsqrtf(impl->getProximityDistance())); + + // s += llformat("%g/", (float)impl->getCPUUsage()); + // s += llformat("%g/", (float)impl->getApproximateTextureInterest()); + debug_str += llformat("%g/", (float)(NULL == impl->getSomeObject()) ? 0.0 : impl->getSomeObject()->getPixelArea()); + + debug_str += LLPluginClassMedia::priorityToString(impl->getPriority()); + + if(impl->hasMedia()) + { + debug_str += '@'; + } + else if(impl->isPlayable()) + { + debug_str += '+'; + } + else if(impl->isForcedUnloaded()) + { + debug_str += '!'; + } + } + + updateListItem(item, + item_name, + item_tooltip, + impl->getProximity(), + impl->isMediaDisabled(), + impl->hasMedia(), + impl->isMediaTimeBased() && impl->isMediaPlaying(), + media_class, + debug_str); +} + +void LLPanelNearByMedia::updateListItem(LLScrollListItem* item, + const std::string &item_name, + const std::string &item_tooltip, + S32 proximity, + bool is_disabled, + bool has_media, + bool is_time_based_and_playing, + LLPanelNearByMedia::MediaClass media_class, + const std::string &debug_str) +{ + LLScrollListCell* cell = item->getColumn(PROXIMITY_COLUMN); + if(cell) + { + // since we are forced to sort by text, encode sort order as string + std::string proximity_string = STRINGIZE(proximity); + std::string old_proximity_string = cell->getValue().asString(); + if(proximity_string != old_proximity_string) + { + cell->setValue(proximity_string); + mMediaList->setNeedsSort(true); + } + } + + cell = item->getColumn(CHECKBOX_COLUMN); + if(cell) + { + cell->setValue(!is_disabled); + } + + cell = item->getColumn(VISIBILITY_COLUMN); + if(cell) + { + S32 old_visibility = cell->getValue(); + // *HACK ALERT: force ordering of Media before Audio before the rest of the list + S32 new_visibility = + item->getUUID() == PARCEL_MEDIA_LIST_ITEM_UUID ? 3 + : item->getUUID() == PARCEL_AUDIO_LIST_ITEM_UUID ? 2 + : (has_media) ? 1 + : ((is_disabled) ? 0 + : -1); + cell->setValue(STRINGIZE(new_visibility)); + if (new_visibility != old_visibility) + { + mMediaList->setNeedsSort(true); + } + } + + cell = item->getColumn(NAME_COLUMN); + if(cell) + { + std::string name = item_name; + std::string old_name = cell->getValue().asString(); + if (has_media) + { + name += " " + mPlayingString; + } + if (name != old_name) + { + cell->setValue(name); + } + cell->setToolTip(item_tooltip); + + // *TODO: Make these font styles/colors configurable via XUI + U8 font_style = LLFontGL::NORMAL; + LLColor4 cell_color = LLColor4::white; + + // Only colorize by class in debug + if (mDebugInfoVisible) + { + switch (media_class) { + case MEDIA_CLASS_FOCUSED: + cell_color = LLColor4::yellow; + break; + case MEDIA_CLASS_ON_OTHERS: + cell_color = LLColor4::red; + break; + case MEDIA_CLASS_OUTSIDE_PARCEL: + cell_color = LLColor4::orange; + break; + case MEDIA_CLASS_WITHIN_PARCEL: + default: + break; + } + } + if (is_disabled) + { + if (mDebugInfoVisible) + { + font_style |= LLFontGL::ITALIC; + cell_color = LLColor4::black; + } + else { + // Dim it if it is disabled + cell_color.setAlpha(0.25); + } + } + // Dim it if it isn't "showing" + else if (!has_media) + { + cell_color.setAlpha(0.25); + } + // Bold it if it is time-based media and it is playing + else if (is_time_based_and_playing) + { + if (mDebugInfoVisible) font_style |= LLFontGL::BOLD; + } + cell->setColor(cell_color); + LLScrollListText *text_cell = dynamic_cast<LLScrollListText*> (cell); + if (text_cell) + { + text_cell->setFontStyle(font_style); + } + } + + cell = item->getColumn(CLASS_COLUMN); + if(cell) + { + // TODO: clean this up! + cell->setValue(STRINGIZE(media_class)); + } + + if(mDebugInfoVisible) + { + cell = item->getColumn(DEBUG_COLUMN); + if(cell) + { + cell->setValue(debug_str); + } + } +} + +void LLPanelNearByMedia::removeListItem(const LLUUID &id) +{ + if (NULL == mMediaList) return; + + mMediaList->deleteSingleItem(mMediaList->getItemIndex(id)); +} + +void LLPanelNearByMedia::refreshParcelItems() +{ + // + // First add/remove the "fake" items Parcel Media and Parcel Audio. + // These items will have special UUIDs + // PARCEL_MEDIA_LIST_ITEM_UUID + // PARCEL_AUDIO_LIST_ITEM_UUID + // + // Get the filter choice. + const LLSD &choice_llsd = mShowCtrl->getSelectedValue(); + MediaClass choice = (MediaClass)choice_llsd.asInteger(); + // Only show "special parcel items" if "All" or "Within" filter + // (and if media is "enabled") + bool should_include = (choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL); + + // First Parcel Media: add or remove it as necessary + if (gSavedSettings.getBOOL("AudioStreamingMedia") &&should_include && LLViewerMedia::hasParcelMedia()) + { + // Yes, there is parcel media. + if (NULL == mParcelMediaItem) + { + mParcelMediaItem = addListItem(PARCEL_MEDIA_LIST_ITEM_UUID); + mMediaList->setNeedsSort(true); + } + } + else { + if (NULL != mParcelMediaItem) { + removeListItem(PARCEL_MEDIA_LIST_ITEM_UUID); + mParcelMediaItem = NULL; + mMediaList->setNeedsSort(true); + } + } + + // ... then update it + if (NULL != mParcelMediaItem) + { + std::string name, url, tooltip; + if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia()) + { + getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); + if (name.empty() || name == url) + { + tooltip = url; + } + else { + tooltip = name + " : " + url; + } + } + LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia(); + updateListItem(mParcelMediaItem, + mParcelMediaName, + tooltip, + -2, // Proximity closer than anything else, before Parcel Audio + impl == NULL || impl->isMediaDisabled(), + impl != NULL && !LLViewerParcelMedia::getURL().empty(), + impl != NULL && impl->isMediaTimeBased() && impl->isMediaPlaying(), + MEDIA_CLASS_ALL, + "parcel media"); + } + + // Next Parcel Audio: add or remove it as necessary (don't show if disabled in prefs) + if (should_include && LLViewerMedia::hasParcelAudio() && gSavedSettings.getBOOL("AudioStreamingMusic")) + { + // Yes, there is parcel audio. + if (NULL == mParcelAudioItem) + { + mParcelAudioItem = addListItem(PARCEL_AUDIO_LIST_ITEM_UUID); + mMediaList->setNeedsSort(true); + } + } + else { + if (NULL != mParcelAudioItem) { + removeListItem(PARCEL_AUDIO_LIST_ITEM_UUID); + mParcelAudioItem = NULL; + mMediaList->setNeedsSort(true); + } + } + + // ... then update it + if (NULL != mParcelAudioItem) + { + bool is_playing = LLViewerMedia::isParcelAudioPlaying(); + + std::string url; + if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic()) + { + url = LLViewerMedia::getParcelAudioURL(); + } + updateListItem(mParcelAudioItem, + mParcelAudioName, + url, + -1, // Proximity after Parcel Media, but closer than anything else + (!is_playing), + is_playing, + is_playing, + MEDIA_CLASS_ALL, + "parcel audio"); + } +} + +void LLPanelNearByMedia::refreshList() +{ + bool all_items_deleted = false; + + if(!mMediaList) + { + // None of this makes any sense if the media list isn't there. + return; + } + + // Check whether the debug column has been shown/hidden. + bool debug_info_visible = gSavedSettings.getBOOL("MediaPerformanceManagerDebug"); + if(debug_info_visible != mDebugInfoVisible) + { + mDebugInfoVisible = debug_info_visible; + + // Clear all items so the list gets regenerated. + mMediaList->deleteAllItems(); + mParcelAudioItem = NULL; + mParcelMediaItem = NULL; + all_items_deleted = true; + + updateColumns(); + } + + refreshParcelItems(); + + // Get the canonical list from LLViewerMedia + LLViewerMedia::impl_list impls = LLViewerMedia::getPriorityList(); + LLViewerMedia::impl_list::iterator priority_iter; + + U32 enabled_count = 0; + U32 disabled_count = 0; + + // iterate over the impl list, creating rows as necessary. + for(priority_iter = impls.begin(); priority_iter != impls.end(); priority_iter++) + { + LLViewerMediaImpl *impl = *priority_iter; + + // If we just emptied out the list, every flag needs to be reset. + if(all_items_deleted) + { + impl->setInNearbyMediaList(false); + } + + if (!impl->isParcelMedia()) + { + LLUUID media_id = impl->getMediaTextureID(); + S32 proximity = impl->getProximity(); + // This is expensive (i.e. a linear search) -- don't use it here. We now use mInNearbyMediaList instead. + //S32 index = mMediaList->getItemIndex(media_id); + if (proximity < 0 || !shouldShow(impl)) + { + if (impl->getInNearbyMediaList()) + { + // There's a row for this impl -- remove it. + removeListItem(media_id); + impl->setInNearbyMediaList(false); + } + } + else + { + if (!impl->getInNearbyMediaList()) + { + // We don't have a row for this impl -- add one. + addListItem(media_id); + impl->setInNearbyMediaList(true); + } + } + // Update counts + if (impl->isMediaDisabled()) + { + disabled_count++; + } + else { + enabled_count++; + } + } + } + mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") || + gSavedSettings.getBOOL("AudioStreamingMedia")) && + (LLViewerMedia::isAnyMediaShowing() || + LLViewerMedia::isParcelMediaPlaying() || + LLViewerMedia::isParcelAudioPlaying())); + + mEnableAllCtrl->setEnabled( (gSavedSettings.getBOOL("AudioStreamingMusic") || + gSavedSettings.getBOOL("AudioStreamingMedia")) && + (disabled_count > 0 || + // parcel media (if we have it, and it isn't playing, enable "start") + (LLViewerMedia::hasParcelMedia() && ! LLViewerMedia::isParcelMediaPlaying()) || + // parcel audio (if we have it, and it isn't playing, enable "start") + (LLViewerMedia::hasParcelAudio() && ! LLViewerMedia::isParcelAudioPlaying()))); + + // Iterate over the rows in the control, updating ones whose impl exists, and deleting ones whose impl has gone away. + std::vector<LLScrollListItem*> items = mMediaList->getAllData(); + + for (std::vector<LLScrollListItem*>::iterator item_it = items.begin(); + item_it != items.end(); + ++item_it) + { + LLScrollListItem* item = (*item_it); + LLUUID row_id = item->getUUID(); + + if (row_id != PARCEL_MEDIA_LIST_ITEM_UUID && + row_id != PARCEL_AUDIO_LIST_ITEM_UUID) + { + LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id); + if(impl) + { + updateListItem(item, impl); + } + else + { + // This item's impl has been deleted -- remove the row. + // Removing the row won't throw off our iteration, since we have a local copy of the array. + // We just need to make sure we don't access this item after the delete. + removeListItem(row_id); + } + } + } + + // Set the selection to whatever media impl the media focus/hover is on. + // This is an experiment, and can be removed by ifdefing out these 4 lines. + LLUUID media_target = LLViewerMediaFocus::getInstance()->getControlsMediaID(); + if(media_target.notNull()) + { + mMediaList->selectByID(media_target); + } +} + +void LLPanelNearByMedia::updateColumns() +{ + if (!mDebugInfoVisible) + { + if (mMediaList->getColumn(CHECKBOX_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(-1); + if (mMediaList->getColumn(VISIBILITY_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(-1); + if (mMediaList->getColumn(PROXIMITY_COLUMN)) mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(-1); + if (mMediaList->getColumn(CLASS_COLUMN)) mMediaList->getColumn(CLASS_COLUMN)->setWidth(-1); + if (mMediaList->getColumn(DEBUG_COLUMN)) mMediaList->getColumn(DEBUG_COLUMN)->setWidth(-1); + } + else { + if (mMediaList->getColumn(CHECKBOX_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(20); + if (mMediaList->getColumn(VISIBILITY_COLUMN)) mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(20); + if (mMediaList->getColumn(PROXIMITY_COLUMN)) mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(30); + if (mMediaList->getColumn(CLASS_COLUMN)) mMediaList->getColumn(CLASS_COLUMN)->setWidth(20); + if (mMediaList->getColumn(DEBUG_COLUMN)) mMediaList->getColumn(DEBUG_COLUMN)->setWidth(200); + } +} + +void LLPanelNearByMedia::onClickEnableAll() +{ + LLViewerMedia::setAllMediaEnabled(true); +} + +void LLPanelNearByMedia::onClickDisableAll() +{ + LLViewerMedia::setAllMediaEnabled(false); +} + +void LLPanelNearByMedia::onClickEnableParcelMedia() +{ + if ( ! LLViewerMedia::isParcelMediaPlaying() ) + { + LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel()); + } +} + +void LLPanelNearByMedia::onClickDisableParcelMedia() +{ + // This actually unloads the impl, as opposed to "stop"ping the media + LLViewerParcelMedia::stop(); +} + +void LLPanelNearByMedia::onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id) +{ + LLCheckBoxCtrl* check = static_cast<LLCheckBoxCtrl*>(ctrl); + + setDisabled(row_id, ! check->getValue()); +} + +bool LLPanelNearByMedia::setDisabled(const LLUUID &row_id, bool disabled) +{ + if (row_id == PARCEL_AUDIO_LIST_ITEM_UUID) + { + if (disabled) onClickParcelAudioStop(); + else onClickParcelAudioStart(); + return true; + } + else if (row_id == PARCEL_MEDIA_LIST_ITEM_UUID) + { + if (disabled) onClickDisableParcelMedia(); + else onClickEnableParcelMedia(); + return true; + } + else { + LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id); + if(impl) + { + impl->setDisabled(disabled, true); + return true; + } + } + return false; +} + +//static +void LLPanelNearByMedia::onZoomMedia(void* user_data) +{ + LLPanelNearByMedia* panelp = (LLPanelNearByMedia*)user_data; + LLUUID media_id = panelp->mMediaList->getValue().asUUID(); + + LLViewerMediaFocus::getInstance()->focusZoomOnMedia(media_id); +} + +void LLPanelNearByMedia::onClickParcelMediaPlay() +{ + LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel()); +} + +void LLPanelNearByMedia::onClickParcelMediaStop() +{ + if (LLViewerParcelMedia::getParcelMedia()) + { + // This stops the media playing, as opposed to unloading it like + // LLViewerParcelMedia::stop() does + LLViewerParcelMedia::getParcelMedia()->stop(); + } +} + +void LLPanelNearByMedia::onClickParcelMediaPause() +{ + LLViewerParcelMedia::pause(); +} + +void LLPanelNearByMedia::onClickParcelAudioStart() +{ + // User *explicitly* started the internet stream, so keep the stream + // playing and updated as they cross to other parcels etc. + mParcelAudioAutoStart = true; + + if (!gAudiop) + return; + + gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL()); +} + +void LLPanelNearByMedia::onClickParcelAudioPlay() +{ + // User *explicitly* started the internet stream, so keep the stream + // playing and updated as they cross to other parcels etc. + mParcelAudioAutoStart = true; + + if (!gAudiop) + return; + + if (LLAudioEngine::AUDIO_PAUSED == gAudiop->isInternetStreamPlaying()) + { + // 'false' means unpause + gAudiop->pauseInternetStream(false); + } + else { + gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL()); + } +} + +void LLPanelNearByMedia::onClickParcelAudioStop() +{ + // User *explicitly* stopped the internet stream, so don't + // re-start audio when i.e. they move to another parcel, until + // they explicitly start it again. + mParcelAudioAutoStart = false; + + if (!gAudiop) + return; + + gAudiop->stopInternetStream(); +} + +void LLPanelNearByMedia::onClickParcelAudioPause() +{ + if (!gAudiop) + return; + + // 'true' means pause + gAudiop->pauseInternetStream(true); +} + +bool LLPanelNearByMedia::shouldShow(LLViewerMediaImpl* impl) +{ + const LLSD &choice_llsd = mShowCtrl->getSelectedValue(); + MediaClass choice = (MediaClass)choice_llsd.asInteger(); + + switch (choice) + { + case MEDIA_CLASS_ALL: + return true; + break; + case MEDIA_CLASS_WITHIN_PARCEL: + return impl->isInAgentParcel(); + break; + case MEDIA_CLASS_OUTSIDE_PARCEL: + return ! impl->isInAgentParcel(); + break; + case MEDIA_CLASS_ON_OTHERS: + return impl->isAttachedToAnotherAvatar(); + break; + default: + break; + } + return true; +} + +void LLPanelNearByMedia::onAdvancedButtonClick() +{ + // bring up the prefs floater + LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>(LLFloaterReg::showInstance("preferences")); + if (prefsfloater) + { + // grab the 'audio' panel from the preferences floater and + // bring it the front! + LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core"); + LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio"); + if (tabcontainer && audiopanel) + { + tabcontainer->selectTabPanel(audiopanel); + } + } +} + +void LLPanelNearByMedia::onMoreLess() +{ + bool is_more = getChild<LLUICtrl>("more_less_btn")->getValue(); + mNearbyMediaPanel->setVisible(is_more); + + // enable resizing when expanded + getChildView("resizebar_bottom")->setEnabled(is_more); + + LLRect new_rect = is_more ? mMoreRect : mLessRect; + new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop); + + setShape(new_rect); +} + +void LLPanelNearByMedia::updateControls() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + + if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID) + { + if (!LLViewerMedia::hasParcelAudio() || !gSavedSettings.getBOOL("AudioStreamingMusic")) + { + // disable controls if audio streaming music is disabled from preference + showDisabledControls(); + } + else { + showTimeBasedControls(LLViewerMedia::isParcelAudioPlaying(), + false, // include_zoom + false, // is_zoomed + gSavedSettings.getBOOL("MuteMusic"), + gSavedSettings.getF32("AudioLevelMusic") ); + } + } + else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) + { + if (!LLViewerMedia::hasParcelMedia() || !gSavedSettings.getBOOL("AudioStreamingMedia")) + { + // disable controls if audio streaming media is disabled from preference + showDisabledControls(); + } + else { + LLViewerMediaImpl* impl = LLViewerParcelMedia::getParcelMedia(); + if (NULL == impl) + { + // Just means it hasn't started yet + showBasicControls(false, false, false); + } + else if (impl->isMediaTimeBased()) + { + showTimeBasedControls(impl->isMediaPlaying(), + false, // include_zoom + false, // is_zoomed + impl->getVolume() == 0.0, + impl->getVolume() ); + } + else { + // non-time-based parcel media + showBasicControls(LLViewerMedia::isParcelMediaPlaying(), false, false); + } + } + } + else { + LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id); + + if (NULL == impl || !gSavedSettings.getBOOL("AudioStreamingMedia")) + { + showDisabledControls(); + } + else { + if (impl->isMediaTimeBased()) + { + showTimeBasedControls(impl->isMediaPlaying(), + ! impl->isParcelMedia(), // include_zoom + LLViewerMediaFocus::getInstance()->isZoomed(), + impl->getVolume() == 0.0, + impl->getVolume()); + } + else { + showBasicControls(!impl->isMediaDisabled(), + ! impl->isParcelMedia(), // include_zoom + LLViewerMediaFocus::getInstance()->isZoomed()); + } + } + } +} + +void LLPanelNearByMedia::showBasicControls(bool playing, bool include_zoom, bool is_zoomed) +{ + mStopCtrl->setVisible(playing); + mPlayCtrl->setVisible(!playing); + mPauseCtrl->setVisible(false); + mMuteCtrl->setVisible(false); + mVolumeSliderCtrl->setVisible(false); + mZoomCtrl->setVisible(include_zoom && !is_zoomed); + mUnzoomCtrl->setVisible(include_zoom && is_zoomed); + mStopCtrl->setEnabled(true); + mZoomCtrl->setEnabled(true); +} + +void LLPanelNearByMedia::showTimeBasedControls(bool playing, bool include_zoom, bool is_zoomed, bool muted, F32 volume) +{ + mStopCtrl->setVisible(true); + mPlayCtrl->setVisible(!playing); + mPauseCtrl->setVisible(playing); + mMuteCtrl->setVisible(true); + mVolumeSliderCtrl->setVisible(true); + mZoomCtrl->setVisible(include_zoom); + mZoomCtrl->setVisible(include_zoom && !is_zoomed); + mUnzoomCtrl->setVisible(include_zoom && is_zoomed); + mStopCtrl->setEnabled(true); + mZoomCtrl->setEnabled(true); + mMuteBtn->setValue(muted); + mVolumeSlider->setValue(volume); +} + +void LLPanelNearByMedia::showDisabledControls() +{ + mStopCtrl->setVisible(true); + mPlayCtrl->setVisible(false); + mPauseCtrl->setVisible(false); + mMuteCtrl->setVisible(false); + mVolumeSliderCtrl->setVisible(false); + mZoomCtrl->setVisible(true); + mUnzoomCtrl->setVisible(false); + mStopCtrl->setEnabled(false); + mZoomCtrl->setEnabled(false); +} + +void LLPanelNearByMedia::onClickSelectedMediaStop() +{ + setDisabled(mMediaList->getValue().asUUID(), true); +} + +void LLPanelNearByMedia::onClickSelectedMediaPlay() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + + // First enable it + setDisabled(selected_media_id, false); + + // Special code to make play "unpause" if time-based and playing + if (selected_media_id != PARCEL_AUDIO_LIST_ITEM_UUID) + { + LLViewerMediaImpl *impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ? + ((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id); + if (NULL != impl) + { + if (impl->isMediaTimeBased() && impl->isMediaPaused()) + { + // Aha! It's really time-based media that's paused, so unpause + impl->play(); + return; + } + else if (impl->isParcelMedia()) + { + LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel()); + } + } + } +} + +void LLPanelNearByMedia::onClickSelectedMediaPause() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID) + { + onClickParcelAudioPause(); + } + else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) + { + onClickParcelMediaPause(); + } + else { + LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id); + if (NULL != impl && impl->isMediaTimeBased() && impl->isMediaPlaying()) + { + impl->pause(); + } + } +} + +void LLPanelNearByMedia::onClickSelectedMediaMute() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID) + { + gSavedSettings.setBOOL("MuteMusic", mMuteBtn->getValue()); + } + else { + LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ? + ((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id); + if (NULL != impl && impl->isMediaTimeBased()) + { + F32 volume = impl->getVolume(); + if(volume > 0.0) + { + impl->setVolume(0.0); + } + else if (mVolumeSlider->getValueF32() == 0.0) + { + impl->setVolume(1.0); + mVolumeSlider->setValue(1.0); + } + else + { + impl->setVolume(mVolumeSlider->getValueF32()); + } + } + } +} + +void LLPanelNearByMedia::onCommitSelectedMediaVolume() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID) + { + F32 vol = mVolumeSlider->getValueF32(); + gSavedSettings.setF32("AudioLevelMusic", vol); + } + else { + LLViewerMediaImpl* impl = (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) ? + ((LLViewerMediaImpl*)LLViewerParcelMedia::getParcelMedia()) : LLViewerMedia::getMediaImplFromTextureID(selected_media_id); + if (NULL != impl && impl->isMediaTimeBased()) + { + impl->setVolume(mVolumeSlider->getValueF32()); + } + } +} + +void LLPanelNearByMedia::onClickSelectedMediaZoom() +{ + LLUUID selected_media_id = mMediaList->getValue().asUUID(); + if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID || selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID) + return; + LLViewerMediaFocus::getInstance()->focusZoomOnMedia(selected_media_id); +} + +void LLPanelNearByMedia::onClickSelectedMediaUnzoom() +{ + LLViewerMediaFocus::getInstance()->unZoom(); +} + + +// static +void LLPanelNearByMedia::getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName) +{ + if (NULL == impl) return; + + name = impl->getName(); + url = impl->getCurrentMediaURL(); // This is the URL the media impl actually has loaded + if (url.empty()) + { + url = impl->getMediaEntryURL(); // This is the current URL from the media data + } + if (url.empty()) + { + url = impl->getHomeURL(); // This is the home URL from the media data + } + if (name.empty()) + { + name = url; + } + if (name.empty()) + { + name = defaultName; + } +} + diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h new file mode 100644 index 0000000000..af4659365f --- /dev/null +++ b/indra/newview/llpanelnearbymedia.h @@ -0,0 +1,185 @@ +/** + * @file llpanelnearbymedia.h + * @brief Management interface for muting and controlling nearby media + * + * $LicenseInfo:firstyear=2005&license=viewergpl$ + * + * Copyright (c) 2005-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#ifndef LL_LLPANELNEARBYMEDIA_H +#define LL_LLPANELNEARBYMEDIA_H + +#include "llpanel.h" + +class LLPanelNearbyMedia; +class LLButton; +class LLScrollListCtrl; +class LLSlider; +class LLSliderCtrl; +class LLCheckBoxCtrl; +class LLTextBox; +class LLComboBox; +class LLViewerMediaImpl; + +class LLPanelNearByMedia : public LLPanel +{ +public: + + /*virtual*/ BOOL postBuild(); + /*virtual*/ void draw(); + /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); + /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); + /*virtual*/ void onTopLost(); + /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); + + // this is part of the nearby media *dialog* so we can track whether + // the user *implicitly* wants audio on or off via their *explicit* + // interaction with our buttons. + bool getParcelAudioAutoStart(); + + LLPanelNearByMedia(); + virtual ~LLPanelNearByMedia(); + +private: + + enum ColumnIndex { + CHECKBOX_COLUMN = 0, + PROXIMITY_COLUMN = 1, + VISIBILITY_COLUMN = 2, + CLASS_COLUMN = 3, + NAME_COLUMN = 4, + DEBUG_COLUMN = 5 + }; + + // Media "class" enumeration + enum MediaClass { + MEDIA_CLASS_ALL = 0, + MEDIA_CLASS_FOCUSED = 1, + MEDIA_CLASS_WITHIN_PARCEL = 2, + MEDIA_CLASS_OUTSIDE_PARCEL = 3, + MEDIA_CLASS_ON_OTHERS = 4 + }; + + // Add/remove an LLViewerMediaImpl to/from the list + LLScrollListItem* addListItem(const LLUUID &id); + void updateListItem(LLScrollListItem* item, LLViewerMediaImpl* impl); + void updateListItem(LLScrollListItem* item, + const std::string &item_name, + const std::string &item_tooltip, + S32 proximity, + bool is_disabled, + bool has_media, + bool is_time_based_and_playing, + MediaClass media_class, + const std::string &debug_str); + void removeListItem(const LLUUID &id); + + // Refresh the list in the UI + void refreshList(); + + void refreshParcelItems(); + + // UI Callbacks + void onClickEnableAll(); + void onClickDisableAll(); + void onClickEnableParcelMedia(); + void onClickDisableParcelMedia(); + void onClickMuteParcelMedia(); + void onParcelMediaVolumeSlider(); + void onClickParcelMediaPlay(); + void onClickParcelMediaStop(); + void onClickParcelMediaPause(); + void onClickParcelAudioPlay(); + void onClickParcelAudioStop(); + void onClickParcelAudioStart(); + void onClickParcelAudioPause(); + void onCheckAutoPlay(); + void onAdvancedButtonClick(); + void onMoreLess(); + + void onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id); + + static void onZoomMedia(void* user_data); + +private: + bool setDisabled(const LLUUID &id, bool disabled); + + static void getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName); + + void updateColumns(); + + bool shouldShow(LLViewerMediaImpl* impl); + + void showBasicControls(bool playing, bool include_zoom, bool is_zoomed); + void showTimeBasedControls(bool playing, bool include_zoom, bool is_zoomed, bool muted, F32 volume); + void showDisabledControls(); + void updateControls(); + + void onClickSelectedMediaStop(); + void onClickSelectedMediaPlay(); + void onClickSelectedMediaPause(); + void onClickSelectedMediaMute(); + void onCommitSelectedMediaVolume(); + void onClickSelectedMediaZoom(); + void onClickSelectedMediaUnzoom(); + + LLUICtrl* mNearbyMediaPanel; + LLScrollListCtrl* mMediaList; + LLUICtrl* mEnableAllCtrl; + LLUICtrl* mDisableAllCtrl; + LLComboBox* mShowCtrl; + + // Dynamic (selection-dependent) controls + LLUICtrl* mStopCtrl; + LLUICtrl* mPlayCtrl; + LLUICtrl* mPauseCtrl; + LLUICtrl* mMuteCtrl; + LLUICtrl* mVolumeSliderCtrl; + LLUICtrl* mZoomCtrl; + LLUICtrl* mUnzoomCtrl; + LLSlider* mVolumeSlider; + LLButton* mMuteBtn; + + bool mAllMediaDisabled; + bool mDebugInfoVisible; + bool mParcelAudioAutoStart; + std::string mEmptyNameString; + std::string mPlayingString; + std::string mParcelMediaName; + std::string mParcelAudioName; + + LLRect mMoreRect; + LLRect mLessRect; + LLFrameTimer mHoverTimer; + LLScrollListItem* mParcelMediaItem; + LLScrollListItem* mParcelAudioItem; +}; + + +#endif // LL_LLPANELNEARBYMEDIA_H diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index e8ae006968..dedd1afcde 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -770,8 +770,8 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); if(object) { - LLInventoryItem* inv = NULL; - if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID))) + const LLInventoryItem *inv = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); + if (inv) { const LLPermissions& perm = inv->getPermissions(); bool can_copy = gAgent.allowOperation(PERM_COPY, perm, @@ -1568,7 +1568,7 @@ void LLPanelObjectInventory::reset() { clearContents(); - setBorderVisible(FALSE); + //setBorderVisible(FALSE); mCommitCallbackRegistrar.pushScope(); // push local callbacks @@ -1583,10 +1583,16 @@ void LLPanelObjectInventory::reset() mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar); + if (hasFocus()) + { + LLEditMenuHandler::gEditMenuHandler = mFolders; + } + LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0); LLScrollContainer::Params scroll_p; scroll_p.name("task inventory scroller"); scroll_p.rect(scroller_rect); + scroll_p.tab_stop(true); scroll_p.follows.flags(FOLLOWS_ALL); mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_p); addChild(mScroller); @@ -1636,7 +1642,7 @@ void LLPanelObjectInventory::updateInventory() // We're still interested in this task's inventory. std::set<LLUUID> selected_items; BOOL inventory_has_focus = FALSE; - if (mHaveInventory && mFolders->getNumSelectedDescendants()) + if (mHaveInventory) { mFolders->getSelectionList(selected_items); inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders); diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 36fab86280..03e8ab644e 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -463,8 +463,10 @@ LLPanelPeople::~LLPanelPeople() delete mFriendListUpdater; delete mRecentListUpdater; - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver(this); + } LLView::deleteViewByHandle(mGroupPlusMenuHandle); LLView::deleteViewByHandle(mNearbyViewSortMenuHandle); @@ -517,6 +519,8 @@ BOOL LLPanelPeople::postBuild() mRecentList->setShowIcons("RecentListShowIcons"); mGroupList = getChild<LLGroupList>("group_list"); + mGroupList->setNoGroupsMsg(getString("no_groups_msg")); + mGroupList->setNoFilteredGroupsMsg(getString("no_filtered_groups_msg")); mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu); mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu); @@ -681,9 +685,15 @@ void LLPanelPeople::updateFriendList() online_friendsp.push_back(buddy_id); } - mOnlineFriendList->setDirty(); - mAllFriendList->setDirty(); - + /* + * Avatarlists will be hidden by showFriendsAccordionsIfNeeded(), if they do not have items. + * But avatarlist can be updated only if it is visible @see LLAvatarList::draw(); + * So we need to do force update of lists to avoid inconsistency of data and view of avatarlist. + */ + mOnlineFriendList->setDirty(true, !mOnlineFriendList->filterHasMatches());// do force update if list do NOT have items + mAllFriendList->setDirty(true, !mAllFriendList->filterHasMatches()); + //update trash and other buttons according to a selected item + updateButtons(); showFriendsAccordionsIfNeeded(); } @@ -1432,9 +1442,6 @@ void LLPanelPeople::onFriendListRefreshComplete(LLUICtrl*ctrl, const LLSD& param { showAccordion("tab_all", param.asInteger()); } - - LLAccordionCtrl* accordion = getChild<LLAccordionCtrl>("friends_accordion"); - accordion->arrange(); } void LLPanelPeople::setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed) diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index 7e184c78a8..854651cd01 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -39,6 +39,7 @@ #include "llpanelpeoplemenus.h" // newview +#include "llagent.h" #include "llagentdata.h" // for gAgentID #include "llavataractions.h" #include "llviewermenu.h" // for gMenuHolder @@ -121,10 +122,11 @@ LLContextMenu* NearbyMenu::createMenu() const LLUUID& id = mUUIDs.front(); registrar.add("Avatar.Profile", boost::bind(&LLAvatarActions::showProfile, id)); registrar.add("Avatar.AddFriend", boost::bind(&LLAvatarActions::requestFriendshipDialog, id)); + registrar.add("Avatar.RemoveFriend", boost::bind(&LLAvatarActions::removeFriendDialog, id)); registrar.add("Avatar.IM", boost::bind(&LLAvatarActions::startIM, id)); registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startCall, id)); registrar.add("Avatar.OfferTeleport", boost::bind(&NearbyMenu::offerTeleport, this)); - registrar.add("Avatar.ShowOnMap", boost::bind(&LLAvatarActions::startIM, id)); // *TODO: unimplemented + registrar.add("Avatar.ShowOnMap", boost::bind(&LLAvatarActions::showOnMap, id)); registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::share, id)); registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id)); registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, id)); @@ -143,6 +145,7 @@ LLContextMenu* NearbyMenu::createMenu() // registrar.add("Avatar.AddFriend", boost::bind(&LLAvatarActions::requestFriendshipDialog, mUUIDs)); // *TODO: unimplemented registrar.add("Avatar.IM", boost::bind(&LLAvatarActions::startConference, mUUIDs)); registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startAdhocCall, mUUIDs)); + registrar.add("Avatar.RemoveFriend",boost::bind(&LLAvatarActions::removeFriendsDialog, mUUIDs)); // registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::startIM, mUUIDs)); // *TODO: unimplemented // registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, mUUIDs)); // *TODO: unimplemented enable_registrar.add("Avatar.EnableItem", boost::bind(&NearbyMenu::enableContextMenuItem, this, _2)); @@ -191,13 +194,38 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata) } else if (item == std::string("can_delete")) { - const LLUUID& id = mUUIDs.front(); - return LLAvatarActions::isFriend(id); + // We can remove friends if: + // - there are selected people + // - and there are only friends among selection. + + bool result = (mUUIDs.size() > 0); + + std::vector<LLUUID>::const_iterator + id = mUUIDs.begin(), + uuids_end = mUUIDs.end(); + + for (;id != uuids_end; ++id) + { + if ( !LLAvatarActions::isFriend(*id) ) + { + result = false; + break; + } + } + + return result; } else if (item == std::string("can_call")) { return LLAvatarActions::canCall(); } + else if (item == std::string("can_show_on_map")) + { + const LLUUID& id = mUUIDs.front(); + + return (LLAvatarTracker::instance().isBuddyOnline(id) && is_agent_mappable(id)) + || gAgent.isGodlike(); + } return false; } diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 8eb0b69491..0a7c39db46 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -140,10 +140,11 @@ public: params["open_tab_name"] = "panel_picks"; params["show_tab_panel"] = "classified_details"; params["classified_id"] = c_info->classified_id; - params["classified_avatar_id"] = c_info->creator_id; + params["classified_creator_id"] = c_info->creator_id; params["classified_snapshot_id"] = c_info->snapshot_id; params["classified_name"] = c_info->name; params["classified_desc"] = c_info->description; + params["from_search"] = true; LLSideTray::getInstance()->showPanel("panel_profile_view", params); } @@ -174,31 +175,6 @@ LLClassifiedHandler gClassifiedHandler; ////////////////////////////////////////////////////////////////////////// -/** - * Copy&Pasted from old LLPanelClassified. This class does nothing at the moment. - * Subscribing to "classifiedclickthrough" removes a few warnings. - */ -class LLClassifiedClickThrough : public LLDispatchHandler -{ -public: - - // "classifiedclickthrough" - // strings[0] = classified_id - // strings[1] = teleport_clicks - // strings[2] = map_clicks - // strings[3] = profile_clicks - virtual bool operator()( - const LLDispatcher* dispatcher, - const std::string& key, - const LLUUID& invoice, - const sparam_t& strings) - { - if (strings.size() != 4) - return false; - - return true; - } -}; //----------------------------------------------------------------------------- // LLPanelPicks @@ -216,13 +192,9 @@ LLPanelPicks::LLPanelPicks() mPicksAccTab(NULL), mClassifiedsAccTab(NULL), mPanelClassifiedInfo(NULL), - mPanelClassifiedEdit(NULL), - mClickThroughDisp(NULL), mNoClassifieds(false), mNoPicks(false) { - mClickThroughDisp = new LLClassifiedClickThrough(); - gGenericDispatcher.addHandler("classifiedclickthrough", mClickThroughDisp); } LLPanelPicks::~LLPanelPicks() @@ -231,8 +203,6 @@ LLPanelPicks::~LLPanelPicks() { LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this); } - - delete mClickThroughDisp; } void* LLPanelPicks::create(void* data /* = NULL */) @@ -351,7 +321,14 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type) if (mNoPicks && mNoClassifieds) { - childSetValue("picks_panel_text", LLTrans::getString("NoPicksClassifiedsText")); + if(getAvatarId() == gAgentID) + { + childSetValue("picks_panel_text", LLTrans::getString("NoPicksClassifiedsText")); + } + else + { + childSetValue("picks_panel_text", LLTrans::getString("NoAvatarPicksClassifiedsText")); + } } } @@ -407,6 +384,9 @@ BOOL LLPanelPicks::postBuild() registar.add("Pick.Teleport", boost::bind(&LLPanelPicks::onClickTeleport, this)); registar.add("Pick.Map", boost::bind(&LLPanelPicks::onClickMap, this)); registar.add("Pick.Delete", boost::bind(&LLPanelPicks::onClickDelete, this)); + LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registar; + enable_registar.add("Pick.Enable", boost::bind(&LLPanelPicks::onEnableMenuItem, this, _2)); + mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_picks.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); LLUICtrl::CommitCallbackRegistry::ScopedRegistrar plus_registar; @@ -443,6 +423,22 @@ bool LLPanelPicks::isActionEnabled(const LLSD& userdata) const return true; } +bool LLPanelPicks::isClassifiedPublished(LLClassifiedItem* c_item) +{ + if(c_item) + { + LLPanelClassifiedEdit* panel = mEditClassifiedPanels[c_item->getClassifiedId()]; + if(panel) + { + return !panel->isNewWithErrors(); + } + + // we've got this classified from server - it's published + return true; + } + return false; +} + void LLPanelPicks::onAccordionStateChanged(const LLAccordionCtrlTab* acc_tab) { if(!mPicksAccTab->getDisplayChildren()) @@ -600,7 +596,11 @@ void LLPanelPicks::onClickTeleport() if(pick_item) pos = pick_item->getPosGlobal(); else if(c_item) + { pos = c_item->getPosGlobal(); + LLPanelClassifiedInfo::sendClickMessage("teleport", false, + c_item->getClassifiedId(), LLUUID::null, pos, LLStringUtil::null); + } if (!pos.isExactlyZero()) { @@ -619,7 +619,11 @@ void LLPanelPicks::onClickMap() if (pick_item) pos = pick_item->getPosGlobal(); else if(c_item) + { + LLPanelClassifiedInfo::sendClickMessage("map", false, + c_item->getClassifiedId(), LLUUID::null, pos, LLStringUtil::null); pos = c_item->getPosGlobal(); + } LLFloaterWorldMap::getInstance()->trackLocation(pos); LLFloaterReg::showInstance("world_map", "center"); @@ -671,6 +675,12 @@ void LLPanelPicks::updateButtons() childSetEnabled(XML_BTN_INFO, has_selected); childSetEnabled(XML_BTN_TELEPORT, has_selected); childSetEnabled(XML_BTN_SHOW_ON_MAP, has_selected); + + LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); + if(c_item) + { + childSetEnabled(XML_BTN_INFO, isClassifiedPublished(c_item)); + } } void LLPanelPicks::setProfilePanel(LLPanelProfile* profile_panel) @@ -707,9 +717,10 @@ void LLPanelPicks::createNewPick() void LLPanelPicks::createNewClassified() { - createClassifiedEditPanel(); + LLPanelClassifiedEdit* panel = NULL; + createClassifiedEditPanel(&panel); - getProfilePanel()->openPanel(mPanelClassifiedEdit, LLSD()); + getProfilePanel()->openPanel(panel, LLSD()); } void LLPanelPicks::onClickInfo() @@ -749,26 +760,20 @@ void LLPanelPicks::openClassifiedInfo() if (selected_value.isUndefined()) return; LLClassifiedItem* c_item = getSelectedClassifiedItem(); + LLSD params; + params["classified_id"] = c_item->getClassifiedId(); + params["classified_creator_id"] = c_item->getAvatarId(); + params["classified_snapshot_id"] = c_item->getSnapshotId(); + params["classified_name"] = c_item->getClassifiedName(); + params["classified_desc"] = c_item->getDescription(); + params["from_search"] = false; - openClassifiedInfo(c_item->getClassifiedId(), c_item->getAvatarId(), - c_item->getSnapshotId(), c_item->getClassifiedName(), - c_item->getDescription()); + openClassifiedInfo(params); } -void LLPanelPicks::openClassifiedInfo(const LLUUID &classified_id, - const LLUUID &avatar_id, - const LLUUID &snapshot_id, - const std::string &name, const std::string &desc) +void LLPanelPicks::openClassifiedInfo(const LLSD ¶ms) { createClassifiedInfoPanel(); - - LLSD params; - params["classified_id"] = classified_id; - params["avatar_id"] = avatar_id; - params["snapshot_id"] = snapshot_id; - params["name"] = name; - params["desc"] = desc; - getProfilePanel()->openPanel(mPanelClassifiedInfo, params); } @@ -800,11 +805,10 @@ void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel) if(panel->isNew()) { + mEditClassifiedPanels[panel->getClassifiedId()] = panel; + LLClassifiedItem* c_item = new LLClassifiedItem(getAvatarId(), panel->getClassifiedId()); - - c_item->setClassifiedName(panel->getClassifiedName()); - c_item->setDescription(panel->getDescription()); - c_item->setSnapshotId(panel->getSnapshotId()); + c_item->fillIn(panel); LLSD c_value; c_value.insert(CLASSIFIED_ID, c_item->getClassifiedId()); @@ -820,6 +824,11 @@ void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel) mClassifiedsAccTab->changeOpenClose(false); showAccordion("tab_classifieds", true); } + else if(panel->isNewWithErrors()) + { + LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); + c_item->fillIn(panel); + } else { onPanelClassifiedClose(panel); @@ -880,15 +889,16 @@ void LLPanelPicks::createClassifiedInfoPanel() } } -void LLPanelPicks::createClassifiedEditPanel() +void LLPanelPicks::createClassifiedEditPanel(LLPanelClassifiedEdit** panel) { - if(!mPanelClassifiedEdit) + if(panel) { - mPanelClassifiedEdit = LLPanelClassifiedEdit::create(); - mPanelClassifiedEdit->setExitCallback(boost::bind(&LLPanelPicks::onPanelClassifiedClose, this, mPanelClassifiedEdit)); - mPanelClassifiedEdit->setSaveCallback(boost::bind(&LLPanelPicks::onPanelClassifiedSave, this, mPanelClassifiedEdit)); - mPanelClassifiedEdit->setCancelCallback(boost::bind(&LLPanelPicks::onPanelClassifiedClose, this, mPanelClassifiedEdit)); - mPanelClassifiedEdit->setVisible(FALSE); + LLPanelClassifiedEdit* new_panel = LLPanelClassifiedEdit::create(); + new_panel->setExitCallback(boost::bind(&LLPanelPicks::onPanelClassifiedClose, this, new_panel)); + new_panel->setSaveCallback(boost::bind(&LLPanelPicks::onPanelClassifiedSave, this, new_panel)); + new_panel->setCancelCallback(boost::bind(&LLPanelPicks::onPanelClassifiedClose, this, new_panel)); + new_panel->setVisible(FALSE); + *panel = new_panel; } } @@ -961,16 +971,26 @@ void LLPanelPicks::onPanelClassifiedEdit() LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); - createClassifiedEditPanel(); - LLSD params; params["classified_id"] = c_item->getClassifiedId(); - params["avatar_id"] = c_item->getAvatarId(); + params["classified_creator_id"] = c_item->getAvatarId(); params["snapshot_id"] = c_item->getSnapshotId(); params["name"] = c_item->getClassifiedName(); params["desc"] = c_item->getDescription(); - - getProfilePanel()->openPanel(mPanelClassifiedEdit, params); + params["category"] = (S32)c_item->getCategory(); + params["content_type"] = (S32)c_item->getContentType(); + params["auto_renew"] = c_item->getAutoRenew(); + params["price_for_listing"] = c_item->getPriceForListing(); + params["location_text"] = c_item->getLocationText(); + + LLPanelClassifiedEdit* panel = mEditClassifiedPanels[c_item->getClassifiedId()]; + if(!panel) + { + createClassifiedEditPanel(&panel); + mEditClassifiedPanels[c_item->getClassifiedId()] = panel; + } + getProfilePanel()->openPanel(panel, params); + panel->setPosGlobal(c_item->getPosGlobal()); } void LLPanelPicks::onClickMenuEdit() @@ -985,6 +1005,20 @@ void LLPanelPicks::onClickMenuEdit() } } +bool LLPanelPicks::onEnableMenuItem(const LLSD& user_data) +{ + std::string param = user_data.asString(); + + LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); + if(c_item && "info" == param) + { + // dont show Info panel if classified was not created + return isClassifiedPublished(c_item); + } + + return true; +} + inline LLPanelProfile* LLPanelPicks::getProfilePanel() { llassert_always(NULL != mProfilePanel); @@ -1173,6 +1207,24 @@ void LLClassifiedItem::setValue(const LLSD& value) childSetVisible("selected_icon", value["selected"]); } +void LLClassifiedItem::fillIn(LLPanelClassifiedEdit* panel) +{ + if(!panel) + { + return; + } + + setClassifiedName(panel->getClassifiedName()); + setDescription(panel->getDescription()); + setSnapshotId(panel->getSnapshotId()); + setCategory(panel->getCategory()); + setContentType(panel->getContentType()); + setAutoRenew(panel->getAutoRenew()); + setPriceForListing(panel->getPriceForListing()); + setPosGlobal(panel->getPosGlobal()); + setLocationText(panel->getClassifiedLocation()); +} + void LLClassifiedItem::setClassifiedName(const std::string& name) { childSetValue("name", name); diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h index 3f757e482e..a98b8c413e 100644 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -55,7 +55,6 @@ class LLPanelPickEdit; class LLToggleableMenu; class LLPanelClassifiedInfo; class LLPanelClassifiedEdit; -class LLClassifiedClickThrough; // *TODO // Panel Picks has been consolidated with Classifieds (EXT-2095), give LLPanelPicks @@ -99,6 +98,8 @@ private: void onPlusMenuItemClicked(const LLSD& param); bool isActionEnabled(const LLSD& userdata) const; + bool isClassifiedPublished(LLClassifiedItem* c_item); + void onListCommit(const LLFlatListView* f_list); void onAccordionStateChanged(const LLAccordionCtrlTab* acc_tab); @@ -115,14 +116,14 @@ private: void onPanelClassifiedEdit(); void onClickMenuEdit(); + bool onEnableMenuItem(const LLSD& user_data); + void createNewPick(); void createNewClassified(); void openPickInfo(); void openClassifiedInfo(); - void openClassifiedInfo(const LLUUID &classified_id, const LLUUID &avatar_id, - const LLUUID &snapshot_id, const std::string &name, - const std::string &desc); + void openClassifiedInfo(const LLSD& params); friend class LLPanelProfile; void showAccordion(const std::string& name, bool show); @@ -143,7 +144,7 @@ private: void createPickInfoPanel(); void createPickEditPanel(); void createClassifiedInfoPanel(); - void createClassifiedEditPanel(); + void createClassifiedEditPanel(LLPanelClassifiedEdit** panel); LLMenuGL* mPopupMenu; LLPanelProfile* mProfilePanel; @@ -152,15 +153,19 @@ private: LLFlatListView* mClassifiedsList; LLPanelPickInfo* mPanelPickInfo; LLPanelClassifiedInfo* mPanelClassifiedInfo; - LLPanelClassifiedEdit* mPanelClassifiedEdit; LLPanelPickEdit* mPanelPickEdit; LLToggleableMenu* mPlusMenu; + // <classified_id, edit_panel> + typedef std::map<LLUUID, LLPanelClassifiedEdit*> panel_classified_edit_map_t; + + // This map is needed for newly created classifieds. The purpose of panel is to + // sit in this map and listen to LLPanelClassifiedEdit::processProperties callback. + panel_classified_edit_map_t mEditClassifiedPanels; + LLAccordionCtrlTab* mPicksAccTab; LLAccordionCtrlTab* mClassifiedsAccTab; - LLClassifiedClickThrough* mClickThroughDisp; - //true if picks list is empty after processing picks bool mNoPicks; //true if classifieds list is empty after processing classifieds @@ -250,6 +255,8 @@ public: /*virtual*/ void setValue(const LLSD& value); + void fillIn(LLPanelClassifiedEdit* panel); + LLUUID getAvatarId() {return mAvatarId;} void setAvatarId(const LLUUID& avatar_id) {mAvatarId = avatar_id;} @@ -260,7 +267,11 @@ public: void setPosGlobal(const LLVector3d& pos) { mPosGlobal = pos; } - const LLVector3d& getPosGlobal() { return mPosGlobal; } + const LLVector3d getPosGlobal() { return mPosGlobal; } + + void setLocationText(const std::string location) { mLocationText = location; } + + std::string getLocationText() { return mLocationText; } void setClassifiedName (const std::string& name); @@ -274,10 +285,31 @@ public: LLUUID getSnapshotId(); + void setCategory(U32 cat) { mCategory = cat; } + + U32 getCategory() { return mCategory; } + + void setContentType(U32 ct) { mContentType = ct; } + + U32 getContentType() { return mContentType; } + + void setAutoRenew(U32 renew) { mAutoRenew = renew; } + + bool getAutoRenew() { return mAutoRenew; } + + void setPriceForListing(S32 price) { mPriceForListing = price; } + + S32 getPriceForListing() { return mPriceForListing; } + private: LLUUID mAvatarId; LLUUID mClassifiedId; LLVector3d mPosGlobal; + std::string mLocationText; + U32 mCategory; + U32 mContentType; + bool mAutoRenew; + S32 mPriceForListing; }; #endif // LL_LLPANELPICKS_H diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 9ebc8ca2b9..f6133d4446 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -256,7 +256,7 @@ void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent) static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); S32 scroll_height = mScrollContainer->getRect().getHeight(); - if (mScrollingPanelMinHeight >= scroll_height) + if (mScrollingPanelMinHeight > scroll_height) { mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight); } diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 479769ee20..a53a3ba1ad 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -724,10 +724,10 @@ void LLPanelPrimMediaControls::draw() mMediaControlsStack->updateLayout(); // adjust for layout stack spacing - S32 space = mMediaControlsStack->getPanelSpacing() + 1; + S32 space = mMediaControlsStack->getPanelSpacing() + 2; LLRect controls_bg_area = mMediaControlsStack->getRect(); - controls_bg_area.mTop += space; + controls_bg_area.mTop += space + 2; // adjust to ignore space from volume slider controls_bg_area.mBottom += mVolumeSliderCtrl->getRect().getHeight(); @@ -736,7 +736,7 @@ void LLPanelPrimMediaControls::draw() controls_bg_area.mLeft += mLeftBookend->getRect().getWidth() - space; // ignore space from right bookend padding - controls_bg_area.mRight -= mRightBookend->getRect().getWidth() - space; + controls_bg_area.mRight -= mRightBookend->getRect().getWidth() - space - 2; // draw control background UI image mBackgroundImage->draw( controls_bg_area, UI_VERTEX_COLOR % alpha); diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 743cec70a1..2e0de7866c 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -58,6 +58,16 @@ public: void updateShape(); bool isMouseOver(); + + enum EZoomLevel + { + ZOOM_NONE = 0, + ZOOM_FAR, + ZOOM_MEDIUM, + ZOOM_NEAR + }; + + EZoomLevel getZoomLevel() const { return mCurrentZoom; } void nextZoomLevel(); void resetZoomLevel(bool reset_camera = true); void close(); @@ -66,13 +76,6 @@ public: void setMediaFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero); - enum EZoomLevel - { - ZOOM_NONE = 0, - ZOOM_FAR, - ZOOM_MEDIUM, - ZOOM_NEAR - }; static const EZoomLevel kZoomLevels[]; static const int kNumZoomLevels; diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index b5d85dfd4b..18da8dd48c 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -171,15 +171,13 @@ void LLPanelProfile::onOpen(const LLSD& key) } else if (panel == "classified_details") { - LLUUID classified_id = key["classified_id"].asUUID(); - LLUUID avatar_id = key["classified_avatar_id"].asUUID(); - LLUUID snapshot_id = key["classified_snapshot_id"].asUUID(); - std::string name = key["classified_name"].asString(); - std::string desc = key["classified_desc"].asString(); LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]); if (picks) { - picks->openClassifiedInfo(classified_id, avatar_id, snapshot_id, name, desc); + LLSD params = key; + params.erase("show_tab_panel"); + params.erase("open_tab_name"); + picks->openClassifiedInfo(params); } } } diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp index 74e37efe4e..ae52bd3703 100644 --- a/indra/newview/llpanelvolumepulldown.cpp +++ b/indra/newview/llpanelvolumepulldown.cpp @@ -56,6 +56,8 @@ // Default constructor LLPanelVolumePulldown::LLPanelVolumePulldown() { + mHoverTimer.stop(); + mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2)); mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2)); LLUICtrlFactory::instance().buildPanel(this, "panel_volume_pulldown.xml"); @@ -77,6 +79,11 @@ void LLPanelVolumePulldown::onMouseEnter(S32 x, S32 y, MASK mask) LLPanel::onMouseEnter(x,y,mask); } +/*virtual*/ +void LLPanelVolumePulldown::onTopLost() +{ + setVisible(FALSE); +} /*virtual*/ void LLPanelVolumePulldown::onMouseLeave(S32 x, S32 y, MASK mask) @@ -91,19 +98,12 @@ void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility ) if (new_visibility) { mHoverTimer.start(); // timer will be stopped when mouse hovers over panel - gFocusMgr.setTopCtrl(this); } else { mHoverTimer.stop(); - gFocusMgr.setTopCtrl(NULL); - } -} -/*virtual*/ -void LLPanelVolumePulldown::onTopLost() -{ - setVisible(FALSE); + } } void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data) diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h index 9f20caa1a8..7fb025f329 100644 --- a/indra/newview/llpanelvolumepulldown.h +++ b/indra/newview/llpanelvolumepulldown.h @@ -47,8 +47,8 @@ class LLPanelVolumePulldown : public LLPanel /*virtual*/ void draw(); /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); - /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); /*virtual*/ void onTopLost(); + /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); /*virtual*/ BOOL postBuild(); private: diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 1c4004c37a..2748daaffa 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -70,6 +70,8 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av mSpeakerMgr->addListener(mSpeakerModeratorListener, "update_moderator"); mAvatarList->setNoItemsCommentText(LLTrans::getString("LoadingData")); + LL_DEBUGS("SpeakingIndicator") << "Set session for speaking indicators: " << mSpeakerMgr->getSessionID() << LL_ENDL; + mAvatarList->setSessionID(mSpeakerMgr->getSessionID()); mAvatarListDoubleClickConnection = mAvatarList->setItemDoubleClickCallback(boost::bind(&LLParticipantList::onAvatarListDoubleClicked, this, _1)); mAvatarListRefreshConnection = mAvatarList->setRefreshCompleteCallback(boost::bind(&LLParticipantList::onAvatarListRefreshed, this, _1, _2)); // Set onAvatarListDoubleClicked as default on_return action. diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp new file mode 100644 index 0000000000..d8ad59c90c --- /dev/null +++ b/indra/newview/llpopupview.cpp @@ -0,0 +1,246 @@ +/** + * @file llpopupview.cpp + * @brief Holds transient popups + * + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2010, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ +#include "llviewerprecompiledheaders.h" + +#include "llpopupview.h" + +static LLRegisterPanelClassWrapper<LLPopupView> r("popup_holder"); + +bool view_visible_and_enabled(LLView* viewp) +{ + return viewp->getVisible() && viewp->getEnabled(); +} + +bool view_visible(LLView* viewp) +{ + return viewp->getVisible(); +} + + +LLPopupView::LLPopupView() +{ + // register ourself as handler of UI popups + LLUI::setPopupFuncs(boost::bind(&LLPopupView::addPopup, this, _1), boost::bind(&LLPopupView::removePopup, this, _1), boost::bind(&LLPopupView::clearPopups, this)); +} + +LLPopupView::~LLPopupView() +{ + // set empty callback function so we can't handle popups anymore + LLUI::setPopupFuncs(LLUI::add_popup_t(), LLUI::remove_popup_t(), LLUI::clear_popups_t()); +} + +void LLPopupView::draw() +{ + S32 screen_x, screen_y; + + // remove dead popups + for (popup_list_t::iterator popup_it = mPopups.begin(); + popup_it != mPopups.end();) + { + if (!popup_it->get()) + { + mPopups.erase(popup_it++); + } + else + { + popup_it++; + } + } + + // draw in reverse order (most recent is on top) + for (popup_list_t::reverse_iterator popup_it = mPopups.rbegin(); + popup_it != mPopups.rend();) + { + LLView* popup = popup_it->get(); + + if (popup->getVisible()) + { + popup->localPointToScreen(0, 0, &screen_x, &screen_y); + + LLUI::pushMatrix(); + { + LLUI::translate( (F32) screen_x, (F32) screen_y, 0.f); + popup->draw(); + } + LLUI::popMatrix(); + } + ++popup_it; + } + + LLPanel::draw(); +} + +BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func, + boost::function<bool(LLView*)> predicate, + S32 x, S32 y, + bool close_popups) +{ + for (popup_list_t::iterator popup_it = mPopups.begin(); + popup_it != mPopups.end();) + { + LLView* popup = popup_it->get(); + if (!popup + || !predicate(popup)) + { + ++popup_it; + continue; + } + + S32 popup_x, popup_y; + if (localPointToOtherView(x, y, &popup_x, &popup_y, popup) + && popup->pointInView(popup_x, popup_y)) + { + if (func(popup, popup_x, popup_y)) + { + return TRUE; + } + } + + if (close_popups) + { + popup_list_t::iterator cur_popup_it = popup_it++; + mPopups.erase(cur_popup_it); + popup->onTopLost(); + } + else + { + ++popup_it; + } + } + + return FALSE; +} + + +BOOL LLPopupView::handleMouseDown(S32 x, S32 y, MASK mask) +{ + if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true)) + { + return FALSE; + } + return TRUE; +} + +BOOL LLPopupView::handleMouseUp(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleMiddleMouseDown(S32 x, S32 y, MASK mask) +{ + if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true)) + { + return FALSE; + } + return TRUE; +} + +BOOL LLPopupView::handleMiddleMouseUp(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleRightMouseDown(S32 x, S32 y, MASK mask) +{ + if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true)) + { + return FALSE; + } + return TRUE; +} + +BOOL LLPopupView::handleRightMouseUp(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleDoubleClick(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleDoubleClick, _1, _2, _3, mask), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleHover(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleHover, _1, _2, _3, mask), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleScrollWheel(S32 x, S32 y, S32 clicks) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleScrollWheel, _1, _2, _3, clicks), view_visible_and_enabled, x, y, false); +} + +BOOL LLPopupView::handleToolTip(S32 x, S32 y, MASK mask) +{ + return handleMouseEvent(boost::bind(&LLMouseHandler::handleToolTip, _1, _2, _3, mask), view_visible, x, y, false); +} + +void LLPopupView::addPopup(LLView* popup) +{ + if (popup) + { + popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); + if(iter != mPopups.end()) + { + mPopups.erase(iter); + } + mPopups.push_front(popup->getHandle()); + } +} + +void LLPopupView::removePopup(LLView* popup) +{ + if (popup) + { + popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); + if(iter != mPopups.end()) + { + mPopups.erase(iter); + } + popup->onTopLost(); + } +} + +void LLPopupView::clearPopups() +{ + for (popup_list_t::iterator popup_it = mPopups.begin(); + popup_it != mPopups.end();) + { + LLView* popup = popup_it->get(); + + popup_list_t::iterator cur_popup_it = popup_it; + ++popup_it; + + mPopups.erase(cur_popup_it); + popup->onTopLost(); + } +} + diff --git a/indra/newview/llpopupview.h b/indra/newview/llpopupview.h new file mode 100644 index 0000000000..1ec61d5450 --- /dev/null +++ b/indra/newview/llpopupview.h @@ -0,0 +1,67 @@ +/** + * @file llpopupview.h + * @brief Holds transient popups + * + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#ifndef LL_LLPOPUPVIEW_H +#define LL_LLPOPUPVIEW_H + +#include "llpanel.h" + +class LLPopupView : public LLPanel +{ +public: + LLPopupView(); + ~LLPopupView(); + + /*virtual*/ void draw(); + /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); + + void addPopup(LLView* popup); + void removePopup(LLView* popup); + void clearPopups(); + + typedef std::list<LLHandle<LLView> > popup_list_t; + popup_list_t getCurrentPopups() { return mPopups; } + +private: + BOOL handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)>, boost::function<bool(LLView*)>, S32 x, S32 y, bool close_popups); + popup_list_t mPopups; +}; +#endif //LL_LLROOTVIEW_H diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 3221745fa3..f5a9f82d50 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -955,8 +955,12 @@ BOOL LLPreviewLSL::postBuild() { const LLInventoryItem* item = getItem(); + llassert(item); + if (item) + { + childSetText("desc", item->getDescription()); + } childSetCommitCallback("desc", LLPreview::onText, this); - childSetText("desc", item->getDescription()); childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe); return LLPreview::postBuild(); diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 0ed6bea74f..22a1ef94a7 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -116,7 +116,8 @@ BOOL LLPreviewTexture::postBuild() } childSetAction("save_tex_btn", LLPreviewTexture::onSaveAsBtn, this); - childSetVisible("save_tex_btn", canSaveAs()); + childSetVisible("save_tex_btn", true); + childSetEnabled("save_tex_btn", canSaveAs()); if (!mCopyToInv) { @@ -248,6 +249,7 @@ void LLPreviewTexture::draw() } } } + } @@ -282,18 +284,52 @@ void LLPreviewTexture::saveAs() // virtual void LLPreviewTexture::reshape(S32 width, S32 height, BOOL called_from_parent) { -// mLastHeight = 0; -// mLastWidth = 0; - mUpdateDimensions = TRUE; LLPreview::reshape(width, height, called_from_parent); + + LLRect dim_rect; + childGetRect("dimensions", dim_rect); + + S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE; + + // add space for dimensions and aspect ratio + S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD; + + LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0); + client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD); + client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ; + + S32 client_width = client_rect.getWidth(); + S32 client_height = client_rect.getHeight(); + + if (mAspectRatio > 0.f) + { + if(mAspectRatio > 1.f) + { + client_height = llceil((F32)client_width / mAspectRatio); + if(client_height > client_rect.getHeight()) + { + client_height = client_rect.getHeight(); + client_width = llceil((F32)client_height * mAspectRatio); + } + } + else//mAspectRatio < 1.f + { + client_width = llceil((F32)client_height * mAspectRatio); + if(client_width > client_rect.getWidth()) + { + client_width = client_rect.getWidth(); + client_height = llceil((F32)client_width / mAspectRatio); + } + } + } + + mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() + (client_height / 2), client_width, client_height); + } // virtual void LLPreviewTexture::onFocusReceived() { - mLastHeight = 0; - mLastWidth = 0; - mUpdateDimensions = TRUE; LLPreview::onFocusReceived(); } @@ -304,12 +340,12 @@ void LLPreviewTexture::openToSave() // static void LLPreviewTexture::onFileLoadedForSave(BOOL success, - LLViewerFetchedTexture *src_vi, - LLImageRaw* src, - LLImageRaw* aux_src, - S32 discard_level, - BOOL final, - void* userdata) + LLViewerFetchedTexture *src_vi, + LLImageRaw* src, + LLImageRaw* aux_src, + S32 discard_level, + BOOL final, + void* userdata) { LLUUID* item_uuid = (LLUUID*) userdata; @@ -364,13 +400,19 @@ void LLPreviewTexture::updateDimensions() { if (!mImage) return; + + if(mImage->getFullWidth() == 0 || mImage->getFullHeight() == 0) + { + return; + } + mUpdateDimensions = FALSE; - - // set text on dimensions display (should be moved out of here and into a callback of some sort) + childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->getFullWidth())); childSetTextArg("dimensions", "[HEIGHT]", llformat("%d", mImage->getFullHeight())); + LLRect dim_rect; childGetRect("dimensions", dim_rect); @@ -379,34 +421,68 @@ void LLPreviewTexture::updateDimensions() // add space for dimensions and aspect ratio S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD; - LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0); - client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD); - client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ; + S32 screen_width = gFloaterView->getSnapRect().getWidth(); + S32 screen_height = gFloaterView->getSnapRect().getHeight(); - S32 client_width = client_rect.getWidth(); - S32 client_height = client_rect.getHeight(); + S32 max_image_width = screen_width - 2*horiz_pad; + S32 max_image_height = screen_height - (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD) + - (PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height); + + S32 client_width = llmin(max_image_width,mImage->getFullWidth()); + S32 client_height = llmin(max_image_height,mImage->getFullHeight()); if (mAspectRatio > 0.f) { if(mAspectRatio > 1.f) { client_height = llceil((F32)client_width / mAspectRatio); - if(client_height > client_rect.getHeight()) + if(client_height > max_image_height) { - client_height = client_rect.getHeight(); + client_height = max_image_height; client_width = llceil((F32)client_height * mAspectRatio); } } - else + else//mAspectRatio < 1.f { client_width = llceil((F32)client_height * mAspectRatio); - if(client_width > client_rect.getWidth()) + if(client_width > max_image_width) { - client_width = client_rect.getWidth(); + client_width = max_image_width; client_height = llceil((F32)client_width / mAspectRatio); } } } + else + { + + if(client_height > max_image_height) + { + F32 ratio = (F32)max_image_height/client_height; + client_height = max_image_height; + client_width = llceil((F32)client_height * ratio); + } + + if(client_width > max_image_width) + { + F32 ratio = (F32)max_image_width/client_width; + client_width = max_image_width; + client_height = llceil((F32)client_width * ratio); + } + } + + //now back to whole floater + S32 floater_width = llmax(getMinWidth(),client_width + 2*horiz_pad); + S32 floater_height = llmax(getMinHeight(),client_height + (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD) + + (PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height)); + + //reshape floater + reshape( floater_width, floater_height ); + gFloaterView->adjustToFitScreen(this, FALSE); + + //setup image rect... + LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0); + client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD); + client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ; mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() + (client_height / 2), client_width, client_height); @@ -468,8 +544,9 @@ void LLPreviewTexture::loadAsset() mImage->setBoostLevel(LLViewerTexture::BOOST_PREVIEW); mImage->forceToSaveRawImage(0) ; mAssetStatus = PREVIEW_ASSET_LOADING; + mUpdateDimensions = TRUE; updateDimensions(); - childSetVisible("save_tex_btn", canSaveAs()); + childSetEnabled("save_tex_btn", canSaveAs()); } LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus() @@ -487,7 +564,12 @@ void LLPreviewTexture::updateImageID() if(item) { mImageID = item->getAssetUUID(); - mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID(); + + // here's the old logic... + //mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID(); + // here's the new logic... 'cos we hate disappearing buttons. + mShowKeepDiscard = TRUE; + mCopyToInv = FALSE; mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED); } diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 7a48f890e0..120b584cd9 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -128,11 +128,13 @@ void LLProgressView::setVisible(BOOL visible) { if (getVisible() && !visible) { + mFadeTimer.start(); } else if (!getVisible() && visible) { - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); + setFocus(TRUE); mFadeTimer.stop(); mProgressTimer.start(); @@ -187,6 +189,8 @@ void LLProgressView::draw() // Fade is complete, release focus gFocusMgr.releaseFocusIfNeeded( this ); LLPanel::setVisible(FALSE); + gViewerWindow->removePopup(this); + gStartTexture = NULL; } return; @@ -223,7 +227,10 @@ void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label) // static void LLProgressView::onCancelButtonClicked(void*) { - if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) + // Quitting viewer here should happen only when "Quit" button is pressed while starting up. + // Check for startup state is used here instead of teleport state to avoid quitting when + // cancel is pressed while teleporting inside region (EXT-4911) + if (LLStartUp::getStartupState() < STATE_STARTED) { LLAppViewer::instance()->requestQuit(); } diff --git a/indra/newview/llrootview.h b/indra/newview/llrootview.h index 760b1a7a4c..38029e3a9d 100644 --- a/indra/newview/llrootview.h +++ b/indra/newview/llrootview.h @@ -35,6 +35,7 @@ #include "llview.h" #include "lluictrlfactory.h" +#include "lltooltip.h" class LLRootViewRegistry : public LLChildRegistry<LLRootViewRegistry> {}; diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 7c2e7e3319..a4426b370e 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -79,17 +79,12 @@ LLScreenChannelBase::~LLScreenChannelBase() bool LLScreenChannelBase::isHovering() { - bool res = mHoveredToast != NULL; - if (!res) + if (!mHoveredToast) { - return res; + return false; } - S32 x, y; - mHoveredToast->screenPointToLocal(gViewerWindow->getCurrentMouseX(), - gViewerWindow->getCurrentMouseY(), &x, &y); - res = mHoveredToast->pointInView(x, y) == TRUE; - return res; + return mHoveredToast->isHovered(); } void LLScreenChannelBase::updatePositionAndSize(LLRect old_world_rect, LLRect new_world_rect) @@ -479,7 +474,8 @@ void LLScreenChannel::showToastsBottom() { if(it != mToastList.rbegin()) { - bottom = (*(it-1)).toast->getRect().mTop; + LLToast* toast = (*(it-1)).toast; + bottom = toast->getRect().mTop - toast->getTopPad(); toast_margin = gSavedSettings.getS32("ToastGap"); } @@ -691,7 +687,10 @@ void LLNotificationsUI::LLScreenChannel::startFadingToasts() while (it != mToastList.end()) { ToastElem& elem = *it; - elem.toast->startFading(); + if (elem.toast->getVisible()) + { + elem.toast->startFading(); + } ++it; } } @@ -777,23 +776,16 @@ void LLScreenChannel::onToastHover(LLToast* toast, bool mouse_enter) { // because of LLViewerWindow::updateUI() that NOT ALWAYS calls onMouseEnter BEFORE onMouseLeave // we must check hovering directly to prevent incorrect setting for hovering in a channel - S32 x,y; if (mouse_enter) { - toast->screenPointToLocal(gViewerWindow->getCurrentMouseX(), - gViewerWindow->getCurrentMouseY(), &x, &y); - bool hover = toast->pointInView(x, y) == TRUE; - if (hover) + if (toast->isHovered()) { mHoveredToast = toast; } } else if (mHoveredToast != NULL) { - mHoveredToast->screenPointToLocal(gViewerWindow->getCurrentMouseX(), - gViewerWindow->getCurrentMouseY(), &x, &y); - bool hover = mHoveredToast->pointInView(x, y) == TRUE; - if (!hover) + if (!mHoveredToast->isHovered()) { mHoveredToast = NULL; } diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index d452ef2228..f35cb3516a 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -88,7 +88,7 @@ bool LLScriptFloater::toggle(const LLUUID& notification_id) else { floater->setVisible(TRUE); - floater->setFocus(TRUE); + floater->setFocus(FALSE); } } // create and show new floater @@ -107,6 +107,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id) floater->setNotificationId(notification_id); floater->createForm(notification_id); + //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445) + floater->setAutoFocus(FALSE); + if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id)) { floater->setSavePosition(true); @@ -117,7 +120,8 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id) floater->dockToChiclet(true); } - LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, TRUE); + //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445) + LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, FALSE); return floater; } @@ -131,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id) void LLScriptFloater::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); } void LLScriptFloater::createForm(const LLUUID& notification_id) @@ -150,14 +154,17 @@ void LLScriptFloater::createForm(const LLUUID& notification_id) } // create new form - mScriptForm = new LLToastNotifyPanel(notification); + LLRect toast_rect = getRect(); + // LLToastNotifyPanel will fit own content in vertical direction, + // but it needs an initial rect to properly calculate its width + // Use an initial rect of the script floater to make the floater window more configurable. + mScriptForm = new LLToastNotifyPanel(notification, toast_rect); addChild(mScriptForm); // position form on floater mScriptForm->setOrigin(0, 0); // make floater size fit form size - LLRect toast_rect = getRect(); LLRect panel_rect = mScriptForm->getRect(); toast_rect.setLeftTopAndSize(toast_rect.mLeft, toast_rect.mTop, panel_rect.getWidth(), panel_rect.getHeight() + getHeaderHeight()); setShape(toast_rect); @@ -279,7 +286,9 @@ void LLScriptFloater::dockToChiclet(bool dock) setSavePosition(false); setDockControl(new LLDockControl(chiclet, this, getDockTongue(), - LLDockControl::TOP, boost::bind(&LLScriptFloater::getAllowedRect, this, _1)), dock); + LLDockControl::TOP, boost::bind(&LLScriptFloater::getAllowedRect, this, _1))); + + setDocked(dock); // Restore saving setSavePosition(save); diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 9540894646..d733574a9d 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4919,13 +4919,15 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) // set up transform to encompass bounding box of HUD glMatrixMode(GL_PROJECTION); - glPushMatrix(); + gGL.pushMatrix(); glLoadIdentity(); F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f); glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth); glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + gGL.pushMatrix(); + gGL.pushUIMatrix(); + gGL.loadUIIdentity(); glLoadIdentity(); glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f); @@ -5022,10 +5024,11 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) if (for_hud && avatar) { glMatrixMode(GL_PROJECTION); - glPopMatrix(); + gGL.popMatrix(); glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + gGL.popMatrix(); + gGL.popUIMatrix(); stop_glerror(); } @@ -5374,7 +5377,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) } glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + gGL.pushMatrix(); + gGL.pushUIMatrix(); + gGL.loadUIIdentity(); + if (!is_hud_object) { glLoadIdentity(); @@ -5493,7 +5499,8 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) gGL.end(); gGL.flush(); } - glPopMatrix(); + gGL.popMatrix(); + gGL.popUIMatrix(); } // diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index cd4a821774..4a24a5dec5 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -297,6 +297,7 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLWearable *we } mEditWearable->setVisible(visible); + mEditWearable->setWearable(wearable); mFilterEditor->setVisible(!visible); mPanelOutfitsInventory->setVisible(!visible); } diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 0630981d7e..6ebe55e362 100644 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -100,6 +100,8 @@ BOOL LLSidepanelTaskInfo::postBuild() mPayBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onPayButtonClicked, this)); mBuyBtn = getChild<LLButton>("buy_btn"); mBuyBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onBuyButtonClicked, this)); + mDetailsBtn = getChild<LLButton>("details_btn"); + mDetailsBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onDetailsButtonClicked, this)); mLabelGroupName = getChild<LLNameBox>("Group Name Proxy"); @@ -1122,6 +1124,15 @@ void LLSidepanelTaskInfo::updateVerbs() //mEditBtn->setEnabled(obj && obj->permModify()); */ + LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection(); + const BOOL multi_select = (object_selection->getNumNodes() > 1); + + mOpenBtn->setVisible(!multi_select); + mPayBtn->setVisible(!multi_select); + mBuyBtn->setVisible(!multi_select); + mDetailsBtn->setVisible(multi_select); + mDetailsBtn->setEnabled(multi_select); + mOpenBtn->setEnabled(enable_object_open()); mPayBtn->setEnabled(enable_pay_object()); mBuyBtn->setEnabled(enable_buy_object()); @@ -1145,6 +1156,11 @@ void LLSidepanelTaskInfo::onBuyButtonClicked() doClickAction(CLICK_ACTION_BUY); } +void LLSidepanelTaskInfo::onDetailsButtonClicked() +{ + LLFloaterReg::showInstance("inspect", LLSD()); +} + // virtual void LLSidepanelTaskInfo::save() { diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h index cf36c20767..e41627435f 100644 --- a/indra/newview/llsidepaneltaskinfo.h +++ b/indra/newview/llsidepaneltaskinfo.h @@ -109,10 +109,12 @@ protected: void onOpenButtonClicked(); void onPayButtonClicked(); void onBuyButtonClicked(); + void onDetailsButtonClicked(); private: LLButton* mOpenBtn; LLButton* mPayBtn; LLButton* mBuyBtn; + LLButton* mDetailsBtn; protected: LLViewerObject* getObject(); diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 50c47e293e..fba1503b4a 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -248,6 +248,11 @@ LLSideTray::LLSideTray(Params& params) // panel_name should be specified via "parameter" attribute. commit.add("SideTray.ShowPanel", boost::bind(&LLSideTray::showPanel, this, _2, LLUUID::null)); LLTransientFloaterMgr::getInstance()->addControlView(this); + LLView* side_bar_tabs = gViewerWindow->getRootView()->getChildView("side_bar_tabs"); + if (side_bar_tabs != NULL) + { + LLTransientFloaterMgr::getInstance()->addControlView(side_bar_tabs); + } LLPanel::Params p; p.name = "buttons_panel"; diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index e4773f99c5..5d20e280b5 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -36,6 +36,8 @@ #include "llweb.h" +#include "llurlregistry.h" + const std::string LLSLURL::PREFIX_SL_HELP = "secondlife://app."; const std::string LLSLURL::PREFIX_SL = "sl://"; const std::string LLSLURL::PREFIX_SECONDLIFE = "secondlife://"; @@ -95,6 +97,20 @@ bool LLSLURL::isSLURL(const std::string& url) return false; } +bool LLSLURL::isValidSLURL(const std::string& url) +{ + std::string temp_url(url); + //"www." may appear in DnD- see description of PREFIX_SLURL_WWW. + // If it is found, we remove it because it isn't expected in regexp. + if (matchPrefix(url, PREFIX_SLURL_WWW)) + { + size_t position = url.find("www."); + temp_url.erase(position,4); + } + + return LLUrlRegistry::getInstance()->isUrl(temp_url); +} + // static bool LLSLURL::isSLURLCommand(const std::string& url) { diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h index 6a695e84f3..a79a8fc97c 100644 --- a/indra/newview/llslurl.h +++ b/indra/newview/llslurl.h @@ -61,6 +61,11 @@ public: static bool isSLURL(const std::string& url); /** + * Returns true if url is proven valid by regexp check from LLUrlRegistry + */ + static bool isValidSLURL(const std::string& url); + + /** * Is this a special secondlife://app/ URL? */ static bool isSLURLCommand(const std::string& url); diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2a57d48f16..d6e9256fee 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -3380,7 +3380,8 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset, mVSize(0.f), mGroup(NULL), mFace(NULL), - mDistance(0.f) + mDistance(0.f), + mDrawMode(LLRender::TRIANGLES) { mDebugColor = (rand() << 16) + rand(); if (mStart >= mVertexBuffer->getRequestedVerts() || diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 64c2a9acbc..7896488379 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -93,6 +93,7 @@ public: LLFace* mFace; //associated face F32 mDistance; LLVector3 mExtents[2]; + U32 mDrawMode; struct CompareTexture { diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index d33c050ee4..cc06179481 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -65,8 +65,12 @@ public: * * @param speaker_id LLUUID of an avatar whose speaking indicator is registered. * @param speaking_indicator instance of the speaking indicator to be registered. + * @param session_id session UUID for which indicator should be shown only. + * If this parameter is set registered indicator will be shown only in voice channel + * which has the same session id (EXT-5562). */ - void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator); + void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator, + const LLUUID& session_id = LLUUID::null); /** * Removes passed speaking indicator from observing. @@ -138,15 +142,18 @@ private: ////////////////////////////////////////////////////////////////////////// // PUBLIC SECTION ////////////////////////////////////////////////////////////////////////// -void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator) +void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator, + const LLUUID& session_id) { // do not exclude agent's indicators. They should be processed in the same way as others. See EXT-3889. - LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << "|"<< speaking_indicator << LL_ENDL; + LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << "|"<< speaking_indicator << ", session: " << session_id << LL_ENDL; ensureInstanceDoesNotExist(speaking_indicator); + speaking_indicator->setTargetSessionID(session_id); + speaking_indicator_value_t value_type(speaker_id, speaking_indicator); mSpeakingIndicators.insert(value_type); @@ -217,6 +224,13 @@ void SpeakingIndicatorManager::onChange() void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on) { + LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel(); + LLUUID session_id; + if (voice_channel) + { + session_id = voice_channel->getSessionID(); + } + speaker_ids_t::const_iterator it_uuid = speakers_uuids.begin(); for (; it_uuid != speakers_uuids.end(); ++it_uuid) { @@ -224,18 +238,36 @@ void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& spea indicator_range_t it_range = mSpeakingIndicators.equal_range(*it_uuid); indicator_const_iterator it_indicator = it_range.first; bool was_found = false; + bool was_switched_on = false; for (; it_indicator != it_range.second; ++it_indicator) { was_found = true; LLSpeakingIndicator* indicator = (*it_indicator).second; - indicator->switchIndicator(switch_on); + + BOOL switch_current_on = switch_on; + + // we should show indicator for specified voice session only if this is current channel. EXT-5562. + if (switch_current_on && indicator->getTargetSessionID().notNull()) + { + switch_current_on = indicator->getTargetSessionID() == session_id; + LL_DEBUGS("SpeakingIndicator") << "Session: " << session_id << ", target: " << indicator->getTargetSessionID() << ", the same? = " << switch_current_on << LL_ENDL; + } + was_switched_on = was_switched_on || switch_current_on; + + indicator->switchIndicator(switch_current_on); + } if (was_found) { LL_DEBUGS("SpeakingIndicator") << mSpeakingIndicators.count(*it_uuid) << " indicators where found" << LL_ENDL; - if (switch_on) + if (switch_on && !was_switched_on) + { + LL_DEBUGS("SpeakingIndicator") << "but non of them where switched on" << LL_ENDL; + } + + if (was_switched_on) { // store switched on indicator to be able switch it off mSwitchedIndicatorsOn.insert(*it_uuid); @@ -274,9 +306,10 @@ void SpeakingIndicatorManager::ensureInstanceDoesNotExist(LLSpeakingIndicator* c /* LLSpeakingIndicatorManager namespace implementation */ /************************************************************************/ -void LLSpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator) +void LLSpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator, + const LLUUID& session_id) { - SpeakingIndicatorManager::instance().registerSpeakingIndicator(speaker_id, speaking_indicator); + SpeakingIndicatorManager::instance().registerSpeakingIndicator(speaker_id, speaking_indicator, session_id); } void LLSpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator) diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h index ce0158f7d8..8d7aba1d6c 100644 --- a/indra/newview/llspeakingindicatormanager.h +++ b/indra/newview/llspeakingindicatormanager.h @@ -35,10 +35,28 @@ #ifndef LL_LLSPEAKINGINDICATORMANAGER_H #define LL_LLSPEAKINGINDICATORMANAGER_H +class SpeakingIndicatorManager; + class LLSpeakingIndicator { public: + virtual ~LLSpeakingIndicator(){} virtual void switchIndicator(bool switch_on) = 0; + +private: + friend class SpeakingIndicatorManager; + // Accessors for target voice session UUID. + // They are intended to be used only from SpeakingIndicatorManager to ensure target session is + // the same indicator was registered with. + void setTargetSessionID(const LLUUID& session_id) { mTargetSessionID = session_id; } + const LLUUID& getTargetSessionID() { return mTargetSessionID; } + + /** + * session UUID for which indicator should be shown only. + * If it is set, registered indicator will be shown only in voice channel + * which has the same session id (EXT-5562). + */ + LLUUID mTargetSessionID; }; // See EXT-3976. @@ -52,8 +70,12 @@ namespace LLSpeakingIndicatorManager * * @param speaker_id LLUUID of an avatar whose speaker indicator is registered. * @param speaking_indicator instance of the speaker indicator to be registered. + * @param session_id session UUID for which indicator should be shown only. + * If this parameter is set registered indicator will be shown only in voice channel + * which has the same session id (EXT-5562). */ - void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator); + void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator, + const LLUUID& session_id); /** * Removes passed speaking indicator from observing. diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp index ffd9bc7624..e5323db466 100644 --- a/indra/newview/llsplitbutton.cpp +++ b/indra/newview/llsplitbutton.cpp @@ -165,7 +165,7 @@ void LLSplitButton::showButtons() // register ourselves as a "top" control // effectively putting us into a special draw layer - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); mItemsPanel->setFocus(TRUE); @@ -182,10 +182,7 @@ void LLSplitButton::hideButtons() mArrowBtn->setToggleState(FALSE); setUseBoundingRect(FALSE); - if(gFocusMgr.getTopCtrl() == this) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(this); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 136989166f..025dd6029a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -121,7 +121,6 @@ #include "lllogininstance.h" // Host the login module. #include "llpanellogin.h" #include "llmutelist.h" -#include "llpanelavatar.h" #include "llavatarpropertiesprocessor.h" #include "llfloaterevent.h" #include "llpanelclassified.h" @@ -200,10 +199,6 @@ #include "lldxhardware.h" #endif -#if (LL_LINUX || LL_SOLARIS) && LL_GTK -#include <glib/gspawn.h> -#endif - // // exported globals // @@ -2899,7 +2894,9 @@ bool process_login_success_response() text = response["agent_region_access"].asString(); if (!text.empty()) { - int preferredMaturity = LLAgent::convertTextToMaturity(text[0]); + U32 preferredMaturity = + llmin((U32)LLAgent::convertTextToMaturity(text[0]), + gSavedSettings.getU32("PreferredMaturity")); gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } // During the AO transition, this flag will be true. Then the flag will diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index bff32af228..9206b4a43a 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -41,6 +41,7 @@ #include "llviewercontrol.h" #include "llfloaterbuycurrency.h" #include "llfloaterlagmeter.h" +#include "llpanelnearbymedia.h" #include "llpanelvolumepulldown.h" #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" @@ -49,6 +50,7 @@ #include "llkeyboard.h" #include "lllineeditor.h" #include "llmenugl.h" +#include "llrootview.h" #include "llsd.h" #include "lltextbox.h" #include "llui.h" @@ -61,6 +63,7 @@ #include "llresmgr.h" #include "llworld.h" #include "llstatgraph.h" +#include "llviewermedia.h" #include "llviewermenu.h" // for gMenuBarView #include "llviewerparcelmgr.h" #include "llviewerthrottle.h" @@ -130,7 +133,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) // status bar can possible overlay menus? setMouseOpaque(FALSE); - setIsChrome(TRUE); // size of day of the weeks and year sDays.reserve(7); @@ -140,9 +142,39 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mHealthTimer = new LLFrameTimer(); LLUICtrlFactory::getInstance()->buildPanel(this,"panel_status_bar.xml"); +} + +LLStatusBar::~LLStatusBar() +{ + delete mBalanceTimer; + mBalanceTimer = NULL; + + delete mHealthTimer; + mHealthTimer = NULL; + + // LLView destructor cleans up children +} + +//----------------------------------------------------------------------- +// Overrides +//----------------------------------------------------------------------- + +// virtual +void LLStatusBar::draw() +{ + refresh(); + LLPanel::draw(); +} - // status bar can never get a tab - setFocusRoot(FALSE); +BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask) +{ + show_navbar_context_menu(this,x,y); + return TRUE; +} + +BOOL LLStatusBar::postBuild() +{ + gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3)); // build date necessary data (must do after panel built) setupDate(); @@ -158,7 +190,10 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mBtnVolume = getChild<LLButton>( "volume_btn" ); mBtnVolume->setClickedCallback( onClickVolume, this ); mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); - mBtnVolume->setIsChrome(TRUE); + + mMediaToggle = getChild<LLButton>("media_toggle_btn"); + mMediaToggle->setClickedCallback( &LLStatusBar::onClickMediaToggle, this ); + mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this)); gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2)); @@ -206,51 +241,13 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mPanelVolumePulldown = new LLPanelVolumePulldown(); addChild(mPanelVolumePulldown); - - LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect(); - LLButton* volbtn = getChild<LLButton>( "volume_btn" ); - volume_pulldown_rect.setLeftTopAndSize(volbtn->getRect().mLeft - - (volume_pulldown_rect.getWidth() - volbtn->getRect().getWidth())/2, - volbtn->calcScreenRect().mBottom, - volume_pulldown_rect.getWidth(), - volume_pulldown_rect.getHeight()); - - mPanelVolumePulldown->setShape(volume_pulldown_rect); mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT); mPanelVolumePulldown->setVisible(FALSE); -} - -LLStatusBar::~LLStatusBar() -{ - delete mBalanceTimer; - mBalanceTimer = NULL; - delete mHealthTimer; - mHealthTimer = NULL; - - // LLView destructor cleans up children -} - -//----------------------------------------------------------------------- -// Overrides -//----------------------------------------------------------------------- - -// virtual -void LLStatusBar::draw() -{ - refresh(); - LLPanel::draw(); -} - -BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask) -{ - show_navbar_context_menu(this,x,y); - return TRUE; -} - -BOOL LLStatusBar::postBuild() -{ - gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3)); + mPanelNearByMedia = new LLPanelNearByMedia(); + addChild(mPanelNearByMedia); + mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT); + mPanelNearByMedia->setVisible(FALSE); return TRUE; } @@ -356,6 +353,17 @@ void LLStatusBar::refresh() // update the master volume button state bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute(); mBtnVolume->setToggleState(mute_audio); + + // Disable media toggle if there's no media, parcel media, and no parcel audio + // (or if media is disabled) + bool button_enabled = (gSavedSettings.getBOOL("AudioStreamingMusic")||gSavedSettings.getBOOL("AudioStreamingMedia")) && + (LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio()); + mMediaToggle->setEnabled(button_enabled); + // Note the "sense" of the toggle is opposite whether media is playing or not + bool any_media_playing = (LLViewerMedia::isAnyMediaShowing() || + LLViewerMedia::isParcelMediaPlaying() || + LLViewerMedia::isParcelAudioPlaying()); + mMediaToggle->setValue(!any_media_playing); } void LLStatusBar::setVisibleForMouselook(bool visible) @@ -385,8 +393,8 @@ void LLStatusBar::setBalance(S32 balance) LLButton* btn_buy_currency = getChild<LLButton>("buycurrency"); LLStringUtil::format_map_t string_args; string_args["[AMT]"] = llformat("%s", money_str.c_str()); - std::string labe_str = getString("buycurrencylabel", string_args); - btn_buy_currency->setLabel(labe_str); + std::string label_str = getString("buycurrencylabel", string_args); + btn_buy_currency->setLabel(label_str); // Resize the balance button so that the label fits it, and the button expands to the left. // *TODO: LLButton should have an option where to expand. @@ -513,13 +521,51 @@ static void onClickScriptDebug(void*) LLFloaterScriptDebug::show(LLUUID::null); } -//static -void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl) +void LLStatusBar::onMouseEnterVolume() { + LLButton* volbtn = getChild<LLButton>( "volume_btn" ); + LLRect vol_btn_rect = volbtn->getRect(); + LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect(); + volume_pulldown_rect.setLeftTopAndSize(vol_btn_rect.mLeft - + (volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth())/2, + vol_btn_rect.mBottom, + volume_pulldown_rect.getWidth(), + volume_pulldown_rect.getHeight()); + + mPanelVolumePulldown->setShape(volume_pulldown_rect); + + // show the master volume pull-down - gStatusBar->mPanelVolumePulldown->setVisible(TRUE); + LLUI::clearPopups(); + LLUI::addPopup(mPanelVolumePulldown); + mPanelNearByMedia->setVisible(FALSE); + mPanelVolumePulldown->setVisible(TRUE); } +void LLStatusBar::onMouseEnterNearbyMedia() +{ + LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder"); + LLRect nearby_media_rect = mPanelNearByMedia->getRect(); + LLButton* nearby_media_btn = getChild<LLButton>( "media_toggle_btn" ); + LLRect nearby_media_btn_rect = nearby_media_btn->getRect(); + nearby_media_rect.setLeftTopAndSize(nearby_media_btn_rect.mLeft - + (nearby_media_rect.getWidth() - nearby_media_btn_rect.getWidth())/2, + nearby_media_btn_rect.mBottom, + nearby_media_rect.getWidth(), + nearby_media_rect.getHeight()); + // force onscreen + nearby_media_rect.translate(popup_holder->getRect().getWidth() - nearby_media_rect.mRight, 0); + + // show the master volume pull-down + mPanelNearByMedia->setShape(nearby_media_rect); + LLUI::clearPopups(); + LLUI::addPopup(mPanelNearByMedia); + + mPanelVolumePulldown->setVisible(FALSE); + mPanelNearByMedia->setVisible(TRUE); +} + + static void onClickVolume(void* data) { // toggle the master mute setting @@ -527,6 +573,15 @@ static void onClickVolume(void* data) LLAppViewer::instance()->setMasterSystemAudioMute(!mute_audio); } +//static +void LLStatusBar::onClickMediaToggle(void* data) +{ + LLStatusBar *status_bar = (LLStatusBar*)data; + // "Selected" means it was showing the "play" icon (so media was playing), and now it shows "pause", so turn off media + bool enable = ! status_bar->mMediaToggle->getValue(); + LLViewerMedia::setAllMediaEnabled(enable); +} + // sets the static variables necessary for the date void LLStatusBar::setupDate() { diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 21a98dd753..e5240fcc3e 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -48,6 +48,7 @@ class LLUUID; class LLFrameTimer; class LLStatGraph; class LLPanelVolumePulldown; +class LLPanelNearByMedia; class LLStatusBar : public LLPanel @@ -87,6 +88,8 @@ public: S32 getSquareMetersCommitted() const; S32 getSquareMetersLeft() const; + LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; } + private: // simple method to setup the part that holds the date void setupDate(); @@ -94,9 +97,13 @@ private: void onClickBuyCurrency(); void onVolumeChanged(const LLSD& newvalue); - static void onMouseEnterVolume(LLUICtrl* ctrl); + void onMouseEnterVolume(); + void onMouseEnterNearbyMedia(); + void onClickScreen(S32 x, S32 y); static void onClickStatGraph(void* data); + static void onClickMediaToggle(void* data); + private: LLTextBox *mTextHealth; LLTextBox *mTextTime; @@ -105,6 +112,7 @@ private: LLStatGraph *mSGPacketLoss; LLButton *mBtnVolume; + LLButton *mMediaToggle; S32 mBalance; S32 mHealth; @@ -113,6 +121,7 @@ private: LLFrameTimer* mBalanceTimer; LLFrameTimer* mHealthTimer; LLPanelVolumePulldown* mPanelVolumePulldown; + LLPanelNearByMedia* mPanelNearByMedia; static std::vector<std::string> sDays; static std::vector<std::string> sMonths; static const U32 MAX_DATE_STRING_LENGTH; diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 127b4265ca..66373feb93 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -211,22 +211,25 @@ void LLSysWellWindow::reshapeWindow() // it includes height from floater top to list top and from floater bottom and list bottom static S32 parent_list_delta_height = getRect().getHeight() - mMessageList->getRect().getHeight(); - S32 notif_list_height = mMessageList->getItemsRect().getHeight() + 2 * mMessageList->getBorderWidth(); + if (isDocked()) // Don't reshape undocked Well window. See EXT-5715. + { + S32 notif_list_height = mMessageList->getItemsRect().getHeight() + 2 * mMessageList->getBorderWidth(); - LLRect curRect = getRect(); + LLRect curRect = getRect(); - S32 new_window_height = notif_list_height + parent_list_delta_height; + S32 new_window_height = notif_list_height + parent_list_delta_height; - if (new_window_height > MAX_WINDOW_HEIGHT) - { - new_window_height = MAX_WINDOW_HEIGHT; - } - S32 newY = curRect.mTop + new_window_height - curRect.getHeight(); - S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH + if (new_window_height > MAX_WINDOW_HEIGHT) + { + new_window_height = MAX_WINDOW_HEIGHT; + } + S32 newY = curRect.mTop + new_window_height - curRect.getHeight(); + S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH : curRect.getWidth(); - curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height); - reshape(curRect.getWidth(), curRect.getHeight(), TRUE); - setRect(curRect); + curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height); + reshape(curRect.getWidth(), curRect.getHeight(), TRUE); + setRect(curRect); + } // update notification channel state // update on a window reshape is important only when a window is visible and docked diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index ddb6405c41..386b636367 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -167,8 +167,8 @@ void LLTexLayerSetBuffer::popProjection() const BOOL LLTexLayerSetBuffer::needsRender() { const LLVOAvatarSelf* avatar = mTexLayerSet->getAvatar(); - BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal(); - BOOL needs_update = gAgentQueryManager.hasNoPendingQueries() && (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating; + BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && gAgentQueryManager.hasNoPendingQueries(); + BOOL needs_update = (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating; if (needs_update) { BOOL invalid_skirt = avatar->getBakedTE(mTexLayerSet) == LLVOAvatarDefines::TEX_SKIRT_BAKED && !avatar->isWearingWearableType(WT_SKIRT); @@ -1130,7 +1130,8 @@ LLTexLayerInterface::LLTexLayerInterface(LLTexLayerSet* const layer_set): } LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWearable *wearable): - mTexLayerSet( layer.mTexLayerSet ) + mTexLayerSet( layer.mTexLayerSet ), + mInfo(NULL) { // don't add visual params for cloned layers setInfo(layer.getInfo(), wearable); @@ -1140,11 +1141,12 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable ) // This sets mInfo and calls initialization functions { - //llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating - if (mInfo != NULL) // above llassert(), but softened into a warning - { - llwarns << "BAD STUFF! mInfo != NULL" << llendl; - } + // setInfo should only be called once. Code is not robust enough to handle redefinition of a texlayer. + // Not a critical warning, but could be useful for debugging later issues. -Nyx + if (mInfo != NULL) + { + llwarns << "mInfo != NULL" << llendl; + } mInfo = info; //mID = info->mID; // No ID @@ -1881,6 +1883,11 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i) /*virtual*/ BOOL LLTexLayerTemplate::render(S32 x, S32 y, S32 width, S32 height) { + if(!mInfo) + { + return FALSE ; + } + BOOL success = TRUE; updateWearableCache(); for (wearable_cache_t::const_iterator iter = mWearableCache.begin(); iter!= mWearableCache.end(); iter++) diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 91c303c79e..49770030c6 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -750,6 +750,8 @@ LLTextureCache::LLTextureCache(bool threaded) LLTextureCache::~LLTextureCache() { + clearDeleteList() ; + writeUpdatedEntries() ; } ////////////////////////////////////////////////////////////////////////////// @@ -757,6 +759,9 @@ LLTextureCache::~LLTextureCache() //virtual S32 LLTextureCache::update(U32 max_time_ms) { + static LLFrameTimer timer ; + static const F32 MAX_TIME_INTERVAL = 300.f ; //seconds. + S32 res; res = LLWorkerThread::update(max_time_ms); @@ -792,6 +797,12 @@ S32 LLTextureCache::update(U32 max_time_ms) responder->completed(success); } + if(!res && timer.getElapsedTimeF32() > MAX_TIME_INTERVAL) + { + timer.reset() ; + writeUpdatedEntries() ; + } + return res; } @@ -1082,6 +1093,8 @@ S32 LLTextureCache::openAndReadEntry(const LLUUID& id, Entry& entry, bool create entry.init(id, time(NULL)); // Update Header writeEntriesHeader(); + + //the new entry, write immediately. // Write Entry S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry); LLAPRFile* aprfile = openHeaderEntriesFile(false, offset); @@ -1097,12 +1110,20 @@ S32 LLTextureCache::openAndReadEntry(const LLUUID& id, Entry& entry, bool create // Remove this entry from the LRU if it exists mLRU.erase(id); // Read the entry - S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry); - LLAPRFile* aprfile = openHeaderEntriesFile(true, offset); - S32 bytes_read = aprfile->read((void*)&entry, (S32)sizeof(Entry)); - llassert_always(bytes_read == sizeof(Entry)); + idx_entry_map_t::iterator iter = mUpdatedEntryMap.find(idx) ; + if(iter != mUpdatedEntryMap.end()) + { + entry = iter->second ; + } + else + { + S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry); + LLAPRFile* aprfile = openHeaderEntriesFile(true, offset); + S32 bytes_read = aprfile->read((void*)&entry, (S32)sizeof(Entry)); + llassert_always(bytes_read == sizeof(Entry)); + closeHeaderEntriesFile(); + } llassert_always(entry.mImageSize == 0 || entry.mImageSize == -1 || entry.mImageSize > entry.mBodySize); - closeHeaderEntriesFile(); } return idx; } @@ -1119,13 +1140,13 @@ void LLTextureCache::writeEntryAndClose(S32 idx, Entry& entry) { mTexturesSizeMap[entry.mID] = entry.mBodySize; } + else if(mTexturesSizeMap.find(entry.mID) != mTexturesSizeMap.end() && mTexturesSizeMap[entry.mID] > 0) + { + llerrs << "mTexturesSizeMap / mHeaderIDMap corrupted." << llendl ; + } // llinfos << "Updating TE: " << idx << ": " << id << " Size: " << entry.mBodySize << " Time: " << entry.mTime << llendl; - S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry); - LLAPRFile* aprfile = openHeaderEntriesFile(false, offset); - S32 bytes_written = aprfile->write((void*)&entry, (S32)sizeof(Entry)); - llassert_always(bytes_written == sizeof(Entry)); mHeaderEntriesMaxWriteIdx = llmax(mHeaderEntriesMaxWriteIdx, idx); - closeHeaderEntriesFile(); + mUpdatedEntryMap[idx] = entry ; } } } @@ -1140,6 +1161,7 @@ U32 LLTextureCache::openAndReadEntries(std::vector<Entry>& entries) mTexturesSizeTotal = 0; LLAPRFile* aprfile = openHeaderEntriesFile(false, (S32)sizeof(EntriesInfo)); + updatedHeaderEntriesFile() ; for (U32 idx=0; idx<num_entries; idx++) { Entry entry; @@ -1190,6 +1212,47 @@ void LLTextureCache::writeEntriesAndClose(const std::vector<Entry>& entries) } } +void LLTextureCache::writeUpdatedEntries() +{ + lockHeaders() ; + if (!mReadOnly && !mUpdatedEntryMap.empty()) + { + openHeaderEntriesFile(false, 0); + updatedHeaderEntriesFile() ; + closeHeaderEntriesFile(); + } + unlockHeaders() ; +} + +//mHeaderMutex is locked and mHeaderAPRFile is created before calling this. +void LLTextureCache::updatedHeaderEntriesFile() +{ + if (!mReadOnly && !mUpdatedEntryMap.empty() && mHeaderAPRFile) + { + //entriesInfo + mHeaderAPRFile->seek(APR_SET, 0); + S32 bytes_written = mHeaderAPRFile->write((U8*)&mHeaderEntriesInfo, sizeof(EntriesInfo)) ; + llassert_always(bytes_written == sizeof(EntriesInfo)); + + //write each updated entry + S32 entry_size = (S32)sizeof(Entry) ; + S32 prev_idx = -1 ; + S32 delta_idx ; + for (idx_entry_map_t::iterator iter = mUpdatedEntryMap.begin(); iter != mUpdatedEntryMap.end(); ++iter) + { + delta_idx = iter->first - prev_idx - 1; + prev_idx = iter->first ; + if(delta_idx) + { + mHeaderAPRFile->seek(APR_CUR, delta_idx * entry_size); + } + + bytes_written = mHeaderAPRFile->write((void*)(&iter->second), entry_size); + llassert_always(bytes_written == entry_size); + } + mUpdatedEntryMap.clear() ; + } +} //---------------------------------------------------------------------------- // Called from either the main thread or the worker thread @@ -1391,6 +1454,10 @@ void LLTextureCache::purgeTextures(bool validate) time_idx_set.insert(std::make_pair(entries[idx].mTime, idx)); // llinfos << "TIME: " << entries[idx].mTime << " TEX: " << entries[idx].mID << " IDX: " << idx << " Size: " << entries[idx].mImageSize << llendl; } + else + { + llerrs << "mTexturesSizeMap / mHeaderIDMap corrupted." << llendl ; + } } } @@ -1574,6 +1641,11 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort) { worker = iter->second; complete = worker->complete(); + + if(!complete && abort) + { + abortRequest(handle, true) ; + } } if (worker && (complete || abort)) { diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h index 64ec881fc3..b840619c1f 100644 --- a/indra/newview/lltexturecache.h +++ b/indra/newview/lltexturecache.h @@ -68,6 +68,7 @@ private: Entry(const LLUUID& id, S32 imagesize, S32 bodysize, U32 time) : mID(id), mImageSize(imagesize), mBodySize(bodysize), mTime(time) {} void init(const LLUUID& id, U32 time) { mID = id, mImageSize = 0; mBodySize = 0; mTime = time; } + Entry& operator=(const Entry& entry) {mID = entry.mID, mImageSize = entry.mImageSize; mBodySize = entry.mBodySize; mTime = entry.mTime; return *this;} LLUUID mID; // 16 bytes S32 mImageSize; // total size of image if known S32 mBodySize; // size of body file in body cache @@ -166,6 +167,8 @@ private: S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize); S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize); bool removeHeaderCacheEntry(const LLUUID& id); + void writeUpdatedEntries() ; + void updatedHeaderEntriesFile() ; void lockHeaders() { mHeaderMutex.lock(); } void unlockHeaders() { mHeaderMutex.unlock(); } @@ -204,6 +207,9 @@ private: S64 mTexturesSizeTotal; LLAtomic32<BOOL> mDoPurge; + typedef std::map<S32, Entry> idx_entry_map_t; + idx_entry_map_t mUpdatedEntryMap; + // Statics static F32 sHeaderCacheVersion; static U32 sCacheMaxEntries; diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 8ca92c3d87..837f837430 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -183,6 +183,8 @@ public: void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder); + LLViewerFetchedTexture* getTexture() { return mTexturep; } + private: BOOL allowDrop(LLInventoryItem* item); BOOL doDrop(LLInventoryItem* item); diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 6c35464a51..b1b3ae473c 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -431,11 +431,11 @@ LLTextureFetchWorker::~LLTextureFetchWorker() // << " Desired=" << mDesiredDiscard << llendl; llassert_always(!haveWork()); lockWorkMutex(); - if (mCacheReadHandle != LLTextureCache::nullHandle()) + if (mCacheReadHandle != LLTextureCache::nullHandle() && mFetcher->mTextureCache) { mFetcher->mTextureCache->readComplete(mCacheReadHandle, true); } - if (mCacheWriteHandle != LLTextureCache::nullHandle()) + if (mCacheWriteHandle != LLTextureCache::nullHandle() && mFetcher->mTextureCache) { mFetcher->mTextureCache->writeComplete(mCacheWriteHandle, true); } @@ -491,7 +491,7 @@ U32 LLTextureFetchWorker::calcWorkPriority() //llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerFetchedTexture::maxDecodePriority()); static const F32 PRIORITY_SCALE = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority(); - mWorkPriority = (U32)(mImagePriority * PRIORITY_SCALE); + mWorkPriority = llmin((U32)LLWorkerThread::PRIORITY_LOWBITS, (U32)(mImagePriority * PRIORITY_SCALE)); return mWorkPriority; } @@ -1429,6 +1429,8 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image LLTextureFetch::~LLTextureFetch() { + clearDeleteList() ; + // ~LLQueuedThread() called here } @@ -1737,6 +1739,26 @@ S32 LLTextureFetch::update(U32 max_time_ms) return res; } +//called in the MAIN thread after the TextureCacheThread shuts down. +void LLTextureFetch::shutDownTextureCacheThread() +{ + if(mTextureCache) + { + llassert_always(mTextureCache->isQuitting() || mTextureCache->isStopped()) ; + mTextureCache = NULL ; + } +} + +//called in the MAIN thread after the ImageDecodeThread shuts down. +void LLTextureFetch::shutDownImageDecodeThread() +{ + if(mImageDecodeThread) + { + llassert_always(mImageDecodeThread->isQuitting() || mImageDecodeThread->isStopped()) ; + mImageDecodeThread = NULL ; + } +} + // WORKER THREAD void LLTextureFetch::startThread() { diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 5213c4f488..ef2ec520bf 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -58,6 +58,8 @@ public: ~LLTextureFetch(); /*virtual*/ S32 update(U32 max_time_ms); + void shutDownTextureCacheThread() ; //called in the main thread after the TextureCacheThread shuts down. + void shutDownImageDecodeThread() ; //called in the main thread after the ImageDecodeThread shuts down. bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority, S32 w, S32 h, S32 c, S32 discard, bool needs_aux); diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 98731f90f4..6cd8a78b25 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -658,6 +658,14 @@ struct compare_decode_pair } }; +struct KillView +{ + void operator()(LLView* viewp) const + { + viewp->die(); + } +}; + void LLTextureView::draw() { if (!mFreezeView) @@ -665,12 +673,12 @@ void LLTextureView::draw() // LLViewerObject *objectp; // S32 te; - for_each(mTextureBars.begin(), mTextureBars.end(), DeletePointer()); + for_each(mTextureBars.begin(), mTextureBars.end(), KillView()); mTextureBars.clear(); - - delete mGLTexMemBar; + + delete mGLTexMemBar; mGLTexMemBar = 0; - + typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t; display_list_t display_image_list; @@ -683,6 +691,10 @@ void LLTextureView::draw() iter != gTextureList.mImageList.end(); ) { LLPointer<LLViewerFetchedTexture> imagep = *iter++; + if(!imagep->hasFetcher()) + { + continue ; + } S32 cur_discard = imagep->getDiscardLevel(); S32 desired_discard = imagep->mDesiredDiscardLevel; diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 110d158e2d..60a89c02e4 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -68,12 +68,17 @@ LLToast::LLToast(const LLToast::Params& p) mNotification(p.notification), mIsHidden(false), mHideBtnPressed(false), - mIsTip(p.is_tip) + mIsTip(p.is_tip), + mWrapperPanel(NULL) { LLUICtrlFactory::getInstance()->buildFloater(this, "panel_toast.xml", NULL); setCanDrag(FALSE); + mWrapperPanel = getChild<LLPanel>("wrapper_panel"); + mWrapperPanel->setMouseEnterCallback(boost::bind(&LLToast::onToastMouseEnter, this)); + mWrapperPanel->setMouseLeaveCallback(boost::bind(&LLToast::onToastMouseLeave, this)); + if(mPanel) { insertPanel(mPanel); @@ -83,6 +88,8 @@ LLToast::LLToast(const LLToast::Params& p) { mHideBtn = getChild<LLButton>("hide_btn"); mHideBtn->setClickedCallback(boost::bind(&LLToast::hide,this)); + mHideBtn->setMouseEnterCallback(boost::bind(&LLToast::onToastMouseEnter, this)); + mHideBtn->setMouseLeaveCallback(boost::bind(&LLToast::onToastMouseLeave, this)); } // init callbacks if present @@ -174,6 +181,42 @@ void LLToast::hide() mOnFadeSignal(this); } +void LLToast::onFocusLost() +{ + if(mWrapperPanel && !isBackgroundVisible()) + { + // Lets make wrapper panel behave like a floater + setBackgroundOpaque(FALSE); + } +} + +void LLToast::onFocusReceived() +{ + if(mWrapperPanel && !isBackgroundVisible()) + { + // Lets make wrapper panel behave like a floater + setBackgroundOpaque(TRUE); + } +} + +S32 LLToast::getTopPad() +{ + if(mWrapperPanel) + { + return getRect().getHeight() - mWrapperPanel->getRect().getHeight(); + } + return 0; +} + +S32 LLToast::getRightPad() +{ + if(mWrapperPanel) + { + return getRect().getWidth() - mWrapperPanel->getRect().getWidth(); + } + return 0; +} + //-------------------------------------------------------------------------- void LLToast::setCanFade(bool can_fade) { @@ -199,22 +242,21 @@ void LLToast::reshapeToPanel() if(!panel) return; - LLRect panel_rect; + LLRect panel_rect = panel->getRect(); - panel_rect = panel->getRect(); - reshape(panel_rect.getWidth(), panel_rect.getHeight()); panel_rect.setLeftTopAndSize(0, panel_rect.getHeight(), panel_rect.getWidth(), panel_rect.getHeight()); - panel->setRect(panel_rect); + panel->setShape(panel_rect); LLRect toast_rect = getRect(); - toast_rect.setLeftTopAndSize(toast_rect.mLeft,toast_rect.mTop,panel_rect.getWidth(), panel_rect.getHeight()); - setRect(toast_rect); + toast_rect.setLeftTopAndSize(toast_rect.mLeft, toast_rect.mTop, + panel_rect.getWidth() + getRightPad(), panel_rect.getHeight() + getTopPad()); + setShape(toast_rect); } void LLToast::insertPanel(LLPanel* panel) { - addChild(panel); + mWrapperPanel->addChild(panel); reshapeToPanel(); } @@ -227,6 +269,19 @@ void LLToast::draw() } LLFloater::draw(); + + if(!isBackgroundVisible()) + { + // Floater background is invisible, lets make wrapper panel look like a + // floater - draw shadow. + drawShadow(mWrapperPanel); + + // Shadow will probably overlap close button, lets redraw the button + if(mHideBtn) + { + drawChild(mHideBtn); + } + } } //-------------------------------------------------------------------------- @@ -261,43 +316,78 @@ void LLToast::setVisible(BOOL show) } } -//-------------------------------------------------------------------------- -void LLToast::onMouseEnter(S32 x, S32 y, MASK mask) +void LLToast::onToastMouseEnter() { - mOnToastHoverSignal(this, MOUSE_ENTER); + LLRect panel_rc = mWrapperPanel->calcScreenRect(); + LLRect button_rc; + if(mHideBtn) + { + button_rc = mHideBtn->calcScreenRect(); + } - setBackgroundOpaque(TRUE); + S32 x, y; + LLUI::getMousePositionScreen(&x, &y); - //toasts fading is management by Screen Channel - - sendChildToFront(mHideBtn); - if(mHideBtn && mHideBtn->getEnabled()) - mHideBtn->setVisible(TRUE); - mOnMouseEnterSignal(this); + if(panel_rc.pointInRect(x, y) || button_rc.pointInRect(x, y)) + { + mOnToastHoverSignal(this, MOUSE_ENTER); + + setBackgroundOpaque(TRUE); + + //toasts fading is management by Screen Channel - LLModalDialog::onMouseEnter(x, y, mask); + sendChildToFront(mHideBtn); + if(mHideBtn && mHideBtn->getEnabled()) + { + mHideBtn->setVisible(TRUE); + } + mOnMouseEnterSignal(this); + mToastMouseEnterSignal(this, getValue()); + } } -//-------------------------------------------------------------------------- -void LLToast::onMouseLeave(S32 x, S32 y, MASK mask) -{ - mOnToastHoverSignal(this, MOUSE_LEAVE); +void LLToast::onToastMouseLeave() +{ + LLRect panel_rc = mWrapperPanel->calcScreenRect(); + LLRect button_rc; + if(mHideBtn) + { + button_rc = mHideBtn->calcScreenRect(); + } - //toasts fading is management by Screen Channel + S32 x, y; + LLUI::getMousePositionScreen(&x, &y); - if(mHideBtn && mHideBtn->getEnabled()) + if( !panel_rc.pointInRect(x, y) && !button_rc.pointInRect(x, y)) { - if( mHideBtnPressed ) + mOnToastHoverSignal(this, MOUSE_LEAVE); + + //toasts fading is management by Screen Channel + + if(mHideBtn && mHideBtn->getEnabled()) { - mHideBtnPressed = false; - return; + if( mHideBtnPressed ) + { + mHideBtnPressed = false; + return; + } + mHideBtn->setVisible(FALSE); } - mHideBtn->setVisible(FALSE); + mToastMouseLeaveSignal(this, getValue()); } - - LLModalDialog::onMouseLeave(x, y, mask); } +void LLToast::setBackgroundOpaque(BOOL b) +{ + if(mWrapperPanel && !isBackgroundVisible()) + { + mWrapperPanel->setBackgroundOpaque(b); + } + else + { + LLModalDialog::setBackgroundOpaque(b); + } +} void LLNotificationsUI::LLToast::stopFading() { @@ -315,6 +405,13 @@ void LLNotificationsUI::LLToast::startFading() } } +bool LLToast::isHovered() +{ + S32 x, y; + LLUI::getMousePositionScreen(&x, &y); + return mWrapperPanel->calcScreenRect().pointInRect(x, y); +} + //-------------------------------------------------------------------------- BOOL LLToast::handleMouseDown(S32 x, S32 y, MASK mask) diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 3d25fd4f02..64855020a9 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -86,8 +86,6 @@ public: // Toast handlers virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual void onMouseEnter(S32 x, S32 y, MASK mask); - virtual void onMouseLeave(S32 x, S32 y, MASK mask); //Fading @@ -97,6 +95,7 @@ public: /** Start fading timer */ virtual void startFading(); + bool isHovered(); // Operating with toasts // insert a panel to a toast @@ -118,10 +117,22 @@ public: virtual void draw(); // virtual void setVisible(BOOL show); + + /*virtual*/ void setBackgroundOpaque(BOOL b); // virtual void hide(); + /*virtual*/ void onFocusLost(); + + /*virtual*/ void onFocusReceived(); + /** + * Returns padding between floater top and wrapper_panel top. + * This padding should be taken into account when positioning or reshaping toasts + */ + S32 getTopPad(); + + S32 getRightPad(); // get/set Toast's flags or states // get information whether the notification corresponding to the toast is valid or not @@ -154,9 +165,15 @@ public: toast_hover_check_signal_t mOnToastHoverSignal; boost::signals2::connection setOnToastHoverCallback(toast_hover_check_callback_t cb) { return mOnToastHoverSignal.connect(cb); } + boost::signals2::connection setMouseEnterCallback( const commit_signal_t::slot_type& cb ) { return mToastMouseEnterSignal.connect(cb); }; + boost::signals2::connection setMouseLeaveCallback( const commit_signal_t::slot_type& cb ) { return mToastMouseLeaveSignal.connect(cb); }; private: + void onToastMouseEnter(); + + void onToastMouseLeave(); + void handleTipToastClick(S32 x, S32 y, MASK mask); // check timer @@ -168,6 +185,8 @@ private: LLUUID mSessionID; LLNotificationPtr mNotification; + LLPanel* mWrapperPanel; + // timer counts a lifetime of a toast LLTimer mTimer; F32 mToastLifetime; // in seconds @@ -184,6 +203,9 @@ private: bool mHideBtnPressed; bool mIsHidden; // this flag is TRUE when a toast has faded or was hidden with (x) button (EXT-1849) bool mIsTip; + + commit_signal_t mToastMouseEnterSignal; + commit_signal_t mToastMouseLeaveSignal; }; } diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index cb43beb819..26d3bd5192 100644 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -66,12 +66,13 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif std::string font_size = LLFontGL::sizeFromFont(fontp); style_params.font.name(font_name); style_params.font.size(font_size); - style_params.font.style = "UNDERLINE"; + //Handle IRC styled /me messages. std::string prefix = p.message.substr(0, 4); if (prefix == "/me " || prefix == "/me'") { + //style_params.font.style = "UNDERLINE"; mMessage->clear(); style_params.font.style ="ITALIC"; @@ -82,7 +83,8 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif } else { - mMessage->setValue(p.message); + style_params.font.style = "NORMAL"; + mMessage->setText(p.message, style_params); } mAvatarName->setValue(p.from); diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 980b51337f..e6d13a7613 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -46,13 +46,14 @@ #include "llnotificationsutil.h" const S32 BOTTOM_PAD = VPAD * 3; +const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding S32 BUTTON_WIDTH = 90; //static const LLFontGL* LLToastNotifyPanel::sFont = NULL; const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL; -LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) : +LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification, const LLRect& rect) : LLToastPanel(notification), mTextBox(NULL), mInfoPanel(NULL), @@ -62,6 +63,10 @@ mNumButtons(0), mAddedDefaultBtn(false) { LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notification.xml"); + if(rect != LLRect::null) + { + this->setShape(rect); + } mInfoPanel = getChild<LLPanel>("info_panel"); mControlPanel = getChild<LLPanel>("control_panel"); BUTTON_WIDTH = gSavedSettings.getS32("ToastButtonWidth"); @@ -127,14 +132,6 @@ mAddedDefaultBtn(false) { std::vector<index_button_pair_t> buttons; buttons.reserve(mNumOptions); - for (S32 i = 0; i < mNumOptions; i++) - { - LLSD form_element = form->getElement(i); - if (form_element["type"].asString() != "button") - { - continue; - } - } S32 buttons_width = 0; // create all buttons and accumulate they total width to reshape mControlPanel for (S32 i = 0; i < mNumOptions; i++) @@ -155,22 +152,47 @@ mAddedDefaultBtn(false) } else { - //try get an average left_pad to spread out buttons - S32 left_pad = (getRect().getWidth() - buttons_width) / (S32(buttons.size() + 1)); - // left_pad can be < 2*HPAD if we have a lot of buttons. - if(left_pad < 2*HPAD) + const S32 button_panel_width = mControlPanel->getRect().getWidth();// do not change width of the panel + S32 button_panel_height = mControlPanel->getRect().getHeight(); + //try get an average h_pad to spread out buttons + S32 h_pad = (button_panel_width - buttons_width) / (S32(buttons.size())); + if(h_pad < 2*HPAD) { - //Probably it is a scriptdialog toast, set default left_pad - left_pad = 2*HPAD; + /* + * Probably it is a scriptdialog toast + * for a scriptdialog toast h_pad can be < 2*HPAD if we have a lot of buttons. + * In last case set default h_pad to avoid heaping of buttons + */ + S32 button_per_row = button_panel_width / BUTTON_WIDTH; + h_pad = (button_panel_width % BUTTON_WIDTH) / (button_per_row - 1);// -1 because we do not need space after last button in a row + if(h_pad < 2*HPAD) // still not enough space between buttons ? + { + h_pad = 2*HPAD; + } } - //how many rows we need to fit all buttons with current width of the panel - S32 button_rows = (buttons_width + left_pad * S32(buttons.size() + 1)) / getRect().getWidth() + 1; - //calculate required panel height - S32 button_panel_height = button_rows *( BTN_HEIGHT + VPAD) + BOTTOM_PAD; - - adjustPanelForScriptNotice(getRect().getWidth(), button_panel_height); - //we begin from lefttop angle and go to rightbottom. - updateButtonsLayout(buttons, left_pad, button_panel_height); + if (mIsScriptDialog) + { + // we are using default width for script buttons so we can determinate button_rows + //to get a number of rows we divide the required width of the buttons to button_panel_width + S32 button_rows = llceil(F32(buttons.size() - 1) * (BUTTON_WIDTH + h_pad) / button_panel_width); + //S32 button_rows = (buttons.size() - 1) * (BUTTON_WIDTH + h_pad) / button_panel_width; + //reserve one row for the ignore_btn + button_rows++; + //calculate required panel height for scripdialog notification. + button_panel_height = button_rows * (BTN_HEIGHT + VPAD) + IGNORE_BTN_TOP_DELTA + BOTTOM_PAD; + } + else + { + // in common case buttons can have different widths so we need to calculate button_rows according to buttons_width + //S32 button_rows = llceil(F32(buttons.size()) * (buttons_width + h_pad) / button_panel_width); + S32 button_rows = llceil(F32((buttons.size() - 1) * h_pad + buttons_width) / button_panel_width); + //calculate required panel height + button_panel_height = button_rows * (BTN_HEIGHT + VPAD) + BOTTOM_PAD; + } + + // we need to keep min width and max height to make visible all buttons, because width of the toast can not be changed + adjustPanelForScriptNotice(button_panel_width, button_panel_height); + updateButtonsLayout(buttons, h_pad); } } // adjust panel's height to the text size @@ -202,7 +224,8 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt mBtnCallbackData.push_back(userdata); LLButton::Params p; - const LLFontGL* font = form_element["index"].asInteger() == -1 ? sFontSmall: sFont; // for ignore button in script dialog + bool is_ignore_btn = form_element["index"].asInteger() == -1; + const LLFontGL* font = is_ignore_btn ? sFontSmall: sFont; // for ignore button in script dialog p.name(form_element["name"].asString()); p.label(form_element["text"].asString()); p.font(font); @@ -210,18 +233,25 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt p.click_callback.function(boost::bind(&LLToastNotifyPanel::onClickButton, userdata)); p.rect.width = BUTTON_WIDTH; p.auto_resize = false; - p.follows.flags(FOLLOWS_RIGHT | FOLLOWS_LEFT | FOLLOWS_BOTTOM); + p.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM); if (mIsCaution) { p.image_color(LLUIColorTable::instance().getColor("ButtonCautionImageColor")); p.image_color_disabled(LLUIColorTable::instance().getColor("ButtonCautionImageColor")); } + // for the scriptdialog buttons we use fixed button size. This is a limit! if (!mIsScriptDialog && font->getWidth(form_element["text"].asString()) > BUTTON_WIDTH) { p.rect.width = 1; p.auto_resize = true; } - + else if (mIsScriptDialog && is_ignore_btn) + { + // this is ignore button,make it smaller + p.rect.height = BTN_HEIGHT_SMALL; + p.rect.width = 1; + p.auto_resize = true; + } LLButton* btn = LLUICtrlFactory::create<LLButton>(p); mNumButtons++; btn->autoResize(); @@ -241,38 +271,48 @@ LLToastNotifyPanel::~LLToastNotifyPanel() LLNotifications::getInstance()->cancel(mNotification); } } -void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 left_pad, S32 top) + +void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 h_pad) { - S32 left = left_pad; + S32 left = 0; + //reserve place for ignore button + S32 bottom_offset = mIsScriptDialog ? (BTN_HEIGHT + IGNORE_BTN_TOP_DELTA + BOTTOM_PAD) : BOTTOM_PAD; + S32 max_width = mControlPanel->getRect().getWidth(); LLButton* ignore_btn = NULL; for (std::vector<index_button_pair_t>::const_iterator it = buttons.begin(); it != buttons.end(); it++) { - if(left + it->second->getRect().getWidth() + 2*HPAD > getRect().getWidth()) - { - // looks like we need to add button to the next row - left = left_pad; - top-= (BTN_HEIGHT + VPAD); - } - LLRect btn_rect(it->second->getRect()); - if(mIsScriptDialog && it->first == -1) + if (it->first == -1) { - //this is ignore button ( index == -1) we need to add it into new extra row at the end ignore_btn = it->second; continue; } - btn_rect.setLeftTopAndSize(left, top, btn_rect.getWidth(), btn_rect.getHeight()); - it->second->setRect(btn_rect); - left = btn_rect.mLeft + btn_rect.getWidth() + left_pad; - addChild(it->second, -1); + LLButton* btn = it->second; + LLRect btn_rect(btn->getRect()); + if (left + btn_rect.getWidth() > max_width)// whether there is still some place for button+h_pad in the mControlPanel + { + // looks like we need to add button to the next row + left = 0; + bottom_offset += (BTN_HEIGHT + VPAD); + } + //we arrange buttons from bottom to top for backward support of old script + btn_rect.setOriginAndSize(left, bottom_offset, btn_rect.getWidth(), btn_rect.getHeight()); + btn->setRect(btn_rect); + left = btn_rect.mLeft + btn_rect.getWidth() + h_pad; + mControlPanel->addChild(btn, -1); } - if(ignore_btn) + if (mIsScriptDialog && ignore_btn != NULL) { - LLRect btn_rect(ignore_btn->getRect()); - btn_rect.setOriginAndSize(getRect().getWidth() - btn_rect.getWidth() - left_pad, - BOTTOM_PAD,// move button at the bottom edge - btn_rect.getWidth(), btn_rect.getHeight()); - ignore_btn->setRect(btn_rect); - addChild(ignore_btn, -1); + LLRect ignore_btn_rect(ignore_btn->getRect()); + S32 buttons_per_row = max_width / BUTTON_WIDTH; //assume that h_pad far less than BUTTON_WIDTH + S32 ignore_btn_left = buttons_per_row * BUTTON_WIDTH + (buttons_per_row - 1) * h_pad - ignore_btn_rect.getWidth(); + if (ignore_btn_left + ignore_btn_rect.getWidth() > max_width)// make sure that the ignore button is in panel + { + ignore_btn_left = max_width - ignore_btn_rect.getWidth() - 2 * HPAD; + } + ignore_btn_rect.setOriginAndSize(ignore_btn_left, BOTTOM_PAD,// always move ignore button at the bottom + ignore_btn_rect.getWidth(), ignore_btn_rect.getHeight()); + ignore_btn->setRect(ignore_btn_rect); + mControlPanel->addChild(ignore_btn, -1); } } @@ -280,18 +320,15 @@ void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 { //adjust layout // we need to keep min width and max height to make visible all buttons, because width of the toast can not be changed - LLRect button_rect = mControlPanel->getRect(); reshape(getRect().getWidth(), mInfoPanel->getRect().getHeight() + button_panel_height + VPAD); - button_rect.set(0, button_rect.mBottom + button_panel_height, button_rect.getWidth(), button_rect.mBottom); - mControlPanel->reshape(button_rect.getWidth(), button_panel_height); - mControlPanel->setRect(button_rect); + mControlPanel->reshape( button_panel_width, button_panel_height); } void LLToastNotifyPanel::adjustPanelForTipNotice() { LLRect info_rect = mInfoPanel->getRect(); LLRect this_rect = getRect(); - + //we don't need display ControlPanel for tips because they doesn't contain any buttons. mControlPanel->setVisible(FALSE); reshape(getRect().getWidth(), mInfoPanel->getRect().getHeight()); @@ -318,4 +355,7 @@ void LLToastNotifyPanel::onClickButton(void* data) response[button_name] = true; } self->mNotification->respond(response); + + // disable all buttons + self->mControlPanel->setEnabled(FALSE); } diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index 1f50c21f6f..152975e7de 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -53,8 +53,17 @@ class LLNotificationForm; class LLToastNotifyPanel: public LLToastPanel { public: - LLToastNotifyPanel(LLNotificationPtr&); + /** + * Constructor for LLToastNotifyPanel. + * + * @param pNotification a shared pointer to LLNotification + * @param rect an initial rectangle of the toast panel. + * If it is null then a loaded from xml rectangle will be used. + * @see LLNotification + */ + LLToastNotifyPanel(LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null); virtual ~LLToastNotifyPanel(); + LLPanel * getControlPanel() { return mControlPanel; } protected: LLButton* createButton(const LLSD& form_element, BOOL is_option); @@ -73,7 +82,13 @@ private: void adjustPanelForScriptNotice(S32 max_width, S32 max_height); void adjustPanelForTipNotice(); void addDefaultButton(); - void updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 left_pad, S32 top); + /* + * It lays out buttons of the notification in mControlPanel. + * Buttons will be placed from BOTTOM to TOP. + * @param h_pad horizontal space between buttons. It is depend on number of buttons. + * @param buttons vector of button to be added. + */ + void updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 h_pad); // panel elements LLTextBase* mTextBox; diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 4fb75f7a49..5f825b461e 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -167,13 +167,16 @@ BOOL LLVisualParamHint::render() LLVisualParamReset::sDirty = TRUE; LLVOAvatar* avatarp = gAgent.getAvatarObject(); + gGL.pushUIMatrix(); + gGL.loadUIIdentity(); + glMatrixMode(GL_PROJECTION); - glPushMatrix(); + gGL.pushMatrix(); glLoadIdentity(); glOrtho(0.0f, mFullWidth, 0.0f, mFullHeight, -1.0f, 1.0f); glMatrixMode(GL_MODELVIEW); - glPushMatrix(); + gGL.pushMatrix(); glLoadIdentity(); LLGLSUIDefault gls_ui; @@ -181,10 +184,10 @@ BOOL LLVisualParamHint::render() mBackgroundp->draw(0, 0, mFullWidth, mFullHeight); glMatrixMode(GL_PROJECTION); - glPopMatrix(); + gGL.popMatrix(); glMatrixMode(GL_MODELVIEW); - glPopMatrix(); + gGL.popMatrix(); mNeedsUpdate = FALSE; mIsVisible = TRUE; @@ -247,6 +250,7 @@ BOOL LLVisualParamHint::render() mVisualParam->setWeight(mLastParamWeight, FALSE); gGL.color4f(1,1,1,1); mGLTexturep->setGLTextureCreated(true); + gGL.popUIMatrix(); return TRUE; } diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fdf9e1df2e..2f4a69a53c 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l || !existing_inspector->getVisible() || existing_inspector->getKey()["object_id"].asUUID() != hover_object->getID())) { + + // Add price to tooltip for items on sale + bool for_sale = for_sale_selection(nodep); + if(for_sale) + { + LLStringUtil::format_map_t args; + args["[PRICE]"] = llformat ("%d", nodep->mSaleInfo.getSalePrice()); + tooltip_msg.append(LLTrans::getString("TooltipPrice", args) ); + } + if (nodep->mName.empty()) { tooltip_msg.append(LLTrans::getString("TooltipNoName")); @@ -931,7 +941,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (media_impl.notNull() && (media_impl->hasMedia())) { is_media_displaying = true; - LLStringUtil::format_map_t args; + //LLStringUtil::format_map_t args; media_plugin = media_impl->getMediaPlugin(); if(media_plugin) @@ -954,14 +964,17 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l } } } - - // Avoid showing tip over media that's displaying + + + // Avoid showing tip over media that's displaying unless it's for sale // also check the primary node since sometimes it can have an action even though // the root node doesn't - bool needs_tip = !is_media_displaying && - (has_media || - needs_tooltip(nodep) || - needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); + + bool needs_tip = (!is_media_displaying || + for_sale) && + (has_media || + needs_tooltip(nodep) || + needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); if (show_all_object_tips || needs_tip) { @@ -1263,11 +1276,10 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick) return false; LLMediaEntry* mep = (tep->hasMedia()) ? tep->getMediaData() : NULL; - if(!mep) return false; - viewer_media_t media_impl = mep ? LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()) : NULL; + viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()); if (gSavedSettings.getBOOL("MediaOnAPrimUI")) { diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp index 577b5952e5..22c7d670f8 100644 --- a/indra/newview/lluploaddialog.cpp +++ b/indra/newview/lluploaddialog.cpp @@ -91,7 +91,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg) setMessage(msg); // The dialog view is a root view - gFocusMgr.setTopCtrl( this ); + gViewerWindow->addPopup(this); } void LLUploadDialog::setMessage( const std::string& msg) diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 0b6bd4b401..b88069cd48 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -180,6 +180,16 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous return false; } + std::string sim_string = LLSLURL::stripProtocol(url); + std::string region_name; + S32 x = 128; + S32 y = 128; + S32 z = 0; + if (! LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z)) + { + return false; + } + // Before we're logged in, need to update the startup screen // to tell the user where they are going. if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP) @@ -194,22 +204,15 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous return true; } - std::string sim_string = LLSLURL::stripProtocol(url); - std::string region_name; - S32 x = 128; - S32 y = 128; - S32 z = 0; - LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z); - // LLFloaterURLDisplay functionality moved to LLPanelPlaces in Side Tray. //LLFloaterURLDisplay* url_displayp = LLFloaterReg::getTypedInstance<LLFloaterURLDisplay>("preview_url",LLSD()); //if(url_displayp) url_displayp->setName(region_name); // Request a region handle by name LLWorldMapMessage::getInstance()->sendNamedRegionRequest(region_name, - LLURLDispatcherImpl::regionNameCallback, - url, - false); // don't teleport + LLURLDispatcherImpl::regionNameCallback, + url, + false); // don't teleport return true; } @@ -221,34 +224,11 @@ void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::strin S32 x = 128; S32 y = 128; S32 z = 0; - LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z); - - LLVector3 local_pos; - local_pos.mV[VX] = (F32)x; - local_pos.mV[VY] = (F32)y; - local_pos.mV[VZ] = (F32)z; - - // determine whether the point is in this region - if ((x >= 0) && (x < REGION_WIDTH_UNITS) && - (y >= 0) && (y < REGION_WIDTH_UNITS)) + if (LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z)) { - // if so, we're done regionHandleCallback(region_handle, url, snapshot_id, teleport); } - - else - { - // otherwise find the new region from the location - - // add the position to get the new region - LLVector3d global_pos = from_region_handle(region_handle) + LLVector3d(local_pos); - - U64 new_region_handle = to_region_handle(global_pos); - LLWorldMapMessage::getInstance()->sendHandleRegionRequest(new_region_handle, - LLURLDispatcherImpl::regionHandleCallback, - url, teleport); - } } /* static */ @@ -261,17 +241,9 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str S32 z = 0; LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z); - // remap x and y to local coordinates - S32 local_x = x % REGION_WIDTH_UNITS; - S32 local_y = y % REGION_WIDTH_UNITS; - if (local_x < 0) - local_x += REGION_WIDTH_UNITS; - if (local_y < 0) - local_y += REGION_WIDTH_UNITS; - LLVector3 local_pos; - local_pos.mV[VX] = (F32)local_x; - local_pos.mV[VY] = (F32)local_y; + local_pos.mV[VX] = (F32)x; + local_pos.mV[VY] = (F32)y; local_pos.mV[VZ] = (F32)z; LLVector3d global_pos = from_region_handle(region_handle); diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 934981b0ad..1d935f5ab8 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -251,7 +251,7 @@ void audio_update_wind(bool force_update) { // initialize wind volume (force_update) by using large volume_delta // which is sufficient to completely turn off or turn on wind noise - volume_delta = max_wind_volume; + volume_delta = 1.f; } // mute wind when not flying diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index bd4f172907..0051f46716 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -338,7 +338,12 @@ void LLViewerCamera::setPerspective(BOOL for_selection, { // make a tiny little viewport // anything drawn into this viewport will be "selected" - GLint* viewport = (GLint*) gGLViewport; + + GLint viewport[4]; + viewport[0] = gViewerWindow->getWorldViewRectRaw().mLeft; + viewport[1] = gViewerWindow->getWorldViewRectRaw().mBottom; + viewport[2] = gViewerWindow->getWorldViewRectRaw().getWidth(); + viewport[3] = gViewerWindow->getWorldViewRectRaw().getHeight(); proj_mat = gl_pick_matrix(x+width/2.f, y_from_bot+height/2.f, (GLfloat) width, (GLfloat) height, viewport); @@ -405,6 +410,9 @@ void LLViewerCamera::setPerspective(BOOL for_selection, if (for_selection && (width > 1 || height > 1)) { + // NB: as of this writing, i believe the code below is broken (doesn't take into account the world view, assumes entire window) + // however, it is also unused (the GL matricies are used for selection, (see LLCamera::sphereInFrustum())) and so i'm not + // comfortable hacking on it. calculateFrustumPlanesFromWindow((F32)(x - width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f, (F32)(y_from_bot - height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f, (F32)(x + width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f, diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp index 8de87eb602..320456e1e2 100644 --- a/indra/newview/llviewerchat.cpp +++ b/indra/newview/llviewerchat.cpp @@ -37,6 +37,7 @@ #include "llagent.h" // gAgent #include "lluicolortable.h" #include "llviewercontrol.h" // gSavedSettings +#include "llinstantmessage.h" //SYSTEM_FROM // LLViewerChat @@ -55,7 +56,7 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color) r_color = LLUIColorTable::instance().getColor("SystemChatColor"); break; case CHAT_SOURCE_AGENT: - if (chat.mFromID.isNull()) + if (chat.mFromID.isNull() || SYSTEM_FROM == chat.mFromName) { r_color = LLUIColorTable::instance().getColor("SystemChatColor"); } diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 64eabe65cf..5daea96123 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -510,6 +510,7 @@ void settings_setup_listeners() gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2)); gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2)); gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2)); + gSavedSettings.getControl("RenderUseTriStrips")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("RenderAnimateTrees")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2)); gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2)); gSavedSettings.getControl("VertexShaderEnable")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2)); diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index ba256d70e8..6c1c1d1096 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -113,7 +113,6 @@ void render_hud_attachments(); void render_ui_3d(); void render_ui_2d(); void render_disconnected_background(); -void render_hud_elements(); void display_startup() { @@ -990,6 +989,7 @@ void render_hud_attachments() LLSpatialGroup::sNoDelete = FALSE; render_hud_elements(); + //restore type mask gPipeline.setRenderTypeMask(mask); if (has_ui) @@ -1129,7 +1129,6 @@ void render_ui(F32 zoom_factor, int subfield) } { - gGL.color4f(1,1,1,1); if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index eb070fb3ef..65e9d8971a 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -78,7 +78,6 @@ #include "llfloatermap.h" #include "llfloatermemleak.h" #include "llfloaternamedesc.h" -#include "llfloaternearbymedia.h" #include "llfloaternotificationsconsole.h" #include "llfloateropenobject.h" #include "llfloaterpay.h" @@ -118,6 +117,7 @@ #include "llmoveview.h" #include "llnearbychat.h" #include "llpanelblockedlist.h" +#include "llpanelclassified.h" #include "llpreviewanim.h" #include "llpreviewgesture.h" #include "llpreviewnotecard.h" @@ -197,7 +197,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("mute_object_by_name", "floater_mute_object.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGetBlockedObjectName>); LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>); - LLFloaterReg::add("nearby_media", "floater_nearby_media.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNearbyMedia>); LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>); LLFloaterReg::add("notification_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNotificationWellWindow>); @@ -221,6 +220,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview"); LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview"); LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>); + LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>); LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>); LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml", diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index b69eaa4853..80336e5c5a 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -48,6 +48,7 @@ #include "llsidetray.h" #include "llinventorybridge.h" +#include "llinventorypanel.h" #include "llfloaterinventory.h" #include "llviewerassettype.h" @@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents() // 2 = folders by date // Need to mask off anything but the first bit. // This comes from LLInventoryFilter from llfolderview.h - U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1; + U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1; // *NOTE: For bug EXT-2879, originally commented out // gAgent.getRegion()->getCapability in order to use the old @@ -1165,6 +1166,40 @@ const LLUUID& LLViewerInventoryItem::getAssetUUID() const return LLInventoryItem::getAssetUUID(); } +const LLUUID& LLViewerInventoryItem::getProtectedAssetUUID() const +{ + if (const LLViewerInventoryItem *linked_item = getLinkedItem()) + { + return linked_item->getProtectedAssetUUID(); + } + + // check for conditions under which we may return a visible UUID to the user + bool item_is_fullperm = getIsFullPerm(); + bool agent_is_godlike = gAgent.isGodlikeWithoutAdminMenuFakery(); + if (item_is_fullperm || agent_is_godlike) + { + return LLInventoryItem::getAssetUUID(); + } + + return LLUUID::null; +} + +const bool LLViewerInventoryItem::getIsFullPerm() const +{ + LLPermissions item_permissions = getPermissions(); + + // modify-ok & copy-ok & transfer-ok + return ( item_permissions.allowOperationBy(PERM_MODIFY, + gAgent.getID(), + gAgent.getGroupID()) && + item_permissions.allowOperationBy(PERM_COPY, + gAgent.getID(), + gAgent.getGroupID()) && + item_permissions.allowOperationBy(PERM_TRANSFER, + gAgent.getID(), + gAgent.getGroupID()) ); +} + const std::string& LLViewerInventoryItem::getName() const { if (const LLViewerInventoryItem *linked_item = getLinkedItem()) diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index c24f76c87a..3d3f80b9b5 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -63,10 +63,12 @@ protected: public: virtual LLAssetType::EType getType() const; virtual const LLUUID& getAssetUUID() const; + virtual const LLUUID& getProtectedAssetUUID() const; // returns LLUUID::null if current agent does not have permission to expose this asset's UUID to the user virtual const std::string& getName() const; virtual S32 getSortField() const; virtual void setSortField(S32 sortField); virtual const LLPermissions& getPermissions() const; + virtual const bool getIsFullPerm() const; // 'fullperm' in the popular sense: modify-ok & copy-ok & transfer-ok, no special god rules applied virtual const LLUUID& getCreatorUUID() const; virtual const std::string& getDescription() const; virtual const LLSaleInfo& getSaleInfo() const; diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index 1a67fc0966..7225aa1523 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -626,7 +626,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy) mFace->mVertexBuffer->drawRange(LLRender::TRIANGLES, start, end, count, offset); glPopMatrix(); } - gPipeline.addTrianglesDrawn(count/3); + gPipeline.addTrianglesDrawn(count); triangle_count += count; diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 0e133f8729..85efe2724e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -50,6 +50,10 @@ #include "llcallbacklist.h" #include "llparcel.h" #include "llaudioengine.h" // for gAudiop +#include "llurldispatcher.h" +#include "llvoavatar.h" +#include "llvoavatarself.h" +#include "llviewerregion.h" #include "llevent.h" // LLSimpleListener #include "llnotificationsutil.h" @@ -63,6 +67,10 @@ #include <boost/signals2.hpp> /*static*/ const char* LLViewerMedia::AUTO_PLAY_MEDIA_SETTING = "ParcelMediaAutoPlayEnable"; +/*static*/ const char* LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING = "MediaShowOnOthers"; +/*static*/ const char* LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING = "MediaShowWithinParcel"; +/*static*/ const char* LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING = "MediaShowOutsideParcel"; + // Move this to its own file. @@ -254,6 +262,8 @@ static LLTimer sMediaCreateTimer; static const F32 LLVIEWERMEDIA_CREATE_DELAY = 1.0f; static F32 sGlobalVolume = 1.0f; static F64 sLowestLoadableImplInterest = 0.0f; +static bool sAnyMediaShowing = false; +static boost::signals2::connection sTeleportFinishConnection; ////////////////////////////////////////////////////////////////////////////////////////// static void add_media_impl(LLViewerMediaImpl* media) @@ -366,8 +376,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s // The current media URL is not empty. // If (the media was already loaded OR the media was set to autoplay) AND this update didn't come from this agent, // do a navigate. - bool auto_play = (media_impl->mMediaAutoPlay && gSavedSettings.getBOOL(AUTO_PLAY_MEDIA_SETTING)); - + bool auto_play = media_impl->isAutoPlayable(); if((was_loaded || auto_play) && !update_from_self) { needs_navigate = url_changed; @@ -391,7 +400,7 @@ viewer_media_t LLViewerMedia::updateMediaImpl(LLMediaEntry* media_entry, const s media_impl->mMediaAutoPlay = media_entry->getAutoPlay(); media_impl->mMediaEntryURL = media_entry->getCurrentURL(); - if(media_impl->mMediaAutoPlay && gSavedSettings.getBOOL(AUTO_PLAY_MEDIA_SETTING)) + if(media_impl->isAutoPlayable()) { needs_navigate = true; } @@ -688,12 +697,13 @@ static bool proximity_comparitor(const LLViewerMediaImpl* i1, const LLViewerMedi // static void LLViewerMedia::updateMedia(void *dummy_arg) { + sAnyMediaShowing = false; impl_list::iterator iter = sViewerMediaImplList.begin(); impl_list::iterator end = sViewerMediaImplList.end(); - for(; iter != end; iter++) + for(; iter != end;) { - LLViewerMediaImpl* pimpl = *iter; + LLViewerMediaImpl* pimpl = *iter++; pimpl->update(); pimpl->calculateInterest(); } @@ -713,6 +723,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) std::vector<LLViewerMediaImpl*> proximity_order; bool inworld_media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia"); + bool inworld_audio_enabled = gSavedSettings.getBOOL("AudioStreamingMusic"); U32 max_instances = gSavedSettings.getU32("PluginInstancesTotal"); U32 max_normal = gSavedSettings.getU32("PluginInstancesNormal"); U32 max_low = gSavedSettings.getU32("PluginInstancesLow"); @@ -818,7 +829,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) impl_count_total++; } - + // Overrides if the window is minimized or we lost focus (taking care // not to accidentally "raise" the priority either) if (!gViewerWindow->getActive() /* viewer window minimized? */ @@ -840,7 +851,14 @@ void LLViewerMedia::updateMedia(void *dummy_arg) new_priority = LLPluginClassMedia::PRIORITY_UNLOADED; } } - + // update the audio stream here as well + if( !inworld_audio_enabled) + { + if(LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio()) + { + gAudiop->stopInternetStream(); + } + } pimpl->setPriority(new_priority); if(pimpl->getUsedInUI()) @@ -854,6 +872,12 @@ void LLViewerMedia::updateMedia(void *dummy_arg) } total_cpu += pimpl->getCPUUsage(); + + if (!pimpl->getUsedInUI() && pimpl->hasMedia()) + { + sAnyMediaShowing = true; + } + } // Re-calculate this every time. @@ -895,9 +919,115 @@ void LLViewerMedia::updateMedia(void *dummy_arg) ////////////////////////////////////////////////////////////////////////////////////////// // static +bool LLViewerMedia::isAnyMediaShowing() +{ + return sAnyMediaShowing; +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +void LLViewerMedia::setAllMediaEnabled(bool val) +{ + // Set "tentative" autoplay first. We need to do this here or else + // re-enabling won't start up the media below. + gSavedSettings.setBOOL("MediaTentativeAutoPlay", val); + + // Then + impl_list::iterator iter = sViewerMediaImplList.begin(); + impl_list::iterator end = sViewerMediaImplList.end(); + + for(; iter != end; iter++) + { + LLViewerMediaImpl* pimpl = *iter; + if (!pimpl->getUsedInUI()) + { + pimpl->setDisabled(!val); + } + } + + // Also do Parcel Media and Parcel Audio + if (val) + { + if (!LLViewerMedia::isParcelMediaPlaying() && LLViewerMedia::hasParcelMedia()) + { + LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel()); + } + + if (gSavedSettings.getBOOL("AudioStreamingMusic") && + !LLViewerMedia::isParcelAudioPlaying() && + gAudiop && + LLViewerMedia::hasParcelAudio()) + { + gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL()); + } + } + else { + // This actually unloads the impl, as opposed to "stop"ping the media + LLViewerParcelMedia::stop(); + if (gAudiop) gAudiop->stopInternetStream(); + } +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +bool LLViewerMedia::isParcelMediaPlaying() +{ + return (LLViewerMedia::hasParcelMedia() && LLViewerParcelMedia::getParcelMedia() && LLViewerParcelMedia::getParcelMedia()->hasMedia()); +} + +///////////////////////////////////////////////////////////////////////////////////////// +// static +bool LLViewerMedia::isParcelAudioPlaying() +{ + return (LLViewerMedia::hasParcelAudio() && gAudiop && LLAudioEngine::AUDIO_PLAYING == gAudiop->isInternetStreamPlaying()); +} + +bool LLViewerMedia::hasInWorldMedia() +{ + if (sInWorldMediaDisabled) return false; + impl_list::iterator iter = sViewerMediaImplList.begin(); + impl_list::iterator end = sViewerMediaImplList.end(); + // This should be quick, because there should be very few non-in-world-media impls + for (; iter != end; iter++) + { + LLViewerMediaImpl* pimpl = *iter; + if (!pimpl->getUsedInUI() && !pimpl->isParcelMedia()) + { + // Found an in-world media impl + return true; + } + } + return false; +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +bool LLViewerMedia::hasParcelMedia() +{ + return !LLViewerParcelMedia::getURL().empty(); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +bool LLViewerMedia::hasParcelAudio() +{ + return !LLViewerMedia::getParcelAudioURL().empty(); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +std::string LLViewerMedia::getParcelAudioURL() +{ + return LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL(); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static void LLViewerMedia::initClass() { - gIdleCallbacks.addFunction(LLViewerMedia::updateMedia, NULL); + gIdleCallbacks.addFunction(LLViewerMedia::updateMedia, NULL); + sTeleportFinishConnection = LLViewerParcelMgr::getInstance()-> + setTeleportFinishedCallback(boost::bind(&LLViewerMedia::onTeleportFinished)); } ////////////////////////////////////////////////////////////////////////////////////////// @@ -905,6 +1035,15 @@ void LLViewerMedia::initClass() void LLViewerMedia::cleanupClass() { gIdleCallbacks.deleteFunction(LLViewerMedia::updateMedia, NULL); + sTeleportFinishConnection.disconnect(); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// static +void LLViewerMedia::onTeleportFinished() +{ + // On teleport, clear this setting (i.e. set it to true) + gSavedSettings.setBOOL("MediaTentativeAutoPlay", true); } ////////////////////////////////////////////////////////////////////////////////////////// @@ -952,7 +1091,8 @@ LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, mBackgroundColor(LLColor4::white), mNavigateSuspended(false), mNavigateSuspendedDeferred(false), - mIsUpdated(false) + mIsUpdated(false), + mTrustedBrowser(false) { // Set up the mute list observer if it hasn't been set up already. @@ -1091,6 +1231,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path = gDirUtilp->getOSUserAppDir(); user_data_path += gDirUtilp->getDirDelimiter(); + // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) + // If the linden username returned is blank, that can only mean we are + // at the login page displaying login Web page or Web browser test via Develop menu. + // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this + // is what we always used before this change) + std::string linden_user_dir = gDirUtilp->getLindenUserDir(); + if ( ! linden_user_dir.empty() ) + { + // gDirUtilp->getLindenUserDir() is whole path, not just Linden name + user_data_path = linden_user_dir; + user_data_path += gDirUtilp->getDirDelimiter(); + }; + // See if the plugin executable exists llstat s; if(LLFile::stat(launcher_name, &s)) @@ -1190,6 +1343,9 @@ void LLViewerMediaImpl::loadURI() { if(mMediaSource) { + // trim whitespace from front and back of URL - fixes EXT-5363 + LLStringUtil::trim( mMediaURL ); + // *HACK: we don't know if the URI coming in is properly escaped // (the contract doesn't specify whether it is escaped or not. // but LLQtWebKit expects it to be, so we do our best to encode @@ -2057,6 +2213,21 @@ void LLViewerMediaImpl::scaleMouse(S32 *mouse_x, S32 *mouse_y) #endif } + + +////////////////////////////////////////////////////////////////////////////////////////// +bool LLViewerMediaImpl::isMediaTimeBased() +{ + bool result = false; + + if(mMediaSource) + { + result = mMediaSource->pluginSupportsMediaTime(); + } + + return result; +} + ////////////////////////////////////////////////////////////////////////////////////////// bool LLViewerMediaImpl::isMediaPlaying() { @@ -2103,7 +2274,7 @@ void LLViewerMediaImpl::resetPreviousMediaState() ////////////////////////////////////////////////////////////////////////////////////////// // -void LLViewerMediaImpl::setDisabled(bool disabled) +void LLViewerMediaImpl::setDisabled(bool disabled, bool forcePlayOnEnable) { if(mIsDisabled != disabled) { @@ -2118,7 +2289,7 @@ void LLViewerMediaImpl::setDisabled(bool disabled) else { // We just (re)enabled this media. Do a navigate if auto-play is in order. - if(mMediaAutoPlay && gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)) + if(isAutoPlayable() || forcePlayOnEnable) { navigateTo(mMediaEntryURL, "", true, true); } @@ -2145,6 +2316,12 @@ bool LLViewerMediaImpl::isForcedUnloaded() const } } + // If this media's class is not supposed to be shown, unload + if (!shouldShowBasedOnClass()) + { + return true; + } + return false; } @@ -2178,6 +2355,14 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla { switch(event) { + case MEDIA_EVENT_CLICK_LINK_NOFOLLOW: + { + LL_DEBUGS("Media") << "MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is: " << plugin->getClickURL() << LL_ENDL; + std::string url = plugin->getClickURL(); + LLURLDispatcher::dispatch(url, NULL, mTrustedBrowser); + + } + break; case MEDIA_EVENT_PLUGIN_FAILED_LAUNCH: { // The plugin failed to load properly. Make sure the timer doesn't retry. @@ -2399,16 +2584,25 @@ void LLViewerMediaImpl::calculateInterest() for(; iter != mObjectList.end() ; ++iter) { LLVOVolume *obj = *iter; - if(LLMuteList::getInstance()->isMuted(obj->getID())) + llassert(obj); + if (!obj) continue; + if(LLMuteList::getInstance() && + LLMuteList::getInstance()->isMuted(obj->getID())) + { mIsMuted = true; + } else { // We won't have full permissions data for all objects. Attempt to mute objects when we can tell their owners are muted. - LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj); - if(obj_perm) + if (LLSelectMgr::getInstance()) { - if(LLMuteList::getInstance()->isMuted(obj_perm->getOwner())) - mIsMuted = true; + LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj); + if(obj_perm) + { + if(LLMuteList::getInstance() && + LLMuteList::getInstance()->isMuted(obj_perm->getOwner())) + mIsMuted = true; + } } } } @@ -2630,3 +2824,112 @@ void LLViewerMediaImpl::setTextureID(LLUUID id) } } +////////////////////////////////////////////////////////////////////////////////////////// +// +bool LLViewerMediaImpl::isAutoPlayable() const +{ + return (mMediaAutoPlay && + gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) && + gSavedSettings.getBOOL("MediaTentativeAutoPlay")); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// +bool LLViewerMediaImpl::shouldShowBasedOnClass() const +{ + // If this is parcel media or in the UI, return true always + if (getUsedInUI() || isParcelMedia()) return true; + + bool attached_to_another_avatar = isAttachedToAnotherAvatar(); + bool inside_parcel = isInAgentParcel(); + + // llinfos << " hasFocus = " << hasFocus() << + // " others = " << (attached_to_another_avatar && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING)) << + // " within = " << (inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING)) << + // " outside = " << (!inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING)) << llendl; + + // If it has focus, we should show it + if (hasFocus()) + return true; + + // If it is attached to an avatar and the pref is off, we shouldn't show it + if (attached_to_another_avatar) + return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING); + + if (inside_parcel) + return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING); + else + return gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING); +} + +////////////////////////////////////////////////////////////////////////////////////////// +// +bool LLViewerMediaImpl::isAttachedToAnotherAvatar() const +{ + bool result = false; + + std::list< LLVOVolume* >::const_iterator iter = mObjectList.begin(); + std::list< LLVOVolume* >::const_iterator end = mObjectList.end(); + for ( ; iter != end; iter++) + { + if (isObjectAttachedToAnotherAvatar(*iter)) + { + result = true; + break; + } + } + return result; +} + +////////////////////////////////////////////////////////////////////////////////////////// +// +//static +bool LLViewerMediaImpl::isObjectAttachedToAnotherAvatar(LLVOVolume *obj) +{ + bool result = false; + LLXform *xform = obj; + // Walk up parent chain + while (NULL != xform) + { + LLViewerObject *object = dynamic_cast<LLViewerObject*> (xform); + if (NULL != object) + { + LLVOAvatar *avatar = object->asAvatar(); + if (NULL != avatar && avatar != gAgent.getAvatarObject()) + { + result = true; + break; + } + } + xform = xform->getParent(); + } + return result; +} + +////////////////////////////////////////////////////////////////////////////////////////// +// +bool LLViewerMediaImpl::isInAgentParcel() const +{ + bool result = false; + + std::list< LLVOVolume* >::const_iterator iter = mObjectList.begin(); + std::list< LLVOVolume* >::const_iterator end = mObjectList.end(); + for ( ; iter != end; iter++) + { + LLVOVolume *object = *iter; + if (LLViewerMediaImpl::isObjectInAgentParcel(object)) + { + result = true; + break; + } + } + return result; +} + +////////////////////////////////////////////////////////////////////////////////////////// +// +// static +bool LLViewerMediaImpl::isObjectInAgentParcel(LLVOVolume *obj) +{ + return (LLViewerParcelMgr::getInstance()->inAgentParcel(obj->getPositionGlobal())); +} diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index daad70f14f..bc51e713a1 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -48,7 +48,7 @@ class LLViewerMediaImpl; class LLUUID; class LLViewerMediaTexture; class LLMediaEntry; -class LLVOVolume ; +class LLVOVolume; class LLMimeDiscoveryResponder; typedef LLPointer<LLViewerMediaImpl> viewer_media_t; @@ -73,50 +73,68 @@ class LLViewerMediaImpl; class LLViewerMedia { LOG_CLASS(LLViewerMedia); - public: - - // String to get/set media autoplay in gSavedSettings - static const char *AUTO_PLAY_MEDIA_SETTING; +public: - typedef std::vector<LLViewerMediaImpl*> impl_list; - - typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map; - - // Special case early init for just web browser component - // so we can show login screen. See .cpp file for details. JC - - static viewer_media_t newMediaImpl(const LLUUID& texture_id, - S32 media_width = 0, - S32 media_height = 0, - U8 media_auto_scale = false, - U8 media_loop = false); - - static viewer_media_t updateMediaImpl(LLMediaEntry* media_entry, const std::string& previous_url, bool update_from_self); - static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id); - static std::string getCurrentUserAgent(); - static void updateBrowserUserAgent(); - static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/); - static bool textureHasMedia(const LLUUID& texture_id); - static void setVolume(F32 volume); - - static void updateMedia(void* dummy_arg = NULL); - - static void initClass(); - static void cleanupClass(); - - static F32 getVolume(); - static void muteListChanged(); - static void setInWorldMediaDisabled(bool disabled); - static bool getInWorldMediaDisabled(); - - static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest); + // String to get/set media autoplay in gSavedSettings + static const char* AUTO_PLAY_MEDIA_SETTING; + static const char* SHOW_MEDIA_ON_OTHERS_SETTING; + static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING; + static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING; - // Returns the priority-sorted list of all media impls. - static impl_list &getPriorityList(); - - // This is the comparitor used to sort the list. - static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2); - + typedef std::vector<LLViewerMediaImpl*> impl_list; + + typedef std::map<LLUUID, LLViewerMediaImpl*> impl_id_map; + + // Special case early init for just web browser component + // so we can show login screen. See .cpp file for details. JC + + static viewer_media_t newMediaImpl(const LLUUID& texture_id, + S32 media_width = 0, + S32 media_height = 0, + U8 media_auto_scale = false, + U8 media_loop = false); + + static viewer_media_t updateMediaImpl(LLMediaEntry* media_entry, const std::string& previous_url, bool update_from_self); + static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id); + static std::string getCurrentUserAgent(); + static void updateBrowserUserAgent(); + static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/); + static bool textureHasMedia(const LLUUID& texture_id); + static void setVolume(F32 volume); + + // Is any media currently "showing"? Includes Parcel Media. Does not include media in the UI. + static bool isAnyMediaShowing(); + // Set all media enabled or disabled, depending on val. Does not include media in the UI. + static void setAllMediaEnabled(bool val); + + static void updateMedia(void* dummy_arg = NULL); + + static void initClass(); + static void cleanupClass(); + + static F32 getVolume(); + static void muteListChanged(); + static void setInWorldMediaDisabled(bool disabled); + static bool getInWorldMediaDisabled(); + + static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest); + + // Returns the priority-sorted list of all media impls. + static impl_list &getPriorityList(); + + // This is the comparitor used to sort the list. + static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2); + + // These are just helper functions for the convenience of others working with media + static bool hasInWorldMedia(); + static std::string getParcelAudioURL(); + static bool hasParcelMedia(); + static bool hasParcelAudio(); + static bool isParcelMediaPlaying(); + static bool isParcelAudioPlaying(); + +private: + static void onTeleportFinished(); }; // Implementation functions not exported into header file @@ -199,18 +217,20 @@ public: void updateImagesMediaStreams(); LLUUID getMediaTextureID() const; - void suspendUpdates(bool suspend) { mSuspendUpdates = suspend; }; + void suspendUpdates(bool suspend) { mSuspendUpdates = suspend; } void setVisible(bool visible); - bool getVisible() const { return mVisible; }; + bool getVisible() const { return mVisible; } + bool isVisible() const { return mVisible; } + bool isMediaTimeBased(); bool isMediaPlaying(); bool isMediaPaused(); bool hasMedia() const; - bool isMediaFailed() const { return mMediaSourceFailed; }; + bool isMediaFailed() const { return mMediaSourceFailed; } void setMediaFailed(bool val) { mMediaSourceFailed = val; } void resetPreviousMediaState(); - void setDisabled(bool disabled); + void setDisabled(bool disabled, bool forcePlayOnEnable = false); bool isMediaDisabled() const { return mIsDisabled; }; void setInNearbyMediaList(bool in_list) { mInNearbyMediaList = in_list; } @@ -222,10 +242,10 @@ public: // returns true if this instance could be playable based on autoplay setting, current load state, etc. bool isPlayable() const; - void setIsParcelMedia(bool is_parcel_media) { mIsParcelMedia = is_parcel_media; }; - bool isParcelMedia() const { return mIsParcelMedia; }; + void setIsParcelMedia(bool is_parcel_media) { mIsParcelMedia = is_parcel_media; } + bool isParcelMedia() const { return mIsParcelMedia; } - ECursorType getLastSetCursor() { return mLastSetCursor; }; + ECursorType getLastSetCursor() { return mLastSetCursor; } // utility function to create a ready-to-use media instance from a desired media type. static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height); @@ -302,6 +322,9 @@ public: void setLowPrioritySizeLimit(int size); void setTextureID(LLUUID id = LLUUID::null); + + bool isTrustedBrowser() { return mTrustedBrowser; } + void setTrustedBrowser(bool trusted) { mTrustedBrowser = trusted; } typedef enum { @@ -326,6 +349,18 @@ public: void cancelMimeTypeProbe(); + // Is this media attached to an avatar *not* self + bool isAttachedToAnotherAvatar() const; + + // Is this media in the agent's parcel? + bool isInAgentParcel() const; + +private: + bool isAutoPlayable() const; + bool shouldShowBasedOnClass() const; + static bool isObjectAttachedToAnotherAvatar(LLVOVolume *obj); + static bool isObjectInAgentParcel(LLVOVolume *obj); + private: // a single media url with some data and an impl. LLPluginClassMedia* mMediaSource; @@ -368,11 +403,12 @@ private: LLMimeDiscoveryResponder *mMimeTypeProbe; bool mMediaAutoPlay; std::string mMediaEntryURL; - bool mInNearbyMediaList; // used by LLFloaterNearbyMedia::refreshList() for performance reasons + bool mInNearbyMediaList; // used by LLPanelNearbyMedia::refreshList() for performance reasons bool mClearCache; LLColor4 mBackgroundColor; bool mNavigateSuspended; bool mNavigateSuspendedDeferred; + bool mTrustedBrowser; private: BOOL mIsUpdated ; diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index f508a3462a..b8179f7fc2 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -126,7 +126,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac if(face_auto_zoom && ! parcel->getMediaPreventCameraZoom()) { // Zoom in on this face - mMediaControls.get()->resetZoomLevel(); + mMediaControls.get()->resetZoomLevel(false); mMediaControls.get()->nextZoomLevel(); } else @@ -559,6 +559,19 @@ void LLViewerMediaFocus::focusZoomOnMedia(LLUUID media_id) } } +void LLViewerMediaFocus::unZoom() +{ + if(mMediaControls.get()) + { + mMediaControls.get()->resetZoomLevel(); + } +} + +bool LLViewerMediaFocus::isZoomed() const +{ + return (mMediaControls.get() && mMediaControls.get()->getZoomLevel() != LLPanelPrimMediaControls::ZOOM_NONE); +} + LLUUID LLViewerMediaFocus::getControlsMediaID() { if(getFocusedMediaImpl()) diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index 002044ea2e..d9ddc7432b 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -85,6 +85,9 @@ public: // Try to focus/zoom on the specified media (if it's on an object in world). void focusZoomOnMedia(LLUUID media_id); + // Are we zoomed in? + bool isZoomed() const; + void unZoom(); // Return the ID of the media instance the controls are currently attached to (either focus or hover). LLUUID getControlsMediaID(); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8c61ba7558..bc3b8ac9d6 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -44,6 +44,7 @@ #include "llagent.h" #include "llagentwearables.h" #include "llagentpilot.h" +#include "llbottomtray.h" #include "llcompilequeue.h" #include "llconsole.h" #include "lldebugview.h" @@ -3554,9 +3555,15 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat, BOOL is_agent_mappable(const LLUUID& agent_id) { - return (LLAvatarActions::isFriend(agent_id) && - LLAvatarTracker::instance().getBuddyInfo(agent_id)->isOnline() && - LLAvatarTracker::instance().getBuddyInfo(agent_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) + const LLRelationship* buddy_info = NULL; + bool is_friend = LLAvatarActions::isFriend(agent_id); + + if (is_friend) + buddy_info = LLAvatarTracker::instance().getBuddyInfo(agent_id); + + return (buddy_info && + buddy_info->isOnline() && + buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) ); } @@ -4415,35 +4422,22 @@ bool visible_take_object() return !is_selection_buy_not_take() && enable_take(); } +bool tools_visible_buy_object() +{ + return is_selection_buy_not_take(); +} + +bool tools_visible_take_object() +{ + return !is_selection_buy_not_take(); +} + class LLToolsEnableBuyOrTake : public view_listener_t { bool handleEvent(const LLSD& userdata) { bool is_buy = is_selection_buy_not_take(); bool new_value = is_buy ? enable_buy_object() : enable_take(); - - // Update label - std::string label; - std::string buy_text; - std::string take_text; - std::string param = userdata.asString(); - std::string::size_type offset = param.find(","); - if (offset != param.npos) - { - buy_text = param.substr(0, offset); - take_text = param.substr(offset+1); - } - if (is_buy) - { - label = buy_text; - } - else - { - label = take_text; - } - gMenuHolder->childSetText("Pie Object Take", label); - gMenuHolder->childSetText("Menu Object Take", label); - return new_value; } }; @@ -5507,6 +5501,37 @@ bool enable_pay_object() return false; } +bool visible_object_stand_up() +{ + // 'Object Stand Up' menu item is visible when agent is sitting on selection + return sitting_on_selection(); +} + +bool visible_object_sit() +{ + // 'Object Sit' menu item is visible when agent is not sitting on selection + bool is_sit_visible = !sitting_on_selection(); + if (is_sit_visible) + { + LLMenuItemGL* sit_menu_item = gMenuHolder->getChild<LLMenuItemGL>("Object Sit"); + // Init default 'Object Sit' menu item label + static const LLStringExplicit sit_text(sit_menu_item->getLabel()); + // Update label + std::string label; + LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(); + if (node && node->mValid && !node->mSitName.empty()) + { + label.assign(node->mSitName); + } + else + { + label = sit_text; + } + sit_menu_item->setLabel(label); + } + return is_sit_visible; +} + class LLObjectEnableSitOrStand : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -5521,34 +5546,6 @@ class LLObjectEnableSitOrStand : public view_listener_t new_value = true; } } - // Update label - std::string label; - std::string sit_text; - std::string stand_text; - std::string param = userdata.asString(); - std::string::size_type offset = param.find(","); - if (offset != param.npos) - { - sit_text = param.substr(0, offset); - stand_text = param.substr(offset+1); - } - if (sitting_on_selection()) - { - label = stand_text; - } - else - { - LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(); - if (node && node->mValid && !node->mSitName.empty()) - { - label.assign(node->mSitName); - } - else - { - label = sit_text; - } - } - gMenuHolder->childSetText("Object Sit", label); return new_value; } @@ -6402,7 +6399,6 @@ class LLToolsSelectedScriptAction : public view_listener_t else { llwarns << "Failed to generate LLFloaterScriptQueue with action: " << action << llendl; - delete queue; } return true; } @@ -6891,7 +6887,8 @@ class LLToolsEditLinkedParts : public view_listener_t { bool handleEvent(const LLSD& userdata) { - BOOL select_individuals = gSavedSettings.getBOOL("EditLinkedParts"); + BOOL select_individuals = !gSavedSettings.getBOOL("EditLinkedParts"); + gSavedSettings.setBOOL( "EditLinkedParts", select_individuals ); if (select_individuals) { LLSelectMgr::getInstance()->demoteSelectionToIndividuals(); @@ -7626,6 +7623,24 @@ class LLWorldDayCycle : public view_listener_t } }; +class LLWorldToggleMovementControls : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + LLBottomTray::getInstance()->toggleMovementControls(); + return true; + } +}; + +class LLWorldToggleCameraControls : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + LLBottomTray::getInstance()->toggleCameraControls(); + return true; + } +}; + void show_navbar_context_menu(LLView* ctrl, S32 x, S32 y) { static LLMenuGL* show_navbar_context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml", @@ -7745,6 +7760,9 @@ void initialize_menus() view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess"); view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle"); + view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls"); + view_listener_t::addMenu(new LLWorldToggleCameraControls(), "World.Toggle.CameraControls"); + // Tools menu view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool"); view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects"); @@ -7774,12 +7792,11 @@ void initialize_menus() view_listener_t::addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink"); view_listener_t::addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake"); enable.add("Tools.EnableTakeCopy", boost::bind(&enable_object_take_copy)); + enable.add("Tools.VisibleBuyObject", boost::bind(&tools_visible_buy_object)); + enable.add("Tools.VisibleTakeObject", boost::bind(&tools_visible_take_object)); view_listener_t::addMenu(new LLToolsEnableSaveToInventory(), "Tools.EnableSaveToInventory"); view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory"); - /*view_listener_t::addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject"); - view_listener_t::addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/ - // Help menu // most items use the ShowFloater method @@ -8002,6 +8019,9 @@ void initialize_menus() enable.add("Object.EnableDelete", boost::bind(&enable_object_delete)); enable.add("Object.EnableWear", boost::bind(&object_selected_and_point_valid)); + enable.add("Object.StandUpVisible", boost::bind(&visible_object_stand_up)); + enable.add("Object.SitVisible", boost::bind(&visible_object_sit)); + view_listener_t::addMenu(new LLObjectEnableReturn(), "Object.EnableReturn"); view_listener_t::addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse"); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8aa642bdb6..361f4e2326 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -193,9 +193,21 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) msg->nextBlockFast(_PREHASH_FolderData); msg->addUUIDFast(_PREHASH_FolderID, fid); msg->sendReliable(LLHost(payload["sender"].asString())); + + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("FriendshipAcceptedByMe", + notification["substitutions"], payload); break; } case 1: // Decline + { + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("FriendshipDeclinedByMe", + notification["substitutions"], payload); + } + // fall-through case 2: // Send IM - decline and start IM session { // decline @@ -2212,7 +2224,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["owner_id"] = from_id; args["slurl"] = location; - nearby_chat->addMessage(chat, true, args); + args["type"] = LLNotificationsUI::NT_NEARBYCHAT; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } @@ -3102,8 +3115,12 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) { // Chat the "back" SLURL. (DEV-4907) + LLSD substitution = LLSD().with("[T_SLURL]", gAgent.getTeleportSourceSLURL()); + std::string completed_from = LLAgent::sTeleportProgressMessages["completed_from"]; + LLStringUtil::format(completed_from, substitution); + LLSD args; - args["MESSAGE"] = "Teleport completed from " + gAgent.getTeleportSourceSLURL(); + args["MESSAGE"] = completed_from; LLNotificationsUtil::add("SystemMessageTip", args); // Set the new position diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d0afa9d9de..b5642d07a5 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2001,6 +2001,9 @@ BOOL LLViewerObject::isActive() const BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { + static LLFastTimer::DeclareTimer ftm("Viewer Object"); + LLFastTimer t(ftm); + if (mDead) { // It's dead. Don't update it. diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 96828ee1b6..6347090f71 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -93,7 +93,7 @@ extern LLPipeline gPipeline; // Statics for object lookup tables. U32 LLViewerObjectList::sSimulatorMachineIndex = 1; // Not zero deliberately, to speed up index check. -LLMap<U64, U32> LLViewerObjectList::sIPAndPortToIndex; +std::map<U64, U32> LLViewerObjectList::sIPAndPortToIndex; std::map<U64, LLUUID> LLViewerObjectList::sIndexAndLocalIDToUUID; LLViewerObjectList::LLViewerObjectList() @@ -571,10 +571,9 @@ void LLViewerObjectList::processCachedObjectUpdate(LLMessageSystem *mesgsys, void LLViewerObjectList::dirtyAllObjectInventory() { - S32 count = mObjects.count(); - for(S32 i = 0; i < count; ++i) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - mObjects[i]->dirtyInventory(); + (*iter)->dirtyInventory(); } } @@ -587,14 +586,14 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent) S32 num_updates, max_value; if (NUM_BINS - 1 == mCurBin) { - num_updates = mObjects.count() - mCurLazyUpdateIndex; - max_value = mObjects.count(); + num_updates = (S32) mObjects.size() - mCurLazyUpdateIndex; + max_value = (S32) mObjects.size(); gTextureList.setUpdateStats(TRUE); } else { - num_updates = (mObjects.count() / NUM_BINS) + 1; - max_value = llmin(mObjects.count(), mCurLazyUpdateIndex + num_updates); + num_updates = ((S32) mObjects.size() / NUM_BINS) + 1; + max_value = llmin((S32) mObjects.size(), mCurLazyUpdateIndex + num_updates); } @@ -647,7 +646,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent) } mCurLazyUpdateIndex = max_value; - if (mCurLazyUpdateIndex == mObjects.count()) + if (mCurLazyUpdateIndex == mObjects.size()) { mCurLazyUpdateIndex = 0; } @@ -694,20 +693,26 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) // Make a copy of the list in case something in idleUpdate() messes with it std::vector<LLViewerObject*> idle_list; - idle_list.reserve( mActiveObjects.size() ); + + static LLFastTimer::DeclareTimer idle_copy("Idle Copy"); - for (std::set<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin(); - active_iter != mActiveObjects.end(); active_iter++) { - objectp = *active_iter; - if (objectp) + LLFastTimer t(idle_copy); + idle_list.reserve( mActiveObjects.size() ); + + for (std::set<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin(); + active_iter != mActiveObjects.end(); active_iter++) { - idle_list.push_back( objectp ); - } - else - { // There shouldn't be any NULL pointers in the list, but they have caused - // crashes before. This may be idleUpdate() messing with the list. - llwarns << "LLViewerObjectList::update has a NULL objectp" << llendl; + objectp = *active_iter; + if (objectp) + { + idle_list.push_back( objectp ); + } + else + { // There shouldn't be any NULL pointers in the list, but they have caused + // crashes before. This may be idleUpdate() messing with the list. + llwarns << "LLViewerObjectList::update has a NULL objectp" << llendl; + } } } @@ -807,7 +812,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) } */ - LLViewerStats::getInstance()->mNumObjectsStat.addValue(mObjects.count()); + LLViewerStats::getInstance()->mNumObjectsStat.addValue((S32) mObjects.size()); LLViewerStats::getInstance()->mNumActiveObjectsStat.addValue(num_active_objects); LLViewerStats::getInstance()->mNumSizeCulledStat.addValue(mNumSizeCulled); LLViewerStats::getInstance()->mNumVisCulledStat.addValue(mNumVisCulled); @@ -815,9 +820,9 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) void LLViewerObjectList::clearDebugText() { - for (S32 i = 0; i < mObjects.count(); i++) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - mObjects[i]->setDebugText(""); + (*iter)->setDebugText(""); } } @@ -856,7 +861,7 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp) if (objectp->isOnMap()) { - mMapObjects.removeObj(objectp); + removeFromMap(objectp); } // Don't clean up mObject references, these will be cleaned up more efficiently later! @@ -913,10 +918,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp) { LLViewerObject *objectp; - S32 i; - for (i = 0; i < mObjects.count(); i++) + + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - objectp = mObjects[i]; + objectp = *iter; if (objectp->mRegionp == regionp) { @@ -933,10 +938,9 @@ void LLViewerObjectList::killAllObjects() // Used only on global destruction. LLViewerObject *objectp; - for (S32 i = 0; i < mObjects.count(); i++) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - objectp = mObjects[i]; - + objectp = *iter; killObject(objectp); llassert(objectp->isDead()); } @@ -945,7 +949,7 @@ void LLViewerObjectList::killAllObjects() if(!mObjects.empty()) { - llwarns << "LLViewerObjectList::killAllObjects still has entries in mObjects: " << mObjects.count() << llendl; + llwarns << "LLViewerObjectList::killAllObjects still has entries in mObjects: " << mObjects.size() << llendl; mObjects.clear(); } @@ -970,16 +974,15 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer) return; } - S32 i = 0; S32 num_removed = 0; LLViewerObject *objectp; - while (i < mObjects.count()) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ) { // Scan for all of the dead objects and remove any "global" references to them. - objectp = mObjects[i]; + objectp = *iter; if (objectp->isDead()) { - mObjects.remove(i); + iter = mObjects.erase(iter); num_removed++; if (num_removed == mNumDeadObjects) @@ -990,8 +993,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer) } else { - // iterate, this isn't a dead object. - i++; + ++iter; } } @@ -1041,12 +1043,11 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset) } LLViewerObject *objectp; - S32 i; - for (i = 0; i < mObjects.count(); i++) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - objectp = getObject(i); + objectp = *iter; // There could be dead objects on the object list, so don't update stuff if the object is dead. - if (objectp) + if (!objectp->isDead()) { objectp->updatePositionCaches(); @@ -1076,9 +1077,9 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap) F32 max_radius = gSavedSettings.getF32("MiniMapPrimMaxRadius"); - for (S32 i = 0; i < mMapObjects.count(); i++) + for (vobj_list_t::iterator iter = mMapObjects.begin(); iter != mMapObjects.end(); ++iter) { - LLViewerObject* objectp = mMapObjects[i]; + LLViewerObject* objectp = *iter; if (!objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment()) { continue; @@ -1144,21 +1145,14 @@ void LLViewerObjectList::renderObjectBounds(const LLVector3 ¢er) { } -void LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent) -{ - generatePickList(camera); - renderPickList(screen_rect, pick_parcel_wall, render_transparent); -} - void LLViewerObjectList::generatePickList(LLCamera &camera) { LLViewerObject *objectp; S32 i; // Reset all of the GL names to zero. - for (i = 0; i < mObjects.count(); i++) + for (vobj_list_t::iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - objectp = mObjects[i]; - objectp->mGLName = 0; + (*iter)->mGLName = 0; } mSelectPickList.clear(); @@ -1321,17 +1315,19 @@ void LLViewerObjectList::addDebugBeacon(const LLVector3 &pos_agent, const LLColor4 &text_color, S32 line_width) { - LLDebugBeacon *beaconp = mDebugBeacons.reserve_block(1); - beaconp->mPositionAgent = pos_agent; - beaconp->mString = string; - beaconp->mColor = color; - beaconp->mTextColor = text_color; - beaconp->mLineWidth = line_width; + LLDebugBeacon beacon; + beacon.mPositionAgent = pos_agent; + beacon.mString = string; + beacon.mColor = color; + beacon.mTextColor = text_color; + beacon.mLineWidth = line_width; + + mDebugBeacons.push_back(beacon); } void LLViewerObjectList::resetObjectBeacons() { - mDebugBeacons.reset(); + mDebugBeacons.clear(); } LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp) @@ -1349,7 +1345,7 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi mUUIDObjectMap[fullid] = objectp; - mObjects.put(objectp); + mObjects.push_back(objectp); updateActive(objectp); @@ -1388,7 +1384,7 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe gMessageSystem->getSenderIP(), gMessageSystem->getSenderPort()); - mObjects.put(objectp); + mObjects.push_back(objectp); updateActive(objectp); @@ -1411,11 +1407,11 @@ LLViewerObject *LLViewerObjectList::replaceObject(const LLUUID &id, const LLPCod S32 LLViewerObjectList::findReferences(LLDrawable *drawablep) const { LLViewerObject *objectp; - S32 i; S32 num_refs = 0; - for (i = 0; i < mObjects.count(); i++) + + for (vobj_list_t::const_iterator iter = mObjects.begin(); iter != mObjects.end(); ++iter) { - objectp = mObjects[i]; + objectp = *iter; if (objectp->mDrawable.notNull()) { num_refs += objectp->mDrawable->findReferences(drawablep); @@ -1460,15 +1456,15 @@ void LLViewerObjectList::orphanize(LLViewerObject *childp, U32 parent_id, U32 ip // Unknown parent, add to orpaned child list U64 parent_info = getIndex(parent_id, ip, port); - if (-1 == mOrphanParents.find(parent_info)) + if (std::find(mOrphanParents.begin(), mOrphanParents.end(), parent_info) == mOrphanParents.end()) { - mOrphanParents.put(parent_info); + mOrphanParents.push_back(parent_info); } LLViewerObjectList::OrphanInfo oi(parent_info, childp->mID); - if (-1 == mOrphanChildren.find(oi)) + if (std::find(mOrphanChildren.begin(), mOrphanChildren.end(), oi) == mOrphanChildren.end()) { - mOrphanChildren.put(oi); + mOrphanChildren.push_back(oi); mNumOrphans++; } } @@ -1491,28 +1487,29 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port) // See if we are a parent of an orphan. // Note: This code is fairly inefficient but it should happen very rarely. // It can be sped up if this is somehow a performance issue... - if (0 == mOrphanParents.count()) + if (mOrphanParents.empty()) { // no known orphan parents return; } - if (-1 == mOrphanParents.find(getIndex(objectp->mLocalID, ip, port))) + if (std::find(mOrphanParents.begin(), mOrphanParents.end(), getIndex(objectp->mLocalID, ip, port)) == mOrphanParents.end()) { // did not find objectp in OrphanParent list return; } - S32 i; U64 parent_info = getIndex(objectp->mLocalID, ip, port); BOOL orphans_found = FALSE; // Iterate through the orphan list, and set parents of matching children. - for (i = 0; i < mOrphanChildren.count(); i++) - { - if (mOrphanChildren[i].mParentInfo != parent_info) + + for (std::vector<OrphanInfo>::iterator iter = mOrphanChildren.begin(); iter != mOrphanChildren.end(); ) + { + if (iter->mParentInfo != parent_info) { + ++iter; continue; } - LLViewerObject *childp = findObject(mOrphanChildren[i].mChildInfo); + LLViewerObject *childp = findObject(iter->mChildInfo); if (childp) { if (childp == objectp) @@ -1546,29 +1543,35 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port) objectp->addChild(childp); orphans_found = TRUE; + ++iter; } else { llinfos << "Missing orphan child, removing from list" << llendl; - mOrphanChildren.remove(i); - i--; + + iter = mOrphanChildren.erase(iter); } } // Remove orphan parent and children from lists now that they've been found - mOrphanParents.remove(mOrphanParents.find(parent_info)); - - i = 0; - while (i < mOrphanChildren.count()) { - if (mOrphanChildren[i].mParentInfo == parent_info) + std::vector<U64>::iterator iter = std::find(mOrphanParents.begin(), mOrphanParents.end(), parent_info); + if (iter != mOrphanParents.end()) + { + mOrphanParents.erase(iter); + } + } + + for (std::vector<OrphanInfo>::iterator iter = mOrphanChildren.begin(); iter != mOrphanChildren.end(); ) + { + if (iter->mParentInfo == parent_info) { - mOrphanChildren.remove(i); + iter = mOrphanChildren.erase(iter); mNumOrphans--; } else { - i++; + ++iter; } } diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 2858081dc9..706966deae 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -38,8 +38,6 @@ // common includes #include "llstat.h" -#include "lldarrayptr.h" -#include "llmap.h" // *TODO: switch to std::map #include "llstring.h" // project includes @@ -50,7 +48,7 @@ class LLNetMap; class LLDebugBeacon; const U32 CLOSE_BIN_SIZE = 10; -const U32 NUM_BINS = 16; +const U32 NUM_BINS = 128; // GL name = position in object list + GL_NAME_INDEX_OFFSET so that // we can have special numbers like zero. @@ -111,13 +109,12 @@ public: void updateAvatarVisibility(); // Selection related stuff - void renderObjectsForSelect(LLCamera &camera, const LLRect& screen_rect, BOOL pick_parcel_wall = FALSE, BOOL render_transparent = TRUE); void generatePickList(LLCamera &camera); void renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent); LLViewerObject *getSelectedObject(const U32 object_id); - inline S32 getNumObjects() { return mObjects.count(); } + inline S32 getNumObjects() { return (S32) mObjects.size(); } void addToMap(LLViewerObject *objectp); void removeFromMap(LLViewerObject *objectp); @@ -131,7 +128,7 @@ public: S32 findReferences(LLDrawable *drawablep) const; // Find references to drawable in all objects, and return value. - S32 getOrphanParentCount() const { return mOrphanParents.count(); } + S32 getOrphanParentCount() const { return (S32) mOrphanParents.size(); } S32 getOrphanCount() const { return mNumOrphans; } void orphanize(LLViewerObject *childp, U32 parent_id, U32 ip, U32 port); void findOrphans(LLViewerObject* objectp, U32 ip, U32 port); @@ -179,26 +176,28 @@ public: S32 mNumUnknownKills; S32 mNumDeadObjects; protected: - LLDynamicArray<U64> mOrphanParents; // LocalID/ip,port of orphaned objects - LLDynamicArray<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects + std::vector<U64> mOrphanParents; // LocalID/ip,port of orphaned objects + std::vector<OrphanInfo> mOrphanChildren; // UUID's of orphaned objects S32 mNumOrphans; - LLDynamicArrayPtr<LLPointer<LLViewerObject>, 256> mObjects; + typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t; + + vobj_list_t mObjects; std::set<LLPointer<LLViewerObject> > mActiveObjects; - LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects; + vobj_list_t mMapObjects; typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map; vo_map mDeadObjects; // Need to keep multiple entries per UUID std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap; - LLDynamicArray<LLDebugBeacon> mDebugBeacons; + std::vector<LLDebugBeacon> mDebugBeacons; S32 mCurLazyUpdateIndex; static U32 sSimulatorMachineIndex; - static LLMap<U64, U32> sIPAndPortToIndex; + static std::map<U64, U32> sIPAndPortToIndex; static std::map<U64, LLUUID> sIndexAndLocalIDToUUID; @@ -264,12 +263,16 @@ inline LLViewerObject *LLViewerObjectList::getObject(const S32 index) inline void LLViewerObjectList::addToMap(LLViewerObject *objectp) { - mMapObjects.put(objectp); + mMapObjects.push_back(objectp); } inline void LLViewerObjectList::removeFromMap(LLViewerObject *objectp) { - mMapObjects.removeObj(objectp); + std::vector<LLPointer<LLViewerObject> >::iterator iter = std::find(mMapObjects.begin(), mMapObjects.end(), objectp); + if (iter != mMapObjects.end()) + { + mMapObjects.erase(iter); + } } diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 07c8867e26..1f6bbcbae8 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -53,7 +53,7 @@ //#include "llfirstuse.h" #include "llfloaterbuyland.h" #include "llfloatergroups.h" -#include "llfloaternearbymedia.h" +#include "llpanelnearbymedia.h" #include "llfloatersellland.h" #include "llfloatertools.h" #include "llparcelselection.h" @@ -1795,12 +1795,13 @@ void optionally_start_music(const std::string& music_url) { // only play music when you enter a new parcel if the UI control for this // was not *explicitly* stopped by the user. (part of SL-4878) - LLFloaterNearbyMedia *nearby_media_floater = LLFloaterReg::findTypedInstance<LLFloaterNearbyMedia>("nearby_media"); - if ((nearby_media_floater && - nearby_media_floater->getParcelAudioAutoStart()) || + LLPanelNearByMedia* nearby_media_panel = gStatusBar->getNearbyMediaPanel();; + if ((nearby_media_panel && + nearby_media_panel->getParcelAudioAutoStart()) || // or they have expressed no opinion in the UI, but have autoplay on... - (!nearby_media_floater && - gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING))) + (!nearby_media_panel && + gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) && + gSavedSettings.getBOOL("MediaTentativeAutoPlay"))) { llinfos << "Starting parcel music " << music_url << llendl; gAudiop->startInternetStream(music_url); diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 77d2d493bd..ce627494c8 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -49,6 +49,7 @@ #include "llagent.h" #include "llcallingcard.h" #include "llcaphttpsender.h" +#include "llcommandhandler.h" #include "lldir.h" #include "lleventpoll.h" #include "llfloatergodtools.h" @@ -58,6 +59,7 @@ #include "llsdutil.h" #include "llstartup.h" #include "lltrans.h" +#include "llurldispatcher.h" #include "llviewerobjectlist.h" #include "llviewerparceloverlay.h" #include "llvlmanager.h" @@ -82,6 +84,45 @@ extern BOOL gNoRender; const F32 WATER_TEXTURE_SCALE = 8.f; // Number of times to repeat the water texture across a region const S16 MAX_MAP_DIST = 10; +// support for secondlife:///app/region/{REGION} SLapps +// N.B. this is defined to work exactly like the classic secondlife://{REGION} +// However, the later syntax cannot support spaces in the region name because +// spaces (and %20 chars) are illegal in the hostname of an http URL. Some +// browsers let you get away with this, but some do not (such as Qt's Webkit). +// Hence we introduced the newer secondlife:///app/region alternative. +class LLRegionHandler : public LLCommandHandler +{ +public: + // requests will be throttled from a non-trusted browser + LLRegionHandler() : LLCommandHandler("region", UNTRUSTED_THROTTLE) {} + + bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) + { + // make sure that we at least have a region name + int num_params = params.size(); + if (num_params < 1) + { + return false; + } + + // build a secondlife://{PLACE} SLurl from this SLapp + std::string url = "secondlife://"; + for (int i = 0; i < num_params; i++) + { + if (i > 0) + { + url += "/"; + } + url += params[i].asString(); + } + + // Process the SLapp as if it was a secondlife://{PLACE} SLurl + LLURLDispatcher::dispatch(url, web, true); + return true; + } +}; +LLRegionHandler gRegionHandler; + class BaseCapabilitiesComplete : public LLHTTPClient::Responder { LOG_CLASS(BaseCapabilitiesComplete); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 28998d409e..133b6ee8c9 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -82,7 +82,7 @@ LLTexturePipelineTester* LLViewerTextureManager::sTesterp = NULL ; S32 LLViewerTexture::sImageCount = 0; S32 LLViewerTexture::sRawCount = 0; S32 LLViewerTexture::sAuxCount = 0; -LLTimer LLViewerTexture::sEvaluationTimer; +LLFrameTimer LLViewerTexture::sEvaluationTimer; F32 LLViewerTexture::sDesiredDiscardBias = 0.f; F32 LLViewerTexture::sDesiredDiscardScale = 1.1f; S32 LLViewerTexture::sBoundTextureMemoryInBytes = 0; @@ -102,7 +102,7 @@ F32 LLViewerTexture::sCurrentTime = 0.0f ; BOOL LLViewerTexture::sUseTextureAtlas = FALSE ; const F32 desired_discard_bias_min = -2.0f; // -max number of levels to improve image quality by -const F32 desired_discard_bias_max = 1.5f; // max number of levels to reduce image quality by +const F32 desired_discard_bias_max = (F32)MAX_DISCARD_LEVEL; // max number of levels to reduce image quality by const F64 log_2 = log(2.0); //---------------------------------------------------------------------------------------------- @@ -293,6 +293,8 @@ void LLViewerTextureManager::init() } } imagep->createGLTexture(0, image_raw); + //cache the raw image + imagep->setCachedRawImage(0, image_raw) ; image_raw = NULL; #else LLViewerFetchedTexture::sDefaultImagep = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT, TRUE, LLViewerTexture::BOOST_UI); @@ -367,7 +369,7 @@ S32 LLViewerTexture::getCategoryFromIndex(S32 index) } // tuning params -const F32 discard_bias_delta = .05f; +const F32 discard_bias_delta = .25f; const F32 discard_delta_time = 0.5f; const S32 min_non_tex_system_mem = (128<<20); // 128 MB // non-const (used externally @@ -799,12 +801,18 @@ BOOL LLViewerTexture::createGLTexture(S32 discard_level, const LLImageRaw* image { mFullWidth = mGLTexturep->getCurrentWidth() ; mFullHeight = mGLTexturep->getCurrentHeight() ; - mComponents = mGLTexturep->getComponents() ; + mComponents = mGLTexturep->getComponents() ; } return ret ; } +//virtual +void LLViewerTexture::setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) +{ + //nothing here. +} + void LLViewerTexture::setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes) { llassert(mGLTexturep.notNull()) ; @@ -1249,20 +1257,30 @@ void LLViewerFetchedTexture::destroyTexture() mFullyLoaded = FALSE ; } -// -//do not change the discard level of the loaded texture image. -BOOL LLViewerFetchedTexture::keepReuestedDiscardLevel() +void LLViewerFetchedTexture::addToCreateTexture() { - if (!mLoadedCallbackList.empty()) + bool force_update = false ; + if (getComponents() != mRawImage->getComponents()) { - return TRUE ; - } + // We've changed the number of components, so we need to move any + // objects using this pool to a different pool. + mComponents = mRawImage->getComponents(); + mGLTexturep->setComponents(mComponents) ; + force_update = true ; - return FALSE ; -} + for(U32 i = 0 ; i < mNumFaces ; i++) + { + mFaceList[i]->dirtyTexture() ; + } + + //discard the cached raw image and the saved raw image + mCachedRawImageReady = FALSE ; + mCachedRawDiscardLevel = -1 ; + mCachedRawImage = NULL ; + mSavedRawDiscardLevel = -1 ; + mSavedRawImage = NULL ; + } -void LLViewerFetchedTexture::addToCreateTexture() -{ if(isForSculptOnly()) { //just update some variables, not to create a real GL texture. @@ -1270,6 +1288,11 @@ void LLViewerFetchedTexture::addToCreateTexture() mNeedsCreateTexture = FALSE ; destroyRawImage(); } + else if(!force_update && getDiscardLevel() > -1 && getDiscardLevel() <= mRawDiscardLevel) + { + mNeedsCreateTexture = FALSE ; + destroyRawImage(); + } else { #if 1 @@ -1278,7 +1301,7 @@ void LLViewerFetchedTexture::addToCreateTexture() //so do not scale down the over qualified image. //Note: scaling down image is expensensive. Do it only when very necessary. // - if(mRequestedDiscardLevel <= mDesiredDiscardLevel && !keepReuestedDiscardLevel()) + if(mRequestedDiscardLevel <= mDesiredDiscardLevel && !mForceToSaveRawImage) { S32 w = mFullWidth >> mRawDiscardLevel; S32 h = mFullHeight >> mRawDiscardLevel; @@ -1391,24 +1414,7 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/) setActive() ; } - // - // Iterate through the list of image loading callbacks to see - // what sort of data they need. - // - // *TODO: Fix image callback code - BOOL imageraw_callbacks = FALSE; - for(callback_list_t::iterator iter = mLoadedCallbackList.begin(); - iter != mLoadedCallbackList.end(); ) - { - LLLoadedCallbackEntry *entryp = *iter++; - if (entryp->mNeedsImageRaw) - { - imageraw_callbacks = TRUE; - break; - } - } - - if (!imageraw_callbacks) + if (!mForceToSaveRawImage) { mNeedsAux = FALSE; destroyRawImage(); @@ -1495,21 +1501,16 @@ F32 LLViewerFetchedTexture::calcDecodePriority() } #endif - if(mFullyLoaded)//already loaded for static texture - { - return -4.0f ; //alreay fetched - } - if (mNeedsCreateTexture) { return mDecodePriority; // no change while waiting to create } - if(mForceToSaveRawImage) + if(mFullyLoaded && !mForceToSaveRawImage)//already loaded for static texture { - return maxDecodePriority() ; + return -4.0f ; //alreay fetched } - - S32 cur_discard = getDiscardLevel(); + + S32 cur_discard = getCurrentDiscardLevelForFetching(); bool have_all_data = (cur_discard >= 0 && (cur_discard <= mDesiredDiscardLevel)); F32 pixel_priority = fsqrtf(mMaxVirtualSize); @@ -1634,11 +1635,8 @@ F32 LLViewerFetchedTexture::maxDecodePriority() void LLViewerFetchedTexture::setDecodePriority(F32 priority) { - //llassert(!mInImageList); // firing a lot, figure out why - if (mInImageList) // above llassert() softened to a warning - { - llwarns << "BAD STUFF! mInImageList" << llendl; - } + llassert(!mInImageList); + mDecodePriority = priority; } @@ -1658,6 +1656,11 @@ void LLViewerFetchedTexture::updateVirtualSize() addTextureStats(0.f, FALSE) ;//reset } + if(mForceToSaveRawImage) + { + setAdditionalDecodePriority(0.75f) ; //boost the fetching priority + } + for(U32 i = 0 ; i < mNumFaces ; i++) { LLFace* facep = mFaceList[i] ; @@ -1672,6 +1675,24 @@ void LLViewerFetchedTexture::updateVirtualSize() reorganizeVolumeList(); } +S32 LLViewerFetchedTexture::getCurrentDiscardLevelForFetching() +{ + S32 current_discard = getDiscardLevel() ; + if(mForceToSaveRawImage) + { + if(mSavedRawDiscardLevel < 0 || current_discard < 0) + { + current_discard = -1 ; + } + else + { + current_discard = llmax(current_discard, mSavedRawDiscardLevel) ; + } + } + + return current_discard ; +} + bool LLViewerFetchedTexture::updateFetch() { static LLCachedControl<bool> textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled"); @@ -1708,7 +1729,7 @@ bool LLViewerFetchedTexture::updateFetch() return false; // process any raw image data in callbacks before replacing } - S32 current_discard = getDiscardLevel() ; + S32 current_discard = getCurrentDiscardLevelForFetching() ; S32 desired_discard = getDesiredDiscardLevel(); F32 decode_priority = getDecodePriority(); decode_priority = llmax(decode_priority, 0.0f); @@ -1718,14 +1739,6 @@ bool LLViewerFetchedTexture::updateFetch() // Sets mRawDiscardLevel, mRawImage, mAuxRawImage S32 fetch_discard = current_discard; - if(mForceToSaveRawImage) - { - if(fetch_discard >= 0) - { - fetch_discard = llmax(fetch_discard, mSavedRawDiscardLevel) ; - } - } - if (mRawImage.notNull()) sRawCount--; if (mAuxRawImage.notNull()) sAuxCount--; bool finished = LLAppViewer::getTextureFetch()->getRequestFinished(getID(), fetch_discard, mRawImage, mAuxRawImage); @@ -1753,18 +1766,6 @@ bool LLViewerFetchedTexture::updateFetch() if ((mRawImage->getDataSize() > 0 && mRawDiscardLevel >= 0) && (current_discard < 0 || mRawDiscardLevel < current_discard)) { - if (getComponents() != mRawImage->getComponents()) - { - // We've changed the number of components, so we need to move any - // objects using this pool to a different pool. - mComponents = mRawImage->getComponents(); - mGLTexturep->setComponents(mComponents) ; - - for(U32 i = 0 ; i < mNumFaces ; i++) - { - mFaceList[i]->dirtyTexture() ; - } - } mFullWidth = mRawImage->getWidth() << mRawDiscardLevel; mFullHeight = mRawImage->getHeight() << mRawDiscardLevel; @@ -1830,18 +1831,6 @@ bool LLViewerFetchedTexture::updateFetch() } } - if (!mDontDiscard) - { - if (mBoostLevel == 0) - { - desired_discard = llmax(desired_discard, current_discard-1); - } - else - { - desired_discard = llmax(desired_discard, current_discard-2); - } - } - bool make_request = true; if (decode_priority <= 0) { @@ -1859,8 +1848,20 @@ bool LLViewerFetchedTexture::updateFetch() //{ // make_request = false; //} - else + + if(make_request) { + //load the texture progressively. + S32 delta_level = (mBoostLevel > LLViewerTexture::BOOST_NONE) ? 2 : 1 ; + if(current_discard < 0) + { + desired_discard = llmax(desired_discard, getMaxDiscardLevel() - delta_level); + } + else + { + desired_discard = llmax(desired_discard, current_discard - delta_level); + } + if (mIsFetching) { if (mRequestedDiscardLevel <= desired_discard) @@ -1880,7 +1881,7 @@ bool LLViewerFetchedTexture::updateFetch() if (make_request) { S32 w=0, h=0, c=0; - if (current_discard >= 0) + if (getDiscardLevel() >= 0) { w = mGLTexturep->getWidth(0); h = mGLTexturep->getHeight(0); @@ -1921,73 +1922,6 @@ bool LLViewerFetchedTexture::updateFetch() return mIsFetching ? true : false; } -// -//force to fetch a new raw image for this texture -// -BOOL LLViewerFetchedTexture::forceFetch() -{ - if(!mForceToSaveRawImage) - { - return false ; - } - //if(mDesiredSavedRawDiscardLevel < getDiscardLevel()) - { - //no need to force fetching. normal fetching flow will do the work. - //return false ; - } - //if (mNeedsCreateTexture) - { - // We may be fetching still (e.g. waiting on write) - // but don't check until we've processed the raw data we have - //return false; - } - if(mIsFetching) - { - return false ; - } - if (mIsMissingAsset) - { - mForceToSaveRawImage = false ; - llassert_always(!mHasFetcher); - return false; // skip - } - if (!mLoadedCallbackList.empty() && mRawImage.notNull()) - { - return false; // process any raw image data in callbacks before replacing - } - if(mRawImage.notNull() && mRawDiscardLevel <= mDesiredSavedRawDiscardLevel) - { - return false ; // mRawImage is enough - } - - S32 desired_discard = mDesiredSavedRawDiscardLevel ; - S32 current_discard = getDiscardLevel(); - - bool fetch_request_created = false; - S32 w=0, h=0, c=0; - if (current_discard >= 0) - { - w = getWidth(0); - h = getHeight(0); - c = getComponents(); - } - setDecodePriority(maxDecodePriority()) ; - fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), getDecodePriority(), - w, h, c, desired_discard, needsAux()); - - if (fetch_request_created) - { - mHasFetcher = TRUE; - mIsFetching = TRUE; - mRequestedDiscardLevel = desired_discard ; - - mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority, - mFetchPriority, mFetchDeltaTime, mRequestDeltaTime); - } - - return mIsFetching ? true : false; -} - void LLViewerFetchedTexture::setIsMissingAsset() { if (mUrl.empty()) @@ -2029,6 +1963,10 @@ void LLViewerFetchedTexture::setLoadedCallback( loaded_callback_func loaded_call LLLoadedCallbackEntry* entryp = new LLLoadedCallbackEntry(loaded_callback, discard_level, keep_imageraw, userdata); mLoadedCallbackList.push_back(entryp); mNeedsAux |= needs_aux; + if(keep_imageraw) + { + forceToSaveRawImage(discard_level) ; + } if (mNeedsAux && mAuxRawImage.isNull() && getDiscardLevel() >= 0) { // We need aux data, but we've already loaded the image, and it didn't have any @@ -2277,8 +2215,15 @@ LLImageRaw* LLViewerFetchedTexture::reloadRawImage(S8 discard_level) if(mSavedRawDiscardLevel >= 0 && mSavedRawDiscardLevel <= discard_level) { - mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), getComponents()) ; - mRawImage->copy(getSavedRawImage()) ; + if(mSavedRawDiscardLevel != discard_level) + { + mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), getComponents()) ; + mRawImage->copy(getSavedRawImage()) ; + } + else + { + mRawImage = getSavedRawImage() ; + } mRawDiscardLevel = discard_level ; } else @@ -2288,13 +2233,18 @@ LLImageRaw* LLViewerFetchedTexture::reloadRawImage(S8 discard_level) { mRawImage = mCachedRawImage ; mRawDiscardLevel = mCachedRawDiscardLevel; - - forceToSaveRawImage(discard_level) ; } else //cached raw image is good enough, copy it. { - mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), getComponents()) ; - mRawImage->copy(mCachedRawImage) ; + if(mCachedRawDiscardLevel != discard_level) + { + mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), getComponents()) ; + mRawImage->copy(mCachedRawImage) ; + } + else + { + mRawImage = mCachedRawImage ; + } mRawDiscardLevel = discard_level ; } } @@ -2323,11 +2273,6 @@ void LLViewerFetchedTexture::destroyRawImage() mAuxRawImage = NULL; mIsRawImageValid = FALSE; mRawDiscardLevel = INVALID_DISCARD_LEVEL; - - if(mForceToSaveRawImage) - { - forceFetch() ; - } } //use the mCachedRawImage to (re)generate the gl texture. @@ -2354,6 +2299,18 @@ void LLViewerFetchedTexture::switchToCachedImage() } } +//cache the imageraw forcefully. +//virtual +void LLViewerFetchedTexture::setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) +{ + if(imageraw != mRawImage.get()) + { + mCachedRawImage = imageraw ; + mCachedRawDiscardLevel = discard_level ; + mCachedRawImageReady = TRUE ; + } +} + void LLViewerFetchedTexture::setCachedRawImage() { if(mRawImage == mCachedRawImage) @@ -2428,7 +2385,7 @@ void LLViewerFetchedTexture::checkCachedRawSculptImage() void LLViewerFetchedTexture::saveRawImage() { - if(mRawImage.isNull() || mSavedRawDiscardLevel == mRawDiscardLevel) + if(mRawImage.isNull() || mRawImage == mSavedRawImage || (mSavedRawDiscardLevel >= 0 && mSavedRawDiscardLevel <= mRawDiscardLevel)) { return ; } @@ -2446,12 +2403,22 @@ void LLViewerFetchedTexture::saveRawImage() void LLViewerFetchedTexture::forceToSaveRawImage(S32 desired_discard) { - if(!mForceToSaveRawImage && (mDesiredSavedRawDiscardLevel < 0 || mDesiredSavedRawDiscardLevel > desired_discard)) + if(!mForceToSaveRawImage || mDesiredSavedRawDiscardLevel < 0 || mDesiredSavedRawDiscardLevel > desired_discard) { mForceToSaveRawImage = TRUE ; mDesiredSavedRawDiscardLevel = desired_discard ; - forceFetch() ; + //copy from the cached raw image if exists. + if(mCachedRawImage.notNull() && mRawImage.isNull() ) + { + mRawImage = mCachedRawImage ; + mRawDiscardLevel = mCachedRawDiscardLevel ; + + saveRawImage() ; + + mRawImage = NULL ; + mRawDiscardLevel = INVALID_DISCARD_LEVEL ; + } } } void LLViewerFetchedTexture::destroySavedRawImage() @@ -2774,7 +2741,7 @@ void LLViewerLODTexture::processTextureStats() mCalculatedDiscardLevel = discard_level; } } - if (mBoostLevel < LLViewerTexture::BOOST_HIGH) + if (mBoostLevel < LLViewerTexture::BOOST_SCULPTED) { discard_level += sDesiredDiscardBias; discard_level *= sDesiredDiscardScale; // scale @@ -2800,8 +2767,7 @@ void LLViewerLODTexture::processTextureStats() // S32 current_discard = getDiscardLevel(); - if ((sDesiredDiscardBias > 0.0f) && - (current_discard >= 0 && mDesiredDiscardLevel >= current_discard)) + if (sDesiredDiscardBias > 0.0f && mBoostLevel < LLViewerTexture::BOOST_SCULPTED && current_discard >= 0) { // Limit the amount of GL memory bound each frame if ( BYTES_TO_MEGA_BYTES(sBoundTextureMemoryInBytes) > sMaxBoundTextureMemInMegaBytes * texmem_middle_bound_scale && @@ -2818,6 +2784,11 @@ void LLViewerLODTexture::processTextureStats() } } } + + if(mForceToSaveRawImage && mDesiredSavedRawDiscardLevel >= 0) + { + mDesiredDiscardLevel = llmin(mDesiredDiscardLevel, (S8)mDesiredSavedRawDiscardLevel) ; + } } void LLViewerLODTexture::scaleDown() diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 85f03b5839..a09a711cc7 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -198,6 +198,7 @@ public: LLGLuint getTexName() const ; BOOL createGLTexture() ; BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, BOOL to_create = TRUE, S32 category = LLViewerTexture::OTHER); + virtual void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; void setFilteringOption(LLTexUnit::eTextureFilterOptions option); void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, BOOL swap_bytes = FALSE); @@ -299,7 +300,7 @@ public: static S32 sImageCount; static S32 sRawCount; static S32 sAuxCount; - static LLTimer sEvaluationTimer; + static LLFrameTimer sEvaluationTimer; static F32 sDesiredDiscardBias; static F32 sDesiredDiscardScale; static S32 sBoundTextureMemoryInBytes; @@ -447,23 +448,24 @@ public: BOOL isCachedRawImageReady() const {return mCachedRawImageReady ;} BOOL isRawImageValid()const { return mIsRawImageValid ; } void forceToSaveRawImage(S32 desired_discard = 0) ; + /*virtual*/ void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; void destroySavedRawImage() ; LLImageRaw* getSavedRawImage() ; BOOL hasSavedRawImage() const ; F32 getElapsedLastReferencedSavedRawImageTime() const ; BOOL isFullyLoaded() const; + BOOL hasFetcher() const { return mHasFetcher;} protected: /*virtual*/ void switchToCachedImage(); + S32 getCurrentDiscardLevelForFetching() ; private: void init(bool firstinit) ; void cleanup() ; void saveRawImage() ; - BOOL forceFetch() ; void setCachedRawImage() ; - BOOL keepReuestedDiscardLevel(); //for atlas void resetFaceAtlas() ; diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index ee934ab9c5..d8918bdb73 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -502,10 +502,11 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image) { llerrs << "LLViewerTextureList::addImageToList - Image already in list" << llendl; } - if ((mImageList.insert(image)).second != true) + if((mImageList.insert(image)).second != true) { - llwarns << "BAD STUFF! (mImageList.insert(image)).second != true" << llendl; + llerrs << "Error happens when insert image to mImageList!" << llendl ; } + image->setInImageList(TRUE) ; } @@ -522,10 +523,11 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image) } llerrs << "LLViewerTextureList::removeImageFromList - Image not in list" << llendl; } - if (mImageList.erase(image) != 1) - { - llwarns << "BAD STUFF! mImageList.erase(image) != 1" << llendl; - } + if(mImageList.erase(image) != 1) + { + llerrs << "Error happens when remove image from mImageList!" << llendl ; + } + image->setInImageList(FALSE) ; } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1dcc7389cb..d0a1a31ebd 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -131,6 +131,7 @@ #include "llmorphview.h" #include "llmoveview.h" #include "llnavigationbar.h" +#include "llpopupview.h" #include "llpreviewtexture.h" #include "llprogressview.h" #include "llresmgr.h" @@ -486,6 +487,10 @@ public: } ypos += y_inc; + addText(xpos, ypos, llformat("UI Verts/Calls: %d/%d", LLRender::sUIVerts, LLRender::sUICalls)); + LLRender::sUICalls = LLRender::sUIVerts = 0; + ypos += y_inc; + addText(xpos,ypos, llformat("%d/%d Nodes visible", gPipeline.mNumVisibleNodes, LLSpatialGroup::sNodeCount)); ypos += y_inc; @@ -686,30 +691,23 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK } // Topmost view gets a chance before the hierarchy - LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl(); - if (top_ctrl) - { - S32 local_x, local_y; - top_ctrl->screenPointToLocal( x, y, &local_x, &local_y ); - if (down) - { - if (top_ctrl->pointInView(local_x, local_y)) - { - return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down) ; - } - else - { - gFocusMgr.setTopCtrl(NULL); - } - } - else - { - if (top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask)) - { - return TRUE; - } - } - } + //LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl(); + //if (top_ctrl) + //{ + // S32 local_x, local_y; + // top_ctrl->screenPointToLocal( x, y, &local_x, &local_y ); + // if (top_ctrl->pointInView(local_x, local_y)) + // { + // return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down) ; + // } + // else + // { + // if (down) + // { + // gFocusMgr.setTopCtrl(NULL); + // } + // } + //} // Give the UI views a chance to process the click if( mRootView->handleAnyMouseClick(x, y, mask, clicktype, down) ) @@ -826,8 +824,10 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi if (slurl_dnd_enabled) { + // special case SLURLs - if ( LLSLURL::isSLURL( data ) ) + // isValidSLURL() call was added here to make sure that dragged SLURL is valid (EXT-4964) + if ( LLSLURL::isSLURL( data ) && LLSLURL::isValidSLURL( data ) ) { if (drop) { @@ -997,6 +997,7 @@ void LLViewerWindow::handleMouseLeave(LLWindow *window) // Note: we won't get this if we have captured the mouse. llassert( gFocusMgr.getMouseCapture() == NULL ); mMouseInWindow = FALSE; + LLToolTipMgr::instance().blockToolTips(); } BOOL LLViewerWindow::handleCloseRequest(LLWindow *window) @@ -1552,11 +1553,13 @@ void LLViewerWindow::initBase() mWorldViewPlaceholder = main_view->getChildView("world_view_rect")->getHandle(); mNonSideTrayView = main_view->getChildView("non_side_tray_view")->getHandle(); mFloaterViewHolder = main_view->getChildView("floater_view_holder")->getHandle(); + mPopupView = main_view->getChild<LLPopupView>("popup_holder"); // Constrain floaters to inside the menu and status bar regions. gFloaterView = main_view->getChild<LLFloaterView>("Floater View"); gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View"); + // Console llassert( !gConsole ); LLConsole::Params cp; @@ -2003,21 +2006,24 @@ void LLViewerWindow::drawDebugText() { gGL.color4f(1,1,1,1); gGL.pushMatrix(); + gGL.pushUIMatrix(); { // scale view by UI global scale factor and aspect ratio correction factor - glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); + gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); mDebugText->draw(); } + gGL.popUIMatrix(); gGL.popMatrix(); + gGL.flush(); } void LLViewerWindow::draw() { -#if LL_DEBUG +//#if LL_DEBUG LLView::sIsDrawing = TRUE; -#endif +//#endif stop_glerror(); LLUI::setLineWidth(1.f); @@ -2056,9 +2062,11 @@ void LLViewerWindow::draw() // No translation needed, this view is glued to 0,0 gGL.pushMatrix(); + LLUI::pushMatrix(); { + // scale view by UI global scale factor and aspect ratio correction factor - glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); + gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f); LLVector2 old_scale_factor = LLUI::sGLScaleFactor; // apply camera zoom transform (for high res screenshots) @@ -2124,11 +2132,12 @@ void LLViewerWindow::draw() LLUI::sGLScaleFactor = old_scale_factor; } + LLUI::popMatrix(); gGL.popMatrix(); -#if LL_DEBUG +//#if LL_DEBUG LLView::sIsDrawing = FALSE; -#endif +//#endif } // Takes a single keydown event, usually when UI is visible @@ -2420,6 +2429,30 @@ void LLViewerWindow::handleScrollWheel(S32 clicks) return; } +void LLViewerWindow::addPopup(LLView* popup) +{ + if (mPopupView) + { + mPopupView->addPopup(popup); + } +} + +void LLViewerWindow::removePopup(LLView* popup) +{ + if (mPopupView) + { + mPopupView->removePopup(popup); + } +} + +void LLViewerWindow::clearPopups() +{ + if (mPopupView) + { + mPopupView->clearPopups(); + } +} + void LLViewerWindow::moveCursorToCenter() { if (! gSavedSettings.getBOOL("DisableMouseWarp")) @@ -2476,6 +2509,9 @@ void append_xui_tooltip(LLView* viewp, LLToolTip::Params& params) // event processing. void LLViewerWindow::updateUI() { + static LLFastTimer::DeclareTimer ftm("Update UI"); + LLFastTimer t(ftm); + static std::string last_handle_msg; LLConsole::updateClass(); @@ -2545,6 +2581,33 @@ void LLViewerWindow::updateUI() } // aggregate visible views that contain mouse cursor in display order + LLPopupView::popup_list_t popups = mPopupView->getCurrentPopups(); + + for(LLPopupView::popup_list_t::iterator popup_it = popups.begin(); popup_it != popups.end(); ++popup_it) + { + LLView* popup = popup_it->get(); + if (popup && popup->calcScreenBoundingRect().pointInRect(x, y)) + { + // iterator over contents of top_ctrl, and throw into mouse_hover_set + for (LLView::tree_iterator_t it = popup->beginTreeDFS(); + it != popup->endTreeDFS(); + ++it) + { + LLView* viewp = *it; + if (viewp->getVisible() + && viewp->calcScreenBoundingRect().pointInRect(x, y)) + { + // we have a view that contains the mouse, add it to the set + mouse_hover_set.insert(viewp->getHandle()); + } + else + { + // skip this view and all of its children + it.skipDescendants(); + } + } + } + } // while the top_ctrl contains the mouse cursor, only it and its descendants will receive onMouseEnter events if (top_ctrl && top_ctrl->calcScreenBoundingRect().pointInRect(x, y)) @@ -3007,17 +3070,16 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window) if (mWorldViewRectRaw != new_world_rect) { - LLRect old_world_rect = mWorldViewRectRaw; mWorldViewRectRaw = new_world_rect; gResizeScreenTexture = TRUE; LLViewerCamera::getInstance()->setViewHeightInPixels( mWorldViewRectRaw.getHeight() ); LLViewerCamera::getInstance()->setAspect( getWorldViewAspectRatio() ); + LLRect old_world_rect_scaled = mWorldViewRectScaled; mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale); // sending a signal with a new WorldView rect - old_world_rect = calcScaledRect(old_world_rect, mDisplayScale); - mOnWorldViewRectUpdated(old_world_rect, mWorldViewRectScaled); + mOnWorldViewRectUpdated(old_world_rect_scaled, mWorldViewRectScaled); } } @@ -3057,7 +3119,6 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point) // Must be called after displayObjects is called, which sets the mGLName parameter // NOTE: This function gets called 3 times: // render_ui_3d: FALSE, FALSE, TRUE -// renderObjectsForSelect: TRUE, pick_parcel_wall, FALSE // render_hud_elements: FALSE, FALSE, FALSE void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud ) { diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index bfce65f2ba..410445d97f 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -69,6 +69,7 @@ class LLHUDIcon; class LLWindow; class LLRootView; class LLViewerWindowListener; +class LLPopupView; #define PICK_HALF_WIDTH 5 #define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1) @@ -300,6 +301,11 @@ public: BOOL handleKey(KEY key, MASK mask); void handleScrollWheel (S32 clicks); + // add and remove views from "popup" layer + void addPopup(LLView* popup); + void removePopup(LLView* popup); + void clearPopups(); + // Hide normal UI when a logon fails, re-show everything when logon is attempted again void setNormalControlsVisible( BOOL visible ); void setMenuBackgroundColor(bool god_mode = false, bool dev_grid = false); @@ -458,6 +464,7 @@ protected: LLHandle<LLView> mWorldViewPlaceholder; // widget that spans the portion of screen dedicated to rendering the 3d world LLHandle<LLView> mNonSideTrayView; // parent of world view + bottom bar, etc...everything but the side tray LLHandle<LLView> mFloaterViewHolder; // container for floater_view + LLPopupView* mPopupView; // container for transient popups class LLDebugText* mDebugText; // Internal class for debug text @@ -477,7 +484,7 @@ protected: private: // Object temporarily hovered over while dragging LLPointer<LLViewerObject> mDragHoveredObject; -}; +}; void toggle_flying(void*); void toggle_first_person(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 7a6a48d1b3..72b9c6df98 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2540,11 +2540,11 @@ void LLVOAvatar::idleUpdateLoadingEffect() { if (isFullyLoaded() && isSelf()) { - llinfos << "self isFullyLoaded" << llendl; - static bool first_fully_visible = true; if (first_fully_visible) { + llinfos << "self isFullyLoaded, first_fully_visible" << llendl; + first_fully_visible = false; LLAppearanceManager::instance().onFirstFullyVisible(); } diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 00998b300a..7dc8772753 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -211,6 +211,8 @@ BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLVOAvatarSkeletonInfo *info) LLVector3 scale(1.f, aspect, 1.f); mScreenp->setScale(scale); mScreenp->setWorldPosition(LLVector3::zero); + // need to update screen agressively when sidebar opens/closes, for example + mScreenp->mUpdateXform = TRUE; return TRUE; } @@ -1290,19 +1292,23 @@ BOOL LLVOAvatarSelf::isTextureDefined(LLVOAvatarDefines::ETextureIndex type, U32 } //----------------------------------------------------------------------------- -// virtual // requestLayerSetUploads() //----------------------------------------------------------------------------- void LLVOAvatarSelf::requestLayerSetUploads() { for (U32 i = 0; i < mBakedTextureDatas.size(); i++) { - ETextureIndex tex_index = mBakedTextureDatas[i].mTextureIndex; - BOOL layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index)); - if (!layer_baked && mBakedTextureDatas[i].mTexLayerSet) - { - mBakedTextureDatas[i].mTexLayerSet->requestUpload(); - } + requestLayerSetUpload((EBakedTextureIndex)i); + } +} + +void LLVOAvatarSelf::requestLayerSetUpload(LLVOAvatarDefines::EBakedTextureIndex i) +{ + ETextureIndex tex_index = mBakedTextureDatas[i].mTextureIndex; + bool layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index)); + if (!layer_baked && mBakedTextureDatas[i].mTexLayerSet) + { + mBakedTextureDatas[i].mTexLayerSet->requestUpload(); } } @@ -1653,8 +1659,11 @@ BOOL LLVOAvatarSelf::updateIsFullyLoaded() { BOOL loading = FALSE; - // do we have a shape? - if (visualParamWeightsAreDefault()) + // do we have our body parts? + if (gAgentWearables.getWearableCount(WT_SHAPE) == 0 || + gAgentWearables.getWearableCount(WT_HAIR) == 0 || + gAgentWearables.getWearableCount(WT_EYES) == 0 || + gAgentWearables.getWearableCount(WT_SKIN) == 0) { loading = TRUE; } @@ -1718,7 +1727,7 @@ BOOL LLVOAvatarSelf::canGrabLocalTexture(ETextureIndex type, U32 index) const return FALSE; } - if (gAgent.isGodlike()) + if (gAgent.isGodlikeWithoutAdminMenuFakery()) return TRUE; // Check permissions of textures that show up in the @@ -1759,14 +1768,8 @@ BOOL LLVOAvatarSelf::canGrabLocalTexture(ETextureIndex type, U32 index) const // search for full permissions version for (S32 i = 0; i < items.count(); i++) { - LLInventoryItem* itemp = items[i]; - LLPermissions item_permissions = itemp->getPermissions(); - if ( item_permissions.allowOperationBy( - PERM_MODIFY, gAgent.getID(), gAgent.getGroupID()) && - item_permissions.allowOperationBy( - PERM_COPY, gAgent.getID(), gAgent.getGroupID()) && - item_permissions.allowOperationBy( - PERM_TRANSFER, gAgent.getID(), gAgent.getGroupID()) ) + LLViewerInventoryItem* itemp = items[i]; + if (itemp->getIsFullPerm()) { can_grab = TRUE; break; diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc70996f0b..df3493c434 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -222,6 +222,7 @@ protected: //-------------------------------------------------------------------- public: void requestLayerSetUploads(); + void requestLayerSetUpload(LLVOAvatarDefines::EBakedTextureIndex i); void requestLayerSetUpdate(LLVOAvatarDefines::ETextureIndex i); LLTexLayerSet* getLayerSet(LLVOAvatarDefines::ETextureIndex index) const; diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp index 177cb16c50..5153cef709 100644 --- a/indra/newview/llvoclouds.cpp +++ b/indra/newview/llvoclouds.cpp @@ -77,9 +77,11 @@ BOOL LLVOClouds::isActive() const return TRUE; } - BOOL LLVOClouds::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { + static LLFastTimer::DeclareTimer ftm("Idle Clouds"); + LLFastTimer t(ftm); + if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS))) { return TRUE; diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index dfd67d0c38..fac7fa6a18 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -140,7 +140,10 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess LLVoiceChannel::~LLVoiceChannel() { // Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed. - if(gVoiceClient) + // Using call of instanceExists() instead of gVoiceClient in check to avoid crash in LLVoiceClient::removeObserver() + // when quitting viewer by closing console window before login (though in case of such quit crash will occur + // later in other destructors anyway). EXT-5524 + if(LLVoiceClient::instanceExists()) { gVoiceClient->removeObserver(this); } diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index f3bfc2e86c..5ba13efca2 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -102,6 +102,13 @@ const F32 UPDATE_THROTTLE_SECONDS = 0.1f; const F32 LOGIN_RETRY_SECONDS = 10.0f; const int MAX_LOGIN_RETRIES = 12; +// Defines the maximum number of times(in a row) "stateJoiningSession" case for spatial channel is reached in stateMachine() +// which is treated as normal. If this number is exceeded we suspect there is a problem with connection +// to voice server (EXT-4313). When voice works correctly, there is from 1 to 15 times. 50 was chosen +// to make sure we don't make mistake when slight connection problems happen- situation when connection to server is +// blocked is VERY rare and it's better to sacrifice response time in this situation for the sake of stability. +const int MAX_NORMAL_JOINING_SPATIAL_NUM = 50; + static void setUUIDFromStringHash(LLUUID &uuid, const std::string &str) { LLMD5 md5_uuid; @@ -1115,10 +1122,9 @@ public: * Gets stored external (vivox) volume level for specified speaker and * transforms it into internal (viewer) level. * - * If specified user is not found default level will be returned. It is equivalent of - * external level 0.5 from the 0.0..1.0 range. + * If specified user is not found -1 will be returned. * Internal level is calculated as: internal = 400 * external^2 - * Maps 0.0 to 1.0 to internal values 0-400 with default 0.5 == 100 + * Maps 0.0 to 1.0 to internal values 0-400 * * @param[in] speaker_id - LLUUID of user to get his volume level */ @@ -1157,9 +1163,8 @@ void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, F32 vo S32 LLSpeakerVolumeStorage::getSpeakerVolume(const LLUUID& speaker_id) { - // default internal level of user voice. - const static LLUICachedControl<S32> DEFAULT_INTERNAL_VOLUME_LEVEL("VoiceDefaultInternalLevel", 100); - S32 ret_val = DEFAULT_INTERNAL_VOLUME_LEVEL; + // Return value of -1 indicates no level is stored for this speaker + S32 ret_val = -1; speaker_data_map_t::const_iterator it = mSpeakersData.find(speaker_id); if (it != mSpeakersData.end()) @@ -1223,6 +1228,7 @@ LLVoiceClient::LLVoiceClient() : mRelogRequested(false), mConnected(false), mPump(NULL), + mSpatialJoiningNum(0), mTuningMode(false), mTuningEnergy(0.0f), @@ -2225,6 +2231,8 @@ void LLVoiceClient::stateMachine() //MARK: stateNoChannel case stateNoChannel: + + mSpatialJoiningNum = 0; // Do this here as well as inside sendPositionalUpdate(). // Otherwise, if you log in but don't join a proximal channel (such as when your login location has voice disabled), your friends list won't sync. sendFriendsListUpdates(); @@ -2281,6 +2289,23 @@ void LLVoiceClient::stateMachine() //MARK: stateJoiningSession case stateJoiningSession: // waiting for session handle + + // If this is true we have problem with connection to voice server (EXT-4313). + // See descriptions of mSpatialJoiningNum and MAX_NORMAL_JOINING_SPATIAL_NUM. + if(mSpatialJoiningNum == MAX_NORMAL_JOINING_SPATIAL_NUM) + { + // Notify observers to let them know there is problem with voice + notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED); + llwarns << "There seems to be problem with connection to voice server. Disabling voice chat abilities." << llendl; + } + + // Increase mSpatialJoiningNum only for spatial sessions- it's normal to reach this case for + // example for p2p many times while waiting for response, so it can't be used to detect errors + if(mAudioSession && mAudioSession->mIsSpatial) + { + mSpatialJoiningNum++; + } + // joinedAudioSession() will transition from here to stateSessionJoined. if(!mVoiceEnabled) { @@ -2304,6 +2329,8 @@ void LLVoiceClient::stateMachine() //MARK: stateSessionJoined case stateSessionJoined: // session handle received + + mSpatialJoiningNum = 0; // It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4 // before continuing from this state. They can happen in either order, and if I don't wait for both, things can get stuck. // For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined. @@ -5045,6 +5072,11 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con mParticipantsByUUID.insert(participantUUIDMap::value_type(&(result->mAvatarID), result)); result->mUserVolume = LLSpeakerVolumeStorage::getInstance()->getSpeakerVolume(result->mAvatarID); + if (result->mUserVolume != -1) + { + result->mVolumeDirty = true; + mVolumeDirty = true; + } LL_DEBUGS("Voice") << "participant \"" << result->mURI << "\" added." << LL_ENDL; } @@ -5377,24 +5409,25 @@ LLVoiceClient::sessionState* LLVoiceClient::startUserIMSession(const LLUUID &uui // No session with user, need to start one. std::string uri = sipURIFromID(uuid); session = addSession(uri); + + llassert(session); + if (!session) return NULL; + session->mIsSpatial = false; session->mReconnect = false; session->mIsP2P = true; session->mCallerID = uuid; } - if(session) + if(session->mHandle.empty()) { - if(session->mHandle.empty()) - { - // Session isn't active -- start it up. - sessionCreateSendMessage(session, false, true); - } - else - { - // Session is already active -- start up text. - sessionTextConnectSendMessage(session); - } + // Session isn't active -- start it up. + sessionCreateSendMessage(session, false, true); + } + else + { + // Session is already active -- start up text. + sessionTextConnectSendMessage(session); } return session; @@ -5988,7 +6021,9 @@ bool LLVoiceClient::voiceEnabled() bool LLVoiceClient::voiceWorking() { //Added stateSessionTerminated state to avoid problems with call in parcels with disabled voice (EXT-4758) - return (stateLoggedIn <= mState) && (mState <= stateSessionTerminated); + // Condition with joining spatial num was added to take into account possible problems with connection to voice + // server(EXT-4313). See bug descriptions and comments for MAX_NORMAL_JOINING_SPATIAL_NUM for more info. + return (mSpatialJoiningNum < MAX_NORMAL_JOINING_SPATIAL_NUM) && (stateLoggedIn <= mState) && (mState <= stateSessionTerminated); } void LLVoiceClient::setLipSyncEnabled(BOOL enabled) diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index a96cf18e27..aaacab69e0 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -586,6 +586,10 @@ static void updatePosition(void); state mState; bool mSessionTerminateRequested; bool mRelogRequested; + // Number of times (in a row) "stateJoiningSession" case for spatial channel is reached in stateMachine(). + // The larger it is the greater is possibility there is a problem with connection to voice server. + // Introduced while fixing EXT-4313. + int mSpatialJoiningNum; void setState(state inState); state getState(void) { return mState; }; diff --git a/indra/newview/llvotextbubble.cpp b/indra/newview/llvotextbubble.cpp index 75beab519e..428ef20006 100644 --- a/indra/newview/llvotextbubble.cpp +++ b/indra/newview/llvotextbubble.cpp @@ -84,6 +84,9 @@ BOOL LLVOTextBubble::isActive() const BOOL LLVOTextBubble::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { + static LLFastTimer::DeclareTimer ftm("Text Bubble"); + LLFastTimer t(ftm); + F32 dt = mUpdateTimer.getElapsedTimeF32(); // Die after a few seconds. if (dt > 1.5f) diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index 24f1c4bd24..55e2c58a52 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -1141,7 +1141,7 @@ U32 LLVOTree::drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD glLoadMatrixf((F32*) scale_mat.mMatrix); glDrawElements(GL_TRIANGLES, sLODIndexCount[trunk_LOD], GL_UNSIGNED_SHORT, indicesp + sLODIndexOffset[trunk_LOD]); - gPipeline.addTrianglesDrawn(LEAF_INDICES/3); + gPipeline.addTrianglesDrawn(LEAF_INDICES); stop_glerror(); ret += sLODIndexCount[trunk_LOD]; } @@ -1191,7 +1191,7 @@ U32 LLVOTree::drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD glLoadMatrixf((F32*) scale_mat.mMatrix); glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_SHORT, indicesp); - gPipeline.addTrianglesDrawn(LEAF_INDICES/3); + gPipeline.addTrianglesDrawn(LEAF_INDICES); stop_glerror(); ret += LEAF_INDICES; } @@ -1216,7 +1216,7 @@ U32 LLVOTree::drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD glLoadMatrixf((F32*) scale_mat.mMatrix); glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_SHORT, indicesp); - gPipeline.addTrianglesDrawn(LEAF_INDICES/3); + gPipeline.addTrianglesDrawn(LEAF_INDICES); stop_glerror(); ret += LEAF_INDICES; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 9fbcd1d32a..86d8204473 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -603,6 +603,9 @@ BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { LLViewerObject::idleUpdate(agent, world, time); + static LLFastTimer::DeclareTimer ftm("Volume"); + LLFastTimer t(ftm); + if (mDead || mDrawable.isNull()) { return TRUE; @@ -624,6 +627,18 @@ BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) mVolumeImpl->doIdleUpdate(agent, world, time); } + const S32 MAX_ACTIVE_OBJECT_QUIET_FRAMES = 40; + + if (mDrawable->isActive()) + { + if (mDrawable->isRoot() && + mDrawable->mQuietCount++ > MAX_ACTIVE_OBJECT_QUIET_FRAMES && + (!mDrawable->getParent() || !mDrawable->getParent()->isActive())) + { + mDrawable->makeStatic(); + } + } + return TRUE; } @@ -1009,6 +1024,8 @@ void LLVOVolume::sculpt() if(!raw_image) { + llassert(discard_level < 0) ; + sculpt_width = 0; sculpt_height = 0; sculpt_data = NULL ; @@ -1040,7 +1057,6 @@ void LLVOVolume::sculpt() if (volume != this && volume->getVolume() == getVolume()) { gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE); - volume->mSculptChanged = TRUE; } } } @@ -1072,7 +1088,7 @@ BOOL LLVOVolume::calcLOD() S32 cur_detail = 0; F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length(); - F32 distance = llmin(mDrawable->mDistanceWRTCamera, MAX_LOD_DISTANCE); + F32 distance = mDrawable->mDistanceWRTCamera; //llmin(mDrawable->mDistanceWRTCamera, MAX_LOD_DISTANCE); distance *= sDistanceFactor; F32 rampDist = LLVOVolume::sLODFactor * 2; @@ -1396,7 +1412,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) return res; } - dirtySpatialGroup(); + dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); BOOL compiled = FALSE; @@ -1499,7 +1515,14 @@ void LLVOVolume::updateFaceSize(S32 idx) else { const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx); - facep->setSize(vol_face.mVertices.size(), vol_face.mIndices.size()); + if (LLPipeline::sUseTriStrips) + { + facep->setSize(vol_face.mVertices.size(), vol_face.mTriStrip.size()); + } + else + { + facep->setSize(vol_face.mVertices.size(), vol_face.mIndices.size()); + } } } @@ -3249,6 +3272,11 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_info->mExtents[0] = facep->mExtents[0]; draw_info->mExtents[1] = facep->mExtents[1]; validate_draw_info(*draw_info); + + if (LLPipeline::sUseTriStrips) + { + draw_info->mDrawMode = LLRender::TRIANGLE_STRIP; + } } } @@ -3333,7 +3361,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) drawablep->updateFaceSize(i); LLFace* facep = drawablep->getFace(i); - if (cur_total > max_total) + if (cur_total > max_total || facep->getIndicesCount() <= 0 || facep->getGeomCount() <= 0) { facep->mVertexBuffer = NULL; facep->mLastVertexBuffer = NULL; diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp index 0272a2ab34..1749ccef94 100644 --- a/indra/newview/llvowlsky.cpp +++ b/indra/newview/llvowlsky.cpp @@ -519,7 +519,7 @@ void LLVOWLSky::drawDome(void) LLRender::TRIANGLE_STRIP, 0, strips_segment->getRequestedVerts()-1, strips_segment->getRequestedIndices(), 0); - gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices() - 2); + gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices(), LLRender::TRIANGLE_STRIP); } #else diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index d6a9837b86..b2de31218b 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -235,8 +235,9 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type ) LLWearable *wearable = generateNewWearable(); wearable->setType( type ); - std::string name = "New "; - name.append( wearable->getTypeLabel() ); + LLSD item_name = LLSD().with("[WEARABLE_ITEM]", wearable->getTypeLabel()); + std::string name = LLTrans::getString("NewWearable"); + LLStringUtil::format(name, item_name); wearable->setName( name ); LLPermissions perm; diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 100ec0bb69..3385b75c65 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -148,6 +148,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel(); substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); substitution["SESSION_ID"] = gAgent.getSessionID(); + substitution["FIRST_LOGIN"] = gAgent.isFirstLogin(); // work out the current language std::string lang = LLUI::getLanguage(); diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 118d7f8d08..d7e5b464a6 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -657,6 +657,9 @@ void LLWorld::updateParticles() void LLWorld::updateClouds(const F32 dt) { + static LLFastTimer::DeclareTimer ftm("World Clouds"); + LLFastTimer t(ftm); + if (gSavedSettings.getBOOL("FreezeTime") || !gSavedSettings.getBOOL("SkyUseClassicClouds")) { diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h index 7e37727b86..e4e677eb64 100644 --- a/indra/newview/llworldmap.h +++ b/indra/newview/llworldmap.h @@ -123,6 +123,7 @@ public: bool isName(const std::string& name) const; bool isDown() { return (mAccess == SIM_ACCESS_DOWN); } bool isPG() { return (mAccess <= SIM_ACCESS_PG); } + bool isAdult() { return (mAccess == SIM_ACCESS_ADULT); } // Debug only void dump() const; // Print the region info to the standard output diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dd9634a234..259ca21e93 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -116,7 +116,6 @@ const F32 BACKLIGHT_DAY_MAGNITUDE_AVATAR = 0.2f; const F32 BACKLIGHT_NIGHT_MAGNITUDE_AVATAR = 0.1f; const F32 BACKLIGHT_DAY_MAGNITUDE_OBJECT = 0.1f; const F32 BACKLIGHT_NIGHT_MAGNITUDE_OBJECT = 0.08f; -const S32 MAX_ACTIVE_OBJECT_QUIET_FRAMES = 40; const S32 MAX_OFFSCREEN_GEOMETRY_CHANGES_PER_FRAME = 10; const U32 REFLECTION_MAP_RES = 128; @@ -271,6 +270,7 @@ BOOL LLPipeline::sDelayVBUpdate = TRUE; BOOL LLPipeline::sFastAlpha = TRUE; BOOL LLPipeline::sDisableShaders = FALSE; BOOL LLPipeline::sRenderBump = TRUE; +BOOL LLPipeline::sUseTriStrips = TRUE; BOOL LLPipeline::sUseFarClip = TRUE; BOOL LLPipeline::sShadowRender = FALSE; BOOL LLPipeline::sWaterReflections = FALSE; @@ -359,6 +359,7 @@ void LLPipeline::init() sDynamicLOD = gSavedSettings.getBOOL("RenderDynamicLOD"); sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); + sUseTriStrips = gSavedSettings.getBOOL("RenderUseTriStrips"); sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights"); sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles"); @@ -477,8 +478,6 @@ void LLPipeline::cleanup() releaseGLBuffers(); - mBloomImagep = NULL; - mBloomImage2p = NULL; mFaceSelectImagep = NULL; mMovedBridge.clear(); @@ -1412,38 +1411,26 @@ void LLPipeline::updateMove() assertInitialized(); - for (LLDrawable::drawable_set_t::iterator iter = mRetexturedList.begin(); - iter != mRetexturedList.end(); ++iter) { - LLDrawable* drawablep = *iter; - if (drawablep && !drawablep->isDead()) - { - drawablep->updateTexture(); - } - } - mRetexturedList.clear(); - - updateMovedList(mMovedList); + static LLFastTimer::DeclareTimer ftm("Retexture"); + LLFastTimer t(ftm); - for (LLDrawable::drawable_set_t::iterator iter = mActiveQ.begin(); - iter != mActiveQ.end(); ) - { - LLDrawable::drawable_set_t::iterator curiter = iter++; - LLDrawable* drawablep = *curiter; - if (drawablep && !drawablep->isDead()) + for (LLDrawable::drawable_set_t::iterator iter = mRetexturedList.begin(); + iter != mRetexturedList.end(); ++iter) { - if (drawablep->isRoot() && - drawablep->mQuietCount++ > MAX_ACTIVE_OBJECT_QUIET_FRAMES && - (!drawablep->getParent() || !drawablep->getParent()->isActive())) + LLDrawable* drawablep = *iter; + if (drawablep && !drawablep->isDead()) { - drawablep->makeStatic(); // removes drawable and its children from mActiveQ - iter = mActiveQ.upper_bound(drawablep); // next valid entry + drawablep->updateTexture(); } } - else - { - mActiveQ.erase(curiter); - } + mRetexturedList.clear(); + } + + { + static LLFastTimer::DeclareTimer ftm("Moved List"); + LLFastTimer t(ftm); + updateMovedList(mMovedList); } //balance octrees @@ -2790,10 +2777,8 @@ void render_hud_elements() LLViewerParcelMgr::getInstance()->render(); LLViewerParcelMgr::getInstance()->renderParcelCollision(); - // Render debugging beacons. - //gObjectList.renderObjectBeacons(); - //LLHUDObject::renderAll(); - //gObjectList.resetObjectBeacons(); + // Render name tags. + LLHUDObject::renderAll(); } else if (gForceRenderLandFence) { @@ -3059,12 +3044,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) } } - if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING)) - { - LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect"); - gObjectList.renderObjectsForSelect(camera, gViewerWindow->getWindowRectScaled()); - } - else { LLFastTimer t(FTM_POOLS); @@ -3204,7 +3183,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } @@ -3436,7 +3414,6 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera) { // Render debugging beacons. gObjectList.renderObjectBeacons(); - LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); } @@ -3515,9 +3492,19 @@ void LLPipeline::renderGeomShadow(LLCamera& camera) } -void LLPipeline::addTrianglesDrawn(S32 count) +void LLPipeline::addTrianglesDrawn(S32 index_count, U32 render_type) { assertInitialized(); + S32 count = 0; + if (render_type == LLRender::TRIANGLE_STRIP) + { + count = index_count-2; + } + else + { + count = index_count/3; + } + mTrianglesDrawn += count; mBatchCount++; mMaxBatchSize = llmax(mMaxBatchSize, count); @@ -4798,10 +4785,6 @@ void LLPipeline::findReferences(LLDrawable *drawablep) llinfos << "In mRetexturedList" << llendl; } - if (mActiveQ.find(drawablep) != mActiveQ.end()) - { - llinfos << "In mActiveQ" << llendl; - } if (std::find(mBuildQ1.begin(), mBuildQ1.end(), drawablep) != mBuildQ1.end()) { llinfos << "In mBuildQ1" << llendl; @@ -4958,19 +4941,6 @@ void LLPipeline::setLight(LLDrawable *drawablep, BOOL is_light) } } -void LLPipeline::setActive(LLDrawable *drawablep, BOOL active) -{ - assertInitialized(); - if (active) - { - mActiveQ.insert(drawablep); - } - else - { - mActiveQ.erase(drawablep); - } -} - //static void LLPipeline::toggleRenderType(U32 type) { @@ -5386,6 +5356,7 @@ void LLPipeline::resetVertexBuffers(LLDrawable* drawable) void LLPipeline::resetVertexBuffers() { sRenderBump = gSavedSettings.getBOOL("RenderObjectBump"); + sUseTriStrips = gSavedSettings.getBOOL("RenderUseTriStrips"); for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); iter != LLWorld::getInstance()->getRegionList().end(); ++iter) diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 67004a5f2d..6aecc23aac 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -270,15 +270,14 @@ public: void shiftObjects(const LLVector3 &offset); void setLight(LLDrawable *drawablep, BOOL is_light); - void setActive(LLDrawable *drawablep, BOOL active); - + BOOL hasRenderBatches(const U32 type) const; LLCullResult::drawinfo_list_t::iterator beginRenderMap(U32 type); LLCullResult::drawinfo_list_t::iterator endRenderMap(U32 type); LLCullResult::sg_list_t::iterator beginAlphaGroups(); LLCullResult::sg_list_t::iterator endAlphaGroups(); - void addTrianglesDrawn(S32 count); + void addTrianglesDrawn(S32 index_count, U32 render_type = LLRender::TRIANGLES); BOOL hasRenderType(const U32 type) const { return (type && (mRenderTypeMask & (1<<type))) ? TRUE : FALSE; } BOOL hasRenderDebugFeatureMask(const U32 mask) const { return (mRenderDebugFeatureMask & mask) ? TRUE : FALSE; } BOOL hasRenderDebugMask(const U32 mask) const { return (mRenderDebugMask & mask) ? TRUE : FALSE; } @@ -448,7 +447,7 @@ public: static BOOL sFastAlpha; static BOOL sDisableShaders; // if TRUE, rendering will be done without shaders static BOOL sRenderBump; - static BOOL sUseFBO; + static BOOL sUseTriStrips; static BOOL sUseFarClip; static BOOL sShadowRender; static BOOL sWaterReflections; @@ -589,8 +588,6 @@ protected: LLViewerObject::vobj_list_t mCreateQ; - LLDrawable::drawable_set_t mActiveQ; - LLDrawable::drawable_set_t mRetexturedList; class HighlightItem @@ -676,8 +673,6 @@ protected: std::vector<LLFace*> mSelectedFaces; LLPointer<LLViewerFetchedTexture> mFaceSelectImagep; - LLPointer<LLViewerTexture> mBloomImagep; - LLPointer<LLViewerTexture> mBloomImage2p; U32 mLightMask; U32 mLightMovingMask; @@ -694,6 +689,7 @@ public: }; void render_bbox(const LLVector3 &min, const LLVector3 &max); +void render_hud_elements(); extern LLPipeline gPipeline; extern BOOL gRenderForSelect; diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico Binary files differindex c35a3fa3a3..87985b9285 100644 --- a/indra/newview/res/ll_icon.ico +++ b/indra/newview/res/ll_icon.ico diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns Binary files differindex ceb6036e0e..4560d4bb24 100644 --- a/indra/newview/secondlife.icns +++ b/indra/newview/secondlife.icns diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index b33d4f73a4..d45d6155dd 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -286,6 +286,9 @@ name="ColorPaletteEntry32" reference="White" /> <color + name="ComboListBgColor" + reference="DkGray" /> + <color name="ConsoleBackground" reference="Black" /> <color @@ -341,7 +344,7 @@ value="0.92 0.92 1 0.78" /> <color name="GridlineColor" - reference="Red" /> + reference="White" /> <color name="GridlineShadowColor" value="0 0 0 0.31" /> diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html index cdad5702b9..5f3426eb60 100644 --- a/indra/newview/skins/default/html/da/loading/loading.html +++ b/indra/newview/skins/default/html/da/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Indlæser...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Indlæser... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html index 3eddbc24f5..44a621b216 100644 --- a/indra/newview/skins/default/html/de/loading/loading.html +++ b/indra/newview/skins/default/html/de/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Wird geladen...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Wird geladen... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html index 34e5c84c4d..1c62d2f73e 100644 --- a/indra/newview/skins/default/html/en-us/loading/loading.html +++ b/indra/newview/skins/default/html/en-us/loading/loading.html @@ -1,9 +1,9 @@ -<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/> loading...
- </td>
- </tr>
-</table>
-</body>
+<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/> loading... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html index f03284ba8c..c4260b34c0 100644 --- a/indra/newview/skins/default/html/es/loading/loading.html +++ b/indra/newview/skins/default/html/es/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Cargando...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Cargando... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html index 23c0ef03bc..b3953448e9 100644 --- a/indra/newview/skins/default/html/fr/loading/loading.html +++ b/indra/newview/skins/default/html/fr/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Chargement...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Chargement... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html index ade91f76c2..ab15a073ba 100644 --- a/indra/newview/skins/default/html/hu/loading/loading.html +++ b/indra/newview/skins/default/html/hu/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Betöltés folyamatban...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Betöltés folyamatban... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html index 0f9af31f6e..ab37e41f04 100644 --- a/indra/newview/skins/default/html/it/loading/loading.html +++ b/indra/newview/skins/default/html/it/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Attendi...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Attendi... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html index 069dc5d12f..35cf74a35f 100644 --- a/indra/newview/skins/default/html/ja/loading/loading.html +++ b/indra/newview/skins/default/html/ja/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> ãƒãƒ¼ãƒ‰ä¸...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> ãƒãƒ¼ãƒ‰ä¸... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html index 39a8691f3f..0215bd7e47 100644 --- a/indra/newview/skins/default/html/nl/loading/loading.html +++ b/indra/newview/skins/default/html/nl/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Laden...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Laden... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html index 515890c2d5..50f3dfb0c5 100644 --- a/indra/newview/skins/default/html/pl/loading/loading.html +++ b/indra/newview/skins/default/html/pl/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Åadowanie...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Åadowanie... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html index 635ea62406..a83e1123d0 100644 --- a/indra/newview/skins/default/html/pt/loading/loading.html +++ b/indra/newview/skins/default/html/pt/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Carregando...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Carregando... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html index dcc0d73c1a..892c0b9f7f 100644 --- a/indra/newview/skins/default/html/ru/loading/loading.html +++ b/indra/newview/skins/default/html/ru/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Загрузка...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Загрузка... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html index e7812e7c8e..1ac07bff34 100644 --- a/indra/newview/skins/default/html/tr/loading/loading.html +++ b/indra/newview/skins/default/html/tr/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Yükleniyor...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Yükleniyor... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html index 0f67994635..3b5b8679b4 100644 --- a/indra/newview/skins/default/html/uk/loading/loading.html +++ b/indra/newview/skins/default/html/uk/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Завантаж...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> Завантаж... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html index 462ea291d9..d1d5d25c92 100644 --- a/indra/newview/skins/default/html/zh/loading/loading.html +++ b/indra/newview/skins/default/html/zh/loading/loading.html @@ -1,10 +1,10 @@ -<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
-<table width="100%" height="100%" border="0">
- <tr>
- <td align="center" valign="middle" style="font-size:0.8em;">
- <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> 请ç‰å¾…...
- </td>
- </tr>
-</table>
-</body>
+<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head> +<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;"> +<table width="100%" height="100%" border="0"> + <tr> + <td align="center" valign="middle" style="font-size:0.8em;"> + <img src="../../en-us/loading/sl_logo_rotate_black.gif" align="absmiddle"><br/> 请ç‰å¾…... + </td> + </tr> +</table> +</body> diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png Binary files differindex fdd65b49e1..9d76f75d0f 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Group.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group.png diff --git a/indra/newview/skins/default/textures/icons/unknown_icon.png b/indra/newview/skins/default/textures/icons/unknown_icon.png Binary files differnew file mode 100644 index 0000000000..8441d86596 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/unknown_icon.png diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png Binary files differindex 605073d786..95913dd55b 100644 --- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png +++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0065d824d2..b1594816b2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -83,7 +83,7 @@ with the same filename but different name <texture name="BottomTray_Scroll_Left" file_name="navbar/Arrow_Left_Off.png" preload="false" /> <texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> - <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> + <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> <texture name="Cam_Avatar_Disabled" file_name="bottomtray/Cam_Avatar_Disabled.png" preload="false" /> @@ -516,6 +516,7 @@ with the same filename but different name <texture name="SL_Logo" file_name="icons/SL_Logo.png" preload="true" /> <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" /> + <texture name="Unknown_Icon" file_name="icons/unknown_icon.png" preload="true" /> <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" /> @@ -679,6 +680,7 @@ with the same filename but different name <texture name="silhouette.j2c" use_mips="true" /> <texture name="foot_shadow.j2c" use_mips="true" /> <texture name="cloud-particle.j2c" use_mips="true" /> + <texture name="transparent.j2c" use_mips="true" /> <!--WARNING OLD ART BELOW *do not use*--> <texture name="icn_chatbar.tga" /> diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png Binary files differnew file mode 100644 index 0000000000..361fab59e0 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Flyout_Pointer_Up.png diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index eb63b5c975..91db3c6b1c 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -8,7 +8,7 @@ Bygget med [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret pÃ¥ [HOSTNAME] ([HOSTIP]) + Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> @@ -43,13 +43,9 @@ Vivox Version: [VIVOX_VERSION] </panel> <panel label="Tak til" name="credits_panel"> <text_editor name="credits_editor"> - Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others. + Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les og mange flere. -Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar - - - -I get by with a little help from my friends. --Richard Starkey +Tak til følgende beboere for at sikre at denne klient er den bedste version indtil nu: (under udarbejdelse) </text_editor> </panel> <panel label="Licenser" name="licenses_panel"> diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index b4af427538..9bda1397bc 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -81,6 +81,9 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel <text name="Group:"> Gruppe: </text> + <text name="GroupText"> + Leyla Linden + </text> <button label="Vælg..." label_selected="Vælg..." name="Set..."/> <check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, sÃ¥ det vil blive støttet af gruppen's jord tildeling."/> <button label="Dedikér..." label_selected="Dedikér..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/> @@ -124,6 +127,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel 0 </text> <button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/> + <button label="Script Info" name="Scripts..."/> <button label="Køb til gruppe..." label_selected="Køb til gruppe..." name="Buy For Group..."/> <button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette omrÃ¥de."/> <button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/> @@ -377,12 +381,9 @@ Kun større parceller kan vises i søgning. </text> <combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/> <text left="4" name="at URL:"> - Medie URL: + Hjemmeside: </text> <button label="Vælg..." label_selected="Vælg..." name="set_media_url"/> - <text name="CurrentURL:"> - Nuværende side: - </text> <check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen sÃ¥ det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/> <text left="4" name="Description:"> Beskrivelse: @@ -393,8 +394,8 @@ Kun større parceller kan vises i søgning. </text> <texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/> <text name="replace_texture_help"> - (Objekter der har denne tekstur vil vise filmen eller -web-siden, efter du klikker pÃ¥ play knappen.) + Objekter der har denne tekstur vil vise filmen eller web-siden, efter du klikker pÃ¥ play knappen. Vælg + Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail for at vælge anden tekstur. </text> <check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/> <text name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105"> @@ -411,8 +412,10 @@ web-siden, efter du klikker pÃ¥ play knappen.) <check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, nÃ¥r det er færdigt med at spille starter det automatisk forfra."/> </panel> <panel label="LYD" name="land_audio_panel"> + <check_box label="Skjul URL" name="hide_music_url" tool_tip="Ved at vælge her, vil musik URL skjules for alle ikke autoriserede brugere der læser denne parcels information."/> <check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/> <check_box label="Tillad stemmer (hÃ¥ndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_local"/> </panel> <panel label="ADGANG" name="land_access_panel"> <panel.string name="access_estate_defined"> @@ -428,8 +431,8 @@ web-siden, efter du klikker pÃ¥ play knappen.) <text name="Only Allow"> Blokér adgang for:: </text> - <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/> - <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/> + <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér for uidentificerede beboere."/> + <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er alders-verificerede. Se [SUPPORT_SITE] for mere information."/> <check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen 'generelt'."/> <check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/> <combo_box name="pass_combo"> diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml index 47e02f0704..fdbfd737ba 100644 --- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml @@ -106,6 +106,9 @@ Maksimal animations længde er [MAX_LENGTH] sekunder. <floater.string name="E_ST_NO_XLT_EMOTE"> kan ikke læse "emote" navn. </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Incorrect root joint name, use "hip". + </floater.string> <text name="name_label"> Navn: </text> diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml index 1111c5e18b..e405a1beb8 100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml @@ -7,26 +7,37 @@ Blandede teksturer </text> <button label="Drop" label_selected="Dump" name="Dump"/> - <texture_picker label="HÃ¥r" name="hair_grain"/> - <texture_picker label="Alpha - hÃ¥r" name="hair_alpha"/> - <texture_picker label="Makeup" name="head_bodypaint"/> - <texture_picker label="Alpha - hoved" name="head_alpha"/> - <texture_picker label="Tatovering hovede" name="head_tattoo"/> - <texture_picker label="Øje" name="eyes_iris"/> - <texture_picker label="Alpha - øjne" name="eyes_alpha"/> - <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> - <texture_picker label="Undertrøje" name="upper_undershirt"/> - <texture_picker label="Handsker" name="upper_gloves"/> - <texture_picker label="Trøje" name="upper_shirt"/> - <texture_picker label="Øvre jakke" name="upper_jacket"/> - <texture_picker label="Alpha - øvre" name="upper_alpha"/> - <texture_picker label="Øvre tatovering" name="upper_tattoo"/> - <texture_picker label="Bodypaint - underkrop" name="lower_bodypaint"/> - <texture_picker label="Undertøj" name="lower_underpants"/> - <texture_picker label="Strømper" name="lower_socks"/> - <texture_picker label="Sko" name="lower_shoes"/> - <texture_picker label="Bukser" name="lower_pants"/> - <texture_picker label="Jakke" name="lower_jacket"/> - <texture_picker label="Alpha - nedre" name="lower_alpha"/> - <texture_picker label="Nedre tatovering" name="lower_tattoo"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <texture_picker label="HÃ¥r" name="hair-baked"/> + <texture_picker label="HÃ¥r" name="hair_grain"/> + <texture_picker label="Alpha - hÃ¥r" name="hair_alpha"/> + <texture_picker label="Hoved" name="head-baked"/> + <texture_picker label="Makeup" name="head_bodypaint"/> + <texture_picker label="Alpha - hoved" name="head_alpha"/> + <texture_picker label="Tatovering - hoved" name="head_tattoo"/> + <texture_picker label="Eyes" name="eyes-baked"/> + <texture_picker label="Øje" name="eyes_iris"/> + <texture_picker label="Alpha - øjne" name="eyes_alpha"/> + <texture_picker label="Overkrop" name="upper-baked"/> + <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/> + <texture_picker label="Undertrøje" name="upper_undershirt"/> + <texture_picker label="Handsker" name="upper_gloves"/> + <texture_picker label="Trøje" name="upper_shirt"/> + <texture_picker label="Jakke - foroven" name="upper_jacket"/> + <texture_picker label="Alpha - øvre" name="upper_alpha"/> + <texture_picker label="Tatovering - øvre" name="upper_tattoo"/> + <texture_picker label="Ben" name="lower-baked"/> + <texture_picker label="Bodypaint - ben" name="lower_bodypaint"/> + <texture_picker label="Underbukser" name="lower_underpants"/> + <texture_picker label="Strømper" name="lower_socks"/> + <texture_picker label="Sko" name="lower_shoes"/> + <texture_picker label="Bukser" name="lower_pants"/> + <texture_picker label="Jakke" name="lower_jacket"/> + <texture_picker label="Alpha - nedre" name="lower_alpha"/> + <texture_picker label="Tatovering - nedre" name="lower_tattoo"/> + <texture_picker label="Nederdel" name="skirt-baked"/> + <texture_picker label="Nederdel" name="skirt"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml index d67d859e7b..8049b072ce 100644 --- a/indra/newview/skins/default/xui/da/floater_beacons.xml +++ b/indra/newview/skins/default/xui/da/floater_beacons.xml @@ -2,7 +2,7 @@ <floater name="beacons" title="PEJLELYS"> <panel name="beacons_panel"> <text name="label_show"> - Vis: + Vis : </text> <check_box label="Pejlelys" name="beacons"/> <check_box label="Fremhævninger" name="highlights"/> diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml index 0dd1a4f6ba..58a1c1b73e 100644 --- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml @@ -49,6 +49,6 @@ <check_box label="Redigere" name="next_owner_modify"/> <check_box label="Kopiére" name="next_owner_copy"/> <check_box initial_value="true" label="Overfør" name="next_owner_transfer" tool_tip="Næste ejer kan sælge eller forære dette objekt væk"/> - <button label="Ok" name="apply"/> + <button label="OK" name="apply"/> <button label="Annullér" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml index 18ee0e0597..49c2264956 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml @@ -46,7 +46,7 @@ L$ [AMT] </text> <text name="currency_links"> - [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] </text> <text name="exchange_rate_note"> Indtast beløbet for at se nyeste valutakurs. diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml index 987ad6585f..57bcc7ad9d 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml @@ -1,5 +1,134 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="KØB LAND"> + <floater.string name="can_resell"> + Kan videresælges. + </floater.string> + <floater.string name="can_not_resell"> + Kan ikke videresælges. + </floater.string> + <floater.string name="can_change"> + Kan samles eller opdeles. + </floater.string> + <floater.string name="can_not_change"> + Kan ikke samles eller opdeles. + </floater.string> + <floater.string name="cant_buy_for_group"> + Du har ikke tilladelse til at købe land for din aktive gruppe. + </floater.string> + <floater.string name="no_land_selected"> + Intet land er valgt. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Flere forskellige parceller er valgt. +Prøv at vælge et mindre omrÃ¥de. + </floater.string> + <floater.string name="no_permission"> + Du har ikke tilladelse til at købe jord for din aktive gruppe. + </floater.string> + <floater.string name="parcel_not_for_sale"> + Det udvalgte parcel er ikke til salg. + </floater.string> + <floater.string name="group_already_owns"> + Gruppen ejer allerede parcellet. + </floater.string> + <floater.string name="you_already_own"> + Du ejer allerede parcellet. + </floater.string> + <floater.string name="set_to_sell_to_other"> + Det udvalgte parcel er sat til salg til en anden. + </floater.string> + <floater.string name="no_public_land"> + Det valgte omrÃ¥de har ingen offentlige arealer. + </floater.string> + <floater.string name="not_owned_by_you"> + Jord, der ejes af en anden bruger er valgt. +Prøv at vælge et mindre omrÃ¥de. + </floater.string> + <floater.string name="processing"> + Forarbejder dit køb... + +(Dette kan tage et minut eller to.) + </floater.string> + <floater.string name="fetching_error"> + Der er sket en fejl under hentning af jord købs oplysninger. + </floater.string> + <floater.string name="buying_will"> + Køb af dette areal vil: + </floater.string> + <floater.string name="buying_for_group"> + Køb af dette areal vil: + </floater.string> + <floater.string name="cannot_buy_now"> + Kan ikke købe nu: + </floater.string> + <floater.string name="not_for_sale"> + Ikke til salg: + </floater.string> + <floater.string name="none_needed"> + ikke nødvendigt + </floater.string> + <floater.string name="must_upgrade"> + Din konto skal være opgraderet for at eje jord. + </floater.string> + <floater.string name="cant_own_land"> + Din konto kan eje jord. + </floater.string> + <floater.string name="land_holdings"> + Du ejer [BUYER] m² land. + </floater.string> + <floater.string name="pay_to_for_land"> + Betal L$ [AMOUNT] til [SELLER] for dette stykke jord + </floater.string> + <floater.string name="buy_for_US"> + Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Denne parcel er pÃ¥ [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + Dette stykke jord er premium, og vil tælle som [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Dette stykke jord er pÃ¥ tilbud, og vil tælle som [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +kan indeholde [AMOUNT2] objekter + </floater.string> + <floater.string name="sold_with_objects"> + solgt med objekter + </floater.string> + <floater.string name="sold_without_objects"> + objekter ikke inkluderet + </floater.string> + <floater.string name="info_price_string"> + L$ [PRICE] +(L$ [PRICE_PER_SQM]/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Gruppen [GROUP] skal bruge nok tildelt jord brugs +kredit for at dække dette parcel før købet vil blive +gennemført. + </floater.string> + <floater.string name="have_enough_lindens"> + Du har L$ [AMOUNT], hvilket er nok til at købe denne jord. + </floater.string> + <floater.string name="not_enough_lindens"> + Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2]. + </floater.string> + <floater.string name="balance_left"> + Efter købet, vil du have L$ [AMOUNT] tilbage. + </floater.string> + <floater.string name="balance_needed"> + Du skal købe mindst L$ [AMOUNT] for at have rÃ¥d til denne jord. + </floater.string> + <floater.string name="no_parcel_selected"> + (intet parcel er valgt) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Region: </text> @@ -107,133 +236,4 @@ Denne parcel er pÃ¥ 512 m². <check_box label="Fjern [AMOUNT] m² af bidrag fra gruppe." name="remove_contribution"/> <button label="Køb" name="buy_btn"/> <button label="Annullér" name="cancel_btn"/> - <string name="can_resell"> - Kan videresælges. - </string> - <string name="can_not_resell"> - Kan ikke videresælges. - </string> - <string name="can_change"> - Kan samles eller opdeles. - </string> - <string name="can_not_change"> - Kan ikke samles eller opdeles. - </string> - <string name="cant_buy_for_group"> - Du har ikke tilladelse til at købe land for din aktive gruppe. - </string> - <string name="no_land_selected"> - Intet land er valgt. - </string> - <string name="multiple_parcels_selected"> - Flere forskellige parceller er valgt. -Prøv at vælge et mindre omrÃ¥de. - </string> - <string name="no_permission"> - Du har ikke tilladelse til at købe jord for din aktive gruppe. - </string> - <string name="parcel_not_for_sale"> - Det udvalgte parcel er ikke til salg. - </string> - <string name="group_already_owns"> - Gruppen ejer allerede parcellet. - </string> - <string name="you_already_own"> - Du ejer allerede parcellet. - </string> - <string name="set_to_sell_to_other"> - Det udvalgte parcel er sat til salg til en anden. - </string> - <string name="no_public_land"> - Det valgte omrÃ¥de har ingen offentlige arealer. - </string> - <string name="not_owned_by_you"> - Jord, der ejes af en anden bruger er valgt. -Prøv at vælge et mindre omrÃ¥de. - </string> - <string name="processing"> - Forarbejder dit køb... - -(Dette kan tage et minut eller to.) - </string> - <string name="fetching_error"> - Der er sket en fejl under hentning af jord købs oplysninger. - </string> - <string name="buying_will"> - Køb af dette areal vil: - </string> - <string name="buying_for_group"> - Køb af dette areal vil: - </string> - <string name="cannot_buy_now"> - Kan ikke købe nu: - </string> - <string name="not_for_sale"> - Ikke til salg: - </string> - <string name="none_needed"> - ikke nødvendigt - </string> - <string name="must_upgrade"> - Din konto skal være opgraderet for at eje jord. - </string> - <string name="cant_own_land"> - Din konto kan eje jord. - </string> - <string name="land_holdings"> - Du ejer [BUYER] m² land. - </string> - <string name="pay_to_for_land"> - Betal L$ [AMOUNT] til [SELLER] for dette stykke jord - </string> - <string name="buy_for_US"> - Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Denne parcel er pÃ¥ [AMOUNT] m² - </string> - <string name="premium_land"> - Dette stykke jord er premium, og vil tælle som [AMOUNT] m². - </string> - <string name="discounted_land"> - Dette stykke jord er pÃ¥ tilbud, og vil tælle som [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -kan indeholde [AMOUNT2] objekter - </string> - <string name="sold_with_objects"> - solgt med objekter - </string> - <string name="sold_without_objects"> - objekter ikke inkluderet - </string> - <string name="info_price_string"> - L$ [PRICE] -(L$ [PRICE_PER_SQM]/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Gruppen [GROUP] skal bruge nok tildelt jord brugs -kredit for at dække dette parcel før købet vil blive -gennemført. - </string> - <string name="have_enough_lindens"> - Du har L$ [AMOUNT], hvilket er nok til at købe denne jord. - </string> - <string name="not_enough_lindens"> - Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2]. - </string> - <string name="balance_left"> - Efter købet, vil du have L$ [AMOUNT] tilbage. - </string> - <string name="balance_needed"> - Du skal købe mindst L$ [AMOUNT] for at have rÃ¥d til denne jord. - </string> - <string name="no_parcel_selected"> - (intet parcel er valgt) - </string> - <string name="buy_currency"> - Køb L$ [LINDENS] for omkring US$ [USD] - </string> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml index 514b2c4331..f744b06277 100644 --- a/indra/newview/skins/default/xui/da/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml @@ -21,7 +21,7 @@ <check_box label="Benyt nu" name="apply_immediate"/> <button label="" label_selected="" name="color_pipette"/> <button label="Annullér" label_selected="Annullér" name="cancel_btn"/> - <button label="Ok" label_selected="Ok" name="select_btn"/> + <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> Nuværende Farve: </text> diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml index 379302ef6a..b8b4b03277 100644 --- a/indra/newview/skins/default/xui/da/floater_customize.xml +++ b/indra/newview/skins/default/xui/da/floater_customize.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="UDSEENDE" width="509"> <tab_container name="customize tab container" width="507"> - <placeholder label="Krops Dele" name="body_parts_placeholder"/> + <text label="Krops Dele" name="body_parts_placeholder"> + Kropsdele + </text> <panel label="Kropsbygning" name="Shape"> <button label="Annullér" label_selected="Annullér" name="Revert"/> <button label="Krop" label_selected="Krop" name="Body"/> @@ -14,8 +16,8 @@ <button label="Overkrop" label_selected="Overkrop" name="Torso"/> <button label="Ben" label_selected="Ben" name="Legs"/> <radio_group name="sex radio"> - <radio_item label="Kvinde" name="radio"/> - <radio_item label="Mand" name="radio2"/> + <radio_item label="Kvinde" name="radio" value="0"/> + <radio_item label="Mand" name="radio2" value="1"/> </radio_group> <text name="title"> [DESC] @@ -33,9 +35,7 @@ Fundet i [PATH] </text> <text name="not worn instructions"> - Vælg en ny krop ved at trække en sÃ¥dan fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden -og bagefter 'tage den pÃ¥'. + Vælg en ny kropsbygning ved at trække en sÃ¥dan fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -68,9 +68,7 @@ og bagefter 'tage den pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny hud pÃ¥ ved at trække en sÃ¥dan fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en hud fra bunden -og bagefter 'tage den pÃ¥'. + Vælg en ny hud ved at trække en sÃ¥dan fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -107,9 +105,7 @@ og bagefter 'tage den pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny hÃ¥r pÃ¥ ved at trække et fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et nyt hÃ¥r fra bunden -og bagefter 'tage det pÃ¥'. + Vælg et nyt hÃ¥r ved at trække et sÃ¥dant fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et fra bunden og bagefter 'tage det pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -140,9 +136,7 @@ og bagefter 'tage det pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny sæt øjne pÃ¥ ved at trække et sæt fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et nyt sæt øjne fra bunden -og bagefter 'tage dem pÃ¥'. + Vælg et nyt sæt øjne ved at trække et sÃ¥dant par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -156,12 +150,14 @@ og bagefter 'tage dem pÃ¥'. <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> </panel> - <placeholder label="Tøje" name="clothes_placeholder"/> + <text label="Tøje" name="clothes_placeholder"> + Tøj + </text> <panel label="Trøje" name="Shirt"> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> + <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> @@ -181,8 +177,7 @@ og bagefter 'tage dem pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny Tøje pÃ¥ ved at trække en fra din beholdning over pÃ¥ din avatar. -Du kan ogsÃ¥ oprette en ny Tøje fra bunden og bagefter 'tage den pÃ¥'. + Vælg en ny trøje ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -194,8 +189,8 @@ Du kan ogsÃ¥ oprette en ny Tøje fra bunden og bagefter 'tage den pÃ¥' <panel label="Bukser" name="Pants"> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> + <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> @@ -215,9 +210,7 @@ Du kan ogsÃ¥ oprette en ny Tøje fra bunden og bagefter 'tage den pÃ¥' Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nyr bukser pÃ¥ ved at trække dem fra din beholdning over pÃ¥ -din avatar. Du kan ogsÃ¥ oprette ny bukser fra bunden og bagefter -'tage dem pÃ¥'. + Vælg et nyt par bukser ved at trække et par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. @@ -243,10 +236,9 @@ din avatar. Du kan ogsÃ¥ oprette ny bukser fra bunden og bagefter Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny par sko pÃ¥ ved at trække dem fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et nyt par sko fra bunden -og bagefter 'tage dem pÃ¥'. + Vælg et nyt par sko ved at trække et par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> + <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -255,7 +247,6 @@ og bagefter 'tage dem pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -278,10 +269,9 @@ og bagefter 'tage dem pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag et ny par Strømper pÃ¥ ved at trække dem fra din beholdning -over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et nyt par Strømper fra bunden -og bagefter 'tage dem pÃ¥'. + Vælg et nyt par sokker ved at trække et par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> + <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -290,7 +280,6 @@ og bagefter 'tage dem pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -313,9 +302,9 @@ og bagefter 'tage dem pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny jakke pÃ¥ ved at trække en fra din beholdning over pÃ¥ din avatar. -Du kan ogsÃ¥ oprette en ny jakke fra bunden og bagefter 'tage den pÃ¥'. + Vælg en ny jakke ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> + <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -325,7 +314,6 @@ Du kan ogsÃ¥ oprette en ny jakke fra bunden og bagefter 'tage den pÃ¥' <texture_picker label="Stof øverst" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/> <texture_picker label="Stof nederst" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -348,10 +336,9 @@ Du kan ogsÃ¥ oprette en ny jakke fra bunden og bagefter 'tage den pÃ¥' Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nye handsker pÃ¥ ved at trække et par fra din beholdning over pÃ¥ -din avatar. Du kan ogsÃ¥ oprette nye handsker fra bunden -og bagefter 'tage dem pÃ¥'. + Vælg et sæt nye handsker ved at trække et par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> + <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -360,7 +347,6 @@ og bagefter 'tage dem pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -383,10 +369,9 @@ og bagefter 'tage dem pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny undertrøje pÃ¥ ved at trække en fra din beholdning over pÃ¥ -din avatar. Du kan ogsÃ¥ oprette en ny undertrøje fra bunden -og bagefter 'tage den pÃ¥'. + Vælg en ny undertrøje ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> + <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -395,7 +380,6 @@ og bagefter 'tage den pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -418,10 +402,9 @@ og bagefter 'tage den pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag nye underbukser pÃ¥ ved at trække dem fra din beholdning over pÃ¥ -din avatar. Du kan ogsÃ¥ oprette en par nye underbukser fra bunden -og bagefter 'tage dem pÃ¥'. + Vælg et nyt par underbukser ved at trække et par fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette et par fra bunden og bagefter 'tage dem pÃ¥'. </text> + <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -430,7 +413,6 @@ og bagefter 'tage dem pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -453,10 +435,9 @@ og bagefter 'tage dem pÃ¥'. Fundet i [PATH] </text> <text name="not worn instructions"> - Tag en ny nederdel pÃ¥ ved at trække en fra din beholdning over pÃ¥ -din avatar. Du kan ogsÃ¥ oprette en ny nederdel fra bunden -og bagefter 'tage den pÃ¥'. + Vælg en ny nederdel ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> + <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at redigere denne del. </text> @@ -465,13 +446,12 @@ og bagefter 'tage den pÃ¥'. </text> <texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/> <color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at Ã¥bne farvevælger"/> - <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Annullér" label_selected="Annullér" name="Revert"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Tatovering" name="Tattoo"> <text name="title"> [DESC] </text> @@ -488,27 +468,24 @@ og bagefter 'tage den pÃ¥'. Placeret i [PATH] </text> <text name="not worn instructions"> - Brug en ny "alpha mask" ved at trække en fra din beholding til din avatar. -Alternativt kan du lave en fra bunden og bære denne. + Vælg en ny tatovering ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> + <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at ændre denne. </text> <text name="Item Action Label"> - Alpha: + Tatovering: </text> - <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Alpha - hÃ¥r" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> - <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/> + <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> <button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/> </panel> - <panel label="Tatovering" name="Tattoo"> + <panel label="Alpha" name="Alpha"> <text name="title"> [DESC] </text> @@ -525,19 +502,20 @@ Alternativt kan du lave en fra bunden og bære denne. Placeret i [PATH] </text> <text name="not worn instructions"> - Brug en ny tatovering ved at trække en fra din beholding til din avatar. -Alternativt kan du lave en fra bunden og bære denne. + Vælg en ny 'alpha maske' ved at trække en fra din beholdning over pÃ¥ din avatar. Du kan ogsÃ¥ oprette en fra bunden og bagefter 'tage den pÃ¥'. </text> + <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/> <text name="no modify instructions"> Du har ikke rettigheder til at ændre denne. </text> <text name="Item Action Label"> - Tatovering: + Alpha: </text> - <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/> - <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/> - <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/> + <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/> + <texture_picker label="Alpha - hÃ¥r" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/> <button label="Tag af" label_selected="Tag af" name="Take Off"/> <button label="Gem" label_selected="Gem" name="Save"/> <button label="Gem som..." label_selected="Gem som..." name="Save As"/> @@ -545,6 +523,7 @@ Alternativt kan du lave en fra bunden og bære denne. </panel> </tab_container> <scroll_container left="212" name="panel_container"/> + <button label="Script info" label_selected="Script info" name="script_info" tool_tip="Vis scripts vedhæftet pÃ¥ din avatar"/> <button label="Lav sæt" label_selected="Lav sæt" name="make_outfit_btn"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml new file mode 100644 index 0000000000..267a36b26c --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Event" name="Event" title="EVENT DETALJER"> + <floater.string name="none"> + ingen + </floater.string> + <floater.string name="notify"> + Meddel + </floater.string> + <floater.string name="dont_notify"> + Meddel ikke + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Event uden navn. + </text> + <text name="event_category"> + (ingen kategori) + </text> + <text name="event_runby_label"> + Afholdt af: + </text> + <text initial_value="(henter)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 time + </text> + <text name="event_cover"> + Gratis + </text> + <text name="event_location_label"> + Lokation: + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Rating:"/> + <text name="rating_value" value="ukendt"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Opret event"/> + <button name="god_delete_event_btn" tool_tip="Slet event"/> + <button label="Giv besked" name="notify_btn"/> + <button label="Teleport" name="teleport_btn"/> + <button label="Kort" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml new file mode 100644 index 0000000000..ea045538c5 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="godtools floater" title="GOD TOOLS"> + <tab_container name="GodTools Tabs"> + <panel label="Region" name="region"> + <check_box label="Reset Home On Teleport" name="check reset home" tool_tip="NÃ¥r beboere teleporterer væk, sÃ¥ sæt deres hjemmeadresse til deres destinations position."/> + </panel> + </tab_container> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml index fc52796344..4eba4aee1f 100644 --- a/indra/newview/skins/default/xui/da/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_help_browser" title="HJÆLP"> + <floater.string name="loading_text"> + Henter... + </floater.string> <layout_stack name="stack1"> - <layout_panel name="external_controls"> - <button label="Ã…ben i min web browser" name="open_browser"/> - </layout_panel> + <layout_panel name="external_controls"/> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml index 519a70d1d9..2ef8a7ce36 100644 --- a/indra/newview/skins/default/xui/da/floater_im.xml +++ b/indra/newview/skins/default/xui/da/floater_im.xml @@ -10,7 +10,7 @@ Tryk pÃ¥ [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat. </string> <string name="muted_message"> - Du har blokeret denne beboer. Hvis du sender besked vil denne blokering fjernes. + Du har blokeret denne beboer. Hvis du sender en besked til beboeren vil dette automatisk medføre fjernelse af blokeringen </string> <string name="generic_request_error"> Kunne ikke etablere forbindelse, prøv igen senere diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml index da6f877f56..28b2f7f7eb 100644 --- a/indra/newview/skins/default/xui/da/floater_im_container.xml +++ b/indra/newview/skins/default/xui/da/floater_im_container.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="Personlige beskeder"/> +<multi_floater name="floater_im_box" title="SAMTALER"/> diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml index 3a1ef2e47d..2349174db2 100644 --- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="incoming call" title="UKENDT PERSON KALDER OP"> + <floater.string name="lifetime"> + 5 + </floater.string> <floater.string name="localchat"> Stemme chat nærved </floater.string> @@ -12,6 +15,9 @@ <floater.string name="VoiceInviteAdHoc"> har sluttet sig til stemme chat opkald med en konference chat. </floater.string> + <floater.string name="VoiceInviteGroup"> + deltager nu i Stemme chat opkald med denne gruppe [GROUP]. + </floater.string> <text name="question"> Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat? </text> diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml index d80051fb84..3a4b0fbd6b 100644 --- a/indra/newview/skins/default/xui/da/floater_inventory.xml +++ b/indra/newview/skins/default/xui/da/floater_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="BEHOLDNING"> +<floater name="Inventory" title="MIN BEHOLDNING"> <floater.string name="Title"> - Beholdning + MIN BEHOLDNING </floater.string> <floater.string name="TitleFetching"> - Beholdning (henter [ITEM_COUNT] genstande...) [FILTER] + MIN BEHOLDNING (Henter [ITEM_COUNT] genstande...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - Beholdning ([ITEM_COUNT] genstande) [FILTER] + MIN BEHOLDNING ([ITEM_COUNT] genstande) [FILTER] </floater.string> <floater.string name="Fetched"> Hentet diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml index 4079ff9f38..0cc13fd736 100644 --- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml @@ -7,7 +7,7 @@ Kører </floater.string> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <button label="Nulstil" label_selected="Reset" name="Reset"/> <check_box initial_value="true" label="Kører" name="running"/> diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml index 2b008f133c..2594d6bb9d 100644 --- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="script ed float" title="LSL WIKI"> +<floater name="script ed float" title="LSL REFERENCE"> <check_box label="Følg markøreren" name="lock_check"/> <combo_box label="LÃ¥s" left_delta="114" name="history_combo" width="70"/> <button label="Tilbage" name="back_btn"/> diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index f618548908..82897d545a 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Mini-kort"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml index 47667973ba..d3028c32f9 100644 --- a/indra/newview/skins/default/xui/da/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="MEDIE VÆLGER"> <layout_stack name="stack1"> <layout_panel name="nav_controls"> - <button label="Tilbage" name="back" /> - <button label="Frem" name="forward" /> - <button label="Opdater" name="reload" /> - <button label="GÃ¥ til" name="go" /> + <button label="Tilbage" name="back"/> + <button label="Frem" name="forward"/> + <button label="Opdater" name="reload"/> + <button label="GÃ¥ til" name="go"/> </layout_panel> <layout_panel name="parcel_owner_controls"> - <button label="Send nuværende URL til parcel" name="assign" /> + <button label="Send denne side til parcel" name="assign"/> </layout_panel> <layout_panel name="external_controls"> - <button label="Ã…ben i min browser" name="open_browser" /> - <check_box label="Ã…ben altid i min browser" name="open_always" /> - <button label="Luk" name="close" /> + <button label="Ã…ben i min browser" name="open_browser"/> + <check_box label="Ã…ben altid i min browser" name="open_always"/> + <button label="Luk" name="close"/> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml index b00dc6bf4d..258af489e7 100644 --- a/indra/newview/skins/default/xui/da/floater_moveview.xml +++ b/indra/newview/skins/default/xui/da/floater_moveview.xml @@ -19,11 +19,10 @@ Flyv baglæns (Tryk pÃ¥ Ned piletast eller S) </string> <panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="xxx - Drej til venstre (Tryk pÃ¥ venstre piletast eller A)"/> + <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk pÃ¥ venstre piletast eller A)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk pÃ¥ højre piletast eller D)"/> - <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, Tryk pÃ¥ "E""/> - <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, Tryk pÃ¥ "C""/> + <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/> + <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/> <joystick_turn name="forward btn" tool_tip="GÃ¥ frem (Tryk pÃ¥ Op piletast eller W)"/> <joystick_turn name="backward btn" tool_tip="GÃ¥ tilbage (Tryk pÃ¥ Ned piletast eller S)"/> </panel> diff --git a/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml new file mode 100644 index 0000000000..0bcb96b151 --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="modal container" title="Gem sæt"> + <button label="Gem" label_selected="Gem" name="Save"/> + <button label="Annullér" label_selected="Annullér" name="Cancel"/> + <text name="Save item as:"> + Gem hvad jeg har pÃ¥ som et nyt sæt: + </text> + <line_editor name="name ed"> + [DESC] (ny) + </line_editor> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml index 5c98d9855f..ef4e22dd8f 100644 --- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="outgoing call" title="KALDER"> + <floater.string name="lifetime"> + 5 + </floater.string> <floater.string name="localchat"> Stemme chat nærved </floater.string> @@ -21,6 +24,15 @@ <text name="noanswer"> Intet svar. Prøv igen senere. </text> + <text name="nearby"> + Du er blevet koblet af fra [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] har afsluttet opkaldet. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Du har afsluttet opkaldet. [RECONNECT_NEARBY] + </text> <text name="leaving"> Forlader [CURRENT_CHAT]. </text> diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml index f74e097da2..368d678681 100644 --- a/indra/newview/skins/default/xui/da/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml @@ -15,7 +15,7 @@ </text> <icon name="icon_object" tool_tip="Objekter"/> <text name="object_name_text"> - ... + Mit fantastiske objekt med et virkeligt langt navn </text> <button label="L$1" label_selected="L$1" name="fastpay 1"/> <button label="L$5" label_selected="L$5" name="fastpay 5"/> diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml index f0fe3472d0..a53586eaaf 100644 --- a/indra/newview/skins/default/xui/da/floater_preferences.xml +++ b/indra/newview/skins/default/xui/da/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Generelt" name="general"/> <panel label="Grafik" name="display"/> <panel label="Privatliv" name="im"/> - <panel label="Sound" name="audio"/> + <panel label="Lyd & medier" name="audio"/> <panel label="Chat" name="chat"/> <panel label="Beskeder" name="msgs"/> <panel label="Opsætning" name="input"/> diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index bfa3c150a9..f49fd8c99a 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> Bevægelse: [NAME] </floater.string> + <text name="name_text"> + Navn: + </text> <text name="desc_label"> Beskrivelse: </text> diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml index 2ebec4462f..e600a774ec 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview notecard" title="NOTE:"> <floater.string name="no_object"> - Kunne ikke finde objekt der indeholder denne note. + Kunne ikke finde objekt som indeholder denne note. </floater.string> <floater.string name="not_allowed"> Du har ikke rettigheder til at se denne note. diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml index ab7ddbcc72..48cf53f563 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml @@ -12,6 +12,9 @@ <text name="dimensions"> [WIDTH]px x [HEIGHT]px </text> + <text name="aspect_ratio"> + Vis aspekt forhold + </text> <combo_box name="combo_aspect_ratio" tool_tip="ForhÃ¥ndsvisning med et bestemt billedformat"> <combo_item name="Unconstrained"> Ikke lÃ¥st @@ -38,7 +41,7 @@ 2:1 </combo_item> </combo_box> - <button label="OK" name="keep"/> - <button label="Annullér" name="discard"/> + <button label="OK" name="Keep"/> + <button label="Kassér" name="Discard"/> <button label="Gem som" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml index 9ef17a3cbb..07978792b9 100644 --- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml @@ -42,7 +42,7 @@ <combo_box.item label="Vælg kategori" name="Select_category"/> <combo_box.item label="Alder > Falsk alder" name="Age__Age_play"/> <combo_box.item label="Alder > Voksen beboer pÃ¥ Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/> - <combo_box.item label="Alder > MindreÃ¥rig beboer udenfor Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> + <combo_box.item label="Alder > MindreÃ¥rig beboer uden for Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> <combo_box.item label="Overfald > Kamp sandkasse / Usikkert omrÃ¥de" name="Assault__Combat_sandbox___unsafe_area"/> <combo_box.item label="Overfald > Sikkert omrÃ¥de" name="Assault__Safe_area"/> <combo_box.item label="Overfald > Sandkasse til vÃ¥bentest" name="Assault__Weapons_testing_sandbox"/> diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml new file mode 100644 index 0000000000..a7f86a782a --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="scriptlimits" title="SCRIPT INFORMATION"/> diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml index 1e8d869716..1aacab6915 100644 --- a/indra/newview/skins/default/xui/da/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SCRIPT: ROTATIONS SCRIPT"> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <text name="desc txt"> Beskrivelse: diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml index fe0d31c6c3..9f7aad5e03 100644 --- a/indra/newview/skins/default/xui/da/floater_select_key.xml +++ b/indra/newview/skins/default/xui/da/floater_select_key.xml @@ -2,6 +2,6 @@ <floater name="modal container" title=""> <button label="Annullér" label_selected="Annullér" name="Cancel"/> <text name="Save item as:"> - Tryk pÃ¥ en taste for at sætte din "Tale" knap udløser. + Tryk en taste for at angive trigger til at tale. </text> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml index 41cf100d94..016e5af378 100644 --- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings_debug" title="DEBUG INDSTILLINGER"> - <combo_box name="boolean_combo"> - <combo_box.item label="SANDT" name="TRUE"/> - <combo_box.item label="FALSK" name="FALSE"/> - </combo_box> + <radio_group name="boolean_combo"> + <radio_item label="SANDT" name="TRUE" value="sand"/> + <radio_item label="FALSK" name="FALSE" value=""/> + </radio_group> <color_swatch label="Farve" name="val_color_swatch"/> <spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_2"/> diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml index 5e8c64e21f..6140055d74 100644 --- a/indra/newview/skins/default/xui/da/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml @@ -4,12 +4,12 @@ Hvor skal foto hen? </text> <radio_group label="Snapshot type" name="snapshot_type_radio"> - <radio_item label="Send via e-mail" name="postcard"/> - <radio_item label="Gem i din beholdning (L$[AMOUNT])" name="texture"/> - <radio_item label="Gem pÃ¥ din computer" name="local"/> + <radio_item label="Email" name="postcard"/> + <radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/> + <radio_item label="Gem pÃ¥ min computer" name="local"/> </radio_group> <text name="file_size_label"> - Fil størrelse: [SIZE] KB + [SIZE] KB </text> <button label="Tag nyt foto" name="new_snapshot_btn"/> <button label="Send" name="send_btn"/> @@ -19,8 +19,8 @@ <flyout_button_item label="Gem som..." name="saveas_item"/> </flyout_button> <button label="Annullér" name="discard_btn"/> - <button label="Mere >>" name="more_btn" tool_tip="Avancerede muligheder"/> - <button label="<< Mindre" name="less_btn" tool_tip="Avancerede muligheder"/> + <button label="Mere" name="more_btn" tool_tip="Avancerede muligheder"/> + <button label="Mindre" name="less_btn" tool_tip="Avancerede muligheder"/> <text name="type_label2"> Størrelse </text> @@ -59,7 +59,7 @@ <spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/> <spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/> <check_box label="Fasthold proportioner" name="keep_aspect_check"/> - <slider label="Billed-kvalitet" name="image_quality_slider"/> + <slider label="Billedkvalitet" name="image_quality_slider"/> <text name="layer_type_label"> Benyt: </text> @@ -68,10 +68,10 @@ <combo_box.item label="Dybde" name="Depth"/> <combo_box.item label="Materinger" name="ObjectMattes"/> </combo_box> - <check_box label="Vis brugerflade pÃ¥ foto" name="ui_check"/> - <check_box label="Vis HUD objekter pÃ¥ foto" name="hud_check"/> + <check_box label="Snitflade" name="ui_check"/> + <check_box label="HUDs" name="hud_check"/> <check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/> - <check_box label="Frys billede og vis" name="freeze_frame_check"/> + <check_box label="Fastfrys (fuldt billede)" name="freeze_frame_check"/> <check_box label="Auto-opdater" name="auto_snapshot_check"/> <string name="unknown"> ukendt diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml index b5cecf93e9..f203c2504f 100644 --- a/indra/newview/skins/default/xui/da/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sys_well_window" title="BESKEDER"> <string name="title_im_well_window"> - IM SESSIONER + SAMTALER </string> <string name="title_notification_well_window"> BESKEDER diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml index 00b49a9df9..fbc7fe2319 100644 --- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml @@ -17,7 +17,7 @@ <check_box label="Benyt ny" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> - <button label="Ok" label_selected="Ok" name="Select"/> + <button label="OK" label_selected="OK" name="Select"/> <string name="pick title"> Vælg: </string> diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index 77459aca67..2e35811133 100644 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml @@ -212,8 +212,8 @@ Næste ejer: </text> <check_box label="Redigére" name="checkbox next owner can modify"/> - <check_box label="Kopiére" left_delta="80" name="checkbox next owner can copy"/> - <check_box label="Sælge/give væk" left_delta="67" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + <check_box label="Kopiére" name="checkbox next owner can copy"/> + <check_box label="Sælge/give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> <text name="B:"> B: </text> diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml index 3f19350e30..86c24d2c19 100644 --- a/indra/newview/skins/default/xui/da/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml @@ -1,15 +1,40 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="top_objects" title="Top objekter"> + <floater.string name="top_scripts_title"> + Mest krævende scripts + </floater.string> + <floater.string name="top_scripts_text"> + [COUNT] scripts bruger ialt [TIME] ms + </floater.string> + <floater.string name="scripts_score_label"> + Tid + </floater.string> + <floater.string name="scripts_mono_time_label"> + Mono tid + </floater.string> + <floater.string name="top_colliders_title"> + Mest kolliderende + </floater.string> + <floater.string name="top_colliders_text"> + Top [COUNT] genstande der potentielt har mange kollisioner + </floater.string> + <floater.string name="colliders_score_label"> + Point + </floater.string> + <floater.string name="none_descriptor"> + Ingen fundet + </floater.string> <text name="title_text"> Henter... </text> <scroll_list name="objects_list"> - <column label="Point" name="score"/> - <column label="Navn" name="name"/> - <column label="Ejer" name="owner"/> - <column label="Lokation" name="location"/> - <column label="Tid" name="time"/> - <column label="Mono tid" name="mono_time"/> + <scroll_list.columns label="Point" name="score"/> + <scroll_list.columns label="Navn" name="name"/> + <scroll_list.columns label="Ejer" name="owner"/> + <scroll_list.columns label="Lokation" name="location"/> + <scroll_list.columns label="Tid" name="time"/> + <scroll_list.columns label="Mono tid" name="mono_time"/> + <scroll_list.columns label="URL'er" name="URLs"/> </scroll_list> <text name="id_text"> Objekt ID: @@ -23,33 +48,9 @@ Ejer: </text> <button label="Filter" name="filter_owner_btn"/> + <button label="Genopfrisk" name="refresh_btn"/> <button label="Returnér valgte" name="return_selected_btn"/> <button label="Returnér alle" name="return_all_btn"/> <button label="Afbryd valgte" name="disable_selected_btn"/> <button label="Afbryd alle" name="disable_all_btn"/> - <button label="Genopfrisk" name="refresh_btn"/> - <string name="top_scripts_title"> - Mest krævende scripts - </string> - <string name="top_scripts_text"> - [COUNT] scripts bruger ialt [TIME] ms - </string> - <string name="scripts_score_label"> - Tid - </string> - <string name="scripts_mono_time_label"> - Mono tid - </string> - <string name="top_colliders_title"> - Mest kolliderende - </string> - <string name="top_colliders_text"> - Top [COUNT] genstande der potentielt har mange kollisioner - </string> - <string name="colliders_score_label"> - Point - </string> - <string name="none_descriptor"> - Ingen fundet - </string> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index 77906f0f46..6f61d9b310 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -4,7 +4,7 @@ <button label="Annullér" label_selected="Annullér" name="Cancel"/> <check_box label="Jeg accepterer vilkÃ¥rene for brug af tjenesten" name="agree_chk"/> <text name="tos_heading"> - Læs venligst de almindelige bestemmelser og vilkÃ¥r igennem, for at fortsætte til [SECOND LIFE] skal du acceptere vilkÃ¥rene. + Læs venligst følgende servicebetingelser grundigt. For at kunne logge pÃ¥ [SECOND_LIFE], skal du acceptere aftalen. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml index 8651851233..05e9eb6cdd 100644 --- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml @@ -13,13 +13,14 @@ Opkald med [NAME] </string> <string name="no_one_near"> - Ingen nær + Ingen i nærheden har aktiveret stemmer </string> - <panel name="control_panel"> - <layout_stack> - <layout_panel name="leave_btn_panel"> - <button label="Forlad opkald" name="leave_call_btn"/> - </layout_panel> - </layout_stack> - </panel> + <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Min avatar:"/> + </layout_panel> + <layout_panel name="leave_call_btn_panel"> + <button label="Forlad opkald" name="leave_call_btn"/> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml index a70db6a6f1..17d5b9c205 100644 --- a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=""> - <button label="Gem" label_selected="Gem" name="Save" /> - <button label="Annullér" label_selected="Annullér" name="Cancel" /> + <button label="Gem" label_selected="Gem" name="Save"/> + <button label="Annullér" label_selected="Annullér" name="Cancel"/> <text name="Save item as:"> - Gem ting som:: + Gem genstand i min beholdning som: </text> <line_editor name="name ed"> Ny [DESC] diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml index d2f618579d..443e84b64a 100644 --- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="whitelist_entry"> +<floater name="whitelist_entry" title="GODKENDTE SIDER"> <text name="media_label"> Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner </text> diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml new file mode 100644 index 0000000000..db8ead21bd --- /dev/null +++ b/indra/newview/skins/default/xui/da/floater_window_size.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="window_size" title="VINDUE STØRRELSE"> + <string name="resolution_format"> + [RES_X] x [RES_Y] + </string> + <text name="windowsize_text"> + Sæt størrelse pÃ¥ vindue: + </text> + <combo_box name="window_size_combo" tool_tip="bredde x højde"> + <combo_box.item label="1000 x 700 (standard)" name="item0"/> + <combo_box.item label="1024 x 768" name="item1"/> + <combo_box.item label="1280 x 720 (720p)" name="item2"/> + <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + </combo_box> + <button label="Sæt" name="set_btn"/> + <button label="Annullér" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml index 137e8509a4..7d4a81d655 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -6,64 +6,29 @@ </text> </panel> <panel> - <button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrér kort om min avatars position"/> - <text name="person_label"> + <text name="me_label"> Mig </text> - <check_box label="Beboer" name="people_chk"/> - <check_box label="Infohub" name="infohub_chk"/> - <text name="infohub_label"> - Infohub + <text name="person_label"> + Person </text> - <check_box label="Land til salg" name="land_for_sale_chk"/> - <text name="land_sale_label"> - Land til salg + <text name="by_owner_label"> + efter ejer </text> <text name="auction_label"> - af ejer - </text> - <button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleportér til min hjemmelokation"/> - <text name="Home_label"> - Hjem + land auktion </text> - <text name="events_label"> - Events: + <text name="pg_label"> + Generelt </text> - <check_box label="PG" name="event_chk"/> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> <text name="mature_label"> - Mature + Moderat </text> - <check_box label="Adult" name="event_adult_chk"/> - </panel> - <panel> - <text name="find_on_map_label"> - Find pÃ¥ kort - </text> - </panel> - <panel> - <combo_box label="Venner online" name="friend combo" tool_tip="Vis venner pÃ¥ kort"> - <combo_box.item label="Mine venner online" name="item1"/> - </combo_box> - <combo_box label="Mine landemærker" name="landmark combo" tool_tip="Landemærke der skal vises pÃ¥ kort"> - <combo_box.item label="Mine landemærker" name="item1"/> - </combo_box> - <search_editor label="Regioner efter navn" name="location" tool_tip="Skriv navnet pÃ¥ en region"/> - <button label="Find" name="DoSearch" tool_tip="Søg efter en region"/> - <scroll_list name="search_results"> - <scroll_list.columns label="" name="icon"/> - <scroll_list.columns label="" name="sim_name"/> - </scroll_list> - <button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleportér til den valgte lokation"/> - <button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer denne lokation som SLurl der kan bruges pÃ¥ web."/> - <button label="Vis selektion" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet pÃ¥ valgte lokation"/> - </panel> - <panel> - <text name="zoom_label"> - Zoom + <text name="adult_label"> + Voksen </text> </panel> <panel> - <slider label="Zoom" name="zoom slider"/> + <button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml index 1b85544303..d4bc0813e5 100644 --- a/indra/newview/skins/default/xui/da/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml @@ -13,7 +13,7 @@ <slider name="volume_slider" tool_tip="Stemme lydstyrke" value="0.5"/> <button label="Tilføj ven" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="Mere" name="view_profile_btn"/> + <button label="Profil" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="SlÃ¥ stemme-chat fra" name="disable_voice"/> <button label="SlÃ¥ stemme-chat til" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml index 29620fca27..6a6831c2e3 100644 --- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="StÃ¥ op" name="Stand Up"/> - <context_menu label="Tag af >" name="Take Off >"> - <context_menu label="Tøj >" name="Clothes >"> + <context_menu label="Tag af â–¶" name="Take Off >"> + <context_menu label="Tøj â–¶" name="Clothes >"> <menu_item_call label="Trøje" name="Shirt"/> <menu_item_call label="Bukser" name="Pants"/> <menu_item_call label="Nederdel" name="Skirt"/> @@ -16,8 +16,8 @@ <menu_item_call label="Alpha" name="Self Alpha"/> <menu_item_call label="Alt tøj" name="All Clothes"/> </context_menu> - <context_menu label="HUD >" name="Object Detach HUD"/> - <context_menu label="Tag af >" name="Object Detach"/> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="Tag af â–¶" name="Object Detach"/> <menu_item_call label="Tag alt af" name="Detach All"/> </context_menu> <menu_item_call label="Udseende" name="Appearance..."/> diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml new file mode 100644 index 0000000000..4889230919 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_im_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="IM Well Button Context Menu"> + <menu_item_call label="Luk alle" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml index 5b8089bfe0..7434f2c3a2 100644 --- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml @@ -7,6 +7,7 @@ <menu_item_call label="Teleportér" name="teleport"/> <menu_item_call label="Invitér til gruppe" name="invite_to_group"/> <menu_item_call label="Blokér" name="block"/> + <menu_item_call label="Fjern blokering" name="unblock"/> <menu_item_call label="Rapportér" name="report"/> <menu_item_call label="Frys" name="freeze"/> <menu_item_call label="Smid ud" name="eject"/> @@ -14,4 +15,5 @@ <menu_item_call label="Find pÃ¥ kort" name="find_on_map"/> <menu_item_call label="Zoom ind" name="zoom_in"/> <menu_item_call label="Betal" name="pay"/> + <menu_item_call label="Del" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml index 376af507d0..cdfcad9b1c 100644 --- a/indra/newview/skins/default/xui/da/menu_inventory.xml +++ b/indra/newview/skins/default/xui/da/menu_inventory.xml @@ -46,9 +46,10 @@ <menu_item_call label="Teleport" name="Landmark Open"/> <menu_item_call label="Ã¥ben" name="Animation Open"/> <menu_item_call label="Ã¥ben" name="Sound Open"/> + <menu_item_call label="Erstat pÃ¥klædning" name="Replace Outfit"/> + <menu_item_call label="Tilføj til pÃ¥klædning" name="Add To Outfit"/> <menu_item_call label="Slet ting" name="Purge Item"/> <menu_item_call label="Genskab ting" name="Restore Item"/> - <menu_item_call label="GÃ¥ til link" name="Goto Link"/> <menu_item_call label="Ã¥ben" name="Open"/> <menu_item_call label="Egenskaber" name="Properties"/> <menu_item_call label="Omdøb" name="Rename"/> @@ -57,13 +58,11 @@ <menu_item_call label="Indsæt" name="Paste"/> <menu_item_call label="Sæt ind som link" name="Paste As Link"/> <menu_item_call label="Slet" name="Delete"/> - <menu_item_call label="Tag ting af" name="Take Off Items"/> - <menu_item_call label="Tilføj til pÃ¥klædning" name="Add To Outfit"/> - <menu_item_call label="Erstat pÃ¥klædning" name="Replace Outfit"/> + <menu_item_call label="Slet systemfolder" name="Delete System Folder"/> <menu_item_call label="start konference chat" name="Conference Chat Folder"/> <menu_item_call label="Afspil" name="Sound Play"/> <menu_item_call label="Om landemærke" name="About Landmark"/> - <menu_item_call label="Afspil offentligt" name="Animation Play"/> + <menu_item_call label="Afspil i verden" name="Animation Play"/> <menu_item_call label="Afspil lokalt" name="Animation Audition"/> <menu_item_call label="Send privat besked (IM)" name="Send Instant Message"/> <menu_item_call label="Tilbyd teleport..." name="Offer Teleport..."/> diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml index 0942f1b807..7fc7d43c20 100644 --- a/indra/newview/skins/default/xui/da/menu_login.xml +++ b/indra/newview/skins/default/xui/da/menu_login.xml @@ -21,8 +21,8 @@ </menu> <menu_item_call label="Vis debug opsætning" name="Debug Settings"/> <menu_item_call label="UI/farve opsætning" name="UI/Color Settings"/> - <menu_item_call label="Vis sidebakke" name="Show Side Tray"/> <menu label="UI tests" name="UI Tests"/> + <menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/> <menu_item_call label="Vis betingelser" name="TOS"/> <menu_item_call label="Vis vigtig besked" name="Critical"/> <menu_item_call label="Test i web browser" name="Web Browser Test"/> diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml new file mode 100644 index 0000000000..40b35b5fdd --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Notification Well Button Context Menu"> + <menu_item_call label="Luk alle" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml index 0714b67ec3..232f3f64e2 100644 --- a/indra/newview/skins/default/xui/da/menu_object.xml +++ b/indra/newview/skins/default/xui/da/menu_object.xml @@ -6,18 +6,20 @@ <menu_item_call label="Ã…ben" name="Open"/> <menu_item_call label="Sid her" name="Object Sit"/> <menu_item_call label="Objekt profil" name="Object Inspect"/> - <context_menu label="Sæt pÃ¥ >" name="Put On"> + <menu_item_call label="Zoom In" name="Zoom In"/> + <context_menu label="Tag pÃ¥ â–¶" name="Put On"> <menu_item_call label="Tag pÃ¥" name="Wear"/> - <context_menu label="Vedhæft >" name="Object Attach"/> - <context_menu label="Vedhæft HUD >" name="Object Attach HUD"/> + <context_menu label="Vedhæft â–¶" name="Object Attach"/> + <context_menu label="Vedhæft HUD â–¶" name="Object Attach HUD"/> </context_menu> - <context_menu label="Fjern >" name="Remove"> - <menu_item_call label="Tag" name="Pie Object Take"/> + <context_menu label="Fjern â–¶" name="Remove"> <menu_item_call label="Rapportér misbrug" name="Report Abuse..."/> <menu_item_call label="Blokér" name="Object Mute"/> <menu_item_call label="Returnér" name="Return..."/> <menu_item_call label="Slet" name="Delete"/> </context_menu> + <menu_item_call label="Køb" name="Pie Object Bye"/> + <menu_item_call label="Tag" name="Pie Object Take"/> <menu_item_call label="Tag kopi" name="Take Copy"/> <menu_item_call label="Betal" name="Pay..."/> <menu_item_call label="Køb" name="Buy..."/> diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml index 44a016026c..c2595dcb3d 100644 --- a/indra/newview/skins/default/xui/da/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Participant List Context Menu"> + <menu_item_check label="Sortér efter navn" name="SortByName"/> + <menu_item_check label="Sortér efter nylige talere" name="SortByRecentSpeakers"/> <menu_item_call label="Profil" name="View Profile"/> <menu_item_call label="Tilføj ven" name="Add Friend"/> <menu_item_call label="Send besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> <menu_item_call label="Del" name="Share"/> <menu_item_call label="Betal" name="Pay"/> - <menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/> - <menu_item_check label="Sluk for tekst" name="MuteText"/> - <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> - <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> - <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> - <menu_item_call label="Ã…ben for denne deltager" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Ã…ben for alle andre" name="ModerateVoiceUnMuteOthers"/> + <menu_item_check label="Blokér stemme" name="Block/Unblock"/> + <menu_item_check label="Blokér tekst" name="MuteText"/> + <context_menu label="Moderator muligheder >" name="Moderator Options"> + <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/> + <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/> + <menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/> + </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml new file mode 100644 index 0000000000..841f58b619 --- /dev/null +++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Se info" name="View Info"/> + <menu_item_call label="Chat" name="Chat"/> + <menu_item_call label="Opkald" name="Call"/> + <menu_item_call label="Aktivér" name="Activate"/> + <menu_item_call label="Forlad" name="Leave"/> +</menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml index 224190149b..5470c32761 100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml @@ -2,9 +2,12 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Profil" name="View Profile"/> <menu_item_call label="Tilføj ven" name="Add Friend"/> + <menu_item_call label="Fjern ven" name="Remove Friend"/> <menu_item_call label="Besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> + <menu_item_call label="Kort" name="Map"/> <menu_item_call label="Del" name="Share"/> <menu_item_call label="Betal" name="Pay"/> <menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/> + <menu_item_call label="Tilbyd teleport" name="teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml index 92c6d2c960..08b7136b97 100644 --- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> <menu_item_call label="Tilføj venner" name="Add Friends"/> + <menu_item_call label="Fjern venner" name="Remove Friend"/> <menu_item_call label="Besked" name="IM"/> <menu_item_call label="Opkald" name="Call"/> <menu_item_call label="Del" name="Share"/> diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml index 58fbc62643..9609b424a1 100644 --- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml @@ -2,4 +2,10 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="Betal" name="pay"/> <menu_item_call label="Del" name="share"/> + <menu_item_call label="Blokér" name="block"/> + <menu_item_call label="Fjern blokering" name="unblock"/> + <menu_item_call label="Spark" name="kick"/> + <menu_item_call label="Frys" name="freeze"/> + <menu_item_call label="Fjern frys" name="unfreeze"/> + <menu_item_call label="Kundeservicemedarbejder (CSR)" name="csr"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index ec0631d54f..18ad7cfffa 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -7,8 +7,8 @@ <menu_item_call label="Profil" name="Profile"/> <menu_item_call label="Udseende" name="Appearance"/> <menu_item_check label="Beholdning" name="Inventory"/> - <menu_item_call label="Vis beholdning i sidebakke" name="ShowSidetrayInventory"/> - <menu_item_call label="Mine bevægelser" name="Gestures"/> + <menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/> + <menu_item_check label="Mine bevægelser" name="Gestures"/> <menu label="Min status" name="Status"> <menu_item_call label="Væk" name="Set Away"/> <menu_item_call label="Optaget" name="Set Busy"/> @@ -22,35 +22,36 @@ <menu_item_call label="Grupper" name="My Groups"/> <menu_item_check label="Chat i nærheden" name="Nearby Chat"/> <menu_item_call label="Personer tæt pÃ¥" name="Active Speakers"/> - <menu_item_check label="Media i nærheden" name="Nearby Media"/> </menu> <menu label="Verden" name="World"> - <menu_item_check label="Flyt" name="Movement Controls"/> - <menu_item_check label="Vis" name="Camera Controls"/> - <menu_item_call label="Om land" name="About Land"/> - <menu_item_call label="Region/Estate" name="Region/Estate"/> - <menu_item_call label="Køb land" name="Buy Land"/> + <menu_item_check label="Mini-kort" name="Mini-Map"/> + <menu_item_check label="Verdenskort" name="World Map"/> + <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/> + <menu label="Profil for sted" name="Land"> + <menu_item_call label="Om land" name="About Land"/> + <menu_item_call label="Region/Estate" name="Region/Estate"/> + </menu> + <menu_item_call label="Køb dette land" name="Buy Land"/> <menu_item_call label="Mit land" name="My Land"/> - <menu label="Vis" name="Land"> - <menu_item_check label="Ban Lines" name="Ban Lines"/> + <menu label="Vis" name="LandShow"> + <menu_item_check label="Bevægelses kontrol" name="Movement Controls"/> + <menu_item_check label="Vis kontroller" name="Camera Controls"/> + <menu_item_check label="'Ingen adgang' markering" name="Ban Lines"/> <menu_item_check label="Pejlelys" name="beacons"/> <menu_item_check label="Parcel skel" name="Property Lines"/> - <menu_item_check label="Land-ejere" name="Land Owners"/> - </menu> - <menu label="Landemærker" name="Landmarks"> - <menu_item_call label="Opret landemærke her" name="Create Landmark Here"/> - <menu_item_call label="Sæt hjem til her" name="Set Home to Here"/> + <menu_item_check label="Grundejere" name="Land Owners"/> + <menu_item_check label="Koordinater" name="Coordinates"/> + <menu_item_check label="Parcel egenskaber" name="Parcel Properties"/> </menu> - <menu_item_call label="Hjem" name="Teleport Home"/> - <menu_item_check label="Mini-kort" name="Mini-Map"/> - <menu_item_check label="Verdenskort" name="World Map"/> - <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Teleport hjem" name="Teleport Home"/> + <menu_item_call label="Sæt dette sted som 'Hjem'" name="Set Home to Here"/> <menu label="Sol" name="Environment Settings"> <menu_item_call label="Solopgang" name="Sunrise"/> <menu_item_call label="Middag" name="Noon"/> <menu_item_call label="Solnedgang" name="Sunset"/> <menu_item_call label="Midnat" name="Midnight"/> - <menu_item_call label="Benyt tid fra estate" name="Revert to Region Default"/> + <menu_item_call label="Estate tid" name="Revert to Region Default"/> <menu_item_call label="Redigering af omgivelser" name="Environment Editor"/> </menu> </menu> @@ -76,10 +77,12 @@ </menu> <menu_item_call label="Sammenkæde" name="Link"/> <menu_item_call label="Adskil" name="Unlink"/> + <menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/> <menu_item_call label="Fokusér pÃ¥ valgte" name="Focus on Selection"/> <menu_item_call label="Zoom til valgte" name="Zoom to Selection"/> <menu label="Objekt" name="Object"> - <menu_item_call label="Køb" name="Menu Object Take"/> + <menu_item_call label="Køb" name="Menu Object Buy"/> + <menu_item_call label="Tag" name="Menu Object Take"/> <menu_item_call label="Tag kopi" name="Take Copy"/> <menu_item_call label="Opdatér ændringer til beholdning" name="Save Object Back to My Inventory"/> <menu_item_call label="Opdater ændringer i indhold til objekt" name="Save Object Back to Object Contents"/> @@ -92,25 +95,18 @@ <menu_item_call label="Sæt scripts til "Not Running"" name="Set Scripts to Not Running"/> </menu> <menu label="Valg" name="Options"> - <menu_item_check label="Redigér sammenlænkede dele" name="Edit Linked Parts"/> <menu_item_call label="Sæt standard rettigheder" name="perm prefs"/> <menu_item_check label="Vis avancerede rettigheder" name="DebugPermissions"/> - <menu label="Selektion" name="Selection"> - <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/> - <menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/> - <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/> - </menu> - <menu label="Vis" name="Show"> - <menu_item_check label="Vis skjult selektion" name="Show Hidden Selection"/> - <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/> - <menu_item_check label="Vis udvælgelses strÃ¥le" name="Show Selection Beam"/> - </menu> - <menu label="Gitter" name="Grid"> - <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/> - <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/> - <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/> - <menu_item_call label="Gitter valg" name="Grid Options"/> - </menu> + <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/> + <menu_item_check label="Vis kun flytbare objekter" name="Select Only Movable Objects"/> + <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/> + <menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/> + <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/> + <menu_item_check label="Vis pejlelys for valgte" name="Show Selection Beam"/> + <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/> + <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/> + <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/> + <menu_item_call label="Gitter indstillinger" name="Grid Options"/> </menu> <menu label="Vis lænkede dele" name="Select Linked Parts"> <menu_item_call label="Vælg næste del" name="Select Next Part"/> @@ -121,15 +117,14 @@ </menu> <menu label="Hjælp" name="Help"> <menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/> - <menu_item_call label="Tutorial" name="Tutorial"/> <menu_item_call label="Rapporter misbrug" name="Report Abuse"/> <menu_item_call label="Rapportér fejl" name="Report Bug"/> </menu> <menu label="Avanceret" name="Advanced"> - <menu_item_check label="Sæt til "væk" efter 30 minutter" name="Go Away/AFK When Idle"/> <menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/> <menu_item_call label="Gendan teksturer" name="Rebake Texture"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> + <menu_item_call label="Vælg vinduesstørrelse..." name="Set Window Size..."/> <menu_item_check label="Begræns valg afstand" name="Limit Select Distance"/> <menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/> <menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/> @@ -176,8 +171,8 @@ <menu_item_check label="Kør flere trÃ¥de" name="Run Multiple Threads"/> <menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/> <menu_item_check label="Muse udjævning" name="Mouse Smoothing"/> - <menu_item_check label="Vis IM's i lokal chat" name="IMInChat"/> <menu label="Shortcuts" name="Shortcuts"> + <menu_item_call label="Billede (L$[COST])..." name="Upload Image"/> <menu_item_check label="Søg" name="Search"/> <menu_item_call label="Frigør taster" name="Release Keys"/> <menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/> @@ -217,6 +212,7 @@ <menu_item_call label="Vis Regionsinfo i debug-konsol" name="Region Info to Debug Console"/> <menu_item_check label="Kamera" name="Camera"/> <menu_item_check label="Vind" name="Wind"/> + <menu_item_check label="Badge" name="Badge"/> </menu> <menu label="Vis info" name="Display Info"> <menu_item_check label="Vis tid" name="Show Time"/> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 42eac1be7a..9193bd43e8 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -11,18 +11,29 @@ </global> <template name="okbutton"> <form> - <button name="OK" text="$yestext"/> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> </form> </template> - <template name="okignore"/> <template name="okcancelbuttons"> <form> - <button name="Cancel" text="$notext"/> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> </form> </template> - <template name="okcancelignore"/> <template name="okhelpbuttons"> <form> + <button name="OK_okhelpbuttons" text="$yestext"/> <button name="Help" text="$helptext"/> </form> </template> @@ -30,6 +41,7 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="Ukendt notificeringsbesked" name="MissingAlert"> @@ -93,13 +105,17 @@ Vælg kun en genstand, og prøv igen. Gem alle ændringer til tøj/krops dele? <usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/> </notification> + <notification name="FriendsAndGroupsOnly"> + 'Ikke-venner' vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM) + <usetemplate name="okbutton" yestext="Ja"/> + </notification> <notification name="GrantModifyRights"> - At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du mÃ¥tte have i verden. Vær meget forsigtig nÃ¥r uddeler denne tilladelse. + At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du mÃ¥tte have i verden. Vær MEGET forsigtig nÃ¥r uddeler denne tilladelse. Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> <notification name="GrantModifyRightsMultiple"> - At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du mÃ¥tte have i verden. Vær meget forsigtig nÃ¥r uddeler denne tilladelse. + At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du mÃ¥tte have i verden. Vær MEGET forsigtig nÃ¥r uddeler denne tilladelse. Ønsker du at ændre rettigheder for de valgte beboere? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> @@ -142,8 +158,15 @@ Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet med Add this Ability to '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/> </notification> - <notification name="ClickUnimplemented"> - Beklager, ikke implementeret endnu. + <notification name="AttachmentDrop"> + Du er ved at smide et vedhæng. + Er du sikker pÃ¥ at du vil fortsætte? + <usetemplate ignoretext="Bekræft før vedhæng smides" name="okcancelignore" notext="Nej" yestext="Ja"/> + </notification> + <notification name="JoinGroupNoCost"> + Du melder dig ind i gruppen [NAME]. +Ønsker du at fortsætte? + <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Bliv medlem"/> </notification> <notification name="JoinGroupCannotAfford"> Tilmelding til denne gruppe koster L$[COST]. @@ -197,13 +220,9 @@ Jo mere du betaler, jo højere oppe pÃ¥ listen vises annoncen, og den vil ogsÃ¥ Er du sikker pÃ¥ at du vil fortsætte? <usetemplate ignoretext="Bekræft før jeg slette media i et objekt" name="okcancelignore" notext="Nej" yestext="Ja"/> </notification> - <notification name="ResetShowNextTimeDialogs"> - Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at fÃ¥ vist? - <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> - </notification> - <notification name="SkipShowNextTimeDialogs"> - Vil du deaktivere alle popups som kan undværes? - <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/> + <notification name="ClassifiedInsufficientFunds"> + Ikke nok penge til at oprette annonce. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CacheWillClear"> Cache vil blive tømt ved næste genstart af [APP_NAME]. @@ -224,11 +243,14 @@ Indtast venligst navn pÃ¥ region i Start lokation feltet eller vælg "Min s <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="UnsupportedHardware"> + Bare sÃ¥ du ved det, din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan opleve dÃ¥rlig hastighed. Desværre kan [SUPPORT_SITE] ikke give teknisk support til ikke-supporterede konfigurationer. +MINSPECS +Besøg [_URL] for mere information? <usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/> </notification> <notification name="UnknownGPU"> - Dit system har et grafikkort som er ukendt for [APP_NAME] lige nu. -Dette er tilfældet med nyt hardware som endnu ikke er blevet testet med [APP_NAME]. [APP_NAME] vil sandsynligvis kunne køre normalt, men det kan være nødvendigt at justere opsætningen af grafik. + Dit system indeholder et grafikkort som [APP_NAME] ikke kan genkende. +Dette skyldes ofte nyt hardware som endnu ikke er blevet testet med [APP_NAME]. Kortet vil sandsynligvis virke fint, med det kan være nødvendigt at justere grafik opsætningen. (Mig > Indstillinger > Grafik). <form name="form"> <ignore name="ignore" text="Dit grafikkort kunne ikke identificeres"/> @@ -260,9 +282,17 @@ GÃ¥ til [_URL] for information om køb af L$? <notification name="LandmarkCreated"> Du har tilføjet "[LANDMARK_NAME]" til din [FOLDER_NAME] mappe. </notification> + <notification name="LandmarkAlreadyExists"> + Du har allerede et landemærke for denne lokation. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CannotOpenScriptObjectNoMod"> Ikke muligt at Ã¥bne script i objekt uden 'Redigére' rettigheder. </notification> + <notification name="CouldNotTeleportReason"> + Teleport fejlede. +[REASON] + </notification> <notification name="invalid_tport"> Der opstod et problem ved din teleport. Det kan være nødvendigt at logge ind igen, før du kan teleporte. Hvis du bliver ved med at fÃ¥ denne fejl, check venligst [SUPPORT_SITE]. @@ -305,6 +335,10 @@ Prøv evt. igen om lidt. <notification name="no_inventory_host"> Beholdningssystemet er ikke tilgængelig lige nu. </notification> + <notification name="ForceOwnerAuctionWarning"> + Denne parcel er sat pÃ¥ auktion. Gennemtving ejerskab vil annullere denne auktion og mÃ¥ske irritere nogen beboere hvis bud allerede er afgivet. +Gennemtving ejerskab? + </notification> <notification name="CannotBuyLandNoRegion"> Ikke i stand til at købe land: Kan ikke finde region som dette land er i. @@ -316,13 +350,6 @@ Kan ikke finde region som dette land er i. Land kunne ikke dedikeres: Kunne ikke finde den region land ligger i. </notification> - <notification name="ParcelCanPlayMedia"> - Dette sted kan afspille 'streaming media'. -'Streaming media' kræver en hurtig internet opkobling. - -Afspil altid 'streaming media' nÃ¥r det er tilgængeligt? -(Du kan ændre dette valg senere under Indstillinger > Privatliv.) - </notification> <notification name="CannotReleaseLandRegionNotFound"> Kunne ikke efterlade land: Kan ikke finde den region landet ligger i. @@ -340,9 +367,8 @@ Kan ikke finde den region landet ligger i. Dette er typisk en midlertidig fejl. Venligst rediger og gem igen om et par minutter. </notification> <notification name="YouHaveBeenLoggedOut"> - Du er blevet logget af [SECOND_LIFE]: + Du er blevet logget af [SECOND_LIFE] [MESSAGE] -Du kan stadig se igangværende samtaler (IM) og chat ved at klikke pÃ¥ 'Se IM & chat. Ellers klik pÃ¥ 'Afslut' for at lukke [APP_NAME] med det samme. <usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB & Chat"/> </notification> <notification label="Tilføj ven" name="AddFriend"> @@ -365,6 +391,9 @@ Tilbyd venskab til [NAME]? <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="ErrorMessage"> + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="AvatarMovedDesired"> Den ønskede lokation er ikke tilgængelig lige nu. Du er blevet flyttet til en region in nærheden. @@ -511,9 +540,12 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil fÃ¥ din &a <usetemplate ignoretext="Jeg skrifter min status til 'optaget" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> - Du har nÃ¥et det maksimale antal grupper. Du skal forlade en anden gruppe for at kunne være med i denne - eller afvis tilbudet. -[NAME] har inviteret dig til at være medlem af en gruppe. -[INVITE] + Du er oppe pÃ¥ det maksimale antal grupper. Forlad venligst en anden gruppe inden du melder dig ind i denne, eller afvis tilbuddet. +[NAME] har inviteret dig til en gruppe. + </notification> + <notification name="JoinedTooManyGroups"> + Du er oppe pÃ¥ det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="OfferTeleport"> <form name="form"> @@ -525,6 +557,7 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil fÃ¥ din &a </form> </notification> <notification name="TeleportFromLandmark"> + Er du sikker pÃ¥ at du vil teleportere til <nolink>[LOCATION]</nolink>? <usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/> </notification> <notification name="TeleportToPick"> @@ -626,6 +659,12 @@ Du kan klikke pÃ¥ 'Ændre præference' for at ændre din indholdsratin Indeholder denne gruppe 'Mature' indhold? <usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/> </notification> + <notification label="Changed Region Maturity" name="RegionMaturityChange"> + Ratingen for denne region er ændret. +Det kan tage noget tid inden ændringen slÃ¥r igennem pÃ¥ kortet. + +For at fÃ¥ adgang til voksen regioner, skal beboere være alders-checket, enten via aldersverifikation eller betalingsverifikation. + </notification> <notification label="Voice Version Mismatch" name="VoiceVersionMismatch"> Denne version af [APP_NAME] er ikke kompatibel med stemme chat funktionen i denne region. For at kunne fÃ¥ stemme chat til at fungere skal du opdatere [APP_NAME]. </notification> @@ -649,9 +688,9 @@ Du kan klikke pÃ¥ 'Ændre præference' for at ændre din indholdsratin <usetemplate ignoretext="Bekræft før jeg afslutter" name="okcancelignore" notext="Afslut ikke" yestext="Quit"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Benyt dette værktøj til at rapportere Use this tool to report krænkelser af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards]. + Benyt dette værktøj til at rapportere krænkninger af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards]. -Alle indrapporterede krænkelser er undersøgt og and afgjort. Du kan se løsning ved at læse [http://secondlife.com/support/incidentreport.php Incident Report]. +Alle rapporter om krænkninger vil blive undersøgt og behandlet. </notification> <notification name="HelpReportAbuseContainsCopyright"> Kære beboer, @@ -792,8 +831,7 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati Bevægelsen [NAME] mangler i databasen. </notification> <notification name="UnableToLoadGesture"> - Ikke muligt at indlæse gestus [NAME]. -Prøv venligst igen. + Kunne ikke indlæse læse bevægelse [NAME]. </notification> <notification name="LandmarkMissing"> Landmærke mangler i databasen. @@ -885,10 +923,9 @@ Click on any landmark to select it, then click 'Teleport' at the botto (You can also double-click on the landmark, or right-click it and choose 'Teleport'.) </notification> <notification name="TeleportToPerson"> - Du kan kontakte beboere som f.eks. '[NAME]' ved at Ã¥bne 'Personer' panelet til højre pÃ¥ skærmen. -Vælg beboeren fra listen og klik sÃ¥ pÃ¥ 'IM' i bunden af panelet. -(Du kan ogsÃ¥ dobbelt-klikke pÃ¥ navnet i listen eller højreklikke og vælge 'IM') -(You can also double-click on their name in the list, or right-click and choose 'IM'). + Du kan kontakte beboere som '[NAME]' ved at Ã¥bne Personer panelet til højre pÃ¥ skærmen. +Vælg beboeren fra listen og klik sÃ¥ 'IM' i bundet af panelet. +(Du kan ogsÃ¥ dobbelt-klikke pÃ¥ navnet i listen, eller højre-klikke og vælge 'IM'). </notification> <notification name="CantSelectLandFromMultipleRegions"> Kan ikke vælge land pÃ¥ tværs af grænser. @@ -959,7 +996,7 @@ Prøv venligst at geninstallere plugin eller kontakt leverandøren hvis probleme Genstandene pÃ¥ det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning. </notification> <notification name="OtherObjectsReturned2"> - Genstandene pÃ¥ det valgte stykke land der er ejet af beboeren '[NAME]' er blevet returneret til deres ejere. + Objekterne i den valgte parcel, ejet af beboeren '[NAME]', er blevet returneret til deres ejer. </notification> <notification name="GroupObjectsReturned"> Genstandene pÃ¥ det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger. @@ -971,7 +1008,7 @@ Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet sl </notification> <notification name="ServerObjectMessage"> Besked fra [NAME]: -[MSG] +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> Dette land er Ã¥bnet for 'skade'. @@ -1080,7 +1117,7 @@ Prøv igen om lidt. No valid parcel could be found. </notification> <notification name="ObjectGiveItem"> - Et objekt med navnet [OBJECTFROMNAME], ejet af [NAME_SLURL], har givet dig [OBJECTTYPE]: + Et objekt med navnet [OBJECTFROMNAME] ejet af [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button name="Keep" text="Behold"/> @@ -1089,7 +1126,7 @@ Prøv igen om lidt. </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - Et objekt med navnet [OBJECTFROMNAME], ejet af en ukendt beboer, har givet dig [OBJECTTYPE]: + Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button name="Keep" text="Behold"/> @@ -1098,12 +1135,12 @@ Prøv igen om lidt. </form> </notification> <notification name="UserGiveItem"> - [NAME_SLURL] har givet dig [OBJECTTYPE]: + [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> - <button name="Keep" text="Behold"/> <button name="Show" text="Vis"/> <button name="Discard" text="Smid væk"/> + <button name="Mute" text="Blokér"/> </form> </notification> <notification name="GodMessage"> @@ -1128,6 +1165,9 @@ Prøv igen om lidt. <button name="Cancel" text="Annullér"/> </form> </notification> + <notification name="TeleportOfferSent"> + Tilbud om teleport sendt til [TO_NAME] + </notification> <notification name="GotoURL"> [MESSAGE] [URL] @@ -1154,9 +1194,15 @@ Som standard vil du kunne se andres onlinestatus. <notification name="FriendshipDeclined"> [NAME] afviste dit tilbud om venskab. </notification> + <notification name="FriendshipAcceptedByMe"> + Tilbud om venskab accepteret. + </notification> + <notification name="FriendshipDeclinedByMe"> + Tilbud om venskab afvist. + </notification> <notification name="OfferCallingCard"> - [FIRST] [LAST] tilbyder vedkommendes visitkort. -Dette vil tilføje et bogmærke i din beholdning, sÃ¥ du hurtigt kan sende en personlig besked (IM) til denne beboer. + [FIRST] [LAST] tilbyder dig et visitkort. +Dette vil lave et bogmørke i din beholding, sÃ¥ du hurtigt kan sende en IM til denne beboer. <form name="form"> <button name="Accept" text="Acceptér"/> <button name="Decline" text="Afvis"/> @@ -1235,14 +1281,6 @@ Tillad denne anmodning? <button name="Block" text="Blokér"/> </form> </notification> - <notification name="FirstBalanceIncrease"> - Du har netop modtaget [AMOUNT] L$. -Din balance vises øverst til højre. - </notification> - <notification name="FirstBalanceDecrease"> - Du har netop betalt [AMOUNT] L$. -Din balance vises øverst til højre. - </notification> <notification name="BuyLindenDollarSuccess"> Tak for din betaling! @@ -1250,58 +1288,17 @@ Din L$ balance vil blive opdateret nÃ¥r transaktionen er gennemført. Ved transa Status for din betaling kan ses i din 'Transaction History' side pÃ¥ din [http://secondlife.com/account/ Dashboard] </notification> - <notification name="FirstSit"> - Du sidder ned. -Benyt piletasterne (eller AWSD) til at se rundt. -Klik pÃ¥ 'StÃ¥ op' tasten for at rejse dig. - </notification> - <notification name="FirstMap"> - Klik og træk pÃ¥ kortet for at se rundt. -Dobbelt-klik for at teleportere. -Benyt kontrollerne til højre for at finde ting og se forskellige baggrunde. - </notification> - <notification name="FirstBuild"> - Du har Ã¥bnet bygge værktøjer. Alle objekter du ser omkring dig er lavet via disse værktøjer. - </notification> - <notification name="FirstTeleport"> - Du kan kun teleportere til bestemte omrÃ¥der i denne region. Pilen peger pÃ¥ din specifikke destination. Klik pÃ¥ pilen for at fjerne den. - </notification> <notification name="FirstOverrideKeys"> Dine bevælgelsestaster bliver nu hÃ¥ndteret af et objekt. Brug piletasterne eller AWSD for at se, hvad de gør. Nogle genstande (som skydevÃ¥ben) kræver at du gÃ¥r ind i musevisning for at bruge dem. Tryk pÃ¥ 'M' for at gÃ¥re det. </notification> - <notification name="FirstAppearance"> - Du redigerer dit udseende. -Benyt piletasterne til at se rundt. -NÃ¥r du er færdig, tryk pÃ¥ 'Gem alt'. - </notification> - <notification name="FirstInventory"> - Dette er din beholdning, som indeholder de genstande du ejer. - -* For at tage noget pÃ¥, træk det over pÃ¥ dig selv. -* For at 'rezze' noget, træk det over pÃ¥ jorden. -* For at læse en note, dobbelt-klik pÃ¥ den. - </notification> <notification name="FirstSandbox"> Dette er et sandkasse omrÃ¥de. Her kan beboere lære ast bygge. De ting du bygger vil blive slettet senere, sÃ¥ glem ikke at højre-klikke og vælge "Tag" for at tage en kopi af din kreation til din beholdning. </notification> - <notification name="FirstFlexible"> - Dette objekt er fleksibelt/blødt. SÃ¥danne objekter skal være 'uden masse' og ikke fysiske. - </notification> - <notification name="FirstDebugMenus"> - Du har Ã¥bnet menuen 'Avanceret'. - -For at slÃ¥ denne menu fra og til, - Windows: Ctrl+Alt+D - Mac: ⌥⌘D - </notification> - <notification name="FirstSculptedPrim"> - Du redigerer en 'Sculpted prim'. SÃ¥danne objekter kræver en speciel tekstur for at definere faconen. - </notification> <notification name="MaxListSelectMessage"> Du mÃ¥ kun vælge op til [MAX_SELECT] genstande pÃ¥ denne liste. </notification> @@ -1408,6 +1405,10 @@ De vil blive blokeret nogle fÃ¥ sekunder af sikkerhedsmæssige Ã¥rsager. <button name="respondbutton" text="Svar"/> </form> </notification> + <notification name="ConfirmCloseAll"> + Er du sikker pÃ¥ at du vil lukke alle personlige samtaler (IM)? + <usetemplate name="okcancelignore" notext="Annullér" yestext="OK"/> + </notification> <notification name="AttachmentSaved"> Vedhæng er blevet gemt. </notification> diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml index ab2e7a6e31..1953fad31f 100644 --- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <panel name="panel_call_buttons"> - <button label="Opkald" name="call_btn"/> - <button label="Forlad samtale" name="end_call_btn"/> - <button label="Stemmekontroller" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="vertical_stack"> + <layout_panel name="call_btn_panel"> + <button label="Opkald" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Stemmekontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml index a9d5ba73ac..56332c00e6 100644 --- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml @@ -22,4 +22,5 @@ [COUNT]Ã¥ </string> <text name="avatar_name" value="Ukendt"/> + <button name="profile_btn" tool_tip="Vis profil"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml index 986a4131de..4f5041ad54 100644 --- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel"> <text name="title_text"> - Blokérede avatarer + Blokerede </text> - <scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/> + <scroll_list name="blocked" tool_tip="Liste med beboerer der p.t. er blokeret"/> <button label="Blokér beboer..." label_selected="Blokér beboer..." name="Block resident..." tool_tip="Vælg en beboer der skal blokeres"/> <button label="Blokér objekt via navn..." label_selected="Blokér objekt via navn..." name="Block object by name..."/> - <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjern beboer fra liste med blokeringer"/> + <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjerm en beboer fra blokeringslisten"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml index 2085840bb5..4a038e89ba 100644 --- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml @@ -7,8 +7,13 @@ Skjuler/viser stemme kontrol panel </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Tal" label_selected="Tal" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> - <gesture_combo_box label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/> + <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/> </layout_panel> <layout_panel name="movement_panel"> <button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/> @@ -19,5 +24,15 @@ <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Tag foto"/> </layout_panel> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Konversationer"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notifikationer"/> + </chiclet_notification> + </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..bd31253ca4 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Vis/skjul bevægelser"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml index a9cce7bf45..6eba024981 100644 --- a/indra/newview/skins/default/xui/da/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_classified_info"> + <panel.string name="l$_price"> + L$[PRICE] + </panel.string> <text name="title" value="Annonce info"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[name]"/> - <text name="classified_location" value="[loading...]"/> - <text name="content_type" value="[content type]"/> - <text name="category" value="[category]"/> + <text_editor name="classified_name" value="[name]"/> + <text_editor name="classified_location" value="[loading...]"/> + <text_editor name="content_type" value="[content type]"/> + <text_editor name="category" value="[category]"/> <check_box label="Forny automatisk hver uge" name="auto_renew"/> - <text name="price_for_listing" tool_tip="Pris for optagelse."> - L$[PRICE] - </text> - <text name="classified_desc" value="[description]"/> + <text_editor name="price_for_listing" tool_tip="Pris for optagelse."/> + <text_editor name="classified_desc" value="[description]"/> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml index d3cfdbba52..85461e23a7 100644 --- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml @@ -35,9 +35,12 @@ </text> <check_box label="Vis mig i søgeresultater" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="Min konto:"/> + <text_editor name="acc_status_text" value="Beboer. Ingen betalingsinfo."/> <text name="my_account_link" value="[[URL] Go to My Dashboard]"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo."/> <text name="title_partner_text" value="Min partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> <text name="partner_edit_link" value="[[URL] Edit]"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml index a41eaf20c1..a1a25bdc77 100644 --- a/indra/newview/skins/default/xui/da/panel_friends.xml +++ b/indra/newview/skins/default/xui/da/panel_friends.xml @@ -16,5 +16,5 @@ <button label="Teleport" name="offer_teleport_btn" tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position"/> <button label="Betal" name="pay_btn" tool_tip="Giv Linden dollars (L$) til denne ven"/> <button label="Fjern" name="remove_btn" tool_tip="Fjern denne beboer fra din venneliste"/> - <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til denne beboer"/> + <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til en beboer"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml index 1db2db45af..26fe4f6ebe 100644 --- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <button label="Group Profile" name="group_info_btn"/> - <panel name="panel_call_buttons"> - <button label="Opkaldsgruppe" name="call_btn"/> - <button label="Forlad samtale" name="end_call_btn"/> - <button label="Kontroller for Ã¥ben stemmechat" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="vertical_stack"> + <layout_panel name="group_info_btn_panel"> + <button label="Gruppe profil" name="group_info_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Opkald gruppe" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Ã…ben stemmekontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml index ec957e6094..becb5ab70a 100644 --- a/indra/newview/skins/default/xui/da/panel_group_general.xml +++ b/indra/newview/skins/default/xui/da/panel_group_general.xml @@ -9,20 +9,38 @@ <panel.string name="incomplete_member_data_str"> Henter medlemsinformationer </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Klik for at vælge et billede"/> + <text name="prepend_founded_by"> + Grundlagt af: + </text> + <name_box initial_value="(henter)" name="founder_name"/> + <text name="join_cost_text"> + Gratis + </text> + <button label="TILMELD NU!" name="btn_join"/> + </panel> <text_editor name="charter"> Gruppens formÃ¥l </text_editor> <name_list name="visible_members"> <name_list.columns label="Medlem" name="name"/> <name_list.columns label="Titel" name="title"/> + <name_list.columns label="Status" name="status"/> </name_list> + <text name="my_group_settngs_label"> + MeMig + </text> <text name="active_title_label"> - Min titel + Min titel: </text> <combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, nÃ¥r denne gruppe er aktiv"/> <check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe. Fjern markeringen i boksen hvis gruppen spammer dig."/> <check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/> <panel name="preferences_container"> + <text name="group_settngs_label"> + Gruppe + </text> <check_box label="Ã…ben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/> <check_box label="Tilmeldingsgebyr" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen"/> <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, nÃ¥r "Tilmeldingsgebyr" er valgt." width="60"/> diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml index 9940ebbd4d..a7aa842439 100644 --- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Gruppe info" name="GroupInfo"> +<panel label="Gruppe profil" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - Der er ændringer pÃ¥ denne fane der ikke er gemt + Der er ændringer der ikke er gemt </panel.string> <panel.string name="want_apply_text"> Ønsker du at gemme disse ændringer? @@ -12,25 +12,24 @@ <panel.string name="group_join_free"> Gratis </panel.string> - <text name="group_name" value="(Henter...)"/> - <line_editor label="Indtast dit nye gruppenavn her" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="Klik for at vælge bilede"/> - <text name="prepend_founded_by"> - Grundlægger: - </text> - <name_box initial_value="(finder)" name="founder_name"/> - <text name="join_cost_text"> - Gratis - </text> - <button label="MELD IND NU!" name="btn_join"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="Generelt"/> - <accordion_tab name="group_roles_tab" title="Roller"/> - <accordion_tab name="group_notices_tab" title="Beskeder"/> - <accordion_tab name="group_land_tab" title="Land/Aktiver"/> - </accordion> - <panel name="button_row"> - <button label="Lav" label_selected="Ny gruppe" name="btn_create"/> - <button label="Gem" label_selected="Gem" name="btn_apply"/> + <panel name="group_info_top"> + <text name="group_name" value="(Henter...)"/> + <line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/> </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="Generelt"/> + <accordion_tab name="group_roles_tab" title="Roller"/> + <accordion_tab name="group_notices_tab" title="Noter"/> + <accordion_tab name="group_land_tab" title="Land/Aktiver"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Chat" name="btn_chat"/> + <button label="Gruppeopkald" name="btn_call" tool_tip="Opkald til denne gruppe"/> + <button label="Gem" label_selected="Save" name="btn_apply"/> + <button label="Opret gruppe" name="btn_create" tool_tip="Opret en ny gruppe"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml index 1e00642c29..49daf6c9f2 100644 --- a/indra/newview/skins/default/xui/da/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml @@ -7,17 +7,14 @@ (indlæser...) </panel.string> <panel.string name="already_in_group"> - Nogen af avatarerne var allerede i gruppen og blev ikke inviteret + Nogle af de beboere du vælger er allerede i gruppen, sÃ¥ de fÃ¥r ikke tilsendt en invitation. </panel.string> <text name="help_text"> - Du kan invitere flere beboere ad -gangen til at blive medlem af din -gruppe. Klik 'Ã…ben personvælger' for -at begynde. + Du kan invitere flere beboere ad gangen til at blive medlem af din gruppe. Klik 'Ã…ben personvælger' for at begynde. </text> <button bottom_delta="-30" label="Ã…ben personvælger" name="add_button"/> - <name_list name="invitee_list" tool_tip="Hold Ctrl knappen nede og klik pÃ¥ beboer navne for at vælge flere"/> - <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjern beboere valgt ovenfor fra invitationslisten"/> + <name_list name="invitee_list" tool_tip="Hold Ctrl-tasten nede og klik pÃ¥ beboere for at vælge flere."/> + <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjerner beboere, der er valgt pÃ¥ ovenstÃ¥ende invitationsliste."/> <text name="role_text"> Vælg hvilken rolle, du vil tildele dem: </text> diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml index c73d7c807d..9b0267529c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml @@ -1,65 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Land & L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> Du har ikke tilladelse til at se gruppeejet land. - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> Du har ikke tilladelse til at se gruppens økonomiinformationer. - </string> - <string name="loading_txt"> + </panel.string> + <panel.string name="loading_txt"> Indlæser... - </string> - <text name="group_land_heading"> - Gruppeejet land - </text> - <scroll_list name="group_parcel_list"> - <column label="Parcel" name="name"/> - <column label="Region" name="location"/> - <column label="Type" name="type"/> - <column label="OmrÃ¥de" name="area"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="Kort" label_selected="Kort" name="map_button"/> - <text name="total_contributed_land_label"> - Totalt bidrag: - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <text name="total_land_in_use_label"> - Totalt land i brug: - </text> - <text name="total_land_in_use_value"> - [AREA] m² - </text> - <text name="land_available_label"> - Ledigt land: - </text> - <text name="land_available_value"> - [AREA] m² - </text> - <text name="your_contribution_label"> - Dit bidrag: - </text> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> Ikke muligt at lave dit bidrag til landet - </string> - <text name="your_contribution_units"> - m² - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] maks.) - </text> - <text name="group_over_limit_text"> - Gruppemedlemmer mÃ¥ bidrag med mere, for at understøtte med det land der bliver brugt - </text> - <text name="group_money_heading"> - Gruppe L$ - </text> + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Parcel" name="name"/> + <scroll_list.columns label="Region" name="location"/> + <scroll_list.columns label="Type" name="type"/> + <scroll_list.columns label="Areal" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Totalt bidrag: + </text> + <text name="total_contributed_land_value"> + [AREA] m² + </text> + <button label="Kort" label_selected="Kort" name="map_button"/> + <text name="total_land_in_use_label"> + Totalt land i brug: + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + Land tilgængelgt: + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Dit bidrag: + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([BELØB] maks.) + </text> + <text name="group_over_limit_text"> + Der kræves flere penge for at supportere det land der er i brug + </text> + <text name="group_money_heading"> + Gruppe L$ + </text> + </panel> <tab_container name="group_money_tab_container"> <panel label="PLANLÆGNING" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml index bfffdccc5e..e77e548340 100644 --- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="group_list_item"> <text name="group_name" value="Ukendt"/> + <button name="profile_btn" tool_tip="Se profil"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml index ec503c37dc..7046ac4d7c 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml @@ -42,7 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag <text name="string"> Træk og slip en gensand for at vedhæfte den: </text> - <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment"/> + <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/> <button label="Send" label_selected="Send" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/> </panel> @@ -59,6 +59,6 @@ Maksimum er 200 pr. gruppe pr. dag <text name="lbl4"> Besked: </text> - <button label="Ã…ben bilag" label_selected="Ã¥ben bilag" name="open_attachment"/> + <button label="Ã…ben vedhæng" label_selected="Ã¥ben bilag" name="open_attachment"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml index 43a84298e2..8a684ca031 100644 --- a/indra/newview/skins/default/xui/da/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml @@ -4,5 +4,5 @@ <text name="title" value="Afsender navn / Gruppe navn"/> </panel> <text name="attachment" value="Bilag"/> - <button label="Ok" name="btn_ok"/> + <button label="OK" name="btn_ok"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml index 74bea831fb..3ab3dd8bf8 100644 --- a/indra/newview/skins/default/xui/da/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Medlemmer & roller" name="roles_tab"> <panel.string name="default_needs_apply_text"> - Der er ændringer her, der ikke er gemt. + Der er ændringer som ikke er gemt </panel.string> <panel.string name="want_apply_text"> Vil du gemme disse ændringer? @@ -58,7 +58,7 @@ ting i denne gruppe. Der er en bred vifte af rettigheder. </tab_container> <panel name="members_footer"> <text name="static"> - Medlemmer + Tildelte roller </text> <scroll_list name="member_assigned_roles"> <scroll_list.columns label="" name="checkbox"/> diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml index 0384652e5d..1ba6b8b97f 100644 --- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml @@ -1,13 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <text name="avatar_name" value="Ukendt"/> - <button label="Profil" name="view_profile_btn"/> - <button label="Tilføj ven" name="add_friend_btn"/> - <button label="Teleportér" name="teleport_btn"/> - <button label="Del" name="share_btn"/> - <panel name="panel_call_buttons"> - <button label="Opkald" name="call_btn"/> - <button label="Læg pÃ¥" name="end_call_btn"/> - <button label="Stemme opsætning" name="voice_ctrls_btn"/> - </panel> + <layout_stack name="button_stack"> + <layout_panel name="view_profile_btn_panel"> + <button label="Profil" name="view_profile_btn"/> + </layout_panel> + <layout_panel name="add_friend_btn_panel"> + <button label="Tilføj ven" name="add_friend_btn"/> + </layout_panel> + <layout_panel name="teleport_btn_panel"> + <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Del" name="share_btn"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Betal" name="pay_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Opkald" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Forlad opkald" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Stemme kontroller" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml index 202a4d4664..8503a41763 100644 --- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml @@ -18,6 +18,7 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <button name="back_btn" tool_tip="Tilbage"/> <text name="title" value="Sted profil"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml index 47487832cb..8adce2c819 100644 --- a/indra/newview/skins/default/xui/da/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Favorites bjælke"/> - <accordion_tab name="tab_landmarks" title="Landemærker"/> + <accordion_tab name="tab_landmarks" title="Mine landmærker"/> <accordion_tab name="tab_inventory" title="Min beholdning"/> <accordion_tab name="tab_library" title="Bibliotek"/> </accordion> diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml index c8c275d84d..9276ff3a09 100644 --- a/indra/newview/skins/default/xui/da/panel_login.xml +++ b/indra/newview/skins/default/xui/da/panel_login.xml @@ -13,7 +13,7 @@ </text> <line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> <line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> - <check_box label="Husk" name="remember_check"/> + <check_box label="Husk password" name="remember_check"/> <text name="start_location_text"> Start ved: </text> diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml index 2cfd358d13..f98ced5f91 100644 --- a/indra/newview/skins/default/xui/da/panel_me.xml +++ b/indra/newview/skins/default/xui/da/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Min profil" name="panel_me"> <tab_container name="tabs"> - <panel label="PROFIL" name="panel_profile"/> - <panel label="FAVORITTER" name="panel_picks"/> + <panel label="MIN PROFIL" name="panel_profile"/> + <panel label="MINE FAVORITTER" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml index 7f1581888d..48f08b9dfd 100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml @@ -4,16 +4,16 @@ Hjemmeside: </text> <text name="home_fails_whitelist_label"> - (Denne side optræder ikke i godkendte sider) + (Siden er ikke pÃ¥ listen med godkendte sider) </text> - <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette media"/> + <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette medie"/> <text name="preview_label"> Vis </text> <text name="current_url_label"> Nuværende side: </text> - <text name="current_url" tool_tip="Den nuværende hjemmeside for kilden til dette media" value=""/> + <text name="current_url" tool_tip="Nuværende side for kilden til dett medie" value=""/> <button label="Nulstil" name="current_url_reset_btn"/> <check_box initial_value="false" label="Gentag afspil" name="auto_loop"/> <check_box initial_value="false" label="Første klik medfører interaktion" name="first_click_interact"/> diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml index ee341f9142..278fe0eeea 100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sikkerhed" name="Media Settings Security"> - <check_box initial_value="false" label="Tillad kun adgang til specifikke URL'er (via "prefix")" name="whitelist_enable"/> + <check_box initial_value="false" label="Tillad kun adgang til angivne URL mønstre" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Opslag som hjemmesiden fejler ved er markeret: + Angivelser som hjemmesiden fejler imod er markeret: </text> <button label="Tilføj" name="whitelist_add"/> <button label="Slet" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - Advarsel: Hjemmesiden angive i "Generelt" fanen er ikke indeholdt i godkendte sider. Den er slÃ¥et fra, indtil en gyldig værdi er tilføjet. + Advarsel: hjemmesiden specificeret i Generelt fanen opfylder ikke krav pÃ¥ listen med godkendte URL. Den er de-aktiveret indtil en gyldig hjemmeside er tilføjet. </text> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml index 1dffc73239..7eb3c9f4e5 100644 --- a/indra/newview/skins/default/xui/da/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml @@ -1,37 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profil" name="panel_profile"> <string name="no_partner_text" value="Ingen"/> + <string name="no_group_text" value="Ingen"/> <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <panel name="second_life_image_panel"> - <icon label="" name="2nd_life_edit_icon" tool_tip="Klik pÃ¥ Rediger Profil knappen nedenfor for at ændre billede"/> - </panel> - <panel name="first_life_image_panel"> - <icon label="" name="real_world_edit_icon" tool_tip="Klik pÃ¥ Rediger Profil knappen nedenfor for at ændre billede"/> - <text name="title_rw_descr_text" value="RL:"/> - </panel> - <text name="me_homepage_text"> - Web: - </text> - <text name="title_member_text" value="Medlem siden:"/> - <text name="title_acc_status_text" value="Konto:"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/> - <text name="title_partner_text" value="Partner:"/> - <text name="title_groups_text" value="Grupper:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Tilføj ven" name="add_friend"/> - <button label="IM" name="im"/> - <button label="Opkald" name="call"/> - <button label="Kort" name="show_on_map_btn"/> - <button label="Teleportér" name="teleport"/> - </panel> - <panel name="profile_me_buttons_panel"> - <button label="Rediger profil" name="edit_profile_btn" tool_tip="Redigér personlig information"/> - <button label="Ændre udseende" name="edit_appearance_btn" tool_tip="Ændre dit udseende: fysiske data, tøj m.v."/> - </panel> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Klik pÃ¥ Redigér profil knappen forneden for at ændre billede"/> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <icon label="" name="real_world_edit_icon" tool_tip="Klik pÃ¥ Redigér profil knappen forneden for at ændre billede"/> + <text name="title_rw_descr_text" value="Real World:"/> + </panel> + <text name="title_member_text" value="Beboer siden:"/> + <text name="title_acc_status_text" value="Konto status:"/> + <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupper:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/> + <button label="Rediger udseende" name="edit_appearance_btn" tool_tip="Opret/tilret dit udseende: fysiske data, tøj m.v."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml index 465bc75a1b..79f7e81b35 100644 --- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/> - <button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/> + <pull_button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/> + <pull_button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/> <button name="home_btn" tool_tip="Teleport til min hjemme lokation"/> <location_input label="Lokation" name="location_combo"/> <search_combo_box label="Søg" name="search_combo_box" tool_tip="Søg"> <combo_editor label="Søg [SECOND_LIFE]" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite"> + <favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at fÃ¥ hurtig adgang til dine favoritsteder i Second Life!"> + <label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at fÃ¥ hurtig adgang til dine favoritsteder i Second Life!"> + Favorit bar + </label> <chevron_button name=">>" tool_tip="Søg mere af mine favoritter"/> </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml index 2aa7ed7c6c..949cbcbd7b 100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <string name="min_width"> - 192 - </string> - <string name="max_width"> - 320 - </string> <line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk pÃ¥ enter for at tale, Ctrl-Enter for at rÃ¥be."/> <button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml new file mode 100644 index 0000000000..32905a2deb --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <tom> + </string> + <string name="parcel_media_name"> + Streaming Media dette sted + </string> + <string name="parcel_audio_name"> + Streaming Audio dette sted + </string> + <string name="playing_suffix"> + (afspilles) + </string> + <panel name="minimized_controls"> + <button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt pÃ¥"/> + <button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt pÃ¥"/> + <button name="open_prefs_btn" tool_tip="Vis media preferencer"/> + <button label="Mere >>" label_selected="Mindre <<" name="more_less_btn" tool_tip="Avanceret opsætning"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Overalt" name="All"/> + <combo_box.item label="PÃ¥ dette sted" name="WithinParcel"/> + <combo_box.item label="Udenfor dette sted" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="I nærheden" name="media_proximity"/> + <scroll_list.columns label="Synligt" name="media_visibility"/> + <scroll_list.columns label="Klasse" name="media_class"/> + <scroll_list.columns label="Navn" name="media_name"/> + <scroll_list.columns label="Debug" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Stop valgte medie"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Afspil valgte medie"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pause valgte medie"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_notes.xml b/indra/newview/skins/default/xui/da/panel_notes.xml index f8d911b9e5..5b3a2d0906 100644 --- a/indra/newview/skins/default/xui/da/panel_notes.xml +++ b/indra/newview/skins/default/xui/da/panel_notes.xml @@ -13,10 +13,10 @@ </scroll_container> </panel> <panel name="notes_buttons_panel"> - <button label="Tilføj" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/> + <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboer"/> <button label="IM" name="im" tool_tip="Ã…ben session med personlig besked (IM)"/> <button label="Kald" name="call" tool_tip="Opkald til denne beboer"/> - <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren pÃ¥ kortet"/> + <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboer pÃ¥ kort"/> <button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/> </panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/da/panel_online_status.xml b/indra/newview/skins/default/xui/da/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml index 7d6401283e..df00cfb2eb 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="Outfits"> - <accordion name="outfits_accordion"> - <accordion_tab name="tab_cof" title="Nuværende sæt"/> - <accordion_tab name="tab_outfits" title="Mine sæt"/> - </accordion> +<panel label="Ting" name="Outfits"> + <tab_container name="appearance_tabs"> + <inventory_panel label="MINE SÆT" name="outfitslist_tab"/> + <inventory_panel label="HAR PÃ…" name="cof_tab"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Vis flere muligheder"/> + <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/> + <button label="Gem sæt" name="make_outfit_btn" tool_tip="Gem udseende som nyt sæt"/> + <button label="Tag pÃ¥" name="wear_btn" tool_tip="Tag valgte sæt pÃ¥"/> + <button label="M" name="look_edit_btn"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml index a6a796f612..7b6469023b 100644 --- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml @@ -4,6 +4,6 @@ <menu_item_call label="Tilføj til nuværende sæt" name="add"/> <menu_item_call label="Fjern fra nuværende sæt" name="remove"/> <menu_item_call label="Omdøb" name="rename"/> - <menu_item_call label="Fjern" name="remove_link"/> - <menu_item_call label="Slet" name="delete"/> + <menu_item_call label="Fjern link" name="remove_link"/> + <menu_item_call label="Slet sæt" name="delete"/> </menu> diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml index 07b7f60810..ecfac67b1a 100644 --- a/indra/newview/skins/default/xui/da/panel_people.xml +++ b/indra/newview/skins/default/xui/da/panel_people.xml @@ -5,7 +5,6 @@ <string name="no_one_near" value="Ingen tæt pÃ¥"/> <string name="no_friends_online" value="Ingen venner online"/> <string name="no_friends" value="Ingen venner"/> - <string name="no_groups" value="Ingen grupper"/> <string name="people_filter_label" value="Filtrér personer"/> <string name="groups_filter_label" value="Filtrér grupper"/> <filter_editor label="Filtrér" name="filter_input"/> @@ -13,21 +12,25 @@ <panel label="TÆT PÃ…" name="nearby_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="nearby_view_sort_btn" tool_tip="Valg"/> - <button name="add_friend_btn" tool_tip="Tilføjer valgte beboere til din venneliste"/> + <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/> </panel> </panel> - <panel label="VENNER" name="friends_panel"> + <panel label="MINE VENNER" name="friends_panel"> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Alle"/> </accordion> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Valg"/> - <button name="add_btn" tool_tip="Tilbyd venskab til beboer"/> + <button name="add_btn" tool_tip="Tilbyd venskab til en beboer"/> <button name="del_btn" tool_tip="Fjern valgte person fra din venneliste"/> </panel> + <text name="no_friends_msg"> + For at tilføje venner prøv [secondlife:///app/search/people global search] eller klik pÃ¥ en bruger for at tilføje dem som ven. +Hvis du leder efter beboere at være sammen med, [secondlife:///app/worldmap prøv kortet]. + </text> </panel> - <panel label="GRUPPER" name="groups_panel"> + <panel label="MINE GRUPPER" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="groups_viewsort_btn" tool_tip="Valg"/> <button name="plus_btn" tool_tip="Bliv medlem af gruppe/Opret ny gruppe"/> @@ -37,17 +40,18 @@ <panel label="NYLIGE" name="recent_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="recent_viewsort_btn" tool_tip="Valg"/> - <button name="add_friend_btn" tool_tip="Tilføj valgte person til din venneliste"/> + <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/> </panel> </panel> </tab_container> <panel name="button_bar"> - <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, grupper og anden information om beboer"/> + <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/> <button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/> <button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/> <button label="Del" name="share_btn"/> <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/> <button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/> <button label="Gruppe chat" name="chat_btn" tool_tip="Ã…ben chat session"/> + <button label="Gruppe opkald" name="group_call_btn" tool_tip="Opkald til denne gruppe"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml index 24316fea14..c1ed95f580 100644 --- a/indra/newview/skins/default/xui/da/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="ledig"/> <string name="allocated" value="fordelt"/> <string name="title_place" value="Sted profil"/> - <string name="title_teleport_history" value="Teleport historik sted"/> + <string name="title_teleport_history" value="Teleport historik"/> <string name="not_available" value="(N\A)"/> <string name="unknown" value="(ukendt)"/> <string name="public" value="(offentlig)"/> @@ -41,62 +41,17 @@ <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </string> + <button name="back_btn" tool_tip="Tilbage"/> <text name="title" value="Sted profil"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> <text name="owner_label" value="Ejer:"/> <text name="maturity_value" value="ukendt"/> <accordion name="advanced_info_accordion"> - <accordion_tab name="parcel_characteristics_tab" title="Parcel"> - <panel> - <text name="rating_label" value="Rating:"/> - <text name="rating_value" value="ukendt"/> - <text name="voice_label" value="Stem:"/> - <text name="voice_value" value="Til"/> - <text name="fly_label" value="Flyve:"/> - <text name="fly_value" value="Til"/> - <text name="push_label" value="Skub:"/> - <text name="push_value" value="Fra"/> - <text name="build_label" value="Byg:"/> - <text name="build_value" value="Til"/> - <text name="scripts_label" value="Scripts:"/> - <text name="scripts_value" value="Til"/> - <text name="damage_label" value="Skade:"/> - <text name="damage_value" value="Fra"/> - <button label="Om land" name="about_land_btn"/> - </panel> - </accordion_tab> - <accordion_tab name="region_information_tab" title="Region"> - <panel> - <text name="region_name_label" value="Region:"/> - <text name="region_type_label" value="Type:"/> - <text name="region_rating_label" value="Rating:"/> - <text name="region_owner_label" value="Ejer:"/> - <text name="region_group_label" value="Gruppe:"/> - <button label="Region/Estate" name="region_info_btn"/> - </panel> - </accordion_tab> - <accordion_tab name="estate_information_tab" title="Estate"> - <panel> - <text name="estate_name_label" value="Estate:"/> - <text name="estate_rating_label" value="Rating:"/> - <text name="estate_owner_label" value="Ejer:"/> - <text name="covenant_label" value="Regler:"/> - </panel> - </accordion_tab> - <accordion_tab name="sales_tab" title="Til salg"> - <panel> - <text name="sales_price_label" value="Pris:"/> - <text name="area_label" value="Areal:"/> - <text name="traffic_label" value="Trafik:"/> - <text name="primitives_label" value="Prims:"/> - <text name="parcel_scripts_label" value="Scripts:"/> - <text name="terraform_limits_label" value="Terraform begrænsninger:"/> - <text name="subdivide_label" value="Mulighed for at Opdele/samle:"/> - <text name="resale_label" value="Mulighed for videresalg:"/> - <text name="sale_to_label" value="Til salg til:"/> - </panel> - </accordion_tab> + <accordion_tab name="parcel_characteristics_tab" title="Parcel"/> + <accordion_tab name="region_information_tab" title="Region"/> + <accordion_tab name="estate_information_tab" title="Estate"/> + <accordion_tab name="sales_tab" title="Til salg"/> </accordion> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml index 052bf749cb..3ac4ebaae9 100644 --- a/indra/newview/skins/default/xui/da/panel_places.xml +++ b/indra/newview/skins/default/xui/da/panel_places.xml @@ -2,13 +2,14 @@ <panel label="Steder" name="places panel"> <string name="landmarks_tab_title" value="MINE LANDEMÆRKER"/> <string name="teleport_history_tab_title" value="TELEPORT HISTORIK"/> - <filter_editor label="Filtrér steder" name="Filter"/> + <filter_editor label="Filtrér mine steder" name="Filter"/> <panel name="button_panel"> - <button label="Teleportér" name="teleport_btn"/> + <button label="Teleportér" name="teleport_btn" tool_tip="Teleportér til det valgte omrÃ¥de"/> <button label="Kort" name="map_btn"/> - <button label="Redigér" name="edit_btn"/> - <button label="Luk" name="close_btn"/> - <button label="Annullér" name="cancel_btn"/> + <button label="Redigér" name="edit_btn" tool_tip="Redigér landemærke information"/> + <button label="â–¼" name="overflow_btn" tool_tip="Vise flere valgmuligheder"/> <button label="Gem" name="save_btn"/> + <button label="Annullér" name="cancel_btn"/> + <button label="Luk" name="close_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 87b749b4eb..30665dfa0e 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -1,27 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> +<panel label="Avanceret" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Talebobler" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> - <slider label="Gennemsigtighed" name="bubble_chat_opacity"/> - <text name="AspectRatioLabel1" tool_tip="bredde / højde"> - Format - </text> - <combo_box name="aspect_ratio" tool_tip="bredde/ højde"> - <combo_box.item label="4:3 (Standard CRT)" name="item1"/> - <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (Widescreen)" name="item3"/> - <combo_box.item label="16:9 (Widescreen)" name="item4"/> - </combo_box> - <check_box label="Registrér automatisk" name="aspect_auto_detect"/> - <text name="heading1"> - Kamera: - </text> <slider label="Synsvinkel" name="camera_fov"/> <slider label="Distance" name="camera_offset_scale"/> <text name="heading2"> @@ -29,20 +10,20 @@ </text> <check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/> <check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/> - <text name="heading3"> - Avatarer: - </text> <check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/> <check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/> <check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/> <check_box label="Bevæg avatarlæber nÃ¥r der tales" name="enable_lip_sync"/> - <check_box label="Vis scriptfejl" name="show_script_errors"/> + <check_box label="Talebobler" name="bubble_text_chat"/> + <slider label="Gennemsigtighed" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> + <check_box label="Vis script fejl i:" name="show_script_errors"/> <radio_group name="show_location"> - <radio_item label="I chat" name="0"/> - <radio_item label="I et vindue" name="1"/> + <radio_item label="Chat" name="0"/> + <radio_item label="Separat vindue" name="1"/> </radio_group> - <check_box label="Knap til aktivering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun nÃ¥r knappen er trykket ned, ellers vil tryk pÃ¥ knap tænde og slukke mikrofon."/> + <check_box label="Knap til aktiverering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun nÃ¥r knappen er trykket ned, ellers vil tryk pÃ¥ knap tænde og slukke mikrofon."/> <line_editor label="Brug walkie-talkie modus" name="modifier_combo"/> <button label="Angiv taste" name="set_voice_hotkey_button"/> - <button label="Midterste museknap" name="set_voice_middlemouse_button"/> + <button label="Midterste museknap" name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste musetaste"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml index 4791033757..7caa17d514 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml @@ -4,11 +4,11 @@ Vis mig nÃ¥r: </text> <check_box label="NÃ¥r jeg bruger eller fÃ¥r L$" name="notify_money_change_checkbox"/> - <check_box label="NÃ¥r mine venner logger af eller pÃ¥" name="friends_online_notify_checkbox"/> + <check_box label="NÃ¥r mine venner logger pÃ¥ eller af" name="friends_online_notify_checkbox"/> <text name="show_label"> - Vis altid disse beskeder: + Vis altid: </text> <text name="dont_show_label"> - Vis aldrig disse beskeder: + Vis aldrig: </text> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 609512bc1b..3345bceff7 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Tekst chat" name="chat"> <radio_group name="chat_font_size"> - <radio_item label="Lille" name="radio"/> - <radio_item label="Mellem" name="radio2"/> - <radio_item label="Stor" name="radio3"/> + <radio_item label="Lille" name="radio" value="0"/> + <radio_item label="Mellem" name="radio2" value="1"/> + <radio_item label="Stor" name="radio3" value="2"/> </radio_group> <color_swatch label="Dig" name="user"/> <text name="text_box1"> @@ -39,8 +39,8 @@ </text> <check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/> <check_box label="Send e-mail til mig nÃ¥r jeg modtager IM og er offline" name="send_im_to_email"/> - <radio_group name="chat_window" tool_tip="Vis dine personlige beskeder i separate vinduer eller i ét vindue med mange faner (ændring kræver genstart)"> - <radio_item label="Flere vinduer" name="radio"/> - <radio_item label="Et vindue" name="radio2"/> + <radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)"> + <radio_item label="Separate vinduer" name="radio" value="0"/> + <radio_item label="Faner" name="radio2" value="1"/> </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index e17ccca4a1..f2c59f3d81 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -38,9 +38,9 @@ Navneskilte: </text> <radio_group name="Name_Tag_Preference"> - <radio_item label="Skjul" name="radio"/> - <radio_item label="Vis" name="radio2"/> - <radio_item label="Vis et øjeblik" name="radio3"/> + <radio_item label="Skjul" name="radio" value="0"/> + <radio_item label="Vis" name="radio2" value="1"/> + <radio_item label="Vis et øjeblik" name="radio3" value="2"/> </radio_group> <check_box label="Vis mit navn" name="show_my_name_checkbox1"/> <check_box initial_value="true" label="SmÃ¥ avatar navne" name="small_avatar_names_checkbox"/> @@ -48,14 +48,17 @@ <text name="effects_color_textbox"> Farve til mine effekter: </text> - <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at Ã¥bne farvevælger"/> <text name="title_afk_text"> Tid inden "væk": </text> - <spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/> - <text name="seconds_textbox"> - sekunder - </text> + <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at Ã¥bne farvevælger"/> + <combo_box label="Timeout før 'væk':" name="afk"> + <combo_box.item label="2 minutter" name="item0"/> + <combo_box.item label="5 minutter" name="item1"/> + <combo_box.item label="10 minutter" name="item2"/> + <combo_box.item label="30 minutter" name="item3"/> + <combo_box.item label="aldrig" name="item4"/> + </combo_box> <text name="text_box3"> Optaget autosvar: </text> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml index bb1cacc773..07e3aec72a 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml @@ -88,8 +88,8 @@ Lys detaljer: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Kun sol og mÃ¥ne" name="SunMoon"/> - <radio_item label="Lys i nærheden" name="LocalLights"/> + <radio_item label="Kun sol og mÃ¥ne" name="SunMoon" value="0"/> + <radio_item label="Lys i nærheden" name="LocalLights" value="1"/> </radio_group> <text name="TerrainDetailText"> Terræn detaljer: diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml index c382b222ea..cdb407dbad 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> log pÃ¥ for at ændre </panel.string> - <button label="Nulstil historik" name="clear_cache"/> + <button label="Nulstil historik" name="clear_cache" tool_tip="Fjern login billede, sidste lokation, teleport historik, samt web og tekstur cache"/> <text name="cache_size_label_l"> (Lokationer, billeder, web, søge historik) </text> @@ -11,7 +11,6 @@ <check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/> <check_box label="SlÃ¥ mikrofon fra nÃ¥r opkald slutter" name="auto_disengage_mic_check"/> <check_box label="Acceptér cookies" name="cookies_enabled"/> - <check_box label="Tillad media autoplay" name="autoplay_enabled"/> <text name="Logs:"> Logs: </text> @@ -19,7 +18,7 @@ <check_box label="Gem en log med private beskeder (IM) pÃ¥ min computer" name="log_instant_messages"/> <check_box label="Tilføj tidsstempel" name="show_timestamps_check_im"/> <text name="log_path_desc"> - Placering af logfiler + Placering af logfiler: </text> <button label="Ændre sti" label_selected="Ændre sti" left="150" name="log_path_button"/> <button label="Liste med blokeringer" name="block_list"/> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml index 2dd0b71d8f..279e288096 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Input og kamera" name="Input panel"> +<panel label="Opsætning" name="Input panel"> <button label="Andre enheder" name="joystick_setup_button"/> <text name="Mouselook:"> Første person: @@ -18,29 +18,29 @@ kbps </text> <check_box label="Speciel port" name="connection_port_enabled"/> - <spinner label="Port nummer:" name="web_proxy_port"/> + <spinner label="Port nummer:" name="connection_port"/> <text name="cache_size_label_l"> Cache størrelse </text> <text name="text_box5"> MB </text> - <button label="Vælg" label_selected="Vælg" name="set_cache"/> - <button label="Nulstil" label_selected="Gem" name="reset_cache"/> <text name="Cache location"> - Cache lokation + Cache placering: </text> + <button label="Vælg" label_selected="Vælg" name="set_cache"/> + <button label="Nulstil" label_selected="Nulstil" name="reset_cache"/> <text name="Web:"> Web: </text> <radio_group name="use_external_browser"> - <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser Ã¥bner et nyt vindue i [APP_NAME]."/> - <radio_item label="Brug min normale browser (IE, Firefox)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm."/> + <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser Ã¥bner et nyt vindue i [APP_NAME]." value="0"/> + <radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/> </radio_group> - <check_box initial_value="false" label="Web proxy" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse pÃ¥ den proxy du ønsker at anvende"/> - <button label="Vælg" label_selected="Vælg" name="set_proxy"/> + <check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/> <text name="Proxy location"> - Proxy placering + Proxy placering: </text> + <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse pÃ¥ den proxy du ønsker at anvende"/> + <spinner label="Port nummer:" name="web_proxy_port"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index ce77018f72..856f978ebd 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Lyde" name="Preference Media panel"> <slider label="Generel" name="System Volume"/> - <check_box initial_value="true" label="Sluk lyd nÃ¥r vinduet er minimeret" name="mute_when_minimized"/> - <slider label="Omgivelser" name="Wind Volume"/> + <check_box initial_value="true" label="Sluk lyd nÃ¥r minimeret" name="mute_when_minimized"/> <slider label="Knapper" name="UI Volume"/> - <slider label="Media" name="Media Volume"/> - <slider label="Effekter" name="SFX Volume"/> + <slider label="Omgivelser" name="Wind Volume"/> + <slider label="Lyd effekter" name="SFX Volume"/> <slider label="Musik" name="Music Volume"/> - <check_box label="Tale" name="enable_voice_check"/> - <slider label="Tale" name="Voice Volume"/> + <check_box label="Aktiveret" name="music_enabled"/> + <slider label="Media" name="Media Volume"/> + <check_box label="Aktiveret" name="enable_media"/> + <slider label="Stemme chat" name="Voice Volume"/> + <check_box label="Aktiveret" name="enable_voice_check"/> + <check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="sandt"/> + <check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="sandt"/> + <text name="voice_chat_settings"> + Stemme chat opsætning + </text> <text name="Listen from"> Hør stemmer fra: </text> diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml index 987ba2a3f8..d3b3c7e21e 100644 --- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml @@ -1,6 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="MediaControls"> + <string name="min_width"> + 300 + </string> + <string name="min_height"> + 75 + </string> + <string name="zoom_medium_padding"> + 1.1 + </string> + <string name="top_world_view_avoid_zone"> + 50 + </string> + <layout_stack name="progress_indicator_area"> + <panel name="media_progress_indicator"> + <progress_bar name="media_progress_bar" tool_tip="Medie hentes"/> + </panel> + </layout_stack> <layout_stack name="media_controls"> + <layout_panel name="back"> + <button name="back_btn" tool_tip="Navigér tilbage"/> + </layout_panel> + <layout_panel name="fwd"> + <button name="fwd_btn" tool_tip="Navigér frem"/> + </layout_panel> + <layout_panel name="home"> + <button name="home_btn" tool_tip="Hjemmeside"/> + </layout_panel> + <layout_panel name="media_stop"> + <button name="media_stop_btn" tool_tip="Stop medie"/> + </layout_panel> + <layout_panel name="reload"> + <button name="reload_btn" tool_tip="Indlæs igen"/> + </layout_panel> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Stop indlæsning"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Afspil medie"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pause medie"/> + </layout_panel> <layout_panel name="media_address"> <line_editor name="media_address_url" tool_tip="Media URL"/> <layout_stack name="media_address_url_icons"> @@ -15,14 +56,24 @@ <layout_panel name="media_play_position"> <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Filmafspilning fremskridt"/> </layout_panel> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="GÃ¥ tilbage"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="GÃ¥ frem"/> + </layout_panel> <layout_panel name="media_volume"> <button name="media_mute_button" tool_tip="Sluk for dette media"/> <slider name="volume_slider" tool_tip="Media lydstyrke"/> </layout_panel> - </layout_stack> - <layout_stack> - <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="Media hentes"/> - </panel> + <layout_panel name="zoom_frame"> + <button name="zoom_frame_btn" tool_tip="Zoom til medie"/> + </layout_panel> + <layout_panel name="close"> + <button name="close_btn" tool_tip="Zoom tilbage"/> + </layout_panel> + <layout_panel name="new_window"> + <button name="new_window_btn" tool_tip="Ã…ben URL i browser"/> + </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_profile.xml b/indra/newview/skins/default/xui/da/panel_profile.xml index ef7110ffcf..c5bfc3ae80 100644 --- a/indra/newview/skins/default/xui/da/panel_profile.xml +++ b/indra/newview/skins/default/xui/da/panel_profile.xml @@ -1,37 +1,41 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profil" name="panel_profile"> <string name="no_partner_text" value="Ingen"/> + <string name="no_group_text" value="Ingen"/> <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <panel name="second_life_image_panel"> - <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> - </panel> - <panel name="first_life_image_panel"> - <text name="title_rw_descr_text" value="Real world:"/> - </panel> - <text name="me_homepage_text"> - Hjemmeside: - </text> - <text name="title_member_text" value="Medlem siden:"/> - <text name="title_acc_status_text" value="Konto status:"/> - <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/> - <text name="title_partner_text" value="Partner:"/> - <text name="title_groups_text" value="Grupper:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til denne beboer"/> - <button label="IM" name="im" tool_tip="Skriv en personlig besked (IM)"/> - <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/> - <button label="Map" name="show_on_map_btn" tool_tip="Show the resident on the map"/> - <button label="Tilbyd teleport" name="teleport" tool_tip="Tilbyd en teleport til denne beboer"/> - <button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med denne beboer"/> - </panel> - <panel name="profile_me_buttons_panel"> - <button label="Redigér profil" name="edit_profile_btn"/> - <button label="Redigér udseende" name="edit_appearance_btn"/> - </panel> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value="Real World:"/> + </panel> + <text name="title_member_text" value="Beboer siden:"/> + <text name="title_acc_status_text" value="Konto status:"/> + <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(henter)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupper:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_buttons_panel"> + <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/> + <button label="IM" name="im" tool_tip="Ã…ben session med personlige beskeder (IM)"/> + <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/> + <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren pÃ¥ kortet"/> + <button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/> + <button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med beboeren"/> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/> + <button label="Redigér udseende" name="edit_appearance_btn" tool_tip="Opret/redigér dit udseende: fysiske data, tøj m.v."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml index 0e8ab7556f..564d8e6665 100644 --- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml @@ -27,7 +27,7 @@ Ændringer i regler vil blive vist i alle parceller til denne estate. </text> <text name="covenant_instructions"> - Træk og slip en note for at ændre regler for denne estate. + Træk og slip et notecard her for at ændre regler for denne estate. </text> <text name="region_section_lbl"> Region diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index d726fedfe9..c21fd9db37 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Estate" name="Estate"> <text name="estate_help_text"> - Ændringer i dette afsnit vil pÃ¥virke alle -regioner i dette estate. + Ændringer her vil pÃ¥virke alle regioner i dette estate. </text> <text name="estate_text"> Estate: @@ -24,10 +23,10 @@ regioner i dette estate. <check_box label="Tillad offentlig adgang" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Begræns adgang til: + Begræns adgang til konti bekræftet med: </text> - <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for brugere uden identifikation"/> - <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se [SUPPORT_SITE] for mere information."/> + <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for uidentificerede beboere"/> + <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er blevet aldersverificeret. Se [SUPPORT_SITE] for mere information."/> <check_box label="Tillad stemme chat" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Tillad direkte teleport" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml new file mode 100644 index 0000000000..467684f712 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Region" name="General"> + <text name="region_text_lbl"> + Region: + </text> + <text name="region_text"> + ukendt + </text> + <text name="version_channel_text_lbl"> + Version: + </text> + <text name="version_channel_text"> + ukendt + </text> + <text name="region_type_lbl"> + Type: + </text> + <text name="region_type"> + ukendt + </text> + <check_box label="Blokér for redigering af terræn" name="block_terraform_check"/> + <check_box label="Blokér for flyvning" name="block_fly_check"/> + <check_box label="Tillad skader" name="allow_damage_check"/> + <check_box label="Begræns skubning" name="restrict_pushobject"/> + <check_box label="Tillad at sælge land" name="allow_land_resell_check"/> + <check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/> + <check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/> + <spinner label="Max besøgende" name="agent_limit_spin"/> + <spinner label="Objekt bonus" name="object_bonus_spin"/> + <text label="Rating" name="access_text"> + Rating: + </text> + <combo_box label="Moderat" name="access_combo"> + <combo_box.item label="Voksent" name="Adult"/> + <combo_box.item label="Moderat" name="Mature"/> + <combo_box.item label="Generel" name="PG"/> + </combo_box> + <button label="Gem" name="apply_btn"/> + <button label="Send en beboer hjem ..." name="kick_btn"/> + <button label="Send alle beboere hjem..."" name="kick_all_btn"/> + <button label="Send besked til region..." name="im_btn"/> + <button label="Vedligehold telehub..." name="manage_telehub_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index fc597eee15..8e324ab777 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -45,10 +45,10 @@ <spinner label="Høj" name="height_range_spin_2"/> <spinner label="Høj" name="height_range_spin_3"/> <text name="height_text_lbl10"> - Disse værdier repræsenterer blandingsomrÃ¥der for teksturer ovenfor. + Disse værdier repræsenterer blandingsforhold for teksturer ovenfor. </text> <text name="height_text_lbl11"> - MÃ¥lt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1, og HØJ værdien er minimumshøjden for tekstur 4. + MÃ¥lt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1 og HØJ værdien er MINIMUMSshøjden for tekstur 4. </text> <text name="height_text_lbl12"> og HØJ værdien er MIMIMUM højde for texture nummer 4. diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..821c82ccda --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MIN AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Avatar Script forbrug + </text> + <text name="loading_text"> + Henter... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Størrelse (kb)" name="size"/> + <scroll_list.columns label="URL'er" name="urls"/> + <scroll_list.columns label="Objekt navn" name="name"/> + <scroll_list.columns label="Lokation" name="location"/> + </scroll_list> + <button label="Gentegn liste" name="refresh_list_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..91fc76dbb4 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="REGION MEMORY" name="script_limits_region_memory_panel"> + <text name="script_memory"> + Parcel script memory + </text> + <text name="loading_text"> + Henter... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Størrelse (kb)" name="size"/> + <scroll_list.columns label="URL'er" name="urls"/> + <scroll_list.columns label="Objekt navn" name="name"/> + <scroll_list.columns label="Objekt ejer" name="owner"/> + <scroll_list.columns label="Parcel" name="parcel"/> + <scroll_list.columns label="Lokation" name="location"/> + </scroll_list> + <button label="Gentegn liste" name="refresh_list_btn"/> + <button label="Fremhæv" name="highlight_btn"/> + <button label="Retur" name="return_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml index ab4a2a134e..ec430d6fd4 100644 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml @@ -2,25 +2,28 @@ <!-- Side tray cannot show background because it is always partially on screen to hold tab buttons. --> <side_tray name="sidebar"> - <sidetray_tab description="Hjem." name="sidebar_home"> + <sidetray_tab description="Ã…bn/luk sidebar" name="sidebar_openclose" tab_title="Ã…bn/luk sidebar"/> + <sidetray_tab description="Hjem." name="sidebar_home" tab_title="Home"> <panel label="hjem" name="panel_home"/> </sidetray_tab> - <sidetray_tab description="Find venner, kontakter og personer tæt pÃ¥." name="sidebar_people"> + <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="My Profile"> <panel_container name="panel_container"> - <panel label="Gruppe info" name="panel_group_info_sidetray"/> + <panel label="Mig" name="panel_me"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Find venner, kontakter og personer tæt pÃ¥." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Gruppe profil" name="panel_group_info_sidetray"/> <panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/> </panel_container> </sidetray_tab> - <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places"> + <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Places"> <panel label="Steder" name="panel_places"/> </sidetray_tab> - <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me"> - <panel label="Mig" name="panel_me"/> + <sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Redigér beholdning" name="sidepanel_inventory"/> </sidetray_tab> - <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance"> + <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="My Appearance"> <panel label="Redigér fremtoning" name="sidepanel_appearance"/> </sidetray_tab> - <sidetray_tab description="Browse din beholdning." name="sidebar_inventory"> - <panel label="Redigér beholdning" name="sidepanel_inventory"/> - </sidetray_tab> </side_tray> diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 4e45b7e328..08ffafd5a6 100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml @@ -21,9 +21,11 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="My Balance: Click to buy more L$"/> + <button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/> + <button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/> <text name="TimeText" tool_tip="Nuværende tid (Pacific)"> - 12:00 + 24:00 PST </text> + <button name="media_toggle_btn" tool_tip="Start/Stop Alle medier (musik, video, hjemmesider)"/> <button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml index 64b5ecf5cf..a1859b64d8 100644 --- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml @@ -4,6 +4,7 @@ <accordion_tab name="today" title="I dag"/> <accordion_tab name="yesterday" title="I gÃ¥r"/> <accordion_tab name="2_days_ago" title="2 dage siden"/> + 5 <accordion_tab name="3_days_ago" title="3 dage siden"/> <accordion_tab name="4_days_ago" title="4 dage siden"/> <accordion_tab name="5_days_ago" title="5 dage siden"/> @@ -11,4 +12,7 @@ <accordion_tab name="1_month_and_older" title="1 mÃ¥ned eller ældre"/> <accordion_tab name="6_months_and_older" title="6 mÃ¥neder eller ældre"/> </accordion> + <panel name="bottom_panel"> + <button name="gear_btn" tool_tip="Vi flere valgmuligheder"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml new file mode 100644 index 0000000000..8148588c86 --- /dev/null +++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="teleport_history_item"> + <button name="profile_btn" tool_tip="Vis info om genstand"/> +</panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml index 27708f5c7a..43ddfdada7 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sæt" name="appearance panel"> <string name="No Outfit" value="Intet sæt"/> - <filter_editor label="Filtrér sæt" name="Filter"/> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Vis flere muligheder"/> - <button name="newlook_btn" tool_tip="Tilføj nyt sæt"/> - <dnd_button name="trash_btn" tool_tip="Fjern valgte del"/> - <button label="Bær" name="wear_btn"/> + <panel name="panel_currentlook"> + <text name="currentlook_title"> + (ikke gemt) + </text> </panel> + <filter_editor label="Filtrér sæt" name="Filter"/> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index 685601b922..77db828c20 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Egenskaber for beholdningsgenstand"> +<panel name="item properties" title="Objekt profil"> <panel.string name="unknown"> (ukendt) </panel.string> @@ -15,7 +15,8 @@ <panel.string name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <text name="title" value="Egenskaber for genstand"/> + <text name="title" value="Objekt profil"/> + <text name="where" value="(Beholdning)"/> <panel label=""> <text name="LabelItemNameTitle"> Navn: @@ -37,34 +38,36 @@ <text name="LabelAcquiredDate"> Ons Maj 24 12:50:46 2006 </text> - <text name="OwnerLabel"> - Dig: - </text> - <check_box label="Editér" name="CheckOwnerModify"/> - <check_box label="Kopiér" name="CheckOwnerCopy"/> - <check_box label="Sælg" name="CheckOwnerTransfer"/> - <text name="AnyoneLabel"> - Enhver: - </text> - <check_box label="Kopiér" name="CheckEveryoneCopy"/> - <text name="GroupLabel"> - Gruppe: - </text> - <check_box label="Del" name="CheckShareWithGroup"/> - <text name="NextOwnerLabel"> - Næste ejer: - </text> - <check_box label="Editér" name="CheckNextOwnerModify"/> - <check_box label="Kopiér" name="CheckNextOwnerCopy"/> - <check_box label="Sælg" name="CheckNextOwnerTransfer"/> + <panel name="perms_inv"> + <text name="perm_modify"> + Du kan: + </text> + <check_box label="Redigér" name="CheckOwnerModify"/> + <check_box label="Kopi" name="CheckOwnerCopy"/> + <check_box label="Giv væk" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Enhver: + </text> + <check_box label="Kopi" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Gruppe: + </text> + <check_box label="Del" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at Ã¥bne for rolle begrænsninger."/> + <text name="NextOwnerLabel"> + Næste ejer: + </text> + <check_box label="Redigere" name="CheckNextOwnerModify"/> + <check_box label="Kopi" name="CheckNextOwnerCopy"/> + <check_box label="Giv væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + </panel> <check_box label="Til salg" name="CheckPurchase"/> <combo_box name="combobox sale copy"> <combo_box.item label="Kopiér" name="Copy"/> <combo_box.item label="Original" name="Original"/> </combo_box> - <spinner label="Pris:" name="Edit Cost"/> - <text name="CurrencySymbol"> - L$ - </text> + <spinner label="Pris: L$" name="Edit Cost"/> + </panel> + <panel name="button_panel"> + <button label="Annullér" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index 6ade03ce56..add2fa3c73 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="object properties" title="Egenskaber for objekt"> +<panel name="object properties" title="Objekt profil"> <panel.string name="text deed continued"> Dedikér </panel.string> @@ -36,84 +36,61 @@ <panel.string name="Sale Mixed"> Blandet salg </panel.string> + <text name="title" value="Objekt profil"/> + <text name="where" value="(verden)"/> <panel label=""> - <text name="Name:"> - Navn: + <text name="CreatorNameLabel"> + Skaber </text> - <text name="Description:"> - Beskrivelse: + <text name="Creator Name"> + Erica Linden </text> - <text name="Creator:"> - Skaber: - </text> - <text name="Owner:"> - Ejer: - </text> - <text name="Group:"> + <text name="Group_label"> Gruppe: </text> - <button name="button set group" tool_tip="Vælg en gruppe der skal dele dette objekts rettigheder"/> - <name_box initial_value="Henter..." name="Group Name Proxy"/> - <button label="Dedikér" label_selected="Dedikér" name="button deed" tool_tip="Dedikering giver denne genstand væk med næste ejers rettigheder. Gruppedelte genstande kan dedikeres af en gruppeadministrator."/> - <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den angivne gruppe at videregive dine "redigere" rettigheder for dette objekt. Du mÃ¥ dedikere for at tillade rolle begrænsninger."/> - <text name="label click action"> - Klik for at: - </text> - <combo_box name="clickaction"> - <combo_box.item label="Røre (standard)" name="Touch/grab(default)"/> - <combo_box.item label="Sidde pÃ¥ objekt" name="Sitonobject"/> - <combo_box.item label="Købe objekt" name="Buyobject"/> - <combo_box.item label="Betale til objekt" name="Payobject"/> - <combo_box.item label="Ã…bne" name="Open"/> - </combo_box> - <check_box label="Til salg:" name="checkbox for sale"/> - <combo_box name="sale type"> - <combo_box.item label="Kopi" name="Copy"/> - <combo_box.item label="Indhold" name="Contents"/> - <combo_box.item label="Original" name="Original"/> - </combo_box> - <spinner label="Pris: L$" name="Edit Cost"/> - <check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/> - <panel name="perms_build"> + <panel name="perms_inv"> <text name="perm_modify"> Du kan redigere dette objekt </text> <text name="Anyone can:"> Enhver: </text> - <check_box label="Flytte" name="checkbox allow everyone move"/> - <check_box label="Kopiere" name="checkbox allow everyone copy"/> - <text name="Next owner can:"> + <check_box label="Kopi" name="checkbox allow everyone copy"/> + <check_box label="Flyt" name="checkbox allow everyone move"/> + <text name="GroupLabel"> + Gruppe: + </text> + <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'rediger' rettigheder for dette objekt. Du skal dedikere for at Ã¥bne for rolle begrænsninger."/> + <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="checkbox next owner can modify"/> - <check_box label="Kopiere" name="checkbox next owner can copy"/> - <check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan sælge eller give dette objekt væk"/> - <text name="B:"> - B: - </text> - <text name="O:"> - Ã…: - </text> - <text name="G:"> - O: - </text> - <text name="E:"> - R: - </text> - <text name="N:"> - N: - </text> - <text name="F:"> - F: - </text> + <check_box label="Kopi" name="checkbox next owner can copy"/> + <check_box label="Give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge objekt"/> </panel> + <check_box label="Til salg" name="checkbox for sale"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> </panel> <panel name="button_panel"> <button label="Ã…ben" name="open_btn"/> <button label="Betal" name="pay_btn"/> <button label="Køb" name="buy_btn"/> - <button label="Annullér" name="cancel_btn"/> - <button label="Gem" name="save_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 493bb4cb20..412f946acc 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> + <string name="CAPITALIZED_APP_NAME"> + SECOND LIFE + </string> <string name="SUPPORT_SITE"> Second Life Support Portal </string> @@ -131,7 +134,7 @@ Klik for at se information om denne lokation </string> <string name="TooltipAgentUrl"> - Klik for at denne beboers profil + Klik for at se beboers profil </string> <string name="TooltipGroupUrl"> Klik for at se denne gruppes beskrivelse @@ -165,7 +168,7 @@ Vis kort for </string> <string name="BUTTON_CLOSE_DARWIN"> - Luk (⌘W) + Luk (⌘W) </string> <string name="BUTTON_CLOSE_WIN"> Luk (Ctrl+W) @@ -182,9 +185,6 @@ <string name="BUTTON_DOCK"> Fastgør </string> - <string name="BUTTON_UNDOCK"> - Frigør - </string> <string name="BUTTON_HELP"> Vis hjælp </string> @@ -209,9 +209,6 @@ <string name="AvatarNameWaiting"> (venter) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (ingen) </string> @@ -572,6 +569,9 @@ <string name="hang_up"> Stemme chat er afbrudt </string> + <string name="reconnect_nearby"> + Du vil nu blive dirigeret til lokal stemme chat + </string> <string name="ScriptQuestionCautionChatGranted"> '[OBJECTNAME]', en genstand, ejet af '[OWNERNAME]', lokaliseret i [REGIONNAME] pÃ¥ [REGIONPOS], har fÃ¥et tilladelse til: [PERMISSIONS]. </string> @@ -764,9 +764,6 @@ <string name="TeleportOffer"> Teleport tilbud </string> - <string name="StartUpNotification"> - %d nye besked modtaget mens du var væk... - </string> <string name="StartUpNotifications"> %d nye beskeder modtaget mens du var væk...... </string> @@ -804,11 +801,13 @@ Tryk ESC for at skift til normalt udsyn </string> <string name="InventoryNoMatchingItems"> - No matching items found in inventory. + Ingen matchende genstande fundet i beholdning. Prøv evt. [secondlife:///app/search/groups "Search"]. + </string> + <string name="FavoritesNoMatchingItems"> + Træk et landemærke hertil for at tilføje den som favorit. </string> <string name="InventoryNoTexture"> - Du har ikke en kopi af denne -tekstur i din beholdning. + Du har ikke en kopi af denne tekstur i din beholdning </string> <string name="no_transfer" value=" (ikke overdragbar)"/> <string name="no_modify" value=" (ikke redigere)"/> @@ -1266,11 +1265,164 @@ tekstur i din beholdning. alle estates du administrerer for [OWNER] </string> <string name="RegionInfoAllowedResidents"> - Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS]) + Godkendte beboere: ([ALLOWEDAGENTS], maks. [MAXACCESS]) </string> <string name="RegionInfoAllowedGroups"> Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS]) </string> + <string name="ScriptLimitsParcelScriptMemory"> + Parcel script memory + </string> + <string name="ScriptLimitsParcelsOwned"> + Parceller listet: [PARCELS] + </string> + <string name="ScriptLimitsMemoryUsed"> + Memory brugt: [COUNT] kb ud af [MAX] kb; [AVAILABLE] kb tilgængeligt + </string> + <string name="ScriptLimitsMemoryUsedSimple"> + Memory brugt: [COUNT] kb + </string> + <string name="ScriptLimitsParcelScriptURLs"> + Parcel Script URL'er + </string> + <string name="ScriptLimitsURLsUsed"> + URL'er brugt: [COUNT] ud af [MAX]; [AVAILABLE] tilgængelige + </string> + <string name="ScriptLimitsURLsUsedSimple"> + URL'er brugt: [COUNT] + </string> + <string name="ScriptLimitsRequestError"> + Fejl ved anmodning om information + </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + Ingen parcel valgt + </string> + <string name="ScriptLimitsRequestWrongRegion"> + Fejl: script information er kun tilgængelig i den nuværende region + </string> + <string name="ScriptLimitsRequestWaiting"> + Henter information... + </string> + <string name="ScriptLimitsRequestDontOwnParcel"> + Du har ikke rettigheder til at undersøge denne parcel + </string> + <string name="SITTING_ON"> + Sidder pÃ¥ + </string> + <string name="ATTACH_CHEST"> + Bryst + </string> + <string name="ATTACH_HEAD"> + Hoved + </string> + <string name="ATTACH_LSHOULDER"> + Venstre skulder + </string> + <string name="ATTACH_RSHOULDER"> + Højre skulder + </string> + <string name="ATTACH_LHAND"> + Venstre hÃ¥nd + </string> + <string name="ATTACH_RHAND"> + Højre hÃ¥nd + </string> + <string name="ATTACH_LFOOT"> + Venstre fod + </string> + <string name="ATTACH_RFOOT"> + Højre fod + </string> + <string name="ATTACH_BACK"> + Ryg + </string> + <string name="ATTACH_PELVIS"> + Bækken + </string> + <string name="ATTACH_MOUTH"> + Mund + </string> + <string name="ATTACH_CHIN"> + Hage + </string> + <string name="ATTACH_LEAR"> + Venstre øre + </string> + <string name="ATTACH_REAR"> + Højre øre + </string> + <string name="ATTACH_LEYE"> + Venstre øje + </string> + <string name="ATTACH_REYE"> + Højre øje + </string> + <string name="ATTACH_NOSE"> + Næse + </string> + <string name="ATTACH_RUARM"> + Højre overarm + </string> + <string name="ATTACH_RLARM"> + Højre underarm + </string> + <string name="ATTACH_LUARM"> + Venstre overarm + </string> + <string name="ATTACH_LLARM"> + Venstre underarm + </string> + <string name="ATTACH_RHIP"> + Højre hofte + </string> + <string name="ATTACH_RULEG"> + Højre lÃ¥r + </string> + <string name="ATTACH_RLLEG"> + Højre underben + </string> + <string name="ATTACH_LHIP"> + Venstre hofte + </string> + <string name="ATTACH_LULEG"> + Venste lÃ¥r + </string> + <string name="ATTACH_LLLEG"> + Venstre underben + </string> + <string name="ATTACH_BELLY"> + Mave + </string> + <string name="ATTACH_RPEC"> + Højre bryst + </string> + <string name="ATTACH_LPEC"> + Venstre bryst + </string> + <string name="ATTACH_HUD_CENTER_2"> + HUD Center 2 + </string> + <string name="ATTACH_HUD_TOP_RIGHT"> + HUD Øverst til højre + </string> + <string name="ATTACH_HUD_TOP_CENTER"> + HUD Foroven midtpÃ¥ + </string> + <string name="ATTACH_HUD_TOP_LEFT"> + HUD Øverst til venstre + </string> + <string name="ATTACH_HUD_CENTER_1"> + HUD Center 1 + </string> + <string name="ATTACH_HUD_BOTTOM_LEFT"> + HUD Nederst til venstre + </string> + <string name="ATTACH_HUD_BOTTOM"> + HUD For neden + </string> + <string name="ATTACH_HUD_BOTTOM_RIGHT"> + HUD Nederst til højre + </string> <string name="CursorPos"> Linie [LINE], Kolonne [COLUMN] </string> @@ -1315,6 +1467,15 @@ tekstur i din beholdning. <string name="ClassifiedUpdateAfterPublish"> (vil blive opdateret efter offentliggørelse) </string> + <string name="NoPicksClassifiedsText"> + Du har ikke oprettet nogen favoritter eller annoncer. Klik pÃ¥ plus knappen nedenfor for at oprette en favorit eller en annonce. + </string> + <string name="NoAvatarPicksClassifiedsText"> + Bruger har ingen favoritter eller annoncer + </string> + <string name="PicksClassifiedsLoadingText"> + Henter... + </string> <string name="MultiPreviewTitle"> Vis først </string> @@ -1391,16 +1552,27 @@ tekstur i din beholdning. Ukendt fil efternavn [.%s] Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> + <string name="MuteObject2"> + Blokér + </string> <string name="AddLandmarkNavBarMenu"> Tilføj landemærke... </string> <string name="EditLandmarkNavBarMenu"> Redigér landemærke... </string> - <string name="accel-mac-control">⌃</string> - <string name="accel-mac-command">⌘</string> - <string name="accel-mac-option">⌥</string> - <string name="accel-mac-shift">⇧</string> + <string name="accel-mac-control"> + ⌃ + </string> + <string name="accel-mac-command"> + ⌘ + </string> + <string name="accel-mac-option"> + ⌥ + </string> + <string name="accel-mac-shift"> + ⇧ + </string> <string name="accel-win-control"> Ctrl+ </string> @@ -1655,39 +1827,15 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Attached Earlobes"> Vedhæftede øreflipper </string> - <string name="Back Bangs"> - NakkehÃ¥r - </string> - <string name="Back Bangs Down"> - NakkehÃ¥r langt - </string> - <string name="Back Bangs Up"> - NakkehÃ¥r kort - </string> <string name="Back Fringe"> NakkehÃ¥r </string> - <string name="Back Hair"> - Volumen - </string> - <string name="Back Hair Down"> - Volumen nedad - </string> - <string name="Back Hair Up"> - Volumen op - </string> <string name="Baggy"> Posede </string> <string name="Bangs"> PandehÃ¥r </string> - <string name="Bangs Down"> - PandehÃ¥r ned - </string> - <string name="Bangs Up"> - PandehÃ¥r op - </string> <string name="Beady Eyes"> Stikkende øjne </string> @@ -1700,9 +1848,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Big Butt"> Stor bagdel </string> - <string name="Big Eyeball"> - Store øjenæbler - </string> <string name="Big Hair Back"> Stort hÃ¥r: Bag </string> @@ -1877,9 +2022,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Corner Down"> Nedadvendt </string> - <string name="Corner Normal"> - Normalt - </string> <string name="Corner Up"> Opadvendt </string> @@ -1889,9 +2031,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Crooked Nose"> Skæv næse </string> - <string name="Cropped Hair"> - Kort hÃ¥r - </string> <string name="Cuff Flare"> Svaj </string> @@ -1910,15 +2049,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Default Heels"> Standard hæle </string> - <string name="Default Toe"> - Standard snude - </string> <string name="Dense"> Tæt </string> - <string name="Dense hair"> - Tæt hÃ¥r - </string> <string name="Double Chin"> Dobbelthage </string> @@ -1964,9 +2097,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Eye Spacing"> Øjenafstand </string> - <string name="Eyeball Size"> - Størrelse øjenæble - </string> <string name="Eyebrow Arc"> Bue pÃ¥ øjenbryn </string> @@ -1991,36 +2121,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Eyeliner Color"> Eyeliner farve </string> - <string name="Eyes Back"> - Dybtliggende øjne - </string> <string name="Eyes Bugged"> UdstÃ¥ende øjne </string> - <string name="Eyes Forward"> - Øjne fremme - </string> - <string name="Eyes Long Head"> - Eyes Long Head - </string> - <string name="Eyes Shear Left Up"> - Eyes Shear Left Up - </string> - <string name="Eyes Shear Right Up"> - Eyes Shear Right Up - </string> - <string name="Eyes Short Head"> - Eyes Short Head - </string> - <string name="Eyes Spread"> - Stor afstand - </string> - <string name="Eyes Sunken"> - Indsunkne øjne - </string> - <string name="Eyes Together"> - Tætsiddende - </string> <string name="Face Shear"> Ansigts symmetri </string> @@ -2030,30 +2133,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Far Set Eyes"> Stor afstand mellem øjne </string> - <string name="Fat"> - Tyk - </string> - <string name="Fat Head"> - Tykt hovede - </string> <string name="Fat Lips"> Tykke læber </string> - <string name="Fat Lower"> - Tyk nedre - </string> - <string name="Fat Lower Lip"> - Tyk underlæbe - </string> - <string name="Fat Torso"> - Tyk overkrop - </string> - <string name="Fat Upper"> - Tyk øvre - </string> - <string name="Fat Upper Lip"> - Tyk overlæbe - </string> <string name="Female"> Kvinde </string> @@ -2090,24 +2172,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Freckles"> Fregner </string> - <string name="Front Bangs Down"> - PandehÃ¥r - ned - </string> - <string name="Front Bangs Up"> - PandehÃ¥r - op - </string> <string name="Front Fringe"> Frynser foran </string> - <string name="Front Hair"> - HÃ¥r foran - </string> - <string name="Front Hair Down"> - HÃ¥r foran - ned - </string> - <string name="Front Hair Up"> - HÃ¥r foran - op - </string> <string name="Full Back"> Langt ud bagtil </string> @@ -2381,9 +2448,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Long arms"> Lange arme </string> - <string name="Longcuffs"> - Longcuffs - </string> <string name="Loose Pants"> Løse bukser </string> @@ -2546,9 +2610,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="No Eyeshadow"> Ingen øjenskygge </string> - <string name="No Heels"> - Ingen hæle - </string> <string name="No Lipgloss"> Ingen lipgloss </string> @@ -2606,9 +2667,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Nostril Width"> Næsebor bredde </string> - <string name="Old"> - Gammel - </string> <string name="Opaque"> Uigennemsigtig </string> @@ -2708,9 +2766,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Pointy Heels"> Spidse hæle </string> - <string name="Pointy Toe"> - Spids snude - </string> <string name="Ponytail"> Hestehale </string> @@ -2735,15 +2790,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Red Hair"> Rødt hÃ¥r </string> - <string name="Red Skin"> - Rød hud - </string> <string name="Regular"> Almindelig </string> - <string name="Regular Muscles"> - Almindelige muskler - </string> <string name="Right Part"> Højre skildning </string> @@ -2753,9 +2802,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Round"> Rund </string> - <string name="Round Forehead"> - Rund pande - </string> <string name="Ruddiness"> Rødmossethed </string> @@ -2768,24 +2814,12 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Saddle Bags"> RidebukselÃ¥r </string> - <string name="Saddlebags"> - RidebukselÃ¥r - </string> - <string name="Scrawny"> - Radmager - </string> <string name="Scrawny Leg"> Magert ben </string> <string name="Separate"> Separat </string> - <string name="Shading"> - Skygger - </string> - <string name="Shadow hair"> - Skygge hÃ¥r - </string> <string name="Shallow"> Lille </string> @@ -2798,15 +2832,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Shear Front"> "MÃ¥ne" </string> - <string name="Shear Left"> - Venstre - </string> <string name="Shear Left Up"> Venstre op </string> - <string name="Shear Right"> - Højre - </string> <string name="Shear Right Up"> Højre op </string> @@ -2867,15 +2895,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Shoulders"> Skuldre </string> - <string name="Side Bangs"> - SidehÃ¥r - </string> - <string name="Side Bangs Down"> - Ned - </string> - <string name="Side Bangs Up"> - Op - </string> <string name="Side Fringe"> Side frynser </string> @@ -2891,9 +2910,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Sides Hair Up"> Op </string> - <string name="Skinny"> - Tynd - </string> <string name="Skinny Neck"> Tynd hals </string> @@ -2942,9 +2958,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Socks Length"> Strømper - længde </string> - <string name="Some"> - Nogen - </string> <string name="Soulpatch"> Soulpatch </string> @@ -2963,9 +2976,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Squash Head"> Bredt hovede </string> - <string name="Squash/Stretch Head"> - Sammentryk/stræk hovede - </string> <string name="Stretch Head"> Stræk hovede </string> @@ -2984,18 +2994,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Sweep Forward"> Stryge fremad </string> - <string name="Swept Back"> - Tilbagestrøget - </string> - <string name="Swept Back Hair"> - Tilbagestrøget hÃ¥r - </string> - <string name="Swept Forward"> - Fremadstrøget - </string> - <string name="Swept Forward Hair"> - Fremadstrøget hÃ¥r - </string> <string name="Tall"> Høj </string> @@ -3014,9 +3012,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Thick Toe"> Bred snude </string> - <string name="Thickness"> - Tykkelse - </string> <string name="Thin"> Tynd </string> @@ -3047,12 +3042,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="Tight Sleeves"> Stramme ærmer </string> - <string name="Tilt Left"> - Hæld til venstre - </string> - <string name="Tilt Right"> - Hæld til højre - </string> <string name="Toe Shape"> Sko form </string> @@ -3194,6 +3183,21 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="IM_moderator_label"> (Moderator) </string> + <string name="started_call"> + Startet et stemme opkald + </string> + <string name="joined_call"> + Tilsluttet stemme opkaldet + </string> + <string name="ringing-im"> + Tilslutter stemme opkald... + </string> + <string name="connected-im"> + Forbundet, klik pÃ¥ Forlad for at lægge pÃ¥ + </string> + <string name="hang_up-im"> + Forladt stemme opkald + </string> <string name="only_user_message"> Du er den eneste deltager i denne samtale </string> @@ -3204,7 +3208,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. Tryk pÃ¥ [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat. </string> <string name="muted_message"> - Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet. + Du har blokeret denne beboer. Sendes en besked, vil beboeren fjernes fra blokeringslisten. + </string> + <string name="generic"> + Fejl ved anmodning, prøv venligst igen senere </string> <string name="generic_request_error"> Kunne ikke etablere forbindelse, prøv igen senere @@ -3224,19 +3231,37 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. <string name="not_a_mod_error"> Du er ikke moderator for denne samtale. </string> + <string name="muted"> + En gruppe moderator har deaktiveret din tekst chat. + </string> <string name="muted_error"> Du er blevet "blokeret". </string> <string name="add_session_event"> Ikke muligt at tilføge brugere til samtale med [RECIPIENT]. </string> + <string name="message"> + Kunne ikke sende din besked til session med [RECIPIENT]. + </string> <string name="message_session_event"> Ikke muligt at sende din besked til samtalen med [RECIPIENT]. </string> + <string name="mute"> + Fejl under moderation. + </string> + <string name="removed"> + Du er blevet fjernet fra denne gruppe. + </string> <string name="removed_from_group"> Du er blevet fjernet fra gruppen. </string> <string name="close_on_no_ability"> Du har ikke længere mulighed for at deltage i samtalen </string> + <string name="unread_chat_single"> + [SOURCES] har sagt noget nyt + </string> + <string name="unread_chat_multiple"> + [SOURCES] har sagt noget nyt + </string> </strings> diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 5f3762c224..c19f98516d 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -8,7 +8,7 @@ Kompiliert mit [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Sie befinden sich in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] auf [HOSTNAME] ([HOSTIP]) + Sie befinden sich in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> 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 aec1179901..186c2932c3 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="LAND-INFO"> + <floater.string name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> <floater.string name="Minutes"> [MINUTES] Minuten </floater.string> @@ -12,10 +21,10 @@ <floater.string name="Remaining"> Restzeit </floater.string> - <tab_container name="landtab" width="489" tab_min_width="40"> + <tab_container name="landtab" tab_min_width="40" width="489"> <panel label="ALLGEMEIN" name="land_general_panel"> <panel.string name="new users only"> - Nur neue Benutzer + Nur neue Einwohner </panel.string> <panel.string name="anyone"> Jeder @@ -101,7 +110,7 @@ <text name="For sale to"> Zum Verkauf an: [BUYER] </text> - <text name="Sell with landowners objects in parcel." left_delta="-50" width="240"> + <text left_delta="-50" name="Sell with landowners objects in parcel." width="240"> Objekte sind im Verkauf eingeschlossen </text> <text name="Selling with no objects in parcel." width="260"> @@ -368,7 +377,7 @@ Nur große Parzellen können in der Suche aufgeführt werden. <text name="landing_point"> Landepunkt: [LANDING] </text> - <button label="Festlegen" label_selected="Festlegen" left="234" right="-88" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/> + <button label="Festlegen" label_selected="Festlegen" left="234" name="Set" right="-88" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/> <button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen" width="70"/> <text name="Teleport Routing: "> Teleport-Route: @@ -388,10 +397,6 @@ Nur große Parzellen können in der Suche aufgeführt werden. Homepage: </text> <button label="Festlegen" label_selected="Einstellen..." name="set_media_url"/> - <text name="CurrentURL:"> - Aktuelle Seite: - </text> - <button label="Zurücksetzen..." label_selected="Zurücksetzen..." name="reset_media_url" tool_tip="URL aktualisieren"/> <check_box label="URL ausblenden" name="hide_media_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar."/> <text name="Description:"> Inhalt: @@ -422,6 +427,7 @@ Nur große Parzellen können in der Suche aufgeführt werden. <text name="MusicURL:"> Musik-URL: </text> + <check_box label="URL ausblenden" name="hide_music_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können"/> <text name="Sound:"> Sound: </text> @@ -431,7 +437,7 @@ Nur große Parzellen können in der Suche aufgeführt werden. </text> <check_box label="Voice aktivieren" name="parcel_enable_voice_channel"/> <check_box label="Voice aktivieren (vom Grundstück eingerichtet)" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box label="Voice auf diese Parzelle beschränken" name="parcel_enable_voice_channel_parcel"/> + <check_box label="Voice auf diese Parzelle beschränken" name="parcel_enable_voice_channel_local"/> </panel> <panel label="ZUGANG" name="land_access_panel"> <panel.string name="access_estate_defined"> diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml index be573b524f..0d55ea7413 100644 --- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml @@ -106,6 +106,9 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden. <floater.string name="E_ST_NO_XLT_EMOTE"> Emote-Name kann nicht gelesen werden. </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Falscher Root-Joint-Name, "hip" verwenden. + </floater.string> <text name="name_label"> Name: </text> @@ -181,5 +184,5 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden. Wir empfehlen exportierte BVH-Dateien aus Poser 4. </text> <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="160"/> - <button label="Abbrechen" name="cancel_btn" left="180" width="88"/> + <button label="Abbrechen" left="180" name="cancel_btn" width="88"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml index f1281bfb9b..6eb99f8b42 100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml @@ -41,8 +41,24 @@ Person ein: <text name="meters"> Meter </text> - <button font="SansSerifSmall" label="Liste aktualisieren" label_selected="Liste aktualisieren" left_delta="10" name="Refresh" width="105"/> - <scroll_list bottom_delta="-169" height="159" name="NearMe"/> + <button + follows="top|left" + layout="topleft" + left_pad="0" + height="28" + width="28" + name="Refresh" + image_overlay="Refresh_Off" /> + <scroll_list + follows="all" + height="100" + border="false" + layout="topleft" + left="0" + name="NearMe" + sort_column="0" + top="50" + width="132" /> </panel> </tab_container> <button label="OK" label_selected="OK" name="ok_btn"/> diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml index cf1b809aa1..92c0c4a27a 100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml @@ -16,7 +16,7 @@ <texture_picker label="Haare" name="hair_grain"/> <texture_picker label="Alpha: Haare" name="hair_alpha"/> <texture_picker label="Kopf" name="head-baked"/> - <texture_picker label="Make-Uup" name="head_bodypaint"/> + <texture_picker label="Make-Up" name="head_bodypaint"/> <texture_picker label="Kopf: Alpha" name="head_alpha"/> <texture_picker label="Kopftattoo" name="head_tattoo"/> <texture_picker label="Augen" name="eyes-baked"/> diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml index 50a4555ae0..6e83e0419b 100644 --- a/indra/newview/skins/default/xui/de/floater_beacons.xml +++ b/indra/newview/skins/default/xui/de/floater_beacons.xml @@ -5,7 +5,7 @@ Anzeigen: </text> <check_box label="Strahlen" name="beacons"/> - <check_box label="Glanzlichter" name="highlights"/> + <check_box label="Hervorhebung" name="highlights"/> <text name="beacon_width_label" tool_tip="Strahlbreite"> Breite: </text> diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml index 1d766ac07b..d3f0d6d78f 100644 --- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floaterbulkperms" title="INHALTS-BERECHTIGUNGEN BEARBEITEN"> +<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN"> <floater.string name="nothing_to_modify_text"> Auswahl enthält keinen Inhalt, der bearbeitet werden kann. </floater.string> @@ -43,7 +43,7 @@ Jeder: </text> <check_box label="Kopieren" name="everyone_copy"/> - <text name="NextOwnerLabel" top="160" left="10"> + <text name="NextOwnerLabel" top="160" left="10" width="200"> Nächster Eigentümer: </text> <check_box label="Bearbeiten" name="next_owner_modify"/> diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml index 72959c7a0c..d0d3628448 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml @@ -18,13 +18,13 @@ <text name="balance_amount"> [AMT] L$ </text> - <text name="currency_action" width="90"> + <text name="currency_action"> Ich möchte kaufen </text> <text name="currency_label"> L$ </text> - <line_editor label="L$" left_delta="55" name="currency_amt"> + <line_editor label="L$" name="currency_amt"> 1234 </line_editor> <text name="buying_label"> @@ -52,7 +52,7 @@ Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen. </text> <text name="purchase_warning_repurchase"> - Nach Bestätigung dieses Kaufs werden nur L$ gekauft, nicht das Objekt. + Achtung: Sie kaufen L$, nicht das Objekt. </text> <text name="purchase_warning_notenough"> Sie kaufen nicht genügend L$. Bitte erhöhen Sie den Betrag. diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index 5efa557869..f380393163 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml @@ -1,43 +1,170 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="LAND KAUFEN"> + <floater.string name="can_resell"> + Verkauf möglich. + </floater.string> + <floater.string name="can_not_resell"> + Verkauf nicht möglich. + </floater.string> + <floater.string name="can_change"> + Zusammenlegen/unterteilen möglich. + </floater.string> + <floater.string name="can_not_change"> + Zusammenlegen/unterteilen nicht möglich. + </floater.string> + <floater.string name="cant_buy_for_group"> + Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen. + </floater.string> + <floater.string name="no_land_selected"> + Kein Land ausgewählt. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Mehrere unterschiedliche Parzellen ausgewählt. +Verkleinern Sie Ihre Auswahl. + </floater.string> + <floater.string name="no_permission"> + Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen. + </floater.string> + <floater.string name="parcel_not_for_sale"> + Die ausgewählte Parzelle steht nicht zum Verkauf. + </floater.string> + <floater.string name="group_already_owns"> + Die Parzelle befindet sich bereits in Gruppenbesitz. + </floater.string> + <floater.string name="you_already_own"> + Die Parzelle gehört Ihnen bereits. + </floater.string> + <floater.string name="set_to_sell_to_other"> + Die ausgewählte Parzelle steht zum Verkauf an Dritte. + </floater.string> + <floater.string name="no_public_land"> + Das ausgewählte Land beinhaltet kein öffentliches Land. + </floater.string> + <floater.string name="not_owned_by_you"> + Sie haben Land ausgewählt, das einem anderen Einwohner gehört. +Wählen Sie ein kleineres Gebiet aus. + </floater.string> + <floater.string name="processing"> + Kauf wird abgewickelt... + +(Dies kann 1 bis 2 Minuten dauern.) + </floater.string> + <floater.string name="fetching_error"> + Fehler bei Abfrage der Landkauf-Informationen. + </floater.string> + <floater.string name="buying_will"> + Bei Landkauf: + </floater.string> + <floater.string name="buying_for_group"> + Landkauf für Gruppe: + </floater.string> + <floater.string name="cannot_buy_now"> + Kaufen jetzt nicht möglich: + </floater.string> + <floater.string name="not_for_sale"> + Nicht zu verkaufen: + </floater.string> + <floater.string name="none_needed"> + nicht benötigt + </floater.string> + <floater.string name="must_upgrade"> + Sie müssen Ihr Konto upgraden, um Land kaufen zu können. + </floater.string> + <floater.string name="cant_own_land"> + Mit Ihrem Konto können Sie Land kaufen. + </floater.string> + <floater.string name="land_holdings"> + Sie besitzen [BUYER] m² Land. + </floater.string> + <floater.string name="pay_to_for_land"> + [SELLER] [AMOUNT] L$ für das Land bezahlen + </floater.string> + <floater.string name="buy_for_US"> + Kaufen Sie [AMOUNT] L$ für ca. [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Diese Parzelle ist [AMOUNT] m². + </floater.string> + <floater.string name="premium_land"> + Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] m² angesetzt. + </floater.string> + <floater.string name="discounted_land"> + Dieses Land ist im Angebot. Es wird mit [AMOUNT] m² angesetzt. + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +unterstützt [AMOUNT2] Objekte + </floater.string> + <floater.string name="sold_with_objects"> + mit Objekten verkauft + </floater.string> + <floater.string name="sold_without_objects"> + Objekte nicht im Verkauf mit eingeschlossen + </floater.string> + <floater.string name="info_price_string"> + [PRICE] L$ +([PRICE_PER_SQM] L$/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Die Gruppe [GROUP] benötigt ausreichende gespendete Landnutzungsrechte, um die Parzelle abzudecken, bevor der Kauf abgeschlossen werden kann. + </floater.string> + <floater.string name="have_enough_lindens"> + Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes. + </floater.string> + <floater.string name="not_enough_lindens"> + Sie haben nur [AMOUNT] L$, brauchen aber mindestens [AMOUNT2] L$. + </floater.string> + <floater.string name="balance_left"> + Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] L$. + </floater.string> + <floater.string name="balance_needed"> + Für dieses Land müssen Sie mindestens [AMOUNT] L$ kaufen. + </floater.string> + <floater.string name="no_parcel_selected"> + (keine Parzelle ausgewählt) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Region: </text> - <text left="680" name="region_name_text" left_delta="140"> + <text left="680" left_delta="140" name="region_name_text"> (unbekannt) </text> <text name="region_type_label"> Typ: </text> - <text left="680" name="region_type_text" left_delta="140"> + <text left="680" left_delta="140" name="region_type_text"> (unbekannt) </text> <text name="estate_name_label"> Grundstück: </text> - <text left="680" name="estate_name_text" left_delta="140"> + <text left="680" left_delta="140" name="estate_name_text"> (unbekannt) </text> <text name="estate_owner_label" right="600" width="200"> Grundstückseigentümer: </text> - <text left="680" name="estate_owner_text" left_delta="140"> + <text left="680" left_delta="140" name="estate_owner_text"> (unbekannt) </text> - <text name="resellable_changeable_label" left="410"> + <text left="410" name="resellable_changeable_label"> Gekauftes Land in dieser Region: </text> - <text name="resellable_clause" left="410"> + <text left="410" name="resellable_clause"> Wiederverkauf möglich oder nicht möglich. </text> - <text name="changeable_clause" left="410"> + <text left="410" name="changeable_clause"> Darft oder darf nicht zusammengelegt/unterteilt werden. </text> - <text name="covenant_text" left="410"> + <text left="410" name="covenant_text"> Sie müssen dem Grundstücksvertrag zustimmen: </text> <text left="470" name="covenant_timestamp_text"/> - <text_editor name="covenant_editor" left="470"> + <text_editor left="470" name="covenant_editor"> Wird geladen... </text_editor> <check_box label="Ich stimme dem obigen Vertrag zu." name="agree_covenant"/> @@ -79,7 +206,7 @@ Objekte im Verkauf eingeschlossen <combo_box.item label="7,50 US$/Monat, vierteljährliche Abrechnung" name="US$7.50/month,billedquarterly"/> <combo_box.item label="6,00 US$/Monat, jährliche Abrechnung" name="US$6.00/month,billedannually"/> </combo_box> - <text name="land_use_action" top="270" height="36"> + <text height="36" name="land_use_action" top="270"> Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month. </text> @@ -108,131 +235,4 @@ Diese Parzelle ist 512 m² gross. <check_box label="[AMOUNT] m² Beitrag von der Gruppe entfernen." name="remove_contribution"/> <button label="Kaufen" name="buy_btn"/> <button label="Abbrechen" name="cancel_btn"/> - <string name="can_resell"> - Verkauf möglich. - </string> - <string name="can_not_resell"> - Verkauf nicht möglich. - </string> - <string name="can_change"> - Zusammenlegen/unterteilen möglich. - </string> - <string name="can_not_change"> - Zusammenlegen/unterteilen nicht möglich. - </string> - <string name="cant_buy_for_group"> - Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen. - </string> - <string name="no_land_selected"> - Kein Land ausgewählt. - </string> - <string name="multiple_parcels_selected"> - Mehrere unterschiedliche Parzellen ausgewählt. -Verkleinern Sie Ihre Auswahl. - </string> - <string name="no_permission"> - Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen. - </string> - <string name="parcel_not_for_sale"> - Die ausgewählte Parzelle steht nicht zum Verkauf. - </string> - <string name="group_already_owns"> - Die Parzelle befindet sich bereits in Gruppenbesitz. - </string> - <string name="you_already_own"> - Die Parzelle gehört Ihnen bereits. - </string> - <string name="set_to_sell_to_other"> - Die ausgewählte Parzelle steht zum Verkauf an Dritte. - </string> - <string name="no_public_land"> - Das ausgewählte Land beinhaltet kein öffentliches Land. - </string> - <string name="not_owned_by_you"> - Sie haben Land ausgewählt, das einer anderen Person gehört. -Verkleinern Sie Ihre Auswahl. - </string> - <string name="processing"> - Kauf wird abgewickelt... - -(Dies kann 1 bis 2 Minuten dauern.) - </string> - <string name="fetching_error"> - Fehler bei Abfrage der Landkauf-Informationen. - </string> - <string name="buying_will"> - Bei Landkauf: - </string> - <string name="buying_for_group"> - Landkauf für Gruppe: - </string> - <string name="cannot_buy_now"> - Kaufen jetzt nicht möglich: - </string> - <string name="not_for_sale"> - Nicht zu verkaufen: - </string> - <string name="none_needed"> - nicht benötigt - </string> - <string name="must_upgrade"> - Sie müssen Ihr Konto upgraden, um Land kaufen zu können. - </string> - <string name="cant_own_land"> - Mit Ihrem Konto können Sie Land kaufen. - </string> - <string name="land_holdings"> - Sie besitzen [BUYER] m² Land. - </string> - <string name="pay_to_for_land"> - [SELLER] [AMOUNT] L$ für das Land bezahlen - </string> - <string name="buy_for_US"> - Kaufen Sie [AMOUNT] L$ für ca. [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Diese Parzelle ist [AMOUNT] m². - </string> - <string name="premium_land"> - Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] m² angesetzt. - </string> - <string name="discounted_land"> - Dieses Land ist im Angebot. Es wird mit [AMOUNT] m² angesetzt. - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -unterstützt [AMOUNT2] Objekte - </string> - <string name="sold_with_objects"> - mit Objekten verkauft - </string> - <string name="sold_without_objects"> - Objekte nicht im Verkauf mit eingeschlossen - </string> - <string name="info_price_string"> - [PRICE] L$ -([PRICE_PER_SQM] L$/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Die Gruppe [GROUP] benötigt ausreichende gespendete Landnutzungsrechte, um die Parzelle abzudecken, bevor der Kauf abgeschlossen werden kann. - </string> - <string name="have_enough_lindens"> - Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes. - </string> - <string name="not_enough_lindens"> - Sie haben nur [AMOUNT] L$, brauchen aber mindestens [AMOUNT2] L$. - </string> - <string name="balance_left"> - Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] L$. - </string> - <string name="balance_needed"> - Für dieses Land müssen Sie mindestens [AMOUNT] L$ kaufen. - </string> - <string name="no_parcel_selected"> - (keine Parzelle ausgewählt) - </string> - <string name="buy_currency"> - [LINDENS] L$ für ca. [USD] US$ kaufen - </string> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml index b8616ea128..87371b05e3 100644 --- a/indra/newview/skins/default/xui/de/floater_camera.xml +++ b/indra/newview/skins/default/xui/de/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Kamera nach oben, unten, links und rechts bewegen </floater.string> + <floater.string name="orbit_mode_title"> + Kreisen + </floater.string> + <floater.string name="pan_mode_title"> + Schwenken + </floater.string> + <floater.string name="avatar_view_mode_title"> + Voreinstellungen + </floater.string> + <floater.string name="free_mode_title"> + Objekt ansehen + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/> <panel name="zoom" tool_tip="Kamera auf Fokus zoomen"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="Kamera kreisen"/> <button label="" name="pan_btn" tool_tip="Kamera schwenken"/> - <button label="" name="avatarview_btn" tool_tip="Avatarsicht"/> + <button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/> <button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml index a2bf45852a..f284d7cd6b 100644 --- a/indra/newview/skins/default/xui/de/floater_customize.xml +++ b/indra/newview/skins/default/xui/de/floater_customize.xml @@ -40,17 +40,17 @@ <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> - <text name="Item Action Label" right="100"> + <text name="Item Action Label"> Form: </text> <button label="Neue Form/Gestalt" label_selected="Neue Form/Gestalt" name="Create New"/> - <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> - <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> + <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" name="Save"/> + <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/> </panel> <panel label="Haut" name="Skin"> <button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/> <button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/> - <button label="Make-Uup" label_selected="Make-Uup" left="2" name="Makeup" width="92"/> + <button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/> <button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/> <text name="title"> [DESC] @@ -105,7 +105,7 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch neues Haar erstellen und anlegen. </text> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. @@ -136,7 +136,7 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch neue Augen erstellen und diese anlegen. </text> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. @@ -156,8 +156,8 @@ <panel label="Hemd" name="Shirt"> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neues Hemd" label_selected="Neues Hemd" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> + <button label="Neues Hemd" label_selected="Neues Hemd" name="Create New"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/> @@ -177,7 +177,7 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Hemd erstellen und dieses anlegen. </text> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. @@ -189,8 +189,8 @@ <panel label="Hose" name="Pants"> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Hose" label_selected="Neue Hose" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> + <button label="Neue Hose" label_selected="Neue Hose" name="Create New"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/> @@ -210,7 +210,7 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen. </text> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. @@ -236,8 +236,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue Schuhe erstellen und diese anlegen. </text> + <button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -246,7 +247,6 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -269,8 +269,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie neue Strümpfe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie neue Socken aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen. </text> + <button label="Neue Socken" label_selected="Neue Socken" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -279,7 +280,6 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Socken" label_selected="Neue Socken" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -302,18 +302,18 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen. </text> + <button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> <text name="Item Action Label" right="100"> Jacke: </text> - <texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> - <texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> + <texture_picker label="Stoff: oben" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> + <texture_picker label="Stoff: unten" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -336,8 +336,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen. </text> + <button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -346,7 +347,6 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -369,8 +369,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Unterhemd erstellen und dieses anziehen. </text> + <button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -379,7 +380,6 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -402,8 +402,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen. </text> + <button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -412,7 +413,6 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> @@ -435,8 +435,9 @@ In [PATH] </text> <text name="not worn instructions"> - Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch einen neuen Rock erstellen und diesen anziehen. </text> + <button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> @@ -445,15 +446,14 @@ </text> <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/> <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/> <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Tätowierung" name="Tattoo"> <text name="title"> - [BESCHR] + Tätowierung </text> <text name="title_no_modify"> [BESCHR]: bearbeiten nicht möglich @@ -468,28 +468,26 @@ Befindet sich in [PATH] </text> <text name="not worn instructions"> - Sie können eine neue Alpha-Maske anlegen, indem Sie eine von Ihrem Inventar auf Ihren Avatar ziehen. Sie können aber auch eine neue erstellen und diese anlegen. + Ziehen Sie eine neue Tätowierung aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen. </text> + <button label="Neue Tätowierung erstellen" label_selected="Neue Tätowierung erstellen" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> <text name="Item Action Label"> - Alpha: + Tätowierung: </text> - <texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <button label="Neue Alpha erstellen" label_selected="Neue Alpha erstellen" name="Create New"/> + <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> <button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button label="Speichern" label_selected="Speichern" name="Save"/> <button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/> <button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/> </panel> - <panel label="Tätowierung" name="Tattoo"> + <panel label="Alpha" name="Alpha"> <text name="title"> - [BESCHR] + Alpha </text> <text name="title_no_modify"> [BESCHR]: bearbeiten nicht möglich @@ -504,25 +502,27 @@ Befindet sich in [PATH] </text> <text name="not worn instructions"> - Ziehen Sie eine neue Tätowierung aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen. + Sie können eine neue Alpha-Maske anlegen, indem Sie eine von Ihrem Inventar auf Ihren Avatar ziehen. Sie können aber auch eine neue erstellen und diese anlegen. </text> + <button label="Neue Alpha erstellen" label_selected="Neue Alpha erstellen" name="Create New"/> <text name="no modify instructions"> Sie sind nicht berechtigt, diese Kleidung zu bearbeiten. </text> <text name="Item Action Label"> - Tätowierung: + Alpha: </text> - <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <button label="Neue Tätowierung erstellen" label_selected="Neue Tätowierung erstellen" name="Create New"/> + <texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/> <button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button label="Speichern" label_selected="Speichern" name="Save"/> <button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/> <button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/> </panel> </tab_container> - <button label="Skriptinfo" label_selected="Skriptinfo" name="script_info"/> + <button label="Skriptinfo" label_selected="Skriptinfo" name="script_info" tool_tip="Skripts, die an Ihren Avatar angehängt sind, anzeigen"/> <button label="Outfit erstellen" label_selected="Outfit erstellen" name="make_outfit_btn"/> <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml new file mode 100644 index 0000000000..cf663e2e1b --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_event.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Event" name="Event" title="EVENT-DETAILS"> + <floater.string name="none"> + keines + </floater.string> + <floater.string name="notify"> + Benachrichtigen + </floater.string> + <floater.string name="dont_notify"> + Nicht benachrichtigen + </floater.string> + <floater.string name="moderate"> + Moderat + </floater.string> + <floater.string name="adult"> + Adult + </floater.string> + <floater.string name="general"> + Allgemein + </floater.string> + <floater.string name="unknown"> + Unbekannt + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Namenloses Event....namenlos! Tadaaa! Tadatadaaaah! + </text> + <text name="event_category"> + (keine Kategorie) + </text> + <text name="event_runby_label"> + Ausgeführt von: + </text> + <text initial_value="(wird in Datenbank gesucht)" name="event_runby"/> + <text name="event_date_label"> + Datum: + </text> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration_label"> + Dauer: + </text> + <text name="event_duration"> + 1 Stunde + </text> + <text name="event_covercharge_label"> + Eintritt: + </text> + <text name="event_cover"> + Kostenlos + </text> + <text name="event_location_label"> + Standort: + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Einstufung:"/> + <text name="rating_value" value="unbekannt"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Event erstellen"/> + <button name="god_delete_event_btn" tool_tip="Event löschen"/> + <button label="Mich benachrichtigen" name="notify_btn"/> + <button label="Teleportieren" name="teleport_btn"/> + <button label="Karte" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml index 30b151ca58..108baee4a4 100644 --- a/indra/newview/skins/default/xui/de/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml @@ -2,12 +2,12 @@ <floater name="godtools floater" title="GOTT-WERKZEUGE"> <tab_container name="GodTools Tabs"> <panel label="Raster" name="grid"> - <button label="Alle Benutzer hinauswerfen" label_selected="Alle Benutzer hinauswerfen" name="Kick all users" width="175"/> + <button label="Alle Einwohner hinauswerfen" label_selected="Alle Einwohner hinauswerfen" name="Kick all users" width="175"/> <button label="Sichtbarkeits-Cache dieser Regionskarte leeren" label_selected="Sichtbarkeits-Cache dieser Regionskarte leeren" name="Flush This Region's Map Visibility Caches" width="285"/> </panel> <panel label="Region" name="region"> <text name="Sim Name:" width="55"> - Sim-Name: + Sim: </text> <check_box label="Startbereich Einleitung" name="check prelude" tool_tip="Diese Region zu einem Startbereich machen."/> <check_box label="Sonne fest" name="check fixed sun" tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ > „Terrain“."/> @@ -35,13 +35,13 @@ <text name="Redirect to Grid: " width="110"> Auf Raster umleiten: </text> - <line_editor left_delta="110" name="redirectx" width="35" left_pad="0"/> - <line_editor left_delta="45" name="redirecty" width="35" /> + <line_editor left_delta="110" left_pad="0" name="redirectx" width="35"/> + <line_editor left_delta="45" name="redirecty" width="35"/> <text font="SansSerifSmall" name="billable factor text"> Abrechnungsfaktor: </text> <text name="land cost text"> - L$ pro qm: + L$ pro m²: </text> <button label="Aktualisieren" label_selected="Aktualisieren" name="Refresh" tool_tip="Klicken Sie hier, um die obigen Informationen zu aktualisieren."/> <button label="Ãœbernehmen" label_selected="Ãœbernehmen" name="Apply" tool_tip="Klicken Sie hier, um die obigen Änderungen zu übernehmen."/> diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml index bfefa57731..d55a3b0a26 100644 --- a/indra/newview/skins/default/xui/de/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_help_browser" title="HILFE-BROWSER"> - <floater.string name="home_page_url"> - http://de.secondlife.com - </floater.string> - <floater.string name="support_page_url"> - http://de.secondlife.com/support + <floater.string name="loading_text"> + Wird geladen... </floater.string> <layout_stack name="stack1"> - <layout_panel name="external_controls"> - <button label="In meinem Browser öffnen" name="open_browser"/> - </layout_panel> + <layout_panel name="external_controls"/> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_im.xml b/indra/newview/skins/default/xui/de/floater_im.xml index 6aa35f2900..8ae8f120cf 100644 --- a/indra/newview/skins/default/xui/de/floater_im.xml +++ b/indra/newview/skins/default/xui/de/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="Instant Message"> <string name="only_user_message"> - Sie sind der einzige Benutzer in dieser Sitzung. + Sie sind der einzige Einwohner in dieser Sitzung. </string> <string name="offline_message"> [FIRST] [LAST] ist offline. @@ -32,7 +32,7 @@ </string> <!-- ALL of the event strings should have [RECIPIENT] in them --> <string name="add_session_event"> - Es konnten keine Benutzer zur Chat-Sitzung mit [RECIPIENT] hinzugefügt werden. + Es konnten keine Einwohner zur Chat-Sitzung mit [RECIPIENT] hinzugefügt werden. </string> <string name="message_session_event"> Ihre Nachricht konnte nicht an die Chat-Sitzung mit [RECIPIENT] gesendet werden. diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml index 7bde3a3453..c69bb600ea 100644 --- a/indra/newview/skins/default/xui/de/floater_im_session.xml +++ b/indra/newview/skins/default/xui/de/floater_im_session.xml @@ -3,7 +3,7 @@ <layout_stack name="im_panels"> <layout_panel label="IM Steuerkonsole" name="panel_im_control_panel"/> <layout_panel> - <line_editor label="Bis" name="chat_editor"/> + <line_editor label="An" name="chat_editor"/> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_inventory.xml b/indra/newview/skins/default/xui/de/floater_inventory.xml index d9014fc0ef..d9b7c30fd2 100644 --- a/indra/newview/skins/default/xui/de/floater_inventory.xml +++ b/indra/newview/skins/default/xui/de/floater_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="INVENTAR"> +<floater name="Inventory" title="MEIN INVENTAR"> <floater.string name="Title"> - Inventar + MEIN INVENTAR </floater.string> <floater.string name="TitleFetching"> - Inventar ([ITEM_COUNT] Artikel werden abgerufen...) [FILTER] + MEIN INVENTAR ([ITEM_COUNT] Objekte werden abgerufen...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - Inventar ([ITEM_COUNT] Artikel) [FILTER] + MEIN INVENTAR ([ITEM_COUNT] Objekte) [FILTER] </floater.string> <floater.string name="Fetched"> Abgerufen diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml index 248460af82..3b42a8b741 100644 --- a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml @@ -7,7 +7,7 @@ Läuft </floater.string> <floater.string name="Title"> - Skript: [NAME] + SKRIPT: [NAME] </floater.string> <button label="Zurücksetzen" label_selected="Zurücksetzen" name="Reset"/> <check_box initial_value="true" label="Läuft" name="running"/> diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index b985d1d187..a9a3149177 100644 --- a/indra/newview/skins/default/xui/de/floater_map.xml +++ b/indra/newview/skins/default/xui/de/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Minikarte"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml index 03930c8ed6..b978322cef 100644 --- a/indra/newview/skins/default/xui/de/floater_moveview.xml +++ b/indra/newview/skins/default/xui/de/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken) </string> + <string name="walk_title"> + Gehen + </string> + <string name="run_title"> + Rennen + </string> + <string name="fly_title"> + Fliegen + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="Gehen"/> <button label="" name="mode_run_btn" tool_tip="Rennen"/> <button label="" name="mode_fly_btn" tool_tip="Fliegen"/> - <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml index 42cb91ccbb..8c110e5516 100644 --- a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="Outfit speichern"> <button label="Speichern" label_selected="Speichern" name="Save"/> <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> <text name="Save item as:"> - Outfit speichern als: + Meine aktuelle Kleidung +als neues Outfit speichern: </text> <line_editor name="name ed"> - [BESCHR] + [DESC] (neu) </line_editor> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml index 99ef0e900e..5372b8387e 100644 --- a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml @@ -25,10 +25,13 @@ Der Anruf wurde nicht entgegengenommen. Bitte versuchen Sie es später erneut. </text> <text name="nearby"> - Die Verbindung zu [VOICE_CHANNEL_NAME] wurde abgebrochen. Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden. + Die Verbindung zu [VOICE_CHANNEL_NAME] wurde abgebrochen. [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> - [VOICE_CHANNEL_NAME] hat den Anruf beendet. Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden. + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] hat den Anruf beendet. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Sie haben das Gespräch beendet. [RECONNECT_NEARBY] </text> <text name="leaving"> [CURRENT_CHAT] wird verlassen. diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml index 6eb1d9472d..ec3c45dccf 100644 --- a/indra/newview/skins/default/xui/de/floater_pay.xml +++ b/indra/newview/skins/default/xui/de/floater_pay.xml @@ -7,7 +7,7 @@ Einwohner bezahlen </string> <text name="payee_label" width="130"> - Zahlen: + Bezahlen: </text> <icon name="icon_person" tool_tip="Person"/> <text left="130" name="payee_name"> @@ -18,8 +18,8 @@ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> <text name="amount text"> - Oder Betrag auswählen: + oder Betrag auswählen: </text> - <button label="Zahlen" label_selected="Zahlen" name="pay btn"/> + <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml index bc714361cc..59494cc100 100644 --- a/indra/newview/skins/default/xui/de/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml @@ -22,8 +22,8 @@ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> <text name="amount text"> - Oder Betrag auswählen: + oder Betrag auswählen: </text> - <button label="Zahlen" label_selected="Zahlen" name="pay btn"/> + <button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index 106fd6dfd3..a2712c437b 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml @@ -6,10 +6,10 @@ <panel label="Allgemein" name="general"/> <panel label="Grafik" name="display"/> <panel label="Privatsphäre" name="im"/> - <panel label="Sound" name="audio"/> + <panel label="Sound & Medien" name="audio"/> <panel label="Chat" name="chat"/> - <panel label="Benachrichtigungen" name="msgs"/> - <panel label="Setup" name="input"/> + <panel label="Meldungen" name="msgs"/> + <panel label="Konfiguration" name="input"/> <panel label="Erweitert" name="advanced1"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml index b2e9c2e66d..3dcdb52555 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml @@ -7,6 +7,6 @@ Beschreibung: </text> <line_editor left="108" name="desc" width="160"/> - <button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können." width="116"/> - <button label="Lokal wiedergeben" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen." width="116"/> + <button label="Inworld abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können." width="116"/> + <button label="Lokal abspielen" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen." width="116"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml index 17419548bc..4629ec4a04 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_sound.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Beschreibung: </text> - <button label="In Welt abspielen" label_selected="In Welt abspielen" name="Sound play btn" tool_tip="Gibt diesen Sound so wieder, dass andere ihn hören können."/> - <button label="Lokal wiedergeben" label_selected="Lokal wiedergeben" name="Sound audition btn" tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören."/> + <button label="Inworld abspielen" label_selected="Inworld abspielen" name="Sound play btn" tool_tip="Gibt diesen Sound so wieder, dass andere ihn hören können."/> + <button label="Lokal abspielen" label_selected="Lokal abspielen" name="Sound audition btn" tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören."/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml index ac6a61cde6..526c0813bd 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="Abbrechen" name="Discard"/> + <button label="Verwerfen" name="Discard"/> <button label="Speichern unter" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml new file mode 100644 index 0000000000..993382727b --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="Anzeige wird veröffentlicht"> + <text name="explanation_text"> + Ihr Anzeige wird für eine Woche veröffentlicht. + +Anzeigengebühren werden nicht zurückerstattet. + </text> + <spinner label="Anzeigenpreis:" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + Weitere Infos (Link zur Hilfe) + </text> + <button label="Veröffentlichen" name="publish_btn"/> + <button label="Abbrechen" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml index f471866967..e37e298478 100644 --- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml @@ -23,7 +23,7 @@ {128.1, 128.1, 15.4} </text> <text bottom_delta="-38" height="32" name="select_object_label"> - Klicken Sie auf die Schaltfläche, dann auf das entsprechende + Klicken Sie die Schaltfläche, dann das entsprechende Objekt: </text> <button label="" label_selected="" name="pick_btn" tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus"/> @@ -41,11 +41,11 @@ Objekt: </text> <combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft"> <combo_box.item label="Kategorie auswählen" name="Select_category"/> - <combo_box.item label="Alter> Age-Play" name="Age__Age_play"/> + <combo_box.item label="Alter > Age-Play" name="Age__Age_play"/> <combo_box.item label="Alter > Erwachsener Einwohner in Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/> <combo_box.item label="Alter > Minderjähriger Einwohner außerhalb Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> - <combo_box.item label="Angriff> Kampf-Sandbox / unsichere Region" name="Assault__Combat_sandbox___unsafe_area"/> - <combo_box.item label="Angriff> Sichere Region" name="Assault__Safe_area"/> + <combo_box.item label="Angriff > Kampf-Sandbox / unsichere Region" name="Assault__Combat_sandbox___unsafe_area"/> + <combo_box.item label="Angriff > Sichere Region" name="Assault__Safe_area"/> <combo_box.item label="Angriff > Sandbox für Waffentest" name="Assault__Weapons_testing_sandbox"/> <combo_box.item label="Handel > Produkt nicht geliefert oder Dienstleistung nicht erbracht" name="Commerce__Failure_to_deliver_product_or_service"/> <combo_box.item label="Offenlegung > Informationen aus realer Welt" name="Disclosure__Real_world_information"/> @@ -57,7 +57,7 @@ Objekt: <combo_box.item label="Ruhestörung > Ständige Spam-Wiederholung" name="Disturbing_the_peace__Repetitive_spam"/> <combo_box.item label="Ruhestörung > Unerwünschte Spam-Werbung" name="Disturbing_the_peace__Unwanted_advert_spam"/> <combo_box.item label="Betrug > L$" name="Fraud__L$"/> - <combo_box.item label="Betrug> Land" name="Fraud__Land"/> + <combo_box.item label="Betrug > Land" name="Fraud__Land"/> <combo_box.item label="Betrug > Schneeballsystem oder Kettenbrief" name="Fraud__Pyramid_scheme_or_chain_letter"/> <combo_box.item label="Betrug > US$" name="Fraud__US$"/> <combo_box.item label="Belästigung > Werbefarmen / visueller Spam" name="Harassment__Advert_farms___visual_spam"/> @@ -94,7 +94,7 @@ Objekt: Details: </text> <text name="bug_aviso"> - Bitte beschreiben Sie alles so genau wie möglich. + Detaillierte Beschreibung: </text> <text_editor bottom_delta="-136" height="70" name="details_edit"/> <text bottom_delta="-20" name="incomplete_title"> diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml index 1ea3803aea..e0bcd42523 100644 --- a/indra/newview/skins/default/xui/de/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SKRIPT: ROTATIONS-SKRIPT"> <floater.string name="Title"> - Skript: [NAME] + SKRIPT: [NAME] </floater.string> <text name="desc txt" width="120"> Beschreibung: diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml index a2c86e7bb0..8f67fae464 100644 --- a/indra/newview/skins/default/xui/de/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml @@ -21,7 +21,7 @@ 1. Preis festlegen: </text> <text name="price_text" > - Einen angemessenen Preis auswählen. + Preis eingeben </text> <text name="price_ld"> L$ @@ -36,12 +36,12 @@ 2. Land verkaufen an: </text> <text bottom_delta="-16" height="16" left="72" name="sell_to_text" right="-10"> - Wählen Sie, ob der Verkauf offen oder auf eine bestimmte Person beschränkt ist. + Offener Verkauf oder Verkauf an bestimmte Person? </text> <combo_box bottom_delta="-32" height="16" left="72" name="sell_to" width="140"> <combo_box.item label="-- Auswählen --" name="--selectone--"/> - <combo_box.item label="Jeder" name="Anyone"/> - <combo_box.item label="Bestimmte Person:" name="Specificuser:"/> + <combo_box.item label="An jeden" name="Anyone"/> + <combo_box.item label="An bestimmte Person:" name="Specificuser:"/> </combo_box> <button label="Auswählen" name="sell_to_select_agent"/> <text name="sell_objects_label"> @@ -58,7 +58,7 @@ <text name="nag_message_label"> ACHTUNG: Verkäufe sind endgültig. </text> - <button label="Land zum Verkauf freigeben" name="sell_btn" width="180"/> + <button label="Zum Verkauf freigeben" name="sell_btn" width="180"/> <button label="Abbrechen" name="cancel_btn"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml index b48c9a77c8..9ee50c7c5c 100644 --- a/indra/newview/skins/default/xui/de/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="FOTO-ANZEIGE"> +<floater name="Snapshot" title="FOTO-VORSCHAU"> <text name="type_label"> Zweck des Fotos </text> <radio_group label="Fototyp" name="snapshot_type_radio"> - <radio_item label="Email-Adresse" name="postcard"/> + <radio_item label="Emailen" name="postcard"/> <radio_item label="Mein Inventar ([AMOUNT] L$)" name="texture"/> <radio_item label="Auf meinem Computer speichern" name="local"/> </radio_group> @@ -68,7 +68,7 @@ <combo_box.item label="Tiefe" name="Depth"/> <combo_box.item label="Objektmasken" name="ObjectMattes"/> </combo_box> - <check_box label="Schnittstelle" name="ui_check"/> + <check_box label="Oberfläche" name="ui_check"/> <check_box label="HUDs" name="hud_check"/> <check_box label="Nach dem Speichern offen lassen" name="keep_open_check"/> <check_box label="Frame einfrieren (Vollbild)" name="freeze_frame_check"/> diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml index 982786b66e..d7db97722c 100644 --- a/indra/newview/skins/default/xui/de/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="notification_chiclet" title="MELDUNGEN"> <string name="title_im_well_window"> - IM-SITZUNGEN + GESPRÄCHE </string> <string name="title_notification_well_window"> BENACHRICHTIGUNGEN diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml index 4d3c96bc87..83d37b2ce4 100644 --- a/indra/newview/skins/default/xui/de/floater_telehub.xml +++ b/indra/newview/skins/default/xui/de/floater_telehub.xml @@ -21,7 +21,7 @@ <button label="Spawn hinzufügen" name="add_spawn_point_btn"/> <button label="Spawn entfernen" name="remove_spawn_point_btn"/> <text name="spawn_point_help"> - Wählen Sie ein Objekt und klicken zur Positionsangabe auf Spawn hinzufügen. + Wählen Sie ein Objekt und klicken Sie zur Positionsangabe auf Spawn hinzufügen. Anschließend können Sie das Objekt verschieben oder löschen. Positionsangaben sind relativ zum Telehub-Mittelpunkt. Wählen Sie ein Objekt aus der Liste aus, um dieses inworld zu markieren. diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml index 4e2d8a9274..8944c79c7d 100644 --- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="AUSWÄHLEN: TEXTUR"> +<floater name="texture picker" title="TEXTUR AUSWÄHLEN"> <string name="choose_picture"> Zum Auswählen eines Bildes hier klicken </string> <text name="Multiple"> - Mehrer Texturen + Mehrere Texturen </text> <text name="unknown"> Größe: [DIMENSIONS] diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index b5c02cce0b..7091e35a6e 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -64,12 +64,12 @@ <radio_item label="Fläche auswählen" name="radio select face"/> </radio_group> <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/> - <text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für diesen Objekt"> + <text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt"> þ: [COUNT] </text> <check_box label="Beide Seiten dehnen" name="checkbox uniform"/> <check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/> - <check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid"/> + <check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="10"/> <combo_box name="combobox grid mode" tool_tip="Wählen Sie das Rasterlineal aus, um das Objekt zu positionieren."> <combo_box.item label="Globales Raster" name="World"/> <combo_box.item label="Lokales Raster" name="Local"/> @@ -196,7 +196,7 @@ </combo_box> <check_box label="Zum Verkauf:" name="checkbox for sale"/> <combo_box name="sale type"> - <combo_box.item label="Kopieren" name="Copy"/> + <combo_box.item label="Kopie" name="Copy"/> <combo_box.item label="Inhalt" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> @@ -369,9 +369,9 @@ <spinner label="Ziehen" name="FlexFriction"/> <spinner label="Wind" name="FlexWind"/> <spinner label="Spannung" name="FlexTension"/> - <spinner label="Erzwingen X" name="FlexForceX"/> - <spinner label="Erzwingen Y" name="FlexForceY"/> - <spinner label="Erzwingen Z" name="FlexForceZ"/> + <spinner label="Kraft X" name="FlexForceX"/> + <spinner label="Kraft Y" name="FlexForceY"/> + <spinner label="Kraft Z" name="FlexForceZ"/> <check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/> <color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> <texture_picker label="" name="light texture control" tool_tip="Klicken, um eine Bild auszuwählen (dieser Effekt funktioniert nur, wenn zeitversetzte Wiedergabe aktiviert ist)"/> diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml index f978042cc2..aa582838a4 100644 --- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml @@ -16,6 +16,9 @@ Es ist niemand in der Nähe, der Voice aktiviert hat. </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mein Avatar:"/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="Anruf beenden" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml index ecd6d7ff3e..097a60a444 100644 --- a/indra/newview/skins/default/xui/de/floater_water.xml +++ b/indra/newview/skins/default/xui/de/floater_water.xml @@ -10,7 +10,7 @@ <button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/> <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Einstellungen" name="Settings"> + <panel label="EINSTELLUNGEN" name="Settings"> <text name="BHText"> Wassertrübungsfarbe </text> @@ -44,7 +44,7 @@ Mischungsmultiplikator </text> </panel> - <panel label="Bild" name="Waves"> + <panel label="BILD" name="Waves"> <text name="BHText"> Richtung große Welle </text> diff --git a/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml index dad1b62975..f9b3552e8b 100644 --- a/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=" "> - <button label="Speichern" label_selected="Speichern" name="Save" /> - <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" /> + <button label="Speichern" label_selected="Speichern" name="Save"/> + <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> <text name="Save item as:"> - Objekt speichern als: + Objekt in meinem Inventar speichern als: </text> <line_editor name="name ed"> Neu [DESC] diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml index 3e06d8f06b..5b59336f9d 100644 --- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml @@ -8,7 +8,7 @@ <button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/> <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/> <tab_container name="WindLight Tabs"> - <panel label="Atmosphäre" name="Atmosphere"> + <panel label="ATMOSPHÄRE" name="Atmosphere"> <text name="BHText"> Horizontfarbe </text> @@ -62,7 +62,7 @@ </text> <button label=" ?" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Licht" name="Lighting"> + <panel label="LICHT" name="Lighting"> <text name="SLCText"> Sonne/Mond-Farbe </text> @@ -118,7 +118,7 @@ </text> <button label=" ?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Wolken" name="Clouds"> + <panel label="WOLKEN" name="Clouds"> <text name="WLCloudColorText"> Wolkenfarbe </text> diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index accc023b8f..008a9d63b7 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -5,7 +5,7 @@ Legende </text> </panel> - <panel> + <panel name="layout_panel_2"> <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position meines Avatars zentrieren"/> <text name="me_label"> Ich @@ -37,9 +37,9 @@ </text> <check_box label="PG" name="event_chk"/> <text name="pg_label"> - Allgemein + Generell </text> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> + <check_box initial_value="wahr" label="Mature" name="event_mature_chk"/> <text name="mature_label"> Moderat </text> @@ -48,12 +48,12 @@ Adult </text> </panel> - <panel> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Auf Karte anzeigen </text> </panel> - <panel> + <panel name="layout_panel_4"> <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freunde auf Karte anzeigen"> <combo_box.item label="Meine Freunde: Online" name="item1"/> </combo_box> @@ -62,6 +62,7 @@ </combo_box> <search_editor label="Regionen nach Name" name="location" tool_tip="Geben Sie den Namen einer Region ein"/> <button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/> + <button name="Clear" tool_tip="Karte zurücksetzen"/> <scroll_list name="search_results"> <scroll_list.columns label="" name="icon"/> <scroll_list.columns label="" name="sim_name"/> @@ -70,12 +71,12 @@ <button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/> <button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/> </panel> - <panel> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml index eedbdc9904..a0bd24a69f 100644 --- a/indra/newview/skins/default/xui/de/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/> <button label="Freund hinzufügen" name="add_friend_btn" width="110"/> <button label="IM" name="im_btn"/> - <button label="Mehr" name="view_profile_btn" width="44" left_delta="120"/> + <button label="Profil" left_delta="120" name="view_profile_btn" width="44"/> <panel name="moderator_panel"> <button label="Voice deaktivieren" name="disable_voice"/> <button label="Voice aktivieren" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml index bcf4b91527..ede14a37d7 100644 --- a/indra/newview/skins/default/xui/de/inspect_object.xml +++ b/indra/newview/skins/default/xui/de/inspect_object.xml @@ -38,7 +38,7 @@ Besitzer secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about http://www.superdupertest.com </text> <button label="Kaufen" name="buy_btn"/> - <button label="Zahlen" name="pay_btn"/> + <button label="Bezahlen" name="pay_btn"/> <button label="Kopie nehmen" name="take_free_copy_btn" width="100"/> <button label="Berühren" name="touch_btn"/> <button label="Sitzen" name="sit_btn"/> diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml index 33cff066a2..d234443fae 100644 --- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml @@ -12,6 +12,6 @@ <menu_item_call label="Hinauswerfen" name="Eject..."/> <menu_item_call label="Debug" name="Debug..."/> <menu_item_call label="Hineinzoomen" name="Zoom In"/> - <menu_item_call label="Zahlen" name="Pay..."/> + <menu_item_call label="Bezahlen" name="Pay..."/> <menu_item_call label="Objektprofil" name="Object Inspect"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml index 85db648119..05eade1d34 100644 --- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml @@ -12,5 +12,5 @@ <menu_item_call label="Hinauswerfen" name="Eject..."/> <menu_item_call label="Debug" name="Debug..."/> <menu_item_call label="Hineinzoomen" name="Zoom In"/> - <menu_item_call label="Zahlen" name="Pay..."/> + <menu_item_call label="Bezahlen" name="Pay..."/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml index 5f9856a9cb..3a116b84a2 100644 --- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="Aufstehen" name="Stand Up"/> - <context_menu label="Ausziehen >" name="Take Off >"> - <context_menu label="Kleidung >" name="Clothes >"> + <context_menu label="Ausziehen â–¶" name="Take Off >"> + <context_menu label="Kleidung â–¶" name="Clothes >"> <menu_item_call label="Hemd" name="Shirt"/> <menu_item_call label="Hose" name="Pants"/> <menu_item_call label="Rock" name="Skirt"/> @@ -16,8 +16,8 @@ <menu_item_call label="Alpha" name="Self Alpha"/> <menu_item_call label="Alle Kleider" name="All Clothes"/> </context_menu> - <context_menu label="HUD >" name="Object Detach HUD"/> - <context_menu label="Abnehmen >" name="Object Detach"/> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="Abnehmen â–¶" name="Object Detach"/> <menu_item_call label="Alles abnehmen" name="Detach All"/> </context_menu> <menu_item_call label="Mein Aussehen" name="Appearance..."/> diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml index 9b6a6b2c4a..6f003dc9a5 100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml @@ -14,5 +14,6 @@ <menu_item_call label="Debug" name="debug"/> <menu_item_call label="Auf Karte anzeigen" name="find_on_map"/> <menu_item_call label="Hineinzoomen" name="zoom_in"/> - <menu_item_call label="Zahlen" name="pay"/> + <menu_item_call label="Bezahlen" name="pay"/> + <menu_item_call label="Teilen" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml index 5efee8617b..634ef0b198 100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml @@ -2,7 +2,7 @@ <menu name="Gear Menu"> <menu_item_call label="Berühren" name="touch"/> <menu_item_call label="Sitzen" name="sit"/> - <menu_item_call label="Zahlen" name="pay"/> + <menu_item_call label="Bezahlen" name="pay"/> <menu_item_call label="Kaufen" name="buy"/> <menu_item_call label="Nehmen" name="take"/> <menu_item_call label="Kopie nehmen" name="take_copy"/> diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml index 77c012d045..a0625d88a8 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory.xml @@ -2,7 +2,7 @@ <menu name="Popup"> <menu_item_call label="Kaufen" name="Task Buy"/> <menu_item_call label="Öffnen" name="Task Open"/> - <menu_item_call label="Wiedergeben/Abspielen" name="Task Play"/> + <menu_item_call label="Abspielen" name="Task Play"/> <menu_item_call label="Eigenschaften" name="Task Properties"/> <menu_item_call label="Umbenennen" name="Task Rename"/> <menu_item_call label="Löschen" name="Task Remove"/> @@ -65,8 +65,8 @@ <menu_item_call label="Konferenz-Chat starten" name="Conference Chat Folder"/> <menu_item_call label="Wiedergeben/Abspielen" name="Sound Play"/> <menu_item_call label="Landmarken-Info" name="About Landmark"/> - <menu_item_call label="In Welt abspielen" name="Animation Play"/> - <menu_item_call label="Lokal wiedergeben" name="Animation Audition"/> + <menu_item_call label="Inworld abspielen" name="Animation Play"/> + <menu_item_call label="Lokal abspielen" name="Animation Audition"/> <menu_item_call label="Instant Message senden" name="Send Instant Message"/> <menu_item_call label="Teleport anbieten..." name="Offer Teleport..."/> <menu_item_call label="Konferenz-Chat starten" name="Conference Chat"/> diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml index 448b1d80bf..531edc02f1 100644 --- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml @@ -20,7 +20,7 @@ <menu_item_call label="Neue Handschuhe" name="New Gloves"/> <menu_item_call label="Neues Unterhemd" name="New Undershirt"/> <menu_item_call label="Neue Unterhose" name="New Underpants"/> - <menu_item_call label="Alpha: Neu" name="New Alpha"/> + <menu_item_call label="Neues Alpha" name="New Alpha"/> <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> </menu> <menu label="Neue Körperteile" name="New Body Parts"> diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 6f8d85ecb8..8bb7b66482 100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml @@ -5,21 +5,23 @@ <menu_item_call label="Bauen" name="Build"/> <menu_item_call label="Öffnen" name="Open"/> <menu_item_call label="Hier sitzen" name="Object Sit"/> + <menu_item_call label="Aufstehen" name="Object Stand Up"/> <menu_item_call label="Objektprofil" name="Object Inspect"/> <menu_item_call label="Hineinzoomen" name="Zoom In"/> - <context_menu label="Anziehen >" name="Put On"> + <context_menu label="Anziehen â–¶" name="Put On"> <menu_item_call label="Anziehen" name="Wear"/> - <context_menu label="Anhängen >" name="Object Attach"/> - <context_menu label="HUD anhängen >" name="Object Attach HUD"/> + <context_menu label="Anhängen â–¶" name="Object Attach"/> + <context_menu label="HUD anhängen â–¶" name="Object Attach HUD"/> </context_menu> - <context_menu label="Entfernen >" name="Remove"> - <menu_item_call label="Nehmen" name="Pie Object Take"/> + <context_menu label="Entfernen â–¶" name="Remove"> <menu_item_call label="Missbrauch melden" name="Report Abuse..."/> <menu_item_call label="Ignorieren" name="Object Mute"/> <menu_item_call label="Zurückgeben" name="Return..."/> <menu_item_call label="Löschen" name="Delete"/> </context_menu> + <menu_item_call label="Kaufen" name="Pie Object Bye"/> + <menu_item_call label="Nehmen" name="Pie Object Take"/> <menu_item_call label="Kopie nehmen" name="Take Copy"/> - <menu_item_call label="Zahlen" name="Pay..."/> + <menu_item_call label="Bezahlen" name="Pay..."/> <menu_item_call label="Kaufen" name="Buy..."/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml index 15c957cee3..5ca4eaaa50 100644 --- a/indra/newview/skins/default/xui/de/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml @@ -7,7 +7,7 @@ <menu_item_call label="IM" name="IM"/> <menu_item_call label="Anrufen" name="Call"/> <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Zahlen" name="Pay"/> + <menu_item_call label="Bezahlen" name="Pay"/> <menu_item_check label="Voice ignorieren" name="Block/Unblock"/> <menu_item_check label="Text ignorieren" name="MuteText"/> <context_menu label="Moderator-Optionen >" name="Moderator Options"> diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml index 87f43d27e6..76225ba241 100644 --- a/indra/newview/skins/default/xui/de/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_call label="Ansichts-Info" name="View Info"/> + <menu_item_call label="Info anzeigen" name="View Info"/> <menu_item_call label="Chat" name="Chat"/> <menu_item_call label="Anrufen" name="Call"/> <menu_item_call label="Aktivieren" name="Activate"/> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml index 9fa5db5fa3..1db964357f 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml @@ -2,10 +2,12 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Profil anzeigen" name="View Profile"/> <menu_item_call label="Freund hinzufügen" name="Add Friend"/> + <menu_item_call label="Freund entfernen" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Anrufen" name="Call"/> + <menu_item_call label="Karte" name="Map"/> <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Zahlen" name="Pay"/> + <menu_item_call label="Bezahlen" name="Pay"/> <menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/> <menu_item_call label="Teleport anbieten" name="teleport"/> </context_menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml index d572a8ca1c..d978d9e40c 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> <menu_item_call label="Freunde hinzufügen" name="Add Friends"/> + <menu_item_call label="Freunde entfernen" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Anrufen" name="Call"/> <menu_item_call label="Teilen" name="Share"/> - <menu_item_call label="Zahlen" name="Pay"/> + <menu_item_call label="Bezahlen" name="Pay"/> </context_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 d0881ddd05..0f252ab46d 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 @@ -3,6 +3,6 @@ <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="Profilbilder anzeigen" name="view_icons"/> - <menu_item_call label="Zeige geblockte Einwohner & Objekte" name="show_blocked_list"/> + <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> + <menu_item_call label="Ignorierte Einwohner & Objekte anzeigen" name="show_blocked_list"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml index 837983b716..1ef020f5e1 100644 --- a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_check label="Nach aktuellesten Objekten sortieren" name="sort_most"/> + <menu_item_check label="Nach aktuellesten Sprechern sortieren" name="sort_most"/> <menu_item_check label="Nach Name sortieren" name="sort_name"/> <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> <menu_item_call label="Ignorierte Einwohner & Objekte anzeigen" name="show_blocked_list"/> diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml index f5cedf5464..03bc19aa3f 100644 --- a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="profile_overflow_menu"> - <menu_item_call label="Zahlen" name="pay"/> + <menu_item_call label="Bezahlen" name="pay"/> <menu_item_call label="Teilen" name="share"/> + <menu_item_call label="Ignorieren" name="block"/> + <menu_item_call label="Freischalten" name="unblock"/> <menu_item_call label="Hinauswerfen" name="kick"/> <menu_item_call label="Einfrieren" name="freeze"/> <menu_item_call label="Auftauen" name="unfreeze"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index c6bbea285f..c628cb4b61 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -9,8 +9,8 @@ <menu_item_call label="Mein Profil" name="Profile"/> <menu_item_call label="Mein Aussehen" name="Appearance"/> <menu_item_check label="Mein Inventar" name="Inventory"/> - <menu_item_call label="Inventar auf Seitenleiste anzeigen" name="ShowSidetrayInventory"/> - <menu_item_call label="Meine Gesten" name="Gestures"/> + <menu_item_check label="Mein Inventar" name="ShowSidetrayInventory"/> + <menu_item_check label="Meine Gesten" name="Gestures"/> <menu label="Mein Status" name="Status"> <menu_item_call label="Abwesend" name="Set Away"/> <menu_item_call label="Beschäftigt" name="Set Busy"/> @@ -22,13 +22,12 @@ <menu label="Unterhalten" name="Communicate"> <menu_item_call label="Meine Freunde" name="My Friends"/> <menu_item_call label="Meine Gruppen" name="My Groups"/> - <menu_item_check label="Lokaler Chat" name="Nearby Chat"/> + <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="Medien in der Nähe" name="Nearby Media"/> </menu> <menu label="Welt" name="World"> <menu_item_check label="Minikarte" name="Mini-Map"/> - <menu_item_check label="Weltkarte" name="World Map"/> + <menu_item_check label="Karte" name="World Map"/> <menu_item_call label="Foto" name="Take Snapshot"/> <menu_item_call label="Landmarke für diesen Ort setzen" name="Create Landmark Here"/> <menu label="Ortsprofil" name="Land"> @@ -40,6 +39,12 @@ <menu label="Anzeigen" name="LandShow"> <menu_item_check label="Bewegungssteuerung" name="Movement Controls"/> <menu_item_check label="Ansichtsteuerung" name="Camera Controls"/> + <menu_item_check label="Bannlinien" name="Ban Lines"/> + <menu_item_check label="Strahlen" name="beacons"/> + <menu_item_check label="Grundstücksgrenzen" name="Property Lines"/> + <menu_item_check label="Landeigentümer" name="Land Owners"/> + <menu_item_check label="Koordinaten" name="Coordinates"/> + <menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/> </menu> <menu_item_call label="Teleport nach Hause" name="Teleport Home"/> <menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/> @@ -55,11 +60,11 @@ <menu label="Bauen" name="BuildTools"> <menu_item_check label="Bauen" name="Show Build Tools"/> <menu label="Bauwerkzeug auswählen" name="Select Tool"> - <menu_item_call label="Fokus-Werkzeug" name="Focus"/> - <menu_item_call label="Werkzeug „Bewegen“" name="Move"/> + <menu_item_call label="Fokus" name="Focus"/> + <menu_item_call label="Verschieben" name="Move"/> <menu_item_call label="Bearbeiten" name="Edit"/> - <menu_item_call label="Werkzeug „Erstellen"" name="Create"/> - <menu_item_call label="Land-Werkzeug" name="Land"/> + <menu_item_call label="Erstellen" name="Create"/> + <menu_item_call label="Land" name="Land"/> </menu> <menu label="Bearbeiten" name="Edit"> <menu_item_call label="Rückgängig" name="Undo"/> @@ -74,10 +79,12 @@ </menu> <menu_item_call label="Verknüpfung" name="Link"/> <menu_item_call label="Verknüpfung auflösen" name="Unlink"/> + <menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/> <menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/> <menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/> <menu label="Objekt" name="Object"> - <menu_item_call label="Kaufen" name="Menu Object Take"/> + <menu_item_call label="Kaufen" name="Menu Object Buy"/> + <menu_item_call label="Nehmen" name="Menu Object Take"/> <menu_item_call label="Kopie nehmen" name="Take Copy"/> <menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/> <menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/> @@ -90,25 +97,18 @@ <menu_item_call label="Skripts auf nicht ausführen einstellen" name="Set Scripts to Not Running"/> </menu> <menu label="Optionen" name="Options"> - <menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/> <menu_item_call label="Hochlade-Berechtigungen (Standard) festlegen" name="perm prefs"/> <menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/> - <menu label="Auswahl" name="Selection"> - <menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/> - <menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/> - <menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/> - </menu> - <menu label="Anzeigen" name="Show"> - <menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/> - <menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/> - <menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/> - </menu> - <menu label="Raster" name="Grid"> - <menu_item_check label="An Raster ausrichten" name="Snap to Grid"/> - <menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/> - <menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/> - <menu_item_call label="Rasteroptionen" name="Grid Options"/> - </menu> + <menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/> + <menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/> + <menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/> + <menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/> + <menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/> + <menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/> + <menu_item_check label="An Raster ausrichten" name="Snap to Grid"/> + <menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/> + <menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/> + <menu_item_call label="Rasteroptionen" name="Grid Options"/> </menu> <menu label="Verknüpfte Teile auswählen" name="Select Linked Parts"> <menu_item_call label="Nächstes Teil auswählen" name="Select Next Part"/> @@ -162,7 +162,7 @@ <menu_item_check label="Partikel" name="Particles"/> <menu_item_check label="Unebenheiten" name="Bump"/> </menu> - <menu label="Rederning-Eigenschaften" name="Rendering Features"> + <menu label="Rendering-Eigenschaften" name="Rendering Features"> <menu_item_check label="UI" name="UI"/> <menu_item_check label="Ausgewählt" name="Selected"/> <menu_item_check label="Farblich hervorgehoben" name="Highlighted"/> @@ -172,11 +172,11 @@ <menu_item_check label="FRInfo testen" name="Test FRInfo"/> <menu_item_check label="Flexible Objekte" name="Flexible Objects"/> </menu> - <menu_item_check label="Mehrer Threads ausführen" name="Run Multiple Threads"/> + <menu_item_check label="Mehrere Threads ausführen" name="Run Multiple Threads"/> <menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/> <menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/> - <menu_item_check label="IMs in lokalem Chat anzeigen" name="IMInChat"/> <menu label="Tastaturkürzel" name="Shortcuts"> + <menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/> <menu_item_check label="Suchen" name="Search"/> <menu_item_call label="Tasten freigeben" name="Release Keys"/> <menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/> @@ -219,6 +219,7 @@ <menu_item_check label="Kamera" name="Camera"/> <menu_item_check label="Wind" name="Wind"/> <menu_item_check label="FOV" name="FOV"/> + <menu_item_check label="Gütesiegel" name="Badge"/> </menu> <menu label="Info anzeigen" name="Display Info"> <menu_item_check label="Zeit anzeigen" name="Show Time"/> @@ -384,7 +385,7 @@ <menu_item_call label="Temp-Asset-Daten ausgeben" name="Dump Temp Asset Data"/> <menu_item_call label="Regions-Status speichern" name="Save Region State"/> </menu> - <menu_item_call label="Gott-Tools" name="God Tools"/> + <menu_item_call label="Gott-Werkzeuge" name="God Tools"/> </menu> <menu label="Admin" name="Deprecated"> <menu label="Objekt anhängen" name="Attach Object"/> @@ -407,7 +408,7 @@ <menu_item_call label="Offizielles Linden-Blog" name="Official Linden Blog"/> <menu_item_call label="Scripting-Portal" name="Scripting Portal"/> <menu label="Fehlermeldungen" name="Bug Reporting"> - <menu_item_call label="Allgemeine Probleme-Tracker" name="Public Issue Tracker"/> + <menu_item_call label="Allgemeiner Probleme-Tracker" name="Public Issue Tracker"/> <menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker" name="Publc Issue Tracker Help"/> <menu_item_call label="Fehlermeldungs-1x1" name="Bug Reporing 101"/> <menu_item_call label="Sicherheitsfragen" name="Security Issues"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index d94bbd8564..2db126bcb0 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -11,18 +11,29 @@ </global> <template name="okbutton"> <form> - <button name="OK" text="$yestext"/> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> </form> </template> - <template name="okignore"/> <template name="okcancelbuttons"> <form> - <button name="Cancel" text="$notext"/> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> </form> </template> - <template name="okcancelignore"/> <template name="okhelpbuttons"> <form> + <button name="OK_okhelpbuttons" text="$yestext"/> <button name="Help" text="$helptext"/> </form> </template> @@ -30,6 +41,7 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="Unbekannte Meldung" name="MissingAlert"> @@ -93,6 +105,10 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut. Änderung an Kleidung/Körperteilen speichern? <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Alles speichern"/> </notification> + <notification name="FriendsAndGroupsOnly"> + Leute, die nicht auf Ihrer Freundesliste stehen, werden nicht wissen, dass Sie deren Anrufe oder Sofortnachrichten ignoriert haben. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Wenn Sie einem anderen Einwohner, das die Erlaubnis zum Bearbeiten erteilen, dann kann dieser JEDES Objekt, das Sie inworld besitzen, verändern, löschen oder nehmen. Seien Sie SEHR vorsichtig, wenn Sie diese Erlaubnis gewähren! Möchten Sie [FIRST_NAME] [LAST_NAME] die Erlaubnis zum Bearbeiten gewähren? @@ -161,14 +177,16 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen? Möchten Sie fortfahren? <usetemplate ignoretext="Bestätigen, bevor Anhänge fallen gelassen werden" name="okcancelignore" notext="Nein" yestext="Ja"/> </notification> - <notification name="ClickUnimplemented"> - Leider ist diese Funktion noch nicht implementiert. - </notification> <notification name="JoinGroupCanAfford"> Der Beitritt zu dieser Gruppe kostet [COST] L$. Fortfahren? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Beitreten"/> </notification> + <notification name="JoinGroupNoCost"> + Sie treten der Gruppe [NAME] bei. +Fortfahren? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Beitreten"/> + </notification> <notification name="JoinGroupCannotAfford"> Der Beitritt zu dieser Gruppe kostet [COST] L$. Sie haben nicht genug L$, um dieser Gruppe beizutreten. @@ -189,15 +207,15 @@ Bitte laden Sie innerhalb von 48 Stunden Mitglieder in Ihre Gruppe ein. Wählen Sie eine bestimmte Person aus, wenn Sie für 0 L$ verkaufen. </notification> <notification name="ConfirmLandSaleChange"> - Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben. -Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert. + Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben. +Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben. <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> ACHTUNG: Wenn Sie auf An jeden verkaufen klicken, kann jeder in [SECOND_LIFE] Ihr Land kaufen, auch Einwohner in anderen Regionen. Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben. -Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert. +Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben. <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> @@ -318,7 +336,7 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten <notification name="AddClassified"> Anzeigen werden im Suchverzeichnis im Abschnitt „Anzeigen" und auf [http://secondlife.com/community/classifieds secondlife.com] für eine Woche angezeigt. Füllen Sie Ihre Anzeige aus und klicken Sie auf 'Veröffentlichen...', um sie zum Verzeichnis hinzuzufügen. -Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf 'Veröffentlichen' klicken. +Sie werden gebeten für die Anzeige zu bezahlen, wenn Sie auf 'Veröffentlichen' klicken. Wenn Sie mehr bezahlen, erscheint Ihre Anzeige weiter oben in der Liste, ebenso wenn ein Benutzer nach Ihren Suchbegriffen sucht. <usetemplate ignoretext="So wird eine neue Anzeige erstellt" name="okcancelignore" notext="Abbrechen" yestext="OK"/> </notification> @@ -336,6 +354,10 @@ Sind Sie sicher, dass Sie fortfahren wollen? Änderung an Anzeige [NAME] speichern? <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Speichern"/> </notification> + <notification name="ClassifiedInsufficientFunds"> + Sie haben nicht genügend Geld, um eine Anzeige zu erstellen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DeleteAvatarPick"> Auswahl [PICK] löschen? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> @@ -431,18 +453,17 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht. Datei [[FILE]] kann nicht geschrieben werden </notification> <notification name="UnsupportedHardware"> - Achtung: Ihr System erfüllt nicht die Mindestanforderungen von [APP_NAME]. Dies kann eine schlechte Darstellungsleistung in [APP_NAME] zur Folge haben. Bei nicht unterstützten Systemkonfigurationen kann Ihnen unsere [SUPPORT_SITE] leider nicht helfen. + Ihr Computer entspricht leider nicht den Mindestanforderungen von [APP_NAME]. Dies kann zur Folge haben, dass das Programm nicht sehr gut ausgeführt wird. Bei nicht unterstützten Systemkonfigurationen kann Ihnen unser [SUPPORT_SITE] leider nicht helfen. -MINDESTANF. -Die Seite [_URL] für weitere Informationen öffnen? +Weitere Informationen finden Sie auf [_URL]. <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=de </url> <usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/> </notification> <notification name="UnknownGPU"> - Ihr System verwendet eine uns zurzeit unbekannte Grafikkarte. -Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde. [APP_NAME] wird wahrscheinlich korrekt ausgeführt werden, jedoch sollten Sie Ihre Grafikeinstellungen anpassen, um eine bessere Darstellung zu erzielen. + Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt. +Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde. Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen. (Ich > Einstellungen > Grafik). <form name="form"> <ignore name="ignore" text="Meine Grafikkarte konnte nicht identifiziert werden."/> @@ -667,7 +688,7 @@ Ihre Suchanfrage: [FINALQUERY] Es wurde keine Suche durchgeführt. </notification> <notification name="CouldNotTeleportReason"> - Teleport fehlgeschlagen. + Teleport ist fehlgeschlagen. [REASON] </notification> <notification name="invalid_tport"> @@ -768,14 +789,6 @@ Mehrere Parzellen ausgewählt. Wählen Sie eine einzelne Parzelle. </notification> - <notification name="ParcelCanPlayMedia"> - Dieser Ort kann Streaming-Medien abspielen. -Streaming-Medien erfordern eine schnelle Internet-Verbindung. - -Streaming-Medien abspielen, wenn verfügbar? -(Sie können diese Option später unter Einstellungen > Datenschutz ändern.) - <usetemplate name="okcancelbuttons" notext="Deaktivieren" yestext="Medien wiedergeben"/> - </notification> <notification name="CannotDeedLandWaitingForServer"> Land kann nicht übertragen werden: Warte auf Server für Eigentümerinformationen. @@ -898,9 +911,8 @@ Land zusammenlegen? Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen Minuten noch einmal an und speichern Sie es erneut. </notification> <notification name="YouHaveBeenLoggedOut"> - Sie wurden von [SECOND_LIFE] abgemeldet: + Es tut uns leid! Sie wurden von [SECOND_LIFE] abgemeldet. [MESSAGE] -Klicken Sie auf „IM & Chat anzeigen“, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Um [APP_NAME] zu schließen, auf „Beenden“ klicken. <usetemplate name="okcancelbuttons" notext="Beenden" yestext="IM & Chat anzeigen"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -908,13 +920,13 @@ Klicken Sie auf „IM & Chat anzeigen“, um vorhandene Nachrichten und Chat Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen. </notification> <notification label="Freund hinzufügen" name="AddFriend"> - Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen. + Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu sehen und den Online-Status anzuzeigen. [NAME] Freundschaft anbieten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification label="Freund hinzufügen" name="AddFriendWithMessage"> - Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen. + Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu sehen und den Online-Status anzuzeigen. [NAME] Freundschaft anbieten? <form name="form"> @@ -1058,6 +1070,7 @@ Der Gruppe „[GROUP_NAME]“ </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> Ihr gewünschter Zielort ist zurzeit nicht verfügbar. @@ -1068,9 +1081,9 @@ Sie wurden zur nächstgelegenen Region teleportiert. Sie wurden zur nächstgelegenen Region teleportiert. </notification> <notification name="AvatarMovedHome"> - Ihr Heimatort ist zurzeit nicht verfügbar. + Ihr Zuhause ist zurzeit nicht verfügbar. Sie wurden zur nächstgelegenen Region teleportiert. -Sie müssen eventuell einen neuen Heimatort festlegen. +Sie müssen eventuell ein neues Zuhause festlegen. </notification> <notification name="ClothingLoading"> Ihre Kleidung wird noch heruntergeladen. @@ -1301,8 +1314,8 @@ Diese Gruppe verlassen? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ConfirmKick"> - Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen? - <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/> + Möchten Sie WIRKLICH alle Einwohner aus dem Grid werfen? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Einwohner hinauswerfen"/> </notification> <notification name="MuteLinden"> Lindens können nicht ignoriert werden. @@ -1335,7 +1348,6 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht <notification name="JoinedTooManyGroupsMember"> Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab. [NAME] hat Sie eingeladen, einer Gruppe beizutreten. -[INVITE] <usetemplate name="okcancelbuttons" notext="Ablehnen" yestext="Beitreten"/> </notification> <notification name="JoinedTooManyGroups"> @@ -1343,7 +1355,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> - Beim Hinauswerfen dieses Benutzers welche Meldung anzeigen? + Beim Hinauswerfen dieses Einwohners welche Meldung anzeigen? <form name="form"> <input name="message"> Sie wurden von einem Administrator abgemeldet. @@ -1363,7 +1375,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht </form> </notification> <notification name="FreezeUser"> - Beim Einfrieren dieses Benutzers welche Meldung anzeigen? + Beim Einfrieren dieses Einwohners welche Meldung anzeigen? <form name="form"> <input name="message"> Sie wurden eingefroren. Bewegen oder Chatten ist nicht mehr möglich. Ein Administrator wird sich über IM an Sie wenden @@ -1373,7 +1385,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht </form> </notification> <notification name="UnFreezeUser"> - Beim Auftauen dieses Benutzers welche Meldung anzeigen? + Beim Auftauen dieses Einwohners welche Meldung anzeigen? <form name="form"> <input name="message"> Sie sind nicht mehr eingefroren. @@ -1393,7 +1405,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht </form> </notification> <notification name="OfferTeleportFromGod"> - Benutzer an Ihrem Standort herbeirufen? + Einwohner an Ihrem Standort herbeirufen? <form name="form"> <input name="message"> Triff mich in [REGION] @@ -1403,7 +1415,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht </form> </notification> <notification name="TeleportFromLandmark"> - Möchten Sie sich wirklich teleportieren? + Sind Sie sicher, dass Sie zu <nolink>[LOCATION]</nolink> teleportieren möchten? <usetemplate ignoretext="Bestätigen, dass ich zu einer Landmarke teleportieren möchte" name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/> </notification> <notification name="TeleportToPick"> @@ -1423,9 +1435,9 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht </form> </notification> <notification label="Linden-Grundstück ändern" name="ChangeLindenEstate"> - Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern. + Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Grid, Orientation, usw.) zu verändern. -Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen auf das Benutzererlebnis hat. Auf dem Mainland werden tausende Regionen geändert, was den Spaceserver stark belastet. +Dies hat EXTREME KONSEQUENZEN und wirkt sich auf die Einwohner aus! Auf dem Mainland kann dies zu Veränderungen in Tausenden von Regionen und zu Problemen mit dem Spaceserver führen! Fortfahren? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> @@ -1728,9 +1740,9 @@ Inventarobjekt(e) verschieben? <usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] and [http://secondlife.com/corporate/cs.php Community-Standards] melden. + Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] und [http://secondlife.com/corporate/cs.php Community-Standards] melden. -Alle gemeldeten Verstöße werden bearbeitet. Sie können auf der Seite [http://secondlife.com/support/incidentreport.php Verstoßmeldungen] nachverfolgen, welche Verstoßmeldungen bearbeitet wurden. +Alle gemeldeten Verstöße werden bearbeitet. </notification> <notification name="HelpReportAbuseSelectCategory"> Wählen Sie eine Missbrauchskategorie aus. @@ -2049,9 +2061,9 @@ Wählen Sie ein einzelnes Objekt aus. Ihre Visitenkarte wurde abgelehnt. </notification> <notification name="TeleportToLandmark"> - Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Landmarken“ auswählen. -Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf „Teleport“ unten in der Konsole. -(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleport“ auswählen). + Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Meine Landmarken“ auswählen. +Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf unten in der Registerkarte auf „Teleportieren“. +(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleportieren“ auswählen). </notification> <notification name="TeleportToPerson"> Sie können Einwohner wie „[NAME]“ kontaktieren, wenn Sie die Tafel „Leute“ auf der rechten Seite Ihres Bildschirms öffnen. @@ -2066,7 +2078,7 @@ Wählen Sie eine kleinere Landfläche. Einige Begriffe in Ihrer Suchanfrage wurden ausgeschlossen, aufgrund von in den Community Standards definierten Inhaltsbeschränkungen. </notification> <notification name="NoContentToSearch"> - Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Allgemein, Moderat oder Adult). + Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Generell, Moderat oder Adult). </notification> <notification name="GroupVote"> [NAME] hat eine Abstimmung vorgeschlagen über: @@ -2140,7 +2152,7 @@ Nicht transferierbare an die Gruppe übertragene Objekte wurden gelöscht. </notification> <notification name="ServerObjectMessage"> Nachricht von [NAME]: -[MSG] +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> Auf diesem Land ist Schaden aktiviert. @@ -2188,10 +2200,10 @@ Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regione Die für den Zutritt zu dieser Region erforderlichen Zahlungsinformationen liegen nicht vor. </notification> <notification name="MustGetAgeRgion"> - Sie müssen alterüberprüft sein, um diese Region betreten zu können. + Sie müssen altersüberprüft sein, um diese Region betreten zu können. </notification> <notification name="MustGetAgeParcel"> - Sie müssen alterüberprüft sein, um diese Parzelle betreten zu können. + Sie müssen altersüberprüft sein, um diese Parzelle betreten zu können. </notification> <notification name="NoDestRegion"> Keine Zielregion gefunden. @@ -2320,7 +2332,6 @@ Versuchen Sie es in einigen Minuten erneut. <form name="form"> <button name="Accept" text="Akzeptieren"/> <button name="Decline" text="Ablehnen"/> - <button name="Send IM" text="IM senden"/> </form> </notification> <notification name="FriendshipOffered"> @@ -2341,6 +2352,12 @@ Versuchen Sie es in einigen Minuten erneut. <notification name="FriendshipDeclined"> [NAME] hat Ihr Freundschaftsangebot abgelehnt. </notification> + <notification name="FriendshipAcceptedByMe"> + Ihr Freundschaftsangebot wurde angeommen. + </notification> + <notification name="FriendshipDeclinedByMe"> + Ihr Freundschaftsangebot wurde abgelehnt. + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] bietet Ihnen ihre/seine Visitenkarte an. Ihrem Inventar wird ein Lesezeichen erstellt, damit Sie diesem Einwohner einfach eine IM schicken können. @@ -2350,7 +2367,7 @@ Ihrem Inventar wird ein Lesezeichen erstellt, damit Sie diesem Einwohner einfach </form> </notification> <notification name="RegionRestartMinutes"> - Diese Region wird in [Minuten] neu gestartet. + Diese Region wird in [MINUTES] neu gestartet. Wenn Sie in dieser Region bleiben, werden Sie abgemeldet. </notification> <notification name="RegionRestartSeconds"> @@ -2416,7 +2433,7 @@ Anfrage gestatten? </form> </notification> <notification name="ScriptToast"> - [FIRST] [LAST]s '[TITLE]' fordert Eingaben vom Benutzer an. + [FIRST] [LAST]s '[TITLE]' fordert Eingaben vom Einwohner an. <form name="form"> <button name="Open" text="Dialog öffnen"/> <button name="Ignore" text="Ignorieren"/> @@ -2550,7 +2567,7 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt. </notification> <notification name="ConfirmCloseAll"> Möchten Sie wirklich alle IMs schließen? - <usetemplate name="okcancelignore" notext="Abbrechen" yestext="OK"/> + <usetemplate ignoretext="Bestätigen, bevor ich alle IMs schließe." name="okcancelignore" notext="Abbrechen" yestext="OK"/> </notification> <notification name="AttachmentSaved"> Der Anhang wurde gespeichert. @@ -2600,7 +2617,7 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter [SUPPORT - Ihr Arbeitsspeicher entspricht nicht den Mindestanforderungen. </global> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> - Wenn Sie ein Stück Land besitzen, können Sie dies als Ihren Heimatort festlegen. + Wenn Sie ein Stück Land besitzen, können Sie dies als Ihr Zuhause festlegen. Ansonsten können Sie auf der Karte nachsehen und dort Ort suchen, die als „Infohub“ gekennzeichnet sind. </global> </notifications> diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml index eeb5de749d..2d140515d4 100644 --- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="block_list_panel" width="300"> - <text name="title_text" left_pad="5" width="260"> + <text left_pad="5" name="title_text" width="260"> Liste der ignorierten Einwohner </text> <scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/> diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml index 7a627e32c8..d3f89b0ad3 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -7,6 +7,11 @@ Voice-Chat-Steuerung anzeigen/ausblenden </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..9c84105254 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml index d45e28f0c8..6480b640cd 100644 --- a/indra/newview/skins/default/xui/de/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml @@ -4,20 +4,51 @@ Moderat </panel.string> <panel.string name="type_pg"> - Allgemeiner Inhalt + Genereller Inhalt </panel.string> - <text name="title" value="Informationen über Anzeige"/> + <panel.string name="l$_price"> + [PRICE] L$ + </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] teleportieren, [MAP] Karte, [PROFILE] Profil + </panel.string> + <panel.string name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + Aktiviert + </panel.string> + <panel.string name="auto_renew_off"> + Deaktiviert + </panel.string> + <text name="title" value="Anzeigen-Info"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[name]"/> - <text name="classified_location" value="[wird geladen...]"/> - <text name="content_type" value="[Inhalts-Art]"/> - <text name="category" value="[Kategorie]"/> - <check_box label="Jede Woche automatisch erneuern" name="auto_renew"/> - <text name="price_for_listing" tool_tip="Preis für Anzeige."> - [PRICE] L$ - </text> - <text name="classified_desc" value="[description]"/> + <text_editor name="classified_name" value="[name]"/> + <text name="classified_location_label" value="Standort:"/> + <text_editor name="classified_location" value="[wird geladen...]"/> + <text name="content_type_label" value="Inhaltsart:"/> + <text_editor name="content_type" value="[Inhalts-Art]"/> + <text name="category_label" value="Kategorie:"/> + <text_editor name="category" value="[Kategorie]"/> + <text name="creation_date_label" value="Erstellungsdatum:"/> + <text_editor name="creation_date" tool_tip="Erstellungsdatum" value="[date]"/> + <text name="price_for_listing_label" value="Preis für Anzeige:"/> + <text_editor name="price_for_listing" tool_tip="Preis für Anzeige." value="[price]"/> + <layout_stack name="descr_stack"> + <layout_panel name="clickthrough_layout_panel"> + <text name="click_through_label" value="Klicks:"/> + <text_editor name="click_through_text" tool_tip="Click-Through-Daten" value="[clicks]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="Autom. erneuern:"/> + <text name="auto_renew" value="Aktiviert"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="Beschreibung:"/> + <text_editor name="classified_desc" value="[description]"/> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml index a9b5da163f..0d9487e895 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> (wird nach Speichern aktualisiert) </panel.string> + <string name="publish_label"> + Veröffentlichen + </string> + <string name="save_label"> + Speichern + </string> <text name="title"> Anzeige bearbeiten </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/> + </panel> <text name="Name:"> Titel: </text> @@ -21,21 +29,20 @@ <text name="classified_location"> wird geladen... </text> - <button label="Auf aktuelle Position einstellen" name="set_to_curr_location_btn"/> - <combo_box name="content_type"> - <combo_item name="mature_ci"> - Moderater Inhalt - </combo_item> - <combo_item name="pg_ci"> - Allgemeiner Inhalt - </combo_item> - </combo_box> + <button label="Aktuellen Standort verwenden" name="set_to_curr_location_btn"/> + <text name="category_label" value="Kategorie:"/> + <text name="content_type_label" value="Inhaltsart:"/> + <icons_combo_box label="Genereller Inhalt" name="content_type"> + <icons_combo_box.item label="Moderater Inhalt" name="mature_ci" value="Moderat"/> + <icons_combo_box.item label="Genereller Inhalt" name="pg_ci" value="G"/> + </icons_combo_box> + <text name="price_for_listing_label" value="Preis für Anzeige:"/> <spinner label="L$" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/> <check_box label="Jede Woche automatisch erneuern" name="auto_renew"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="Speichern" name="save_changes_btn"/> + <button label="[LABEL]" name="save_changes_btn"/> <button label="Abbrechen" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml index 3752faf48a..950c9023fe 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_jacket_panel"> <panel name="avatar_jacket_color_panel"> - <texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> - <texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Stoff: oben" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> + <texture_picker label="Stoff: unten" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/> <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> </panel> <accordion name="wearable_accordion"> diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml index bd05a4151e..0cb14177af 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml @@ -18,7 +18,7 @@ <text name="pick_location"> wird geladen... </text> - <button label="Auf aktuelle Position einstellen" name="set_to_curr_location_btn"/> + <button label="Aktuellen Standort verwenden" name="set_to_curr_location_btn"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml index f643115dbe..bf74abaeba 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml @@ -42,13 +42,13 @@ <line_editor name="homepage_edit" value="http://"/> <check_box label="In Suchergebnissen anzeigen" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="Mein Konto:"/> + <text_editor name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/> <text name="my_account_link" value="[[URL] Meine Startseite aufrufen]"/> - <text name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/> <text name="title_partner_text" value="Mein Partner:"/> - <text name="partner_edit_link" value="[[URL] bearbeiten]"/> <panel name="partner_data_panel"> - <name_box name="partner_text" value="[FIRST] [LAST]"/> + <name_box initial_value="(wird in Datenbank gesucht)" name="partner_text" value="[FIRST] [LAST]"/> </panel> + <text name="partner_edit_link" value="[[URL] bearbeiten]"/> </panel> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml index 46bd1d9f4d..90b06a29bc 100644 --- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml @@ -8,7 +8,7 @@ <accordion name="wearable_accordion"> <accordion_tab name="skin_color_tab" title="Hautfarbe"/> <accordion_tab name="skin_face_tab" title="Gesichtsdetails"/> - <accordion_tab name="skin_makeup_tab" title="Make-Uup"/> + <accordion_tab name="skin_makeup_tab" title="Make-Up"/> <accordion_tab name="skin_body_tab" title="Körperdetails"/> </accordion> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_friends.xml b/indra/newview/skins/default/xui/de/panel_friends.xml index 10c5954775..50013a2b24 100644 --- a/indra/newview/skins/default/xui/de/panel_friends.xml +++ b/indra/newview/skins/default/xui/de/panel_friends.xml @@ -25,7 +25,7 @@ <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung"/> <button label="Profil" name="profile_btn" tool_tip="Bilder, Gruppen und andere Informationen anzeigen"/> <button label="Teleportieren" name="offer_teleport_btn" tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an"/> - <button label="Zahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben"/> + <button label="Bezahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben"/> <button label="Entfernen" name="remove_btn" tool_tip="Diese Person von Ihrer Freundesliste entfernen"/> <button label="Hinzufügen" name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index 8904193f18..f300679e16 100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml @@ -11,27 +11,45 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. <panel.string name="incomplete_member_data_str"> Mitgliedsdaten werden abgerufen </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Klicken, um ein Bild auszuwählen"/> + <text name="prepend_founded_by"> + Gründer: + </text> + <name_box initial_value="(wird in Datenbank gesucht)" name="founder_name"/> + <text name="join_cost_text"> + Kostenlos + </text> + <button label="JETZT BEITRETEN!" name="btn_join"/> + </panel> <text_editor name="charter"> Gruppencharta </text_editor> <name_list name="visible_members"> <name_list.columns label="Mitglied" name="name" relwidth="0.40"/> <name_list.columns label="Titel" name="title" relwidth="0.25"/> + <name_list.columns label="Status" name="status"/> </name_list> + <text name="my_group_settngs_label"> + Ich + </text> <text name="active_title_label"> - Mein Titel + Mein Titel: </text> <combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/> <check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können. Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/> <check_box label="In meinem Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/> <panel name="preferences_container"> - <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> - <check_box label="Beitrittsgebühr" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/> + <text name="group_settngs_label"> + Gruppe + </text> + <check_box label="Jeder kann beitreten" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/> + <check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/> <spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/> - <check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/> <combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält"> - <combo_box.item label="Allgemeiner Inhalt" name="pg"/> + <combo_box.item label="Genereller Inhalt" name="pg"/> <combo_box.item label="Moderater Inhalt" name="mature"/> </combo_box> + <check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml index f70291c922..b89e4f90de 100644 --- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Gruppeninfo" name="GroupInfo"> +<panel label="Gruppenprofil" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - In der aktuellen Registerkarte befinden sich ungesicherte Änderungen + Diese Änderungen wurden nicht gespeichert. </panel.string> <panel.string name="want_apply_text"> Möchten Sie diese Änderungen speichern? @@ -12,27 +12,24 @@ <panel.string name="group_join_free"> Kostenlos </panel.string> - <text name="group_name" value="(Lädt...)"/> - <line_editor label="Geben Sie Ihren neuen Gruppennamen hier ein" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="Klicken Sie, um ein Bild auszuwählen"/> - <text name="prepend_founded_by"> - Gründer: - </text> - <name_box initial_value="(empfange)" name="founder_name"/> - <text name="join_cost_text"> - Kostenlos - </text> - <button label="JETZT BEITRETEN!" name="btn_join"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="Allgemein"/> - <accordion_tab name="group_roles_tab" title="Rollen"/> - <accordion_tab name="group_notices_tab" title="Mitteilungen"/> - <accordion_tab name="group_land_tab" title="Land/Kapital"/> - </accordion> - <panel name="button_row"> - <button label="Erstellen" label_selected="Neue Gruppe" name="btn_create"/> - <button label="Gruppen-Chat" name="btn_chat"/> - <button label="Gruppe anrufen" name="btn_call"/> - <button label="Speichern" label_selected="Speichern" name="btn_apply"/> + <panel name="group_info_top"> + <text name="group_name" value="(wird geladen...)"/> + <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/> </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="Allgemein"/> + <accordion_tab name="group_roles_tab" title="Rollen"/> + <accordion_tab name="group_notices_tab" title="Mitteilungen"/> + <accordion_tab name="group_land_tab" title="Land/Kapital"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Chat" name="btn_chat"/> + <button label="Gruppe anrufen" name="btn_call" tool_tip="Diese Gruppe anrufen"/> + <button label="Speichern" label_selected="Speichern" name="btn_apply"/> + <button label="Gruppe erstellen" name="btn_create" tool_tip="Neue Gruppe erstellen"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml index fb357093bb..4e3a304609 100644 --- a/indra/newview/skins/default/xui/de/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml @@ -9,18 +9,18 @@ <panel.string name="already_in_group"> Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten. </panel.string> - <text name="help_text" top="10"> - Sie können mehrere Einwohner auswählen, um diese in Ihre Gruppe einzuladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“. + <text name="help_text"> + Sie können mehrere Einwohner Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“. </text> - <button label="Einwohnerliste öffnen" name="add_button" tool_tip="" top_delta="62"/> + <button label="Einwohnerliste öffnen" name="add_button" tool_tip=""/> <name_list name="invitee_list" tool_tip="Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Namen."/> <button label="Auswahl aus Liste löschen" name="remove_button" tool_tip="Die oben ausgewählten Einwohner von der Einladungsliste entfernen."/> <text name="role_text"> Wählen Sie eine Rolle aus: </text> <combo_box name="role_name" tool_tip="Wählen Sie aus der Liste der Rollen, die Sie an Mitglieder vergeben dürfen."/> - <button label="Einladungen versenden" name="ok_button" width="136"/> - <button label="Abbrechen" name="cancel_button" width="66"/> + <button label="Einladungen versenden" name="ok_button"/> + <button label="Abbrechen" name="cancel_button"/> <string name="GroupInvitation"> Gruppeneinladung </string> diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml index d6cfb22cfe..0c89946987 100644 --- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml @@ -1,65 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Land und L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen. - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen. - </string> - <string name="loading_txt"> + </panel.string> + <panel.string name="loading_txt"> Wird geladen... - </string> - <text name="group_land_heading"> - Land in Gruppenbesitz - </text> - <scroll_list name="group_parcel_list"> - <column label="Parzelle" name="name"/> - <column label="Region" name="location"/> - <column label="Typ" name="type"/> - <column label="Gebiet" name="area"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="Karte" label_selected="Karte" name="map_button"/> - <text name="total_contributed_land_label"> - Gesamtbeitrag: - </text> - <text name="total_contributed_land_value"> - [AREA] m². - </text> - <text name="total_land_in_use_label" left="28" width="180"> - Insgesamt verwendetes Land: - </text> - <text name="total_land_in_use_value"> - [AREA] m². - </text> - <text name="land_available_label" left="4"> - Land verfügbar: - </text> - <text name="land_available_value"> - [AREA] m². - </text> - <text name="your_contribution_label"> - Ihr Beitrag: - </text> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> Ihr Landbeitrag kann nicht festgelegt werden. - </string> - <text name="your_contribution_units"> - m² - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] max.) - </text> - <text name="group_over_limit_text" width="300"> - Um das benutzte Land zu unterstützen, sind weitere Landnutzungsrechte erforderlich. - </text> - <text name="group_money_heading" left="10" top_pad="10"> - Gruppen-L$ - </text> + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Parzelle" name="name"/> + <scroll_list.columns label="Region" name="location"/> + <scroll_list.columns label="Typ" name="type"/> + <scroll_list.columns label="Gebiet" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Gesamtbeitrag: + </text> + <text name="total_contributed_land_value"> + [AREA] m². + </text> + <button label="Karte" label_selected="Karte" name="map_button"/> + <text name="total_land_in_use_label"> + Insgesamt genutztes Land: + </text> + <text name="total_land_in_use_value"> + [AREA] m². + </text> + <text name="land_available_label"> + Land verfügbar: + </text> + <text name="land_available_value"> + [AREA] m². + </text> + <text name="your_contribution_label"> + Ihr Beitrag: + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([AMOUNT] max.) + </text> + <text name="group_over_limit_text"> + Um das benutzte Land zu unterstützen, sind weitere Landnutzungsrechte erforderlich. + </text> + <text name="group_money_heading"> + Gruppen-L$ + </text> + </panel> <tab_container name="group_money_tab_container"> <panel label="PLANUNG" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> @@ -82,89 +79,3 @@ </panel> </tab_container> </panel> -<!-- - -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Land und L$" name="land_money_tab"> - <string name="help_text"> - Parzellen in Gruppenbesitz werden zusammen mit Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> - Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen. - </string> - <string name="cant_view_group_accounting_text"> - Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen. - </string> - <string name="loading_txt"> - Wird geladen... - </string> - <text name="group_land_heading"> - Land in Gruppenbesitz - </text> - <scroll_list name="group_parcel_list"> - <column label="Parzellenname" name="name"/> - <column label="Region" name="location"/> - <column label="Typ" name="type"/> - <column label="Gebiet" name="area"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="Auf Karte" label_selected="Auf Karte" name="map_button"/> - <text name="total_contributed_land_label"> - Gesamtbeitrag: - </text> - <text name="total_contributed_land_value"> - [AREA] qm - </text> - <text name="total_land_in_use_label"> - Insgesamt verwendetes Land: - </text> - <text name="total_land_in_use_value"> - [AREA] qm - </text> - <text name="land_available_label"> - Land verfügbar: - </text> - <text name="land_available_value"> - [AREA] qm - </text> - <text name="your_contribution_label"> - Ihr Beitrag: - </text> - <string name="land_contrib_error"> - Ihr Landbeitrag kann nicht festgelegt werden. - </string> - <text name="your_contribution_max_value"> - qm (max. [AMOUNT]) - </text> - <text name="group_over_limit_text"> - Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit -das verwendete Land gehalten werden kann. - </text> - <text name="group_money_heading"> - Gruppen-L$ - </text> - <tab_container name="group_money_tab_container"> - <panel label="Planung" name="group_money_planning_tab"> - <text_editor name="group_money_planning_text"> - Wird berechnet... - </text_editor> - </panel> - <panel label="Details" name="group_money_details_tab"> - <text_editor name="group_money_details_text"> - Wird berechnet... - </text_editor> - <button label="< Früher" label_selected="< Früher" name="earlier_details_button" tool_tip="Zurück in der Zeit"/> - <button label="Später >" label_selected="Später >" name="later_details_button" tool_tip="Weiter in der Zeit"/> - </panel> - <panel label="Verkäufe" name="group_money_sales_tab"> - <text_editor name="group_money_sales_text"> - Wird berechnet... - </text_editor> - <button label="< Früher" label_selected="< Früher" name="earlier_sales_button" tool_tip="Zurück in der Zeit"/> - <button label="Später >" label_selected="Später >" name="later_sales_button" tool_tip="Weiter in der Zeit"/> - </panel> - </tab_container> -</panel> - ---> diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index d2ba40ae2c..cc5664bd97 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -37,9 +37,9 @@ Maximal 200 pro Gruppe täglich Anhängen: </text> <text name="string"> - Das Objekt hierin ziehen und ablegen, um es anzuhängen: + Das Objekt hierhin ziehen und ablegen, um es anzuhängen: </text> - <button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment"/> + <button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment" tool_tip="Anhang von Ihrer Benachrichtigung entfernen"/> <button label="Senden" label_selected="Senden" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Ziehen Sie ein Objekt aus Ihrem Inventar auf dieses Feld, um es mit dieser Mitteilung zu versenden. Um das Objekt anhängen zu können, müssen Sie die Erlaubnis zum Kopieren und Ãœbertragen besitzen."/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml index cb4c6cdb39..9c05e99786 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml @@ -4,7 +4,7 @@ <string name="subject_font" value="SANSSERIF_BIG"/> <string name="date_font" value="SANSSERIF"/> <panel label="Ãœberschrift" name="header"> - <text name="title" value="Name des Absenders / Gruppenname"/> + <text name="title" value="Absender/Gruppenname"/> </panel> <text_editor name="message" value="Nachricht"/> <text name="attachment" value="Anhang"/> diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml index b2e885e639..db5186e081 100644 --- a/indra/newview/skins/default/xui/de/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Mitglieder und Rollen" name="roles_tab"> <panel.string name="default_needs_apply_text"> - Die Registerkarte enthält nicht gespeicherte Änderungen. + Diese Änderungen wurden nicht gespeichert. </panel.string> <panel.string name="want_apply_text"> Möchten Sie Ihre Änderungen speichern? diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index 8132f769cb..abf8011d9d 100644 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml @@ -9,11 +9,14 @@ <button label="Freund hinzufügen" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Teleportieren" name="teleport_btn"/> + <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> diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml index 3336232782..db12462a31 100644 --- a/indra/newview/skins/default/xui/de/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/de/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Favoritenleiste"/> - <accordion_tab name="tab_landmarks" title="Landmarken"/> + <accordion_tab name="tab_landmarks" title="Meine Landmarken"/> <accordion_tab name="tab_inventory" title="Mein Inventar"/> <accordion_tab name="tab_library" title="Bibliothek"/> </accordion> diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index aa0b43b550..7d57a3b3f2 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -44,7 +44,7 @@ <menu_item_call label="Neue Handschuhe" name="New Gloves"/> <menu_item_call label="Neues Unterhemd" name="New Undershirt"/> <menu_item_call label="Neue Unterhose" name="New Underpants"/> - <menu_item_call label="Alpha: Neu" name="New Alpha"/> + <menu_item_call label="Neues Alpha" name="New Alpha"/> <menu_item_call label="Neue Tätowierung" name="New Tattoo"/> </menu> <menu label="Neue Körperteile" name="New Body Parts"> @@ -57,7 +57,7 @@ <menu label="Sortieren" name="Sort"> <menu_item_check label="Nach Name" name="By Name"/> <menu_item_check label="Nach Datum" name="By Date"/> - <menu_item_check label="Ordner immer nach Name" name="Folders Always By Name"/> + <menu_item_check label="Ordner immer nach Namen" name="Folders Always By Name"/> <menu_item_check label="Systemordner nach oben" name="System Folders To Top"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml index c61fc26f4c..26b9812212 100644 --- a/indra/newview/skins/default/xui/de/panel_me.xml +++ b/indra/newview/skins/default/xui/de/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Mein Profil" name="panel_me"> <tab_container name="tabs"> - <panel label="PROFIL" name="panel_profile"/> - <panel label="AUSWAHL" name="panel_picks"/> + <panel label="MEIN PROFIL" name="panel_profile"/> + <panel label="MEINE AUSWAHL" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_my_profile.xml b/indra/newview/skins/default/xui/de/panel_my_profile.xml index 618ed88846..55eed89848 100644 --- a/indra/newview/skins/default/xui/de/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_my_profile.xml @@ -30,11 +30,14 @@ </panel> <text name="title_member_text" value="Einwohner seit:"/> <text name="title_acc_status_text" value="Kontostatus:"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> Einwohner. Keine Zahlungsinfo archiviert. Linden. - </text> + </text_editor> <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(wird in Datenbank gesucht)" name="partner_text"/> + </panel> <text name="title_groups_text" value="Gruppen:"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml index ab59c207bf..99293edd0f 100644 --- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <button name="back_btn" tool_tip="Zurück zum vorherigen Standort gehen"/> - <button name="forward_btn" tool_tip="Um einen Standort weiter gehen"/> - <button name="home_btn" tool_tip="Zu meinem Heimatort teleportieren"/> + <pull_button name="back_btn" tool_tip="Zurück zum vorherigen Standort gehen"/> + <pull_button name="forward_btn" tool_tip="Um einen Standort weiter gehen"/> + <button name="home_btn" tool_tip="Zu meinem Zuhause teleportieren"/> <location_input label="Standort" name="location_combo"/> <search_combo_box label="Suche" name="search_combo_box" tool_tip="Suche"> <combo_editor label="[SECOND_LIFE] durchsuchen" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite"> + <favorites_bar name="favorite" tool_tip="Ziehen Sie Landmarken hier hin, damit Sie schnell zu Ihren Lieblingsplätzen in Second Life gelangen können!"> + <label name="favorites_bar_label" tool_tip="Ziehen Sie Landmarken hier hin, damit Sie schnell zu Ihren Lieblingsplätzen in Second Life gelangen können!"> + Favoritenleiste + </label> <chevron_button name=">>" tool_tip="Mehr meiner Favoriten anzeigen"/> </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml index 5e6e460c65..08cc0b0ec8 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <string name="min_width"> - 192 - </string> - <string name="max_width"> - 320 - </string> <line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/> <button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml new file mode 100644 index 0000000000..2d97a25fa9 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <leer> + </string> + <string name="parcel_media_name"> + Streaming-Medien auf Parzelle + </string> + <string name="parcel_audio_name"> + Streaming-Audio auf Parzelle + </string> + <string name="playing_suffix"> + (wird abgespielt) + </string> + <panel name="minimized_controls"> + <button label="Alle stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der Nähe ausschalten"/> + <button label="Alle starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der Nähe einschalten"/> + <button name="open_prefs_btn" tool_tip="Medien-Einstellungen öffnen"/> + <button label="Mehr >>" label_selected="Weniger <<" name="more_less_btn" tool_tip="Erweiterte Steuerung"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Alle" name="All"/> + <combo_box.item label="Auf dieser Parzelle" name="WithinParcel"/> + <combo_box.item label="Außerhalb dieser Parzelle" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="Umgebung" name="media_proximity"/> + <scroll_list.columns label="Sichtbar" name="media_visibility"/> + <scroll_list.columns label="Klasse" name="media_class"/> + <scroll_list.columns label="Name" name="media_name"/> + <scroll_list.columns label="Fehler beseitigen" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Ausgewählte Medien stoppen"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Ausgewählte Medien wiedergeben"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Ausgewählte Medien pausieren"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Lautstärke für ausgewählte Medien"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Audio für ausgewählte Medien stummschalten"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Auf ausgewählte Medien zoomen"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Von ausgewählten Medien wegzoomen"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_online_status.xml b/indra/newview/skins/default/xui/de/panel_online_status.xml new file mode 100644 index 0000000000..7c7448c061 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Freunde_online_Status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml new file mode 100644 index 0000000000..7c7448c061 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Freunde_online_Status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml index 8d2dd84512..54c56992fd 100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml @@ -2,7 +2,7 @@ <panel label="Sonstiges" name="Outfits"> <tab_container name="appearance_tabs"> <inventory_panel label="MEINE OUTFITS" name="outfitslist_tab"/> - <inventory_panel label="AKTUELLES OUTFIT" name="cof_accordionpanel"/> + <inventory_panel label="AKTUELLES OUTFIT" name="cof_tab"/> </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index 91a17e127a..cc45f25c82 100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -5,9 +5,10 @@ <string name="no_one_near" value="Keiner in der Nähe"/> <string name="no_friends_online" value="Keine Freunde online"/> <string name="no_friends" value="Keine Freunde"/> - <string name="no_groups" value="Keine Gruppen"/> <string name="people_filter_label" value="Nach Leuten filtern"/> <string name="groups_filter_label" value="Nach Gruppen filtern"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Suche verwenden, um die Gruppe zu finden?]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Suche verwenden, um Gruppen zu finden?]"/> <filter_editor label="Filter" name="filter_input"/> <tab_container name="tabs"> <panel label="IN DER NÄHE" name="nearby_panel"> @@ -16,7 +17,7 @@ <button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/> </panel> </panel> - <panel label="FREUNDE" name="friends_panel"> + <panel label="MEINE FREUNDE" name="friends_panel"> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Alle"/> @@ -26,8 +27,12 @@ <button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/> <button name="del_btn" tool_tip="Ausgewählte Person von Ihrer Freundesliste entfernen"/> </panel> + <text name="no_friends_msg"> + Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie mit rechts auf einen Einwohner und fügen Sie diesen als Freund hinzu. +Wenn Sie nach Orten suchen, an denen sich Leute befinden, verwenden Sie [secondlife:///app/worldmap die Karte]. + </text> </panel> - <panel label="GRUPPEN" name="groups_panel"> + <panel label="MEINE GRUPPEN" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="groups_viewsort_btn" tool_tip="Optionen"/> <button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/> 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 94a43833bf..82e5febf8d 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="verfügbar"/> <string name="allocated" value="vergeben"/> <string name="title_place" value="Ortsprofil"/> - <string name="title_teleport_history" value="Speicherort der Teleport-Liste"/> + <string name="title_teleport_history" value="Teleport-Liste"/> <string name="not_available" value="k.A."/> <string name="unknown" value="(unbekannt)"/> <string name="public" value="(öffentlich)"/> @@ -68,7 +68,7 @@ <text name="maturity_value" value="unbekannt"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parzelle"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Einstufung:"/> <text name="rating_value" value="unbekannt"/> <text name="voice_label" value="Voice:"/> @@ -83,11 +83,11 @@ <text name="scripts_value" value="Ein"/> <text name="damage_label" value="Schaden:"/> <text name="damage_value" value="Aus"/> - <button label="Ãœber Land" name="about_land_btn"/> + <button label="Land-Info" name="about_land_btn"/> </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Region"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Region:"/> <text name="region_name" value="Mooseland"/> <text name="region_type_label" value="Typ:"/> @@ -104,7 +104,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Grundstück"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Grundstück:"/> <text name="estate_rating_label" value="Einstufung:"/> <text name="estate_owner_label" value="Eigentümer:"/> @@ -112,7 +112,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="Zum Verkauf"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Preis:"/> <text name="area_label" value="Gebiet:"/> <text name="traffic_label" value="Traffic:"/> diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml index 0b3ed26dce..2215ea3988 100644 --- a/indra/newview/skins/default/xui/de/panel_places.xml +++ b/indra/newview/skins/default/xui/de/panel_places.xml @@ -2,14 +2,14 @@ <panel label="Orte" name="places panel"> <string name="landmarks_tab_title" value="MEINE LANDMARKEN"/> <string name="teleport_history_tab_title" value="TELEPORT-LISTE"/> - <filter_editor label="Orte filtern" name="Filter"/> + <filter_editor label="Meine Orte filtern" name="Filter"/> <panel name="button_panel"> <button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/> <button label="Karte" name="map_btn" width="60"/> <button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/> - <button name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/> - <button label="Schließen" name="close_btn"/> - <button label="Abbrechen" name="cancel_btn" width="66"/> + <button label="â–¼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/> <button label="Speichern" name="save_btn" width="66"/> + <button label="Abbrechen" name="cancel_btn" width="66"/> + <button label="Schließen" name="close_btn"/> </panel> </panel> 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 c9d6faf3ba..78c495e377 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -1,48 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> +<panel label="Erweitert" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Blasen-Chat" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Farbe für Blasen-Chat auswählen"/> - <slider label="Deckkraft" name="bubble_chat_opacity" label_width="66"/> - <text name="AspectRatioLabel1" tool_tip="Breite/Höhe"> - Seitenverhältnis - </text> - <combo_box name="aspect_ratio" tool_tip="Breite/Höhe"> - <combo_box.item label="4:3 (Standard-CRT)" name="item1"/> - <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (Widescreen)" name="item3"/> - <combo_box.item label="16:9 (Widescreen)" name="item4"/> - </combo_box> - <check_box label="Automatisch erkennen" name="aspect_auto_detect"/> - <text name="heading1"> - Kamera: - </text> <slider label="Sichtwinkel" name="camera_fov"/> <slider label="Abstand" name="camera_offset_scale"/> <text name="heading2"> - Automatische Positionierung: + Automatische Position für: </text> <check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/> <check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/> - <text name="heading3"> - Avatare: - </text> <check_box label="Mich im Mouselook anzeigen" name="first_person_avatar_visible"/> <check_box label="Mit Pfeiltasten bewegen" name="arrow_keys_move_avatar_check"/> <check_box label="2-mal-drücken-halten, um zu rennen" name="tap_tap_hold_to_run"/> <check_box label="Avatarlippen beim Sprechen bewegen" name="enable_lip_sync"/> - <check_box label="Skript-Fehler anzeigen" name="show_script_errors"/> + <check_box label="Blasen-Chat" name="bubble_text_chat"/> + <slider label="Deckkraft" label_width="66" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Farbe für Blasen-Chat auswählen" left_pad="35"/> + <check_box label="Skript-Fehler anzeigen:" name="show_script_errors"/> <radio_group name="show_location"> - <radio_item label="In Chat" name="0"/> - <radio_item label="In einem Fenster" name="1"/> + <radio_item label="Chat in der Nähe" name="0"/> + <radio_item label="Getrenntes Fenster" name="1"/> </radio_group> - <check_box label="Umschaltmodus für Mikrofon, wenn die Auslöste-Taste zum Sprechen gedrückt wird:" name="push_to_talk_toggle_check" tool_tip="Wenn der Umschaltmodus aktiviert ist, drücken Sie die Auslöse-Taste EINMAL, um Ihr Mikrofon an oder aus zu stellen. Wenn der Umschaltmodus nicht motiviert ist, ist das Mikro nur dann eingeschaltet, wenn Sie die Auslösetaste gedrückt halten."/> + <check_box label="Sprachfunktion ein-/ausschalten, wenn gedrückt wird:" name="push_to_talk_toggle_check" tool_tip="Wenn der Umschaltmodus aktiviert ist, drücken Sie die Auslöse-Taste EINMAL, um Ihr Mikrofon an oder aus zu stellen. Wenn der Umschaltmodus nicht motiviert ist, ist das Mikro nur dann eingeschaltet, wenn Sie die Auslösetaste gedrückt halten."/> <line_editor label="Auslöser für Zum-Sprechen-drücken:" name="modifier_combo"/> <button label="Taste festlegen" name="set_voice_hotkey_button"/> - <button label="Mittlere Maustaste" name="set_voice_middlemouse_button"/> + <button label="Mittlere Maustaste" name="set_voice_middlemouse_button" tool_tip="Auf mittlere Maustaste zurücksetzen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml index def5fb3b1b..0a0534c739 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml @@ -4,11 +4,11 @@ Anzeigen: </text> <check_box label="Wenn ich Geld ausgebe oder L$ erhalte" name="notify_money_change_checkbox"/> - <check_box label="Wenn meinen Freund sich an- oder abmelden" name="friends_online_notify_checkbox"/> + <check_box label="Wenn meine Freunde sich an- oder abmelden" name="friends_online_notify_checkbox"/> <text name="show_label"> - Diese Warnhinweise immer anzeigen: + Immer anzeigen: </text> <text name="dont_show_label"> - Diese Benachrichtungen nie anzeigen: + Niemals anzeigen: </text> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index cc0a09c06c..45b560c759 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text-Chat" name="chat"> + <text name="font_size"> + Schriftgröße: + </text> <radio_group name="chat_font_size"> <radio_item label="Klein" name="radio" value="0"/> <radio_item label="Mittel" name="radio2" value="1"/> <radio_item label="Groß" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Schriftfarben: + </text> <color_swatch label="Sie" name="user"/> <text name="text_box1"> Ich @@ -39,9 +45,9 @@ </text> <check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/> <check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/> - <check_box label="Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> - <radio_group name="chat_window" tool_tip="Zeigen sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit viele Registerkarten an (Neustart erforderlich)."> - <radio_item label="Mehrere Fenster" name="radio" value="0"/> - <radio_item label="Ein Fenster" name="radio2" value="1"/> + <check_box label="Kompakten Text-Chatverlauf aktivieren" name="plain_text_chat_history"/> + <radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit viele Registerkarten an (Neustart erforderlich)."> + <radio_item label="Getrennte Fenster" name="radio" value="0"/> + <radio_item label="Registerkarten" name="radio2" value="1"/> </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 2af1b72472..b59a779853 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -20,20 +20,20 @@ (Erfordert Neustart) </text> <text name="maturity_desired_prompt" width="350"> - Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen: + Ich möchte auf Inhalt mit folgender Einstufung zugreifen: </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="Allgemein, Moderat, Adult" name="Desired_Adult"/> - <combo_box.item label="Allgemein und Moderat" name="Desired_Mature"/> - <combo_box.item label="Allgemein" name="Desired_PG"/> + <combo_box.item label="Generell, Moderat, Adult" name="Desired_Adult"/> + <combo_box.item label="Generell und Moderat" name="Desired_Mature"/> + <combo_box.item label="Generell" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> Startstandort: </text> <combo_box name="start_location_combo"> <combo_box.item label="Mein letzter Standort" name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden."/> - <combo_box.item label="Mein Heimatort" name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden."/> + <combo_box.item label="Mein Zuhause" name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden."/> </combo_box> <check_box initial_value="true" label="Beim Anmelden anzeigen" name="show_location_checkbox"/> <text name="name_tags_textbox"> @@ -42,7 +42,7 @@ <radio_group name="Name_Tag_Preference"> <radio_item label="Aus" name="radio" value="0"/> <radio_item label="An" name="radio2" value="1"/> - <radio_item label="Vorübergehend anzeigen" name="radio3" value="2"/> + <radio_item label="Kurz anzeigen" name="radio3" value="2"/> </radio_group> <check_box label="Meinen Namen anzeigen" name="show_my_name_checkbox1"/> <check_box initial_value="true" label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index e7bb768925..16b4598486 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -55,7 +55,7 @@ <text name="AvatarRenderingText"> Avatar-Darstellung: </text> - <check_box initial_value="true" label="Scheinavatare" name="AvatarImpostors"/> + <check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/> <check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/> <check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/> <slider label="Sichtweite:" name="DrawDistance"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index 43664f4f8a..42a625fbf6 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> Anmelden, um Änderungen vorzunehmen </panel.string> - <button label="Verlauf leeren" name="clear_cache"/> + <button label="Cache leeren" name="clear_cache" tool_tip="Bild bei Anmeldung, letzter Standort, Teleport-Liste, Internet- und Texturen-Cache löschen"/> <text name="cache_size_label_l"> (Standorte, Bilder, Web, Suchverlauf) </text> @@ -11,8 +11,6 @@ <check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/> <check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/> <check_box label="Cookies annehmen" name="cookies_enabled"/> - <check_box label="Medien aktiviert" name="media_enabled"/> - <check_box label="Automatische Wiedergabe zulassen" name="autoplay_enabled"/> <text name="Logs:"> Protokolle: </text> @@ -20,7 +18,7 @@ <check_box label="IM Protokolle auf meinem Computer speichern" name="log_instant_messages"/> <check_box label="Zeitstempel hinzufügen" name="show_timestamps_check_im"/> <text name="log_path_desc"> - Speicherort für Protokolle: + Protokolle speichern in: </text> <button label="Durchsuchen" label_selected="Durchsuchen" name="log_path_button"/> <button label="Ignorierte Einwohner/Objekte" name="block_list" width="180"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 00be3920ca..2516cd3a40 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml @@ -18,29 +18,29 @@ kbit/s </text> <check_box label="Eigener Port" name="connection_port_enabled"/> - <spinner label="Portnummer:" name="web_proxy_port"/> + <spinner label="Port-Nummer:" name="connection_port"/> <text name="cache_size_label_l"> Cachegröße </text> <text name="text_box5"> MB </text> - <button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/> - <button label="Zurücksetzen" label_selected="Zurücksetzen" name="reset_cache"/> <text name="Cache location"> Cache-Ordner: </text> + <button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/> + <button label="Zurücksetzen" label_selected="Zurücksetzen" name="reset_cache"/> <text name="Web:"> Web: </text> <radio_group name="use_external_browser"> - <radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/> - <radio_item label="Meinen Browser verwenden (IE, Firefox)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen."/> + <radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]." value="0"/> + <radio_item label="Meinen Browser verwenden (IE, Firefox, Safari)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen." value="1"/> </radio_group> - <check_box initial_value="false" label="Web Proxy" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/> - <button label="Durchsuchen" label_selected="Durchsuchen" name="set_proxy"/> + <check_box initial_value="false" label="Web-Proxy aktivieren" name="web_proxy_enabled"/> <text name="Proxy location"> Proxy-Standort: </text> + <line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/> + <spinner label="Portnummer:" name="web_proxy_port"/> </panel> 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 2398da71d0..96a86ed85d 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sounds" name="Preference Media panel"> <slider label="Master-Lautstärke" name="System Volume"/> - <check_box initial_value="true" label="Stummschalten, wenn verkleinert" name="mute_when_minimized"/> - <slider label="Umgebung" name="Wind Volume"/> + <check_box initial_value="true" label="Stummschalten, wenn minimiert" name="mute_when_minimized"/> <slider label="Schaltflächen" name="UI Volume"/> - <slider label="Medien" name="Media Volume"/> + <slider label="Umgebung" name="Wind Volume"/> <slider label="Soundeffekte" name="SFX Volume"/> <slider label="Musik wird gestreamt" name="Music Volume"/> - <check_box label="Voice aktivieren" name="enable_voice_check"/> - <slider label="Sprache" name="Voice Volume"/> + <check_box label="Aktiviert" name="music_enabled"/> + <slider label="Medien" name="Media Volume"/> + <check_box label="Aktiviert" name="enable_media"/> + <slider label="Voice-Chat" name="Voice Volume"/> + <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="wahr"/> + <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="wahr"/> + <text name="voice_chat_settings"> + Voice-Chat-Einstellungen + </text> <text name="Listen from"> Zuhören von: </text> diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml index 4ce5ed8fba..cb598f89f6 100644 --- a/indra/newview/skins/default/xui/de/panel_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_profile.xml @@ -28,11 +28,14 @@ </panel> <text name="title_member_text" value="Einwohner seit:"/> <text name="title_acc_status_text" value="Kontostatus:"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> Einwohner. Keine Zahlungsinfo archiviert. Linden. - </text> + </text_editor> <text name="title_partner_text" value="Partner:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(wird in Datenbank gesucht)" name="partner_text"/> + </panel> <text name="title_groups_text" value="Gruppen:"/> </panel> </scroll_container> @@ -43,6 +46,7 @@ <button label="Anrufen" name="call" tool_tip="Diesen Einwohner anrufen"/> <button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen" width="36"/> <button label="Teleportieren" name="teleport" tool_tip="Teleport anbieten"/> + <button label="â–¼" name="overflow_btn" tool_tip="Dem Einwohner Geld geben oder Inventar an den Einwohner schicken"/> </layout_panel> <layout_panel name="profile_me_buttons_panel"> <button label="Profil bearbeiten" name="edit_profile_btn" tool_tip="Ihre persönlichen Informationen bearbeiten"/> diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index b0c6dce8cf..92ad9741bc 100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Grundstück" name="Estate"> <text name="estate_help_text"> - Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus. + Änderungen wirken sich auf alle Regionen des Grundstücks aus. </text> <text name="estate_text"> Grundstück: @@ -16,7 +16,7 @@ (unbekannt) </text> <text name="Only Allow"> - Zugang auf Einwohner beschränken, die überprüft wurden von: + Zugang nur dann, wenn überprüft mit: </text> <check_box label="Zahlungsinformation gespeichert" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen"/> <check_box label="Altersüberprüfung" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/> @@ -69,6 +69,6 @@ <button label="?" name="ban_resident_help"/> <button label="Hinzufügen..." name="add_banned_avatar_btn"/> <button label="Entfernen..." name="remove_banned_avatar_btn"/> - <button label="Nachricht an Grundstück senden..." name="message_estate_btn"/> - <button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn"/> + <button label="Nachricht an Grundstück" name="message_estate_btn"/> + <button label="Einwohner hinauswerfen..." name="kick_user_from_estate_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml index 978b701054..2bf8721c86 100644 --- a/indra/newview/skins/default/xui/de/panel_region_general.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general.xml @@ -19,35 +19,25 @@ unbekannt </text> <check_box label="Terraformen blockieren" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="Fliegen blockieren" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="Schaden zulassen" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="Stoßen beschränken" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="Landwiederverkauf zulassen" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="Landumverteilung zulassen" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> <check_box label="Landanzeige in Suche blockieren" name="block_parcel_search_check" tool_tip="Diese Region und ihre Parzellen in Suchergebnissen anzeigen"/> - <button label="?" name="parcel_search_help"/> <spinner label="Avatar-Limit" name="agent_limit_spin"/> - <button label="?" name="agent_limit_help"/> <spinner label="Objektbonus" name="object_bonus_spin"/> - <button label="?" name="object_bonus_help"/> - <text label="Alterseinstufung" name="access_text"> + <text label="Inhaltseinstufung" name="access_text"> Einstufung: </text> - <combo_box label="Moderat" name="access_combo"> - <combo_box.item label="Adult" name="Adult"/> - <combo_box.item label="Moderat" name="Mature"/> - <combo_box.item label="Allgemein" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="Moderat" name="access_combo"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Moderat" name="Mature" value="21"/> + <icons_combo_box.item label="Allgemein" name="PG" value="13"/> + </icons_combo_box> <button label="Ãœbernehmen" name="apply_btn"/> - <button label="Einen Benutzer nach Hause teleportieren..." name="kick_btn"/> - <button label="Alle Benutzer nach Hause teleportieren..." name="kick_all_btn"/> + <button label="Einen Einwohner nach Hause teleportieren..." name="kick_btn"/> + <button label="Alle Einwohner nach Hause teleportieren..." name="kick_all_btn"/> <button label="Nachricht an Region senden..." name="im_btn"/> <button label="Telehub verwalten..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_general_layout.xml b/indra/newview/skins/default/xui/de/panel_region_general_layout.xml index 732249df35..09142ada6f 100644 --- a/indra/newview/skins/default/xui/de/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/de/panel_region_general_layout.xml @@ -36,8 +36,8 @@ <combo_box.item label="Allgemein" name="PG"/> </combo_box> <button label="Ãœbernehmen" name="apply_btn"/> - <button label="Einen Benutzer nach Hause teleportieren..." name="kick_btn"/> - <button label="Alle Benutzer nach Hause teleportieren..." name="kick_all_btn"/> + <button label="Einen Einwohner nach Hause teleportieren..." name="kick_btn"/> + <button label="Alle Einwohner nach Hause teleportieren..." name="kick_all_btn"/> <button label="Nachricht an Region senden..." name="im_btn"/> <button label="Telehub verwalten..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml index f9997f300a..2f4904730b 100644 --- a/indra/newview/skins/default/xui/de/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/de/panel_region_texture.xml @@ -25,25 +25,25 @@ Texturhöhenbereich </text> <text name="height_text_lbl6"> - Südwest + Nordwest </text> <text name="height_text_lbl7"> - Nordwest + Nordost </text> <text name="height_text_lbl8"> - Südost + Südwest </text> <text name="height_text_lbl9"> - Nordost + Südost </text> - <spinner label="Niedrig" name="height_start_spin_0" label_width="40"/> - <spinner label="Niedrig" name="height_start_spin_1" label_width="40"/> - <spinner label="Niedrig" name="height_start_spin_2" label_width="40"/> - <spinner label="Niedrig" name="height_start_spin_3" label_width="40"/> - <spinner label="Hoch" name="height_range_spin_0" label_width="40"/> - <spinner label="Hoch" name="height_range_spin_1" label_width="40"/> - <spinner label="Hoch" name="height_range_spin_2" label_width="40"/> - <spinner label="Hoch" name="height_range_spin_3" label_width="40"/> + <spinner label="Niedrig" label_width="40" name="height_start_spin_0"/> + <spinner label="Niedrig" label_width="40" name="height_start_spin_1"/> + <spinner label="Niedrig" label_width="40" name="height_start_spin_2"/> + <spinner label="Niedrig" label_width="40" name="height_start_spin_3"/> + <spinner label="Hoch" label_width="40" name="height_range_spin_0"/> + <spinner label="Hoch" label_width="40" name="height_range_spin_1"/> + <spinner label="Hoch" label_width="40" name="height_range_spin_2"/> + <spinner label="Hoch" label_width="40" name="height_range_spin_3"/> <text name="height_text_lbl10"> Diese Werte geben den Mischungsgrad für die obigen Texturen an. </text> diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml index 16bf4e8eb4..c91eb98e9c 100644 --- a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="MEIN AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Avatar-Skript-Gebrauch + </text> <text name="loading_text"> Wird geladen... </text> diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml index 3eec66fe75..8d7cc1bf9a 100644 --- a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml @@ -3,20 +3,18 @@ <text name="script_memory"> Parzellenskript-Speicher </text> - <text name="parcels_listed"> - Parzelleneigentümer: - </text> - <text name="memory_used"> - Verwendeter Speicher: - </text> + <text name="parcels_listed"/> + <text name="memory_used"/> <text name="loading_text"> Wird geladen... </text> <scroll_list name="scripts_list"> <scroll_list.columns label="Größe (KB)" name="size" width="80"/> + <scroll_list.columns label="URLs" name="urls"/> <scroll_list.columns label="Objektname" name="name"/> <scroll_list.columns label="Objekteigentümer" name="owner" width="130"/> - <scroll_list.columns label="Parzelle / Standort" name="location"/> + <scroll_list.columns label="Parzelle" name="parcel"/> + <scroll_list.columns label="Standort" name="location"/> </scroll_list> <button label="Liste aktualisieren" name="refresh_list_btn" width="110"/> <button label="Markieren" name="highlight_btn"/> diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml index 446117962f..3c81636fa0 100644 --- a/indra/newview/skins/default/xui/de/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/de/panel_side_tray.xml @@ -7,11 +7,13 @@ <panel label="Startseite" name="panel_home"/> </sidetray_tab> <sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me" tab_title="Mein Profil"> - <panel label="Ich" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="Ich" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people" tab_title="Leute"> <panel_container name="panel_container"> - <panel label="Gruppeninfo" name="panel_group_info_sidetray"/> + <panel label="Gruppenprofil" name="panel_group_info_sidetray"/> <panel label="Ignorierte Einwohner & Objekte" name="panel_block_list_sidetray"/> </panel_container> </sidetray_tab> diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml index 5b8137af4a..be21429007 100644 --- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml @@ -2,5 +2,5 @@ <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> <panel name="panel_stand_stop_flying"> <button label="Stehen" name="stand_btn" tool_tip="Klicken Sie hier, um aufzustehen."/> - <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/> + <button label="Flug stoppen" name="stop_fly_btn" tool_tip="Flug stoppen"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml index 33fd0f6348..0e182fa417 100644 --- a/indra/newview/skins/default/xui/de/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml @@ -22,9 +22,10 @@ [AMT] L$ </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/> - <button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/> + <button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/> <text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)"> - 12:00 + 24:00 H PST </text> + <button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/> <button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/> </panel> diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml index 9f8fdc085a..990543b725 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -37,8 +37,8 @@ Mischverkauf </panel.string> <text name="title" value="Objektprofil"/> - <text name="where" value="(Inworld)"/> - <panel label=""> + <text name="where" value="(inworld)"/> + <panel label="" name="properties_panel"> <text name="Name:"> Name: </text> @@ -85,7 +85,7 @@ <text name="GroupLabel"> Gruppe: </text> - <check_box label="Teilen" name="checkbox share with group" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern teilen. Sie müssen Ãœbereignen, um Rollenbeschränkungen zu aktivieren."/> + <check_box label="Teilen" name="checkbox share with group" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern, teilen. Sie müssen Ãœbereignen, um Rollenbeschränkungen zu aktivieren."/> <text name="NextOwnerLabel"> Nächster Eigentümer: </text> @@ -96,7 +96,7 @@ <check_box label="Zum Verkauf" name="checkbox for sale"/> <combo_box name="sale type"> <combo_box.item label="Kopieren" name="Copy"/> - <combo_box.item label="Inhalte" name="Contents"/> + <combo_box.item label="Inhalt" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> <spinner label="Preis: L$" name="Edit Cost"/> @@ -122,7 +122,8 @@ </panel> <panel name="button_panel"> <button label="Öffnen" name="open_btn"/> - <button label="Zahlen" name="pay_btn"/> + <button label="Bezahlen" name="pay_btn"/> <button label="Kaufen" name="buy_btn"/> + <button label="Details" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 858bbf27b1..fc01b69461 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -227,9 +227,6 @@ <string name="AvatarNameMultiple"> (mehrere) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (keiner) </string> @@ -593,6 +590,9 @@ <string name="hang_up"> Verbindung mit In-Welt-Voice-Chat getrennt </string> + <string name="reconnect_nearby"> + Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden + </string> <string name="ScriptQuestionCautionChatGranted"> Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung erteilt: [PERMISSIONS]. </string> @@ -636,7 +636,7 @@ Nicht verbunden </string> <string name="SIM_ACCESS_PG"> - Allgemein + Generell </string> <string name="SIM_ACCESS_MATURE"> Moderat @@ -758,6 +758,9 @@ <string name="invalid"> ungültig </string> + <string name="NewWearable"> + Neue/r/s [WEARABLE_ITEM] + </string> <string name="next"> Weiter </string> @@ -825,10 +828,10 @@ ESC drücken, um zur Normalansicht zurückzukehren </string> <string name="InventoryNoMatchingItems"> - Im Inventar wurden keine passenden Objekte gefunden. + Im Inventar wurden keine passenden Objekte gefunden. Versuchen Sie es mit [secondlife:///app/search/groups „Suche"]. </string> <string name="FavoritesNoMatchingItems"> - Hier eine Landmarke hin ziehen, um diese zu Ihrem Favoriten hinzuzufügen. + Landmarke hier hin ziehen, um diese hinzuzufügen. </string> <string name="InventoryNoTexture"> Sie haben keine Kopie dieser Textur in Ihrem Inventar. @@ -979,7 +982,7 @@ Gummi </string> <string name="Light"> - Licht + Hell </string> <string name="KBShift"> Umschalt-Taste @@ -1256,7 +1259,7 @@ (unbekannt) </string> <string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am "/> - <string name="NextStipendDay" value="Der nächste Stipendium-Tag ist "/> + <string name="NextStipendDay" value=". Der nächste Stipendium-Tag ist "/> <string name="GroupIndividualShare" value=" Gruppenanteil Einzelanteil"/> <string name="Balance"> Kontostand @@ -1324,6 +1327,9 @@ <string name="ScriptLimitsRequestError"> Fehler bei Informationsabruf </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + Keine Parzellen wurden ausgewählt + </string> <string name="ScriptLimitsRequestWrongRegion"> Fehler: Skriptinformationen sind nur für Ihre aktuelle Region verfügbar </string> @@ -1465,6 +1471,9 @@ <string name="PanelContentsNewScript"> Neues Skript </string> + <string name="BusyModeResponseDefault"> + Der Einwohner/Die Einwohnerin ist „beschäftigt", d.h. er/sie möchte im Moment nicht gestört werden. Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden. + </string> <string name="MuteByName"> (nach Namen) </string> @@ -1501,7 +1510,10 @@ (wird nach Veröffentlichung aktualisiert) </string> <string name="NoPicksClassifiedsText"> - Es wurde keine Auswahl getroffen/keine Anzeigen ausgewählt + Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die „Plus"-Schaltfläche, um eine Auswahl oder Anzeige zu erstellen. + </string> + <string name="NoAvatarPicksClassifiedsText"> + Der Einwohner hat eine Auswahl oder Anzeigen im Profil. </string> <string name="PicksClassifiedsLoadingText"> Wird geladen... @@ -2053,7 +2065,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Kinn-Hals </string> <string name="Clear"> - Löschen + Transparent </string> <string name="Cleft"> Spalte @@ -2356,16 +2368,16 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Farbe Innenseite </string> <string name="In Shdw Opacity"> - Deckkraft: innerer Lidschatten + Deckkraft: innen </string> <string name="Inner Eye Corner"> Ecke: Nasenseite </string> <string name="Inner Eye Shadow"> - Innerer Lidschatten + Innenlid </string> <string name="Inner Shadow"> - Innerer Lidschatten + Innenlid </string> <string name="Jacket Length"> Jackenlänge @@ -2758,10 +2770,10 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Aus </string> <string name="Out Shdw Color"> - Farbe: Oberer Lidschatten + Farbe: Oben </string> <string name="Out Shdw Opacity"> - Deckkraft: Oberer Lidschatten + Deckkraft: Oben </string> <string name="Outer Eye Corner"> Äußerer Augenwinkel @@ -2932,7 +2944,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Schuhart </string> <string name="Short"> - Sandale + Klein </string> <string name="Short Arms"> Kurze Arme @@ -3061,7 +3073,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Nach vorne </string> <string name="Tall"> - Stiefel + Groß </string> <string name="Taper Back"> Ansatzbreite hinten @@ -3265,7 +3277,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ Für Instant Message hier klicken. </string> <string name="IM_to_label"> - Bis + An </string> <string name="IM_moderator_label"> (Moderator) diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml index 2c56eff0a3..69c952c532 100644 --- a/indra/newview/skins/default/xui/de/teleport_strings.xml +++ b/indra/newview/skins/default/xui/de/teleport_strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<teleport_messages name=""> +<teleport_messages> <message_set name="errors"> <message name="invalid_tport"> Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen sich zum Teleportieren eventuell neu anmelden. @@ -62,6 +62,9 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e <message name="completing"> Teleport wird abgeschlossen. </message> + <message name="completed_from"> + Teleport aus [T_SLURL] wurde erfolgreich abgeschlossen. + </message> <message name="resolving"> Ziel wird ermittelt. </message> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 593bbe4b5e..2764befeac 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -9,6 +9,18 @@ title="ABOUT LAND" width="490"> <floater.string + name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string + name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string + name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> + <floater.string name="Minutes"> [MINUTES] minutes </floater.string> @@ -46,7 +58,7 @@ top="0"> <panel.string name="new users only"> - New users only + New Residents only </panel.string> <panel.string name="anyone"> @@ -395,7 +407,7 @@ Leyla Linden </text> name="Cancel Land Sale" left_pad="5" top_pad="-25" - width="145" /> + width="155" /> <text type="string" length="1" @@ -1107,7 +1119,7 @@ Leyla Linden </text> label="Type" name="type" sort_column="online_status" - width="24" /> + width="50" /> <name_list.columns name="online_status" width="-1" /> @@ -1504,7 +1516,7 @@ Only large parcels can be listed in search. name="Clear" tool_tip="Clear the landing point" right="-10" - width="50" /> + width="55" /> <text type="string" length="1" @@ -1609,41 +1621,12 @@ Only large parcels can be listed in search. name="set_media_url" width="50" top_delta="0"/> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="CurrentURL:" - width="100" - top_pad="10"> - Current Page: - </text> - <button - follows="top|right" - height="23" - image_overlay="Refresh_Off" - layout="topleft" - name="reset_media_url" - left_pad="0" - tool_tip="Refresh URL" - width="23" - top_delta="0"/> - <text - follows="left|top" - height="16" - layout="topleft" - left_pad="10" - name="current_url" - width="300" /> <check_box follows="top|left" height="16" label="Hide URL" layout="topleft" - left_delta="-36" + left="110" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." width="50" @@ -1903,6 +1886,10 @@ Only large parcels can be listed in search. name="access_estate_defined"> (Defined by the Estate) </panel.string> + <panel.string + name="allow_public_access"> + Allow Public Access ([MATURITY]) + </panel.string> <panel.string name="estate_override"> One or more of these options is set at the estate level @@ -1923,7 +1910,6 @@ Only large parcels can be listed in search. <check_box follows="top|left" height="16" - label="Allow Public Access [MATURITY]" layout="topleft" left_delta="0" name="public_access" diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 6e0c3dfe54..125b080519 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -64,7 +64,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="not_owned_by_you"> - Land owned by another user is selected. + Land owned by another Resident is selected. Try selecting a smaller area. </floater.string> <floater.string @@ -172,6 +172,15 @@ supports [AMOUNT2] objects name="no_parcel_selected"> (no parcel selected) </floater.string> + <floater.string + name="icon_PG" + value="Parcel_PG_Dark"/> + <floater.string + name="icon_M" + value="Parcel_M_Dark"/> + <floater.string + name="icon_R" + value="Parcel_R_Dark"/> <text type="string" length="1" @@ -195,9 +204,17 @@ supports [AMOUNT2] objects left_delta="110" name="region_name_text" top_delta="0" - width="175"> + use_ellipses="true" + width="155"> (unknown) </text> + <icon + follows="left|top" + height="16" + layout="topleft" + name="rating_icon" + top_delta="-2" + width="18"/> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 2bd8420925..b45e39a111 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -12,6 +12,7 @@ help_topic="camera_floater" save_rect="true" save_visibility="true" + save_dock_state="true" single_instance="true" width="150"> <floater.string @@ -26,6 +27,22 @@ name="move_tooltip"> Move Camera Up and Down, Left and Right </floater.string> + <floater.string + name="orbit_mode_title"> + Orbit + </floater.string> + <floater.string + name="pan_mode_title"> + Pan + </floater.string> + <floater.string + name="avatar_view_mode_title"> + Presets + </floater.string> + <floater.string + name="free_mode_title"> + View Object + </floater.string> <panel border="false" height="110" @@ -131,6 +148,7 @@ height="40" image_selected="Cam_Preset_Back_On" image_unselected="Cam_Preset_Back_Off" + is_toggle="true" layout="topleft" left="0" name="rear_view" @@ -145,6 +163,7 @@ height="40" image_selected="Cam_Preset_Side_On" image_unselected="Cam_Preset_Side_Off" + is_toggle="true" layout="topleft" left_pad="5" name="group_view" @@ -159,6 +178,7 @@ height="40" image_selected="Cam_Preset_Front_On" image_unselected="Cam_Preset_Front_Off" + is_toggle="true" layout="topleft" left="0" name="front_view" @@ -173,6 +193,7 @@ height="40" image_selected="Cam_Preset_Eye_Off" image_unselected="Cam_Preset_Eye_Off" + is_toggle="true" layout="topleft" left_pad="5" name="mouselook_view" @@ -227,7 +248,7 @@ image_selected="PushButton_Selected_Press" name="avatarview_btn" tab_stop="false" - tool_tip="See as avatar" + tool_tip="Presets" width="25"> </button> <button diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index b048eeceb6..6f2b0fc3ea 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -286,7 +286,7 @@ height="23" layout="topleft" name="Item Action Label" - right="132" + right="90" width="100"> Shape: </text> @@ -307,7 +307,7 @@ label_selected="Save" layout="topleft" name="Save" - right="218" + right="186" top="477" width="82" /> <button @@ -319,7 +319,7 @@ name="Save As" top="477" right="304" - width="82" /> + width="115" /> </panel> <panel border="false" @@ -489,7 +489,7 @@ height="23" layout="topleft" name="Item Action Label" - right="132" + right="90" width="100"> Skin: </text> @@ -548,7 +548,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -561,7 +561,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -739,7 +739,7 @@ height="23" layout="topleft" name="Item Action Label" - right="132" + right="90" width="100"> Hair: </text> @@ -771,7 +771,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -784,7 +784,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -924,7 +924,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Eyes: </text> @@ -955,7 +955,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -968,7 +968,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -1069,7 +1069,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -1082,7 +1082,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -1193,7 +1193,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Shirt: </text> @@ -1272,7 +1272,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -1285,7 +1285,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -1396,7 +1396,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Pants: </text> @@ -1538,7 +1538,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Shoes: </text> @@ -1579,7 +1579,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -1592,7 +1592,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -1741,7 +1741,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Socks: </text> @@ -1782,7 +1782,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -1795,7 +1795,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -1944,7 +1944,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Jacket: </text> @@ -1996,7 +1996,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -2009,7 +2009,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -2158,7 +2158,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Gloves: </text> @@ -2199,7 +2199,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -2212,7 +2212,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -2361,7 +2361,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Undershirt: </text> @@ -2402,7 +2402,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -2415,7 +2415,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -2564,7 +2564,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Underpants: </text> @@ -2605,7 +2605,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -2618,7 +2618,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -2767,7 +2767,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Skirt: </text> @@ -2808,7 +2808,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -2821,7 +2821,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -2970,7 +2970,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Tattoo: </text> @@ -3024,7 +3024,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -3037,7 +3037,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" @@ -3186,7 +3186,7 @@ height="23" layout="bottomleft" name="Item Action Label" - right="132" + right="90" width="100"> Alpha: </text> @@ -3305,7 +3305,7 @@ label="Save" label_selected="Save" layout="topleft" - right="218" + right="186" name="Save" top="477" width="82" /> @@ -3318,7 +3318,7 @@ right="304" name="Save As" top="477" - width="82" /> + width="115" /> <button follows="right|bottom" height="23" diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 8c87bd42dd..14f9e2db95 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -135,28 +135,28 @@ width="210" /> <button follows="left|top" - height="20" + height="23" label="Use Estate Time" layout="topleft" - left="8" + left="10" name="EnvUseEstateTimeButton" top="120" width="137" /> <button follows="left|top" - height="20" + height="23" label="Advanced Sky" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedSkyButton" top_delta="0" width="137" /> <button follows="left|top" - height="20" + height="23" label="Advanced Water" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedWaterButton" top_delta="0" width="137" /> diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 9ce0c9c86d..0255e202fb 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -2,9 +2,11 @@ <floater follows="all" height="350" + help_topic="event_details" label="Event" layout="topleft" name="Event" + title="EVENT DETAILS" width="330"> <floater.string name="none"> @@ -18,6 +20,22 @@ name="dont_notify"> Don't Notify </floater.string> + <floater.string + name="moderate"> + Moderate + </floater.string> + <floater.string + name="adult"> + Adult + </floater.string> + <floater.string + name="general"> + General + </floater.string> + <floater.string + name="unknown"> + Unknown + </floater.string> <layout_stack name="layout" orientation="vertical" @@ -30,7 +48,7 @@ border_size="0"> <layout_panel name="profile_stack" - follows="all" + follows="top|left" layout="topleft" top="0" left="0" @@ -70,7 +88,7 @@ left="10" top_pad="7" name="event_runby_label" - width="310"> + width="90"> Run by: </text> <text @@ -78,48 +96,79 @@ height="20" initial_value="(retrieving)" layout="topleft" - left="10" + left_pad="0" link="true" name="event_runby" - top_pad="2" + top_delta="0" use_ellipses="true" - width="310" /> + width="240" /> + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_date_label" + width="90"> + Date: + </text> <text type="string" length="1" - left="10" + left_pad="0" height="17" - font="SansSerifMedium" - text_color="EmphasisColor" - top_pad="5" + top_delta="0" follows="top|left" layout="topleft" name="event_date" - width="310"> + width="240"> 10/10/2010 </text> <text type="string" - height="14" length="1" + follows="top|left" + layout="topleft" left="10" + top_pad="5" + name="event_duration_label" + width="90"> + Duration: + </text> + <text + type="string" + height="14" + length="1" + left_pad="0" follows="top|left" layout="topleft" name="event_duration" - width="310"> + top_delta="0" + width="240"> 1 hour </text> <text - font="SansSerifMedium" - text_color="EmphasisColor" + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_covercharge_label" + width="90"> + Cover charge: + </text> + <text type="string" follows="left|top" height="16" layout="topleft" - left="10" + left_pad="0" name="event_cover" visible="true" - width="310"> + width="240" + top_delta="0"> Free </text> <text @@ -129,28 +178,48 @@ layout="topleft" left="10" top_pad="5" - name="event_location_label"> + name="event_location_label" + width="90"> Location: </text> <text type="string" length="1" height="20" - left="10" + left_pad="0" follows="top|left" layout="topleft" name="event_location" use_ellipses="true" + top_delta="0" value="SampleParcel, Name Long (145, 228, 26)" - width="310" /> + width="240" /> <icon - follows="top|left" - height="16" - image_name="Parcel_PG_Dark" - layout="topleft" - left="10" - name="rating_icon" - width="18" /> + follows="top|left" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left="10" + name="rating_icon_pg" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_M_Dark" + layout="topleft" + left="10" + name="rating_icon_m" + top_delta="0" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_R_Dark" + layout="topleft" + left="10" + name="rating_icon_r" + top_delta="0" + width="18" /> <text follows="left|top" height="16" @@ -159,33 +228,34 @@ name="rating_label" top_delta="3" value="Rating:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" layout="topleft" - left_pad="0" + left_pad="2" name="rating_value" top_delta="0" value="unknown" - width="200" /> + width="240" /> <expandable_text - follows="left|top|right" - height="106" - layout="topleft" - left="6" - name="event_desc" - width="313" /> + follows="left|top|right" + height="65" + layout="topleft" + left="6" + name="event_desc" + width="322"> + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text> </layout_panel> <layout_panel - follows="left|right" - height="24" - layout="topleft" - mouse_opaque="false" - name="button_panel" - top="0" - left="0" - user_resize="false"> + follows="left|right" + height="24" + layout="topleft" + mouse_opaque="false" + name="button_panel" + top="0" + left="0" + user_resize="false"> <button follows="left|top" height="18" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 0fac6cd5f1..36ef6beb59 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -31,8 +31,8 @@ <button follows="left|top" height="20" - label="Kick all users" - label_selected="Kick all users" + label="Kick all Residents" + label_selected="Kick all Residents" layout="topleft" left="10" name="Kick all users" diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index a21242ffe1..55efe83820 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -14,7 +14,7 @@ width="419"> <multi_floater.string name="only_user_message"> - You are the only user in this session. + You are the only Resident in this session. </multi_floater.string> <multi_floater.string name="offline_message"> @@ -54,7 +54,7 @@ </multi_floater.string> <multi_floater.string name="add_session_event"> - Unable to add users to chat session with [RECIPIENT]. + Unable to add Residents to chat session with [RECIPIENT]. </multi_floater.string> <multi_floater.string name="message_session_event"> diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 964713adbf..65a05f3ec5 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -24,7 +24,7 @@ tab_height="16" use_custom_icon_ctrl="true" tab_icon_ctrl_pad="2" - font_halign="left" + halign="left" use_ellipses="true" top="0" width="390" /> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index d2e5473157..25016e0673 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -2,6 +2,7 @@ <floater legacy_header_height="18" background_visible="true" + default_tab_group="1" follows="all" height="350" layout="topleft" @@ -18,12 +19,14 @@ min_height="190"> <layout_stack animate="false" + default_tab_group="2" follows="all" height="320" width="360" layout="topleft" orientation="horizontal" name="im_panels" + tab_group="1" top="20" left="0"> <layout_panel @@ -35,7 +38,9 @@ auto_resize="false" user_resize="true" /> <layout_panel + default_tab_group="3" left="0" + tab_group="2" top="0" height="200" width="245" @@ -75,6 +80,7 @@ label="To" layout="bottomleft" name="chat_editor" + tab_group="3" width="240"> </line_editor> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index 3f7642fafe..bea35e5fc1 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -16,7 +16,7 @@ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </floater.string> <scroll_list - bottom="270" + bottom="268" column_padding="0" draw_heading="true" follows="top|right|left|bottom" @@ -47,23 +47,23 @@ </scroll_list> <button follows="left|bottom" - height="20" + height="23" label="See Owner Profile..." layout="topleft" - left_delta="0" + left_delta="-1" name="button owner" tool_tip="See profile of the highlighted object's owner" - top_pad="5" + top_pad="4" width="150"> <button.commit_callback function="Inspect.OwnerProfile" /> </button> <button follows="left|bottom" - height="20" + height="23" label="See Creator Profile..." layout="topleft" - left_pad="10" + left_pad="5" name="button creator" tool_tip="See profile of the highlighted object's original creator" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 990be55847..1f192f9b28 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -45,9 +45,9 @@ layout="topleft" name="Reset" left="10" - width="61" /> + width="85" /> <check_box - left_delta="71" + left_delta="90" top_delta="3" enabled="false" follows="left|bottom" @@ -57,9 +57,9 @@ label="Running" layout="topleft" name="running" - width="100" /> + width="205" /> <check_box - left_delta="75" + left_delta="140" enabled="true" follows="left|bottom" font="SansSerif" diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 0bdcbf30df..8e2c57764b 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -12,6 +12,7 @@ help_topic="move_floater" save_rect="true" save_visibility="true" + save_dock_state="true" width="115"> <string name="walk_forward_tooltip"> @@ -37,6 +38,18 @@ name="fly_back_tooltip"> Fly Backwards (press Down Arrow or S) </string> + <string + name="walk_title"> + Walk + </string> + <string + name="run_title"> + Run + </string> + <string + name="fly_title"> + Fly + </string> <panel border="false" height="83" @@ -83,7 +96,7 @@ left="10" name="move up btn" scale_image="false" - tool_tip="Fly up, press "E"" + tool_tip="Fly up, press E" top="14" width="25" /> <button @@ -96,7 +109,7 @@ left_pad="45" name="move down btn" scale_image="false" - tool_tip="Fly down, press "C"" + tool_tip="Fly down, press C" top_delta="0" width="20" /> <joystick_turn @@ -178,16 +191,5 @@ tool_tip="Flying mode" top="2" width="31" /> - <button - visible="false" - follows="left|bottom" - height="20" - label="Stop Flying" - layout="topleft" - left="0" - name="stop_fly_btn" - tool_tip="Stop flying" - top="2" - width="115" /> </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index ae686d9ab7..28616d503b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -6,7 +6,7 @@ border="false" bg_opaque_image="Window_Foreground" bg_alpha_image="Window_Background" - bg_alpha_color="0 0 0 0" + bg_alpha_image_overlay="DkGray_66" legacy_header_height="18" can_minimize="true" can_tear_off="false" diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index 16079b30cb..a2938e8574 100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -4,6 +4,7 @@ can_minimize="false" height="100" layout="topleft" + title="Save Outfit" name="modal container" width="240"> <button diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 05deca705a..d7a7daf30c 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -46,6 +46,7 @@ tab_group="1" tab_position="left" tab_width="115" + tab_padding_right="5" top="21" width="620"> <panel @@ -72,7 +73,7 @@ <panel class="panel_preference" filename="panel_preferences_sound.xml" - label="Sound" + label="Sound & Media" layout="topleft" help_topic="preferences_audio_tab" name="audio" /> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index fc6f06ffd4..7fd7eab867 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -118,7 +118,7 @@ <button follows="right|bottom" height="22" - label="Cancel" + label="Discard" layout="topleft" left_pad="5" name="Discard" diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml new file mode 100644 index 0000000000..3225843d09 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + height="200" + layout="topleft" + name="publish_classified" + help_topic="price_for_listing" + title="Publishing Classified" + width="320"> + <text + top="20" + follows="top|left" + font="SansSerif" + height="60" + layout="topleft" + left="15" + word_wrap="true" + name="explanation_text"> + +Your classified ad will run for one week from the date it is published. + +Remember, Classified fees are non-refundable. + + </text> + <spinner + decimal_digits="0" + follows="left|top" + halign="left" + height="23" + increment="1" + label_width="70" + label="Price for Ad: " + v_pad="10" + layout="topleft" + left="15" + value="50" + min_val="50" + max_val="99999" + name="price_for_listing" + top_pad="10" + tool_tip="Price for listing." + width="150" /> + <text + follows="top|left" + font="SansSerif" + height="60" + layout="topleft" + left_pad="5" + top_delta="0" + word_wrap="true" + value="L$" + name="l$_text" /> + <text + follows="top|right" + font="SansSerif" + height="20" + layout="topleft" + left="15" + name="more_info_text" + top_pad="-20" + width="300"> +More info (link to classified help) + </text> + <button + follows="top|left" + height="22" + label="Publish" + layout="topleft" + left="105" + name="publish_btn" + top="160" + width="100" /> + <button + follows="top|left" + height="22" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index c3e974d978..12ade86b5f 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -3,16 +3,16 @@ legacy_header_height="18" background_visible="true" follows="left|top|right|bottom" - height="369" + height="250" layout="topleft" left="0" name="script_floater" top="0" can_dock="true" can_minimize="true" - visible="true" - width="520" - can_resize="true" + visible="false" + width="350" + can_resize="false" min_width="350" - min_height="369"> + min_height="200"> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 2c9402f6cb..dda14f02ff 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -45,7 +45,7 @@ </radio_group> <ui_ctrl height="90" - width="90" + width="125" layout="topleft" name="thumbnail_placeholder" top_pad="6" @@ -105,9 +105,11 @@ width="100"> <flyout_button.item label="Save" + name="save_item" value="save" /> <flyout_button.item label="Save As..." + name="saveas_item" value="save as" /> </flyout_button> <button @@ -147,7 +149,7 @@ left="10" name="type_label2" top_pad="5" - width="120"> + width="127"> Size </text> <text @@ -197,7 +199,7 @@ left_delta="0" name="texture_size_combo" top_delta="0" - width="120"> + width="127"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -226,7 +228,7 @@ left_delta="0" name="local_size_combo" top_delta="0" - width="120"> + width="127"> <combo_box.item label="Current Window" name="CurrentWindow" @@ -354,10 +356,6 @@ label="Depth" name="Depth" value="depth" /> - <combo_box.item - label="Object Mattes" - name="ObjectMattes" - value="objects" /> </combo_box> <check_box label="Interface" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 447bd7f599..80cb2723a0 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -88,7 +88,6 @@ <!-- First column --> <button - height="20" follows="top|left" label="Button" layout="topleft" @@ -100,7 +99,6 @@ <!-- "flyout_button" is a button that can spawn a menu --> <flyout_button follows="top|left" - height="20" label="Flyout" layout="topleft" left_delta="0" @@ -136,7 +134,6 @@ <combo_box bottom_delta="35" follows="top|left" - height="16" width="150" label="Combobox" layout="topleft" @@ -343,12 +340,10 @@ line to actually fit <tab_container follows="all" height="400" - halign="center" layout="topleft" left="525" name="group_tab_container" tab_position="top" - tab_height="20" tool_tip="tab container" top="80" width="300"> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 23203d227e..12d169b70a 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" follows="left|top|right" - height="570" + height="580" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -290,11 +290,11 @@ width="134" /> <check_box control_name="SnapEnabled" - height="20" + height="18" initial_value="true" label="Snap to grid" layout="topleft" - top_pad="0" + top_pad="7" name="checkbox snap to grid" width="134" /> <combo_box @@ -581,7 +581,7 @@ left="0" name="radio select land" top="-1" - width="114" /> + width="134" /> <radio_item height="19" label="Flatten" @@ -639,7 +639,7 @@ follows="left|top" height="12" layout="topleft" - left="125" + left="150" name="Bulldozer:" top="57" width="100"> @@ -737,7 +737,7 @@ </text> <tab_container follows="left|top" - height="400" + height="410" halign="center" left="0" name="Object Info Tabs" @@ -990,11 +990,11 @@ label="For Sale:" layout="topleft" name="checkbox for sale" - left="10" - width="90" /> + left="7" + width="93" /> <!-- NEW SALE TYPE COMBO BOX --> <combo_box - left_pad="0" + left_pad="3" layout="topleft" follows="left|top" allow_text_entry="false" @@ -1054,7 +1054,7 @@ even though the user gets a free copy. name="perms_build" left="0" top="241" - height="120" + height="130" width="278"> <text type="string" @@ -1104,9 +1104,9 @@ even though the user gets a free copy. follows="left|top|right" label="Modify" layout="topleft" - left="15" + left="5" name="checkbox next owner can modify" - width="85" /> + width="80" /> <check_box follows="left|top|right" height="19" @@ -1114,7 +1114,7 @@ even though the user gets a free copy. layout="topleft" left_pad="0" name="checkbox next owner can copy" - width="90" /> + width="80" /> <check_box follows="left|top|right" height="19" @@ -1124,7 +1124,7 @@ even though the user gets a free copy. left_pad="0" top_delta="0" tool_tip="Next owner can give away or resell this object" - width="90" /> + width="100" /> <text type="string" text_color="EmphasisColor" @@ -1135,7 +1135,7 @@ even though the user gets a free copy. left="10" name="B:" height="10" - width="45"> + width="80"> B: </text> <text @@ -1147,7 +1147,7 @@ even though the user gets a free copy. left_pad="0" name="O:" height="10" - width="44"> + width="80"> O: </text> <text @@ -1159,7 +1159,7 @@ even though the user gets a free copy. left_pad="0" name="G:" height="10" - width="43"> + width="80"> G: </text> <text @@ -1167,11 +1167,12 @@ even though the user gets a free copy. text_color="White" length="1" follows="left|top" - left_pad="0" + left="10" + top_pad="2" layout="topleft" name="E:" height="10" - width="43"> + width="80"> E: </text> <text @@ -1183,7 +1184,7 @@ even though the user gets a free copy. left_pad="0" name="N:" height="10" - width="48"> + width="80"> N: </text> <text @@ -1195,7 +1196,7 @@ even though the user gets a free copy. left_pad="0" name="F:" height="10" - width="50"> + width="80"> F: </text> </panel> @@ -2050,7 +2051,7 @@ even though the user gets a free copy. increment="1" initial_value="2" label="Softness" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="3" @@ -2063,7 +2064,7 @@ even though the user gets a free copy. increment="0.5" initial_value="0.3" label="Gravity" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2077,7 +2078,7 @@ even though the user gets a free copy. increment="0.5" initial_value="2" label="Drag" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2090,7 +2091,7 @@ even though the user gets a free copy. increment="0.5" initial_value="0" label="Wind" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2103,7 +2104,7 @@ even though the user gets a free copy. increment="0.5" initial_value="1" label="Tension" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2116,7 +2117,7 @@ even though the user gets a free copy. increment="0.01" initial_value="0" label="Force X" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2130,7 +2131,7 @@ even though the user gets a free copy. increment="0.01" initial_value="0" label="Force Y" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2144,7 +2145,7 @@ even though the user gets a free copy. increment="0.01" initial_value="0" label="Force Z" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2785,6 +2786,9 @@ even though the user gets a free copy. name="button permissions" width="130" /> <panel_inventory_object + border="true" + border_visible="true" + bevel_style="in" follows="left|top" height="325" layout="topleft" @@ -2812,7 +2816,7 @@ even though the user gets a free copy. left="20" name="label_parcel_info" top="24" - width="150"> + width="240"> Parcel Information </text> <text diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index e86cb23c1e..3a981adfdf 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -112,7 +112,7 @@ layout="topleft" left_pad="15" name="toggle_overlap_panel" - tool_tip="Toggle highlighting and display panel for overlapping elements; right click an element to select it for this feature. The selected element is marked by a red rectangle." + tool_tip="Toggle highlighting and display panel for overlapping elements; right-click an element to select it for this feature. The selected element is marked by a red rectangle." top_delta="0" width="30" /> <text diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index c4411db8c5..114b9a84e3 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -70,7 +70,7 @@ text_color="white" top="4" use_ellipses="true" - value="Mya Avatar:" + value="My Avatar:" width="210" /> <output_monitor auto_update="true" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 32739ac953..3a44ba3763 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -16,49 +16,49 @@ type="string" length="1" follows="left|top|right" - font.style="BOLD" height="16" layout="topleft" left="10" name="KeyFramePresetsText" top="34" - width="110"> + font="SansSerif" + width="85"> Water Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_pad="10" + left_delta="95" name="WaterPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WaterNewPreset" - top_delta="1" - width="90" /> + top_delta="0" + width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WaterSavePreset" top_delta="0" - width="90" /> + width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WaterDeletePreset" top_delta="0" - width="90" /> + width="70" /> <tab_container border="false" follows="left|top" @@ -74,7 +74,7 @@ border="true" follows="all" height="180" - label="Settings" + label="SETTINGS" layout="topleft" left="0" mouse_opaque="false" @@ -331,7 +331,7 @@ border="true" follows="all" height="180" - label="Image" + label="IMAGE" layout="topleft" left="0" mouse_opaque="false" @@ -348,7 +348,7 @@ layout="topleft" left="10" name="BHText" - top="10" + top="4" width="200"> Big Wave Direction </text> @@ -361,23 +361,10 @@ layout="topleft" left="10" name="WaterWave1DirXText" - top_pad="4" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave1DirYText" - top_delta="18" - width="10"> - Y - </text> <slider control_name="WaterWave1DirX" decimal_digits="2" @@ -390,8 +377,22 @@ max_val="4" min_val="-4" name="WaterWave1DirX" - top="55" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave1DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave1DirY" decimal_digits="2" @@ -404,7 +405,8 @@ max_val="4" min_val="-4" name="WaterWave1DirY" - top_pad="5" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -413,9 +415,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="BHText2" - top_delta="3" + top_pad="-10" width="355"> Little Wave Direction </text> @@ -427,24 +429,12 @@ height="16" layout="topleft" left="10" + left_delta="0" name="WaterWave2DirXText" - top="90" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave2DirYText" - top_delta="20" - width="10"> - Y - </text> <slider control_name="WaterWave2DirX" decimal_digits="2" @@ -457,8 +447,22 @@ max_val="4" min_val="-4" name="WaterWave2DirX" - top="115" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave2DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave2DirY" decimal_digits="2" @@ -471,7 +475,8 @@ max_val="4" min_val="-4" name="WaterWave2DirY" - top_pad="10" + left_pad="3" + top_pad="6" width="200" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 0cb7814c6a..d09a41978d 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="220" + height="256" layout="topleft" name="WindLight floater" help_topic="windlight_floater" @@ -22,68 +22,64 @@ left="10" name="KeyFramePresetsText" top="34" - width="110"> + width="85"> Sky Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="110" + left_delta="85" name="WLPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WLNewPreset" - top_delta="1" width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WLSavePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WLDeletePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Day Cycle Editor" label_selected="Day Cycle Editor" layout="topleft" - left_pad="50" + right="-10" name="WLDayCycleMenuButton" - top_delta="0" + top_pad="-23" width="120" /> <tab_container follows="left|top" - height="160" + height="196" halign="center" layout="topleft" left="0" name="WindLight Tabs" tab_position="top" - tab_height="20" top="60" width="700"> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Atmosphere" + height="196" + label="ATMOSPHERE" layout="topleft" left="1" mouse_opaque="false" @@ -113,10 +109,22 @@ layout="topleft" left="10" name="BHText2" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueHorizonR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueHorizonR" + width="200" /> <text type="string" length="1" @@ -124,12 +132,25 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="10" + top_pad="-15" name="BHText3" - top_delta="11" width="10"> G </text> + <slider + control_name="WLBlueHorizonG" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="0" + name="WLBlueHorizonG" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -137,12 +158,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText4" - top_delta="11" + left="10" + top_pad="-15" width="10"> B </text> + <slider + control_name="WLBlueHorizonB" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + name="WLBlueHorizonB" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -150,49 +183,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText5" - top_delta="11" + left="10" + top_pad="-15" width="10"> I </text> <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLBlueHorizonR" - top="40" - width="200" /> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - top_pad="1" - width="200" /> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonB" - top_pad="1" - width="200" /> - <slider control_name="WLBlueHorizonI" decimal_digits="2" follows="left" @@ -200,9 +197,9 @@ increment="0.01" initial_value="1.0" layout="topleft" - left_delta="0" name="WLBlueHorizonI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -211,9 +208,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="10" + top_pad="-10" name="BDensText" - top_delta="-2" width="355"> Haze Horizon </text> @@ -225,9 +222,10 @@ increment="0.01" initial_value="0.25" layout="topleft" - left="24" + left="23" + top_delta="0" + top_pad="27" name="WLHazeHorizon" - top="107" width="200" /> <text type="string" @@ -251,10 +249,22 @@ layout="topleft" left="245" name="BHText6" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueDensityR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueDensityR" + width="200" /> <text type="string" length="1" @@ -262,50 +272,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="245" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText9" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLBlueDensityR" - top="40" - width="200" /> <slider control_name="WLBlueDensityG" decimal_digits="2" @@ -316,8 +288,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText8" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLBlueDensityB" decimal_digits="2" @@ -328,8 +314,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText9" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLBlueDensityI" decimal_digits="2" @@ -340,7 +340,8 @@ layout="topleft" left_delta="0" name="WLBlueDensityI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -349,9 +350,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="245" name="HDText" - top_delta="-2" + top_pad="-10" width="355"> Haze Density </text> @@ -363,10 +364,10 @@ increment="0.01" initial_value="0.7" layout="topleft" - left="259" + left="258" max_val="4" name="WLHazeDensity" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -389,10 +390,10 @@ increment="0.01" initial_value="0.1" layout="topleft" - left="494" + left_delta="13" max_val="0.9" name="WLDensityMult" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -401,9 +402,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLDistanceMultText" - top_delta="-3" + top_pad="-10" width="355"> Distance Multiplier </text> @@ -414,11 +415,11 @@ height="10" initial_value="1.0" layout="topleft" - left="494" + left_delta="13" max_val="100" name="WLDistanceMult" - top="73" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -426,9 +427,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="MaxAltText" - top_delta="-2" + top_pad="-15" width="355"> Max Altitude </text> @@ -440,17 +441,17 @@ increment="1" initial_value="500" layout="topleft" - left="494" + left_delta="13" max_val="4000" name="WLMaxAltitude" - top="107" - width="205" /> + top_pad="27" + width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Lighting" + height="196" + label="LIGHTING" layout="topleft" left_delta="0" help_topic="windlight_lighting_tab" @@ -477,12 +478,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLSunlightR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLSunlightR" + width="200" /> <text type="string" length="1" @@ -490,50 +503,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLSunlightR" - top="40" - width="200" /> <slider control_name="WLSunlightG" decimal_digits="2" @@ -544,8 +519,22 @@ layout="topleft" left_delta="0" name="WLSunlightG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLSunlightB" decimal_digits="2" @@ -556,8 +545,22 @@ layout="topleft" left_delta="0" name="WLSunlightB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLSunlightI" decimal_digits="2" @@ -568,7 +571,8 @@ layout="topleft" left_delta="0" name="WLSunlightI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -577,9 +581,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="TODText" - top_delta="-2" + top_pad="-10" width="355"> Sun/Moon Position </text> @@ -587,9 +591,9 @@ height="20" image_name="icon_diurnal.tga" layout="topleft" - left="30" + left_delta="14" + top_pad="10" name="SkyDayCycle" - top="97" width="148" /> <slider control_name="WLSunAngle" @@ -598,10 +602,10 @@ increment="0.001" initial_value="0.7" layout="topleft" - left="24" + left_delta="-8" name="WLSunAngle" - top="137" - width="204" /> + top_pad="20" + width="207" /> <text type="string" length="1" @@ -622,12 +626,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText5" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLAmbientR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLAmbientR" + width="200" /> <text type="string" length="1" @@ -635,50 +651,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText7" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLAmbientR" - top="40" - width="200" /> <slider control_name="WLAmbientG" decimal_digits="2" @@ -689,8 +667,22 @@ layout="topleft" left_delta="0" name="WLAmbientG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText7" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLAmbientB" decimal_digits="2" @@ -701,8 +693,22 @@ layout="topleft" left_delta="0" name="WLAmbientB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText8" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLAmbientI" decimal_digits="2" @@ -713,7 +719,8 @@ layout="topleft" left_delta="0" name="WLAmbientI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -722,9 +729,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLEastAngleText" - top_delta="-2" + top_pad="-10" width="355"> East Angle </text> @@ -736,9 +743,9 @@ increment="0.01" initial_value="0.0" layout="topleft" - left="259" + left_delta="13" name="WLEastAngle" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -762,10 +769,10 @@ initial_value="0.1" label="Focus " layout="topleft" - left="494" + left_delta="0" max_val="0.5" name="WLGlowB" - top="40" + top_pad="27" width="200" /> <slider control_name="WLGlowR" @@ -780,7 +787,7 @@ max_val="1.99" min_val="1" name="WLGlowR" - top_pad="1" + top_pad="6" width="200" /> <text type="string" @@ -789,9 +796,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="SceneGammaText" - top_delta="0" + top_pad="-10" width="200"> Scene Gamma </text> @@ -803,11 +810,11 @@ increment="0.01" initial_value="2.0" layout="topleft" - left="494" + left_delta="0" max_val="10" name="WLGamma" - top="87" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -815,9 +822,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="WLStarText" - top_delta="-1" + top_pad="-10" width="355"> Star Brightness </text> @@ -829,17 +836,17 @@ increment="0.01" initial_value="0" layout="topleft" - left="494" + left_delta="0" max_val="2" name="WLStarAlpha" - top="122" + top_pad="27" width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Clouds" + height="196" + label="CLOUDS" layout="topleft" left_delta="0" mouse_opaque="false" @@ -867,12 +874,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLCloudColorR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudColorR" + width="200" /> <text type="string" length="1" @@ -880,50 +899,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLCloudColorR" - top="40" - width="200" /> <slider control_name="WLCloudColorG" decimal_digits="2" @@ -934,8 +915,22 @@ layout="topleft" left_delta="0" name="WLCloudColorG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLCloudColorB" decimal_digits="2" @@ -946,8 +941,22 @@ layout="topleft" left_delta="0" name="WLCloudColorB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLCloudColorI" decimal_digits="2" @@ -958,7 +967,8 @@ layout="topleft" left_delta="0" name="WLCloudColorI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -967,9 +977,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudColorText2" - top_delta="-2" + top_pad="-10" width="355"> Cloud XY/Density </text> @@ -980,12 +990,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText5" - top="87" + top_pad="5" width="10"> X </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudX" + width="200" /> <text type="string" length="1" @@ -993,12 +1015,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> Y </text> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudY" + width="200" /> <text type="string" length="1" @@ -1006,37 +1040,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> D </text> <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudX" - top_delta="-2" - width="200" /> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudY" - top_pad="1" - width="200" /> - <slider control_name="WLCloudDensity" decimal_digits="2" follows="left" @@ -1046,7 +1056,8 @@ layout="topleft" left_delta="0" name="WLCloudDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -1069,9 +1080,9 @@ increment="0.01" initial_value="0.5" layout="topleft" - left="259" + left_delta="13" name="WLCloudCoverage" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -1080,9 +1091,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudScaleText" - top_delta="-1" + top_pad="-10" width="355"> Cloud Scale </text> @@ -1094,10 +1105,10 @@ increment="0.01" initial_value="1.0" layout="topleft" - left="259" + left_delta="13" min_val="0.01" name="WLCloudScale" - top="75" + top_pad="27" width="200" /> <text type="string" @@ -1106,9 +1117,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudDetailText" - top_delta="-4" + top_pad="-10" width="355"> Cloud Detail (XY/Density) </text> @@ -1119,12 +1130,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText8" - top="87" + top_pad="5" width="10"> X </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudDetailX" + width="200" /> <text type="string" length="1" @@ -1132,37 +1155,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText9" - top_delta="11" + top_pad="-15" width="10"> Y </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText10" - top_delta="11" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudDetailX" - top_delta="-2" - width="200" /> <slider control_name="WLCloudDetailY" decimal_digits="2" @@ -1173,8 +1171,22 @@ layout="topleft" left_delta="0" name="WLCloudDetailY" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText10" + top_pad="-15" + width="10"> + D + </text> <slider control_name="WLCloudDetailDensity" decimal_digits="2" @@ -1185,7 +1197,8 @@ layout="topleft" left_delta="0" name="WLCloudDetailDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 86ac7c8e54..291f8f6f51 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -53,7 +53,8 @@ follows="right|top" height="126" top_pad="0" - width="238"> + width="238" + name="layout_panel_2"> <button follows="right|top" height="22" @@ -374,7 +375,8 @@ top_pad="0" width="238" background_visible="true" - bg_alpha_color="DkGray2"> + bg_alpha_color="DkGray2" + name="layout_panel_3"> <text text_color="White" font="SansSerifLarge" @@ -396,7 +398,8 @@ follows="right|top|bottom" height="310" top_pad="0" - width="238"> + width="238" + name="layout_panel_4"> <icon color="0.5 0 0 1" follows="top|right" @@ -638,7 +641,8 @@ top_pad="0" width="238" background_visible="true" - bg_alpha_color="DkGray2"> + bg_alpha_color="DkGray2" + name="layout_panel_5"> <text text_color="White" font="SansSerifLarge" @@ -660,7 +664,8 @@ height="30" min_height="30" top_pad="0" - width="238"> + width="238" + name="layout_panel_6"> <icon follows="left|bottom" height="16" @@ -670,7 +675,7 @@ mouse_opaque="true" name="zoom_icon" top_pad="7" - width="16" /> + width="16" ></icon> <slider follows="left|bottom" height="16" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 9796f7b5b6..194ae151d2 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -123,7 +123,7 @@ <button follows="top|left" height="20" - label="More" + label="Profile" layout="topleft" name="view_profile_btn" left_delta="96" diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml new file mode 100644 index 0000000000..39fb54d513 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml @@ -0,0 +1,9 @@ +<button + chrome="true" + image_selected="Info_Small" + image_unselected="Info_Small" + image_pressed="Info_Small" + height="12" + name="inspector_info_ctrl" + width="12" /> +
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 1d4377e339..85853f39bb 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -156,6 +156,13 @@ name="notify_container" tab_group="-2" width="1024"/> + <panel top="0" + follows="all" + height="768" + mouse_opaque="false" + name="popup_holder" + class="popup_holder" + width="1024"/> <menu_holder top="0" follows="all" height="768" diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 85ec174829..1b002b1c32 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -116,4 +116,10 @@ <menu_item_call.on_click function="InspectAvatar.Pay"/> </menu_item_call> + <menu_item_call + label="Share" + name="share"> + <menu_item_call.on_click + function="InspectAvatar.Share"/> + </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index d66818e91a..2c97112e38 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -44,11 +44,24 @@ name="Object Sit"> <menu_item_call.on_click function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.SitVisible" /> <menu_item_call.on_enable function="Object.EnableSitOrStand" - name="EnableSitOrStand" - parameter="Sit Here,Stand Up" /> - </menu_item_call> + name="EnableSitOrStand" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Stand Up" + name="Object Stand Up"> + <menu_item_call.on_click + function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.StandUpVisible" /> + <menu_item_call.on_enable + function="Object.EnableSitOrStand" + name="EnableSitOrStand" /> + </menu_item_call> <menu_item_call label="Object Profile" name="Object Inspect"> @@ -124,16 +137,28 @@ </menu_item_call> </context_menu> <menu_item_separator layout="topleft" /> - <menu_item_call - enabled="false" + <menu_item_call + label="Buy" + layout="topleft" + name="Pie Object Bye"> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleBuyObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> + </menu_item_call> + <menu_item_call label="Take" + layout="topleft" name="Pie Object Take"> - <menu_item_call.on_click - function="Tools.BuyOrTake" /> - <menu_item_call.on_enable - function="Tools.EnableBuyOrTake" - parameter="Buy,Take" /> - </menu_item_call> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleTakeObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> + </menu_item_call> <menu_item_call enabled="false" label="Take Copy" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index c4da1df017..014a52bb4f 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -20,6 +20,16 @@ parameter="can_add" /> </menu_item_call> <menu_item_call + label="Remove Friend" + layout="topleft" + name="Remove Friend"> + <menu_item_call.on_click + function="Avatar.RemoveFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call label="IM" layout="topleft" name="IM"> @@ -37,6 +47,16 @@ parameter="can_call" /> </menu_item_call> <menu_item_call + label="Map" + layout="topleft" + name="Map"> + <menu_item_call.on_click + function="Avatar.ShowOnMap" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_show_on_map" /> + </menu_item_call> + <menu_item_call label="Share" layout="topleft" name="Share"> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml index 0d3dd3366d..588342595e 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -14,6 +14,16 @@ parameter="can_add" /> </menu_item_call> <menu_item_call + label="Remove Friends" + layout="topleft" + name="Remove Friend"> + <menu_item_call.on_click + function="Avatar.RemoveFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call label="IM" layout="topleft" name="IM"> diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml index 7e07a97016..ebb49c9004 100644 --- a/indra/newview/skins/default/xui/en/menu_picks.xml +++ b/indra/newview/skins/default/xui/en/menu_picks.xml @@ -8,6 +8,9 @@ name="pick_info"> <menu_item_call.on_click function="Pick.Info" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="info" /> </menu_item_call> <menu_item_call label="Edit" @@ -16,6 +19,9 @@ visible="false"> <menu_item_call.on_click function="Pick.Edit" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="edit" /> </menu_item_call> <menu_item_call label="Teleport" @@ -23,6 +29,9 @@ name="pick_teleport"> <menu_item_call.on_click function="Pick.Teleport" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="teleport" /> </menu_item_call> <menu_item_call label="Map" @@ -30,6 +39,9 @@ name="pick_map"> <menu_item_call.on_click function="Pick.Map" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="map" /> </menu_item_call> <menu_item_separator layout="topleft" @@ -42,5 +54,8 @@ visible="false"> <menu_item_call.on_click function="Pick.Delete" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="delete" /> </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 9b3948b29b..3e38503e43 100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -45,6 +45,9 @@ <on_click function="Places.LandmarksGear.CopyPaste.Action" parameter="copy" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="copy" /> </menu_item_call> <menu_item_call label="Paste" @@ -88,6 +91,9 @@ <on_click function="Places.LandmarksGear.Folding.Action" parameter="expand" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="expand" /> </menu_item_call> <menu_item_call label="Collapse" @@ -96,6 +102,9 @@ <on_click function="Places.LandmarksGear.Folding.Action" parameter="collapse" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="collapse" /> </menu_item_call> <menu_item_call label="Expand all folders" diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml index 407ce14e81..5162a4902f 100644 --- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml @@ -19,19 +19,22 @@ <menu_item_call.on_click function="Profile.Share" /> </menu_item_call> - <menu_item_check - label="Block/Unblock" - layout="topleft" - name="block_unblock"> - <menu_item_check.on_click - function="Profile.BlockUnblock" /> - <menu_item_check.on_check - function="Profile.CheckItem" - parameter="is_blocked" /> - <menu_item_check.on_enable - function="Profile.EnableItem" - parameter="can_block" /> - </menu_item_check> + <menu_item_call + label="Block" + name="block"> + <menu_item_call.on_click + function="Profile.BlockUnblock"/> + <menu_item_call.on_visible + function="Profile.EnableBlock" /> + </menu_item_call> + <menu_item_call + label="Unblock" + name="unblock"> + <menu_item_call.on_click + function="Profile.BlockUnblock"/> + <menu_item_call.on_visible + function="Profile.EnableUnblock" /> + </menu_item_call> <menu_item_call label="Kick" 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 07a366da7f..158e764eae 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -194,18 +194,6 @@ function="SideTray.PanelPeopleTab" parameter="nearby_panel" /> </menu_item_call> - <menu_item_check - label="Nearby Media" - layout="topleft" - name="Nearby Media" - shortcut="control|alt|N"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="nearby_media" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="nearby_media" /> - </menu_item_check> </menu> <menu label="World" @@ -311,8 +299,7 @@ function="Floater.Visible" parameter="moveview" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="moveview" /> + function="World.Toggle.MovementControls" /> </menu_item_check> <menu_item_check label="View Controls" @@ -322,8 +309,7 @@ function="Floater.Visible" parameter="camera" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="camera" /> + function="World.Toggle.CameraControls" /> </menu_item_check> <menu_item_check label="Ban Lines" @@ -368,6 +354,24 @@ function="ToggleControl" parameter="ShowParcelOwners" /> </menu_item_check> + <menu_item_check + label="Coordinates" + name="Coordinates"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowCoordinates" /> + <menu_item_check.on_check + control="NavBarShowCoordinates" /> + </menu_item_check> + <menu_item_check + label="Parcel Properties" + name="Parcel Properties"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowParcelProperties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> </menu> <menu_item_separator layout="topleft" /> @@ -715,16 +719,26 @@ name="Object" tear_off="true"> <menu_item_call - label="Buy" - layout="topleft" - name="Menu Object Take" - visible="true"> - <menu_item_call.on_click - function="Tools.BuyOrTake" /> - <menu_item_call.on_enable - function="Tools.EnableBuyOrTake" - name="EnableBuyOrTake" - parameter="Buy,Take" /> + label="Buy" + layout="topleft" + name="Menu Object Buy"> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleBuyObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> + </menu_item_call> + <menu_item_call + label="Take" + layout="topleft" + name="Menu Object Take"> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleTakeObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> </menu_item_call> <menu_item_call label="Take Copy" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0fbd860648..a2540237c8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -249,7 +249,7 @@ Save all changes to clothing/body parts? Non-friends won't know that you've choosen to ignore their calls and instant messages. <usetemplate name="okbutton" - yestext="Yes"/> + yestext="OK"/> </notification> <notification @@ -1036,7 +1036,6 @@ Unable to write file [[FILE]] type="alertmodal"> Just so you know, your computer does not meet [APP_NAME]'s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can't provide technical support for unsupported system configurations. -MINSPECS Visit [_URL] for more information? <url option="0" name="url"> @@ -2297,6 +2296,9 @@ Display settings have been set to recommended levels based on your system config name="ErrorMessage" type="alertmodal"> [ERROR_MESSAGE] + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification @@ -2846,11 +2848,11 @@ Leave Group? icon="alert.tga" name="ConfirmKick" type="alert"> -Do you REALLY want to kick all users off the grid? +Do you REALLY want to kick all Residents off the grid? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Kick All Users"/> + yestext="Kick All Residents"/> </notification> <notification @@ -2950,7 +2952,7 @@ You have reached your maximum number of groups. Please leave some group before j icon="alert.tga" name="KickUser" type="alert"> -Kick this user with what message? +Kick this Resident with what message? <form name="form"> <input name="message" type="text"> An administrator has logged you off. @@ -2992,7 +2994,7 @@ An administrator has logged you off. icon="alert.tga" name="FreezeUser" type="alert"> -Freeze this user with what message? +Freeze this Resident with what message? <form name="form"> <input name="message" type="text"> You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM). @@ -3013,7 +3015,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you icon="alert.tga" name="UnFreezeUser" type="alert"> -Unfreeze this user with what message? +Unfreeze this Resident with what message? <form name="form"> <input name="message" type="text"> You are no longer frozen. @@ -3055,7 +3057,7 @@ Join me in [REGION] icon="alertmodal.tga" name="OfferTeleportFromGod" type="alertmodal"> -God summon user to your location? +God summon Resident to your location? <form name="form"> <input name="message" type="text"> Join me in [REGION] @@ -3135,7 +3137,7 @@ Type a short announcement which will be sent to everyone currently in your estat type="alert"> You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). -This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. +This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. Proceed? <usetemplate @@ -4307,14 +4309,14 @@ Topic: [SUBJECT], Message: [MESSAGE] icon="notifytip.tga" name="FriendOnline" type="notifytip"> -[NAME_SLURL] is Online +[FIRST] [LAST] is Online </notification> <notification icon="notifytip.tga" name="FriendOffline" type="notifytip"> -[NAME_SLURL] is Offline +[FIRST] [LAST] is Offline </notification> <notification @@ -5202,9 +5204,23 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th type="notify"> [NAME] declined your friendship offer. </notification> + + <notification + icon="notify.tga" + name="FriendshipAcceptedByMe" + type="offer"> +Friendship offer accepted. + </notification> <notification icon="notify.tga" + name="FriendshipDeclinedByMe" + type="offer"> +Friendship offer declined. + </notification> + + <notification + icon="notify.tga" name="OfferCallingCard" type="notify"> [FIRST] [LAST] is offering their calling card. @@ -5367,7 +5383,7 @@ Grant this request? icon="notify.tga" name="ScriptToast" type="notify"> - [FIRST] [LAST]'s '[TITLE]' is requesting user input. + [FIRST] [LAST]'s '[TITLE]' is requesting Resident input. <form name="form"> <button index="0" @@ -5833,7 +5849,8 @@ Are you sure you want to close all IMs? <usetemplate name="okcancelignore" notext="Cancel" - yestext="OK"/> + yestext="OK" + ignoretext="Confirm before I close all IMs"/> </notification> <notification icon="notifytip.tga" diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index c605975c8e..1e2e74f882 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -75,6 +75,7 @@ height="16" image_pressed="Info_Press" image_unselected="Info_Over" + layout="topleft" left_pad="3" right="-53" name="info_btn" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 0755813389..015a2e91ff 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -47,7 +47,8 @@ min_height="23" width="310" top="4" - min_width="188" + max_width="320" + min_width="216" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml" /> @@ -60,7 +61,7 @@ min_height="28" width="100" top_delta="0" - min_width="54" + min_width="100" name="speak_panel" user_resize="false"> <talk_button @@ -73,6 +74,11 @@ name="talk" top="5" width="100"> + <speak_button + name="speak_btn" + label="Speak" + label_selected="Speak" + /> <show_button> <show_button.init_callback function="Button.SetDockableFloaterToggle" @@ -100,7 +106,7 @@ min_height="28" width="82" top_delta="0" - min_width="52" + min_width="62" name="gesture_panel" user_resize="false"> <gesture_combo_list @@ -252,7 +258,7 @@ top="0" name="chiclet_list_panel" width="189" - min_width="110" + min_width="60" user_resize="false" auto_resize="true"> <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same @@ -263,7 +269,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. height="24" layout="topleft" left="1" - min_width="110" + min_width="60" name="chiclet_list" top="7" chiclet_padding="4" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 51e2256a7d..250dadd390 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -2,7 +2,8 @@ <panel background_visible="true" bevel_style="in" - bg_alpha_color="black" + bg_opaque_color="Black" + bg_alpha_color="DkGray_66" follows="top|left|right" height="24" label="im_header" diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 34c1923582..e3b331799c 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -22,6 +22,22 @@ name="l$_price"> L$[PRICE] </panel.string> + <panel.string + name="click_through_text_fmt"> + [TELEPORT] teleport, [MAP] map, [PROFILE] profile + </panel.string> + <panel.string + name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string + name="auto_renew_on"> + Enabled + </panel.string> + <panel.string + name="auto_renew_off"> + Disabled + </panel.string> <button follows="top|right" height="23" @@ -51,11 +67,11 @@ follows="all" height="502" layout="topleft" - left="9" + left="10" top_pad="10" name="profile_scroll" reserve_scroll_corner="false" - width="310"> + width="312"> <panel name="scroll_content_panel" follows="left|top" @@ -63,18 +79,28 @@ layout="topleft" top="0" background_visible="false" - height="500" + height="610" left="0" width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="275" + > <texture_picker enabled="false" follows="left|top|right" height="197" layout="topleft" - left="11" + left="0" name="classified_snapshot" - top="10" - width="286" /> + top="0" + width="275" /> + </panel> <text_editor allow_scroll="false" bg_visible="false" @@ -93,20 +119,61 @@ v_pad="0" value="[name]" use_ellipses="true" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="classified_location_label" + text_color="white" + top_pad="5" + value="Location:" + width="250" /> <text_editor allow_scroll="false" bg_visible="false" follows="left|top" h_pad="0" - height="25" + height="30" layout="topleft" left="10" name="classified_location" read_only="true" + top_pad="5" width="290" word_wrap="true" v_pad="0" value="[loading...]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="content_type_label" + text_color="white" + top_pad="10" + value="Content Type:" + width="140" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_M_Light" + layout="topleft" + left_pad="0" + name="content_type_moderate" + top_pad="-11" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_PG_Light" + layout="topleft" + left_delta="0" + name="content_type_general" + top_delta="0" + width="18" /> <text_editor allow_scroll="false" bg_visible="false" @@ -114,13 +181,24 @@ h_pad="0" height="18" layout="topleft" - left="10" + left_pad="2" name="content_type" read_only="true" - width="290" - top_pad="5" + width="130" + top_delta="1" v_pad="0" value="[content type]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="0" + value="Category:" + width="140" /> <text_editor allow_html="true" allow_scroll="false" @@ -129,23 +207,51 @@ h_pad="0" height="18" layout="topleft" - left="10" + left_pad="0" name="category" read_only="true" - width="290" - top_pad="5" + width="150" + top_pad="-10" v_pad="0" value="[category]" /> - <check_box - enabled="false" + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="creation_date_label" + text_color="white" + top_pad="0" + value="Creation date:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" height="16" - label="Auto renew each week" + layout="topleft" + left_pad="0" + name="creation_date" + read_only="true" + top_pad="-10" + tool_tip="Creation date" + v_pad="0" + value="[date]" + width="150" /> + <text + follows="left|top" + font.style="BOLD" + height="10" layout="topleft" left="10" - name="auto_renew" + name="price_for_listing_label" + text_color="white" top_pad="5" - v_pad="0" - width="290" /> + value="Price for listing:" + width="140" /> <text_editor allow_scroll="false" bg_visible="false" @@ -154,29 +260,133 @@ halign="left" height="16" layout="topleft" - left="10" + left_pad="0" name="price_for_listing" read_only="true" - top_pad="5" + top_pad="-10" tool_tip="Price for listing." v_pad="0" + value="[price]" width="105" /> + <layout_stack + animate="false" + name="descr_stack" + layout="topleft" + follows="all" + orientation="vertical" + left="10" + top_pad="5" + width="290" + height="215"> + <layout_panel + auto_resize="false" + name="clickthrough_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="16" + user_resize="false"> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="click_through_label" + text_color="white" + top_pad="0" + value="Clicks:" + width="140" /> <text_editor - allow_html="true" allow_scroll="false" bg_visible="false" - follows="left|top|right" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="click_through_text" + read_only="true" + top_pad="-10" + tool_tip="Click through data" + v_pad="0" + value="[clicks]" + width="150" /> + </layout_panel> + <layout_panel + auto_resize="false" + name="price_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="16" + user_resize="false"> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="auto_renew_label" + text_color="white" + top="0" + value="Auto renew:" + width="140" /> + <text + height="16" + layout="topleft" + follows="top|left" + left_pad="0" + name="auto_renew" + top_pad="-10" + value="Enabled" + width="150" /> + </layout_panel> + <layout_panel + name="descr_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="215" + user_resize="false"> + <text + auto_resize="false" + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="classified_desc_label" + text_color="white" + top="0" + value="Description:" + width="250" /> + <text_editor + allow_html="true" + allow_scroll="true" + bg_visible="false" + follows="all" h_pad="0" height="200" layout="topleft" - left="10" + left="0" max_length="1023" name="classified_desc" read_only="true" - width="290" + top_pad="7" + width="280" v_pad="0" value="[description]" word_wrap="true" /> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 1375eb87d9..996e28c575 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="description" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index a357ba1d97..7383edf63d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -3,7 +3,7 @@ background_visible="true" bevel_style="in" follows="left|top|right|bottom" - height="570" + height="569" label="Edit Classified" layout="topleft" left="0" @@ -16,6 +16,12 @@ name="location_notice"> (will update after save) </panel.string> + <string name="publish_label"> + Publish + </string> + <string name="save_label"> + Save + </string> <button follows="top|right" height="23" @@ -23,7 +29,7 @@ layout="topleft" name="back_btn" picture_style="true" - left="11" + left="12" tab_stop="false" top="2" width="23" /> @@ -42,16 +48,16 @@ Edit Classified </text> <scroll_container - color="DkGray2" - follows="all" - height="502" - layout="topleft" - left="9" - top_pad="10" - name="profile_scroll" - reserve_scroll_corner="false" - opaque="true" - width="310"> + color="DkGray2" + follows="all" + height="502" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + reserve_scroll_corner="false" + opaque="true" + width="312"> <panel name="scroll_content_panel" follows="left|top" @@ -59,27 +65,36 @@ layout="topleft" top="0" background_visible="false" - height="600" + height="690" left="0" - width="295"> - <texture_picker - follows="left|top|right" - height="197" - width="286" - layout="topleft" - top="10" - left="11" - name="classified_snapshot" /> - <icon - height="18" - image_name="AddItem_Off" + width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="272"> + <texture_picker + follows="left|top|right" + height="197" + width="272" + layout="topleft" + top="0" + left="0" + name="classified_snapshot" /> + <icon + height="197" + image_name="spacer24.tga" layout="topleft" - right="-5" name="edit_icon" label="" tool_tip="Click to select an image" - top="17" - width="18" /> + top="0" + left="0" + width="272" /> + </panel> <text type="string" length="1" @@ -92,7 +107,7 @@ top="215" name="Name:" text_color="white" - width="290"> + width="280"> Title: </text> <line_editor @@ -106,7 +121,7 @@ name="classified_name" prevalidate_callback="ascii" text_color="black" - width="290" /> + width="273" /> <text type="string" length="1" @@ -119,13 +134,13 @@ top_pad="20" name="description_label" text_color="white" - width="290"> + width="280"> Description: </text> <text_editor follows="left|top|right" height="100" - width="290" + width="273" hide_scrollbar="false" layout="topleft" left="10" @@ -146,20 +161,20 @@ name="location_label" text_color="white" top_pad="20" - width="290"> + width="280"> Location: </text> <text type="string" length="1" follows="left|top" - height="50" + height="30" layout="topleft" left="10" name="classified_location" right="-10" top_pad="2" - width="290" + width="280" word_wrap="true"> loading... </text> @@ -171,7 +186,18 @@ left="10" top_pad="5" name="set_to_curr_location_btn" - width="156" /> + width="200" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="15" + value="Category:" + width="250" /> <combo_box follows="left|top" height="23" @@ -180,25 +206,63 @@ name="category" top_pad="5" width="156" /> - <combo_box - allow_text_entry="false" - follows="left|top" - height="23" + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" left="10" - name="content_type" + name="content_type_label" + text_color="white" + top_pad="15" + value="Content type:" + width="250" /> + <icons_combo_box + follows="left|top" + height="23" + label="General Content" + layout="topleft" + left="10" + name="content_type" top_pad="5" width="156"> - <combo_item - name="mature_ci" - value="Mature"> - Moderate Content - </combo_item> - <combo_item - name="pg_ci" - value="PG"> - General Content - </combo_item> - </combo_box> + <icons_combo_box.drop_down_button + image_overlay="Parcel_PG_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item + label="Moderate Content" + name="mature_ci" + value="Mature"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item + label="General Content" + name="pg_ci" + value="PG"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="price_for_listing_label" + text_color="white" + top_pad="15" + value="Price for listing:" + width="250" /> <spinner decimal_digits="0" follows="left|top" @@ -223,23 +287,23 @@ layout="topleft" left="10" name="auto_renew" - top_pad="5" + top_pad="15" width="250" /> - </panel> + </panel> </scroll_container> <panel follows="left|right|bottom" height="23" label="bottom_panel" layout="topleft" - left="9" + left="8" name="bottom_panel" top_pad="5" width="303"> <button follows="bottom|left" height="23" - label="Save" + label="[LABEL]" layout="topleft" name="save_changes_btn" left="0" @@ -252,6 +316,6 @@ layout="topleft" name="cancel_btn" left_pad="3" - width="152" /> + width="153" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 6ef762dc1d..7445bb339d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -3,7 +3,7 @@ background_visible="true" bevel_style="in" follows="left|top|right|bottom" - height="570" + height="569" label="Edit Pick" layout="topleft" left="0" @@ -18,7 +18,7 @@ image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="11" + left="12" tab_stop="false" top="2" width="23" /> @@ -41,11 +41,11 @@ follows="all" height="502" layout="topleft" - left="9" + left="8" top_pad="10" name="profile_scroll" opaque="true" - width="310"> + width="312"> <panel name="scroll_content_panel" follows="left|top|right" @@ -66,15 +66,15 @@ left="11" name="pick_snapshot" /> <icon - height="18" - image_name="AddItem_Off" + height="197" + image_name="spacer24.tga" layout="topleft" - right="-5" name="edit_icon" label="" tool_tip="Click to select an image" - top="17" - width="18" /> + top="10" + left="11" + width="286" /> <text type="string" length="1" @@ -164,7 +164,7 @@ left="8" top_pad="0" name="set_to_curr_location_btn" - width="156" /> + width="200" /> </panel> </scroll_container> <panel @@ -172,7 +172,7 @@ height="23" label="bottom_panel" layout="topleft" - left="9" + left="8" name="bottom_panel" top_pad="5" width="303"> @@ -192,6 +192,6 @@ layout="topleft" name="cancel_btn" left_pad="3" - width="152" /> + width="153" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 2a2199fc87..26be8440e7 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -60,11 +60,11 @@ <scroll_container color="DkGray2" follows="all" - height="493" + height="494" min_height="300" layout="topleft" - left="9" - width="290" + left="8" + width="292" name="profile_scroll" reserve_scroll_corner="true" opaque="true" @@ -74,19 +74,19 @@ follows="left|top|right" layout="topleft" top="0" - height="493" + height="494" min_height="300" left="0" - width="290"> + width="292"> <panel name="data_panel" follows="left|top|right" layout="topleft" top="0" - height="493" + height="494" min_height="300" left="0" - width="290"> + width="292"> <panel name="lifes_images_panel" follows="left|top|right" @@ -94,7 +94,7 @@ layout="topleft" top="0" left="0" - width="290"> + width="292"> <panel follows="left|top" height="117" @@ -102,7 +102,7 @@ left="10" name="second_life_image_panel" top="0" - width="280"> + width="282"> <text follows="left|top|right" font.style="BOLD" @@ -127,15 +127,15 @@ width="102" /> </panel> <icon - height="18" - image_name="AddItem_Off" + height="102" + image_name="spacer24.tga" layout="topleft" name="2nd_life_edit_icon" label="" - left="87" + left="11" + top_pad="-92" tool_tip="Click to select an image" - top="25" - width="18" /> + width="102" /> </panel> <text_editor type="string" @@ -183,15 +183,15 @@ width="102" /> </panel> <icon - height="18" - image_name="AddItem_Off" + height="102" + image_name="spacer24.tga" layout="topleft" name="real_world_edit_icon" label="" - left="87" + left="11" + top_pad="-92" tool_tip="Click to select an image" - top="148" - width="18" /> + width="102" /> <text_editor type="string" length="1" @@ -230,7 +230,7 @@ top_pad="0" value="http://" name="homepage_edit" - width="270"> + width="272"> </line_editor> <check_box follows="left|top" @@ -334,7 +334,7 @@ height="23" label="Save Changes" layout="topleft" - left="9" + left="8" name="save_btn" top="5" width="152" /> @@ -343,8 +343,8 @@ height="23" label="Cancel" layout="topleft" - left_pad="4" + left_pad="3" name="cancel_btn" - width="152" /> + width="153" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 662fd1ae73..f913c58cc9 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel label="General" - follows="all" height="604" - width="313" + width="304" class="panel_group_general" name="general_tab"> <panel.string @@ -26,7 +25,7 @@ Hover your mouse over the options for more help. top="0" left="0" height="129" - width="313" + width="304" layout="topleft"> <texture_picker follows="left|top" @@ -179,9 +178,9 @@ Hover your mouse over the options for more help. top_pad="5" width="295" /> <panel - background_visible="true" - bevel_style="in" - border="true" + background_visible="false" + bevel_style="none" + border="false" bg_alpha_color="FloaterUnfocusBorderColor" follows="left|top|right" height="140" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 375de64923..701a14e1c5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -40,23 +40,28 @@ background_visible="true" image_overlay="BackArrow_Off" layout="topleft" name="back" - left="10" + left="8" tab_stop="false" top="2" width="23" /> - <text + <text_editor + allow_scroll="false" + bg_visible="false" + read_only = "true" layout="topleft" name="group_name" + v_pad="0" value="(Loading...)" - font="SansSerifHuge" - height="20" - left_pad="5" - text_color="white" - top="3" + font="SansSerifHugeBold" + h_pad="0" + height="26" + left_pad="10" + text_color="LtGray" + top="0" use_ellipses="true" - width="270" - follows="top|left" - word_wrap="true" + width="275" + follows="top|left|right" + word_wrap="false" mouse_opaque="false"/> <line_editor follows="left|top" @@ -75,90 +80,101 @@ background_visible="true" name="layout" orientation="vertical" follows="all" - left="0" + left="8" top_pad="0" - height="537" - width="313" + height="536" + width="292" border_size="0"> <layout_panel - name="group_accordions" - follows="all" - layout="topleft" - auto_resize="true" - > + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + name="group_accordions" + follows="all" + layout="topleft" + auto_resize="true"> <accordion left="0" top="0" - single_expansion="true" - follows="all" - layout="topleft" - name="groups_accordion"> - <accordion_tab + single_expansion="true" + follows="all" + layout="topleft" + name="groups_accordion"> + <accordion_tab expanded="true" layout="topleft" name="group_general_tab" - title="General"> - <panel - border="false" - class="panel_group_general" - filename="panel_group_general.xml" - layout="topleft" - left="0" - follows="all" - help_topic="group_general_tab" - name="group_general_tab_panel" - top="0" /> + title="General" + fit_panel="false"> + <panel + border="false" + class="panel_group_general" + filename="panel_group_general.xml" + layout="topleft" + left="0" + follows="left|top|right" + help_topic="group_general_tab" + name="group_general_tab_panel" + top="0" /> </accordion_tab> <accordion_tab expanded="false" layout="topleft" name="group_roles_tab" - title="Roles"> - <panel - border="false" - class="panel_group_roles" - filename="panel_group_roles.xml" - layout="topleft" - left="0" - name="group_roles_tab_panel" - top="0" /> + title="Roles" + fit_panel="false"> + <panel + border="false" + class="panel_group_roles" + filename="panel_group_roles.xml" + follows="left|top|right" + layout="topleft" + left="0" + name="group_roles_tab_panel" + top="0" /> </accordion_tab> <accordion_tab - expanded="false" - layout="topleft" - name="group_notices_tab" - title="Notices"> - <panel - border="false" - class="panel_group_notices" - filename="panel_group_notices.xml" - layout="topleft" - left="0" - help_topic="group_notices_tab" - name="group_notices_tab_panel" - top="0" /> + expanded="false" + layout="topleft" + name="group_notices_tab" + title="Notices" + fit_panel="false"> + <panel + border="false" + class="panel_group_notices" + filename="panel_group_notices.xml" + follows="left|top|right" + layout="topleft" + left="0" + help_topic="group_notices_tab" + name="group_notices_tab_panel" + top="0" /> </accordion_tab> - <accordion_tab - expanded="false" - layout="topleft" - name="group_land_tab" - title="Land/Assets"> - <panel - border="false" - class="panel_group_land_money" - filename="panel_group_land_money.xml" - layout="topleft" - left="0" - name="group_land_tab_panel" - top="0" /> + <accordion_tab + expanded="false" + layout="topleft" + name="group_land_tab" + title="Land/Assets" + fit_panel="false"> + <panel + border="false" + class="panel_group_land_money" + filename="panel_group_land_money.xml" + follows="left|top|right" + layout="topleft" + left="0" + name="group_land_tab_panel" + top="0" /> </accordion_tab> </accordion> </layout_panel> <layout_panel - height="25" + height="30" layout="topleft" auto_resize="false" left="0" + top_pad="0" name="button_row" follows="bottom|left" width="313"> @@ -167,56 +183,52 @@ background_visible="true" height="23" image_overlay="Refresh_Off" layout="topleft" - left="5" - top="0" + left="0" + top="5" name="btn_refresh" width="23" /> - <button - follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - left_pad="2" - top_delta="3" - name="btn_create" - visible="true" - tool_tip="Create a new Group" - width="18" /> - <!-- <button - left_pad="10" - height="20" - label="Cancel" - label_selected="Cancel" - name="btn_cancel" - visible="false" - width="65" />--> <button follows="bottom|left" label="Chat" name="btn_chat" - left_pad="2" + left_pad="3" height="23" - top_delta="-3" - width="60" /> + width="82" /> <button follows="bottom|left" - left_pad="2" + left_pad="3" height="23" name="btn_call" label="Group Call" layout="topleft" tool_tip="Call this group" - width="95" /> + width="112" /> <button follows="bottom|left" height="23" label="Save" label_selected="Save" name="btn_apply" - left_pad="2" - width="85" /> + left_pad="3" + width="82" /> + <button + follows="bottom|left" + height="23" + layout="topleft" + left="0" + label="Create Group" + name="btn_create" + visible="true" + tool_tip="Create a new Group" + width="103" /> + <!--<button + left_pad="3" + height="23" + label="Cancel" + label_selected="Cancel" + name="btn_cancel" + visible="false" + width="65" />--> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 48083b7677..15a3191bdf 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -86,7 +86,7 @@ left="4" name="ok_button" top="356" - width="130" /> + width="135" /> <button height="20" label="Cancel" diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 38b0f234d5..7996a89e72 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="false" - follows="all" height="500" label="Land & L$" layout="topleft" left="0" name="land_money_tab" top="0" - width="313"> + width="304"> <panel.string name="help_text"> A warning appears until the Total Land in Use is less than or = to the Total Contribution. diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 5f46ad7860..731b3c119c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="all" height="530" label="Notices" layout="topleft" left="0" name="notices_tab" top="0" - width="313"> + width="304"> <panel.string name="help_text"> Notices let you send a message and an optionally attached item. @@ -44,7 +43,7 @@ Maximum 200 per group daily right="-1" name="notice_list" top_pad="0" - width="313"> + width="304"> <scroll_list.columns label="" name="icon" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 25a0213bde..19c0da4f08 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="all" height="680" label="Members & Roles" layout="topleft" left="0" top="0" name="roles_tab" - width="313"> + width="304"> <panel.string name="default_needs_apply_text"> There are unsaved changes @@ -31,7 +30,7 @@ tab_height="22" tab_min_width="90" top="0" - width="313"> + width="304"> <panel border="false" follows="all" @@ -276,7 +275,7 @@ things in this group. There's a broad variety of Abilities. </tab_container> <panel height="350" - background_visible="true" + background_visible="false" bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" follows="top|left|right" @@ -356,7 +355,7 @@ things in this group. There's a broad variety of Abilities. </panel> <panel height="550" - background_visible="true" + background_visible="false" bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" follows="top|left|right" @@ -509,7 +508,7 @@ things in this group. There's a broad variety of Abilities. </panel> <panel height="424" - background_visible="true" + background_visible="false" bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" follows="top|left|right" diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 28c4adf67c..88566ea037 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -111,7 +111,7 @@ layout="topleft" min_height="25" width="100" - name="share_btn_panel" + name="pay_btn_panel" user_resize="false"> <button auto_resize="true" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 6927906d3d..befeb182f9 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -8,7 +8,7 @@ min_height="350" name="landmark_info" top="20" - width="330"> + width="333"> <string name="title_create_landmark" value="Create Landmark" /> @@ -58,11 +58,11 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" - top="0" + top="4" width="23" /> <text follows="top|left|right" @@ -72,36 +72,36 @@ left_pad="10" name="title" text_color="LtGray" - top="0" + top="2" use_ellipses="true" value="Place Profile" - width="275" /> + width="280" /> <scroll_container color="DkGray2" follows="all" - height="533" + height="532" layout="topleft" - left="10" + left="9" name="place_scroll" opaque="true" - top_pad="5" - width="313"> + top_pad="10" + width="310"> <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="610" + height="630" layout="topleft" left="0" min_height="300" name="scrolling_panel" top="0" - width="313"> + width="310"> <texture_picker enabled="false" - follows="top|left" - height="190" + follows="left|top|right" + height="197" layout="topleft" - left="10" + left="11" name="logo" top="10" width="290" /> @@ -113,29 +113,29 @@ left="10" name="region_title" text_color="white" - top_pad="5" + top_pad="10" use_ellipses="true" value="SampleRegion" - width="290" /> + width="280" /> <text follows="left|top|right" height="14" layout="topleft" left="10" name="parcel_title" - top_pad="4" + top_pad="10" use_ellipses="true" value="SampleParcel, Name Long (145, 228, 26)" - width="285" /> + width="280" /> <expandable_text follows="left|top|right" height="50" layout="topleft" - left="5" + left="10" name="description" top_pad="10" value="Du waltz die spritz" - width="300" /> + width="280" /> <icon follows="top|left" height="16" @@ -149,9 +149,9 @@ follows="left|top|right" height="16" layout="topleft" - left_pad="8" + left_pad="5" name="maturity_value" - top_delta="0" + top_pad="-13" value="unknown" width="268" /> <panel @@ -284,7 +284,7 @@ width="290" /> <combo_box follows="bottom|left|right" - height="20" + height="23" layout="topleft" left="0" name="folder_combo" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index 91d4cd6e83..ee8bca6f83 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -7,17 +7,17 @@ left="0" width="380" help_topic="panel_landmarks" - border="true" + border="false" background_visible="true" bg_alpha_color="DkGray2" - follows="left|top|right|bottom"> + follows="all"> <accordion - follows="left|top|right|bottom" - height="368" + follows="all" + height="360" layout="topleft" left="0" name="landmarks_accordion" - top="2" + top="0" width="380"> <accordion_tab layout="topleft" @@ -27,7 +27,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -43,7 +43,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -59,7 +59,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -75,8 +75,8 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" - height="120" + follows="all" + height="126" left="0" mouse_opaque="true" name="library_list" @@ -85,11 +85,14 @@ </accordion_tab> </accordion> <panel - background_visible="true" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="30" + height="38" layout="bottomleft" left="0" name="bottom_panel" @@ -104,7 +107,7 @@ layout="topleft" left="10" name="options_gear_btn" - top="6" + top="14" width="18" /> <button follows="bottom|left" @@ -113,7 +116,7 @@ image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - left_pad="5" + left_pad="10" name="add_btn" tool_tip="Add new landmark" width="18" /> @@ -123,10 +126,10 @@ image_selected="TrashItem_Press" image_unselected="TrashItem_Off" layout="topleft" - right="-5" + right="-8" name="trash_btn" tool_tip="Remove selected landmark" - top="6" + top="14" width="18" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index c6a4233c9c..50983d2976 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -2,7 +2,7 @@ <panel background_visible="true" follows="all" - height="400" + height="408" label="Things" layout="topleft" min_height="350" @@ -13,102 +13,6 @@ name="Title"> Things </panel.string> - <filter_editor - text_pad_left="14" - follows="left|top|right" - height="23" - label="Filter Inventory" - layout="topleft" - left="15" -max_length="300" - name="inventory search editor" - top="26" - width="303" /> - <tab_container -follows="all" -halign="center" - height="300" - layout="topleft" - left_delta="-4" - name="inventory filter tabs" - tab_height="30" - tab_position="top" - tab_min_width="100" - top_pad="4" - width="305"> - <inventory_panel - border="false" - follows="all" - height="295" - label="MY INVENTORY" - help_topic="my_inventory_tab" - layout="topleft" - left="0" - name="All Items" - top="16" - width="290" /> - <inventory_panel - border="false" - follows="all" - height="295" - label="RECENT" - help_topic="recent_inventory_tab" - layout="topleft" - left_delta="0" - name="Recent Items" - width="290" /> - </tab_container> - - <panel - background_visible="true" - bevel_style="none" - bottom="0" - follows="left|right|bottom" - height="30" - layout="bottomleft" - left="0" - visible="true" - name="bottom_panel" - width="330"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - layout="topleft" - left="10" - name="options_gear_btn" - picture_style="true" - top="6" - width="18" /> - <button - follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - left_pad="5" - name="add_btn" - picture_style="true" - tool_tip="Add new item" - width="18" /> - <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - right="-5" - name="trash_btn" - picture_style="true" - tool_tip="Remove selected item" - top="6" - width="18" /> - </panel> - <menu_bar bg_visible="false" follows="left|top|right" @@ -470,4 +374,115 @@ halign="center" </menu_item_check> </menu> </menu_bar> + <filter_editor + text_pad_left="10" + follows="left|top|right" + height="23" + label="Filter Inventory" + layout="topleft" + left="10" +max_length="300" + name="inventory search editor" + top="26" + width="303" /> + <tab_container + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" +follows="all" +halign="center" + height="305" + layout="topleft" + left="6" + name="inventory filter tabs" + tab_height="30" + tab_position="top" + tab_min_width="100" + top_pad="10" + width="315"> + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="295" + label="MY INVENTORY" + help_topic="my_inventory_tab" + layout="topleft" + left="0" + name="All Items" + sort_order_setting="InventorySortOrder" + top="16" + width="290" /> + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="295" + label="RECENT" + help_topic="recent_inventory_tab" + layout="topleft" + left_delta="0" + name="Recent Items" + width="290" /> + </tab_container> + + <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + bevel_style="none" + follows="left|right|bottom" + height="38" + layout="topleft" + top_pad="-1" + left="9" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="8" + name="options_gear_btn" + top="14" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="10" + name="add_btn" + tool_tip="Add new item" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-7" + name="trash_btn" + tool_tip="Remove selected item" + top="14" + width="18" /> + </panel> + + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml index a30d80f101..63c522ac69 100644 --- a/indra/newview/skins/default/xui/en/panel_me.xml +++ b/indra/newview/skins/default/xui/en/panel_me.xml @@ -4,7 +4,7 @@ border="false" follows="all" height="570" - label="My Profile!!!!!" + label="My Profile" layout="topleft" left="0" name="panel_me" @@ -26,16 +26,16 @@ </text> --> <tab_container follows="all" - height="570" + height="575" halign="center" layout="topleft" - left="6" + left="5" name="tabs" tab_min_width="95" tab_height="30" tab_position="top" top_pad="10" - width="315"> + width="317"> <panel class="panel_my_profile" filename="panel_my_profile.xml" diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index d519569543..4112b65635 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -60,13 +60,13 @@ left="0" name="profile_scroll" opaque="true" - height="492" + height="488" width="315" top="0"> <panel layout="topleft" follows="left|top|right" - height="492" + height="488" name="scroll_content_panel" top="0" left="0" @@ -385,12 +385,12 @@ user_resize="false" auto_resize="false" height="28" - width="313"> + width="315"> <button follows="bottom|right" height="23" - left="4" - top="5" + left="6" + top="1" label="Edit Profile" name="edit_profile_btn" tool_tip="Edit your personal information" @@ -399,10 +399,10 @@ follows="bottom|right" height="23" label="Edit Appearance" - left_pad="4" + left_pad="3" name="edit_appearance_btn" tool_tip="Create/edit your appearance: physical data, clothes and etc." - width="152" /> + width="153" /> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index d484564e0d..a314cedc21 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -151,7 +151,6 @@ width="590"> <label follows="left|top" - font.style="BOLD" height="15" layout="topleft" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 2b361c0628..1d99de1fa7 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -8,12 +8,6 @@ name="chat_bar" top="21" width="310"> - <string name="min_width"> - 188 - </string> - <string name="max_width"> - 320 - </string> <line_editor border_style="line" border_thickness="1" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml new file mode 100644 index 0000000000..7c0ce9e62e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -0,0 +1,387 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + can_resize="true" + can_close="false" + mouse_opaque="true" + bg_opaque_image="Volume_Background" + bg_alpha_image="Volume_Background" + background_opaque="true" + background_visible="true" + layout="topleft" + width="270" + height="235" + name="nearby_media" + help_topic="nearby_media"> + <string name="empty_item_text"><empty></string> + <string name="parcel_media_name">Parcel Streaming Media</string> + <string name="parcel_audio_name">Parcel Streaming Audio</string> + <string name="playing_suffix">(playing)</string> + <panel + bevel_style="in" + background_visible="false" + follows="left|right|top" + top="0" + height="30" + name="minimized_controls" + left="0"> + <button + name="all_nearby_media_disable_btn" + follows="left" + tool_tip="Turn all nearby media off" + left="15" + width="60" + height="22" + label="Stop All"> + <button.commit_callback + function="MediaListCtrl.DisableAll" /> + </button> + <button + name="all_nearby_media_enable_btn" + follows="left" + tool_tip="Turn all nearby media on" + left_pad="4" + width="60" + height="22" + label="Start All"> + <button.commit_callback + function="MediaListCtrl.EnableAll" /> + </button> + <button + name="open_prefs_btn" + image_overlay="Icon_Gear_Foreground" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + tool_tip = "Bring up media prefs" + top_delta="0" + left_pad="4" + height="22" + min_width="28" + width="28"> + <button.commit_callback + function="MediaListCtrl.GoMediaPrefs" /> + </button> + <button + name="more_less_btn" + follows="right" + tool_tip="Advanced Controls" + top_delta="0" + right="-10" + width="60" + height="22" + toggle="true" + label="More >>" + label_selected="Less <<"> + <button.commit_callback + function="MediaListCtrl.MoreLess" /> + </button> + </panel> + <panel + name="nearby_media_panel" + bevel_style="in" + border_style="line" + bg_alpha_color="0 0 0 0" + bg_opaque_color="0 0 0 0.3" + follows="left|right|top|bottom" + top_delta="30" + right="-1" + left="0" + height="200"> + <text + type="string" + length="1" + follows="top|left" + font="SansSerif" + left="10" + width="100"> + Nearby Media + </text> + <text + type="string" + length="1" + follows="top|left" + font="SansSerif" + top_pad="15" + left="10" + width="40"> + Show: + </text> + <combo_box + height="23" + left="50" + width="140" + top_delta="-5" + follows="left|top" + name="show_combo"> + <combo_box.item + label="All" + value="0" + name="All" /> + <combo_box.item + label="In this Parcel" + value="2" + name="WithinParcel" /> + <combo_box.item + label="Outside this Parcel" + value="3" + name="OutsideParcel" /> + <combo_box.item + label="On other Avatars" + value="4" + ame="OnOthers" /> + </combo_box> + <scroll_list + name="media_list" + follows="left|top|bottom|right" + column_padding="0" + height="105" + draw_heading="false" + draw_stripes="true" + bg_stripe_color="0.25 0.25 0.25 0.25" + top_pad="8" + left="10" + right="-10"> + <scroll_list.columns + type="checkbox" + width="-1" + label="" + name="media_checkbox_ctrl" /> + <scroll_list.columns + sort_column="media_proximity" + width="-1" + label="Proximity" + name="media_proximity" /> + <scroll_list.columns + sort_column="media_visibility" + width="-1" + label="Visible" + name="media_visibility" /> + <scroll_list.columns + sort_column="media_class" + width="-1" + label="Class" + name="media_class" /> + <scroll_list.columns + label="Name" + name="media_name" /> + <scroll_list.columns + sort_column="media_debug" + width="-1" + label="Debug" + name="media_debug" /> + </scroll_list> + <panel + bevel_style="in" + background_visible="false" + follows="left|right|bottom" + top_pad="5" + height="30" + left="10" + right="-10"> + <layout_stack + name="media_controls" + follows="left|right|top" + animate="false" + height="26" + layout="topleft" + top="4" + left="10" + right="-10" + border_size="0" + orientation="horizontal"> + <layout_panel + name="stop" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="stop_btn" + follows="top" + image_overlay="Stop_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip="Stop selected media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Stop" /> + </button> + </layout_panel> + <layout_panel + name="play" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="play_btn" + follows="top" + image_overlay="Play_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip = "Play selected media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Play" /> + </button> + </layout_panel> + <layout_panel + name="pause" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="pause_btn" + follows="top" + image_overlay="Pause_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + top="0" + height="22" + width="22" + tool_tip = "Pause selected media"> + <button.commit_callback + function="SelectedMediaCtrl.Pause" /> + </button> + </layout_panel> + <layout_panel + name="volume_slider_ctrl" + auto_resize="true" + user_resize="false" + follows="left|right" + layout="topleft" + top="0" + height="22" + min_width="100" + width="200"> + <slider_bar + name="volume_slider" + follows="left|right|top" + top="0" + height="22" + increment="0.01" + initial_value="0.5" + layout="topleft" + tool_tip="Audio volume for selected media" + width="200"> + <slider_bar.commit_callback + function="SelectedMediaCtrl.Volume" /> + </slider_bar> + </layout_panel> + <layout_panel + name="mute" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="72" + min_width="22" + width="22"> + <button + name="mute_btn" + follows="top" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + hover_glow_amount="0.15" + is_toggle="true" + layout="topleft" + scale_image="false" + tool_tip="Mute audio on selected media" + top="0" + height="20" + width="22" > + <button.commit_callback + function="SelectedMediaCtrl.Mute" /> + </button> + </layout_panel> + <layout_panel + name="zoom" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="28" + min_width="22" + width="22"> + <button + name="zoom_btn" + follows="top" + image_overlay="Zoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip="Zoom into selected media" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Zoom" /> + </button> + </layout_panel> + <layout_panel + name="unzoom" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="21" + width="21" > + <button + name="unzoom_btn" + follows="top" + image_overlay="UnZoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip ="Zoom back from selected media" + top_delta="-4" + width="21" > + <button.commit_callback + function="SelectedMediaCtrl.Unzoom" /> + </button> + </layout_panel> + <layout_panel + name="right_bookend" + width="0" + user_resize="false" /> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index ac100a2c06..cff7b51ce8 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="all" - height="540" + height="533" label="Notes & Privacy" layout="topleft" left="0" @@ -25,7 +25,7 @@ layout="topleft" top="0" left="0" - height="475" + height="450" width="313"> <scroll_container color="DkGray2" @@ -34,7 +34,7 @@ left="0" name="profile_scroll" opaque="true" - height="475" + height="450" width="313" top="0"> <panel @@ -46,35 +46,35 @@ width="303"> <text follows="left|top" - font="SansSerifBold" + font.style="BOLD" height="16" layout="topleft" - left="10" + left="11" name="status_message" text_color="white" - top="20" + top="10" value="My private notes:" width="293" /> <text_editor follows="left|top" height="120" layout="topleft" - left="10" + left="12" max_length="1000" name="notes_edit" text_color="DkGray" - top_pad="10" - width="280" + top_pad="3" + width="288" word_wrap="true" /> <text follows="left|top" - font="SansSerifBold" + font.style="BOLD" height="16" layout="topleft" - left="10" + left="11" name="status_message2" text_color="white" - top_pad="30" + top_pad="20" value="Allow this person to:" width="293" /> <check_box @@ -82,7 +82,7 @@ height="16" label="See my online status" layout="topleft" - left="20" + left="10" name="status_check" width="293" /> <check_box @@ -90,7 +90,7 @@ height="16" label="See me on the map" layout="topleft" - left="20" + left="10" name="map_check" width="293" /> <check_box @@ -98,7 +98,7 @@ height="16" label="Edit, delete or take my objects" layout="topleft" - left="20" + left="10" name="objects_check" width="293" /> </panel> @@ -117,7 +117,7 @@ height="23" label="Add Friend" layout="topleft" - left="0" + left="2" mouse_opaque="false" name="add_friend" tool_tip="Offer friendship to the Resident" @@ -142,7 +142,7 @@ tool_tip="Call this Resident" left_pad="3" top="5" - width="45" /> + width="46" /> <button enabled="false" follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 145a24b642..34738745eb 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -3,8 +3,8 @@ background_opaque="false" border_visible="false" background_visible="true" - bg_alpha_color="0.3 0.3 0.3 0" - bg_opaque_color="0.3 0.3 0.3 0" + bg_alpha_color="1 0.3 0.3 0" + bg_opaque_color="1 0.3 0.3 0" label="notification_panel" layout="topleft" left="0" @@ -83,12 +83,16 @@ <panel background_visible="false" follows="left|right|bottom" - height="40" + height="30" + width="290" label="control_panel" layout="topleft" - left="0" - left_delta="-38" + left="10" name="control_panel" - top_pad="0"> + top_pad="5"> + <!-- + Notes: + This panel holds buttons of notification. Change of its size can affect the layout of buttons. + --> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_online_status.xml b/indra/newview/skins/default/xui/en/panel_online_status.xml new file mode 100644 index 0000000000..14cb5fffee --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_online_status.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="false" + height="152" + label="friend_online_status" + layout="topleft" + left="0" + name="friend_online_status" + top="0" + width="305"> + <avatar_icon + follows="top|left" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="false" + name="avatar_icon" + top="10" + width="18" /> + <text + font="SansSerifSmall" + follows="all" + height="137" + layout="topleft" + left_pad="5" + name="message" + text_color="white" + top="15" + use_ellipses="true" + value="" + width="285" + word_wrap="true" + max_length="350" /> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml new file mode 100644 index 0000000000..14cb5fffee --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="false" + height="152" + label="friend_online_status" + layout="topleft" + left="0" + name="friend_online_status" + top="0" + width="305"> + <avatar_icon + follows="top|left" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="false" + name="avatar_icon" + top="10" + width="18" /> + <text + font="SansSerifSmall" + follows="all" + height="137" + layout="topleft" + left_pad="5" + name="message" + text_color="white" + top="15" + use_ellipses="true" + value="" + width="285" + word_wrap="true" + max_length="350" /> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 710ca733e0..cc60b97f92 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -11,15 +11,15 @@ border="false"> <tab_container follows="all" - height="500" + height="490" layout="topleft" - left="10" + left="6" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" - width="313"> + width="315"> <inventory_panel background_visible="true" background_opaque="true" @@ -49,39 +49,51 @@ start_folder="Current Outfit" width="313" /> </tab_container> + <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="left|right|bottom" + height="38" + layout="topleft" + left="9" + visible="true" + top_pad="-1" + width="310" /> <panel - background_visible="true" + background_visible="false" follows="bottom|left" - height="50" + height="73" layout="topleft" - left="0" + left="9" visible="true" name="bottom_panel" - top_pad="10" - width="313"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - layout="topleft" - left="10" - name="options_gear_btn" - top="6" - width="18" /> - <dnd_button - follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - right="-5" - name="trash_btn" - tool_tip="Remove selected item" - top="6" - width="18" /> + top_pad="-38" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="8" + name="options_gear_btn" + top="14" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-9" + name="trash_btn" + tool_tip="Remove selected item" + top="14" + width="18" /> <button follows="bottom|left" height="23" @@ -89,20 +101,19 @@ layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" - top="26" - left='10' - width="120" /> + top="43" + left="0" + width="153" /> <button follows="bottom|right" height="23" label="Wear" layout="topleft" name="wear_btn" - right="-10" - left_pad="10" - top="26" + left_pad="3" + top="43" tool_tip="Wear selected outfit" - width="120" /> + width="152" /> <button follows="bottom|left" height="23" @@ -114,4 +125,5 @@ visible="false" width="20" /> </panel> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 446bf0dc6e..13791a6d32 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Side tray panel --> <panel -background_visible="true" follows="all" - height="575" label="People" layout="topleft" + height="449" min_height="350" name="people_panel" top="0" @@ -29,11 +28,22 @@ background_visible="true" <string name="groups_filter_label" value="Filter Groups" /> + <!-- + *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes. + They are not defined as translatable in VLT. See EXT-5931 + --> + <string + name="no_filtered_groups_msg" + value="[secondlife:///app/search/groups Try finding the group in search?]" /> + <string + name="no_groups_msg" + value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor + text_pad_left="10" follows="left|top|right" height="23" layout="topleft" - left="15" + left="10" label="Filter" max_length="300" name="filter_input" @@ -42,19 +52,23 @@ background_visible="true" width="303" /> <tab_container follows="all" - height="500" + height="383" layout="topleft" - left="6" + left="5" name="tabs" tab_min_width="70" tab_height="30" tab_position="top" top_pad="10" halign="center" - width="313"> - <panel + width="317"> + <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" follows="all" - height="500" + height="383" label="NEARBY" layout="topleft" left="0" @@ -65,7 +79,7 @@ background_visible="true" <avatar_list allow_select="true" follows="all" - height="470" + height="345" ignore_online_status="true" layout="topleft" left="0" @@ -75,7 +89,7 @@ background_visible="true" width="313" /> <panel follows="left|right|bottom" - height="30" + height="38" label="bottom_panel" layout="topleft" left="0" @@ -91,7 +105,7 @@ background_visible="true" layout="topleft" left="10" name="nearby_view_sort_btn" - top="5" + top="10" width="18" /> <button follows="bottom|left" @@ -100,9 +114,8 @@ background_visible="true" image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - left_pad="5" + left_pad="10" name="add_friend_btn" - top_delta="0" tool_tip="Add selected Resident to your friends List" width="18"> <commit_callback @@ -111,8 +124,12 @@ background_visible="true" </panel> </panel> <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" follows="all" - height="500" + height="383" label="MY FRIENDS" layout="topleft" left="0" @@ -122,7 +139,7 @@ background_visible="true" width="313"> <accordion follows="all" - height="470" + height="345" layout="topleft" left="0" name="friends_accordion" @@ -130,14 +147,14 @@ background_visible="true" width="313"> <accordion_tab layout="topleft" - height="235" + height="172" min_height="150" name="tab_online" title="Online"> <avatar_list allow_select="true" follows="all" - height="235" + height="172" layout="topleft" left="0" multi_select="true" @@ -147,13 +164,13 @@ background_visible="true" </accordion_tab> <accordion_tab layout="topleft" - height="235" + height="173" name="tab_all" title="All"> <avatar_list allow_select="true" follows="all" - height="235" + height="173" layout="topleft" left="0" multi_select="true" @@ -162,20 +179,9 @@ background_visible="true" width="313" /> </accordion_tab> </accordion> - <text - follows="all" - height="450" - left="10" - name="no_friends_msg" - top="10" - width="293" - wrap="true"> - To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend. -If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. - </text> <panel follows="left|right|bottom" - height="30" + height="38" label="bottom_panel" layout="topleft" left="0" @@ -191,7 +197,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" left="10" name="friends_viewsort_btn" - top="5" + top="10" width="18" /> <button follows="bottom|left" @@ -200,10 +206,9 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - left_pad="5" + left_pad="10" name="add_btn" tool_tip="Offer friendship to a Resident" - top_delta="0" width="18" /> <button follows="bottom|left" @@ -219,10 +224,25 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t top_delta="0" width="18" /> </panel> + <text + follows="all" + height="450" + left="10" + name="no_friends_msg" + top="10" + width="293" + wrap="true"> + To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend. +If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. + </text> </panel> <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" follows="all" - height="500" + height="383" label="MY GROUPS" layout="topleft" left="0" @@ -230,20 +250,23 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t name="groups_panel" top="0" width="313"> + <!-- + *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931 + Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() + --> <group_list follows="all" - height="470" + height="345" layout="topleft" left="0" name="group_list" - no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]" + no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" width="313" /> <panel - top_pad="0" follows="left|right|bottom" - height="30" + height="38" label="bottom_panel" layout="topleft" left="0" @@ -259,7 +282,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" left="10" name="groups_viewsort_btn" - top="7" + top="10" width="18" /> <button follows="bottom|left" @@ -268,10 +291,9 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - left_pad="5" + left_pad="10" name="plus_btn" tool_tip="Join group/Create new group" - top_delta="0" width="18" /> <button follows="bottom|left" @@ -280,16 +302,20 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t image_selected="Activate_Checkmark" image_unselected="Activate_Checkmark" layout="topleft" - left_pad="24" + left_pad="10" name="activate_btn" tool_tip="Activate selected group" - top_delta="5" + top_delta="4" width="10" /> </panel> </panel> <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" follows="all" - height="500" + height="383" label="RECENT" layout="topleft" left="0" @@ -300,7 +326,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <avatar_list allow_select="true" follows="all" - height="470" + height="345" layout="topleft" left="0" multi_select="true" @@ -309,9 +335,8 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t top="0" width="313" /> <panel - top_pad="0" follows="left|right|bottom" - height="30" + height="38" label="bottom_panel" layout="topleft" left="0" @@ -327,7 +352,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" left="10" name="recent_viewsort_btn" - top="7" + top="10" width="18" /> <button follows="bottom|left" @@ -336,7 +361,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t image_unselected="AddItem_Off" image_disabled="AddItem_Disabled" layout="topleft" - left_pad="5" + left_pad="10" name="add_friend_btn" top_delta="0" tool_tip="Add selected Resident to your friends List" @@ -349,15 +374,14 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t </tab_container> <panel follows="bottom|left" - height="35" + height="23" layout="topleft" - left="10" + left="8" + top_pad="0" name="button_bar" width="313"> <button follows="bottom|left" - top="4" - left="0" height="23" label="Profile" layout="topleft" @@ -366,72 +390,66 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t width="70" /> <button follows="bottom|left" - top="4" - left_pad="2" + left_pad="3" height="23" label="IM" layout="topleft" name="im_btn" tool_tip="Open instant message session" - width="45" /> + width="43" /> <button follows="bottom|left" - top="4" - left_pad="2" + left_pad="3" height="23" label="Call" layout="topleft" name="call_btn" tool_tip="Call this Resident" - width="50" /> + width="51" /> <button - follows="left|top" - top="4" - left_pad="2" + follows="bottom|left" + left_pad="3" height="23" label="Share" layout="topleft" name="share_btn" - width="60" /> + width="62" /> <button follows="bottom|left" - top="4" - left_pad="2" + left_pad="3" height="23" label="Teleport" layout="topleft" name="teleport_btn" tool_tip="Offer teleport" - width="75" /> + width="76" /> <button follows="bottom|left" - top="4" left="0" + top_delta="0" height="23" label="Group Profile" layout="topleft" name="group_info_btn" tool_tip="Show group information" - width="102" /> + width="107" /> <button follows="bottom|left" - top="4" - left_pad="2" + left_pad="3" height="23" label="Group Chat" layout="topleft" name="chat_btn" tool_tip="Open chat session" - width="102" /> + width="100" /> <button follows="bottom|left" - top="4" - left_pad="2" + left_pad="3" height="23" label="Group Call" layout="topleft" name="group_call_btn" tool_tip="Call this group" - width="102" /> + width="95" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 097813131f..ecf5516390 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -16,7 +16,7 @@ image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="11" + left="12" tab_stop="false" top="2" width="23" /> @@ -36,12 +36,12 @@ color="DkGray2" opaque="true" follows="all" - height="502" + height="503" layout="topleft" - left="9" + left="8" top_pad="10" name="profile_scroll" - width="310"> + width="312"> <panel name="scroll_content_panel" follows="left|top|right" @@ -116,7 +116,7 @@ height="35" layout="topleft" top_pad="5" - left="9" + left="8" name="buttons"> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 8b25fb5d2a..715dc5f23c 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="picture_descr" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 9ef3649d9c..0093a08e15 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -4,7 +4,7 @@ bg_opaque_color="DkGray2" background_visible="true" background_opaque="true" follows="all" - height="540" + height="548" label="Picks" layout="topleft" left="0" @@ -30,7 +30,7 @@ bg_opaque_color="DkGray2" <accordion fit_parent="true" follows="all" - height="465" + height="470" layout="topleft" left="0" name="accordion" @@ -86,7 +86,7 @@ bg_opaque_color="DkGray2" label="bottom_panel" layout="topleft" name="edit_panel" - top_pad="0" + top_pad="-2" width="313"> <button enabled="false" @@ -130,8 +130,8 @@ bg_opaque_color="DkGray2" background_opaque="true" layout="topleft" left="0" - height="30" - top_pad="7" + height="40" + top="502" name="buttons_cucks" width="313"> <button diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 94c9b2de01..1e7c51259c 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -8,7 +8,7 @@ min_height="350" name="place_profile" top="20" - width="330"> + width="333"> <string name="on" value="On" /> @@ -143,11 +143,11 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" - top="0" + top="4" width="23" /> <text follows="top|left|right" @@ -157,36 +157,36 @@ left_pad="10" name="title" text_color="LtGray" - top="0" + top="2" use_ellipses="true" value="Place Profile" - width="275" /> + width="280" /> <scroll_container color="DkGray2" follows="all" - height="533" + height="532" layout="topleft" - left="10" + left="9" name="place_scroll" opaque="true" - top_pad="5" - width="313"> + top_pad="10" + width="310"> <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="533" + height="540" layout="topleft" left="0" min_height="300" name="scrolling_panel" top="0" - width="313"> + width="310"> <texture_picker enabled="false" - follows="top|left" - height="190" + follows="left|top|right" + height="197" layout="topleft" - left="10" + left="11" name="logo" top="10" width="290" /> @@ -318,13 +318,14 @@ width="268" /> <accordion follows="all" - height="230" + height="223" layout="topleft" left="0" name="advanced_info_accordion" top_pad="10" width="313"> <accordion_tab + height="170" layout="topleft" name="parcel_characteristics_tab" title="Parcel"> @@ -333,6 +334,7 @@ height="160" layout="topleft" left="0" + name="parcel_characteristics_panel" top="0" width="275"> <icon @@ -536,6 +538,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="150" layout="topleft" name="region_information_tab" title="Region"> @@ -544,6 +547,7 @@ height="125" layout="topleft" left="0" + name="region_information_panel" top="0" width="290"> <text @@ -662,6 +666,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="190" layout="topleft" name="estate_information_tab" title="Estate"> @@ -670,6 +675,7 @@ height="189" layout="topleft" left="0" + name="estate_information_panel" top="0" width="290"> <text @@ -750,6 +756,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="320" layout="topleft" name="sales_tab" title="For Sale"> @@ -758,6 +765,7 @@ height="300" layout="topleft" left="0" + name="sales_panel" top="0" width="290"> <text diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index c4e4b9aa9b..ff5d89470c 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -17,12 +17,12 @@ background_visible="true" name="teleport_history_tab_title" value="TELEPORT HISTORY" /> <filter_editor - text_pad_left="14" + text_pad_left="10" follows="left|top|right" font="SansSerifSmall" height="23" layout="topleft" - left="15" + left="10" label="Filter My Places" max_length="300" name="Filter" @@ -31,15 +31,15 @@ background_visible="true" <tab_container follows="all" halign="center" - height="500" + height="503" layout="topleft" - left="10" + left="6" name="Places Tabs" tab_min_width="80" tab_height="30" tab_position="top" top_pad="10" - width="313" /> + width="315" /> <panel class="panel_place_profile" filename="panel_place_profile.xml" @@ -51,7 +51,7 @@ background_visible="true" name="panel_place_profile" top="5" visible="false" - width="313" /> + width="315" /> <panel class="panel_landmark_info" filename="panel_landmark_info.xml" @@ -63,13 +63,13 @@ background_visible="true" name="panel_landmark_info" top="5" visible="false" - width="313" /> + width="315" /> <panel height="19" layout="topleft" - left="0" + left="4" name="button_panel" - width="313"> + width="315"> <button follows="bottom|left" height="23" @@ -78,65 +78,59 @@ background_visible="true" left="5" name="teleport_btn" tool_tip="Teleport to the selected area" - top="0" - width="100" /> + top="1" + width="108" /> <button follows="bottom|left" height="23" label="Map" layout="topleft" - left_pad="5" + left_pad="3" name="map_btn" - top="0" - width="70" /> + width="85" /> <button follows="bottom|left" height="23" label="Edit" layout="topleft" - left_pad="5" + left_pad="3" name="edit_btn" tool_tip="Edit landmark information" - top="0" - width="70" /> + width="83" /> <button follows="bottom|right" height="23" - image_disabled="ForwardArrow_Off" - image_selected="ForwardArrow_Press" - image_unselected="ForwardArrow_Off" + label="â–¼" layout="topleft" name="overflow_btn" tool_tip="Show additional options" - right="-10" - top="0" - width="18" /> + left_pad="3" + width="23" /> <button - follows="bottom|right" + follows="bottom|left" height="23" - label="Close" + label="Save" layout="topleft" - name="close_btn" - right="-10" - top="0" - width="60" /> + name="save_btn" + left="5" + top_pad="-23" + width="152" /> <button follows="bottom|right" height="23" label="Cancel" layout="topleft" name="cancel_btn" - right="-10" - top="0" - width="60" /> + left_pad="3" + width="153" /> <button follows="bottom|right" height="23" - label="Save" + label="Close" layout="topleft" - name="save_btn" - right="-75" - top="0" + name="close_btn" + right="-10" + top="1" width="60" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 05a3771edf..4be4d6b432 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -171,6 +171,7 @@ Automatic position for: height="50" layout="topleft" left_pad="10" + top="190" name="background" tool_tip="Choose color for bubble chat" width="38"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 2e81139ef2..3d434361b9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -14,6 +14,7 @@ layout="topleft" left="30" height="12" + name="font_size" width="120" top="10"> Font size: @@ -60,6 +61,7 @@ layout="topleft" left="30" height="12" + name="font_colors" top_pad="10" width="120" > diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 099c789e4b..d11aebe943 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -141,7 +141,34 @@ label="General" name="Desired_PG" value="13" /> + <combo_box.commit_callback + function="Pref.MaturitySettings"/> </combo_box> + <icon + follows="left|top" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left_pad="5" + name="rating_icon_general" + top_delta="3" + width="18"/> + <icon + follows="left|top" + height="16" + image_name="Parcel_M_Dark" + layout="topleft" + left_pad="2" + name="rating_icon_moderate" + width="18"/> + <icon + follows="left|top" + height="16" + image_name="Parcel_R_Dark" + layout="topleft" + left_pad="2" + name="rating_icon_adult" + width="18"/> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 82821a1dfe..c74de043e9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -366,10 +366,7 @@ min_val="64" name="DrawDistance" top="3" - width="255"> - <slider.commit_callback - function="Pref.UpdateMeterText" /> - </slider> + width="255" /> <text type="string" length="1" @@ -638,7 +635,7 @@ left_delta="-230" name="LightingDetailText" top_pad="8" - width="128"> + width="140"> Lighting detail: </text> <radio_group @@ -675,10 +672,10 @@ follows="left|top" height="12" layout="topleft" - left="360" + left="358" name="TerrainDetailText" top="465" - width="128"> + width="155"> Terrain detail: </text> <radio_group diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index f78d90c434..f232a69482 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -78,43 +78,6 @@ name="cookies_enabled" top_pad="10" width="350" /> - <check_box - name="media_enabled" - control_name="AudioStreamingMedia" - height="16" - label="Media Enabled" - layout="topleft" - left="30" - top_pad="10" - width="350"> - <check_box.commit_callback - function="Pref.MediaEnabled" /> - </check_box> - <check_box - enabled_control="AudioStreamingMedia" - control_name="ParcelMediaAutoPlayEnable" - height="16" - label="Allow Media to auto-play" - layout="topleft" - left="30" - name="autoplay_enabled" - top_pad="10" - width="350"> - <check_box.commit_callback - function="Pref.ParcelMediaAutoPlayEnable" /> - </check_box> - <check_box - control_name="AudioStreamingMusic" - height="16" - label="Music Enabled" - layout="topleft" - left="30" - name="music_enabled" - top_pad="10" - width="350"> - <check_box.commit_callback - function="Pref.MusicEnabled" /> - </check_box> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index ae5e6fbbfa..e03ecd8f04 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -17,7 +17,7 @@ increment="0.05" initial_value="0.5" label="Master volume" - label_width="160" + label_width="120" layout="topleft" left="0" name="System Volume" @@ -25,20 +25,20 @@ slider_label.halign="right" top="10" volume="true" - width="350"> + width="300"> <slider.commit_callback function="Pref.setControlFalse" parameter="MuteAudio" /> </slider> <button control_name="MuteAudio" - follows="top|right" + follows="top|left" height="16" image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="16" + left_pad="5" name="mute_audio" tab_stop="false" width="16" /> @@ -46,12 +46,46 @@ control_name="MuteWhenMinimized" height="15" initial_value="true" - label="Mute if minimized" + label="Mute when minimized" layout="topleft" - left="167" name="mute_when_minimized" - top_pad="5" - width="215" /> + top_delta="3" + left_pad="5" + width="235" /> + <slider + control_name="AudioLevelUI" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.05" + initial_value="0.5" + label="Buttons" + label_width="120" + layout="topleft" + left="0" + name="UI Volume" + show_text="false" + slider_label.halign="right" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteUI" /> + </slider> + <button + control_name="MuteUI" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> <slider control_name="AudioLevelAmbient" disabled_control="MuteAudio" @@ -60,7 +94,7 @@ increment="0.05" initial_value="0.5" label="Ambient" - label_width="160" + label_width="120" layout="topleft" left="0" name="Wind Volume" @@ -68,7 +102,7 @@ slider_label.halign="right" top_pad="7" volume="true" - width="350"> + width="300"> <slider.commit_callback function="Pref.setControlFalse" parameter="MuteAmbient" /> @@ -76,81 +110,13 @@ <button control_name="MuteAmbient" disabled_control="MuteAudio" - follows="top|right" - height="16" - image_selected="AudioMute_Off" - image_unselected="Audio_Off" - is_toggle="true" - layout="topleft" - left_pad="16" - name="mute_audio" - tab_stop="false" - width="16" /> - <slider - control_name="AudioLevelUI" - disabled_control="MuteAudio" - follows="left|top" - height="15" - increment="0.05" - initial_value="0.5" - label="Buttons" - label_width="160" - layout="topleft" - left="0" - name="UI Volume" - show_text="false" - slider_label.halign="right" - top_pad="7" - volume="true" - width="350"> - <slider.commit_callback - function="Pref.setControlFalse" - parameter="MuteUI" /> - </slider> - <button - control_name="MuteUI" - disabled_control="MuteAudio" - follows="top|right" - height="16" - image_selected="AudioMute_Off" - image_unselected="Audio_Off" - is_toggle="true" - layout="topleft" - left_pad="16" - name="mute_audio" - tab_stop="false" - width="16" /> - <slider - control_name="AudioLevelMedia" - disabled_control="MuteAudio" - follows="left|top" - height="15" - increment="0.05" - initial_value="0.5" - label="Media" - label_width="160" - layout="topleft" - left="0" - name="Media Volume" - show_text="false" - slider_label.halign="right" - top_pad="7" - volume="true" - width="350"> - <slider.commit_callback - function="Pref.setControlFalse" - parameter="MuteMedia" /> - </slider> - <button - control_name="MuteMedia" - disabled_control="MuteAudio" - follows="top|right" + follows="top|left" height="16" image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="16" + left_pad="5" name="mute_audio" tab_stop="false" width="16" /> @@ -161,8 +127,8 @@ height="15" increment="0.05" initial_value="0.5" - label="Sound effects" - label_width="160" + label="Sound Effects" + label_width="120" slider_label.halign="right" layout="topleft" left="0" @@ -170,7 +136,7 @@ show_text="false" top_pad="7" volume="true" - width="350"> + width="300"> <slider.commit_callback function="Pref.setControlFalse" parameter="MuteSounds" /> @@ -178,13 +144,13 @@ <button control_name="MuteSounds" disabled_control="MuteAudio" - follows="top|right" + follows="top|left" height="16" image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="16" + left_pad="5" name="mute_audio" tab_stop="false" width="16" /> @@ -196,7 +162,7 @@ increment="0.05" initial_value="0.5" label="Streaming music" - label_width="160" + label_width="120" layout="topleft" left="0" name="Music Volume" @@ -204,119 +170,199 @@ show_text="false" top_pad="7" volume="true" - width="350"> + width="300"> <slider.commit_callback function="Pref.setControlFalse" parameter="MuteMusic" /> - </slider> - <button + </slider> + <button control_name="MuteMusic" - disabled_control="MuteAudio" - follows="top|right" + disabled_control="MuteAudio" + follows="top|left" height="16" image_selected="AudioMute_Off" image_unselected="Audio_Off" is_toggle="true" layout="topleft" - left_pad="16" + left_pad="5" name="mute_audio" tab_stop="false" - width="16" /> - <check_box - label_text.halign="left" - follows="left|top" - height="16" - control_name ="EnableVoiceChat" - disabled_control="CmdLineDisableVoice" - label="Enable voice" - layout="topleft" - left="28" - name="enable_voice_check" - top_pad="5" - width="110" - > - </check_box> - <slider - control_name="AudioLevelVoice" - enabled_control="EnableVoiceChat" - disabled_control="MuteAudio" + width="16" /> + <check_box + control_name="AudioStreamingMusic" + height="16" + label="Enabled" + layout="topleft" + left_pad="5" + name="music_enabled" + top_delta="2" + width="350"/> + <slider + control_name="AudioLevelMedia" + disabled_control="MuteAudio" + follows="left|top" + height="16" + increment="0.05" + initial_value="0.5" + label="Media" + label_width="120" + layout="topleft" + left="0" + name="Media Volume" + show_text="false" + slider_label.halign="right" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteMedia" /> + </slider> + <button + control_name="MuteMedia" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + label_text.halign="left" + follows="left|top" + height="16" + control_name ="AudioStreamingMedia" + label="Enabled" + layout="topleft" + top_delta="2" + left_pad="5" + name="enable_media" + width="110"/> + <slider + control_name="AudioLevelVoice" + disabled_control="MuteAudio" + follows="left|top" + height="16" + increment="0.05" + initial_value="0.5" + label="Voice Chat" + label_width="120" + layout="topleft" + left="0" + top_delta="20" + name="Voice Volume" + show_text="false" + slider_label.halign="right" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteVoice" /> + </slider> + <button + control_name="MuteVoice" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + label_text.halign="left" + follows="left|top" + height="16" + control_name ="EnableVoiceChat" + disabled_control="CmdLineDisableVoice" + label="Enabled" + layout="topleft" + top_delta="2" + left_pad="5" + name="enable_voice_check" + width="110"/> + <!-- --> + <check_box + name="media_auto_play_btn" + control_name="ParcelMediaAutoPlayEnable" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Check this to let media auto-play if it wants" + label="Allow Media to auto-play" + top_pad="5" + left="25"/> + <check_box + name="media_show_on_others_btn" + control_name="MediaShowOnOthers" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Uncheck this to hide media attached to other avatars nearby" + label="Play media attached to other avatars" + left="25"/> + + <text + type="string" + length="1" follows="left|top" - height="15" - increment="0.05" - initial_value="0.5" - label="Voice" - label_width="160" - layout="topleft" - left="0" - top_delta="20" - name="Voice Volume" - show_text="false" - slider_label.halign="right" - volume="true" - width="350"> - <slider.commit_callback - function="Pref.setControlFalse" - parameter="MuteVoice" /> - </slider> - <button - control_name="MuteVoice" - disabled_control="MuteAudio" - follows="top|right" - height="16" - image_selected="AudioMute_Off" - image_unselected="Audio_Off" - is_toggle="true" + height="20" layout="topleft" - left_pad="16" - name="mute_audio" - tab_stop="false" - width="16" /> + left="25" + name="voice_chat_settings" + width="200" + top="210"> + Voice Chat Settings + </text> <text type="string" length="1" follows="left|top" - height="13" layout="topleft" - left="30" + left="80" + top_delta="16" name="Listen from" - width="200" - top="205"> + width="142"> Listen from: </text> - <icon - follows="left|top" - height="18" - image_name="Cam_FreeCam_Off" - layout="topleft" - name="camera_icon" - mouse_opaque="false" - visible="true" - width="18" - left="80" - top="219"/> <icon - follows="left|top" - height="18" - image_name="Move_Walk_Off" - layout="topleft" - name="avatar_icon" - mouse_opaque="false" - visible="true" - width="18" - top="239" - left="80" - /> + follows="left|top" + height="18" + image_name="Cam_FreeCam_Off" + layout="topleft" + name="camera_icon" + mouse_opaque="false" + visible="true" + width="18" + left_pad="0" + top_delta="-5"/> + <icon + follows="left|top" + height="18" + image_name="Move_Walk_Off" + layout="topleft" + name="avatar_icon" + mouse_opaque="false" + visible="true" + width="18" + top_delta="20" /> <radio_group enabled_control="EnableVoiceChat" control_name="VoiceEarLocation" draw_border="false" follows="left|top" layout="topleft" - left="100" + left_pad="2" width="221" height="38" - name="ear_location" - top="218"> + name="ear_location"> <radio_item height="16" label="Camera position" @@ -339,8 +385,8 @@ is_toggle="true" label="Input/Output devices" layout="topleft" - left="30" - top="262" + left="80" + top_pad="5" name="device_settings_btn" width="190"> </button> @@ -440,28 +486,28 @@ <locate height="20" layout="topleft" - left_pad="2" + left_pad="5" name="bar1" top_delta="0" width="20" /> <locate height="20" layout="topleft" - left_pad="2" + left_pad="5" name="bar2" top_delta="0" width="20" /> <locate height="20" layout="topleft" - left_pad="2" + left_pad="5" name="bar3" top_delta="0" width="20" /> <locate height="20" layout="topleft" - left_pad="2" + left_pad="5" name="bar4" top_delta="0" width="20" /> @@ -475,7 +521,7 @@ visible="true" width="22" /> <text - font.style="BOLD" + font.style="BOLD" type="string" length="1" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index e1d8ee241d..6b5f0c3896 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -71,7 +71,7 @@ layout="topleft" top="0" left="0" - border_size="1" + border_size="0" mouse_opaque="false" orientation="horizontal"> <!-- outer layout_panels center the inner one --> @@ -260,7 +260,7 @@ top="0" height="22" min_width="22" - width="24"> + width="22"> <button name="play_btn" follows="top" @@ -272,7 +272,6 @@ hover_glow_amount="0.15" layout="topleft" tool_tip = "Play media" - left_delta="2" top="0" height="22" width="22"> @@ -288,7 +287,7 @@ layout="topleft" top="0" min_width="22" - width="24"> + width="22"> <button name="pause_btn" follows="top" @@ -302,7 +301,6 @@ top="0" height="22" width="22" - left_delta="-1" tool_tip = "Pause media"> <button.commit_callback function="MediaCtrl.Pause" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 351df22042..412485e03f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -59,7 +59,7 @@ left="0" name="profile_scroll" opaque="true" - height="524" + height="527" width="317" top="0"> <panel @@ -284,10 +284,11 @@ width="300" /> <expandable_text follows="all" - height="113" + height="103" layout="topleft" left="7" name="sl_groups" + textbox.max_length="512" top_pad="0" translate="false" width="290" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 607de65c5c..5a96ba2dd2 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -6,6 +6,7 @@ layout="topleft" min_height="350" name="panel_target_profile" + left="0" width="333"> <string name="status_online"> @@ -21,17 +22,19 @@ image_overlay="BackArrow_Off" layout="topleft" name="back" - left="10" + left="12" tab_stop="false" top="2" width="23" /> <text_editor + h_pad="0" + v_pad="0" allow_scroll="false" bg_visible="false" read_only = "true" follows="top|left|right" font="SansSerifHugeBold" - height="29" + height="26" layout="topleft" left_pad="10" name="user_name" @@ -51,7 +54,7 @@ width="150" /> <tab_container follows="all" - height="535" + height="538" halign="center" layout="topleft" left="5" diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 3980eb86d3..c5b2512fba 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -20,7 +20,7 @@ name="estate_help_text" top="14" word_wrap="true" - width="275"> + width="250"> Changes to settings on this tab will affect all regions in the estate. </text> <text @@ -198,7 +198,7 @@ <button follows="left|top" height="23" - label="Kick User from Estate..." + label="Kick Resident from Estate..." layout="topleft" left="50" name="kick_user_from_estate_btn" diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index c06e67a4bb..ca9579284b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,27 +171,51 @@ width="100"> Rating: </text> - <combo_box + <icons_combo_box + follows="left|top" height="20" label="Moderate" layout="topleft" left_delta="100" name="access_combo" top_delta="0" - width="85"> - <combo_box.item + width="105"> + <icons_combo_box.drop_down_button + image_overlay="Parcel_M_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item label="Adult" name="Adult" - value="42" /> - <combo_box.item + value="42"> + <item.columns + halign="center" + type="icon" + value="Parcel_R_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="Moderate" name="Mature" - value="21" /> - <combo_box.item + value="21"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="General" name="PG" - value="13" /> - </combo_box> + value="13"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> <button enabled="false" follows="left|top" @@ -205,7 +229,7 @@ <button follows="left|top" height="20" - label="Teleport Home One User..." + label="Teleport Home One Resident..." layout="topleft" left="10" name="kick_btn" @@ -214,7 +238,7 @@ <button follows="left|top" height="20" - label="Teleport Home All Users..." + label="Teleport Home All Residents..." layout="topleft" left_delta="0" name="kick_all_btn" diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml index 525c5aa8e7..ffa1a257d5 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -203,7 +203,7 @@ <button follows="left|top" height="20" - label="Teleport Home One User..." + label="Teleport Home One Resident..." layout="topleft" left="10" name="kick_btn" @@ -212,7 +212,7 @@ <button follows="left|top" height="20" - label="Teleport Home All Users..." + label="Teleport Home All Residents..." layout="topleft" left_delta="0" name="kick_all_btn" diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml index 04dbf73be9..5d910ea659 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -148,103 +148,33 @@ name="height_text_lbl6" top="185" width="100"> - Southwest - </text> - <text - follows="left|top" - height="20" - layout="topleft" - left_pad="10" - name="height_text_lbl7" - top_delta="0" - width="100"> Northwest </text> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_0" - top_delta="15" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_1" - top_delta="0" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_0" - top_delta="20" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_1" - top_delta="0" - width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="51" - name="height_text_lbl8" - top_pad="10" - width="100"> - Southeast - </text> <text follows="left|top" height="20" layout="topleft" left_pad="10" - name="height_text_lbl9" + name="height_text_lbl7" top_delta="0" width="100"> Northeast </text> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_start_spin_2" - top_delta="15" - width="100" /> +<!-- northwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_start_spin_1" + top_delta="15" + width="100" /> +<!-- northeast low--> <spinner follows="left|top" height="20" @@ -258,20 +188,22 @@ name="height_start_spin_3" top_delta="0" width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left="10" - max_val="500" - min_val="-500" - name="height_range_spin_2" - top_delta="20" - width="100" /> - <spinner +<!-- northwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_range_spin_1" + top_delta="20" + width="100" /> +<!-- northeast high--> + <spinner follows="left|top" height="20" increment="0.5" @@ -284,18 +216,94 @@ name="height_range_spin_3" top_delta="0" width="100" /> - <text - follows="left|top" - height="20" - layout="topleft" - left="10" - name="height_text_lbl10" - top_delta="30" - width="400" - word_wrap="true"> - These values represent the blend range for the textures above. - </text> - <text + <text + follows="left|top" + height="20" + layout="topleft" + left="51" + name="height_text_lbl8" + top_pad="10" + width="100"> + Southwest + </text> + <text + follows="left|top" + height="20" + layout="topleft" + left_pad="10" + name="height_text_lbl9" + top_delta="0" + width="100"> + Southeast + </text> +<!-- southwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_start_spin_0" + top_delta="15" + width="100" /> +<!-- southeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_2" + top_delta="0" + width="100" /> +<!--southwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_range_spin_0" + top_delta="20" + width="100" /> +<!-- southeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_2" + top_delta="0" + width="100" /> + <text + follows="left|top" + height="20" + layout="topleft" + left="10" + name="height_text_lbl10" + top_delta="30" + width="400" + word_wrap="true"> + These values represent the blend range for the textures above. + </text> + <text follows="left|top" height="20" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index d14355b9f4..d444420550 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -178,5 +178,5 @@ top_pad="-35" right="487" name="Save_btn" - width="61" /> + width="81" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index eb95de3a7c..6ef93406ec 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -54,12 +54,19 @@ mouse_opaque="false" background_visible="true" > + <panel_container + name="panel_container" + default_panel_name="panel_me" + width="333" + > <panel class="panel_me" name="panel_me" filename="panel_me.xml" label="Me" /> + + </panel_container> </sidetray_tab> <sidetray_tab diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index a65dc8fb68..0c870e155b 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -51,12 +51,12 @@ image_unselected="spacer35.tga" image_pressed="spacer35.tga" height="16" - right="-210" + right="-230" label_shadow="false" name="buycurrency" tool_tip="My Balance" top="3" - width="110" /> + width="120" /> <button auto_resize="true" halign="right" @@ -75,7 +75,7 @@ pad_bottom="2" tool_tip="Click to buy more L$" top="2" - width="45" /> + width="55" /> <text type="string" font="SansSerifSmall" @@ -85,10 +85,10 @@ height="16" top="5" layout="topleft" - left_pad="5" + left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="80"> + width="100"> 24:00 AM PST </text> <button @@ -102,7 +102,7 @@ left_pad="15" top="1" name="media_toggle_btn" - tool_tip="Click to toggle media" + tool_tip="Start/Stop All Media (Music, Video, Web pages)" width="16" > </button> <button diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 06da64533b..0d4f67f94c 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Teleport History" bottom="0" height="326" left="0" width="380" +<panel name="Teleport History" bottom="0" height="400" left="0" width="380" help_topic="panel_teleport_history" - border="true" follows="left|top|right|bottom"> + border="false" follows="left|top|right|bottom"> <accordion follows="left|top|right|bottom" - height="300" + height="368" layout="topleft" left="0" top="0" name="history_accordion" + background_visible="true" + bg_alpha_color="DkGray2" width="380"> <accordion_tab layout="topleft" @@ -138,20 +140,21 @@ </accordion_tab> </accordion> <panel - background_visible="true" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" bevel_style="none" - top_pad="0" + bottom="0" follows="left|right|bottom" - height="30" - label="bottom_panel" - layout="topleft" + height="38" + layout="bottomleft" left="0" name="bottom_panel" width="380"> <button follows="bottom|left" - font="SansSerifBigBold" - tool_tip="Show additional optioins" + tool_tip="Show additional options" height="18" image_disabled="OptionsMenu_Disabled" image_selected="OptionsMenu_Press" @@ -159,7 +162,7 @@ layout="topleft" left="10" name="gear_btn" - top="5" + top="14" width="18" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index bfe3cce7d0..11069b3ac3 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -3,17 +3,25 @@ <!-- Don't remove floater's height! It is needed for Overflow and Start-Up toasts!--> +<!-- + This floater is invisible. To make toast look like a floater we render wrapper_panel + like a floater(draw shadows and so on). This is done with one purpose - make close button + look like it is positioned out of floater and able to accept mouse clicks (see EXT-4246) +--> + <floater - legacy_header_height="18" + legacy_header_height="0" + header_height="0" name="toast" title="" visible="false" layout="topleft" - height="40" - width="305" + height="47" + width="310" left="0" top="0" follows="right|bottom" + background_visible="false" bg_opaque_image="Toast_Over" bg_alpha_image="Toast_Background" can_minimize="false" @@ -27,6 +35,21 @@ drop_shadow_visible = "false" border = "false" > + <panel + background_opaque="false" + border_visible="false" + background_visible="true" + bg_opaque_image="Toast_Over" + bg_alpha_image="Toast_Background" + label="wrapper_panel" + layout="topleft" + left="0" + name="wrapper_panel" + top="7" + height="40" + follows="all" + translate="false" + width="305"> <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!--> <text clip_partial="true" @@ -46,10 +69,11 @@ width="260"> Toast text; </text> + </panel> <button layout="topleft" - top="-14" - left="293" + top="0" + right="310" width="17" height="17" follows="top|right" diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 55ab95bfe9..cd66c56ca1 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_opaque="true" - background_visible="false" + background_visible="true" + bg_opaque_image="Volume_Background" + bg_alpha_image="Volume_Background" border_visible="false" border="false" chrome="true" @@ -10,15 +12,6 @@ layout="topleft" name="volumepulldown_floater" width="32"> - <!-- floater background image --> - <icon - height="150" - image_name="Volume_Background" - layout="topleft" - left="0" - name="normal_background" - top="0" - width="32" /> <slider control_name="AudioLevelMaster" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index bde45a9487..b3d55fec65 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -37,20 +37,20 @@ width="333"> name="openoutfit_btn" /> <icon follows="top|left" - height="30" + height="24" image_name="TabIcon_Appearance_Off" name="outfit_icon" mouse_opaque="false" visible="true" - left="5" + left="9" top="0" - width="30" /> + width="24" /> <text font="SansSerifHugeBold" height="20" left_pad="5" text_color="LtGray" - top="3" + top="0" use_ellipses="true" width="305" follows="top|left" @@ -76,7 +76,7 @@ width="333"> height="23" follows="left|top|right" layout="topleft" - left="15" + left="10" label="Filter Outfits" max_length="300" name="Filter" @@ -90,7 +90,7 @@ width="333"> min_height="410" width="320" left="0" - top_pad="0" + top_pad="6" follows="all" /> <!-- <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index fb5f9d2ec8..a233d42568 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -32,10 +32,10 @@ width="330" /> <panel height="25" - layout="bottomright" + layout="topleft" name="button_panel" - left="5" - bottom="5" + left="9" + top_pad="-2" width="313"> <button enabled="true" @@ -46,17 +46,17 @@ left="0" name="info_btn" top="0" - width="100" /> + width="153" /> <button enabled="false" follows="bottom|left" height="23" label="Wear" layout="topleft" - left="130" + left="156" name="wear_btn" top="0" - width="100" /> + width="152" /> <button enabled="false" follows="bottom|left" @@ -64,19 +64,19 @@ label="Play" layout="topleft" name="play_btn" - left="130" + left="156" top="0" - width="80" /> + width="152" /> <button enabled="false" follows="bottom|left" height="23" label="Teleport" layout="topleft" - left="130" + left="156" name="teleport_btn" top="0" - width="100" /> + width="152" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 18b59741bf..12c06504ca 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -43,10 +43,10 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="14" name="back_btn" tab_stop="false" - top="0" + top="2" width="23" /> <text follows="top|left|right" @@ -71,10 +71,10 @@ width="150" /> <panel follows="all" - height="490" + height="493" label="" layout="topleft" - left="10" + left="9" help_topic="" top="45" width="313" @@ -161,13 +161,14 @@ </text> <button follows="top|right" - height="23" - label="Profile" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" layout="topleft" - right="-1" + right="-5" name="BtnCreator" top_delta="-6" - width="78" /> + width="16" /> <text type="string" length="1" @@ -203,13 +204,14 @@ </text> <button follows="top|right" - height="23" - label="Profile" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" layout="topleft" - right="-1" + right="-5" name="BtnOwner" top_delta="-3" - width="78" /> + width="16" /> <text type="string" length="1" @@ -239,8 +241,6 @@ top_pad="10" follows="left|top" layout="topleft" mouse_opaque="false" - background_visible="true" - bg_alpha_color="DkGray" name="perms_inv" left="0" top_pad="25" @@ -400,7 +400,7 @@ top_pad="10" </panel> <panel height="30" - layout="bottomright" + layout="topleft" name="button_panel" left="5" bottom="2" diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index d2c9e56bc3..433b7691fa 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -77,7 +77,7 @@ top="0" use_ellipses="true" value="Object Profile" - width="275" /> + width="290" /> <text follows="top|left" height="13" @@ -94,6 +94,7 @@ layout="topleft" left="10" help_topic="" + name="properties_panel" top="45" width="313" background_visible="true" @@ -549,5 +550,16 @@ name="buy_btn" top="0" width="100" /> + <button + follows="bottom|left" + height="23" + label="Details" + layout="topleft" + left="5" + name="details_btn" + top="0" + width="100" + visible="false" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a7bca3955c..485db0080d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -76,7 +76,9 @@ <string name="TooltipObjectIMUrl">Click to view this object's description</string> <string name="TooltipMapUrl">Click to view this location on a map</string> <string name="TooltipSLAPP">Click to run the secondlife:// command</string> - <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" /> + <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" /> + <string name="TooltipPrice" value=" L$[PRICE]-" /> + <!-- text for SLURL labels --> <string name="SLurlLabelTeleport">Teleport to</string> @@ -1769,6 +1771,9 @@ Clears (deletes) the media and all params from the given face. <string name="tattoo">Tattoo</string> <string name="invalid">invalid</string> + <!-- Wearable List--> + <string name="NewWearable">New [WEARABLE_ITEM]</string> + <!-- LLGroupNotify --> <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 --> <string name="next">Next</string> @@ -1805,12 +1810,9 @@ Clears (deletes) the media and all params from the given face. <string name="LeaveMouselook">Press ESC to return to World View</string> <!-- inventory --> - <string name="InventoryNoMatchingItems">[secondlife:///app/search/groups No matching items found in inventory.Try "Search"?]</string> - <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> - <string name="InventoryNoTexture"> - You do not have a copy of -this texture in your inventory - </string> + <string name="InventoryNoMatchingItems">No matching items found in inventory. Try [secondlife:///app/search/groups "Search"].</string> + <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> + <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> <!-- use value="" because they have preceding spaces --> <string name="no_transfer" value=" (no transfer)" /> <string name="no_modify" value=" (no modify)" /> @@ -2107,6 +2109,9 @@ this texture in your inventory <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <!-- panel preferences general --> + <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <!-- Mute --> <string name="MuteByName">(by name)</string> <string name="MuteAgent">(Resident)</string> @@ -2130,6 +2135,7 @@ this texture in your inventory <!-- panel picks --> <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> + <string name="NoAvatarPicksClassifiedsText">User has no picks or classfields</string> <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index e8f6b1319a..bae821d3b5 100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -61,6 +61,9 @@ Try again in a moment. <message name="completing"> Completing teleport. </message> + <message name="completed_from"> + Teleport completed from [T_SLURL] + </message> <message name="resolving"> Resolving destination. </message> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 1b34a731a5..c4f0fe5208 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -22,5 +22,6 @@ hover_glow_amount="0.15" halign="center" pad_bottom="3" + height="23" scale_image="true"> </button> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 63f08a4250..413ca1d1ef 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -24,7 +24,7 @@ follows="left|top|bottom" height="20" left="2" - mouse_opaque="true" + mouse_opaque="false" name="adhoc_icon" width="21" /> <chiclet_im_adhoc.unread_notifications diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 132bd24bca..d1f68a9ef9 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -2,6 +2,7 @@ <combo_box font="SansSerifSmall" list_position="below" max_chars="20" + height="23" follows="right|top"> <combo_box.combo_button name="Combobox Button" hover_glow_amount="0.15" @@ -20,7 +21,7 @@ image_pressed="DropDown_Press" image_pressed_selected="DropDown_Press" image_disabled="DropDown_Disabled" /> - <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" + <combo_box.combo_list bg_writeable_color="ComboListBgColor" background_visible="true" /> <!-- Text is "tentative" if you have typed in a string that does not match diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml index a5043c5c14..83df10e417 100644 --- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<flyout_button list_position="below"> +<flyout_button list_position="below" height="23"> <action_button scale_image="true" image_selected="SegmentedBtn_Left_Selected" image_unselected="SegmentedBtn_Left_Off" diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 7262c0dc5c..9bf99fa363 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -6,6 +6,8 @@ --> <panel bg_opaque_color="PanelFocusBackgroundColor" bg_alpha_color="PanelDefaultBackgroundColor" + bg_opaque_image_overlay="White" + bg_alpha_image_overlay="White" background_visible="false" background_opaque="false" chrome="false"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index a9a760b3a4..32e443a058 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -3,6 +3,7 @@ clear_button_visible="false" search_button_visible="true" text_pad_left="6" + text_pad_right="6" select_on_focus="true" text_tentative_color="TextFgTentativeColor" background_image="TextField_Search_Off" @@ -21,5 +22,6 @@ image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" pad_right="4" + pad_left="4" width="16" /> </search_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 89d5950e98..ea63cac790 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. --> <slider_bar track_color="SliderTrackColor" thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" @@ -7,6 +8,6 @@ thumb_image_disabled="SliderThumb_Disabled" track_image_horizontal="SliderTrack_Horiz" track_image_vertical="SliderTrack_Vert" - track_highlight_horizontal_image="SliderTrack_Horiz" + track_highlight_horizontal_image="transparent.j2c" track_highlight_vertical_image="SliderTrack_Vert" font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 4a163fc1e3..8d6b0c1cfe 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -16,17 +16,17 @@ label_pad_left - padding to the left of tab button labels tab_bottom_image_unselected="Toolbar_Left_Off" tab_bottom_image_selected="Toolbar_Left_Selected" tab_left_image_unselected="SegmentedBtn_Left_Disabled" - tab_left_image_selected="SegmentedBtn_Left_Off"/> + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> <middle_tab tab_top_image_unselected="TabTop_Middle_Off" tab_top_image_selected="TabTop_Middle_Selected" tab_bottom_image_unselected="Toolbar_Middle_Off" tab_bottom_image_selected="Toolbar_Middle_Selected" tab_left_image_unselected="SegmentedBtn_Left_Disabled" - tab_left_image_selected="SegmentedBtn_Left_Off"/> + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> <last_tab tab_top_image_unselected="TabTop_Right_Off" tab_top_image_selected="TabTop_Right_Selected" tab_bottom_image_unselected="Toolbar_Right_Off" tab_bottom_image_selected="Toolbar_Right_Selected" tab_left_image_unselected="SegmentedBtn_Left_Disabled" - tab_left_image_selected="SegmentedBtn_Left_Off"/> + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> </tab_container> diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index 68cf082c35..a7e271a1ff 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -11,9 +11,6 @@ image_unselected="SegmentedBtn_Left_Off" image_pressed="SegmentedBtn_Left_Selected_Press" image_pressed_selected="SegmentedBtn_Left_Selected_Press" - name="speak_btn" - label="Speak" - label_selected="Speak" tab_stop="false" /> <show_button diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index e8e38316f9..cb1aa5eaa1 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -1,20 +1,66 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="ACERCA DE [CAPITALIZED_APP_NAME]"> -<tab_container name="about_tab"> - <panel name="credits_panel"> - <text_editor name="credits_editor"> - Le ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, y otros muchos. + <floater.string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </floater.string> + <floater.string name="AboutCompiler"> + Compilado con [COMPILER], versión [COMPILER_VERSION] + </floater.string> + <floater.string name="AboutPosition"> + Estás en la posición [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1], de [REGION], alojada en <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +[SERVER_VERSION] +[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] + </floater.string> + <floater.string name="AboutSystem"> + CPU: [CPU] +Memoria: [MEMORY_MB] MB +Versión del Sistema Operativo: [OS_VERSION] +Fabricante de la tarjeta gráfica: [GRAPHICS_CARD_VENDOR] +Tarjeta gráfica: [GRAPHICS_CARD] + </floater.string> + <floater.string name="AboutDriver"> + Versión de Windows Graphics Driver: [GRAPHICS_DRIVER_VERSION] + </floater.string> + <floater.string name="AboutLibs"> + Versión de OpenGL: [OPENGL_VERSION] - Gracias a todos estos residentes por contribuir a garantizar que esta es la mejor versión: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar +Versión de libcurl: [LIBCURL_VERSION] +Versión de J2C Decoder: [J2C_VERSION] +Versión de Audio Driver: [AUDIO_DRIVER_VERSION] +Versión de Qt Webkit: [QT_WEBKIT_VERSION] +Versión de Vivox: [VIVOX_VERSION] + </floater.string> + <floater.string name="none"> + (no hay) + </floater.string> + <floater.string name="AboutTraffic"> + Paquetes perdidos: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </floater.string> + <tab_container name="about_tab"> + <panel label="Información" name="support_panel"> + <button label="Copiar al portapapeles" name="copy_btn" width="165"/> + </panel> + <panel label="Créditos" name="credits_panel"> + <text_editor name="credits_editor"> + Te ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les y muchos otros. +Gracias a los siguientes Residentes por ayudarnos a estar seguros de que, hoy por hoy, esta es la mejor versión: (pendiente) - Para tener éxito en los negocios, se atrevido, se el primero, se diferente. (Henry Marchant) - </text_editor> - </panel> - <panel name="licenses_panel"> - <text_editor name="credits_editor"> - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion + + + + + + +No es frecuente la mente que puede hacer que lo que hasta ahora no existÃa de pronto salte a la vista. Sà es frecuente -y engañoso- gritar 'A mà se me podÃa haber ocurrido eso', pero el hecho es que no se hizo, un hecho muy significativo y revelador. + -- Douglas Adams + </text_editor> + </panel> + <panel label="Licencias" name="licenses_panel"> + <text_editor name="credits_editor"> + 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. @@ -35,10 +81,7 @@ All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - </text_editor> - </panel> -</tab_container> - <string name="you_are_at"> - Está en [POSITION] - </string> + </text_editor> + </panel> + </tab_container> </floater> 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 7575df4b98..46531c5e58 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -1,7 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="ACERCA DEL TERRENO"> + <floater.string name="Minutes"> + [MINUTES] minutos + </floater.string> + <floater.string name="Minute"> + minuto + </floater.string> + <floater.string name="Seconds"> + [SECONDS] segundos + </floater.string> + <floater.string name="Remaining"> + restantes + </floater.string> <tab_container name="landtab"> - <panel label="General" name="land_general_panel"> + <panel label="GENERAL" name="land_general_panel"> + <panel.string name="new users only"> + Sólo usuarios nuevos + </panel.string> + <panel.string name="anyone"> + Cualquiera + </panel.string> + <panel.string name="area_text"> + Superficie + </panel.string> + <panel.string name="area_size_text"> + [AREA] m² + </panel.string> + <panel.string name="auction_id_text"> + ID de la subasta: [ID] + </panel.string> + <panel.string name="need_tier_to_modify"> + Debe aprobar su compra para modificar este terreno. + </panel.string> + <panel.string name="group_owned_text"> + (Propiedad del grupo) + </panel.string> + <panel.string name="profile_text"> + Perfil... + </panel.string> + <panel.string name="info_text"> + Información... + </panel.string> + <panel.string name="public_text"> + (público) + </panel.string> + <panel.string name="none_text"> + (ninguno) + </panel.string> + <panel.string name="sale_pending_text"> + (Venta pendiente) + </panel.string> + <panel.string name="no_selection_text"> + No se ha seleccionado una parcela. +Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver sus caracterÃsticas. + </panel.string> <text name="Name:"> Nombre: </text> @@ -26,10 +78,12 @@ <text name="OwnerText"> Leyla Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="Profile..."/> <text name="Group:"> Grupo: </text> + <text name="GroupText"> + Leyla Linden + </text> <button label="Configurar..." label_selected="Configurar..." name="Set..."/> <check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será apoyado por el grupo en sus asignaciones de terreno."/> <button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/> @@ -47,13 +101,13 @@ <text name="For sale to"> En venta a: [BUYER] </text> - <text width="216" name="Sell with landowners objects in parcel."> + <text name="Sell with landowners objects in parcel." width="216"> Los objetos se incluyen en la venta. </text> - <text width="216" name="Selling with no objects in parcel."> + <text name="Selling with no objects in parcel." width="216"> Los objetos no se incluyen en la venta. </text> - <button font="SansSerifSmall" bottom="-245" left="275" width="165" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/> + <button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale" width="165"/> <text name="Claimed:"> Reclamada: </text> @@ -73,59 +127,29 @@ 0 </text> <button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/> + <button label="Información del script" name="Scripts..."/> <button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..."/> - <button label="Comprar un pase..." label_selected="Comprar un pase..." left="130" width="125" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno."/> + <button label="Comprar un pase..." label_selected="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..." label_selected="Abandonar el terreno..." name="Abandon Land..."/> <button label="Reclamar el terreno..." label_selected="Reclamar el terreno..." name="Reclaim Land..."/> <button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/> - <panel.string name="new users only"> - Sólo usuarios nuevos - </panel.string> - <panel.string name="anyone"> - Cualquiera - </panel.string> - <panel.string name="area_text"> - Superficie - </panel.string> - <panel.string name="area_size_text"> - [AREA] m² - </panel.string> - <panel.string name="auction_id_text"> - ID de la subasta: [ID] - </panel.string> - <panel.string name="need_tier_to_modify"> - Debe aprobar su compra para modificar este terreno. - </panel.string> - <panel.string name="group_owned_text"> - (Propiedad del grupo) - </panel.string> - <panel.string name="profile_text"> - Perfil... - </panel.string> - <panel.string name="info_text"> - Información... - </panel.string> - <panel.string name="public_text"> - (público) + </panel> + <panel label="CONTRATO" name="land_covenant_panel"> + <panel.string name="can_resell"> + El terreno comprado en esta región se podrá revender. </panel.string> - <panel.string name="none_text"> - (ninguno) + <panel.string name="can_not_resell"> + El terreno comprado en esta región no se podrá revender. </panel.string> - <panel.string name="sale_pending_text"> - (Venta pendiente) + <panel.string name="can_change"> + El terreno comprado en esta región se podrá unir o dividir. </panel.string> - <panel.string name="no_selection_text"> - No se ha seleccionado una parcela. -Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver sus caracterÃsticas. + <panel.string name="can_not_change"> + El terreno comprado en esta región no se podrá unir o dividir. </panel.string> - </panel> - <panel label="Contrato" name="land_covenant_panel"> <text name="estate_section_lbl"> Estado: </text> - <text name="estate_name_lbl"> - Nombre: - </text> <text name="estate_name_text"> mainland </text> @@ -144,9 +168,6 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="region_section_lbl"> Región: </text> - <text name="region_name_lbl"> - Nombre: - </text> <text name="region_name_text"> leyla </text> @@ -174,121 +195,82 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="changeable_clause"> El terreno de esta región no se podrá unir/dividir. </text> - <panel.string name="can_resell"> - El terreno comprado en esta región se podrá revender. - </panel.string> - <panel.string name="can_not_resell"> - El terreno comprado en esta región no se podrá revender. - </panel.string> - <panel.string name="can_change"> - El terreno comprado en esta región se podrá unir o dividir. + </panel> + <panel label="OBJETOS" name="land_objects_panel"> + <panel.string name="objects_available_text"> + [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles) </panel.string> - <panel.string name="can_not_change"> - El terreno comprado en esta región no se podrá unir o dividir. + <panel.string name="objects_deleted_text"> + [COUNT] de un máximo de [MAX] ([DELETED] se borrarán) </panel.string> - </panel> - <panel label="Objetos" name="land_objects_panel"> <text name="parcel_object_bonus"> Plus de objetos en la región: [BONUS] </text> <text name="Simulator primitive usage:"> - Simulador de uso de prims: + Uso de primitivas: </text> - <text name="objects_available" left="204" width="250" > + <text left="204" name="objects_available" width="250"> [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles) </text> - <panel.string name="objects_available_text"> - [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles) - </panel.string> - <panel.string name="objects_deleted_text"> - [COUNT] de un máximo de [MAX] ([DELETED] se borrarán) - </panel.string> <text name="Primitives parcel supports:" width="200"> Prims que admite la parcela: </text> - <text name="object_contrib_text" left="204" width="152"> + <text left="204" name="object_contrib_text" width="152"> [COUNT] </text> <text name="Primitives on parcel:"> Prims en la parcela: </text> - <text name="total_objects_text" left="204" width="48"> + <text left="204" name="total_objects_text" width="48"> [COUNT] </text> - <text name="Owned by parcel owner:" left="14" width="180" > + <text left="14" name="Owned by parcel owner:" width="180"> Del propietario de la parcela: </text> - <text name="owner_objects_text" left="204" width="48"> + <text left="204" name="owner_objects_text" width="48"> [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios." right="-10" width="119"/> - <text name="Set to group:" left="14" width="180"> + <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <text left="14" name="Set to group:" width="180"> Del grupo: </text> - <text name="group_objects_text" left="204" width="48"> + <text left="204" name="group_objects_text" width="48"> [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios." right="-10" width="119"/> - <text name="Owned by others:" left="14" width="128"> + <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <text left="14" name="Owned by others:" width="128"> Propiedad de otros: </text> - <text name="other_objects_text" left="204" width="48"> + <text left="204" name="other_objects_text" width="48"> [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios." right="-10" width="119"/> - <text name="Selected / sat upon:" left="14" width="193" > + <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <text left="14" name="Selected / sat upon:" width="193"> Seleccionados / con gente sentada: </text> - <text name="selected_objects_text" left="204" width="48"> + <text left="204" name="selected_objects_text" width="48"> [COUNT] </text> - <text name="Autoreturn" left="4" width="412" > - Autodevolución de objetos a otros residentes (minutos; 0 la desactiva): + <text left="4" name="Autoreturn" width="412"> + Devolución automática de objetos de otros Residentes (minutos, 0 para desactivarla): </text> - <line_editor name="clean other time" right="-20" /> + <line_editor name="clean other time" right="-20"/> <text name="Object Owners:" width="150"> Propietarios de los objetos: </text> - <button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" left="158"/> - <button label="Devolver los objetos..." label_selected="Devolver los objetos..." name="Return objects..." left="270" width="164"/> + <button label="Actualizar la lista" label_selected="Actualizar la lista" left="158" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Devolver los objetos..." label_selected="Devolver los objetos..." left="270" name="Return objects..." width="164"/> <name_list name="owner list"> - <column label="Tipo" name="type"/> - <column label="Nombre" name="name"/> - <column label="Número" name="count"/> - <column label="Más recientes" name="mostrecent"/> + <name_list.columns label="Tipo" name="type"/> + <name_list.columns label="Nombre" name="name"/> + <name_list.columns label="Número" name="count"/> + <name_list.columns label="Más recientes" name="mostrecent"/> </name_list> </panel> - <panel label="Opciones" name="land_options_panel"> - <text name="allow_label"> - Permitir a otros residentes: - </text> - <check_box label="Editar el terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar su terreno. Mejor dejarlo desmarcado, pues usted siempre puede modificar su terreno."/> - <check_box label="Crear hitos" name="check landmark"/> - <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en su terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/> - <text name="allow_label2" left="162" > - Crear objetos: - </text> - <check_box label="Todos los residentes" name="edit objects check" left="255" /> - <check_box label="El grupo" name="edit group objects check" left="385" /> - <text name="allow_label3" left="162"> - Dejar objetos: - </text> - <check_box label="Todos los residentes" name="all object entry check" left="255"/> - <check_box label="El grupo" name="group object entry check" left="385"/> - <text name="allow_label4" left="162"> - Ejecutar scripts: - </text> - <check_box label="Todos los residentes" name="check other scripts" left="255"/> - <check_box label="El grupo" name="check group scripts" left="385"/> - <text name="land_options_label"> - Opciones del terreno: - </text> - <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/> - <check_box label="Sin 'empujones'" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/> - <check_box label="Mostrar la parcela en Buscar (30 L$/semana) en" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/> + <panel label="OPCIONES" name="land_options_panel"> <panel.string name="search_enabled_tooltip"> Permitir que aparezca esta parcela en los resultados de la búsqueda </panel.string> @@ -299,62 +281,6 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <panel.string name="search_disabled_permissions_tooltip"> Esta opción no esta activada porque usted no puede modificar las opciones de la parcela. </panel.string> - <combo_box name="land category with adult" left="282" width="140"> - <combo_box.item name="item0" label="Cualquier categorÃa" - /> - <combo_box.item name="item1" label="Localización Linden" - /> - <combo_box.item name="item2" label="'Adult'" - /> - <combo_box.item name="item3" label="Arte y Cultura" - /> - <combo_box.item name="item4" label="Negocios" - /> - <combo_box.item name="item5" label="Educativo" - /> - <combo_box.item name="item6" label="Juegos de azar" - /> - <combo_box.item name="item7" label="Entretenimiento" - /> - <combo_box.item name="item8" label="Para recién llegados" - /> - <combo_box.item name="item9" label="Parques y Naturaleza" - /> - <combo_box.item name="item10" label="Residencial" - /> - <combo_box.item name="item11" label="Compras" - /> - <combo_box.item name="item12" label="Otra" - /> - </combo_box> - <combo_box name="land category" left="282" width="140"> - <combo_box.item name="item0" label="Cualquier categorÃa" - /> - <combo_box.item name="item1" label="Localización Linden" - /> - <combo_box.item name="item3" label="Arte y Cultura" - /> - <combo_box.item name="item4" label="Negocios" - /> - <combo_box.item name="item5" label="Educativo" - /> - <combo_box.item name="item6" label="Juegos de azar" - /> - <combo_box.item name="item7" label="Entretenimiento" - /> - <combo_box.item name="item8" label="Para recién llegados" - /> - <combo_box.item name="item9" label="Parques y Naturaleza" - /> - <combo_box.item name="item10" label="Residencial" - /> - <combo_box.item name="item11" label="Compras" - /> - <combo_box.item name="item12" label="Otra" - /> - </combo_box> - <button label="?" label_selected="?" name="?" left="427"/> - <check_box label="Contenido 'Mature'" name="MatureCheck" tool_tip=""/> <panel.string name="mature_check_mature"> Contenido 'Mature' </panel.string> @@ -367,6 +293,71 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <panel.string name="mature_check_adult_tooltip"> La información o el contenido de su parcela se considera 'Adult'. </panel.string> + <panel.string name="landing_point_none"> + (ninguno) + </panel.string> + <panel.string name="push_restrict_text"> + Sin 'empujones' + </panel.string> + <panel.string name="push_restrict_region_text"> + Sin 'empujones' (prevalece lo marcado en la región) + </panel.string> + <text name="allow_label"> + Permitir a otros Residentes: + </text> + <check_box label="Editar el terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar su terreno. Mejor dejarlo desmarcado, pues usted siempre puede modificar su terreno."/> + <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en su terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/> + <text left="162" name="allow_label2"> + Crear objetos: + </text> + <check_box label="Todos los residentes" left="255" name="edit objects check"/> + <check_box label="El grupo" left="385" name="edit group objects check"/> + <text left="162" name="allow_label3"> + Dejar objetos: + </text> + <check_box label="Todos los residentes" left="255" name="all object entry check"/> + <check_box label="El grupo" left="385" name="group object entry check"/> + <text left="162" name="allow_label4"> + Ejecutar scripts: + </text> + <check_box label="Todos los residentes" left="255" name="check other scripts"/> + <check_box label="El grupo" left="385" name="check group scripts"/> + <text name="land_options_label"> + Opciones del terreno: + </text> + <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/> + <check_box label="Sin 'empujones'" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/> + <check_box label="Mostrar el sitio en la búsqueda (30 L$/semana)" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/> + <combo_box left="282" name="land category with adult" width="140"> + <combo_box.item label="Cualquier categorÃa" name="item0"/> + <combo_box.item label="Localización Linden" name="item1"/> + <combo_box.item label="'Adult'" name="item2"/> + <combo_box.item label="Arte y Cultura" name="item3"/> + <combo_box.item label="Negocios" name="item4"/> + <combo_box.item label="Educativo" name="item5"/> + <combo_box.item label="Juegos de azar" name="item6"/> + <combo_box.item label="Entretenimiento" name="item7"/> + <combo_box.item label="Para recién llegados" name="item8"/> + <combo_box.item label="Parques y Naturaleza" name="item9"/> + <combo_box.item label="Residencial" name="item10"/> + <combo_box.item label="Compras" name="item11"/> + <combo_box.item label="Otra" name="item12"/> + </combo_box> + <combo_box left="282" name="land category" width="140"> + <combo_box.item label="Cualquier categorÃa" name="item0"/> + <combo_box.item label="Localización Linden" name="item1"/> + <combo_box.item label="Arte y Cultura" name="item3"/> + <combo_box.item label="Negocios" name="item4"/> + <combo_box.item label="Educativo" name="item5"/> + <combo_box.item label="Juegos de azar" name="item6"/> + <combo_box.item label="Entretenimiento" name="item7"/> + <combo_box.item label="Para recién llegados" name="item8"/> + <combo_box.item label="Parques y Naturaleza" name="item9"/> + <combo_box.item label="Residencial" name="item10"/> + <combo_box.item label="Compras" name="item11"/> + <combo_box.item label="Otra" name="item12"/> + </combo_box> + <check_box label="Contenido 'Mature'" name="MatureCheck" tool_tip=""/> <text name="Snapshot:"> Foto: </text> @@ -374,61 +365,42 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <text name="landing_point"> Punto de llegada: [LANDING] </text> - <panel.string name="landing_point_none"> - (ninguno) - </panel.string> <button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúrelo a la posición de su avatar dentro de esta parcela."/> <button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borrar el punto de llegada."/> <text name="Teleport Routing: "> Punto de teleporte: </text> <combo_box name="landing type" tool_tip="Punto de teleporte: defina cómo manejar en su terreno los teleportes."> - <combo_box.item name="Blocked" label="Bloqueado" - /> - <combo_box.item name="LandingPoint" label="Punto de llegada" - /> - <combo_box.item name="Anywhere" label="Cualquiera" - /> + <combo_box.item label="Bloqueado" name="Blocked"/> + <combo_box.item label="Punto de llegada" name="LandingPoint"/> + <combo_box.item label="Cualquiera" name="Anywhere"/> </combo_box> - <panel.string name="push_restrict_text"> - Sin 'empujones' - </panel.string> - <panel.string name="push_restrict_region_text"> - Sin 'empujones' (prevalece lo marcado en la región) - </panel.string> </panel> - <panel label="Media" name="land_media_panel"> + <panel label="MEDIA" name="land_media_panel"> <text name="with media:" width="85"> Tipo de media: </text> - <combo_box name="media type" tool_tip="Especifique si la URL es una pelÃcula, una web, u otro media" left="97" /> + <combo_box left="97" name="media type" tool_tip="Especifique si la URL es una pelÃcula, una web, u otro media"/> <text name="at URL:" width="85"> - URL del media: + Página inicial: </text> <line_editor left="97" name="media_url"/> <button label="Definir..." label_selected="Definir..." name="set_media_url"/> + <check_box label="Ocultar la URL del media" left="97" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/> <text name="Description:"> Descripción: </text> - <line_editor name="url_description" tool_tip="Texto a mostrar cerca del botón play/cargar" left="97" /> + <line_editor left="97" name="url_description" tool_tip="Texto a mostrar cerca del botón play/cargar"/> <text name="Media texture:"> Cambiar la textura: </text> - <texture_picker label="" name="media texture" tool_tip="Pulse para elegir una imagen" left="97" /> + <texture_picker label="" left="97" name="media texture" tool_tip="Pulse para elegir una imagen"/> <text name="replace_texture_help" width="285"> - (Los objetos que usen esta textura mostrarán la -pelÃcula o la web cuando pulse la flecha de play.) - </text> - <text name="Options:"> - Opciones de -los media: + Cuando pulses la flecha 'play', los objetos que usen esta textura mostrarán la pelÃcula o la página web. Selecciona la miniatura para elegir una textura distinta. </text> - <check_box left="97" label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/> - <check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/> - <check_box left="97" label="Ocultar la URL del media" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/> - <check_box label="Ocultar la URL de la música" name="hide_music_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL de la música"/> - <text name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)." left="102" width="120"> + <check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/> + <text left="102" name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)." width="120"> Tamaño del media: </text> <spinner left_delta="104" name="media_size_width" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)."/> @@ -436,58 +408,45 @@ los media: <text name="pixels"> pÃxeles </text> - <text name="MusicURL:" bottom_delta="-28" > - URL de la -música: - </text> - <line_editor bottom_delta="-12" left="97" name="music_url"/> - <text name="Sound:"> - Sonido: - </text> - <check_box left="97" label="Limitar los gestos y los sonidos de objetos a esta parcela" name="check sound local"/> - <button label="?" label_selected="?" name="?" left="424"/> - <text name="Voice settings:"> - Voz: + <text name="Options:"> + Opciones de +los media: </text> - <check_box left="97" label="Activar la voz" name="parcel_enable_voice_channel"/> - <check_box left="97" label="Activar la voz (establecido por el Estado)" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box left="117" label="Limitar la voz a esta parcela" name="parcel_enable_voice_channel_parcel"/> + <check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/> </panel> - <panel label="Acceso" name="land_access_panel"> + <panel label="SONIDO" name="land_audio_panel"> + <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Al marcar esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/> + <check_box label="Activar la voz" name="parcel_enable_voice_channel"/> + <check_box label="Autorizar la voz (establecido por el Estado)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Limitar la voz a esta parcela" name="parcel_enable_voice_channel_local"/> + </panel> + <panel label="ACCESO" name="land_access_panel"> + <panel.string name="access_estate_defined"> + (Definido por el Estado) + </panel.string> + <panel.string name="estate_override"> + Una o más de esta opciones está configurada a nivel del estado + </panel.string> <text name="Limit access to this parcel to:"> Acceso a esta parcela </text> - <check_box label="Permitir el acceso público" name="public_access"/> + <check_box label="Permitir el acceso público [MATURITY]" name="public_access"/> <text name="Only Allow"> - Impedir el acceso a: + Restringir el acceso a residentes verificados con: </text> - <check_box label="Residentes que no hayan dado a Linden Lab información de su forma de pago" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/> - <check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/> - <panel.string name="estate_override"> - Una o más de esta opciones está configurada a nivel del estado - </panel.string> + <check_box label="Información de pago aportada [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/> + <check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/> <check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/> <check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/> <combo_box name="pass_combo"> - <combo_box.item name="Anyone" label="Cualquiera" - /> - <combo_box.item name="Group" label="Grupo" - /> + <combo_box.item label="Cualquiera" name="Anyone"/> + <combo_box.item label="Grupo" name="Group"/> </combo_box> <spinner label="Precio en L$:" name="PriceSpin"/> <spinner label="Horas de acceso:" name="HoursSpin"/> - <text label="Permitir siempre" name="AllowedText"> - Residentes autorizados - </text> - <name_list name="AccessList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/> - <button label="Añadir..." label_selected="Añadir..." name="add_allowed"/> - <button label="Quitar" label_selected="Quitar" name="remove_allowed"/> - <text label="Prohibir el acceso" name="BanCheck"> - Residentes con el acceso prohibido - </text> - <name_list name="BannedList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/> - <button label="Añadir..." label_selected="Añadir..." name="add_banned"/> - <button label="Quitar" label_selected="Quitar" name="remove_banned"/> + <panel name="Allowed_layout_panel"> + <name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/> + </panel> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml new file mode 100644 index 0000000000..988786c1ae --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_activeim.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_activeim" title="MI activo"/> diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml index 5a03aa6370..2fc18e55f6 100644 --- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml @@ -1,70 +1,180 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Animation Preview" title=""> + <floater.string name="failed_to_initialize"> + Fallo al iniciar el movimiento + </floater.string> + <floater.string name="anim_too_long"> + El archivo de la animación dura [LENGTH] segundos. + +La duración máxima de una animación es de [MAX_LENGTH] segundos. + </floater.string> + <floater.string name="failed_file_read"> + No se ha podido leer el archivo de la animación. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + OK + </floater.string> + <floater.string name="E_ST_EOF"> + Fin prematuro del archivo. + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + No se puede leer la definición de la restricción. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + No se puede abrir el archivo BVH. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + 'HIERARCHY header' inválido. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + No se pueden encontrar 'ROOT' o 'JOINT'. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + No se puede obtener el nombre 'JOINT'. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + No se puede encontrar 'OFFSET'. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + No se puede encontrar 'CHANNELS'. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + No se puede conseguir el orden de la rotación. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + No se puede encontrar el eje de rotación. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + No se puede encontrar 'MOTION'. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + No se puede conseguir el número de frames. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + No se puede conseguir el tiempo del frame. + </floater.string> + <floater.string name="E_ST_NO_POS"> + No se pueden conseguir los valores de la posición. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + No se pueden conseguir los valores de la rotación. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + No se puede abrir el archivo de traducción. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + No se puede leer el encabezamiento de la traducción. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + No se puede leer la traducción de los nombres. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + No se puede leer la traducción de los valores ignorados. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + No se puede leer el valor relativo de la traducción. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + No se puede leer la traducción del valor 'outname' + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + No se puede leer la matriz de traducciones. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + No se puede conseguir el nombre 'mergechild'. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + No se puede conseguir el nombre 'mergeparent'. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + No se puede obtener el valor prioritario. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + No se puede conseguir el valor del bucle. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + No se pueden conseguir los valores 'easeIn'. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + No se pueden conseguir los valores 'easeOut'. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + No se puede conseguir el valor de 'hand morph'. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + No se puede leer el nombre del gesto. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nombre incorrecto de 'root joint', usa "hip". + </floater.string> <text name="name_label"> Nombre: </text> <text name="description_label"> Descripción: </text> - <spinner label_width="72" width="110" label="Prioridad:" name="priority" tool_tip="Controle qué otras animaciones pueden ser anuladas por ésta."/> - <check_box left="8" label="Bucle:" name="loop_check" tool_tip="Haga esta animación en bucle."/> - <spinner label_width="65" left="65" width="116" label="Empieza(%)" name="loop_in_point" tool_tip="Indique el punto en el que la animación empieza el bucle."/> - <spinner label_width="50" left="185" label="Acaba(%)" name="loop_out_point" tool_tip="Indique el punto en el que la animación acaba el bucle."/> + <spinner label="Prioridad:" label_width="72" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta" width="110"/> + <check_box label="Bucle:" left="8" name="loop_check" tool_tip="Hace esta animación en bucle"/> + <spinner label="Empieza(%)" label_width="65" left="65" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar" width="116"/> + <spinner label="Acaba(%)" label_width="50" left="185" name="loop_out_point" tool_tip="Indica el punto en el que la animación acaba el bucle"/> <text name="hand_label"> Posición de las manos </text> - <combo_box left_delta="120" width="164" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación."> - <combo_box.item name="Spread" label="Extendidas"/> - <combo_box.item name="Relaxed" label="Relajadas"/> - <combo_box.item name="PointBoth" label="Ambas señalan"/> - <combo_box.item name="Fist" label="Puño"/> - <combo_box.item name="RelaxedLeft" label="La izquierda relajada"/> - <combo_box.item name="PointLeft" label="La izquierda señala"/> - <combo_box.item name="FistLeft" label="Puño en la izquierda"/> - <combo_box.item name="RelaxedRight" label="La derecha relajada"/> - <combo_box.item name="PointRight" label="La derecha señala"/> - <combo_box.item name="FistRight" label="Puño en la derecha"/> - <combo_box.item name="SaluteRight" label="La derecha saluda"/> - <combo_box.item name="Typing" label="Escribiendo"/> - <combo_box.item name="PeaceRight" label="Paz en la derecha"/> + <combo_box left_delta="120" name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación" width="164"> + <combo_box.item label="Extendidas" name="Spread"/> + <combo_box.item label="Relajadas" name="Relaxed"/> + <combo_box.item label="Ambas señalan" name="PointBoth"/> + <combo_box.item label="Puño" name="Fist"/> + <combo_box.item label="La izq. relajada" name="RelaxedLeft"/> + <combo_box.item label="La izq. señala" name="PointLeft"/> + <combo_box.item label="Puño izq." name="FistLeft"/> + <combo_box.item label="La der. relajada" name="RelaxedRight"/> + <combo_box.item label="La der. señala" name="PointRight"/> + <combo_box.item label="Puño der." name="FistRight"/> + <combo_box.item label="La derecha saluda" name="SaluteRight"/> + <combo_box.item label="Escribiendo" name="Typing"/> + <combo_box.item label="'Paz' en la der." name="PeaceRight"/> </combo_box> <text name="emote_label"> Expresión </text> - <combo_box left_delta="120" width="164" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación."> - <combo_box.item name="[None]" label="Nada]"/> - <combo_box.item name="Aaaaah" label="Aaaaah"/> - <combo_box.item name="Afraid" label="Con miedo"/> - <combo_box.item name="Angry" label="Enfadada"/> - <combo_box.item name="BigSmile" label="Gran sonrisa"/> - <combo_box.item name="Bored" label="Aburrida"/> - <combo_box.item name="Cry" label="Llorar"/> - <combo_box.item name="Disdain" label="Desdén"/> - <combo_box.item name="Embarrassed" label="Avergonzada"/> - <combo_box.item name="Frown" label="Fruncir el ceño"/> - <combo_box.item name="Kiss" label="Besar"/> - <combo_box.item name="Laugh" label="ReÃr"/> - <combo_box.item name="Plllppt" label="Sacar la lengua"/> - <combo_box.item name="Repulsed" label="Rechazo"/> - <combo_box.item name="Sad" label="Triste"/> - <combo_box.item name="Shrug" label="Encogerse de hombros"/> - <combo_box.item name="Smile" label="Sonrisa"/> - <combo_box.item name="Surprise" label="Sorpresa"/> - <combo_box.item name="Wink" label="Guiño"/> - <combo_box.item name="Worry" label="Preocupación"/> + <combo_box left_delta="120" name="emote_combo" tool_tip="Controla qué hace la cara durante la animación" width="164"> + <combo_box.item label="(ninguno)" name="[None]"/> + <combo_box.item label="Aaaaah" name="Aaaaah"/> + <combo_box.item label="Con miedo" name="Afraid"/> + <combo_box.item label="Enfado" name="Angry"/> + <combo_box.item label="Gran sonrisa" name="BigSmile"/> + <combo_box.item label="Aburrimiento" name="Bored"/> + <combo_box.item label="Llorar" name="Cry"/> + <combo_box.item label="Desdén" name="Disdain"/> + <combo_box.item label="Avergonzarse" name="Embarrassed"/> + <combo_box.item label="Fruncir el ceño" name="Frown"/> + <combo_box.item label="Beso" name="Kiss"/> + <combo_box.item label="ReÃr" name="Laugh"/> + <combo_box.item label="Sacar la lengua" name="Plllppt"/> + <combo_box.item label="Rechazo" name="Repulsed"/> + <combo_box.item label="Triste" name="Sad"/> + <combo_box.item label="Encogerse de hombros" name="Shrug"/> + <combo_box.item label="Sonrisa" name="Smile"/> + <combo_box.item label="Sorpresa" name="Surprise"/> + <combo_box.item label="Guiño" name="Wink"/> + <combo_box.item label="Preocupación" name="Worry"/> </combo_box> <text name="preview_label" width="250"> Vista previa mientras </text> - <combo_box left_delta="120" width="130" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes."> - <combo_box.item name="Standing" label="Estar de pie"/> - <combo_box.item name="Walking" label="Caminar"/> - <combo_box.item name="Sitting" label="Estar sentado"/> - <combo_box.item name="Flying" label="Volar"/> + <combo_box left_delta="120" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes." width="130"> + <combo_box.item label="De pie" name="Standing"/> + <combo_box.item label="Caminando" name="Walking"/> + <combo_box.item label="Sentado/a" name="Sitting"/> + <combo_box.item label="Volando" name="Flying"/> </combo_box> - <spinner label_width="125" width="192" label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/> - <spinner bottom_delta="-20" label_width="125" left="10" width="192" label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/> - <button bottom_delta="-32" name="play_btn" tool_tip="Mover/Pausar su animación."/> + <spinner label="Combinar (sec)" label_width="125" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones" width="192"/> + <spinner bottom_delta="-20" label="Dejar de combinar (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones" width="192"/> + <button bottom_delta="-32" name="play_btn" tool_tip="Ejecutar tu animación"/> + <button name="pause_btn" tool_tip="Pausar tu animación"/> <button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/> <slider label="" name="playback_slider"/> <text name="bad_animation_text"> @@ -73,19 +183,6 @@ Recomendamos usar archivos BVH exportados de Poser 4. </text> - <button label="Cancelar" name="cancel_btn"/> <button label="Subir ([AMOUNT] L$)" name="ok_btn"/> - <string name="failed_to_initialize"> - Fallo al iniciar el movimiento - </string> - <string name="anim_too_long"> - El archivo de la animación dura [LENGTH] segundos. - -La duración máxima de una animación es de [MAX_LENGTH] segundos. - </string> - <string name="failed_file_read"> - No se ha podido leer el archivo de la animación. - -[STATUS] - </string> + <button label="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml index 5196ac0b78..6faf19dbb5 100644 --- a/indra/newview/skins/default/xui/es/floater_auction.xml +++ b/indra/newview/skins/default/xui/es/floater_auction.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_auction" title="EMPEZAR VENTA DE TERRENO LINDEN"> - <check_box label="Incluir la valla amarilla de selección" name="fence_check"/> - <button label="Foto" label_selected="Foto" name="snapshot_btn"/> - <button label="OK" label_selected="OK" name="ok_btn"/> - <text name="already for sale"> +<floater name="floater_auction" title="COMENZAR LA VENTA DE TERRENO LINDEN"> + <floater.string name="already for sale"> No puede subastar parcelas que ya están en venta. - </text> + </floater.string> + <check_box initial_value="true" label="Incluir la valla amarilla de selección" name="fence_check"/> + <button label="Foto" label_selected="Foto" name="snapshot_btn"/> + <button label="Vender a cualquiera" label_selected="Vender a cualquiera" name="sell_to_anyone_btn"/> + <button label="Limpiar las configuraciones" label_selected="Limpiar las configuraciones" name="reset_parcel_btn"/> + <button label="Comenzar subasta" label_selected="Comenzar subasta" name="start_auction_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml index df0147b191..c83dd3ef3e 100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml @@ -1,42 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="avatarpicker" title="ELEGIR A UN RESIDENTE"> + <floater.string name="not_found"> + No se ha encontrado '[TEXT]' + </floater.string> + <floater.string name="no_one_near"> + No hay nadie cerca + </floater.string> + <floater.string name="no_results"> + Sin resultados + </floater.string> + <floater.string name="searching"> + Buscando... + </floater.string> + <string label="Elegir" label_selected="Elegir" name="Select"> + Seleccionar + </string> + <string name="Close"> + Cerrar + </string> <tab_container name="ResidentChooserTabs"> <panel label="Buscar" name="SearchPanel"> <text name="InstructSearchResidentName"> - Escriba parte del nombre del residente: + Escribe parte del nombre de la persona: </text> - <button label="Buscar" label_selected="Buscar" name="Find"/> + <button label="Ir" label_selected="Ir" name="Find"/> </panel> - <panel label="Tarjetas de visita" name="CallingCardsPanel"> - <text name="InstructSelectCallingCard"> - Elija una tarjeta de visita: + <panel label="Amigos" name="FriendsPanel"> + <text name="InstructSelectFriend"> + Elige a una persona: </text> </panel> <panel label="Cercanos" name="NearMePanel"> <text name="InstructSelectResident"> - Seleccionar un -residente cercano: + Elegir a alguien que esté cerca: </text> - <button font="SansSerifSmall" left_delta="1" width="115" label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh"/> - <slider label="Alcance" name="near_me_range" bottom_delta="-36"/> + <slider bottom_delta="-36" label="Alcance" name="near_me_range"/> <text name="meters"> Metros </text> - <scroll_list bottom_delta="-169" height="159" name="NearMe" /> + <button font="SansSerifSmall" label="Actualizar la lista" label_selected="Actualizar la lista" left_delta="1" name="Refresh" width="115"/> + <scroll_list bottom_delta="-169" height="159" name="NearMe"/> </panel> </tab_container> - <button label="Elegir" label_selected="Elegir" name="Select"/> - <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <string name="not_found"> - No se ha encontrado '[TEXT]' - </string> - <string name="no_one_near"> - No hay nadie cerca - </string> - <string name="no_results"> - Sin resultados - </string> - <string name="searching"> - Buscando... - </string> + <button label="OK" label_selected="OK" name="ok_btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml index 8febe4b0a9..089ff3cd68 100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml @@ -1,30 +1,43 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="avatar_texture_debug" title="TEXTURAS DEL AVATAR"> - <text name="baked_label"> - Texturas predeterminadas - </text> + <floater.string name="InvalidAvatar"> + AVATAR NO VÃLIDO + </floater.string> <text name="composite_label"> Texturas compuestas </text> - <texture_picker label="Cabeza" name="baked_head"/> - <texture_picker label="Maquillaje" name="head_bodypaint"/> - <texture_picker label="Pelo" name="hair"/> <button label="Soltar" label_selected="Soltar" name="Dump"/> - <texture_picker label="Ojos" name="baked_eyes"/> - <texture_picker label="Ojo" name="eye_texture"/> - <texture_picker label="Parte superior del cuerpo" name="baked_upper_body"/> - <texture_picker label="Tatuaje de la parte superior del cuerpo" name="upper_bodypaint"/> - <texture_picker label="Camiseta" name="undershirt"/> - <texture_picker label="Guantes" name="gloves"/> - <texture_picker label="Camisa" name="shirt"/> - <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/> - <texture_picker label="Parte inferior del cuerpo" name="baked_lower_body"/> - <texture_picker label="Tatuaje de la parte inferior del cuerpo" name="lower_bodypaint"/> - <texture_picker label="Ropa interior" name="underpants"/> - <texture_picker label="Calcetines" name="socks"/> - <texture_picker label="Zapatos" name="shoes"/> - <texture_picker label="Pantalones" name="pants"/> - <texture_picker label="Chaqueta" name="jacket"/> - <texture_picker label="Falda" name="baked_skirt"/> - <texture_picker label="Falda" name="skirt_texture"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <texture_picker label="Pelo" name="hair-baked"/> + <texture_picker label="Pelo" name="hair_grain"/> + <texture_picker label="Alfa del pelo" name="hair_alpha"/> + <texture_picker label="Cabeza" name="head-baked"/> + <texture_picker label="Maquillaje" name="head_bodypaint"/> + <texture_picker label="Alfa de la cabeza" name="head_alpha"/> + <texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/> + <texture_picker label="Ojos" name="eyes-baked"/> + <texture_picker label="Ojo" name="eyes_iris"/> + <texture_picker label="Alfa de los ojos" name="eyes_alpha"/> + <texture_picker label="Parte superior del cuerpo" name="upper-baked"/> + <texture_picker label="Pintura corporal: parte superior del cuerpo" name="upper_bodypaint"/> + <texture_picker label="Camiseta" name="upper_undershirt"/> + <texture_picker label="Guantes" name="upper_gloves"/> + <texture_picker label="Camisa" name="upper_shirt"/> + <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/> + <texture_picker label="Alfa superior" name="upper_alpha"/> + <texture_picker label="Tatuaje superior" name="upper_tattoo"/> + <texture_picker label="Parte inferior del cuerpo" name="lower-baked"/> + <texture_picker label="Pintura corporal: parte inferior del cuerpo" name="lower_bodypaint"/> + <texture_picker label="Ropa interior" name="lower_underpants"/> + <texture_picker label="Calcetines" name="lower_socks"/> + <texture_picker label="Zapatos" name="lower_shoes"/> + <texture_picker label="Pantalones" name="lower_pants"/> + <texture_picker label="Chaqueta" name="lower_jacket"/> + <texture_picker label="Alfa inferior" name="lower_alpha"/> + <texture_picker label="Tatuaje inferior" name="lower_tattoo"/> + <texture_picker label="Falda" name="skirt-baked"/> + <texture_picker label="Falda" name="skirt"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml index 2df90bc911..b86967755c 100644 --- a/indra/newview/skins/default/xui/es/floater_beacons.xml +++ b/indra/newview/skins/default/xui/es/floater_beacons.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="beacons" title="BALIZAS"> <panel name="beacons_panel"> - <check_box label="Objetos con script sólo al tocarlos" name="touch_only"/> - <check_box label="Objetos con script" name="scripted"/> - <check_box label="Objetos materiales" name="physical"/> - <check_box label="Fuentes de sonido" name="sounds"/> - <check_box label="Fuentes de partÃculas" name="particles"/> - <check_box label="Activar los realzados" name="highlights"/> - <check_box label="Activar las balizas" name="beacons"/> - <text name="beacon_width_label"> - Ancho de la baliza: + <text name="label_show"> + Mostrar: </text> + <check_box label="Balizas" name="beacons"/> + <check_box label="Realzados" name="highlights"/> + <text name="beacon_width_label" tool_tip="Ancho de la baliza"> + Ancho: + </text> + <text name="label_objects"> + Para estos objetos: + </text> + <check_box label="Materiales" name="physical"/> + <check_box label="Con scripts" name="scripted"/> + <check_box label="Sólo tocar" name="touch_only"/> + <check_box label="Origen de sonidos" name="sounds"/> + <check_box label="Origen de partÃculas" name="particles"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml index 3d839bf645..de8d205ad4 100644 --- a/indra/newview/skins/default/xui/es/floater_build_options.xml +++ b/indra/newview/skins/default/xui/es/floater_build_options.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="OPCIONES DE LA CUADRÃCULA"> - <spinner label="Unidad de la cuadrÃcula (metros)" name="GridResolution" width="250" label_width="192"/> - <spinner label="Graduación de la cuadrÃcula (metros)" name="GridDrawSize" width="250" label_width="192"/> + <spinner label="Unidad de la cuadrÃcula (metros)" label_width="192" name="GridResolution" width="250"/> + <spinner label="Graduación de la cuadrÃcula (metros)" label_width="192" name="GridDrawSize" width="250"/> <check_box label="Activar subunidades" name="GridSubUnit"/> <check_box label="Ver la sección transversal" name="GridCrossSection"/> + <text name="grid_opacity_label" tool_tip="Opacidad de la cuadrÃcula"> + Opacidad: + </text> <slider label="Opacidad de la cuadrÃcula" name="GridOpacity" width="250"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml index 0553f4c672..f1948220b4 100644 --- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml @@ -1,44 +1,54 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floaterbulkperms" title="CAMBIO MASIVO DE LOS PERMISOS DEL CONTENIDO"> - <text name="applyto"> - Tipos de contenido - </text> +<floater name="floaterbulkperms" title="EDITAR LOS PERMISOS DEL CONTENIDO"> + <floater.string name="nothing_to_modify_text"> + Lo seleccionado tiene contenidos no editables. + </floater.string> + <floater.string name="status_text"> + Configurando los permisos de [NAME] + </floater.string> + <floater.string name="start_text"> + Iniciando el cambio de permisos solicitado... + </floater.string> + <floater.string name="done_text"> + Finalizado el cambio de permisos solicitado. + </floater.string> <check_box label="Animación" name="check_animation"/> + <icon name="icon_animation" tool_tip="Animaciones"/> <check_box label="Partes del cuerpo" name="check_bodypart"/> + <icon name="icon_bodypart" tool_tip="Partes del cuerpo"/> <check_box label="Ropa" name="check_clothing"/> + <icon name="icon_clothing" tool_tip="Ropa"/> <check_box label="Gestos" name="check_gesture"/> - <check_box label="Hitos" name="check_landmark"/> + <icon name="icon_gesture" tool_tip="Gestos"/> <check_box label="Notas" name="check_notecard"/> + <icon name="icon_notecard" tool_tip="Notas"/> <check_box label="Objetos" name="check_object"/> + <icon name="icon_object" tool_tip="Objetos"/> <check_box label="Scripts" name="check_script"/> + <icon name="icon_script" tool_tip="Scripts"/> <check_box label="Sonidos" name="check_sound"/> + <icon name="icon_sound" tool_tip="Sonidos"/> <check_box label="Texturas" name="check_texture"/> - <button label="Marcar todo" label_selected="Todo" name="check_all"/> - <button label="Desmarcar todo" label_selected="Ninguno" name="check_none"/> + <icon name="icon_texture" tool_tip="Texturas"/> + <button label="√ Todos" label_selected="Todo" name="check_all"/> + <button label="Limpiar" label_selected="Ninguno" name="check_none"/> <text name="newperms"> - Permisos nuevos + Permisos nuevos del contenido + </text> + <text name="GroupLabel"> + Grupo: </text> - <check_box label="Compartir con el grupo" name="share_with_group"/> - <check_box label="Permitir a cualquiera que lo copie" name="everyone_copy"/> + <check_box label="Compartir" name="share_with_group"/> + <text name="AnyoneLabel"> + Cualquiera: + </text> + <check_box label="Copiarlo" name="everyone_copy"/> <text name="NextOwnerLabel"> - El próximo propietario puede: + Próximo propietario: </text> <check_box label="Modificarlo" name="next_owner_modify"/> <check_box label="Copiarlo" name="next_owner_copy"/> - <check_box label="Revenderlo/Darlo" name="next_owner_transfer"/> - <button label="Ayuda" name="help"/> - <button label="Aplicar" name="apply"/> - <button label="Cerrar" name="close"/> - <string name="nothing_to_modify_text"> - Lo seleccionado tiene contenidos no editables. - </string> - <string name="status_text"> - Configurando los permisos de [NAME] - </string> - <string name="start_text"> - Iniciando el cambio de permisos solicitado... - </string> - <string name="done_text"> - Finalizado el cambio de permisos solicitado. - </string> + <check_box initial_value="true" label="Transferirlo" name="next_owner_transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> + <button label="OK" name="apply"/> + <button label="Cancelar" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml index 0522f788bb..6a9c6b1f22 100644 --- a/indra/newview/skins/default/xui/es/floater_bumps.xml +++ b/indra/newview/skins/default/xui/es/floater_bumps.xml @@ -1,21 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_bumps" title="CHOQUES, EMPUJONES, E IMPACTOS"> - <text name="none_detected"> + <floater.string name="none_detected"> No se han detectado - </text> - <text name="bump"> + </floater.string> + <floater.string name="bump"> [TIME] [FIRST] [LAST] ha chocado con usted - </text> - <text name="llpushobject"> + </floater.string> + <floater.string name="llpushobject"> [TIME] [FIRST] [LAST] le ha empujado con un script - </text> - <text name="selected_object_collide"> + </floater.string> + <floater.string name="selected_object_collide"> [TIME] [FIRST] [LAST] ha hecho que un objeto impacte con usted - </text> - <text name="scripted_object_collide"> + </floater.string> + <floater.string name="scripted_object_collide"> [TIME] [FIRST] [LAST] ha hecho que un objeto con script impacte con usted - </text> - <text name="physical_object_collide"> + </floater.string> + <floater.string name="physical_object_collide"> [TIME] [FIRST] [LAST] ha hecho que un objeto material impacte con usted - </text> + </floater.string> + <floater.string name="timeStr"> + [[hour,datetime,slt]:[min,datetime,slt]] + </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml index c4d269ff39..98604ad5f4 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_buy_contents" title="COMPRAR EL CONTENIDO"> +<floater name="floater_buy_contents" title="COMPRAR LOS CONTENIDOS"> <text name="contains_text"> [NAME] contiene: </text> diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml index 1ecb813dd1..81c54cf600 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml @@ -1,71 +1,66 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="buy currency" title="COMPRAR DINERO"> - <text name="info_buying"> - Comprando dinero: - </text> - <text name="info_cannot_buy" left="5" right="-5"> - No puede comprar en este momento: - </text> - <text name="info_need_more" left="5" right="-5"> - Necesita más dinero: - </text> - <text name="error_message"> - Algo no va bien. +<floater name="buy currency" title="COMPRAR L$"> + <floater.string name="buy_currency"> + Comprar [LINDENS] L$ por, aprox., [LOCALAMOUNT] + </floater.string> + <text left="5" name="info_need_more" right="-5"> + Necesitas más L$ </text> - <button label="Ir al sitio web" name="error_web"/> <text name="contacting"> Contactando con el LindeX... </text> - <text name="buy_action_unknown" right="-5"> - Comprar L$ en el sistema LindeX de cambio + <text name="info_buying"> + Comprar L$ </text> - <text name="buy_action"> - [NAME] [PRICE] L$ + <text name="balance_label"> + Tengo + </text> + <text name="balance_amount"> + [AMT] L$ </text> <text name="currency_action" width="50"> - Comprar + Quiero comprar + </text> + <text name="currency_label"> + L$ </text> - <line_editor name="currency_amt" width="65" left_delta="50"> + <line_editor label="L$" left_delta="50" name="currency_amt" width="65"> 1234 </line_editor> - <text name="currency_est" width="138" left_delta="68"> - por, aprox., [LOCALAMOUNT] - </text> - <text name="getting_data"> - Obteniendo los datos... + <text name="buying_label"> + Al precio de </text> - <text name="balance_label"> - Actualmente, tiene + <text left_delta="68" name="currency_est" width="138"> + aprox. [LOCALAMOUNT] </text> - <text name="balance_amount"> - [AMT] L$ - </text> - <text name="buying_label"> - Está comprando + <text name="getting_data"> + Calculando... </text> - <text name="buying_amount"> - [AMT] L$ + <text name="buy_action"> + [NAME] [PRICE] L$ </text> <text name="total_label"> - Su saldo será de + Mi nuevo saldo será </text> <text name="total_amount"> [AMT] L$ </text> <text name="currency_links"> - [http://www.secondlife.com/my/account/payment_method_management.php?lang=es-ES payment method] | [http://www.secondlife.com/my/account/currency.php?lang=es-ES currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=es-ES exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de cambio] + </text> + <text name="exchange_rate_note"> + Vuelve a escribir la cantidad para ver el tipo de cambio más reciente. </text> <text name="purchase_warning_repurchase" right="-10"> - Confirmando esta compra sólo compra la moneda. -Tendrá que intentar de nuevo la operación. + Confirmando que con esta compra sólo se compran L$, no el objeto. </text> <text name="purchase_warning_notenough"> - No está comprando dinero suficiente. -Aumente la cantidad a comprar. + No estás comprando suficientes L$. Por favor, aumenta la cantidad. </text> + <button label="Comprar ahora" name="buy_btn"/> <button label="Cancelar" name="cancel_btn"/> - <button label="Comprar" name="buy_btn"/> - <string name="buy_currency"> - Compre [LINDENS] L$ por, aprox., [LOCALAMOUNT] - </string> + <text left="5" name="info_cannot_buy" right="-5"> + No se pudo hacer la compra + </text> + <button label="Ir a la web" name="error_web"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml index 7ff45fcf79..496e719c6d 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml @@ -1,27 +1,156 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="COMPRAR TERRENO"> + <floater.string name="can_resell"> + Puede revenderse. + </floater.string> + <floater.string name="can_not_resell"> + No se puede revender. + </floater.string> + <floater.string name="can_change"> + Puede unirse o dividirse. + </floater.string> + <floater.string name="can_not_change"> + No puede unirse ni dividirse. + </floater.string> + <floater.string name="cant_buy_for_group"> + No tiene permiso de comprar terreno para el grupo que tiene activado. + </floater.string> + <floater.string name="no_land_selected"> + No se ha seleccionado terreno. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Se han seleccionado varias parcelas diferentes. +Inténtelo seleccionando un área más pequeña. + </floater.string> + <floater.string name="no_permission"> + No tiene permiso de comprar terreno para el grupo que tiene activado. + </floater.string> + <floater.string name="parcel_not_for_sale"> + La parcela seleccionada no está en venta. + </floater.string> + <floater.string name="group_already_owns"> + El grupo ya es propietario de la parcela. + </floater.string> + <floater.string name="you_already_own"> + Usted ya es propietario de la parcela. + </floater.string> + <floater.string name="set_to_sell_to_other"> + La parcela seleccionada está marcada para ser vendida a otro + </floater.string> + <floater.string name="no_public_land"> + El área seleccionada no tiene terreno público. + </floater.string> + <floater.string name="not_owned_by_you"> + Se ha seleccionado terreno propiedad de otro. +Inténtelo seleccionando un área más pequeña. + </floater.string> + <floater.string name="processing"> + Procesando su compra... + +(Llevará uno o dos minutos). + </floater.string> + <floater.string name="fetching_error"> + Se ha producido un error al ir a buscar la información de compra de terreno. + </floater.string> + <floater.string name="buying_will"> + Al comprar este terreno: + </floater.string> + <floater.string name="buying_for_group"> + Comprando terreno para el grupo: + </floater.string> + <floater.string name="cannot_buy_now"> + No se puede comprar ahora: + </floater.string> + <floater.string name="not_for_sale"> + No está en venta: + </floater.string> + <floater.string name="none_needed"> + no necesita + </floater.string> + <floater.string name="must_upgrade"> + Para poseer terreno, su cuenta debe ascender de categorÃa. + </floater.string> + <floater.string name="cant_own_land"> + Su cuenta puede poseer terreno. + </floater.string> + <floater.string name="land_holdings"> + Tienes [BUYER] m² de terreno. + </floater.string> + <floater.string name="pay_to_for_land"> + Pagar por este terreno [AMOUNT] L$ a [SELLER] + </floater.string> + <floater.string name="buy_for_US"> + Comprar [AMOUNT] L$ por, aprox., [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Este terreno tiene [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + Este terreno es 'premium', y se considerará como de [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Este terreno es 'discounted', y se considerará como de [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +admite [AMOUNT2] objetos + </floater.string> + <floater.string name="sold_with_objects"> + vendido con los objetos + </floater.string> + <floater.string name="sold_without_objects"> + objetos no incluidos + </floater.string> + <floater.string name="info_price_string"> + [PRICE] L$ +([PRICE_PER_SQM] L$/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Antes de que se complete la compra, el grupo [GROUP] necesitará +los suficientes créditos de uso en contribución de terreno +para cubrir esta parcela. + </floater.string> + <floater.string name="have_enough_lindens"> + Tiene [AMOUNT] L$, cantidad suficiente para comprar este terreno. + </floater.string> + <floater.string name="not_enough_lindens"> + Sólo tiene [AMOUNT] L$. NecesitarÃa [AMOUNT2] L$ más. + </floater.string> + <floater.string name="balance_left"> + Tras la compra, aún tendrá [AMOUNT] L$. + </floater.string> + <floater.string name="balance_needed"> + Para costearse este terreno, deberá comprar, al menos, [AMOUNT] L$. + </floater.string> + <floater.string name="no_parcel_selected"> + (No se ha seleccionado una parcela) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Región: </text> - <text name="region_name_text" left="565"> + <text left="565" name="region_name_text"> (desconocida) </text> <text name="region_type_label"> Tipo: </text> - <text name="region_type_text" left="565"> + <text left="565" name="region_type_text"> (desconocido) </text> <text name="estate_name_label"> Estado: </text> - <text name="estate_name_text" left="565"> + <text left="565" name="estate_name_text"> (desconocido) </text> - <text name="estate_owner_label" width="115" right="565"> + <text name="estate_owner_label" right="565" width="115"> Propietario del estado: </text> - <text name="estate_owner_text" left="565" > + <text left="565" name="estate_owner_text"> (desconocido) </text> <text name="resellable_changeable_label"> @@ -58,8 +187,8 @@ </text> <text name="info_price"> 1500 L$ -(1.1 L$/m²) -incluyendo los objetos +(1.1/m² L$) +se vende con los objetos </text> <text name="info_action"> Al comprar este terreno: @@ -75,16 +204,16 @@ incluyendo los objetos Sólo pueden ser propietarios de terreno los miembros premium. </text> <combo_box name="account_level"> - <combo_box.item name="US$9.95/month,billedmonthly" label="9.95 US$/mes, facturados mensualmente" /> - <combo_box.item name="US$7.50/month,billedquarterly" label="7.50 US$/mes, facturados cuatrimestralmente" /> - <combo_box.item name="US$6.00/month,billedannually" label="6.00 US$/mes, facturados anualmente" /> + <combo_box.item label="9.95 US$/mes, facturados mensualmente" name="US$9.95/month,billedmonthly"/> + <combo_box.item label="7.50 US$/mes, facturados trimestralmente" name="US$7.50/month,billedquarterly"/> + <combo_box.item label="6.00 US$/mes, facturados anualmente" name="US$6.00/month,billedannually"/> </combo_box> <text name="land_use_action"> Aumenta su cuota mensual por uso de terreno a 40 US$/mes. </text> <text name="land_use_reason"> - Usted posee 1309 m² de terreno. -Esta parcela mide 512 m². + Tienes 1309 m² de terreno. +Esta parcela es de 512 m². </text> <text name="purchase_action"> Pagar al residente Joe 4.000 L$ por el terreno @@ -99,141 +228,12 @@ Esta parcela mide 512 m². 1.000 </line_editor> <text name="currency_est"> - por, aprox., [AMOUNT2] US$ + por, aprox., [LOCAL_AMOUNT] </text> <text name="currency_balance"> Tiene 2.100 L$. </text> - <check_box label="Quitar [AMOUNT] m² de la contribución del grupo." name="remove_contribution"/> + <check_box label="Quitar [AMOUNT] m² de las contribuciones de grupo." name="remove_contribution"/> <button label="Comprar" name="buy_btn"/> <button label="Cancelar" name="cancel_btn"/> - <string name="can_resell"> - Puede revenderse. - </string> - <string name="can_not_resell"> - No se puede revender. - </string> - <string name="can_change"> - Puede unirse o dividirse. - </string> - <string name="can_not_change"> - No puede unirse ni dividirse. - </string> - <string name="cant_buy_for_group"> - No tiene permiso de comprar terreno para el grupo que tiene activado. - </string> - <string name="no_land_selected"> - No se ha seleccionado terreno. - </string> - <string name="multiple_parcels_selected"> - Se han seleccionado varias parcelas diferentes. -Inténtelo seleccionando un área más pequeña. - </string> - <string name="no_permission"> - No tiene permiso de comprar terreno para el grupo que tiene activado. - </string> - <string name="parcel_not_for_sale"> - La parcela seleccionada no está en venta. - </string> - <string name="group_already_owns"> - El grupo ya es propietario de la parcela. - </string> - <string name="you_already_own"> - Usted ya es propietario de la parcela. - </string> - <string name="set_to_sell_to_other"> - La parcela seleccionada está marcada para ser vendida a otro - </string> - <string name="no_public_land"> - El área seleccionada no tiene terreno público. - </string> - <string name="not_owned_by_you"> - Se ha seleccionado terreno propiedad de otro. -Inténtelo seleccionando un área más pequeña. - </string> - <string name="processing"> - Procesando su compra... - -(Llevará uno o dos minutos). - </string> - <string name="fetching_error"> - Se ha producido un error al ir a buscar la información de compra de terreno. - </string> - <string name="buying_will"> - Al comprar este terreno: - </string> - <string name="buying_for_group"> - Comprando terreno para el grupo: - </string> - <string name="cannot_buy_now"> - No se puede comprar ahora: - </string> - <string name="not_for_sale"> - No está en venta: - </string> - <string name="none_needed"> - no necesita - </string> - <string name="must_upgrade"> - Para poseer terreno, su cuenta debe ascender de categorÃa. - </string> - <string name="cant_own_land"> - Su cuenta puede poseer terreno. - </string> - <string name="land_holdings"> - Usted tiene [BUYER] m² de terreno. - </string> - <string name="pay_to_for_land"> - Pagar por este terreno [AMOUNT] L$ a [SELLER] - </string> - <string name="buy_for_US"> - Comprar [AMOUNT] L$ por, aprox., [AMOUNT2] US$, - </string> - <string name="parcel_meters"> - Esta parcela tiene [AMOUNT] m². - </string> - <string name="premium_land"> - Este terreno es premium, y se contará como de [AMOUNT] m². - </string> - <string name="discounted_land"> - Este terreno tiene descuento, y se contará como de [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -admite [AMOUNT2] objetos - </string> - <string name="sold_with_objects"> - vendido con los objetos - </string> - <string name="sold_without_objects"> - objetos no incluidos - </string> - <string name="info_price_string"> - [PRICE] L$ -([PRICE_PER_SQM] L$/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Antes de que se complete la compra, el grupo [GROUP] necesitará -los suficientes créditos de uso en contribución de terreno -para cubrir esta parcela. - </string> - <string name="have_enough_lindens"> - Tiene [AMOUNT] L$, cantidad suficiente para comprar este terreno. - </string> - <string name="not_enough_lindens"> - Sólo tiene [AMOUNT] L$. NecesitarÃa [AMOUNT2] L$ más. - </string> - <string name="balance_left"> - Tras la compra, aún tendrá [AMOUNT] L$. - </string> - <string name="balance_needed"> - Para costearse este terreno, deberá comprar, al menos, [AMOUNT] L$. - </string> - <string name="no_parcel_selected"> - (No se ha seleccionado una parcela) - </string> - <string name="buy_currency"> - Comprar [LINDENS] L$ por, aprox., [USD] US$ - </string> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml index 26696bc868..117d29777f 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="contents" title="COMPRAR UNA COPIA DEL OBJETO"> <text name="contents_text"> - y sus contenidos: + Contenidos: </text> <text name="buy_text"> ¿Comprarlo por [AMOUNT] L$ a [NAME]? diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index 3aeb4e5771..40c5603706 100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml @@ -10,7 +10,22 @@ Mover la cámara arriba y abajo, izquierda y derecha </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Mover la cámara arriba y abajo, izquierda y derecha"/> - <joystick_zoom name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado"/> + <joystick_track name="cam_track_stick" tool_tip="Mueve la cámara arriba y abajo, a izquierda y derecha"/> + <panel name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado"> + <slider_bar name="zoom_slider" tool_tip="Hacer zoom en lo enfocado"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="La cámara gira alrededor del punto de vista"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Desde detrás"/> + <button name="group_view" tool_tip="Desde tu hombro"/> + <button name="front_view" tool_tip="De frente"/> + <button name="mouselook_view" tool_tip="Vista subjetiva"/> + </panel> + </panel> + <panel name="buttons"> + <button label="" name="orbit_btn" tool_tip="Cámara orbital"/> + <button label="" name="pan_btn" tool_tip="Cámara panorámica"/> + <button label="" name="avatarview_btn" tool_tip="Posición de tu cámara"/> + <button label="" name="freecamera_btn" tool_tip="Centrar el objeto"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml index 4395ee6890..ed168c09d5 100644 --- a/indra/newview/skins/default/xui/es/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="ColorPicker" title="PALETA DE COLORES"> +<floater name="ColorPicker" title="SELECTOR DE COLOR"> <text name="r_val_text"> Rojo: </text> @@ -18,14 +18,13 @@ <text name="l_val_text"> Lumin.: </text> - <check_box label="Aplicar ahora mismo" name="apply_immediate"/> + <check_box label="Aplicarlo ahora" name="apply_immediate"/> <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> - <button label="Elegir" label_selected="Elegir" name="select_btn"/> + <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> Color actual: </text> <text name="(Drag below to save.)"> - (Arrástrelo abajo - para guardarlo) + (arrástralo abajo para guardarlo) </text> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml index 94452dae6b..4b332cd9c3 100644 --- a/indra/newview/skins/default/xui/es/floater_customize.xml +++ b/indra/newview/skins/default/xui/es/floater_customize.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="APARIENCIA" width="527"> <tab_container name="customize tab container" width="525"> - <placeholder label="Partes del cuerpo" name="body_parts_placeholder"/> + <text label="Partes del cuerpo" name="body_parts_placeholder"> + Partes del cuerpo + </text> <panel label="Forma" name="Shape" width="389"> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> <button label="Cuerpo" label_selected="Cuerpo" name="Body"/> @@ -14,8 +16,8 @@ <button label="Torso" label_selected="Torso" name="Torso"/> <button label="Piernas" label_selected="Piernas" name="Legs"/> <radio_group name="sex radio"> - <radio_item name="radio" label="Mujer" /> - <radio_item name="radio2" label="Varón" /> + <radio_item label="Mujer" name="radio" value="0"/> + <radio_item label="Varón" name="radio2" value="1"/> </radio_group> <text name="title"> [DESC] @@ -33,8 +35,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Póngase una forma nueva arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una anatomÃa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -43,8 +44,8 @@ avatar. O parta de cero creando una nueva y vistiéndola. Forma: </text> <button label="Crear una forma nueva" label_selected="Crear una forma nueva" name="Create New"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> </panel> <panel label="Piel" name="Skin"> <button label="Color de piel" label_selected="Color de piel" name="Skin Color" width="115"/> @@ -67,8 +68,7 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra piel arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -76,12 +76,12 @@ avatar. O parta de cero creando una nueva y vistiéndola. <text name="Item Action Label" right="107"> Piel: </text> - <texture_picker width="90" label="Tatuaje: cabeza" name="Head Tattoos" tool_tip="Pulse para elegir una imagen"/> - <texture_picker width="90" label="Tatuaje: superior" name="Upper Tattoos" tool_tip="Pulse para elegir una imagen"/> - <texture_picker width="90" label="Tatuaje: inferior" name="Lower Tattoos" tool_tip="Pulse para elegir una imagen"/> + <texture_picker label="Tatuaje: cabeza" name="Head Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/> + <texture_picker label="Tatuaje: superior" name="Upper Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/> + <texture_picker label="Tatuaje: inferior" name="Lower Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/> <button label="Crear una piel nueva" label_selected="Crear una piel nueva" name="Create New"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Pelo" name="Hair"> @@ -105,8 +105,7 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situado en [PATH] </text> <text name="not worn instructions"> - Póngase otro pelo arrastrando uno desde su inventario hasta su -avatar. O parta de cero creando uno nueva y vistiéndolo. + Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien puedes crear uno nuevo partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -116,8 +115,8 @@ avatar. O parta de cero creando uno nueva y vistiéndolo. </text> <texture_picker label="Textura" name="Texture" tool_tip="Pulse para elegir una imagen"/> <button label="Crear un pelo nuevo" label_selected="Crear un pelo nuevo" name="Create New"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Ojos" name="Eyes"> @@ -137,8 +136,7 @@ avatar. O parta de cero creando uno nueva y vistiéndolo. Situados en [PATH] </text> <text name="not worn instructions"> - Póngase otros ojos arrastrando unos desde su inventario hasta su -avatar. O parta de cero creando unos nuevos y vistiéndoselos. + Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -148,18 +146,20 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. </text> <texture_picker label="Iris" name="Iris" tool_tip="Pulse para elegir una imagen"/> <button label="Crear unos ojos nuevos" label_selected="Crear unos ojos nuevos" name="Create New"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> - <panel label="Ropa" name="clothes_placeholder"/> + <text label="Ropa" name="clothes_placeholder"> + Ropas + </text> <panel label="Camisa" name="Shirt"> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarla" label_selected="Quitarla" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> <text name="title"> [DESC] @@ -177,8 +177,7 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra camisa arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -189,11 +188,11 @@ avatar. O parta de cero creando una nueva y vistiéndola. </panel> <panel label="Pantalones" name="Pants"> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear unos pantalones nuevos" label_selected="Crear unos pantalones nuevos" name="Create New" width="185"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Crear unos pantalones nuevos" label_selected="Crear unos pantalones nuevos" name="Create New" width="185"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> <text name="title"> [DESC] @@ -211,8 +210,7 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situados en [PATH] </text> <text name="not worn instructions"> - Póngase otros pantalones arrastrando unos desde su inventario hasta su -avatar. O parta de cero creando unos nuevos y vistiéndoselos. + Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. @@ -238,9 +236,9 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Situados en [PATH] </text> <text name="not worn instructions"> - Póngase otros zapatos arrastrando unos desde su inventario hasta su -avatar. O parta de cero creando unos nuevos y vistiéndoselos. + Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> + <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -248,11 +246,10 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Zapatos: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Calcetines" name="Socks"> @@ -272,9 +269,9 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Situados en [PATH] </text> <text name="not worn instructions"> - Póngase otros calcetines arrastrando unos desde su inventario hasta su -avatar. O parta de cero creando unos nuevos y vistiéndoselos. + Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> + <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -282,11 +279,10 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Calcetines: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Chaqueta" name="Jacket"> @@ -306,9 +302,9 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra chaqueta arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> + <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -317,11 +313,10 @@ avatar. O parta de cero creando una nueva y vistiéndola. </text> <texture_picker label="Tela superior" name="Upper Fabric" tool_tip="Pulse para elegir una imagen"/> <texture_picker label="Tela inferior" name="Lower Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarla" label_selected="Quitarla" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Guantes" name="Gloves"> @@ -341,9 +336,9 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situados en [PATH] </text> <text name="not worn instructions"> - Póngase otros guantes arrastrando unos desde su inventario hasta su -avatar. O parta de cero creando unos nuevos y vistiéndoselos. + Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero. </text> + <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -351,11 +346,10 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Guantes: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Camiseta" name="Undershirt"> @@ -375,9 +369,9 @@ avatar. O parta de cero creando unos nuevos y vistiéndoselos. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra camiseta arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> + <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -385,11 +379,10 @@ avatar. O parta de cero creando una nueva y vistiéndola. Camiseta: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarla" label_selected="Quitarla" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Ropa interior" name="Underpants"> @@ -409,9 +402,9 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra ropa interior arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> + <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -419,11 +412,10 @@ avatar. O parta de cero creando una nueva y vistiéndola. Ropa interior: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarla" label_selected="Quitarla" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> <panel label="Falda" name="Skirt"> @@ -443,9 +435,9 @@ avatar. O parta de cero creando una nueva y vistiéndola. Situada en [PATH] </text> <text name="not worn instructions"> - Póngase otra falda arrastrando una desde su inventario hasta su -avatar. O parta de cero creando una nueva y vistiéndola. + Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero. </text> + <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/> <text name="no modify instructions"> No tiene permiso para modificar este Ãtem. </text> @@ -453,16 +445,86 @@ avatar. O parta de cero creando una nueva y vistiéndola. Falda: </text> <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/> - <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> <button label="Quitarla" label_selected="Quitarla" name="Take Off"/> - <button left="113" label="Guardar" label_selected="Guardar" name="Save"/> - <button left="199" width="102" label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Guardar" label_selected="Guardar" left="113" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." left="199" name="Save As" width="102"/> <button label="Restablecer" label_selected="Restablecer" name="Revert"/> </panel> + <panel label="Tatuaje" name="Tattoo"> + <text name="title"> + [DESC] + </text> + <text name="title_no_modify"> + [DESC]: no modificable + </text> + <text name="title_loading"> + [DESC]: cargando... + </text> + <text name="title_not_worn"> + [DESC]: no puesto + </text> + <text name="path"> + Situado en [PATH] + </text> + <text name="not worn instructions"> + Pon un tatuaje nuevo arrastrándolo desde tu inventario a tu avatar. O bien puedes crear uno nuevo partiendo de cero. + </text> + <button label="Crear un tatuaje nuevo" label_selected="Crear un tatuaje nuevo" name="Create New"/> + <text name="no modify instructions"> + No tienes permiso para modificar este artÃculo. + </text> + <text name="Item Action Label"> + Tatuaje: + </text> + <texture_picker label="Tatuaje de la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <button label="Quitarme" label_selected="Quitarme" name="Take Off"/> + <button label="Guardar" label_selected="Guardar" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Revertir" label_selected="Revertir" name="Revert"/> + </panel> + <panel label="Alfa" name="Alpha"> + <text name="title"> + [DESC] + </text> + <text name="title_no_modify"> + [DESC]: no modificable + </text> + <text name="title_loading"> + [DESC]: cargando... + </text> + <text name="title_not_worn"> + [DESC]: no puesto + </text> + <text name="path"> + Situado en [PATH] + </text> + <text name="not worn instructions"> + Pon una capa Alfa nueva arrastrándola desde tu inventario a tu avatar. O bien puedes crear una nueva partiendo de cero. + </text> + <button label="Crear una capa Alfa nueva" label_selected="Crear una capa Alfa nueva" name="Create New"/> + <text name="no modify instructions"> + No tienes permiso para modificar este artÃculo. + </text> + <text name="Item Action Label"> + Alfa: + </text> + <texture_picker label="Alfa inferior" name="Lower Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa superior" name="Upper Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa de la cabeza" name="Head Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa de los ojos" name="Eye Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa del pelo" name="Hair Alpha" tool_tip="Pulsa para elegir una imagen"/> + <button label="Quitarme" label_selected="Quitarme" name="Take Off"/> + <button label="Guardar" label_selected="Guardar" name="Save"/> + <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/> + <button label="Revertir" label_selected="Revertir" name="Revert"/> + </panel> </tab_container> <scroll_container left="230" name="panel_container"/> + <button label="Información del script" label_selected="Información del script" name="script_info" tool_tip="Mostrar los scripts anexados a tu avatar"/> + <button label="Hacer un vestuario" label_selected="Hacer un vestuario" name="make_outfit_btn"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> - <button label="Hacer un vestuario..." label_selected="Hacer un vestuario..." name="Make Outfit" width="130"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml index 5d6ba47daf..195690f546 100644 --- a/indra/newview/skins/default/xui/es/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_env_settings.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Environment Editor Floater" title="EDITOR DEL ENTORNO"> + <floater.string name="timeStr"> + [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] + </floater.string> <text name="EnvTimeText"> Duración de un dÃa @@ -14,13 +17,12 @@ un dÃa Color del agua </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Pulse para abrir el selector de color"/> + <color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el selector de color"/> <text name="EnvWaterFogText"> Claridad del agua </text> <button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/> - <button label="Cielo avanzado" name="EnvAdvancedSkyButton" width="155" left="167" /> - <button label="Agua avanzada" name="EnvAdvancedWaterButton" width="155" left="326"/> - <button label="?" name="EnvSettingsHelpButton"/> + <button label="Cielo avanzado" left="167" name="EnvAdvancedSkyButton" width="155"/> + <button label="Agua avanzada" left="326" name="EnvAdvancedWaterButton" width="155"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml new file mode 100644 index 0000000000..81909e997c --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Evento" name="Event" title="DETALLES DEL EVENTO"> + <floater.string name="none"> + ninguno + </floater.string> + <floater.string name="notify"> + Notificar + </floater.string> + <floater.string name="dont_notify"> + No notificar + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Evento sin nombre... + </text> + <text name="event_category"> + (sin categorÃa) + </text> + <text name="event_runby_label"> + Organizado por: + </text> + <text initial_value="(obteniendo)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 hora + </text> + <text name="event_cover"> + Gratis + </text> + <text name="event_location_label"> + Localización: + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Calificación:"/> + <text name="rating_value" value="desconocida"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Crear el evento"/> + <button name="god_delete_event_btn" tool_tip="Borrar el evento"/> + <button label="Notificarme" name="notify_btn"/> + <button label="Teleportar" name="teleport_btn"/> + <button label="Mapa" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml index 496881f2d2..1dc1d54295 100644 --- a/indra/newview/skins/default/xui/es/floater_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_gesture.xml @@ -1,15 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="gestures" title="GESTOS DISPONIBLES"> - <text name="help_label"> - Pulse dos veces en un gesto para reproducir las animaciones -y sonidos. - </text> - <scroll_list bottom_delta="-385" height="360" name="gesture_list"> - <column label="Botón" name="trigger"/> - <column label="Tecla" name="shortcut"/> - <column label="Nombre" name="name"/> +<floater label="Lugares" name="gestures" title="GESTOS"> + <floater.string name="loading"> + Cargando... + </floater.string> + <floater.string name="playing"> + (Ejecutándose) + </floater.string> + <floater.string name="copy_name"> + Copia de [COPY_NAME] + </floater.string> + <scroll_list bottom_delta="-385" height="360" name="gesture_list"> + <scroll_list.columns label="Nombre" name="name"/> + <scroll_list.columns label="Chat" name="trigger"/> + <scroll_list.columns label="Tecla" name="shortcut"/> </scroll_list> - <button label="Nuevo" name="new_gesture_btn"/> + <panel label="bottom_panel" name="bottom_panel"> + <menu_button name="gear_btn" tool_tip="Más opciones"/> + <button name="new_gesture_btn" tool_tip="Hacer un gesto nuevo"/> + <button name="activate_btn" tool_tip="Activar/Desactivar el gesto elegido"/> + <button name="del_btn" tool_tip="Borrar este gesto"/> + </panel> <button label="Editar" name="edit_btn"/> <button label="Reproducir" name="play_btn"/> <button label="Parar" name="stop_btn"/> diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml index 78ec76e32b..b604f7f46f 100644 --- a/indra/newview/skins/default/xui/es/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml @@ -1,52 +1,37 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="godtools floater" title="HERRAMIENTAS DE DIOS"> <tab_container name="GodTools Tabs"> <panel label="Red" name="grid"> - <button label="Expulsar a todos los usuarios" - label_selected="Expulsar a todos los usuarios" name="Kick all users" /> - <button label="Vaciar los caches de visibilidad del mapa de la región" - label_selected="Vaciar los caches de visibilidad del mapa de la región" - name="Flush This Region's Map Visibility Caches" /> + <button label="Expulsar a todos los usuarios" label_selected="Expulsar a todos los usuarios" name="Kick all users"/> + <button label="Vaciar los caches de visibilidad del mapa de la región" label_selected="Vaciar los caches de visibilidad del mapa de la región" name="Flush This Region's Map Visibility Caches"/> </panel> <panel label="Región" name="region"> <text name="Sim Name:"> Nombre del Sim: </text> - <check_box label="Preludio" name="check prelude" - tool_tip="Defina esté para hacer un preludio de la región." /> - <check_box label="Sol fijo" name="check fixed sun" - tool_tip="Fijar la posición del sol (asà como en Región/Propiedad > Terreno." /> - <check_box label="Restaurar casa en el teletransporte" name="check reset home" - tool_tip="Cuando el residente sea teletransportado hacia fuera, restaurar su casa para la posición de destino." /> - <check_box label="Visible" name="check visible" - tool_tip="Defina esté para tornar la región visible a no dioses." /> - <check_box label="Daño" name="check damage" - tool_tip="Defina esté para activar el daño en esta región." /> - <check_box label="Bloquear rastreo de tráfico" name="block dwell" - tool_tip="Defina esté para hacer que una región no compute el tráfico." /> - <check_box label="Bloquear formar terreno" name="block terraform" - tool_tip="Defina esté para no permitir que personas muden la formación del terreno de ellas" /> - <check_box label="Caja de arena" name="is sandbox" - tool_tip="Activar/desactivar si ésta es una región caja de arena." /> - <button label="Formar terreno" label_selected="Formar terreno" name="Bake Terrain" - tool_tip="Guardar el terreno actual como patrón." /> - <button label="Revertir terreno" label_selected="Revertir terreno" - name="Revert Terrain" - tool_tip="Sustituir el terreno actual por el patrón." /> - <button label="Cambiar terreno" label_selected="Cambiar terreno" name="Swap Terrain" - tool_tip="Cambiar terreno actual por el patrón." /> + <check_box label="Preludio" name="check prelude" tool_tip="Defina esté para hacer un preludio de la región."/> + <check_box label="Sol fijo" name="check fixed sun" tool_tip="Fijar la posición del sol (asà como en Región/Propiedad > Terreno."/> + <check_box label="Restaurar casa en el teletransporte" name="check reset home" tool_tip="When Resident teleports out, reset their home to the destination position."/> + <check_box label="Visible" name="check visible" tool_tip="Defina esté para tornar la región visible a no dioses."/> + <check_box label="Daño" name="check damage" tool_tip="Defina esté para activar el daño en esta región."/> + <check_box label="Bloquear rastreo de tráfico" name="block dwell" tool_tip="Defina esté para hacer que una región no compute el tráfico."/> + <check_box label="Bloquear formar terreno" name="block terraform" tool_tip="Defina esté para no permitir que personas muden la formación del terreno de ellas"/> + <check_box label="Caja de arena" name="is sandbox" tool_tip="Activar/desactivar si ésta es una región caja de arena."/> + <button label="Formar terreno" label_selected="Formar terreno" name="Bake Terrain" tool_tip="Guardar el terreno actual como patrón."/> + <button label="Revertir terreno" label_selected="Revertir terreno" name="Revert Terrain" tool_tip="Sustituir el terreno actual por el patrón."/> + <button label="Cambiar terreno" label_selected="Cambiar terreno" name="Swap Terrain" tool_tip="Cambiar terreno actual por el patrón."/> <text name="estate id"> ID de la propiedad: </text> <text name="parent id"> ID del padre: </text> - <line_editor name="parentestate" tool_tip="Ésta es una propiedad padre para esta región" /> + <line_editor name="parentestate" tool_tip="Ésta es una propiedad padre para esta región"/> <text name="Grid Pos: "> Red Pos: </text> - <line_editor name="gridposx" tool_tip="Ésta es la posición x de la reja para esta región" /> - <line_editor name="gridposy" tool_tip="Ésta es la posición y de la reja para esta región" /> + <line_editor name="gridposx" tool_tip="Ésta es la posición x de la reja para esta región"/> + <line_editor name="gridposy" tool_tip="Ésta es la posición y de la reja para esta región"/> <text name="Redirect to Grid: "> Redireccionar para red: </text> @@ -56,16 +41,10 @@ <text name="land cost text"> L$ por m²: </text> - <button label="Actualizar" label_selected="Actualizar" name="Refresh" - tool_tip="Haga clic aquà para actualizar la información arriba." /> - <button label="Aplicar" label_selected="Aplicar" name="Apply" - tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." /> - <button label="Seleccionar región" label_selected="Seleccionar región" - name="Select Region" - tool_tip="Seleccione toda la región con esta herramienta de terreno." /> - <button label="Guardado automático ahora" label_selected="Guardado automático ahora" - name="Autosave now" - tool_tip="Guardar estado con gzip en el directorio de guardado automático." /> + <button label="Actualizar" label_selected="Actualizar" name="Refresh" tool_tip="Haga clic aquà para actualizar la información arriba."/> + <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba."/> + <button label="Seleccionar región" label_selected="Seleccionar región" name="Select Region" tool_tip="Seleccione toda la región con esta herramienta de terreno."/> + <button label="Guardado automático ahora" label_selected="Guardado automático ahora" name="Autosave now" tool_tip="Guardar estado con gzip en el directorio de guardado automático."/> </panel> <panel label="Objetos" name="objects"> <text name="Sim Name:"> @@ -74,62 +53,42 @@ <text name="region name"> Galés </text> - <check_box label="Desactivar scripts" name="disable scripts" - tool_tip="Defina esté para desactivar todos los scripts en esta región" /> - <check_box label="Desactivar colisiones" name="disable collisions" - tool_tip="Defina esté para desactivar las colisiones entre no agentes en esta región" /> - <check_box label="Desactivar fÃsica" name="disable physics" - tool_tip="Defina esté para desactivar toda la fÃsica en esta región" /> - <button label="Aplicar" label_selected="Aplicar" name="Apply" - tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." /> - <button label="Definir blanco" label_selected="Definir blanco" name="Set Target" - tool_tip="Ajuste el avatar del blanco para la exclusión del objeto." /> + <check_box label="Desactivar scripts" name="disable scripts" tool_tip="Defina esté para desactivar todos los scripts en esta región"/> + <check_box label="Desactivar colisiones" name="disable collisions" tool_tip="Defina esté para desactivar las colisiones entre no agentes en esta región"/> + <check_box label="Desactivar fÃsica" name="disable physics" tool_tip="Defina esté para desactivar toda la fÃsica en esta región"/> + <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba."/> + <button label="Definir blanco" label_selected="Definir blanco" name="Set Target" tool_tip="Ajuste el avatar del blanco para la exclusión del objeto."/> <text name="target_avatar_name"> (sin blanco) </text> - <button label="Borrar objetos con script del blanco en otros terrenos" - label_selected="Borrar objetos con script del blanco en otros terrenos" - name="Delete Target's Scripted Objects On Others Land" - tool_tip="Borrar todos los objetos con script pertenecientes al blanco en el terreno que no pertenece a él. Objetos (sin copia) retornarán." /> - <button label="Borrar objetos con script del blanco en *TODOS* los terrenos" - label_selected="Borrar objetos con script del blanco en *TODOS* los terrenos" - name="Delete Target's Scripted Objects On *Any* Land" - tool_tip="Borrar todos los objetos con script pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." /> - <button label="Borrar *TODOS* los objetos del blanco" - label_selected="Borrar *TODOS* los objetos del blanco" - name="Delete *ALL* Of Target's Objects" - tool_tip="Borrar todos los objetos pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." /> - <button label="Obtener top de colisionadores" - label_selected="Obtener top de colisionadores" name="Get Top Colliders" - tool_tip="Coger lista de objetos que están recibiendo narrowphase callbacks." /> - <button label="Obtener top de scripts" label_selected="Obtener top de scripts" - name="Get Top Scripts" - tool_tip="Coger lista de objetos que están consumiendo más tiempo de ejecución de scripts." /> - <button label="Compilador de scripts" label_selected="Compilador de scripts" - name="Scripts digest" - tool_tip="Coger una lista de todos los scripts y sus respectivos números de ocurrencia." /> + <button label="Borrar objetos con script del blanco en otros terrenos" label_selected="Borrar objetos con script del blanco en otros terrenos" name="Delete Target's Scripted Objects On Others Land" tool_tip="Borrar todos los objetos con script pertenecientes al blanco en el terreno que no pertenece a él. Objetos (sin copia) retornarán."/> + <button label="Borrar objetos con script del blanco en *TODOS* los terrenos" label_selected="Borrar objetos con script del blanco en *TODOS* los terrenos" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Borrar todos los objetos con script pertenecientes al blanco en esta región. Objetos (sin copia) retornarán."/> + <button label="Borrar *TODOS* los objetos del blanco" label_selected="Borrar *TODOS* los objetos del blanco" name="Delete *ALL* Of Target's Objects" tool_tip="Borrar todos los objetos pertenecientes al blanco en esta región. Objetos (sin copia) retornarán."/> + <button label="Obtener top de colisionadores" label_selected="Obtener top de colisionadores" name="Get Top Colliders" tool_tip="Coger lista de objetos que están recibiendo narrowphase callbacks."/> + <button label="Obtener top de scripts" label_selected="Obtener top de scripts" name="Get Top Scripts" tool_tip="Coger lista de objetos que están consumiendo más tiempo de ejecución de scripts."/> + <button label="Compilador de scripts" label_selected="Compilador de scripts" name="Scripts digest" tool_tip="Coger una lista de todos los scripts y sus respectivos números de ocurrencia."/> </panel> <panel label="Requerir" name="request"> <text name="Destination:"> Destino: </text> <combo_box name="destination"> - <combo_box.item name="item1" label="Selección" /> - <combo_box.item name="item2" label="Agente de región" /> + <combo_box.item label="Selección" name="item1"/> + <combo_box.item label="Agente de región" name="item2"/> </combo_box> <text name="Request:"> Exigencia: </text> <combo_box name="request"> - <combo_box.item name="item1" label="colisionadores <pasos>" /> - <combo_box.item name="item2" label="scripts <contar>,<patrón opcional>" /> - <combo_box.item name="item3" label="objetos <patrón>" /> - <combo_box.item name="item4" label="rez <asset_id>" /> + <combo_box.item label="colisionadores <pasos>" name="item1"/> + <combo_box.item label="scripts <contar>,<patrón opcional>" name="item2"/> + <combo_box.item label="objetos <patrón>" name="item3"/> + <combo_box.item label="rez <asset_id>" name="item4"/> </combo_box> <text name="Parameter:"> Parámetro: </text> - <button label="Hacer exigencia" label_selected="Hacer exigencia" name="Make Request" /> + <button label="Hacer exigencia" label_selected="Hacer exigencia" name="Make Request"/> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml index 9418252036..f967d697c5 100644 --- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml @@ -8,21 +8,21 @@ Antialiasing: </text> <combo_box label="Antialiasing" name="fsaa" width="94"> - <combo_box.item name="FSAADisabled" label="Desactivado"/> - <combo_box.item name="2x" label="2x"/> - <combo_box.item name="4x" label="4x"/> - <combo_box.item name="8x" label="8x"/> - <combo_box.item name="16x" label="16x"/> + <combo_box.item label="Desactivado" name="FSAADisabled"/> + <combo_box.item label="2x" name="2x"/> + <combo_box.item label="4x" name="4x"/> + <combo_box.item label="8x" name="8x"/> + <combo_box.item label="16x" name="16x"/> </combo_box> <spinner label="Gamma:" name="gamma"/> <text name="(brightness, lower is brighter)"> - (brillo; menor es más brillante, 0=predeterminado) + (0 = brillo por defecto, más bajo = más brillo) </text> <text name="Enable VBO:"> Activar VBO: </text> - <check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caÃdas."/> - <slider label_width="150" left="10" width="300" label="Memoria para texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vÃdeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/> + <check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caÃdas."/> + <slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vÃdeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/> <spinner label="Intensidad de la niebla:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml new file mode 100644 index 0000000000..ec3c38e8c7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_help_browser" title="BUSCADOR DE AYUDA"> + <floater.string name="loading_text"> + Cargando... + </floater.string> + <layout_stack name="stack1"> + <layout_panel name="external_controls"/> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml index 3e92003bac..e6b01a4946 100644 --- a/indra/newview/skins/default/xui/es/floater_im.xml +++ b/indra/newview/skins/default/xui/es/floater_im.xml @@ -10,7 +10,7 @@ Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> <string name="muted_message"> - Ha ignorado a este residente. Al enviarle un mensaje, automáticamente dejará de ignorarle. + Has ignorado a este Residente. Enviándole un mensaje, automáticamente dejarás de ignorarle. </string> <string name="generic_request_error"> Error al hacer lo solicitado; por favor, inténtelo más tarde. diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml new file mode 100644 index 0000000000..1cd752e6ec --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_im_container.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<multi_floater name="floater_im_box" title="CONVERSACIONES"/> diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml new file mode 100644 index 0000000000..c7312e609b --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_im_session.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="panel_im"> + <layout_stack name="im_panels"> + <layout_panel label="Panel de control de MI" name="panel_im_control_panel"/> + <layout_panel> + <line_editor label="A" name="chat_editor"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml index 6d51a800b7..0ad91265c9 100644 --- a/indra/newview/skins/default/xui/es/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml @@ -10,17 +10,17 @@ Previsualizar la imagen como: </text> - <combo_box label="Tipo de ropa" name="clothing_type_combo" left="100" width="186"> - <combo_box.item name="Image" label="Imagen" /> - <combo_box.item name="Hair" label="Pelo" /> - <combo_box.item name="FemaleHead" label="Cabeza de mujer" /> - <combo_box.item name="FemaleUpperBody" label="Mujer: parte superior del cuerpo" /> - <combo_box.item name="FemaleLowerBody" label="Mujer: parte inferior del cuerpo" /> - <combo_box.item name="MaleHead" label="Cabeza de varón" /> - <combo_box.item name="MaleUpperBody" label="Varón: parte superior del cuerpo" /> - <combo_box.item name="MaleLowerBody" label="Varón: parte inferior del cuerpo" /> - <combo_box.item name="Skirt" label="Falda" /> - <combo_box.item name="SculptedPrim" label="Prim sculpted"/> + <combo_box label="Tipo de ropa" left="100" name="clothing_type_combo" width="186"> + <combo_box.item label="Imagen" name="Image"/> + <combo_box.item label="Pelo" name="Hair"/> + <combo_box.item label="Mujer: cabeza" name="FemaleHead"/> + <combo_box.item label="Mujer: parte superior del cuerpo" name="FemaleUpperBody"/> + <combo_box.item label="Mujer: parte inferior del cuerpo" name="FemaleLowerBody"/> + <combo_box.item label="Varón: cabeza" name="MaleHead"/> + <combo_box.item label="Varón: parte superior del cuerpo" name="MaleUpperBody"/> + <combo_box.item label="Varón: parte inferior del cuerpo" name="MaleLowerBody"/> + <combo_box.item label="Falda" name="Skirt"/> + <combo_box.item label="Prim sculpted" name="SculptedPrim"/> </combo_box> <text name="bad_image_text"> Imposible leer la imagen. diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml new file mode 100644 index 0000000000..2b5fc7f193 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="incoming call" title="ESTà LLAMANDO ALGUIEN DESCONOCIDO"> + <floater.string name="lifetime"> + 5 + </floater.string> + <floater.string name="localchat"> + Chat de voz + </floater.string> + <floater.string name="anonymous"> + anónimo + </floater.string> + <floater.string name="VoiceInviteP2P"> + está llamando. + </floater.string> + <floater.string name="VoiceInviteAdHoc"> + ha entrado en un chat de voz en multiconferencia. + </floater.string> + <floater.string name="VoiceInviteGroup"> + ha hecho una llamada de voz al grupo [GROUP]. + </floater.string> + <text name="question"> + ¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz? + </text> + <button label="Aceptar" label_selected="Aceptar" name="Accept"/> + <button label="Expulsar" label_selected="Expulsar" name="Reject"/> + <button label="Comenzar un MI" name="Start IM"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml index 3c8b38648f..d95653ddd0 100644 --- a/indra/newview/skins/default/xui/es/floater_inspect.xml +++ b/indra/newview/skins/default/xui/es/floater_inspect.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="inspect" title="EXAMINAR OBJETOS" min_width="450"> +<floater min_width="450" name="inspect" title="EXAMINAR LOS OBJETOS"> + <floater.string name="timeStamp"> + [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + </floater.string> <scroll_list name="object_list" tool_tip="Seleccione un objeto de esta lista para realzarlo en el mundo"> - <column label="Nombre del objeto" name="object_name"/> - <column label="Propietario" name="owner_name"/> - <column label="Creador" name="creator_name"/> - <column label="Fecha de creación" name="creation_date"/> + <scroll_list.columns label="Nombre del objeto" name="object_name"/> + <scroll_list.columns label="Propietario" name="owner_name"/> + <scroll_list.columns label="Creador" name="creator_name"/> + <scroll_list.columns label="Fecha de creación" name="creation_date"/> </scroll_list> - <button width="185" label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado"/> - <button width="165" left="205" label="Ver el perfil del creador..." label_selected="" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado"/> + <button label="Ver el perfil del propietario..." label_selected="" name="button owner" tool_tip="Ver el perfil del propietario del objeto realzado" width="185"/> + <button label="Ver el perfil del creador..." label_selected="" left="205" name="button creator" tool_tip="Ver el perfil del creador original del objeto realzado" width="165"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml index 8d16d6089e..0f0ba2fce6 100644 --- a/indra/newview/skins/default/xui/es/floater_inventory.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory.xml @@ -1,47 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="INVENTARIO"> - <search_editor label="Escriba aquà para buscar" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Todos los Ãtems" name="All Items"/> - <inventory_panel label="Ãtems recientes" name="Recent Items"/> - </tab_container> - <menu_bar name="Inventory Menu"> - <menu label="Archivo" name="File"> - <menu_item_call label="Abrir" name="Open"/> - <menu_item_call label="Nueva ventana" name="New Window"/> - <menu_item_call label="Ver los filtros" name="Show Filters"/> - <menu_item_call label="Restablecer los filtros" name="Reset Current"/> - <menu_item_call label="Cerrar todas las carpetas" name="Close All Folders"/> - <menu_item_call label="Vaciar la papelera" name="Empty Trash"/> - </menu> - <menu label="Crear" name="Create"> - <menu_item_call label="Carpeta nueva" name="New Folder"/> - <menu_item_call label="Script nuevo" name="New Script"/> - <menu_item_call label="Nota nueva" name="New Note"/> - <menu_item_call label="Gesto nuevo" name="New Gesture"/> - <menu name="New Clothes"> - <menu_item_call label="Falda nueva" name="New Shirt"/> - <menu_item_call label="Pantalones nuevos" name="New Pants"/> - <menu_item_call label="Zapatos nuevos" name="New Shoes"/> - <menu_item_call label="Calcetines nuevos" name="New Socks"/> - <menu_item_call label="Chaqueta nueva" name="New Jacket"/> - <menu_item_call label="Falda nueva" name="New Skirt"/> - <menu_item_call label="Guantes nuevos" name="New Gloves"/> - <menu_item_call label="Camiseta nueva" name="New Undershirt"/> - <menu_item_call label="Ropa interior nueva" name="New Underpants"/> - </menu> - <menu name="New Body Parts"> - <menu_item_call label="Forma nueva" name="New Shape"/> - <menu_item_call label="Piel nueva" name="New Skin"/> - <menu_item_call label="Pelo nuevo" name="New Hair"/> - <menu_item_call label="Ojos nuevos" name="New Eyes"/> - </menu> - </menu> - <menu label="Ordenar" name="Sort"> - <menu_item_check label="Por el nombre" name="By Name"/> - <menu_item_check label="Por la fecha" name="By Date"/> - <menu_item_check label="Las carpetas, siempre por la fecha" name="Folders Always By Name"/> - <menu_item_check label="Las carpetas del sistema, arriba" name="System Folders To Top"/> - </menu> - </menu_bar> +<floater name="Inventory" title="MI INVENTARIO"> + <floater.string name="Title"> + MI INVENTARIO + </floater.string> + <floater.string name="TitleFetching"> + MI INVENTARIO (obteniendo [ITEM_COUNT] Ãtems...) [FILTER] + </floater.string> + <floater.string name="TitleCompleted"> + MI INVENTARIO ([ITEM_COUNT] Ãtems) [FILTER] + </floater.string> + <floater.string name="Fetched"> + Obtenido + </floater.string> + <panel label="Panel del inventario" name="Inventory Panel"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml index 7abdfceb94..5746688962 100644 --- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="item properties" title="PROPIEDADES DEL ÃTEM DEL INVENTARIO"> + <floater.string name="unknown"> + (desconocido) + </floater.string> + <floater.string name="public"> + (público) + </floater.string> + <floater.string name="you_can"> + Usted puede: + </floater.string> + <floater.string name="owner_can"> + El propietario puede: + </floater.string> + <floater.string name="acquiredDate"> + [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + </floater.string> <text name="LabelItemNameTitle"> Nombre: </text> @@ -27,55 +42,32 @@ May Mié 24 12:50:46 2006 </text> <text name="OwnerLabel"> - Usted puede: - </text> - <check_box label="Modificarlo" name="CheckOwnerModify"/> - <check_box left_delta="88" label="Copiarlo" name="CheckOwnerCopy"/> - <check_box label="Venderlo/darlo" name="CheckOwnerTransfer"/> - <text name="BaseMaskDebug"> - B: - </text> - <text name="OwnerMaskDebug"> - O: + Tú: </text> - <text name="GroupMaskDebug"> - G: + <check_box label="Editar" name="CheckOwnerModify"/> + <check_box label="Copiarlo" left_delta="88" name="CheckOwnerCopy"/> + <check_box label="Revender" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Cualquiera: </text> - <text name="EveryoneMaskDebug"> - E: + <check_box label="Copiar" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Grupo: </text> - <text name="NextMaskDebug"> - N: - </text> - <check_box label="Compartir con el grupo" name="CheckShareWithGroup"/> - <check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/> + <check_box label="Compartir" name="CheckShareWithGroup"/> <text name="NextOwnerLabel" width="230"> - El próximo propietario puede: - </text> - <check_box label="Modificarlo" name="CheckNextOwnerModify"/> - <check_box left_delta="88" label="Copiarlo" name="CheckNextOwnerCopy"/> - <check_box label="Revenderlo/darlo" name="CheckNextOwnerTransfer"/> - <text name="SaleLabel"> - Marcar Ãtem como: + Próximo propietario: </text> + <check_box label="Editar" name="CheckNextOwnerModify"/> + <check_box label="Copiarlo" left_delta="88" name="CheckNextOwnerCopy"/> + <check_box label="Revender" name="CheckNextOwnerTransfer"/> <check_box label="En venta" name="CheckPurchase"/> - <radio_group name="RadioSaleType" left_delta="88" > - <radio_item name="radio" label="Original" /> - <radio_item name="radio2" label="Copia" /> - </radio_group> - <text name="TextPrice"> - Precio: L$ + <combo_box name="combobox sale copy"> + <combo_box.item label="Copia" name="Copy"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Precio:" name="Edit Cost"/> + <text name="CurrencySymbol"> + L$ </text> - <string name="unknown"> - (desconocido) - </string> - <string name="public"> - (público) - </string> - <string name="you_can"> - Usted puede: - </string> - <string name="owner_can"> - El propietario puede: - </string> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml index 75c53dd646..283a46b60b 100644 --- a/indra/newview/skins/default/xui/es/floater_joystick.xml +++ b/indra/newview/skins/default/xui/es/floater_joystick.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Joystick" title="CONFIGURACIÓN DEL JOYSTICK"> - <check_box name="enable_joystick" label="Activar el joystick:"/> + <check_box label="Activar el joystick:" name="enable_joystick"/> <text left="140" name="joystick_type" width="360"/> - <spinner label="Mapping: eje X" name="JoystickAxis1" label_width="118" width="161"/> - <spinner label="Mapping: eje Y" name="JoystickAxis2" label_width="105" width="148"/> - <spinner label="Mapping: eje Z" name="JoystickAxis0" label_width="95" width="138"/> - <spinner label="Mapping: arriba/abajo" name="JoystickAxis4" label_width="118" width="161"/> - <spinner label="Mapping: izq./der." name="JoystickAxis5" label_width="105" width="148"/> - <spinner label="Mapping: giro" name="JoystickAxis3" label_width="95" width="138"/> - <spinner label="Mapping: zoom" name="JoystickAxis6" label_width="118" width="161"/> + <spinner label="Mapping: eje X" label_width="118" name="JoystickAxis1" width="161"/> + <spinner label="Mapping: eje Y" label_width="105" name="JoystickAxis2" width="148"/> + <spinner label="Mapping: eje Z" label_width="95" name="JoystickAxis0" width="138"/> + <spinner label="Mapping: arriba/abajo" label_width="118" name="JoystickAxis4" width="161"/> + <spinner label="Mapping: izq./der." label_width="105" name="JoystickAxis5" width="148"/> + <spinner label="Mapping: giro" label_width="95" name="JoystickAxis3" width="138"/> + <spinner label="Mapping: zoom" label_width="118" name="JoystickAxis6" width="161"/> <check_box label="Zoom directo" name="ZoomDirect"/> <check_box label="Cursor 3D" name="Cursor3D"/> <check_box label="Nivel automático" name="AutoLeveling"/> <text name="Control Modes:"> Modos de control: </text> - <check_box name="JoystickAvatarEnabled" label="Avatar"/> - <check_box name="JoystickBuildEnabled" left="192" label="Construir"/> - <check_box name="JoystickFlycamEnabled" label="Flycam"/> + <check_box label="Avatar" name="JoystickAvatarEnabled"/> + <check_box label="Construir" left="192" name="JoystickBuildEnabled"/> + <check_box label="Flycam" name="JoystickFlycamEnabled"/> <text name="XScale"> Escala: X </text> @@ -27,7 +27,7 @@ <text name="ZScale"> Escala: Z </text> - <text name="PitchScale" left="3" width="115"> + <text left="3" name="PitchScale" width="115"> Escala: arriba/abajo </text> <text name="YawScale"> @@ -45,10 +45,10 @@ <text name="ZDeadZone"> Zona muerta Z </text> - <text name="PitchDeadZone" left="3" width="115"> + <text left="3" name="PitchDeadZone" width="115"> Zona muerta arri./aba. </text> - <text name="YawDeadZone" left="3" width="115"> + <text left="3" name="YawDeadZone" width="115"> Zona muerta izq./der. </text> <text name="RollDeadZone"> @@ -63,9 +63,9 @@ <text name="ZoomDeadZone"> Zona muerta zoom </text> - <button label="Predeterminados del SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall" left="330" width="210"/> - <button label="OK" label_selected="OK" name="ok_btn" left="330"/> - <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" left_delta="120"/> + <button font="SansSerifSmall" label="Predeterminados del SpaceNavigator" left="330" name="SpaceNavigatorDefaults" width="210"/> + <button label="OK" label_selected="OK" left="330" name="ok_btn"/> + <button label="Cancelar" label_selected="Cancelar" left_delta="120" name="cancel_btn"/> <stat_view label="Monitor del joystick" name="axis_view"> <stat_bar label="Eje 0" name="axis0"/> <stat_bar label="Eje 1" name="axis1"/> diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml index 54c4ce8c6a..227689a194 100644 --- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml @@ -1,155 +1,154 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_lagmeter" title="MEDIDOR DEL LAG"> - <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado del lag del cliente"/> - <text name="client"> - Cliente: - </text> - <text name="client_text" font="SansSerifSmall"> - Normal - </text> - <text left="30" name="client_lag_cause" right="-10" /> - <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/> - <text name="network"> - Red: - </text> - <text name="network_text" font="SansSerifSmall"> - Normal - </text> - <text left="30" name="network_lag_cause" right="-10" /> - <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/> - <text name="server"> - Servidor: - </text> - <text name="server_text" font="SansSerifSmall"> - Normal - </text> - <text left="30" name="server_lag_cause" right="-32" /> - <button label="?" name="server_help"/> - <button label=">>" name="minimize"/> - <string name="max_title_msg"> + <floater.string name="max_title_msg"> Medidor del lag - </string> - <string name="max_width_px"> + </floater.string> + <floater.string name="max_width_px"> 360 - </string> - <string name="min_title_msg"> + </floater.string> + <floater.string name="min_title_msg"> Lag - </string> - <string name="min_width_px"> + </floater.string> + <floater.string name="min_width_px"> 90 - </string> - <string name="client_text_msg"> + </floater.string> + <floater.string name="client_text_msg"> Cliente - </string> - <string name="client_frame_rate_critical_fps"> + </floater.string> + <floater.string name="client_frame_rate_critical_fps"> 10 - </string> - <string name="client_frame_rate_warning_fps"> + </floater.string> + <floater.string name="client_frame_rate_warning_fps"> 15 - </string> - <string name="client_frame_time_window_bg_msg"> + </floater.string> + <floater.string name="client_frame_time_window_bg_msg"> Normal, ventana en segundo plano - </string> - <string name="client_frame_time_critical_msg"> + </floater.string> + <floater.string name="client_frame_time_critical_msg"> Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL] - </string> - <string name="client_frame_time_warning_msg"> + </floater.string> + <floater.string name="client_frame_time_warning_msg"> Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] y [CLIENT_FRAME_RATE_WARNING] - </string> - <string name="client_frame_time_normal_msg"> + </floater.string> + <floater.string name="client_frame_time_normal_msg"> Normal - </string> - <string name="client_draw_distance_cause_msg"> + </floater.string> + <floater.string name="client_draw_distance_cause_msg"> Posible causa: distancia de dibujo fijada muy alta - </string> - <string name="client_texture_loading_cause_msg"> + </floater.string> + <floater.string name="client_texture_loading_cause_msg"> Posible causa: imágenes cargándose - </string> - <string name="client_texture_memory_cause_msg"> + </floater.string> + <floater.string name="client_texture_memory_cause_msg"> Posible causa: demasiadas imágenes en la memoria - </string> - <string name="client_complex_objects_cause_msg"> + </floater.string> + <floater.string name="client_complex_objects_cause_msg"> Posible causa: demasiados objetos complejos en la escena - </string> - <string name="network_text_msg"> + </floater.string> + <floater.string name="network_text_msg"> Red - </string> - <string name="network_packet_loss_critical_pct"> + </floater.string> + <floater.string name="network_packet_loss_critical_pct"> 10 - </string> - <string name="network_packet_loss_warning_pct"> + </floater.string> + <floater.string name="network_packet_loss_warning_pct"> 5 - </string> - <string name="network_packet_loss_critical_msg"> + </floater.string> + <floater.string name="network_packet_loss_critical_msg"> La conexión deja caer más del [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes - </string> - <string name="network_packet_loss_warning_msg"> + </floater.string> + <floater.string name="network_packet_loss_warning_msg"> La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes - </string> - <string name="network_performance_normal_msg"> + </floater.string> + <floater.string name="network_performance_normal_msg"> Normal - </string> - <string name="network_ping_critical_ms"> + </floater.string> + <floater.string name="network_ping_critical_ms"> 600 - </string> - <string name="network_ping_warning_ms"> + </floater.string> + <floater.string name="network_ping_warning_ms"> 300 - </string> - <string name="network_ping_critical_msg"> + </floater.string> + <floater.string name="network_ping_critical_msg"> El tiempo de conexión -ping- supera los [NETWORK_PING_CRITICAL] ms - </string> - <string name="network_ping_warning_msg"> + </floater.string> + <floater.string name="network_ping_warning_msg"> El tiempo de conexión -ping- es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms - </string> - <string name="network_packet_loss_cause_msg"> + </floater.string> + <floater.string name="network_packet_loss_cause_msg"> Quizá una mala conexión o un ancho de banda fijado demasiado alto. - </string> - <string name="network_ping_cause_msg"> + </floater.string> + <floater.string name="network_ping_cause_msg"> Quizá una mala conexión o una aplicación de archivos compartidos. - </string> - <string name="server_text_msg"> + </floater.string> + <floater.string name="server_text_msg"> Servidor - </string> - <string name="server_frame_rate_critical_fps"> + </floater.string> + <floater.string name="server_frame_rate_critical_fps"> 20 - </string> - <string name="server_frame_rate_warning_fps"> + </floater.string> + <floater.string name="server_frame_rate_warning_fps"> 30 - </string> - <string name="server_single_process_max_time_ms"> + </floater.string> + <floater.string name="server_single_process_max_time_ms"> 20 - </string> - <string name="server_frame_time_critical_msg"> + </floater.string> + <floater.string name="server_frame_time_critical_msg"> Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL] - </string> - <string name="server_frame_time_warning_msg"> + </floater.string> + <floater.string name="server_frame_time_warning_msg"> Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING] - </string> - <string name="server_frame_time_normal_msg"> + </floater.string> + <floater.string name="server_frame_time_normal_msg"> Normal - </string> - <string name="server_physics_cause_msg"> + </floater.string> + <floater.string name="server_physics_cause_msg"> Posible causa: demasiados objetos fÃsicos - </string> - <string name="server_scripts_cause_msg"> + </floater.string> + <floater.string name="server_scripts_cause_msg"> Posible causa: demasiados objetos con script - </string> - <string name="server_net_cause_msg"> + </floater.string> + <floater.string name="server_net_cause_msg"> Posible causa: demasiado tráfico en la red - </string> - <string name="server_agent_cause_msg"> + </floater.string> + <floater.string name="server_agent_cause_msg"> Posible causa: demasiada gente moviéndose en la región - </string> - <string name="server_images_cause_msg"> + </floater.string> + <floater.string name="server_images_cause_msg"> Posible causa: demasiados cálculos de imáganes - </string> - <string name="server_generic_cause_msg"> + </floater.string> + <floater.string name="server_generic_cause_msg"> Posible causa: carga del simulador muy pesada - </string> - <string name="smaller_label"> + </floater.string> + <floater.string name="smaller_label"> >> - </string> - <string name="bigger_label"> + </floater.string> + <floater.string name="bigger_label"> << - </string> + </floater.string> + <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado del lag del cliente"/> + <text name="client"> + Cliente + </text> + <text font="SansSerifSmall" name="client_text"> + Normal + </text> + <text left="30" name="client_lag_cause" right="-10"/> + <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/> + <text name="network"> + Red + </text> + <text font="SansSerifSmall" name="network_text"> + Normal + </text> + <text left="30" name="network_lag_cause" right="-10"/> + <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/> + <text name="server"> + Servidor + </text> + <text font="SansSerifSmall" name="server_text"> + Normal + </text> + <text left="30" name="server_lag_cause" right="-32"/> + <button label=">>" name="minimize" tool_tip="Cambia el tamaño de la ventana"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml index bcdebf4588..36a02b7300 100644 --- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="land holdings floater" title="MI TERRENO"> <scroll_list name="parcel list"> - <column label="Nombre de la parcela" name="name"/> + <column label="Parcela" name="name"/> <column label="Región" name="location"/> <column label="Tipo" name="type"/> <column label="Superficie" name="area"/> <column label="" name="hidden"/> </scroll_list> <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno."/> - <button width="130" label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/> + <button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo" width="130"/> <text name="contrib_label"> Contribuciones a sus grupos: </text> diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml index 02be809319..4ff54bccb5 100644 --- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script ed float" title="SCRIPT: SCRIPT NUEVO"> - <button label="Reiniciar" label_selected="Reiniciar" name="Reset"/> - <check_box label="Ejecutándose" name="running" left="4"/> - <check_box label="Mono" name="mono" left="106"/> - <string name="not_allowed"> - No está autorizado para ver este script. - </string> - <string name="script_running"> + <floater.string name="not_allowed"> + No puedes ver ni editar este script. Ha sido configurado como "no copiable". Necesitas todos los permisos para ver o editar un script que está dentro de un objeto. + </floater.string> + <floater.string name="script_running"> Ejecutándose - </string> + </floater.string> + <floater.string name="Title"> + SCRIPT: [NAME] + </floater.string> + <button label="Reiniciar" label_selected="Reiniciar" name="Reset"/> + <check_box initial_value="true" label="Ejecutándose" left="4" name="running"/> + <check_box initial_value="true" label="Mono" left="106" name="mono"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml index 0cde2fe5bc..43a7ede030 100644 --- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="script ed float" title="WIKI DE LSL"> +<floater name="script ed float" title="GUÃA DE LSL"> <check_box label="Seguir al cursor" name="lock_check"/> - <combo_box label="Bloquear" name="history_combo" left_delta="120" width="70"/> - <button label="Atrás" name="back_btn" left_delta="75"/> + <combo_box label="Bloquear" left_delta="120" name="history_combo" width="70"/> + <button label="Atrás" left_delta="75" name="back_btn"/> <button label="Adelante" name="fwd_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index eee9caf830..fde4d37caf 100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Minimapa"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml index cdc7ae49ff..9c4ef1eb2f 100644 --- a/indra/newview/skins/default/xui/es/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml @@ -9,13 +9,13 @@ <layout_stack name="stack1"> <layout_panel name="nav_controls"> <button label="Atrás" name="back" width="75"/> - <button label="Adelante" name="forward" left_delta="75" width="70"/> - <button label="Actualizar" name="reload" left_delta="75"/> + <button label="Adelante" left_delta="75" name="forward" width="70"/> + <button label="Actualizar" left_delta="75" name="reload"/> <combo_box left_delta="75" name="address" width="510"/> - <button label="Ir" name="go" left_delta="515"/> + <button label="Ir" left_delta="515" name="go"/> </layout_panel> <layout_panel name="parcel_owner_controls"> - <button label="Enviar a la parcela la URL actual" name="assign"/> + <button label="Enviar a la parcela la página actual" name="assign"/> </layout_panel> <layout_panel name="external_controls"> <button label="Abrir en mi navegador" name="open_browser"/> diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml new file mode 100644 index 0000000000..3f7cef5785 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_media_settings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="media_settings" title="CONFIGURACIÓN DE LOS MEDIA"> + <button label="OK" label_selected="OK" name="OK"/> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <button label="Aplicar" label_selected="Aplicar" name="Apply"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml index 6d5e987409..da8ba780bc 100644 --- a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="MemLeak" title="PRUEBA DE LA FUGA DE MEMORIA"> +<floater name="MemLeak" title="SIMULAR UNA PÉRDIDA DE MEMORIA"> <spinner label="Velocidad de la fuga (bites por fotograma):" name="leak_speed"/> <spinner label="Fuga de memoria máx. (MB):" name="max_leak"/> <text name="total_leaked_label"> diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml index a61cebbf80..1269943879 100644 --- a/indra/newview/skins/default/xui/es/floater_moveview.xml +++ b/indra/newview/skins/default/xui/es/floater_moveview.xml @@ -1,13 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="move_floater"> -<panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izquierda"/> - <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la derecha"/> - <button label="" label_selected="" name="move up btn" tool_tip="Saltar o ascender"/> - <button label="" label_selected="" name="move down btn" tool_tip="Agacharse o descender"/> - <joystick_slide name="slide left btn" tool_tip="Ir hacia la izquierda"/> - <joystick_slide name="slide right btn" tool_tip="Ir hacia la derecha"/> - <joystick_turn name="forward btn" tool_tip="Ir hacia adelante"/> - <joystick_turn name="backward btn" tool_tip="Ir hacia atrás"/> -</panel> + <string name="walk_forward_tooltip"> + Caminar hacia adelante (cursor arriba o W) + </string> + <string name="walk_back_tooltip"> + Caminar de espaldas (cursor abajo o S) + </string> + <string name="run_forward_tooltip"> + Correr hacia adelante (cursor arriba o W) + </string> + <string name="run_back_tooltip"> + Correr de espaldas (cursor abajo o S) + </string> + <string name="fly_forward_tooltip"> + Volar hacia adelante (cursor arriba o W) + </string> + <string name="fly_back_tooltip"> + Volar hacia atrás (cursor abajo o S) + </string> + <panel name="panel_actions"> + <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izq. (cursor izq. o A)"/> + <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la der. (cursor der. o D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Volar: pulsa E para subir"/> + <button label="" label_selected="" name="move down btn" tool_tip="Volar: pulsa C para descender"/> + <joystick_turn name="forward btn" tool_tip="Caminar hacia adelante (cursor arriba o W)"/> + <joystick_turn name="backward btn" tool_tip="Caminar de espaldas (cursor abajo o S)"/> + </panel> + <panel name="panel_modes"> + <button label="" name="mode_walk_btn" tool_tip="Modo de caminar"/> + <button label="" name="mode_run_btn" tool_tip="Modo de correr"/> + <button label="" name="mode_fly_btn" tool_tip="Modo de volar"/> + <button label="Dejar de volar" name="stop_fly_btn" tool_tip="Dejar de volar"/> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml index 390333cd1d..4cd16a59ed 100644 --- a/indra/newview/skins/default/xui/es/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="mute by name" title="IGNORAR UN OBJETO SEGÚN SU NOMBRE"> - <text name="message" bottom_delta="-40"> - Ignorar según el nombre sólo afecta al chat y los MI del -objeto, no a sus sonidos. -Debe escribir exactamente el nombre del objeto. +<floater name="mute by name" title="IGNORAR OBJETOS SEGÚN SU NOMBRE"> + <text bottom_delta="-40" name="message"> + Ignorar un objeto: </text> - <line_editor name="object_name" bottom_delta="-58"> + <line_editor bottom_delta="-58" name="object_name"> Nombre del objeto </line_editor> + <text name="note"> + * Sólo se ignoran los textos del objeto, no sus sonidos + </text> <button label="OK" name="OK"/> <button label="Cancelar" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml new file mode 100644 index 0000000000..d30a39f725 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="nearby_chat" title="CHAT"/> diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml index 89c79e8833..b8b688df60 100644 --- a/indra/newview/skins/default/xui/es/floater_openobject.xml +++ b/indra/newview/skins/default/xui/es/floater_openobject.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="objectcontents" title="CONTENIDO DEL OBJETO"> +<floater name="objectcontents" title="CONTENIDOS DEL OBJETO"> <text name="object_name"> [DESC]: </text> diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml new file mode 100644 index 0000000000..9f9902a3a0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="modal container" title="Guardar el vestuario"> + <button label="Guardar" label_selected="Guardar" name="Save"/> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <text name="Save item as:"> + Guardar lo que llevo puesto +como un vestuario nuevo: + </text> + <line_editor name="name ed"> + [DESC] (nuevo) + </line_editor> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml new file mode 100644 index 0000000000..e2a53693b5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="outgoing call" title="LLAMANDO"> + <floater.string name="lifetime"> + 5 + </floater.string> + <floater.string name="localchat"> + Chat de voz + </floater.string> + <floater.string name="anonymous"> + anónimo + </floater.string> + <floater.string name="VoiceInviteP2P"> + está llamando. + </floater.string> + <floater.string name="VoiceInviteAdHoc"> + ha entrado en un chat de voz en multiconferencia. + </floater.string> + <text name="connecting"> + Conectando con [CALLEE_NAME] + </text> + <text name="calling"> + Llamando a [CALLEE_NAME] + </text> + <text name="noanswer"> + Sin respuesta. Vuelve a intentarlo más tarde. + </text> + <text name="nearby"> + Has sido desconectado de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] ha colgado la llamada. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Has finalizado la llamada. [RECONNECT_NEARBY] + </text> + <text name="leaving"> + Saliendo de [CURRENT_CHAT]. + </text> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml index 64156d94e3..d4a4e81310 100644 --- a/indra/newview/skins/default/xui/es/floater_pay.xml +++ b/indra/newview/skins/default/xui/es/floater_pay.xml @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> + <string name="payee_group"> + Pagar al grupo + </string> + <string name="payee_resident"> + Pagar al residente + </string> + <text left="5" name="payee_label" width="105"> + Pagar: + </text> + <icon name="icon_person" tool_tip="Persona"/> + <text left="115" name="payee_name"> + [FIRST] [LAST] + </text> <button label="1 L$" label_selected="1 L$" name="fastpay 1"/> <button label="5 L$" label_selected="5 L$" name="fastpay 5"/> <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> - <button label="Pagar" label_selected="Pagar" name="pay btn"/> - <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/> - <text name="payee_label" left="5" width="105"> - Pagar al residente: - </text> - <text name="payee_name" left="115"> - [FIRST] [LAST] - </text> - <text name="fastpay text" width="100" halign="left"> - Pago rápido: - </text> - <text name="amount text" left="4" > - Cantidad: + <text left="4" name="amount text"> + O elige cuánto: </text> <line_editor left="60" name="amount" width="55"/> + <button label="Pagar" label_selected="Pagar" name="pay btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml index b5eca53bfa..f29745ea9b 100644 --- a/indra/newview/skins/default/xui/es/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml @@ -1,30 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> - <text name="payee_group" left="5" width="110"> - Pagar al grupo: - </text> - <text name="payee_resident" left="5" width="110"> - Pagar al residente: - </text> - <text name="payee_name" left="120" width="180"> + <string left="5" name="payee_group" width="110"> + Pagar al grupo + </string> + <string left="5" name="payee_resident" width="110"> + Pagar al residente + </string> + <icon name="icon_person" tool_tip="Persona"/> + <text left="120" name="payee_name" width="180"> [FIRST] [LAST] </text> - <text name="object_name_label" left="5" width="110"> + <text left="5" name="object_name_label" width="110"> A través del objeto: </text> - <text name="object_name_text" left="120" width="180"> - ... - </text> - <text name="fastpay text"> - Pago rápido: - </text> - <text name="amount text"> - Cantidad: + <icon name="icon_object" tool_tip="Objetos"/> + <text left="120" name="object_name_text" width="180"> + El muy largo nombre de mi objeto </text> <button label="1 L$" label_selected="1 L$" name="fastpay 1"/> <button label="5 L$" label_selected="5 L$" name="fastpay 5"/> <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> + <text name="amount text"> + O elige cuánto: + </text> <button label="Pagar" label_selected="Pagar" name="pay btn"/> <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml index 7d3c8e62f3..93e2088aba 100644 --- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="perm prefs" title="PERMISOS DE SUBIDA POR DEFECTO"> +<floater name="perm prefs" title="PERMISOS POR DEFECTO DE SUBIDA"> <panel label="Permisos" name="permissions"> <button label="?" label_selected="?" name="help"/> <check_box label="Compartir con el grupo" name="share_with_group"/> diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml index ace3204cc7..df94486c0e 100644 --- a/indra/newview/skins/default/xui/es/floater_postcard.xml +++ b/indra/newview/skins/default/xui/es/floater_postcard.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Postcard" title="FOTO POR CORREO ELECTRÓNICO"> +<floater name="Postcard" title="FOTO POR CORREO"> <text name="to_label"> Correo electrónico del destinatario: </text> - <line_editor bottom_delta="-20" name="to_form" /> - <text name="from_label" bottom_delta="-12"> + <line_editor bottom_delta="-20" name="to_form"/> + <text bottom_delta="-12" name="from_label"> Su correo electrónico: </text> - <line_editor bottom_delta="-20" name="from_form" /> + <line_editor bottom_delta="-20" name="from_form"/> <text name="name_label"> Su nombre: </text> @@ -17,20 +17,20 @@ Asunto: </text> <line_editor label="Escriba aquà el asunto." name="subject_form"/> - <text name="msg_label" bottom_delta="-18"> + <text bottom_delta="-18" name="msg_label"> Mensaje: </text> <text_editor name="msg_form"> Escriba aquà el mensaje. </text_editor> - <text name="fine_print" bottom_delta="-21"> + <text bottom_delta="-21" name="fine_print"> Si su destinatario se registra en [SECOND_LIFE], usted conseguirá un bono de referido. </text> <button label="Cancelar" name="cancel_btn"/> <button label="Enviar" name="send_btn"/> <string name="default_subject"> - Postal desde [SECOND_LIFE] + Postal desde [SECOND_LIFE]. </string> <string name="default_message"> ¡Mira esto! diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml index 5fe4ae3b64..37d56ea839 100644 --- a/indra/newview/skins/default/xui/es/floater_preferences.xml +++ b/indra/newview/skins/default/xui/es/floater_preferences.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Preferences" title="PREFERENCIAS" min_width="350" width="646"> +<floater min_width="350" name="Preferences" title="PREFERENCIAS" width="646"> <button label="OK" label_selected="OK" name="OK"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <button label="Aplicar" label_selected="Aplicar" name="Apply"/> - <button label="Acerca de..." label_selected="Acerca de..." name="About..." /> - <button label="Ayuda" label_selected="Ayuda" name="Help"/> - <tab_container name="pref core" tab_width="146" width="646" /> + <tab_container name="pref core" tab_width="146" width="646"> + <panel label="General" name="general"/> + <panel label="Gráficos" name="display"/> + <panel label="Privacidad" name="im"/> + <panel label="Sonido y Media" name="audio"/> + <panel label="Chat" name="chat"/> + <panel label="Notificaciones" name="msgs"/> + <panel label="Configurar" name="input"/> + <panel label="Avanzado" name="advanced1"/> + </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml index 0d9cf8ec9f..6b8c8b6ff5 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_anim"> + <floater.string name="Title"> + Animación: [NAME] + </floater.string> <text name="desc txt"> Descripción: </text> - <button left="12" width="142" label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/> - <button left="156" width="136" label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/> + <button label="Ver en el mundo" label_selected="Parar" left="12" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás" width="142"/> + <button label="Ejecutarla para usted" label_selected="Parar" left="156" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea yo" width="136"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_classified.xml b/indra/newview/skins/default/xui/es/floater_preview_classified.xml index 8114c7f3c2..d9c9c51ba8 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_classified.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_classified.xml @@ -1,2 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="classified_preview" title="INFORMACIÓN CLASIFICADA"/> +<floater name="classified_preview" title="INFORMACIÓN DEL CLASIFICADO"> + <floater.string name="Title"> + Clasificado: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_event.xml b/indra/newview/skins/default/xui/es/floater_preview_event.xml index 04cb0de4d4..7edd4f9e3f 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_event.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_event.xml @@ -1,2 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="event_preview" title="INFORMACIÓN DE EVENTOS"/> +<floater name="event_preview" title="INFORMACIÓN DEL EVENTO"> + <floater.string name="Title"> + Evento: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml index 0e43ce536c..44179d6b28 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="gesture_preview"> - <string name="stop_txt"> + <floater.string name="step_anim"> + Animación a ejecutar: + </floater.string> + <floater.string name="step_sound"> + Sonido a ejecutar: + </floater.string> + <floater.string name="step_chat"> + Decir en el chat: + </floater.string> + <floater.string name="step_wait"> + Espera: + </floater.string> + <floater.string name="stop_txt"> Parar - </string> - <string name="preview_txt"> + </floater.string> + <floater.string name="preview_txt"> Vista previa - </string> - <string name="none_text"> + </floater.string> + <floater.string name="none_text"> -- Ninguno -- - </string> + </floater.string> + <floater.string name="Title"> + Gesto: [NAME] + </floater.string> + <text name="name_text"> + Nombre: + </text> <text name="desc_label"> Descripción: </text> @@ -22,37 +40,31 @@ <text name="key_label"> Atajo de teclado: </text> - <combo_box label="Ninguno" name="modifier_combo" left="116" width="76"/> - <combo_box label="Ninguno" name="key_combo" width="76" left_delta="80"/> + <combo_box label="Ninguno" left="116" name="modifier_combo" width="76"/> + <combo_box label="Ninguno" left_delta="80" name="key_combo" width="76"/> <text name="library_label"> Biblioteca: </text> + <scroll_list name="library_list"/> + <button label="Añadir >>" name="add_btn"/> <text name="steps_label"> Pasos: </text> - <scroll_list name="library_list"> - Animación -Sonido -Chat -Esperar - </scroll_list> - <button label="Añadir >>" name="add_btn"/> - <button label="Hacia arriba" name="up_btn"/> - <button label="Hacia abajo" name="down_btn"/> + <button label="Arriba" name="up_btn"/> + <button label="Abajo" name="down_btn"/> <button label="Quitar" name="delete_btn"/> - <text name="help_label"> - Todos los pasos suceden a la vez, -a menos que añada pasos de espera. - </text> - <text left="230" name="options_text" width="200" /> + <text left="230" name="options_text" width="200"/> <radio_group name="animation_trigger_type"> - <radio_item name="start" label="Empezar" /> - <radio_item name="stop" label="Parar" /> + <radio_item label="Empezar" name="start"/> + <radio_item label="Parar" name="stop"/> </radio_group> - <check_box bottom_delta="34" label="hasta que las animaciones estén hechas" name="wait_anim_check"/> + <check_box bottom_delta="34" label="hasta que las animaciones estén hechas" name="wait_anim_check"/> <check_box bottom_delta="-30" label="tiempo en segundos" name="wait_time_check"/> - <line_editor left_delta="130" name="wait_time_editor" /> - <check_box left="130" label="Disponible" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/> + <line_editor left_delta="130" name="wait_time_editor"/> + <text name="help_label"> + Todos los pasos suceden a la vez, a menos que añadas pasos de espera. + </text> + <check_box label="Disponible" left="130" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/> <button label="Vista previa" name="preview_btn" width="85"/> <button label="Guardar" name="save_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture_info.xml new file mode 100644 index 0000000000..f5b771c6e7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture_info.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATAJO DE TECLADO PARA GESTOS"/> diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture_shortcut.xml new file mode 100644 index 0000000000..ea955f9727 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture_shortcut.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATAJO DE TECLADO PARA GESTOS"> + <text name="trigger_label"> + Chat : + </text> + <text name="key_label"> + Teclado: + </text> + <combo_box label="Ninguno/a" name="modifier_combo"/> + <combo_box label="Ninguno/a" name="key_combo"/> + <text name="replace_text" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambias la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'QuerÃa decir hola' por 'QuerÃa decir qué tal' en cuanto realices el gesto."> + Reemplazar por: + </text> + <line_editor name="replace_editor" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambias la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'QuerÃa decir hola' por 'QuerÃa decir qué tal' en cuanto realices el gesto."/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture_steps.xml new file mode 100644 index 0000000000..f5b771c6e7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_preview_gesture_steps.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATAJO DE TECLADO PARA GESTOS"/> diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml index 35f795a7ec..57ec5eb7b4 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml @@ -1,16 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview notecard" title="NOTA:"> - <button label="Guardar" label_selected="Guardar" name="Save"/> + <floater.string name="no_object"> + No se ha podido encontrar el objeto que contiene esta nota. + </floater.string> + <floater.string name="not_allowed"> + No tienes permiso para ver esta nota. + </floater.string> + <floater.string name="Title"> + Nota: [NAME] + </floater.string> + <floater.string label="Guardar" label_selected="Guardar" name="Save"> + Guardar + </floater.string> <text name="desc txt"> Descripción: </text> <text_editor name="Notecard Editor"> Cargando... </text_editor> - <string name="no_object"> - No se ha podido encontrar el objeto que contiene esta nota. - </string> - <string name="not_allowed"> - No está autorizado a ver esta nota. - </string> + <button label="Guardar" label_selected="Guardar" name="Save"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml index 060a033b08..62525c9536 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_sound"> + <floater.string name="Title"> + Sonido : [NAME] + </floater.string> <text name="desc txt"> Descripción: </text> - <button label="Tocar en el mundo" label_selected="Tocar en el mundo" name="Sound play btn" tool_tip="Tocar este sonido para que puedan oÃrlo los demás."/> - <button label="OÃr sólo uno mismo" label_selected="OÃr sólo uno mismo" name="Sound audition btn" tool_tip="Tocar este sonido para que sólo pueda oÃrlo usted."/> + <button label="Escuchar en el mundo" label_selected="Escuchar en el mundo" name="Sound play btn" tool_tip="Ejecutar este sonido de modo que lo oigan todos"/> + <button label="OÃr sólo uno mismo" label_selected="OÃr sólo uno mismo" name="Sound audition btn" tool_tip="Ejecutar este sonido de modo que sólo tú lo oigas"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml index 280438fefd..4012191c78 100644 --- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml @@ -1,9 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_texture"> + <floater.string name="Title"> + Textura: [NAME] + </floater.string> + <floater.string name="Copy"> + Copiar al inventario + </floater.string> <text name="desc txt"> Descripción: </text> <text name="dimensions"> - Tamaño: [WIDTH] x [HEIGHT] + [WIDTH] px x [HEIGHT] px </text> + <text name="aspect_ratio"> + Previsualizar la ratio de las proporciones + </text> + <combo_box name="combo_aspect_ratio" tool_tip="Vista previa en una proporción concreta"> + <combo_item name="Unconstrained"> + Sin restricciones + </combo_item> + <combo_item name="1:1" tool_tip="Emblema del grupo o perfil del Mundo real"> + 1:1 + </combo_item> + <combo_item name="4:3" tool_tip="Perfil de [SECOND_LIFE]"> + 4:3 + </combo_item> + <combo_item name="10:7" tool_tip="Clasificados (también en las listas de búsqueda), hitos"> + 10:7 + </combo_item> + <combo_item name="3:2" tool_tip="Acerca del terreno"> + 3:2 + </combo_item> + <combo_item name="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" tool_tip="Destacados del perfil"> + 16:9 + </combo_item> + <combo_item name="2:1"> + 2:1 + </combo_item> + </combo_box> + <button label="OK" name="Keep"/> + <button label="Descartar" name="Discard"/> + <button label="Guardar como" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml index a075c51247..760429e73d 100644 --- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_report_abuse" title="DENUNCIA DE INFRACCIÓN"> - <texture_picker label="" name="screenshot"/> - <check_box label="Incluir una captura de pantalla" name="screen_check"/> + <floater.string name="Screenshot"> + Captura de pantalla + </floater.string> + <check_box label="Usar esta captura de pantalla" name="screen_check"/> <text name="reporter_title"> Denunciante: </text> <text name="reporter_field"> - Loremipsum Dolorsitamut + Loremipsum Dolorsitamut Longnamez </text> <text name="sim_title"> Región: @@ -21,11 +23,11 @@ {128.1, 128.1, 15.4} </text> <text name="select_object_label"> - Pulse el botón y luego el objeto: + Pulsa el botón y luego el objeto a denunciar: </text> <button label="" label_selected="" name="pick_btn" tool_tip="Señalar objeto - Identificar un objeto como sujeto de esta denuncia"/> <text name="object_name_label"> - Nombre: + Objeto: </text> <text name="object_name"> Consetetur Sadipscing @@ -34,54 +36,53 @@ Propietario: </text> <text name="owner_name"> - Hendrerit Vulputate + Hendrerit Vulputate Kamawashi Longname </text> <combo_box name="category_combo" tool_tip="CategorÃa -- Elija la categorÃa que describa mejor esta denuncia"> - <combo_box.item name="Select_category" label="Elegir la categorÃa"/> - <combo_box.item name="Age__Age_play" label="Edad > Jugar a ser niño"/> - <combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Edad > Residente adulto en Teen Second Life"/> - <combo_box.item name="Age__Underage_resident_outside_of_Teen_Second_Life" label="Edad > Residente menor de edad fuera de Teen Second Life"/> - <combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Ataque > Sandbox de combate / Zona no segura"/> - <combo_box.item name="Assault__Safe_area" label="Ataque > Zona segura"/> - <combo_box.item name="Assault__Weapons_testing_sandbox" label="Ataque > Sandbox de prueba de armas"/> - <combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Comercio > Error en la entrega de productos o servicios"/> - <combo_box.item name="Disclosure__Real_world_information" label="Indiscreción > Información del mundo real"/> - <combo_box.item name="Disclosure__Remotely_monitoring chat" label="Indiscreción > Monitorizar a distancia el chat"/> - <combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Indiscreción > Información Se Second Life, el chat o los MI"/> - <combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Perturbando la paz > Abuso de los recursos de la región"/> - <combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Perturbando la paz > Excesivos objetos con script"/> - <combo_box.item name="Disturbing_the_peace__Object_littering" label="Perturbando la paz > Objeto basura"/> - <combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Perturbando la paz > Spam (mensajes no pedidos) repetitivo"/> - <combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Perturbando la paz > Publicidad no deseada"/> - <combo_box.item name="Fraud__L$" label="Fraude > L$"/> - <combo_box.item name="Fraud__Land" label="Fraude > Terreno"/> - <combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude > Esquemas piramidales o cadenas de cartas"/> - <combo_box.item name="Fraud__US$" label="Fraude > US$"/> - <combo_box.item name="Harassment__Advert_farms___visual_spam" label="Acoso > Anuncios múltiples / Spam visual"/> - <combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Acoso > Difamación de individuos o grupos"/> - <combo_box.item name="Harassment__Impeding_movement" label="Acoso > Impedir el movimiento"/> - <combo_box.item name="Harassment__Sexual_harassment" label="Acoso > Acoso sexual"/> - <combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Acoso > Incitar a, o pedir, que otros violen las Condiciones del Servicio"/> - <combo_box.item name="Harassment__Verbal_abuse" label="Acoso > Abuso verbal"/> - <combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indecencia > En general, contenido o conducta ofensivos"/> - <combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indecencia > Nombre inapropiado del avatar"/> - <combo_box.item name="Indecency__Mature_content_in_PG_region" label="Indecencia > Contenido o conducta inapropiada en una región 'PG'"/> - <combo_box.item name="Indecency__Inappropriate_content_in_Mature_region" label="Indecencia > Contenido o conducta inapropiada en una región 'Mature'"/> - <combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Infracción de la propiedad intelectual > Eliminación de contenidos"/> - <combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Infracción de la propiedad intelectual > CopyBot o Exploit (programa malicioso) de permisos"/> - <combo_box.item name="Intolerance" label="Intolerancia"/> - <combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terreno > Abuso de los recursos de un sandbox"/> - <combo_box.item name="Land__Encroachment__Objects_textures" label="Terreno > Invasión > Objetos/Texturas"/> - <combo_box.item name="Land__Encroachment__Particles" label="Terreno > Invasión > PartÃculas"/> - <combo_box.item name="Land__Encroachment__Trees_plants" label="Terreno > Invasión > Ãrboles/Plantas"/> - <combo_box.item name="Wagering_gambling" label="Apuestas/Juego"/> - <combo_box.item name="Other" label="Otra"/> + <combo_box.item label="Elegir la categorÃa" name="Select_category"/> + <combo_box.item label="Edad > Jugar a ser niño" name="Age__Age_play"/> + <combo_box.item label="Edad > Residente adulto en Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/> + <combo_box.item label="Edad > Residente menor de edad fuera de Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> + <combo_box.item label="Ataque > Sandbox de combate / Zona no segura" name="Assault__Combat_sandbox___unsafe_area"/> + <combo_box.item label="Ataque > Zona segura" name="Assault__Safe_area"/> + <combo_box.item label="Ataque > Sandbox de prueba de armas" name="Assault__Weapons_testing_sandbox"/> + <combo_box.item label="Comercio > Error en la entrega de productos o servicios" name="Commerce__Failure_to_deliver_product_or_service"/> + <combo_box.item label="Indiscreción > Información del mundo real" name="Disclosure__Real_world_information"/> + <combo_box.item label="Indiscreción > Monitorizar a distancia el chat" name="Disclosure__Remotely_monitoring chat"/> + <combo_box.item label="Indiscreción > Información Se Second Life, el chat o los MI" name="Disclosure__Second_Life_information_chat_IMs"/> + <combo_box.item label="Perturbando la paz > Abuso de los recursos de la región" name="Disturbing_the_peace__Unfair_use_of_region_resources"/> + <combo_box.item label="Perturbando la paz > Excesivos objetos con script" name="Disturbing_the_peace__Excessive_scripted_objects"/> + <combo_box.item label="Perturbando la paz > Objeto basura" name="Disturbing_the_peace__Object_littering"/> + <combo_box.item label="Perturbando la paz > Spam (mensajes no pedidos) repetitivo" name="Disturbing_the_peace__Repetitive_spam"/> + <combo_box.item label="Perturbando la paz > Publicidad no deseada" name="Disturbing_the_peace__Unwanted_advert_spam"/> + <combo_box.item label="Fraude > L$" name="Fraud__L$"/> + <combo_box.item label="Fraude > Terreno" name="Fraud__Land"/> + <combo_box.item label="Fraude > Esquemas piramidales o cadenas de cartas" name="Fraud__Pyramid_scheme_or_chain_letter"/> + <combo_box.item label="Fraude > US$" name="Fraud__US$"/> + <combo_box.item label="Acoso > Anuncios múltiples / Spam visual" name="Harassment__Advert_farms___visual_spam"/> + <combo_box.item label="Acoso > Difamación de individuos o grupos" name="Harassment__Defaming_individuals_or_groups"/> + <combo_box.item label="Acoso > Impedir el movimiento" name="Harassment__Impeding_movement"/> + <combo_box.item label="Acoso > Acoso sexual" name="Harassment__Sexual_harassment"/> + <combo_box.item label="Acoso > Incitar a, o pedir, que otros violen las Condiciones del Servicio" name="Harassment__Solicting_inciting_others_to_violate_ToS"/> + <combo_box.item label="Acoso > Abuso verbal" name="Harassment__Verbal_abuse"/> + <combo_box.item label="Indecencia > En general, contenido o conducta ofensivos" name="Indecency__Broadly_offensive_content_or_conduct"/> + <combo_box.item label="Indecencia > Nombre inapropiado del avatar" name="Indecency__Inappropriate_avatar_name"/> + <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región 'PG'" name="Indecency__Mature_content_in_PG_region"/> + <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región 'Mature'" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="Infracción de la propiedad intelectual > Eliminación de contenidos" name="Intellectual_property_infringement_Content_Removal"/> + <combo_box.item label="Infracción de la propiedad intelectual > CopyBot o Exploit (programa malicioso) de permisos" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> + <combo_box.item label="Intolerancia" name="Intolerance"/> + <combo_box.item label="Terreno > Abuso de los recursos de un sandbox" name="Land__Abuse_of_sandbox_resources"/> + <combo_box.item label="Terreno > Invasión > Objetos/Texturas" name="Land__Encroachment__Objects_textures"/> + <combo_box.item label="Terreno > Invasión > PartÃculas" name="Land__Encroachment__Particles"/> + <combo_box.item label="Terreno > Invasión > Ãrboles/Plantas" name="Land__Encroachment__Trees_plants"/> + <combo_box.item label="Apuestas/Juego" name="Wagering_gambling"/> + <combo_box.item label="Otra" name="Other"/> </combo_box> <text name="abuser_name_title"> Nombre del infractor: </text> - <button label="Elegir al residente" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/> - <check_box label="No sé el nombre del infractor" name="omit_abuser_name" tool_tip="Marque esto si no puede aportar el nombre del infractor"/> + <button label="Elegir" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/> <text name="abuser_name_title2"> Localización de la infracción: </text> @@ -92,13 +93,11 @@ Detalles: </text> <text name="bug_aviso"> - Por favor, sea muy concreto sobre la fecha, la localización, -la naturaleza de la infracción, el aportar textos relevantes -del chat o los MI, y, si es posible, seleccione el objeto. + Por favor, sé todo lo concreto que puedas </text> <text name="incomplete_title"> - Nota: las denuncias incompletas no se investigarán. + * Las denuncias incompletas no se investigarán </text> - <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> <button label="Denunciar la infracción" label_selected="Denunciar la infracción" name="send_btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml new file mode 100644 index 0000000000..db9fd5f36e --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="script" short_title="[TODOS LOS SCRIPTS]" title="[TODOS LOS SCRIPTS]"/> diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml new file mode 100644 index 0000000000..410f7b5e36 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="scriptlimits" title="INFORMACIÓN DEL SCRIPT"/> diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml index 79984e7bc1..5c190a4682 100644 --- a/indra/newview/skins/default/xui/es/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="preview lsl text" title="SCRIPT: SCRIPT DE ROTACIÓN"> +<floater name="preview lsl text" title="SCRIPT: ROTACIÓN DEL SCRIPT"> + <floater.string name="Title"> + SCRIPT: [NAME] + </floater.string> <text name="desc txt"> Descripción: </text> diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml index ace596cd9a..39c84103c4 100644 --- a/indra/newview/skins/default/xui/es/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="queue" title="REINICIO"> +<floater name="queue" title="PROGRESO DEL REINICIO"> + <floater.string name="Starting"> + Empezando [START] de [COUNT] Ãtems. + </floater.string> + <floater.string name="Done"> + Hecho. + </floater.string> + <floater.string name="Resetting"> + Reiniciando + </floater.string> + <floater.string name="Running"> + Ejecutándose + </floater.string> + <floater.string name="NotRunning"> + Sin ejecutarse + </floater.string> <button label="Cerrar" label_selected="Cerrar" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml index a59f258a18..1ab6682023 100644 --- a/indra/newview/skins/default/xui/es/floater_script_search.xml +++ b/indra/newview/skins/default/xui/es/floater_script_search.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="script search" title="BUSCAR EN EL SCRIPT" width="320"> - <check_box label="Indiferente mays./mins." name="case_text" left="75"/> +<floater name="script search" title="BÚSQUEDA DE SCRIPTS" width="320"> + <check_box label="Indiferente mays./mins." left="75" name="case_text"/> <button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/> - <button label="Reemplazar" label_selected="Reemplazar" name="replace_btn" left="100" width="85"/> - <button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn" left="190" width="122"/> + <button label="Reemplazar" label_selected="Reemplazar" left="100" name="replace_btn" width="85"/> + <button label="Reemplazar todos" label_selected="Reemplazar todos" left="190" name="replace_all_btn" width="122"/> <text name="txt" width="65"> Buscar </text> <text name="txt2" width="65"> Reemplazar </text> - <line_editor left="75" name="search_text" width="240" /> - <line_editor left="75" name="replace_text" width="240" /> + <line_editor left="75" name="search_text" width="240"/> + <line_editor left="75" name="replace_text" width="240"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml new file mode 100644 index 0000000000..377b848530 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_search.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_search" title="ENCONTRAR"> + <floater.string name="loading_text"> + Cargando... + </floater.string> + <floater.string name="done_text"> + Hecho + </floater.string> + <layout_stack name="stack1"> + <layout_panel name="browser_layout"> + <text name="refresh_search"> + Redo search to reflect current God level + </text> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml index 9c889df63a..6503a3d5cb 100644 --- a/indra/newview/skins/default/xui/es/floater_select_key.xml +++ b/indra/newview/skins/default/xui/es/floater_select_key.xml @@ -2,6 +2,6 @@ <floater name="modal container" title=""> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Pulse una tecla para seleccionarla + Pulsa una tecla para configurarla como tu botón para hablar. </text> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml index c6e8746250..efedb5d689 100644 --- a/indra/newview/skins/default/xui/es/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml @@ -1,64 +1,65 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="sell land" title="VENDER EL TERRENO"> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <text name="info_parcel_label"> - Parcela: - </text> - <text name="info_parcel"> - NOMBRE DE LA PARCELA - </text> - <text name="info_size_label"> - Tamaño: - </text> - <text name="info_size"> - [AREA] m² - </text> - <text name="info_action"> - Vender esta parcela: - </text> - <icon bottom_delta="-56" name="step_price" /> - <text name="price_label"> - Marque un precio: - </text> - <text name="price_text"> - Elija un precio adecuado para esta parcela. - </text> - <text name="price_ld"> - L$ - </text> - <text name="price_per_m"> - ([PER_METER] L$ por metro cuadrado) - </text> - <text name="sell_to_label"> - Vender este terreno a: - </text> - <text name="sell_to_text"> - Elija si venderlo a cualquiera o a un comprador concreto. - </text> - <combo_box name="sell_to"> - <combo_box.item name="--selectone--" label="seleccione --" /> - <combo_box.item name="Anyone" label="Cualquiera" /> - <combo_box.item name="Specificuser:" label="Un usuario concreto:" /> - </combo_box> - <button label="Seleccionar..." name="sell_to_select_agent"/> - <text name="sell_objects_label"> - ¿Vender los objetos con el terreno? - </text> - <text name="sell_objects_text"> - Los objetos transferibles del propietario del terreno cambiarán -de propietario. - </text> - <radio_group name="sell_objects" bottom_delta="-58" > - <radio_item name="no" label="No, mantener la propiedad de los objetos" /> - <radio_item name="yes" label="SÃ, vender los objetos con el terreno" /> - </radio_group> - <button label="Mostrar los objetos" name="show_objects" width="120"/> - <text name="nag_message_label"> - RECUERDE: todas las ventas son definitivas. - </text> - <button label="Poner el terreno en venta" name="sell_btn"/> - <button label="Cancelar" name="cancel_btn"/> - </panel> - </scroll_container> +<floater name="sell land" title="VENTA DE TERRENO"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text name="info_parcel_label"> + Parcela: + </text> + <text name="info_parcel"> + NOMBRE DE LA PARCELA + </text> + <text name="info_size_label"> + Tamaño: + </text> + <text name="info_size"> + [AREA] m² + </text> + <text name="info_action"> + Vender esta parcela: + </text> + <text name="price_label"> + 1. Marcar un precio: + </text> + <text name="price_text"> + Elegir un precio adecuado. + </text> + <text name="price_ld"> + L$ + </text> + <line_editor name="price"> + 0 + </line_editor> + <text name="price_per_m"> + ([PER_METER] L$ por m²) + </text> + <text name="sell_to_label"> + 2. Vender el terreno a: + </text> + <text name="sell_to_text"> + Elige si venderlo a cualquiera o a un comprador concreto. + </text> + <combo_box name="sell_to"> + <combo_box.item label="- Elegir a alguien -" name="--selectone--"/> + <combo_box.item label="Cualquiera" name="Anyone"/> + <combo_box.item label="Alguien concreto:" name="Specificuser:"/> + </combo_box> + <button label="Elegir" name="sell_to_select_agent"/> + <text name="sell_objects_label"> + 3. ¿Vender los objetos junto con el terreno? + </text> + <text name="sell_objects_text"> + Los objetos transferibles del propietario del terreno que estén en la parcela cambiarán de propietario. + </text> + <radio_group bottom_delta="-58" name="sell_objects"> + <radio_item label="No, mantener la propiedad de los objetos" name="no"/> + <radio_item label="SÃ, vender los objetos con el terreno" name="yes"/> + </radio_group> + <button label="Mostrar los objetos" name="show_objects" width="120"/> + <text name="nag_message_label"> + RECUERDA: todas las ventas son definitivas. + </text> + <button label="Poner en venta el terreno" name="sell_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml index 0e8e6bdfd2..bca1839f09 100644 --- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="settings_debug" title="CONFIGURACIÓN DEL DEPURADOR"> - <combo_box name="boolean_combo"> - <combo_box.item name="TRUE" label="TRUE" /> - <combo_box.item name="FALSE" label="FALSE" /> - </combo_box> - <color_swatch label="Color" name="color_swatch"/> +<floater name="settings_debug" title="CONFIGURACIONES DEL DEPURADOR"> + <radio_group name="boolean_combo"> + <radio_item label="VERDADERO" name="TRUE" value="verdadero"/> + <radio_item label="FALSO" name="FALSE" value=""/> + </radio_group> + <color_swatch label="Color" name="val_color_swatch"/> <spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_2"/> <spinner label="x" name="val_spinner_3"/> diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml index afea6c09fe..febb51e5d6 100644 --- a/indra/newview/skins/default/xui/es/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml @@ -4,23 +4,23 @@ Destino de la foto </text> <radio_group label="Tipo de la foto" name="snapshot_type_radio"> - <radio_item name="postcard" label="Enviar por correo electrónico" /> - <radio_item name="texture" label="Guardarla en su inventario ([AMOUNT] L$)" /> - <radio_item name="local" label="Guardarla en su disco duro" /> + <radio_item label="Correo-e" name="postcard"/> + <radio_item label="Mi inventario ([AMOUNT] L$)" name="texture"/> + <radio_item label="Guardar en mi ordenador" name="local"/> </radio_group> <text name="file_size_label"> - Tamaño del archivo: [SIZE] KB + [SIZE] KB </text> <button label="Actualizar la foto" name="new_snapshot_btn"/> <button label="Enviar" name="send_btn"/> <button label="Guardar ([AMOUNT] L$)" name="upload_btn"/> <flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo"> - <flyout_button_item name="save_item" label="Guardar"/> - <flyout_button_item name="saveas_item" label="Guardar como..."/> + <flyout_button_item label="Guardar" name="save_item"/> + <flyout_button_item label="Guardar como..." name="saveas_item"/> </flyout_button> <button label="Cancelar" name="discard_btn"/> - <button label="Más >>" name="more_btn" tool_tip="Opciones avanzadas"/> - <button label="<< Menos" name="less_btn" tool_tip="Opciones avanzadas"/> + <button label="Más" name="more_btn" tool_tip="Opciones avanzadas"/> + <button label="Menos" name="less_btn" tool_tip="Opciones avanzadas"/> <text name="type_label2"> Tamaño </text> @@ -28,50 +28,50 @@ Formato </text> <combo_box label="Resolución" name="postcard_size_combo"> - <combo_box.item name="CurrentWindow" label="Ventana actual"/> - <combo_box.item name="640x480" label="640x480"/> - <combo_box.item name="800x600" label="800x600"/> - <combo_box.item name="1024x768" label="1024x768"/> - <combo_box.item name="Custom" label="Personalizar"/> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="Personalizar" name="Custom"/> </combo_box> <combo_box label="Resolución" name="texture_size_combo"> - <combo_box.item name="CurrentWindow" label="Ventana actual"/> - <combo_box.item name="Small(128x128)" label="Pequeño (128x128)"/> - <combo_box.item name="Medium(256x256)" label="Medio (256x256)"/> - <combo_box.item name="Large(512x512)" label="Grande (512x512)"/> - <combo_box.item name="Custom" label="Personalizar"/> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="Pequeño (128x128)" name="Small(128x128)"/> + <combo_box.item label="Medio (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> + <combo_box.item label="Personalizar" name="Custom"/> </combo_box> <combo_box label="Resolución" name="local_size_combo"> - <combo_box.item name="CurrentWindow" label="Ventana actual"/> - <combo_box.item name="320x240" label="320x240"/> - <combo_box.item name="640x480" label="640x480"/> - <combo_box.item name="800x600" label="800x600"/> - <combo_box.item name="1024x768" label="1024x768"/> - <combo_box.item name="1280x1024" label="1280x1024"/> - <combo_box.item name="1600x1200" label="1600x1200"/> - <combo_box.item name="Custom" label="Personalizar"/> + <combo_box.item label="Ventana actual" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="Personalizar" name="Custom"/> </combo_box> <combo_box label="Formato" name="local_format_combo"> - <combo_box.item name="PNG" label="PNG"/> - <combo_box.item name="JPEG" label="JPEG"/> - <combo_box.item name="BMP" label="BMP"/> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> </combo_box> - <spinner label="Ancho" name="snapshot_width" label_width="41" width="101"/> - <spinner label="Alto" name="snapshot_height" label_width="30" width="90" left="121"/> + <spinner label="Ancho" label_width="41" name="snapshot_width" width="101"/> + <spinner label="Alto" label_width="30" left="121" name="snapshot_height" width="90"/> <check_box label="Mantener las proporciones" name="keep_aspect_check"/> <slider label="Calidad de la imagen" name="image_quality_slider"/> <text name="layer_type_label"> Captura: </text> <combo_box label="Capas de la imagen" name="layer_types"> - <combo_box.item name="Colors" label="Colores"/> - <combo_box.item name="Depth" label="Profundidad"/> - <combo_box.item name="ObjectMattes" label="Bandas negras"/> + <combo_box.item label="Colores" name="Colors"/> + <combo_box.item label="Profundidad" name="Depth"/> + <combo_box.item label="Bandas negras" name="ObjectMattes"/> </combo_box> - <check_box label="Incluir la interfaz en la foto" name="ui_check"/> - <check_box bottom_delta="-17" label="Incluir los HUD en la foto" name="hud_check"/> + <check_box label="Interfaz" name="ui_check"/> + <check_box bottom_delta="-17" label="HUDs" name="hud_check"/> <check_box bottom_delta="-17" label="Mantenerla abierta tras guardarla" name="keep_open_check"/> - <check_box bottom_delta="-17" label="Congelar la toma (vista previa en pantalla completa)" name="freeze_frame_check"/> + <check_box bottom_delta="-17" label="Congelar la toma (pantalla completa)" name="freeze_frame_check"/> <check_box bottom_delta="-29" label="Actualizar automáticamente" name="auto_snapshot_check"/> <string name="unknown"> desconocido diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml new file mode 100644 index 0000000000..5f4fabf375 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_stats.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Statistics" title="ESTADÃSTICAS"> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Básico" name="basic"> + <stat_bar label="FPS" name="fps"/> + <stat_bar label="Ancho de banda" name="bandwidth"/> + <stat_bar label="Pérdida de paquetes" name="packet_loss"/> + <stat_bar label="Ping del Sim" name="ping"/> + </stat_view> + <stat_view label="Avanzado" name="advanced"> + <stat_view label="Renderización" name="render"> + <stat_bar label="KTris generados" name="ktrisframe"/> + <stat_bar label="KTris generados" name="ktrissec"/> + <stat_bar label="Objetos en total" name="objs"/> + <stat_bar label="Objetos nuevos" name="newobjs"/> + </stat_view> + <stat_view label="Textura" name="texture"> + <stat_bar label="Número" name="numimagesstat"/> + <stat_bar label="Raw: número" name="numrawimagesstat"/> + <stat_bar label="GL Mem" name="gltexmemstat"/> + <stat_bar label="Formatted Mem" name="formattedmemstat"/> + <stat_bar label="Raw Mem" name="rawmemstat"/> + <stat_bar label="Bound Mem" name="glboundmemstat"/> + </stat_view> + <stat_view label="Red" name="network"> + <stat_bar label="Paquetes salientes" name="packetsinstat"/> + <stat_bar label="Paquetes entrantes" name="packetsoutstat"/> + <stat_bar label="Objetos" name="objectkbitstat"/> + <stat_bar label="Textura" name="texturekbitstat"/> + <stat_bar label="Asset" name="assetkbitstat"/> + <stat_bar label="Capas" name="layerskbitstat"/> + <stat_bar label="Entrando ahora" name="actualinkbitstat"/> + <stat_bar label="Saliendo ahora" name="actualoutkbitstat"/> + <stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulador" name="sim"> + <stat_bar label="Tiempo de dilación" name="simtimedilation"/> + <stat_bar label="FPS en el Sim" name="simfps"/> + <stat_bar label="Physics FPS" name="simphysicsfps"/> + <stat_view label="Physics Details" name="physicsdetail"> + <stat_bar label="Pin de objetos" name="physicspinnedtasks"/> + <stat_bar label="Objetos con bajo nivel de detalle" name="physicslodtasks"/> + <stat_bar label="Memoria asignada" name="physicsmemoryallocated"/> + <stat_bar label="Agentes: actual./seg." name="simagentups"/> + <stat_bar label="Agentes del grid principal" name="simmainagents"/> + <stat_bar label="Agentes secundarios" name="simchildagents"/> + <stat_bar label="Objetos" name="simobjects"/> + <stat_bar label="Objetos activos" name="simactiveobjects"/> + <stat_bar label="Scripts activos" name="simactivescripts"/> + <stat_bar label="Eventos de scripts" name="simscripteps"/> + <stat_bar label="Paquetes salientes" name="siminpps"/> + <stat_bar label="Paquetes entrantes" name="simoutpps"/> + <stat_bar label="Descargas pendientes" name="simpendingdownloads"/> + <stat_bar label="Subidas pendientes" name="simpendinguploads"/> + <stat_bar label="Total de bytes no reconocidos" name="simtotalunackedbytes"/> + </stat_view> + <stat_view label="Tiempo (ms)" name="simperf"> + <stat_bar label="Tiempo total de los frames" name="simframemsec"/> + <stat_bar label="Tiempo de red" name="simnetmsec"/> + <stat_bar label="Physics Time" name="simsimphysicsmsec"/> + <stat_bar label="Tiempo de la simulación" name="simsimothermsec"/> + <stat_bar label="Tiempo de los agentes" name="simagentmsec"/> + <stat_bar label="Tiempo de las imágenes" name="simimagesmsec"/> + <stat_bar label="Tiempo de los scripts" name="simscriptmsec"/> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml new file mode 100644 index 0000000000..8c8190be55 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_sys_well.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="sys_well_window" title="NOTIFICACIONES"> + <string name="title_im_well_window"> + CONVERSACIONES + </string> + <string name="title_notification_well_window"> + NOTIFICACIONES + </string> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml index b2dddfb7f7..87cc9c1659 100644 --- a/indra/newview/skins/default/xui/es/floater_telehub.xml +++ b/indra/newview/skins/default/xui/es/floater_telehub.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="telehub" title="PUNTO DE TELEPORTE" min_height="310" height="310"> +<floater height="310" min_height="310" name="telehub" title="PUNTO DE TELEPORTE"> <text name="status_text_connected"> Punto de Teleporte conectado al objeto [OBJECT] </text> @@ -9,7 +9,7 @@ <text name="help_text_connected"> Para quitar, pulse Desconectar. </text> - <text name="help_text_not_connected" height="38" bottom_delta="-18"> + <text bottom_delta="-18" height="38" name="help_text_not_connected"> Seleccione el objeto y pulse Conectar el Punto de Teleporte. </text> @@ -21,12 +21,9 @@ de Teleporte. <button label="Añadir sucursales" name="add_spawn_point_btn"/> <button label="Quitar sucursales" name="remove_spawn_point_btn"/> <text name="spawn_point_help"> - Seleccione el objeto y pulse Añadir para -especificar la posición. -Hecho eso, puede mover o borrar el objeto. -Las posiciones son relativas al centro del -Punto de Teleporte. -Seleccione un Ãtem de la lista para mostrar su -posición en el mundo. + Selecciona el objeto y pulsa "Añadir sucursal" para especificar una posición. +Luego, puedes mover o borrar el objeto. +Las posiciones son relativas al centro del Punto de Teleporte. +Elige un Ãtem de la lista para realzarlo en el mundo. </text> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml index 09d6e7e4aa..ed2787ea60 100644 --- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="ELEGIR: TEXTURA"> +<floater name="texture picker" title="DESTACADO: TEXTURA"> <string name="choose_picture"> Pulse para elegir una imagen </string> <text name="Multiple"> - Múltiple + Texturas múltiples </text> <text name="unknown"> - Dimensiones: [DIMENSIONS] + Tamaño: [DIMENSIONS] </text> <button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/> - <button label="Ninguna" label_selected="Ninguna" name="None" left="90"/> + <button label="Ninguna" label_selected="Ninguna" left="90" name="None"/> <button label="Blanca" label_selected="Blanca" name="Blank"/> <check_box label="Ver las carpetas" name="show_folders_check"/> - <search_editor label="Escriba aquà para buscar una" name="inventory search editor"/> - <check_box label="Aplicar ahora mismo" name="apply_immediate_check"/> + <search_editor label="Filtrar las texturas" name="inventory search editor"/> + <check_box label="Aplicarlo ahora" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <button label="Elegir" label_selected="Elegir" name="Select"/> + <button label="OK" label_selected="OK" name="Select"/> <string name="pick title"> Elegir: </string> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index 24db352ac4..1c65567830 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -1,45 +1,81 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" title="" short_title="CONSTRUIR" width="288"> +<floater name="toolbox floater" short_title="HERRAMIENTAS DE CONSTRUCCIÓN" title="" width="288"> + <floater.string name="status_rotate"> + Arrastre las bandas de color para girar el objeto + </floater.string> + <floater.string name="status_scale"> + Pulse y arrastre para estirar el lado seleccionado + </floater.string> + <floater.string name="status_move"> + Arrastrar para mover, Mayús.+arrastrar para copiar + </floater.string> + <floater.string name="status_modifyland"> + Mantenga pulsado para modificar el terreno + </floater.string> + <floater.string name="status_camera"> + Pulsa y arrastra para mover la cámara + </floater.string> + <floater.string name="status_grab"> + Arrastra para mover: Ctrl, verticalmente; Ctrl-Mayús., girando + </floater.string> + <floater.string name="status_place"> + Pulse en el mundo para construir + </floater.string> + <floater.string name="status_selectland"> + Pulse y arrastre para seleccionar el terreno + </floater.string> + <floater.string name="grid_screen_text"> + Pantalla + </floater.string> + <floater.string name="grid_local_text"> + Local + </floater.string> + <floater.string name="grid_world_text"> + Mundo + </floater.string> + <floater.string name="grid_reference_text"> + Referencia + </floater.string> + <floater.string name="grid_attachment_text"> + Añadido + </floater.string> <button label="" label_selected="" name="button focus" tool_tip="Visión"/> <button label="" label_selected="" name="button move" tool_tip="Mover"/> <button label="" label_selected="" name="button edit" tool_tip="Editar"/> <button label="" label_selected="" name="button create" tool_tip="Crear"/> <button label="" label_selected="" name="button land" tool_tip="Terreno"/> + <text name="text status" width="280"> + Arrastrar para mover, Mayús.+arrastrar para copiar + </text> <radio_group name="focus_radio_group"> <radio_item label="Zoom" name="radio zoom"/> <radio_item label="Órbita (Ctrl)" name="radio orbit"/> - <radio_item label="Panorámica (Ctrl-Shift)" name="radio pan"/> + <radio_item label="Panorámica (Ctrl+Shift)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> <radio_item label="Mover" name="radio move"/> <radio_item label="Vertical (Ctrl)" name="radio lift"/> - <radio_item label="Horizontal (Ctrl-Shift)" name="radio spin"/> + <radio_item label="Horizontal (Ctrl+Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> - <radio_item label="Posición" name="radio position"/> + <radio_item label="Moverse" name="radio position"/> <radio_item label="Girar (Ctrl)" name="radio rotate"/> - <radio_item label="Estirar (Ctrl-Shift)" name="radio stretch"/> + <radio_item label="Estirar (Ctrl+Shift)" name="radio stretch"/> <radio_item label="Elegir la cara" name="radio select face"/> </radio_group> <check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/> - <text name="text ruler mode"> - Ajuste: + <text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto"> + þ: [COUNT] </text> - <combo_box name="combobox grid mode" width="82"> - <combo_box.item name="World" label="Mundo" - /> - <combo_box.item name="Local" label="Local" - /> - <combo_box.item name="Reference" label="Referencia" - /> - </combo_box> <check_box label="Estirar ambos lados" name="checkbox uniform"/> - <check_box label="Estirar las texturas" name="checkbox stretch textures"/> - <check_box label="Usar la cuadrÃcula" name="checkbox snap to grid"/> - <button label="Opciones..." label_selected="Opciones..." name="Options..."/> - <text name="text status" width="280"> - Arrastrar para mover, Mayús.+arrastrar para copiar - </text> + <check_box initial_value="true" label="Estirar las texturas" name="checkbox stretch textures"/> + <check_box initial_value="true" label="Usar la cuadrÃcula" name="checkbox snap to grid"/> + <combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto" width="82"> + <combo_box.item label="Mundo" name="World"/> + <combo_box.item label="Local" name="Local"/> + <combo_box.item label="Referencia" name="Reference"/> + </combo_box> + <button label="Opciones..." label_selected="Opciones..." name="Options..." tool_tip="Ver más opciones de la cuadrÃcula"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirámide"/> @@ -55,10 +91,10 @@ <button label="" label_selected="" name="ToolRing" tool_tip="Cono truncado"/> <button label="" label_selected="" name="ToolTree" tool_tip="Ãrbol"/> <button label="" label_selected="" name="ToolGrass" tool_tip="Hierba"/> - <check_box label="Mantener seleccionado" name="checkbox sticky"/> - <check_box label="Copia seleccionada" name="checkbox copy selection"/> - <check_box label="Centrada" name="checkbox copy centers"/> - <check_box label="Girada" name="checkbox copy rotates"/> + <check_box label="Mantener la herramienta elegida" name="checkbox sticky"/> + <check_box label="Copiar la selección" name="checkbox copy selection"/> + <check_box initial_value="true" label="Copia centrada" name="checkbox copy centers"/> + <check_box label="Copia girada" name="checkbox copy rotates"/> <radio_group name="land_radio_group"> <radio_item label="Seleccionar el terreno" name="radio select land"/> <radio_item label="Nivelar" name="radio flatten"/> @@ -68,7 +104,6 @@ <radio_item label="Escarpar" name="radio noise"/> <radio_item label="Restablecer" name="radio revert"/> </radio_group> - <button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado" left="146"/> <text name="Bulldozer:"> Bulldozer: </text> @@ -78,14 +113,51 @@ <text name="Strength:"> Fuerza </text> - <text name="obj_count" left="134"> - Objetos seleccionados: [COUNT] + <button label="Aplicar" label_selected="Aplicar" left="146" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/> + <text left="134" name="obj_count"> + Objetos: [COUNT] </text> - <text name="prim_count" left="134"> - primitivas: [COUNT] + <text left="134" name="prim_count"> + Primitivas: [COUNT] </text> <tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288"> <panel label="General" name="General"> + <panel.string name="text deed continued"> + Transfeir + </panel.string> + <panel.string name="text deed"> + Transferir + </panel.string> + <panel.string name="text modify info 1"> + Puedes modificar este objeto + </panel.string> + <panel.string name="text modify info 2"> + Puedes modificar estos objetos + </panel.string> + <panel.string name="text modify info 3"> + No puedes modificar este objeto + </panel.string> + <panel.string name="text modify info 4"> + No puedes modificar estos objetos + </panel.string> + <panel.string name="text modify warning"> + Para configurar los permisos, debes seleccionar el objeto completo + </panel.string> + <panel.string name="Cost Default"> + Precio: L$ + </panel.string> + <panel.string name="Cost Total"> + Precio total: L$ + </panel.string> + <panel.string name="Cost Per Unit"> + Price Per: L$ + </panel.string> + <panel.string name="Cost Mixed"> + Precio variable + </panel.string> + <panel.string name="Sale Mixed"> + Venta variable + </panel.string> <text name="Name:"> Nombre: </text> @@ -98,135 +170,77 @@ <text name="Creator Name"> Thrax Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/> <text name="Owner:"> Propietario: </text> <text name="Owner Name"> Thrax Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/> <text name="Group:"> Grupo: </text> - <text name="Group Name Proxy"> - Los Linden - </text> - <button label="Configurar..." label_selected="Configurar..." name="button set group"/> - <text name="Permissions:"> - Permisos: - </text> - - <check_box label="Compartir con el grupo" name="checkbox share with group" tool_tip="Permitir que todos los miembros del grupo compartan y utilicen sus permisos sobre este objeto. Debe transferirlo para activar las restricciones según los roles."/> - <string name="text deed continued"> - Transferir... - </string> - <string name="text deed"> - Transferir - </string> - <button label="Transferir..." label_selected="Transferir..." name="button deed" tool_tip="Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/> - <check_box label="Permitir a cualquiera que lo mueva" name="checkbox allow everyone move"/> - <check_box label="Permitir a cualquiera que lo copie" name="checkbox allow everyone copy"/> - <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/> - <check_box label="En venta" name="checkbox for sale"/> - <text name="Cost"> - Precio: L$ + <button label="Configurar..." label_selected="Configurar..." name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/> + <name_box initial_value="Cargando..." name="Group Name Proxy"/> + <button label="Transfeir" label_selected="Transfeir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/> + <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <text name="label click action" width="180"> + Al tocarlo: </text> + <combo_box name="clickaction" width="192"> + <combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/> + <combo_box.item label="Sentarse en el objeto" name="Sitonobject"/> + <combo_box.item label="Comprar el objeto" name="Buyobject"/> + <combo_box.item label="Pagar al objeto" name="Payobject"/> + <combo_box.item label="Abrirlo" name="Open"/> + <combo_box.item label="Zoom" name="Zoom"/> + </combo_box> + <check_box label="En venta:" name="checkbox for sale"/> <combo_box name="sale type"> <combo_box.item label="Copia" name="Copy"/> <combo_box.item label="Contenidos" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> - - <text name="label click action" width="180"> - Al pulsarlo con el botón izquierdo: - </text> - <combo_box name="clickaction" width="192"> - <combo_box.item name="Touch/grab(default)" label="Tocar/Agarrar (por defecto)" - /> - <combo_box.item name="Sitonobject" label="Sentarse en el objeto" - /> - <combo_box.item name="Buyobject" label="Comprar el objeto" - /> - <combo_box.item name="Payobject" label="Pagar al objeto" - /> - <combo_box.item name="Open" label="Abrirlo" - /> - <combo_box.item name="Play" label="Ejecutar los media de la parcela" - /> - <combo_box.item name="Opemmedia" label="Abrir los media de la parcela" - /> - </combo_box> - <panel name="perms_build"> - <text name="perm_modify"> - Puede modificar este objeto - </text> - <text name="B:"> - B: - </text> - <text name="O:"> - O: - </text> - <text name="G:"> - G: - </text> - <text name="E:"> - E: - </text> - <text name="N:"> - N: - </text> - <text name="F:"> - F: - </text> - <text name="Next owner can:"> - El próximo propietario puede: - </text> - <check_box label="Modificarlo" name="checkbox next owner can modify"/> - <check_box label="Copiarlo" name="checkbox next owner can copy" left_delta="80"/> - <check_box name="checkbox next owner can transfer" left_delta="67"/> - </panel> - <string name="text modify info 1"> - Puede modificar este objeto - </string> - <string name="text modify info 2"> - Puede modificar estos objetos - </string> - <string name="text modify info 3"> - No puede modificar este objeto - </string> - <string name="text modify info 4"> - No puede modificar estos objetos - </string> - <string name="text modify warning"> - Debe seleccionar todo el objeto para definir los permisos - </string> - <string name="Cost Default"> - Precio: L$ - </string> - <string name="Cost Total"> - Precio total: L$ - </string> - <string name="Cost Per Unit"> - Precio por: L$ - </string> - <string name="Cost Mixed"> - Precio variable - </string> - <string name="Sale Mixed"> - Venta variable - </string> + <spinner label="Precio: L$" name="Edit Cost"/> + <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/> + <panel name="perms_build"> + <text name="perm_modify"> + Puedes modificar este objeto + </text> + <text name="Anyone can:"> + Cualquiera: + </text> + <check_box label="Moverlo" name="checkbox allow everyone move"/> + <check_box label="Copiar" name="checkbox allow everyone copy"/> + <text name="Next owner can:"> + Próximo propietario: + </text> + <check_box label="Modificarlo" name="checkbox next owner can modify"/> + <check_box label="Copiarlo" left_delta="80" name="checkbox next owner can copy"/> + <check_box label="Transferirlo" left_delta="67" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> + </panel> </panel> <panel label="Objeto" name="Object"> - <text name="select_single"> - Seleccione un sólo prim para editarlo. - </text> - <text name="edit_object"> - Modificar los parámetros del objeto: - </text> <check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/> <check_box label="Material" name="Physical Checkbox Ctrl" tool_tip="Permite que el objeto pueda ser empujado y le afecte la gravedad."/> - <check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Hace que el objeto se borre 1 minuto después de su creación."/> + <check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Provoca que el objeto desaparezca 1 minuto después de ser creado"/> <check_box label="Inmaterial" name="Phantom Checkbox Ctrl" tool_tip="Hace que el objeto no colisiones con otros objetos o avatares."/> <text name="label position"> Posición (metros) @@ -246,48 +260,27 @@ <spinner label="X" name="Rot X"/> <spinner label="Y" name="Rot Y"/> <spinner label="Z" name="Rot Z"/> - <text name="label material"> - Material - </text> - <combo_box name="material"> - <combo_box.item name="Stone" label="Piedra" - /> - <combo_box.item name="Metal" label="Metal" - /> - <combo_box.item name="Glass" label="Vidrio" - /> - <combo_box.item name="Wood" label="Madera" - /> - <combo_box.item name="Flesh" label="Carne" - /> - <combo_box.item name="Plastic" label="Plástico" - /> - <combo_box.item name="Rubber" label="Goma" - /> - </combo_box> - <text name="label basetype"> - Tipo de objeto a construir - </text> <combo_box name="comboBaseType"> - <combo_box.item name="Box" label="Caja" - /> - <combo_box.item name="Cylinder" label="Cilindro" - /> - <combo_box.item name="Prism" label="Prisma" - /> - <combo_box.item name="Sphere" label="Esfera" - /> - <combo_box.item name="Torus" label="Toroide" - /> - <combo_box.item name="Tube" label="Tubo" - /> - <combo_box.item name="Ring" label="Cono truncado" - /> - <combo_box.item name="Sculpted" label="Sculpted" - /> + <combo_box.item label="Caja" name="Box"/> + <combo_box.item label="Cilindro" name="Cylinder"/> + <combo_box.item label="Prisma" name="Prism"/> + <combo_box.item label="Esfera" name="Sphere"/> + <combo_box.item label="Toroide" name="Torus"/> + <combo_box.item label="Tubo" name="Tube"/> + <combo_box.item label="Cono truncado" name="Ring"/> + <combo_box.item label="Sculpted" name="Sculpted"/> + </combo_box> + <combo_box name="material"> + <combo_box.item label="Piedra" name="Stone"/> + <combo_box.item label="Metal" name="Metal"/> + <combo_box.item label="Vidrio" name="Glass"/> + <combo_box.item label="Madera" name="Wood"/> + <combo_box.item label="Carne" name="Flesh"/> + <combo_box.item label="Plástico" name="Plastic"/> + <combo_box.item label="Goma" name="Rubber"/> </combo_box> <text name="text cut"> - Corte: Inicio y Fin + Corte (inicio/fin) </text> <spinner label="I" name="cut begin"/> <spinner label="F" name="cut end"/> @@ -301,17 +294,13 @@ Forma del hueco </text> <combo_box name="hole"> - <combo_box.item name="Default" label="Por defecto" - /> - <combo_box.item name="Circle" label="CÃrculo" - /> - <combo_box.item name="Square" label="Cuadrado" - /> - <combo_box.item name="Triangle" label="Triángulo" - /> + <combo_box.item label="Por defecto" name="Default"/> + <combo_box.item label="CÃrculo" name="Circle"/> + <combo_box.item label="Cuadrado" name="Square"/> + <combo_box.item label="Triángulo" name="Triangle"/> </combo_box> <text name="text twist"> - Torsión: Inicio y Fin + Torsión (inicio/fin) </text> <spinner label="I" name="Twist Begin"/> <spinner label="F" name="Twist End"/> @@ -329,13 +318,13 @@ <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut"> - Corte del perfil: Inicio y Fin + Corte del perfil (inicio/fin) </text> <text name="advanced_dimple"> - Horadar: Inicio y Fin + Horadar (inicio/fin) </text> <text name="advanced_slice"> - Cortar: Inicio y Fin + Cortar (inicio/fin) </text> <spinner label="I" name="Path Limit Begin"/> <spinner label="F" name="Path Limit End"/> @@ -351,22 +340,17 @@ Giros </text> <texture_picker label="Textura para sculpted" name="sculpt texture control" tool_tip="Pulse para elegir una imagen"/> - <check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpted siguiendo el eje X."/> - <check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro."/> + <check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpted siguiendo el eje X"/> + <check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro"/> <text name="label sculpt type"> Tipo de unión </text> <combo_box name="sculpt type control"> - <combo_box.item name="None" label="(ninguna)" - /> - <combo_box.item name="Sphere" label="Esfera" - /> - <combo_box.item name="Torus" label="Toroide" - /> - <combo_box.item name="Plane" label="Plano" - /> - <combo_box.item name="Cylinder" label="Cilindro" - /> + <combo_box.item label="(ninguna)" name="None"/> + <combo_box.item label="Esfera" name="Sphere"/> + <combo_box.item label="Toroide" name="Torus"/> + <combo_box.item label="Plano" name="Plane"/> + <combo_box.item label="Cilindro" name="Cylinder"/> </combo_box> </panel> <panel label="Caracter." name="Features"> @@ -376,7 +360,7 @@ <text name="edit_object"> Editar las caracterÃsticas del objeto: </text> - <check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto flexione en el eje Z. (Sólo del lado del cliente)"/> + <check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto flexione en el eje Z (sólo del lado del cliente)"/> <spinner label="Blandura" name="FlexNumSections"/> <spinner label="Gravedad" name="FlexGravity"/> <spinner label="Fricción" name="FlexFriction"/> @@ -386,86 +370,70 @@ <spinner label="Fuerza en Y" name="FlexForceY"/> <spinner label="Fuerza en Z" name="FlexForceZ"/> <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Hace que el objeto emita luz"/> - <text name="label color"> - Color - </text> - <color_swatch label="" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/> + <color_swatch label="" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/> + <texture_picker label="" name="light texture control" tool_tip="Pulsa para elegir una proyección de imagen (sólo tiene efecto con renderización deferida activada)"/> <spinner label="Intensidad" name="Light Intensity"/> + <spinner label="FOV" name="Light FOV"/> <spinner label="Radio" name="Light Radius"/> + <spinner label="Visión" name="Light Focus"/> <spinner label="Atenuación" name="Light Falloff"/> + <spinner label="Ambiental" name="Light Ambiance"/> </panel> <panel label="Textura" name="Texture"> + <panel.string name="string repeats per meter"> + Repeticiones por m. + </panel.string> + <panel.string name="string repeats per face"> + Repeticiones por cara + </panel.string> <texture_picker label="Textura" name="texture control" tool_tip="Pulse para elegir una imagen"/> - <color_swatch label="Color" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/> + <color_swatch label="Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/> <text name="color trans"> Transparencia % </text> <text name="glow label"> Resplandor </text> - <check_box label="Brillo al máximo" name="checkbox fullbright" bottom_delta="-21"/> + <check_box bottom_delta="-21" label="Brillo al +máximo" name="checkbox fullbright"/> <text name="tex gen"> Detallado </text> <combo_box name="combobox texgen" width="86"> - <combo_box.item name="Default" label="Por defecto" - /> - <combo_box.item name="Planar" label="Plano" - /> + <combo_box.item label="Por defecto" name="Default"/> + <combo_box.item label="Plano" name="Planar"/> </combo_box> <text name="label shininess"> Brillantez </text> <combo_box name="combobox shininess"> - <combo_box.item name="None" label="Ninguna" - /> - <combo_box.item name="Low" label="Baja" - /> - <combo_box.item name="Medium" label="Media" - /> - <combo_box.item name="High" label="Alta" - /> + <combo_box.item label="Ninguna" name="None"/> + <combo_box.item label="Baja" name="Low"/> + <combo_box.item label="Media" name="Medium"/> + <combo_box.item label="Alta" name="High"/> </combo_box> <text name="label bumpiness"> Relieve </text> <combo_box name="combobox bumpiness"> - <combo_box.item name="None" label="Ninguno" - /> - <combo_box.item name="Brightness" label="Brillo" - /> - <combo_box.item name="Darkness" label="Oscuro" - /> - <combo_box.item name="woodgrain" label="grano de madera" - /> - <combo_box.item name="bark" label="corteza" - /> - <combo_box.item name="bricks" label="ladrillos" - /> - <combo_box.item name="checker" label="cajero" - /> - <combo_box.item name="concrete" label="cemento" - /> - <combo_box.item name="crustytile" label="azulejerÃa" - /> - <combo_box.item name="cutstone" label="piedra cortada" - /> - <combo_box.item name="discs" label="discos" - /> - <combo_box.item name="gravel" label="grava" - /> - <combo_box.item name="petridish" label="placa de Petri" - /> - <combo_box.item name="siding" label="revestimiento" - /> - <combo_box.item name="stonetile" label="baldosa de piedra" - /> - <combo_box.item name="stucco" label="estuco" - /> - <combo_box.item name="suction" label="succión" - /> - <combo_box.item name="weave" label="tejido" - /> + <combo_box.item label="Ninguno" name="None"/> + <combo_box.item label="Brillo" name="Brightness"/> + <combo_box.item label="Oscuro" name="Darkness"/> + <combo_box.item label="grano de madera" name="woodgrain"/> + <combo_box.item label="corteza" name="bark"/> + <combo_box.item label="ladrillos" name="bricks"/> + <combo_box.item label="cajero" name="checker"/> + <combo_box.item label="cemento" name="concrete"/> + <combo_box.item label="azulejerÃa" name="crustytile"/> + <combo_box.item label="piedra cortada" name="cutstone"/> + <combo_box.item label="discos" name="discs"/> + <combo_box.item label="grava" name="gravel"/> + <combo_box.item label="placa de Petri" name="petridish"/> + <combo_box.item label="revestimiento" name="siding"/> + <combo_box.item label="baldosa de piedra" name="stonetile"/> + <combo_box.item label="estuco" name="stucco"/> + <combo_box.item label="succión" name="suction"/> + <combo_box.item label="tejido" name="weave"/> </combo_box> <text name="tex scale"> Repeticiones por cara @@ -474,31 +442,23 @@ <check_box label="Voltear" name="checkbox flip s"/> <spinner label="Vertical (V)" name="TexScaleV"/> <check_box label="Voltear" name="checkbox flip t"/> - <text name="tex rotate"> - Rotación (grados) - </text> - <string name="string repeats per meter"> - Repeticiones por m. - </string> - <string name="string repeats per face"> - Repeticiones por cara - </string> - <text name="rpt"> - Repeticiones por m. - </text> - <spinner left="118" name="TexRot" width="62" /> - <spinner left="118" name="rptctrl" width="62" /> - <button label="Aplicar" label_selected="Aplicar" name="button apply" left_delta="72"/> + <spinner label="Rotación" left="118" name="TexRot" width="62"/> + <spinner label="Repeticiones / Metro" left="118" name="rptctrl" width="62"/> + <button label="Aplicar" label_selected="Aplicar" left_delta="72" name="button apply"/> <text name="tex offset"> Desplazar </text> <spinner label="Horizontal (U)" name="TexOffsetU"/> <spinner label="Vertical (V)" name="TexOffsetV"/> - <text name="textbox autofix" width="180"> - Centrar la textura para los media -(primero debe subirla) - </text> - <button label="Alinear" label_selected="Alinear" name="button align" left="180"/> + <panel name="Add_Media"> + <text name="media_tex"> + Media + </text> + <button name="add_media" tool_tip="Añadir un media"/> + <button name="delete_media" tool_tip="Borrar esta textura para media"/> + <button name="edit_media" tool_tip="Editar este media"/> + <button label="Centrar" label_selected="Centrar los media" name="button align" tool_tip="Centrar esta textura para media (primero debe cargarse)"/> + </panel> </panel> <panel label="Contenido " name="Contents"> <button label="Script nuevo" label_selected="Script nuevo" name="button new script"/> @@ -513,59 +473,26 @@ Precio: [PRICE] L$ por [AREA] m² </text> <text name="label_area"> - Superficie: [AREA] m² + Ãrea: [AREA] m² </text> - <button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land" width="140"/> - <check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario: Verde = Su terreno Agua = Terreno de sus grupos Rojo = Propiedad de otros Amarillo = En venta Morado = Para subasta Gris = Público"/> - <button label="?" label_selected="?" name="button show owners help" left_delta="150"/> + <button label="Acerca del terreno" label_selected="Acerca del terreno" name="button about land" width="140"/> + <check_box label="Mostrar los propietarios" name="checkbox show owners" tool_tip="El color de las parcelas es según su propietario: + +Verde = Su terreno +Agua = Terreno de sus grupos +Rojo = Propiedad de otros +Amarillo = En venta +Morado = Para subasta +Gris = Público"/> <text name="label_parcel_modify"> Modificar la parcela </text> - <button label="Subdividir" label_selected="Subdividir" name="button subdivide land" width="140"/> - <button label="Unir" label_selected="Unir" name="button join land" width="140"/> + <button label="Dividir" label_selected="Dividir" name="button subdivide land" width="140"/> + <button label="Inscribirse" label_selected="Inscribirse" name="button join land" width="140"/> <text name="label_parcel_trans"> Transacciones de terreno </text> <button label="Comprar terreno" label_selected="Comprar terreno" name="button buy land" width="140"/> <button label="Abandonar el terreno" label_selected="Abandonar el terreno" name="button abandon land" width="140"/> </panel> - <floater.string name="status_rotate"> - Arrastre las bandas de color para girar el objeto - </floater.string> - <floater.string name="status_scale"> - Pulse y arrastre para estirar el lado seleccionado - </floater.string> - <floater.string name="status_move"> - Arrastrar para mover, Mayús.+arrastrar para copiar - </floater.string> - <floater.string name="status_modifyland"> - Mantenga pulsado para modificar el terreno - </floater.string> - <floater.string name="status_camera"> - Pulse y arrastre para cambiar el punto de vista - </floater.string> - <floater.string name="status_grab"> - Arrastre para mover objetos: Ctrl, verticalmente; Ctrl-Mayús., para girarlos. - </floater.string> - <floater.string name="status_place"> - Pulse en el mundo para construir - </floater.string> - <floater.string name="status_selectland"> - Pulse y arrastre para seleccionar el terreno - </floater.string> - <floater.string name="grid_screen_text"> - Pantalla - </floater.string> - <floater.string name="grid_local_text"> - Local - </floater.string> - <floater.string name="grid_world_text"> - Mundo - </floater.string> - <floater.string name="grid_reference_text"> - Referencia - </floater.string> - <floater.string name="grid_attachment_text"> - Añadido - </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml index 29ae9991af..7c2522e8a9 100644 --- a/indra/newview/skins/default/xui/es/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml @@ -1,58 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="top_objects" title="CARGANDO..."> +<floater name="top_objects" title="Objetos superiores"> + <floater.string name="top_scripts_title"> + Scripts según su uso + </floater.string> + <floater.string name="top_scripts_text"> + [COUNT] scripts con un total de [TIME] ms + </floater.string> + <floater.string name="scripts_score_label"> + Tiempo + </floater.string> + <floater.string name="scripts_mono_time_label"> + Tiempo en Mono + </floater.string> + <floater.string name="top_colliders_title"> + Objetos que colisionan + </floater.string> + <floater.string name="top_colliders_text"> + [COUNT] objetos con muchas posibles colisiones + </floater.string> + <floater.string name="colliders_score_label"> + Resultado + </floater.string> + <floater.string name="none_descriptor"> + No se ha encontrado ninguno. + </floater.string> <text name="title_text"> Cargando... </text> <scroll_list name="objects_list"> - <column label="Resultado" name="score"/> - <column label="Nombre" name="name"/> - <column label="Propietario" name="owner"/> - <column label="Posición" name="location"/> - <column label="Tiempo" name="time"/> - <column label="Tiempo en Mono" name="mono_time"/> + <scroll_list.columns label="Resultado" name="score"/> + <scroll_list.columns label="Nombre" name="name"/> + <scroll_list.columns label="Propietario" name="owner"/> + <scroll_list.columns label="Posición" name="location"/> + <scroll_list.columns label="Tiempo" name="time"/> + <scroll_list.columns label="Tiempo en Mono" name="mono_time"/> + <scroll_list.columns label="URLs" name="URLs"/> </scroll_list> - <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> - <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> - <line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/> <text name="id_text"> ID del objeto: </text> + <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> <button label="Mostrar la baliza" name="show_beacon_btn" width="115"/> <text name="obj_name_text"> Nombre del objeto: </text> + <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> <button label="Filtro" name="filter_object_btn" width="115"/> <text name="owner_name_text" width="130"> - Nombre del propietario: + Propietario: </text> + <line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/> <button label="Filtro" name="filter_owner_btn" width="115"/> + <button label="Actualizar" name="refresh_btn" width="115"/> <button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/> - <button label="Devolver todo" name="return_all_btn" left="190"/> + <button label="Devolver todo" left="190" name="return_all_btn"/> <button label="Desactivar lo seleccionado" name="disable_selected_btn" width="170"/> - <button label="Desactivar todo" name="disable_all_btn" left="190"/> - <button label="Actualizar" name="refresh_btn" width="115"/> - <string name="top_scripts_title"> - Scripts según su uso - </string> - <string name="top_scripts_text"> - [COUNT] scripts con un total de [TIME] ms - </string> - <string name="scripts_score_label"> - Tiempo - </string> - <string name="scripts_mono_time_label"> - Tiempo en Mono - </string> - <string name="top_colliders_title"> - Objetos que colisionan - </string> - <string name="top_colliders_text"> - [COUNT] objetos con muchas posibles colisiones - </string> - <string name="colliders_score_label"> - Resultado - </string> - <string name="none_descriptor"> - No se ha encontrado ninguno. - </string> + <button label="Desactivar todo" left="190" name="disable_all_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index d46c84cb03..cbacce304c 100644 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml @@ -4,8 +4,7 @@ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/> <text name="tos_heading"> - Por favor, lea cuidadosamente las siguientes Condiciones del Servicio. Si quiere seguir -iniciando sesión en [SECOND_LIFE], debe aceptar el acuerdo. + Por favor, lee detenidamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml new file mode 100644 index 0000000000..934d14a45c --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_controls" title="Controles de Voz"> + <string name="title_nearby"> + CHAT DE VOZ + </string> + <string name="title_group"> + Multiconferencia de voz con [GROUP] + </string> + <string name="title_adhoc"> + Multiconferencia de voz + </string> + <string name="title_peer_2_peer"> + Llamada: [NAME] + </string> + <string name="no_one_near"> + Nadie cercano tiene activada la voz + </string> + <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mi avatar:"/> + </layout_panel> + <layout_panel name="leave_call_btn_panel"> + <button label="Colgar" name="leave_call_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml index c86e49a355..9996860137 100644 --- a/indra/newview/skins/default/xui/es/floater_water.xml +++ b/indra/newview/skins/default/xui/es/floater_water.xml @@ -11,20 +11,20 @@ <text name="BHText"> Color del agua </text> - <button label="?" name="WaterFogColorHelp" left="175" /> - <color_swatch label="" name="WaterFogColor" tool_tip="Pulse para abrir el selector de color"/> + <button label="?" left="175" name="WaterFogColorHelp"/> + <color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/> <text name="WaterFogDensText"> Transparencia </text> - <button label="?" name="WaterFogDensityHelp" left="175" /> + <button label="?" left="175" name="WaterFogDensityHelp"/> <text name="WaterUnderWaterFogModText"> Modificar la claridad del agua </text> - <button label="?" name="WaterUnderWaterFogModHelp" left="175" /> + <button label="?" left="175" name="WaterUnderWaterFogModHelp"/> <text name="BDensText"> Tamaño de las ondulaciones </text> - <button label="?" name="WaterNormalScaleHelp" left="405"/> + <button label="?" left="405" name="WaterNormalScaleHelp"/> <text name="BHText2"> 1 </text> @@ -37,29 +37,29 @@ <text name="HDText"> Escala de Fresnel </text> - <button label="?" name="WaterFresnelScaleHelp" left="405"/> + <button label="?" left="405" name="WaterFresnelScaleHelp"/> <text name="FresnelOffsetText"> Coeficiente de reflexión </text> - <button label="?" name="WaterFresnelOffsetHelp" left="405"/> + <button label="?" left="405" name="WaterFresnelOffsetHelp"/> <text name="DensMultText"> Refracción de la superficie </text> - <button label="?" name="WaterScaleAboveHelp" left="640"/> + <button label="?" left="640" name="WaterScaleAboveHelp"/> <text name="WaterScaleBelowText"> Refracción bajo la superficie </text> - <button label="?" name="WaterScaleBelowHelp" left="640"/> + <button label="?" left="640" name="WaterScaleBelowHelp"/> <text name="MaxAltText"> Desenfoque </text> - <button label="?" name="WaterBlurMultiplierHelp" left="640"/> + <button label="?" left="640" name="WaterBlurMultiplierHelp"/> </panel> <panel label="Imagen" name="Waves"> <text name="BHText"> Sentido de la onda grande </text> - <button label="?" name="WaterWave1Help" left="170"/> + <button label="?" left="170" name="WaterWave1Help"/> <text name="WaterWave1DirXText"> X </text> @@ -69,7 +69,7 @@ <text name="BHText2"> Sentido de la onda pequeña </text> - <button label="?" name="WaterWave2Help" left="170"/> + <button label="?" left="170" name="WaterWave2Help"/> <text name="WaterWave2DirXText"> X </text> diff --git a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml index 1dfff90004..bf96ed53ce 100644 --- a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml @@ -3,7 +3,7 @@ <button label="Guardar" label_selected="Guardar" name="Save"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Guardar el Ãtem como: + Guardar el Ãtem en mi inventario como: </text> <line_editor name="name ed"> Nuevo [DESC] diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml new file mode 100644 index 0000000000..7dc47ca367 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="whitelist_entry" title="ENTRADA DE LA LISTA BLANCA"> + <text name="media_label"> + Escribe una URL o un rango de URL para añadirla a lista de dominios autorizados + </text> + <line_editor name="whitelist_entry" tool_tip="Añade una URL o un rango de URL a la Lista Blanca"/> + <button label="OK" name="ok_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml new file mode 100644 index 0000000000..f57ce08eac --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_window_size.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="window_size" title="TAMAÑO DE LA VENTANA"> + <string name="resolution_format"> + [RES_X] x [RES_Y] + </string> + <text name="windowsize_text"> + Definir el tamaño de la ventana: + </text> + <combo_box name="window_size_combo" tool_tip="ancho x alto"> + <combo_box.item label="1000 x 700 (por defecto)" name="item0"/> + <combo_box.item label="1024 x 768" name="item1"/> + <combo_box.item label="1280 x 720 (720 p)" name="item2"/> + <combo_box.item label="1920 x 1080 (1080 p)" name="item3"/> + </combo_box> + <button label="Configurar" name="set_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml index 4d7337bef7..a8dc05703c 100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml @@ -1,57 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="worldmap" title="MAPA DEL MUNDO"> - <tab_container name="maptab"> - <panel label="Objetos" name="objects_mapview"/> - <panel label="Terreno" name="terrain_mapview"/> - </tab_container> - <text name="you_label"> - Usted - </text> - <text name="home_label"> - Base - </text> - <text name="auction_label"> - Subasta - </text> - <text name="land_for_sale_label"> - Terreno en venta - </text> - <button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a su Base"/> - <check_box label="Residente" name="people_chk"/> - <check_box label="Punto de Info" name="infohub_chk"/> - <check_box label="Punto de Teleporte" name="telehubchk"/> - <check_box label="Terreno en venta" name="land_for_sale_chk"/> - <text name="events_label"> - Eventos: - </text> - <check_box label="'PG'" name="event_chk"/> - <check_box label="'Mature'" name="event_mature_chk"/> - <check_box label="'Adult'" name="event_adult_chk"/> - <combo_box label="Amigos conectados" name="friend combo" tool_tip="Amigo a mostrar en el mapa"> - <combo_box.item name="item1" label="Amigos conectados" /> - </combo_box> - <combo_box label="Hitos" name="landmark combo" tool_tip="Hito a mostrar en el mapa"> - <combo_box.item name="item1" label="Hitos" /> - </combo_box> - <line_editor label="Buscar por el nombre de la región" name="location" tool_tip="Escriba el nombre de una región"/> - <button label="Buscar" name="DoSearch" tool_tip="Buscar una región"/> - <text name="search_label"> - Resultados de la búsqueda: - </text> - <scroll_list name="search_results"> - <column label="" name="icon"/> - <column label="" name="sim_name"/> - </scroll_list> - <text name="location_label"> - Localización: - </text> - <spinner name="spin x" tool_tip="Coordenada X de la posición a mostrar en el mapa"/> - <spinner name="spin y" tool_tip="Coordenada Y de la posición a mostrar en el mapa"/> - <spinner name="spin z" tool_tip="Coordenada Z de la posición a mostrar en el mapa"/> - <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/> - <button label="Mostrar el destino" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/> - <button label="Limpiar" label_selected="Limpiar" name="Clear" tool_tip="Parar la búsqueda"/> - <button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de su avatar"/> - <button label="Copiar la SLurl al portapapeles" name="copy_slurl" tool_tip="Copiar la posición actual como una SLurl, para usarla en la web."/> - <slider label="Zoom" name="zoom slider"/> + <panel name="layout_panel_1"> + <text name="events_label"> + Leyenda + </text> + </panel> + <panel> + <text name="me_label"> + Yo + </text> + <text name="person_label"> + Persona + </text> + <text name="by_owner_label"> + por el propietario + </text> + <text name="auction_label"> + subasta de terreno + </text> + <text name="pg_label"> + General + </text> + <text name="mature_label"> + Moderado + </text> + <text name="adult_label"> + Adulto + </text> + </panel> + <panel> + <button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml new file mode 100644 index 0000000000..bff10d9292 --- /dev/null +++ b/indra/newview/skins/default/xui/es/inspect_avatar.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_avatar"> + <string name="Subtitle"> + [AGE] + </string> + <string name="Details"> + [SL_PROFILE] + </string> + <slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/> + <button label="Añadir como amigo" name="add_friend_btn"/> + <button label="MI" name="im_btn"/> + <button label="Perfil" name="view_profile_btn"/> + <panel name="moderator_panel"> + <button label="Desactivar la voz" name="disable_voice"/> + <button label="Activar la voz" name="enable_voice"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml new file mode 100644 index 0000000000..ba10b19f41 --- /dev/null +++ b/indra/newview/skins/default/xui/es/inspect_group.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_group"> + <string name="PrivateGroup"> + Grupo privado + </string> + <string name="FreeToJoin"> + Inscripción gratuita + </string> + <string name="CostToJoin"> + Inscribirse cuesta [AMOUNT] L$ + </string> + <string name="YouAreMember"> + Eres miembro + </string> + <button label="Inscribirse" name="join_btn"/> + <button label="Abandonar" name="leave_btn"/> + <button label="Ver el perfil" name="view_profile_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml new file mode 100644 index 0000000000..6a831def07 --- /dev/null +++ b/indra/newview/skins/default/xui/es/inspect_object.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_object"> + <string name="Creator"> + Por [CREATOR] + </string> + <string name="CreatorAndOwner"> + por [CREATOR] +propietario [OWNER] + </string> + <string name="Price"> + [AMOUNT] L$ + </string> + <string name="PriceFree"> + ¡Gratis! + </string> + <string name="Touch"> + Tocar + </string> + <string name="Sit"> + Sentarme + </string> + <button label="Comprar" name="buy_btn"/> + <button label="Pagar" name="pay_btn"/> + <button label="Coger una copia" name="take_free_copy_btn"/> + <button label="Tocar" name="touch_btn"/> + <button label="Sentarme" name="sit_btn"/> + <button label="Abrir" name="open_btn"/> + <icon name="secure_browsing" tool_tip="Navegación segura"/> + <button label="Más" name="more_info_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml new file mode 100644 index 0000000000..f814e84a6f --- /dev/null +++ b/indra/newview/skins/default/xui/es/inspect_remote_object.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_remote_object"> + <text name="object_owner_label"> + Propietario: + </text> + <button label="Mapa" name="map_btn"/> + <button label="Ignorar" name="block_btn"/> + <button label="Cerrar" name="close_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml new file mode 100644 index 0000000000..12acb572dc --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- *NOTE: See also menu_avatar_other.xml --> +<context_menu name="Avatar Pie"> + <menu_item_call label="Ver el perfil" name="Profile..."/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="MI" name="Send IM..."/> + <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Invitar al grupo" name="Invite..."/> + <menu_item_call label="Ignorar" name="Avatar Mute"/> + <menu_item_call label="Denunciar" name="abuse"/> + <menu_item_call label="Congelar" name="Freeze..."/> + <menu_item_call label="Expulsar" name="Eject..."/> + <menu_item_call label="Depurar" name="Debug..."/> + <menu_item_call label="Acercar el zoom" name="Zoom In"/> + <menu_item_call label="Pagar" name="Pay..."/> + <menu_item_call label="Perfil del objeto" name="Object Inspect"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml new file mode 100644 index 0000000000..c5afb99d49 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Attachment Pie"> + <menu_item_call label="Tocar" name="Attachment Object Touch"/> + <menu_item_call label="Editar" name="Edit..."/> + <menu_item_call label="Quitar" name="Detach"/> + <menu_item_call label="Soltar" name="Drop"/> + <menu_item_call label="Levantarse" name="Stand Up"/> + <menu_item_call label="Mi apariencia" name="Appearance..."/> + <menu_item_call label="Mis amigos" name="Friends..."/> + <menu_item_call label="Mis grupos" name="Groups..."/> + <menu_item_call label="Mi perfil" name="Profile..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml new file mode 100644 index 0000000000..fe7331a108 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Avatar Icon Menu"> + <menu_item_call label="Ver el perfil" name="Show Profile"/> + <menu_item_call label="Enviar un MI..." name="Send IM"/> + <menu_item_call label="Añadir como amigo..." name="Add Friend"/> + <menu_item_call label="Quitar de los amigos..." name="Remove Friend"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml new file mode 100644 index 0000000000..83801e872d --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- *NOTE: See also menu_attachment_other.xml --> +<context_menu name="Avatar Pie"> + <menu_item_call label="Ver el perfil" name="Profile..."/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="MI" name="Send IM..."/> + <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Invitar al grupo" name="Invite..."/> + <menu_item_call label="Ignorar" name="Avatar Mute"/> + <menu_item_call label="Denunciar" name="abuse"/> + <menu_item_call label="Congelar" name="Freeze..."/> + <menu_item_call label="Expulsar" name="Eject..."/> + <menu_item_call label="Depurar" name="Debug..."/> + <menu_item_call label="Acercar el zoom" name="Zoom In"/> + <menu_item_call label="Pagar" name="Pay..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml new file mode 100644 index 0000000000..46b6d3ece6 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Self Pie"> + <menu_item_call label="Levantarse" name="Stand Up"/> + <context_menu label="Quitarme â–¶" name="Take Off >"> + <context_menu label="Ropas â–¶" name="Clothes >"> + <menu_item_call label="Camisa" name="Shirt"/> + <menu_item_call label="Pantalón" name="Pants"/> + <menu_item_call label="Falda" name="Skirt"/> + <menu_item_call label="Zapatos" name="Shoes"/> + <menu_item_call label="Calcetines" name="Socks"/> + <menu_item_call label="Chaqueta" name="Jacket"/> + <menu_item_call label="Guantes" name="Gloves"/> + <menu_item_call label="Camiseta" name="Self Undershirt"/> + <menu_item_call label="Ropa interior" name="Self Underpants"/> + <menu_item_call label="Tatuaje" name="Self Tattoo"/> + <menu_item_call label="Alfa" name="Self Alpha"/> + <menu_item_call label="Toda la ropa" name="All Clothes"/> + </context_menu> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="Desanexar â–¶" name="Object Detach"/> + <menu_item_call label="Quitarse todo" name="Detach All"/> + </context_menu> + <menu_item_call label="Mi apariencia" name="Appearance..."/> + <menu_item_call label="Mis amigos" name="Friends..."/> + <menu_item_call label="Mis grupos" name="Groups..."/> + <menu_item_call label="Mi perfil" name="Profile..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_bottomtray.xml b/indra/newview/skins/default/xui/es/menu_bottomtray.xml new file mode 100644 index 0000000000..8169563882 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_bottomtray.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="hide_camera_move_controls_menu"> + <menu_item_check label="Botón Gestos" name="ShowGestureButton"/> + <menu_item_check label="Botón Moverse" name="ShowMoveButton"/> + <menu_item_check label="Botón Vista" name="ShowCameraButton"/> + <menu_item_check label="Botón Foto" name="ShowSnapshotButton"/> + <menu_item_call label="Cortar" name="NearbyChatBar_Cut"/> + <menu_item_call label="Copiar" name="NearbyChatBar_Copy"/> + <menu_item_call label="Pegar" name="NearbyChatBar_Paste"/> + <menu_item_call label="Borrar" name="NearbyChatBar_Delete"/> + <menu_item_call label="Seleccionar todo" name="NearbyChatBar_Select_All"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml new file mode 100644 index 0000000000..c8a7858ddb --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_favorites.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Popup"> + <menu_item_call label="Teleportarse" name="Teleport To Landmark"/> + <menu_item_call label="Ver/Editar el hito" name="Landmark Open"/> + <menu_item_call label="Copiar la SLurl" name="Copy slurl"/> + <menu_item_call label="Mostrar en el mapa" name="Show On Map"/> + <menu_item_call label="Copiar" name="Landmark Copy"/> + <menu_item_call label="Pegar" name="Landmark Paste"/> + <menu_item_call label="Borrar" name="Delete"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml new file mode 100644 index 0000000000..24706eb2c8 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gesture_gear"> + <menu_item_call label="Añadir a / Quitar de los favoritos" name="activate"/> + <menu_item_call label="Copiar" name="copy_gesture"/> + <menu_item_call label="Pegar" name="paste"/> + <menu_item_call label="Copiar la UUID" name="copy_uuid"/> + <menu_item_call label="Añadir al vestuario actual" name="save_to_outfit"/> + <menu_item_call label="Editar" name="edit_gesture"/> + <menu_item_call label="Inspeccionar" name="inspect"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml new file mode 100644 index 0000000000..6b26ba42c4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_group_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Entrar al grupo..." name="item_join"/> + <menu_item_call label="Grupo nuevo..." name="item_new"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml new file mode 100644 index 0000000000..7fc1af00c5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="hide_navbar_menu"> + <menu_item_check label="Mostrar la barra de navegación" name="ShowNavbarNavigationPanel"/> + <menu_item_check label="Mostrar la barra de favoritos" name="ShowNavbarFavoritesPanel"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_im_well_button.xml b/indra/newview/skins/default/xui/es/menu_im_well_button.xml new file mode 100644 index 0000000000..c8f6c217cc --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_im_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="IM Well Button Context Menu"> + <menu_item_call label="Cerrar todo" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml new file mode 100644 index 0000000000..e11e9bdc58 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet AdHoc Menu"> + <menu_item_call label="Acabar la sesión" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml new file mode 100644 index 0000000000..a5e60ea40b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet Group Menu"> + <menu_item_call label="Información del grupo" name="Show Profile"/> + <menu_item_call label="Mostrar la sesión" name="Chat"/> + <menu_item_call label="Acabar la sesión" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml new file mode 100644 index 0000000000..492801026c --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet P2P Menu"> + <menu_item_call label="Ver el perfil" name="Show Profile"/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="Mostrar la sesión" name="Send IM"/> + <menu_item_call label="Acabar la sesión" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml new file mode 100644 index 0000000000..34f6b8ece7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Ver el perfil" name="view_profile"/> + <menu_item_call label="Añadir como amigo" name="add_friend"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Llamada" name="call"/> + <menu_item_call label="Teleportarse" name="teleport"/> + <menu_item_call label="Invitar al grupo" name="invite_to_group"/> + <menu_item_call label="Ignorar" name="block"/> + <menu_item_call label="Designorar" name="unblock"/> + <menu_item_call label="Denunciar" name="report"/> + <menu_item_call label="Congelar" name="freeze"/> + <menu_item_call label="Expulsar" name="eject"/> + <menu_item_call label="Depurar" name="debug"/> + <menu_item_call label="Encontrar en el mapa" name="find_on_map"/> + <menu_item_call label="Acercar el zoom" name="zoom_in"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Compartir" name="share"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml new file mode 100644 index 0000000000..af85b833e9 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Tocar" name="touch"/> + <menu_item_call label="Sentarse" name="sit"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Comprar" name="buy"/> + <menu_item_call label="Tomar" name="take"/> + <menu_item_call label="Coger una copia" name="take_copy"/> + <menu_item_call label="Abrir" name="open"/> + <menu_item_call label="Editar" name="edit"/> + <menu_item_call label="Ponerse" name="wear"/> + <menu_item_call label="Denunciar" name="report"/> + <menu_item_call label="Ignorar" name="block"/> + <menu_item_call label="Acercar el zoom" name="zoom_in"/> + <menu_item_call label="Quitar" name="remove"/> + <menu_item_call label="Más información" name="more_info"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml new file mode 100644 index 0000000000..cb8fb82f0d --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Levantarse" name="stand_up"/> + <menu_item_call label="Mi apariencia" name="my_appearance"/> + <menu_item_call label="Mi perfil" name="my_profile"/> + <menu_item_call label="Mis amigos" name="my_friends"/> + <menu_item_call label="Mis grupos" name="my_groups"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index 28d47fce52..602798b108 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -12,7 +12,7 @@ <menu_item_call label="Script nuevo" name="New Script"/> <menu_item_call label="Nota nueva" name="New Note"/> <menu_item_call label="Gesto nuevo" name="New Gesture"/> - <menu name="New Clothes" label="Nueva ropa"> + <menu label="Ropas nuevas" name="New Clothes"> <menu_item_call label="Camisa nueva" name="New Shirt"/> <menu_item_call label="Pantalones nuevos" name="New Pants"/> <menu_item_call label="Zapatos nuevos" name="New Shoes"/> @@ -22,16 +22,32 @@ <menu_item_call label="Guantes nuevos" name="New Gloves"/> <menu_item_call label="Camiseta nueva" name="New Undershirt"/> <menu_item_call label="Ropa interior nueva" name="New Underpants"/> + <menu_item_call label="Nueva capa Alpha" name="New Alpha Mask"/> + <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> </menu> - <menu name="New Body Parts" label="Nuevas partes del cuerpo"> + <menu label="Nuevas partes del cuerpo" name="New Body Parts"> <menu_item_call label="Forma nueva" name="New Shape"/> <menu_item_call label="Piel nueva" name="New Skin"/> <menu_item_call label="Pelo nuevo" name="New Hair"/> <menu_item_call label="Ojos nuevos" name="New Eyes"/> </menu> + <menu label="Change Type" name="Change Type"> + <menu_item_call label="Por defecto" name="Default"/> + <menu_item_call label="Guantes" name="Gloves"/> + <menu_item_call label="Chaqueta" name="Jacket"/> + <menu_item_call label="Pantalón" name="Pants"/> + <menu_item_call label="Forma" name="Shape"/> + <menu_item_call label="Zapatos" name="Shoes"/> + <menu_item_call label="Camisa" name="Shirt"/> + <menu_item_call label="Falda" name="Skirt"/> + <menu_item_call label="Ropa interior" name="Underpants"/> + <menu_item_call label="Camiseta" name="Undershirt"/> + </menu> <menu_item_call label="Teleportar" name="Landmark Open"/> <menu_item_call label="Abrir" name="Animation Open"/> <menu_item_call label="Abrir" name="Sound Open"/> + <menu_item_call label="Reemplazar el vestuario" name="Replace Outfit"/> + <menu_item_call label="Añadir al vestuario" name="Add To Outfit"/> <menu_item_call label="Eliminar el Ãtem" name="Purge Item"/> <menu_item_call label="Restaurar el Ãtem" name="Restore Item"/> <menu_item_call label="Abrir" name="Open"/> @@ -40,22 +56,21 @@ <menu_item_call label="Copiar la UUID" name="Copy Asset UUID"/> <menu_item_call label="Copiar" name="Copy"/> <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Pegar como enlace" name="Paste As Link"/> <menu_item_call label="Borrar" name="Delete"/> - <menu_item_call label="Quitarse los Ãtems" name="Take Off Items"/> - <menu_item_call label="Añadir al vestuario" name="Add To Outfit"/> - <menu_item_call label="Reemplazar el vestuario" name="Replace Outfit"/> + <menu_item_call label="Borrar carpeta del sistema" name="Delete System Folder"/> <menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/> <menu_item_call label="Escuchar" name="Sound Play"/> - <menu_item_call label="Acerca del hito" name="Teleport To Landmark"/> - <menu_item_call label="Ver en el mundo" name="Animation Play"/> + <menu_item_call label="Acerca del hito" name="About Landmark"/> + <menu_item_call label="Escuchar en el mundo" name="Animation Play"/> <menu_item_call label="Ejecutarla para usted" name="Animation Audition"/> <menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/> <menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/> <menu_item_call label="Empezar multiconferencia" name="Conference Chat"/> <menu_item_call label="Activar" name="Activate"/> <menu_item_call label="Desactivar" name="Deactivate"/> + <menu_item_call label="Guardar como" name="Save As"/> <menu_item_call label="Quitarse" name="Detach From Yourself"/> - <menu_item_call label="Volver a la última posición" name="Restore to Last Position"/> <menu_item_call label="Ponerse" name="Object Wear"/> <menu label="Anexar a" name="Attach To"/> <menu label="Anexar como HUD" name="Attach To HUD"/> diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml new file mode 100644 index 0000000000..91cb4a08ff --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_inventory_add"> + <menu label="Subir" name="upload"> + <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> + <menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/> + <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> + <menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Carpeta nueva" name="New Folder"/> + <menu_item_call label="Script nuevo" name="New Script"/> + <menu_item_call label="Nota nueva" name="New Note"/> + <menu_item_call label="Gesto nuevo" name="New Gesture"/> + <menu label="Ropas nuevas" name="New Clothes"> + <menu_item_call label="Camisa nueva" name="New Shirt"/> + <menu_item_call label="Pantalón nuevo" name="New Pants"/> + <menu_item_call label="Zapatos nuevos" name="New Shoes"/> + <menu_item_call label="Calcetines nuevos" name="New Socks"/> + <menu_item_call label="Chaqueta nueva" name="New Jacket"/> + <menu_item_call label="Falda nueva" name="New Skirt"/> + <menu_item_call label="Guantes nuevos" name="New Gloves"/> + <menu_item_call label="Camiseta nueva" name="New Undershirt"/> + <menu_item_call label="Ropa interior nueva" name="New Underpants"/> + <menu_item_call label="Nueva Alfa" name="New Alpha"/> + <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + </menu> + <menu label="Nuevas partes del cuerpo" name="New Body Parts"> + <menu_item_call label="Forma nueva" name="New Shape"/> + <menu_item_call label="Piel nueva" name="New Skin"/> + <menu_item_call label="Pelo nuevo" name="New Hair"/> + <menu_item_call label="Ojos nuevos" name="New Eyes"/> + </menu> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml new file mode 100644 index 0000000000..80cf78c0b5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gear_default"> + <menu_item_call label="Nueva ventana del inventario" name="new_window"/> + <menu_item_call label="Ordenar alfabéticamente" name="sort_by_name"/> + <menu_item_call label="Ordenar por los más recientes" name="sort_by_recent"/> + <menu_item_call label="Ver los filtros" name="show_filters"/> + <menu_item_call label="Restablecer los filtros" name="reset_filters"/> + <menu_item_call label="Cerrar todas las carpetas" name="close_folders"/> + <menu_item_call label="Vaciar la Papelera" name="empty_trash"/> + <menu_item_call label="Vaciar Objetos Perdidos" name="empty_lostnfound"/> + <menu_item_call label="Guardar la textura como" name="Save Texture As"/> + <menu_item_call label="Encontrar el original" name="Find Original"/> + <menu_item_call label="Encontrar todos los enlazados" name="Find All Links"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml new file mode 100644 index 0000000000..c315cb2f2c --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_land.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Land Pie"> + <menu_item_call label="Acerca del terreno" name="Place Information..."/> + <menu_item_call label="Sentarse aquÃ" name="Sit Here"/> + <menu_item_call label="Comprar este terreno" name="Land Buy"/> + <menu_item_call label="Comprar un pase" name="Land Buy Pass"/> + <menu_item_call label="Construir" name="Create"/> + <menu_item_call label="Modificar el terreno" name="Edit Terrain"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml new file mode 100644 index 0000000000..f69b1539b8 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_landmark.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="landmark_overflow_menu"> + <menu_item_call label="Copiar la SLurl" name="copy"/> + <menu_item_call label="Borrar" name="delete"/> + <menu_item_call label="Crear un Destacado" name="pick"/> + <menu_item_call label="Añadir a la barra de favoritos" name="add_to_favbar"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml index 1cf6ad5ae6..7ebe2e0c31 100644 --- a/indra/newview/skins/default/xui/es/menu_login.xml +++ b/indra/newview/skins/default/xui/es/menu_login.xml @@ -1,13 +1,30 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Login Menu"> - <menu label="Archivo" name="File"> + <menu label="Yo" name="File"> + <menu_item_call label="Preferencias" name="Preferences..."/> <menu_item_call label="Salir" name="Quit"/> </menu> - <menu label="Editar" name="Edit"> - <menu_item_call label="Preferencias..." name="Preferences..."/> - </menu> <menu label="Ayuda" name="Help"> <menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Acerca de [APP_NAME]..." name="About Second Life..."/> + </menu> + <menu label="Depurar" name="Debug"> + <menu label="Editar" name="Edit"> + <menu_item_call label="Deshacer" name="Undo"/> + <menu_item_call label="Rehacer" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Borrar" name="Delete"/> + <menu_item_call label="Duplicar" name="Duplicate"/> + <menu_item_call label="Seleccionar todo" name="Select All"/> + <menu_item_call label="Deseleccionar" name="Deselect"/> + </menu> + <menu_item_call label="Mostrar las configuraciones del depurador" name="Debug Settings"/> + <menu_item_call label="Configuraciones del Visor/Color" name="UI/Color Settings"/> + <menu label="Pruebas de la interfaz" name="UI Tests"/> + <menu_item_call label="Definir el tamaño de la ventana..." name="Set Window Size..."/> + <menu_item_call label="Mostrar los 'TOS'" name="TOS"/> + <menu_item_call label="Mostrar mensaje crÃtico" name="Critical"/> + <menu_item_call label="Web Browser Test" name="Web Browser Test"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml index 19061cea06..9c5a5719ee 100644 --- a/indra/newview/skins/default/xui/es/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml @@ -3,6 +3,7 @@ <menu_item_call label="Zoom cerca" name="Zoom Close"/> <menu_item_call label="Zoom medio" name="Zoom Medium"/> <menu_item_call label="Zoom lejos" name="Zoom Far"/> + <menu_item_check label="Girar el mapa" name="Rotate Map"/> <menu_item_call label="Parar la búsqueda" name="Stop Tracking"/> - <menu_item_call label="Perfil..." name="Profile"/> + <menu_item_call label="Mapa del mundo" name="World Map"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml new file mode 100644 index 0000000000..63e5468020 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_navbar.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Navbar Menu"> + <menu_item_check label="Mostrar las coordenadas" name="Show Coordinates"/> + <menu_item_check label="Mostrar las propiedades de la parcela" name="Show Parcel Properties"/> + <menu_item_call label="Hito" name="Landmark"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Borrar" name="Delete"/> + <menu_item_call label="Seleccionar todo" name="Select All"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml new file mode 100644 index 0000000000..94b281b6c7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="NearBy Chat Menu"> + <menu_item_call label="Mostrar la gente que está cerca..." name="nearby_people"/> + <menu_item_check label="Ver el texto ignorado" name="muted_text"/> + <menu_item_check label="Mostrar los iconos del amigo" name="show_buddy_icons"/> + <menu_item_check label="Mostrar los nombres" name="show_names"/> + <menu_item_check label="Mostrar los iconos y los nombres" name="show_icons_and_names"/> + <menu_item_call label="Tamaño de la fuente" name="font_size"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml new file mode 100644 index 0000000000..0562d35be7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Notification Well Button Context Menu"> + <menu_item_call label="Cerrar todo" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml new file mode 100644 index 0000000000..18b6363bbb --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_object.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Object Pie"> + <menu_item_call label="Tocar" name="Object Touch"/> + <menu_item_call label="Editar" name="Edit..."/> + <menu_item_call label="Construir" name="Build"/> + <menu_item_call label="Abrir" name="Open"/> + <menu_item_call label="Sentarse aquÃ" name="Object Sit"/> + <menu_item_call label="Perfil del objeto" name="Object Inspect"/> + <menu_item_call label="Acercar el zoom" name="Zoom In"/> + <context_menu label="Ponerme â–¶" name="Put On"> + <menu_item_call label="Ponerse" name="Wear"/> + <context_menu label="Anexar â–¶" name="Object Attach"/> + <context_menu label="Anexar como HUD â–¶" name="Object Attach HUD"/> + </context_menu> + <context_menu label="Quitarme â–¶" name="Remove"> + <menu_item_call label="Denunciar una infracción" name="Report Abuse..."/> + <menu_item_call label="Ignorar" name="Object Mute"/> + <menu_item_call label="Devolver" name="Return..."/> + <menu_item_call label="Eliminar" name="Delete"/> + </context_menu> + <menu_item_call label="Comprar" name="Pie Object Bye"/> + <menu_item_call label="Tomar" name="Pie Object Take"/> + <menu_item_call label="Coger una copia" name="Take Copy"/> + <menu_item_call label="Pagar" name="Pay..."/> + <menu_item_call label="Comprar" name="Buy..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml new file mode 100644 index 0000000000..7e4578b950 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Object Icon Menu"> + <menu_item_call label="Perfil del objeto..." name="Object Profile"/> + <menu_item_call label="Ignorar..." name="Block"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml new file mode 100644 index 0000000000..60c92eec75 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Participant List Context Menu"> + <menu_item_check label="Ordenar alfabéticamente" name="SortByName"/> + <menu_item_check label="Ordenar según las intervenciones recientes" name="SortByRecentSpeakers"/> + <menu_item_call label="Ver el perfil" name="View Profile"/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Compartir" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Ignorar la voz" name="Block/Unblock"/> + <menu_item_check label="Ignorar el texto" name="MuteText"/> + <context_menu label="Opciones del moderador >" name="Moderator Options"> + <menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/> + <menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Silenciar a todos los demás" name="ModerateVoiceMuteOthers"/> + <menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Quitar el silencio a todos los demás" name="ModerateVoiceUnMuteOthers"/> + </context_menu> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml new file mode 100644 index 0000000000..0e883be00e --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> + <menu_item_check label="Ordenar por estatus" name="sort_status"/> + <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> + <menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml new file mode 100644 index 0000000000..51bd2c7208 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Ver la información" name="View Info"/> + <menu_item_call label="Chat" name="Chat"/> + <menu_item_call label="Llamar" name="Call"/> + <menu_item_call label="Activar" name="Activate"/> + <menu_item_call label="Dejar" name="Leave"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml new file mode 100644 index 0000000000..1bd3efb611 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/> + <menu_item_call label="Dejar el grupo seleccionado" name="Leave Selected Group"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml new file mode 100644 index 0000000000..88df983838 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Avatar Context Menu"> + <menu_item_call label="Ver el perfil" name="View Profile"/> + <menu_item_call label="Añadir como amigo" name="Add Friend"/> + <menu_item_call label="Quitarle como amigo" name="Remove Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Mapa" name="Map"/> + <menu_item_call label="Compartir" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/> + <menu_item_call label="Ofrecer teleporte" name="teleport"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml new file mode 100644 index 0000000000..b87d6c6deb --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Multi-Selected People Context Menu"> + <menu_item_call label="Añadir como amigos" name="Add Friends"/> + <menu_item_call label="Quitar amigos" name="Remove Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Llamada" name="Call"/> + <menu_item_call label="Compartir" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> +</context_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 new file mode 100644 index 0000000000..f0fe383c0c --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<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_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml new file mode 100644 index 0000000000..e4aaa89110 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Ordenar por los más recientes" name="sort_most"/> + <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> + <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> + <menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml new file mode 100644 index 0000000000..9da68d7c9b --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_picks.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Picks"> + <menu_item_call label="Información" name="pick_info"/> + <menu_item_call label="Editar" name="pick_edit"/> + <menu_item_call label="Teleportar" name="pick_teleport"/> + <menu_item_call label="Mapa" name="pick_map"/> + <menu_item_call label="Eliminar" name="pick_delete"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml new file mode 100644 index 0000000000..cc59bf1d29 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_picks_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="picks_plus_menu"> + <menu_item_call label="Destacado nuevo" name="create_pick"/> + <menu_item_call label="Clasificado nuevo" name="create_classified"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml new file mode 100644 index 0000000000..675f0699e9 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_place.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="place_overflow_menu"> + <menu_item_call label="Crear un hito" name="landmark"/> + <menu_item_call label="Crear un destacado" name="pick"/> + <menu_item_call label="Comprar un pase" name="pass"/> + <menu_item_call label="Editar" name="edit"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml new file mode 100644 index 0000000000..4b2f908a06 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_folder_gear"> + <menu_item_call label="Añadir una carpeta" name="add_folder"/> + <menu_item_call label="Añadir este hito" name="add_landmark"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml new file mode 100644 index 0000000000..bf46eb58e3 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_folder_gear"> + <menu_item_call label="Añadir este hito" name="add_landmark"/> + <menu_item_call label="Añadir una carpeta" name="add_folder"/> + <menu_item_call label="Cortar" name="cut"/> + <menu_item_call label="Copiar" name="copy_folder"/> + <menu_item_call label="Pegar" name="paste"/> + <menu_item_call label="Renombrar" name="rename"/> + <menu_item_call label="Borrar" name="delete"/> + <menu_item_call label="Abrir" name="expand"/> + <menu_item_call label="Cerrar" name="collapse"/> + <menu_item_call label="Abrir todas las carpetas" name="expand_all"/> + <menu_item_call label="Cerrar todas las carpetas" name="collapse_all"/> + <menu_item_check label="Ordenar por fecha" name="sort_by_date"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..eac85de846 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_ladmark_gear"> + <menu_item_call label="Teleportar" name="teleport"/> + <menu_item_call label="Más información" name="more_info"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Añadir un hito" name="add_landmark"/> + <menu_item_call label="Añadir una carpeta" name="add_folder"/> + <menu_item_call label="Cortar" name="cut"/> + <menu_item_call label="Copiar el hito" name="copy_landmark"/> + <menu_item_call label="Copiar la SLurl" name="copy_slurl"/> + <menu_item_call label="Pegar" name="paste"/> + <menu_item_call label="Renombrar" name="rename"/> + <menu_item_call label="Eliminar" name="delete"/> + <menu_item_call label="Abrir todas las carpetas" name="expand_all"/> + <menu_item_call label="Cerrar todas las carpetas" name="collapse_all"/> + <menu_item_check label="Ordenar por fecha" name="sort_by_date"/> + <menu_item_call label="Crear un Destacado" name="create_pick"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml new file mode 100644 index 0000000000..37ad29d8ec --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="profile_overflow_menu"> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Compartir" name="share"/> + <menu_item_call label="Ignorar" name="block"/> + <menu_item_call label="Designorar" name="unblock"/> + <menu_item_call label="Expulsar" name="kick"/> + <menu_item_call label="Congelar" name="freeze"/> + <menu_item_call label="Descongelar" name="unfreeze"/> + <menu_item_call label="CSR" name="csr"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml index 5c5900ae56..ca19acec6e 100644 --- a/indra/newview/skins/default/xui/es/menu_slurl.xml +++ b/indra/newview/skins/default/xui/es/menu_slurl.xml @@ -2,5 +2,5 @@ <menu name="Popup"> <menu_item_call label="Acerca de la URL" name="about_url"/> <menu_item_call label="Teleportar a la URL" name="teleport_to_url"/> - <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Mapa" name="show_on_map"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml new file mode 100644 index 0000000000..b708f3bc20 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Teleport History Gear Context Menu"> + <menu_item_call label="Abrir todas las carpetas" name="Expand all folders"/> + <menu_item_call label="Cerrar todas las carpetas" name="Collapse all folders"/> + <menu_item_call label="Limpiar el historial de teleportes" name="Clear Teleport History"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml new file mode 100644 index 0000000000..ed33c55aca --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Teleport History Item Context Menu"> + <menu_item_call label="Teleportarse" name="Teleport"/> + <menu_item_call label="Más información" name="More Information"/> + <menu_item_call label="Copiar al portapapeles" name="CopyToClipboard"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml new file mode 100644 index 0000000000..17e90422a5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Teleport History Item Context Menu"> + <menu_item_call label="Abrir" name="TabOpen"/> + <menu_item_call label="Cerrar" name="TabClose"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml new file mode 100644 index 0000000000..095e461734 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_text_editor.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Text editor context menu"> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Borrar" name="Delete"/> + <menu_item_call label="Seleccionar todo" name="Select All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml new file mode 100644 index 0000000000..a089c8f68e --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/> + <menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml new file mode 100644 index 0000000000..79374b9739 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_group.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar la información del grupo" name="show_group"/> + <menu_item_call label="Copiar el grupo al portapapeles" name="url_copy_label"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml new file mode 100644 index 0000000000..585c059ff3 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_http.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Abrir la página web" name="url_open"/> + <menu_item_call label="Abrir en el navegador incorporado" name="url_open_internal"/> + <menu_item_call label="Abrir en mi navegador" name="url_open_external"/> + <menu_item_call label="Copiar la URL al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml new file mode 100644 index 0000000000..13a8711c76 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_inventory.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar Ãtem del inventario" name="show_item"/> + <menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml new file mode 100644 index 0000000000..f96a0c7170 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_map.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Teleportarse a la localización" name="teleport_to_location"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml new file mode 100644 index 0000000000..8791a290af --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar la información del objeto" name="show_object"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/> + <menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml new file mode 100644 index 0000000000..9e789ef8ee --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_parcel.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar la información de la parcela" name="show_parcel"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml new file mode 100644 index 0000000000..7147dcd3cf --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_slapp.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Ejecutar este comando" name="run_slapp"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml new file mode 100644 index 0000000000..4ab47c2f61 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_slurl.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar la información del lugar" name="show_place"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Teleportarse a este lugar" name="teleport_to_location"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml new file mode 100644 index 0000000000..8f86a91be3 --- /dev/null +++ b/indra/newview/skins/default/xui/es/menu_url_teleport.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Teleportarse a este lugar" name="teleport"/> + <menu_item_call label="Mostrar en el mapa" name="show_on_map"/> + <menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index fdb6a92084..9c08fbb2c8 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -1,217 +1,322 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Main Menu"> - <menu name="Me"> + <menu label="Yo" name="Me"> <menu_item_call label="Preferencias" name="Preferences"/> - <menu_item_call name="Manage My Account"> - <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es" /> + <menu_item_call label="Mi panel de control" name="Manage My Account"> + <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/> </menu_item_call> + <menu_item_call label="Comprar L$" name="Buy and Sell L$"/> + <menu_item_call label="Mi perfil" name="Profile"/> + <menu_item_call label="Mi apariencia" name="Appearance"/> + <menu_item_check label="Mi Inventario" name="Inventory"/> + <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/> + <menu_item_check label="Mis gestos" name="Gestures"/> + <menu label="Mi estatus" name="Status"> + <menu_item_call label="Ausente" name="Set Away"/> + <menu_item_call label="Ocupado" name="Set Busy"/> + </menu> + <menu_item_call label="Solicitar estatus de Administrador" name="Request Admin Options"/> + <menu_item_call label="Dejar el estatus de Administrador" name="Leave Admin Options"/> + <menu_item_call label="Salir de [APP_NAME]" name="Quit"/> </menu> - <menu label="Archivo" name="File"> - <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/> - <menu label="Subir" name="upload"> - <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> - <menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/> - <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> - <menu_item_call label="Masiva ([COST] L$ por archivo)..." name="Bulk Upload"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Definir los permisos por defecto..." name="perm prefs"/> - </menu> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Cerrar la ventana" name="Close Window"/> - <menu_item_call label="Cerrar todas las ventanas" name="Close All Windows"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Guardar la textura como..." name="Save Texture As..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Hacer una foto" name="Take Snapshot"/> - <menu_item_call label="Guardar una foto" name="Snapshot to Disk"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Salir" name="Quit"/> - </menu> - <menu label="Editar" name="Edit"> - <menu_item_call label="Deshacer" name="Undo"/> - <menu_item_call label="Rehacer" name="Redo"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Cortar" name="Cut"/> - <menu_item_call label="Copiar" name="Copy"/> - <menu_item_call label="Pegar" name="Paste"/> - <menu_item_call label="Borrar" name="Delete"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Buscar..." name="Search..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Seleccionar todo" name="Select All"/> - <menu_item_call label="Deseleccionar" name="Deselect"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Duplicar" name="Duplicate"/> - <menu_item_separator label="-----------" name="separator5"/> - <menu label="Anexar el objeto" name="Attach Object"/> - <menu label="Quitarse el objeto" name="Detach Object"/> - <menu label="Quitarse ropa" name="Take Off Clothing"> - <menu_item_call label="Camisa" name="Shirt"/> - <menu_item_call label="Pantalones" name="Pants"/> - <menu_item_call label="Zapatos" name="Shoes"/> - <menu_item_call label="Calcetines" name="Socks"/> - <menu_item_call label="Chaqueta" name="Jacket"/> - <menu_item_call label="Guantes" name="Gloves"/> - <menu_item_call label="Camiseta" name="Menu Undershirt"/> - <menu_item_call label="Ropa interior" name="Menu Underpants"/> - <menu_item_call label="Falda" name="Skirt"/> - <menu_item_call label="Toda la ropa" name="All Clothes"/> - </menu> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Gestos..." name="Gestures..."/> - <menu_item_call label="Perfil..." name="Profile..."/> - <menu_item_call label="Apariencia..." name="Appearance..."/> - <menu_item_separator label="-----------" name="separator7"/> - <menu_item_check label="Amigos..." name="Friends..."/> - <menu_item_call label="Grupos..." name="Groups..."/> - <menu_item_separator label="-----------" name="separator8"/> - <menu_item_call label="Preferencias..." name="Preferences..."/> - </menu> - <menu label="Ver" name="View"> - <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/> - <menu_item_call label="Vista subjetiva" name="Mouselook"/> - <menu_item_check label="Construir" name="Build"/> - <menu_item_check label="Flycam del joystick" name="Joystick Flycam"/> - <menu_item_call label="Volver a la vista por defecto" name="Reset View"/> - <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Barra de herramientas" name="Toolbar"/> - <menu_item_check label="Chat" name="Chat History"/> - <menu_item_check label="Comunicarse" name="Instant Message"/> - <menu_item_check label="Inventario" name="Inventory"/> - <menu_item_check label="Participantes activos" name="Active Speakers"/> - <menu_item_check label="Lista de ignorados" name="Mute List"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_check label="Controles de la cámara" name="Camera Controls"/> - <menu_item_check label="Controles del movimiento" name="Movement Controls"/> - <menu_item_check label="Mapa del mundo" name="World Map"/> - <menu_item_check label="Minimapa" name="Mini-Map"/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_check label="EstadÃsticas" name="Statistics Bar"/> - <menu_item_check label="LÃmites de las parcelas" name="Property Lines"/> - <menu_item_check label="LÃneas de prohibición" name="Banlines"/> - <menu_item_check label="Propietarios del terreno" name="Land Owners"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu label="Información adicional" name="Hover Tips"> - <menu_item_check label="Mostrar información adicional." name="Show Tips"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Información adicional del terreno" name="Land Tips"/> - <menu_item_check label="Información adicional en todos los objetos" name="Tips On All Objects"/> - </menu> - <menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/> - <menu_item_check label="Balizas" name="beacons"/> - <menu_item_check label="Ocultar las partÃculas" name="Hide Particles"/> - <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments"/> - <menu_item_separator label="-----------" name="separator5"/> - <menu_item_call label="Acercar el zoom" name="Zoom In"/> - <menu_item_call label="Zoom predeterminado" name="Zoom Default"/> - <menu_item_call label="Alejar el zoom" name="Zoom Out"/> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Pantalla completa" name="Toggle Fullscreen"/> - <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/> + <menu label="Comunicarse" name="Communicate"> + <menu_item_call label="Mis amigos" name="My Friends"/> + <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> <menu label="Mundo" name="World"> - <menu_item_call label="Chat" name="Chat"/> - <menu_item_check label="Correr siempre" name="Always Run"/> - <menu_item_check label="Volar" name="Fly"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Crear aquà un hito" name="Create Landmark Here"/> + <menu_item_check label="Minimapa" name="Mini-Map"/> + <menu_item_check label="Mapa del mundo" name="World Map"/> + <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Crear un hito de este sitio" name="Create Landmark Here"/> + <menu label="Perfil del lugar" name="Land"> + <menu_item_call label="Acerca del terreno" name="About Land"/> + <menu_item_call label="Región/Estado" name="Region/Estate"/> + </menu> + <menu_item_call label="Comprar este terreno" name="Buy Land"/> + <menu_item_call label="Mi terreno" name="My Land"/> + <menu label="Mostrar" name="LandShow"> + <menu_item_check label="Controles del movimiento" name="Movement Controls"/> + <menu_item_check label="Controles de la cámara" name="Camera Controls"/> + <menu_item_check label="LÃneas de prohibición" name="Ban Lines"/> + <menu_item_check label="Balizas" name="beacons"/> + <menu_item_check label="LÃmites de las parcelas" name="Property Lines"/> + <menu_item_check label="Propietarios del terreno" name="Land Owners"/> + <menu_item_check label="Coordenadas" name="Coordinates"/> + <menu_item_check label="Propiedades de la parcela" name="Parcel Properties"/> + </menu> + <menu_item_call label="Teleportar a la Base" name="Teleport Home"/> <menu_item_call label="Fijar mi Base aquÃ" name="Set Home to Here"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Teleportar a mi Base" name="Teleport Home"/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Pasar al estado ausente" name="Set Away"/> - <menu_item_call label="Pasar al estado ocupado" name="Set Busy"/> - <menu_item_call label="Parar la animación de mi avatar" name="Stop Animating My Avatar"/> - <menu_item_call label="Recuperar las teclas" name="Release Keys"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Historial de mi cuenta..." name="Account History..."> - <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=es"/> - </menu_item_call> - <menu_item_call label="Administrar mi cuenta..." name="Manage My Account..."> - <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/> - </menu_item_call> - <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/> - <menu_item_separator label="-----------" name="separator5"/> - <menu_item_call label="Mi terreno..." name="My Land..."/> - <menu_item_call label="Acerca del terreno..." name="About Land..."/> - <menu_item_call label="Comprar terreno..." name="Buy Land..."/> - <menu_item_call label="Region/Estado..." name="Region/Estate..."/> - <menu_item_separator label="-----------" name="separator6"/> - <menu label="Configuración del entorno" name="Environment Settings"> + <menu label="Sol" name="Environment Settings"> <menu_item_call label="Amanecer" name="Sunrise"/> <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="Volver a los valores por defecto de la región" name="Revert to Region Default"/> - <menu_item_separator label="-----------" name="separator"/> + <menu_item_call label="Hora del Estado" name="Revert to Region Default"/> <menu_item_call label="Editor del entorno" name="Environment Editor"/> </menu> </menu> - <menu label="Herramientas" name="Tools"> - <menu label="Elegir una herramienta" name="Select Tool"> - <menu_item_call label="Visión" name="Focus"/> - <menu_item_call label="Moverse" name="Move"/> - <menu_item_call label="Modificar" name="Edit"/> - <menu_item_call label="Crear" name="Create"/> - <menu_item_call label="Terreno" name="Land"/> - </menu> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/> - <menu_item_check label="Seleccionar sólo objetos movibles" name="Select Only Movable Objects"/> - <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/> - <menu_item_check label="Al seleccionar, mostrar los ocultos" name="Show Hidden Selection"/> - <menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/> - <menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_check label="Ajustar a la cuadrÃcula" name="Snap to Grid"/> - <menu_item_call label="Ajustar a la cuadrÃcula los ejes X e Y" name="Snap Object XY to Grid"/> - <menu_item_call label="Usar lo seleccionado como cuadrÃcula" name="Use Selection for Grid"/> - <menu_item_call label="Opciones de la cuadrÃcula..." name="Grid Options..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/> + <menu label="Construir" name="BuildTools"> + <menu_item_check label="Construir" name="Show Build Tools"/> + <menu label="Seleccionar la herramienta de construcción" name="Select Tool"> + <menu_item_call label="Herramienta Visión" name="Focus"/> + <menu_item_call label="Herramienta Mover" name="Move"/> + <menu_item_call label="Herramienta Editar" name="Edit"/> + <menu_item_call label="Herramienta Crear" name="Create"/> + <menu_item_call label="Herramienta Terreno" name="Land"/> + </menu> + <menu label="Editar" name="Edit"> + <menu_item_call label="Deshacer" name="Undo"/> + <menu_item_call label="Rehacer" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Eliminar" name="Delete"/> + <menu_item_call label="Duplicar" name="Duplicate"/> + <menu_item_call label="Seleccionar todo" name="Select All"/> + <menu_item_call label="Deseleccionar" name="Deselect"/> + </menu> <menu_item_call label="Enlazar" name="Link"/> <menu_item_call label="Desenlazar" name="Unlink"/> - <menu_item_separator label="-----------" name="separator4"/> + <menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/> <menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/> <menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/> - <menu_item_call label="Comprar el objeto" name="Menu Object Take"> - <on_enable userdata="Comprar el objeto,Coger el objeto" name="EnableBuyOrTake"/> - </menu_item_call> - <menu_item_call label="Coger una copia" name="Take Copy"/> - <menu_item_call label="Devolver una copia del objeto a los contenidos de donde salió" name="Save Object Back to Object Contents"/> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Ver en una ventana los errores o alertas de los scripts" name="Show Script Warning/Error Window"/> - <menu label="Recompilar los scripts en lo seleccionado" name="Recompile Scripts in Selection"> - <menu_item_call label="Mono" name="Mono"/> - <menu_item_call label="LSL" name="LSL"/> - </menu> - <menu_item_call label="Reiniciar los scripts en lo seleccionado" name="Reset Scripts in Selection"/> - <menu_item_call label="Definir los scripts a ejecutar en lo seleccionado" name="Set Scripts to Running in Selection"/> - <menu_item_call label="Definir los scripts a no ejecutar en lo seleccionado" name="Set Scripts to Not Running in Selection"/> + <menu label="Objeto" name="Object"> + <menu_item_call label="Comprar" name="Menu Object Buy"/> + <menu_item_call label="Tomar" name="Menu Object Take"/> + <menu_item_call label="Coger una copia" name="Take Copy"/> + <menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/> + <menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/> + </menu> + <menu label="Scripts" name="Scripts"> + <menu_item_call label="Recompilar los scripts (Mono)" name="Mono"/> + <menu_item_call label="Recompilar los scripts (LSL)" name="LSL"/> + <menu_item_call label="Reiniciar los scripts" name="Reset Scripts"/> + <menu_item_call label="Definir los scripts a ejecutar" name="Set Scripts to Running"/> + <menu_item_call label="Configurar scripts como no ejecutándose" name="Set Scripts to Not Running"/> + </menu> + <menu label="Opciones" name="Options"> + <menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/> + <menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/> + <menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/> + <menu_item_check label="Seleccionar sólo los objetos movibles" name="Select Only Movable Objects"/> + <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/> + <menu_item_check label="Al seleccionar, mostrar lo oculto" name="Show Hidden Selection"/> + <menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/> + <menu_item_check label="Mostrar el rayo indicador" name="Show Selection Beam"/> + <menu_item_check label="Ajustar a la cuadrÃcula" name="Snap to Grid"/> + <menu_item_call label="Ajustar a la cuadrÃcula los ejes X e Y" name="Snap Object XY to Grid"/> + <menu_item_call label="Usar lo seleccionado como cuadrÃcula" name="Use Selection for Grid"/> + <menu_item_call label="Opciones de la cuadrÃcula" name="Grid Options"/> + </menu> + <menu label="Seleccionar las partes enlazadas" name="Select Linked Parts"> + <menu_item_call label="Seleccionar la parte siguiente" name="Select Next Part"/> + <menu_item_call label="Seleccionar la parte previa" name="Select Previous Part"/> + <menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/> + <menu_item_call label="Incluir la parte previa" name="Include Previous Part"/> + </menu> </menu> <menu label="Ayuda" name="Help"> <menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Tutorial" name="Tutorial"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Blog oficial..." name="Official Linden Blog..."/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Portal de programación..." name="Scripting Portal..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Denunciar una infracción..." name="Report Abuse..."/> - <menu_item_call label="Choques, empujones, e impactos..." name="Bumps, Pushes &amp; Hits..."/> - <menu_item_call label="Medidor del lag" name="Lag Meter"/> - <menu_item_separator label="-----------" name="separator7"/> - <menu label="Informes de fallos" name="Bug Reporting"> - <menu_item_call label="Public Issue Tracker..." name="Public Issue Tracker..."/> - <menu_item_call label="Ayuda del Public Issue Tracker..." name="Publc Issue Tracker Help..."/> - <menu_item_separator label="-----------" name="separator7"/> - <menu_item_call label="Informes de fallos - instrucciones..." name="Bug Reporing 101..."/> - <menu_item_call label="Problemas de seguridad..." name="Security Issues..."/> - <menu_item_call label="Wiki QA..." name="QA Wiki..."/> - <menu_item_separator label="-----------" name="separator9"/> - <menu_item_call label="Informar de un fallo..." name="Report Bug..."/> - </menu> - <menu_item_call label="Acerca de [APP_NAME]..." name="About Second Life..."/> + <menu_item_call label="Denunciar una infracción" name="Report Abuse"/> + <menu_item_call label="Informar de un fallo" name="Report Bug"/> + </menu> + <menu label="Avanzado" name="Advanced"> + <menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/> + <menu_item_call label="Recargar las texturas" name="Rebake Texture"/> + <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/> + <menu_item_call label="Definir el tamaño de la ventana..." name="Set Window Size..."/> + <menu_item_check label="Limitar la distancia para Seleccionar" name="Limit Select Distance"/> + <menu_item_check label="Desactivar los lÃmites de la cámara" name="Disable Camera Distance"/> + <menu_item_check label="Foto en Alta Resolución" name="HighResSnapshot"/> + <menu_item_check label="Silenciar el Guardar una foto" name="QuietSnapshotsToDisk"/> + <menu_item_check label="Comprimir las fotos para el disco duro" name="CompressSnapshotsToDisk"/> + <menu label="Herramientas de rendimiento" name="Performance Tools"> + <menu_item_call label="Medidor de lag" name="Lag Meter"/> + <menu_item_check label="EstadÃsticas" name="Statistics Bar"/> + <menu_item_check label="Mostrar cuánto cuesta renderizar el avatar" name="Avatar Rendering Cost"/> + </menu> + <menu label="Realzando y Visibilidad" name="Highlighting and Visibility"> + <menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/> + <menu_item_check label="Ocultar las partÃculas" name="Hide Particles"/> + <menu_item_check label="Ocultar lo seleccionado" name="Hide Selected"/> + <menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/> + <menu_item_check label="Mostrar los HUD anexados" name="Show HUD Attachments"/> + <menu_item_check label="Mostrar el Punto de Mira en la vista subjetiva" name="ShowCrosshairs"/> + <menu_item_check label="Mostrar información complementaria del terreno" name="Land Tips"/> + </menu> + <menu label="Objetos representados" name="Rendering Types"> + <menu_item_check label="Simple" name="Simple"/> + <menu_item_check label="Alfa" name="Alpha"/> + <menu_item_check label="Ãrbol" name="Tree"/> + <menu_item_check label="Avatares" name="Character"/> + <menu_item_check label="Superficie del terreno" name="SurfacePath"/> + <menu_item_check label="Cielo" name="Sky"/> + <menu_item_check label="Agua" name="Water"/> + <menu_item_check label="Terreno" name="Ground"/> + <menu_item_check label="volumen" name="Volume"/> + <menu_item_check label="Hierba" name="Grass"/> + <menu_item_check label="Nubes" name="Clouds"/> + <menu_item_check label="PartÃculas" name="Particles"/> + <menu_item_check label="Efectos de relieve" name="Bump"/> + </menu> + <menu label="Rasgos renderizados" name="Rendering Features"> + <menu_item_check label="UI" name="UI"/> + <menu_item_check label="Seleccionado" name="Selected"/> + <menu_item_check label="Realzados" name="Highlighted"/> + <menu_item_check label="Texturas dinámicas" name="Dynamic Textures"/> + <menu_item_check label="Huellas" name="Foot Shadows"/> + <menu_item_check label="Niebla" name="Fog"/> + <menu_item_check label="Objetos flexibles" name="Flexible Objects"/> + </menu> + <menu_item_check label="Ejecutar múltiples temas" name="Run Multiple Threads"/> + <menu_item_call label="Vaciar la caché de grupo" name="ClearGroupCache"/> + <menu_item_check label="Vista subjetiva suavizada" name="Mouse Smoothing"/> + <menu label="Atajos de teclado" name="Shortcuts"> + <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> + <menu_item_check label="Buscar" name="Search"/> + <menu_item_call label="Recuperar las teclas" name="Release Keys"/> + <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/> + <menu_item_check label="Correr siempre" name="Always Run"/> + <menu_item_check label="Volar" name="Fly"/> + <menu_item_call label="Cerrar la ventana" name="Close Window"/> + <menu_item_call label="Cerrar todas las ventanas" name="Close All Windows"/> + <menu_item_call label="Guardar una foto" name="Snapshot to Disk"/> + <menu_item_call label="Vista subjetiva" name="Mouselook"/> + <menu_item_check label="Flycam del joystick" name="Joystick Flycam"/> + <menu_item_call label="Volver a la vista por defecto" name="Reset View"/> + <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter"/> + <menu label="Seleccionar la herramienta de construcción" name="Select Tool"> + <menu_item_call label="Herramienta Visión" name="Focus"/> + <menu_item_call label="Herramienta Mover" name="Move"/> + <menu_item_call label="Herramienta Editar" name="Edit"/> + <menu_item_call label="Herramienta Crear" name="Create"/> + <menu_item_call label="Herramienta Terreno" name="Land"/> + </menu> + <menu_item_call label="Acercar el zoom" name="Zoom In"/> + <menu_item_call label="Zoom por defecto" name="Zoom Default"/> + <menu_item_call label="Alejar el zoom" name="Zoom Out"/> + <menu_item_call label="Pantalla completa" name="Toggle Fullscreen"/> + </menu> + <menu_item_call label="Mostrar las configuraciones del depurador" name="Debug Settings"/> + <menu_item_check label="Mostrar el menú Desarrollar" name="Debug Mode"/> + </menu> + <menu label="Develop" name="Develop"> + <menu label="Consoles" name="Consoles"> + <menu_item_check label="Texture Console" name="Texture Console"/> + <menu_item_check label="Debug Console" name="Debug Console"/> + <menu_item_call label="Notifications Console" name="Notifications"/> + <menu_item_check label="Texture Size Console" name="Texture Size"/> + <menu_item_check label="Texture Category Console" name="Texture Category"/> + <menu_item_check label="Fast Timers" name="Fast Timers"/> + <menu_item_check label="Memory" name="Memory"/> + <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/> + <menu_item_check label="Camera" name="Camera"/> + <menu_item_check label="Wind" name="Wind"/> + <menu_item_check label="Badge" name="Badge"/> + </menu> + <menu label="Show Info" name="Display Info"> + <menu_item_check label="Show Time" name="Show Time"/> + <menu_item_check label="Show Render Info" name="Show Render Info"/> + <menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/> + <menu_item_check label="Show Updates to Objects" name="Show Updates"/> + </menu> + <menu label="Force an Error" name="Force Errors"> + <menu_item_call label="Force Breakpoint" name="Force Breakpoint"/> + <menu_item_call label="FForce LLError And Crash" name="Force LLError And Crash"/> + <menu_item_call label="Force Bad Memory Access" name="Force Bad Memory Access"/> + <menu_item_call label="Force an Infinite Loop" name="Force Infinite Loop"/> + <menu_item_call label="Force Driver Crash" name="Force Driver Carsh"/> + <menu_item_call label="Force Software Exception" name="Force Software Exception"/> + <menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"/> + <menu_item_call label="Simulate a Memory Leak" name="Memory Leaking Simulation"/> + </menu> + <menu label="Render Tests" name="Render Tests"> + <menu_item_check label="Camera Offset" name="Camera Offset"/> + <menu_item_check label="Randomize Framerate" name="Randomize Framerate"/> + <menu_item_check label="Frame Test" name="Frame Test"/> + </menu> + <menu label="Rendering" name="Rendering"> + <menu_item_check label="Ejes" name="Axes"/> + <menu_item_check label="Wireframe" name="Wireframe"/> + <menu_item_check label="Global Illumination" name="Global Illumination"/> + <menu_item_check label="Animation Textures" name="Animation Textures"/> + <menu_item_check label="Disable Textures" name="Disable Textures"/> + <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> + <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> + <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> + </menu> + <menu label="Red" name="Network"> + <menu_item_check label="Pause Avatar" name="AgentPause"/> + <menu_item_call label="Drop a Packet" name="Drop a Packet"/> + </menu> + <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/> + <menu label="World" name="World"> + <menu_item_check label="Region Sun Override" name="Sim Sun Override"/> + <menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/> + <menu_item_check label="Fixed Weather" name="Fixed Weather"/> + <menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/> + </menu> + <menu label="UI" name="UI"> + <menu_item_call label="Web Browser Test" name="Web Browser Test"/> + <menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/> + <menu_item_call label="Memory Stats" name="Memory Stats"/> + <menu_item_check label="Double-Click Auto-Pilot" name="Double-ClickAuto-Pilot"/> + <menu_item_check label="Debug Clicks" name="Debug Clicks"/> + <menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/> + </menu> + <menu label="XUI" name="XUI"> + <menu_item_call label="Reload Color Settings" name="Reload Color Settings"/> + <menu_item_call label="Show Font Test" name="Show Font Test"/> + <menu_item_call label="Load from XML" name="Load from XML"/> + <menu_item_call label="Save to XML" name="Save to XML"/> + <menu_item_check label="Show XUI Names" name="Show XUI Names"/> + <menu_item_call label="Send Test IMs" name="Send Test IMs"/> + </menu> + <menu label="Avatar" name="Character"> + <menu label="Grab Baked Texture" name="Grab Baked Texture"> + <menu_item_call label="Iris" name="Iris"/> + <menu_item_call label="Cabeza" name="Head"/> + <menu_item_call label="Upper Body" name="Upper Body"/> + <menu_item_call label="Lower Body" name="Lower Body"/> + <menu_item_call label="Falda" name="Skirt"/> + </menu> + <menu label="Character Tests" name="Character Tests"> + <menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/> + <menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/> + </menu> + <menu_item_call label="Force Params to Default" name="Force Params to Default"/> + <menu_item_check label="Animation Info" name="Animation Info"/> + <menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/> + <menu_item_check label="Disable Level Of Detail" name="Disable LOD"/> + <menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/> + <menu_item_check label="Display Agent Target" name="Display Agent Target"/> + <menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/> + </menu> + <menu_item_check label="HTTP Textures" name="HTTP Textures"/> + <menu_item_check label="Console Window on next Run" name="Console Window"/> + <menu_item_check label="Show Admin Menu" name="View Admin Options"/> + <menu_item_call label="Solicitar estatus de Administrador" name="Request Admin Options"/> + <menu_item_call label="Dejar el estatus de Administrador" name="Leave Admin Options"/> + </menu> + <menu label="Admin" name="Admin"> + <menu label="Object"> + <menu_item_call label="Coger una copia" name="Take Copy"/> + <menu_item_call label="Force Owner To Me" name="Force Owner To Me"/> + <menu_item_call label="Force Owner Permissive" name="Force Owner Permissive"/> + <menu_item_call label="Eliminar" name="Delete"/> + <menu_item_call label="Lock" name="Lock"/> + </menu> + <menu label="Parcel" name="Parcel"> + <menu_item_call label="Force Owner To Me" name="Owner To Me"/> + <menu_item_call label="Set to Linden Content" name="Set to Linden Content"/> + <menu_item_call label="Claim Public Land" name="Claim Public Land"/> + </menu> + <menu label="Región" name="Region"> + <menu_item_call label="Dump Temporary Asset Data" name="Dump Temp Asset Data"/> + <menu_item_call label="Save Region State" name="Save Region State"/> + </menu> + <menu_item_call label="God Tools" name="God Tools"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml new file mode 100644 index 0000000000..77d05934f4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Contenido web + </label> + <tooltip name="web_tooltip"> + Este sitio tiene contenido web + </tooltip> + <playtip name="web_playtip"> + Mostrar el contenido web + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + PelÃcula + </label> + <tooltip name="movie_tooltip"> + Aquà puede verse una pelÃcula + </tooltip> + <playtip name="movie_playtip"> + Ver la pelÃcula + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Imagen + </label> + <tooltip name="image_tooltip"> + En este sitio hay una imagen + </tooltip> + <playtip name="image_playtip"> + Ver la imagen de esta localización + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <tooltip name="audio_tooltip"> + En este sitio hay audio + </tooltip> + <playtip name="audio_playtip"> + OÃr el audio de este sitio + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Streaming en 'Real Time' + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - VacÃo - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - VacÃo - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + VÃdeo + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Imagen + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + PelÃcula (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Audio/VÃdeo Ogg + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Documento PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Documento Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Texto enriquecido (RTF) + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Synchronized Multimedia Integration Language (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Página web (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Imagen (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Imagen (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Imagen (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Imagen (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Imagen (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Imagen (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Página web + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Texto + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + PelÃcula (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + PelÃcula (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + PelÃcula (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + PelÃcula (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + PelÃcula (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + PelÃcula (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml new file mode 100644 index 0000000000..77d05934f4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Contenido web + </label> + <tooltip name="web_tooltip"> + Este sitio tiene contenido web + </tooltip> + <playtip name="web_playtip"> + Mostrar el contenido web + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + PelÃcula + </label> + <tooltip name="movie_tooltip"> + Aquà puede verse una pelÃcula + </tooltip> + <playtip name="movie_playtip"> + Ver la pelÃcula + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Imagen + </label> + <tooltip name="image_tooltip"> + En este sitio hay una imagen + </tooltip> + <playtip name="image_playtip"> + Ver la imagen de esta localización + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <tooltip name="audio_tooltip"> + En este sitio hay audio + </tooltip> + <playtip name="audio_playtip"> + OÃr el audio de este sitio + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Streaming en 'Real Time' + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - VacÃo - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - VacÃo - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + VÃdeo + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Imagen + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + PelÃcula (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Audio/VÃdeo Ogg + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Documento PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Documento Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Texto enriquecido (RTF) + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Synchronized Multimedia Integration Language (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Página web (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Imagen (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Imagen (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Imagen (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Imagen (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Imagen (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Imagen (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Página web + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Texto + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + PelÃcula (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + PelÃcula (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + PelÃcula (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + PelÃcula (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + PelÃcula (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + PelÃcula (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 6b58bbea47..f99bb277cb 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -9,74 +9,45 @@ <global name="implicitclosebutton"> Cerrar </global> - <template name="okbutton"> - <form> - <button - name="OK" - text="$yestext"/> - </form> - </template> - - <template name="okignore"> - <form> - <button - name="OK" - text="$yestext"/> - <ignore text="$ignoretext"/> - </form> - </template> - - <template name="okcancelbuttons"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Cancel" - text="$notext"/> - </form> - </template> - - <template name="okcancelignore"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Cancel" - text="$notext"/> - <ignore text="$ignoretext"/> - </form> - </template> - - <template name="okhelpbuttons"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Help" - text="$helptext"/> - </form> - </template> - - <template name="yesnocancelbuttons"> - <form> - <button - name="Yes" - text="$yestext"/> - <button - name="No" - text="$notext"/> - <button - name="Cancel" - text="$canceltext"/> - </form> - </template> - <notification functor="GenericAcknowledge" label="Mensaje de alerta desconocida" name="MissingAlert"> - Su versión de [APP_NAME] no sabe cómo mostrar el mensaje de alerta que acaba de recibir. - -Detalles del error: no se ha encontrado en notifications.xml la alerta llamada '[_NAME]'. + <template name="okbutton"> + <form> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> + </form> + </template> + <template name="okcancelbuttons"> + <form> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> + </form> + </template> + <template name="okhelpbuttons"> + <form> + <button name="OK_okhelpbuttons" text="$yestext"/> + <button name="Help" text="$helptext"/> + </form> + </template> + <template name="yesnocancelbuttons"> + <form> + <button name="Yes" text="$yestext"/> + <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> + </form> + </template> + <notification functor="GenericAcknowledge" label="Mensaje de notificación desconocida" name="MissingAlert"> + Tu versión de [APP_NAME] no sabe cómo mostrar la notificación que acaba de recibir. Por favor, comprueba que tienes instalado el último Visor. + +Detalles del error: la notificación de nombre '[_NAME]' no se ha encontrado en notifications.xml. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FloaterNotFound"> @@ -97,24 +68,18 @@ Detalles del error: no se ha encontrado en notifications.xml la alerta llamada & <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="SÃ"/> </notification> <notification name="BadInstallation"> - Ha habido un error al actualizar [APP_NAME]. Por favor, descargue la última versión desde secondlife.com. - <usetemplate - name="okbutton" - yestext="OK"/> + Ha habido un error actualizando [APP_NAME]. Por favor, [http://get.secondlife.com descarga la última versión] del Visor. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LoginFailedNoNetwork"> - Error de red: no se ha podido conectar. + No se puede conectar con [SECOND_LIFE_GRID]. '[DIAGNOSTIC]' -Por favor, revise su conexión a internet. - <usetemplate - name="okbutton" - yestext="OK"/> +Asegúrate de que tu conexión a internet está funcionando adecuadamente. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MessageTemplateNotFound"> No se ha encontrado la plantilla de mensaje [PATH]. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="WearableSave"> ¿Guardar los cambios en las ropas o partes del cuerpo actuales? @@ -139,12 +104,18 @@ Por favor, revise su conexión a internet. ¿Guardar todos los cambios en la ropa y partes del cuerpo? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No guardarlos" yestext="Guardarlos todos"/> </notification> + <notification name="FriendsAndGroupsOnly"> + Quienes no sean tus amigos no sabrán que has elegido ignorar sus llamadas y mensajes instantáneos. + <usetemplate name="okbutton" yestext="SÃ"/> + </notification> <notification name="GrantModifyRights"> - Al conceder derechos de modificación a otro residente le autoriza a cambiar, borrar, o coger CUALQUIER objeto que usted tenga en el mundo. Sea MUY cuidadoso dando este permiso. ¿Quiere conceder derechos de modificación a [FIRST_NAME] [LAST_NAME]? + Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso. +¿Quieres conceder permisos de modificación a [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/> </notification> <notification name="GrantModifyRightsMultiple"> - Al conceder derechos de modificación a otros residentes les autoriza a cambiar, borrar, o coger CUALQUIER objeto que usted tenga en el mundo. Sea MUY cuidadoso dando este permiso. ¿Quiere conceder derechos de modificación a los residentes seleccionados? + Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso. +¿Quieres conceder permisos de modificación a los Residentes elegidos? <usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/> </notification> <notification name="RevokeModifyRights"> @@ -173,7 +144,7 @@ Por favor, revise su conexión a internet. Va a añadir miembros al rol de [ROLE_NAME]. No podrá removérseles de ese rol, sino que deberán renunciar a él por sà mismos. ¿Está seguro de que quiere seguir? - <usetemplate ignoretext="Cuando se añaden miembros del grupo al rol de propietario" name="okcancelignore" notext="No" yestext="SÃ"/> + <usetemplate ignoretext="Confirmar que vas a añadir un nuevo propietario al grupo" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="AssignDangerousActionWarning"> Va a añadir la capacidad '[ACTION_NAME]' al rol '[ROLE_NAME]'. @@ -191,68 +162,31 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sà mi ¿Añadir esta capacidad a '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/> </notification> - <notification name="ClickPublishHelpLand"> - Seleccionar 'Publicar en la web' -Marcando este Ãtem, se mostrará: -- esta parcela en los resultados de la búsqueda -- los objetos públicos de esta parcela -- esta parcela en la búsqueda de la web - </notification> - <notification name="ClickSoundHelpLand"> - Los media y la música sólo pueden disfrutarse dentro de la parcela. Según el nivel de calificación de los residentes, las opciones de sonido y de voz pueden ceñirse a la parcela u oÃrse fuera de ella. ¿Quiere ir a la Base de Conocimientos para aprender más sobre cómo configurar estas opciones? - <url name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=5046 - </url> - <usetemplate - name="okcancelbuttons" - yestext="Ir a la Base de Conocimientos" - notext="Cerrar" /> - </notification> - <notification name="ClickSearchHelpAll"> - Los resultados de la búsqueda se organizan según la pestaña en que esté, su nivel de calificación, la categorÃa elegida, y otros factores. Para más detalles, vea, por favor, la Base de Conocimientos. - <url name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4722 - </url> - <usetemplate - name="okcancelbuttons" - yestext="Ir a la Base de Conocimientos" - notext="Cerrar" /> - </notification> - <notification name="ClickPublishHelpLandDisabled"> - No puede hacer que esta parcela aparezca en la búsqueda, porque está situada en una región que lo prohÃbe. - </notification> - <notification name="ClickPublishHelpAvatar"> - Al seleccionar 'Mostrar en la búsqueda' se mostrará: -- mi perfil en los resultados de la búsqueda -- un enlace a mi perfil en las páginas públicas de grupo - </notification> - <notification name="ClickPartnerHelpAvatar"> - Puede proponérselo a otro residente o disolver su relación con un/a compañero/a en el sitio web de [SECOND_LIFE]. - -¿Ir al sitio web de [SECOND_LIFE] para tener más información sobre este asunto? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir a la página"/> - </notification> - <notification name="ClickUploadHelpPermissions"> - Sus permisos por defecto no funcionarán en regiones antiguas. - </notification> - <notification name="ClickWebProfileHelpAvatar"> - Si este residente ha indicado una URL para mostrar un perfil en la web, usted puede: - * Pulsar 'Cargar' para ver la página en esta pestaña web. - * Pulsar Cargar > 'En un navegador externo' para ver la página en su navegador por defecto. - * Pulsar Cargar > 'URL Inicio' para volver al perfil en la web de este residente si usted ha estado navegando por otros sitios. - -Cuando esté viendo su propio perfil, puede introducir cualquier URL como su perfil web, y pulsar OK para fijarla. -Los demás residentes podrán visitar la URL que usted haya elegido cuando vean su perfil. + <notification name="AttachmentDrop"> + Vas a soltar tu anexado. + ¿Estás seguro de que quieres continuar? + <usetemplate ignoretext="Confirmar antes de soltar anexados" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="JoinGroupCanAfford"> Entrar a este grupo cuesta [COST] L$. ¿Quiere hacerlo?? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/> </notification> + <notification name="JoinGroupNoCost"> + Vas a entrar al grupo [NAME]. +¿Quieres seguir? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/> + </notification> <notification name="JoinGroupCannotAfford"> Entrar a este grupo cuesta [COST] L$. No tiene dinero suficiente para entrar. </notification> + <notification name="CreateGroupCost"> + Crear este grupo te costará 100 L$. +Los grupos necesitan más de un miembro. Si no, son borrados permanentemente. +Por favor, invita a miembros en las próximas 48 horas. + <usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Crear un grupo por 100 L$"/> + </notification> <notification name="LandBuyPass"> Por [COST] L$ puede entrar a este terreno ('[PARCEL_NAME]') durante [TIME] horas. ¿Comprar un pase? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> @@ -267,10 +201,10 @@ Su precio de venta será de [SALE_PRICE] L$, y se autorizará la compra sólo a <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> - ATENCIÓN: Al pulsar 'vender a cualquiera', su terreno estará disponible para toda la comunidad de [SECOND_LIFE], incluso para quienes no están en esta región. + ATENCIÓN: Marcando 'vender a cualquiera' hace que tu terreno esté disponible para toda la comunidad de [SECOND_LIFE], incluso para quienes no están en esta región. -Los [LAND_SIZE] m² de terreno seleccionados se van a poner a la venta. -Su precio de venta será de [SALE_PRICE] L$, y se autorizará la compra a [NAME]. +Los [LAND_SIZE] m² seleccionados de terreno se van a poner a la venta. +El precio de venta será de [SALE_PRICE] L$ y se autoriza la compra a [NAME]. <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> @@ -330,6 +264,12 @@ Objetos: [N] Toda esta región tiene activado el 'daño'. Para que funcionen las armas los scripts deben estar activados. </notification> + <notification name="MultipleFacesSelected"> + Están seleccionadas varias caras. +Si sigues con esta acción, en las diferentes caras del objeto aparecerán distintas peticiones de los media. +Para colocar los media en una sola cara, marca la opción Elegir la cara y pulsa en la cara adecuada del objeto, y luego pulsa Añadir. + <usetemplate ignoretext="Los media se configurarán en las varias caras seleccionadas" name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> <notification name="MustBeInParcel"> Para configurar el Punto de llegada de la parcela, debe estar usted dentro de ella. @@ -366,6 +306,10 @@ La carpeta del vestuario contiene partes del cuerpo, u objetos a anexar o que no <notification name="CannotWearTrash"> No puede vestirse ropas o partes del cuerpo que están en la Papelera </notification> + <notification name="MaxAttachmentsOnOutfit"> + No se puede anexar el objeto. +Se ha superado el lÃmite máximo de [MAX_ATTACHMENTS] objetos. Por favor, quÃtate alguno. + </notification> <notification name="CannotWearInfoNotComplete"> No puede vestirse este Ãtem porque aún no se ha cargado. Por favor, reinténtelo en un minuto. </notification> @@ -380,21 +324,30 @@ Necesita una cuenta para entrar en [SECOND_LIFE]. ¿Quiere crear una ahora? <usetemplate name="okcancelbuttons" notext="Volver a intentarlo" yestext="Crear una cuenta nueva"/> </notification> <notification name="AddClassified"> - Los anuncios clasificados aparecen durante una semana en la sección 'Clasificados' del directorio Buscar y en [http://secondlife.com/community/classifieds/?lang=es-ES secondlife.com]. -Rellene su anuncio y pulse 'Publicar...' para añadirlo al directorio. -Cuando pulse Publicar, se le preguntará por un precio a pagar. -El pagar más hará que su anuncio aparezca más arriba en la lista, y que también aparezca más arriba cuando la gente busque por palabras clave. - <usetemplate ignoretext="Cuando se añade un nuevo Clasificado" name="okcancelignore" notext="Cancelar" yestext="OK"/> + Los anuncios clasificados aparecen durante una semana en la sección 'Clasificados' de la búsqueda y en [http://secondlife.com/community/classifieds secondlife.com]. +Rellena tu anuncio y pulsa 'Publicar...' para añadirlo al directorio. +Cuando pulses Publicar, se te preguntará por un precio a pagar. +El pagar más hará que tu anuncio aparezca más arriba en la lista, y que también aparezca más arriba en la lista cuando la gente busque por palabras clave. + <usetemplate ignoretext="Cómo crear un anuncio clasificado nuevo." name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="DeleteClassified"> ¿Borrar el clasificado '[NAME]'? No se reembolsan las cuotas pagadas. <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> + <notification name="DeleteMedia"> + Has elegido borrar los media asociados a esta cara. +¿Estás seguro de que quieres continuar? + <usetemplate ignoretext="Confirmar antes de borrar los media de un objeto" name="okcancelignore" notext="No" yestext="SÃ"/> + </notification> <notification name="ClassifiedSave"> ¿Guardar los cambios en el clasificado [NAME]? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No guardar" yestext="Guardar"/> </notification> + <notification name="ClassifiedInsufficientFunds"> + Dinero insuficiente para crear un clasificado. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DeleteAvatarPick"> ¿Borrar el destacado [PICK]? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> @@ -412,26 +365,18 @@ No se reembolsan las cuotas pagadas. <notification name="SelectHistoryItemToView"> Por favor, seleccione un Ãtem del historial para verlo. </notification> - <notification name="ResetShowNextTimeDialogs"> - ¿Quiere reactivar todas estas ventanas emergentes, incluso las que marcó previamente como 'No mostrarme más esto'? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> - </notification> - <notification name="SkipShowNextTimeDialogs"> - ¿Quiere activar todas las ventanas emergentes que puedan habilitarse? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> - </notification> <notification name="CacheWillClear"> - La caché se limpiará cuando reinicie [APP_NAME]. + La caché se limpiará cuando reinices [APP_NAME]. </notification> <notification name="CacheWillBeMoved"> - La caché se moverá cuando reinicie [APP_NAME]. -Nota: esto limpiará la caché. + La caché se moverá cuando reinicies [APP_NAME]. +Nota: esto vaciará la caché. </notification> <notification name="ChangeConnectionPort"> - Las configuraciones del puerto tendrán efecto cuando reinicie [APP_NAME]. + La configuración del puerto tendrá efecto cuando reinicies [APP_NAME]. </notification> <notification name="ChangeSkin"> - La nueva apariencia se verá cuando reinicie [APP_NAME]. + La nueva apariencia la verás cuando reinicies [APP_NAME]. </notification> <notification name="GoToAuctionPage"> ¿Ir a la página web de [SECOND_LIFE] para ver los detalles de la subasta @@ -480,6 +425,11 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range& <notification name="SaveBytecodeFailReason"> Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, reintente guardarlo más tarde.. </notification> + <notification name="StartRegionEmpty"> + Perdon, no está definida tu Posición inicial. +Por favor, escribe el nombre de la región en el cajetÃn de Posición inicial, o elige para esa posición Mi Base o Mi última posición. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CouldNotStartStopScript"> No se ha podido correr o parar el script porque no se pudo encontrar el objeto que incluye. El objeto debe de haber sido borrado o estar fuera de rango ('out of range').. @@ -491,30 +441,28 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range& No se ha podido escribir el archivo [[FILE]] </notification> <notification name="UnsupportedHardware"> - Atención: su sistema no tiene los requerimientos mÃnimos que necesita [APP_NAME]. Si sigue usando [APP_NAME], tendrá un funcionamiento pobre. Desafortunadamente, no podemos ofrecer soporte técnico para configuraciones inadecuadas del sistema. + Debes saber que tu ordenador no cumple los requisitos mÃnimos para la utilización de [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida. MINSPECS -Para más información, ¿quiere visitar [_URL]? +¿Ir a [_URL] para más información? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=es </url> - <usetemplate ignoretext="Cuando se detecte hardware no adecuado" name="okcancelignore" notext="No" yestext="SÃ"/> + <usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="UnknownGPU"> - En este momento, desconocemos la tarjeta gráfica de su sistema. -Con frecuencia, esto se debe a hardware nuevo que no hemos podido revisar aún. -Es muy probable que [APP_NAME] funcione correctamente, pero deberá ajustar sus configuraciones gráficas a lo que sea más apropiado. -(Menú Editar > Preferencias > Gráficos). + Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce. +Suele suceder con hardware nuevo que todavÃa no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. +(Yo > Preferencias > Gráficos). <form name="form"> - <ignore name="ignore" text="Cuando se detecte una tarjeta gráfica desconocida"/> + <ignore name="ignore" text="No se ha podido identificar mi tarjeta gráfica"/> </form> </notification> <notification name="DisplaySettingsNoShaders"> - [APP_NAME] se cayó al inicializar los drivers gráficos. -La calidad de los gráficos deberá establecerse en un nivel bajo para prevenir algunos errores frecuentes en los drivers. -Esto desactivará algunas opciones gráficas. -Le recomendamos que actualice los drivers de su tarjeta gráfica. -La calidad gráfica puede configurarse en Preferencias > Gráficos. + [APP_NAME] se cae al iniciar los 'driver' gráficos. +La calidad de los gráficos se configurará en Baja para prevenir algunos errores comunes de los gráficos. Esto desactivará algunas posibilidades gráficas. +Te recomendamos actualizar los 'drivers' de tu tarjeta gráfica. +La calidad gráfica puede ajustarse en Preferencias > Gráficos. </notification> <notification name="RegionNoTerraforming"> En la región [REGION] no se permite modificar el terreno. @@ -569,6 +517,9 @@ Temporalmente, será incapaz de moverse, usar el chat, o interactuar con el mund ¿Expulsar a [AVATAR_NAME] de su terreno? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar"/> </notification> + <notification name="EjectAvatarFromGroup"> + Has expulsado a [AVATAR_NAME] del grupo [GROUP_NAME] + </notification> <notification name="AcquireErrorTooManyObjects"> ERROR 'ACQUIRE': Hay demasiados objetos seleccionados. </notification> @@ -580,7 +531,7 @@ misma región. <notification name="PromptGoToCurrencyPage"> [EXTRA] -¿Ir a [_URL] para informarse sobre la compra de L$? +¿Ir a [_URL] para informarte sobre la compra de L$? <url name="url"> http://secondlife.com/app/currency/?lang=es-ES </url> @@ -671,12 +622,19 @@ PodrÃa ser [VALIDS] No se ha podido crear el archivo de salida: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - Actualmente, no ofrecemos la posibilidad de subida masiva de archivos de animación. + Actualmente, [APP_NAME] no admite la subida masiva de animaciones. </notification> <notification name="CannotUploadReason"> No se ha podido subir [FILE] por la siguiente razón: [REASON] Por favor, inténtelo más tarde. </notification> + <notification name="LandmarkCreated"> + Se ha añadido "[LANDMARK_NAME]" a tu carpeta [FOLDER_NAME]. + </notification> + <notification name="LandmarkAlreadyExists"> + Ya tienes un hito de esta localización. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CannotCreateLandmarkNotOwner"> No puede crear un hito aquà porque el propietario del terreno no lo permite. </notification> @@ -699,6 +657,9 @@ Seleccione objetos con scripts. Seleccione objetos con scripts en los que usted tenga permiso para modificarlos. </notification> + <notification name="CannotOpenScriptObjectNoMod"> + Imposible abrir el script del objeto sin modificar los permisos. + </notification> <notification name="CannotSetRunningSelectObjectsNoScripts"> No se puede configurar ningún script como 'ejecutándose'. @@ -723,51 +684,48 @@ Buscando: [FINALQUERY] por lo que no se ha hecho la búsqueda. </notification> <notification name="CouldNotTeleportReason"> - No se ha podido teleportar. + Fallo en el teleporte. [REASON] </notification> - - <notification name="invalid_tport"> -Ha habido un problema al procesar su petición de teleporte. Debe volver a iniciar sesión para poder teleportarse. Si le sigue apareciendo este mensaje, revise, por favor, las preguntas frecuentes en el Soporte técnico: -www.secondlife.com/support - </notification> - <notification name="invalid_region_handoff"> -Ha habido un problema al procesar su paso a otra región. Debe volver a iniciar sesión para poder pasar de región a región. Si le sigue apareciendo este mensaje, revise, por favor, las preguntas frecuentes en el Soporte técnico: -www.secondlife.com/support - </notification> - <notification name="blocked_tport"> -Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelva a intentarlo en un momento. Si sigue sin poder teleportarse, desconéctese y vuelva a iniciar sesión para solucionar el problema. - </notification> - <notification name="nolandmark_tport"> -Lo sentimos, pero el sistema no ha podido localizar el destino de este hito. - </notification> - <notification name="timeout_tport"> -Lo sentimos, pero el sistema no ha podido completar el teleporte. + <notification name="invalid_tport"> + Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión antes de poder teleportarte de nuevo. +Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE]. + </notification> + <notification name="invalid_region_handoff"> + Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. +Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE]. + </notification> + <notification name="blocked_tport"> + Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelva a intentarlo en un momento. Si sigue sin poder teleportarse, desconéctese y vuelva a iniciar sesión para solucionar el problema. + </notification> + <notification name="nolandmark_tport"> + Lo sentimos, pero el sistema no ha podido localizar el destino de este hito. + </notification> + <notification name="timeout_tport"> + Lo sentimos, pero el sistema no ha podido completar el teleporte. Vuelva a intentarlo en un momento. - </notification> - <notification name="noaccess_tport"> -Lo sentimos, pero usted no tiene acceso al destino de este teleporte. - </notification> - <notification name="missing_attach_tport"> -Aún no han llegado sus objetos anexados. Espere unos segundos más o desconéctese y vuelva a iniciar sesión antes de teleportarse. - </notification> - <notification name="too_many_uploads_tport"> -La cola de espera en esta región está actualmente obstruida, por lo que su petición de teleporte no se atenderá en un tiempo prudencial. Por favor, vuelva a intentarlo en unos minutos o vaya a una zona menos ocupada. - </notification> - <notification name="expired_tport"> -Lo sentimos, pero el sistema no ha podido atender a su petición de teleporte en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos. - </notification> - <notification name="expired_region_handoff"> -Lo sentimos, pero el sistema no ha podido completar su paso a otra región en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos. - </notification> - <notification name="no_host"> -Ha sido imposible encontrar el destino del teleporte: o está desactivado temporalmente o ya no existe. Por favor, vuelva a intentarlo en unos pocos minutos. - </notification> - <notification name="no_inventory_host"> -En estos momentos no está disponible el sistema del inventario. - </notification> - - + </notification> + <notification name="noaccess_tport"> + Lo sentimos, pero usted no tiene acceso al destino de este teleporte. + </notification> + <notification name="missing_attach_tport"> + Aún no han llegado sus objetos anexados. Espere unos segundos más o desconéctese y vuelva a iniciar sesión antes de teleportarse. + </notification> + <notification name="too_many_uploads_tport"> + La cola de espera en esta región está actualmente obstruida, por lo que su petición de teleporte no se atenderá en un tiempo prudencial. Por favor, vuelva a intentarlo en unos minutos o vaya a una zona menos ocupada. + </notification> + <notification name="expired_tport"> + Lo sentimos, pero el sistema no ha podido atender a su petición de teleporte en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos. + </notification> + <notification name="expired_region_handoff"> + Lo sentimos, pero el sistema no ha podido completar su paso a otra región en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos. + </notification> + <notification name="no_host"> + Ha sido imposible encontrar el destino del teleporte: o está desactivado temporalmente o ya no existe. Por favor, vuelva a intentarlo en unos pocos minutos. + </notification> + <notification name="no_inventory_host"> + En estos momentos no está disponible el sistema del inventario. + </notification> <notification name="CannotSetLandOwnerNothingSelected"> No se ha podido configurar el propietario del terreno: no se ha seleccionado una parcela. @@ -776,7 +734,8 @@ no se ha seleccionado una parcela. No se ha podido obtener la propiedad del terreno porque la selección se extiende por varias regiones. Por favor, seleccione un área más pequeña y reinténtelo. </notification> <notification name="ForceOwnerAuctionWarning"> - Está parcela está siendo subastada. Forzar su propiedad cancelará la subasta y, probablemente, disguste a algunos residentes que ya hayan empezado a pujar. ¿Forzar la propiedad? + Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ya ha empezado. +¿Forzar la propiedad? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="CannotContentifyNothingSelected"> @@ -804,7 +763,7 @@ no se ha seleccionado una parcela. no se ha podido encontrar en qué región está. </notification> <notification name="CannotCloseFloaterBuyLand"> - No puede cerrar la ventana de Comprar terreno hasta que [APP_NAME] calcule el precio de esta transacción. + No puedes cerrar la ventana de Comprar terreno hasta que [APP_NAME] calcule el precio de esta transacción. </notification> <notification name="CannotDeedLandNothingSelected"> No se ha podido transferir el terreno: @@ -824,14 +783,6 @@ ha seleccionado varias parcelas. Inténtelo seleccionando sólo una. </notification> - <notification name="ParcelCanPlayMedia"> - Esta localización puede mostrar media en streaming. -Los media en streaming necesitan una conexión a internet rápida. - -Si hay media, ¿reproducirlos en streaming? -(Puede cambiar más adelante esta opción en Preferencias > Audio y VÃdeo). - <usetemplate name="okcancelbuttons" notext="Desactivar" yestext="Ejecutar los media"/> - </notification> <notification name="CannotDeedLandWaitingForServer"> No se ha podido transferir el terreno: esperando que el servidor informe acerca de la propiedad. @@ -928,17 +879,6 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela. ¿Unir el terreno? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> - <notification name="ShowOwnersHelp"> - Mostrar los propietarios: -El color de las parcelas indica el tipo de propietario. - -Verde = Su terreno -Agua = Terreno de sus grupos -Rojo = Propiedad de otros -Amarillo = En venta -Morado = Para subasta -Gris = Público - </notification> <notification name="ConfirmNotecardSave"> Esta nota debe guardarse antes de que se la pueda copiar o ver. ¿Guardar la nota? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> @@ -961,12 +901,11 @@ Gris = Público </notification> <notification name="CannotSaveToAssetStore"> No se ha podido guardar [NAME] en la base central de almacenamiento. -Esto es, generalmente, un fallo temporal. Por favor, reinténtelo en unos pocos minutos. +Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el Ãtem de aquà a unos minutos. </notification> <notification name="YouHaveBeenLoggedOut"> - Se ha cerrado su sesión en [SECOND_LIFE]: + Vaya, se te ha cerrado la sesión en [SECOND_LIFE] [MESSAGE] -Aún puede ver el chat y los MI existentes pulsando 'Ver MI y Chat'. Si no, pulse 'Salir' para dejar inmediatemente [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -1125,37 +1064,39 @@ Si se vende una parcela transferida, el precio de venta se dividirá a partes ig </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] - </notification> - <notification name="AvatarMoved"> - Su localización [TYPE] no está disponible en estos momentos. [HELP] -Ha sido llevado a una región cercana. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> - La localización que ha elegido no está disponible en estos momentos. -Ha sido llevado a una región cercana. + La localización que querÃas no está disponible en estos momentos. +Se te ha llevado a una región cercana. </notification> <notification name="AvatarMovedLast"> - Su última posición no está disponible en estos momentos. -Ha sido llevado a una región cercana. + En estos momentos no está disponible tu última posición. +Se te ha llevado a una región cercana. + </notification> + <notification name="AvatarMovedHome"> + En estos momentos no está disponible tu Base. +Se te ha llevado a una región cercana. +Quizá quieras configurar una nueva posición para tu Base. </notification> <notification name="ClothingLoading"> - Aún está descargándose su ropa. -Puede usar normalmente [SECOND_LIFE], los demás residentes le verán correctamente. + Aún está descargándose tu ropa. +Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán correctamente. <form name="form"> - <ignore name="ignore" text="Cuando está llevando mucho tiempo descargar la ropa"/> + <ignore name="ignore" text="La ropa está tardando mucho en descargarse"/> </form> </notification> <notification name="FirstRun"> - Se ha completado la instalación de [APP_NAME]. + Se ha completado la instalación de [SECOND_LIFE]. -Si esta es la primera vez que usa [SECOND_LIFE], deberá crear una cuenta antes de que pueda iniciar una sesión. -¿Volver a [https://join.secondlife.com/index.php?lang=es-ES secondlife.com] para crear una cuenta nueva? +Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de poder iniciar una sesión. +¿Volver a [http://join.secondlife.com secondlife.com] para crear una cuenta nueva? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/> </notification> <notification name="LoginPacketNeverReceived"> - Tenemos problemas de conexión. Puede deberse a un problema de su conexión a internet o de los servidores de [SECOND_LIFE]. + Tenemos problemas de conexión. Puede deberse a un problema de tu conexión a internet o de [SECOND_LIFE_GRID]. -Puede revisar su conexión a internet y volver a intentarlo en unos minutos. Pulse Ayuda para conectarse a nuestro sitio de Sporte, o pulse Teleportar para intentar teleportarse a su Base. +Puedes revisar tu conexión a internet y volver a intentarlo en unos minutos, pulsar Ayuda para conectarte a [SUPPORT_SITE], o pulsar Teleporte para intentar teleportarte a tu Base. <url name="url"> http://es.secondlife.com/support/ </url> @@ -1178,10 +1119,10 @@ Puede cambiar más adelante su elección. [NAME] cuesta [PRICE] L$. No tiene suficientes L$ para hacer eso. </notification> <notification name="GrantedModifyRights"> - Se le ha concedido el privilegio de modificar los objetos de [FIRST_NAME] [LAST_NAME]. + [NAME] te ha dado permiso para modificar sus objetos. </notification> <notification name="RevokedModifyRights"> - Ha sido revocado su privilegio de modificar los objetos de [FIRST_NAME] [LAST_NAME]. + Ha sido revocado tu privilegio de modificar los objetos de [NAME] </notification> <notification name="FlushMapVisibilityCaches"> Esto limpiará las caches del mapa en esta región. @@ -1260,93 +1201,107 @@ Por favor, ponga en venta el objeto y reinténtelo. [DOWNLOAD_PATH]. </notification> <notification name="DownloadWindowsMandatory"> - Está disponible una versión nueva de [APP_NAME]. + Hay una versión nueva de [SECOND_LIFE] disponible. [MESSAGE] -Debe descargar esta actualización para usar [APP_NAME]. +Debes descargar esta actualización para usar [SECOND_LIFE]. <usetemplate name="okcancelbuttons" notext="Salir" yestext="Descargarla"/> </notification> <notification name="DownloadWindows"> - Está disponible una versión actualizada de [APP_NAME]. + Hay una versión actualizada de [SECOND_LIFE] disponible. [MESSAGE] -Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar el rendimiento y la estabilidad. +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargarla"/> </notification> <notification name="DownloadWindowsReleaseForDownload"> - Está disponible una versión actualizada de [APP_NAME]. + Hay una versión actualizada de [SECOND_LIFE] disponible. [MESSAGE] -Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar el rendimiento y la estabilidad. +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargarla"/> </notification> + <notification name="DownloadLinuxMandatory"> + Hay una versión nueva de [SECOND_LIFE] disponible. +[MESSAGE] +Debes descargar esta actualización para usar [SECOND_LIFE]. + <usetemplate name="okcancelbuttons" notext="Salir" yestext="Descargar"/> + </notification> + <notification name="DownloadLinux"> + Hay una versión actualizada de [SECOND_LIFE] disponible. +[MESSAGE] +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. + <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/> + </notification> + <notification name="DownloadLinuxReleaseForDownload"> + Hay una versión actualizada de [SECOND_LIFE] disponible. +[MESSAGE] +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. + <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/> + </notification> <notification name="DownloadMacMandatory"> - Está disponible una versión nueva de [APP_NAME]. + Hay una versión nueva de [SECOND_LIFE] disponible. [MESSAGE] -Debe descargar esta actualización para usar [APP_NAME]. +Debes descargar esta actualización para usar [SECOND_LIFE]. -¿Descargarla a su carpeta de aplicaciones? +¿Descargarla a tu carpeta de Programas? <usetemplate name="okcancelbuttons" notext="Salir" yestext="Descargarla"/> </notification> <notification name="DownloadMac"> - Está disponible una versión actualizada de [APP_NAME]. + Hay una versión actualizada de [SECOND_LIFE] disponible. [MESSAGE] -Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar el rendimiento y la estabilidad. +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. -¿Descargarla a su carpeta de aplicaciones? +¿Descargarla a tu carpeta de Programas? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargarla"/> </notification> <notification name="DownloadMacReleaseForDownload"> - Está disponible una versión actualizada de [APP_NAME]. + Hay una versión actualizada de [SECOND_LIFE] disponible. [MESSAGE] -Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar el rendimiento y la estabilidad. +Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad. -¿Descargarla a su carpeta de aplicaciones? +¿Descargarla a tu carpeta de Programas? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargarla"/> </notification> <notification name="DeedObjectToGroup"> Transferir este objeto al grupo hará que: * Reciba los L$ pagados en el objeto - <usetemplate ignoretext="Cuando se transfieren objetos a los grupos" name="okcancelignore" notext="Cancelar" yestext="Transferir"/> + <usetemplate ignoretext="Confirmar antes de transferir un objeto al grupo" name="okcancelignore" notext="Cancelar" yestext="Transferir"/> </notification> <notification name="WebLaunchExternalTarget"> - ¿Abrir el navegador de su sistema para ver este contenido? - <usetemplate ignoretext="Cuando se abra el navegador de su sistema para ver una página web" name="okcancelignore" notext="Cancelar" yestext="OK"/> + ¿Quieres abrir tu navegador para ver este contenido? + <usetemplate ignoretext="Abrir mi navegador para ver una página web" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchJoinNow"> - ¿Ir a www.secondlife.com para administrar su cuenta? - <usetemplate ignoretext="Cuando se abra el navegador para administrar su cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/> + ¿Ir al [http://secondlife.com/account/ Panel de Control] para administrar tu cuenta? + <usetemplate ignoretext="Abrir mi navegador para administrar mi cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchSecurityIssues"> Visite el wiki de [SECOND_LIFE] para más detalles sobre cómo informar de una cuestión de seguridad. - <usetemplate ignoretext="Cuando se abra el navegador para ver el wiki de cuestiones de seguridad" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Abrir mi navegador para informar de un fallo de seguridad" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchQAWiki"> Visite el wiki QA de [SECOND_LIFE]. - <usetemplate ignoretext="Cuando se abra el navegador para ver el wiki QA" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Abrir mi navegador para el ver el wiki de 'QA' (Control de Calidad)" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchPublicIssue"> Visite el Public Issue Tracker (sistema público de seguimiento de incidencias) de [SECOND_LIFE], donde podrá informar de errores y otros asuntos. - <usetemplate ignoretext="Cuando se abra el navegador para ver el Public Issue Tracker" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> - </notification> - <notification name="WebLaunchPublicIssueHelp"> - Visite el wiki de [SECOND_LIFE] para informarse de cómo usar el Public Issue Tracker (sistema público de seguimiento de incidencias). - <usetemplate ignoretext="Cuando se abra el navegador para ver el wiki del Public Issue Tracker" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> + <usetemplate ignoretext="Abrir mi navegador para usar el 'Public Issue Tracker'" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> </notification> <notification name="WebLaunchSupportWiki"> Para ver las últimas noticias e informaciones, ¿ir la Blog oficial? - <usetemplate ignoretext="Cuando se abra el navegador para ver el blog" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Abrir mi navegador para ver el blog" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchLSLGuide"> - ¿Ir a la GuÃa de programación para encontrar ayuda? - <usetemplate ignoretext="Cuando se abra el navegador para ver la GuÃa de programación" name="okcancelignore" notext="Cancelar" yestext="OK"/> + ¿Quieres abrir la GuÃa de Script para tener ayuda sobre el tema? + <usetemplate ignoretext="Abrir mi navegador para ver la GuÃa de Script" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchLSLWiki"> - ¿Ir al portal de LSL para encontrar ayuda sobre programación? - <usetemplate ignoretext="Cuando se abra el navegador para ver el portal de programación" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> + ¿Quieres visitar el portal de LSL para tener ayuda sobre manejo de scripts? + <usetemplate ignoretext="Abrir mi navegador para ver el portal de LSL" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> </notification> <notification name="ReturnToOwner"> ¿Está seguro de que quiere devolver los objetos seleccionados a sus propietarios? Los objetos transferibles que se hayan cedido volverán a sus propietarios anteriores. *ATENCIÓN* ¡Serán borrados los objetos no transferibles que estén cedidos! - <usetemplate ignoretext="Cuando se devuelvan los objetos a sus propietarios" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Confirmar antes de devolver objetos a sus propietarios." name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="GroupLeaveConfirmMember"> Actualmente, usted es miembro del grupo [GROUP]. @@ -1358,14 +1313,14 @@ Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los usuarios"/> </notification> <notification name="MuteLinden"> - Perdón, pero no puede ignorar a un Linden. + Lo sentimos, pero no puedes ignorar a un Linden. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotStartAuctionAlreadyForSale"> No puede empezar una subasta en una parcela que ya está en venta. Desactive la venta de terreno si está seguro de querer iniciar una subasta. </notification> - <notification label="Fallo al ignorar un objeto según el nombre" name="MuteByNameFailed"> - Ya ha ignorado ese nombre. + <notification label="Falló ignorar el objeto según su nombre." name="MuteByNameFailed"> + Ya has ignorado este nombre. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RemoveItemWarn"> @@ -1383,15 +1338,18 @@ Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar </notification> <notification name="BusyModeSet"> Pasar al modo ocupado. -Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos recibirán su Respuesta en el modo ocupado. Todos los ofrecimientos de teleporte serán rehusados. Todas las ofertas de inventario irán a su Papelera. - <usetemplate ignoretext="Cuando se pasa al modo ocupado" name="okignore" yestext="OK"/> +Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera. + <usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> - Pertenece a demasiados grupos para poder entrar en otro. Por favor, salga de al menos uno antes de entrar en éste, o rehúse la oferta. Para salir de un grupo, seleccione la opción 'Grupos...' en el menú 'Editar'. -[NAME] le ha invitado a ser miembro de un grupo. -[INVITE] + Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta. +[NAME] te ha invitado a ser miembro de un grupo. <usetemplate name="okcancelbuttons" notext="Rehusar" yestext="Entrar"/> </notification> + <notification name="JoinedTooManyGroups"> + Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="KickUser"> ¿Con qué mensaje se expulsará a este usuario? <form name="form"> @@ -1453,8 +1411,16 @@ Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos re </form> </notification> <notification name="TeleportFromLandmark"> - ¿Está seguro de que quiere teleportarse? - <usetemplate ignoretext="Cuando está teleportando desde un hito del inventario" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> + ¿Seguro que quieres teleportarte a <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Confirmar que quiero teleportarme a un hito" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> + </notification> + <notification name="TeleportToPick"> + ¿Teleportarte a [PICK]? + <usetemplate ignoretext="Confirmar el teleporte a una localización de los Destacados" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> + </notification> + <notification name="TeleportToClassified"> + ¿Teleportarse a [CLASSIFIED]? + <usetemplate ignoretext="Confirmar el teleporte a una localización de los Clasificados" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/> </notification> <notification label="Mensaje a todo el estado" name="MessageEstate"> Escriba un anuncio breve que se enviará a todo el que esté en su estado. @@ -1523,9 +1489,7 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se Usted no está autorizado en esa región por su nivel de calificación. Puede deberse a que no hay información validada de su edad. Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked_KB"> Usted no está autorizado en esa región por su nivel de calificación. @@ -1534,37 +1498,26 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es </url> - <usetemplate - name="okcancelignore" - yestext="Ir a la Base de Conocimientos" - notext="Cerrar" - ignoretext="Cuando la entrada a la región está bloqueada por el nivel de calificación"/> + <usetemplate ignoretext="No puedo entrar a esta región dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/> </notification> <notification name="RegionEntryAccessBlocked_Notify"> Usted no está autorizado en esa región por su nivel de calificación. </notification> <notification name="RegionEntryAccessBlocked_Change"> - Usted no está autorizado en esa región por su nivel de calificación.. - -Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificación y poder entrar. Desde ese momento, podrá buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quiere deshacer esta configuración, vaya a Editar > Preferencias... > General. - <form name="form"> - <button - name="OK" - text="Cambiar preferencia"/> - <button - default="true" - name="Cancel" - text="Cerrar"/> - <ignore name="ignore" text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/> - </form> + No estás autorizado en esta región por tus preferencias sobre el nivel de calificación. + +Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferencias del nivel de calificación y, asÃ, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo > Preferencias > General. + <form name="form"> + <button name="OK" text="Cambiar las preferencias"/> + <button default="true" name="Cancel" text="Cerrar"/> + <ignore name="ignore" text="Mis preferencias sobre nivel de calificación me impiden entrar a esta región"/> + </form> </notification> <notification name="LandClaimAccessBlocked"> Usted no puede reclamar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de su edad. Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LandClaimAccessBlocked_KB"> No puede reclamar este terreno por sus nivel de calificación. @@ -1573,32 +1526,22 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es </url> - <usetemplate - name="okcancelignore" - yestext="Ir a la Base de Conocimientos" - notext="Cerrar" - ignoretext="Cuando el reclamar terreno está bloqueado por el nivel de calificación"/> + <usetemplate ignoretext="No puedo reclamar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/> </notification> <notification name="LandClaimAccessBlocked_Notify"> Por su nivel de calificación, usted no puede reclamar este terreno. </notification> <notification name="LandClaimAccessBlocked_Change"> - No puede reclamar este terreno por sus preferencias de nivel de calificación. + No puedes reclamar este terreno por tus preferencias sobre el nivel de calificación. -Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificación y poder entrar. Desde ese momento, podrá buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quiere deshacer esta configuración, vaya a Editar > Preferencias... > General.. - <usetemplate - name="okcancelignore" - yestext="Cambiar preferencia" - notext="Cerrar" - ignoretext="Cuando el reclamar terreno está bloqueado por la preferencia del nivel de calificación"/> +Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferencias del nivel de calificación y, asÃ, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo > Preferencias > General. + <usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden reclamar este terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/> </notification> <notification name="LandBuyAccessBlocked"> Usted no puede comprar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de su edad. Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LandBuyAccessBlocked_KB"> No puede comprar este terreno por sus preferencias de nivel de calificación. @@ -1607,27 +1550,19 @@ Por favor, compruebe que tiene instalado el último visor, y vaya a la Base de C <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es </url> - <usetemplate - name="okcancelignore" - yestext="Ir a la Base de Conocimientos" - notext="Cerrar" - ignoretext="Cuando la compra de terreno está bloqueada por el nivel de calificación"/> + <usetemplate ignoretext="No puedo comprar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/> </notification> <notification name="LandBuyAccessBlocked_Notify"> No puede comprar este terreno por su nivel de calificación. </notification> <notification name="LandBuyAccessBlocked_Change"> - No puede comprar este terreno por sus preferencias de nivel de calificación. + No puedes comprar este terreno por tus preferencias sobre el nivel de calificación. -Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificación y poder entrar. Desde ese momento, podrá buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quiere deshacer esta configuración, vaya a Editar > Preferencias... > General. - <usetemplate - name="okcancelignore" - yestext="Cambiar preferencia" - notext="Cerrar" - ignoretext="Cuando la compra de terreno está bloqueada por la preferencia del nivel de calificación"/> +Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferencias del nivel de calificación y, asÃ, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo > Preferencias > General. + <usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden comprar el terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/> </notification> <notification name="TooManyPrimsSelected"> - "Hay seleccionadas demasiadas primitivas. Por favor, seleccione [MAX_PRIM_COUNT] o menos, y reinténtelo." + Hay demasiados prims seleccionados. Por favor, selecciona [MAX_PRIM_COUNT] o menos y vuelve a intentarlo <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemImportingEstateCovenant"> @@ -1642,9 +1577,7 @@ Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificac </notification> <notification name="UnableToLoadNotecardAsset"> En este momento, no se pueden cargar los datos de la's nota's. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NotAllowedToViewNotecard"> Permisos insuficientes para ver la nota asociada a la ID solicitada. @@ -1662,19 +1595,11 @@ Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificac </notification> <notification name="SetClassifiedMature"> ¿Este anuncio tiene contenido 'Mature'? - <usetemplate - canceltext="Cancelar" - name="yesnocancelbuttons" - notext="No" - yestext="SÃ"/> + <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="SÃ"/> </notification> <notification name="SetGroupMature"> ¿Este grupo tiene contenido 'Mature'? - <usetemplate - canceltext="Cancelar" - name="yesnocancelbuttons" - notext="No" - yestext="SÃ"/> + <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="SÃ"/> </notification> <notification label="Confirmar el reinicio" name="ConfirmRestart"> ¿Verdaderamente quiere reiniciar la región de aquà a 2 minutos? @@ -1688,226 +1613,14 @@ Puede pulsar 'Cambiar preferencia' para aumentar su nivel de calificac <button name="Cancel" text="Cancelar"/> </form> </notification> - <notification label="No permitir modificar el terreno" name="HelpRegionBlockTerraform"> - Si se marca está casilla, los propietarios de terreno no podrán modificarlo, independientemente de lo que esté configurado en cada parcela. - -Por defecto: off - </notification> - <notification label="Prohibir volar" name="HelpRegionBlockFly"> - Si se marca esta casilla, estará prohibido volar en la región, independientemente de lo que esté configurado en cada parcela. - -Por defecto: off - </notification> - <notification label="Cambio múltiple de permisos del contenido" name="HelpBulkPermission"> - La herramienta de cambio múltiple de permisos le ayuda a cambiar con rapidez los permisos de varios de los objetos contenidos en el objeto u objetos que seleccione. Pero fÃjese que sólo configurará los permisos de los Ãtems que están en el contenido de los objetos seleccionados, no los de esos objetos que los contienen. - -Note también que los permisos no se aplicarán a los contenidos que puedan tener cada uno de los Ãtems. Lo que haga sólo afectará a los Ãtems que estén exactamente en el primer nivel de contenidos. - -Puede elegir qué clase de Ãtems modificar usando la lista 'Tipos de contenido' here. Las imágenes se consideran incluidas si selecciona Texturas. - -* Esta herramienta sólo puede cambiar los permisos de aquellos Ãtems de los que usted esté autorizado a cambiarlos. -* No puede otorgar al siguiente propietario permisos que usted no tenga ya. -* Los permisos para el nuevo propietario son, en principio, una solicitud. Si alguno de los Ãtems no puede coger todos esos permisos solicitados, no cambiará ninguno de los permisos que tenga. - -Cuando esté listo para efectuar el cambio múltiple de permisos, pulse 'Aplicar' y espere a que se muestren los resultados. - -SSi cierra la ventana de Cambio múltiple de permisos mientras se están cambiando, se cancelará la operación. - </notification> - <notification label="Permitir el daño" name="HelpRegionAllowDamage"> - Si se marca la casilla, el sistema de 'vida' afecta a todas las parcelas independientemente de lo que tenga marcado cada una. -Si la casilla no está marcada, el propietario de cada parcela podrá decidir si activa en ella el sistema de 'vida'. - -Por defecto: off - </notification> - <notification label="Nº máximo de avatares" name="HelpRegionAgentLimit"> - Configura el número máximo de avatares que se permite en esta región. -El funcionamiento puede variar según el número de avatares que estén presentes. - -Por defecto: 40 - </notification> - <notification label="Plus de objetos" name="HelpRegionObjectBonus"> - El plus de objetos es un multiplicador de los prims permitidos en cualquier parcela. -El rango permitido es de 1 a 10. Fijándolo en '1', se permiten 117 objetos en cada parcela de 512 m². Fijándolo en '2', se permiten 234 (el doble), y asà sucesivamente. El número máximo de objetos permitidos en una región sigue siendo de 15.000, sea cual sea el plus. -Una vez establecido, tenga en cuenta que reducir el plus de objetos puede causar que se devuelvan o borren objetos. - -Por defecto: 1.0 - </notification> - <notification label="Calificación" name="HelpRegionMaturity"> - Configura el nivel de calificación de la región, tal como se verá en la barra superior del visor de cualquier residente, y en los datos que mostrará el mapa del mundo cuando se pase el cursor sobre esta región. Esta configuración también afecta al acceso a esta región y a los resultados de la búsqueda. Los demás residentes sólo entrarán en las regiones o verán aquellos resultados de la búsqueda que tengan el mismo nivel de calificación que ellos han elegido en sus preferencias. - -Puede llevar algún tiempo que este cambio se refleje en el mapa. - </notification> - <notification label="Impedir 'empujar'" name="HelpRegionRestrictPushObject"> - Esta casilla controla en toda la región los permisos para que haya 'empujones'. -Cuando está activada, los residentes sólo pueden ser empujados por sà mismos o por el propietario de la parcela. -('Empujar' se refiere a la función llPushObject() del LSL). - -Por defecto: Off - </notification> - <notification label="Unir/Dividir parcelas" name="HelpParcelChanges"> - Esta casilla determina si las parcelas que no son del propietario del estado pueden unirse o subdividirse. -Si no se marca esta opción: - * Sólo los propietarios o los administradores del estado pueden unir o dividir parcelas. - * Sólo podrán unir o dividir las parcelas pertenecientes al propietario o a un grupo en el que tengan los poderes adecuados. -Si se marca esta opción: - * Todo los propietarios de parcelas podrán unir o dividir las que posean. - * En parcelas propiedad de un grupo, quienes tengan los poderes adecuados podrán unirlas o dividirlas. - -Por defecto: Marcado - </notification> - <notification label="No mostrar en la búsqueda" name="HelpRegionSearch"> - Marcando esta casilla bloqueará que los propietarios de parcelas puedan listarlas en la búsqueda. - -Por defecto: Off - </notification> <notification label="Cambiada la calificación de la región" name="RegionMaturityChange"> - Se ha actualizado la calificación de esta región. -Llevará algún tiempo que el cambio se refleje en el mapa. - </notification> - <notification label="Reventa de terreno" name="HelpRegionLandResell"> - Los propietarios y los administradores del estado pueden poner en venta cualquier terreno que posea el propietario del estado. -Si se desmarca esta opción, los compradores no podrán revender el terreno que compren en esta región. -Si se marca esta opción, los compradores podrán revender el terreno que compren en esta región. - -Por defecto: Deshabilitado - </notification> - <notification label="Desactivar los scripts" name="HelpRegionDisableScripts"> - Cuando el rendimiento de un sim es pobre, el culpable puede ser un script. Abra EstadÃsticas (Ctrl+May+1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las EstadÃsticas. Si ve que Script Time está en 25 ms o más alto, pulse el botón Listar los scripts según su uso, y verá el nombre y la posición de los scripts que pueden estar causando el bajo rendimiento. - -Marcando la casilla Desactivar los scripts y pulsando el botón Aplicar, se desactivarán temporalmente en esta región todos los scripts. -Debe hacer esto para viajar a la posición que ha visto en la Lista de scripts según su uso. Cuando llegue, investigue el script para determinar si es él quien causa el problema. Deberá contactar con el propietario del script, o borrar o devolver el objeto. -Desmarque la casilla Desactivar los scripts y pulse Aplicar para reactivar los scripts en la región. - -Por defecto: off - </notification> - <notification label="Desactivar las colisiones" name="HelpRegionDisableCollisions"> - Cuando el rendimiento de un sim es pobre, la culpa puede estar en los objetos fÃsicos. Abra EstadÃsticas (Ctrl+May+1). Mire Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las EstadÃsticas. Si ve que Sim Time (Physics) está en 20 ms o más alto, pulse el botón Listar los objetos que colisionan, y verá el nombre y la posición de los objetos que pueden estar causando el bajo rendimiento. - -Marcando la casilla Desactivar las colisiones y pulsando el botón Aplicar, se desactivarán temporalmente las colisiones entre objetos. -Debe hacer esto para viajar a la localización que se ha avisado en la Lista de objetos que colisionan. Cuando llegue, investigue el objeto: -¿está colisionando constantemente con otros objetos? Deberá contactar con el propietario del objeto, o borrarlo o devolverlo. -Desmarque la casilla Desactivar las colisiones y pulse Aplicar para reactivar las colisiones en la región. - -Por defecto: off - </notification> - <notification label="Desactivar la fÃsica" name="HelpRegionDisablePhysics"> - Desactivar la fÃsica es parecido a Desactivar las colisiones, pero se desactivan todas las simulaciones fÃsicas: no sólo se detiene la colisión de objetos, sino que también se provoca que los avatares no puedan moverse. - -Esto deberÃa usarse sólo cuando Desactivar las colisiones no ha aportado a la región suficiente rendimiento para investigar un problema con las propiedades fÃsicas o los objetos que colisionan. - -Cuando acabe, no se olvide de reactivar la fÃsica, o los avatares seguirán sin poderse mover. - -Por defecto: off - </notification> - <notification label="Objetos que colisionan" name="HelpRegionTopColliders"> - Muestra una lista de aquellos objetos con más colisiones potenciales con otros objetos. Estos objetos pueden ralentizar el rendimiento. -Seleccione Ver > EstadÃsticas, y mire Simulator > Time > Sim Time (Physics) para ver si se están empleando en 'physics' más de 20 ms. - </notification> - <notification label="Listar los scripts" name="HelpRegionTopScripts"> - Muestra una lista de los objetos que más tiempo emplean en ejecutar scripts de LSL. Estos objetos pueden ralentizar el rendimiento. -Seleccione Ver > EstadÃsticas, y mire Simulator > Time > Script Time para ver si se están empleando más de 25 ms. - </notification> - <notification label="Reiniciar la región" name="HelpRegionRestart"> - Reinicia los procesos del servidor en que corre esta región tras dos minutos de advertencia previa. Se desconectará a todos los residentes que estén en la región. La región guardará sus datos, y deberÃa volver en unos 90 segundos. - -Reiniciar la región no solventa la mayorÃa de los problemas de rendimiento, y, normalmente, debe utilizarse sólo cuando se indique. - </notification> - <notification label="Nivel del agua" name="HelpRegionWaterHeight"> - Es el nivel, en metros, del agua. Si se marca en algo distinto de 20, y usted tiene al lado el agua del mundo o un 'vacÃo', habrá una diferencia visible. - -Por defecto: 20 - </notification> - <notification label="Elevación del terreno" name="HelpRegionTerrainRaise"> - Es la distancia que, en metros, los propietarios de parcelas pueden elevar su terreno sobre la altura del terreno inicialmente creado. - -Por defecto: 4 - </notification> - <notification label="Rebaje del terreno" name="HelpRegionTerrainLower"> - Es la distancia que, en metros, los propietarios de parcelas pueden bajar su terreno sobre la altura del terreno inicialmente creado. - -Por defecto: -4 - </notification> - <notification label="Subir un RAW para el terreno" name="HelpRegionUploadRaw"> - Este botón carga un archivo .RAW en la región en que usted está. -El archivo debe tener las dimensiones correctas (RGB, 256x256) y 13 canales. La forma mejor de crear un archivo de terreno es descargar el archivo RAW existente. Un buen inicio es modificar el canal rojo -red- (altura del terreno), y subirlo. - -La carga puede llevar unos 45 segundos. FÃjese que subir un archivo de terreno *no* moverá los objetos que haya en el terreno, sólo el terreno mismo y los permisos asociados a las parcelas. -Por tanto, puede que algunos objetos acaben enterrados.. - -Para más información sobre la edición de las alturas del terreno, consulte la ayuda F1. - </notification> - <notification label="Descargar el RAW del terreno" name="HelpRegionDownloadRaw"> - Este botón descarga un archivo de esta región con los datos de alturas, dimensiones de las parcelas, estado de las parcelas en venta, y algunos permisos de las parcelas. Al abrir el archivo en un programa como Photoshop debe especificar las dimensiones del documento: RGB, 256x256 con 13 canales. -Este archivo de terreno no puede abrirse de otro modo. - -Para más información sobre la edición de las alturas del terreno, consulte la ayuda F1. - </notification> - <notification label="Usar el Sol del estado" name="HelpRegionUseEstateSun"> - Esta casilla hace que la posición del Sol en la región sea la misma que la del resto del estado. - -Por defecto: on - </notification> - <notification label="Fijar el Sol" name="HelpRegionFixedSun"> - Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento. - -Por defecto: off - </notification> - <notification label="Predeterminar este terreno" name="HelpRegionBakeTerrain"> - Este botón salva la forma actual del terreno como nueva forma por defecto para la región. Una vez predeterminado, el terreno puede volver a esa forma cada vez que usted u otros usan la opción 'Revertir' en Editar el terreno. El terreno predeterminado también marca el punto medio para elevar y bajar los lÃmites. - </notification> - <notification label="Administradores del estado" name="HelpEstateEstateManager"> - Un administrador del estado es un residente en el que usted delega controles de la región y configuraciones del estado. Un administrador del estado puede cambiar algunas configuraciones de estos paneles, excepto las de subir, descargar, y predeterminar el terreno. Y, concretamente, puede autorizar o expulsar a residentes de su estado. + Se ha actualizado el nivel de calificación de esta región. +Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa. -Sólo el propietario del estado puede añadir o remover administradores, nadie más. -Por favor, elija sólo a residentes en quienes confÃe, pues usted será el responsable último de sus acciones. - </notification> - <notification label="Usar el horario global" name="HelpEstateUseGlobalTime"> - Esta casilla hace que, en su estado, el Sol tenga la misma posición que en los estados propiedad de Linden, 'mainland'. - -Por defecto: on - </notification> - <notification label="Fijar el Sol" name="HelpEstateFixedSun"> - Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento. - </notification> - <notification label="Acceso público" name="HelpEstateExternallyVisible"> - Esta casilla habilita que cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso. - -Por defecto: on - </notification> - <notification label="Permitir el teleporte a cualquier punto" name="HelpEstateAllowDirectTeleport"> - Cuando esta marcado, los residentes puede teleportarse directamente a cualquier punto de su estado. Si se desmarca, los residentes se teleportarán al Punto de Teleporte más cercano. - -Por defecto: off - </notification> - <notification label="Autorizar el acceso" name="HelpEstateAllowResident"> - El acceso a este estado se limitará a los residentes aquà enumerados y a cualquier grupo de abajo. Esta configuración sólo funciona cuando está desmarcado Acceso público. - </notification> - <notification label="Autorizar el acceso de grupo" name="HelpEstateAllowGroup"> - El acceso a este estado se limitará a los grupos aquà enumerados y a cualquier residente de abajo. Esta configuración sólo funciona cuando está desmarcado Acceso público. - </notification> - <notification label="Dirección de correo para infracciones" name="HelpEstateAbuseEmailAddress"> - Aportando aquà una dirección de correo válida, se hará que las Denuncias de Infracción en este estado se envÃen a esa dirección. -Si se deja en blanco, las Denuncias de Infracción se enviarán sólo a Linden Lab. - </notification> - <notification label="Denegar el acceso" name="HelpEstateBanResident"> - A los residentes en esta lista se les niega el acceso a su estado, independientemente de cualquier otra configuración. - </notification> - <notification label="Autorizar el chat de voz" name="HelpEstateVoiceChat"> - Se autoriza a las parcelas del estado a tener sus propios canales de voz en los que los residentes puedan hablar y oÃr a otros residentes. - -Por defecto: off +Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago. </notification> <notification label="Desajuste en la versión de voz" name="VoiceVersionMismatch"> - En esta región, la versión de [APP_NAME] no es compatible con el chat de voz. Para que el chat de voz funcione correctamente, debe actualizar [APP_NAME]. - </notification> - <notification label="Contrato del estado" name="HelpEstateCovenant"> - Definir un contrato del estado le permite vender parcelas del mismo. Si no existe un contrato, no puede vender terreno. -La nota para su contrato puede estar vacÃa si es que no quiere aplicar reglas, avisos a los compradores, o cualquier otra cosa relacionada con el terreno antes de que sea comprado. - -Puede usar un contrato para comunicar al posible comprador reglas, pautas, información cultural, o, simplemente, sus propias expectativas. -AsÃ, puede hablarse de parcelación, normas de las construcciones, formas de pago, u otra información que considere que el nuevo propietario debe saber y con la que debe estar de acuerdo antes de hacer la compra. - -Para poder finalizar la compra, el comprador debe aceptar el contrato marcando la casilla adecuada. Los contratos de los estados son siempre visibles en la información Acerca del terreno en todas las parcelas. + Esta versión de [APP_NAME] no es compatible con la prestación de voz de esta región. Para que el chat de voz funcione correctamente debes actualizar [APP_NAME]. </notification> <notification label="No se pudo comprar los objetos" name="BuyObjectOneOwner"> No se pueden comprar a la vez objetos de propietarios diferentes. @@ -1995,52 +1708,36 @@ Ha actualizado la posición de este Destacado, pero los otros detalles permanece Ha elegido Ãtems 'no copiables' de su inventario. Esos Ãtems se quitarán de su inventario, no se copiarán. ¿Mover el/los Ãtem/s del inventario? - <usetemplate ignoretext="Cuando mueva objetos 'no copiables' del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Avisarme antes de que mueva Ãtems 'no copiables' desde un objeto" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> Ha elegido Ãtems 'no copiables' de su inventario. Esos Ãtems se moverán a su inventario, no se copiarán. Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar un mal funcionamiento del script. ¿Mover el/los Ãtem/s del inventario? - <usetemplate ignoretext="Cuando mueva objetos con script 'no copiables' del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Avisarme antes de que mueva Ãtems 'no copiables' que puedan estropear un objeto con script" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Atención: la acción 'Pagar al objeto' al pulsar ha sido marcada, pero sólo funcionará si se añade un script con un evento money(). + Advertencia: la acción 'Pagar al objeto' ha sido marcada, pero sólo funcionará si se añade un script con un evento money(). <form name="form"> - <ignore name="ignore" text="Cuando configure 'Pagar al objeto' sin el evento money()"/> + <ignore name="ignore" text="He establecido la acción 'Pagar al objeto' cuando construyo uno sin un script money()"/> </form> </notification> <notification name="OpenObjectCannotCopy"> En este objeto, no hay Ãtems que esté autorizado a copiar. </notification> <notification name="WebLaunchAccountHistory"> - ¿Ir al sitio web de [SECOND_LIFE] para ver el historial de su cuenta? - <usetemplate ignoretext="Cuando se cargue la página web del historial de la cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> - </notification> - <notification name="ClickOpenF1Help"> - ¿Visitar el sitio web de Soporte de [SECOND_LIFE]? - <usetemplate ignoretext="Cuando visite el sitio web de Soporte de [SECOND_LIFE]." name="okcancelignore" notext="Cancelar" yestext="Ir"/> + ¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta? + <usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/> </notification> <notification name="ConfirmQuit"> - ¿Está seguro de que quiere salir? - <usetemplate ignoretext="Cuando esté saliendo de [APP_NAME]." name="okcancelignore" notext="Continuar" yestext="Salir"/> + ¿Estás seguro de que quieres salir? + <usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Use esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php?lang=es-ES Condiciones del Servicio] y las [http://secondlife.com/corporate/cs.php?lang=es-ES Normas de la Comunidad]. - -Se investigan y resuelven todas las infracciones denunciadas de las Normas de la Comunidad y las Condiciones del Servicio. Puede ver la resolución tomada en el Informe de Incidentes, en: + Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. -http://secondlife.com/support/incidentreport.php - </notification> - <notification name="HelpReportAbuseEmailEO"> - IMPORTANTE: Esta denuncia no irá a Linden Lab, sino al propietario de la región en la que usted se encuentra actualmente. - -Como un servicio a los residentes y visitantes, el propietario de la región ha elegido recibir y resolver todas las enuncias que se originen en esta región. Linden Lab no investigará las denuncias que usted envÃe desde aquÃ. - -El propietario de la región resolverá las denuncias basándose en las reglas locales de la región, tal como se detallan en el Contrato del estado. -(Puede ver el Contrato yendo al menú Mundo y eligiendo Acerca del terreno). - -La resolución de esta denuncia se aplica exclusivamente a esta región; el acceso de los residentes a otras áreas de [SECOND_LIFE] no se verá afectado por el resultado de esta denuncia. Únicamente Linden Lab puede impedir el acceso a la totalidad de [SECOND_LIFE]. +Se investigan y resuelven todas las infracciones denunciadas. </notification> <notification name="HelpReportAbuseSelectCategory"> Por favor, elija una categorÃa para esta denuncia de infracción. @@ -2066,13 +1763,13 @@ Aportar una descripción precisa nos ayuda a clasificar y procesar las denuncias <notification name="HelpReportAbuseContainsCopyright"> Estimado Residente: -Parece que está usted denunciando una violación de la propiedad intelectual. Por favor, asegúrese de que su denuncia es correcto. +Parece que estás denunciando una violación de la propiedad intelectual. Por favor, asegúrate de que tu denuncia es correcta. -(1) El proceso de la denuncia. Debe enviar una denuncia de infracción si cree que un Residente está reventando el sistema de permisos de [SECOND_LIFE], por ejemplo, usando un CopyBot u otras herramientas parecidas para copiar, infringiendo los derechos de propiedad intelectual. El Equipo de Infracciones (Abuse Team) investiga y lleva a cabo las acciones disciplinarias apropiadas ante toda acción que viole las las Normas de la Comunidad de [SECOND_LIFE] o las Condiciones del Servicio. Sin embargo, el Equipo de Infracciones ni gestiona ni responde a las solicitudes de eliminar contenidos del mundo de [SECOND_LIFE]. +(1) El proceso de la denuncia. Debes enviar una denuncia de infracción si crees que un Residente está reventando el sistema de permisos de [SECOND_LIFE], usando, por ejemplo, un CopyBot u otras herramientas parecidas para copiar, infringiendo los derechos de propiedad intelectual. El Equipo de Infracciones ('Abuse Team') investiga y lleva a cabo las acciones disciplinarias apropiadas ante toda acción que viole las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad] de [SECOND_LIFE]. Sin embargo, el Equipo de Infracciones ni gestiona ni responde a las solicitudes de eliminar contenidos del mundo de [SECOND_LIFE]. -(2) El DMCA o Proceso de Eliminación de Contenido. Para solicitar que se elimine algún contenido de [SECOND_LIFE], DEBE enviar una notificación válida de infracción tal y como se explica en nuestra DMCA Policy en http://secondlife.com/corporate/dmca.php. +(2) El DMCA o Proceso de Eliminación de Contenido. Para solicitar que se elimine algún contenido de [SECOND_LIFE], DEBES enviar una notificación válida de infracción tal y como se explica en nuestra [http://secondlife.com/corporate/dmca.php 'DMCA Policy']. -Si todavÃa quiere seguir con el proceso de infracción, por favor, cierre esta ventana y acabe de enviar su denuncia. En concreto, debe seleccionar la categorÃa 'CopyBot o Programa para saltarse los permisos'. +Si todavÃa quieres seguir con el proceso de infracción, por favor, cierra esta ventana y acaba de enviar tu denuncia. En concreto, debes seleccionar la categorÃa 'CopyBot o Programa para saltarse los permisos'. Gracias, @@ -2085,7 +1782,7 @@ Linden Lab <notification label="Reemplazar el anexado actual" name="ReplaceAttachment"> En ese punto de su cuerpo ya hay un objeto anexado. ¿Quiere reemplazarlo por el objeto que ha elegido? <form name="form"> - <ignore name="ignore" save_option="true" text="Cuando se reemplacen anexados existentes"/> + <ignore name="ignore" save_option="true" text="Reemplazar un añadido actual con el Ãtem seleccionado"/> <button ignore="Reemplazar automaticamente" name="Yes" text="OK"/> <button ignore="Nunca reemplazar" name="No" text="Cancelar"/> </form> @@ -2095,18 +1792,22 @@ Linden Lab ¿Quiere salir del modo Ocupado ante de completar esta transacción? <form name="form"> - <ignore name="ignore" save_option="true" text="Cuando se esté pagando a un objeto o persona en el modo Ocupado"/> + <ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/> <button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/> <button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/> </form> </notification> + <notification name="ConfirmDeleteProtectedCategory"> + La carpeta '[FOLDERNAME]' pertenece al sistema, y borrar carpetas del sistema puede provocar inestabilidad. ¿Estás seguro de que quieres borrarla? + <usetemplate ignoretext="Confirmar antes de borrar una carpeta del sistema" name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> <notification name="ConfirmEmptyTrash"> - ¿Está seguro de que quiere vaciar definitivamente el contenido de su Papelera? - <usetemplate ignoretext="Cuando se vacÃe la Papelera" name="okcancelignore" notext="Cancelar" yestext="OK"/> + ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera? + <usetemplate ignoretext="Confirmar antes de vaciar la Papelera del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="ConfirmClearBrowserCache"> - ¿Está seguro de que quiere limpiar la caché de su navegador? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="SÃ"/> + ¿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="ConfirmClearCookies"> ¿Está seguro de que quiere limpiar sus cookies? @@ -2117,39 +1818,18 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="SÃ"/> </notification> <notification name="ConfirmEmptyLostAndFound"> - ¿Está seguro de que quiere eliminar permanentemente el contenido de su carpeta Objetos Perdidos? - <usetemplate ignoretext="Cuando se vacÃe la carpeta del inventario Objetos Perdidos" name="okcancelignore" notext="No" yestext="SÃ"/> + ¿Estás seguro de que quieres borrar de forma permanente el contenido de Objetos Perdidos? + <usetemplate ignoretext="Confirmar antes de vaciar la carpeta Objetos Perdidos" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="CopySLURL"> - Se ha copiado a su portapapeles la siguiente SLurl: + Se ha copiado a tu portapapeles esta SLurl: [SLURL] -PublÃquela en una página web para que otros puedan acceder fácilmente a esta posición, o pruébela usted mismo pegándola en la barra de direcciones de su navegador. +PublÃcala en una página web para que otros puedan acceder fácilmente a esta posición, o pruébala tú mismo pegándola en la barra de direcciones de tu navegador. <form name="form"> - <ignore name="ignore" text="Cuando se copie una SLurl al portapapeles"/> + <ignore name="ignore" text="La SLurl se ha copiado a mi portapapeles"/> </form> </notification> - <notification name="GraphicsPreferencesHelp"> - Este panel controla el tamaño de la ventana, y la resolución y la calidad de los gráficos del cliente. La interfaz Preferencias > Gráficos le permite escoger entre cuatro niveles gráficos: Bajo, Medio, Alto, y Ultra. También puede personalizar sus configuraciones gráficas marcando la casilla Personalizar y adaptando estas configuraciones: - -Efectos: activa o desactiva varios tipos de shaders. - -Objetos reflejados: determina qué objetos reflejará el agua. - -Renderización del avatar: muestra opciones que afectan a cómo renderiza el cliente los avatares. - -Distancia de dibujo: afecta a cuán lejos de su punto de vista se renderizarán los objetos en la escena. - -Núm. máx. de partÃculas: define el número máximo de partÃculas que podrá ver a la vez en su pantalla. - -Calidad del procesamiento: define la resolución con que se renderiza el brillo. - -Detalle de la malla: define la cantidad de detalles o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar. - -Detalles de la iluminación: determina que tipo de luces quiere usted que se rendericen. - -Nivel de detalle del terreno: marca con cuánto detalle quiere ver la textura del terreno. - </notification> <notification name="WLSavePresetAlert"> ¿Quiere sobrescribir la preselección guardada? <usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/> @@ -2168,149 +1848,6 @@ Nivel de detalle del terreno: marca con cuánto detalle quiere ver la textura de Ya existe un efecto de procesamiento. ¿Desea sobreescribirlo? <usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/> </notification> - <notification name="HelpEditSky"> - Edite los deslizables del WindLight para crear y guardar configuraciones del cielo. - </notification> - <notification name="HelpEditDayCycle"> - Define cómo se verán los cielos a lo largo del dÃa. - </notification> - <notification name="EnvSettingsHelpButton"> - Estas configuraciones ajustan la forma en que usted ve el medio ambiente localmente, en su ordenador. Su tarjeta gráfica debe admitir shaders de la atmósfera ('atmospheric shaders') para poder acceder a esta configuración. - -Ajuste el deslizable 'Duración de un dÃa' para cambiar localmente, en su visor, las etapas del dÃa. - -Ajuste el deslizable 'Nubosidad' para controlar cuántas nubes cubren el cielo. - -Pulse un color en el selector de 'Color del agua' para cambiar el color de la misma. - -Ajuste el deslizable 'Claridad del agua' para controlar el nivel de claridad del agua bajo la superficie. - -Pulse 'Usar el horario del estado' para devolver los valores del dÃa al tiempo actual de la región y seguir a partir de él. - -Pulse 'Cielo avanzado' para abrir un editor con configuraciones avanzadas para el cielo. - -Pulse 'Agua avanzada' para abrir un editor con configuraciones avanzadas para el agua. - </notification> - <notification name="HelpDayCycle"> - El Editor del ciclo del dÃa le permite controlar el cielo de [SECOND_LIFE] durante el ciclo dÃa/noche. Este es el ciclo que usa el deslizable Duración de un dÃa del Editor del entorno. - -El Editor del ciclo del dÃa trabaja configurando fotogramas clave ('keyframes'): nodos (representados por los puntos grises en la lÃnea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un dÃa, el WindLight realiza la 'animación' del cielo interpolándose entre esos fotogramas clave. - -La flecha amarilla sobre la lÃnea del tiempo representa lo que usted ve actualmente, basándose en la Duración de un dÃa. Púlsela y muévela para ver cómo cambia la animación del dÃa. Puede añadir o borrar fotogramas clave pulsando los botones Añadir un punto o Quitar un punto, situados a la derecha de la lÃnea del tiempo. - -Puede establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la lÃnea del tiempo, o configurando manualmente su valor en el recuadro Configuración del fotograma clave. También en ese recuadro podrá asociar el fotograma clave a un modelo predefinido de WindLight. - -La Duración del ciclo establece la duración total de un 'dÃa'. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de su lÃnea del tiempo se animen ¡en sólo dos minutos reales! Una vez que esté satisfecho con su ciclo de la lÃnea del tiempo y los fotogramas clave, utilice los botones Probar y Parar para obtener una vista previa de los resultados. Recuerde que también puede mover la flecha amarilla de encima de la lÃnea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un dÃa con el ciclo del estado. - -Cuando todo esté a su gusto, puede guardar esos datos y cargarlos luego usando los botones Guardar este tipo de dÃa y Cargar un tipo de dÃa. Note que, por el momento, sólo podemos permitir un ciclo de un dÃa. - </notification> - <notification name="HelpBlueHorizon"> - Use los deslizables Rojo/Verde/Azul (RVA) para ajustar el color del cielo. Puede usar el deslizable de Intensidad (I) para moverlos al unÃsono. - </notification> - <notification name="HelpHazeHorizon"> - La Cantidad de bruma es uno de los parámetros más útiles para ajustar el nivel de luz de la escena. Es eficaz para simular muchos ajustes de la exposición, como la claridad en un ambiente nublado o de nevisca, o las tonalidades del una flor Iris aún cerrada. - </notification> - <notification name="HelpBlueDensity"> - La Saturación afecta a la densidad global de la saturación de color del cielo y la niebla. Si mueve el deslizable Intensidad (I) a la derecha, los colores serán más vivos y brillantes. Si lo mueve a la izquierda, se irán decolorando hasta llegar incluso al blanco y negro. Si desea ajustar el balance de color del cielo, puede controlar la saturación de cada elemento usando el deslizable Rojo/Verde/Azul (RVA). - </notification> - <notification name="HelpHazeDensity"> - La Densidad de la bruma controla lo sombrÃo de la atmósfera, su neblina. Es eficaz para simular escenas con mucho humo o contaminantes, y también para simular niebla y llovizna. - </notification> - <notification name="HelpDensityMult"> - La Densidad puede usarse para definir globalmente la 'pesadez' de la atmósfera. Los ajustes bajos dan sensación de un 'aire limpio', y los altos de pesadez, de esmog. - </notification> - <notification name="HelpDistanceMult"> - Ajusta a qué distancia se percibe el WindLight. El valor cero desactiva la influencia del WindLight en el terreno y los objetos. Los valores superiores a 1 simulan mayores distancias a las que afectan los efectos atmosféricos - </notification> - <notification name="HelpMaxAltitude"> - La Altitud máx. ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del dÃa, es útil para ajustar la 'profundidad' a la que aparece el Sol. - </notification> - <notification name="HelpSunlightColor"> - Ajusta en la escena la intensidad y el color de las luces directas. - </notification> - <notification name="HelpSunAmbient"> - Ajusta en la escena la intensidad y el color de la luz ambiental. - </notification> - <notification name="HelpSunGlow"> - El deslizable Tamaño controla el tamaño del Sol. -El deslizable Visión controla cómo se ve de borroso el Sol en el cielo. - </notification> - <notification name="HelpSceneGamma"> - Ajusta la distribución de luz y oscuridad en la pantalla. - </notification> - <notification name="HelpStarBrightness"> - Ajusta el brillo de las estrellas en el cielo. - </notification> - <notification name="HelpTimeOfDay"> - Controla la posición del Sol en el cielo. Es parecido a la elevación. - </notification> - <notification name="HelpEastAngle"> - Controla la posición del Sol en el cielo. Es parecido al acimut. - </notification> - <notification name="HelpCloudColor"> - Edita el color de las nubes. En general, es recomendable mantenerlas blanquecinas. -Pero, vaya, diviértase si quiere. - </notification> - <notification name="HelpCloudDetail"> - Controla el detalle de las capas superiores de la imagen en la imagen principal de las nubes. X e Y controlan su posición. D (Densidad) controla la densidad o la fracturación con que aparecen las nubes. - </notification> - <notification name="HelpCloudDensity"> - Le permite controlar la posición de las nubes con los deslizables X e Y, y su desnidad con el deslizable D. - </notification> - <notification name="HelpCloudCoverage"> - Controla cuánto cubren el cielo las nubes. - </notification> - <notification name="HelpCloudScale"> - Controla el tamaño de la imagen de las nubes en la bóveda celeste. - </notification> - <notification name="HelpCloudScrollX"> - Controla la velocidad de las nubes al moverse en la dirección del eje X. - </notification> - <notification name="HelpCloudScrollY"> - Controla la velocidad de las nubes al moverse en la dirección del eje Y. - </notification> - <notification name="HelpClassicClouds"> - Marque esta casilla para activar la aparición de las nubes clásicas de [SECOND_LIFE] junto a las nubes del WindLight. - </notification> - <notification name="HelpWaterFogColor"> - Elije el color del agua bajo la superficie. - </notification> - <notification name="HelpWaterFogDensity"> - Controla la densidad de la claridad del agua, y a qué distancia puede verse bajo ella. - </notification> - <notification name="HelpUnderWaterFogMod"> - Modifica el efecto de Transparencia para controlar cuán lejos su avatar puede ver bajo el agua. - </notification> - <notification name="HelpWaterGlow"> - Controla la cantidad de brillo de la superficie del agua. - </notification> - <notification name="HelpWaterNormalScale"> - Controla el tamaño de las tres ondulaciones que componen el agua. - </notification> - <notification name="HelpWaterFresnelScale"> - Controla cuánta luz se refleja desde diferentes ángulos. - </notification> - <notification name="HelpWaterFresnelOffset"> - Controla cuánta intensidad de luz se refleja. - </notification> - <notification name="HelpWaterScaleAbove"> - Controla la cantidad de luz refractada mirando la superficie del agua desde arriba. - </notification> - <notification name="HelpWaterScaleBelow"> - Controla la cantidad de luz refractada mirando la superficie del agua desde debajo. - </notification> - <notification name="HelpWaterBlurMultiplier"> - Controla cómo se mezclan las ondas y los reflejos. - </notification> - <notification name="HelpWaterNormalMap"> - Controla cuál es la capa de 'vista normal' del agua, para determinar las reflexiones/refracciones. - </notification> - <notification name="HelpWaterWave1"> - Controla hacia adónde y a qué velocidad se mueve en los ejes X e Y la versión en tamaño grande de la 'vista normal'. - </notification> - <notification name="HelpWaterWave2"> - Controla hacia adónde y a qué velocidad se mueve en los ejes X e Y la versión en tamaño pequeño de la 'vista normal'. - </notification> <notification name="NewSkyPreset"> Dame un nombre para el cielo nuevo. <form name="form"> @@ -2356,35 +1893,33 @@ Pero, vaya, diviértase si quiere. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="Cannot_Purchase_an_Attachment"> - No se pueden comprar los Ãtems que aún forman parte de un objeto anexado. + No puedes comprar un objeto mientras esté anexado. </notification> <notification label="Acerca de las solicitudes de autorización de débito" name="DebitPermissionDetails"> Al admitir esta petición, le da permiso a un script para que coja dólares Linden (L$) de su cuenta. Para revocar este permiso, el propietario del objeto debe eliminarlo o reiniciar ese script del objeto. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AutoWearNewClothing"> - ¿Quiere vestirse automáticamente el Ãtem de ropa nueva que ha creado? - <usetemplate ignoretext="Al vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="SÃ"/> + ¿Quieres ponerte automáticamente la ropa que vas a crear? + <usetemplate ignoretext="Ponerme la ropa que estoy creando mientras modifico mi apariencia" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="NotAgeVerified"> - Para acceder a esta parcela, se debe haber verificado su edad. -¿Quiere visitar la web de [SECOND_LIFE] para verificar su edad? + Debes haber verificado tu edad para visitar este sitio. ¿Quieres ir al sitio web de [SECOND_LIFE] y verificarla? [_URL] <url name="url" option="0"> https://secondlife.com/account/verification.php?lang=es </url> - <usetemplate ignoretext="Advertir de la falta de la verificación de edad" name="okcancelignore" notext="No" yestext="SÃ"/> + <usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="Cannot enter parcel: no payment info on file"> - Antes de que pueda acceder a esta parcela, se requiere que usted tenga archivada su información de pago. -¿Quiere visitar la web de [SECOND_LIFE] para actualizar esto? + Para visitar este sitio debes haber aportado información de pago en tu cuenta. ¿Quieres ir al sitio web de [SECOND_LIFE] y configurar esto? [_URL] <url name="url" option="0"> https://secondlife.com/account/index.php?lang=es </url> - <usetemplate ignoretext="Advertir de la falta de información de pago" name="okcancelignore" notext="No" yestext="SÃ"/> + <usetemplate ignoretext="No he registrado información de pago" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="MissingString"> La cadena [STRING_NAME] Ha desaparecido de strings.xml @@ -2414,7 +1949,7 @@ Pero, vaya, diviértase si quiere. [FIRST] [LAST] no está conectado </notification> <notification name="AddSelfFriend"> - No se puede añadir como amigo a usted mismo. + Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo. </notification> <notification name="UploadingAuctionSnapshot"> Subiendo fotos del mundo y del sitio web... @@ -2433,11 +1968,10 @@ Pero, vaya, diviértase si quiere. Se ha descargado Terrain.raw </notification> <notification name="GestureMissing"> - El gesto [NAME] ha desaparecido de la base de datos. + No se encuentra en la base de datos el gesto [NAME]. </notification> <notification name="UnableToLoadGesture"> - No se ha podido cargar el gesto [NAME]. -Por favor, vuelva a intentarlo. + No se puede cargar el gesto [NAME]. </notification> <notification name="LandmarkMissing"> El hito ha desaparecido de la base de datos. @@ -2446,14 +1980,14 @@ Por favor, vuelva a intentarlo. No se ha podido cargar el hito. Por favor, vuelva a intentarlo. </notification> <notification name="CapsKeyOn"> - Tiene pulsada su tecla de bloqueo de mayúsculas, lo que influirá en cómo escriba la contraseña. -Quizá quiera soltar esa tecla. + Tienes pulsada la tecla de mayúsculas. +Esto puede influir en tu contraseña. </notification> <notification name="NotecardMissing"> La nota ha desaparecido de la base de datos. </notification> <notification name="NotecardNoPermissions"> - No tiene permisos suficientes para ver la nota. + No tienes permiso para ver esta nota. </notification> <notification name="RezItemNoPermissions"> No tiene permisos suficientes para renderizar el objeto. @@ -2491,11 +2025,11 @@ Por favor, vuelva a intentarlo. Por favor, vuelva a intentarlo. </notification> <notification name="CannotBuyObjectsFromDifferentOwners"> - No puede comprar a la vez objetos de diferentes propietarios. -Por favor, elija sólo uno. + No puedes comprar más de un objeto a la vez. +Por favor, selecciona un sólo objeto. </notification> <notification name="ObjectNotForSale"> - El objeto no aparece como puesto a la venta. + Este objeto no está en venta. </notification> <notification name="EnteringGodMode"> Entrando en el modo administrativo, nivel [LEVEL] @@ -2504,10 +2038,10 @@ Por favor, elija sólo uno. Saliendo del modo administrativo, nivel [LEVEL] </notification> <notification name="CopyFailed"> - No se ha hecho la copia porque usted no tiene permiso para hacerla + No tienes pemiso para copiar esto. </notification> <notification name="InventoryAccepted"> - [NAME] ha aceptado su oferta del inventario. + [NAME] ha recibido tu oferta de inventario. </notification> <notification name="InventoryDeclined"> [NAME] ha rehusado su oferta del inventario. @@ -2522,12 +2056,14 @@ Por favor, elija sólo uno. Se ha rehusado su tarjeta de visita. </notification> <notification name="TeleportToLandmark"> - Ahora que ha llegado a mainland (los continentes), puede teleportarse a localizaciones como '[NAME]' pulsando el botón Inventario de la esquina inferior derecha de su pantalla, y, después, seleccionando la carpeta Hitos. -Pulse dos veces en el hito y, luego, pulse en Teleportar para viajar hasta allÃ. + Puedes teleportarte a lugares como '[NAME]' abriendo el panel Lugares -a la derecha de tu pantalla- y seleccionando la sección Hitos. +Pulsa en un hito para seleccionarlo, y, luego, pulsa 'Teleportar' en la parte inferior del panel. +(También puedes pulsar dos veces en el hito o pulsarlo con el botón derecho del ratón y elegir 'Teleportar'.) </notification> <notification name="TeleportToPerson"> - Ahora que ha llegado a mainland (los continentes), puede contactar con residentes como '[NAME]' pulsando el botón Inventario de la esquina inferior derecha de su pantalla, y, después, seleccionando la carpeta Tarjetas de visita. -Pulse dos veces en la tarjeta, pulse en Mensaje Instantáneo, y escriba un mensaje. + Puedes contactar con un Residente como '[NAME]' abriendo el panel Gente en el lado derecho de tu pantalla. +Elige al Residente de la lista y pulsa 'MI' en la parte inferior del panel. +(También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir 'MI'). </notification> <notification name="CantSelectLandFromMultipleRegions"> No puede seleccionar un terreno que cruce las fronteras entre servidores. @@ -2550,6 +2086,9 @@ Inténtelo seleccionando un trozo más pequeño de terreno. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="PaymentRecived"> + [MESSAGE] + </notification> <notification name="EventNotification"> Notificación de un evento: @@ -2574,8 +2113,20 @@ Inténtelo seleccionando un trozo más pequeño de terreno. [NAMES] </notification> <notification name="NoQuickTime"> - No se ve como instalado en su sistema el software QuickTime de Apple. -Si quiere ver por streaming elementos multimedia en las parcelas que los tengan, debe ir al sitio web de QuickTime (http://www.apple.com/quicktime) e instalar el QuickTime Player. + No parece que tu sistema tenga instalado el software QuickTime de Apple. +Si quieres ver media en streaming en las parcelas que los tienen, deberÃas ir al [http://www.apple.com/quicktime sitio de QuickTime] e intalar el QuickTime Player. + </notification> + <notification name="NoPlugin"> + No se ha encontrado el 'Media Plugin' para manejar el 'mime type' "[MIME_TYPE]". Los media de este tipo no estarán disponibles. + </notification> + <notification name="MediaPluginFailed"> + Fallo de este 'Media Plugin': + [PLUGIN] + +Por favor, reinstala el plugin o contacta con el vendedor si sigues teniendo problemas. + <form name="form"> + <ignore name="ignore" text="Fallo al ejecutar un 'Media Plugin'"/> + </form> </notification> <notification name="OwnedObjectsReturned"> Se han devuelto a su inventario los objetos de los que usted era propietario en la parcela seleccionada. @@ -2584,7 +2135,7 @@ Si quiere ver por streaming elementos multimedia en las parcelas que los tengan, Se han devuelto a su inventario los objetos de los que usted era propietario en la parcela propiedad de [FIRST] [LAST]. </notification> <notification name="OtherObjectsReturned2"> - Se han devuelto a su propietario los objetos que, en la parcela seleccionada, eran propiedad del residente '[NAME]'. + Se han devuelto a su propietario los objetos seleccionados en la parcela de terreno propiedad de '[NAME]'. </notification> <notification name="GroupObjectsReturned"> Se han devuelto a los inventarios de sus propietarios los objetos que estaban compartidos con el grupo [GROUPNAME] en la parcela seleccionada. @@ -2594,24 +2145,26 @@ Los objetos no transferibles que se transfirieron al grupo han sido borrados. <notification name="UnOwnedObjectsReturned"> Se han devuelto a sus propietarios los objetos de los que usted NO era propietario en la parcela seleccionada. </notification> + <notification name="ServerObjectMessage"> + Mensaje de [NAME]: +<nolink>[MSG]</nolink> + </notification> <notification name="NotSafe"> - Este es un terreno con el daño autorizado ('no seguro'). -Aquà puede ser herido. Si muere, será teleportado a su Base. + Este terreno tiene el daño activado. +Aquà puedes ser herido. Si mueres, se te teleportará a tu Base. </notification> <notification name="NoFly"> - En este terreno no se permite volar ('no volar'). -Aquà no debe volar. + Este terreno tiene desactivado el poder volar. +Aquà no puedes volar. </notification> <notification name="PushRestricted"> - Este terreno es 'Sin empujones'. -No puede empujar a otros a menos que sea el propietario del terreno. + Este terreno no autoriza el poder empujar. No puedes hacerlo a menos que seas el propetario del terreno. </notification> <notification name="NoVoice"> - Este terreno tiene desactivada la voz. + Este tereno tiene desactivado el chat de voz. No podrás oÃr hablar a nadie. </notification> <notification name="NoBuild"> - Este terreno tiene desactivado el construir ('no construir'). -Aquà no puede crear objetos. + Este terreno tiene desactivado el poder construir. Aquà no puedes ni construir ni crear objetos. </notification> <notification name="ScriptsStopped"> Un administrador ha detenido temporalmente los scripts en esta región. @@ -2620,12 +2173,12 @@ Aquà no puede crear objetos. En esta región no se está ejecutando ningún script. </notification> <notification name="NoOutsideScripts"> - Esta región tiene desactivados los scripts de otros -('no scripts de otros'). -No se ejecutará ningún script que no pertenezca al propietario del terreno. + Este terreno tiene desactivados los scripts externos. + +Los scripts no funcionan aquÃ, excepto los pertenecientes al propietario del terreno. </notification> <notification name="ClaimPublicLand"> - Sólo puede reclamar terreno público en la región en que está usted. + Sólo puedes reclamar terreno público de la región en que estás. </notification> <notification name="RegionTPAccessBlocked"> No está autorizado en esa región por su nivel de calificación. Debe validar su edad y/o instalar el último visor. @@ -2638,16 +2191,9 @@ Por favor, vaya a la Base de Conocimientos para más detalles sobre el acceso a <notification name="NoTeenGridAccess"> Su cuenta no puede conectarse a esta región del grid teen. </notification> - <notification name="NoHelpIslandTP"> - No puede teleportarse de vuelta a la Help Island ('Isla de Ayuda'). -Vaya a la 'Help Island Public' ('Isla Pública de Ayuda') para repetir el tutorial. - </notification> <notification name="ImproperPaymentStatus"> No tiene el estado de pago adecuado para entrar a esta región. </notification> - <notification name="MustGetAgeRegion"> - Debe haber verificado su edad para entrar a esta región. - </notification> <notification name="MustGetAgeParcel"> Debe haber verificado su edad para entrar a esta parcela. </notification> @@ -2710,7 +2256,8 @@ Por favor, reinténtelo en unos momentos. No se ha podido encontrar una parcela válida. </notification> <notification name="ObjectGiveItem"> - Un objeto llamado [OBJECTFROMNAME], propiedad de [FIRST] [LAST], le ha dado un/a [OBJECTTYPE] de nombre [OBJECTNAME]. + Un objeto de nombre [OBJECTFROMNAME], propiedad de [NAME_SLURL], te ha dado este [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button name="Keep" text="Guardar"/> <button name="Discard" text="Descartar"/> @@ -2718,7 +2265,8 @@ Por favor, reinténtelo en unos momentos. </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - Un objeto llamado [OBJECTFROMNAME], propiedad de (un usuario desconocido), le ha dado un/a [OBJECTTYPE] de nombre [OBJECTNAME]. + Un objeto de nombre [OBJECTFROMNAME] propiedad de (un Residente desconocido) te ha dado este [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button name="Keep" text="Guardar"/> <button name="Discard" text="Descartar"/> @@ -2726,15 +2274,17 @@ Por favor, reinténtelo en unos momentos. </form> </notification> <notification name="UserGiveItem"> - [NAME] le ha dado un/a [OBJECTTYPE] de nombre '[OBJECTNAME]'. + [NAME_SLURL] te ha dado este [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> - <button name="Keep" text="Guardar"/> + <button name="Show" text="Mostrar"/> <button name="Discard" text="Descartar"/> <button name="Mute" text="Ignorar"/> </form> </notification> <notification name="GodMessage"> [NAME] + [MESSAGE] </notification> <notification name="JoinGroup"> @@ -2746,7 +2296,7 @@ Por favor, reinténtelo en unos momentos. </form> </notification> <notification name="TeleportOffered"> - [NAME] se ha ofrecido a teleportarle hasta su posición: + [NAME] te ofrece teleportarte a su localización: [MESSAGE] <form name="form"> @@ -2754,6 +2304,9 @@ Por favor, reinténtelo en unos momentos. <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification name="TeleportOfferSent"> + Teleporte ofrecido a [TO_NAME] + </notification> <notification name="GotoURL"> [MESSAGE] [URL] @@ -2773,6 +2326,9 @@ Por favor, reinténtelo en unos momentos. <button name="Decline" text="Rehusar"/> </form> </notification> + <notification name="FriendshipOffered"> + Has ofrecido amistad a [TO_NAME] + </notification> <notification name="OfferFriendshipNoMessage"> [NAME] le está ofreciendo amistad. @@ -2788,21 +2344,27 @@ Por favor, reinténtelo en unos momentos. <notification name="FriendshipDeclined"> [NAME] ha rehusado su oferta de amistad. </notification> + <notification name="FriendshipAcceptedByMe"> + Aceptado el ofrecimiento de amistad. + </notification> + <notification name="FriendshipDeclinedByMe"> + Rehusado el ofrecimiento de amistad. + </notification> <notification name="OfferCallingCard"> - [FIRST] [LAST] le está ofreciendo su tarjeta de visita. -Esto añadirá un Ãtem a su inventario para que pueda enviar rápidamente a este residente un MI. + [FIRST] [LAST] te está ofreciendo su tarjeta de visita. +Esto añadirá un marcador en tu inventario para que puedas enviarle rápidamente un MI. <form name="form"> <button name="Accept" text="Aceptar"/> <button name="Decline" text="Rehusar"/> </form> </notification> <notification name="RegionRestartMinutes"> - La región se reiniciará en [MINUTES] minutos. -Si permanece en esta región, será desconectado. + Esta región se reiniciará en [MINUTES] minutos. +Si permaneces en esta región serás desconectado. </notification> <notification name="RegionRestartSeconds"> - La región se reiniciará en [SECONDS] segundos. -Si permanece en esta región, será desconectado. + Esta región se reiniciará en [SECONDS] segundos. +Si permaneces en esta región serás desconectado. </notification> <notification name="LoadWebPage"> ¿Cargar la página web [URL]? @@ -2822,7 +2384,7 @@ Del objeto: [OBJECTNAME]; propiedad de: [NAME]? Búsqueda fallida de [TYPE] de nombre [DESC] en la base de datos. </notification> <notification name="InvalidWearable"> - El Ãtem que intenta llevar usa una caracterÃstica que su visor no puede leer. Por favor, actualice su versión de [APP_NAME] para llevar este Ãtem. + El Ãtem que quieres vestirte tiene una caracterÃstica que tu visor no puede leer. Por favor, actualiza tu versión de [APP_NAME] para ponerte este Ãtem. </notification> <notification name="ScriptQuestion"> '[OBJECTNAME]', un objeto propiedad de '[NAME]', querrÃa: @@ -2836,10 +2398,10 @@ Del objeto: [OBJECTNAME]; propiedad de: [NAME]? </form> </notification> <notification name="ScriptQuestionCaution"> - '[OBJECTNAME]', un objeto propiedad de '[NAME]', querrÃa: + Un objeto de nombre '[OBJECTNAME]', propiedad de '[NAME]', quiere: [QUESTIONS] -Si no confÃa en este objeto y su creador, debe denegar la solicitud. Para más información, pulse el botón Detalles. +Si no confias en este objeto y en su creador, deberÃas rehusar esta petición. ¿Autorizar esta petición? <form name="form"> @@ -2862,86 +2424,37 @@ Si no confÃa en este objeto y su creador, debe denegar la solicitud. Para más <button name="Ignore" text="Ignorar"/> </form> </notification> - <notification name="FirstBalanceIncrease"> - Ha recibido [AMOUNT] L$. -Pueden darle L$ tanto objetos como otros usuarios. -Su balance se muestra en la esquina superior derecha de la pantalla. - </notification> - <notification name="FirstBalanceDecrease"> - Ha pagado [AMOUNT] L$. -Su balance se muestra en la esquina superior derecha de la pantalla. - </notification> - <notification name="FirstSit"> - Está sentado. -Use las teclas del cursor (o AWSD) para cambiar el punto de vista. -Pulde el botón 'Levantarse' para ponerse de pie. - </notification> - <notification name="FirstMap"> - Pulse el mapa y arrástrelo para desplazarlo. -Púlselo dos veces para teleportarse. -Use los controles de la derecha para encontrar sitios y mostrar diferentes fondos. - </notification> - <notification name="FirstBuild"> - Usted puede construir objetos nuevos en algunas zonas de [SECOND_LIFE]. -Use las herramientas de arriba a la izquierda para construir, y pruebe a cambiar rápidamente entre ellas pulsando Ctrl o Alt. -Pulse Esc para dejar de construir. - </notification> - <notification name="FirstLeftClickNoHit"> - En algunos objetos concretos, al pulsarlos con el botón izquierdo del ratón interacciona con ellos. -Si el puntero del ratón pasa a ser una mano puede interactuar con el objeto. -El botón derecho del ratón siempre muestra un menú con cosas que usted puede hacer. + <notification name="ScriptToast"> + El '[TITLE]' de [FIRST] [LAST] está esperando una respuesta del usuario. + <form name="form"> + <button name="Open" text="Abrir el diálogo"/> + <button name="Ignore" text="Ignorar"/> + <button name="Block" text="Ignorar"/> + </form> </notification> - <notification name="FirstTeleport"> - Esta región no permite teleportarse de un punto a otro, por lo que ha sido llevado al Punto de Teleporte más cercano. -Su destinado está señalado con una columna de luz roja. -Siga la flecha roja hasta llegar a la columna, o pulse la flecha para hacerla desaparecer. + <notification name="BuyLindenDollarSuccess"> + ¡Gracias por tu pago! + +Tu saldo de L$ se actualizará cuando se complete el proceso. Si el proceso tarda más de 20 minutos, se cancelará tu transacción, y la cantidad se cargará en tu saldo de US$. + +Puedes revisar el estado de tu pago en el Historial de transacciones de tu [http://secondlife.com/account/ Panel de Control] </notification> <notification name="FirstOverrideKeys"> A partir de ahora, sus teclas de movimiento las gestiona un objeto. Pruebe las teclas del cursor o AWSD para ver qué hacen. Algunos objetos (las pistolas, por ejemplo) le pedirán que, para usarlos, entre usted en vista subjetiva. Pulse 'M' para hacerlo. </notification> - <notification name="FirstAppearance"> - Está modificando su apariencia. -Use las teclas del cursor para girar el punto de vista y hacer zoom. -Cuando acabe, pulse 'Guardar todo' para salvar su apariencia y salir del modificarla. -Puede modificar su apariencia tantas veces como quiera. - </notification> - <notification name="FirstInventory"> - Este es su inventario. Tiene objetos, notas, ropas, y otras cosas de su propiedad. -* Para vestirse un objeto o un vestuario completo, arrástrelo hasta usted mismo. -* Para colocar un objeto en el mundo, arrástrelo hasta el suelo. -* Para leer una nota, pulse dos veces en ella. - </notification> <notification name="FirstSandbox"> - Esta es una región 'sandbox' (zona de pruebas). -Los objetos que construya aquà pueden ser eliminados cuando salga de esta zona, pues los sandbox se limpian regularmente. Por favor, tenga en cuenta la información que hay arriba de su pantalla junto al nombre de la región. + Esta es una región 'sandbox' (zona de pruebas) donde los Residentes pueden aprender a construir. -Las regiones sandbox no son frecuentes, y están señalizadas. - </notification> - <notification name="FirstFlexible"> - Este objeto es flexible. -Los objetos flexibles no pueden ser materiales, y serán inmateriales hasta que se desmarque la casilla de flexibles. - </notification> - <notification name="FirstDebugMenus"> - Ha activado el menú Avanzado. -Contiene herramientas útiles para los desarrolladores que trabajan mejorando [SECOND_LIFE]. -Para pasar este menú a una ventana, pulse Ctrl+Alt+D. En un Mac, pulse ⌥⌘D. - </notification> - <notification name="FirstSculptedPrim"> - Está editando un prim 'sculpted'. -Los prim sculpted requieren una textura especial para tomar forma. -Puede encontrar ejemplos de texturas sculpted en la biblioteca del inventario. - </notification> - <notification name="FirstMedia"> - Ha empezado a reproducir media. Puede hacer que los media se reproduzcan automáticamente en la pestaña Audio y VÃdeo de la ventana de preferencias. Note que tal cosa puede suponer un riesgo de seguridad en los sitios multimedia en los que no confÃe. +Los objetos que construyas aquà serán eliminados cuando la abandones; por tanto, no olvides pulsarlos con el botón derecho y elegir 'Tomar' para que tu creación vaya a tu inventario. </notification> <notification name="MaxListSelectMessage"> Puede seleccionar un máximo de [MAX_SELECT] Ãtems de esta lista. </notification> <notification name="VoiceInviteP2P"> - [NAME] le está invitando a un chat de voz. -Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Pulse Ignorar para ignorar a quien llama. + [NAME] te está invitando a un chat de voz. +Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar al que llama. <form name="form"> <button name="Accept" text="Aceptar"/> <button name="Decline" text="Rehusar"/> @@ -2949,17 +2462,17 @@ Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Puls </form> </notification> <notification name="AutoUnmuteByIM"> - [FIRST] [LAST], a quien ha enviado un mensaje instantáneo, ha dejado automáticamente de estar ignorado. + [FIRST] [LAST] ha dejado automáticamente de estar ignorado al enviarle un mensaje instantáneo. </notification> <notification name="AutoUnmuteByMoney"> - [FIRST] [LAST], a quien ha dado dinero, ha dejado automáticamente de estar ignorado. + [FIRST] [LAST] ha dejado automáticamente de estar ignorado al darle dinero. </notification> <notification name="AutoUnmuteByInventory"> - [FIRST] [LAST], a quien ha ofrecido algo del inventario, ha dejado automáticamente de estar ignorado. + [FIRST] [LAST] ha dejado automáticamente de estar ignorado al ofrecerle algo del inventario. </notification> <notification name="VoiceInviteGroup"> [NAME] ha empezado un chat de voz con el grupo [GROUP]. -Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Pulse Ignorar para ignorar a quien llama. +Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar al que llama. <form name="form"> <button name="Accept" text="Aceptar"/> <button name="Decline" text="Rehusar"/> @@ -2968,7 +2481,7 @@ Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Puls </notification> <notification name="VoiceInviteAdHoc"> [NAME] ha empezado un chat de voz en multiconferencia. -Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Pulse Ignorar para ignorar a este usuario. +Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar al que llama. <form name="form"> <button name="Accept" text="Aceptar"/> <button name="Decline" text="Rehusar"/> @@ -2976,8 +2489,8 @@ Pulse Aceptar para coger la llamada o Rehusar para declinar la invitación. Puls </form> </notification> <notification name="InviteAdHoc"> - [NAME] le está invitando a un chat en multiconferencia. -Pulse Aceptar para entrar al chat o Rehusar para declinar la invitación. Pulse Ignorar para ignorar a este usuario. + NAME] te está invitando a un chat en multiconferencia. +Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar al que llama. <form name="form"> <button name="Accept" text="Aceptar"/> <button name="Decline" text="Rehusar"/> @@ -2991,25 +2504,25 @@ Pulse Aceptar para entrar al chat o Rehusar para declinar la invitación. Pulse Lo sentimos. Este área ha llegado a su capacidad máxima de conversaciones por voz. Por favor, intente usar la voz en otra zona. </notification> <notification name="VoiceChannelDisconnected"> - Ha sido desconectado del [VOICE_CHANNEL_NAME]. Va a ser reconectado al chat de voz del mundo. + Has sido desconectado de [VOICE_CHANNEL_NAME]. Vas a ser reconectado al chat de voz. </notification> <notification name="VoiceChannelDisconnectedP2P"> - [VOICE_CHANNEL_NAME] ha colgado la llamada. Usted va a ser reconectado al chat de voz del mundo. + [VOICE_CHANNEL_NAME] ha colgado la llamada. Vas a ser reconectado al chat de voz. </notification> <notification name="P2PCallDeclined"> - [VOICE_CHANNEL_NAME] ha rehusado su llamada. Usted va a ser reconectado al chat de voz del mundo. + [VOICE_CHANNEL_NAME] ha rehusado tu llamada. Vas a ser reconectado al chat de voz. </notification> <notification name="P2PCallNoAnswer"> - [VOICE_CHANNEL_NAME] no está disponible para coger su llamada. Usted va a ser reconectado al chat de voz del mundo. + [VOICE_CHANNEL_NAME] no está disponible para coger tu llamada. Vas a ser reconectado al chat de voz. </notification> <notification name="VoiceChannelJoinFailed"> - Fallo al conectar al [VOICE_CHANNEL_NAME]; por favor, inténtelo más tarde. Usted va a ser reconectado al chat de voz del mundo. + Fallo al conectar a [VOICE_CHANNEL_NAME]; por favor, inténtalo más tarde. Vas a ser reconectado al chat de voz. </notification> <notification name="VoiceLoginRetry"> Estamos creando un canal de voz para usted. Se puede tardar hasta un minuto. </notification> <notification name="Cannot enter parcel: not a group member"> - No puede entrar en esta parcela, no es miembro del grupo adecuado. + Sólo los miembros de un grupo determinado pueden visitar esta zona. </notification> <notification name="Cannot enter parcel: banned"> No puede entrar en esta parcela, se le ha prohibido el acceso. @@ -3024,18 +2537,62 @@ Pulse Aceptar para entrar al chat o Rehusar para declinar la invitación. Pulse Ha ocurrido un error intentando conectarle al [VOICE_CHANNEL_NAME]. Por favor, inténtelo más tarde. </notification> <notification name="ServerVersionChanged"> - La región en la que ha entrado se ejecuta en un simulador con una versión diferente. Pulse este mensaje para ver más detalles. + Acabas de entrar en una región que usa un servidor con una versión distinta, y esto puede influir en el funcionamiento. [[URL] Ver las notas de desarrollo]. + </notification> + <notification name="UnsupportedCommandSLURL"> + No se admite el formato de la SLurl que has pulsado. + </notification> + <notification name="BlockedSLURL"> + Por tu seguridad, se ha bloqueado una SLurl recibida de un navegador no de confianza. </notification> - <notification name="UnableToOpenCommandURL"> - No puede abrirse desde este navegador la URL que ha pulsado. + <notification name="ThrottledSLURL"> + En muy poco tiempo, se han recibido muchas SLurls desde un navegador que no es de confianza. +Por tu seguridad, serán bloqueadas durante unos segundos. + </notification> + <notification name="IMToast"> + [MESSAGE] + <form name="form"> + <button name="respondbutton" text="Responder"/> + </form> + </notification> + <notification name="ConfirmCloseAll"> + ¿Seguro que quieres cerrar todos los MI? + <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="AttachmentSaved"> + Se ha guardado el adjunto. + </notification> + <notification name="UnableToFindHelpTopic"> + No se ha podido encontrar un tema de ayuda para este elemento. + </notification> + <notification name="ObjectMediaFailure"> + Error del servidor: fallo en la actualización u obtención de los media. +'[ERROR]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="TextChatIsMutedByModerator"> + Un moderador ha silenciado tu chat de texto. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="VoiceIsMutedByModerator"> + Un moderador ha silenciado tu voz. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="ConfirmClearTeleportHistory"> + ¿Estás seguro de que quieres borrar tu historial de teleportes? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="BottomTrayButtonCanNotBeShown"> + El botón elegido no se puede mostrar correctamente. +Se mostrará cuando tenga suficiente espacio. </notification> <global name="UnsupportedCPU"> - La velocidad de su CPU no cumple los requerimientos mÃnimos. </global> <global name="UnsupportedGLRequirements"> - Parece que no tiene los requerimientos de hardware apropiados para [APP_NAME]. [APP_NAME] requiere una tarjeta gráfica OpenGL que admita texturas múltiples ('multitexture support'). Si la tiene, compruebe que tiene los últimos drivers para su tarjeta gráfica, asà como los últimos parches y 'service packs' para su sistema operativo. + Parece que no tienes el hardware apropiado para [APP_NAME]. [APP_NAME] requiere una tarjeta gráfica OpenGL que admita texturas múltiples ('multitexture support'). Si la tienes, comprueba que tienes los últimos 'drivers' para tu tarjeta gráfica, asà como los últimos parches y 'service packs' para tu sistema operativo. -Si los problemas persisten, por favor, acuda a: http://www.secondlife.com/support +Si los problemas persisten, por favor, acude a [SUPPORT_SITE]. </global> <global name="UnsupportedCPUAmount"> 796 @@ -3049,10 +2606,8 @@ Si los problemas persisten, por favor, acuda a: http://www.secondlife.com/suppor <global name="UnsupportedRAM"> - La memoria de su sistema no cumple los requerimientos mÃnimos. </global> - <global name="PermYes"> - Sà - </global> - <global name="PermNo"> - No + <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> + Si posees un terreno, puedes hacerlo tu Base. +También puedes buscar en el Mapa lugares marcados como "Puntos de Información". </global> </notifications> diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml new file mode 100644 index 0000000000..8d4fadb101 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_active_object_row.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_activeim_row"> + <string name="unknown_obj"> + Objeto desconocido + </string> + <text name="object_name"> + Objeto sin nombre + </text> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml new file mode 100644 index 0000000000..c64a93e0e5 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="vertical_stack"> + <layout_panel name="call_btn_panel"> + <button label="Llamar" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Colgar" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Controles de la voz" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml new file mode 100644 index 0000000000..e1ffc14823 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="avatar_list_item"> + <string name="FormatSeconds"> + [COUNT] seg. + </string> + <string name="FormatMinutes"> + [COUNT] min. + </string> + <string name="FormatHours"> + [COUNT] h. + </string> + <string name="FormatDays"> + [COUNT] d. + </string> + <string name="FormatWeeks"> + [COUNT] sem. + </string> + <string name="FormatMonths"> + [COUNT] mes/es + </string> + <string name="FormatYears"> + [COUNT] año/s + </string> + <text name="avatar_name" value="Desconocido"/> + <button name="profile_btn" tool_tip="Ver el perfil"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml new file mode 100644 index 0000000000..cddbad1195 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="block_list_panel"> + <text name="title_text"> + Lista de ignorados + </text> + <scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/> + <button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/> + <button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/> + <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray.xml b/indra/newview/skins/default/xui/es/panel_bottomtray.xml new file mode 100644 index 0000000000..74dc17f3de --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_bottomtray.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray"> + <string name="SpeakBtnToolTip"> + Activa/Desactiva el micrófono + </string> + <string name="VoiceControlBtnToolTip"> + Muestra/Oculta el panel del control de voz + </string> + <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Hablar" label_selected="Hablar" name="speak_btn"/> + </talk_button> + </layout_panel> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Gestos" name="Gesture" tool_tip="Muestra/Oculta los gestos"/> + </layout_panel> + <layout_panel name="movement_panel"> + <button label="Moverme" name="movement_btn" tool_tip="Muestra/Oculta los controles del movimiento"/> + </layout_panel> + <layout_panel name="cam_panel"> + <button label="Visión" name="camera_btn" tool_tip="Muestra/Oculta los controles de la cámara"/> + </layout_panel> + <layout_panel name="snapshot_panel"> + <button label="" name="snapshots" tool_tip="Hacer una foto"/> + </layout_panel> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Conversaciones"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notificaciones"/> + </chiclet_notification> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..8d1b84a5fd --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Gestos" name="Gesture" tool_tip="Muestra/Oculta los gestos"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml new file mode 100644 index 0000000000..d46eadde48 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_classified_info"> + <panel.string name="l$_price"> + [PRICE] L$ + </panel.string> + <text name="title" value="Información del clasificado"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text_editor name="classified_name" value="[nombre]"/> + <text_editor name="classified_location" value="[cargando...]"/> + <text_editor name="content_type" value="[tipo de contenido]"/> + <text_editor name="category" value="[categorÃa]"/> + <check_box label="Renovar automáticamente cada semana" name="auto_renew"/> + <text_editor name="price_for_listing" tool_tip="Precio por publicarlo."/> + <text_editor name="classified_desc" value="[descripción]"/> + </panel> + </scroll_container> + <panel name="buttons"> + <button label="Teleportar" name="teleport_btn"/> + <button label="Mapa" name="show_on_map_btn"/> + <button label="Editar" name="edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml new file mode 100644 index 0000000000..3f238da9d0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_alpha_panel"> + <panel name="avatar_alpha_color_panel"> + <texture_picker label="Alfa inferior" name="Lower Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa superior" name="Upper Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa de la cabeza" name="Head Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa de los ojos" name="Eye Alpha" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Alfa del pelo" name="Hair Alpha" tool_tip="Pulsa para elegir una imagen"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml new file mode 100644 index 0000000000..e612104b3f --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar el clasificado" name="panel_edit_classified"> + <panel.string name="location_notice"> + (se actualizará tras guardarlo) + </panel.string> + <text name="title"> + Editar el clasificado + </text> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/> + <text name="Name:"> + TÃtulo: + </text> + <text name="description_label"> + Descripción: + </text> + <text name="location_label"> + Localización: + </text> + <text name="classified_location"> + cargando... + </text> + <button label="Configurarlo en esta localización" name="set_to_curr_location_btn"/> + <spinner label="L$" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/> + <check_box label="Renovar automáticamente cada semana" name="auto_renew"/> + </panel> + </scroll_container> + <panel label="bottom_panel" name="bottom_panel"> + <button label="Guardar" name="save_changes_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml new file mode 100644 index 0000000000..e33848554d --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_eyes_panel"> + <panel name="avatar_eye_color_panel"> + <texture_picker label="Iris" name="Iris" tool_tip="Pulsa para elegir una imagen"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="eyes_main_tab" title="Ojos"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml new file mode 100644 index 0000000000..397322466c --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_gloves_panel"> + <panel name="avatar_gloves_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="gloves_main_tab" title="Guantes"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml new file mode 100644 index 0000000000..49cc8ce98c --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_hair.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_hair_panel"> + <panel name="avatar_hair_color_panel"> + <texture_picker label="Textura" name="Texture" tool_tip="Pulsa para elegir una imagen"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="hair_color_tab" title="Color"/> + <accordion_tab name="hair_style_tab" title="Estilo"/> + <accordion_tab name="hair_eyebrows_tab" title="Cejas"/> + <accordion_tab name="hair_facial_tab" title="Facial"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml new file mode 100644 index 0000000000..abee993aec --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_jacket_panel"> + <panel name="avatar_jacket_color_panel"> + <texture_picker label="Tejido superior" name="Upper Fabric" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tejido inferior" name="Lower Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="jacket_main_tab" title="Chaqueta"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml new file mode 100644 index 0000000000..80eb5f0de0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_pants.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_pants_panel"> + <panel name="avatar_pants_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="pants_main_tab" title="Pantalones"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml new file mode 100644 index 0000000000..839e9c6023 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar el destacado" name="panel_edit_pick"> + <text name="title"> + Editar el destacado + </text> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/> + <text name="Name:"> + TÃtulo: + </text> + <text name="description_label"> + Descripción: + </text> + <text name="location_label"> + Posición: + </text> + <text name="pick_location"> + cargando... + </text> + <button label="Configurar en la posición actual" name="set_to_curr_location_btn"/> + </panel> + </scroll_container> + <panel label="bottom_panel" name="bottom_panel"> + <button label="Guardar [WHAT]" name="save_changes_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml index c12dd8d58c..e7bd7aba17 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml @@ -1,45 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="edit_profile_panel"> - <string name="CaptionTextAcctInfo"> - [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] - </string> - <string name="AcctTypeResident" - value="Residente" /> - <string name="AcctTypeTrial" - value="Prueba" /> - <string name="AcctTypeCharterMember" - value="Miembro fundador" /> - <string name="AcctTypeEmployee" - value="Empleado de Linden Lab" /> - <string name="PaymentInfoUsed" - value="Ha usado una forma de pago" /> - <string name="PaymentInfoOnFile" - value="Hay infor. de la forma de pago" /> - <string name="NoPaymentInfoOnFile" - value="Sin infor. de la forma de pago" /> - <string name="AgeVerified" - value="Edad verificada" /> - <string name="NotAgeVerified" - value="Edad no verificada" /> - <string name="partner_edit_link_url"> - http://www.secondlife.com/account/partners.php?lang=es - </string> - <panel name="scroll_content_panel"> - <panel name="data_panel" > - <panel name="lifes_images_panel"> - <panel name="second_life_image_panel"> - <text name="second_life_photo_title_text"> - [SECOND_LIFE]: - </text> - </panel> - </panel> - <text name="title_partner_text" value="Compañero/a:"/> - <panel name="partner_data_panel"> - <text name="partner_text" value="[FIRST] [LAST]"/> - </panel> - <text name="text_box3"> - Mensaje en el estado ocupado: - </text> - </panel> - </panel> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar el perfil" name="edit_profile_panel"> + <string name="CaptionTextAcctInfo"> + [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] + </string> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <string name="AcctTypeResident" value="Residente"/> + <string name="AcctTypeTrial" value="Prueba"/> + <string name="AcctTypeCharterMember" value="Miembro fundador"/> + <string name="AcctTypeEmployee" value="Empleado de Linden Lab"/> + <string name="PaymentInfoUsed" value="Ha usado una forma de pago"/> + <string name="PaymentInfoOnFile" value="Hay infor. de la forma de pago"/> + <string name="NoPaymentInfoOnFile" value="Sin infor. de la forma de pago"/> + <string name="AgeVerified" value="Edad verificada"/> + <string name="NotAgeVerified" value="Edad no verificada"/> + <string name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=es + </string> + <string name="no_partner_text" value="Ninguno"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="data_panel"> + <panel name="lifes_images_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Pulsa para elegir una imagen"/> + </panel> + <panel name="first_life_image_panel"> + <text name="real_world_photo_title_text" value="Mundo real:"/> + </panel> + <icon label="" name="real_world_edit_icon" tool_tip="Pulsa para elegir una imagen"/> + <text name="title_homepage_text"> + Web: + </text> + <check_box label="Mostrarme en los resultados de la búsqueda" name="show_in_search_checkbox"/> + <text name="title_acc_status_text" value="Mi cuenta:"/> + <text_editor name="acc_status_text" value="Residente. No ha aportado información de pago."/> + <text name="my_account_link" value="[[URL] Ir a mi Panel de Control]"/> + <text name="title_partner_text" value="Mi compañero/a:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(obteniendo)" name="partner_text"/> + </panel> + <text name="partner_edit_link" value="[[URL] Editar]"/> + </panel> + </panel> + </scroll_container> + <panel name="profile_me_buttons_panel"> + <button label="Guardar cambios" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml new file mode 100644 index 0000000000..8a9ac0e9ec --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_shape.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shape_panel"> + <panel name="avatar_sex_panel"> + <text name="gender_text"> + Sexo: + </text> + <radio_group name="sex_radio"> + <radio_item label="Mujer" name="radio"/> + <radio_item label="Varón" name="radio2"/> + </radio_group> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shape_body_tab" title="Cuerpo"/> + <accordion_tab name="shape_head_tab" title="Cabeza"/> + <accordion_tab name="shape_eyes_tab" title="Ojos"/> + <accordion_tab name="shape_ears_tab" title="Orejas"/> + <accordion_tab name="shape_nose_tab" title="Nariz"/> + <accordion_tab name="shape_mouth_tab" title="Boca"/> + <accordion_tab name="shape_chin_tab" title="Barbilla"/> + <accordion_tab name="shape_torso_tab" title="Torso"/> + <accordion_tab name="shape_legs_tab" title="Piernas"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml new file mode 100644 index 0000000000..6d65660409 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shirt_panel"> + <panel name="avatar_shirt_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shirt_main_tab" title="Camisa"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml new file mode 100644 index 0000000000..e613b1809d --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shoes_panel"> + <panel name="avatar_shoes_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shoes_main_tab" title="Zapatos"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml new file mode 100644 index 0000000000..2d9e556a4a --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_skin.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_skin_panel"> + <panel name="avatar_skin_color_panel"> + <texture_picker label="Tatuajes de la cabeza" name="Head Tattoos" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuajes superiores" name="Upper Tattoos" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuajes inferiores" name="Lower Tattoos" tool_tip="Pulsa para elegir una imagen"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skin_color_tab" title="Color de la piel"/> + <accordion_tab name="skin_face_tab" title="Detalles faciales"/> + <accordion_tab name="skin_makeup_tab" title="Maquillaje"/> + <accordion_tab name="skin_body_tab" title="Detalles del cuerpo"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml new file mode 100644 index 0000000000..c8e25d38a9 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_skirt_panel"> + <panel name="avatar_skirt_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skirt_main_tab" title="Falda"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml new file mode 100644 index 0000000000..d65f119da7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_socks.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_socks_panel"> + <panel name="avatar_socks_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="socks_main_tab" title="Calcetines"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml new file mode 100644 index 0000000000..e5e72a11e4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_tattoo_panel"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuaje de la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/> + <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml new file mode 100644 index 0000000000..ea446c1625 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_underpants_panel"> + <panel name="avatar_underpants_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="underpants_main_tab" title="Ropa interior"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml new file mode 100644 index 0000000000..92e42657a4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_undershirt_panel"> + <panel name="avatar_undershirt_color_panel"> + <texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/> + <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="undershirt_main_tab" title="Camiseta"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml new file mode 100644 index 0000000000..6d48b77d3c --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Se puede poner" name="panel_edit_wearable"> + <string name="edit_shape_title"> + Modificando la anatomÃa + </string> + <string name="edit_skin_title"> + Modificando la piel + </string> + <string name="edit_hair_title"> + Modificando el pelo + </string> + <string name="edit_eyes_title"> + Modificando los ojos + </string> + <string name="edit_shirt_title"> + Modificando la camisa + </string> + <string name="edit_pants_title"> + Modificando los pantalones + </string> + <string name="edit_shoes_title"> + Modificando los zapatos + </string> + <string name="edit_socks_title"> + Modificando los calcetines + </string> + <string name="edit_jacket_title"> + Modificando la chaqueta + </string> + <string name="edit_skirt_title"> + Modificando la falda + </string> + <string name="edit_gloves_title"> + Modificando los guantes + </string> + <string name="edit_undershirt_title"> + Modificando la camiseta + </string> + <string name="edit_underpants_title"> + Modificando la ropa interior + </string> + <string name="edit_alpha_title"> + Modificando la capa Alfa + </string> + <string name="edit_tattoo_title"> + Modificando los tatuajes + </string> + <string name="shape_desc_text"> + AnatomÃa: + </string> + <string name="skin_desc_text"> + Piel: + </string> + <string name="hair_desc_text"> + Pelo: + </string> + <string name="eyes_desc_text"> + Ojos: + </string> + <string name="shirt_desc_text"> + Camisa: + </string> + <string name="pants_desc_text"> + Pantalones: + </string> + <string name="shoes_desc_text"> + Zapatos: + </string> + <string name="socks_desc_text"> + Calcetines: + </string> + <string name="jacket_desc_text"> + Chaqueta: + </string> + <string name="skirt_skirt_desc_text"> + Falda: + </string> + <string name="gloves_desc_text"> + Guantes: + </string> + <string name="undershirt_desc_text"> + Camiseta: + </string> + <string name="underpants_desc_text"> + Ropa interior: + </string> + <string name="alpha_desc_text"> + Capa alfa: + </string> + <string name="tattoo_desc_text"> + Tatuaje: + </string> + <text name="edit_wearable_title" value="Modificando la anatomÃa"/> + <panel label="Camisa" name="wearable_type_panel"> + <text name="description_text" value="AnatomÃa:"/> + </panel> + <panel name="button_panel"> + <button label="Guardar como" name="save_as_button"/> + <button label="Revertir" name="revert_button"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml index ea5c7d1e4f..e1cac7c2c3 100644 --- a/indra/newview/skins/default/xui/es/panel_friends.xml +++ b/indra/newview/skins/default/xui/es/panel_friends.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="friends"> <string name="Multiple"> - Varios amigos... + Varios amigos </string> <scroll_list name="friend_list" tool_tip="Para seleccionar a varios amigos, mantenga pulsado Ctrl o Mays. mientras les va pulsando."> <column name="icon_online_status" tool_tip="Estado de conexión"/> @@ -13,8 +13,8 @@ </scroll_list> <button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de mensajes instantáneos"/> <button label="Perfil" name="profile_btn" tool_tip="Mostrar la imagen, los grupos, y otra información"/> - <button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/> - <button label="Pagar..." name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/> - <button label="Quitar..." name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/> - <button label="Añadir..." name="add_btn" tool_tip="Ofrecer ser mi amigo a un residente"/> + <button label="Teleporte" name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/> + <button label="Pagar" name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/> + <button label="Quitar" name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/> + <button label="Añadir" name="add_btn" tool_tip="Ofrecer amistad a un Residente"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml new file mode 100644 index 0000000000..b398293175 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="vertical_stack"> + <layout_panel name="group_info_btn_panel"> + <button label="Perfil del grupo" name="group_info_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Llamar al grupo" 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="Abrir los controles de la voz" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index 4fd5685b7d..66d0c5be93 100644 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml @@ -1,72 +1,55 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="General" name="general_tab"> - <string name="help_text"> - La pestaña General contiene información global de este grupo, la lista de propietarios y miembros visibles, las preferencias generales del grupo, y las opciones de los miembros. + <panel.string name="help_text"> + La pestaña General tiene información general de este grupo, una lista de sus miembros, las preferencias generales del grupo y las opciones de sus miembros. -Ponga su ratón sobre las opciones para más información. - </string> - <string name="group_info_unchanged"> - La información general del grupo ha cambiado. - </string> - <button label="?" label_selected="?" name="help_button"/> - <line_editor label="Escriba aquà el nombre de su nuevo grupo" name="group_name_editor"/> - <text name="group_name"> - Escriba aquà el nombre de su nuevo grupo - </text> - <text name="prepend_founded_by"> - Creado por - </text> - <text name="founder_name"> - (esperando) - </text> - <text name="group_charter_label"> - Carta del grupo - </text> - <texture_picker label="Emblema del grupo" name="insignia" tool_tip="Pulse para elegir una imagen"/> +Deja el cursor sobre las opciones para ver más ayuda. + </panel.string> + <panel.string name="group_info_unchanged"> + Ha cambiado la información general del grupo + </panel.string> + <panel.string name="incomplete_member_data_str"> + Recuperando los datos de los miembros + </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Pulsa para elegir una imagen"/> + <text name="prepend_founded_by"> + Fundador: + </text> + <name_box initial_value="(obteniendo)" name="founder_name"/> + <text name="join_cost_text"> + Gratis + </text> + <button label="¡ENTRA AHORA!" name="btn_join"/> + </panel> <text_editor name="charter"> Carta del grupo </text_editor> - <button label="Entrar (0 L$)" label_selected="Entrar (0 L$)" name="join_button"/> - <button label="Ver en detalle" label_selected="Ver en detalle" name="info_button"/> - <text name="text_owners_and_visible_members"> - Propietarios y Miembros visibles - </text> - <text name="text_owners_are_shown_in_bold"> - (los propietarios aparecen en negrilla) - </text> <name_list name="visible_members"> - <name_list.columns label="Nombre del miembro" name="name" relwidth="0.40"/> + <name_list.columns label="Miembro" name="name" relwidth="0.40"/> <name_list.columns label="Etiqueta" name="title" relwidth="0.25"/> - <name_list.columns label="Última conexión" name="online" relwidth="0.35"/> + <name_list.columns label="Estado" name="status"/> </name_list> - <text name="text_group_preferences"> - Preferencias del grupo + <text name="my_group_settngs_label"> + Yo </text> + <text name="active_title_label"> + Mi etiqueta: + </text> + <combo_box name="active_title" tool_tip="Configura la etiqueta que se verá sobre el nombre de tu avatar cuando tengas activo este grupo."/> + <check_box label="Recibir los avisos del grupo" name="receive_notices" tool_tip="Configura si quieres recibir avisos del grupo. Desmárcalo si este grupo te envÃa 'spam'."/> + <check_box label="Mostrarlo en mi perfil" name="list_groups_in_profile" tool_tip="Configura si quieres que este grupo se vea en tu perfil"/> <panel name="preferences_container"> - <check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/> - <check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/> - <check_box label="Cuota de inscripción:" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/> - <spinner width="60" left_delta="130" name="spin_enrollment_fee" tool_tip="Cuando está marcado 'Cuota de inscripción', los miembros nuevos deben pagar esta cuota para entrar al grupo."/> - <combo_box bottom_delta="-38" width="150" name="group_mature_check" tool_tip="Establece si la información de su grupo es 'mature'."> - <combo_box.item name="select_mature" label="- Elegir Calificación -"/> - <combo_box.item name="mature" label="Contenido 'Mature'"/> - <combo_box.item name="pg" label="Contenido 'PG'"/> + <text name="group_settngs_label"> + Grupo + </text> + <check_box label="Cualquiera puede entrar" name="open_enrollement" tool_tip="Configura si se permite la entrada de nuevos miembros sin ser invitados."/> + <check_box label="Cuota de entrada" name="check_enrollment_fee" tool_tip="Configura si hay que pagar una cuota para entrar al grupo"/> + <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Si la opción Cuota de entrada está marcada, los nuevos miembros han de pagar esta cuota para entrar al grupo." width="60"/> + <combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es 'mature'." width="150"> + <combo_box.item label="Contenido 'PG'" name="pg"/> + <combo_box.item label="Contenido 'Mature'" name="mature"/> </combo_box> - <panel name="title_container"> - <text name="active_title_label"> - Mi etiqueta activa - </text> - <combo_box name="active_title" tool_tip="Define la etiqueta que aparecerá sobre el nombre de su avatar cuando tenga activo este grupo."/> - </panel> - <check_box label="Recibir los avisos del grupo" name="receive_notices" tool_tip="Define si quiere recibir avisos de este grupo. Desmarque esto si el grupo le envÃa spam."/> - <check_box label="Mostrar el grupo en mi perfil" name="list_groups_in_profile" tool_tip="Define si quiere que este grupo aparezca en su perfil."/> + <check_box initial_value="true" label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Permite que la gente vea este grupo en los resultados de la búsqueda"/> </panel> - <string name="incomplete_member_data_str"> - Recuperando los datos de los miembros - </string> - <string name="confirm_group_create_str"> - Crear este grupo cuesta 100 L$. -¿Está plena, absoluta, y TOTALMENTE seguro de que quiere gastarse 100 L$ para crear este grupo? -Queda avisado de que si, en un plazo de 48 horas, no entra nadie al grupo, éste será disuelto, y el nombre no se podrá usar en el futuro. - </string> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml new file mode 100644 index 0000000000..872dfb13d7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Perfil del grupo" name="GroupInfo"> + <panel.string name="default_needs_apply_text"> + Hay cambios sin guardar + </panel.string> + <panel.string name="want_apply_text"> + ¿Quieres guardar estos cambios? + </panel.string> + <panel.string name="group_join_btn"> + Entrar ([AMOUNT] L$) + </panel.string> + <panel.string name="group_join_free"> + Gratis + </panel.string> + <panel name="group_info_top"> + <text name="group_name" value="(Cargando...)"/> + <line_editor label="Escribe aquà el nombre de tu nuevo grupo" name="group_name_editor"/> + </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="General"/> + <accordion_tab name="group_roles_tab" title="Roles"/> + <accordion_tab name="group_notices_tab" title="Avisos"/> + <accordion_tab name="group_land_tab" title="Terreno/Bienes"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Chat" name="btn_chat"/> + <button label="Llamar al grupo" name="btn_call" tool_tip="Llama a este grupo"/> + <button label="Guardar" label_selected="Guardar" name="btn_apply"/> + <button label="Crear un grupo" name="btn_create" tool_tip="Crea un grupo nuevo"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml index f66f0c473a..0d877f78f2 100644 --- a/indra/newview/skins/default/xui/es/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml @@ -1,24 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Invitar a un miembro" name="invite_panel" width="224"> - <text name="help_text" height="72" bottom_delta="-96" width="214"> - Puede seleccionar a varios residentes -para invitarles a su grupo. Para -empezar, pulse 'Abrir el selector de -residentes'. + <panel.string name="confirm_invite_owner_str"> + ¿Está seguro de que quiere invitar a un nuevo propietario/s? ¡Esta acción es permanente! + </panel.string> + <panel.string name="loading"> + (cargando...) + </panel.string> + <panel.string name="already_in_group"> + Alguno de los Residentes que has elegido ya están en el grupo: no se les enviará la invitación. + </panel.string> + <text bottom_delta="-96" height="72" name="help_text" width="214"> + Puedes elegir a varios Residentes para invitarles a tu grupo. Para empezar, pulsa 'Abrir el selector de residentes'. </text> <button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/> - <name_list height="156" bottom_delta="-160" name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/> - <button left_delta="-7" width="214" label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/> + <name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Para seleccionar a varios residentes, ve pulsando sus nombres mientras mantienes apretada la tecla Ctrl"/> + <button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quitar de la lista a los Residentes seleccionados arriba" width="214"/> <text name="role_text"> Elegir qué rol asignarles: </text> - <combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/> + <combo_box name="role_name" tool_tip="Elige el rol de entre la lista de aquellos que estás autorizado a asignar"/> <button label="Enviar las invitaciones" name="ok_button"/> <button label="Cancelar" name="cancel_button"/> - <string name="confirm_invite_owner_str"> - ¿Está seguro de que quiere invitar a un nuevo propietario/s? ¡Esta acción es permanente! - </string> - <string name="loading"> - (cargando...) + <string name="GroupInvitation"> + Invitar al grupo </string> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml index bccc114624..b763e2e74d 100644 --- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml @@ -1,85 +1,81 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terreno y L$" name="land_money_tab"> - <string name="help_text"> - Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas 'Planificación', 'Detalles' y 'Ventas' aportan información sobre las finanzas del grupo - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> - No tiene permiso para ver qué terreno posee el grupo. - </string> - <string name="cant_view_group_accounting_text"> - No tiene permiso para ver la información de la cuenta del grupo. - </string> - <string name="loading_txt"> + <panel.string name="help_text"> + Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. + </panel.string> + <panel.string name="cant_view_group_land_text"> + No tienes permiso para ver el terreno propiedad del grupo + </panel.string> + <panel.string name="cant_view_group_accounting_text"> + No tienes permiso para ver la información de la cuenta del grupo. + </panel.string> + <panel.string name="loading_txt"> Cargando... - </string> - <text name="group_land_heading" width="250"> - Terreno propiedad del grupo - </text> - <scroll_list name="group_parcel_list"> - <column label="Parcela" name="name" width="100"/> - <column label="Región" name="location" width="100"/> - <column label="Tipo" name="type" width="100"/> - <column label="Superficie" name="area" width="81"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button" left="282" width="130"/> - <text name="total_contributed_land_label"> - Contribución total: - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <text name="total_land_in_use_label"> - Terreno total en uso: - </text> - <text name="total_land_in_use_value"> - [AREA] m² - </text> - <text name="land_available_label"> - Terreno disponible: - </text> - <text name="land_available_value"> - [AREA] m² - </text> - <text name="your_contribution_label"> - Su contribución: - </text> - <string name="land_contrib_error"> - No se ha podido defininir su contribución de terreno. - </string> - <text name="your_contribution_units"> - ( m² ) - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] máx.) - </text> - <text name="group_over_limit_text"> - Los miembros del grupo deben contribuir con más créditos de terreno -para mantener el terreno en uso. - </text> - <text name="group_money_heading"> - L$ del grupo - </text> + </panel.string> + <panel.string name="land_contrib_error"> + No se ha podido definir tu contribución de terreno + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Parcela" name="name"/> + <scroll_list.columns label="Región" name="location"/> + <scroll_list.columns label="Tipo" name="type"/> + <scroll_list.columns label="Ãrea" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Contribución total: + </text> + <text name="total_contributed_land_value"> + [AREA] m² + </text> + <button label="Mapa" label_selected="Mapa" name="map_button"/> + <text name="total_land_in_use_label"> + Terreno total en uso: + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + Terreno disponible: + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Tu contribución: + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([AMOUNT] máx.) + </text> + <text name="group_over_limit_text"> + Se necesitan más créditos de terreno para mantener el terreno en uso + </text> + <text name="group_money_heading"> + L$ del grupo + </text> + </panel> <tab_container name="group_money_tab_container"> - <panel label="Planificación" name="group_money_planning_tab"> + <panel label="RESUMEN" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> - Calculando... + Cargando... </text_editor> </panel> - <panel label="Detalles" name="group_money_details_tab"> + <panel label="DETALLES" name="group_money_details_tab"> <text_editor name="group_money_details_text"> - Calculando... + Cargando... </text_editor> - <button label="< Antes" label_selected="< Antes" name="earlier_details_button" tool_tip="Ir hacia atrás en el tiempo"/> - <button label="Después >" label_selected="Después >" name="later_details_button" tool_tip="Ir hacia adelante en el tiempo"/> + <button label="< Antes" label_selected="< Antes" name="earlier_details_button" tool_tip="Anterior"/> + <button label="Después >" label_selected="Después >" name="later_details_button" tool_tip="Siguiente"/> </panel> - <panel label="Ventas" name="group_money_sales_tab"> + <panel label="VENTAS" name="group_money_sales_tab"> <text_editor name="group_money_sales_text"> - Calculando... + Cargando... </text_editor> - <button label="< Antes" label_selected="< Antes" name="earlier_sales_button" tool_tip="Ir hacia atrás en el tiempo"/> - <button label="Después >" label_selected="Después >" name="later_sales_button" tool_tip="Ir hacia adelante en el tiempo"/> + <button label="< Antes" label_selected="< Antes" name="earlier_sales_button" tool_tip="Anterior"/> + <button label="Después >" label_selected="Después >" name="later_sales_button" tool_tip="Siguiente"/> </panel> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml new file mode 100644 index 0000000000..5c9f1c3688 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="group_list_item"> + <text name="group_name" value="Desconocido"/> + <button name="profile_btn" tool_tip="Ver el perfil"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml index c6788b3a65..58e1919782 100644 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml @@ -1,35 +1,29 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Avisos" name="notices_tab"> - <text name="help_text"> + <panel.string name="help_text"> Los avisos son una forma rápida de comunicación dentro de un grupo, difundiendo un mensaje y, si se quiere, añadiéndole un Ãtem. Los avisos sólo los reciben los miembros del grupo cuyo rol tiene adjudicada tal habilidad. Puede desactivar los avisos en la pestaña General. - </text> - <text name="no_notices_text"> - No hay avisos pasados. - </text> - <button label="?" label_selected="?" name="help_button"/> - <text name="lbl"> - Archivo de avisos del grupo - </text> + </panel.string> + <panel.string name="no_notices_text"> + No hay avisos pasados + </panel.string> <text name="lbl2"> - Los avisos se mantienen durante 14 dÃas. Las listas de avisos tienen un lÃmite de 200 avisos por dÃa. + Los avisos se mantienen durante 14 dÃas. +El máximo es de 200 por dÃa y grupo. </text> <scroll_list name="notice_list"> - <column label="Asunto" name="subject"/> - <column label="De" name="from"/> - <column label="Fecha" name="date"/> + <scroll_list.columns label="Asunto" name="subject"/> + <scroll_list.columns label="De" name="from"/> + <scroll_list.columns label="Fecha" name="date"/> </scroll_list> <text name="notice_list_none_found"> - No se han encontrado. + No se han encontrado </text> - <button label="Crear un aviso nuevo" label_selected="Crear un aviso nuevo" name="create_new_notice"/> - <button label="Actualizar" label_selected="Actualizar la lista" name="refresh_notices"/> + <button label="Crear un aviso nuevo" label_selected="Crear un aviso nuevo" name="create_new_notice" tool_tip="Crear un aviso nuevo"/> + <button label="Actualizar" label_selected="Actualizar la lista" name="refresh_notices" tool_tip="Actualizar la lista de avisos"/> <panel label="Crear un aviso nuevo" name="panel_create_new_notice"> <text name="lbl"> Crear un aviso </text> - <text name="lbl2"> - Puede añadir un Ãtem al aviso arrastrándolo desde su inventario a este panel. Los Ãtems anexados deben ser copiables y transferibles, y no se puede enviar una carpeta. - </text> <text name="lbl3"> Asunto: </text> @@ -39,16 +33,19 @@ <text name="lbl5"> Anexar: </text> - <button label="Remover lo anexado" label_selected="Remover lo anexado" name="remove_attachment"/> + <text name="string"> + Arrastra y suelta aquà un Ãtem para adjuntarlo: + </text> + <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quita el adjunto de tu aviso"/> <button label="Enviar" label_selected="Enviar" name="send_notice"/> - <panel name="drop_target" tool_tip="Para enviar un Ãtem con el aviso, arrástrelo desde su inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, usted debe tener permiso para copiarlo y transferirlo."/> + <group_drop_target name="drop_target" tool_tip="Para enviar un Ãtem con el aviso, arrástralo desde tu inventario hasta este cajetÃn. Para poder adjuntarlo, debes tener permiso para copiarlo y transferirlo."/> </panel> <panel label="Ver avisos pasados" name="panel_view_past_notice"> <text name="lbl"> Avisos archivados </text> <text name="lbl2"> - Pulse el botón 'Crear un aviso nuevo' para enviar uno nuevo. + Para enviar un aviso nuevo, pulsa el botón + </text> <text name="lbl3"> Asunto: @@ -56,6 +53,6 @@ <text name="lbl4"> Mensaje: </text> - <button label="Abrir lo anexado" label_selected="Abrir lo anexado" name="open_attachment"/> + <button label="Abrir el adjunto" label_selected="Abrir lo anexado" name="open_attachment"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml new file mode 100644 index 0000000000..7bdacbd1e0 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_group_notify.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="instant_message" name="panel_group_notify"> + <panel label="header" name="header"> + <text name="title" value="Nombre del emisor / Nombre del grupo"/> + </panel> + <text name="attachment" value="Adjunto"/> + <button label="OK" name="btn_ok"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml index 2739a3da5e..5ef81162bc 100644 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml @@ -1,158 +1,119 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Miembros y Roles" name="roles_tab"> - <string name="default_needs_apply_text"> - En esta pestaña hay cambios sin aplicar. - </string> - <string name="want_apply_text"> - ¿Quiere aplicar estos cambios? - </string> - <button label="?" name="help_button"/> - <panel name="members_header"> - <text name="static"> - Miembros y Roles - </text> - <text name="static2"> - Los miembros del grupo tienen asignados roles con distintas capacidades. -Estas configuraciones son fácilmente personalizables, para facilitar una -mayor flexibilidad y organización. - </text> - </panel> - <panel name="roles_header"> - <text name="static"> - Roles - </text> - <text name="role_properties_modifiable"> - Elija un rol de los de abajo. Puede modificar su nombre, su -descripción, y la etiqueta de los miembros. - </text> - <text name="role_properties_not_modifiable"> - Elija un rol de los de abajo para ver sus propiedades, miembros, y qué -capacidades tiene asignadas. - </text> - <text bottom_delta="-28" name="role_actions_modifiable"> - También puede asignar capacidades al rol. - </text> - <text name="role_actions_not_modifiable"> - Puede ver, pero no modificar, las capacidades asignadas. - </text> - </panel> - <panel name="actions_header"> - <text name="static"> - Capacidades - </text> - <text name="static2"> - Puede ver una descripción de la capacidad, y qué miembros y roles pueden -realizarla. - </text> - </panel> - <tab_container height="164" name="roles_tab_container"> - <panel height="148" label="Miembros" name="members_sub_tab" tool_tip="Miembros"> - <line_editor bottom="127" name="search_text"/> - <button label="Buscar" name="search_button" width="75"/> - <button label="Verlos todos" name="show_all_button" left_delta="80"/> - <name_list name="member_list" bottom_delta="-105" height="104" > - <column label="Nombre del miembro" name="name"/> - <column label="Cuotas donadas" name="donated"/> - <column label="Última conexión" name="online"/> - </name_list> - <button label="Invitar a un nuevo miembro..." name="member_invite" width="175"/> - <button label="Expulsar del grupo" name="member_eject"/> - <string name="help_text"> + <panel.string name="default_needs_apply_text"> + Hay cambios sin guardar + </panel.string> + <panel.string name="want_apply_text"> + ¿Quieres guardar estos cambios? + </panel.string> + <tab_container name="roles_tab_container"> + <panel label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros"> + <panel.string name="help_text"> Puede añadir o quitar los roles asignados a los miembros. Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos. - </string> + </panel.string> + <filter_editor label="Filtrar los miembros" name="filter_input"/> + <name_list name="member_list"> + <name_list.columns label="Miembro" name="name"/> + <name_list.columns label="Donaciones" name="donated"/> + <name_list.columns label="Estatus" name="online"/> + </name_list> + <button label="Invitar" name="member_invite"/> + <button label="Expulsar" name="member_eject"/> </panel> - <panel height="148" label="Roles" name="roles_sub_tab"> - <line_editor bottom="127" name="search_text"/> - <button label="Buscar" name="search_button" width="75"/> - <button label="Verlos todos" name="show_all_button" left_delta="80"/> - <scroll_list name="role_list" bottom_delta="-104" height="104"> - <column label="Nombre del rol" name="name"/> - <column label="Etiqueta" name="title"/> - <column label="Miembros" name="members"/> + <panel label="ROLES" name="roles_sub_tab"> + <panel.string name="help_text"> + Los roles tienen una etiqueta propia y unas capacidades que se +permiten ejercer a sus miembros. Los miembros pueden +tener más de un rol. Un grupo puede tener hasta 10 roles, +incluyendo el de Todos y el de Propietarios. + </panel.string> + <panel.string name="cant_delete_role"> + Los roles de 'Todos' y 'Propietarios' son especiales, y no pueden eliminarse. + </panel.string> + <panel.string name="power_folder_icon"> + Inv_FolderClosed + </panel.string> + <filter_editor label="Filtrar los roles" name="filter_input"/> + <scroll_list name="role_list"> + <scroll_list.columns label="Rol" name="name"/> + <scroll_list.columns label="Etiqueta" name="title"/> + <scroll_list.columns label="#" name="members"/> </scroll_list> - <button label="Crear un rol nuevo..." name="role_create"/> + <button label="Añadir un rol" name="role_create"/> <button label="Eliminar el rol" name="role_delete"/> - <string name="help_text"> - Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios. - </string> - <string name="cant_delete_role"> - Los roles de 'Todos' y 'Propietarios' son especiales, y no pueden eliminarse. - </string> </panel> - <panel height="148" label="Capacidades" name="actions_sub_tab"> - <line_editor bottom="127" name="search_text"/> - <button label="Buscar" name="search_button" width="75"/> - <button label="Verlos todos" name="show_all_button" left_delta="80"/> - <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Elija una capacidad para verla más en detalle."> - <column label="" name="icon"/> - <column label="" name="action"/> - </scroll_list> - <string name="help_text"> + <panel height="148" label="CAPACIDADES" name="actions_sub_tab" tool_tip="Puedes ver una descripción de la capacidad y qué miembros y roles la tienen."> + <panel.string name="help_text"> Las capacidades permiten a los miembros que tienen ese rol el hacer tareas especÃficas dentro de este grupo. Hay una gran variedad de capacidades. - </string> + </panel.string> + <filter_editor label="Filtrar las capacidades" name="filter_input"/> + <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Elige una capacidad para verla más en detalle"> + <scroll_list.columns label="" name="icon"/> + <scroll_list.columns label="" name="action"/> + </scroll_list> </panel> </tab_container> <panel name="members_footer"> <text name="static"> Roles asignados </text> + <scroll_list name="member_assigned_roles"> + <scroll_list.columns label="" name="checkbox"/> + <scroll_list.columns label="" name="role"/> + </scroll_list> <text name="static2"> Capacidades permitidas </text> - <scroll_list name="member_assigned_roles"> - <column label="" name="checkbox"/> - <column label="" name="role"/> - </scroll_list> - <scroll_list name="member_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades."> - <column label="" name="icon"/> - <column label="" name="action"/> + <scroll_list name="member_allowed_actions" tool_tip="Para más detalles de cada capacidad, ver la pestaña Capacidades"> + <scroll_list.columns label="" name="icon"/> + <scroll_list.columns label="" name="action"/> </scroll_list> </panel> <panel name="roles_footer"> <text name="static"> - Nombre - </text> - <text name="static2"> - Descripción + Nombre del rol </text> <line_editor name="role_name"> Empleados </line_editor> <text name="static3"> - Etiqueta + Etiqueta del rol </text> <line_editor name="role_title"> (esperando) </line_editor> + <text name="static2"> + Descripción + </text> <text_editor name="role_description"> (esperando) </text_editor> <text name="static4"> - Miembros asignados + Roles asignados </text> + <check_box label="Mostrar los miembros" name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo."/> <text name="static5" tool_tip="Una lista de las capacidades que puede desarrollar el rol seleccionado actualmente."> Capacidades asignadas </text> - <check_box label="Los miembros son visibles." name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo."/> - <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades."> - <column label="" name="icon"/> - <column label="" name="checkbox"/> - <column label="" name="action"/> + <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad, ver la pestaña Capacidades"> + <scroll_list.columns label="" name="icon"/> + <scroll_list.columns label="" name="checkbox"/> + <scroll_list.columns label="" name="action"/> </scroll_list> </panel> <panel name="actions_footer"> <text name="static"> - Descripción + Descripción de la capacidad </text> <text_editor name="action_description"> Esta capacidad es la de 'Expulsar miembros de este grupo'. Sólo un propietario puede expulsar a otro. </text_editor> <text name="static2"> - Roles con la capacidad + Roles con esta capacidad </text> <text name="static3"> - Miembros con la capacidad + Miembros con esta capacidad </text> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml new file mode 100644 index 0000000000..c3d5b017ad --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="button_stack"> + <layout_panel name="view_profile_btn_panel"> + <button label="Perfil" name="view_profile_btn"/> + </layout_panel> + <layout_panel name="add_friend_btn_panel"> + <button label="Añadir como amigo" name="add_friend_btn"/> + </layout_panel> + <layout_panel name="teleport_btn_panel"> + <button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Compartir" name="share_btn"/> + </layout_panel> + <layout_panel name="share_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> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml new file mode 100644 index 0000000000..49a9f84cfe --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_landmark_info.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="landmark_info"> + <string name="title_create_landmark" value="Crear un hito"/> + <string name="title_edit_landmark" value="Editar el hito"/> + <string name="title_landmark" value="Hito"/> + <string name="not_available" value="(No disp.)"/> + <string name="unknown" value="(desconocidas)"/> + <string name="public" value="(público)"/> + <string name="server_update_text"> + Los datos de este lugar no están disponibles sin una actualización del servidor. + </string> + <string name="server_error_text"> + Los datos de este lugar no están disponibles por el momento. Por favor, prueba más tarde. + </string> + <string name="server_forbidden_text"> + Por restricciones en el acceso, los datos de esta localización no están disponibles. Por favor, revisa tus permisos con el propietario de la parcela. + </string> + <string name="acquired_date"> + [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + </string> + <button name="back_btn" tool_tip="Atrás"/> + <text name="title" value="Añadir el perfil"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="maturity_value" value="desconocido"/> + <panel name="landmark_info_panel"> + <text name="owner_label" value="Propietario:"/> + <text name="creator_label" value="Creador:"/> + <text name="created_label" value="Creado:"/> + </panel> + <panel name="landmark_edit_panel"> + <text name="title_label" value="TÃtulo:"/> + <text name="notes_label" value="Mis notas:"/> + <text name="folder_label" value="Localización del hito:"/> + </panel> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml new file mode 100644 index 0000000000..8f476403c7 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_landmarks.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Landmarks"> + <accordion name="landmarks_accordion"> + <accordion_tab name="tab_favorites" title="Barra de favoritos"/> + <accordion_tab name="tab_landmarks" title="Mis hitos"/> + <accordion_tab name="tab_inventory" title="Mi Inventario"/> + <accordion_tab name="tab_library" title="Biblioteca"/> + </accordion> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Ver más opciones"/> + <button name="add_btn" tool_tip="Añadir un nuevo hito"/> + <dnd_button name="trash_btn" tool_tip="Quitar el hito seleccionado"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index 52c3855d6a..c5494d8199 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -6,34 +6,29 @@ <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=es </panel.string> -<panel name="login_widgets"> - <text name="first_name_text"> - Nombre: - </text> - <text name="last_name_text"> - Apellido: - </text> - <text name="password_text"> - Contraseña: - </text> - <text name="start_location_text"> - Posición inicial: - </text> - <combo_box name="start_location_combo"> - <combo_box.item name="MyHome" label="Mi Base"/> - <combo_box.item name="MyLastLocation" label="Mi última posición"/> - <combo_box.item name="Typeregionname" label="<Escriba el nombre de la Región>"/> - </combo_box> - <check_box label="Recordar la contraseña" name="remember_check"/> - <button label="Iniciar sesión" label_selected="Iniciar sesión" name="connect_btn"/> - <text name="create_new_account_text"> - RegÃstrese para obtener una cuenta - </text> - <text name="forgot_password_text"> - ¿Olvidó su nombre o su contraseña? - </text> - <text name="channel_text"> - [VERSION] - </text> -</panel> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="first_name_text"> + Nombre: + </text> + <line_editor label="Nombre" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Apellido" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <check_box label="Recordar la contraseña" name="remember_check"/> + <text name="start_location_text"> + Empezar en: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Mi Base" name="MyHome"/> + </combo_box> + <button label="Iniciar sesión" name="connect_btn"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_new_account_text"> + Registrarme + </text> + <text name="login_help"> + ¿Necesitas ayuda para conectarte? + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml new file mode 100644 index 0000000000..8656098467 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Cosas" name="main inventory panel"> + <panel.string name="Title"> + Cosas + </panel.string> + <filter_editor label="Filtrar" name="inventory search editor"/> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Todos los Ãtems" name="All Items"/> + <inventory_panel label="Ãtems recientes" name="Recent Items"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostrar más opciones"/> + <button name="add_btn" tool_tip="Añadir un Ãtem nuevo"/> + <dnd_button name="trash_btn" tool_tip="Quitar el Ãtem seleccionado"/> + </panel> + <menu_bar name="Inventory Menu"> + <menu label="Archivo" name="File"> + <menu_item_call label="Abrir" name="Open"/> + <menu label="Subir" name="upload"> + <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> + <menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/> + <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> + <menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Ventana nueva" name="New Window"/> + <menu_item_call label="Ver los filtros" name="Show Filters"/> + <menu_item_call label="Restablecer los filtros" name="Reset Current"/> + <menu_item_call label="Cerrar todas las carpetas" name="Close All Folders"/> + <menu_item_call label="Vaciar la Papelera" name="Empty Trash"/> + <menu_item_call label="Vaciar Objetos Perdidos" name="Empty Lost And Found"/> + </menu> + <menu label="Crear" name="Create"> + <menu_item_call label="Carpeta nueva" name="New Folder"/> + <menu_item_call label="Script nuevo" name="New Script"/> + <menu_item_call label="Nota nueva" name="New Note"/> + <menu_item_call label="Gesto nuevo" name="New Gesture"/> + <menu label="Ropas nuevas" name="New Clothes"> + <menu_item_call label="Camisa nueva" name="New Shirt"/> + <menu_item_call label="Pantalón nuevo" name="New Pants"/> + <menu_item_call label="Zapatos nuevos" name="New Shoes"/> + <menu_item_call label="Calcetines nuevos" name="New Socks"/> + <menu_item_call label="Chaqueta nueva" name="New Jacket"/> + <menu_item_call label="Falda nueva" name="New Skirt"/> + <menu_item_call label="Guantes nuevos" name="New Gloves"/> + <menu_item_call label="Camiseta nueva" name="New Undershirt"/> + <menu_item_call label="Ropa interior nueva" name="New Underpants"/> + <menu_item_call label="Nueva Alfa" name="New Alpha"/> + <menu_item_call label="Tatuaje nuevo" name="New Tattoo"/> + </menu> + <menu label="Nuevas partes del cuerpo" name="New Body Parts"> + <menu_item_call label="Forma nueva" name="New Shape"/> + <menu_item_call label="Piel nueva" name="New Skin"/> + <menu_item_call label="Pelo nuevo" name="New Hair"/> + <menu_item_call label="Ojos nuevos" name="New Eyes"/> + </menu> + </menu> + <menu label="Ordenar" name="Sort"> + <menu_item_check label="Alfabéticamente" name="By Name"/> + <menu_item_check label="Cronológicamente" name="By Date"/> + <menu_item_check label="Las carpetas siempre alfabéticamente" name="Folders Always By Name"/> + <menu_item_check label="Las carpetas del sistema, arriba" name="System Folders To Top"/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml new file mode 100644 index 0000000000..ed253904aa --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_me.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Mi perfil" name="panel_me"> + <tab_container name="tabs"> + <panel label="MI PERFIL" name="panel_profile"/> + <panel label="MIS DESTACADOS" name="panel_picks"/> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml new file mode 100644 index 0000000000..46326d1e8b --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="General" name="Media Settings General"> + <text name="home_label"> + Página inicial: + </text> + <text name="home_fails_whitelist_label"> + (La Lista Blanca especificada no aprueba esta página) + </text> + <line_editor name="home_url" tool_tip="Página inicial para el origen de este media"/> + <text name="preview_label"> + Vista previa + </text> + <text name="current_url_label"> + Página actual: + </text> + <text name="current_url" tool_tip="Página actual para el origen de este media" value=""/> + <button label="Definir" name="current_url_reset_btn"/> + <check_box initial_value="false" label="Media en bucle" name="auto_loop"/> + <check_box initial_value="false" label="A la primera pulsación" name="first_click_interact"/> + <check_box initial_value="false" label="Zoom automático" name="auto_zoom"/> + <check_box initial_value="false" label="Ejecutar automáticamente los media" name="auto_play"/> + <text name="media_setting_note"> + Nota: los residentes pueden elegir una configuración distinta de ésta + </text> + <check_box initial_value="false" label="Ajustar automáticamente los media en la cara del objeto" name="auto_scale"/> + <text name="size_label"> + Tamaño: + </text> + <text name="X_label"> + X + </text> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..3e625f56fe --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Personalizar" name="Media settings for controls"> + <text name="controls_label"> + Controles: + </text> + <combo_box name="controls"> + <combo_item name="Standard"> + Estándar + </combo_item> + <combo_item name="Mini"> + Mini + </combo_item> + </combo_box> + <check_box initial_value="false" label="Permitir la navegación e interactividad" name="perms_owner_interact"/> + <check_box initial_value="false" label="Mostrar la barra de control" name="perms_owner_control"/> + <check_box initial_value="false" label="Permitir la navegación e interactividad" name="perms_group_interact"/> + <check_box initial_value="false" label="Mostrar la barra de control" name="perms_group_control"/> + <check_box initial_value="false" label="Permitir la navegación e interactividad" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Mostrar la barra de control" name="perms_anyone_control"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml new file mode 100644 index 0000000000..c72f562a68 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Seguridad" name="Media Settings Security"> + <check_box initial_value="false" label="Permitir el acceso sólo a los patrones de URL especificados" name="whitelist_enable"/> + <text name="home_url_fails_some_items_in_whitelist"> + Están marcadas las entradas que la página web no admite: + </text> + <button label="Añadir" name="whitelist_add"/> + <button label="Borrar" name="whitelist_del"/> + <text name="home_url_fails_whitelist"> + Atención: la página web especificada en la pestaña General no se admite en esta lista blanca. Se ha desactivado hasta que se añada una entrada correcta. + </text> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_my_profile.xml b/indra/newview/skins/default/xui/es/panel_my_profile.xml new file mode 100644 index 0000000000..5a6fd8b144 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_my_profile.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Perfil" name="panel_profile"> + <string name="no_partner_text" value="Ninguno/a"/> + <string name="no_group_text" value="Ninguno"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Pulsa el botón Editar el perfil para cambiar la imagen"/> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <icon label="" name="real_world_edit_icon" tool_tip="Pulsa el botón Editar el perfil para cambiar la imagen"/> + <text name="title_rw_descr_text" value="Mundo real:"/> + </panel> + <text name="title_member_text" value="Residente desde:"/> + <text name="title_acc_status_text" value="Estado de la cuenta:"/> + <text name="title_partner_text" value="Compañero/a:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(obteniendo)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupos:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/> + <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu fÃsico, ropas, etc."/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml new file mode 100644 index 0000000000..e8e95c3bac --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="navigation_bar"> + <panel name="navigation_panel"> + <pull_button name="back_btn" tool_tip="Volver a lo localización anterior"/> + <pull_button name="forward_btn" tool_tip="Ir una localización adelante"/> + <button name="home_btn" tool_tip="Teleportar a mi Base"/> + <location_input label="Localización" name="location_combo"/> + <search_combo_box label="Buscar" name="search_combo_box" tool_tip="Buscar"> + <combo_editor label="Buscar en [SECOND_LIFE]" name="search_combo_editor"/> + </search_combo_box> + </panel> + <favorites_bar name="favorite" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquÃ!"> + <label name="favorites_bar_label" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquÃ!"> + Barra de Favoritos + </label> + <chevron_button name=">>" tool_tip="Ver más de Mis favoritos"/> + </favorites_bar> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml new file mode 100644 index 0000000000..986c109c41 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> +<panel name="nearby_chat"> + <panel name="chat_caption"> + <text name="sender_name"> + CHAT + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml new file mode 100644 index 0000000000..af2b6e920b --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="chat_bar"> + <line_editor label="Pulsa aquà para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/> + <button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml new file mode 100644 index 0000000000..885c780e00 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <vacÃo> + </string> + <string name="parcel_media_name"> + Media en streaming de la parcela + </string> + <string name="parcel_audio_name"> + Audio en streaming de la parcela + </string> + <string name="playing_suffix"> + (ejecutándose) + </string> + <panel name="minimized_controls"> + <button label="Parar todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/> + <button label="Iniciar todo" name="all_nearby_media_enable_btn" tool_tip="Encender todos los media cercanos"/> + <button name="open_prefs_btn" tool_tip="Abrir las preferencias de los media"/> + <button label="Más >>" label_selected="Menos <<" name="more_less_btn" tool_tip="Controles avanzados"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Todo" name="All"/> + <combo_box.item label="En esta parcela" name="WithinParcel"/> + <combo_box.item label="Fuera de la parcela" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="CercanÃa" name="media_proximity"/> + <scroll_list.columns label="Visibilidad" name="media_visibility"/> + <scroll_list.columns label="Clase" name="media_class"/> + <scroll_list.columns label="Nombre" name="media_name"/> + <scroll_list.columns label="Depurar" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Parar los media seleccionados"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Ejecutar los media seleccionados"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pausar los media seleccionados"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen de los media seleccionados"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Silenciar el audio de los media seleccionados"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Zoom en los media seleccionados"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Alejar el zoom de los media seleccionados"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_notes.xml b/indra/newview/skins/default/xui/es/panel_notes.xml new file mode 100644 index 0000000000..bf8da4cf73 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_notes.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Notas y Privacidad" name="panel_notes"> + <layout_stack name="layout"> + <panel name="notes_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <text name="status_message" value="Mis notas privadas:"/> + <text name="status_message2" value="Permitir que esta persona:"/> + <check_box label="Vea si estoy conectado" name="status_check"/> + <check_box label="Me vea en el mapa" name="map_check"/> + <check_box label="Edite, borre o coja mis objetos" name="objects_check"/> + </panel> + </scroll_container> + </panel> + <panel name="notes_buttons_panel"> + <button label="Añadir como amigo" name="add_friend" tool_tip="Ofrecer amistad a este Residente"/> + <button label="MI" name="im" tool_tip="Abrir un mensaje instantáneo"/> + <button label="Llamada" name="call" tool_tip="Llamar a este Residente"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/> + <button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/> + </panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_online_status.xml b/indra/newview/skins/default/xui/es/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml new file mode 100644 index 0000000000..2f60df7743 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Cosas" name="Outfits"> + <tab_container name="appearance_tabs"> + <inventory_panel label="MIS VESTUARIOS" name="outfitslist_tab"/> + <inventory_panel label="PUESTO" name="cof_tab"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Ver más opciones"/> + <dnd_button name="trash_btn" tool_tip="Quitar el Ãtem seleccionado"/> + <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guardar la apariencia como un vestuario"/> + <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/> + <button label="M" name="look_edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml new file mode 100644 index 0000000000..8f805c3d18 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gear_default"> + <menu_item_call label="Reemplazar el vestuario actual" name="wear"/> + <menu_item_call label="Añadir al vestuario actual" name="add"/> + <menu_item_call label="Quitar del vestuario actual" name="remove"/> + <menu_item_call label="Renombrar" name="rename"/> + <menu_item_call label="Quitar el enlace" name="remove_link"/> + <menu_item_call label="Borrar el vestuario" name="delete"/> +</menu> diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml new file mode 100644 index 0000000000..03c449da93 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray panel --> +<panel label="Gente" name="people_panel"> + <string name="no_people" value="No hay nadie"/> + <string name="no_one_near" value="No hay nadie cerca"/> + <string name="no_friends_online" value="No hay amigos conectados"/> + <string name="no_friends" value="No hay amigos"/> + <string name="people_filter_label" value="Filtrar a la gente"/> + <string name="groups_filter_label" value="Filtrar a los grupos"/> + <filter_editor label="Filtrar" name="filter_input"/> + <tab_container name="tabs"> + <panel label="CERCANÃA" name="nearby_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="nearby_view_sort_btn" tool_tip="Opciones"/> + <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> + </panel> + </panel> + <panel label="MIS AMIGOS" name="friends_panel"> + <accordion name="friends_accordion"> + <accordion_tab name="tab_online" title="Conectado"/> + <accordion_tab name="tab_all" title="Todas"/> + </accordion> + <panel label="bottom_panel" name="bottom_panel"> + <button name="friends_viewsort_btn" tool_tip="Opciones"/> + <button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/> + <button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/> + </panel> + <text name="no_friends_msg"> + Para añadir amigos, prueba a hacer una [secondlife:///app/search/people búsqueda general] o pulsa en un usuario para añadirle como amigo. +Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el mapa]. + </text> + </panel> + <panel label="MIS GRUPOS" name="groups_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="groups_viewsort_btn" tool_tip="Opciones"/> + <button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/> + <button name="activate_btn" tool_tip="Activar el grupo seleccionado"/> + </panel> + </panel> + <panel label="RECIENTE" name="recent_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="recent_viewsort_btn" tool_tip="Opciones"/> + <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/> + </panel> + </panel> + </tab_container> + <panel name="button_bar"> + <button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/> + <button label="MI" name="im_btn" tool_tip="Abrir un mensaje instantáneo"/> + <button label="Llamada" name="call_btn" tool_tip="Llamar a este Residente"/> + <button label="Compartir" name="share_btn"/> + <button label="Teleportarse" name="teleport_btn" tool_tip="Ofrecer teleporte"/> + <button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/> + <button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/> + <button label="Multiconferencia" name="group_call_btn" tool_tip="Llamar a este grupo"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml new file mode 100644 index 0000000000..c55addbc93 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_pick_info.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_pick_info"> + <text name="title" value="Información del destacado"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text name="pick_name" value="[nombre]"/> + <text name="pick_location" value="[cargando...]"/> + <text name="pick_desc" value="[descripción]"/> + </panel> + </scroll_container> + <panel name="buttons"> + <button label="Teleporte" name="teleport_btn"/> + <button label="Mapa" name="show_on_map_btn"/> + <button label="Editar" name="edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml new file mode 100644 index 0000000000..abedc6c551 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_picks.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Destacados" name="panel_picks"> + <string name="no_picks" value="No hay destacados"/> + <string name="no_classifieds" value="No hay clasificados"/> + <text name="empty_picks_panel_text"> + No hay ni destacados ni clasificados + </text> + <accordion name="accordion"> + <accordion_tab name="tab_picks" title="Destacados"/> + <accordion_tab name="tab_classifieds" title="Clasificados"/> + </accordion> + <panel label="bottom_panel" name="edit_panel"> + <button name="new_btn" tool_tip="Crear un nuevo destacado o clasificado de la posición actual"/> + </panel> + <panel name="buttons_cucks"> + <button label="Información" name="info_btn" tool_tip="Mostrar la información del destacado"/> + <button label="Teleportarse" name="teleport_btn" tool_tip="Teleportar a esta zona"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar esta zona en el mapa del mundo"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml new file mode 100644 index 0000000000..2c873ef464 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="place_profile"> + <string name="on" value="On"/> + <string name="off" value="Off"/> + <string name="anyone" value="Cualquiera"/> + <string name="available" value="disponible"/> + <string name="allocated" value="asignados"/> + <string name="title_place" value="Añadir el perfil"/> + <string name="title_teleport_history" value="Historial de teleportes"/> + <string name="not_available" value="(No disp.)"/> + <string name="unknown" value="(desconocido)"/> + <string name="public" value="(público)"/> + <string name="none_text" value="(ninguno)"/> + <string name="sale_pending_text" value="(venta pendiente)"/> + <string name="group_owned_text" value="(propiedad de un grupo)"/> + <string name="price_text" value="L$"/> + <string name="area_text" value="m²"/> + <string name="all_residents_text" value="Todos los residentes"/> + <string name="group_text" value="Grupo"/> + <string name="can_resell"> + El terreno comprado en esta región puede revenderse. + </string> + <string name="can_not_resell"> + El terreno comprado en esta región no puede revenderse. + </string> + <string name="can_change"> + El terreno comprado en esta región puede unirse o dividirse. + </string> + <string name="can_not_change"> + El terreno comprado en esta región no puede unirse o dividirse. + </string> + <string name="server_update_text"> + La información de esta parcela no está disponible sin una actualización del servidor. + </string> + <string name="server_error_text"> + En este momento no está disponible la información de esta parcela. Por favor, inténtalo más tarde. + </string> + <string name="server_forbidden_text"> + Por tener restringido el acceso, no está disponible la información de esta parcela. Por favor, revisa tus permisos con el propietario de la parcela. + </string> + <string name="acquired_date"> + [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + </string> + <button name="back_btn" tool_tip="Atrás"/> + <text name="title" value="Añadir el perfil"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="owner_label" value="Propietario:"/> + <text name="maturity_value" value="desconocido"/> + <accordion name="advanced_info_accordion"> + <accordion_tab name="parcel_characteristics_tab" title="Parcela"> + <panel name="parcel_characteristics_panel"> + <text name="rating_label" value="Calificación:"/> + <text name="rating_value" value="desconocida"/> + <text name="voice_label" value="Voz:"/> + <text name="voice_value" value="SÃ"/> + <text name="fly_label" value="Volar:"/> + <text name="fly_value" value="SÃ"/> + <text name="push_label" value="Empujones:"/> + <text name="push_value" value="No"/> + <text name="build_label" value="Construir:"/> + <text name="build_value" value="SÃ"/> + <text name="scripts_label" value="Scripts:"/> + <text name="scripts_value" value="SÃ"/> + <text name="damage_label" value="Daño:"/> + <text name="damage_value" value="No"/> + <button label="Acerca del terreno" name="about_land_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="region_information_tab" title="Región"> + <panel name="region_information_panel"> + <text name="region_name_label" value="Región:"/> + <text name="region_type_label" value="Tipo:"/> + <text name="region_rating_label" value="Calificación:"/> + <text name="region_owner_label" value="Propietario:"/> + <text name="region_group_label" value="Grupo:"/> + <button label="Región/Estado" name="region_info_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="estate_information_tab" title="Estado"> + <panel name="estate_information_panel"> + <text name="estate_name_label" value="Estado:"/> + <text name="estate_rating_label" value="Calificación:"/> + <text name="estate_owner_label" value="Propietario:"/> + <text name="covenant_label" value="Contrato:"/> + </panel> + </accordion_tab> + <accordion_tab name="sales_tab" title="En venta"> + <panel name="sales_panel"> + <text name="sales_price_label" value="Precio:"/> + <text name="area_label" value="Ãrea:"/> + <text name="traffic_label" value="Tráfico:"/> + <text name="primitives_label" value="Primitivas:"/> + <text name="parcel_scripts_label" value="Scripts:"/> + <text name="terraform_limits_label" value="LÃmites de modificación del terreno:"/> + <text name="subdivide_label" value="Puede dividirse/unirse:"/> + <text name="resale_label" value="Puede revenderse:"/> + <text name="sale_to_label" value="En venta a:"/> + </panel> + </accordion_tab> + </accordion> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml new file mode 100644 index 0000000000..4818bff069 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_places.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Lugares" name="places panel"> + <string name="landmarks_tab_title" value="MIS HITOS"/> + <string name="teleport_history_tab_title" value="HISTORIAL DE TELEPORTES"/> + <filter_editor label="Filtrar mis lugares" name="Filter"/> + <panel name="button_panel"> + <button label="Teleporte" name="teleport_btn" tool_tip="Teleportar a la zona elegida"/> + <button label="Mapa" name="map_btn"/> + <button label="Editar" name="edit_btn" tool_tip="Editar la información del hito"/> + <button label="â–¼" name="overflow_btn" tool_tip="Ver más opciones"/> + <button label="Guardar" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + <button label="Cerrar" name="close_btn"/> + </panel> +</panel> 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 02fb4da017..add854932d 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml @@ -1,12 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <text name="AspectRatioLabel1" tool_tip="ancho / alto"> - Proporción: +<panel label="Avanzado" name="advanced"> + <panel.string name="aspect_ratio_text"> + [NUM]:[DEN] + </panel.string> + <slider label="Ãngulo de visión" name="camera_fov"/> + <slider label="Distancia" name="camera_offset_scale"/> + <text name="heading2"> + Posición automática para: </text> - <combo_box name="aspect_ratio" tool_tip="ancho / alto"> - <combo_box.item label="4:3 (Standard CRT)" name="item1"/> - <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (Widescreen)" name="item3"/> - <combo_box.item label="16:9 (Widescreen)" name="item4"/> - </combo_box> + <check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Usar el posicionamiento automático de la cámara al entrar en o salir del modo de edición"/> + <check_box label="Apariencia" name="appearance_camera_movement" tool_tip="Usar el posicionamiento automático de la cámara mientras se está editando"/> + <check_box label="Verme en vista subjetiva" name="first_person_avatar_visible"/> + <check_box label="Las teclas del cursor siempre para moverme" name="arrow_keys_move_avatar_check"/> + <check_box label="Correr siempre: atajo de teclado" name="tap_tap_hold_to_run"/> + <check_box label="Al hablar, mover los labios del avatar" name="enable_lip_sync"/> + <check_box label="Bocadillos del chat" name="bubble_text_chat"/> + <slider label="Opacidad" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Elegir el color de los bocadillos del chat"/> + <check_box label="Mostrar los errores de los scripts en:" name="show_script_errors"/> + <radio_group name="show_location"> + <radio_item label="Chat" name="0"/> + <radio_item label="Ventanas distintas" name="1"/> + </radio_group> + <check_box label="Cambiar entre hablar on/off cuando pulse:" name="push_to_talk_toggle_check" tool_tip="En el modo 'un toque', pulsa y suelta el botón UNA VEZ para activar o desactivar el micrófono. Si no estás en el modo 'un toque', el micrófono sólo recogerá tu voz mientras mantengas pulsado el botón."/> + <line_editor label="Botón de Apretar para Hablar" name="modifier_combo"/> + <button label="Elegir la tecla" name="set_voice_hotkey_button"/> + <button label="Botón de en medio del ratón" name="set_voice_middlemouse_button" tool_tip="Reconfigurarlo al botón medio del ratón"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml index a71ac172a3..0ccc307039 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Ventanas emergentes" name="popups" title="Ventanas emergentes"> - <text name="dont_show_label"> - No mostrar estas ventanas emergentes: + <text name="tell_me_label"> + Avisarme: </text> - <button width="200" label="Activar esta ventana emergente" label_selected="Activar esta popup" name="enable_popup"/> - <button width="255" left="225" label="Activar todas las ventanas emergentes..." label_selected="Restaurar cajas de diálogo 'Mostrar en la próxima vez'..." name="reset_dialogs_btn" tool_tip="Activar todas las ventanas emergentes y los avisos de 'primera vez que se usa'."/> + <check_box label="Cuando gaste o consiga L$" name="notify_money_change_checkbox"/> + <check_box label="Cuando mis amigos se conectan o desconectan" name="friends_online_notify_checkbox"/> <text name="show_label" width="300"> - Mostrar estas ventanas emergentes: + Mostrar siempre: </text> - <button left="205" width="275" label="Desactivar todas estas ventanas emergentes..." name="skip_dialogs_btn" tool_tip="Desactivar todas las ventanas emergentes y los avisos de 'primera vez que se usa'."/> - <text name="text_box2"> - Oferta de notas, texturas e hitos: + <text name="dont_show_label"> + No mostrar nunca: </text> - <check_box label="Aceptar automáticamente" name="accept_new_inventory"/> - <check_box label="Ver automáticamente tras aceptar" name="show_new_inventory"/> - <check_box label="Mostrar automáticamente los objetos aceptados recientemente en el inventario" name="show_in_inventory"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index 4e9dc6db6f..17e3b45beb 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat de texto" name="chat"> - <text name="text_box"> - Tamaño de la fuente -del chat: + <text name="font_size"> + Font size: </text> <radio_group name="chat_font_size"> - <radio_item name="radio" label="Pequeño" /> - <radio_item name="radio2" label="Medio" /> - <radio_item name="radio3" label="Grande" /> + <radio_item label="Disminuir" name="radio" value="0"/> + <radio_item label="Media" name="radio2" value="1"/> + <radio_item label="Aumentar" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Font colors: + </text> <color_swatch label="Usted" name="user"/> <text name="text_box1"> - Usted + Yo </text> <color_swatch label="Otros" name="agent"/> <text name="text_box2"> @@ -37,22 +39,14 @@ del chat: <text name="text_box7"> Propietario </text> - <color_swatch label="Bocadillo" name="background"/> - <text name="text_box8"> - Bocadillo - </text> <color_swatch label="URL" name="links"/> <text name="text_box9"> URL </text> - <check_box label="Ver en el chat los avisos y errores de los scripts" name="script_errors_as_chat"/> - <spinner label="Quitar el chat tras" name="fade_chat_time" label_width="95" width="145" /> - <slider label="Opacidad" name="console_opacity"/> - <check_box label="Usar el ancho de la pantalla (tras reiniciar)" name="chat_full_width_check"/> - <check_box label="Cerrar el chat al pulsar Intro" name="close_chat_on_return_check"/> - <check_box label="En el chat, las teclas del cursor mueven el avatar" name="arrow_keys_move_avatar_check"/> - <check_box label="Incluir la hora en el chat" name="show_timestamps_check"/> - <check_box label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/> - <check_box label="Mostrar el chat en bocadillos" name="bubble_text_chat"/> - <slider label="Opacidad" name="bubble_chat_opacity"/> + <check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/> + <check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/> + <radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)"> + <radio_item label="Varias ventanas" name="radio" value="0"/> + <radio_item label="Pestañas" name="radio2" value="1"/> + </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index 2b813a18bf..8993fa139f 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -1,90 +1,67 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="General" name="general_panel"> - <combo_box name="start_location_combo"> - <combo_box.item name="MyHome" tool_tip="Por defecto, iniciar sesión en mi Base." label="Mi Base"/> - <combo_box.item name="MyLastLocation" tool_tip="Por defecto, iniciar sesión en mi última posición." label="Mi última posición"/> - </combo_box> - <check_box label="Ver mi posición inicial en la pantalla de inicio de sesión" name="show_location_checkbox"/> - <combo_box name="fade_out_combobox"> - <combo_box.item name="Never" label="Nunca"/> - <combo_box.item name="Show Temporarily" label="Mostrarlos temporalmente"/> - <combo_box.item name="Always" label="Siempre"/> - </combo_box> - <check_box label="Nombres de avatar en pequeño" name="small_avatar_names_checkbox"/> - <check_box label="No ver mi nombre en mi pantalla" name="show_my_name_checkbox"/> - <text name="group_titles_textbox"> - Etiquetas de grupo: - </text> - <check_box label="Ocultar las etiquetas de grupo" name="show_all_title_checkbox"/> - <check_box label="Ocultar mi etiqueta de grupo" name="show_my_title_checkbox"/> - <color_swatch label="" name="effect_color_swatch" tool_tip="Pulse para abrir el selector de color"/> - <text name="UI Size:"> - Tamaño de la interfaz: + <text name="language_textbox"> + Idioma: </text> - <check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/> - <spinner label="Ausente tras:" name="afk_timeout_spinner"/> - <check_box label="Avisar cuando gasto o recibo dólares Linden (L$)" name="notify_money_change_checkbox"/> - <text name="maturity_desired_label"> - Calificación: + <combo_box name="language_combobox"> + <combo_box.item label="Predeterminado del sistema" name="System Default Language"/> + <combo_box.item label="English (Inglés)" name="English"/> + <combo_box.item label="Dansk (Danés) - Beta" name="Danish"/> + <combo_box.item label="Deutsch (Alemán) - Beta" name="Deutsch(German)"/> + <combo_box.item label="Español - Beta" name="Spanish"/> + <combo_box.item label="Français (Francés) - Beta" name="French"/> + <combo_box.item label="Italiano - Beta" name="Italian"/> + <combo_box.item label="Nederlands (Neerlandés) - Beta" name="Dutch"/> + <combo_box.item label="Polski (Polaco) - Beta" name="Polish"/> + <combo_box.item label="Portugués (Portugués) - Beta" name="Portugese"/> + <combo_box.item label="日本語 (Japonés) - Beta" name="(Japanese)"/> + </combo_box> + <text name="language_textbox2"> + (requiere reiniciar) </text> <text name="maturity_desired_prompt"> - Quiero acceder a contenido calificado: + Quiero acceder a contenido: </text> + <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item name="Desired_Adult" label="'PG', 'Mature' y 'Adult'"/> - <combo_box.item name="Desired_Mature" label="'PG' y 'Mature'"/> - <combo_box.item name="Desired_PG" label="'PG'"/> + <combo_box.item label="'PG', 'Mature' y 'Adult'" name="Desired_Adult"/> + <combo_box.item label="'PG' y 'Mature'" name="Desired_Mature"/> + <combo_box.item label="'PG'" name="Desired_PG"/> </combo_box> - <text name="maturity_desired_textbox"> - 'PG' - </text> <text name="start_location_textbox"> - Posición inicial: + Localización inicial: </text> - <text name="show_names_textbox"> - Mostrar los nombres: + <combo_box name="start_location_combo"> + <combo_box.item label="Mi última posición" name="MyLastLocation" tool_tip="Por defecto, iniciar sesión en mi última posición."/> + <combo_box.item label="Mi Base" name="MyHome" tool_tip="Por defecto, iniciar sesión en mi Base."/> + </combo_box> + <check_box initial_value="true" label="Mostrar en la pantalla de conexión" name="show_location_checkbox"/> + <text name="name_tags_textbox"> + Etiquetas de los nombres: </text> + <radio_group name="Name_Tag_Preference"> + <radio_item label="Off" name="radio" value="0"/> + <radio_item label="On" name="radio2" value="1"/> + <radio_item label="Mostrar brevemente" name="radio3" value="2"/> + </radio_group> + <check_box label="Mostrar mi nombre" name="show_my_name_checkbox1"/> + <check_box initial_value="true" label="Etiquetas de los avatares en pequeño" name="small_avatar_names_checkbox"/> + <check_box label="Mostrar las etiquetas de grupo" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> - Color de mis efectos: - </text> - <text name="seconds_textbox"> - segundos - </text> - <text name="crash_report_textbox"> - Informes de caÃdas: + Mis efectos: </text> - <text name="language_textbox"> - Idioma: + <text name="title_afk_text"> + Ausente tras: </text> - <text name="language_textbox2"> - (Tendrá efecto tras reiniciar) - </text> - <string name="region_name_prompt"> - <escriba el nombre de la región> - </string> - <combo_box name="crash_behavior_combobox"> - <combo_box.item name="Askbeforesending" label="Preguntar antes de enviar"/> - <combo_box.item name="Alwayssend" label="Enviar siempre"/> - <combo_box.item name="Neversend" label="No enviar nunca"/> - </combo_box> - <combo_box name="language_combobox"> - <combo_box.item name="System Default Language" label="Predeterminado del sistema"/> - <combo_box.item name="English" label="English (Inglés)"/> - <combo_box.item name="Danish" label="Dansk (Danés) - Beta"/> - <combo_box.item name="Deutsch(German)" label="Deutsch (Alemán) - Beta"/> - <combo_box.item name="Spanish" label="Español - Beta"/> - <combo_box.item name="French" label="Français (Francés) - Beta"/> - <combo_box.item name="Italian" label="Italiano - Beta"/> - <combo_box.item name="Hungarian" label="Magyar (Húngaro) - Beta"/> - <combo_box.item name="Dutch" label="Nederlands (Neerlandés) - Beta"/> - <combo_box.item name="Polish" label="Polski (Polaco) - Beta"/> - <combo_box.item name="Portugese" label="Portugués (Portugués) - Beta"/> - <combo_box.item name="Russian" label="РуÑÑкий (Ruso) - Beta"/> - <combo_box.item name="Turkish" label="Türkçe (Turco) - Beta"/> - <combo_box.item name="Ukrainian" label="УкраїнÑька (Ucraniano) - Beta"/> - <combo_box.item name="Chinese" label="ä¸æ–‡ (简体) (Chino) - Beta"/> - <combo_box.item name="(Japanese)" label="日本語 (Japonés) - Beta"/> - <combo_box.item name="(Korean)" label="í•œêµì–´ (Coreano) - Beta"/> + <color_swatch label="" name="effect_color_swatch" tool_tip="Pulse para abrir el selector de color"/> + <combo_box label="Ausente tras:" name="afk"> + <combo_box.item label="2 minutos" name="item0"/> + <combo_box.item label="5 minutos" name="item1"/> + <combo_box.item label="10 minutos" name="item2"/> + <combo_box.item label="30 minutos" name="item3"/> + <combo_box.item label="nunca" name="item4"/> </combo_box> - <check_box label="Compartir el idioma con los objetos" name="language_is_public" tool_tip="Hace que los objetos con script del mundo sepan su idioma preferido."/> + <text name="text_box3"> + Respuesta cuando estoy en modo ocupado: + </text> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml index 4038940256..6ec3a04a02 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml @@ -1,42 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Gráficos" name="Display panel"> - <button label="?" name="GraphicsPreferencesHelpButton"/> - <check_box label="Abrir Second Life en una ventana" name="windowed mode"/> - <text_editor name="FullScreenInfo" width="480"> - Si no está marcado, el visor se mostrará en pantalla completa cuando inicie sesión. - </text_editor> - <text name="WindowSizeLabel"> - Tamaño de la ventana: + <text name="UI Size:"> + Tamaño de la UI: </text> - <combo_box left="124" name="windowsize combo"> - <combo_box.item name="640x480" label="640x480"/> - <combo_box.item name="800x600" label="800x600"/> - <combo_box.item name="720x480" label="720x480 (NTSC)"/> - <combo_box.item name="768x576" label="768x576 (PAL)"/> - <combo_box.item name="1024x768" label="1024x768"/> - </combo_box> - <text name="DisplayResLabel"> - Resolución: + <text name="QualitySpeed"> + Calidad y velocidad: </text> - <combo_box left="124" name="fullscreen combo" /> - <text name="AspectRatioLabel1" tool_tip="ancho / alto"> - Proporción: + <text name="FasterText"> + Más rápido </text> - <combo_box left="124" name="aspect_ratio" tool_tip="ancho / alto"> - <combo_box.item name="4:3(StandardCRT)" label="4:3 (Standard CRT)"/> - <combo_box.item name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)"/> - <combo_box.item name="8:5(Widescreen)" label="8:5 (Widescreen)"/> - <combo_box.item name="16:9(Widescreen)" label="16:9 (Widescreen)"/> - </combo_box> - <check_box label="Detectar automáticamente la proporción" name="aspect_auto_detect" left="295" /> - <text name="HigherText"> - Calidad y - </text> - <text name="QualityText"> - Rendimiento: - </text> - <text name="FasterText" left="95"> - El más rápido + <text name="BetterText"> + Más calidad </text> <text name="ShadersPrefText"> Bajo @@ -50,97 +24,82 @@ <text name="ShadersPrefText4"> Ultra </text> - <text name="HigherText2" left="325" > - Más alto - </text> - <text name="QualityText2" left="325" > - calidad - </text> - <check_box label="Personalizar" name="CustomSettings"/> - <panel name="CustomGraphics Panel"> - <text name="ShadersText"> - Shaders: - </text> - <check_box label="Efecto de relieve y brillo" name="BumpShiny"/> - <check_box label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/> - <check_box label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/> - <check_box label="Reflejos en el agua" name="Reflections"/> - <text name="ReflectionDetailText"> - Objetos reflejados: - </text> - <radio_group name="ReflectionDetailRadio"> - <radio_item name="0" label="Terreno y árboles" /> - <radio_item name="1" label="Todos los objetos estáticos" /> - <radio_item name="2" label="Todos los avatares y objetos" /> - <radio_item name="3" label="Todo" /> - </radio_group> - <text name="AvatarRenderingText"> - Renderización del avatar: - </text> - <check_box label="Avatares simulados" name="AvatarImpostors"/> - <check_box label="Renderizado por hardware" name="AvatarVertexProgram"/> - <check_box label="Ropas del avatar" name="AvatarCloth"/> - <text name="DrawDistanceMeterText1"> - m - </text> - <text name="DrawDistanceMeterText2"> - m - </text> - <slider label="Distancia de dibujo:" name="DrawDistance"/> - <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/> - <slider label="Calidad del procesamiento:" name="RenderPostProcess" label_width="142"/> - <text name="MeshDetailText"> - Detalle de la malla: - </text> - <slider label=" Objetos:" name="ObjectMeshDetail"/> - <slider label=" Prims flexibles:" name="FlexibleMeshDetail"/> - <slider label=" Ãrboles:" name="TreeMeshDetail"/> - <slider label=" Avatares:" name="AvatarMeshDetail"/> - <slider label=" Terreno:" name="TerrainMeshDetail"/> - <slider label=" Cielo:" name="SkyMeshDetail"/> - <text name="PostProcessText"> - Baja - </text> - <text name="ObjectMeshDetailText"> - Bajo - </text> - <text name="FlexibleMeshDetailText"> - Bajo - </text> - <text name="TreeMeshDetailText"> - Bajo - </text> - <text name="AvatarMeshDetailText"> - Bajo - </text> - <text name="TerrainMeshDetailText"> - Bajo - </text> - <text name="SkyMeshDetailText"> - Bajo - </text> - <text name="LightingDetailText" width="135"> - Detalles de la iluminación: - </text> - <radio_group name="LightingDetailRadio"> - <radio_item name="SunMoon" label="Sólo el Sol y la Luna" /> - <radio_item name="LocalLights" label="Puntos de luz cercanos" /> - </radio_group> - <text name="TerrainDetailText"> - Nivel de detalle del - terreno: - </text> - <radio_group name="TerrainDetailRadio" left_delta="60"> - <radio_item name="0" label="Bajo" /> - <radio_item name="2" label="Alto" /> - </radio_group> + <panel label="CustomGraphics" name="CustomGraphics Panel"> + <text name="ShadersText"> + Shaders: + </text> + <check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/> + <check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/> + <check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/> + <check_box initial_value="true" label="Reflejos en el agua" name="Reflections"/> + <text name="ReflectionDetailText"> + Objetos reflejados: + </text> + <radio_group name="ReflectionDetailRadio"> + <radio_item label="Terreno y árboles" name="0"/> + <radio_item label="Todos los objetos estáticos" name="1"/> + <radio_item label="Todos los avatares y objetos" name="2"/> + <radio_item label="Todo" name="3"/> + </radio_group> + <text name="AvatarRenderingText"> + Renderización del avatar: + </text> + <check_box initial_value="true" label="Avatares simulados" name="AvatarImpostors"/> + <check_box initial_value="true" label="Renderizado por hardware" name="AvatarVertexProgram"/> + <check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/> + <slider label="Distancia de dibujo:" name="DrawDistance"/> + <text name="DrawDistanceMeterText2"> + m + </text> + <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/> + <slider label="Calidad del procesamiento:" label_width="142" name="RenderPostProcess"/> + <text name="MeshDetailText"> + Detalle de la malla: + </text> + <slider label=" Objetos:" name="ObjectMeshDetail"/> + <slider label=" Prims flexibles:" name="FlexibleMeshDetail"/> + <slider label=" Ãrboles:" name="TreeMeshDetail"/> + <slider label=" Avatares:" name="AvatarMeshDetail"/> + <slider label=" Terreno:" name="TerrainMeshDetail"/> + <slider label=" Cielo:" name="SkyMeshDetail"/> + <text name="PostProcessText"> + Baja + </text> + <text name="ObjectMeshDetailText"> + Bajo + </text> + <text name="FlexibleMeshDetailText"> + Bajo + </text> + <text name="TreeMeshDetailText"> + Bajo + </text> + <text name="AvatarMeshDetailText"> + Bajo + </text> + <text name="TerrainMeshDetailText"> + Bajo + </text> + <text name="SkyMeshDetailText"> + Bajo + </text> + <text name="LightingDetailText"> + Detalles de iluminación: + </text> + <radio_group name="LightingDetailRadio"> + <radio_item label="Sólo el Sol y la Luna" name="SunMoon"/> + <radio_item label="Puntos de luz cercanos" name="LocalLights"/> + </radio_group> + <text name="TerrainDetailText"> + Detalle del terreno: + </text> + <radio_group name="TerrainDetailRadio"> + <radio_item label="Bajo" name="0"/> + <radio_item label="Alto" name="2"/> + </radio_group> </panel> - <button label="Configuraciones recomendadas" name="Defaults" width="195" left="110"/> - <button label="Opciones del hardware" label_selected="Opciones del hardware" name="GraphicsHardwareButton" left="315"/> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> - <panel.string name="aspect_ratio_text"> - [NUM]:[DEN] - </panel.string> + <button label="Aplicar" label_selected="Aplicar" name="Apply"/> + <button label="Por defecto" name="Defaults"/> + <button label="Avanzado" name="Advanced"/> + <button label="Hardware" label_selected="Hardware" left="315" name="GraphicsHardwareButton"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index cbaa3d96ee..3632ecca7b 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -1,34 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Comunicación" name="im"> - <text name="text_box"> - Mi estado de conexión: + <panel.string name="log_in_to_change"> + Conéctate para que cambie + </panel.string> + <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpia la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/> + <text name="cache_size_label_l"> + (Localizaciones, imágenes, web, historial de búsqueda) </text> - <check_box label="Sólo pueden ver si estoy conectado mis amigos y grupos" name="online_visibility"/> - <text name="text_box2"> - Opciones de los MI: + <check_box label="Sólo saben si estoy conectado mis amigos y grupos" name="online_visibility"/> + <check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/> + <check_box label="Desconectar el micrófono cuando finalicen las llamadas" name="auto_disengage_mic_check"/> + <check_box label="Aceptar las 'cookies'" name="cookies_enabled"/> + <text name="Logs:"> + Registros: </text> - <string name="log_in_to_change"> - inicie sesión para cambiar - </string> - <check_box label="Enviar MI al correo electrónico ([EMAIL])" name="send_im_to_email"/> - <check_box label="Incluir los MI en la consola del chat" name="include_im_in_chat_console"/> - <check_box label="Incluir la hora en los MI" name="show_timestamps_check"/> - <check_box label="Avisar si se conecta un amigo" name="friends_online_notify_checkbox"/> - <text name="text_box3"> - Mensaje en el estado -ocupado: + <check_box label="Guardar en mi ordenador registros del chat" name="log_nearby_chat"/> + <check_box label="Guardar en mi ordenador registros de los MI" name="log_instant_messages"/> + <check_box label="Añadir fecha y hora" name="show_timestamps_check_im"/> + <text name="log_path_desc"> + Localización de los registros: </text> - <text name="text_box4"> - Opciones de los -registros: - </text> - <check_box label="Guardar un registro de los MI en mi ordenador" name="log_instant_messages"/> - <check_box label="Incluir la hora en el registro de los MI" name="log_instant_messages_timestamp"/> - <check_box label="Mostrar el final de la última conversación por MI" name="log_show_history"/> - <check_box label="Guardar un registro del chat en mi ordenador" name="log_chat"/> - <check_box label="Incluir la hora en el registro del chat" name="log_chat_timestamp"/> - <check_box label="Mostrar en el chat la llegada de los MI" name="log_chat_IM"/> - <check_box label="Incluir la fecha junto a la hora" name="log_date_timestamp"/> - <button label="Cambiar la ruta" label_selected="Cambiar la ruta" name="log_path_button" width="120"/> <line_editor left="278" name="log_path_string" right="-20"/> + <button label="Elegir" label_selected="Elegir" name="log_path_button" width="120"/> + <button label="Lista de ignorados" name="block_list"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml index 967626b8d5..ebf2b1084b 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml @@ -1,32 +1,46 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Dispositivos y Cámara" name="Input panel"> - <text name=" Mouselook Options:"> +<panel label="Configurar" name="Input panel"> + <button bottom_delta="-40" label="Otros dispositivos" name="joystick_setup_button"/> + <text name="Mouselook:"> Vista subjetiva: </text> - <text name=" Mouse Sensitivity:"> - Sensibilidad del ratón: + <text name=" Mouse Sensitivity"> + Sensibilidad del ratón </text> - <check_box label="Invertir el ratón" name="invert_mouse"/> - <text name=" Auto Fly Options:"> - Vuelo: + <check_box label="Invertir" name="invert_mouse"/> + <text name="Network:"> + Red: </text> - <check_box label="Despegar/Aterrizar pulsando RePág/AvPág" name="automatic_fly"/> - <text name=" Camera Options:"> - Opciones de la cámara: + <text name="Maximum bandwidth"> + Ancho de banda máximo </text> - <text name="camera_fov_label" width="218"> - Ãngulo de vista de la cámara: + <text name="text_box2"> + kbps </text> - <slider bottom_delta="-6" width="128" left="326" name="camera_fov" /> - <text name="Camera Follow Distance:" width="218"> - Distancia a la que sigue la cámara: + <check_box label="Personalizar el puerto" name="connection_port_enabled"/> + <spinner label="Número de puerto:" name="connection_port"/> + <text name="cache_size_label_l"> + Tamaño de la caché </text> - <slider bottom_delta="-6" width="128" left="326" name="camera_offset_scale" /> - <check_box label="Reorientar la cámara al editar" name="edit_camera_movement" tool_tip="Usar la reorientación automática de la cámara al entrar y salir del modo de edición"/> - <check_box label="Reorientar la cámara al modificar la apariencia" name="appearance_camera_movement" tool_tip="Usar la reorientación automática de la cámara mientras se modifica la apariencia"/> - <text name="text2"> - Visualización del avatar: + <text name="text_box5"> + MB </text> - <check_box label="Ver el avatar en vista subjetiva" name="first_person_avatar_visible"/> - <button bottom_delta="-40" label="Configurar el joystick" name="joystick_setup_button"/> + <text name="Cache location"> + Localización de la caché: + </text> + <button label="Elegir" label_selected="Elegir" name="set_cache"/> + <button label="Recuperar" label_selected="Reconfigurar" name="reset_cache"/> + <text name="Web:"> + Web: + </text> + <radio_group name="use_external_browser"> + <radio_item label="Usar el navegador incorporado" name="internal" tool_tip="Usa el navegador incorporado para ayuda, enlaces web, etc. Este navegador se abre en una nueva ventana dentro de [APP_NAME]." value="0"/> + <radio_item label="Usar mi navegador (IE, Firefox, Safari)" name="external" tool_tip="Usa tu navegador por defecto para ayuda, enlaces web, etc. No es aconsejable si estás a pantalla completa." value="1"/> + </radio_group> + <check_box initial_value="false" label="Activar web proxy" name="web_proxy_enabled"/> + <text name="Proxy location"> + Localización del proxy: + </text> + <line_editor name="web_proxy_editor" tool_tip="Nombre o dirección IP del proxy que quieres usar"/> + <spinner label="Número de puerto:" name="web_proxy_port"/> </panel> 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 241f3042fe..1e8b0c736c 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -1,38 +1,45 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Audio y VÃdeo" name="Preference Media panel"> - <slider label="General" name="System Volume"/> +<panel label="Sonidos" name="Preference Media panel"> + <slider label="Volumen general" name="System Volume"/> + <check_box initial_value="true" label="Silenciar cuando minimice" name="mute_when_minimized"/> + <slider label="Botones" name="UI Volume"/> <slider label="Ambiental" name="Wind Volume"/> - <slider label="Sonidos" name="SFX Volume"/> - <slider label="Media" name="Media Volume"/> - <slider label="Interfaz" name="UI Volume"/> - <slider label="Música" name="Music Volume"/> - <slider label="Voz" name="Voice Volume"/> - <text_editor name="voice_unavailable"> - El chat de voz no está disponible - </text_editor> - <check_box label="Activar el chat de voz" name="enable_voice_check"/> - <radio_group name="ear_location"> - <radio_item name="0" label="OÃr el chat desde la posición de la cámara." /> - <radio_item name="1" label="OÃr el chat desde la posición del avatar." /> - </radio_group> - <button label="Configuración de los dispositivos" name="device_settings_btn" width="210" /> - <text name="muting_text"> - Volumen: - </text> - <text name="streaming_prefs_text"> - Preferencias multimedia: + <slider label="Efectos de sonido" name="SFX Volume"/> + <slider label="Música en streaming" name="Music Volume"/> + <check_box label="Activada" name="music_enabled"/> + <slider label="Multimedia" name="Media Volume"/> + <check_box label="Activada" name="enable_media"/> + <slider label="Chat de voz" name="Voice Volume"/> + <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="SÃ"/> + <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="SÃ"/> + <text name="voice_chat_settings"> + Configuración del chat de voz </text> - <text name="audio_prefs_text"> - Preferencias de sonido: + <text name="Listen from"> + OÃr desde: </text> - <panel label="Volumen" name="Volume Panel"/> - <check_box label="Si hay música, reproducirla en streaming" name="streaming_music"/> - <check_box label="Si hay media, reproducirlos en streaming" name="streaming_video"/> - <check_box label="Reproducir automáticamente los media" name="auto_streaming_video"/> - <check_box label="Silenciar el sonido al minimizar la ventana" name="mute_when_minimized"/> - <slider label="Efecto Doppler" name="Doppler Effect" label_width="140" width="270" /> - <slider label="Distancia de escucha" name="Distance Factor" label_width="140" width="270" /> - <slider label="Nivel de atenuación" name="Rolloff Factor" label_width="140" width="270" /> - <spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold" label_width="195" width="259"/> - <spinner label="Avisar del estado de la vida desde" name="Health Change Threshold" label_width="195" width="259"/> + <radio_group name="ear_location"> + <radio_item label="La posición de la cámara" name="0"/> + <radio_item label="La posición del avatar" name="1"/> + </radio_group> + <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> + <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> diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml new file mode 100644 index 0000000000..174922e28e --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="MediaControls"> + <string name="min_width"> + 300 + </string> + <string name="min_height"> + 75 + </string> + <string name="zoom_medium_padding"> + 1.1 + </string> + <string name="top_world_view_avoid_zone"> + 50 + </string> + <layout_stack name="progress_indicator_area"> + <panel name="media_progress_indicator"> + <progress_bar name="media_progress_bar" tool_tip="Los media se están cargando"/> + </panel> + </layout_stack> + <layout_stack name="media_controls"> + <layout_panel name="back"> + <button name="back_btn" tool_tip="Navegar hacia atrás"/> + </layout_panel> + <layout_panel name="fwd"> + <button name="fwd_btn" tool_tip="Navegar hacia adelante"/> + </layout_panel> + <layout_panel name="home"> + <button name="home_btn" tool_tip="Página inicial"/> + </layout_panel> + <layout_panel name="media_stop"> + <button name="media_stop_btn" tool_tip="Parar los media"/> + </layout_panel> + <layout_panel name="reload"> + <button name="reload_btn" tool_tip="Recargar"/> + </layout_panel> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Parar la carga"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Ejecutar los media"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pausar los media"/> + </layout_panel> + <layout_panel name="media_address"> + <line_editor name="media_address_url" tool_tip="URL de los media"/> + <layout_stack name="media_address_url_icons"> + <layout_panel> + <icon name="media_whitelist_flag" tool_tip="Lista Blanca activada"/> + </layout_panel> + <layout_panel> + <icon name="media_secure_lock_flag" tool_tip="Navegación segura"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="media_play_position"> + <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Progreso de la pelÃcula"/> + </layout_panel> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Hacia atrás"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Hacia adelante"/> + </layout_panel> + <layout_panel name="media_volume"> + <button name="media_mute_button" tool_tip="Silenciar este media"/> + <slider name="volume_slider" tool_tip="Volumen de los media"/> + </layout_panel> + <layout_panel name="zoom_frame"> + <button name="zoom_frame_btn" tool_tip="Zoom hacia los media"/> + </layout_panel> + <layout_panel name="close"> + <button name="close_btn" tool_tip="Alejar el zoom"/> + </layout_panel> + <layout_panel name="new_window"> + <button name="new_window_btn" tool_tip="Abrir la URL en el navegador"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml index 218e03dcce..d725bfe618 100644 --- a/indra/newview/skins/default/xui/es/panel_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_profile.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="panel_profile"> +<panel label="Perfil" name="panel_profile"> <string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] @@ -11,4 +11,42 @@ http://www.secondlife.com/account/partners.php?lang=es </string> <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=es-ES"/> + <string name="no_partner_text" value="Ninguno"/> + <string name="no_group_text" value="Ninguno"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value="Mundo real:"/> + </panel> + <text name="title_member_text" value="Residente desde:"/> + <text name="title_acc_status_text" value="Estado de la cuenta:"/> + <text name="title_partner_text" value="Compañero/a:"/> + <panel name="partner_data_panel"> + <name_box initial_value="(obteniendo)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupos:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_buttons_panel"> + <button label="Añadir como amigo" name="add_friend" tool_tip="Ofrecer amistad a este Residente"/> + <button label="MI" name="im" tool_tip="Abrir una sesión de mensajes instantáneos"/> + <button label="Llamar" name="call" tool_tip="Llamar a este Residente"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/> + <button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/> + <button label="â–¼" name="overflow_btn" tool_tip="Pagar dinero al Residente o compartir algo del inventario con él"/> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/> + <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu fÃsico, ropas, etc."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_profile_view.xml b/indra/newview/skins/default/xui/es/panel_profile_view.xml new file mode 100644 index 0000000000..b556346051 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_profile_view.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_target_profile"> + <string name="status_online"> + Conectado/a + </string> + <string name="status_offline"> + Desconectado/a + </string> + <text_editor name="user_name" value="(Cargando...)"/> + <text name="status" value="Conectado/a"/> + <tab_container name="tabs"> + <panel label="PERFIL" name="panel_profile"/> + <panel label="DESTACADOS" name="panel_picks"/> + <panel label="NOTAS Y PRIVACIDAD" name="panel_notes"/> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml index 220479098b..0a5d7c2786 100644 --- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Contrato" name="Covenant"> <text name="estate_section_lbl"> - Estado: + Estado </text> <text name="estate_name_lbl"> Nombre: @@ -22,7 +22,7 @@ Última modificación el miér. 31 de dic. de 1969, 16:00:00 </text> <button label="?" name="covenant_help"/> - <text_editor name="covenant_editor" bottom="-263" height="178" > + <text_editor bottom="-263" height="178" name="covenant_editor"> No se ha aportado un contrato para este estado. </text_editor> <button label="Cambiar" name="reset_covenant"/> @@ -30,11 +30,11 @@ Los cambios en el contrato se mostrarán en todas las parcelas del estado. </text> - <text name="covenant_instructions" bottom_delta="-31" > - Para cambiar el contrato de este estado, arrastre y suelte una nota. + <text bottom_delta="-31" name="covenant_instructions"> + Arrastra y suelta una nota para cambiar el contrato de este estado. </text> <text name="region_section_lbl"> - Región: + Región </text> <text name="region_name_lbl"> Nombre: diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml index a7999cc54d..64162220a6 100644 --- a/indra/newview/skins/default/xui/es/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml @@ -7,11 +7,11 @@ desconocida </text> <check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/> - <button label="?" name="disable_scripts_help" left="215"/> + <button label="?" left="215" name="disable_scripts_help"/> <check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/> - <button label="?" name="disable_collisions_help" left="215"/> + <button label="?" left="215" name="disable_collisions_help"/> <check_box label="Desactivar las propiedades fÃsicas" name="disable_physics_check" tool_tip="Desactiva toda la fÃsica en esta región"/> - <button label="?" name="disable_physics_help" left="215"/> + <button label="?" left="215" name="disable_physics_help"/> <button label="Aplicar" name="apply_btn"/> <text name="objret_text_lbl" width="130"> Devolver el objeto @@ -22,18 +22,18 @@ <line_editor name="target_avatar_name"> (nadie) </line_editor> - <button label="Elegir..." name="choose_avatar_btn"/> + <button label="Elegir" name="choose_avatar_btn"/> <text name="options_text_lbl"> Opciones: </text> - <check_box label="Devolver sólo los objetos con scripts" name="return_scripts" tool_tip="Devolver sólo los objetos que tengan scripts."/> - <check_box label="Devolver sólo los objetos que están en terreno de otro" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/> - <check_box label="Devolver los objetos de cualquier región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/> + <check_box label="Con scripts" name="return_scripts" tool_tip="Devolver sólo los objetos con scripts"/> + <check_box label="En el terreno de otros" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/> + <check_box label="En cada región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/> <button label="Devolver" name="return_btn"/> - <button width="280" label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/> - <button label="?" name="top_colliders_help" left="297"/> - <button width="280" label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/> - <button label="?" name="top_scripts_help" left="297"/> + <button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales" width="280"/> + <button label="?" left="297" name="top_colliders_help"/> + <button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts" width="280"/> + <button label="?" left="297" name="top_scripts_help"/> <button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/> <button label="?" name="restart_help"/> <button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/> diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index f16ec89cb0..53d05cf2c9 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Estado" name="Estate"> <text name="estate_help_text"> - Los cambios en las configuraciones de esta -pestaña afectarán a todas las regiones del estado. + En esta pestaña, los cambios en la configuración afectarán a todas las regiones del estado. </text> <text name="estate_text"> Estado: @@ -11,7 +10,7 @@ pestaña afectarán a todas las regiones del estado. (desconocido) </text> <text name="owner_text"> - Propietario: + Propietario del Estado: </text> <text name="estate_owner"> (desconocido) @@ -24,10 +23,10 @@ pestaña afectarán a todas las regiones del estado. <check_box label="Permitir el acceso público" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Impedir el acceso a Residentes... + Restringir el acceso a cuentas verificadas por: </text> - <check_box label="sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/> - <check_box label="que no han verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/> + <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/> + <check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/> <check_box label="Permitir el chat de voz" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml new file mode 100644 index 0000000000..89ad5549c8 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Región" name="General"> + <text name="region_text_lbl"> + Región: + </text> + <text name="region_text"> + desconocida + </text> + <text name="version_channel_text_lbl"> + Versión: + </text> + <text name="version_channel_text"> + desconocida + </text> + <text name="region_type_lbl"> + Tipo: + </text> + <text name="region_type"> + desconocido + </text> + <check_box label="No permitir modificar el terreno" name="block_terraform_check"/> + <check_box label="Prohibir volar" name="block_fly_check"/> + <check_box label="Permitir el daño" name="allow_damage_check"/> + <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/> + <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/> + <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/> + <check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permite que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/> + <spinner label="Nº máximo de avatares" name="agent_limit_spin"/> + <spinner label="Plus de objetos" name="object_bonus_spin"/> + <text label="Calificación" name="access_text"> + Calificación: + </text> + <combo_box label="Moderado" name="access_combo"> + <combo_box.item label="Adulto" name="Adult"/> + <combo_box.item label="Moderado" name="Mature"/> + <combo_box.item label="General" name="PG"/> + </combo_box> + <button label="Aplicar" name="apply_btn"/> + <button label="Teleportar a su Base a un usuario..." name="kick_btn"/> + <button label="Teleportar a sus Bases a todos los usuarios..." name="kick_all_btn"/> + <button label="Enviar un mensaje a toda la región..." name="im_btn"/> + <button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml index 5540358f97..83c22d20eb 100644 --- a/indra/newview/skins/default/xui/es/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml @@ -48,7 +48,7 @@ Estos valores representan la gama de mezclas para las texturas superiores. </text> <text name="height_text_lbl11"> - Midiendo en metros, el valor BAJA es la altura MÃXIMA de la textura #1, + Midiendo en metros, el valor BAJA es la altura MÃXIMA de la textura #1, y el valor ALTA es la altura MÃNIMA de la textura #4. </text> <text name="height_text_lbl12"> y el valor ALTA es la altura MÃNIMA de la textura #4. diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml new file mode 100644 index 0000000000..c73db729fe --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="script panel"> + <panel.string name="loading"> + Cargando... + </panel.string> + <panel.string name="can_not_view"> + No puedes ver ni editar este script. Ha sido configurado como "no copiable". Necesitas todos los permisos para ver o editar un script que está dentro de un objeto. + </panel.string> + <panel.string name="public_objects_can_not_run"> + Los objetos públicos no pueden ejecutar scripts + </panel.string> + <panel.string name="script_running"> + Ejecutándose + </panel.string> + <panel.string name="Title"> + Script: [NAME] + </panel.string> + <text_editor name="Script Editor"> + Cargando... + </text_editor> + <button label="Guardar" label_selected="Guardar" name="Save_btn"/> + <combo_box label="Insertar..." name="Insert..."/> + <menu_bar name="script_menu"> + <menu label="Archivo" name="File"> + <menu_item_call label="Guardar" name="Save"/> + <menu_item_call label="Deshacer todos los cambios" name="Revert All Changes"/> + </menu> + <menu label="Editar" name="Edit"> + <menu_item_call label="Deshacer" name="Undo"/> + <menu_item_call label="Rehacer" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Pegar" name="Paste"/> + <menu_item_call label="Seleccionar todo" name="Select All"/> + <menu_item_call label="Deseleccionar" name="Deselect"/> + <menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/> + </menu> + <menu label="Ayuda" name="Help"> + <menu_item_call label="Ayuda..." name="Help..."/> + <menu_item_call label="Ayuda de palabras clave..." name="Keyword Help..."/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..9334d58af2 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MI AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Uso de scripts en el avatar + </text> + <text name="loading_text"> + Cargando... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Tamaño (kb)" name="size"/> + <scroll_list.columns label="URLs" name="urls"/> + <scroll_list.columns label="Nombre del objeto" name="name"/> + <scroll_list.columns label="Localización" name="location"/> + </scroll_list> + <button label="Actualizar la lista" name="refresh_list_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..37dc0a576c --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MEMORIA DE LA REGIÓN" name="script_limits_region_memory_panel"> + <text name="script_memory"> + Memoria de los scripts de la parcela + </text> + <text name="loading_text"> + Cargando... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Tamaño (kb)" name="size"/> + <scroll_list.columns label="URLs" name="urls"/> + <scroll_list.columns label="Nombre del objeto" name="name"/> + <scroll_list.columns label="Propietario del objeto" name="owner"/> + <scroll_list.columns label="Parcela" name="parcel"/> + <scroll_list.columns label="Localización" name="location"/> + </scroll_list> + <button label="Actualizar la lista" name="refresh_list_btn"/> + <button label="Realzar" name="highlight_btn"/> + <button label="Devolver" name="return_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_side_tray.xml b/indra/newview/skins/default/xui/es/panel_side_tray.xml new file mode 100644 index 0000000000..4e9834063b --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_side_tray.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> +<side_tray name="sidebar"> + <sidetray_tab description="Manejar la barra lateral." name="sidebar_openclose" tab_title="Barra lateral"/> + <sidetray_tab description="Base." name="sidebar_home" tab_title="Home"> + <panel label="base" name="panel_home"/> + </sidetray_tab> + <sidetray_tab description="Edita tu perfil público y tus destacados." name="sidebar_me" tab_title="My Profile"> + <panel_container name="panel_container"> + <panel label="Yo" name="panel_me"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Encuentra a tus amigos, contactos y gente que esté cerca." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Perfil del grupo" name="panel_group_info_sidetray"/> + <panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Encontrar lugares donde ir o que ya visitaste." label="Lugares" name="sidebar_places" tab_title="Places"> + <panel label="Lugares" name="panel_places"/> + </sidetray_tab> + <sidetray_tab description="Mira tu inventario." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Modificar el inventario" name="sidepanel_inventory"/> + </sidetray_tab> + <sidetray_tab description="Cambia tu apariencia y tu 'look' actual." name="sidebar_appearance" tab_title="My Appearance"> + <panel label="Modificar la apariencia" name="sidepanel_appearance"/> + </sidetray_tab> +</side_tray> diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml new file mode 100644 index 0000000000..3633b0ccaa --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="sidetray_tab_panel"> + <text name="sidetray_tab_title" value="Panel lateral"/> + <button name="show_help" tool_tip="Ver ayuda"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml new file mode 100644 index 0000000000..350aec9c69 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> +<panel name="panel_stand_stop_flying"> + <button label="Levantarme" name="stand_btn" tool_tip="Pulsa aquà para levantarte."/> + <button label="Dejar de volar" name="stop_fly_btn" tool_tip="Dejar de volar"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index 31cde7d237..d4404fd9b5 100644 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml @@ -1,38 +1,31 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="status"> - <text name="ParcelNameText" tool_tip="Nombre de la parcela en la que está. Pulse Acerca del terreno."> - el nombre de la parcela va aquà - </text> - <text name="BalanceText" tool_tip="Saldo de su cuenta"> - Cargando... - </text> - <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinero"/> - <text name="TimeText" tool_tip="Hora actual (costa oeste EE.UU.)"> - 12:00 AM - </text> - <string name="StatBarDaysOfWeek"> + <panel.string name="StatBarDaysOfWeek"> Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado - </string> - <string name="StatBarMonthsOfYear"> + </panel.string> + <panel.string name="StatBarMonthsOfYear"> Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre - </string> - <button label="" label_selected="" name="scriptout" tool_tip="Errores y alertas de los scripts"/> - <button label="" label_selected="" name="health" tool_tip="Vida"/> - <text name="HealthText" tool_tip="Vida"> - 100% - </text> - <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/> - <button label="" label_selected="" name="no_build" tool_tip="No se permite Construir/Renderizar"/> - <button label="" label_selected="" name="no_scripts" tool_tip="No se permiten los scripts"/> - <button label="" label_selected="" name="restrictpush" tool_tip="Sin 'empujones'"/> - <button label="" label_selected="" name="status_no_voice" tool_tip="Aquà no está disponible la voz"/> - <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela"/> - <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en [SECOND_LIFE]"/> - <button label="" label_selected="" name="search_btn" tool_tip="Buscar en [SECOND_LIFE]"/> - <string name="packet_loss_tooltip"> + </panel.string> + <panel.string name="packet_loss_tooltip"> Pérdida de paquetes - </string> - <string name="bandwidth_tooltip"> + </panel.string> + <panel.string name="bandwidth_tooltip"> Ancho de banda - </string> + </panel.string> + <panel.string name="time"> + [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt] + </panel.string> + <panel.string name="timeTooltip"> + [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] + </panel.string> + <panel.string name="buycurrencylabel"> + [AMT] L$ + </panel.string> + <button label="" label_selected="" name="buycurrency" tool_tip="Mi saldo"/> + <button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/> + <text name="TimeText" tool_tip="Hora actual (PacÃfico)"> + 24:00 AM PST + </text> + <button name="media_toggle_btn" tool_tip="Iniciar/Parar todos los media (música, vÃdeo, páginas web)"/> + <button name="volume_btn" tool_tip="Control general del volumen"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml new file mode 100644 index 0000000000..a0ee30e8f6 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_teleport_history.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Teleport History"> + <accordion name="history_accordion"> + <accordion_tab name="today" title="Hoy"/> + <accordion_tab name="yesterday" title="Ayer"/> + <accordion_tab name="2_days_ago" title="Hace 2 dÃas"/> + 5 + <accordion_tab name="3_days_ago" title="Hace 3 dÃas"/> + <accordion_tab name="4_days_ago" title="Hace 4 dÃas"/> + <accordion_tab name="5_days_ago" title="Hace 5 dÃas"/> + <accordion_tab name="6_days_and_older" title="6 y más dÃas"/> + <accordion_tab name="1_month_and_older" title="1 mes y más"/> + <accordion_tab name="6_months_and_older" title="6 y más meses"/> + </accordion> + <panel name="bottom_panel"> + <button name="gear_btn" tool_tip="Ver más opciones"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml new file mode 100644 index 0000000000..10b37b6880 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="teleport_history_item"> + <button name="profile_btn" tool_tip="Mostrar la información del Ãtem"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml index 7cb4009422..77cec6b60b 100644 --- a/indra/newview/skins/default/xui/es/panel_world_map.xml +++ b/indra/newview/skins/default/xui/es/panel_world_map.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="world_map"> + <panel.string name="Loading"> + Cargando... + </panel.string> + <panel.string name="InvalidLocation"> + Localización inválida + </panel.string> <panel.string name="world_map_north"> N </panel.string> diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml index da9a820eb8..14df3d67ca 100644 --- a/indra/newview/skins/default/xui/es/role_actions.xml +++ b/indra/newview/skins/default/xui/es/role_actions.xml @@ -1,199 +1,76 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> - <action_set - description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación." - name="Membership"> - <action description="Invitar personas al grupo" - longdescription="Invitar a personas al grupo usando el botón 'Invitar a un nuevo miembro' en Miembros y Roles > subpestaña Miembros." - name="member invite" value="1" /> - <action description="Expulsar a miembros del grupo" - longdescription="Expulsar a miembros del grupo usando el botón 'Expulsar del grupo' en Miembros y Roles > subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro del grupo puede expulsarle sólo si tiene concedida tal capacidad especÃfica. Para quitar capacidades a los miembros, usted debe tener la de 'Quitar capacidades a miembros'." - name="member eject" value="2" /> - <action - description="Activar/desactivar 'Inscripción libre' y cambiar 'Cuota de inscripción'" - longdescription="Activar/desactivar 'Inscripción libre' para permitir o no que se unan sin invitación nuevos miembros, y cambiar la 'Cuota de inscripción' en la sección Preferencias del grupo de la pestaña General." - name="member options" value="3" /> + <action_set description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación." name="Membership"> + <action description="Invitar personas al grupo" longdescription="Invitar a gente a este grupo usando el botón 'Invitar' en la sección Roles > pestaña Miembros." name="member invite" value="1"/> + <action description="Expulsar a miembros del grupo" longdescription="Expulsar a miembros de este grupo usando el botón 'Expulsar' en la sección Roles > pestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si no eres un propietario, un miembro puede ser expulsado única y exclusivamente si está en el rol de Cualquiera y NO en otros roles. Para quitar roles a los miembros, tienes que tener la capacidad de 'Quitar roles a los miembros'." name="member eject" value="2"/> + <action description="Cambiar 'Inscripción abierta' y 'Cuota de inscripción'" longdescription="En la sección General, cambiar la 'Inscripción abierta' -que permite entrar al grupo sin invitación- y la 'Cuota de inscripción'." name="member options" value="3"/> </action_set> - <action_set - description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a miembros, y darles capacidades." - name="Roles"> - <action description="Crear nuevos roles" - longdescription="Crear nuevos roles en Miembros y Roles > pestaña Roles > botón Crear un rol nuevo." - name="role create" value="4" /> - <action description="Borrar roles" - longdescription="Borrar roles en Miembros y Roles > pestaña Roles > botón Eliminar el rol." - name="role delete" value="5" /> - <action description="Cambiar nombres de roles, tÃtulos y descripciones" - longdescription="Cambiar el nombre del rol que elija, su etiqueta y descripción en la parte media de la pestaña Miembros y Roles." - name="role properties" value="6" /> - <action description="Designar miembros para el rol del asignador" - longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles > subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee." - name="role assign member limited" value="7" /> - <action description="Designar miembros para cualquier rol" - longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles > subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sà mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrÃan elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad." - name="role assign member" value="8" /> - <action description="Quitar capacidades a los miembros" - longdescription="Quitar capacidades a los miembros en la sección Capacidades asignadas de Miembros y Roles > subpestaña Roles. No se pueden quitar a los Propietarios." - name="role remove member" value="9" /> - <action description="Añadir o quitar capacidades a los roles" - longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles > subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sà mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrÃan elevarse hasta poderes cercanos a los del propietario. Asegúrese de lo que está haciendo antes de otorgar esta capacidad." - name="role change actions" value="10" /> + <action_set description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a miembros, y darles capacidades." name="Roles"> + <action description="Crear nuevos roles" longdescription="Crear roles nuevos en la sección Roles > pestaña Roles." name="role create" value="4"/> + <action description="Borrar roles" longdescription="Borrar roles en la sección Roles > pestaña Roles." name="role delete" value="5"/> + <action description="Cambiar el nombre, la etiqueta y la descripción de los roles, asà como qué miembros se muestran públicamente en ese rol" longdescription="Cambiar el nombre, la etiqueta y la descripción de los roles, asà como qué miembros se muestran públicamente en ese rol. Se hace seleccionando el rol, dentro de la sección Roles > pestaña Roles." name="role properties" value="6"/> + <action description="Designar miembros para el rol del asignador" longdescription="Añadir miembros a los roles en la lista de Roles asignados (sección Roles > pestaña Miembros). Un miembro con esta capacidad sólo puede añadir miembros a los roles que tenga él mismo." name="role assign member limited" value="7"/> + <action description="Designar miembros para cualquier rol" longdescription="Designar miembros para cualquier rol en la lista de Roles asignados (sección Roles > pestaña Miembros). *AVISO* Todos los miembros que tengan un rol con esta capacidad podrán asignarse a sà mismos -y a otros miembros que no sean los propietarios- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrÃan elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role assign member" value="8"/> + <action description="Quitar capacidades a los miembros" longdescription="Quitar miembros de los roles en la lista de roles asignados (sección Roles > pestaña Miembros). No se puede quitar a los Propietarios." name="role remove member" value="9"/> + <action description="Añadir o quitar capacidades a los roles" longdescription="Asignar y quitar capacidades a cada rol en la lista de capacidades permitidas (sección Roles > pestaña Roles). *AVISO* Todos los miembros que tengan un rol con esta capacidad podrán asignarse a sà mismos -y a otros miembros que no sean los propietarios- todas las capacidades. Potencialmente, podrÃan elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role change actions" value="10"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema." - name="Group Identity"> - <action - description="Cambiar la carta, emblema, 'Mostrar en la búsqueda', y qué miembros serán visibles en la información del grupo" - longdescription="Cambiar la carta, emblema, 'Mostrar en la búsqueda', y qué miembros serán visibles en la información del grupo de la pestaña General." - name="group change identity" value="11" /> + <action_set description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema." name="Group Identity"> + <action description="Cambiar la carta, emblema, 'Mostrar en la búsqueda', y qué miembros serán visibles en la información del grupo" longdescription="Cambia la carta, emblema y 'Mostrar en la búsqueda'. Se hace en la sección General." name="group change identity" value="11"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vea el menú Mundo > Acerca del terreno, o pulse con el botón derecho en el terreno y seleccione 'Acerca del terreno...', o pulse en la información de la parcela en la barra superior del menú." - name="Parcel Management"> - <action description="Transferir y comprar terreno para el grupo" - longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno > pestaña General." - name="land deed" value="12" /> - <action description="Abandonar al terreno a favor de Governor Linden" - longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno > pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrese de lo que está haciendo antes de otorgar esta capacidad." - name="land release" value="13" /> - <action description="Vender terreno" - longdescription="Vender terreno. *AVISO* Todos los miembros con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno > pestaña General. Asegúrese de lo que está haciendo antes de otorgar esta capacidad." - name="land set sale info" value="14" /> - <action description="Dividir y unir parcelas" - longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, 'Modificar el terreno', y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, elija la parte que quiere separar y pulse 'Subdividir...'. Para unir, seleccione dos o más parcelas contiguas y pulse 'Unir...'. " - name="land divide join" value="15" /> + <action_set description="Estas capacidades incluyen poder para transferir, modificar y vender terrenos del grupo. Para ver la ventana Acerca del terreno, pulsa con el botón derecho en el terreno y selecciona 'Acerca del terreno', o pulsa en el signo 'i' de la barra de navegación." name="Parcel Management"> + <action description="Transferir y comprar terreno para el grupo" longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno > pestaña General." name="land deed" value="12"/> + <action description="Abandonar al terreno a favor de Governor Linden" longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno > pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrese de lo que está haciendo antes de otorgar esta capacidad." name="land release" value="13"/> + <action description="Vender terreno" longdescription="Vender terreno. *AVISO* Todos los miembros con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno > pestaña General. Asegúrese de lo que está haciendo antes de otorgar esta capacidad." name="land set sale info" value="14"/> + <action description="Dividir y unir parcelas" longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, 'Modificar el terreno', y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, elige la parte que quieres separar y pulsa 'Dividir'. Para unir, selecciona dos o más parcelas contiguas y pulsa 'Unir'." name="land divide join" value="15"/> </action_set> - <action_set - description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, asà como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte." - name="Parcel Identity"> - <action - description="Activar/desactivar 'Mostrar en Buscar' y el definir la categorÃa" - longdescription="Activar/desactivar el 'Mostrar en Buscar' y en que categorÃa se mostrará en Acerca del terreno > pestaña Opciones." - name="land find places" value="17" /> - <action - description="Cambiar el nombre de la parcela, la descripción, y la configuración de 'Mostrar en Buscar'" - longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de 'Mostrar en Buscar'. Se hace en Acerca del terreno > pestaña Opciones." - name="land change identity" value="18" /> - <action description="Definir los puntos de llegada y teleporte" - longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno > pestaña Opciones." - name="land set landing point" value="19" /> + <action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, asà como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte." name="Parcel Identity"> + <action description="Cambiar 'Mostrar el sitio en Buscar' y configurar la categorÃa" longdescription="Cambia 'Mostrar el sitio en Buscar' y el configurar la categorÃa de una parcela en Acerca del terreno > pestaña Opciones." name="land find places" value="17"/> + <action description="Cambiar el nombre de la parcela, su descripción, y la configuración de 'Mostrar el sitio en Buscar'" longdescription="Cambia el nombre de la parcela, su descripción, y la configuración de 'Mostrar el sitio en Buscar'. Se hace en Acerca del terreno > pestaña Opciones." name="land change identity" value="18"/> + <action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno > pestaña Opciones." name="land set landing point" value="19"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como 'Crear objetos', 'Editar el terreno' y las configuraciones de la música y los media." - name="Parcel Settings"> - <action description="Cambiar música y configuraciones de los media" - longdescription="Cambiar la música en streaming y las configuraciones de vÃdeo en Acerca del terreno > pestaña Media." - name="land change media" value="20" /> - <action description="Activar/desactivar 'Editar el terreno'" - longdescription="Activar/desactivar 'Editar el terreno'. *AVISO* Acerca del terreno > pestaña Opciones > Editar el terreno, permite a cualquiera alterar la forma de su terreno y sustituir y mover plantas Linden. Asegúrese de lo que está haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno > pestaña Opciones." - name="land edit" value="21" /> - <action - description="Activar/desactivar varios Ãtems de Acerca del terreno > Opciones" - longdescription="Activar/desactivar en un terreno del grupo los Ãtems de Acerca del terreno > pestaña Opciones: 'Seguro (sin daño)', 'Volar', y permitir a otros residentes: 'Crear objetos', 'Editar el terreno', 'Crear hitos', y 'Ejecutar scripts'." - name="land options" value="22" /> + <action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como 'Crear objetos', 'Editar el terreno' y las configuraciones de la música y los media." name="Parcel Settings"> + <action description="Cambiar música y configuraciones de los media" longdescription="Cambiar la música en streaming y las configuraciones de vÃdeo en Acerca del terreno > pestaña Media." name="land change media" value="20"/> + <action description="Activar/desactivar 'Editar el terreno'" longdescription="Activar/desactivar 'Editar el terreno'. *AVISO* Acerca del terreno > pestaña Opciones > Editar el terreno, permite a cualquiera alterar la forma de su terreno y sustituir y mover plantas Linden. Asegúrese de lo que está haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno > pestaña Opciones." name="land edit" value="21"/> + <action description="Activar/desactivar varios Ãtems de Acerca del terreno > Opciones" longdescription="Cambia 'Seguro (sin daño)', 'Volar', y el permitir a otros residentes en terrenos propiedad del grupo 'Modificar el terreno', 'Construir', 'Crear hitos' y 'Ejecutat scripts', como aparece en Acerca del terreno > pestaña Opciones." name="land options" value="22"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." - name="Parcel Powers"> - <action description="Permitir siempre 'Editar el terreno'" - longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." - name="land allow edit land" value="23" /> - <action description="Permitir siempre 'Volar'" - longdescription="Quien tenga un rol con esta capacidad puede volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." - name="land allow fly" value="24" /> - <action description="Permitir siempre 'Crear objetos'" - longdescription="Quien tenga un rol con esta capacidad puede crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." - name="land allow create" value="25" /> - <action description="Permitir siempre 'Crear hitos'" - longdescription="Quien tenga un rol con esta capacidad puede crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." - name="land allow landmark" value="26" /> - <action description="Permitir 'Fijar mi Base aquÃ' en el terreno del grupo" - longdescription="Quien tenga un rol con esta capacidad puede usar el menú Mundo > Fijar mi Base aquà en una parcela transferida al grupo." - name="land allow set home" value="28" /> + <action_set description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." name="Parcel Powers"> + <action description="Permitir siempre 'Editar el terreno'" longdescription="Quien tenga un rol con esta capacidad puede editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." name="land allow edit land" value="23"/> + <action description="Permitir siempre 'Volar'" longdescription="Quien tenga un rol con esta capacidad puede volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." name="land allow fly" value="24"/> + <action description="Permitir siempre 'Crear objetos'" longdescription="Quien tenga un rol con esta capacidad puede crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." name="land allow create" value="25"/> + <action description="Permitir siempre 'Crear hitos'" longdescription="Quien tenga un rol con esta capacidad puede crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno > pestaña Opciones." name="land allow landmark" value="26"/> + <action description="Permitir 'Fijar mi Base aquÃ' en el terreno del grupo" longdescription="Los miembros que tengan un rol con esta capacidad pueden usar el menú Mundo > Hitos > Fijar aquà mi Base en una parcela transferida al grupo." name="land allow set home" value="28"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes para permitir o restringir el acceso a parcelas pertenecientes al grupo, incluyendo el congelar y expulsar a residentes." - name="Parcel Access"> - <action description="Administrar las listas de acceso a la parcela" - longdescription="Administre las listas de acceso a la parcela en Acerca del terreno > pestaña Acceso." - name="land manage allowed" value="29" /> - <action description="Administrar la lista de residentes con el acceso prohibido" - longdescription="Administrar la lista de residentes con el acceso prohibido a la parcela en Acerca del terreno > pestaña Acceso." - name="land manage banned" value="30" /> - <action description="Cambiar en las configuraciones de parcela el 'Vender pases a...'" - longdescription="Cambiar la configuración de 'Vender pases a...' en Acerca del terreno > pestaña Acceso." - name="land manage passes" value="31" /> - <action description="Expulsar y congelar residentes en las parcelas" - longdescription="Quien tenga un rol con esta capacidad puede actuar frente a un residente indeseado en una parcela del grupo pulsando con el botón derecho sobre él, Más > y seleccionando 'Expulsar...' o 'Congelar...'." - name="land admin" value="32" /> + <action_set description="Estas capacidades incluyen poderes para permitir o restringir el acceso a parcelas pertenecientes al grupo, incluyendo el congelar y expulsar a residentes." name="Parcel Access"> + <action description="Administrar las listas de acceso a la parcela" longdescription="Administre las listas de acceso a la parcela en Acerca del terreno > pestaña Acceso." name="land manage allowed" value="29"/> + <action description="Administrar la lista de residentes con el acceso prohibido" longdescription="Manejar la lista de expulsados en Acerca del terreno > pestaña Acceso." name="land manage banned" value="30"/> + <action description="Cambiar en la parcela la configuración de 'Vender pases a'" longdescription="Cambia en la parcela la configuración de 'Vender pases a' (Acerca del terreno > pestaña Acceso)." name="land manage passes" value="31"/> + <action description="Expulsar y congelar residentes en las parcelas" longdescription="En una parcela propiedad del grupo, los miembros cuyo rol tengan esta capacidad pueden manejar a residentes no deseados pulsándoles con el botón derecho del ratón para 'Expulsar' o 'Congelar'." name="land admin" value="32"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes que permitan a los miembros devolver objetos y poner y mover plantas Linden. Es útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, ya que no se pueden deshacer esos cambios en los objetos." - name="Parcel Content"> - <action description="Devolver objetos que pertenecen al grupo" - longdescription="Devolver objetos pertenecientes al grupo en parcelas de su propiedad en Acerca del terreno > pestaña Objetos." - name="land return group owned" value="48" /> - <action description="Devolver objetos definidos para el grupo" - longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Acerca del terreno > pestaña Objetos." - name="land return group set" value="33" /> - <action description="Devolver objetos que no pertenecen al grupo" - longdescription="Devuolver objetos que estén en una parcela del grupo y pertenezcan a alguien que no sea del grupo en Acerca del terreno > pestaña Objetos." - name="land return non group" value="34" /> - <action description="Modificar el paisaje usando plantas Linden" - longdescription="La capacidad de modificar el paisaje permite poner y mover árboles Linden, plantas y arbustos. Estos Ãtems están en la 's Biblioteca de su Inventario > carpeta Objetos, o pueden crearse con el botón Construir." - name="land gardening" value="35" /> + <action_set description="Estas capacidades incluyen poderes que permitan a los miembros devolver objetos y poner y mover plantas Linden. Es útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, ya que no se pueden deshacer esos cambios en los objetos." name="Parcel Content"> + <action description="Devolver objetos que pertenecen al grupo" longdescription="Devolver objetos pertenecientes al grupo en parcelas de su propiedad en Acerca del terreno > pestaña Objetos." name="land return group owned" value="48"/> + <action description="Devolver objetos definidos para el grupo" longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Acerca del terreno > pestaña Objetos." name="land return group set" value="33"/> + <action description="Devolver objetos que no pertenecen al grupo" longdescription="Devuolver objetos que estén en una parcela del grupo y pertenezcan a alguien que no sea del grupo en Acerca del terreno > pestaña Objetos." name="land return non group" value="34"/> + <action description="Modificar el paisaje usando plantas Linden" longdescription="Capacidad de poner y mover árboles, plantas y arbustos Linden. Estos Ãtems están en la Biblioteca de tu inventario > carpeta Objetos, o pueden construirse con el menú Construir." name="land gardening" value="35"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes para tranferir, modificar y vender objetos pertenecientes al grupo. Estos cambios se hacen en la pestaña General de la herramienta de edición. Para verlo, pulse en un objeto con el botón derecho y elija Editar. " - name="Object Management"> - <action description="Transferir objetos al grupo" - longdescription="Transferir objetos al grupo en Editar > pestaña General." - name="object deed" value="36" /> - <action description="Manipular (mover, copiar, y modificar) objetos del grupo" - longdescription="Manipular (mover, copiar, y modificar) objetos pertenecientes al grupo en Editar > pestaña General." - name="object manipulate" value="38" /> - <action description="Vender objetos pertenecientes al grupo" - longdescription="Poner a la venta objetos pertenecientes al grupo para venta en Editar > pestaña General." - name="object set sale" value="39" /> + <action_set description="Estas capacidades incluyen poder transferir, modificar y vender objetos propiedad del grupo. Estos cambios se hacen en las Herramientas de construcción > pestaña General. Pulsa un objeto con el botón derecho del ratón y edÃtalo para ver sus configuraciones." name="Object Management"> + <action description="Transferir objetos al grupo" longdescription="Transferir objetos al grupo en las Herramientas de construcción > pestaña General." name="object deed" value="36"/> + <action description="Manipular (mover, copiar, y modificar) objetos del grupo" longdescription="Mover, copiar y modificar objetos pertenecientes al grupo en las Herramientas de construcción > pestaña General." name="object manipulate" value="38"/> + <action description="Vender objetos pertenecientes al grupo" longdescription="Poner a la venta objetos pertenecientes al grupo en las Herramientas de construcción > pestaña General." name="object set sale" value="39"/> </action_set> - <action_set - description="Estas habilidades incluyen poderes para que los miembros paguen deudas del grupo o reciban sus dividendos, y para limitar el acceso al historial de la cuenta del grupo." - name="Accounting"> - <action description="Pagar deudas y recibir dividendos del grupo" - longdescription="Quien tenga un rol con esta capacidad, automáticamente pagará deudas del grupo y recibirá sus dividendos. Esto significa que recibirá una parte de las ventas de terreno de grupo, y que contribuirá a cosas como, por ejemplo, las cuotas por posesión de terreno. " - name="accounting accountable" value="40" /> + <action_set description="Estas habilidades incluyen poderes para que los miembros paguen deudas del grupo o reciban sus dividendos, y para limitar el acceso al historial de la cuenta del grupo." name="Accounting"> + <action description="Pagar deudas y recibir dividendos del grupo" longdescription="Quien tenga un rol con esta capacidad, automáticamente pagará deudas del grupo y recibirá sus dividendos. Esto significa que recibirá una parte de las ventas de terreno de grupo, y que contribuirá a cosas como, por ejemplo, las cuotas por posesión de terreno. " name="accounting accountable" value="40"/> </action_set> - <action_set - description="Estas habilidades incluyen poderes para enviar, recibir y ver avisos de grupo." - name="Notices"> - <action description="Enviar aviso" - longdescription="Quien tenga un rol con esta capacidad puede enviar avisos en Información del grupo > pestaña Avisos." - name="notices send" value="42" /> - <action description="Recibir avisos nuevos y ver los anteriores" - longdescription="Quien tenga un rol con esta capacidad puede recibir los avisos nuevos, y ver los anteriores en Información del grupo > pestaña Avisos." - name="notices receive" value="43" /> + <action_set description="Estas habilidades incluyen poderes para enviar, recibir y ver avisos de grupo." name="Notices"> + <action description="Enviar aviso" longdescription="Los miembros con un rol que tenga esta capacidad pueden enviar avisos a través de la sección Grupo > Avisos." name="notices send" value="42"/> + <action description="Recibir avisos nuevos y ver los anteriores" longdescription="Los miembros con un rol que tenga esta capacidad pueden recibir Avisos y ver los ya enviados en la sección Grupo > Avisos." name="notices receive" value="43"/> </action_set> - <action_set - description="Estas habilidades incluyen poderes para permitir a los miembros crear propuestas, votarlas, y ver el historial de votaciones." - name="Proposals"> - <action description="Hacer una propuesta" - longdescription="Quien tenga un rol con esta capacidad puede crear propuestas para que sean votadas en Información del grupo > pestaña Propuestas." - name="proposal start" value="44" /> - <action description="Votar en propuestas" - longdescription="Quien tenga un rol con esta capacidad puede votar las propuestas en Información del grupo > pestaña Propuestas." - name="proposal vote" value="45" /> + <action_set description="Estas habilidades incluyen poderes para permitir a los miembros crear propuestas, votarlas, y ver el historial de votaciones." name="Proposals"> + <action description="Hacer una propuesta" longdescription="Quien tenga un rol con esta capacidad puede crear propuestas para que sean votadas en Información del grupo > pestaña Propuestas." name="proposal start" value="44"/> + <action description="Votar en propuestas" longdescription="Quien tenga un rol con esta capacidad puede votar las propuestas en Información del grupo > pestaña Propuestas." name="proposal vote" value="45"/> </action_set> - <action_set - description="Estas capacidades incluyen poderes para permitir o no el aceso a las sesiones de chat del grupo y al chat de voz del mismo." - name="Chat"> - <action description="Abrir chat de grupo" - longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat del grupo, tanto de texto como de voz." - name="join group chat" value="16" /> - <action description="Abrir chat de voz del grupo" - longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad 'Abrir chat de grupo'." - name="join voice chat" value="27" /> - <action description="Moderar el chat de grupo" - longdescription="Quien tenga esta capacidad puede controlar el acceso y la participación en los chats de texto y de voz del grupo." - name="moderate group chat" value="37" /> + <action_set description="Estas capacidades incluyen poderes para permitir o no el aceso a las sesiones de chat del grupo y al chat de voz del mismo." name="Chat"> + <action description="Abrir chat de grupo" longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat del grupo, tanto de texto como de voz." name="join group chat" value="16"/> + <action description="Abrir chat de voz del grupo" longdescription="Quien tenga un rol con esta capacidad puede abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad 'Abrir chat de grupo'." name="join voice chat" value="27"/> + <action description="Moderar el chat de grupo" longdescription="Quien tenga esta capacidad puede controlar el acceso y la participación en los chats de texto y de voz del grupo." name="moderate group chat" value="37"/> </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml new file mode 100644 index 0000000000..0c7f63d662 --- /dev/null +++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Vestuarios" name="appearance panel"> + <string name="No Outfit" value="No hay vestuario"/> + <panel name="panel_currentlook"> + <text name="currentlook_title"> + (sin guardar) + </text> + </panel> + <filter_editor label="Filtrar los vestuarios" name="Filter"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml new file mode 100644 index 0000000000..776b253adc --- /dev/null +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Cosas" name="objects panel"> + <panel label="" name="sidepanel__inventory_panel"> + <panel name="button_panel"> + <button label="Perfil" name="info_btn"/> + <button label="Ponerme" name="wear_btn"/> + <button label="Play" name="play_btn"/> + <button label="Teleporte" name="teleport_btn"/> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml new file mode 100644 index 0000000000..0d2eb0ac35 --- /dev/null +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="item properties" title="Perfil del objeto"> + <panel.string name="unknown"> + (desconocidas) + </panel.string> + <panel.string name="public"> + (público) + </panel.string> + <panel.string name="you_can"> + Puedes: + </panel.string> + <panel.string name="owner_can"> + El propietario puede: + </panel.string> + <panel.string name="acquiredDate"> + [wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + </panel.string> + <text name="title" value="Perfil del objeto"/> + <text name="where" value="(Inventario)"/> + <panel label=""> + <text name="LabelItemNameTitle"> + Nombre: + </text> + <text name="LabelItemDescTitle"> + Descripción: + </text> + <text name="LabelCreatorTitle"> + Creador: + </text> + <button label="Perfil..." name="BtnCreator"/> + <text name="LabelOwnerTitle"> + Propietario: + </text> + <button label="Perfil..." name="BtnOwner"/> + <text name="LabelAcquiredTitle"> + Obtenido: + </text> + <text name="LabelAcquiredDate"> + Miér., 24 Mayo 2006 12:50:46 + </text> + <panel name="perms_inv"> + <text name="perm_modify"> + Tú puedes: + </text> + <check_box label="Modificar" name="CheckOwnerModify"/> + <check_box label="Copiarlo" name="CheckOwnerCopy"/> + <check_box label="Transferirlo" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Cualquiera: + </text> + <check_box label="Copiarlo" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Grupo: + </text> + <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <text name="NextOwnerLabel"> + Próximo propietario: + </text> + <check_box label="Modificarlo" name="CheckNextOwnerModify"/> + <check_box label="Copiarlo" name="CheckNextOwnerCopy"/> + <check_box label="Transferirlo" name="CheckNextOwnerTransfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> + </panel> + <check_box label="En venta" name="CheckPurchase"/> + <combo_box name="combobox sale copy"> + <combo_box.item label="Copiar" name="Copy"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Precio: L$" name="Edit Cost"/> + </panel> + <panel name="button_panel"> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml new file mode 100644 index 0000000000..0cd3b40ca6 --- /dev/null +++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="object properties" title="Perfil del objeto"> + <panel.string name="text deed continued"> + Transfeir + </panel.string> + <panel.string name="text deed"> + Transfeir + </panel.string> + <panel.string name="text modify info 1"> + Puedes modificar este objeto + </panel.string> + <panel.string name="text modify info 2"> + Puedes modificar estos objetos + </panel.string> + <panel.string name="text modify info 3"> + No puedes modificar este objeto + </panel.string> + <panel.string name="text modify info 4"> + No puedes modificar estos objetos + </panel.string> + <panel.string name="text modify warning"> + Este objeto tiene partes enlazadas + </panel.string> + <panel.string name="Cost Default"> + Precio: L$ + </panel.string> + <panel.string name="Cost Total"> + Precio total: L$ + </panel.string> + <panel.string name="Cost Per Unit"> + Price Per: L$ + </panel.string> + <panel.string name="Cost Mixed"> + Mixed Price + </panel.string> + <panel.string name="Sale Mixed"> + Mixed Sale + </panel.string> + <text name="title" value="Perfil del objeto"/> + <text name="where" value="(en el mundo)"/> + <panel label=""> + <text name="CreatorNameLabel"> + Creador: + </text> + <text name="Creator Name"> + Erica Linden + </text> + <text name="Group_label"> + Grupo: + </text> + <panel name="perms_inv"> + <text name="perm_modify"> + Puedes modificar este objeto + </text> + <text name="Anyone can:"> + Cualquiera: + </text> + <check_box label="Copiarlo" name="checkbox allow everyone copy"/> + <check_box label="Moverlo" name="checkbox allow everyone move"/> + <text name="GroupLabel"> + Grupo: + </text> + <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <text name="NextOwnerLabel"> + Próximo propietario: + </text> + <check_box label="Modificarlo" name="checkbox next owner can modify"/> + <check_box label="Copiarlo" name="checkbox next owner can copy"/> + <check_box label="Transferirlo" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/> + </panel> + <check_box label="En venta" name="checkbox for sale"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> + </panel> + <panel name="button_panel"> + <button label="Abrir" name="open_btn"/> + <button label="Pagar" name="pay_btn"/> + <button label="Comprar" name="buy_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index dc508f7c37..619094bbfa 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1,13 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> - <string name="create_account_url">http://join.secondlife.com/index.php?lang=es-ES</string> + <string name="CAPITALIZED_APP_NAME"> + SECOND LIFE + </string> + <string name="SUPPORT_SITE"> + Portal de Soporte de Second Life + </string> + <string name="StartupDetectingHardware"> + Identificando el hardware... + </string> + <string name="StartupLoading"> + Cargando + </string> <string name="LoginInProgress"> Iniciando la sesión. [APP_NAME] debe de aparecer congelado. Por favor, espere. </string> + <string name="LoginInProgressNoFrozen"> + Iniciando la sesión... + </string> <string name="LoginAuthenticating"> Autenticando </string> @@ -26,6 +40,9 @@ <string name="LoginInitializingMultimedia"> Iniciando multimedia... </string> + <string name="LoginInitializingFonts"> + Cargando las fuentes... + </string> <string name="LoginVerifyingCache"> Comprobando los archivos de la caché (puede tardar entre 60 y 90 segundos)... </string> @@ -56,9 +73,15 @@ <string name="LoginDownloadingClothing"> Descargando la ropa... </string> + <string name="LoginFailedNoNetwork"> + Error de red: no se ha podido conectar; por favor, revisa tu conexión a internet. + </string> <string name="Quit"> Salir </string> + <string name="create_account_url"> + http://join.secondlife.com/index.php?lang=es-ES + </string> <string name="AgentLostConnection"> Esta región puede estar teniendo problemas. Por favor, compruebe su conexión a internet. </string> @@ -77,39 +100,9 @@ <string name="TooltipIsGroup"> (Grupo) </string> - <string name="TooltipFlagScript"> - Script - </string> - <string name="TooltipFlagPhysics"> - Propiedades fÃsicas - </string> - <string name="TooltipFlagTouch"> - Tocar - </string> - <string name="TooltipFlagL$"> - L$ - </string> - <string name="TooltipFlagDropInventory"> - Desplegar el inventario - </string> - <string name="TooltipFlagPhantom"> - Inmaterial - </string> - <string name="TooltipFlagTemporary"> - Temporal - </string> - <string name="TooltipFlagRightClickMenu"> - (pulse el botón derecho del ratón para ver el menú) - </string> - <string name="TooltipFreeToCopy"> - Copia gratis - </string> <string name="TooltipForSaleL$"> En venta: [AMOUNT] L$ </string> - <string name="TooltipForSaleMsg"> - En venta: [MESSAGE] - </string> <string name="TooltipFlagGroupBuild"> Construir el grupo </string> @@ -137,6 +130,73 @@ <string name="TooltipMustSingleDrop"> Aquà se puede arrastrar sólo un Ãtem </string> + <string name="TooltipHttpUrl"> + Pulsa para ver esta página web + </string> + <string name="TooltipSLURL"> + Pulsa para ver la información de este lugar + </string> + <string name="TooltipAgentUrl"> + Pulsa para ver el perfil del Residente + </string> + <string name="TooltipGroupUrl"> + Pulsa para ver la descripción de este grupo + </string> + <string name="TooltipEventUrl"> + Pulsa para ver la descripción de este evento + </string> + <string name="TooltipClassifiedUrl"> + Pulsa para ver este clasificado + </string> + <string name="TooltipParcelUrl"> + Pulsa para ver la descripción de esta parcela + </string> + <string name="TooltipTeleportUrl"> + Pulsa para teleportarte a esta posición + </string> + <string name="TooltipObjectIMUrl"> + Pulsa para ver la descripción de este objeto + </string> + <string name="TooltipMapUrl"> + Pulsa para ver en el mapa esta localización + </string> + <string name="TooltipSLAPP"> + Pulsa para ejecutar el comando secondlife:// + </string> + <string name="CurrentURL" value="URL actual: [CurrentURL]"/> + <string name="SLurlLabelTeleport"> + Teleportarse a + </string> + <string name="SLurlLabelShowOnMap"> + Mostrarla en el mapa + </string> + <string name="BUTTON_CLOSE_DARWIN"> + Cerrar (⌘W) + </string> + <string name="BUTTON_CLOSE_WIN"> + Cerrar (Ctrl+W) + </string> + <string name="BUTTON_RESTORE"> + Maximizar + </string> + <string name="BUTTON_MINIMIZE"> + Minimizar + </string> + <string name="BUTTON_TEAR_OFF"> + Separar la ventana + </string> + <string name="BUTTON_DOCK"> + Fijar + </string> + <string name="BUTTON_HELP"> + Ver la Ayuda + </string> + <string name="Searching"> + Buscando... + </string> + <string name="NoneFound"> + No se ha encontrado. + </string> <string name="RetrievingData"> Reintentando... </string> @@ -152,9 +212,6 @@ <string name="AvatarNameWaiting"> (esperando) </string> - <string name="AvatarNameHippos"> - (hipopótamos) - </string> <string name="GroupNameNone"> (ninguno) </string> @@ -191,8 +248,77 @@ <string name="AssetErrorUnknownStatus"> Estado desconocido </string> - <string name="AvatarEditingApparance"> - (Modificando la apariencia) + <string name="texture"> + la textura + </string> + <string name="sound"> + el sonido + </string> + <string name="calling card"> + la tarjeta de visita + </string> + <string name="landmark"> + el hito + </string> + <string name="legacy script"> + el script antiguo + </string> + <string name="clothing"> + esa ropa + </string> + <string name="object"> + el objeto + </string> + <string name="note card"> + la nota + </string> + <string name="folder"> + la carpeta + </string> + <string name="root"> + la ruta + </string> + <string name="lsl2 script"> + ese script de LSL2 + </string> + <string name="lsl bytecode"> + el código intermedio de LSL + </string> + <string name="tga texture"> + esa textura tga + </string> + <string name="body part"> + esa parte del cuerpo + </string> + <string name="snapshot"> + la foto + </string> + <string name="lost and found"> + Objetos Perdidos + </string> + <string name="targa image"> + esa imagen targa + </string> + <string name="trash"> + la Papelera + </string> + <string name="jpeg image"> + esa imagen jpeg + </string> + <string name="animation"> + la animación + </string> + <string name="gesture"> + el gesto + </string> + <string name="simstate"> + simstate + </string> + <string name="favorite"> + ese favorito + </string> + <string name="symbolic link"> + el enlace </string> <string name="AvatarAway"> Ausente @@ -414,7 +540,19 @@ Cargando... </string> <string name="worldmap_offline"> - Desconectado/a + Sin conexión + </string> + <string name="worldmap_results_none_found"> + No se ha encontrado. + </string> + <string name="Ok"> + OK + </string> + <string name="Premature end of file"> + Fin prematuro del archivo + </string> + <string name="ST_NO_JOINT"> + No se puede encontrar ROOT o JOINT. </string> <string name="whisper"> susurra: @@ -422,6 +560,60 @@ <string name="shout"> grita: </string> + <string name="ringing"> + Conectando al chat de voz... + </string> + <string name="connected"> + Conectado + </string> + <string name="unavailable"> + La voz no está disponible en su localización actual + </string> + <string name="hang_up"> + Desconectado del chat de voz + </string> + <string name="reconnect_nearby"> + Vas a ser reconectado al chat de voz con los cercanos + </string> + <string name="ScriptQuestionCautionChatGranted"> + '[OBJECTNAME]', un objeto propiedad de '[OWNERNAME]', localizado en [REGIONNAME] con la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS]. + </string> + <string name="ScriptQuestionCautionChatDenied"> + A '[OBJECTNAME]', un objeto propiedad de '[OWNERNAME]', localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS]. + </string> + <string name="ScriptTakeMoney"> + Cogerle a usted dólares Linden (L$) + </string> + <string name="ActOnControlInputs"> + Actuar en sus controles de entrada + </string> + <string name="RemapControlInputs"> + Reconfigurar sus controles de entrada + </string> + <string name="AnimateYourAvatar"> + Ejecutar animaciones en su avatar + </string> + <string name="AttachToYourAvatar"> + Anexarse a su avatar + </string> + <string name="ReleaseOwnership"> + Anular la propiedad y que pase a ser público + </string> + <string name="LinkAndDelink"> + Enlazar y desenlazar de otros objetos + </string> + <string name="AddAndRemoveJoints"> + Añadir y quitar uniones con otros objetos + </string> + <string name="ChangePermissions"> + Cambiar sus permisos + </string> + <string name="TrackYourCamera"> + Seguir su cámara + </string> + <string name="ControlYourCamera"> + Controlar su cámara + </string> <string name="SIM_ACCESS_PG"> 'PG' </string> @@ -440,8 +632,6 @@ <string name="land_type_unknown"> (desconocido) </string> - <string name="covenant_never_modified">Última modificación: (nunca)</string> - <string name="covenant_modified">Última modificación: </string> <string name="all_files"> Todos los archivos </string> @@ -487,28 +677,904 @@ <string name="choose_the_directory"> Elegir directorio </string> - <!-- OSMessageBox messages --> - <string name="MBAlreadyRunning"> - [APP_NAME] ya se está ejecutando. -Busque en la barra de su escritorio una copia minimizada del programa. -Si aun asà persiste este mensaje, reinicie su ordenador. + <string name="AvatarSetNotAway"> + Salir del estado ausente </string> - <string name="MBVideoDrvErr"> - No se puede ejecutar [APP_NAME] porque los drivers de su tarjeta de vÃdeo no están instalados correctamente, o no están actualizados, o son de un hardware no admitido. Por favor, asegúrese de que tiene los últimos drivers para su tarjeta de vÃdeo, e incluso en ese caso intente reinstalarlos. - -Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. + <string name="AvatarSetAway"> + Pasar al estado ausente + </string> + <string name="AvatarSetNotBusy"> + Salir del estado ocupado + </string> + <string name="AvatarSetBusy"> + Pasar al estado ocupado + </string> + <string name="shape"> + Forma + </string> + <string name="skin"> + Piel + </string> + <string name="hair"> + Pelo + </string> + <string name="eyes"> + Ojos + </string> + <string name="shirt"> + Camisa + </string> + <string name="pants"> + Pantalón + </string> + <string name="shoes"> + Zapatos + </string> + <string name="socks"> + Calcetines + </string> + <string name="jacket"> + Chaqueta + </string> + <string name="gloves"> + Guantes + </string> + <string name="undershirt"> + Camiseta + </string> + <string name="underpants"> + Ropa interior + </string> + <string name="skirt"> + Falda + </string> + <string name="alpha"> + Alfa + </string> + <string name="tattoo"> + Tatuaje + </string> + <string name="invalid"> + inválido/a + </string> + <string name="next"> + Siguiente + </string> + <string name="ok"> + OK + </string> + <string name="GroupNotifyGroupNotice"> + Aviso de grupo + </string> + <string name="GroupNotifyGroupNotices"> + Avisos del grupo + </string> + <string name="GroupNotifySentBy"> + Enviado por + </string> + <string name="GroupNotifyAttached"> + Adjunto: + </string> + <string name="GroupNotifyViewPastNotices"> + Ver los avisos pasados u optar por dejar de recibir aquà estos mensajes. + </string> + <string name="GroupNotifyOpenAttachment"> + Abrir el adjunto + </string> + <string name="GroupNotifySaveAttachment"> + Guardar el adjunto + </string> + <string name="TeleportOffer"> + Ofrecimiento de teleporte + </string> + <string name="StartUpNotifications"> + Llegaron [%d] avisos nuevos mientras estabas ausente... + </string> + <string name="OverflowInfoChannelString"> + Tienes [%d] aviso/s más + </string> + <string name="BodyPartsRightArm"> + Brazo der. + </string> + <string name="BodyPartsHead"> + Cabeza + </string> + <string name="BodyPartsLeftArm"> + Brazo izq. + </string> + <string name="BodyPartsLeftLeg"> + Pierna izq. + </string> + <string name="BodyPartsTorso"> + Torso + </string> + <string name="BodyPartsRightLeg"> + Pierna der. + </string> + <string name="GraphicsQualityLow"> + Bajo + </string> + <string name="GraphicsQualityMid"> + Medio + </string> + <string name="GraphicsQualityHigh"> + Alto + </string> + <string name="LeaveMouselook"> + Pulsa ESC para salir de la vista subjetiva + </string> + <string name="InventoryNoMatchingItems"> + No se han encontrado tales Ãtems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"]. + </string> + <string name="FavoritesNoMatchingItems"> + Arrastra aquà un hito para tenerlo en tus favoritos. + </string> + <string name="InventoryNoTexture"> + No tienes en tu inventario una copia de esta textura + </string> + <string name="no_transfer" value="(no transferible)"/> + <string name="no_modify" value="(no modificable)"/> + <string name="no_copy" value="(no copiable)"/> + <string name="worn" value="(puesto)"/> + <string name="link" value="(enlace)"/> + <string name="broken_link" value="(enlace roto)""/> + <string name="LoadingContents"> + Cargando el contenido... + </string> + <string name="NoContents"> + No hay contenido + </string> + <string name="WornOnAttachmentPoint" value="(lo llevas en: [ATTACHMENT_POINT])"/> + <string name="Chat" value="Chat :"/> + <string name="Sound" value="Sonido :"/> + <string name="Wait" value="--- Espera :"/> + <string name="AnimFlagStop" value="Parar la animación:"/> + <string name="AnimFlagStart" value="Empezar la animación:"/> + <string name="Wave" value="Onda"/> + <string name="HelloAvatar" value="¡Hola, avatar!"/> + <string name="ViewAllGestures" value="Ver todos >>"/> + <string name="Animations" value="Animaciones,"/> + <string name="Calling Cards" value="Tarjetas de visita,"/> + <string name="Clothing" value="Ropa,"/> + <string name="Gestures" value="Gestos,"/> + <string name="Landmarks" value="Hitos,"/> + <string name="Notecards" value="Notas,"/> + <string name="Objects" value="Objetos,"/> + <string name="Scripts" value="Scripts,"/> + <string name="Sounds" value="Sonidos,"/> + <string name="Textures" value="Texturas,"/> + <string name="Snapshots" value="Fotos,"/> + <string name="No Filters" value="No"/> + <string name="Since Logoff" value="- Desde la desconexión"/> + <string name="InvFolder My Inventory"> + Mi Inventario + </string> + <string name="InvFolder My Favorites"> + Mis Favoritos + </string> + <string name="InvFolder Library"> + Biblioteca + </string> + <string name="InvFolder Textures"> + Texturas + </string> + <string name="InvFolder Sounds"> + Sonidos + </string> + <string name="InvFolder Calling Cards"> + Tarjetas de visita + </string> + <string name="InvFolder Landmarks"> + Hitos + </string> + <string name="InvFolder Scripts"> + Scripts + </string> + <string name="InvFolder Clothing"> + Ropa + </string> + <string name="InvFolder Objects"> + Objetos + </string> + <string name="InvFolder Notecards"> + Notas + </string> + <string name="InvFolder New Folder"> + Carpeta nueva + </string> + <string name="InvFolder Inventory"> + Inventario + </string> + <string name="InvFolder Uncompressed Images"> + Imágenes sin comprimir + </string> + <string name="InvFolder Body Parts"> + Partes del cuerpo + </string> + <string name="InvFolder Trash"> + la Papelera + </string> + <string name="InvFolder Photo Album"> + Ãlbum de fotos + </string> + <string name="InvFolder Lost And Found"> + Objetos Perdidos + </string> + <string name="InvFolder Uncompressed Sounds"> + Sonidos sin comprimir + </string> + <string name="InvFolder Animations"> + Animaciones + </string> + <string name="InvFolder Gestures"> + Gestos + </string> + <string name="InvFolder favorite"> + Favoritos + </string> + <string name="InvFolder Current Outfit"> + Vestuario actual + </string> + <string name="InvFolder My Outfits"> + Mis vestuarios + </string> + <string name="InvFolder Friends"> + Amigos + </string> + <string name="InvFolder All"> + Todas + </string> + <string name="Buy"> + Comprar + </string> + <string name="BuyforL$"> + Comprar por L$ + </string> + <string name="Stone"> + Piedra + </string> + <string name="Metal"> + Metal + </string> + <string name="Glass"> + Cristal + </string> + <string name="Wood"> + Madera + </string> + <string name="Flesh"> + Carne + </string> + <string name="Plastic"> + Plástico + </string> + <string name="Rubber"> + Goma + </string> + <string name="Light"> + Claridad + </string> + <string name="KBShift"> + Mayúsculas + </string> + <string name="KBCtrl"> + Ctrl + </string> + <string name="Chest"> + Tórax + </string> + <string name="Skull"> + Cráneo + </string> + <string name="Left Shoulder"> + Hombro izquierdo + </string> + <string name="Right Shoulder"> + Hombro derecho + </string> + <string name="Left Hand"> + Mano izq. + </string> + <string name="Right Hand"> + Mano der. + </string> + <string name="Left Foot"> + Pie izq. + </string> + <string name="Right Foot"> + Pie der. + </string> + <string name="Spine"> + Columna + </string> + <string name="Pelvis"> + Pelvis + </string> + <string name="Mouth"> + Boca + </string> + <string name="Chin"> + Barbilla + </string> + <string name="Left Ear"> + Oreja izq. + </string> + <string name="Right Ear"> + Oreja der. + </string> + <string name="Left Eyeball"> + Ojo izq. + </string> + <string name="Right Eyeball"> + Ojo der. + </string> + <string name="Nose"> + Nariz + </string> + <string name="R Upper Arm"> + Brazo der. + </string> + <string name="R Forearm"> + Antebrazo der. + </string> + <string name="L Upper Arm"> + Brazo izq. + </string> + <string name="L Forearm"> + Antebrazo izq. + </string> + <string name="Right Hip"> + Cadera der. + </string> + <string name="R Upper Leg"> + Muslo der. + </string> + <string name="R Lower Leg"> + Pantorrilla der. + </string> + <string name="Left Hip"> + Cadera izq. + </string> + <string name="L Upper Leg"> + Muslo izq. + </string> + <string name="L Lower Leg"> + Pantorrilla izq. + </string> + <string name="Stomach"> + Abdomen + </string> + <string name="Left Pec"> + Pecho izquierdo + </string> + <string name="Right Pec"> + Pecho derecho + </string> + <string name="YearsMonthsOld"> + [AGEYEARS] [AGEMONTHS] de edad + </string> + <string name="YearsOld"> + [AGEYEARS] de edad + </string> + <string name="MonthsOld"> + [AGEMONTHS] de edad + </string> + <string name="WeeksOld"> + [AGEWEEKS] de edad + </string> + <string name="DaysOld"> + [AGEDAYS] de edad + </string> + <string name="TodayOld"> + Registrado hoy + </string> + <string name="AgeYearsA"> + [COUNT] año + </string> + <string name="AgeYearsB"> + [COUNT] años + </string> + <string name="AgeYearsC"> + [COUNT] años + </string> + <string name="AgeMonthsA"> + [COUNT] mes + </string> + <string name="AgeMonthsB"> + [COUNT] meses + </string> + <string name="AgeMonthsC"> + [COUNT] meses + </string> + <string name="AgeWeeksA"> + [COUNT] semana + </string> + <string name="AgeWeeksB"> + [COUNT] semanas + </string> + <string name="AgeWeeksC"> + [COUNT] semanas + </string> + <string name="AgeDaysA"> + [COUNT] dÃa + </string> + <string name="AgeDaysB"> + [COUNT] dÃas + </string> + <string name="AgeDaysC"> + [COUNT] dÃas + </string> + <string name="GroupMembersA"> + [COUNT] miembro + </string> + <string name="GroupMembersB"> + [COUNT] miembros + </string> + <string name="GroupMembersC"> + [COUNT] miembros + </string> + <string name="AcctTypeResident"> + Residente + </string> + <string name="AcctTypeTrial"> + Prueba + </string> + <string name="AcctTypeCharterMember"> + Miembro fundador + </string> + <string name="AcctTypeEmployee"> + Empleado de Linden Lab + </string> + <string name="PaymentInfoUsed"> + Ha usado información sobre la forma de pago + </string> + <string name="PaymentInfoOnFile"> + Hay información archivada sobre la forma de pago + </string> + <string name="NoPaymentInfoOnFile"> + No hay información archivada sobre la forma de pago + </string> + <string name="AgeVerified"> + Edad verificada + </string> + <string name="NotAgeVerified"> + Edad no verificada + </string> + <string name="Center 2"> + Centro 2 + </string> + <string name="Top Right"> + Arriba der. + </string> + <string name="Top"> + Arriba + </string> + <string name="Top Left"> + Arriba izq. + </string> + <string name="Center"> + Centro + </string> + <string name="Bottom Left"> + Abajo izq. + </string> + <string name="Bottom"> + Abajo + </string> + <string name="Bottom Right"> + Abajo der. + </string> + <string name="CompileQueueDownloadedCompiling"> + Descargado, compilándolo + </string> + <string name="CompileQueueScriptNotFound"> + No se encuentra el script en el servidor. + </string> + <string name="CompileQueueProblemDownloading"> + Problema al descargar + </string> + <string name="CompileQueueInsufficientPermDownload"> + Permisos insuficientes para descargar un script. + </string> + <string name="CompileQueueInsufficientPermFor"> + Permisos insuficientes para + </string> + <string name="CompileQueueUnknownFailure"> + Fallo desconocido en la descarga + </string> + <string name="CompileQueueTitle"> + Recompilando + </string> + <string name="CompileQueueStart"> + recompilar + </string> + <string name="ResetQueueTitle"> + Progreso del reinicio + </string> + <string name="ResetQueueStart"> + restaurar + </string> + <string name="RunQueueTitle"> + Configurar según se ejecuta + </string> + <string name="RunQueueStart"> + Configurando según se ejecuta + </string> + <string name="NotRunQueueTitle"> + Configurar sin ejecutar + </string> + <string name="NotRunQueueStart"> + Configurando sin ejecutarlo + </string> + <string name="CompileSuccessful"> + ¡Compilación correcta! + </string> + <string name="CompileSuccessfulSaving"> + Compilación correcta, guardando... + </string> + <string name="SaveComplete"> + Guardado. + </string> + <string name="ObjectOutOfRange"> + Script (objeto fuera de rango) + </string> + <string name="GodToolsObjectOwnedBy"> + El objeto [OBJECT] es propiedad de [OWNER] + </string> + <string name="GroupsNone"> + ninguno + </string> + <string name="Group" value="(grupo)"/> + <string name="Unknown"> + (Desconocido) + </string> + <string name="SummaryForTheWeek" value="Resumen de esta semana, empezando el"/> + <string name="NextStipendDay" value="El próximo dÃa de pago es el"/> + <string name="GroupIndividualShare" value="Grupo Aportaciones individuales"/> + <string name="Balance"> + Saldo + </string> + <string name="Credits"> + Créditos + </string> + <string name="Debits"> + Débitos + </string> + <string name="Total"> + Total + </string> + <string name="NoGroupDataFound"> + No se encontraron datos del grupo + </string> + <string name="IMParentEstate"> + parent estate + </string> + <string name="IMMainland"> + continente + </string> + <string name="IMTeen"> + teen + </string> + <string name="RegionInfoError"> + error + </string> + <string name="RegionInfoAllEstatesOwnedBy"> + todos los estados propiedad de [OWNER] + </string> + <string name="RegionInfoAllEstatesYouOwn"> + todos los estados que posees + </string> + <string name="RegionInfoAllEstatesYouManage"> + todos los estados que administras para [OWNER] + </string> + <string name="RegionInfoAllowedResidents"> + Resientes autorizados: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS]) + </string> + <string name="RegionInfoAllowedGroups"> + Grupos autorizados: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS]) + </string> + <string name="ScriptLimitsParcelScriptMemory"> + Memoria de los scripts de la parcela + </string> + <string name="ScriptLimitsParcelsOwned"> + Parcelas listadas: [PARCELS] + </string> + <string name="ScriptLimitsMemoryUsed"> + Memoria usada: [COUNT] kb de un máx de [MAX] kb; [AVAILABLE] kb disponibles + </string> + <string name="ScriptLimitsMemoryUsedSimple"> + Memoria usada: [COUNT] kb + </string> + <string name="ScriptLimitsParcelScriptURLs"> + URLs de los scripts de la parcela + </string> + <string name="ScriptLimitsURLsUsed"> + URLs usadas: [COUNT] de un máx. de [MAX]; [AVAILABLE] disponibles + </string> + <string name="ScriptLimitsURLsUsedSimple"> + URLs usadas: [COUNT] + </string> + <string name="ScriptLimitsRequestError"> + Error al obtener la información + </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + No hay una parcela seleccionada + </string> + <string name="ScriptLimitsRequestWrongRegion"> + Error: la información del script sólo está disponible en tu región actual + </string> + <string name="ScriptLimitsRequestWaiting"> + Obteniendo la información... + </string> + <string name="ScriptLimitsRequestDontOwnParcel"> + No tienes permiso para examinar esta parcela + </string> + <string name="SITTING_ON"> + Sentado en + </string> + <string name="ATTACH_CHEST"> + Tórax + </string> + <string name="ATTACH_HEAD"> + Cabeza + </string> + <string name="ATTACH_LSHOULDER"> + Hombro izquierdo + </string> + <string name="ATTACH_RSHOULDER"> + Hombro derecho + </string> + <string name="ATTACH_LHAND"> + Mano izq. + </string> + <string name="ATTACH_RHAND"> + Mano der. + </string> + <string name="ATTACH_LFOOT"> + Pie izq. + </string> + <string name="ATTACH_RFOOT"> + Pie der. + </string> + <string name="ATTACH_BACK"> + Anterior + </string> + <string name="ATTACH_PELVIS"> + Pelvis + </string> + <string name="ATTACH_MOUTH"> + Boca + </string> + <string name="ATTACH_CHIN"> + Barbilla + </string> + <string name="ATTACH_LEAR"> + Oreja izq. + </string> + <string name="ATTACH_REAR"> + Oreja der. + </string> + <string name="ATTACH_LEYE"> + Ojo izq. + </string> + <string name="ATTACH_REYE"> + Ojo der. + </string> + <string name="ATTACH_NOSE"> + Nariz + </string> + <string name="ATTACH_RUARM"> + Brazo der. + </string> + <string name="ATTACH_RLARM"> + Antebrazo der. + </string> + <string name="ATTACH_LUARM"> + Brazo izq. + </string> + <string name="ATTACH_LLARM"> + Antebrazo izq. + </string> + <string name="ATTACH_RHIP"> + Cadera der. + </string> + <string name="ATTACH_RULEG"> + Muslo der. + </string> + <string name="ATTACH_RLLEG"> + Pantorrilla der. + </string> + <string name="ATTACH_LHIP"> + Cadera izq. + </string> + <string name="ATTACH_LULEG"> + Muslo izq. + </string> + <string name="ATTACH_LLLEG"> + Pantorrilla izq. + </string> + <string name="ATTACH_BELLY"> + Vientre + </string> + <string name="ATTACH_RPEC"> + Pecho derecho + </string> + <string name="ATTACH_LPEC"> + Pecho izquierdo + </string> + <string name="ATTACH_HUD_CENTER_2"> + HUD: Centro 2 + </string> + <string name="ATTACH_HUD_TOP_RIGHT"> + HUD: arriba der. + </string> + <string name="ATTACH_HUD_TOP_CENTER"> + HUD: arriba centro + </string> + <string name="ATTACH_HUD_TOP_LEFT"> + HUD: arriba izq. + </string> + <string name="ATTACH_HUD_CENTER_1"> + HUD: Centro 1 + </string> + <string name="ATTACH_HUD_BOTTOM_LEFT"> + HUD: abajo izq. + </string> + <string name="ATTACH_HUD_BOTTOM"> + HUD: abajo + </string> + <string name="ATTACH_HUD_BOTTOM_RIGHT"> + HUD: abajo der. + </string> + <string name="CursorPos"> + LÃnea [LINE], Columna [COLUMN] + </string> + <string name="PanelDirCountFound"> + [COUNT] resultados + </string> + <string name="PanelContentsNewScript"> + Script nuevo + </string> + <string name="MuteByName"> + (por el nombre) + </string> + <string name="MuteAgent"> + (Residente) + </string> + <string name="MuteObject"> + (objeto) + </string> + <string name="MuteGroup"> + (grupo) + </string> + <string name="RegionNoCovenant"> + No se ha aportado un contrato para este estado. + </string> + <string name="RegionNoCovenantOtherOwner"> + No se ha aportado un contrato para este estado. El terreno de este estado lo vende el propietario del estado, no Linden Lab. Por favor, contacta con ese propietario para informarte sobre la venta. + </string> + <string name="covenant_last_modified"> + Última modificación: + </string> + <string name="none_text" value="(no hay)"/> + <string name="never_text" value="(nunca)"/> + <string name="GroupOwned"> + Propiedad del grupo + </string> + <string name="Public"> + Público + </string> + <string name="ClassifiedClicksTxt"> + Clics: [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil + </string> + <string name="ClassifiedUpdateAfterPublish"> + (se actualizará tras la publicación) + </string> + <string name="NoPicksClassifiedsText"> + No has creado destacados ni clasificados. Pulsa el botón Más para crear uno. + </string> + <string name="NoAvatarPicksClassifiedsText"> + El usuario no tiene clasificados ni destacados + </string> + <string name="PicksClassifiedsLoadingText"> + Cargando... + </string> + <string name="MultiPreviewTitle"> + Vista previa + </string> + <string name="MultiPropertiesTitle"> + Propiedades + </string> + <string name="InvOfferAnObjectNamed"> + Un objeto de nombre + </string> + <string name="InvOfferOwnedByGroup"> + propiedad del grupo + </string> + <string name="InvOfferOwnedByUnknownGroup"> + propiedad de un grupo desconocido + </string> + <string name="InvOfferOwnedBy"> + propiedad de + </string> + <string name="InvOfferOwnedByUnknownUser"> + propiedad de un usuario desconocido + </string> + <string name="InvOfferGaveYou"> + te ha dado + </string> + <string name="InvOfferYouDecline"> + Has rehusado + </string> + <string name="InvOfferFrom"> + de + </string> + <string name="GroupMoneyTotal"> + Total + </string> + <string name="GroupMoneyBought"> + comprado + </string> + <string name="GroupMoneyPaidYou"> + pagado a ti + </string> + <string name="GroupMoneyPaidInto"> + pagado en + </string> + <string name="GroupMoneyBoughtPassTo"> + pase comprado a + </string> + <string name="GroupMoneyPaidFeeForEvent"> + cuotas pagadas para el evento + </string> + <string name="GroupMoneyPaidPrizeForEvent"> + precio pagado por el evento + </string> + <string name="GroupMoneyBalance"> + Saldo + </string> + <string name="GroupMoneyCredits"> + Créditos + </string> + <string name="GroupMoneyDebits"> + Débitos + </string> + <string name="ViewerObjectContents"> + Contenidos + </string> + <string name="AcquiredItems"> + ArtÃculos adquiridos + </string> + <string name="Cancel"> + Cancelar + </string> + <string name="UploadingCosts"> + Subir este/a [%s] cuesta + </string> + <string name="UnknownFileExtension"> + Extensión de archivo desconocida [.%s] +Se esperaba .wav, .tga, .bmp, .jpg, .jpeg, o .bvh + </string> + <string name="MuteObject2"> + Ignorar + </string> + <string name="AddLandmarkNavBarMenu"> + Guardarme este hito... + </string> + <string name="EditLandmarkNavBarMenu"> + Editar este hito... </string> <string name="accel-mac-control"> - ⌃ + ⌃ </string> <string name="accel-mac-command"> - ⌘ + ⌘ </string> <string name="accel-mac-option"> - ⌥ + ⌥ </string> <string name="accel-mac-shift"> - ⇧ + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -519,82 +1585,1622 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. <string name="accel-win-shift"> Mayús+ </string> - <string name="GraphicsQualityLow"> - Bajo + <string name="FileSaved"> + Archivo guardado </string> - <string name="GraphicsQualityMid"> - Medio + <string name="Receiving"> + Recibiendo </string> - <string name="GraphicsQualityHigh"> - Alto + <string name="AM"> + AM </string> - - <!-- PARCEL_CATEGORY_UI_STRING --> - <string name="Linden Location">Localización Linden</string> - <string name="Adult">'Adult'</string> - <string name="Arts&Culture">Arte y Cultura</string> - <string name="Business">Negocios</string> - <string name="Educational">Educativo</string> - <string name="Gaming">Juegos de azar</string> - <string name="Hangout">Entretenimiento</string> - <string name="Newcomer Friendly">Para recién llegados</string> - <string name="Parks&Nature">Parques y Naturaleza</string> - <string name="Residential">Residencial</string> - <string name="Shopping">Compras</string> - <string name="Other">Otra</string> - - <string name="ringing"> - Conectando al chat de voz... + <string name="PM"> + PM </string> - <string name="connected"> - Conectado + <string name="PST"> + PST </string> - <string name="unavailable"> - La voz no está disponible en su localización actual + <string name="PDT"> + PDT </string> - <string name="hang_up"> - Desconectado del chat de voz + <string name="Forward"> + Adelante + </string> + <string name="Left"> + Izquierda + </string> + <string name="Right"> + Derecha + </string> + <string name="Back"> + Atrás + </string> + <string name="North"> + Norte + </string> + <string name="South"> + Sur + </string> + <string name="West"> + Oeste + </string> + <string name="East"> + Este + </string> + <string name="Up"> + Arriba + </string> + <string name="Down"> + Abajo + </string> + <string name="Any Category"> + Cualquier categorÃa + </string> + <string name="Shopping"> + Compras + </string> + <string name="Land Rental"> + Terreno en alquiler + </string> + <string name="Property Rental"> + Propiedad en alquiler + </string> + <string name="Special Attraction"> + Atracción especial + </string> + <string name="New Products"> + Nuevos productos + </string> + <string name="Employment"> + Empleo + </string> + <string name="Wanted"> + Se busca + </string> + <string name="Service"> + Servicios + </string> + <string name="Personal"> + Personal + </string> + <string name="None"> + Ninguno + </string> + <string name="Linden Location"> + Localización Linden + </string> + <string name="Adult"> + 'Adult' + </string> + <string name="Arts&Culture"> + Arte y Cultura + </string> + <string name="Business"> + Negocios + </string> + <string name="Educational"> + Educativo + </string> + <string name="Gaming"> + Juegos de azar + </string> + <string name="Hangout"> + Entretenimiento + </string> + <string name="Newcomer Friendly"> + Para recién llegados + </string> + <string name="Parks&Nature"> + Parques y Naturaleza + </string> + <string name="Residential"> + Residencial + </string> + <string name="Stage"> + Artes escénicas + </string> + <string name="Other"> + Otra + </string> + <string name="Any"> + Cualquiera + </string> + <string name="You"> + Tú + </string> + <string name="Multiple Media"> + Múltiples medias + </string> + <string name="Play Media"> + Play/Pausa los media + </string> + <string name="MBCmdLineError"> + Ha habido un error analizando la lÃnea de comando. +Por favor, consulta: http://wiki.secondlife.com/wiki/Client_parameters +Error: + </string> + <string name="MBCmdLineUsg"> + [APP_NAME] Uso de lÃnea de comando: + </string> + <string name="MBUnableToAccessFile"> + [APP_NAME] no puede acceder a un archivo que necesita. + +Puede ser porque estés ejecutando varias copias, o porque tu sistema crea -equivocadamente- que el archivo está abierto. +Si este mensaje persiste, reinicia tu ordenador y vuelve a intentarlo. +Si aun asà sigue apareciendo el mensaje, debes desinstalar completamente [APP_NAME] y reinstalarlo. + </string> + <string name="MBFatalError"> + Error fatal + </string> + <string name="MBRequiresAltiVec"> + [APP_NAME] requiere un procesador con AltiVec (G4 o posterior). + </string> + <string name="MBAlreadyRunning"> + [APP_NAME] ya se está ejecutando. +Revisa tu barra de tareas para encontrar una copia minimizada del programa. +Si este mensaje persiste, reinicia tu ordenador. + </string> + <string name="MBFrozenCrashed"> + En su anterior ejecución, [APP_NAME] se congeló o se cayó. +¿Quieres enviar un informe de caÃda? + </string> + <string name="MBAlert"> + Alerta + </string> + <string name="MBNoDirectX"> + [APP_NAME] no encuentra DirectX 9.0b o superior. +[APP_NAME] usa DirectX para detectar el hardware o los drivers no actualizados que pueden provocar problemas de estabilidad, ejecución pobre y caÃdas. Aunque puedes ejecutar [APP_NAME] sin él, recomendamos encarecidamente hacerlo con DirectX 9.0b. + +¿Quieres continuar? + </string> + <string name="MBWarning"> + ¡Atención! + </string> + <string name="MBNoAutoUpdate"> + Las actualizaciones automáticas no están todavÃa implementadas para Linux. +Por favor, descarga la última versión desde www.secondlife.com. + </string> + <string name="MBRegClassFailed"> + Fallo en RegisterClass + </string> + <string name="MBError"> + Error + </string> + <string name="MBFullScreenErr"> + No puede ejecutarse a pantalla completa de [WIDTH] x [HEIGHT]. +Ejecutándose en una ventana. + </string> + <string name="MBDestroyWinFailed"> + Error Shutdown destruyendo la ventana (DestroyWindow() failed) + </string> + <string name="MBShutdownErr"> + Error Shutdown + </string> + <string name="MBDevContextErr"> + No se puede construir el 'GL device context' + </string> + <string name="MBPixelFmtErr"> + No se puede encontrar un formato adecuado de pÃxel + </string> + <string name="MBPixelFmtDescErr"> + No se puede conseguir la descripción del formato de pÃxel + </string> + <string name="MBTrueColorWindow"> + Para ejecutarse, [APP_NAME] necesita True Color (32-bit). +Por favor, en las configuraciones de tu ordenador ajusta el modo de color a 32-bit. + </string> + <string name="MBAlpha"> + [APP_NAME] no puede ejecutarse porque no puede obtener un canal alpha de 8 bit. Generalmente, se debe a alguna cuestión de los drivers de la tarjeta de vÃdeo. +Por favor, comprueba que tienes instalados los últimos drivers para tu tarjeta de vÃdeo. +Comprueba también que tu monitor esta configurado para True Color (32-bit) en Panel de Control > Apariencia y temas > Pantalla. +Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. + </string> + <string name="MBPixelFmtSetErr"> + No se puede configurar el formato de pÃxel + </string> + <string name="MBGLContextErr"> + No se puede crear el 'GL rendering context' + </string> + <string name="MBGLContextActErr"> + No se puede activar el 'GL rendering context' + </string> + <string name="MBVideoDrvErr"> + [APP_NAME] no puede ejecutarse porque los drivers de tu tarjeta de vÃdeo o no están bien instalados, o no están actualizados, o son para hardware no admitido. Por favor, comprueba que tienes los drivers más actuales para tu tarjeta de vÃdeo, y, aunque los tengas, intenta reinstalarlos. + +Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. + </string> + <string name="5 O'Clock Shadow"> + Barba del dÃa + </string> + <string name="All White"> + Blanco del todo + </string> + <string name="Anime Eyes"> + Ojos de cómic + </string> + <string name="Arced"> + Arqueadas + </string> + <string name="Arm Length"> + Brazos: longitud + </string> + <string name="Attached"> + Cortos + </string> + <string name="Attached Earlobes"> + Lóbulos cortos + </string> + <string name="Back Fringe"> + Nuca: largo + </string> + <string name="Baggy"> + Marcadas + </string> + <string name="Bangs"> + Bangs + </string> + <string name="Beady Eyes"> + Ojos pequeños + </string> + <string name="Belly Size"> + Barriga: tamaño + </string> + <string name="Big"> + Grande + </string> + <string name="Big Butt"> + Culo grande + </string> + <string name="Big Hair Back"> + Pelo: moño + </string> + <string name="Big Hair Front"> + Pelo: tupé + </string> + <string name="Big Hair Top"> + Pelo: melena alta + </string> + <string name="Big Head"> + Cabeza grande + </string> + <string name="Big Pectorals"> + Grandes pectorales + </string> + <string name="Big Spikes"> + Crestas grandes + </string> + <string name="Black"> + Negro + </string> + <string name="Blonde"> + Rubio + </string> + <string name="Blonde Hair"> + Pelo rubio + </string> + <string name="Blush"> + Colorete + </string> + <string name="Blush Color"> + Color del colorete + </string> + <string name="Blush Opacity"> + Opacidad del colorete + </string> + <string name="Body Definition"> + Definición del cuerpo + </string> + <string name="Body Fat"> + Cuerpo: gordura + </string> + <string name="Body Freckles"> + Pecas del cuerpo + </string> + <string name="Body Thick"> + Cuerpo grueso + </string> + <string name="Body Thickness"> + Cuerpo: grosor + </string> + <string name="Body Thin"> + Cuerpo delgado + </string> + <string name="Bow Legged"> + Abiertas + </string> + <string name="Breast Buoyancy"> + Busto: firmeza + </string> + <string name="Breast Cleavage"> + Busto: canalillo + </string> + <string name="Breast Size"> + Busto: tamaño + </string> + <string name="Bridge Width"> + Puente: ancho + </string> + <string name="Broad"> + Ancho + </string> + <string name="Brow Size"> + Arco ciliar + </string> + <string name="Bug Eyes"> + Bug Eyes + </string> + <string name="Bugged Eyes"> + Ojos saltones + </string> + <string name="Bulbous"> + Bulbosa + </string> + <string name="Bulbous Nose"> + Nariz de porra + </string> + <string name="Bushy Eyebrows"> + Cejijuntas + </string> + <string name="Bushy Hair"> + Pelo tupido + </string> + <string name="Butt Size"> + Culo: tamaño + </string> + <string name="bustle skirt"> + Polisón + </string> + <string name="no bustle"> + Sin polisón + </string> + <string name="more bustle"> + Con polisón + </string> + <string name="Chaplin"> + Cortito + </string> + <string name="Cheek Bones"> + Pómulos + </string> + <string name="Chest Size"> + Tórax: tamaño + </string> + <string name="Chin Angle"> + Barbilla: ángulo + </string> + <string name="Chin Cleft"> + Barbilla: contorno + </string> + <string name="Chin Curtains"> + Barba en collar + </string> + <string name="Chin Depth"> + Barbilla: largo + </string> + <string name="Chin Heavy"> + Hacia la barbilla + </string> + <string name="Chin In"> + Barbilla retraÃda + </string> + <string name="Chin Out"> + Barbilla prominente + </string> + <string name="Chin-Neck"> + Papada + </string> + <string name="Clear"> + Transparente + </string> + <string name="Cleft"> + Remarcar + </string> + <string name="Close Set Eyes"> + Ojos juntos + </string> + <string name="Closed"> + Cerrar + </string> + <string name="Closed Back"> + Trasera cerrada + </string> + <string name="Closed Front"> + Frontal cerrado + </string> + <string name="Closed Left"> + Cerrada + </string> + <string name="Closed Right"> + Cerrada + </string> + <string name="Coin Purse"> + Poco abultada + </string> + <string name="Collar Back"> + Espalda + </string> + <string name="Collar Front"> + Escote + </string> + <string name="Corner Down"> + Hacia abajo + </string> + <string name="Corner Up"> + Hacia arriba + </string> + <string name="Creased"> + CaÃdos + </string> + <string name="Crooked Nose"> + Nariz torcida + </string> + <string name="Cuff Flare"> + Acampanado + </string> + <string name="Dark"> + Oscuridad + </string> + <string name="Dark Green"> + Verde oscuro + </string> + <string name="Darker"> + Más oscuros + </string> + <string name="Deep"> + Remarcar + </string> + <string name="Default Heels"> + Tacones por defecto + </string> + <string name="Dense"> + Densas + </string> + <string name="Double Chin"> + Mucha papada + </string> + <string name="Downturned"> + Poco + </string> + <string name="Duffle Bag"> + Muy abultada + </string> + <string name="Ear Angle"> + Orejas: ángulo + </string> + <string name="Ear Size"> + Orejas: tamaño + </string> + <string name="Ear Tips"> + Orejas: forma + </string> + <string name="Egg Head"> + Cabeza: ahuevada + </string> + <string name="Eye Bags"> + Ojos: bolsas + </string> + <string name="Eye Color"> + Ojos: color + </string> + <string name="Eye Depth"> + Ojos: profundidad + </string> + <string name="Eye Lightness"> + Ojos: brillo + </string> + <string name="Eye Opening"> + Ojos: apertura + </string> + <string name="Eye Pop"> + Ojos: simetrÃa + </string> + <string name="Eye Size"> + Ojos: tamaño + </string> + <string name="Eye Spacing"> + Ojos: separación + </string> + <string name="Eyebrow Arc"> + Cejas: arco + </string> + <string name="Eyebrow Density"> + Cejas: densidad + </string> + <string name="Eyebrow Height"> + Cejas: altura + </string> + <string name="Eyebrow Points"> + Cejas: en V + </string> + <string name="Eyebrow Size"> + Cejas: tamaño + </string> + <string name="Eyelash Length"> + Pestañas: longitud + </string> + <string name="Eyeliner"> + Contorno de ojos + </string> + <string name="Eyeliner Color"> + Contorno de ojos: color + </string> + <string name="Eyes Bugged"> + Eyes Bugged + </string> + <string name="Face Shear"> + Cara: simetrÃa + </string> + <string name="Facial Definition"> + Rasgos marcados + </string> + <string name="Far Set Eyes"> + Ojos separados + </string> + <string name="Fat Lips"> + Prominentes + </string> + <string name="Female"> + Mujer + </string> + <string name="Fingerless"> + Sin dedos + </string> + <string name="Fingers"> + Con dedos + </string> + <string name="Flared Cuffs"> + Campana + </string> + <string name="Flat"> + Redondeadas + </string> + <string name="Flat Butt"> + Culo plano + </string> + <string name="Flat Head"> + Cabeza plana + </string> + <string name="Flat Toe"> + Empeine bajo + </string> + <string name="Foot Size"> + Pie: tamaño + </string> + <string name="Forehead Angle"> + Frente: ángulo + </string> + <string name="Forehead Heavy"> + Hacia la frente + </string> + <string name="Freckles"> + Pecas + </string> + <string name="Front Fringe"> + Flequillo + </string> + <string name="Full Back"> + Sin cortar + </string> + <string name="Full Eyeliner"> + Contorno completo + </string> + <string name="Full Front"> + Sin cortar + </string> + <string name="Full Hair Sides"> + Pelo: volumen a los lados + </string> + <string name="Full Sides"> + Volumen total + </string> + <string name="Glossy"> + Con brillo + </string> + <string name="Glove Fingers"> + Guantes: dedos + </string> + <string name="Glove Length"> + Guantes: largo + </string> + <string name="Hair"> + Pelo + </string> + <string name="Hair Back"> + Pelo: nuca + </string> + <string name="Hair Front"> + Pelo: delante + </string> + <string name="Hair Sides"> + Pelo: lados + </string> + <string name="Hair Sweep"> + Peinado: dirección + </string> + <string name="Hair Thickess"> + Pelo: espesor + </string> + <string name="Hair Thickness"> + Pelo: espesor + </string> + <string name="Hair Tilt"> + Pelo: inclinación + </string> + <string name="Hair Tilted Left"> + A la izq. + </string> + <string name="Hair Tilted Right"> + A la der. + </string> + <string name="Hair Volume"> + Pelo: volumen + </string> + <string name="Hand Size"> + Manos: tamaño + </string> + <string name="Handlebars"> + Muy largo + </string> + <string name="Head Length"> + Cabeza: longitud + </string> + <string name="Head Shape"> + Cabeza: forma + </string> + <string name="Head Size"> + Cabeza: tamaño + </string> + <string name="Head Stretch"> + Cabeza: estiramiento + </string> + <string name="Heel Height"> + Tacón: altura + </string> + <string name="Heel Shape"> + Tacón: forma + </string> + <string name="Height"> + Altura + </string> + <string name="High"> + Subir + </string> + <string name="High Heels"> + Tacones altos + </string> + <string name="High Jaw"> + MandÃbula alta + </string> + <string name="High Platforms"> + Suela gorda + </string> + <string name="High and Tight"> + Pegada + </string> + <string name="Higher"> + Arrriba + </string> + <string name="Hip Length"> + Cadera: altura + </string> + <string name="Hip Width"> + Cadera: ancho + </string> + <string name="In"> + Pegadas + </string> + <string name="In Shdw Color"> + LÃnea de ojos: color + </string> + <string name="In Shdw Opacity"> + LÃnea de ojos: opacidad + </string> + <string name="Inner Eye Corner"> + Ojos: lagrimal + </string> + <string name="Inner Eye Shadow"> + Inner Eye Shadow + </string> + <string name="Inner Shadow"> + LÃnea de ojos + </string> + <string name="Jacket Length"> + Chaqueta: largo + </string> + <string name="Jacket Wrinkles"> + Chaqueta: arrugas + </string> + <string name="Jaw Angle"> + MandÃbula: ángulo + </string> + <string name="Jaw Jut"> + Maxilar inferior + </string> + <string name="Jaw Shape"> + MandÃbula: forma + </string> + <string name="Join"> + Más junto + </string> + <string name="Jowls"> + Mofletes + </string> + <string name="Knee Angle"> + Rodillas: ángulo + </string> + <string name="Knock Kneed"> + Zambas + </string> + <string name="Large"> + Aumentar + </string> + <string name="Large Hands"> + Manos grandes + </string> + <string name="Left Part"> + Raya: izq. + </string> + <string name="Leg Length"> + Piernas: longitud + </string> + <string name="Leg Muscles"> + Piernas: musculatura + </string> + <string name="Less"> + Menos + </string> + <string name="Less Body Fat"> + Menos gordura + </string> + <string name="Less Curtains"> + Menos tupida + </string> + <string name="Less Freckles"> + Menos pecas + </string> + <string name="Less Full"> + Menos grosor + </string> + <string name="Less Gravity"> + Más levantado + </string> + <string name="Less Love"> + Menos michelines + </string> + <string name="Less Muscles"> + Pocos músculos + </string> + <string name="Less Muscular"> + Poca musculatura + </string> + <string name="Less Rosy"> + Menos sonrosada + </string> + <string name="Less Round"> + Menos redondeada + </string> + <string name="Less Saddle"> + Menos cartucheras + </string> + <string name="Less Square"> + Menos cuadrada + </string> + <string name="Less Volume"> + Menos volumen + </string> + <string name="Less soul"> + Pequeña + </string> + <string name="Lighter"> + Más luminosos + </string> + <string name="Lip Cleft"> + Labio: hoyuelo + </string> + <string name="Lip Cleft Depth"> + Hoyuelo marcado + </string> + <string name="Lip Fullness"> + Labios: grosor + </string> + <string name="Lip Pinkness"> + Labios sonrosados + </string> + <string name="Lip Ratio"> + Labios: ratio + </string> + <string name="Lip Thickness"> + Labios: prominencia + </string> + <string name="Lip Width"> + Labios: ancho + </string> + <string name="Lipgloss"> + Brillo de labios + </string> + <string name="Lipstick"> + Barra de labios + </string> + <string name="Lipstick Color"> + Barra de labios: color + </string> + <string name="Long"> + Más + </string> + <string name="Long Head"> + Cabeza alargada + </string> + <string name="Long Hips"> + Cadera larga + </string> + <string name="Long Legs"> + Piernas largas + </string> + <string name="Long Neck"> + Cuello largo + </string> + <string name="Long Pigtails"> + Coletas largas + </string> + <string name="Long Ponytail"> + Cola de caballo larga + </string> + <string name="Long Torso"> + Torso largo + </string> + <string name="Long arms"> + Brazos largos + </string> + <string name="Loose Pants"> + Pantalón suelto + </string> + <string name="Loose Shirt"> + Camiseta suelta + </string> + <string name="Loose Sleeves"> + Puños anchos + </string> + <string name="Love Handles"> + Michelines + </string> + <string name="Low"> + Bajar + </string> + <string name="Low Heels"> + Tacones bajos + </string> + <string name="Low Jaw"> + MandÃbula baja + </string> + <string name="Low Platforms"> + Suela fina + </string> + <string name="Low and Loose"> + Suelta + </string> + <string name="Lower"> + Abajo + </string> + <string name="Lower Bridge"> + Puente: abajo + </string> + <string name="Lower Cheeks"> + Mejillas: abajo + </string> + <string name="Male"> + Varón + </string> + <string name="Middle Part"> + Raya: en medio + </string> + <string name="More"> + Más + </string> + <string name="More Blush"> + Más colorete + </string> + <string name="More Body Fat"> + Más gordura + </string> + <string name="More Curtains"> + Más tupida + </string> + <string name="More Eyeshadow"> + Más + </string> + <string name="More Freckles"> + Más pecas + </string> + <string name="More Full"> + Más grosor + </string> + <string name="More Gravity"> + Menos levantado + </string> + <string name="More Lipstick"> + Más barra de labios + </string> + <string name="More Love"> + Más michelines + </string> + <string name="More Lower Lip"> + Más el inferior + </string> + <string name="More Muscles"> + Más músculos + </string> + <string name="More Muscular"> + Más musculatura + </string> + <string name="More Rosy"> + Más sonrosada + </string> + <string name="More Round"> + Más redondeada + </string> + <string name="More Saddle"> + Más cartucheras + </string> + <string name="More Sloped"> + Más inclinada + </string> + <string name="More Square"> + Más cuadrada + </string> + <string name="More Upper Lip"> + Más el superior + </string> + <string name="More Vertical"> + Más recta + </string> + <string name="More Volume"> + Más volumen + </string> + <string name="More soul"> + Grande + </string> + <string name="Moustache"> + Bigote + </string> + <string name="Mouth Corner"> + Comisuras + </string> + <string name="Mouth Position"> + Boca: posición + </string> + <string name="Mowhawk"> + Rapado + </string> + <string name="Muscular"> + Muscular + </string> + <string name="Mutton Chops"> + Patillas largas + </string> + <string name="Nail Polish"> + Uñas pintadas + </string> + <string name="Nail Polish Color"> + Uñas pintadas: color + </string> + <string name="Narrow"> + Disminuir + </string> + <string name="Narrow Back"> + Rapada + </string> + <string name="Narrow Front"> + Entradas + </string> + <string name="Narrow Lips"> + Labios estrechos + </string> + <string name="Natural"> + Natural + </string> + <string name="Neck Length"> + Cuello: longitud + </string> + <string name="Neck Thickness"> + Cuello: grosor + </string> + <string name="No Blush"> + Sin colorete + </string> + <string name="No Eyeliner"> + Sin contorno + </string> + <string name="No Eyeshadow"> + Menos + </string> + <string name="No Lipgloss"> + Sin brillo + </string> + <string name="No Lipstick"> + Sin barra de labios + </string> + <string name="No Part"> + Sin raya + </string> + <string name="No Polish"> + Sin pintar + </string> + <string name="No Red"> + Nada + </string> + <string name="No Spikes"> + Sin crestas + </string> + <string name="No White"> + Sin blanco + </string> + <string name="No Wrinkles"> + Sin arrugas + </string> + <string name="Normal Lower"> + Normal Lower + </string> + <string name="Normal Upper"> + Normal Upper + </string> + <string name="Nose Left"> + Nariz a la izq. + </string> + <string name="Nose Right"> + Nariz a la der. + </string> + <string name="Nose Size"> + Nariz: tamaño + </string> + <string name="Nose Thickness"> + Nariz: grosor + </string> + <string name="Nose Tip Angle"> + Nariz: respingona + </string> + <string name="Nose Tip Shape"> + Nariz: punta + </string> + <string name="Nose Width"> + Nariz: ancho + </string> + <string name="Nostril Division"> + Ventana: altura + </string> + <string name="Nostril Width"> + Ventana: ancho + </string> + <string name="Opaque"> + Opaco + </string> + <string name="Open"> + Abrir + </string> + <string name="Open Back"> + Apertura trasera + </string> + <string name="Open Front"> + Apertura frontal + </string> + <string name="Open Left"> + Abierta + </string> + <string name="Open Right"> + Abierta + </string> + <string name="Orange"> + Anaranjado + </string> + <string name="Out"> + De soplillo + </string> + <string name="Out Shdw Color"> + Sombra de ojos: color + </string> + <string name="Out Shdw Opacity"> + Sombra de ojos: opacidad + </string> + <string name="Outer Eye Corner"> + Ojos: comisura + </string> + <string name="Outer Eye Shadow"> + Outer Eye Shadow + </string> + <string name="Outer Shadow"> + Sombra de ojos + </string> + <string name="Overbite"> + RetraÃdo + </string> + <string name="Package"> + Pubis + </string> + <string name="Painted Nails"> + Pintadas + </string> + <string name="Pale"> + Pálida + </string> + <string name="Pants Crotch"> + Pantalón: cruz + </string> + <string name="Pants Fit"> + Ceñido + </string> + <string name="Pants Length"> + Pernera: largo + </string> + <string name="Pants Waist"> + Caja + </string> + <string name="Pants Wrinkles"> + Pantalón: arrugas + </string> + <string name="Part"> + Raya + </string> + <string name="Part Bangs"> + Flequillo partido + </string> + <string name="Pectorals"> + Pectorales + </string> + <string name="Pigment"> + Tono + </string> + <string name="Pigtails"> + Coletas + </string> + <string name="Pink"> + Rosa + </string> + <string name="Pinker"> + Más sonrosados + </string> + <string name="Platform Height"> + Suela: altura + </string> + <string name="Platform Width"> + Suela: ancho + </string> + <string name="Pointy"> + En punta + </string> + <string name="Pointy Heels"> + De aguja + </string> + <string name="Ponytail"> + Cola de caballo + </string> + <string name="Poofy Skirt"> + Con vuelo + </string> + <string name="Pop Left Eye"> + Izquierdo más grande + </string> + <string name="Pop Right Eye"> + Derecho más grande + </string> + <string name="Puffy"> + Hinchadas + </string> + <string name="Puffy Eyelids"> + Ojeras + </string> + <string name="Rainbow Color"> + Irisación + </string> + <string name="Red Hair"> + Pelirrojo + </string> + <string name="Regular"> + Regular + </string> + <string name="Right Part"> + Raya: der. + </string> + <string name="Rosy Complexion"> + Tez sonrosada + </string> + <string name="Round"> + Redondear + </string> + <string name="Ruddiness"> + Rubicundez + </string> + <string name="Ruddy"> + Rojiza + </string> + <string name="Rumpled Hair"> + Pelo encrespado + </string> + <string name="Saddle Bags"> + Cartucheras + </string> + <string name="Scrawny Leg"> + Piernas flacas + </string> + <string name="Separate"> + Más ancho + </string> + <string name="Shallow"> + Sin marcar + </string> + <string name="Shear Back"> + Nuca: corte + </string> + <string name="Shear Face"> + Shear Face + </string> + <string name="Shear Front"> + Shear Front + </string> + <string name="Shear Left Up"> + Arriba - izq. + </string> + <string name="Shear Right Up"> + Arriba - der. + </string> + <string name="Sheared Back"> + Rapada + </string> + <string name="Sheared Front"> + Rapada + </string> + <string name="Shift Left"> + A la izq. + </string> + <string name="Shift Mouth"> + Boca: ladeada + </string> + <string name="Shift Right"> + A la der. + </string> + <string name="Shirt Bottom"> + Alto de cintura + </string> + <string name="Shirt Fit"> + Ceñido + </string> + <string name="Shirt Wrinkles"> + Camisa: arrugas + </string> + <string name="Shoe Height"> + Caña: altura + </string> + <string name="Short"> + Menos + </string> + <string name="Short Arms"> + Brazos cortos + </string> + <string name="Short Legs"> + Piernas cortas + </string> + <string name="Short Neck"> + Cuello corto + </string> + <string name="Short Pigtails"> + Coletas cortas + </string> + <string name="Short Ponytail"> + Cola de caballo corta + </string> + <string name="Short Sideburns"> + Patillas cortas + </string> + <string name="Short Torso"> + Torso corto + </string> + <string name="Short hips"> + Cadera corta + </string> + <string name="Shoulders"> + Hombros + </string> + <string name="Side Fringe"> + Lados: franja + </string> + <string name="Sideburns"> + Patillas + </string> + <string name="Sides Hair"> + Pelo: lados + </string> + <string name="Sides Hair Down"> + Bajar lados del pelo + </string> + <string name="Sides Hair Up"> + Subir lados del pelo + </string> + <string name="Skinny Neck"> + Cuello estrecho + </string> + <string name="Skirt Fit"> + Falda: vuelo + </string> + <string name="Skirt Length"> + Falda: largo + </string> + <string name="Slanted Forehead"> + Slanted Forehead + </string> + <string name="Sleeve Length"> + Largo de manga + </string> + <string name="Sleeve Looseness"> + Ancho de puños + </string> + <string name="Slit Back"> + Raja trasera + </string> + <string name="Slit Front"> + Raja frontal + </string> + <string name="Slit Left"> + Raja a la izq. + </string> + <string name="Slit Right"> + Raja a la der. + </string> + <string name="Small"> + Disminuir + </string> + <string name="Small Hands"> + Manos pequeñas + </string> + <string name="Small Head"> + Cabeza pequeña + </string> + <string name="Smooth"> + Leves + </string> + <string name="Smooth Hair"> + Pelo liso + </string> + <string name="Socks Length"> + Calcetines: largo + </string> + <string name="Soulpatch"> + Perilla + </string> + <string name="Sparse"> + Depiladas + </string> + <string name="Spiked Hair"> + Crestas + </string> + <string name="Square"> + Cuadrada + </string> + <string name="Square Toe"> + Punta cuadrada + </string> + <string name="Squash Head"> + Cabeza aplastada + </string> + <string name="Stretch Head"> + Cabeza estirada + </string> + <string name="Sunken"> + Chupadas + </string> + <string name="Sunken Chest"> + Estrecho de pecho + </string> + <string name="Sunken Eyes"> + Ojos hundidos + </string> + <string name="Sweep Back"> + Sweep Back + </string> + <string name="Sweep Forward"> + Sweep Forward + </string> + <string name="Tall"> + Alta + </string> + <string name="Taper Back"> + Cubierta trasera + </string> + <string name="Taper Front"> + Cubierta frontal + </string> + <string name="Thick Heels"> + Tacones grandes + </string> + <string name="Thick Neck"> + Cuello ancho + </string> + <string name="Thick Toe"> + Empeine alto + </string> + <string name="Thin"> + Delgadas + </string> + <string name="Thin Eyebrows"> + Cejas finas + </string> + <string name="Thin Lips"> + Hacia dentro + </string> + <string name="Thin Nose"> + Nariz fina + </string> + <string name="Tight Chin"> + Poca papada + </string> + <string name="Tight Cuffs"> + Sin campana + </string> + <string name="Tight Pants"> + Pantalón ceñido + </string> + <string name="Tight Shirt"> + Camisa ceñida + </string> + <string name="Tight Skirt"> + Falda ceñida + </string> + <string name="Tight Sleeves"> + Puños ceñidos + </string> + <string name="Toe Shape"> + Punta: forma + </string> + <string name="Toe Thickness"> + Empeine + </string> + <string name="Torso Length"> + Torso: longitud + </string> + <string name="Torso Muscles"> + Torso: musculatura + </string> + <string name="Torso Scrawny"> + Torso flacucho + </string> + <string name="Unattached"> + Largos + </string> + <string name="Uncreased"> + Abiertos + </string> + <string name="Underbite"> + Prognatismo + </string> + <string name="Unnatural"> + No natural + </string> + <string name="Upper Bridge"> + Puente: arriba + </string> + <string name="Upper Cheeks"> + Mejillas: arriba + </string> + <string name="Upper Chin Cleft"> + Barbilla: prominencia + </string> + <string name="Upper Eyelid Fold"> + Párpados + </string> + <string name="Upturned"> + Mucho + </string> + <string name="Very Red"> + Del todo + </string> + <string name="Waist Height"> + Cintura + </string> + <string name="Well-Fed"> + Mofletes + </string> + <string name="White Hair"> + Pelo blanco + </string> + <string name="Wide"> + Ancho + </string> + <string name="Wide Back"> + Completa + </string> + <string name="Wide Front"> + Completa + </string> + <string name="Wide Lips"> + Labios anchos + </string> + <string name="Wild"> + Total + </string> + <string name="Wrinkles"> + Arrugas + </string> + <string name="LocationCtrlAddLandmarkTooltip"> + Añadir a mis hitos + </string> + <string name="LocationCtrlEditLandmarkTooltip"> + Editar mis hitos + </string> + <string name="LocationCtrlInfoBtnTooltip"> + Ver más información de esta localización + </string> + <string name="LocationCtrlComboBtnTooltip"> + Historial de mis localizaciones + </string> + <string name="UpdaterWindowTitle"> + Actualizar [APP_NAME] + </string> + <string name="UpdaterNowUpdating"> + Actualizando [APP_NAME]... + </string> + <string name="UpdaterNowInstalling"> + Instalando [APP_NAME]... + </string> + <string name="UpdaterUpdatingDescriptive"> + Tu visor [APP_NAME] se está actualizando a la última versión. Llevará algún tiempo, paciencia. + </string> + <string name="UpdaterProgressBarTextWithEllipses"> + Descargando la actualización... + </string> + <string name="UpdaterProgressBarText"> + Descargando la actualización + </string> + <string name="UpdaterFailDownloadTitle"> + Fallo en la descarga de la actualización + </string> + <string name="UpdaterFailUpdateDescriptive"> + Ha habido un error actualizando [APP_NAME]. Por favor, descarga la última versión desde www.secondlife.com. + </string> + <string name="UpdaterFailInstallTitle"> + Fallo al instalar la actualización + </string> + <string name="UpdaterFailStartTitle"> + Fallo al iniciar el visor + </string> + <string name="IM_logging_string"> + -- Activado el registro de los mensajes instantáneos -- + </string> + <string name="IM_typing_start_string"> + [NAME] está escribiendo... + </string> + <string name="Unnamed"> + (sin nombre) + </string> + <string name="IM_moderated_chat_label"> + (Moderado: por defecto, desactivada la voz) + </string> + <string name="IM_unavailable_text_label"> + Para esta llamada no está disponible el chat de texto. + </string> + <string name="IM_muted_text_label"> + Un moderador del grupo ha desactivado tu chat de texto. + </string> + <string name="IM_default_text_label"> + Pulsa aquà para enviar un mensaje instantáneo. + </string> + <string name="IM_to_label"> + A + </string> + <string name="IM_moderator_label"> + (Moderador) + </string> + <string name="started_call"> + Llamada de voz iniciada + </string> + <string name="joined_call"> + Entrando a la llamada de voz + </string> + <string name="ringing-im"> + Haciendo la llamada de voz... + </string> + <string name="connected-im"> + Conectado, pulsa Colgar para salir + </string> + <string name="hang_up-im"> + Se colgó la llamada de voz </string> - <string name="ScriptQuestionCautionChatGranted"> - '[OBJECTNAME]', un objeto propiedad de '[OWNERNAME]', localizado en [REGIONNAME] con la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS]. - </string> - <string name="ScriptQuestionCautionChatDenied"> - A '[OBJECTNAME]', un objeto propiedad de '[OWNERNAME]', localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS]. - </string> - <string name="ScriptTakeMoney"> - Cogerle a usted dólares Linden (L$) - </string> - <string name="ActOnControlInputs"> - Actuar en sus controles de entrada - </string> - <string name="RemapControlInputs"> - Reconfigurar sus controles de entrada - </string> - <string name="AnimateYourAvatar"> - Ejecutar animaciones en su avatar - </string> - <string name="AttachToYourAvatar"> - Anexarse a su avatar - </string> - <string name="ReleaseOwnership"> - Anular la propiedad y que pase a ser público - </string> - <string name="LinkAndDelink"> - Enlazar y desenlazar de otros objetos - </string> - <string name="AddAndRemoveJoints"> - Añadir y quitar uniones con otros objetos - </string> - <string name="ChangePermissions"> - Cambiar sus permisos - </string> - <string name="TrackYourCamera"> - Seguir su cámara - </string> - <string name="ControlYourCamera"> - Controlar su cámara - </string> - <string name="only_user_message"> Usted es el único usuario en esta sesión. </string> @@ -604,6 +3210,12 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. <string name="invite_message"> Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> + <string name="muted_message"> + Has ignorado a este residente. Enviándole un mensaje, automáticamente dejarás de ignorarle. + </string> + <string name="generic"> + Error en lo solicitado, por favor, inténtalo más tarde. + </string> <string name="generic_request_error"> Error al hacer lo solicitado; por favor, inténtelo más tarde. </string> @@ -622,46 +3234,37 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE]. <string name="not_a_mod_error"> Usted no es un moderador de la sesión. </string> + <string name="muted"> + Un moderador del grupo ha desactivado tu chat de texto. + </string> <string name="muted_error"> Un moderador del grupo le ha desactivado el chat de texto. </string> <string name="add_session_event"> No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT]. </string> + <string name="message"> + No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT]. + </string> <string name="message_session_event"> No se ha podido enviar su mensaje a la sesión de chat con [RECIPIENT]. </string> + <string name="mute"> + Error moderando. + </string> + <string name="removed"> + Se te ha sacado del grupo. + </string> <string name="removed_from_group"> Ha sido eliminado del grupo. </string> <string name="close_on_no_ability"> Usted ya no tendrá más la capacidad de estar en la sesión de chat. </string> - <string name="AcctTypeResident"> - Residente - </string> - <string name="AcctTypeTrial"> - Prueba - </string> - <string name="AcctTypeCharterMember"> - Miembro fundador - </string> - <string name="AcctTypeEmployee"> - Empleado de Linden Lab - </string> - <string name="PaymentInfoUsed"> - Ha usado una forma de pago - </string> - <string name="PaymentInfoOnFile"> - Hay infor. de la forma de pago - </string> - <string name="NoPaymentInfoOnFile"> - Sin infor. de la forma de pago - </string> - <string name="AgeVerified"> - Edad verificada - </string> - <string name="NotAgeVerified"> - Edad no verificada - </string> + <string name="unread_chat_single"> + [SOURCES] ha dicho algo nuevo + </string> + <string name="unread_chat_multiple"> + [SOURCES] ha dicho algo nuevo + </string> </strings> diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml index 6cf5437e3c..0a605277f2 100644 --- a/indra/newview/skins/default/xui/es/teleport_strings.xml +++ b/indra/newview/skins/default/xui/es/teleport_strings.xml @@ -2,12 +2,12 @@ <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> - Ha habido un problema al procesar su petición de teleporte. Debe volver a iniciar sesión para poder teleportarse. Si le sigue apareciendo este mensaje, revise, por favor, las preguntas frecuentes en el Soporte técnico: -www.secondlife.com/support + Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión antes de poder teleportarte de nuevo. +Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE]. </message> <message name="invalid_region_handoff"> - Ha habido un problema al procesar su paso a otra región. Debe volver a iniciar sesión para poder pasar de región a región. Si le sigue apareciendo este mensaje, revise, por favor, las preguntas frecuentes en el Soporte técnico: -www.secondlife.com/support + Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. +Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE]. </message> <message name="blocked_tport"> Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelva a intentarlo en un momento. Si sigue sin poder teleportarse, desconéctese y vuelva a iniciar sesión para solucionar el problema. diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml index 440412c0c0..21d0b6c10c 100644 --- a/indra/newview/skins/default/xui/fr/floater_about.xml +++ b/indra/newview/skins/default/xui/fr/floater_about.xml @@ -8,7 +8,7 @@ Compilé avec [COMPILER] version [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION] se trouvant à [HOSTNAME] ([HOSTIP]) + Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION] se trouvant à <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> @@ -54,7 +54,7 @@ Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henr </panel> <panel label="Licences" name="licenses_panel"> <text_editor name="credits_editor"> - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion + 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. 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 8e2b27aca6..b5acd6299a 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floaterland" title="À PROPOS DES TERRAINS"> +<floater name="floaterland" title="À PROPOS DU TERRAIN"> + <floater.string name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> <floater.string name="Minutes"> [MINUTES] minutes </floater.string> @@ -15,7 +24,7 @@ <tab_container name="landtab" tab_min_width="60"> <panel label="GÉNÉRAL" name="land_general_panel"> <panel.string name="new users only"> - Nouveaux utilisateurs uniquement + Nouveaux résidents uniquement </panel.string> <panel.string name="anyone"> Tout le monde @@ -71,7 +80,7 @@ Catégorie : </text> <text name="ContentRatingText"> - Adult + Adulte </text> <text name="Owner:"> Propriétaire : @@ -99,7 +108,7 @@ Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²) </text> <text name="SalePending"/> - <button label="Vendez du terrain" label_selected="Vendre le terrain..." name="Sell Land..."/> + <button label="Vendre le terrain" label_selected="Vendre le terrain..." name="Sell Land..."/> <text name="For sale to"> À vendre à : [BUYER] </text> @@ -109,7 +118,7 @@ <text name="Selling with no objects in parcel."> Objets non inclus dans la vente </text> - <button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" left="275" name="Cancel Land Sale" width="165"/> + <button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale"/> <text name="Claimed:"> Acquis : </text> @@ -312,17 +321,17 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. </text> <check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n'importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/> <check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n'est pas cochée, ils ne pourront voler que lorsqu'ils arrivent et passent au dessus de votre terrain."/> - <text left="152" name="allow_label2"> + <text name="allow_label2"> Construire : </text> <check_box label="Tous" left="285" name="edit objects check"/> <check_box label="Groupe" left="395" name="edit group objects check"/> - <text left="152" name="allow_label3" width="150"> + <text name="allow_label3"> Laisser entrer des objets : </text> <check_box label="Tous" left="285" name="all object entry check"/> <check_box label="Groupe" left="395" name="group object entry check"/> - <text left="152" name="allow_label4"> + <text name="allow_label4"> Exécuter des scripts : </text> <check_box label="Tous" left="285" name="check other scripts"/> @@ -367,11 +376,11 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. Photo : </text> <texture_picker bottom="-319" label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> - <text bottom="-323" name="landing_point"> + <text name="landing_point"> Lieu d'arrivée : [LANDING] </text> - <button bottom="-323" label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain."/> - <button bottom="-323" label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d'arrivée"/> + <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain."/> + <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d'arrivée"/> <text bottom="-343" name="Teleport Routing: "> Règles de téléportation : </text> @@ -392,10 +401,6 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. </text> <line_editor left="97" name="media_url"/> <button label="Choisir" label_selected="Définir..." name="set_media_url"/> - <text name="CurrentURL:"> - Page actuelle : - </text> - <button label="Réinitialiser..." label_selected="Réinitialiser..." name="reset_media_url" tool_tip="Actualiser l'URL"/> <check_box label="Masquer l'URL" left="97" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL du média. Cette option n'est pas disponible pour les fichiers HTML."/> <text name="Description:"> Description : @@ -424,10 +429,11 @@ texture : <check_box label="En boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/> </panel> <panel label="SON" name="land_audio_panel"> - <text name="MusicURL:" bottom_delta="-28" > + <text bottom_delta="-28" name="MusicURL:"> URL de la musique : </text> + <check_box label="Masquer l'URL" name="hide_music_url" tool_tip="Si vous cochez cette option, l'URL de musique sera masquée et invisible pour tous les utilisateurs non autorisés des informations de cette parcelle."/> <text name="Sound:"> Son : </text> @@ -437,7 +443,7 @@ musique : </text> <check_box label="Activer le chat vocal" name="parcel_enable_voice_channel"/> <check_box label="Activer la voix (contrôlé par le domaine)" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box label="Limiter le chat vocal à cette parcelle" name="parcel_enable_voice_channel_parcel"/> + <check_box label="Limiter le chat vocal à cette parcelle" name="parcel_enable_voice_channel_local"/> </panel> <panel label="ACCÈS" name="land_access_panel"> <panel.string name="access_estate_defined"> diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml index f7a796a508..e0cb0ef524 100644 --- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml @@ -106,6 +106,9 @@ La longueur maximale est de [MAX_LENGTH] secondes. <floater.string name="E_ST_NO_XLT_EMOTE"> Impossible de lire le nom emote. </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nom de racine incorrect. + </floater.string> <text name="name_label"> Nom : </text> diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml index 983efcdc47..ae8f926d8f 100644 --- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml @@ -24,7 +24,7 @@ <texture_picker label="Alpha yeux" name="eyes_alpha"/> <texture_picker label="Haut du corps" name="upper-baked"/> <texture_picker label="Peinture corporelle haut" name="upper_bodypaint"/> - <texture_picker label="Sous-vêtements (homme)" name="upper_undershirt"/> + <texture_picker label="Débardeur" name="upper_undershirt"/> <texture_picker label="Gants" name="upper_gloves"/> <texture_picker label="Chemise" name="upper_shirt"/> <texture_picker label="Veste (haut)" name="upper_jacket"/> @@ -32,7 +32,7 @@ <texture_picker label="Tatouage haut" name="upper_tattoo"/> <texture_picker label="Bas du corps" name="lower-baked"/> <texture_picker label="Peinture corporelle bas" name="lower_bodypaint"/> - <texture_picker label="Sous-vêtements (femme)" name="lower_underpants"/> + <texture_picker label="Caleçon" name="lower_underpants"/> <texture_picker label="Chaussettes" name="lower_socks"/> <texture_picker label="Chaussures" name="lower_shoes"/> <texture_picker label="Pantalon" name="lower_pants"/> diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml index 778d92793b..d61115a2db 100644 --- a/indra/newview/skins/default/xui/fr/floater_beacons.xml +++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml @@ -2,7 +2,7 @@ <floater name="beacons" title="BALISES"> <panel name="beacons_panel"> <text name="label_show"> - Afficher : + Afficher : </text> <check_box label="Balises" name="beacons"/> <check_box label="Surbrillances" name="highlights"/> diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml index ecd9dd0863..241cf1af09 100644 --- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml @@ -4,7 +4,7 @@ La sélection contient des contenus non modifiables. </floater.string> <floater.string name="status_text"> - Permissions paramétrées sur [NAME] + Droits paramétrés sur [NAME] </floater.string> <floater.string name="start_text"> Demande de changement des droits lancée... @@ -33,7 +33,7 @@ <button label="√ Tout" label_selected="Tout" name="check_all"/> <button label="Effacer" label_selected="Aucun" name="check_none"/> <text name="newperms"> - Nouvelles permissions + Nouveaux droits </text> <text name="GroupLabel"> Groupe : diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml index f5cf871844..7c9a31a4c3 100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml @@ -1,5 +1,132 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="ACHETER DU TERRAIN"> + <floater.string name="can_resell"> + Peut être revendu. + </floater.string> + <floater.string name="can_not_resell"> + Ne peut pas être revendu. + </floater.string> + <floater.string name="can_change"> + Peut être fusionné ou divisé. + </floater.string> + <floater.string name="can_not_change"> + Ne peut pas être fusionné ou divisé. + </floater.string> + <floater.string name="cant_buy_for_group"> + Vous n'avez pas la permission d'acheter de terrain pour votre groupe. + </floater.string> + <floater.string name="no_land_selected"> + Aucun terrain sélectionné. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Vous avez sélectionné plusieurs parcelles. +Sélectionnez une zone plus petite. + </floater.string> + <floater.string name="no_permission"> + Vous n'avez pas la permission d'acheter de terrain pour votre groupe. + </floater.string> + <floater.string name="parcel_not_for_sale"> + La parcelle sélectionnée n'est pas à vendre. + </floater.string> + <floater.string name="group_already_owns"> + La parcelle appartient déjà au groupe. + </floater.string> + <floater.string name="you_already_own"> + La parcelle vous appartient déjà . + </floater.string> + <floater.string name="set_to_sell_to_other"> + La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre. + </floater.string> + <floater.string name="no_public_land"> + Il n'y a pas de terrain public dans cette zone. + </floater.string> + <floater.string name="not_owned_by_you"> + Le terrain sélectionné appartient à quelqu'un d'autre. +Sélectionnez une zone plus petite. + </floater.string> + <floater.string name="processing"> + Achat en cours de traitement... + +(Veuillez patienter quelques instants.) + </floater.string> + <floater.string name="fetching_error"> + Une erreur s'est produite pendant le traitement de l'achat du terrain. + </floater.string> + <floater.string name="buying_will"> + Si vous achetez ce terrain : + </floater.string> + <floater.string name="buying_for_group"> + Si vous achetez le terrain pour le groupe : + </floater.string> + <floater.string name="cannot_buy_now"> + Impossible d'acheter maintenant : + </floater.string> + <floater.string name="not_for_sale"> + Pas à vendre : + </floater.string> + <floater.string name="none_needed"> + aucun besoin + </floater.string> + <floater.string name="must_upgrade"> + Pour posséder du terrain, vous devez avoir un niveau de compte supérieur. + </floater.string> + <floater.string name="cant_own_land"> + Avec votre compte, vous pouvez posséder du terrain. + </floater.string> + <floater.string name="land_holdings"> + Vous détenez [BUYER] m² de terrain. + </floater.string> + <floater.string name="pay_to_for_land"> + Payez [AMOUNT] L$ à [SELLER] pour ce terrain + </floater.string> + <floater.string name="buy_for_US"> + Achetez [AMOUNT] L$ pour environ [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Cette parcelle fait [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + C'est un terrain premium, [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Ce terrain est en solde, [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +prend en charge [AMOUNT2] objets + </floater.string> + <floater.string name="sold_with_objects"> + vendu avec objets + </floater.string> + <floater.string name="sold_without_objects"> + objets non inclus + </floater.string> + <floater.string name="info_price_string"> + [PRICE] L$ +([PRICE_PER_SQM] L$/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé. + </floater.string> + <floater.string name="have_enough_lindens"> + Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain. + </floater.string> + <floater.string name="not_enough_lindens"> + Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus. + </floater.string> + <floater.string name="balance_left"> + Après cet achat, il vous restera [AMOUNT] L$. + </floater.string> + <floater.string name="balance_needed"> + Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$. + </floater.string> + <floater.string name="no_parcel_selected"> + (aucune parcelle sélectionnée) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Région : </text> @@ -37,10 +164,10 @@ Vous devez accepter le règlement du domaine : </text> <text left="470" name="covenant_timestamp_text"/> - <text_editor name="covenant_editor" left="510"> + <text_editor left="510" name="covenant_editor"> Chargement... </text_editor> - <check_box label="J'accepte le règlement ci-dessus." name="agree_covenant" left="510"/> + <check_box label="J'accepte le règlement ci-dessus." left="510" name="agree_covenant"/> <text name="info_parcel_label"> Parcelle : </text> @@ -79,20 +206,9 @@ vendu avec objets <combo_box.item label="7,50 US$/mois, facturation trimestrielle" name="US$7.50/month,billedquarterly"/> <combo_box.item label="6,00 US$/mois, facturation annuelle" name="US$6.00/month,billedannually"/> </combo_box> - <text - type="string" - length="1" - follows="top|left" - font="SansSerifBig" - height="16" - layout="topleft" - left="72" - name="land_use_action" - right="500" - top="284" - width="400"> - Augmentez vos frais d'occupation de terrain à 40 US$/mois. - </text> + <text follows="top|left" font="SansSerifBig" height="16" layout="topleft" left="72" length="1" name="land_use_action" right="500" top="284" type="string" width="400"> + Augmentez vos frais d'occupation de terrain à 40 US$/mois. + </text> <text name="land_use_reason"> Vous détenez 1 309 m² de terrain. Cette parcelle fait 512 m². @@ -118,131 +234,4 @@ Cette parcelle fait 512 m². <check_box label="Enlever [AMOUNT] m² de contribution du groupe." name="remove_contribution"/> <button label="Acheter" name="buy_btn"/> <button label="Annuler" name="cancel_btn"/> - <string name="can_resell"> - Peut être revendu. - </string> - <string name="can_not_resell"> - Ne peut pas être revendu. - </string> - <string name="can_change"> - Peut être fusionné ou divisé. - </string> - <string name="can_not_change"> - Ne peut pas être fusionné ou divisé. - </string> - <string name="cant_buy_for_group"> - Vous n'avez pas la permission d'acheter de terrain pour votre groupe. - </string> - <string name="no_land_selected"> - Aucun terrain sélectionné. - </string> - <string name="multiple_parcels_selected"> - Vous avez sélectionné plusieurs parcelles. -Sélectionnez une zone plus petite. - </string> - <string name="no_permission"> - Vous n'avez pas la permission d'acheter de terrain pour votre groupe. - </string> - <string name="parcel_not_for_sale"> - La parcelle sélectionnée n'est pas à vendre. - </string> - <string name="group_already_owns"> - La parcelle appartient déjà au groupe. - </string> - <string name="you_already_own"> - La parcelle vous appartient déjà . - </string> - <string name="set_to_sell_to_other"> - La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre. - </string> - <string name="no_public_land"> - Il n'y a pas de terrain public dans cette zone. - </string> - <string name="not_owned_by_you"> - Le terrain sélectionné appartient à quelqu'un d'autre. -Sélectionnez une zone plus petite. - </string> - <string name="processing"> - Achat en cours de traitement... - -(Veuillez patienter quelques instants.) - </string> - <string name="fetching_error"> - Une erreur s'est produite pendant le traitement de l'achat du terrain. - </string> - <string name="buying_will"> - Si vous achetez ce terrain : - </string> - <string name="buying_for_group"> - Si vous achetez le terrain pour le groupe : - </string> - <string name="cannot_buy_now"> - Impossible d'acheter maintenant : - </string> - <string name="not_for_sale"> - Pas à vendre : - </string> - <string name="none_needed"> - aucun besoin - </string> - <string name="must_upgrade"> - Pour posséder du terrain, vous devez avoir un niveau de compte supérieur. - </string> - <string name="cant_own_land"> - Avec votre compte, vous pouvez posséder du terrain. - </string> - <string name="land_holdings"> - Vous détenez [BUYER] m² de terrain. - </string> - <string name="pay_to_for_land"> - Payez [AMOUNT] L$ à [SELLER] pour ce terrain - </string> - <string name="buy_for_US"> - Achetez [AMOUNT] L$ pour environ [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Cette parcelle fait [AMOUNT] m² - </string> - <string name="premium_land"> - C'est un terrain premium, [AMOUNT] m². - </string> - <string name="discounted_land"> - Ce terrain est en solde, [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -prend en charge [AMOUNT2] objets - </string> - <string name="sold_with_objects"> - vendu avec objets - </string> - <string name="sold_without_objects"> - objets non inclus - </string> - <string name="info_price_string"> - [PRICE] L$ -([PRICE_PER_SQM] L$/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé. - </string> - <string name="have_enough_lindens"> - Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain. - </string> - <string name="not_enough_lindens"> - Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus. - </string> - <string name="balance_left"> - Après cet achat, il vous restera [AMOUNT] L$. - </string> - <string name="balance_needed"> - Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$. - </string> - <string name="no_parcel_selected"> - (aucune parcelle sélectionnée) - </string> - <string name="buy_currency"> - Acheter [LINDENS] L$ pour environ [USD] US$ - </string> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml index 309c93cf3b..558551b649 100644 --- a/indra/newview/skins/default/xui/fr/floater_camera.xml +++ b/indra/newview/skins/default/xui/fr/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Déplacer la caméra vers le haut et le bas, la gauche et la droite </floater.string> + <floater.string name="orbit_mode_title"> + Faire tourner + </floater.string> + <floater.string name="pan_mode_title"> + Faire un panoramique + </floater.string> + <floater.string name="avatar_view_mode_title"> + Préréglages + </floater.string> + <floater.string name="free_mode_title"> + Voir l'objet + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/> <panel name="zoom" tool_tip="Zoomer en direction du point central"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/> <button label="" name="pan_btn" tool_tip="Faire un panoramique"/> - <button label="" name="avatarview_btn" tool_tip="Vue subjective"/> + <button label="" name="avatarview_btn" tool_tip="Préréglages"/> <button label="" name="freecamera_btn" tool_tip="Voir l'objet"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml index a1cd568571..0343ff0014 100644 --- a/indra/newview/skins/default/xui/fr/floater_customize.xml +++ b/indra/newview/skins/default/xui/fr/floater_customize.xml @@ -156,8 +156,8 @@ <panel label="Chemise" name="Shirt"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> + <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> <button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/> @@ -189,8 +189,8 @@ <panel label="Pantalon" name="Pants"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> + <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> <button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/> @@ -238,6 +238,7 @@ <text name="not worn instructions"> Pour changer de chaussures, faites-en glisser une paire de votre inventaire à votre avatar. Vous pouvez aussi en créer des nouvelles et les porter. </text> + <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> @@ -246,7 +247,6 @@ </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -271,6 +271,7 @@ <text name="not worn instructions"> Pour changer de chaussettes, faites-en glisser une paire à partir de votre inventaire. Vous pouvez aussi en créer des nouvelles et les porter. </text> + <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> @@ -279,7 +280,6 @@ </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -304,6 +304,7 @@ <text name="not worn instructions"> Pour changer de veste, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter. </text> + <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> @@ -313,7 +314,6 @@ <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/> <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="81"/> - <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -338,6 +338,7 @@ <text name="not worn instructions"> Pour changer de gants, faites-en glisser une paire à partir de votre inventaire. Vous pouvez aussi en créer de nouveaux et les porter. </text> + <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> @@ -346,13 +347,12 @@ </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> <button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/> </panel> - <panel label="Sous-vêtements (haut)" name="Undershirt"> + <panel label="Débardeur" name="Undershirt"> <text name="title"> [DESC] </text> @@ -363,30 +363,29 @@ [DESC]: en cours de chargement... </text> <text name="title_not_worn"> - [DESC]: non portés + [DESC]: non porté </text> <text name="path"> Emplacement : [PATH] </text> <text name="not worn instructions"> - Pour changer de sous-vêtements (homme), faites-en glisser à partir de votre inventaire. Vous pouvez aussi en créer de nouveaux et les porter. + Pour changer de débardeur, faites-en glisser un à partir de votre inventaire. Vous pouvez aussi en créer un nouveau et le porter. </text> + <button label="Créer un débardeur" label_selected="Créer un débardeur" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> <text bottom="-470" name="Item Action Label" right="92"> - Sous-vêtements -(haut) : + Débardeur : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> <button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/> </panel> - <panel label="Sous-vêtements (bas)" name="Underpants"> + <panel label="Caleçon" name="Underpants"> <text name="title"> [DESC] </text> @@ -397,24 +396,23 @@ [DESC]: en cours de chargement... </text> <text name="title_not_worn"> - [DESC]: non portés + [DESC]: non porté </text> <text name="path"> Emplacement : [PATH] </text> <text name="not worn instructions"> - Pour changer de sous-vêtements (femme), faites-en glisser à partir de votre inventaire. Vous pouvez aussi en créer de nouveaux et les porter. + Pour changer de caleçon, faites-en glisser un à partir de votre inventaire. Vous pouvez aussi en créer un nouveau et le porter. </text> + <button label="Créer un caleçon" label_selected="Créer un caleçon" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> <text bottom="-470" name="Item Action Label" right="92"> - Sous-vêtements -(bas) : + Caleçon : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -439,6 +437,7 @@ <text name="not worn instructions"> Pour changer de jupe, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter. </text> + <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas la permission de modifier cet objet. </text> @@ -447,13 +446,12 @@ </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> - <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> <button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Tatouage" name="Tattoo"> <text name="title"> [DESC] </text> @@ -470,26 +468,24 @@ Dans [PATH] </text> <text name="not worn instructions"> - Pour changer de masque alpha, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter. + Pour changer de tatouage, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter. </text> + <button label="Créer un nouveau tatouage" label_selected="Créer un nouveau tatouage" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas le droit de modifier cet objet. </text> <text name="Item Action Label"> - Alpha : + Tatouage : </text> - <texture_picker label="Alpha bas" name="Lower Alpha" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/> - <button label="Créer un nouvel alpha" label_selected="Créer un nouvel alpha" name="Create New"/> + <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/> <button label="Enlever" label_selected="Enlever" name="Take Off"/> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/> - <button label="Annuler modification" label_selected="Annuler modification" name="Revert"/> + <button label="Rétablir" label_selected="Rétablir" name="Revert"/> </panel> - <panel label="Tatouage" name="Tattoo"> + <panel label="Alpha" name="Alpha"> <text name="title"> [DESC] </text> @@ -506,26 +502,28 @@ Dans [PATH] </text> <text name="not worn instructions"> - Pour changer de tatouage, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter. + Pour changer de masque alpha, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter. </text> + <button label="Créer un nouvel alpha" label_selected="Créer un nouvel alpha" name="Create New"/> <text name="no modify instructions"> Vous n'avez pas le droit de modifier cet objet. </text> <text name="Item Action Label"> - Tatouage : + Alpha : </text> - <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/> - <button label="Créer un nouveau tatouage" label_selected="Créer un nouveau tatouage" name="Create New"/> + <texture_picker label="Alpha bas" name="Lower Alpha" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/> <button label="Enlever" label_selected="Enlever" name="Take Off"/> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/> - <button label="Annuler modification" label_selected="Annuler modification" name="Revert"/> + <button label="Rétablir" label_selected="Rétablir" name="Revert"/> </panel> </tab_container> <scroll_container left="251" name="panel_container"/> - <button label="Infos sur les scripts" label_selected="Infos sur les scripts" name="script_info"/> + <button label="Infos sur les scripts" label_selected="Infos sur les scripts" name="script_info" tool_tip="Afficher les scripts attachés à votre avatar"/> <button label="Créer tenue" label_selected="Créer une tenue..." name="make_outfit_btn"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml new file mode 100644 index 0000000000..b005ce3b36 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_event.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Événement" name="Event" title="DÉTAILS SUR L'ÉVÉNEMENT"> + <floater.string name="none"> + aucun + </floater.string> + <floater.string name="notify"> + Prévenir + </floater.string> + <floater.string name="dont_notify"> + Ne pas prévenir + </floater.string> + <floater.string name="moderate"> + Modéré + </floater.string> + <floater.string name="adult"> + Adulte + </floater.string> + <floater.string name="general"> + Général + </floater.string> + <floater.string name="unknown"> + Inconnu + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Nameless Event...of Doom! De doom! Doom doom. + </text> + <text name="event_category"> + (pas de catégorie) + </text> + <text name="event_runby_label"> + Organisé par : + </text> + <text initial_value="(récupération en cours)" name="event_runby"/> + <text name="event_date_label"> + Date : + </text> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration_label"> + Durée : + </text> + <text name="event_duration"> + 1 heure + </text> + <text name="event_covercharge_label"> + Prix : + </text> + <text name="event_cover"> + Gratuit + </text> + <text name="event_location_label"> + Lieu : + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Catégorie :"/> + <text name="rating_value" value="inconnu"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Créer un événement"/> + <button name="god_delete_event_btn" tool_tip="Supprimer l'événement"/> + <button label="Me prévenir" name="notify_btn"/> + <button label="Téléporter" name="teleport_btn"/> + <button label="Carte" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml index 187814eba2..e20da40bcf 100644 --- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml @@ -2,7 +2,7 @@ <floater name="godtools floater" title="OUTILS DIVINS"> <tab_container name="GodTools Tabs"> <panel label="Grille" name="grid"> - <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175"/> + <button label="Éjecter tous les résidents" label_selected="Éjecter tous les résidents" name="Kick all users" width="175"/> <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region's Map Visibility Caches" width="285"/> </panel> <panel label="Région" name="region"> diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml index 1170d1d87b..11caca640c 100644 --- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_help_browser" title="NAVIGATEUR D'AIDE"> - <floater.string name="home_page_url"> - http://fr.secondlife.com - </floater.string> - <floater.string name="support_page_url"> - http://fr.secondlife.com/support + <floater.string name="loading_text"> + Chargement… </floater.string> <layout_stack name="stack1"> - <layout_panel name="external_controls"> - <button label="Ouvrir dans mon navigateur Web" name="open_browser"/> - </layout_panel> + <layout_panel name="external_controls"/> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_im.xml b/indra/newview/skins/default/xui/fr/floater_im.xml index 0e4039d3af..15b01dbf12 100644 --- a/indra/newview/skins/default/xui/fr/floater_im.xml +++ b/indra/newview/skins/default/xui/fr/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="Message instantané"> <text name="only_user_message"> - Vous êtes le seul participant à cette session. + Vous êtes le seul résident participant à cette session. </text> <text name="offline_message"> [FIRST] [LAST] est déconnecté(e). @@ -31,7 +31,7 @@ Un modérateur de groupe a désactivé votre chat écrit. </string> <string name="add_session_event"> - Impossible d'ajouter des participants à la session de chat avec [RECIPIENT]. + Impossible d'ajouter des résidents à la session de chat avec [RECIPIENT]. </string> <string name="message_session_event"> Impossible d'envoyer votre message à la session de chat avec [RECIPIENT]. diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml index 1f8b7f37ad..200c07e522 100644 --- a/indra/newview/skins/default/xui/fr/floater_inventory.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="INVENTAIRE"> +<floater name="Inventory" title="MON INVENTAIRE"> <floater.string name="Title"> - Inventaire + MON INVENTAIRE </floater.string> <floater.string name="TitleFetching"> - Inventaire (Récupération de [ITEM_COUNT] articles en cours) [FILTER] + MON INVENTAIRE (récupération de [ITEM_COUNT] articles en cours) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - Inventaire ([ITEM_COUNT] articles) [FILTER] + MON INVENTAIRE ([ITEM_COUNT] articles) [FILTER] </floater.string> <floater.string name="Fetched"> Récupéré diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml index 20dffbbbc8..39a861d8bd 100644 --- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml @@ -25,16 +25,16 @@ Normal, fenêtre en arrière-plan </floater.string> <floater.string name="client_frame_time_critical_msg"> - Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL] + Taux de défilement [CLIENT_FRAME_RATE_CRITICAL] </floater.string> <floater.string name="client_frame_time_warning_msg"> - Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING] + Taux de défilement entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING] </floater.string> <floater.string name="client_frame_time_normal_msg"> Normal </floater.string> <floater.string name="client_draw_distance_cause_msg"> - Cause possible : la limite d'affichage est trop élevée + Cause possible : limite d'affichage trop élevée </floater.string> <floater.string name="client_texture_loading_cause_msg"> Cause possible : images en cours de chargement @@ -43,7 +43,7 @@ Cause possible : trop d'images en mémoire </floater.string> <floater.string name="client_complex_objects_cause_msg"> - Cause possible : trop d'objets complexes dans la scène + Cause possible : trop d'objets complexes </floater.string> <floater.string name="network_text_msg"> Réseau @@ -70,10 +70,10 @@ 300 </floater.string> <floater.string name="network_ping_critical_msg"> - Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms + Connexion ping > [NETWORK_PING_CRITICAL] ms </floater.string> <floater.string name="network_ping_warning_msg"> - Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms + Connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms </floater.string> <floater.string name="network_packet_loss_cause_msg"> Mauvaise connexion possible ou réglage de la bande passante trop élevé. @@ -94,10 +94,10 @@ 20 </floater.string> <floater.string name="server_frame_time_critical_msg"> - Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL] + Défilement du simulateur < [SERVER_FRAME_RATE_CRITICAL] </floater.string> <floater.string name="server_frame_time_warning_msg"> - Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING] + Défilement simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING] </floater.string> <floater.string name="server_frame_time_normal_msg"> Normal @@ -112,7 +112,7 @@ Cause possible : trop de trafic réseau </floater.string> <floater.string name="server_agent_cause_msg"> - Cause possible : trop de personnes en mouvement dans la région + Cause possible : trop de personnes en mouvement </floater.string> <floater.string name="server_images_cause_msg"> Cause possible : trop de calculs d'images diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml index 7e7180166d..7647452e91 100644 --- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script ed float" title="SCRIPT : NOUVEAU SCRIPT"> <floater.string name="not_allowed"> - Ce script ne peut pas être copié, visualisé ou modifié. Pour visualiser ou modifier un script à l'intérieur d'un objet, vous devez avoir les permissions requises. + Ce script ne peut pas être copié, visualisé ou modifié. Pour visualiser ou modifier un script à l'intérieur d'un objet, vous devez avoir les droits requis. </floater.string> <floater.string name="script_running"> Exécution en cours </floater.string> <floater.string name="Title"> - Script : [NAME] + SCRIPT : [NAME] </floater.string> - <button label="Réinitialiser" label_selected="Réinitialiser" left="390" name="Reset" width="100"/> - <check_box initial_value="true" label="Exécution en cours" left="4" name="running"/> - <check_box initial_value="true" label="Mono" left_delta="160" name="mono"/> + <button label="Réinitialiser" label_selected="Réinitialiser" name="Reset"/> + <check_box initial_value="true" label="Exécution en cours" name="running"/> + <check_box initial_value="true" label="Mono" name="mono"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index aeef4b0e91..e01b687fce 100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Mini-carte"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml index 0e8887bb96..fac569557e 100644 --- a/indra/newview/skins/default/xui/fr/floater_moveview.xml +++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Voler vers l'arrière (appuyer sur la flèche vers le bas ou S) </string> + <string name="walk_title"> + Marcher + </string> + <string name="run_title"> + Courir + </string> + <string name="fly_title"> + Voler + </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/> <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="Mode marche"/> <button label="" name="mode_run_btn" tool_tip="Mode course"/> <button label="" name="mode_fly_btn" tool_tip="Mode vol"/> - <button label="Atterrir" name="stop_fly_btn" tool_tip="Atterrir"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml index 72775169cb..a59253a746 100644 --- a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="nearby_chat" title="CHAT PRÈS DE VOUS"/> +<floater name="nearby_chat" title="CHAT PRÈS DE MOI"/> diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml index f5dfc8d6df..d77dfbdf82 100644 --- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="Enregistrer la tenue"> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> <text name="Save item as:"> - Enregistrer la tenue sous : + Enregistrer ce que je porte +comme une nouvelle tenue : </text> <line_editor name="name ed"> - [DESC] + [DESC] (nouv.) </line_editor> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml index a6f0970502..2420c2b04b 100644 --- a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml @@ -25,10 +25,13 @@ Pas de réponse. Veuillez réessayer ultérieurement. </text> <text name="nearby"> - Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. Vous allez maintenant être reconnecté(e) au chat vocal près de vous. + Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> - [VOICE_CHANNEL_NAME] a mis fin à l'appel. Vous allez maintenant être reconnecté(e) au chat vocal près de vous. + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] a mis fin à l'appel. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Vous avez mis fin à l'appel. [RECONNECT_NEARBY] </text> <text name="leaving"> En train de quitter [CURRENT_CHAT]. diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml index 4db7ca304c..406e91a18a 100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Général" name="general"/> <panel label="Graphiques" name="display"/> <panel label="Confidentialité" name="im"/> - <panel label="Son" name="audio"/> + <panel label="Son et Média" name="audio"/> <panel label="Chat" name="chat"/> <panel label="Notifications" name="msgs"/> <panel label="Configuration" name="input"/> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml index 923d56801e..b14aecafbb 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Description : </text> - <button label="Jouer dans le Monde" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Lire cette animation de façon à ce que les autres puissent la voir" width="131"/> + <button label="Jouer dans Second Life" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Lire cette animation de façon à ce que les autres puissent la voir" width="131"/> <button label="Jouer localement" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Lire cette animation de façon à ce que vous soyez la seule personne à pouvoir la voir" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml index 67d93e9e92..a215f92df1 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Description : </text> - <button label="Jouer dans le Monde" label_selected="Jouer dans le Monde" left_delta="-142" name="Sound play btn" tool_tip="Lire ce son de façon à ce que les autres puissent l'entendre" width="131"/> + <button label="Jouer dans Second Life" label_selected="Jouer dans Second Life" left_delta="-142" name="Sound play btn" tool_tip="Lire ce son de façon à ce que les autres puissent l'entendre" width="131"/> <button label="Jouer localement" label_selected="Jouer localement" left="162" name="Sound audition btn" tool_tip="Lire ce son de façon à ce que vous soyez la seule personne à pouvoir l'entendre" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 2ff14b4a68..9fc9d14026 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml @@ -19,7 +19,7 @@ <combo_item name="Unconstrained"> Sans contraintes </combo_item> - <combo_item name="1:1" tool_tip="Logo du groupe ou profil dans le monde physique"> + <combo_item name="1:1" tool_tip="Logo du groupe ou profil dans la vie réelle"> 1:1 </combo_item> <combo_item name="4:3" tool_tip="Profil [SECOND_LIFE]"> @@ -28,7 +28,7 @@ <combo_item name="10:7" tool_tip="Petites annonces, repères"> 10:7 </combo_item> - <combo_item name="3:2" tool_tip="À propos des terrains"> + <combo_item name="3:2" tool_tip="À propos du terrain"> 3:2 </combo_item> <combo_item name="16:10"> @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="Annuler" name="Discard"/> + <button label="Jeter" name="Discard"/> <button label="Enregistrer sous" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml new file mode 100644 index 0000000000..39a2b086f1 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="Publication de l'annonce"> + <text name="explanation_text"> + Votre petite annonce sera visible pendant une semaine à partir de sa date de publication. + +Rappel : les frais liés aux annonces passées ne sont pas remboursables. + </text> + <spinner label="Coût de l'annonce :" name="price_for_listing" tool_tip="Coût de l’annonce." value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + En savoir plus (lien vers l'aide sur les annonces) + </text> + <button label="Publier" name="publish_btn"/> + <button label="Annuler" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml index 215df18bd6..78c35dc303 100644 --- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml @@ -5,7 +5,7 @@ </floater.string> <check_box label="Utiliser cette capture d'écran" name="screen_check"/> <text name="reporter_title" width="60"> - Déposant : + Témoin : </text> <text name="reporter_field"> Loremipsum Dolorsitamut Longnamez diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml index 7b8c5399b9..7b6bc73677 100644 --- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SCRIPT : SCRIPT DE ROTATION"> <floater.string name="Title"> - Script : [NAME] + SCRIPT : [NAME] </floater.string> <text name="desc txt"> Description : diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml index 74738b7e31..ccb862acac 100644 --- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml @@ -62,8 +62,8 @@ <check_box label="Interface" name="ui_check"/> <check_box label="HUD" name="hud_check"/> <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/> - <check_box label="Contraindre les proportions" name="keep_aspect_check"/> - <check_box label="Arrêt sur image (plein écran)" name="freeze_frame_check"/> + <check_box label="Conserver les proportions" name="keep_aspect_check"/> + <check_box label="Figer l'image (plein écran)" name="freeze_frame_check"/> <button label="Rafraîchir" name="new_snapshot_btn"/> <check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/> <button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/> diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml index 9b0253065c..47b761aed9 100644 --- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="notification_chiclet" title="NOTIFICATIONS"> <string name="title_im_well_window"> - SESSIONS IM + CONVERSATIONS </string> <string name="title_notification_well_window"> NOTIFICATIONS diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 3488ae15d1..40765b9e06 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" short_title="OUTILS DE CONSTRUCTION" title=""> +<floater name="toolbox floater" short_title="OUTILS POUR LA CONSTRUCTION" title=""> <floater.string name="status_rotate"> Pour faire tourner l'objet, faîtes glisser les bandes de couleur. </floater.string> @@ -179,9 +179,9 @@ <text name="Group:"> Groupe : </text> - <button label="Définir..." label_selected="Définir..." name="button set group" tool_tip="Choisissez un groupe pour partager les permissions de cet objet"/> + <button label="Définir..." label_selected="Définir..." name="button set group" tool_tip="Choisissez un groupe pour partager les droits de cet objet"/> <name_box initial_value="Chargement..." name="Group Name Proxy"/> - <button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les permissions au prochain propriétaire. Seul un officier peut céder les objets d'un groupe."/> + <button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les droits au prochain propriétaire. Seul un officier peut céder les objets d'un groupe."/> <check_box label="Partager" name="checkbox share with group" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Transférer."/> <text name="label click action"> Cliquer pour : @@ -474,7 +474,7 @@ <text name="label_area"> Surface : [AREA] m² </text> - <button label="À propos des terrains" label_selected="À propos des terrains" name="button about land" width="142"/> + <button label="À propos du terrain" label_selected="À propos du terrain" name="button about land" width="142"/> <check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorier les parcelles en fonction du type de leur propriétaire : Vert = votre terrain Turquoise = le terrain de votre groupe Rouge = appartenant à d'autres Jaune = en vente Mauve = aux enchères Gris = public"/> <text name="label_parcel_modify"> Modifier la parcelle diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml index 54ba2ad3e5..1a7bc228fa 100644 --- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml @@ -16,6 +16,9 @@ Il n'y a personne près de vous avec le chat vocal activé </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mon avatar :"/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="Quitter l'appel" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml index 1a74017330..6d697b40d3 100644 --- a/indra/newview/skins/default/xui/fr/floater_water.xml +++ b/indra/newview/skins/default/xui/fr/floater_water.xml @@ -10,7 +10,7 @@ <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/> <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Paramètres" name="Settings"> + <panel label="PARAMÈTRES" name="Settings"> <text name="BHText"> Couleur du brouillard dans l'eau </text> @@ -43,7 +43,7 @@ Multiplicateur de flou </text> </panel> - <panel label="Image" name="Waves"> + <panel label="IMAGE" name="Waves"> <text name="BHText"> Direction grande vague </text> diff --git a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml index af6274d4e2..5dda347fcf 100644 --- a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container"> - <button label="Enregistrer" label_selected="Enregistrer" name="Save" /> - <button label="Annuler" label_selected="Annuler" name="Cancel" /> + <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> + <button label="Annuler" label_selected="Annuler" name="Cancel"/> <text name="Save item as:"> - Enregistrer l'objet sous : + Enregistrer l'objet dans mon inventaire comme : </text> <line_editor name="name ed"> Nouveau [DESC] diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml index d92fadd048..9f93302b71 100644 --- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml @@ -6,9 +6,9 @@ <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/> <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/> <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/> - <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_pad="20" left_delta="95" name="WLDayCycleMenuButton" width="150"/> + <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/> <tab_container name="WindLight Tabs" width="706"> - <panel label="Atmosphère" name="Atmosphere"> + <panel label="ATMOSPHÈRE" name="Atmosphere"> <text name="BHText"> Bleu de l'horizon </text> @@ -62,7 +62,7 @@ </text> <button label="?" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Éclairage" name="Lighting"> + <panel label="LUMIÈRE" name="Lighting"> <text name="SLCText"> Couleur soleil/lune </text> @@ -118,7 +118,7 @@ </text> <button label="?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Nuages" name="Clouds"> + <panel label="NUAGES" name="Clouds"> <text name="WLCloudColorText"> Couleur des nuages </text> diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index 3ac3580d4b..f8e1926586 100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml @@ -1,90 +1,70 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="worldmap" title="CARTE DU MONDE"> - <panel name="objects_mapview" width="542"/> <panel name="layout_panel_1"> <text name="events_label"> Légende </text> </panel> - <panel> - <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de mon avatar" width="165"/> + <panel name="layout_panel_2"> + <button name="Show My Location" tool_tip="Centrer la carte sur l’emplacement de mon avatar"/> <text name="me_label"> Moi </text> - <check_box label="Résident" name="people_chk"/> - <icon left="-262" name="person"/> <text name="person_label"> Résident </text> - <check_box label="Infohub" name="infohub_chk"/> - <icon left="-266" name="infohub"/> <text name="infohub_label"> Infohub </text> - <check_box label="Terrain à vendre" name="land_for_sale_chk"/> - <icon left="-266" name="landforsale"/> <text name="land_sale_label"> Vente de terrains </text> - <icon left="-270" name="square2"/> <text name="by_owner_label"> par le propriétaire </text> <text name="auction_label"> enchères </text> - <button label="Aller chez moi" label_selected="Aller chez moi" left="-120" name="Go Home" tool_tip="Me téléporter jusqu'à mon domicile" width="108"/> + <button name="Go Home" tool_tip="Me téléporter jusqu’à mon domicile"/> <text name="Home_label"> Domicile </text> - <text left="-144" name="events_label"> + <text name="events_label"> Événements : </text> - <check_box label="PG" name="event_chk"/> - <icon left="-132" name="event"/> <text name="pg_label"> Général </text> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> - <icon left="-132" name="events_mature_icon"/> + <check_box initial_value="true" name="event_mature_chk"/> <text name="mature_label"> Modéré </text> - <check_box label="Adult" name="event_adult_chk"/> - <icon left="-132" name="events_adult_icon"/> <text name="adult_label"> Adulte </text> </panel> - <panel> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Situer sur la carte </text> </panel> - <panel> - <combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte" width="232"> + <panel name="layout_panel_4"> + <combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte"> <combo_box.item label="Mes amis connectés" name="item1"/> </combo_box> - <icon left="-270" name="landmark_icon"/> - <combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232"> + <combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte"> <combo_box.item label="Mes repères" name="item1"/> </combo_box> - <search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d'une région" width="155"/> - <button label="Trouver" label_selected=">" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/> - <scroll_list left="-270" name="search_results" width="252"> - <scroll_list.columns label="" name="icon"/> - <scroll_list.columns label="" name="sim_name"/> - </scroll_list> - <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l'endroit sélectionné"/> - <button label="Copier la SLurl" left="-270" name="copy_slurl" tool_tip="Copie l'emplacement actuel sous la forme d'une SLurl à utiliser sur le Web."/> - <button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné" width="165"/> + <search_editor label="Régions par nom" name="location" tool_tip="Tapez le nom d'une région"/> + <button label="Trouver" name="DoSearch" tool_tip="Rechercher une région"/> + <button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/> + <button label="Téléporter" name="Teleport" tool_tip="Me téléporter à l'emplacement sélectionné"/> + <button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l’emplacement actuel sous la forme d’une SLurl à utiliser sur le Web."/> + <button label="Afficher la sélection" name="Show Destination" tool_tip="Centrer la carte sur l'emplacement sélectionné"/> </panel> - <panel> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoomer </text> </panel> - <panel> - <slider label="Zoom" left="-270" name="zoom slider"/> - </panel> </floater> diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml index be23369dc7..381a52ed43 100644 --- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/> <button label="Devenir amis" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="Plus" name="view_profile_btn"/> + <button label="Profil" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="Désactiver le chat vocal" name="disable_voice"/> <button label="Activer le chat vocal" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml index ccb93f129e..8d51c1b4e3 100644 --- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml @@ -8,7 +8,7 @@ <menu_item_call label="Inviter dans le groupe" name="Invite..."/> <menu_item_call label="Ignorer" name="Avatar Mute"/> <menu_item_call label="Signaler" name="abuse"/> - <menu_item_call label="Geler" name="Freeze..."/> + <menu_item_call label="Figer" name="Freeze..."/> <menu_item_call label="Expulser" name="Eject..."/> <menu_item_call label="Débogage" name="Debug..."/> <menu_item_call label="Zoomer en avant" name="Zoom In"/> diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml index 289912cd05..b42271e969 100644 --- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml @@ -8,7 +8,7 @@ <menu_item_call label="Inviter dans le groupe" name="Invite..."/> <menu_item_call label="Ignorer" name="Avatar Mute"/> <menu_item_call label="Signaler" name="abuse"/> - <menu_item_call label="Geler" name="Freeze..."/> + <menu_item_call label="Figer" name="Freeze..."/> <menu_item_call label="Expulser" name="Eject..."/> <menu_item_call label="Débogage" name="Debug..."/> <menu_item_call label="Zoomer en avant" name="Zoom In"/> diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml index 82945cf96e..e370e8d3b8 100644 --- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="Me lever" name="Stand Up"/> - <context_menu label="Enlever >" name="Take Off >"> - <context_menu label="Habits >" name="Clothes >"> + <context_menu label="Enlever â–¶" name="Take Off >"> + <context_menu label="Habits â–¶" name="Clothes >"> <menu_item_call label="Chemise" name="Shirt"/> <menu_item_call label="Pantalon" name="Pants"/> <menu_item_call label="Jupe" name="Skirt"/> @@ -16,8 +16,8 @@ <menu_item_call label="Alpha" name="Self Alpha"/> <menu_item_call label="Tous les habits" name="All Clothes"/> </context_menu> - <context_menu label="HUD >" name="Object Detach HUD"/> - <context_menu label="Détacher >" name="Object Detach"/> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="Détacher â–¶" name="Object Detach"/> <menu_item_call label="Tout détacher" name="Detach All"/> </context_menu> <menu_item_call label="Mon apparence" name="Appearance..."/> diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml index 39ba4b1074..0da9a1806d 100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml @@ -9,10 +9,11 @@ <menu_item_call label="Ignorer" name="block"/> <menu_item_call label="Ne plus ignorer" name="unblock"/> <menu_item_call label="Signaler" name="report"/> - <menu_item_call label="Geler" name="freeze"/> + <menu_item_call label="Figer" name="freeze"/> <menu_item_call label="Expulser" name="eject"/> <menu_item_call label="Débogage" name="debug"/> <menu_item_call label="Situer sur la carte" name="find_on_map"/> <menu_item_call label="Zoomer en avant" name="zoom_in"/> <menu_item_call label="Payer" name="pay"/> + <menu_item_call label="Partager" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml index 5276aa5b7e..2f6f25dc6b 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml @@ -20,8 +20,8 @@ <menu_item_call label="Nouvelle veste" name="New Jacket"/> <menu_item_call label="Nouvelle jupe" name="New Skirt"/> <menu_item_call label="Nouveaux gants" name="New Gloves"/> - <menu_item_call label="Nouveau tricot" name="New Undershirt"/> - <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/> + <menu_item_call label="Nouveau débardeur" name="New Undershirt"/> + <menu_item_call label="Nouveau caleçon" name="New Underpants"/> <menu_item_call label="Nouveau masque alpha" name="New Alpha Mask"/> <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> </menu> @@ -40,8 +40,8 @@ <menu_item_call label="Chaussures" name="Shoes"/> <menu_item_call label="Chemise" name="Shirt"/> <menu_item_call label="Jupe" name="Skirt"/> - <menu_item_call label="Sous-vêtements (femme)" name="Underpants"/> - <menu_item_call label="Sous-vêtements (homme)" name="Undershirt"/> + <menu_item_call label="Caleçon" name="Underpants"/> + <menu_item_call label="Débardeur" name="Undershirt"/> </menu> <menu_item_call label="Téléporter" name="Landmark Open"/> <menu_item_call label="Ouvrir" name="Animation Open"/> @@ -65,7 +65,7 @@ <menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/> <menu_item_call label="Jouer" name="Sound Play"/> <menu_item_call label="À propos du repère" name="About Landmark"/> - <menu_item_call label="Jouer dans le Monde" name="Animation Play"/> + <menu_item_call label="Jouer dans Second Life" name="Animation Play"/> <menu_item_call label="Jouer localement" name="Animation Audition"/> <menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/> <menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/> diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml index 80cc49aa42..b84daee3ae 100644 --- a/indra/newview/skins/default/xui/fr/menu_land.xml +++ b/indra/newview/skins/default/xui/fr/menu_land.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Land Pie"> - <menu_item_call label="À propos des terrains" name="Place Information..."/> + <menu_item_call label="À propos du terrain" name="Place Information..."/> <menu_item_call label="M'asseoir ici" name="Sit Here"/> <menu_item_call label="Acheter ce terrain" name="Land Buy"/> <menu_item_call label="Acheter un pass" name="Land Buy Pass"/> diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index b6775661ad..6492a83e06 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -5,20 +5,22 @@ <menu_item_call label="Construire" name="Build"/> <menu_item_call label="Ouvrir" name="Open"/> <menu_item_call label="M'asseoir ici" name="Object Sit"/> + <menu_item_call label="Me lever" name="Object Stand Up"/> <menu_item_call label="Profil de l'objet" name="Object Inspect"/> <menu_item_call label="Zoomer en avant" name="Zoom In"/> - <context_menu label="Porter >" name="Put On"> + <context_menu label="Porter â–¶" name="Put On"> <menu_item_call label="Porter" name="Wear"/> - <context_menu label="Joindre >" name="Object Attach"/> - <context_menu label="Joindre les éléments HUD >" name="Object Attach HUD"/> + <context_menu label="Attacher â–¶" name="Object Attach"/> + <context_menu label="Attacher les éléments HUD â–¶" name="Object Attach HUD"/> </context_menu> - <context_menu label="Supprimer >" name="Remove"> - <menu_item_call label="Prendre" name="Pie Object Take"/> + <context_menu label="Supprimer â–¶" name="Remove"> <menu_item_call label="Signaler une infraction" name="Report Abuse..."/> <menu_item_call label="Ignorer" name="Object Mute"/> <menu_item_call label="Retour" name="Return..."/> <menu_item_call label="Supprimer" name="Delete"/> </context_menu> + <menu_item_call label="Acheter" name="Pie Object Bye"/> + <menu_item_call label="Prendre" name="Pie Object Take"/> <menu_item_call label="Prendre une copie" name="Take Copy"/> <menu_item_call label="Payer" name="Pay..."/> <menu_item_call label="Acheter" name="Buy..."/> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml index d48be969f4..26bd3978a9 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml @@ -2,8 +2,10 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Voir le profil" name="View Profile"/> <menu_item_call label="Devenir amis" name="Add Friend"/> + <menu_item_call label="Supprimer cet ami" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Appeler" name="Call"/> + <menu_item_call label="Carte" name="Map"/> <menu_item_call label="Partager" name="Share"/> <menu_item_call label="Payer" name="Pay"/> <menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml index 2185ac95e9..18ae84a67b 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> <menu_item_call label="Devenir amis" name="Add Friends"/> + <menu_item_call label="Supprimer des amis" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Appeler" name="Call"/> <menu_item_call label="Partager" name="Share"/> diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml index 4bb9fa19a8..58bd16064a 100644 --- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml @@ -2,8 +2,10 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="Payer" name="pay"/> <menu_item_call label="Partager" name="share"/> + <menu_item_call label="Ignorer" name="block"/> + <menu_item_call label="Ne plus ignorer" name="unblock"/> <menu_item_call label="Éjecter" name="kick"/> - <menu_item_call label="Geler" name="freeze"/> - <menu_item_call label="Dégeler" name="unfreeze"/> + <menu_item_call label="Figer" name="freeze"/> + <menu_item_call label="Libérer" name="unfreeze"/> <menu_item_call label="Représentant du service consommateur" name="csr"/> </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 272fcfdae6..5925d28565 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -9,8 +9,8 @@ <menu_item_call label="Mon profil" name="Profile"/> <menu_item_call label="Mon apparence" name="Appearance"/> <menu_item_check label="Mon inventaire" name="Inventory"/> - <menu_item_call label="Afficher l'inventaire dans le panneau latéral" name="ShowSidetrayInventory"/> - <menu_item_call label="Mes gestes" name="Gestures"/> + <menu_item_check label="Mon inventaire" name="ShowSidetrayInventory"/> + <menu_item_check label="Mes gestes" name="Gestures"/> <menu label="Mon statut" name="Status"> <menu_item_call label="Absent" name="Set Away"/> <menu_item_call label="Occupé" name="Set Busy"/> @@ -22,9 +22,8 @@ <menu label="Communiquer" name="Communicate"> <menu_item_call label="Mes amis" name="My Friends"/> <menu_item_call label="Mes groupes" name="My Groups"/> - <menu_item_check label="Chat près de vous" name="Nearby Chat"/> - <menu_item_call label="Personnes près de vous" name="Active Speakers"/> - <menu_item_check label="Média près de vous" name="Nearby Media"/> + <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> <menu label="Monde" name="World"> <menu_item_check label="Mini-carte" name="Mini-Map"/> @@ -32,14 +31,20 @@ <menu_item_call label="Photo" name="Take Snapshot"/> <menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/> <menu label="Profil du lieu" name="Land"> - <menu_item_call label="À propos des terrains" name="About Land"/> + <menu_item_call label="À propos du terrain" name="About Land"/> <menu_item_call label="Région/Domaine" name="Region/Estate"/> </menu> <menu_item_call label="Acheter ce terrain" name="Buy Land"/> <menu_item_call label="Mes terrains" name="My Land"/> <menu label="Afficher" name="LandShow"> <menu_item_check label="Contrôles de mouvement" name="Movement Controls"/> - <menu_item_check label="Contrôles d'affichage" name="Camera Controls"/> + <menu_item_check label="Contrôles d’affichage" name="Camera Controls"/> + <menu_item_check label="Lignes d'interdiction" name="Ban Lines"/> + <menu_item_check label="Balises" name="beacons"/> + <menu_item_check label="Limites du terrain" name="Property Lines"/> + <menu_item_check label="Propriétaires de terrains" name="Land Owners"/> + <menu_item_check label="Coordonnées" name="Coordinates"/> + <menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/> </menu> <menu_item_call label="Me téléporter chez moi" name="Teleport Home"/> <menu_item_call label="Définir le domicile ici" name="Set Home to Here"/> @@ -74,10 +79,12 @@ </menu> <menu_item_call label="Lien" name="Link"/> <menu_item_call label="Annuler le lien" name="Unlink"/> + <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/> <menu_item_call label="Point central sur la sélection" name="Focus on Selection"/> <menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/> <menu label="Objet" name="Object"> - <menu_item_call label="Acheter" name="Menu Object Take"/> + <menu_item_call label="Acheter" name="Menu Object Buy"/> + <menu_item_call label="Prendre" name="Menu Object Take"/> <menu_item_call label="Prendre une copie" name="Take Copy"/> <menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/> <menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/> @@ -90,27 +97,20 @@ <menu_item_call label="Définir les scripts sur Pas d'exécution" name="Set Scripts to Not Running"/> </menu> <menu label="Options" name="Options"> - <menu_item_check label="Modifier les parties reliées" name="Edit Linked Parts"/> <menu_item_call label="Définir les droits de chargement par défaut" name="perm prefs"/> <menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/> - <menu label="Sélection" name="Selection"> - <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/> - <menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/> - <menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/> - </menu> - <menu label="Afficher" name="Show"> - <menu_item_check label="Afficher la sélection masquée" name="Show Hidden Selection"/> - <menu_item_check label="Afficher le rayon lumineux pour la sélection" name="Show Light Radius for Selection"/> - <menu_item_check label="Afficher le faisceau de sélection lumineux" name="Show Selection Beam"/> - </menu> - <menu label="Grille" name="Grid"> - <menu_item_check label="Fixer sur la grille" name="Snap to Grid"/> - <menu_item_call label="Fixer les coordonnées XY de l'objet sur la grille" name="Snap Object XY to Grid"/> - <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/> - <menu_item_call label="Options de la grille" name="Grid Options"/> - </menu> - </menu> - <menu label="Sélectionner les parties reliées" name="Select Linked Parts"> + <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/> + <menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/> + <menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/> + <menu_item_check label="Afficher la sélection masquée" name="Show Hidden Selection"/> + <menu_item_check label="Afficher le rayon lumineux pour la sélection" name="Show Light Radius for Selection"/> + <menu_item_check label="Afficher le faisceau de sélection lumineux" name="Show Selection Beam"/> + <menu_item_check label="Fixer sur la grille" name="Snap to Grid"/> + <menu_item_call label="Fixer les coordonnées XY de l'objet sur la grille" name="Snap Object XY to Grid"/> + <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/> + <menu_item_call label="Options de la grille" name="Grid Options"/> + </menu> + <menu label="Sélectionner les parties liées" name="Select Linked Parts"> <menu_item_call label="Sélectionner la partie suivante" name="Select Next Part"/> <menu_item_call label="Sélectionner la partie précédente" name="Select Previous Part"/> <menu_item_call label="Inclure la partie suivante" name="Include Next Part"/> @@ -127,7 +127,7 @@ <menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/> <menu_item_call label="Refixer les textures" name="Rebake Texture"/> <menu_item_call label="Taille de l'interface par défaut" name="Set UI Size to Default"/> - <menu_item_call label="Définir la taille de la fenêtre..." name="Set Window Size..."/> + <menu_item_call label="Définir la taille de la fenêtre…" name="Set Window Size..."/> <menu_item_check label="Limiter la distance de sélection" name="Limit Select Distance"/> <menu_item_check label="Désactiver les contraintes de la caméra" name="Disable Camera Distance"/> <menu_item_check label="Photo haute résolution" name="HighResSnapshot"/> @@ -152,7 +152,6 @@ <menu_item_check label="Alpha" name="Alpha"/> <menu_item_check label="Arbre" name="Tree"/> <menu_item_check label="Avatars" name="Character"/> - <menu_item_check label="SurfacePath" name="SurfacePath"/> <menu_item_check label="Ciel" name="Sky"/> <menu_item_check label="Eau" name="Water"/> <menu_item_check label="Sol" name="Ground"/> @@ -175,8 +174,8 @@ <menu_item_check label="Exécuter plusieurs threads" name="Run Multiple Threads"/> <menu_item_call label="Effacer le cache du groupe" name="ClearGroupCache"/> <menu_item_check label="Effet de lissage de la souris" name="Mouse Smoothing"/> - <menu_item_check label="Afficher les IM dans le chat près de vous" name="IMInChat"/> <menu label="Raccourcis" name="Shortcuts"> + <menu_item_call label="Image ([COST] L$)..." name="Upload Image"/> <menu_item_check label="Rechercher" name="Search"/> <menu_item_call label="Relâcher les touches" name="Release Keys"/> <menu_item_call label="Taille de l'interface par défaut" name="Set UI Size to Default"/> @@ -219,6 +218,7 @@ <menu_item_check label="Caméra" name="Camera"/> <menu_item_check label="Vent" name="Wind"/> <menu_item_check label="Angle de champ" name="FOV"/> + <menu_item_check label="Badge" name="Badge"/> </menu> <menu label="Afficher les infos" name="Display Info"> <menu_item_check label="Afficher l'heure" name="Show Time"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 6d7aef6389..0fb609d653 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -11,18 +11,29 @@ </global> <template name="okbutton"> <form> - <button name="OK" text="$yestext"/> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> </form> </template> - <template name="okignore"/> <template name="okcancelbuttons"> <form> - <button name="Cancel" text="$notext"/> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> </form> </template> - <template name="okcancelignore"/> <template name="okhelpbuttons"> <form> + <button name="OK_okhelpbuttons" text="$yestext"/> <button name="Help" text="$helptext"/> </form> </template> @@ -30,6 +41,7 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="Message de notification inconnu" name="MissingAlert"> @@ -93,6 +105,10 @@ Veuillez ne sélectionner qu'un seul objet. Enregistrer tous les changements dans les habits/parties du corps ? <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Tout enregistrer"/> </notification> + <notification name="FriendsAndGroupsOnly"> + Les résidents qui ne sont pas vos amis ne sauront pas que vous avez choisi d'ignorer leurs appels et leurs messages instantanés. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Lorsque vous accordez des droits d'édition à un autre résident, vous lui permettez de changer, supprimer ou prendre n'importe lequel de vos objets dans le Monde. Réfléchissez bien avant d'accorder ces droits. Souhaitez-vous accorder des droits d'édition à [FIRST_NAME] [LAST_NAME] ? @@ -154,14 +170,16 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ? Voulez-vous vraiment continuer ? <usetemplate ignoretext="Confirmez avant d'abandonner les éléments joints." name="okcancelignore" notext="Non" yestext="Oui"/> </notification> - <notification name="ClickUnimplemented"> - Désolés, pas encore mis en Å“uvre. - </notification> <notification name="JoinGroupCanAfford"> Rejoindre ce groupe coûte [COST] L$. Voulez-vous continuer ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Rejoindre"/> </notification> + <notification name="JoinGroupNoCost"> + Vous vous apprêtez à rejoindre le groupe [NAME]. +Voulez-vous continuer ? + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Fusionner"/> + </notification> <notification name="JoinGroupCannotAfford"> Rejoindre ce groupe coûte [COST] L$. Vous n'avez pas suffisamment de L$ pour rejoindre ce groupe. @@ -298,7 +316,7 @@ La limite de [MAX_ATTACHMENTS] objets joints a été dépassée. Veuillez commen Vous ne pouvez pas porter cet article car il n'a pas encore été chargé. Veuillez réessayer dans une minute. </notification> <notification name="MustHaveAccountToLogIn"> - Oups! Vous avez oublié de fournir certaines informations. + Zut ! Vous avez oublié de fournir certaines informations. Vous devez saisir le nom et le prénom de votre avatar. Pour entrer dans [SECOND_LIFE], vous devez avoir un compte. Voulez-vous en créer un maintenant ? @@ -328,6 +346,10 @@ Voulez-vous vraiment continuer ? Enregistrer les changements dans l'annonce [NAME] ? <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/> </notification> + <notification name="ClassifiedInsufficientFunds"> + Fonds insuffisants pour créer la petite annonce. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DeleteAvatarPick"> Supprimer le favori [PICK] ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> @@ -423,18 +445,17 @@ L'objet est peut-être inaccessible ou a peut-être été supprimé. Impossible d'écrire le fichier [[FILE]] </notification> <notification name="UnsupportedHardware"> - Avertissement : vous n'avez pas la configuration système requise pour utiliser [APP_NAME]. Si vous continuez à utiliser [APP_NAME], votre performance risque d'être moindre. Malheureusement, la page [SUPPORT_SITE] n'offre aucune assistance pour les problèmes de configuration système. + Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. Malheureusement, la section [SUPPORT_SITE] n'offre aucune aide pour les problèmes de configuration système. -MINSPECS -Voulez-vous visiter [_URL] pour plus d'informations ? +Consulter [_URL] pour en savoir plus ? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=fr </url> <usetemplate ignoretext="Mon matériel n'est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/> </notification> <notification name="UnknownGPU"> - Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas actuellement. -Cela est souvent le cas avec le nouveau matériel qui n'a pas encore été testé avec [APP_NAME]. Vous pourrez probablement utiliser [APP_NAME] sans problème, mais vous devrez peut-être ajuster les paramètres de vos graphiques. + Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas. +Cela est souvent le cas avec le nouveau matériel qui n'a pas encore été testé avec [APP_NAME]. Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques. (Moi > Préférences > Graphiques). <form name="form"> <ignore name="ignore" text="Ma carte graphique ne peut être identifiée"/> @@ -474,14 +495,14 @@ Souhaitez-vous vraiment donner ces objets ? Vous n'êtes pas autorisé à transférer le dossier sélectionné. </notification> <notification name="FreezeAvatar"> - Geler cet avatar ? + Figer cet avatar ? Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde. - <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/> + <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Libérer" yestext="Figer"/> </notification> <notification name="FreezeAvatarFullname"> - Geler [AVATAR_NAME] ? + Figer [AVATAR_NAME] ? Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde. - <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/> + <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Libérer" yestext="Figerf"/> </notification> <notification name="EjectAvatarFullname"> Expulser [AVATAR_NAME] de votre terrain ? @@ -657,7 +678,7 @@ Recherche effectuée : [FINALQUERY] Vos termes de recherche étaient trop courts et aucune recherche n'a été effectuée. </notification> <notification name="CouldNotTeleportReason"> - Impossible de téléporter. + Échec de la téléportation. [REASON] </notification> <notification name="invalid_tport"> @@ -757,14 +778,6 @@ plusieurs parcelles sélectionnées. Essayez de ne sélectionner qu'une seule parcelle. </notification> - <notification name="ParcelCanPlayMedia"> - Cet emplacement propose des flux de média. -Pour jouer des flux de média, il faut avoir une connexion Internet rapide. - -Jouer les flux de média lorsqu'ils sont disponibles ? -(Vous pourrez modifier cette option ultérieurement sous Préférences > Confidentialité.) - <usetemplate name="okcancelbuttons" notext="Désactiver" yestext="Jouer le média"/> - </notification> <notification name="CannotDeedLandWaitingForServer"> Cession du terrain impossible : rapport de propriété sur le point d'être envoyé par le serveur. @@ -886,9 +899,8 @@ Fusionner le terrain ? Cette erreur est généralement temporaire. Veuillez éditer et sauvegarder l'élément endossable à nouveau d'ici quelques minutes. </notification> <notification name="YouHaveBeenLoggedOut"> - Vous avez été déconnecté(e) de [SECOND_LIFE] : + Zut. Vous avez été déconnecté(e) de [SECOND_LIFE] [MESSAGE] -Vous pouvez afficher vos messages instantanés et votre chat en cliquant sur Afficher IM et chat. Sinon, cliquez sur Quitter pour quitter immédiatement [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -1038,6 +1050,7 @@ Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ? </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> La destination que vous avez choisie n'est pas disponible actuellement. @@ -1282,8 +1295,8 @@ Quitter le groupe ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="ConfirmKick"> - Souhaitez-vous vraiment éjecter tous les utilisateurs de la grille ? - <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous"/> + Souhaitez-vous vraiment éjecter tous les résidents de la grille ? + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/> </notification> <notification name="MuteLinden"> Désolé, vous ne pouvez pas ignorer un Linden. @@ -1316,7 +1329,6 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i <notification name="JoinedTooManyGroupsMember"> Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre. [NAME] vous invite à rejoindre un groupe. -[INVITE] <usetemplate name="okcancelbuttons" notext="Refuser" yestext="Rejoindre"/> </notification> <notification name="JoinedTooManyGroups"> @@ -1324,7 +1336,7 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> - Éjecter cet utilisateur avec quel message ? + Éjecter ce résident avec quel message ? <form name="form"> <input name="message"> Un administrateur vous a déconnecté. @@ -1344,20 +1356,20 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i </form> </notification> <notification name="FreezeUser"> - Geler cet utilisateur avec quel message ? + Figer ce résident avec quel message ? <form name="form"> <input name="message"> - Vous avez été gelé. Vous ne pouvez ni bouger ni chatter. Un administrateur va vous envoyer un message instantané (IM). + Vous avez été figé. Vous ne pouvez ni bouger ni chatter. Un administrateur va vous envoyer un message instantané (IM). </input> <button name="OK" text="OK"/> <button name="Cancel" text="Annuler"/> </form> </notification> <notification name="UnFreezeUser"> - Dégeler cet utilisateur avec quel message ? + Libérer ce résident avec quel message ? <form name="form"> <input name="message"> - Vous n'êtes plus gelé. + Vous n'êtes plus figé. </input> <button name="OK" text="OK"/> <button name="Cancel" text="Annuler"/> @@ -1374,7 +1386,7 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i </form> </notification> <notification name="OfferTeleportFromGod"> - Demander au résident de venir vous rejoindre ? + Exiger du résident qu'il vienne vous rejoindre ? <form name="form"> <input name="message"> On se rejoint à [REGION] ? @@ -1384,7 +1396,7 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i </form> </notification> <notification name="TeleportFromLandmark"> - Êtes-vous certain de vouloir être téléporté ? + Souhaitez-vous vraiment vous téléporter vers <nolink>[LOCATION]</nolink> ? <usetemplate ignoretext="Confirmer que je veux me téléporter à un repère" name="okcancelignore" notext="Annuler" yestext="Téléporter"/> </notification> <notification name="TeleportToPick"> @@ -1406,7 +1418,7 @@ Les chats et les messages instantanés ne s'afficheront pas. Les messages i <notification label="Modifier un domaine Linden" name="ChangeLindenEstate"> Vous vous apprêtez à modifier un domaine appartenant aux Lindens (continent, zone réservée aux ados, orientation etc.). -Cela est extrêmement délicat car l'expérience des résidents est en jeu. Sur le continent, cela modifiera des milliers de régions et sera difficile à digérer pour le serveur. +Cela est extrêmement délicat car l'expérience des résidents est en jeu. Sur le continent, cette action modifiera des milliers de régions et sera difficile à digérer pour le serveur. Continuer ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> @@ -1553,7 +1565,7 @@ En cliquant sur Modifier les préférences, vous pourrez changer votre catégori <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NotAllowedToViewNotecard"> - Permissions pour afficher la note insuffisantes. + Droits pour afficher la note insuffisants. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MissingNotecardAssetID"> @@ -1708,9 +1720,9 @@ Déplacer les objets de l'inventaire ? <usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php Conditions d'utilisation] et aux [http://secondlife.com/corporate/cs.php Règles communautaires]. + Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php Conditions d’utilisation] et aux [http://secondlife.com/corporate/cs.php Règles communautaires]. -Lorsqu'elles sont signalées, toutes les infractions font l'objet d'une enquête et sont résolues. Vous pouvez consulter les détails de la résolution d'un incident dans le [http://secondlife.com/support/incidentreport.php Rapport d'incident]. +Lorsqu'elles sont signalées, toutes les infractions font l'objet d'une enquête et sont résolues. </notification> <notification name="HelpReportAbuseSelectCategory"> Veuillez choisir une catégorie pour ce rapport d'infraction. @@ -1964,7 +1976,7 @@ Cela risque d'impacter votre mot de passe. Vous n'avez pas le droit de consulter cette note. </notification> <notification name="RezItemNoPermissions"> - Permissions insuffisantes pour rezzer l'objet. + Droits insuffisants pour rezzer l'objet. </notification> <notification name="UnableToLoadNotecard"> Impossible de lire les données de la note actuellement. @@ -1973,7 +1985,7 @@ Cela risque d'impacter votre mot de passe. Script absent de la base de données. </notification> <notification name="ScriptNoPermissions"> - Permissions insuffisantes pour voir le script. + Droits insuffisants pour voir le script. </notification> <notification name="UnableToLoadScript"> Impossible de charger le script. Merci de réessayer. @@ -2121,8 +2133,8 @@ Les objets non transférables donnés au groupe ont étés supprimés. Les objets sélectionnés sur la parcelle et qui ne sont pas à vous ont été rendus à leurs propriétaires. </notification> <notification name="ServerObjectMessage"> - Message de [NAME] : -[MSG] + Message de [NAME] : +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> Les dégâts sont autorisés sur ce terrain. @@ -2302,7 +2314,6 @@ Veuillez réessayer dans quelques minutes. <form name="form"> <button name="Accept" text="Accepter"/> <button name="Decline" text="Refuser"/> - <button name="Send IM" text="Envoyer IM"/> </form> </notification> <notification name="FriendshipOffered"> @@ -2323,6 +2334,12 @@ Veuillez réessayer dans quelques minutes. <notification name="FriendshipDeclined"> [NAME] a refusé votre amitié. </notification> + <notification name="FriendshipAcceptedByMe"> + Amitié acceptée. + </notification> + <notification name="FriendshipDeclinedByMe"> + Amitié refusée. + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] vous offre sa carte de visite. Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d'envoyer rapidement un IM à ce résident. @@ -2398,7 +2415,7 @@ Accepter cette requête ? </form> </notification> <notification name="ScriptToast"> - [FIRST] [LAST]'s '[TITLE]' demande la participation de l'utilisateur. + Le/La [TITLE] de [FIRST] [LAST] demande la participation du résident. <form name="form"> <button name="Open" text="Ouvrir la boîte de dialogue"/> <button name="Ignore" text="Ignorer"/> @@ -2531,7 +2548,7 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité. </notification> <notification name="ConfirmCloseAll"> Êtes-vous certain de vouloir fermer tous les IM ? - <usetemplate name="okcancelignore" notext="Annuler" yestext="OK"/> + <usetemplate ignoretext="Confirmer avant de fermer tous les IM." name="okcancelignore" notext="Annuler" yestext="OK"/> </notification> <notification name="AttachmentSaved"> L'élément joint a été sauvegardé. diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml index b3fac96250..d3e4afd6ee 100644 --- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml @@ -7,6 +7,11 @@ Affiche/Masque le panneau de contrôle vocal </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Parler" label_selected="Parler" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..5b6d37ce00 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml index d317e35d2f..e064846c48 100644 --- a/indra/newview/skins/default/xui/fr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml @@ -6,18 +6,49 @@ <panel.string name="type_pg"> Contenu Général </panel.string> + <panel.string name="l$_price"> + [PRICE] L$ + </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] téléporter, [MAP] carte, [PROFILE] profil + </panel.string> + <panel.string name="date_fmt"> + [day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + Activé + </panel.string> + <panel.string name="auto_renew_off"> + Désactivé + </panel.string> <text name="title" value="Infos sur la petite annonce"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[name]"/> - <text name="classified_location" value="[loading...]"/> - <text name="content_type" value="[content type]"/> - <text name="category" value="[category]"/> - <check_box label="Renouvellement automatique toutes les semaines" name="auto_renew"/> - <text name="price_for_listing" tool_tip="Coût de l'annonce."> - [PRICE] L$ - </text> - <text name="classified_desc" value="[description]"/> + <text_editor name="classified_name" value="[name]"/> + <text name="classified_location_label" value="Emplacement :"/> + <text_editor name="classified_location" value="[loading...]"/> + <text name="content_type_label" value="Type de contenu :"/> + <text_editor name="content_type" value="[content type]"/> + <text name="category_label" value="Catégorie :"/> + <text_editor name="category" value="[category]"/> + <text name="creation_date_label" value="Date de création :"/> + <text_editor name="creation_date" tool_tip="Date de création" value="[date]"/> + <text name="price_for_listing_label" value="Coût de l'annonce :"/> + <text_editor name="price_for_listing" tool_tip="Coût de l'annonce." value="[prix]"/> + <layout_stack name="descr_stack"> + <layout_panel name="clickthrough_layout_panel"> + <text name="click_through_label" value="Clics :"/> + <text_editor name="click_through_text" tool_tip="Parcourir les données en cliquant" value="[clics]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="Renouvellement automatique :"/> + <text name="auto_renew" value="Activé"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="Description :"/> + <text_editor name="classified_desc" value="[description]"/> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml index 1f44f2fe09..9ea7ff8122 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> (mise à jour après l'enregistrement) </panel.string> + <string name="publish_label"> + Publier + </string> + <string name="save_label"> + Enregistrer + </string> <text name="title"> Modifier la petite annonce </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <icon label="" name="edit_icon" tool_tip="Cliquez pour sélectionner une image"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="Cliquer pour sélectionner une image"/> + </panel> <text name="Name:"> Titre : </text> @@ -22,20 +30,19 @@ en cours de chargement... </text> <button label="Définir sur l'emplacement actuel" name="set_to_curr_location_btn"/> - <combo_box name="content_type"> - <combo_item name="mature_ci"> - Contenu Modéré - </combo_item> - <combo_item name="pg_ci"> - Contenu Général - </combo_item> - </combo_box> + <text name="category_label" value="Catégorie :"/> + <text name="content_type_label" value="Type de contenu :"/> + <icons_combo_box label="Contenu Général" name="content_type"> + <icons_combo_box.item label="Contenu Modéré" name="mature_ci" value="Mature"/> + <icons_combo_box.item label="Contenu Général" name="pg_ci" value="PG"/> + </icons_combo_box> + <text name="price_for_listing_label" value="Coût de l'annonce :"/> <spinner label="L$" name="price_for_listing" tool_tip="Coût de l'annonce." value="50"/> <check_box label="Renouvellement automatique toutes les semaines" name="auto_renew"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="Enregistrer" name="save_changes_btn"/> + <button label="[LABEL]" name="save_changes_btn"/> <button label="Annuler" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml index 24cf7844b5..7c8365fdee 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml @@ -33,7 +33,7 @@ <icon label="" name="2nd_life_edit_icon" tool_tip="Cliquez pour sélectionner une image"/> </panel> <panel name="first_life_image_panel"> - <text name="real_world_photo_title_text" value="Monde physique :"/> + <text name="real_world_photo_title_text" value="Vie réelle :"/> </panel> <icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/> <text name="title_homepage_text"> @@ -42,18 +42,18 @@ <line_editor name="homepage_edit" value="http://"/> <check_box label="Afficher dans les résultats de recherche" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="Mon compte :"/> + <text_editor name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/> <text name="my_account_link" value="[[URL] Accéder à ma Page d'accueil]"/> - <text name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/> <text name="title_partner_text" value="Mon partenaire :"/> - <text name="partner_edit_link" value="[[URL] Modifier]"/> <panel name="partner_data_panel"> - <name_box name="partner_text" value="[FIRST] [LAST]"/> + <name_box initial_value="(récupération en cours)" name="partner_text" value="[FIRST] [LAST]"/> </panel> + <text name="partner_edit_link" value="[[URL] Modifier]"/> </panel> </panel> </scroll_container> <panel name="profile_me_buttons_panel"> - <button label="Enregistrer les changements" width="166" name="save_btn"/> + <button label="Enregistrer les changements" name="save_btn" width="166"/> <button label="Annuler" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml index 6323462877..90dcae18ec 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml @@ -5,6 +5,6 @@ <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> - <accordion_tab name="underpants_main_tab" title="Sous-vêtements (femme)"/> + <accordion_tab name="underpants_main_tab" title="Caleçon"/> </accordion> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml index 5af733d8a2..950cdd7639 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml @@ -5,6 +5,6 @@ <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> - <accordion_tab name="undershirt_main_tab" title="Sous-vêtements (homme)"/> + <accordion_tab name="undershirt_main_tab" title="Débardeur"/> </accordion> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml index c6ab686b0e..75b6c044f6 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -96,6 +96,6 @@ </panel> <panel name="button_panel"> <button label="Enregistrer sous" name="save_as_button"/> - <button label="Annuler modification" width="130" name="revert_button"/> + <button label="Rétablir" width="130" name="revert_button"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml index 10ec952aa3..ad9e3daf3d 100644 --- a/indra/newview/skins/default/xui/fr/panel_friends.xml +++ b/indra/newview/skins/default/xui/fr/panel_friends.xml @@ -16,5 +16,5 @@ <button label="Téléporter" name="offer_teleport_btn" tool_tip="Proposez à cet ami d'être téléporté là où vous êtes"/> <button label="Payer" name="pay_btn" tool_tip="Donnez des L$ à cet ami"/> <button label="Supprimer" name="remove_btn" tool_tip="Supprimez ce résident de votre liste d'amis"/> - <button label="Ajouter" name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/> + <button label="Ajouter" name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml index f0b242c6a1..cf71a28451 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml @@ -11,27 +11,45 @@ Faites glisser le pointeur de la souris sur les options pour en savoir plus. <panel.string name="incomplete_member_data_str"> Extraction des données du résident en cours </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Cliquez pour sélectionner une image"/> + <text name="prepend_founded_by"> + Fondateur : + </text> + <name_box initial_value="(récupération en cours)" name="founder_name"/> + <text name="join_cost_text"> + Gratuit + </text> + <button label="REJOINDRE" name="btn_join"/> + </panel> <text_editor name="charter"> Indiquez ici la charte de votre groupe </text_editor> <name_list name="visible_members"> <name_list.columns label="Membre" name="name" relwidth="0.40"/> <name_list.columns label="Titre" name="title" relwidth="0.25"/> + <name_list.columns label="Statut" name="status"/> </name_list> + <text name="my_group_settngs_label"> + Moi + </text> <text name="active_title_label"> - Mon titre + Mon titre : </text> <combo_box name="active_title" tool_tip="Indique le titre qui apparaît en face du nom de votre avatar lorsque votre groupe est actif."/> <check_box label="Recevoir les notices du groupe" name="receive_notices" tool_tip="Indique si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/> <check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez afficher ce groupe dans votre profil"/> <panel name="preferences_container"> - <check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si ce groupe autorise les nouveaux membres à le rejoindre sans y être invités."/> - <check_box label="Frais d'inscription" name="check_enrollment_fee" tool_tip="Indique s'il faut payer des frais d'inscription pour rejoindre ce groupe"/> + <text name="group_settngs_label"> + Groupe + </text> + <check_box label="Inscription ouverte à tous" name="open_enrollement" tool_tip="Indique si ce groupe autorise les nouveaux membres à le rejoindre sans y être invités."/> + <check_box label="Inscription payante" name="check_enrollment_fee" tool_tip="Indique s'il faut payer des frais d'inscription pour rejoindre ce groupe"/> <spinner label="L$" name="spin_enrollment_fee" tool_tip="Les nouveaux membres doivent payer ces frais pour rejoindre le groupe quand l'option Frais d'inscription est cochée."/> - <check_box initial_value="true" label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Permettre aux autres résidents de voir ce groupe dans les résultats de recherche"/> <combo_box name="group_mature_check" tool_tip="Définit si votre groupe contient des informations de type Modéré" width="195"> <combo_box.item label="Contenu Général" name="pg"/> <combo_box.item label="Contenu Modéré" name="mature"/> </combo_box> + <check_box initial_value="true" label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Permettre aux autres résidents de voir ce groupe dans les résultats de recherche"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml index 8207fd7735..5b08b4aefb 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Profil du groupe" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - Certaines modifications sur cet onglet n'ont pas été enregistrées. + Certaines modifications n'ont pas été enregistrées. </panel.string> <panel.string name="want_apply_text"> Voulez-vous enregistrer ces modifications ? @@ -12,27 +12,24 @@ <panel.string name="group_join_free"> Gratuit </panel.string> - <text name="group_name" value="(en cours de chargement...)"/> - <line_editor label="Saisissez le nom du groupe ici" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="Cliquez pour sélectionner une image"/> - <text name="prepend_founded_by"> - Fondateur : - </text> - <name_box initial_value="(récupération en cours)" name="founder_name"/> - <text name="join_cost_text"> - Gratuit - </text> - <button label="REJOINDRE" name="btn_join"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="Général"/> - <accordion_tab name="group_roles_tab" title="Rôles"/> - <accordion_tab name="group_notices_tab" title="Notices"/> - <accordion_tab name="group_land_tab" title="Terrain/Actifs"/> - </accordion> - <panel name="button_row"> - <button label="Créer" label_selected="Nouveau groupe" name="btn_create"/> - <button label="Chat de groupe" name="btn_chat"/> - <button label="Appel de groupe" width="100" name="btn_call"/> - <button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/> + <panel name="group_info_top"> + <text name="group_name" value="(en cours de chargement...)"/> + <line_editor label="Saisissez le nom du groupe ici" name="group_name_editor"/> </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="Général"/> + <accordion_tab name="group_roles_tab" title="Rôles"/> + <accordion_tab name="group_notices_tab" title="Notices"/> + <accordion_tab name="group_land_tab" title="Terrain/Actifs"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Chat" name="btn_chat"/> + <button label="Appel de groupe" name="btn_call" tool_tip="Appeler ce groupe"/> + <button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/> + <button label="Créer un groupe" name="btn_create" tool_tip="Créer un groupe"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index 02b14cb859..a10eaf9d18 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml @@ -1,65 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terrain et L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> Vous n'avez pas la permission de voir quel terrain possède ce groupe - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> Vous n'avez pas la permission d'accéder aux informations financières de ce groupe. - </string> - <string name="loading_txt"> + </panel.string> + <panel.string name="loading_txt"> Chargement... - </string> - <text name="group_land_heading"> - Terrain du groupe - </text> - <scroll_list name="group_parcel_list" width="310"> - <column label="Parcelle" name="name" width="76" /> - <column label="Région" name="location" width="78" /> - <column label="Type" name="type" width="70" /> - <column label="Surface" name="area" width="50" /> - <column label="" name="hidden" width="-1" /> - </scroll_list> - <button label="Carte" label_selected="Carte" name="map_button"/> - <text name="total_contributed_land_label"> - Total des contributions : - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <text name="total_land_in_use_label"> - Superficie déjà utilisée : - </text> - <text name="total_land_in_use_value"> - [AREA] m² - </text> - <text name="land_available_label"> - Superficie disponible : - </text> - <text name="land_available_value"> - [AREA] m² - </text> - <text name="your_contribution_label"> - Votre contribution : - </text> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> Impossible de définir votre don de terrain - </string> - <text name="your_contribution_units"> - m² - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] max.) - </text> - <text name="group_over_limit_text"> - Une contribution supplémentaire est requise pour prendre en charge le terrain utilisé - </text> - <text name="group_money_heading"> - Finances - </text> + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Parcelle" name="name"/> + <scroll_list.columns label="Région" name="location"/> + <scroll_list.columns label="Type" name="type"/> + <scroll_list.columns label="Surface" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Total des contributions : + </text> + <text name="total_contributed_land_value"> + [AREA] m² + </text> + <button label="Carte" label_selected="Carte" name="map_button"/> + <text name="total_land_in_use_label"> + Superficie déjà utilisée : + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + Superficie disponible : + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Votre contribution : + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([AMOUNT] max.) + </text> + <text name="group_over_limit_text"> + Une contribution supplémentaire est requise pour prendre en charge le terrain utilisé + </text> + <text name="group_money_heading"> + Finances + </text> + </panel> <tab_container name="group_money_tab_container"> <panel label="PLANIFICATION" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml index 68c74f9322..35a5caaa92 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml @@ -10,7 +10,7 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. </panel.string> <text name="lbl2"> Les notices sont conservées pendant 14 jours. -200 maximum par groupe et par jour +200 max. par groupe et par jour. </text> <scroll_list name="notice_list"> <scroll_list.columns label="" name="icon"/> @@ -30,19 +30,19 @@ Vous pouvez désactiver la réception des notices dans l'onglet Général. <text name="lbl3"> Sujet : </text> - <line_editor name="create_subject" /> - <text name="lbl4"> + <line_editor name="create_subject"/> + <text name="lbl4"> Message : </text> <text_editor name="create_message"/> - <text name="lbl5" > + <text name="lbl5"> Pièce-jointe : </text> <line_editor name="create_inventory_name"/> <text name="string"> Faire glisser l'objet et le déposer ici pour le joindre : </text> - <button label="Supprimer" label_selected="Supprimer pièce-jointe" name="remove_attachment"/> + <button label="Supprimer" label_selected="Supprimer pièce-jointe" name="remove_attachment" tool_tip="Supprimer la pièce jointe de votre notification"/> <button label="Envoyer" label_selected="Envoyer" left="200" name="send_notice" width="100"/> <group_drop_target name="drop_target" tool_tip="Faites glisser un objet de l'inventaire jusqu'à cette case pour l'envoyer avec la notice. Vous devez avoir l'autorisation de copier et transférer l'objet pour pouvoir le joindre."/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml index 400d4d6aee..e1eeaa8601 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Membres et rôles" name="roles_tab"> <panel.string name="default_needs_apply_text"> - Certaines modifications sur cet onglet n'ont pas été enregistrées. + Certaines modifications n'ont pas été enregistrées. </panel.string> <panel.string name="want_apply_text"> Voulez-vous enregistrer vos modifications ? @@ -15,10 +15,10 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to <filter_editor label="Filtrer les membres" name="filter_input"/> <name_list name="member_list"> <name_list.columns label="Membre" name="name"/> - <name_list.columns label="Donation" name="donated" width="116"/> - <name_list.columns label="Statut" name="online" width="136"/> + <name_list.columns label="Donation" name="donated"/> + <name_list.columns label="Statut" name="online"/> </name_list> - <button label="Inviter" name="member_invite" width="165"/> + <button label="Inviter" name="member_invite"/> <button label="Expulser" name="member_eject"/> </panel> <panel label="RÔLES" name="roles_sub_tab"> @@ -47,7 +47,7 @@ notamment les rôles Tous et Propriétaire. <scroll_list.columns label="#" name="members"/> </scroll_list> <button label="Nouveau rôle" name="role_create"/> - <button label="Supprimer le rôle" width="120" name="role_delete"/> + <button label="Supprimer le rôle" name="role_delete"/> </panel> <panel height="148" label="POUVOIRS" name="actions_sub_tab" tool_tip="Vous pouvez afficher une description du pouvoir et voir quels membres et rôles peuvent s'en servir."> <panel.string name="help_text"> diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml index 0590ed0f1b..1f2169e22c 100644 --- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml @@ -9,11 +9,14 @@ <button label="Devenir amis" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Téléporter" name="teleport_btn"/> + <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> diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml index a2f82c72df..4001616034 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml @@ -13,7 +13,7 @@ Aucune information sur ce lieu n'est disponible actuellement, veuillez réessayer ultérieurement. </string> <string name="server_forbidden_text"> - Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos permissions avec le propriétaire de la parcelle. + Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle. </string> <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml index c4e90bed61..9c15b0bbd3 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Barre des Favoris"/> - <accordion_tab name="tab_landmarks" title="Repères"/> + <accordion_tab name="tab_landmarks" title="Mes repères"/> <accordion_tab name="tab_inventory" title="Mon inventaire"/> <accordion_tab name="tab_library" title="Bibliothèque"/> </accordion> diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml index 75648d3541..209a803e07 100644 --- a/indra/newview/skins/default/xui/fr/panel_login.xml +++ b/indra/newview/skins/default/xui/fr/panel_login.xml @@ -19,7 +19,7 @@ <text name="password_text"> Mot de passe : </text> - <check_box label="Rappel" name="remember_check"/> + <check_box label="Enregistrer" name="remember_check"/> <text name="start_location_text"> Commencer à : </text> diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index 5dc9042205..5faba01339 100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml @@ -42,8 +42,8 @@ <menu_item_call label="Nouvelle veste" name="New Jacket"/> <menu_item_call label="Nouvelle jupe" name="New Skirt"/> <menu_item_call label="Nouveaux gants" name="New Gloves"/> - <menu_item_call label="Nouveaux sous-vêtements (homme)" name="New Undershirt"/> - <menu_item_call label="Nouveaux sous-vêtements (femme)" name="New Underpants"/> + <menu_item_call label="Nouveau débardeur" name="New Undershirt"/> + <menu_item_call label="Nouveau caleçon" name="New Underpants"/> <menu_item_call label="Nouvel alpha" name="New Alpha"/> <menu_item_call label="Nouveau tatouage" name="New Tattoo"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index c9d77c208f..2521967bc6 100644 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Mon profil" name="panel_me"> <tab_container name="tabs"> - <panel label="PROFIL" name="panel_profile"/> - <panel label="FAVORIS" name="panel_picks"/> + <panel label="MON PROFIL" name="panel_profile"/> + <panel label="MES PRÉFÉRENCES" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_my_profile.xml b/indra/newview/skins/default/xui/fr/panel_my_profile.xml index bbf760466a..ce2e5f4c60 100644 --- a/indra/newview/skins/default/xui/fr/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_my_profile.xml @@ -26,15 +26,18 @@ </panel> <panel name="first_life_image_panel"> <icon label="" name="real_world_edit_icon" tool_tip="Cliquez sur le bouton Modifier le profil ci-dessous pour changer d'image"/> - <text name="title_rw_descr_text" value="Monde physique :"/> + <text name="title_rw_descr_text" value="Vie réelle :"/> </panel> <text name="title_member_text" value="Résident depuis :"/> <text name="title_acc_status_text" value="Statut du compte :"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> Résident. Aucune info de paiement enregistrée. Linden. - </text> + </text_editor> <text name="title_partner_text" value="Partenaire :"/> + <panel name="partner_data_panel"> + <name_box initial_value="(récupération en cours)" name="partner_text"/> + </panel> <text name="title_groups_text" value="Groupes :"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml index 7b89a2b686..45caf2323d 100644 --- a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <button name="back_btn" tool_tip="Revenir à l'emplacement précédent"/> - <button name="forward_btn" tool_tip="Avancer d'un emplacement"/> + <pull_button name="back_btn" tool_tip="Revenir à l'emplacement précédent"/> + <pull_button name="forward_btn" tool_tip="Avancer d'un emplacement"/> <button name="home_btn" tool_tip="Me téléporter jusqu'à mon domicile"/> <location_input label="Emplacement" name="location_combo"/> <search_combo_box label="Rechercher" name="search_combo_box" tool_tip="Rechercher"> <combo_editor label="Rechercher dans [SECOND_LIFE]" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite"> + <favorites_bar name="favorite" tool_tip="Faites glisser des repères ici pour un accès rapide à vos lieux favoris dans Second Life."> + <label name="favorites_bar_label" tool_tip="Faites glisser des repères ici pour un accès rapide à vos lieux favoris dans Second Life."> + Favoris + </label> <chevron_button name=">>" tool_tip="Afficher d'avantage de Favoris"/> </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml index f1a7ebb35c..b506a202bd 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml @@ -4,6 +4,6 @@ <panel name="chat_caption"> <text name="sender_name" -width="170">CHAT PRÈS DE VOUS</text> +width="170">CHAT PRÈS DE MOI</text> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml index 8ed441cbae..82cdf292ab 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <string name="min_width"> - 192 - </string> - <string name="max_width"> - 320 - </string> <line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/> <button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml new file mode 100644 index 0000000000..71e65232aa --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <vide> + </string> + <string name="parcel_media_name"> + Flux de média de la parcelle + </string> + <string name="parcel_audio_name"> + Flux audio de la parcelle + </string> + <string name="playing_suffix"> + (lecture en cours) + </string> + <panel name="minimized_controls"> + <button label="Tout arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias près de vous"/> + <button label="Tout lancer" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias près de vous"/> + <button name="open_prefs_btn" tool_tip="Ouvrir les préférences de média"/> + <button label="Plus >>" label_selected="Moins <<" name="more_less_btn" tool_tip="Options avancées"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Tout" name="All"/> + <combo_box.item label="Dans cette parcelle" name="WithinParcel"/> + <combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="Proximité" name="media_proximity"/> + <scroll_list.columns label="Visible" name="media_visibility"/> + <scroll_list.columns label="Classe" name="media_class"/> + <scroll_list.columns label="Nom" name="media_name"/> + <scroll_list.columns label="Débogage" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Arrêter le média sélectionné"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Jouer le média sélectionné"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pauser le média sélectionné"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume audio pour le média sélectionné"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Couper l'audio sur le média sélectionné"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Zoomer en avant sur le média sélectionné"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Zoomer en arrière sur le média sélectionné"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml index ba052a0e07..f4e4f8a4ab 100644 --- a/indra/newview/skins/default/xui/fr/panel_notes.xml +++ b/indra/newview/skins/default/xui/fr/panel_notes.xml @@ -13,7 +13,7 @@ </scroll_container> </layout_panel> <layout_panel name="notes_buttons_panel"> - <button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/> + <button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/> <button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/> <button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/> <button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/> diff --git a/indra/newview/skins/default/xui/fr/panel_online_status.xml b/indra/newview/skins/default/xui/fr/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml index 3447d54cf8..9b9d830aaf 100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml @@ -2,7 +2,7 @@ <panel label="Choses" name="Outfits"> <tab_container name="appearance_tabs"> <inventory_panel label="MES TENUES" name="outfitslist_tab"/> - <inventory_panel label="TENUE" name="cof_accordionpanel"/> + <inventory_panel label="PORTÉ" name="cof_tab"/> </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index 408a7e67d7..8d17d9ffdf 100644 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml @@ -5,9 +5,10 @@ <string name="no_one_near" value="Personne près de vous"/> <string name="no_friends_online" value="Pas d'amis connectés"/> <string name="no_friends" value="Pas d'amis"/> - <string name="no_groups" value="Pas de groupes"/> <string name="people_filter_label" value="Filtrer les personnes"/> <string name="groups_filter_label" value="Filtrer les groupes"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Trouver le groupe via la recherche ?]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Rechercher des groupes à rejoindre.]"/> <filter_editor label="Filtre" name="filter_input"/> <tab_container name="tabs"> <panel label="PRÈS DE VOUS" name="nearby_panel"> @@ -16,18 +17,22 @@ <button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d'amis"/> </panel> </panel> - <panel label="AMIS" name="friends_panel"> + <panel label="MES AMIS" name="friends_panel"> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="En ligne"/> <accordion_tab name="tab_all" title="Tout"/> </accordion> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Options"/> - <button name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/> + <button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/> <button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d'amis"/> </panel> + <text name="no_friends_msg"> + Pour ajouter des amis, utilisez la [secondlife:///app/search/people recherche] ou cliquez-droit sur le résident à ajouter comme ami. +Si vous souhaitez rencontrer d'autres résidents, cliquez sur [secondlife:///app/worldmap la carte]. + </text> </panel> - <panel label="GROUPES" name="groups_panel"> + <panel label="MES GROUPES" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="groups_viewsort_btn" tool_tip="Options"/> <button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/> @@ -47,8 +52,8 @@ <button label="Appeler" name="call_btn" tool_tip="Appeler ce résident"/> <button label="Partager" name="share_btn"/> <button label="Téléporter" name="teleport_btn" tool_tip="Proposez une téléportation"/> - <button label="Profil du groupe" name="group_info_btn" tool_tip="Voir le profil du groupe"/> - <button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/> - <button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/> + <button label="Profil" name="group_info_btn" tool_tip="Voir le profil du groupe"/> + <button label="Chat" name="chat_btn" tool_tip="Ouvrir une session de chat"/> + <button label="Appel" name="group_call_btn" tool_tip="Appeler ce groupe"/> </panel> </panel> 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 7ff796a61f..f2bdb3d745 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="disponible"/> <string name="allocated" value="affecté"/> <string name="title_place" value="Profil du lieu"/> - <string name="title_teleport_history" value="Emplacement de l'historique des téléportations"/> + <string name="title_teleport_history" value="Historique des téléportations"/> <string name="not_available" value="(s/o)"/> <string name="unknown" value="(inconnu)"/> <string name="public" value="(public)"/> @@ -36,7 +36,7 @@ Aucune information sur ce lieu n'est disponible actuellement, veuillez réessayer ultérieurement. </string> <string name="server_forbidden_text"> - Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos permissions auprès du propriétaire de la parcelle. + Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos droits auprès du propriétaire de la parcelle. </string> <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] @@ -68,59 +68,59 @@ <text name="maturity_value" value="(inconnu)"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcelle"> - <panel> - <text name="rating_label" value="Catégorie :"/> - <text name="rating_value" value="(inconnu)"/> - <text name="voice_label" value="Voix :"/> - <text name="voice_value" value="Activée"/> - <text name="fly_label" value="Voler :"/> + <panel name="parcel_characteristics_panel"> + <text name="rating_label" value="Catégorie :"/> + <text name="rating_value" value="inconnu"/> + <text name="voice_label" value="Voix :"/> + <text name="voice_value" value="Activé"/> + <text name="fly_label" value="Voler :"/> <text name="fly_value" value="Activé"/> - <text name="push_label" value="Appuyer :"/> + <text name="push_label" value="Pousser :"/> <text name="push_value" value="Désactivé"/> - <text name="build_label" value="Construire :"/> + <text name="build_label" value="Construire :"/> <text name="build_value" value="Activé"/> - <text name="scripts_label" value="Scripts :"/> - <text name="scripts_value" value="Activés"/> - <text name="damage_label" value="Dégâts :"/> - <text name="damage_value" value="Désactivés"/> - <button label="À propos des terrains" name="about_land_btn"/> + <text name="scripts_label" value="Scripts :"/> + <text name="scripts_value" value="Activé"/> + <text name="damage_label" value="Dégâts :"/> + <text name="damage_value" value="Désactivé"/> + <button label="À propos du terrain" name="about_land_btn"/> </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Région"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Région :"/> <text name="region_name" value="Pays des orignaux"/> - <text name="region_type_label" value="Type :"/> + <text name="region_type_label" value="Type :"/> <text name="region_type" value="Orignal"/> - <text name="region_rating_label" value="Catégorie :"/> + <text name="region_rating_label" value="Catégorie :"/> <text name="region_rating" value="Adulte"/> - <text name="region_owner_label" value="Propriétaire :"/> + <text name="region_owner_label" value="Propriétaire :"/> <text name="region_owner" value="orignal Van Orignal"/> - <text name="region_group_label" value="Groupe :"/> + <text name="region_group_label" value="Groupe :"/> <text name="region_group"> - Le puissant orignal d'Orignalville + Le puissant orignal d’Orignalville </text> <button label="Région/Domaine" name="region_info_btn"/> </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Domaine"> - <panel> - <text name="estate_name_label" value="Domaine :"/> - <text name="estate_rating_label" value="Catégorie :"/> - <text name="estate_owner_label" value="Propriétaire :"/> - <text name="covenant_label" value="Règlement :"/> + <panel name="estate_information_panel"> + <text name="estate_name_label" value="Domaine :"/> + <text name="estate_rating_label" value="Catégorie :"/> + <text name="estate_owner_label" value="Propriétaire :"/> + <text name="covenant_label" value="Règlement :"/> </panel> </accordion_tab> <accordion_tab name="sales_tab" title="À vendre"> - <panel> - <text name="sales_price_label" value="Prix :"/> + <panel name="sales_panel"> + <text name="sales_price_label" value="Prix :"/> <text name="area_label" value="Surface :"/> <text name="traffic_label" value="Trafic :"/> <text name="primitives_label" value="Prims :"/> - <text name="parcel_scripts_label" value="Scripts :"/> - <text name="terraform_limits_label" value="Limites de terraformage :"/> - <text name="subdivide_label" value="Possibilité de division/fusion :"/> - <text name="resale_label" value="Possibilité de revente :"/> + <text name="parcel_scripts_label" value="Scripts :"/> + <text name="terraform_limits_label" value="Limites de terraformage :"/> + <text name="subdivide_label" value="Possibilité de sous-division/fusion :"/> + <text name="resale_label" value="Possibilité de revente :"/> <text name="sale_to_label" value="À vendre à :"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index 3cea86a3e4..f0c40d7e92 100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml @@ -2,14 +2,14 @@ <panel label="Lieux" name="places panel"> <string name="landmarks_tab_title" value="MES REPÈRES"/> <string name="teleport_history_tab_title" value="HISTORIQUE DES TÉLÉPORTATIONS"/> - <filter_editor label="Filtrer les lieux" name="Filter"/> + <filter_editor label="Filtrer les endroits" name="Filter"/> <panel name="button_panel"> <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> <button label="Carte" name="map_btn"/> <button label="Éditer" name="edit_btn" tool_tip="Modifier les informations du repère"/> - <button name="overflow_btn" tool_tip="Afficher d'autres options"/> - <button label="Fermer" name="close_btn"/> - <button label="Annuler" name="cancel_btn"/> + <button label="â–¼" name="overflow_btn" tool_tip="Afficher d'autres options"/> <button label="Enregistrer" name="save_btn"/> + <button label="Annuler" name="cancel_btn"/> + <button label="Fermer" name="close_btn"/> </panel> </panel> 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 0c0cc29e7a..b47ed4bd8b 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -1,48 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> +<panel label="Avancées" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Bulles de chat" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Choisir la couleur des bulles de chat"/> - <slider label="Opacité" name="bubble_chat_opacity"/> - <text width="140" name="AspectRatioLabel1" tool_tip="largeur/hauteur"> - Rapport hauteur/largeur - </text> - <combo_box name="aspect_ratio" tool_tip="largeur/hauteur"> - <combo_box.item label="4:3 (Standard CRT)" name="item1"/> - <combo_box.item label="5:4 (1280 x 1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (écran large)" name="item3"/> - <combo_box.item label="16:9 (plein écran)" name="item4"/> - </combo_box> - <check_box label="Détection automatique" name="aspect_auto_detect"/> - <text name="heading1"> - Caméra : - </text> <slider label="Angle de vue" name="camera_fov"/> <slider label="Distance" name="camera_offset_scale"/> <text name="heading2"> - Positionnement automatique pour : + Positionnement automatique pour : </text> <check_box label="Construire/Éditer" name="edit_camera_movement" tool_tip="Utilisez le positionnement automatique de la caméra quand vous accédez au mode de modification et quand vous le quittez"/> <check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra quand je suis en mode Édition"/> - <text name="heading3"> - Avatars : - </text> <check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/> <check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/> <check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/> <check_box label="Faire bouger les lèvres de l'avatar quand il parle" name="enable_lip_sync"/> - <check_box label="Afficher les erreurs de script" name="show_script_errors"/> + <check_box label="Bulles de chat" name="bubble_text_chat"/> + <slider label="Opacité" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Choisir la couleur des bulles de chat"/> + <check_box label="Afficher les erreurs de script dans :" name="show_script_errors"/> <radio_group name="show_location"> - <radio_item label="En chat" name="0"/> - <radio_item label="Dans une fenêtre" name="1"/> + <radio_item label="Chat près de moi" name="0"/> + <radio_item label="Autre fenêtre" name="1"/> </radio_group> - <check_box label="Basculer le mode micro quand j'appuie sur la touche de contrôle de la fonction Parler :" name="push_to_talk_toggle_check" tool_tip="En mode bascule, appuyez une fois sur la touche de contrôle de la fonction, puis relâchez-la pour activer/désactiver votre micro. Si vous n'êtes pas en mode bascule, le micro ne diffuse votre voix que quand vous maintenez la touche de contrôle de la fonction enfoncée."/> + <check_box label="Activer/désactiver la fonction Parler quand j'appuie sur :" name="push_to_talk_toggle_check" tool_tip="En mode bascule, appuyez une fois sur la touche de contrôle de la fonction, puis relâchez-la pour activer/désactiver votre micro. Si vous n'êtes pas en mode bascule, le micro ne diffuse votre voix que quand vous maintenez la touche de contrôle de la fonction enfoncée."/> <line_editor label="Touche de contrôle de la fonction Appuyer pour parler" name="modifier_combo"/> <button label="Définir la touche" name="set_voice_hotkey_button"/> - <button label="Bouton central de la souris" name="set_voice_middlemouse_button"/> + <button label="Bouton central de la souris" name="set_voice_middlemouse_button" tool_tip="Réinitialiser sur le bouton central de la souris"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml index 73f4e1e2bd..901a92ed1b 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml @@ -6,9 +6,9 @@ <check_box label="Quand je dépense ou que je reçois des L$" name="notify_money_change_checkbox"/> <check_box label="Quand mes amis se connectent ou se déconnectent" name="friends_online_notify_checkbox"/> <text name="show_label"> - Toujours afficher ces notifications : + Toujours afficher : </text> <text name="dont_show_label"> - Ne jamais afficher ces notifications : + Ne jamais afficher : </text> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 25a8e3b6d4..7e6e96aa49 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat écrit" name="chat"> + <text name="font_size"> + Taille de la police : + </text> <radio_group name="chat_font_size"> - <radio_item label="Moins" name="radio" value="0"/> + <radio_item label="Petite" name="radio" value="0"/> <radio_item label="Moyenne" name="radio2" value="1"/> - <radio_item label="Plus" name="radio3" value="2"/> + <radio_item label="Grande" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Couleurs de police : + </text> <color_swatch label="Vous" name="user"/> <text name="text_box1"> Moi @@ -42,6 +48,6 @@ <check_box label="Activer l'historique des chats en texte brut" name="plain_text_chat_history"/> <radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)"> <radio_item label="Plusieurs fenêtres" name="radio" value="0"/> - <radio_item label="Une fenêtre" name="radio2" value="1"/> + <radio_item label="Onglets" name="radio2" value="1"/> </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index b359cf56d8..8e8ee26af4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -44,17 +44,17 @@ <radio_item label="Activé" name="radio2" value="1"/> <radio_item label="Afficher brièvement" name="radio3" value="2"/> </radio_group> - <check_box label="Afficher mon nom" name="show_my_name_checkbox1"/> + <check_box label="Montrer mon nom" name="show_my_name_checkbox1"/> <check_box initial_value="true" label="Affichage en petit" name="small_avatar_names_checkbox"/> <check_box label="Afficher les titres de groupe" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> Mes effets : </text> <text name="title_afk_text"> - Délai d'absence : + Me montrer absent après : </text> <color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/> - <combo_box label="Délai d'absence :" name="afk"> + <combo_box label="Me montrer absent après :" name="afk"> <combo_box.item label="2 minutes" name="item0"/> <combo_box.item label="5 minutes" name="item1"/> <combo_box.item label="10 minutes" name="item2"/> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml index 9576119eb5..450ad64ae4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml @@ -17,11 +17,11 @@ <text name="QualitySpeed"> Qualité et vitesse : </text> - <text left="35" name="FasterText"> + <text name="FasterText"> Plus rapide </text> <text name="BetterText"> - Meilleur + Meilleure </text> <text name="ShadersPrefText"> Faible diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml index 88b68d1a06..f14ccc3a8e 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> se connecter pour changer </panel.string> - <button label="Vider le cache" name="clear_cache"/> + <button label="Vider le cache" name="clear_cache" tool_tip="Effacer l'image de connexion, le dernier lieu, l'historique des téléportations et la texture du cache."/> <text name="cache_size_label_l"> (Endroits, images, web, historique des recherches) </text> @@ -11,14 +11,12 @@ <check_box label="Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM" name="voice_call_friends_only_check"/> <check_box label="Fermer le micro à la fin d'un appel" name="auto_disengage_mic_check"/> <check_box label="Accepter les cookies" name="cookies_enabled"/> - <check_box label="Média activé" name="media_enabled"/> - <check_box label="Autoriser la lecture automatique du média" name="autoplay_enabled"/> <text name="Logs:"> Journaux : </text> <check_box label="Sauvegarder les chats près de moi sur mon ordinateur" name="log_nearby_chat"/> <check_box label="Sauvegarder les IM sur mon ordinateur" name="log_instant_messages"/> - <check_box label="Inclure les heures" name="show_timestamps_check_im"/> + <check_box label="Inclure les dates et heures" name="show_timestamps_check_im"/> <text name="log_path_desc"> Emplacement : </text> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml index d477a9532d..ecea368c54 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml @@ -17,30 +17,30 @@ <text name="text_box2"> kbps </text> - <check_box label="Port de connexion personnalisé" name="connection_port_enabled"/> - <spinner label="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/> + <check_box label="Port de connexion" name="connection_port_enabled"/> + <spinner label="Numéro :" name="connection_port"/> <text name="cache_size_label_l"> Taille de la mémoire </text> <text name="text_box5"> Mo </text> - <button label="Parcourir" label_selected="Parcourir" name="set_cache"/> - <button label="Réinitialiser" label_selected="Réinitialiser" name="reset_cache"/> <text name="Cache location"> Emplacement du cache : </text> + <button label="Parcourir" label_selected="Parcourir" name="set_cache"/> + <button label="Réinitialiser" label_selected="Réinitialiser" name="reset_cache"/> <text name="Web:"> Web : </text> <radio_group name="use_external_browser"> - <radio_item label="Utiliser le navigateur intégré" name="internal" tool_tip="Utilisez le navigateur intégré pour obtenir de l'aide, ouvrir des liens, etc. Ce navigateur s'ouvre dans [APP_NAME]."/> - <radio_item label="Utiliser mon navigateur (IE, Firefox etc.)" name="external" tool_tip="Utiliser le navigateur web système par défaut pour l'aide, les liens etc. Non recommandé en mode plein écran."/> + <radio_item label="Utiliser le navigateur intégré" name="internal" tool_tip="Utilisez le navigateur intégré pour obtenir de l'aide, ouvrir des liens, etc. Ce navigateur s'ouvre dans [APP_NAME]." value="0"/> + <radio_item label="Utiliser mon navigateur (IE, Firefox, Safari)" name="external" tool_tip="Utiliser le navigateur web système par défaut pour l'aide, les liens etc. Non recommandé en mode plein écran." value="1"/> </radio_group> - <check_box initial_value="false" label="Proxy web" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser"/> - <button label="Parcourir" label_selected="Parcourir" name="set_proxy"/> + <check_box initial_value="false" label="Activer le proxy Web" name="web_proxy_enabled"/> <text name="Proxy location"> Emplacement du proxy : </text> + <line_editor name="web_proxy_editor" tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser"/> + <spinner label="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/> </panel> 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 4f5ef423f5..4c055a2b8d 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -1,16 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sons" name="Preference Media panel"> <slider label="Volume principal" name="System Volume"/> - <check_box initial_value="true" label="Couper le son si minimisé" name="mute_when_minimized"/> - <slider label="Ambiant" name="Wind Volume"/> + <check_box initial_value="true" label="Couper quand minimisé" name="mute_when_minimized"/> <slider label="Boutons" name="UI Volume"/> - <slider label="Média" name="Media Volume"/> + <slider label="Ambiant" name="Wind Volume"/> <slider label="Effets sonores" name="SFX Volume"/> <slider label="Flux musical" name="Music Volume"/> - <check_box label="Activer le chat vocal" name="enable_voice_check"/> + <check_box label="Activé" name="music_enabled"/> + <slider label="Média" name="Media Volume"/> + <check_box label="Activé" name="enable_media"/> <slider label="Chat vocal" name="Voice Volume"/> + <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="vrai"/> + <check_box label="Jouer le 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="vrai"/> + <text name="voice_chat_settings"> + Paramètres du chat vocal + </text> <text name="Listen from"> - Écouter à partir de : + Écouter à partir de : </text> <radio_group name="ear_location"> <radio_item label="Position de la caméra" name="0"/> diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml index 19c6a3b090..8cb4641937 100644 --- a/indra/newview/skins/default/xui/fr/panel_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_profile.xml @@ -24,25 +24,29 @@ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> </panel> <panel name="first_life_image_panel"> - <text name="title_rw_descr_text" value="Monde physique :"/> + <text name="title_rw_descr_text" value="Vie réelle :"/> </panel> <text name="title_member_text" value="Résident depuis :"/> <text name="title_acc_status_text" value="Statut du compte :"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> Résident. Aucune info de paiement enregistrée. Linden. - </text> + </text_editor> <text name="title_partner_text" value="Partenaire :"/> + <panel name="partner_data_panel"> + <name_box initial_value="(récupération en cours)" name="partner_text"/> + </panel> <text name="title_groups_text" value="Groupes :"/> </panel> </scroll_container> </layout_panel> <layout_panel name="profile_buttons_panel"> - <button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/> - <button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/> - <button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/> + <button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/> + <button label="IM" name="im" tool_tip="Ouvrir une session IM" width="30"/> + <button label="Appeler" name="call" tool_tip="Appeler ce résident" width="60"/> <button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/> <button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/> + <button label="â–¼" name="overflow_btn" tool_tip="Payer ou partager l'inventaire avec le résident"/> </layout_panel> <layout_panel name="profile_me_buttons_panel"> <button label="Modifier le profil" name="edit_profile_btn" tool_tip="Modifier vos informations personnelles"/> diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index f9262ea478..2c12547d61 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml @@ -5,7 +5,7 @@ onglet affecteront toutes les régions du domaine. </text> - <text top_pad="8" bottom_delta="-34" name="estate_text"> + <text bottom_delta="-34" name="estate_text" top_pad="8"> Domaine : </text> <text name="estate_name"> @@ -20,8 +20,8 @@ domaine. <text name="Only Allow"> Limiter l'accès aux comptes vérifiés par : </text> - <check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/> - <check_box label="Vérification de mon âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n'ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d'informations."/> + <check_box label="Infos de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/> + <check_box label="Vérification de l'âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n'ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d'informations."/> <check_box label="Autoriser les chats vocaux" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <text name="abuse_email_text"> @@ -74,5 +74,5 @@ domaine. <button label="Ajouter..." name="add_banned_avatar_btn"/> <button label="Supprimer..." name="remove_banned_avatar_btn"/> <button label="Envoyer un message au domaine..." name="message_estate_btn"/> - <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/> + <button label="Éjecter un résident du domaine..." name="kick_user_from_estate_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml index 711278d614..925f4375da 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml @@ -19,35 +19,25 @@ (inconnu) </text> <check_box label="Interdire le terraformage" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="Interdire le vol" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="Autoriser les dégâts" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="Interdire les bousculades" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="Autoriser la revente" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> <check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/> - <button label="?" name="parcel_search_help"/> - <spinner label="Nombre maximum d'avatars" name="agent_limit_spin" label_width="160" width="240"/> - <button label="?" name="agent_limit_help"/> - <spinner label="Bonus objet" name="object_bonus_spin" label_width="160" width="240"/> - <button label="?" name="object_bonus_help"/> + <spinner label="Nombre maximum d'avatars" label_width="160" name="agent_limit_spin" width="240"/> + <spinner label="Bonus objet" label_width="160" name="object_bonus_spin" width="240"/> <text label="Maturité" name="access_text"> Catégorie : </text> - <combo_box label="Modéré" name="access_combo"> - <combo_box.item label="Adult" name="Adult"/> - <combo_box.item label="Modéré" name="Mature"/> - <combo_box.item label="Général" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="Modéré" name="access_combo"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Modéré" name="Mature" value="21"/> + <icons_combo_box.item label="Général" name="PG" value="13"/> + </icons_combo_box> <button label="Appliquer" name="apply_btn"/> - <button label="Téléporter un résident chez lui..." name="kick_btn"/> - <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/> + <button label="Téléporter un résident chez lui…" name="kick_btn"/> + <button label="Téléporter tous les résidents chez eux…" name="kick_all_btn"/> <button label="Envoyer un message à la région..." name="im_btn"/> <button label="Gérer le Téléhub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml b/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml index e709100fa2..663ae55134 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_general_layout.xml @@ -3,19 +3,19 @@ <text name="region_text_lbl"> Région : </text> - <text name="region_text" left_delta="56"> + <text left_delta="56" name="region_text"> inconnu </text> <text name="version_channel_text_lbl"> Version : </text> - <text name="version_channel_text" left_delta="56"> + <text left_delta="56" name="version_channel_text"> inconnu </text> <text name="region_type_lbl"> Type : </text> - <text name="region_type" left_delta="56"> + <text left_delta="56" name="region_type"> inconnu </text> <check_box label="Interdire le terraformage" name="block_terraform_check"/> @@ -25,8 +25,8 @@ <check_box label="Autoriser la revente de terrains" name="allow_land_resell_check"/> <check_box label="Autoriser la fusion/division de terrains" name="allow_parcel_changes_check"/> <check_box label="Interdire l'affichage du terrain dans les recherches" name="block_parcel_search_check" tool_tip="Permettre aux autres résidents de voir cette région et ses parcelles dans les résultats de recherche"/> - <spinner label="Nombre maximum d'avatars" name="agent_limit_spin" label_width="160" width="240"/> - <spinner label="Bonus objet" name="object_bonus_spin" label_width="160" width="240"/> + <spinner label="Nombre maximum d'avatars" label_width="160" name="agent_limit_spin" width="240"/> + <spinner label="Bonus objet" label_width="160" name="object_bonus_spin" width="240"/> <text label="Accès" name="access_text"> Catégorie : </text> @@ -36,8 +36,8 @@ <combo_box.item label="Général" name="PG"/> </combo_box> <button label="Appliquer" name="apply_btn"/> - <button label="Téléporter un résident chez lui..." name="kick_btn"/> - <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/> + <button label="Téléporter un résident chez lui…" name="kick_btn"/> + <button label="Téléporter tous les résidents chez eux…" name="kick_all_btn"/> <button label="Envoyer un message à la région..." name="im_btn"/> <button label="Gérer le téléhub..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml index e95d911c01..be7ca456f1 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml @@ -28,16 +28,16 @@ Limites d'élévation de texture </text> <text name="height_text_lbl6"> - Sud-ouest + Nord-ouest </text> <text name="height_text_lbl7"> - Nord-ouest + Nord-est </text> <text name="height_text_lbl8"> - Sud-est + Sud-ouest </text> <text name="height_text_lbl9"> - Nord-est + Sud-est </text> <text name="height_text_lbl10" width="460"> Ces valeurs représentent les limites de mélange pour les textures ci-dessus. diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml index 47d8382e57..e541fae31f 100644 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="MON AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Utilisation des scripts d'avatars + </text> <text name="loading_text"> Chargement... </text> <scroll_list name="scripts_list"> - <scroll_list.columns label="Taille (Ko)" width="80" name="size"/> + <scroll_list.columns label="Taille (Ko)" name="size" width="80"/> <scroll_list.columns label="URL" name="urls"/> <scroll_list.columns label="Nom de l'objet" name="name"/> <scroll_list.columns label="Endroit" name="location"/> diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml index 9426047ee1..751abd6f1d 100644 --- a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml @@ -3,20 +3,18 @@ <text name="script_memory"> Mémoire des scripts de parcelles </text> - <text name="parcels_listed"> - Parcelles possédées : - </text> - <text name="memory_used"> - Mémoire utilisée : - </text> + <text name="parcels_listed"/> + <text name="memory_used"/> <text name="loading_text"> Chargement... </text> <scroll_list name="scripts_list"> - <scroll_list.columns label="Taille (Ko)" width="80" name="size"/> + <scroll_list.columns label="Taille (Ko)" name="size" width="80"/> + <scroll_list.columns label="URL" name="urls"/> <scroll_list.columns label="Nom de l'objet" name="name"/> - <scroll_list.columns label="Propriétaire d'objet" width="140" name="owner"/> - <scroll_list.columns label="Parcelle/emplacement" name="location"/> + <scroll_list.columns label="Propriétaire d'objet" name="owner" width="140"/> + <scroll_list.columns label="Parcelle" name="parcel"/> + <scroll_list.columns label="Endroit" name="location"/> </scroll_list> <button label="Rafraîchir la liste" name="refresh_list_btn"/> <button label="Surbrillance" name="highlight_btn"/> diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml index 6329324a23..178ae4324b 100644 --- a/indra/newview/skins/default/xui/fr/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/fr/panel_side_tray.xml @@ -7,7 +7,9 @@ <panel label="domicile" name="panel_home"/> </sidetray_tab> <sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me" tab_title="Mon profil"> - <panel label="Moi" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="Moi" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people" tab_title="Personnes"> <panel_container name="panel_container"> diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml index ae575a9fac..657bf792cf 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -22,9 +22,10 @@ [AMT] L$ </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/> - <button label="Acheter des L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> + <button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> <text name="TimeText" tool_tip="Heure actuelle (Pacifique)"> - midi + 00h00 PST </text> + <button name="media_toggle_btn" tool_tip="Arrêter tous les médias (musique, vidéo, pages web)"/> <button name="volume_btn" tool_tip="Contrôle du volume global"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml index 3367353b28..c049de48b1 100644 --- a/indra/newview/skins/default/xui/fr/role_actions.xml +++ b/indra/newview/skins/default/xui/fr/role_actions.xml @@ -17,21 +17,21 @@ <action_set description="Ces pouvoirs permettent de modifier le profil public du groupe, sa charte et son logo." name="Group Identity"> <action description="Modifier le profil public du groupe" longdescription="Modifiez la charte, le logo et l'affichage dans les résultats de recherche. Vous pouvez faire cela dans la section Général." name="group change identity" value="11"/> </action_set> - <action_set description="Ces pouvoirs incluent les pouvoirs de céder, modifier et vendre les terrains de ce groupe. Pour accéder à la fenêtre À propos des terrains, cliquez sur le sol avec le bouton droit de la souris et sélectionnez À propos des terrains, ou cliquez sur l'icône i dans la barre de navigation." name="Parcel Management"> + <action_set description="Ces pouvoirs incluent les pouvoirs de céder, modifier et vendre les terrains de ce groupe. Pour accéder à la fenêtre À propos du terrain, cliquez sur le sol avec le bouton droit de la souris et sélectionnez À propos du terrain, ou cliquez sur l'icône i dans la barre de navigation." name="Parcel Management"> <action description="Transférer et acheter des parcelles pour le groupe" longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu À propos du terrain > Général." name="land deed" value="12"/> <action description="Abandonner le terrain" longdescription="Abandonnez des parcelles du groupe à Linden Lab. Attention : ce pouvoir autorise l'abandon d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer." name="land release" value="13"/> <action description="Vendre du terrain" longdescription="Vendez des parcelles du groupe. Attention : ce pouvoir autorise la vente d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer." name="land set sale info" value="14"/> <action description="Diviser et fusionner des parcelles" longdescription="Divisez et fusionnez des parcelles. Pour ce faire, cliquez sur le sol avec le bouton droit de la souris, sélectionnez Modifier le terrain et faites glisser la souris sur le terrain pour faire une sélection. Pour diviser une parcelle, sélectionnez ce que vous souhaitez diviser et cliquez sur Sous-diviser. Pour fusionner des parcelles, sélectionnez-en deux ou plus qui sont contiguës et cliquez sur Fusionner." name="land divide join" value="15"/> </action_set> <action_set description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation." name="Parcel Identity"> - <action description="Activez Afficher le lieu dans la recherche et définissez la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d'une parcelle dans l'onglet À propos des terrains > Options." name="land find places" value="17"/> - <action description="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche. Pour ce faire, utilisez l'onglet À propos des terrains > Options." name="land change identity" value="18"/> + <action description="Activez Afficher le lieu dans la recherche et définissez la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d'une parcelle dans l'onglet À propos du terrain > Options." name="land find places" value="17"/> + <action description="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d'affichage du lieu dans la recherche. Pour ce faire, utilisez l'onglet À propos du terrain > Options." name="land change identity" value="18"/> <action description="Définir le lieu d'arrivée et le routage des téléportations" longdescription="Définissez le lieu d'arrivée des téléportations et le routage à partir du menu À propos du terrain > Options." name="land set landing point" value="19"/> </action_set> <action_set description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief." name="Parcel Settings"> <action description="Modifier la musique et les médias" longdescription="Changez la musique et les médias à partir du menu À propos du terrain > Médias." name="land change media" value="20"/> <action description="Changer l'option Modifier le terrain" longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer. " name="land edit" value="21"/> - <action description="Changer diverses options du terrain" longdescription="Activez Sécurisé (pas de dégâts), Voler, et autorisez les autres résidents à : modifier le terrain, construire, créer des repères et exécuter des scripts sur les terrains appartenant au groupe dans l'onglet propos des terrains > Options." name="land options" value="22"/> + <action description="Changer diverses options du terrain" longdescription="Activez Sécurisé (pas de dégâts), Voler, et autorisez les autres résidents à : modifier le terrain, construire, créer des repères et exécuter des scripts sur les terrains appartenant au groupe dans l'onglet propos du terrain > Options." name="land options" value="22"/> </action_set> <action_set description="Ces pouvoirs permettent aux membres d'outrepasser les restrictions sur les parcelles du groupe." name="Parcel Powers"> <action description="Toujours autoriser Modifier le terrain" longdescription="Vous pouvez modifier le relief d'une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options." name="land allow edit land" value="23"/> @@ -40,11 +40,11 @@ <action description="Toujours autoriser à créer des repères" longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options." name="land allow landmark" value="26"/> <action description="Autoriser à définir un domicile sur le terrain du groupe" longdescription="Un membre dans un rôle avec ce pouvoir peut utiliser le menu Monde > Repères > Définir le domicile ici sur une parcelle cédée à ce groupe." name="land allow set home" value="28"/> </action_set> - <action_set description="Ces pouvoirs permettent d'autoriser ou d'interdire l'accès à des parcelles du groupe et de geler ou d'expulser des résidents." name="Parcel Access"> + <action_set description="Ces pouvoirs permettent d'autoriser ou d'interdire l'accès à des parcelles du groupe et de figer ou d'expulser des résidents." name="Parcel Access"> <action description="Gérer la liste d'accès à la parcelle" longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain > Accès." name="land manage allowed" value="29"/> - <action description="Gérer la liste noire de cette parcelle" longdescription="Gérez les listes des résidents bannis des parcelles dans l'onglet À propos des terrains > Accès." name="land manage banned" value="30"/> - <action description="Modifiez les paramètres Vendre des pass à " longdescription="Modifiez les paramètres Vendre des pass à dans l'onglet À propos des terrains > Accès." name="land manage passes" value="31"/> - <action description="Expulser et geler des résidents" longdescription="Les membres dans un rôle avec ce pouvoir peuvent se charger des résidents indésirables sur une parcelle appartenant au groupe en cliquant dessus, puis en sélectionnant Expulser ou Geler." name="land admin" value="32"/> + <action description="Gérer la liste noire de cette parcelle" longdescription="Gérez les listes des résidents bannis des parcelles dans l'onglet À propos du terrain > Accès." name="land manage banned" value="30"/> + <action description="Modifiez les paramètres Vendre des pass à " longdescription="Modifiez les paramètres Vendre des pass à dans l'onglet À propos du terrain > Accès." name="land manage passes" value="31"/> + <action description="Expulser et figer des résidents" longdescription="Les membres dans un rôle avec ce pouvoir peuvent se charger des résidents indésirables sur une parcelle appartenant au groupe en cliquant dessus, puis en sélectionnant Expulser ou Figer." name="land admin" value="32"/> </action_set> <action_set description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement." name="Parcel Content"> <action description="Renvoyer les objets transférés au groupe" longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu À propos du terrain > Objets." name="land return group owned" value="48"/> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml index 688bed8cbf..cc99b1a07c 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml @@ -19,7 +19,7 @@ Vous ne pouvez pas modifier ces objets </panel.string> <panel.string name="text modify warning"> - Cet objet comprend des parties reliées + Cet objet comprend des parties liées </panel.string> <panel.string name="Cost Default"> Prix : L$ @@ -37,34 +37,34 @@ Vente mixte </panel.string> <text name="title" value="Profil de l'objet"/> - <text name="where" value="(dans le monde virtuel)"/> - <panel label=""> + <text name="where" value="(dans Second Life)"/> + <panel label="" name="properties_panel"> <text name="Name:"> - Nom : + Nom : </text> <text name="Description:"> Description : </text> <text name="CreatorNameLabel"> - Créateur : + Créateur : </text> <text name="Creator Name"> Erica Linden </text> <text name="Owner:"> - Propriétaire : + Propriétaire : </text> <text name="Owner Name"> Erica Linden </text> <text name="Group_label"> - Groupe : + Groupe : </text> - <button name="button set group" tool_tip="Choisissez un groupe pour partager les permissions de cet objet"/> - <name_box initial_value="Chargement..." name="Group Name Proxy"/> - <button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les permissions au prochain propriétaire. Seul un officier peut céder les objets d'un groupe."/> + <button name="button set group" tool_tip="Choisir un groupe pour partager les droits relatifs à cet objet"/> + <name_box initial_value="Chargement…" name="Group Name Proxy"/> + <button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les droits au prochain propriétaire. Seul un officier peut céder les objets partagés d'un groupe."/> <text name="label click action"> - Cliquer pour : + Cliquer pour : </text> <combo_box name="clickaction"> <combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/> @@ -78,16 +78,16 @@ Vous pouvez modifier cet objet </text> <text name="Anyone can:"> - N'importe qui : + N'importe qui : </text> <check_box label="Copier" name="checkbox allow everyone copy"/> <check_box label="Bouger" name="checkbox allow everyone move"/> <text name="GroupLabel"> - Groupe : + Groupe : </text> - <check_box label="Partager" name="checkbox share with group" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Transférer."/> + <check_box label="Partager" name="checkbox share with group" tool_tip="Autoriser tous les membres du groupe choisi à partager vos droits de modification pour cet objet. Pour activer les restrictions de rôles, vous devez d'abord cliquer sur Céder."/> <text name="NextOwnerLabel"> - Le prochain propriétaire : + Le prochain propriétaire : </text> <check_box label="Modifier" name="checkbox next owner can modify"/> <check_box label="Copier" name="checkbox next owner can copy"/> @@ -99,30 +99,31 @@ <combo_box.item label="Contenus" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> - <spinner label="Prix : L$" name="Edit Cost"/> + <spinner label="Prix : L$" name="Edit Cost"/> <check_box label="Afficher dans les résultats de recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/> <text name="B:"> - B : + B : </text> <text name="O:"> - O : + O : </text> <text name="G:"> G : </text> <text name="E:"> - E : + E : </text> <text name="N:"> - N : + N : </text> <text name="F:"> - F : + F : </text> </panel> <panel name="button_panel"> <button label="Ouvrir" name="open_btn"/> <button label="Payer" name="pay_btn"/> <button label="Acheter" name="buy_btn"/> + <button label="Détails" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index c6f73dde21..f759f5f41a 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -227,9 +227,6 @@ <string name="AvatarNameMultiple"> (multiple) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (aucun) </string> @@ -593,6 +590,9 @@ <string name="hang_up"> Déconnecté du chat vocal </string> + <string name="reconnect_nearby"> + Vous allez maintenant être reconnecté(e) au chat vocal près de vous. + </string> <string name="ScriptQuestionCautionChatGranted"> '[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de : [PERMISSIONS]. </string> @@ -642,7 +642,7 @@ Modéré </string> <string name="SIM_ACCESS_ADULT"> - Adult + Adulte </string> <string name="SIM_ACCESS_DOWN"> Hors ligne @@ -741,10 +741,10 @@ Gants </string> <string name="undershirt"> - Sous-vêtements (homme) + Débardeur </string> <string name="underpants"> - Sous-vêtements (femme) + Caleçon </string> <string name="skirt"> Jupe @@ -758,6 +758,9 @@ <string name="invalid"> non valide </string> + <string name="NewWearable"> + Nouv. [WEARABLE_ITEM] + </string> <string name="next"> Suivant </string> @@ -825,7 +828,7 @@ Appuyez sur ESC pour quitter la vue subjective </string> <string name="InventoryNoMatchingItems"> - Aucun objet correspondant dans l'inventaire. + Aucun objet correspondant dans l'inventaire. Essayer la [secondlife:///app/search/groups "Recherche"]. </string> <string name="FavoritesNoMatchingItems"> Faites glisser un repère ici pour l'ajouter à vos Favoris. @@ -1201,10 +1204,10 @@ Problème lors du téléchargement </string> <string name="CompileQueueInsufficientPermDownload"> - Permissions insuffisantes pour télécharger un script. + Droits insuffisants pour télécharger un script. </string> <string name="CompileQueueInsufficientPermFor"> - Permissions insuffisantes pour + Droits insuffisants pour </string> <string name="CompileQueueUnknownFailure"> Échec du téléchargement, erreur inconnue @@ -1324,6 +1327,9 @@ <string name="ScriptLimitsRequestError"> Une erreur est survenue pendant la requête d'informations. </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + Aucune parcelle sélectionnée + </string> <string name="ScriptLimitsRequestWrongRegion"> Erreur : les informations de script ne sont disponibles que dans votre région actuelle. </string> @@ -1465,6 +1471,9 @@ <string name="PanelContentsNewScript"> Nouveau script </string> + <string name="BusyModeResponseDefault"> + Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu'il a demandé à ne pas être dérangé. Votre message restera affiché dans son panneau IM afin qu'il puisse le lire ultérieurement. + </string> <string name="MuteByName"> (par nom) </string> @@ -1501,7 +1510,10 @@ (mise à jour après la publication) </string> <string name="NoPicksClassifiedsText"> - Il n'y a pas de préférences/petites annonces ici + Vous n'avez pas créé de favoris ni de petites annonces Cliquez sur le bouton Plus pour créer un favori ou une petite annonce. + </string> + <string name="NoAvatarPicksClassifiedsText"> + L'utilisateur n'a ni favoris ni petites annonces </string> <string name="PicksClassifiedsLoadingText"> Chargement... @@ -1706,7 +1718,7 @@ Appartenant aux Lindens </string> <string name="Adult"> - Adult + Adulte </string> <string name="Arts&Culture"> Arts et culture @@ -1897,7 +1909,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Mèches de derrière </string> <string name="Baggy"> - Cernés + Plus </string> <string name="Bangs"> Frange @@ -1924,7 +1936,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Volume : Haut </string> <string name="Big Head"> - Grosse tête + Plus </string> <string name="Big Pectorals"> Gros pectoraux @@ -1960,13 +1972,13 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Grains de beauté </string> <string name="Body Thick"> - Corps épais + Plus </string> <string name="Body Thickness"> Épaisseur du corps </string> <string name="Body Thin"> - Corps mince + Moins </string> <string name="Bow Legged"> Jambes arquées @@ -2098,7 +2110,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Déviation du nez </string> <string name="Cuff Flare"> - Jambe + Jambes </string> <string name="Dark"> Sombre @@ -2215,7 +2227,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Jambes larges </string> <string name="Flat"> - Plat + Moins </string> <string name="Flat Butt"> Fesses plates @@ -2380,7 +2392,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Saillie de la mâchoire </string> <string name="Jaw Shape"> - Forme de la mâchoire + Mâchoire </string> <string name="Join"> Rapprochés @@ -2461,7 +2473,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Fente labiale </string> <string name="Lip Cleft Depth"> - Profondeur fente labiale + Fente labiale </string> <string name="Lip Fullness"> Volume des lèvres @@ -2488,7 +2500,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Couleur du rouge à lèvres </string> <string name="Long"> - Long + Plus </string> <string name="Long Head"> Tête longue @@ -2587,7 +2599,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Plus </string> <string name="More Lower Lip"> - Plus + Inférieure plus grosse </string> <string name="More Muscles"> Plus @@ -2611,7 +2623,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Plus </string> <string name="More Upper Lip"> - Plus + Supérieure plus grosse </string> <string name="More Vertical"> Plus @@ -2647,7 +2659,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Couleur du vernis </string> <string name="Narrow"> - Étroit + Moins </string> <string name="Narrow Back"> Arrière étroit @@ -2827,7 +2839,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Plateforme (largeur) </string> <string name="Pointy"> - Pointu + Pointue </string> <string name="Pointy Heels"> Talons pointus @@ -2845,10 +2857,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Å’il droit saillant </string> <string name="Puffy"> - Gonflées + Plus </string> <string name="Puffy Eyelids"> - Paupières + Cernes </string> <string name="Rainbow Color"> Couleur arc en ciel @@ -3013,10 +3025,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Petites mains </string> <string name="Small Head"> - Petite tête + Moins </string> <string name="Smooth"> - Lisses + Moins </string> <string name="Smooth Hair"> Cheveux lisses @@ -3034,7 +3046,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Mèches en pointe </string> <string name="Square"> - Carré + Carrée </string> <string name="Square Toe"> Orteil carré @@ -3145,7 +3157,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Menton supérieur </string> <string name="Upper Eyelid Fold"> - Paupière supérieure + Paupière sup. </string> <string name="Upturned"> En trompette @@ -3163,7 +3175,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. Cheveux blancs </string> <string name="Wide"> - Large + Plus </string> <string name="Wide Back"> Derrière large diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml index b76ae370fd..7c291c0984 100644 --- a/indra/newview/skins/default/xui/fr/teleport_strings.xml +++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<teleport_messages name=""> +<teleport_messages> <message_set name="errors"> <message name="invalid_tport"> Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir vous téléporter. @@ -61,6 +61,9 @@ Veuillez réessayer dans un moment. <message name="completing"> Téléportation sur le point d'aboutir. </message> + <message name="completed_from"> + Téléportation depuis [T_SLURL] terminée + </message> <message name="resolving"> Destination en cours de résolution. </message> diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml index a672df0d96..1b47dd7d7e 100644 --- a/indra/newview/skins/default/xui/it/floater_world_map.xml +++ b/indra/newview/skins/default/xui/it/floater_world_map.xml @@ -5,7 +5,8 @@ Legenda </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button font="SansSerifSmall" label="Mostra la mia posizione" label_selected="Mostra la mia posizione" left_delta="91" name="Show My Location" tool_tip="Centra la mappa sul luogo dove si trova il mio avatar" width="135"/> <text name="person_label"> Io @@ -37,12 +38,14 @@ </text> <check_box label="Adult" name="event_adult_chk"/> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> Trova sulla Mappa </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="Amici Online" name="friend combo" tool_tip="Mostra amici sulla mappa"> <combo_box.item label="Miei Amici Online" name="item1"/> </combo_box> @@ -59,12 +62,14 @@ <button font="SansSerifSmall" label="Copia SLurl" name="copy_slurl" tool_tip="Copia il luogo attuale come SLurl per essere usato nel web."/> <button font="SansSerifSmall" label="Mostra Selezione" label_selected="Mostra destinazione" left_delta="91" name="Show Destination" tool_tip="Centra la mappa sul luogo prescelto" width="135"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml index 0361eb49ed..f7a58581d4 100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <string name="min_width"> - 192 - </string> - <string name="max_width"> - 320 - </string> <line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per dire, Ctrl+Invio per gridare"/> <button name="show_nearby_chat" tool_tip="Mostra/Nasconde la chat log nei dintorni"/> </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 70e1577199..03716ba4c5 100644 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml @@ -48,7 +48,7 @@ <text name="maturity_value" value="sconosciuto"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcel"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Valutazione:"/> <text name="rating_value" value="sconosciuto"/> <text name="voice_label" value="Voice:"/> @@ -67,7 +67,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Regione"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Regione:"/> <text name="region_type_label" value="Scrivi:"/> <text name="region_rating_label" value="Valutazione:"/> @@ -77,7 +77,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Proprietà immobiliare"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Proprietà immobiliare:"/> <text name="estate_rating_label" value="Valutazione:"/> <text name="estate_owner_label" value="Proprietà :"/> @@ -85,7 +85,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="In vendita"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Prezzo:"/> <text name="area_label" value="Area:"/> <text name="traffic_label" value="Traffico:"/> diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml index e5f27795be..0eecdfb2a2 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml @@ -36,7 +36,7 @@ <panel.string name="Sale Mixed"> Vendita assortita </panel.string> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> Nome: </text> @@ -74,7 +74,7 @@ </combo_box> <spinner label="Prezzo: L$" name="Edit Cost"/> <check_box label="Mostra nella ricerca" name="search_check" tool_tip="Mostra questo oggetto nei risultati della ricerca"/> - <panel name="perms_build"> + <panel name="perms_inv"> <text name="perm_modify"> Puoi modificare questo oggetto </text> diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index 78bc355f4b..0eaad11cc7 100644 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml @@ -8,9 +8,9 @@ コンパイラー [COMPILER] [COMPILER_VERSION] ãƒãƒ¼ã‚¸ãƒ§ãƒ³ </floater.string> <floater.string name="AboutPosition"> - You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP]) + ã‚ãªãŸã®ç¾åœ¨åœ°ã¯ã€[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] ã® [REGION] ã§ã™ã€‚ä½ç½®ã¯ <nolink>[HOSTNAME]</nolink> ã§ã™ã€‚（[HOSTIP]） [SERVER_VERSION] -[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] +[[SERVER_RELEASE_NOTES_URL] [リリースノート]] </floater.string> <floater.string name="AboutSystem"> CPU： [CPU] @@ -43,7 +43,7 @@ Vivox ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [VIVOX_VERSION] </panel> <panel label="クレジット" name="credits_panel"> <text_editor name="credits_editor"> - Second Lifeã¯ã€ Philipã€Tessaã€Andrewã€Coryã€Jamesã€Benã€Charã€Charlieã€Colinã€Danã€Danielã€Dougã€Ericã€Hamletã€Haneyã€Eveã€Hunterã€Ianã€Jeffã€Jenniferã€Jimã€Johnã€Leeã€Markã€Peterã€Phoenixã€Richardã€Robinã€Xenonã€Steveã€Tanyaã€Eddieã€Aviã€Frankã€Bruceã€Aaronã€Aliceã€Bobã€Debraã€Eileenã€Helenã€Janetã€Louieã€Leviathaniaã€Stefanã€Rayã€Kevinã€Tomã€Mikebã€MikeTã€Burgessã€Elenaã€Tracyã€Billã€Toddã€Ryanã€Zachã€Sarahã€Novaã€Timã€Stephanieã€Michaelã€Evanã€Nicolasã€Catherineã€Rachelleã€Daveã€Hollyã€Bubã€Kellyã€Magellanã€Ramziã€Donã€Sabinã€Jillã€Rheyaã€Jeskaã€Torleyã€Konaã€Callumã€Charityã€Ventrellaã€Jackã€Vektorã€Irisã€Chrisã€Nicoleã€Mickã€Reubenã€Blueã€Babbageã€Yedwabã€Deanaã€Laurenã€Brentã€Pathfinderã€Chadrickã€Altruimaã€Jesseã€Teenyã€Monroeã€Icculusã€Davidã€Tessã€Lizzieã€Patsyã€Isaacã€Lawrenceã€Cynã€Boã€Giaã€Annetteã€Mariusã€Tboneã€Jonathanã€Karenã€Ginsuã€Satokoã€Yukoã€Makikoã€Thomasã€Harryã€Sethã€Alexeiã€Brianã€Guyã€Runitaiã€Ethanã€Dataã€Corneliusã€Kennyã€Swissã€Zeroã€Natriaã€Wendyã€Stephenã€Teepleã€Thumperã€Lucyã€Deeã€Miaã€Lianaã€Warrenã€Brankaã€Auraã€beezã€Miloã€Hermiaã€Redã€Thraxã€Joeã€Sallyã€Magentaã€Moguraã€Paulã€Joseã€Rejeanã€Henrikã€Lexieã€Amberã€Loganã€Xanã€Noraã€Morpheusã€Donovanã€Leylaã€MichaelFrancisã€Beastã€Cubeã€Buckyã€Joshuaã€Stryfeã€Harmonyã€Teresaã€Claudiaã€Walkerã€Glennã€Fritzã€Fordakã€Juneã€Cleopetraã€Jeanã€Ivyã€Betsyã€Rooseveltã€Spikeã€Kenã€Whichã€Tofuã€Chiyoã€Robã€Zeeã€dustinã€Georgeã€Delã€Matthewã€Catã€Jacquiã€Lightfootã€Adrianã€Violaã€Alfredã€Noelã€Irfanã€Sunilã€Yoolã€Rikaã€Janeã€Xtremeã€Frontierã€a2ã€Neoã€Siobhanã€Yozã€Justinã€Elleã€Qarlã€Benjaminã€Isabelã€Gulliverã€Everettã€Christopherã€Izzyã€Stephanyã€Garryã€Sejongã€Seanã€Tobinã€Iridiumã€Metaã€Anthonyã€Jeremyã€JPã€Jakeã€Mauriceã€Madhaviã€Leopardã€Kyleã€Joonã€Kariã€Bertã€Belindaã€Jonã€Kristiã€Bridieã€Pramodã€KJã€Socratesã€Mariaã€Ivanã€Aricã€Yamasakiã€Adreanneã€Jayã€MitchKã€Cerenã€Cocoã€Durlã€Jennyã€Periapseã€Karticã€Storrsã€Lotteã€Sandyã€Rohnã€Colossusã€Zenã€BigPapiã€Bradã€Pastramiã€Kurzã€Maniã€Neuroã€Jaimeã€MJã€Rowanã€Sgtã€Elvisã€Geckoã€Samuelã€Sardonyxã€Leoã€Bryanã€Nikoã€Softã€Poppyã€Rachelã€Akiã€Angeloã€Banzaiã€Alexaã€Sueã€CeeLoã€Benderã€CGã€Gillianã€Pelleã€Nickã€Echoã€Zaraã€Christineã€Shamiranã€Emmaã€Blakeã€Keikoã€Plexusã€Joppaã€Sidewinderã€Ericaã€Ashleiã€Twilightã€Kristenã€Brettã€Qã€Enusã€Simonã€Bevisã€Kraftã€Kipã€Chandlerã€Ronã€LauraPã€Ramã€KyleJMã€Scouseã€Prosperoã€Melissaã€Martyã€Natã€Hamiltonã€Kendã€Lordanã€Jimmyã€Kosmoã€Seraphã€Greenã€Ekimã€Wiggoã€JTã€Romeã€Dorisã€Mizã€Benocã€Whumpã€Trinityã€Patchã€Kateã€TJã€Baoã€Joohwanã€Christyã€Sofiaã€Matiasã€Cogsworthã€Johanã€Orehã€Cheahã€Angelaã€Brandyã€Mangoã€Lanã€Aleksã€Gloriaã€Heidyã€Mitchellã€Spaceã€Coltonã€Bambersã€Einsteinã€Maggieã€Malbersã€Roseã€Winnieã€Stellaã€Miltonã€Rothmanã€Niallã€Marinã€Allisonã€Katieã€Dawnã€Kattã€Dustyã€Kalpanaã€Judyã€Andreaã€Ambroffã€Infinityã€Gailã€Ricoã€Raymondã€Yiã€Williamã€Christaã€Mã€Teaganã€Scoutã€Mollyã€Danteã€Corrã€Dynamikeã€Usiã€Kayleeã€Vidtutsã€Lilã€Danicaã€Saschaã€Kelvã€Jacobã€Nyaã€Rodneyã€Brandonã€Elsieã€Blondinã€Grantã€Katrinã€Nyxã€Gabrielã€Locklainnã€Claireã€Devinã€Minervaã€Montyã€Austinã€Bradfordã€Siã€Keiraã€Hã€Caitlinã€Ditaã€Makaiã€Jennã€Annã€Meredithã€Clareã€Joyã€Praveenã€Codyã€Edmundã€Rutheã€Sirenaã€Gayathriã€Spiderã€FJã€Davidoffã€Tianã€Jennieã€Louiseã€Oskarã€Landonã€Noelleã€Jarvã€Ingridã€Alã€Sommerã€Docã€Ariaã€Huinã€Grayã€Liliã€Virã€DJã€Yangã€Tã€Simoneã€Maestroã€Scottã€Charleneã€Quixoteã€Amandaã€Susanã€Zedã€Anneã€Enkiduã€Esbeeã€Joroanã€Katelinã€Roxieã€Tayã€Scarletã€Kevinã€Johnnyã€Wolfgangã€Andrenã€Bobã€Howardã€Merovã€Randã€Rayã€Michonã€Newellã€Galenã€Dessieã€Lesã€Michonã€Jenelleã€Geoã€Sizã€Shapiroã€Peteã€Calyleã€Seleneã€Allenã€Phoebeã€Goldinã€Kimmoraã€Dakotaã€Slatonã€Lindquistã€Zoeyã€Hariã€Othelloã€Rohitã€Sheldonã€Petraã€Vialeã€Gordonã€Kayeã€Pinkã€Fernyã€Emersonã€Davyã€Briã€Chanã€Juanã€Robertã€Terrenceã€Nathanã€Carlã¨ã€ãã®ä»–多数ã®äººé”ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã—ãŸã€‚ + Second Life ã¯ã€ Philipã€Tessaã€Andrewã€Coryã€Jamesã€Benã€Charã€Charlieã€Colinã€Danã€Danielã€Dougã€Ericã€Hamletã€Haneyã€Eveã€Hunterã€Ianã€Jeffã€Jenniferã€Jimã€Johnã€Leeã€Markã€Peterã€Phoenixã€Richardã€Robinã€Xenonã€Steveã€Tanyaã€Eddieã€Aviã€Frankã€Bruceã€Aaronã€Aliceã€Bobã€Debraã€Eileenã€Helenã€Janetã€Louieã€Leviathaniaã€Stefanã€Rayã€Kevinã€Tomã€Mikebã€MikeTã€Burgessã€Elenaã€Tracyã€Billã€Toddã€Ryanã€Zachã€Sarahã€Novaã€Timã€Stephanieã€Michaelã€Evanã€Nicolasã€Catherineã€Rachelleã€Daveã€Hollyã€Bubã€Kellyã€Magellanã€Ramziã€Donã€Sabinã€Jillã€Rheyaã€Jeskaã€Torleyã€Konaã€Callumã€Charityã€Ventrellaã€Jackã€Vektorã€Irisã€Chrisã€Nicoleã€Mickã€Reubenã€Blueã€Babbageã€Yedwabã€Deanaã€Laurenã€Brentã€Pathfinderã€Chadrickã€Altruimaã€Jesseã€Teenyã€Monroeã€Icculusã€Davidã€Tessã€Lizzieã€Patsyã€Isaacã€Lawrenceã€Cynã€Boã€Giaã€Annetteã€Mariusã€Tboneã€Jonathanã€Karenã€Ginsuã€Satokoã€Yukoã€Makikoã€Thomasã€Harryã€Sethã€Alexeiã€Brianã€Guyã€Runitaiã€Ethanã€Dataã€Corneliusã€Kennyã€Swissã€Zeroã€Natriaã€Wendyã€Stephenã€Teepleã€Thumperã€Lucyã€Deeã€Miaã€Lianaã€Warrenã€Brankaã€Auraã€beezã€Miloã€Hermiaã€Redã€Thraxã€Joeã€Sallyã€Magentaã€Moguraã€Paulã€Joseã€Rejeanã€Henrikã€Lexieã€Amberã€Loganã€Xanã€Noraã€Morpheusã€Donovanã€Leylaã€MichaelFrancisã€Beastã€Cubeã€Buckyã€Joshuaã€Stryfeã€Harmonyã€Teresaã€Claudiaã€Walkerã€Glennã€Fritzã€Fordakã€Juneã€Cleopetraã€Jeanã€Ivyã€Betsyã€Rooseveltã€Spikeã€Kenã€Whichã€Tofuã€Chiyoã€Robã€Zeeã€dustinã€Georgeã€Delã€Matthewã€Catã€Jacquiã€Lightfootã€Adrianã€Violaã€Alfredã€Noelã€Irfanã€Sunilã€Yoolã€Rikaã€Janeã€Xtremeã€Frontierã€a2ã€Neoã€Siobhanã€Yozã€Justinã€Elleã€Qarlã€Benjaminã€Isabelã€Gulliverã€Everettã€Christopherã€Izzyã€Stephanyã€Garryã€Sejongã€Seanã€Tobinã€Iridiumã€Metaã€Anthonyã€Jeremyã€JPã€Jakeã€Mauriceã€Madhaviã€Leopardã€Kyleã€Joonã€Kariã€Bertã€Belindaã€Jonã€Kristiã€Bridieã€Pramodã€KJã€Socratesã€Mariaã€Ivanã€Aricã€Yamasakiã€Adreanneã€Jayã€MitchKã€Cerenã€Cocoã€Durlã€Jennyã€Periapseã€Karticã€Storrsã€Lotteã€Sandyã€Rohnã€Colossusã€Zenã€BigPapiã€Bradã€Pastramiã€Kurzã€Maniã€Neuroã€Jaimeã€MJã€Rowanã€Sgtã€Elvisã€Geckoã€Samuelã€Sardonyxã€Leoã€Bryanã€Nikoã€Softã€Poppyã€Rachelã€Akiã€Angeloã€Banzaiã€Alexaã€Sueã€CeeLoã€Benderã€CGã€Gillianã€Pelleã€Nickã€Echoã€Zaraã€Christineã€Shamiranã€Emmaã€Blakeã€Keikoã€Plexusã€Joppaã€Sidewinderã€Ericaã€Ashleiã€Twilightã€Kristenã€Brettã€Qã€Enusã€Simonã€Bevisã€Kraftã€Kipã€Chandlerã€Ronã€LauraPã€Ramã€KyleJMã€Scouseã€Prosperoã€Melissaã€Martyã€Natã€Hamiltonã€Kendã€Lordanã€Jimmyã€Kosmoã€Seraphã€Greenã€Ekimã€Wiggoã€JTã€Romeã€Dorisã€Mizã€Benocã€Whumpã€Trinityã€Patchã€Kateã€TJã€Baoã€Joohwanã€Christyã€Sofiaã€Matiasã€Cogsworthã€Johanã€Orehã€Cheahã€Angelaã€Brandyã€Mangoã€Lanã€Aleksã€Gloriaã€Heidyã€Mitchellã€Spaceã€Coltonã€Bambersã€Einsteinã€Maggieã€Malbersã€Roseã€Winnieã€Stellaã€Miltonã€Rothmanã€Niallã€Marinã€Allisonã€Katieã€Dawnã€Kattã€Dustyã€Kalpanaã€Judyã€Andreaã€Ambroffã€Infinityã€Gailã€Ricoã€Raymondã€Yiã€Williamã€Christaã€Mã€Teaganã€Scoutã€Mollyã€Danteã€Corrã€Dynamikeã€Usiã€Kayleeã€Vidtutsã€Lilã€Danicaã€Saschaã€Kelvã€Jacobã€Nyaã€Rodneyã€Brandonã€Elsieã€Blondinã€Grantã€Katrinã€Nyxã€Gabrielã€Locklainnã€Claireã€Devinã€Minervaã€Montyã€Austinã€Bradfordã€Siã€Keiraã€Hã€Caitlinã€Ditaã€Makaiã€Jennã€Annã€Meredithã€Clareã€Joyã€Praveenã€Codyã€Edmundã€Rutheã€Sirenaã€Gayathriã€Spiderã€FJã€Davidoffã€Tianã€Jennieã€Louiseã€Oskarã€Landonã€Noelleã€Jarvã€Ingridã€Alã€Sommerã€Docã€Ariaã€Huinã€Grayã€Liliã€Virã€DJã€Yangã€Tã€Simoneã€Maestroã€Scottã€Charleneã€Quixoteã€Amandaã€Susanã€Zedã€Anneã€Enkiduã€Esbeeã€Joroanã€Katelinã€Roxieã€Tayã€Scarletã€Kevinã€Johnnyã€Wolfgangã€Andrenã€Bobã€Howardã€Merovã€Randã€Rayã€Michonã€Newellã€Galenã€Dessieã€Lesã€Michonã€Jenelleã€Geoã€Sizã€Shapiroã€Peteã€Calyleã€Seleneã€Allenã€Phoebeã€Goldinã€Kimmoraã€Dakotaã€Slatonã€Lindquistã€Zoeyã€Hariã€Othelloã€Rohitã€Sheldonã€Petraã€Vialeã€Gordonã€Kayeã€Pinkã€Fernyã€Emersonã€Davyã€Briã€Chanã€Juanã€Robertã€Terrenceã€Nathanã€Carlã¨ã€ãã®ä»–多数ã®äººé”ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã—ãŸã€‚ ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ã“ã‚Œã¾ã§ã§æœ€é«˜ã®ã‚‚ã®ã«ãªã‚‹ã‚ˆã†ã”å”力をã„ãŸã ã„ãŸä»¥ä¸‹ã®ä½äººã®çš†æ§˜ã«æ·±ãæ„Ÿè¬ã„ãŸã—ã¾ã™ã€‚ able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar 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 b3278a8f9e..ceda48109e 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="åœŸåœ°æƒ…å ±"> + <floater.string name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> <floater.string name="Minutes"> [MINUTES] 分 </floater.string> @@ -15,7 +24,7 @@ <tab_container name="landtab"> <panel label="一般" name="land_general_panel"> <panel.string name="new users only"> - æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ã¿ + æ–°è¦ä½äººå°‚用 </panel.string> <panel.string name="anyone"> 誰ã§ã‚‚ @@ -27,13 +36,13 @@ [AREA] 平方メートル </panel.string> <panel.string name="auction_id_text"> - オークションID： [ID] + オークション ID： [ID] </panel.string> <panel.string name="need_tier_to_modify"> ã“ã®åœŸåœ°ã‚’ä¿®æ£å¤‰æ›´ã™ã‚‹ã«ã¯ã€è³¼å…¥ã‚’承èªã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ </panel.string> <panel.string name="group_owned_text"> - (グループ所有) + （グループ所有） </panel.string> <panel.string name="profile_text"> プãƒãƒ•ã‚£ãƒ¼ãƒ« @@ -42,13 +51,13 @@ æƒ…å ± </panel.string> <panel.string name="public_text"> - (公共) + （公共） </panel.string> <panel.string name="none_text"> （ãªã—） </panel.string> <panel.string name="sale_pending_text"> - (購入審査ä¸) + （購入審査ä¸ï¼‰ </panel.string> <panel.string name="no_selection_text"> 区画ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -73,7 +82,7 @@ Adult </text> <text name="Owner:"> - オーナー： + 所有者： </text> <text name="OwnerText"> Leyla Linden @@ -85,9 +94,9 @@ Leyla Linden </text> <button label="è¨å®š" label_selected="è¨å®š..." name="Set..."/> - <check_box label="グループã¸ã®è²æ¸¡ã‚’許å¯" name="check deed" tool_tip="グループã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ã¯ã“ã®åœŸåœ°ã‚’グループã«è²æ¸¡ã§ãã¾ã™ã€‚ãã†ã™ã‚‹ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®åœŸåœ°å‰²ã‚Šå½“ã¦ã«ã‚ˆã£ã¦ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚"/> - <button label="è²æ¸¡" label_selected="è²æ¸¡..." name="Deed..." tool_tip="é¸æŠžã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ã§ã‚ã‚‹ã¨ãã®ã¿ã€åœŸåœ°ã‚’è²æ¸¡ã§ãã¾ã™ã€‚"/> - <check_box label="オーナーãŒè²æ¸¡ã¨å…±ã«å¯„付" name="check contrib" tool_tip="土地ãŒã‚°ãƒ«ãƒ¼ãƒ—ã«è²æ¸¡ã•ã‚Œã‚‹ã¨ãã€å‰ã®æ‰€æœ‰è€…ã¯è²æ¸¡ãŒæˆç«‹ã™ã‚‹ã‚ˆã†ã€å分ãªåœŸåœ°ã‚’寄付ã—ã¾ã™ã€‚"/> + <check_box label="グループã¸ã®è²æ¸¡ã‚’許å¯" name="check deed" tool_tip="グループã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ã¯ã“ã®åœŸåœ°ã‚’グループã«è²æ¸¡ã§ãã¾ã™ã€‚グループã®åœŸåœ°å‰²ã‚Šå½“ã¦ã«ã‚ˆã£ã¦ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚"/> + <button label="è²æ¸¡" label_selected="è²æ¸¡..." name="Deed..." tool_tip="é¸æŠžã—ãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ã®ã¿ã€åœŸåœ°ã‚’è²æ¸¡ã§ãã¾ã™ã€‚"/> + <check_box label="所有者ãŒè²æ¸¡ã¨å…±ã«å¯„付" name="check contrib" tool_tip="土地ãŒã‚°ãƒ«ãƒ¼ãƒ—ã«è²æ¸¡ã•ã‚Œã‚‹ã¨ãã€å‰ã®æ‰€æœ‰è€…ã¯è²æ¸¡ãŒæˆç«‹ã™ã‚‹ã‚ˆã†ã€å分ãªåœŸåœ°ã‚’寄付ã—ã¾ã™ã€‚"/> <text name="For Sale:"> 販売ã®æœ‰ç„¡ï¼š </text> @@ -95,7 +104,7 @@ 販売対象外 </text> <text name="For Sale: Price L$[PRICE]."> - ä¾¡æ ¼ï¼š L$[PRICE] （L$[PRICE_PER_SQM]/平方メートル） + ä¾¡æ ¼ï¼š L$ [PRICE] （L$ [PRICE_PER_SQM] / 平方メートル） </text> <button label="土地を売る" label_selected="土地を販売..." name="Sell Land..." width="100"/> <text name="For sale to"> @@ -107,7 +116,7 @@ <text name="Selling with no objects in parcel."> オブジェクトã¯è²©å£²ã—ãªã„ </text> - <button label="土地販売ã®å–り消ã—" label_selected="土地販売ã®å–り消ã—" name="Cancel Land Sale" width="100"/> + <button label="土地販売ã®å–り消ã—" label_selected="土地販売ã®å–り消ã—" name="Cancel Land Sale" width="100"/> <text name="Claimed:"> å–得日時： </text> @@ -132,20 +141,20 @@ <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="土地ãŒæ‰€æœ‰ã•ã‚Œã¦ãŠã‚Šã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚オークションã®å¯¾è±¡ã«ãªã£ã¦ã„ãªã„ã“ã¨ã‚‚å¿…è¦æ¡ä»¶ã§ã™ã€‚"/> + <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地ãŒæ‰€æœ‰ã•ã‚Œã¦ãŠã‚Šã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚オークションã®å¯¾è±¡ã«ãªã£ã¦ã„ãªã„ã“ã¨ã‚‚å¿…è¦æ¡ä»¶ã§ã™ã€‚"/> </panel> <panel label="約款" name="land_covenant_panel"> <panel.string name="can_resell"> - ã“ã®åœ°åŸŸã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€å†è²©ã§ãã¾ã™ã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€å†è²©ã§ãã¾ã™ã€‚ </panel.string> <panel.string name="can_not_resell"> - ã“ã®åœ°åŸŸã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€å†è²©ã§ããªã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€å†è²©ã§ããªã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ </panel.string> <panel.string name="can_change"> - ã“ã®åœ°åŸŸã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€çµ±åˆã¾ãŸã¯å†åˆ†å‰²ã§ãã¾ã™ã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€çµ±åˆã¾ãŸã¯å†åˆ†å‰²ã§ãã¾ã™ã€‚ </panel.string> <panel.string name="can_not_change"> - ã“ã®åœ°åŸŸã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€çµ±åˆï¼å†åˆ†å‰²ã§ããªã„ã“ã¨ãŒ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§è³¼å…¥ã—ãŸåœŸåœ°ã¯ã€çµ±åˆãƒ»å†åˆ†å‰²ã§ããªã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ ã‚ã‚Šã¾ã™ã€‚ </panel.string> <text font="SansSerifLarge" name="estate_section_lbl"> @@ -155,7 +164,7 @@ メインランド </text> <text name="estate_owner_lbl"> - オーナー： + 所有者： </text> <text name="estate_owner_text"> （ãªã—） @@ -188,22 +197,21 @@ å†è²©ï¼š </text> <text name="resellable_clause"> - ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«ã‚る土地ã¯å†è²©ã§ãã¾ã›ã‚“。 + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«ã‚る土地ã¯å†è²©ã§ãã¾ã›ã‚“。 </text> <text name="changeable_lbl"> å†åˆ†å‰²ï¼š </text> <text name="changeable_clause"> - ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«ã‚る土地ã¯çµ±åˆã¾ãŸã¯åˆ†å‰²ãŒã§ã -ã¾ã›ã‚“。 + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«ã‚る土地ã¯çµ±åˆã¾ãŸã¯åˆ†å‰²ãŒã§ããªã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ </text> </panel> <panel label="オブジェクト" name="land_objects_panel"> <panel.string left="200" name="objects_available_text"> - [MAX]ã®å†…[COUNT]（[AVAILABLE]利用å¯èƒ½ï¼‰ + [MAX] ã®å†… [COUNT]（[AVAILABLE] 利用å¯èƒ½ï¼‰ </panel.string> <panel.string left="200" name="objects_deleted_text"> - [MAX]ã®å†…[COUNT]（[DELETED]を削除） + [MAX] ã®å†… [COUNT]（[DELETED] を削除） </panel.string> <text name="parcel_object_bonus"> オブジェクトボーナス: [BONUS] @@ -212,7 +220,7 @@ プリム使用状æ³ï¼š </text> <text left="200" name="objects_available"> - [MAX]ã®å†…[COUNT]（[AVAILABLE]利用å¯èƒ½ï¼‰ + [MAX] ã®å†… [COUNT] （[AVAILABLE] 利用å¯èƒ½ï¼‰ </text> <text name="Primitives parcel supports:" width="200"> 区画ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ãƒ—リム数： @@ -227,13 +235,13 @@ [COUNT] </text> <text name="Owned by parcel owner:" width="300"> - 区画オーナーã«ã‚ˆã‚‹æ‰€æœ‰ï¼š + 区画所有者ã®æ‰€æœ‰ç‰©ï¼š </text> <text left="200" name="owner_objects_text"> [COUNT] </text> <button label="表示" label_selected="表示" name="ShowOwner" right="-145"/> - <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトをオーナーã«è¿”å´ã—ã¾ã™"/> + <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトを所有者ã«è¿”å´ã—ã¾ã™"/> <text name="Set to group:"> グループã«è¨å®šï¼š </text> @@ -241,27 +249,27 @@ [COUNT] </text> <button label="表示" label_selected="表示" name="ShowGroup" right="-145"/> - <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトをオーナーã«è¿”å´ã—ã¾ã™"/> + <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトを所有者ã«è¿”å´ã—ã¾ã™"/> <text name="Owned by others:"> - 他人ã«ã‚ˆã‚‹æ‰€æœ‰ï¼š + 他人ã®æ‰€æœ‰ç‰©ï¼š </text> <text left="200" name="other_objects_text"> [COUNT] </text> <button label="表示" label_selected="表示" name="ShowOther" right="-145"/> - <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnOther..." right="-15" tool_tip="オブジェクトをオーナーã«è¿”å´ã—ã¾ã™"/> + <button label="è¿”å´" label_selected="è¿”å´..." name="ReturnOther..." right="-15" tool_tip="オブジェクトを所有者ã«è¿”å´ã—ã¾ã™"/> <text name="Selected / sat upon:"> - é¸æŠžæ¸ˆã¿ï¼æ±ºå®šæ¸ˆã¿ï¼š + é¸æŠžæ¸ˆã¿ãƒ»æ±ºå®šæ¸ˆã¿ï¼š </text> <text left="200" name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn" width="500"> - 他人ã®ã‚ªãƒ–ジェクトを自動返å´ï¼ˆåˆ†å˜ä½ã€0ã§è‡ªå‹•è¿”å´ãªã—）： + 他人ã®ã‚ªãƒ–ジェクトを自動返å´ï¼ˆåˆ†å˜ä½ã€0 ã§è‡ªå‹•è¿”å´ãªã—）： </text> <line_editor left_delta="5" name="clean other time" right="-80"/> <text name="Object Owners:" width="150"> - オブジェクトã®ã‚ªãƒ¼ãƒŠãƒ¼ï¼š + オブジェクトã®æ‰€æœ‰è€…： </text> <button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List" tool_tip="オブジェクトã®ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã—ã¾ã™"/> <button label="オブジェクトを返å´ã™ã‚‹" label_selected="オブジェクトã®è¿”å´..." left="256" name="Return objects..."/> @@ -269,7 +277,7 @@ <name_list.columns label="タイプ" name="type"/> <name_list.columns name="online_status"/> <name_list.columns label="åå‰" name="name"/> - <name_list.columns label="カウント" name="count"/> + <name_list.columns label="æ•°" name="count"/> <name_list.columns label="最新" name="mostrecent"/> </name_list> </panel> @@ -278,23 +286,23 @@ ã“ã®åŒºç”»ã‚’検索çµæžœã«è¡¨ç¤ºã™ã‚‹ </panel.string> <panel.string name="search_disabled_small_tooltip"> - 区画é¢ç©ãŒ128平方メートルã‹ãれ以下ã®ãŸã‚ã€ã“ã®ã‚ªãƒ—ションã¯ç„¡åŠ¹ã§ã™ã€‚ + 区画é¢ç©ãŒ 128 平方メートルã‹ãれ以下ã®ãŸã‚ã€ã“ã®ã‚ªãƒ—ションã¯ç„¡åŠ¹ã§ã™ã€‚ 大ããªåŒºç”»ã®ã¿æ¤œç´¢ã«è¡¨ç¤ºã•ã›ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ </panel.string> <panel.string name="search_disabled_permissions_tooltip"> ã‚ãªãŸã¯ã“ã®åŒºç”»ã®è¨å®šç·¨é›†ãŒã§ããªã„ãŸã‚ã€ã“ã®ã‚ªãƒ—ションã¯ç„¡åŠ¹ã§ã™ã€‚ </panel.string> <panel.string name="mature_check_mature"> - 控ãˆã‚コンテンツ + 「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ </panel.string> <panel.string name="mature_check_adult"> - Adultコンテンツ + 「Adultã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ </panel.string> <panel.string name="mature_check_mature_tooltip"> - ã‚ãªãŸã®åŒºç”»æƒ…å ±åŠã³ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯æŽ§ãˆã‚ã¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã®åŒºç”»æƒ…å ±åŠã³ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ŒModerateã€ã¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ </panel.string> <panel.string name="mature_check_adult_tooltip"> - ã‚ãªãŸã®åŒºç”»æƒ…å ±åŠã³ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯Adultã¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã®åŒºç”»æƒ…å ±åŠã³ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ŒAdultã€ã¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ </panel.string> <panel.string name="landing_point_none"> （ãªã—） @@ -303,7 +311,7 @@ ãƒ—ãƒƒã‚·ãƒ³ã‚°ã‚’åˆ¶é™ </panel.string> <panel.string name="push_restrict_region_text"> - ãƒ—ãƒƒã‚·ãƒ³ã‚°ã‚’åˆ¶é™ (地域優先) + ãƒ—ãƒƒã‚·ãƒ³ã‚°ã‚’åˆ¶é™ ï¼ˆåœ°åŸŸè¨å®šå„ªå…ˆï¼‰ </panel.string> <text name="allow_label"> ä»–ã®ä½äººã¸ã®è¨±å¯ï¼š @@ -330,10 +338,10 @@ </text> <check_box label="安全（ダメージãªã—）" name="check safe" tool_tip="ãƒã‚§ãƒƒã‚¯ã‚’入れるã¨ã“ã®åœŸåœ°ã§ã®ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚³ãƒ³ãƒãƒƒãƒˆãŒç„¡åŠ¹ã«ãªã‚Šã€ã€Œå®‰å…¨ã€ã«è¨å®šã•ã‚Œã¾ã™ã€‚ ãƒã‚§ãƒƒã‚¯ã‚’外ã™ã¨ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚³ãƒ³ãƒãƒƒãƒˆãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚"/> <check_box label="プッシングを制é™" name="PushRestrictCheck" tool_tip="スクリプトã«ã‚ˆã‚‹ãƒ—ッシングを制é™ã—ã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションをé¸æŠžã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€ã‚ãªãŸã®åœŸåœ°ã§ã®ç ´å£Šçš„行動を防ãã“ã¨ãŒã§ãã¾ã™ã€‚"/> - <check_box label="検索ã«åŒºç”»ã‚’表示（週 L$30）" name="ShowDirectoryCheck" tool_tip="ã“ã®åŒºç”»ã‚’検索çµæžœã«è¡¨ç¤ºã—ã¾ã™"/> + <check_box label="検索ã«åŒºç”»ã‚’表示（週 L$ 30）" name="ShowDirectoryCheck" tool_tip="ã“ã®åŒºç”»ã‚’検索çµæžœã«è¡¨ç¤ºã—ã¾ã™"/> <combo_box name="land category with adult"> <combo_box.item label="全カテゴリ" name="item0"/> - <combo_box.item label="Linden所在地" name="item1"/> + <combo_box.item label="Linden 所在地" name="item1"/> <combo_box.item label="Adult" name="item2"/> <combo_box.item label="アートã¨ã‚«ãƒ«ãƒãƒ£ãƒ¼" name="item3"/> <combo_box.item label="ビジãƒã‚¹" name="item4"/> @@ -348,7 +356,7 @@ </combo_box> <combo_box name="land category"> <combo_box.item label="全カテゴリー" name="item0"/> - <combo_box.item label="Linden所在地" name="item1"/> + <combo_box.item label="Linden 所在地" name="item1"/> <combo_box.item label="アート&カルãƒãƒ£ãƒ¼" name="item3"/> <combo_box.item label="ビジãƒã‚¹" name="item4"/> <combo_box.item label="教育的" name="item5"/> @@ -360,7 +368,7 @@ <combo_box.item label="ショッピング" name="item11"/> <combo_box.item label="ãã®ä»–" name="item12"/> </combo_box> - <check_box label="控ãˆã‚コンテンツ" name="MatureCheck" tool_tip=""/> + <check_box label="「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="MatureCheck" tool_tip=""/> <text name="Snapshot:"> スナップショット： </text> @@ -383,15 +391,11 @@ <text name="with media:"> 種類： </text> - <combo_box name="media type" tool_tip="URL ãŒå‹•ç”»ã€Webページã€ãã®ä»–ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®å ´åˆã«æŒ‡å®šã—ã¾ã™"/> + <combo_box name="media type" tool_tip="URL ãŒå‹•ç”»ã€Web ページã€ãã®ä»–ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‹ã‚’指定ã—ã¾ã™"/> <text name="at URL:"> ホームページ： </text> <button label="è¨å®š" label_selected="è¨å®š..." name="set_media_url"/> - <text name="CurrentURL:"> - ç¾åœ¨ã®ãƒšãƒ¼ã‚¸ï¼š - </text> - <button label="リセット..." label_selected="リセット..." name="reset_media_url" tool_tip="URLã‚’æ›´æ–°"/> <check_box label="URL ã‚’éžè¡¨ç¤º" name="hide_media_url" tool_tip="ã“ã®ã‚ªãƒ—ションをオンã«ã™ã‚‹ã¨ã€è¨±å¯ãªã—ã§ã“ã®åŒºç”»æƒ…å ±ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„るユーザーã«ã¯ãƒ¡ãƒ‡ã‚£ã‚¢ URL ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。 ã“れ㯠HTML タイプã«ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“ã®ã§ã”注æ„ãã ã•ã„。"/> <text name="Description:"> 説明： @@ -400,16 +404,16 @@ <text name="Media texture:"> テクスãƒãƒ£ç½®ãæ›ãˆï¼š </text> - <texture_picker label="" name="media texture" tool_tip="写真をクリックã—ã¦é¸æŠž" left="120"/> + <texture_picker label="" left="120" name="media texture" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <text name="replace_texture_help" width="290"> - ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’使用ã™ã‚‹ã‚ªãƒ–ジェクトã®ãƒ—レイをクリックã™ã‚‹ã¨ã€ãƒ ービーや Web ページを表示ã—ã¾ã™ã€‚ テクスãƒãƒ£ã‚’変更ã™ã‚‹ã«ã¯ã‚µãƒ ãƒã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ãã ã•ã„。 + ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’使用ã™ã‚‹ã‚ªãƒ–ジェクトã®ã€Œå†ç”Ÿã€ã‚’クリックã™ã‚‹ã¨ã€å‹•ç”»ã‚„ Web ページを表示ã—ã¾ã™ã€‚ テクスãƒãƒ£ã‚’変更ã™ã‚‹ã«ã¯ã‚µãƒ ãƒã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ãã ã•ã„。 </text> - <check_box label="スケールを自動è¨å®š" name="media_auto_scale" tool_tip="ã“ã®ã‚ªãƒ—ションをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã¨ã€ã“ã®åŒºç”»ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ã‚¹ã‚±ãƒ¼ãƒ«ãŒè‡ªå‹•çš„ã«è¨å®šã•ã‚Œã¾ã™ã€‚ 動作速度ã¨ç”»è³ªãŒå°‘ã—低下ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ãŒã€ä»–ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼ã®ã‚¹ã‚±ãƒ¼ãƒªãƒ³ã‚°ã‚„整列ãŒå¿…è¦ã«ãªã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。"/> - <text name="media_size" tool_tip="レンダリングã™ã‚‹Webメディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"> + <check_box label="スケールを自動è¨å®š" name="media_auto_scale" tool_tip="ã“ã®ã‚ªãƒ—ションをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã¨ã€ã“ã®åŒºç”»ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ã‚¹ã‚±ãƒ¼ãƒ«ãŒè‡ªå‹•çš„ã«è¨å®šã•ã‚Œã¾ã™ã€‚ 動作速度ã¨ç”»è³ªãŒå°‘ã—低下ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ãŒã€ä»–ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ã‚¹ã‚±ãƒ¼ãƒªãƒ³ã‚°ã‚„整列ãŒå¿…è¦ã«ãªã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。"/> + <text name="media_size" tool_tip="レンダリングã™ã‚‹ Web メディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"> サイズ： </text> - <spinner name="media_size_width" tool_tip="レンダリングã™ã‚‹Webメディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"/> - <spinner name="media_size_height" tool_tip="レンダリングã™ã‚‹Webメディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"/> + <spinner name="media_size_width" tool_tip="レンダリングã™ã‚‹ Web メディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"/> + <spinner name="media_size_height" tool_tip="レンダリングã™ã‚‹ Web メディアã®ã‚µã‚¤ã‚ºã§ã™ã€‚デフォルト㮠0 ã®ã¾ã¾ã«ã—ã¾ã™ã€‚"/> <text name="pixels"> ピクセル </text> @@ -422,6 +426,7 @@ <text name="MusicURL:"> 音楽 URL： </text> + <check_box label="URL ã‚’éžè¡¨ç¤ºã«ã™ã‚‹" name="hide_music_url" tool_tip="ã“ã®ã‚ªãƒ—ションã«ãƒã‚§ãƒƒã‚¯ã‚’入れるã¨ã€æ¨©é™ã®ãªã„人ãŒåŒºç”»æƒ…å ±ã‚’è¦‹ãŸã¨ãã«éŸ³æ¥½ã® URL ãŒéš ã‚Œã¾ã™ã€‚"/> <text name="Sound:"> サウンド： </text> @@ -431,14 +436,14 @@ </text> <check_box label="ボイスを有効ã«ã™ã‚‹" name="parcel_enable_voice_channel"/> <check_box label="ボイスを有効ã«ã™ã‚‹ï¼ˆä¸å‹•ç”£è¨å®šï¼‰" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box label="ボイスをã“ã®åŒºç”»ã«é™å®šã™ã‚‹" name="parcel_enable_voice_channel_parcel"/> + <check_box label="ボイスをã“ã®åŒºç”»ã«é™å®šã™ã‚‹" name="parcel_enable_voice_channel_local"/> </panel> <panel label="アクセス" name="land_access_panel"> <panel.string name="access_estate_defined"> （エステートã«é™å®šï¼‰ </panel.string> <panel.string name="estate_override"> - 1ã¤ä»¥ä¸Šã®ã‚ªãƒ—ションãŒã€ä¸å‹•ç”£ãƒ¬ãƒ™ãƒ«ã§è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ + 1 ã¤ä»¥ä¸Šã®ã‚ªãƒ—ションãŒã€ä¸å‹•ç”£ãƒ¬ãƒ™ãƒ«ã§è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ </panel.string> <text name="Limit access to this parcel to:"> ã“ã®åŒºç”»ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ @@ -449,8 +454,8 @@ </text> <check_box label="æ”¯æ‰•æƒ…å ±ç™»éŒ²æ¸ˆ [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="未確èªã®ä½äººã®ç«‹å…¥ã‚’ç¦æ¢ã—ã¾ã™ã€‚"/> <check_box label="å¹´é½¢ç¢ºèª [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="年齢確èªã‚’済ã¾ã›ã¦ã„ãªã„ä½äººã®ç«‹å…¥ã‚’ç¦æ¢ã—ã¾ã™ã€‚ 詳ã—ã„æƒ…å ±ã¯ [SUPPORT_SITE] ã‚’ã”覧下ã•ã„。"/> - <check_box label="グループã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ï¼š[GROUP]" name="GroupCheck" tool_tip="[一般]タブã§ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠžã—ã¦ãã ã•ã„。"/> - <check_box label="å…¥å ´è¨±å¯ã‚’販売：" name="PassCheck" tool_tip="ã“ã®åŒºç”»ã¸ã®ä¸€æ™‚çš„ãªã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã—ã¾ã™"/> + <check_box label="グループã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ï¼š[GROUP]" name="GroupCheck" tool_tip="「一般ã€ã‚¿ãƒ–ã§ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠžã—ã¦ãã ã•ã„。"/> + <check_box label="å…¥å ´è¨±å¯ã‚’販売：" name="PassCheck" tool_tip="ã“ã®åŒºç”»ã¸ã®ä¸€æ™‚çš„ãªã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã—ã¾ã™ã€‚"/> <combo_box name="pass_combo"> <combo_box.item label="誰ã§ã‚‚" name="Anyone"/> <combo_box.item label="グループ" name="Group"/> diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml index 4674df8bec..8c2ac17ace 100644 --- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml @@ -106,6 +106,9 @@ <floater.string name="E_ST_NO_XLT_EMOTE"> エモートåã‚’èªã¿ã¨ã‚Œã¾ã›ã‚“。 </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + ルートジョイントåãŒç„¡åŠ¹ã§ã™ã€‚「hipã€ã‚’使用ã—ã¦ãã ã•ã„。 + </floater.string> <text name="name_label"> åå‰ï¼š </text> diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml index 9fd788d9cb..8cb67ca521 100644 --- a/indra/newview/skins/default/xui/ja/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="グリッドオプション"> - <spinner label="グリッドユニット（メートル）" name="GridResolution"/> + <spinner label="グリッドå˜ä½ï¼ˆãƒ¡ãƒ¼ãƒˆãƒ«ï¼‰" name="GridResolution"/> <spinner label="グリッドﾞ範囲（メートル）" name="GridDrawSize"/> - <check_box label="サブユニットã«ã‚¹ãƒŠãƒƒãƒ—" name="GridSubUnit"/> + <check_box label="より細ã‹ã„å˜ä½ã§ã‚¹ãƒŠãƒƒãƒ—フィット" name="GridSubUnit"/> <check_box label="横æ–é¢ã‚’表示" name="GridCrossSection"/> - <text name="grid_opacity_label" tool_tip="グリッドã®é€æ˜Žåº¦"> - é€æ˜Žåº¦ï¼š + <text name="grid_opacity_label" tool_tip="グリッドã®ä¸é€æ˜Žåº¦"> + ä¸é€æ˜Žåº¦ï¼š </text> <slider label="グリッドã®ä¸é€æ˜Žåº¦" name="GridOpacity"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml index 69d4faf5b8..ed17736eb3 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater min_width="340" name="floater_buy_contents" title="ä¸èº«ã®è³¼å…¥" width="340"> <text name="contains_text" width="320"> - [NAME]ã®ä¸èº«ï¼š + [NAME] ã®ä¸èº«ï¼š </text> <scroll_list name="item_list" width="310"/> <text name="buy_text" width="320"> - ä¸èº«ã‚’[NAME]ã‹ã‚‰L$[AMOUNT]ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ + ä¸èº«ã‚’ [NAME] ã‹ã‚‰ L$[AMOUNT] ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ </text> <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel_btn" width="73"/> <button label="購入" label_selected="購入" left_delta="-77" name="buy_btn" width="73"/> - <check_box label="今ã™ãæœã‚’ç€ã‚‹" left_delta="-125" name="wear_check"/> + <check_box label="今ã™ãç€ã‚‹" left_delta="-125" name="wear_check"/> <text name="no_copy_text"> - (コピーä¸å¯) + （コピーä¸å¯ï¼‰ </text> <text name="no_modify_text"> - (ä¿®æ£ä¸å¯) + （修æ£ä¸å¯ï¼‰ </text> <text name="no_transfer_text"> - (å†è²©ãƒ»ãƒ—レゼントä¸å¯) + （å†è²©ãƒ»ãƒ—レゼントä¸å¯ï¼‰ </text> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml index f332c3d988..a274e25326 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml @@ -1,5 +1,132 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="土地ã®è³¼å…¥"> + <floater.string name="can_resell"> + å†è²©å¯èƒ½ + </floater.string> + <floater.string name="can_not_resell"> + å†è²©ä¸å¯èƒ½ + </floater.string> + <floater.string name="can_change"> + çµ±åˆãƒ»å†åˆ†å‰²å¯èƒ½ + </floater.string> + <floater.string name="can_not_change"> + çµ±åˆãƒ»å†åˆ†å‰²ä¸å¯èƒ½ + </floater.string> + <floater.string name="cant_buy_for_group"> + ã‚ãªãŸã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚°ãƒ«ãƒ¼ãƒ—用ã®åœŸåœ°è³¼å…¥ã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ + </floater.string> + <floater.string name="no_land_selected"> + 土地ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ + </floater.string> + <floater.string name="multiple_parcels_selected"> + 複数ã®ç•°ãªã£ãŸåŒºç”»ã‚’é¸æŠžã—ã¾ã—ãŸã€‚ +ã“れよりå°ã•ãªç¯„囲をé¸æŠžã—ã¦ãã ã•ã„。 + </floater.string> + <floater.string name="no_permission"> + ã‚ãªãŸã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚°ãƒ«ãƒ¼ãƒ—用ã®åœŸåœ°è³¼å…¥ã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ + </floater.string> + <floater.string name="parcel_not_for_sale"> + é¸æŠžã•ã‚ŒãŸåŒºç”»ã¯è²©å£²å¯¾è±¡å¤–ã§ã™ + </floater.string> + <floater.string name="group_already_owns"> + グループã¯ã™ã§ã«ã“ã®åŒºç”»ã‚’所有ã—ã¦ã„ã¾ã™ + </floater.string> + <floater.string name="you_already_own"> + ã‚ãªãŸã¯ã™ã§ã«ã“ã®åŒºç”»ã‚’所有ã—ã¦ã„ã¾ã™ + </floater.string> + <floater.string name="set_to_sell_to_other"> + é¸æŠžã•ã‚ŒãŸåŒºç”»ã¯ã€ä»–ã®äººã¸ã®è²©å£²ãŒæ±ºã¾ã£ã¦ã„ã¾ã™ + </floater.string> + <floater.string name="no_public_land"> + é¸æŠžã•ã‚ŒãŸåœ°åŸŸã«ã€å…¬å…±ã®åœŸåœ°ã¯ã‚ã‚Šã¾ã›ã‚“ + </floater.string> + <floater.string name="not_owned_by_you"> + ä»–ã®ä½äººãŒæ‰€æœ‰ã™ã‚‹åœŸåœ°ã‚’é¸æŠžã—ã¦ã„ã¾ã™ã€‚ +ã‚‚ã£ã¨ç‹ã„範囲をé¸æŠžã—ã¦ã¿ã¦ãã ã•ã„。 + </floater.string> + <floater.string name="processing"> + 購入処ç†ä¸... + +（数分ã‹ã‹ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ï¼‰ + </floater.string> + <floater.string name="fetching_error"> + 土地購入ã®æƒ…å ±å…¥æ‰‹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—㟠+ </floater.string> + <floater.string name="buying_will"> + ã“ã®åœŸåœ°ã‚’è²·ã†ã¨ï¼š + </floater.string> + <floater.string name="buying_for_group"> + グループ用ã®åœŸåœ°ã‚’購入ã™ã‚‹ã¨ï¼š + </floater.string> + <floater.string name="cannot_buy_now"> + ç¾åœ¨è³¼å…¥ä¸å¯ï¼š + </floater.string> + <floater.string name="not_for_sale"> + 販売対象外： + </floater.string> + <floater.string name="none_needed"> + 一切必è¦ãªã— + </floater.string> + <floater.string name="must_upgrade"> + アカウントをアップグレードã—ãªã„ã¨ã€åœŸåœ°ã‚’所有ã§ãã¾ã›ã‚“ + </floater.string> + <floater.string name="cant_own_land"> + ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§åœŸåœ°ã‚’所有ã§ãã¾ã™ + </floater.string> + <floater.string name="land_holdings"> + ã‚ãªãŸã¯ã€[BUYER] 平方メートルã®åœŸåœ°ã‚’所有ã—ã¦ã„ã¾ã™ã€‚ + </floater.string> + <floater.string name="pay_to_for_land"> + ã“ã®åœŸåœ°ã®ä»£é‡‘ã¨ã—ã¦ã€[SELLER]ã«L$[AMOUNT]を支払ㆠ+ </floater.string> + <floater.string name="buy_for_US"> + L$ [AMOUNT] ã‚’ã€ç´„ [LOCAL_AMOUNT] ã§è³¼å…¥ã—ã¾ã™ã€‚ + </floater.string> + <floater.string name="parcel_meters"> + ã“ã®åŒºç”»ã¯ [AMOUNT] 平方メートルã§ã™ã€‚ + </floater.string> + <floater.string name="premium_land"> + ã“ã®åœŸåœ°ã¯å‰²ã‚Šå¢—ã—付ã§ã™ã€‚ [AMOUNT] 平方メートルã®æ–™é‡‘ãŒã‹ã‹ã‚Šã¾ã™ã€‚ + </floater.string> + <floater.string name="discounted_land"> + ã“ã®åœŸåœ°ã¯ãƒ‡ã‚£ã‚¹ã‚«ã‚¦ãƒ³ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚ [AMOUNT] 平方メートルã®æ–™é‡‘ãŒã‹ã‹ã‚Šã¾ã™ã€‚ + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] 平方メートル +オブジェクト [AMOUNT2] 個サãƒãƒ¼ãƒˆ + </floater.string> + <floater.string name="sold_with_objects"> + オブジェクト込ã¿ã§è²©å£² + </floater.string> + <floater.string name="sold_without_objects"> + オブジェクトã¯å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“ + </floater.string> + <floater.string name="info_price_string"> + L$ [PRICE] +（L$[PRICE_PER_SQM]/平方メートル） +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + ã“ã® [GROUP] ãŒåŒºç”»ã®è³¼å…¥æ‰‹ç¶šãを完了ã™ã‚‹ã«ã¯ã€ ä¾¡æ ¼ã«è¦‹åˆã†ã ã‘ã®å¯„付ã•ã‚ŒãŸåœŸåœ°ã®åˆ©ç”¨å®Ÿç¸¾ãŒå¿…è¦ã§ã™ + </floater.string> + <floater.string name="have_enough_lindens"> + ã‚ãªãŸã®æ‰€æŒã™ã‚‹ L$ [AMOUNT]ã§ã€ã“ã®åœŸåœ°ã‚’購入ã§ãã¾ã™ + </floater.string> + <floater.string name="not_enough_lindens"> + ã‚ãªãŸã®æ‰€æŒé‡‘㯠L$ [AMOUNT]ã ã‘ã§ã€ã‚ã¨L$ [AMOUNT2] å¿…è¦ã§ã™ + </floater.string> + <floater.string name="balance_left"> + 購入後ã€ã‚ãªãŸã®æ®‹é¡ã¯L$[AMOUNT]ã«ãªã‚Šã¾ã™ + </floater.string> + <floater.string name="balance_needed"> + ã“ã®åœŸåœ°ã‚’è²·ã†ã«ã¯ã€å°‘ãªãã¨ã‚‚ L$ [AMOUNT] を購入ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ + </floater.string> + <floater.string name="no_parcel_selected"> + (区画ãŒé¸å®šã•ã‚Œã¦ã„ã¾ã›ã‚“) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> 地域： </text> @@ -27,10 +154,10 @@ <text name="resellable_changeable_label"> ã“ã®åœ°åŸŸã§è³¼å…¥ã—ãŸåœŸåœ°ï¼š </text> - <text name="resellable_clause" left="460"> + <text left="460" name="resellable_clause"> å†è²©ã§ãã‚‹å ´åˆã¨ã§ããªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ </text> - <text name="changeable_clause" left="460"> + <text left="460" name="changeable_clause"> çµ±åˆã¾ãŸã¯å†åˆ†å‰²ã§ãã‚‹å ´åˆã¨ã§ããªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ </text> <text name="covenant_text"> @@ -107,131 +234,4 @@ <check_box label="グループã‹ã‚‰ [AMOUNT] 平方メートルã®è²¢çŒ®ã‚’å–り除ãã¾ã™ã€‚" name="remove_contribution"/> <button label="購入" name="buy_btn"/> <button label="å–り消ã—" name="cancel_btn"/> - <string name="can_resell"> - å†è²©å¯èƒ½ - </string> - <string name="can_not_resell"> - å†è²©ä¸å¯èƒ½ - </string> - <string name="can_change"> - çµ±åˆãƒ»å†åˆ†å‰²å¯èƒ½ - </string> - <string name="can_not_change"> - çµ±åˆãƒ»å†åˆ†å‰²ä¸å¯èƒ½ - </string> - <string name="cant_buy_for_group"> - ã‚ãªãŸã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚°ãƒ«ãƒ¼ãƒ—用ã®åœŸåœ°è³¼å…¥ã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ - </string> - <string name="no_land_selected"> - 土地ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ - </string> - <string name="multiple_parcels_selected"> - 複数ã®ç•°ãªã£ãŸåŒºç”»ã‚’é¸æŠžã—ã¾ã—ãŸã€‚ -ã“れよりå°ã•ãªç¯„囲をé¸æŠžã—ã¦ãã ã•ã„。 - </string> - <string name="no_permission"> - ã‚ãªãŸã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚°ãƒ«ãƒ¼ãƒ—用ã®åœŸåœ°è³¼å…¥ã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ - </string> - <string name="parcel_not_for_sale"> - é¸æŠžã•ã‚ŒãŸåŒºç”»ã¯è²©å£²å¯¾è±¡å¤–ã§ã™ - </string> - <string name="group_already_owns"> - グループã¯ã™ã§ã«ã“ã®åŒºç”»ã‚’所有ã—ã¦ã„ã¾ã™ - </string> - <string name="you_already_own"> - ã‚ãªãŸã¯ã™ã§ã«ã“ã®åŒºç”»ã‚’所有ã—ã¦ã„ã¾ã™ - </string> - <string name="set_to_sell_to_other"> - é¸æŠžã•ã‚ŒãŸåŒºç”»ã¯ã€ä»–ã®äººã¸ã®è²©å£²ãŒæ±ºã¾ã£ã¦ã„ã¾ã™ - </string> - <string name="no_public_land"> - é¸æŠžã•ã‚ŒãŸåœ°åŸŸã«ã€å…¬å…±ã®åœŸåœ°ã¯ã‚ã‚Šã¾ã›ã‚“ - </string> - <string name="not_owned_by_you"> - ä»–ã®ä½¿ç”¨è€…ã«æ‰€æœ‰ã•ã‚ŒãŸåœŸåœ°ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ -ã“れよりå°ã•ãªç¯„囲をé¸æŠžã—ã¦ãã ã•ã„。 - </string> - <string name="processing"> - 購入処ç†ä¸... - -（数分ã‹ã‹ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ï¼‰ - </string> - <string name="fetching_error"> - 土地購入ã®æƒ…å ±å…¥æ‰‹ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ãã¾ã—㟠- </string> - <string name="buying_will"> - ã“ã®åœŸåœ°ã‚’è²·ã†ã¨ï¼š - </string> - <string name="buying_for_group"> - グループ用ã®åœŸåœ°ã‚’購入ã™ã‚‹ã¨ï¼š - </string> - <string name="cannot_buy_now"> - ç¾åœ¨è³¼å…¥ä¸å¯ï¼š - </string> - <string name="not_for_sale"> - 販売対象外： - </string> - <string name="none_needed"> - 一切必è¦ãªã— - </string> - <string name="must_upgrade"> - アカウントをアップグレードã—ãªã„ã¨ã€åœŸåœ°ã‚’所有ã§ãã¾ã›ã‚“ - </string> - <string name="cant_own_land"> - ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§åœŸåœ°ã‚’所有ã§ãã¾ã™ - </string> - <string name="land_holdings"> - ã‚ãªãŸã¯ã€[BUYER] 平方メートルã®åœŸåœ°ã‚’所有ã—ã¦ã„ã¾ã™ã€‚ - </string> - <string name="pay_to_for_land"> - ã“ã®åœŸåœ°ã®ä»£é‡‘ã¨ã—ã¦ã€[SELLER]ã«L$[AMOUNT]を支払ㆠ- </string> - <string name="buy_for_US"> - L$ [AMOUNT] ã‚’ã€ç´„ [LOCAL_AMOUNT] ã§è³¼å…¥ã—ã¾ã™ã€‚ - </string> - <string name="parcel_meters"> - ã“ã®åŒºç”»ã¯ [AMOUNT] 平方メートルã§ã™ã€‚ - </string> - <string name="premium_land"> - ã“ã®åœŸåœ°ã¯å‰²ã‚Šå¢—ã—付ã§ã™ã€‚ [AMOUNT] 平方メートルã®æ–™é‡‘ãŒã‹ã‹ã‚Šã¾ã™ã€‚ - </string> - <string name="discounted_land"> - ã“ã®åœŸåœ°ã¯ãƒ‡ã‚£ã‚¹ã‚«ã‚¦ãƒ³ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚ [AMOUNT] 平方メートルã®æ–™é‡‘ãŒã‹ã‹ã‚Šã¾ã™ã€‚ - </string> - <string name="meters_supports_object"> - [AMOUNT] 平方メートル -オブジェクト [AMOUNT2] 個サãƒãƒ¼ãƒˆ - </string> - <string name="sold_with_objects"> - オブジェクト込ã¿ã§è²©å£² - </string> - <string name="sold_without_objects"> - オブジェクトã¯å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“ - </string> - <string name="info_price_string"> - L$ [PRICE] -（L$[PRICE_PER_SQM]/平方メートル） -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - ã“ã® [GROUP] ãŒåŒºç”»ã®è³¼å…¥æ‰‹ç¶šãを完了ã™ã‚‹ã«ã¯ã€ ä¾¡æ ¼ã«è¦‹åˆã†ã ã‘ã®å¯„付ã•ã‚ŒãŸåœŸåœ°ã®åˆ©ç”¨å®Ÿç¸¾ãŒå¿…è¦ã§ã™ - </string> - <string name="have_enough_lindens"> - ã‚ãªãŸã®æ‰€æŒã™ã‚‹ L$ [AMOUNT]ã§ã€ã“ã®åœŸåœ°ã‚’購入ã§ãã¾ã™ - </string> - <string name="not_enough_lindens"> - ã‚ãªãŸã®æ‰€æŒé‡‘㯠L$ [AMOUNT]ã ã‘ã§ã€ã‚ã¨L$ [AMOUNT2] å¿…è¦ã§ã™ - </string> - <string name="balance_left"> - 購入後ã€ã‚ãªãŸã®æ®‹é¡ã¯L$[AMOUNT]ã«ãªã‚Šã¾ã™ - </string> - <string name="balance_needed"> - ã“ã®åœŸåœ°ã‚’è²·ã†ã«ã¯ã€å°‘ãªãã¨ã‚‚ L$ [AMOUNT] を購入ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ - </string> - <string name="no_parcel_selected"> - (区画ãŒé¸å®šã•ã‚Œã¦ã„ã¾ã›ã‚“) - </string> - <string name="buy_currency"> - ç´„US$ [USD]ã§L$ [LINDENS]を購入 - </string> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml index 7a5b7dc140..f323263699 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml @@ -4,7 +4,7 @@ ä¸èº«ï¼š </text> <text name="buy_text"> - [NAME]ã‹ã‚‰L$[AMOUNT]ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ + [NAME] ã‹ã‚‰ L$[AMOUNT] ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ </text> <button label="å–消" label_selected="å–消" name="cancel_btn"/> <button label="購入" label_selected="購入" name="buy_btn"/> @@ -15,12 +15,12 @@ 次ã®ã‚‚ã®ã‚’購入 </string> <text name="no_copy_text"> - (コピーä¸å¯) + （コピーä¸å¯ï¼‰ </text> <text name="no_modify_text"> - (ä¿®æ£ä¸å¯) + （修æ£ä¸å¯ï¼‰ </text> <text name="no_transfer_text"> - (å†è²©ãƒ»ãƒ—レゼントä¸å¯) + （å†è²©ãƒ»ãƒ—レゼントä¸å¯ï¼‰ </text> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml index 3730bcd385..610d4183b3 100644 --- a/indra/newview/skins/default/xui/ja/floater_camera.xml +++ b/indra/newview/skins/default/xui/ja/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> カメラを上下左å³ã«ç§»å‹• </floater.string> + <floater.string name="orbit_mode_title"> + 旋回 + </floater.string> + <floater.string name="pan_mode_title"> + 水平・垂直移動 + </floater.string> + <floater.string name="avatar_view_mode_title"> + 固定 + </floater.string> + <floater.string name="free_mode_title"> + オブジェクトを見る + </floater.string> <panel name="controls"> <joystick_track name="cam_track_stick" tool_tip="カメラを上下左å³ã«å‹•ã‹ã—ã¾ã™"/> <panel name="zoom" tool_tip="å‘ã„ã¦ã„る方法ã«ã‚«ãƒ¡ãƒ©ã‚’ズーム"> @@ -25,7 +37,7 @@ <panel name="buttons"> <button label="" name="orbit_btn" tool_tip="カメラを回ã™"/> <button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/> - <button label="" name="avatarview_btn" tool_tip="ã‚¢ãƒã‚¿ãƒ¼è¦–点"/> + <button label="" name="avatarview_btn" tool_tip="固定"/> <button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml index 27ce1adede..cc0032e1ab 100644 --- a/indra/newview/skins/default/xui/ja/floater_customize.xml +++ b/indra/newview/skins/default/xui/ja/floater_customize.xml @@ -35,7 +35,7 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シェイプをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シェイプをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -68,7 +68,7 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スã‚ンをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スã‚ンをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -105,7 +105,7 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„髪をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„髪をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -113,7 +113,7 @@ <text name="Item Action Label"> 髪型： </text> - <texture_picker label="テクスãƒãƒ£ãƒ¼" name="Texture" tool_tip="写真をクリックã—ã¦é¸æŠž"/> + <texture_picker label="テクスãƒãƒ£" name="Texture" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <button label="æ–°ã—ã„髪を作æˆ" label_selected="æ–°ã—ã„髪を作æˆ" name="Create New"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -156,8 +156,8 @@ <panel label="シャツ" name="Shirt"> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„シャツを作æˆ" label_selected="æ–°ã—ã„シャツを作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> + <button label="æ–°ã—ã„シャツを作æˆ" label_selected="æ–°ã—ã„シャツを作æˆ" name="Create New"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> <button label="戻ã™" label_selected="戻ã™" name="Revert"/> @@ -177,7 +177,7 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シャツをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シャツをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -189,8 +189,8 @@ <panel label="パンツ" name="Pants"> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> + <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> <button label="戻ã™" label_selected="戻ã™" name="Revert"/> @@ -238,6 +238,7 @@ <text name="not worn instructions"> ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„é´ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„é´ã‚’作æˆ" label_selected="æ–°ã—ã„é´ã‚’作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -246,7 +247,6 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„é´ã‚’作æˆ" label_selected="æ–°ã—ã„é´ã‚’作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -271,6 +271,7 @@ <text name="not worn instructions"> ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„é´ä¸‹ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" label_selected="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -279,7 +280,6 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" label_selected="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -302,8 +302,9 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„ジャケットをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„ジャケットをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„上ç€ã‚’作æˆ" label_selected="æ–°ã—ã„上ç€ã‚’作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -313,7 +314,6 @@ <texture_picker label="上åŠèº«ã®ç”Ÿåœ°" name="Upper Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <texture_picker label="下層生地" name="Lower Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„上ç€ã‚’作æˆ" label_selected="æ–°ã—ã„上ç€ã‚’作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -338,6 +338,7 @@ <text name="not worn instructions"> ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„手袋をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„手袋を作æˆ" label_selected="æ–°ã—ã„手袋を作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -346,7 +347,6 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„手袋を作æˆ" label_selected="æ–°ã—ã„手袋を作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -371,6 +371,7 @@ <text name="not worn instructions"> æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„下ç€ï¼ˆä¸Šï¼‰ã‚’ç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" label_selected="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -379,7 +380,6 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" label_selected="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -404,6 +404,7 @@ <text name="not worn instructions"> ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„下ç€ï¼ˆä¸‹ï¼‰ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -412,7 +413,6 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> @@ -435,8 +435,9 @@ [PATH] ã«æ‰€åœ¨ </text> <text name="not worn instructions"> - æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スカートを履ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スカートを履ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="スカートを作æˆ" label_selected="スカートを作æˆ" name="Create New"/> <text name="no modify instructions"> ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </text> @@ -445,13 +446,12 @@ </text> <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/> <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> - <button label="スカートを作æˆ" label_selected="スカートを作æˆ" name="Create New"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> <button label="戻ã™" label_selected="戻ã™" name="Revert"/> </panel> - <panel label="アルファ" name="Alpha"> + <panel label="タトゥ" name="Tattoo"> <text name="title"> [DESC] </text> @@ -468,26 +468,24 @@ å‚ç…§ [PATH] </text> <text name="not worn instructions"> - ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„アルファマスクをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„タトゥをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„タトゥを作æˆ" label_selected="æ–°ã—ã„タトゥを作æˆ" name="Create New"/> <text name="no modify instructions"> ã“ã®ç€ç”¨ç‰©ã‚’ä¿®æ£ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </text> <text name="Item Action Label"> - アルファ： + タトゥ： </text> - <texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="é 部ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Head Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="ç›®ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Eye Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="髪ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Hair Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <button label="æ–°ã—ã„アルファを作æˆ" label_selected="æ–°ã—ã„アルファを作æˆ" name="Create New"/> + <texture_picker label="é 部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Head Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="上部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Upper Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="下部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Lower Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> <button label="å…ƒã«æˆ»ã™" label_selected="å…ƒã«æˆ»ã™" name="Revert"/> </panel> - <panel label="タトゥ" name="Tattoo"> + <panel label="アルファ" name="Alpha"> <text name="title"> [DESC] </text> @@ -504,25 +502,27 @@ å‚ç…§ [PATH] </text> <text name="not worn instructions"> - ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„タトゥをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ + ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„アルファマスクをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ </text> + <button label="æ–°ã—ã„アルファを作æˆ" label_selected="æ–°ã—ã„アルファを作æˆ" name="Create New"/> <text name="no modify instructions"> ã“ã®ç€ç”¨ç‰©ã‚’ä¿®æ£ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </text> <text name="Item Action Label"> - タトゥ： + アルファ： </text> - <texture_picker label="é 部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Head Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="上部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Upper Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <texture_picker label="下部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Lower Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <button label="æ–°ã—ã„タトゥを作æˆ" label_selected="æ–°ã—ã„タトゥを作æˆ" name="Create New"/> + <texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="é 部ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Head Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="ç›®ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Eye Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <texture_picker label="髪ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Hair Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/> <button label="å…ƒã«æˆ»ã™" label_selected="å…ƒã«æˆ»ã™" name="Revert"/> </panel> </tab_container> - <button label="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" label_selected="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" name="script_info"/> + <button label="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" label_selected="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" name="script_info" tool_tip="ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«ä»˜ã„ã¦ã„るスクリプトを表示ã—ã¾ã™"/> <button label="アウトフィット作æˆ" label_selected="アウトフィット作æˆ" name="make_outfit_btn"/> <button label="ã‚ャンセル" label_selected="ã‚ャンセル" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml index 3bd5ed2837..2a7985fe58 100644 --- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="Day Cycle Floater" title="デイ・サイクル編集"> +<floater name="Day Cycle Floater" title="デイサイクル編集"> <tab_container name="Day Cycle Tabs"> - <panel label="デイ・サイクル" name="Day Cycle"> + <panel label="デイサイクル" name="Day Cycle"> <button label="?" name="WLDayCycleHelp" /> <text name="WL12am"> 深夜 12時 @@ -63,7 +63,7 @@ ã‚ーフレームã®è¨å®šï¼š </text> <text name="WLCurKeyTimeText"> - ã‚ー・タイム： + ã‚ータイム： </text> <spinner label="時間" name="WLCurKeyHour" /> <spinner label="分" name="WLCurKeyMin" /> @@ -88,10 +88,10 @@ <button label="åœæ¢!" label_selected="åœæ¢" name="WLStopAnimSky" /> <button label="ä¸å‹•ç”£ã®æ™‚刻を使用" label_selected="ä¸å‹•ç”£ã®æ™‚刻ã«å¤‰æ›´" name="WLUseLindenTime" width="140"/> - <button label="デイ・テストをä¿å˜" - label_selected="デイ・テストをä¿å˜" name="WLSaveDayCycle" /> - <button label="デイ・テストをãƒãƒ¼ãƒ‰" - label_selected="デイ・テストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" /> + <button label="デイテストをä¿å˜" + label_selected="デイテストをä¿å˜" name="WLSaveDayCycle" /> + <button label="デイテストをãƒãƒ¼ãƒ‰" + label_selected="デイテストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" /> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml new file mode 100644 index 0000000000..671f9077d9 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_event.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="イベント" name="Event" title="イベント詳細"> + <floater.string name="none"> + ãªã— + </floater.string> + <floater.string name="notify"> + 知らã›ã‚‹ + </floater.string> + <floater.string name="dont_notify"> + 知らã›ãªã„ + </floater.string> + <floater.string name="moderate"> + Moderate + </floater.string> + <floater.string name="adult"> + Adult + </floater.string> + <floater.string name="general"> + General + </floater.string> + <floater.string name="unknown"> + ä¸æ˜Ž + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Nameless Event...of Doom! De doom! Doom doom. + </text> + <text name="event_category"> + （カテゴリãªã—） + </text> + <text name="event_runby_label"> + 主催者： + </text> + <text initial_value="（å–å¾—ä¸ï¼‰" name="event_runby"/> + <text name="event_date_label"> + 日付： + </text> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration_label"> + 期間： + </text> + <text name="event_duration"> + 1 時間 + </text> + <text name="event_covercharge_label"> + ã‚«ãƒãƒ¼ãƒãƒ£ãƒ¼ã‚¸ï¼š + </text> + <text name="event_cover"> + ç„¡æ–™ + </text> + <text name="event_location_label"> + å ´æ‰€ï¼š + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="レーティング区分："/> + <text name="rating_value" value="ä¸æ˜Ž"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="イベント作æˆ"/> + <button name="god_delete_event_btn" tool_tip="イベント削除"/> + <button label="知らã›ã‚‹" name="notify_btn"/> + <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn"/> + <button label="地図" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml index 075cde8dec..6ccd6b9293 100644 --- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml @@ -2,7 +2,7 @@ <floater name="godtools floater" title="ゴッド・ツール"> <tab_container name="GodTools Tabs"> <panel label="グリッド" name="grid"> - <button label="ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã™" label_selected="ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã™" name="Kick all users" width="160"/> + <button label="ä½äººå…¨å“¡ã‚’追ã„出ã™" label_selected="ä½äººå…¨å“¡ã‚’追ã„出ã™" name="Kick all users" width="160"/> <button label="ã“ã®åœ°åŸŸã®åœ°å›³ã®è¡¨ç¤ºã‚ャッシュを消去" label_selected="ã“ã®åœ°åŸŸã®åœ°å›³ã®è¡¨ç¤ºã‚ャッシュを消去" name="Flush This Region's Map Visibility Caches"/> </panel> <panel label="地域" name="region"> diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml index 0a783713d5..15200d7ef7 100644 --- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_help_browser" title="ヘルプブラウザ"> - <floater.string name="home_page_url"> - http://jp.secondlife.com - </floater.string> - <floater.string name="support_page_url"> - http://jp.secondlife.com/support + <floater.string name="loading_text"> + ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... </floater.string> <layout_stack name="stack1"> - <layout_panel name="external_controls"> - <button label="Web ブラウザã§é–‹ã" name="open_browser"/> - </layout_panel> + <layout_panel name="external_controls"/> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_im.xml b/indra/newview/skins/default/xui/ja/floater_im.xml index 9c323f25e6..2e8993ec21 100644 --- a/indra/newview/skins/default/xui/ja/floater_im.xml +++ b/indra/newview/skins/default/xui/ja/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="インスタント・メッセージ"> <string name="only_user_message"> - ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã„るユーザーã¯ã‚ãªãŸã ã‘ã§ã™ã€‚ + ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã¯ã€ã‚ãªãŸã—ã‹ã„ã¾ã›ã‚“。 </string> <string name="offline_message"> [FIRST] [LAST]ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ @@ -32,7 +32,7 @@ </string> <!-- ALL of the event strings should have [RECIPIENT] in them --> <string name="add_session_event"> - [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ + [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ä½äººã‚’è¿½åŠ ã§ãã¾ã›ã‚“。 </string> <string name="message_session_event"> [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml index 1d028258ec..06b65e27f0 100644 --- a/indra/newview/skins/default/xui/ja/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="æ›ç®—"/> +<multi_floater name="floater_im_box" title="会話"/> diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 78af3cec07..8d920a3c3f 100644 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="ミニマップ"> <floater.string name="mini_map_north"> 北 </floater.string> diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml index 8ba297c7a0..20aec48541 100644 --- a/indra/newview/skins/default/xui/ja/floater_moveview.xml +++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> 後ã‚ã«é£›ã¶ï¼ˆä¸‹çŸ¢å°ã‹ S を押ã™ï¼‰ </string> + <string name="walk_title"> + æ©ã + </string> + <string name="run_title"> + èµ°ã‚‹ + </string> + <string name="fly_title"> + 飛㶠+ </string> <panel name="panel_actions"> <button label="" label_selected="" name="turn left btn" tool_tip="左をå‘ã（左矢å°ã‹ A を押ã™ï¼‰"/> <button label="" label_selected="" name="turn right btn" tool_tip="å³ã‚’å‘ã（å³çŸ¢å°ã‹ D を押ã™ï¼‰"/> @@ -30,6 +39,5 @@ <button label="" name="mode_walk_btn" tool_tip="æ©è¡Œãƒ¢ãƒ¼ãƒ‰"/> <button label="" name="mode_run_btn" tool_tip="走行モード"/> <button label="" name="mode_fly_btn" tool_tip="飛行モード"/> - <button label="飛行åœæ¢" name="stop_fly_btn" tool_tip="飛行åœæ¢"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml index a869b106ce..70555e6ded 100644 --- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="アウトフィットをä¿å˜ã™ã‚‹"> <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> <button label="ã‚ャンセル" label_selected="ã‚ャンセル" name="Cancel"/> <text name="Save item as:"> - アウトフィットを別åã§ä¿å˜ï¼š + ç€ç”¨ã—ã¦ã„ã‚‹ã‚‚ã®ã‚’ +æ–°ã—ã„アウトフィットã«ä¿å˜ï¼š </text> <line_editor name="name ed"> - [DESC] + [DESC] （新） </line_editor> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml index 8d67108b77..4ccaf1a4af 100644 --- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml @@ -25,10 +25,13 @@ 繋ãŒã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ ã‚ã¨ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </text> <text name="nearby"> - [VOICE_CHANNEL_NAME] ã¸ã®æŽ¥ç¶šãŒåˆ‡ã‚Œã¾ã—ãŸã€‚ 「近ãã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã€ã«å†æŽ¥ç¶šã•ã‚Œã¾ã™ã€‚ + [VOICE_CHANNEL_NAME] ã¸ã®æŽ¥ç¶šãŒåˆ‡ã‚Œã¾ã—ãŸã€‚ [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> - [VOICE_CHANNEL_NAME] ãŒã‚³ãƒ¼ãƒ«ã‚’終了ã—ã¾ã—ãŸã€‚ 「近ãã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã€ã«å†æŽ¥ç¶šã•ã‚Œã¾ã™ã€‚ + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] ãŒã‚³ãƒ¼ãƒ«ã‚’終了ã—ã¾ã—ãŸã€‚ [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + コールを終了ã—ã¾ã—ãŸã€‚ [RECONNECT_NEARBY] </text> <text name="leaving"> [CURRENT_CHAT] を終了ã—ã¾ã™ã€‚ diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml index 4564354899..39bc37bc6c 100644 --- a/indra/newview/skins/default/xui/ja/floater_pay.xml +++ b/indra/newview/skins/default/xui/ja/floater_pay.xml @@ -7,7 +7,7 @@ ä½äººã«æ”¯æ‰•ã† </string> <text name="payee_label"> - 支払ã„： + 支払ã†ï¼š </text> <icon name="icon_person" tool_tip="ä½äºº"/> <text name="payee_name"> @@ -20,6 +20,6 @@ <text name="amount text"> 金é¡ã‚’指定： </text> - <button label="支払ã„" label_selected="支払ã„" name="pay btn"/> + <button label="支払ã†" label_selected="支払ã†" name="pay btn"/> <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml index e2893d5eab..6ba27b71a6 100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="一般" name="general"/> <panel label="グラフィック" name="display"/> <panel label="プライãƒã‚·ãƒ¼" name="im"/> - <panel label="サウンド" name="audio"/> + <panel label="サウンドã¨ãƒ¡ãƒ‡ã‚£ã‚¢" name="audio"/> <panel label="ãƒãƒ£ãƒƒãƒˆ" name="chat"/> <panel label="メッセージ" name="msgs"/> <panel label="セットアップ" name="input"/> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index 2c0d6a0097..4fc59e16d3 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> 説明： </text> - <button label="ワールドå†ç”Ÿ" label_selected="åœæ¢" name="Anim play btn" tool_tip="他人ã«ã‚‚見ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> + <button label="インワールドã§å†ç”Ÿ" label_selected="åœæ¢" name="Anim play btn" tool_tip="他人ã«ã‚‚見ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> <button label="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" label_selected="åœæ¢" name="Anim audition btn" tool_tip="自分ã ã‘ãŒè¦‹ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml index 8a0aea717c..64c577b879 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml @@ -33,10 +33,10 @@ <text name="trigger_label"> トリガー: </text> - <text name="replace_text" tool_tip="トリガー・ワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"> + <text name="replace_text" tool_tip="トリガーワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"> ç½®æ›ï¼š </text> - <line_editor name="replace_editor" tool_tip="トリガー・ワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"/> + <line_editor name="replace_editor" tool_tip="トリガーワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"/> <text name="key_label"> ショートカット： </text> @@ -62,7 +62,7 @@ <text name="help_label"> 待機ステップを入れãªã„é™ã‚Šã¯ã€ã™ã¹ã¦ã®ã‚¹ãƒ†ãƒƒãƒ—ãŒåŒæ™‚ã«èµ·ã“ã‚Šã¾ã™ã€‚ </text> - <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェスãƒãƒ£ãƒ¼ã¯ã€ãƒˆãƒªã‚¬ãƒ¼ãƒ»ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’使ã†ã‹ã€ã¾ãŸã¯ãƒ›ãƒƒãƒˆãƒ»ã‚ーを押ã™ã“ã¨ã«ã‚ˆã£ã¦ãƒˆãƒªã‚¬ãƒ¼ã§ãã¾ã™ã€‚ 1ã¤ã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆãƒ»ã‚ーã«2ã¤ä»¥ä¸Šã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸå ´åˆã€ãã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ä¸¡æ–¹ã¨ã‚‚アクティブã§ã¯ãªããªã‚Šã¾ã™ã€‚"/> + <check_box label="アクティブ" name="active_check" tool_tip="アクティブãªã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ã€ãƒˆãƒªã‚¬ãƒ¼ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’使ã†ã‹ã€ãƒ›ãƒƒãƒˆã‚ーを押ã™ã¨åˆ‡ã‚Šæ›¿ã‚ã‚Šã¾ã™ã€‚ 1ã¤ã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚ーã«2ã¤ä»¥ä¸Šã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸå ´åˆã€ãã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ä¸¡æ–¹ã¨ã‚‚アクティブã§ã¯ãªããªã‚Šã¾ã™ã€‚"/> <button label="プレビュー" name="preview_btn"/> <button label="ä¿å˜" name="save_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml index dc334dfc1f..5c0f05cec6 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml @@ -6,6 +6,6 @@ <text name="desc txt"> 説明： </text> - <button label="ワールドå†ç”Ÿ" label_selected="ワールドå†ç”Ÿ" name="Sound play btn" tool_tip="他人ã«ã‚‚èžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> + <button label="インワールドã§å†ç”Ÿ" label_selected="インワールドã§å†ç”Ÿ" name="Sound play btn" tool_tip="他人ã«ã‚‚èžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> <button label="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" label_selected="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" name="Sound audition btn" tool_tip="自分ã ã‘ãŒèžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml index c322538127..6ea1d79cfc 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="ã‚ャンセル" name="Discard"/> + <button label="処分ã™ã‚‹" name="Discard"/> <button label="別åã§ä¿å˜" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml new file mode 100644 index 0000000000..ca6204424e --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="クラシファイド広告掲載"> + <text name="explanation_text"> + ã‚ãªãŸã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã¯ã€æŽ²è¼‰ã•ã‚ŒãŸæ—¥ã‹ã‚‰1週間有効ã§ã™ã€‚ + +クラシファイド広告ã¯è¿”金ã§ãã¾ã›ã‚“ã®ã§ã”了承ãã ã•ã„。 + </text> + <spinner label="広告費：" name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼" value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + 詳ã—ã„æƒ…å ±ï¼ˆã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰ãƒ˜ãƒ«ãƒ—ã¸ã®ãƒªãƒ³ã‚¯ï¼‰ + </text> + <button label="掲載" name="publish_btn"/> + <button label="ã‚ャンセル" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml index c66f307f23..105e903840 100644 --- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml @@ -49,7 +49,7 @@ <combo_box.item label="商å–引＞製å“ã¾ãŸã¯ã‚µãƒ¼ãƒ“スã®æä¾›ãŒè¡Œã‚ã‚Œãªã„" name="Commerce__Failure_to_deliver_product_or_service"/> <combo_box.item label="開示＞リアルワールドã®æƒ…å ±" name="Disclosure__Real_world_information"/> <combo_box.item label="開示＞離れãŸã¨ã“ã‚ã‹ã‚‰ãƒãƒ£ãƒƒãƒˆã‚’モニターã—ã¦ã„ã‚‹" name="Disclosure__Remotely_monitoring chat"/> - <combo_box.item label="開示＞Second Lifeã®æƒ…å ±/ãƒãƒ£ãƒƒãƒˆ/IM" name="Disclosure__Second_Life_information_chat_IMs"/> + <combo_box.item label="開示＞Second Life ã®æƒ…å ±/ãƒãƒ£ãƒƒãƒˆ/IM" name="Disclosure__Second_Life_information_chat_IMs"/> <combo_box.item label="å¹³ç©ã‚’ä¹±ã™è¡Œç‚ºï¼žåœ°åŸŸãƒªã‚½ãƒ¼ã‚¹ã®ä½¿ç”¨ãŒä¸å…¬å¹³" name="Disturbing_the_peace__Unfair_use_of_region_resources"/> <combo_box.item label="å¹³ç©ã‚’ä¹±ã™è¡Œç‚ºï¼žã‚¹ã‚¯ãƒªãƒ—ト・オブジェクトã®ä¹±ç”¨" name="Disturbing_the_peace__Excessive_scripted_objects"/> <combo_box.item label="å¹³ç©ã‚’ä¹±ã™è¡Œç‚ºï¼žã‚ªãƒ–ジェクトã®æ¨ã¦ç½®ã" name="Disturbing_the_peace__Object_littering"/> @@ -57,7 +57,7 @@ <combo_box.item label="å¹³ç©ã‚’ä¹±ã™è¡Œç‚ºï¼žä¸è¦ãªåºƒå‘Šã‚¹ãƒ‘ム" name="Disturbing_the_peace__Unwanted_advert_spam"/> <combo_box.item label="è©æ¬ºï¼ž L$" name="Fraud__L$"/> <combo_box.item label="è©æ¬ºï¼žåœŸåœ°" name="Fraud__Land"/> - <combo_box.item label="è©æ¬ºï¼žãƒžãƒ«ãƒå•†æ³•ã¾ãŸã¯ãƒã‚§ãƒ¼ãƒ³ãƒ»ãƒ¡ãƒ¼ãƒ«" name="Fraud__Pyramid_scheme_or_chain_letter"/> + <combo_box.item label="è©æ¬ºï¼žãƒžãƒ«ãƒå•†æ³•ã¾ãŸã¯ãƒã‚§ãƒ¼ãƒ³ãƒ¡ãƒ¼ãƒ«" name="Fraud__Pyramid_scheme_or_chain_letter"/> <combo_box.item label="è©æ¬ºï¼ž US$" name="Fraud__US$"/> <combo_box.item label="å«ŒãŒã‚‰ã›ï¼žåºƒå‘Šå§”託/視覚的ãªã‚¹ãƒ‘ム" name="Harassment__Advert_farms___visual_spam"/> <combo_box.item label="å«ŒãŒã‚‰ã›ï¼žå€‹äººã¾ãŸã¯ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸å‚·" name="Harassment__Defaming_individuals_or_groups"/> @@ -68,11 +68,11 @@ <combo_box.item label="ã‚ã„ã›ã¤ï¼žè‘—ã—ãä¸å¿«ã§ã‚ã‚‹ã¨è¦‹ãªã•ã‚Œã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¾ãŸã¯è¡Œç‚º" name="Indecency__Broadly_offensive_content_or_conduct"/> <combo_box.item label="ã‚ã„ã›ã¤ï¼žä¸é©åˆ‡ãªã‚¢ãƒã‚¿ãƒ¼å" name="Indecency__Inappropriate_avatar_name"/> <combo_box.item label="ã‚ã„ã›ã¤ï¼žPG地域ã§ã®ä¸é©åˆ‡ãªã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¾ãŸã¯è¡Œç‚º" name="Indecency__Mature_content_in_PG_region"/> - <combo_box.item label="ã‚ã„ã›ã¤ > 控ãˆã‚指定ã®åœ°åŸŸã§ã®ä¸é©åˆ‡ãªã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¾ãŸã¯è¡Œç‚º" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="ã‚ã„ã›ã¤ > 「Moderateã€æŒ‡å®šã®åœ°åŸŸã§ã®ä¸é©åˆ‡ãªã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¾ãŸã¯è¡Œç‚º" name="Indecency__Inappropriate_content_in_Mature_region"/> <combo_box.item label="知的財産ã®ä¾µå®³ï¼žã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®æ’¤åŽ»" name="Intellectual_property_infringement_Content_Removal"/> <combo_box.item label="知的財産ã®ä¾µå®³ï¼žã‚³ãƒ”ーBotåŠã³æ¨©é™ã®æ‚ªç”¨" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> <combo_box.item label="ä¸å¯›å®¹" name="Intolerance"/> - <combo_box.item label="土地＞サンドボックス・リソースã®ä¹±ç”¨" name="Land__Abuse_of_sandbox_resources"/> + <combo_box.item label="土地＞サンドボックスã®ãƒªã‚½ãƒ¼ã‚¹ã®ä¹±ç”¨" name="Land__Abuse_of_sandbox_resources"/> <combo_box.item label="土地＞ä¸æ³•ä¾µå…¥ï¼žã‚ªãƒ–ジェクト/テクスãƒãƒ£ãƒ¼" name="Land__Encroachment__Objects_textures"/> <combo_box.item label="土地＞ä¸æ³•ä¾µå…¥ï¼žãƒ‘ーティクル" name="Land__Encroachment__Particles"/> <combo_box.item label="土地＞ä¸æ³•ä¾µå…¥ï¼žæ¨¹æœ¨/æ¤ç‰©" name="Land__Encroachment__Trees_plants"/> diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index 4ad54ec7ab..153b4068ad 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -3,9 +3,9 @@ <text name="type_label"> スナップショットã®é€ã‚Šå…ˆ </text> - <radio_group label="スナップショット・タイプ" name="snapshot_type_radio"> + <radio_group label="スナップショットã®ç¨®é¡ž" name="snapshot_type_radio"> <radio_item label="メール" name="postcard"/> - <radio_item label="ç§ã®æŒã¡ç‰©ï¼ˆL$[AMOUNT]）" name="texture"/> + <radio_item label="「æŒã¡ç‰©ã€ã«ä¿å˜ï¼ˆL$ [AMOUNT]）" name="texture"/> <radio_item label="コンピューターã«ä¿å˜" name="local"/> </radio_group> <text name="file_size_label"> @@ -16,7 +16,7 @@ <button label="ä¿å˜ï¼ˆL$[AMOUNT]）" name="upload_btn"/> <flyout_button label="ä¿å˜" name="save_btn" tool_tip="ç”»åƒã‚’ファイルã«ä¿å˜"> <flyout_button.item label="ä¿å˜" name="save_item"/> - <flyout_button.item label="åå‰ã‚’付ã‘ã¦ä¿å˜" name="saveas_item"/> + <flyout_button.item label="別åã§ä¿å˜..." name="saveas_item"/> </flyout_button> <button label="ã‚ャンセル" name="discard_btn"/> <button label="全表示" name="more_btn" tool_tip="詳ã—ã„è¨å®š"/> @@ -29,26 +29,26 @@ </text> <combo_box label="解åƒåº¦" name="postcard_size_combo"> <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/> - <combo_box.item label="640x480" name="640x480"/> - <combo_box.item label="800x600" name="800x600"/> - <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="640 x 480" name="640x480"/> + <combo_box.item label="800 x 600" name="800x600"/> + <combo_box.item label="1024 x 768" name="1024x768"/> <combo_box.item label="カスタム" name="Custom"/> </combo_box> <combo_box label="解åƒåº¦" name="texture_size_combo"> <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/> - <combo_box.item label="å°ï¼ˆ128x128）" name="Small(128x128)"/> - <combo_box.item label="ä¸ï¼ˆ256x256）" name="Medium(256x256)"/> - <combo_box.item label="大（512x512）" name="Large(512x512)"/> + <combo_box.item label="å°ï¼ˆ128 x 128）" name="Small(128x128)"/> + <combo_box.item label="ä¸ï¼ˆ256 x 256）" name="Medium(256x256)"/> + <combo_box.item label="大（512 x5 12）" name="Large(512x512)"/> <combo_box.item label="カスタム" name="Custom"/> </combo_box> <combo_box label="解åƒåº¦" name="local_size_combo"> <combo_box.item label="ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="CurrentWindow"/> - <combo_box.item label="320x240" name="320x240"/> - <combo_box.item label="640x480" name="640x480"/> - <combo_box.item label="800x600" name="800x600"/> - <combo_box.item label="1024x768" name="1024x768"/> - <combo_box.item label="1280x1024" name="1280x1024"/> - <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="320 x 240" name="320x240"/> + <combo_box.item label="640 x 480" name="640x480"/> + <combo_box.item label="800 x 600" name="800x600"/> + <combo_box.item label="1024 x 768" name="1024x768"/> + <combo_box.item label="1280 x 1024" name="1280x1024"/> + <combo_box.item label="1600 x 1200" name="1600x1200"/> <combo_box.item label="カスタム" name="Custom"/> </combo_box> <combo_box label="å½¢å¼" name="local_format_combo"> @@ -65,8 +65,8 @@ </text> <combo_box label="ç”»åƒãƒ¬ã‚¤ãƒ¤ãƒ¼" name="layer_types"> <combo_box.item label="色" name="Colors"/> - <combo_box.item label="æ·±ã•" name="Depth"/> - <combo_box.item label="オグジェクトã®ã¤ã‚„消ã—" name="ObjectMattes"/> + <combo_box.item label="色深度" name="Depth"/> + <combo_box.item label="マットオブジェクト" name="ObjectMattes"/> </combo_box> <check_box label="インターフェース" name="ui_check"/> <check_box label="HUD" name="hud_check"/> @@ -74,6 +74,6 @@ <check_box label="ç”»é¢å…¨ä½“ã‚’é™æ¢" name="freeze_frame_check"/> <check_box label="自動更新" name="auto_snapshot_check"/> <string name="unknown"> - 未知 + ä¸æ˜Ž </string> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml index a7c0a2b391..6536eb253c 100644 --- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="notification_chiclet" title="通知"> <string name="title_im_well_window"> - IMセッション + 会話 </string> <string name="title_notification_well_window"> 通知 diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index 456e30c2b4..a8261a7493 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -4,19 +4,19 @@ 色ã®ä»˜ã„ãŸãƒãƒ³ãƒ‰ã‚’ドラッグã—ã¦ã‚ªãƒ–ジェクトを回転 </floater.string> <floater.string name="status_scale"> - é¸æŠžã—ãŸå´ã‚’クリックã—ã€ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦å¼•ã伸ã°ã™ + é¸æŠžã—ãŸå´ã‚’クリックã—ã€ãƒ‰ãƒ©ãƒƒã‚°ã§å¼•ã伸ã°ã™ </floater.string> <floater.string name="status_move"> - 移動：ﾄﾞﾗｯｸﾞã€ã‚³ãƒ”ー：Shiftを押ã—ãªãŒã‚‰ï¾„ﾞﾗｯｸﾞ + 移動：ドラッグã€ã‚³ãƒ”ー：Shift + ドラッグ </floater.string> <floater.string name="status_modifyland"> 土地をクリックã—ã€ãƒœã‚¿ãƒ³ã‚’押ã—ãŸã¾ã¾å…¥åŠ›ã—ã¦ä¿®æ£å¤‰æ›´ </floater.string> <floater.string name="status_camera"> - クリック・ドラッグã§è¦–界移動 + クリック + ドラッグã§è¦–界移動 </floater.string> <floater.string name="status_grab"> - ドラッグã§ç§»å‹•ã€Ctrlã§æŒã¡ä¸Šã’ã€Ctrl+Shiftã§å›žè»¢ + ドラッグã§ç§»å‹•ã€Ctrlã§æŒã¡ä¸Šã’ã€Ctrl + Shiftã§å›žè»¢ </floater.string> <floater.string name="status_place"> インワールドã§ã‚¯ãƒªãƒƒã‚¯ã—ã¦ä½œæˆ @@ -31,10 +31,10 @@ ãƒãƒ¼ã‚«ãƒ« </floater.string> <floater.string name="grid_world_text"> - 世界 + インワールド </floater.string> <floater.string name="grid_reference_text"> - å‚ç…§ + レファレンス </floater.string> <floater.string name="grid_attachment_text"> アタッãƒãƒ¡ãƒ³ãƒˆ @@ -50,12 +50,12 @@ <radio_group name="focus_radio_group"> <radio_item label="ズーム" name="radio zoom"/> <radio_item label="軌跡（Ctrl）" name="radio orbit"/> - <radio_item label="水平・垂直移動 (Ctrl+Shift)" name="radio pan"/> + <radio_item label="水平・垂直移動 (Ctrl + Shift)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> <radio_item label="移動" name="radio move"/> <radio_item label="æŒã¡ä¸Šã’る（Ctrl）" name="radio lift"/> - <radio_item label="回転 (Ctrl+Shift)" name="radio spin"/> + <radio_item label="回転 (Ctrl + Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> <radio_item label="移動" name="radio position"/> @@ -68,14 +68,14 @@ þ: [COUNT] </text> <check_box label="両å´ã‚’引伸ã°ã™" left="116" name="checkbox uniform"/> - <check_box initial_value="true" label="テクスãƒãƒ£ãƒ¼ã‚’引伸ã°ã™" name="checkbox stretch textures"/> - <check_box initial_value="true" label="グリッドãƒã‚¤ãƒ³ãƒˆã«ã‚¹ãƒŠãƒƒãƒ—" left_delta="27" name="checkbox snap to grid"/> - <combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトã®é…ç½®ã«ä½¿ã†ã‚°ãƒªãƒƒãƒ‰ãƒ«ãƒ¼ãƒ©ã‚’é¸æŠž" width="76"> - <combo_box.item label="ワールドグリッド" name="World"/> + <check_box initial_value="true" label="テクスãƒãƒ£ã‚’引伸ã°ã™" name="checkbox stretch textures"/> + <check_box initial_value="true" label="グリッドã«ã‚¹ãƒŠãƒƒãƒ—" left_delta="27" name="checkbox snap to grid"/> + <combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトã®é…ç½®ã«ä½¿ã†ã‚°ãƒªãƒƒãƒ‰ãƒ«ãƒ¼ãƒ©ã‚’é¸æŠžã—ã¾ã™" width="76"> + <combo_box.item label="インワールドグリッド" name="World"/> <combo_box.item label="ãƒãƒ¼ã‚«ãƒ«ã‚°ãƒªãƒƒãƒ‰" name="Local"/> <combo_box.item label="リファレンスグリッド" name="Reference"/> </combo_box> - <button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションをもã£ã¨è¦‹ã‚‹"/> + <button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示ã—ã¾ã™"/> <button label="" label_selected="" name="ToolCube" tool_tip="ã‚ューブ"/> <button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/> @@ -113,7 +113,7 @@ <text name="Strength:"> 強度 </text> - <button label="é©ç”¨" label_selected="é©ç”¨" name="button apply to selection" tool_tip="é¸æŠžã—ãŸåœŸåœ°ã‚’ä¿®æ£"/> + <button label="é©ç”¨" label_selected="é©ç”¨" name="button apply to selection" tool_tip="é¸æŠžã—ãŸåœŸåœ°ã‚’ä¿®æ£ã—ã¾ã™"/> <text name="obj_count"> オブジェクト： [COUNT] </text> @@ -150,7 +150,7 @@ åˆè¨ˆï¼š L$ </panel.string> <panel.string name="Cost Per Unit"> - Price Per: L$ + å˜ä¾¡ï¼š L$ </panel.string> <panel.string name="Cost Mixed"> æ··åˆä¾¡æ ¼ @@ -165,7 +165,7 @@ 説明： </text> <text name="Creator:"> - クリエーター + 制作者： </text> <text name="Creator Name"> Esbee Linden @@ -179,20 +179,20 @@ <text name="Group:"> グループ： </text> - <button label="è¨å®š..." label_selected="è¨å®š..." name="button set group" tool_tip="ã“ã®ã‚ªãƒ–ジェクト権é™ã‚’共有ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠž"/> + <button label="è¨å®š..." label_selected="è¨å®š..." name="button set group" tool_tip="ã“ã®ã‚ªãƒ–ジェクト権é™ã‚’共有ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠžã—ã¾ã™"/> <name_box initial_value="ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°..." name="Group Name Proxy"/> - <button label="è²æ¸¡" label_selected="è²æ¸¡" name="button deed" tool_tip="ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’è²æ¸¡ã™ã‚‹ã¨ã€Œæ¬¡ã®æ‰€æœ‰è€…ã€ã®æ¨©é™ãŒé©ç”¨ã•ã‚Œã¾ã™ã€‚ グループ共有オブジェクトã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ãŒè²æ¸¡ã§ãã¾ã™ã€‚"/> - <check_box label="共有" name="checkbox share with group" tool_tip="è¨å®šã—ãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼å…¨å“¡ã«ã“ã®ã‚ªãƒ–ジェクトã®ä¿®æ£æ¨©é™ã‚’与ãˆã¾ã™ã€‚ è²æ¸¡ã—ãªã„é™ã‚Šã€å½¹å‰²åˆ¶é™ã‚’有効ã«ã¯ã§ãã¾ã›ã‚“。"/> + <button label="è²æ¸¡" label_selected="è²æ¸¡" name="button deed" tool_tip="ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’è²æ¸¡ã™ã‚‹ã¨ã€Œæ¬¡ã®æ‰€æœ‰è€…ã€ã®æ¨©é™ãŒé©ç”¨ã•ã‚Œã¾ã™ã€‚ グループ共有オブジェクトã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ãŒè²æ¸¡ã§ãã¾ã™"/> + <check_box label="共有" name="checkbox share with group" tool_tip="è¨å®šã—ãŸã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼å…¨å“¡ã«ã“ã®ã‚ªãƒ–ジェクトã®ä¿®æ£æ¨©é™ã‚’与ãˆã¾ã™ã€‚ è²æ¸¡ã—ãªã„é™ã‚Šã€å½¹å‰²åˆ¶é™ã‚’有効ã«ã¯ã§ãã¾ã›ã‚“"/> <text name="label click action"> クリックã§ï¼š </text> <combo_box name="clickaction"> <combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/> <combo_box.item label="オブジェクトã«åº§ã‚‹" name="Sitonobject"/> - <combo_box.item label="オブジェクトを購入" name="Buyobject"/> - <combo_box.item label="オブジェクトã¸ã®æ”¯æ‰•ã„" name="Payobject"/> + <combo_box.item label="オブジェクトを購入ã™ã‚‹" name="Buyobject"/> + <combo_box.item label="オブジェクトã«æ”¯æ‰•ã†" name="Payobject"/> <combo_box.item label="é–‹ã" name="Open"/> - <combo_box.item label="ズーム" name="Zoom"/> + <combo_box.item label="ズームã™ã‚‹" name="Zoom"/> </combo_box> <check_box label="販売対象：" name="checkbox for sale"/> <combo_box name="sale type"> @@ -201,7 +201,7 @@ <combo_box.item label="オリジナル" name="Original"/> </combo_box> <spinner label="ä¾¡æ ¼ï¼š L$" name="Edit Cost"/> - <check_box label="検索ã«è¡¨ç¤º" name="search_check" tool_tip="検索çµæžœã§ã€ã“ã®ã‚ªãƒ–ジェクトを人ã«è¦‹ã›ã‚‹"/> + <check_box label="検索ã«è¡¨ç¤º" name="search_check" tool_tip="検索çµæžœã«ã“ã®ã‚ªãƒ–ジェクトを表示ã—ã¾ã™"/> <panel name="perms_build"> <text name="perm_modify"> ã‚ãªãŸã¯ã“ã®ã‚ªãƒ–ジェクトを修æ£ã§ãã¾ã™ @@ -216,7 +216,7 @@ </text> <check_box label="ä¿®æ£" name="checkbox next owner can modify"/> <check_box label="コピー" name="checkbox next owner can copy"/> - <check_box label="å†è²©ãƒ»ãƒ—レゼント" name="checkbox next owner can transfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™"/> + <check_box label="å†è²©ãƒ»ãƒ—レゼント" name="checkbox next owner can transfer" tool_tip="次ã«æ‰€æœ‰ã™ã‚‹äººã¯ã€ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã§ãã¾ã™"/> <text name="B:"> B: </text> @@ -238,7 +238,7 @@ </panel> </panel> <panel label="形状" name="Object"> - <check_box label="ãƒãƒƒã‚¯æ¸ˆã¿" name="checkbox locked" tool_tip="オブジェクトã®ç§»å‹•ã¨å‰Šé™¤ã‚’ç¦æ¢ã—ã¾ã™ã€‚ ã“ã®æ©Ÿèƒ½ã‚’使ã†ã¨ã€æ§‹ç¯‰ä¸ã«æ„図ã—ãªã„編集を防ãã“ã¨ãŒã§ãã¾ã™ã€‚"/> + <check_box label="ãƒãƒƒã‚¯" name="checkbox locked" tool_tip="オブジェクトã®ç§»å‹•ã¨å‰Šé™¤ã‚’ç¦æ¢ã—ã¾ã™ã€‚ ã“ã®æ©Ÿèƒ½ã‚’使ã†ã¨ã€åˆ¶ä½œä¸ã®æ„図ã›ã¬ç·¨é›†ã‚’防ãã“ã¨ãŒã§ãã¾ã™"/> <check_box label="物ç†" name="Physical Checkbox Ctrl" tool_tip="オブジェクトã«å¯¾ã™ã‚‹é‡åŠ›ã®ä½œç”¨ã¨å½±éŸ¿ã‚’有効ã«ã—ã¾ã™"/> <check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後 1 分ã§ã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™"/> <check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクトåŒå£«ã®è¡çªã¾ãŸã¯ã‚ªãƒ–ジェクトã¨ã‚¢ãƒã‚¿ãƒ¼ã®è¡çªã‚’回é¿ã—ã¾ã™"/> @@ -280,7 +280,7 @@ <combo_box.item label="ゴム" name="Rubber"/> </combo_box> <text name="text cut"> - パスカット (始点・終点) + パスカット（始点ã¨çµ‚点） </text> <spinner label="B" name="cut begin"/> <spinner label="E" name="cut end"/> @@ -300,7 +300,7 @@ <combo_box.item label="三角形" name="Triangle"/> </combo_box> <text name="text twist"> - ã²ãã‚Š (始点・終点) + ã²ãり（始点ã¨çµ‚点） </text> <spinner label="B" name="Twist Begin"/> <spinner label="E" name="Twist End"/> @@ -318,13 +318,13 @@ <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut"> - プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚«ãƒƒãƒˆ (始点・終点) + プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚«ãƒƒãƒˆï¼ˆå§‹ç‚¹ã¨çµ‚点） </text> <text name="advanced_dimple"> - ãã¼ã¿ (始点・終点) + ãã¼ã¿ï¼ˆå§‹ç‚¹ã¨çµ‚点） </text> <text name="advanced_slice"> - 切りå–ã‚Š (始点・終点) + 切りå–り（始点ã¨çµ‚点） </text> <spinner label="B" name="Path Limit Begin"/> <spinner label="E" name="Path Limit End"/> @@ -339,7 +339,7 @@ <text name="text revolutions"> 回転体 </text> - <texture_picker label="スカルプトテクスãƒãƒ£ãƒ¼" name="sculpt texture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¦ãã ã•ã„。"/> + <texture_picker label="スカルプトテクスãƒãƒ£" name="sculpt texture control" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¦ãã ã•ã„"/> <check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上ã§å転ã•ã›ã¾ã™"/> <check_box label="è£è¿”ã—" name="sculpt invert control" tool_tip="スカルプトプリムをå転ã•ã›ã¦è£è¿”ã—ã¾ã™"/> <text name="label sculpt type"> @@ -355,20 +355,20 @@ </panel> <panel label="特徴" name="Features"> <text name="select_single"> - プリムを1ã¤ã ã‘é¸æŠžã—ã¦ç·¨é›†ã—ã¦ãã ã•ã„ + プリムを 1 ã¤ã ã‘é¸æŠžã—ã¦ç·¨é›†ã—ã¦ãã ã•ã„ </text> <text name="edit_object"> オブジェクトã®ç‰¹å¾´ã‚’編集： </text> - <check_box label="フレã‚シブル・パス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸をä¸å¿ƒã«ã‚ªãƒ–ジェクトã®å±ˆæ›²ã‚’有効ã«ã—ã¾ã™ï¼ˆã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆå´ã®ã¿ï¼‰"/> + <check_box label="フレã‚シブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸をä¸å¿ƒã«ã‚ªãƒ–ジェクトã®å±ˆæ›²ã‚’有効ã«ã—ã¾ã™ï¼ˆã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆå´ã®ã¿ï¼‰"/> <spinner label="柔軟性" label_width="72" name="FlexNumSections" width="135"/> <spinner label="é‡åŠ›" label_width="72" name="FlexGravity" width="135"/> <spinner label="ドラッグ" label_width="72" name="FlexFriction" width="135"/> <spinner label="風" label_width="72" name="FlexWind" width="135"/> <spinner label="ç·Šå¼µ" label_width="72" name="FlexTension" width="135"/> - <spinner label="X軸方å‘ã®åŠ›" label_width="72" name="FlexForceX" width="135"/> - <spinner label="Y軸方å‘ã®åŠ›" label_width="72" name="FlexForceY" width="135"/> - <spinner label="Z軸方å‘ã®åŠ›" label_width="72" name="FlexForceZ" width="135"/> + <spinner label="X 軸方å‘ã®åŠ›" label_width="72" name="FlexForceX" width="135"/> + <spinner label="Y 軸方å‘ã®åŠ›" label_width="72" name="FlexForceY" width="135"/> + <spinner label="Z 軸方å‘ã®åŠ›" label_width="72" name="FlexForceZ" width="135"/> <check_box label="å…‰" name="Light Checkbox Ctrl" tool_tip="オブジェクトãŒç™ºå…‰ã—ã¾ã™"/> <color_swatch label="" left_delta="74" name="colorswatch" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> <texture_picker label="" name="light texture control" tool_tip="クリックã§æŠ•å½±ç”»ã‚’é¸æŠžã—ã¾ã™ï¼ˆé…延レンダリング有効時ã®ã¿ï¼‰"/> @@ -386,7 +386,7 @@ <panel.string name="string repeats per face"> é¢ã”ã¨ã«ç¹°ã‚Šè¿”ã™ </panel.string> - <texture_picker label="テクスãƒãƒ£ãƒ¼" name="texture control" tool_tip="写真をクリックã—ã¦é¸æŠž"/> + <texture_picker label="テクスãƒãƒ£" name="texture control" tool_tip="写真をクリックã—ã¦é¸æŠžã—ã¾ã™"/> <color_swatch label="色" name="colorswatch" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> <text name="color trans"> é€éŽåº¦ % @@ -456,7 +456,7 @@ <button name="add_media" tool_tip="ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’è¿½åŠ ã—ã¾ã™"/> <button name="delete_media" tool_tip="ã“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’削除ã—ã¾ã™"/> <button name="edit_media" tool_tip="ã“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’編集ã—ã¾ã™"/> - <button label="æƒãˆã‚‹" label_selected="メディアを一列ã«æƒãˆã‚‹" name="button align" tool_tip="メディアテクスãƒãƒ£ã‚’一列ã«æƒãˆã¾ã™ï¼ˆæœ€åˆã«èªã¿è¾¼ã‚€å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰"/> + <button label="æƒãˆã‚‹" label_selected="メディアを一列ã«æƒãˆã¾ã™" name="button align" tool_tip="メディアテクスãƒãƒ£ã‚’一列ã«æƒãˆã¾ã™ï¼ˆæœ€åˆã«èªã¿è¾¼ã‚€å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰"/> </panel> </panel> <panel label="ä¸èº«" name="Contents"> diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml index 5a0694e5c5..5af8f20690 100644 --- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml @@ -16,6 +16,9 @@ è¿‘ãã«ãƒœã‚¤ã‚¹ã‚’有効ã«ã—ã¦ã„る人ã¯ã„ã¾ã›ã‚“。 </string> <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="マイ ã‚¢ãƒã‚¿ãƒ¼ï¼š"/> + </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="コール終了" name="leave_call_btn"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml index 52cd91a08a..fb64332e79 100644 --- a/indra/newview/skins/default/xui/ja/floater_water.xml +++ b/indra/newview/skins/default/xui/ja/floater_water.xml @@ -28,10 +28,10 @@ <slider label="2" name="WaterNormalScaleY"/> <slider label="3" name="WaterNormalScaleZ"/> <text name="HDText"> - フレãƒãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ« + フレãƒãƒ«ã®ã‚¹ã‚±ãƒ¼ãƒ« </text> <text name="FresnelOffsetText"> - フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ + フレãƒãƒ«ã®ã‚ªãƒ•ã‚»ãƒƒãƒˆ </text> <text name="DensMultText"> æ°´é¢ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ« @@ -63,7 +63,7 @@ Y </text> <text name="BHText3"> - ノーマル・マップ + ノーマルマップ </text> </panel> </tab_container> diff --git a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml index fc9ddf5096..de8b590a80 100644 --- a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=" "> - <button label="ä¿å˜" label_selected="ä¿å˜" name="Save" /> - <button label="å–り消ã—" label_selected="å–り消ã—" name="Cancel" /> + <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/> + <button label="å–り消ã—" label_selected="å–り消ã—" name="Cancel"/> <text name="Save item as:"> - アイテムを別åã§ä¿å˜ï¼š + アイテムを別åã§æŒã¡ç‰©ã«ä¿å˜ï¼š </text> <line_editor name="name ed"> New [DESC] diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index af9c05de91..0e489be9a8 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -5,7 +5,7 @@ è¡¨è¨˜ãƒ»è¨˜å· </text> </panel> - <panel> + <panel name="layout_panel_2"> <button label="ç¾åœ¨åœ°ã‚’表示" label_selected="ç¾åœ¨åœ°ã‚’表示" name="Show My Location" tool_tip="ã‚¢ãƒã‚¿ãƒ¼ã®ä½ç½®ã‚’地図ã®ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™"/> <text name="me_label"> 自分 @@ -23,7 +23,7 @@ 土地販売 </text> <text name="by_owner_label"> - 所有者ã®è²©å£² + 所有者ã«ã¦ </text> <text name="auction_label"> 土地オークション @@ -37,45 +37,46 @@ </text> <check_box label="PG" name="event_chk"/> <text name="pg_label"> - 一般 + General </text> <check_box initial_value="true" label="Mature" name="event_mature_chk"/> <text name="mature_label"> - 控ãˆã‚ + Moderate </text> <check_box label="Adult" name="event_adult_chk"/> <text name="adult_label"> - アダルト + Adult </text> </panel> - <panel> + <panel name="layout_panel_3"> <text name="find_on_map_label"> - 地図上ã§æŽ¢ã™ + 地図上ã§è¦‹ã¤ã‘ã‚‹ </text> </panel> - <panel> - <combo_box label="オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰" name="friend combo" tool_tip="フレンドを地図上ã«è¡¨ç¤ºã—ã¾ã™"> + <panel name="layout_panel_4"> + <combo_box label="オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰" name="friend combo" tool_tip="フレンドを地図ã«è¡¨ç¤º"> <combo_box.item label="オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰" name="item1"/> </combo_box> <combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図上ã«è¡¨ç¤ºã™ã‚‹ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯"> <combo_box.item label="マイ ランドマーク" name="item1"/> </combo_box> - <search_editor label="リージョンå" name="location" tool_tip="地域åを入力ã—ã¦ãã ã•ã„。"/> - <button label="検索" name="DoSearch" tool_tip="地域検索"/> + <search_editor label="リージョンå" name="location" tool_tip="リージョンåを入力ã—ã¾ã™"/> + <button label="検索" name="DoSearch" tool_tip="リージョン検索"/> + <button name="Clear" tool_tip="追跡ラインをクリアã—ã¦åœ°å›³ã‚’リセットã—ã¾ã™"/> <scroll_list name="search_results"> <scroll_list.columns label="" name="icon"/> <scroll_list.columns label="" name="sim_name"/> </scroll_list> - <button label="テレãƒãƒ¼ãƒˆ" label_selected="テレãƒãƒ¼ãƒˆ" name="Teleport" tool_tip="é¸æŠžã—ãŸå ´æ‰€ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™"/> - <button label="SLurl をコピー" name="copy_slurl" tool_tip="ç¾åœ¨åœ°ã‚’ SLurl ã§ã‚³ãƒ”ーã—ã¦ã€Webã§ä½¿ç”¨ã—ã¾ã™ã€‚"/> - <button label="é¸æŠžã—ãŸãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹" label_selected="目的地を表示" name="Show Destination" tool_tip="é¸æŠžã—ãŸå ´æ‰€ã‚’地図ã®ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™"/> + <button label="テレãƒãƒ¼ãƒˆ" label_selected="テレãƒãƒ¼ãƒˆ" name="Teleport" tool_tip="é¸æŠžã—ãŸå ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™"/> + <button label="SLurl をコピー" name="copy_slurl" tool_tip="ç¾åœ¨åœ°ã® SLurl をコピーã—㦠Web ã§ä½¿ç”¨ã—ã¾ã™ã€‚"/> + <button label="é¸æŠžã‚’表示ã™ã‚‹" label_selected="目的地を表示" name="Show Destination" tool_tip="é¸æŠžã—ãŸå ´æ‰€ã‚’地図ã®ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™"/> </panel> - <panel> + <panel name="layout_panel_5"> <text name="zoom_label"> ズーム</text> </panel> - <panel> + <panel name="layout_panel_6"> <slider label="ズーム" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index 9371b80af5..aeac0a8328 100644 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="ボイス音é‡" value="0.5"/> <button label="フレンド登録" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="詳細" name="view_profile_btn"/> + <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="ボイスを無効ã«ã™ã‚‹" name="disable_voice"/> <button label="ボイスを有効ã«ã™ã‚‹" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml index 9d5ce3dada..a638bed36f 100644 --- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="ç«‹ã¡ä¸ŠãŒã‚‹" name="Stand Up"/> - <context_menu label="脱ã＞" name="Take Off >"> - <context_menu label="衣類 >" name="Clothes >"> + <context_menu label="脱ã â–¶" name="Take Off >"> + <context_menu label="衣類 â–¶" name="Clothes >"> <menu_item_call label="シャツ" name="Shirt"/> <menu_item_call label="パンツ" name="Pants"/> <menu_item_call label="スカート" name="Skirt"/> @@ -16,8 +16,8 @@ <menu_item_call label="アルファ" name="Self Alpha"/> <menu_item_call label="ã™ã¹ã¦ã®è¡£é¡ž" name="All Clothes"/> </context_menu> - <context_menu label="HUD >" name="Object Detach HUD"/> - <context_menu label="å–り外㙠>" name="Object Detach"/> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="å–り外㙠▶" name="Object Detach"/> <menu_item_call label="ã™ã¹ã¦å–り外ã™" name="Detach All"/> </context_menu> <menu_item_call label="容姿" name="Appearance..."/> diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml index 3d5086c52a..93f75f3ce1 100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml @@ -15,4 +15,5 @@ <menu_item_call label="地図ã§æŽ¢ã™" name="find_on_map"/> <menu_item_call label="ズームイン" name="zoom_in"/> <menu_item_call label="支払ã†" name="pay"/> + <menu_item_call label="共有" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 3d661f96e0..1607b2647e 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -6,8 +6,8 @@ <menu_item_call label="プãƒãƒ‘ティ" name="Task Properties"/> <menu_item_call label="åå‰ã®å¤‰æ›´" name="Task Rename"/> <menu_item_call label="削除" name="Task Remove"/> - <menu_item_call label="ゴミ箱を空ã«ã™ã‚‹" name="Empty Trash"/> - <menu_item_call label="éºå¤±ç‰©ãƒ•ã‚©ãƒ«ãƒ€ã‚’空ã«ã™ã‚‹" name="Empty Lost And Found"/> + <menu_item_call label="ã”ã¿ç®±ã‚’空ã«ã™ã‚‹" name="Empty Trash"/> + <menu_item_call label="紛失物フォルダを空ã«ã™ã‚‹" name="Empty Lost And Found"/> <menu_item_call label="æ–°ã—ã„フォルダ" name="New Folder"/> <menu_item_call label="æ–°ã—ã„スクリプト" name="New Script"/> <menu_item_call label="æ–°ã—ã„ノートカード" name="New Note"/> @@ -49,34 +49,34 @@ <menu_item_call label="ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‚’入れ替ãˆã‚‹" name="Replace Outfit"/> <menu_item_call label="ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã«è¿½åŠ ã™ã‚‹" name="Add To Outfit"/> <menu_item_call label="ç€ç”¨ä¸ã®ã‚¢ã‚¦ãƒˆãƒ•ã‚£ãƒƒãƒˆã‹ã‚‰å–り除ã" name="Remove From Outfit"/> - <menu_item_call label="アイテムを除外" name="Purge Item"/> - <menu_item_call label="アイテムを復元" name="Restore Item"/> + <menu_item_call label="アイテムを除外ã™ã‚‹" name="Purge Item"/> + <menu_item_call label="アイテムを復元ã™ã‚‹" name="Restore Item"/> <menu_item_call label="オリジナルを探ã™" name="Find Original"/> <menu_item_call label="é–‹ã" name="Open"/> <menu_item_call label="プãƒãƒ‘ティ" name="Properties"/> - <menu_item_call label="åå‰ã®å¤‰æ›´" name="Rename"/> - <menu_item_call label="UUIDをコピー" name="Copy Asset UUID"/> + <menu_item_call label="åå‰ã‚’変更ã™ã‚‹" name="Rename"/> + <menu_item_call label="UUID をコピーã™ã‚‹" name="Copy Asset UUID"/> <menu_item_call label="コピー" name="Copy"/> <menu_item_call label="貼り付ã‘" name="Paste"/> - <menu_item_call label="リンクã®è²¼ã‚Šä»˜ã‘" name="Paste As Link"/> + <menu_item_call label="リンクを貼り付ã‘ã‚‹" name="Paste As Link"/> <menu_item_call label="リンクを外ã™" name="Remove Link"/> <menu_item_call label="削除" name="Delete"/> <menu_item_call label="システムフォルダを削除ã™ã‚‹" name="Delete System Folder"/> - <menu_item_call label="コンファレンスãƒãƒ£ãƒƒãƒˆã‚’開始" name="Conference Chat Folder"/> - <menu_item_call label="å†ç”Ÿ" name="Sound Play"/> + <menu_item_call label="コンファレンスãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹" name="Conference Chat Folder"/> + <menu_item_call label="å†ç”Ÿã™ã‚‹" name="Sound Play"/> <menu_item_call label="ランドマークã®æƒ…å ±" name="About Landmark"/> - <menu_item_call label="ワールドå†ç”Ÿ" name="Animation Play"/> - <menu_item_call label="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" name="Animation Audition"/> - <menu_item_call label="インスタントメッセージをé€ä¿¡" name="Send Instant Message"/> + <menu_item_call label="インワールドã§å†ç”Ÿã™ã‚‹" name="Animation Play"/> + <menu_item_call label="ãƒãƒ¼ã‚«ãƒ«ã§å†ç”Ÿã™ã‚‹" name="Animation Audition"/> + <menu_item_call label="インスタントメッセージをé€ä¿¡ã™ã‚‹" name="Send Instant Message"/> <menu_item_call label="テレãƒãƒ¼ãƒˆã‚’é€ã‚‹..." name="Offer Teleport..."/> - <menu_item_call label="会è°ãƒãƒ£ãƒƒãƒˆé–‹å§‹" name="Conference Chat"/> + <menu_item_call label="コンファレンスãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹" name="Conference Chat"/> <menu_item_call label="アクティブ" name="Activate"/> <menu_item_call label="éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–" name="Deactivate"/> - <menu_item_call label="別åã§ä¿å˜" name="Save As"/> + <menu_item_call label="別åã§ä¿å˜ã™ã‚‹" name="Save As"/> <menu_item_call label="自分ã‹ã‚‰å–り外ã™" name="Detach From Yourself"/> <menu_item_call label="装ç€" name="Object Wear"/> <menu label="装ç€å…ˆ" name="Attach To"/> - <menu label="HUD装ç€å…ˆ" name="Attach To HUD"/> + <menu label="HUD 装ç€å…ˆ" name="Attach To HUD"/> <menu_item_call label="編集" name="Wearable Edit"/> <menu_item_call label="装ç€" name="Wearable Wear"/> <menu_item_call label="å–り外ã™" name="Take Off"/> diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index d218b48c98..e59a500534 100644 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml @@ -5,20 +5,22 @@ <menu_item_call label="制作" name="Build"/> <menu_item_call label="é–‹ã" name="Open"/> <menu_item_call label="ã“ã“ã«åº§ã‚‹" name="Object Sit"/> + <menu_item_call label="ç«‹ã¡ä¸ŠãŒã‚‹" name="Object Stand Up"/> <menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Object Inspect"/> <menu_item_call label="ズームイン" name="Zoom In"/> - <context_menu label="è£…ç€ >" name="Put On"> + <context_menu label="è£…ç€ â–¶" name="Put On"> <menu_item_call label="装ç€" name="Wear"/> - <context_menu label="å–り付ã‘ã‚‹ >" name="Object Attach"/> - <context_menu label="HUD ã‚’å–り付ã‘ã‚‹ >" name="Object Attach HUD"/> + <context_menu label="å–り付ã‘ã‚‹ â–¶" name="Object Attach"/> + <context_menu label="HUD ã‚’å–り付ã‘ã‚‹ â–¶" name="Object Attach HUD"/> </context_menu> - <context_menu label="削除 >" name="Remove"> - <menu_item_call label="å–ã‚‹" name="Pie Object Take"/> + <context_menu label="å–り除ã â–¶" name="Remove"> <menu_item_call label="å«ŒãŒã‚‰ã›ã®å ±å‘Š" name="Report Abuse..."/> <menu_item_call label="ブãƒãƒƒã‚¯" name="Object Mute"/> <menu_item_call label="è¿”å´" name="Return..."/> <menu_item_call label="削除" name="Delete"/> </context_menu> + <menu_item_call label="è²·ã†" name="Pie Object Bye"/> + <menu_item_call label="å–ã‚‹" name="Pie Object Take"/> <menu_item_call label="コピーをå–ã‚‹" name="Take Copy"/> <menu_item_call label="支払ã†" name="Pay..."/> <menu_item_call label="è²·ã†" name="Buy..."/> diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml index e4ccbf43ad..5eaad31898 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> <menu_item_check label="åå‰ã§ä¸¦ã¹æ›¿ãˆ" name="sort_name"/> - <menu_item_check label="オンライン状æ³ã§ä¸¦ã¹æ›¿ãˆ" name="sort_status"/> + <menu_item_check label="オンライン状態ã§ä¸¦ã¹æ›¿ãˆ" name="sort_status"/> <menu_item_check label="人ã®ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º" name="view_icons"/> <menu_item_call label="ブãƒãƒƒã‚¯ã•ã‚ŒãŸä½äººã¨ã‚ªãƒ–ジェクトを表示" name="show_blocked_list"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml index 2c8a346d1a..8d84b0e521 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml @@ -2,8 +2,10 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã®è¡¨ç¤º" name="View Profile"/> <menu_item_call label="フレンド登録" name="Add Friend"/> + <menu_item_call label="フレンドを削除" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="コール" name="Call"/> + <menu_item_call label="地図" name="Map"/> <menu_item_call label="共有" name="Share"/> <menu_item_call label="支払ã†" name="Pay"/> <menu_item_check label="ブãƒãƒƒã‚¯ãƒ»ãƒ–ãƒãƒƒã‚¯è§£é™¤" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml index bcd562e3ed..238bfc4af9 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Multi-Selected People Context Menu"> <menu_item_call label="フレンド登録" name="Add Friends"/> + <menu_item_call label="フレンドを削除" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="コール" name="Call"/> <menu_item_call label="共有" name="Share"/> diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml index bb93990efe..d7107dc153 100644 --- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml @@ -2,6 +2,8 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="支払ã†" name="pay"/> <menu_item_call label="共有" name="share"/> + <menu_item_call label="ブãƒãƒƒã‚¯" name="block"/> + <menu_item_call label="ブãƒãƒƒã‚¯è§£é™¤" name="unblock"/> <menu_item_call label="追放" name="kick"/> <menu_item_call label="フリーズ" name="freeze"/> <menu_item_call label="フリーズ解除" name="unfreeze"/> diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml index eb24cee7e0..61ba3085d9 100644 --- a/indra/newview/skins/default/xui/ja/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="Popup"> - <menu_item_call label="URLã«ã¤ã„ã¦" name="about_url"/> - <menu_item_call label="URLã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹" name="teleport_to_url"/> + <menu_item_call label="URL ã«ã¤ã„ã¦" name="about_url"/> + <menu_item_call label="URL ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹" name="teleport_to_url"/> <menu_item_call label="地図" name="show_on_map"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml index c2f4f24db6..c3da8a8686 100644 --- a/indra/newview/skins/default/xui/ja/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> <menu_item_call label="Web ページを開ã" name="url_open"/> - <menu_item_call label="インターãƒãƒƒãƒˆãƒ–ラウザã§é–‹ã" name="url_open_internal"/> + <menu_item_call label="内蔵ブラウザã§é–‹ã" name="url_open_internal"/> <menu_item_call label="外部ブラウザã§é–‹ã" name="url_open_external"/> <menu_item_call label="URLをクリップボードã«ã‚³ãƒ”ー" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index c5d5914f3f..bcad812457 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -5,13 +5,13 @@ <menu_item_call label="マイアカウント" name="Manage My Account"> <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/> </menu_item_call> - <menu_item_call label="L$ã®è³¼å…¥" name="Buy and Sell L$"/> - <menu_item_call label="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile"/> - <menu_item_call label="マイ 容姿" name="Appearance"/> - <menu_item_check label="マイ æŒã¡ç‰©" name="Inventory"/> - <menu_item_call label="æŒã¡ç‰©ã‚’サイドトレイã«è¡¨ç¤º" name="ShowSidetrayInventory"/> - <menu_item_call label="マイ ジェスãƒãƒ£ãƒ¼" name="Gestures"/> - <menu label="マイ ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹" name="Status"> + <menu_item_call label="L$ ã®è³¼å…¥" name="Buy and Sell L$"/> + <menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile"/> + <menu_item_call label="容姿" name="Appearance"/> + <menu_item_check label="æŒã¡ç‰©" name="Inventory"/> + <menu_item_check label="æŒã¡ç‰©" name="ShowSidetrayInventory"/> + <menu_item_check label="ジェスãƒãƒ£ãƒ¼" name="Gestures"/> + <menu label="ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹" name="Status"> <menu_item_call label="一時退å¸ä¸" name="Set Away"/> <menu_item_call label="å–ã‚Šè¾¼ã¿ä¸" name="Set Busy"/> </menu> @@ -24,7 +24,6 @@ <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 Media"/> </menu> <menu label="世界" name="World"> <menu_item_check label="ミニマップ" name="Mini-Map"/> @@ -39,7 +38,13 @@ <menu_item_call label="自分ã®åœŸåœ°" name="My Land"/> <menu label="表示" name="LandShow"> <menu_item_check label="移動コントãƒãƒ¼ãƒ«" name="Movement Controls"/> - <menu_item_check label="コントãƒãƒ¼ãƒ«ã‚’表示" name="Camera Controls"/> + <menu_item_check label="カメラコントãƒãƒ¼ãƒ«" name="Camera Controls"/> + <menu_item_check label="ç«‹å…¥ç¦æ¢ãƒ©ã‚¤ãƒ³" name="Ban Lines"/> + <menu_item_check label="ビーコン（標è˜ï¼‰" name="beacons"/> + <menu_item_check label="プãƒãƒ‘ティ境界線" name="Property Lines"/> + <menu_item_check label="土地所有者" name="Land Owners"/> + <menu_item_check label="座標" name="Coordinates"/> + <menu_item_check label="区画プãƒãƒ‘ティ" name="Parcel Properties"/> </menu> <menu_item_call label="ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="Teleport Home"/> <menu_item_call label="ç¾åœ¨åœ°ã‚’ホームã«è¨å®š" name="Set Home to Here"/> @@ -58,7 +63,7 @@ <menu_item_call label="フォーカスツール" name="Focus"/> <menu_item_call label="移動ツール" name="Move"/> <menu_item_call label="編集ツール" name="Edit"/> - <menu_item_call label="クリエーションツール" name="Create"/> + <menu_item_call label="作æˆãƒ„ール" name="Create"/> <menu_item_call label="土地ツール" name="Land"/> </menu> <menu label="編集" name="Edit"> @@ -74,9 +79,11 @@ </menu> <menu_item_call label="リンク" name="Link"/> <menu_item_call label="リンクを外ã™" name="Unlink"/> + <menu_item_check label="リンクã—ãŸéƒ¨åˆ†ã‚’編集" name="Edit Linked Parts"/> <menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã«ç„¦ç‚¹ã‚’åˆã‚ã›ã‚‹" name="Focus on Selection"/> <menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã‚’ズームã™ã‚‹" name="Zoom to Selection"/> <menu label="オブジェクト" name="Object"> + <menu_item_call label="è²·ã†" name="Menu Object Buy"/> <menu_item_call label="å–ã‚‹" name="Menu Object Take"/> <menu_item_call label="コピーをå–ã‚‹" name="Take Copy"/> <menu_item_call label="「æŒã¡ç‰©ã€ã«ä¿å˜" name="Save Object Back to My Inventory"/> @@ -90,31 +97,24 @@ <menu_item_call label="スクリプトを実行åœæ¢ã«ã™ã‚‹" name="Set Scripts to Not Running"/> </menu> <menu label="オプション" name="Options"> - <menu_item_check label="リンク部ä½ã‚’編集" name="Edit Linked Parts"/> - <menu_item_call label="デフォルトã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ¨©é™ã‚’è¨å®š" name="perm prefs"/> - <menu_item_check label="権é™ã®è©³ç´°ã‚’表示" name="DebugPermissions"/> - <menu label="é¸æŠž" name="Selection"> - <menu_item_check label="ç§ã®ã‚ªãƒ–ジェクトã ã‘ã‚’é¸æŠž" name="Select Only My Objects"/> - <menu_item_check label="動的オブジェクトã®ã¿é¸æŠž" name="Select Only Movable Objects"/> - <menu_item_check label="環境ã§é¸æŠž" name="Select By Surrounding"/> - </menu> - <menu label="表示" name="Show"> - <menu_item_check label="éžè¡¨ç¤ºã®é¸æŠžã‚’表示" name="Show Hidden Selection"/> - <menu_item_check label="é¸æŠžã—ãŸå…‰ã®åŠå¾„範囲を表示" name="Show Light Radius for Selection"/> - <menu_item_check label="é¸æŠžãƒ“ームを表示" name="Show Selection Beam"/> - </menu> - <menu label="グリッド" name="Grid"> - <menu_item_check label="グリッドãƒã‚¤ãƒ³ãƒˆã«ã‚¹ãƒŠãƒƒãƒ—" name="Snap to Grid"/> - <menu_item_call label="オブジェクトã®XY軸をグリッドã«ã‚¹ãƒŠãƒƒãƒ—" name="Snap Object XY to Grid"/> - <menu_item_call label="é¸æŠžã‚’グリッドã«ä½¿ç”¨" name="Use Selection for Grid"/> - <menu_item_call label="グリッドオプション" name="Grid Options"/> - </menu> - </menu> - <menu label="リンクã—ãŸéƒ¨åˆ†ã‚’é¸æŠž" name="Select Linked Parts"> - <menu_item_call label="次ã®éƒ¨ä½ã‚’é¸æŠž" name="Select Next Part"/> - <menu_item_call label="å‰å›žã®éƒ¨ä½ã‚’é¸æŠž" name="Select Previous Part"/> - <menu_item_call label="次ã®éƒ¨ä½ã‚’å«ã‚ã‚‹" name="Include Next Part"/> - <menu_item_call label="å‰å›žã®éƒ¨ä½ã‚’å«ã‚ã‚‹" name="Include Previous Part"/> + <menu_item_call label="デフォルトã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ¨©é™ã‚’è¨å®šã™ã‚‹" name="perm prefs"/> + <menu_item_check label="権é™ã®è©³ç´°ã‚’表示ã™ã‚‹" name="DebugPermissions"/> + <menu_item_check label="ç§ã®ã‚ªãƒ–ジェクトã ã‘ã‚’é¸æŠžã™ã‚‹" name="Select Only My Objects"/> + <menu_item_check label="動的オブジェクトã ã‘ã‚’é¸æŠžã™ã‚‹" name="Select Only Movable Objects"/> + <menu_item_check label="範囲内をé¸æŠžã™ã‚‹" name="Select By Surrounding"/> + <menu_item_check label="éš ã‚ŒãŸä½ç½®ã®é¸æŠžã‚‚表示ã™ã‚‹" name="Show Hidden Selection"/> + <menu_item_check label="é¸æŠžã—ãŸå…‰ã®åŠå¾„範囲を表示ã™ã‚‹" name="Show Light Radius for Selection"/> + <menu_item_check label="é¸æŠžãƒ“ームを表示ã™ã‚‹" name="Show Selection Beam"/> + <menu_item_check label="グリッドãƒã‚¤ãƒ³ãƒˆã«ã‚¹ãƒŠãƒƒãƒ—ã™ã‚‹" name="Snap to Grid"/> + <menu_item_call label="オブジェクト㮠XY 軸をグリッドã«ã‚¹ãƒŠãƒƒãƒ—ã™ã‚‹" name="Snap Object XY to Grid"/> + <menu_item_call label="é¸æŠžã‚’グリッドã«ä½¿ç”¨ã™ã‚‹" name="Use Selection for Grid"/> + <menu_item_call label="グリッドオプション" name="Grid Options"/> + </menu> + <menu label="リンクã—ãŸéƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Linked Parts"> + <menu_item_call label="次ã®éƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Next Part"/> + <menu_item_call label="å‰å›žã®éƒ¨åˆ†ã‚’é¸æŠžã™ã‚‹" name="Select Previous Part"/> + <menu_item_call label="次ã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Next Part"/> + <menu_item_call label="å‰å›žã®éƒ¨åˆ†ã‚’å«ã‚ã‚‹" name="Include Previous Part"/> </menu> </menu> <menu label="ヘルプ" name="Help"> @@ -124,28 +124,28 @@ <menu_item_call label="[APP_NAME] ã«ã¤ã„ã¦" name="About Second Life"/> </menu> <menu label="アドãƒãƒ³ã‚¹" name="Advanced"> - <menu_item_call label="ç§ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹" name="Stop Animating My Avatar"/> - <menu_item_call label="テクスãƒãƒ£ã®ãƒªãƒ™ãƒ¼ã‚¯" name="Rebake Texture"/> + <menu_item_call label="自分ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’åœæ¢ã™ã‚‹" name="Stop Animating My Avatar"/> + <menu_item_call label="テクスãƒãƒ£ã®ãƒªãƒ™ãƒ¼ã‚¯ã‚’ã™ã‚‹" name="Rebake Texture"/> <menu_item_call label="UI ã®ã‚µã‚¤ã‚ºã‚’デフォルトã«è¨å®šã™ã‚‹" name="Set UI Size to Default"/> - <menu_item_call label="ウィンドウã®ã‚µã‚¤ã‚ºã®è¨å®šï¼š" name="Set Window Size..."/> + <menu_item_call label="ウィンドウã®ã‚µã‚¤ã‚ºã‚’è¨å®šã™ã‚‹" name="Set Window Size..."/> <menu_item_check label="é ãã®ã‚ªãƒ–ジェクトをé¸æŠžã—ãªã„" name="Limit Select Distance"/> <menu_item_check label="カメラã®è·é›¢ç§»å‹•ã‚’制é™ã—ãªã„" name="Disable Camera Distance"/> <menu_item_check label="高解åƒåº¦ã‚¹ãƒŠãƒƒãƒ—ショット" name="HighResSnapshot"/> - <menu_item_check label="シャッター音ã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãªã—ã§ã‚¹ãƒŠãƒƒãƒ—ショットをディスクã«ä¿å˜" name="QuietSnapshotsToDisk"/> + <menu_item_check label="シャッター音ã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãªã—ã§ã‚¹ãƒŠãƒƒãƒ—ショットをディスクã«ä¿å˜ã™ã‚‹" name="QuietSnapshotsToDisk"/> <menu_item_check label="圧縮ã—ã¦ã‚¹ãƒŠãƒƒãƒ—ショットをディスクã«ä¿å˜ã™ã‚‹" name="CompressSnapshotsToDisk"/> <menu label="パフォーマンスツール" name="Performance Tools"> <menu_item_call label="ラグ計測器" name="Lag Meter"/> <menu_item_check label="統計ãƒãƒ¼" name="Statistics Bar"/> - <menu_item_check label="ã‚¢ãƒã‚¿ãƒ¼ã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã‚³ã‚¹ãƒˆã‚’表示" name="Avatar Rendering Cost"/> + <menu_item_check label="ã‚¢ãƒã‚¿ãƒ¼ã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°ã‚³ã‚¹ãƒˆã‚’表示ã™ã‚‹" name="Avatar Rendering Cost"/> </menu> <menu label="ãƒã‚¤ãƒ©ã‚¤ãƒˆã¨ç›®ã«è¦‹ãˆã‚‹ã‚‚ã®" name="Highlighting and Visibility"> <menu_item_check label="ãƒãƒ¼ã‚¸ãƒ¼ãƒ“ーコン" name="Cheesy Beacon"/> <menu_item_check label="パーティクルをéžè¡¨ç¤ºã«ã™ã‚‹" name="Hide Particles"/> <menu_item_check label="é¸æŠžã—ãŸã‚‚ã®ã‚’éžè¡¨ç¤ºã«ã™ã‚‹" name="Hide Selected"/> - <menu_item_check label="é€æ˜Žéƒ¨åˆ†ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆ" name="Highlight Transparent"/> - <menu_item_check label="HUD を表示" name="Show HUD Attachments"/> - <menu_item_check label="一人称視点ã®ã¨ãã«åå—線を表示" name="ShowCrosshairs"/> - <menu_item_check label="土地ã®ãƒ„ールãƒãƒƒãƒ—を表示" name="Land Tips"/> + <menu_item_check label="é€æ˜Žéƒ¨åˆ†ã‚’ãƒã‚¤ãƒ©ã‚¤ãƒˆã™ã‚‹" name="Highlight Transparent"/> + <menu_item_check label="HUD を表示ã™ã‚‹" name="Show HUD Attachments"/> + <menu_item_check label="一人称視点ã®ã¨ãã«åå—線を表示ã™ã‚‹" name="ShowCrosshairs"/> + <menu_item_check label="土地ã®ãƒ„ールãƒãƒƒãƒ—を表示ã™ã‚‹" name="Land Tips"/> </menu> <menu label="レンダリング（種類）" name="Rendering Types"> <menu_item_check label="シンプル" name="Simple"/> @@ -175,21 +175,21 @@ <menu_item_check label="マルãƒã‚¹ãƒ¬ãƒƒãƒ‰å‡¦ç†" name="Run Multiple Threads"/> <menu_item_call label="グループã‚ャッシュã®ã‚¯ãƒªã‚¢" name="ClearGroupCache"/> <menu_item_check label="マウスã®å¹³æ»‘化" name="Mouse Smoothing"/> - <menu_item_check label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆã« IM を表示" name="IMInChat"/> <menu label="ショートカット" name="Shortcuts"> + <menu_item_call label="ç”»åƒ ï¼ˆL$ [COST] ）..." name="Upload Image"/> <menu_item_check label="検索" name="Search"/> <menu_item_call label="ã‚ーをリリース" name="Release Keys"/> - <menu_item_call label="UI ã®ã‚µã‚¤ã‚ºã‚’デフォルトã«è¨å®š" name="Set UI Size to Default"/> + <menu_item_call label="UI ã®ã‚µã‚¤ã‚ºã‚’デフォルトã«è¨å®šã™ã‚‹" name="Set UI Size to Default"/> <menu_item_check label="常ã«èµ°ã‚‹" name="Always Run"/> - <menu_item_check label="飛行" name="Fly"/> + <menu_item_check label="飛行ã™ã‚‹" name="Fly"/> <menu_item_call label="ウィンドウを閉ã˜ã‚‹" name="Close Window"/> <menu_item_call label="å…¨ã¦ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹" name="Close All Windows"/> - <menu_item_call label="スナップショットをディスクã«ä¿å˜" name="Snapshot to Disk"/> + <menu_item_call label="スナップショットをディスクã«ä¿å˜ã™ã‚‹" name="Snapshot to Disk"/> <menu_item_call label="一人称視点" name="Mouselook"/> - <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam"/> - <menu_item_call label="表示をリセット" name="Reset View"/> + <menu_item_check label="ジョイスティックフライカム" name="Joystick Flycam"/> + <menu_item_call label="表示をリセットã™ã‚‹" name="Reset View"/> <menu_item_call label="最後ã®ç™ºè¨€è€…を見る" name="Look at Last Chatter"/> - <menu label="制作ツールをé¸æŠž" name="Select Tool"> + <menu label="制作ツールをé¸æŠžã™ã‚‹" name="Select Tool"> <menu_item_call label="焦点ツール" name="Focus"/> <menu_item_call label="移動ツール" name="Move"/> <menu_item_call label="編集ツール" name="Edit"/> @@ -197,12 +197,12 @@ <menu_item_call label="土地ツール" name="Land"/> </menu> <menu_item_call label="ズームイン" name="Zoom In"/> - <menu_item_call label="ズーム・デフォルト" name="Zoom Default"/> + <menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/> <menu_item_call label="ズームアウト" name="Zoom Out"/> <menu_item_call label="全画é¢è¡¨ç¤º" name="Toggle Fullscreen"/> </menu> <menu_item_call label="デãƒãƒƒã‚°è¨å®šã‚’表示ã™ã‚‹" name="Debug Settings"/> - <menu_item_check label="開発メニューを表示" name="Debug Mode"/> + <menu_item_check label="開発メニューを表示ã™ã‚‹" name="Debug Mode"/> </menu> <menu label="開発" name="Develop"> <menu label="コンソール" name="Consoles"> @@ -210,7 +210,7 @@ <menu_item_check label="デãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Debug Console"/> <menu_item_call label="通知コンソール" name="Notifications"/> <menu_item_check label="テクスãƒãƒ£ã‚µã‚¤ã‚ºã®ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Texture Size"/> - <menu_item_check label="テクスãƒãƒ£ã‚«ãƒ†ã‚´ãƒªãƒ»ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Texture Category"/> + <menu_item_check label="テクスãƒãƒ£ã‚«ãƒ†ã‚´ãƒªã®ã‚³ãƒ³ã‚½ãƒ¼ãƒ«" name="Texture Category"/> <menu_item_check label="ファーストタイマー" name="Fast Timers"/> <menu_item_check label="メモリ" name="Memory"/> <menu_item_call label="ãƒªãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’ãƒ‡ãƒãƒƒã‚°ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸" name="Region Info to Debug Console"/> @@ -219,28 +219,29 @@ <menu_item_check label="カメラ" name="Camera"/> <menu_item_check label="風" name="Wind"/> <menu_item_check label="FOV" name="FOV"/> + <menu_item_check label="ãƒãƒƒã‚¸" name="Badge"/> </menu> <menu label="æƒ…å ±ã‚’è¡¨ç¤º" name="Display Info"> - <menu_item_check label="時間を表示" name="Show Time"/> - <menu_item_check label="æç”»æƒ…å ±ã‚’è¡¨ç¤º" name="Show Render Info"/> - <menu_item_check label="マトリックスを表示" name="Show Matrices"/> - <menu_item_check label="カーソルを乗ã›ãŸå ´æ‰€ã®è‰²ã‚’表示" name="Show Color Under Cursor"/> - <menu_item_check label="オブジェクトã®ã‚¢ãƒƒãƒ—デートを表示" name="Show Updates"/> + <menu_item_check label="時間を表示ã™ã‚‹" name="Show Time"/> + <menu_item_check label="æç”»æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹" name="Show Render Info"/> + <menu_item_check label="マトリックスを表示ã™ã‚‹" name="Show Matrices"/> + <menu_item_check label="カーソルを乗ã›ãŸå ´æ‰€ã®è‰²ã‚’表示ã™ã‚‹" name="Show Color Under Cursor"/> + <menu_item_check label="オブジェクトã®ã‚¢ãƒƒãƒ—デートを表示ã™ã‚‹" name="Show Updates"/> </menu> - <menu label="エラーを実行" name="Force Errors"> + <menu label="エラー実行" name="Force Errors"> <menu_item_call label="ブレークãƒã‚¤ãƒ³ãƒˆ" name="Force Breakpoint"/> - <menu_item_call label="LLError ã¨ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚’実行" name="Force LLError And Crash"/> - <menu_item_call label="ãƒãƒƒãƒ‰ãƒ¡ãƒ¢ãƒªã‚¢ã‚¯ã‚»ã‚¹ã‚’実行" name="Force Bad Memory Access"/> + <menu_item_call label="LLError ã¨ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚’実行ã™ã‚‹" name="Force LLError And Crash"/> + <menu_item_call label="ãƒãƒƒãƒ‰ãƒ¡ãƒ¢ãƒªã‚¢ã‚¯ã‚»ã‚¹ã‚’実行ã™ã‚‹" name="Force Bad Memory Access"/> <menu_item_call label="ç„¡é™ãƒ«ãƒ¼ãƒ—" name="Force Infinite Loop"/> - <menu_item_call label="ドライãƒã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚’実行" name="Force Driver Carsh"/> - <menu_item_call label="ソフトウェア例外エラーã®å®Ÿè¡Œ" name="Force Software Exception"/> - <menu_item_call label="ビューワã®æŽ¥ç¶šé®æ–を実行" name="Force Disconnect Viewer"/> - <menu_item_call label="メモリリークã®ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ãƒˆ" name="Memory Leaking Simulation"/> + <menu_item_call label="ドライãƒã®ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã‚’実行ã™ã‚‹" name="Force Driver Carsh"/> + <menu_item_call label="ソフトウェア例外エラーã®å®Ÿè¡Œã™ã‚‹" name="Force Software Exception"/> + <menu_item_call label="ビューワã®æŽ¥ç¶šé®æ–を実行ã™ã‚‹" name="Force Disconnect Viewer"/> + <menu_item_call label="メモリリークをシミュレートã™ã‚‹" name="Memory Leaking Simulation"/> </menu> <menu label="レンダーテスト" name="Render Tests"> <menu_item_check label="カメラオフセット" name="Camera Offset"/> <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/> - <menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/> + <menu_item_check label="定期的ã«é…ã„フレームを挿入ã™ã‚‹" name="Periodic Slow Frame"/> <menu_item_check label="フレームテスト" name="Frame Test"/> </menu> <menu label="メタデータã®ãƒ¬ãƒ³ãƒ€ãƒ¼" name="Render Metadata"> @@ -252,10 +253,10 @@ <menu_item_check label="アニメーション部分をテクスãƒãƒ£ã§è¡¨ç¤º" name="Texture Anim"/> <menu_item_check label="テクスãƒãƒ£å„ªå…ˆåº¦" name="Texture Priority"/> <menu_item_check label="テクスãƒãƒ£ã®ç¯„囲" name="Texture Area"/> - <menu_item_check label="Face Area" name="Face Area"/> + <menu_item_check label="å´é¢" name="Face Area"/> <menu_item_check label="å…‰" name="Lights"/> <menu_item_check label="骨組ã¿ã®è¡çªåˆ¤å®š" name="Collision Skeleton"/> - <menu_item_check label="Raycast" name="Raycast"/> + <menu_item_check label="レイã‚ャスト" name="Raycast"/> </menu> <menu label="レンダリング" name="Rendering"> <menu_item_check label="軸" name="Axes"/> @@ -263,10 +264,10 @@ <menu_item_call label="é¸æŠžã—ãŸãƒ†ã‚¯ã‚¹ãƒãƒ£æƒ…å ±åŸºåº•" name="Selected Texture Info Basis"/> <menu_item_check label="ワイヤーフレーム" name="Wireframe"/> <menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/> - <menu_item_check label="フレームãƒãƒƒãƒ•ã‚¡ãƒ»ã‚ªãƒ–ジェクト" name="Framebuffer Objects"/> + <menu_item_check label="フレームãƒãƒƒãƒ•ã‚¡ã‚ªãƒ–ジェクト" name="Framebuffer Objects"/> <menu_item_check label="é…延レンダリング" name="Deferred Rendering"/> <menu_item_check label="ã‚°ãƒãƒ¼ãƒãƒ«ã‚¤ãƒ«ãƒŸãƒãƒ¼ã‚·ãƒ§ãƒ³" name="Global Illumination"/> - <menu_item_check label="GLデãƒãƒƒã‚°" name="Debug GL"/> + <menu_item_check label="GL デãƒãƒƒã‚°" name="Debug GL"/> <menu_item_check label="経路をデãƒãƒƒã‚°" name="Debug Pipeline"/> <menu_item_check label="ファーストアルファ" name="Fast Alpha"/> <menu_item_check label="アニメーションテクスãƒãƒ£" name="Animation Textures"/> @@ -276,10 +277,10 @@ <menu_item_check label="テクスãƒãƒ£ã‚¢ãƒˆãƒ©ã‚¹" name="Texture Atlas"/> <menu_item_check label="装ç€ã•ã‚ŒãŸå…‰æºã‚’æç”»ã™ã‚‹" name="Render Attached Lights"/> <menu_item_check label="å–り付ã‘られãŸãƒ‘ーティクルをæç”»ã™ã‚‹" name="Render Attached Particles"/> - <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> + <menu_item_check label="マウスオーãƒãƒ¼ã§å¼·èª¿è¡¨ç¤ºã™ã‚‹" name="Hover Glow Objects"/> </menu> <menu label="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯" name="Network"> - <menu_item_check label="エージェントを一時åœæ¢" name="AgentPause"/> + <menu_item_check label="エージェントを一時åœæ¢ã™ã‚‹" name="AgentPause"/> <menu_item_call label="メッセージãƒã‚°ã‚’有効ã«ã™ã‚‹" name="Enable Message Log"/> <menu_item_call label="メッセージãƒã‚°ã‚’使用ä¸å¯ã«ã™ã‚‹" name="Disable Message Log"/> <menu_item_check label="速力ãŒæŒ¿å…¥ã•ã‚ŒãŸã‚ªãƒ–ジェクト" name="Velocity Interpolate Objects"/> @@ -297,9 +298,9 @@ </menu> <menu label="世界" name="World"> <menu_item_check label="シムã®å¤ªé™½ã®è¨å®šã‚’無視ã™ã‚‹" name="Sim Sun Override"/> - <menu_item_check label="ビーコンã®å¼·èª¿è¡¨ç¤º" name="Cheesy Beacon"/> + <menu_item_check label="ビーコンを強調表示ã™ã‚‹" name="Cheesy Beacon"/> <menu_item_check label="固定ã•ã‚ŒãŸå¤©æ°—" name="Fixed Weather"/> - <menu_item_call label="リージョンオブジェクトã®ã‚ャッシュをダンプ" name="Dump Region Object Cache"/> + <menu_item_call label="リージョンオブジェクトã®ã‚ャッシュをダンプã™ã‚‹" name="Dump Region Object Cache"/> </menu> <menu label="UI" name="UI"> <menu_item_call label="Web ブラウザã®ãƒ†ã‚¹ãƒˆ" name="Web Browser Test"/> @@ -310,7 +311,7 @@ <menu_item_call label="é¸æŠžã—ãŸã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Selected Object Info"/> <menu_item_call label="ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆæƒ…å ±ã‚’ãƒ—ãƒªãƒ³ãƒˆ" name="Print Agent Info"/> <menu_item_call label="メモリ使用状æ³" name="Memory Stats"/> - <menu_item_check label="ダブルクリックã—ãŸå ´æ‰€ã«è‡ªå‹•æ“作ã§ç§»å‹•" name="Double-ClickAuto-Pilot"/> + <menu_item_check label="ダブルクリックã—ãŸå ´æ‰€ã«è‡ªå‹•æ“作ã§ç§»å‹•ã™ã‚‹" name="Double-ClickAuto-Pilot"/> <menu_item_check label="SelectMgr ã®ãƒ‡ãƒãƒƒã‚°" name="Debug SelectMgr"/> <menu_item_check label="ダブルクリック" name="Debug Clicks"/> <menu_item_check label="デãƒãƒƒã‚°è¡¨ç¤º" name="Debug Views"/> @@ -320,15 +321,15 @@ <menu_item_check label="WindowProc ã®ãƒ‡ãƒãƒƒã‚°" name="Debug WindowProc"/> </menu> <menu label="XUI" name="XUI"> - <menu_item_call label="色ã®è¨å®šã‚’æ›´æ–°" name="Reload Color Settings"/> - <menu_item_call label="フォントテストを表示" name="Show Font Test"/> + <menu_item_call label="色ã®è¨å®šã‚’æ›´æ–°ã™ã‚‹" name="Reload Color Settings"/> + <menu_item_call label="フォントテストを表示ã™ã‚‹" name="Show Font Test"/> <menu_item_call label="XML ã‹ã‚‰èªã¿è¾¼ã‚€" name="Load from XML"/> - <menu_item_call label="XML ã§ä¿å˜" name="Save to XML"/> - <menu_item_check label="XUI ãƒãƒ¼ãƒ を表示" name="Show XUI Names"/> - <menu_item_call label="テスト用 IM ã‚’é€ä¿¡" name="Send Test IMs"/> + <menu_item_call label="XML ã§ä¿å˜ã™ã‚‹" name="Save to XML"/> + <menu_item_check label="XUI ãƒãƒ¼ãƒ を表示ã™ã‚‹" name="Show XUI Names"/> + <menu_item_call label="テスト用 IM ã‚’é€ä¿¡ã™ã‚‹" name="Send Test IMs"/> </menu> <menu label="ã‚¢ãƒã‚¿ãƒ¼" name="Character"> - <menu label="ベークドテクスãƒãƒ£ã‚’å–å¾—" name="Grab Baked Texture"> + <menu label="ベークドテクスãƒãƒ£ã‚’å–å¾—ã™ã‚‹" name="Grab Baked Texture"> <menu_item_call label="çž³" name="Iris"/> <menu_item_call label="é " name="Head"/> <menu_item_call label="上åŠèº«" name="Upper Body"/> @@ -336,23 +337,23 @@ <menu_item_call label="スカート" name="Skirt"/> </menu> <menu label="ã‚ャラクターテスト" name="Character Tests"> - <menu_item_call label="容姿を XML ã«ä¿å˜" name="Appearance To XML"/> + <menu_item_call label="容姿を XML ã«ä¿å˜ã™ã‚‹" name="Appearance To XML"/> <menu_item_call label="ã‚ャラクタジオメトリã®åˆ‡ã‚Šæ›¿ãˆ" name="Toggle Character Geometry"/> <menu_item_call label="男性アãƒã‚¿ãƒ¼ã®ãƒ†ã‚¹ãƒˆ" name="Test Male"/> <menu_item_call label="女性アãƒã‚¿ãƒ¼ã®ãƒ†ã‚¹ãƒˆ" name="Test Female"/> <menu_item_call label="PG ã®ãƒˆã‚°ãƒ«" name="Toggle PG"/> <menu_item_check label="é¸æŠžã‚¢ãƒã‚¿ãƒ¼è¨±å¯" name="Allow Select Avatar"/> </menu> - <menu_item_call label="Params をデフォルトã«å®Ÿè¡Œ" name="Force Params to Default"/> + <menu_item_call label="パラメータを強制的ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ã™ã‚‹" name="Force Params to Default"/> <menu_item_check label="ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³æƒ…å ±" name="Animation Info"/> - <menu_item_check label="アニメーションをスãƒãƒ¼ãƒ¢ãƒ¼ã‚·ãƒ§ãƒ³" name="Slow Motion Animations"/> + <menu_item_check label="スãƒãƒ¼ãƒ¢ãƒ¼ã‚·ãƒ§ãƒ³ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³" name="Slow Motion Animations"/> <menu_item_check label="見ã¦ã„ã‚‹ã‚‚ã®ã‚’表示ã™ã‚‹" name="Show Look At"/> <menu_item_check label="クリックã—ãŸå ´æ‰€ã‚’表示ã™ã‚‹" name="Show Point At"/> <menu_item_check label="çµåˆéƒ¨ã®ã‚¢ãƒƒãƒ—デートã®ãƒ‡ãƒãƒƒã‚°" name="Debug Joint Updates"/> <menu_item_check label="LOD を無効ã«ã™ã‚‹" name="Disable LOD"/> <menu_item_check label="ã‚ャラクター Vis ã®ãƒ‡ãƒãƒƒã‚°" name="Debug Character Vis"/> - <menu_item_check label="骨組ã¿ã®è¡çªåˆ¤å®šã‚’表示" name="Show Collision Skeleton"/> - <menu_item_check label="エージェントã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã‚’表示" name="Display Agent Target"/> + <menu_item_check label="骨組ã¿ã®è¡çªåˆ¤å®šã‚’表示ã™ã‚‹" name="Show Collision Skeleton"/> + <menu_item_check label="エージェントã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã‚’表示ã™ã‚‹" name="Display Agent Target"/> --> <menu_item_call label="アタッãƒãƒ¡ãƒ³ãƒˆã‚’ダンプ" name="Dump Attachments"/> <menu_item_call label="ã‚¢ãƒã‚¿ãƒ¼ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚’デãƒãƒƒã‚°" name="Debug Avatar Textures"/> @@ -360,9 +361,9 @@ </menu> <menu_item_check label="HTTP Texture" name="HTTP Textures"/> <menu_item_call label="圧縮画åƒ" name="Compress Images"/> - <menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/> - <menu_item_check label="次回ã®èµ·å‹•æ™‚ã«ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’表示" name="Console Window"/> - <menu_item_check label="管ç†è€…メニューを表示" name="View Admin Options"/> + <menu_item_check label="デãƒãƒƒã‚°ç”¨ã®ãƒŸãƒ‹ãƒ€ãƒ³ãƒ—を出力ã™ã‚‹" name="Output Debug Minidump"/> + <menu_item_check label="次回ã®èµ·å‹•æ™‚ã«ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’表示ã™ã‚‹" name="Console Window"/> + <menu_item_check label="管ç†è€…メニューを表示ã™ã‚‹" name="View Admin Options"/> <menu_item_call label="管ç†è€…ステータスã®å‘¼ã³å‡ºã—" name="Request Admin Options"/> <menu_item_call label="管ç†è€…ステータス解除" name="Leave Admin Options"/> </menu> @@ -370,19 +371,19 @@ <menu label="Object"> <menu_item_call label="コピーをå–ã‚‹" name="Take Copy"/> <menu_item_call label="ç§ã‚’所有者ã«ã™ã‚‹" name="Force Owner To Me"/> - <menu_item_call label="所有者権é™ã®å®Ÿè¡Œ" name="Force Owner Permissive"/> + <menu_item_call label="所有者権é™ã‚’実行ã™ã‚‹" name="Force Owner Permissive"/> <menu_item_call label="削除" name="Delete"/> <menu_item_call label="ãƒãƒƒã‚¯" name="Lock"/> - <menu_item_call label="アセット ID ã‚’å–å¾—" name="Get Assets IDs"/> + <menu_item_call label="アセット ID ã‚’å–å¾—ã™ã‚‹" name="Get Assets IDs"/> </menu> <menu label="区画" name="Parcel"> <menu_item_call label="ç§ã‚’所有者ã«ã™ã‚‹" name="Owner To Me"/> - <menu_item_call label="リンデンコンテンツã«è¨å®š" name="Set to Linden Content"/> - <menu_item_call label="パブリックã®åœŸåœ°ã‚’å–å¾—" name="Claim Public Land"/> + <menu_item_call label="リンデンコンテンツã«è¨å®šã™ã‚‹" name="Set to Linden Content"/> + <menu_item_call label="パブリックã®åœŸåœ°ã‚’å–å¾—ã™ã‚‹" name="Claim Public Land"/> </menu> <menu label="リージョン/地域" name="Region"> <menu_item_call label="一時アセットデータをダンプ" name="Dump Temp Asset Data"/> - <menu_item_call label="リージョンã®çŠ¶æ…‹ã‚’ä¿å˜" name="Save Region State"/> + <menu_item_call label="リージョンã®çŠ¶æ…‹ã‚’ä¿å˜ã™ã‚‹" name="Save Region State"/> </menu> <menu_item_call label="グリッドツール" name="God Tools"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index b502fb2e6e..ddb2ae49f7 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -11,18 +11,29 @@ </global> <template name="okbutton"> <form> - <button name="OK" text="$yestext"/> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> </form> </template> - <template name="okignore"/> <template name="okcancelbuttons"> <form> - <button name="Cancel" text="$notext"/> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> </form> </template> - <template name="okcancelignore"/> <template name="okhelpbuttons"> <form> + <button name="OK_okhelpbuttons" text="$yestext"/> <button name="Help" text="$helptext"/> </form> </template> @@ -30,16 +41,17 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="ä¸æ˜Žã®é€šçŸ¥ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸" name="MissingAlert"> ã‚ãªãŸã® [APP_NAME] ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ä»Šå—ã‘å–ã£ãŸé€šçŸ¥ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 最新ビューワãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ã”確èªãã ã•ã„。 -エラー詳細： 「[_NAME]ã€ã¨ã„ã†é€šçŸ¥ã¯ notifications.xml ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ +エラー詳細： 「 [_NAME] ã€ã¨ã„ã†é€šçŸ¥ã¯ notifications.xml ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FloaterNotFound"> - フãƒãƒ¼ã‚¿ãƒ»ã‚¨ãƒ©ãƒ¼ï¼šä¸‹è¨˜ã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸï¼š + フãƒãƒ¼ã‚¿ã‚¨ãƒ©ãƒ¼ï¼šä¸‹è¨˜ã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸï¼š [CONTROLS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -69,29 +81,38 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="WearableSave"> - ç¾åœ¨ã®è¡£æœ/ボディーパーツã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ + ç¾åœ¨ã®è¡£é¡žã€èº«ä½“部ä½ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="ä¿å˜ã—ãªã„" yestext="ä¿å˜"/> </notification> <notification name="CompileQueueSaveText"> - 次ã®ç†ç”±ã§ã€ã‚¹ã‚¯ãƒªãƒ—ト用テã‚ストã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ [REASON] 後ã§ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + 次ã®ç†ç”±ã§ã€ã‚¹ã‚¯ãƒªãƒ—ト用テã‚ストã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ +[REASON] +後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="CompileQueueSaveBytecode"> - 次ã®ç†ç”±ã§ã€ã‚³ãƒ³ãƒ‘イルã—ãŸã‚¹ã‚¯ãƒªãƒ—トã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ [REASON]後ã§ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + 次ã®ç†ç”±ã§ã€ã‚³ãƒ³ãƒ‘イルã—ãŸã‚¹ã‚¯ãƒªãƒ—トã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ +[REASON] +後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="WriteAnimationFail"> アニメーションデータã®æ›¸ãè¾¼ã¿ã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="UploadAuctionSnapshotFail"> - 次ã®ç†ç”±ã§ã€ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚¹ãƒŠãƒƒãƒ—ショットã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ [REASON] + 次ã®ç†ç”±ã§ã€ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚¹ãƒŠãƒƒãƒ—ショットã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰æ™‚ã«å•é¡ŒãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ +[REASON] </notification> <notification name="UnableToViewContentsMoreThanOne"> - 一度ã«è¤‡æ•°ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯è¡¨ç¤ºã§ãã¾ã›ã‚“。 -é¸æŠžã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã‚’1ã¤ã ã‘ã«ã—ã¦ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + 一度ã«è¤‡æ•°ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ä¸èº«ã‚’表示ã§ãã¾ã›ã‚“。 +アイテムを 1 ã¤ã ã‘é¸æŠžã—ã¦ã€ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="SaveClothingBodyChanges"> - è¡£æœï¼èº«ä½“部ä½ã«å¯¾ã™ã‚‹å¤‰æ›´ã‚’ã™ã¹ã¦ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ + è¡£æœã€èº«ä½“部ä½ã«å¯¾ã™ã‚‹å¤‰æ›´ã‚’ã™ã¹ã¦ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ä¿å˜ã—ãªã„" yestext="ã™ã¹ã¦ä¿å˜"/> </notification> + <notification name="FriendsAndGroupsOnly"> + フレンド以外ã‹ã‚‰ã®ã‚³ãƒ¼ãƒ«ã‚„インスタントメッセージを無視ã™ã‚‹è¨å®šã«ã—ãŸã“ã¨ã‚’ã€ç›¸æ‰‹ã«çŸ¥ã‚‰ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> 他人ã«ä¿®æ£æ¨©é™ã‚’与ãˆã‚‹ã¨ã€æ¨©é™ã‚’与ãˆã‚‰ã‚ŒãŸäººã¯ã‚ãªãŸãŒæ‰€æœ‰ã™ã‚‹ã‚¤ãƒ³ãƒ¯ãƒ¼ãƒ«ãƒ‰ã®ã‚ªãƒ–ジェクトを変更ã€å‰Šé™¤ã€æŒã¡å¸°ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æ¨©é™ã‚’与ãˆã‚‹éš›ã«ã¯å分ã«æ³¨æ„ã—ã¦ãã ã•ã„。 [FIRST_NAME] [LAST_NAME] ã«ä¿®æ£æ¨©é™ã‚’与ãˆã¾ã™ã‹ï¼Ÿ @@ -103,7 +124,7 @@ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="RevokeModifyRights"> - [FIRST_NAME] [LAST_NAME]ã«å¯¾ã—ã¦å¤‰æ›´æ¨©é™ã‚’å–り消ã—ã¾ã™ã‹ï¼Ÿ + [FIRST_NAME] [LAST_NAME] ã«å¯¾ã—ã¦å¤‰æ›´æ¨©é™ã‚’å–り消ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="RevokeModifyRightsMultiple"> @@ -125,28 +146,27 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AddGroupOwnerWarning"> - ã‚ãªãŸã¯ [ROLE_NAME]ã®å½¹å‰²ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’与ãˆã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã¯ [ROLE_NAME] ã®å½¹å‰²ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’与ãˆã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ 任命ã•ã‚ŒãŸãƒ¡ãƒ³ãƒãƒ¼ãŒè‡ªã‚‰é€€ä»»ã—ãªã„é™ã‚Šã€ -彼らを役柄ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。 +役柄ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。 æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="グループオーナーを新ã—ãè¿½åŠ ã™ã‚‹å‰ã«ç¢ºèª" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + <usetemplate ignoretext="グループオーナーを新ã—ãè¿½åŠ ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="AssignDangerousActionWarning"> - ã‚ãªãŸã¯[ROLE_NAME]ã« [ACTION_NAME]ã®èƒ½åŠ›ã‚’ + ã‚ãªãŸã¯ [ROLE_NAME] ã« [ACTION_NAME] ã®èƒ½åŠ›ã‚’ 与ãˆã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ *è¦å‘Š* ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ 自分ã¨ä»–ã®ãƒ¡ãƒ³ãƒãƒ¼ã«ç¾åœ¨ã‚ˆã‚Šå¼·åŠ›ãªæ¨©é™ã‚’割り当ã¦ã€ -自分をオーナーã¨ã»ã¼åŒæ§˜ã®ç«‹å ´ã« -任命ã™ã‚‹ã“ã¨ã‚‚ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ ã“ã®è¡Œç‚ºã®æ„味をよãç†è§£ã—ã¦ã‹ã‚‰ -実行ã—ã¦ãã ã•ã„。 +自分をオーナーã¨ã»ã¼åŒæ§˜ã®ç«‹å ´ã«ä»»å‘½ã™ã‚‹ã“ã¨ã‚‚ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ +ã“ã®è¡Œç‚ºã®æ„味をよãç†è§£ã—ã¦ã‹ã‚‰å®Ÿè¡Œã—ã¦ãã ã•ã„。 -ã“ã®èƒ½åŠ›ã‚’[ROLE_NAME]ã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿ +ã“ã®èƒ½åŠ›ã‚’ [ROLE_NAME] ã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="AssignDangerousAbilityWarning"> - ã‚ãªãŸã¯[ROLE_NAME]ã« [ACTION_NAME]ã®èƒ½åŠ›ã‚’ + ã‚ãªãŸã¯ [ROLE_NAME] ã« [ACTION_NAME] ã®èƒ½åŠ›ã‚’ 与ãˆã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ *è¦å‘Š* @@ -154,97 +174,99 @@ 自分ã¨ä»–ã®ãƒ¡ãƒ³ãƒãƒ¼ã«ã™ã¹ã¦ã®èƒ½åŠ›ã‚’割り当ã¦ã€ 自分をオーナーã¨ã»ã¼åŒæ§˜ã®ç«‹å ´ã«ä»»å‘½ã§ãã¾ã™ã€‚ -ã“ã®èƒ½åŠ›ã‚’[ROLE_NAME]ã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿ +ã“ã®èƒ½åŠ›ã‚’ [ROLE_NAME] ã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="AttachmentDrop"> アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«ç½®ã“ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ 続ã‘ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«è½ã¨ã™å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> - </notification> - <notification name="ClickUnimplemented"> - 申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã¾ã 未実装ã§ã™ã€‚ + <usetemplate ignoretext="アタッãƒãƒ¡ãƒ³ãƒˆã‚’下ã«è½ã¨ã™å‰ã®ç¢ºèª" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="JoinGroupCanAfford"> - ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã«ã¯ã€L$[COST]ã‹ã‹ã‚Šã¾ã™ã€‚ + ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã«ã¯ã€L$ [COST] ã‹ã‹ã‚Šã¾ã™ã€‚ 続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="å‚åŠ "/> </notification> + <notification name="JoinGroupNoCost"> + [NAME] ã¨ã„ã†ã‚°ãƒ«ãƒ¼ãƒ—ã«å…¥ã‚ã†ã¨ã—ã¦ã„ã¾ã™ã€‚ +続ã‘ã¾ã™ã‹ï¼Ÿ + <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="å‚åŠ "/> + </notification> <notification name="JoinGroupCannotAfford"> - ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«åŠ å…¥ã™ã‚‹ã«ã¯ã€L$[COST]å¿…è¦ã§ã™ã€‚ -L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«åŠ å…¥ã™ã‚‹ã«ã¯ã€L$ [COST] å¿…è¦ã§ã™ã€‚ +L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </notification> <notification name="CreateGroupCost"> - ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を作るã«ã¯ L$100 ã‹ã‹ã‚Šã¾ã™ã€‚ + ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を作るã«ã¯ L$ 100 ã‹ã‹ã‚Šã¾ã™ã€‚ 一人ã§ã¯ã‚°ãƒ«ãƒ¼ãƒ—ã«ãªã‚‰ãªã„ã®ã§ã€æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¦ã—ã¾ã„ã¾ã™ã€‚ 48 時間以内ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’勧誘ã—ã€å…¥ä¼šã—ã¦ã‚‚らã£ã¦ãã ã•ã„。 <usetemplate canceltext="ã‚ャンセル" name="okcancelbuttons" notext="ã‚ャンセル" yestext="L$100 ã§ã‚°ãƒ«ãƒ¼ãƒ—を作æˆ"/> </notification> <notification name="LandBuyPass"> - L$[COST]㧠[TIME]時間ã“ã®åœŸåœ°[PARCEL_NAME]ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ + L$ [COST] 㧠[TIME] 時間 [PARCEL_NAME] ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ å…¥å ´è¨±å¯ã‚’購入ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="SalePriceRestriction"> ä¸ç‰¹å®šã®äººã«å£²å´ã™ã‚‹å ´åˆã«ã¯ã€ -売å´ä¾¡æ ¼ã¯L$0以上ã«è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -売å´ä¾¡æ ¼ã‚’L$0ã«è¨å®šã™ã‚‹å ´åˆã¯ã€ +売å´ä¾¡æ ¼ã¯L$ 0 以上ã«è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ +売å´ä¾¡æ ¼ã‚’L$ 0 ã«è¨å®šã™ã‚‹å ´åˆã¯ã€ 売å´ã™ã‚‹å€‹äººã‚’é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="ConfirmLandSaleChange"> - é¸æŠžã•ã‚ŒãŸ[LAND_SIZE]平方メートルã®åœŸåœ°ã¯ã€å£²ã‚Šå‡ºã—ä¸ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ -売å´ä¾¡æ ¼L$[SALE_PRICE]ã§ã€[NAME]ã«å£²å´ã‚’èªå¯ã—ã¾ã™ã€‚ + é¸æŠžã—㟠[LAND_SIZE] 平方メートルã®åœŸåœ°ã¯ã€å£²ã‚Šå‡ºã—ä¸ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ +売å´ä¾¡æ ¼ L$ [SALE_PRICE] ã§ã€[NAME] ã«å£²å´ã‚’èªå¯ã—ã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> 注æ„： 「誰ã«ã§ã‚‚販売ã€ã‚’クリックã™ã‚‹ã“ã¨ã§ã€ã‚ãªãŸã®åœŸåœ°ã¯ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„る人ã«é™ã‚‰ãš [SECOND_LIFE] コミュニティ全体ã§åˆ©ç”¨å¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚ é¸æŠžã—㟠[LAND_SIZE] 平方メートルã®åœŸåœ°ã¯ã€è²©å£²å¯¾è±¡ã«è¨å®šã•ã‚Œã¾ã—ãŸã€‚ -è²©å£²ä¾¡æ ¼ L$[SALE_PRICE] ã§ã€[NAME] ãŒè²©å£²å¯¾è±¡è€…ã¨ãªã‚Šã¾ã™ã€‚ +è²©å£²ä¾¡æ ¼ L$ [SALE_PRICE] ã§ã€[NAME] ãŒè²©å£²å¯¾è±¡è€…ã¨ãªã‚Šã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> - ã“ã®åŒºç”»ã®ã‚°ãƒ«ãƒ¼ãƒ—[NAME]共有ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトをã€ä»¥å‰ã®ã‚ªãƒ¼ãƒŠãƒ¼ã®æŒã¡ç‰©ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + ã“ã®åŒºç”»ã®ã‚°ãƒ«ãƒ¼ãƒ— [NAME] 共有ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトをã€ä»¥å‰ã®æ‰€æœ‰è€…ã®ã€ŒæŒã¡ç‰©ã€ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ *è¦å‘Š* ã“ã‚Œã«ã‚ˆã‚Šã€ -グループã«è²æ¸¡ã•ã‚ŒãŸè²æ¸¡ä¸å¯èƒ½ãªã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ +グループã«è²æ¸¡ã•ã‚ŒãŸã€Œå†è²©ãƒ»ãƒ—レゼントä¸å¯ã€ã®ã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ReturnObjectsOwnedByUser"> ã“ã®åŒºç”»ã§ã€ -ä½äºº[NAME]ãŒæ‰€æœ‰ã™ã‚‹å…¨ã¦ã®ã‚ªãƒ–ジェクトを -彼らã®æŒã¡ç‰©ã«æœ¬å½“ã«è¿”å´ã—ã¦ã‚‚よã„ã§ã™ã‹ï¼Ÿ +ä½äºº [NAME] ãŒæ‰€æœ‰ã™ã‚‹å…¨ã¦ã®ã‚ªãƒ–ジェクトを +本人ã®ã€ŒæŒã¡ç‰©ã€ã«æœ¬å½“ã«è¿”å´ã—ã¦ã‚‚よã„ã§ã™ã‹ï¼Ÿ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ReturnObjectsOwnedBySelf"> ã“ã®åœŸåœ°åŒºç”»å†…ã«ã‚ã‚‹ã€ã‚ãªãŸãŒæ‰€æœ‰ã™ã‚‹ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトを〠-ã‚ãªãŸã®æŒã¡ç‰©ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ +ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedBySelf"> ã“ã®åœŸåœ°åŒºç”»å†…ã«ã‚ã‚‹ã€ã‚ãªãŸä»¥å¤–ãŒæ‰€æœ‰ã™ã‚‹ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトを〠-ãã‚Œãžã‚Œã®ã‚ªãƒ¼ãƒŠãƒ¼ã®æŒã¡ç‰©ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ +ãã‚Œãžã‚Œã®æ‰€æœ‰è€…ã®ã€ŒæŒã¡ç‰©ã€ã«æˆ»ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ -グループã«è²æ¸¡ã•ã‚ŒãŸè²æ¸¡å¯èƒ½ã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ +グループã«è²æ¸¡ã•ã‚ŒãŸã€Œå†è²©ãƒ»ãƒ—レゼントå¯ã€ã®ã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ *è¦å‘Š* ã“ã‚Œã«ã‚ˆã‚Šã€ -グループã«è²æ¸¡ã•ã‚ŒãŸè²æ¸¡ä¸å¯èƒ½ãªã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ +グループã«è²æ¸¡ã•ã‚ŒãŸã€Œå†è²©ãƒ»ãƒ—レゼントä¸å¯ã€ã®ã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedByUser"> ã“ã®åœŸåœ°åŒºç”»å†…ã«ã‚る〠-[NAME]以外ã«ã‚ˆã‚‹æ‰€æœ‰ã®ã‚ªãƒ–ジェクトをã™ã¹ã¦ãã‚Œãžã‚Œã®ã‚ªãƒ¼ãƒŠãƒ¼ã®æŒã¡ç‰©ã«è¿”å´ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -æ“作を続行ã—ã¾ã™ã‹ï¼Ÿã‚°ãƒ«ãƒ¼ãƒ—ã«è²æ¸¡ã•ã‚ŒãŸè²æ¸¡å¯èƒ½ã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ +[NAME]以外ã«ã‚ˆã‚‹æ‰€æœ‰ã®ã‚ªãƒ–ジェクトをã™ã¹ã¦ãã‚Œãžã‚Œã®æ‰€æœ‰è€…ã®ã€ŒæŒã¡ç‰©ã€ã«è¿”å´ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ +æ“作を続行ã—ã¾ã™ã‹ï¼Ÿã‚°ãƒ«ãƒ¼ãƒ—ã«è²æ¸¡ã•ã‚ŒãŸã€Œå†è²©ãƒ»ãƒ—レゼントå¯ã€ã®ã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ *è¦å‘Š* ã“ã‚Œã«ã‚ˆã‚Šã€ -グループã«è²æ¸¡ã•ã‚ŒãŸè²æ¸¡ä¸å¯èƒ½ãªã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ +グループã«è²æ¸¡ã•ã‚ŒãŸã€Œå†è²©ãƒ»ãƒ—レゼントä¸å¯ã€ã®ã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> @@ -253,43 +275,42 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="DisableAllTopObjects"> - ã“ã®åœ°åŸŸå†…ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトを無効ã«ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰å†…ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトを無効ã«ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedByGroup"> - ã“ã®åœŸåœ°ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ—[NAME] -ã¨ã®é–“ã§å…±æœ‰ã—ã¦ã„ãªã„オブジェクトをオーナーã«è¿”å´ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®åœŸåœ°ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ— [NAME] ã¨ã®é–“ã§å…±æœ‰ã—ã¦ã„ãªã„オブジェクトを所有者ã«è¿”å´ã—ã¾ã™ã‹ï¼Ÿ オブジェクト： [N] <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="UnableToDisableOutsideScripts"> スクリプトを無効ã«ã§ãã¾ã›ã‚“。 -ã“ã®åœ°åŸŸå…¨ä½“ãŒã€Œãƒ€ãƒ¡ãƒ¼ã‚¸æœ‰åŠ¹ã€ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ +ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰å…¨ä½“ãŒã€Œãƒ€ãƒ¡ãƒ¼ã‚¸æœ‰åŠ¹ã€ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ æ¦å™¨ã‚’使用ã™ã‚‹ã«ã¯ã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡Œã‚’許å¯ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ </notification> <notification name="MultipleFacesSelected"> ç¾åœ¨è¤‡æ•°ã®é¢ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ ã“ã®ã¾ã¾ç¶šã‘ãŸå ´åˆã€ãƒ¡ãƒ‡ã‚£ã‚¢ã®åˆ¥ã€…ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãŒã‚ªãƒ–ジェクトã®è¤‡æ•°ã®é¢ã«è¨å®šã•ã‚Œã¾ã™ã€‚ メディアを 1 ã¤ã®é¢ã ã‘ã«å–り付ã‘ã‚‹ã«ã¯ã€ã€Œé¢ã‚’é¸æŠžã€ã‚’é¸ã‚“ã§ã‚ªãƒ–ジェクトã®å¸Œæœ›ã™ã‚‹é¢ã‚’クリックã€ãã‚Œã‹ã‚‰ã€Œè¿½åŠ ã€ã‚’クリックã—ã¦ãã ã•ã„。 - <usetemplate ignoretext="メディアã¯é¸æŠžã—ãŸè¤‡æ•°ã®é¢ã«ã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="メディアãŒé¸æŠžã—ãŸè¤‡æ•°ã®é¢ã«ã‚»ãƒƒãƒˆã•ã‚Œã‚‹ã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="MustBeInParcel"> ç€åœ°ç‚¹ã‚’è¨å®šã™ã‚‹ã«ã¯ã€ã“ã®åŒºç”»ã®å†…å´ã« ç«‹ã£ã¦ãã ã•ã„。 </notification> <notification name="PromptRecipientEmail"> - å—信者ã®æœ‰åŠ¹ãªEメールアドレスを入力ã—ã¦ãã ã•ã„。 + å—信者ã®æœ‰åŠ¹ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’入力ã—ã¦ãã ã•ã„。 </notification> <notification name="PromptSelfEmail"> - ã‚ãªãŸã®Eメール・アドレスを入力ã—ã¦ãã ã•ã„。 + ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’入力ã—ã¦ãã ã•ã„。 </notification> <notification name="PromptMissingSubjMsg"> デフォルトã®ä»¶åã¾ãŸã¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’付ã‘ã¦ã€ã‚¹ãƒŠãƒƒãƒ—ショットをé€ä¿¡ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ErrorProcessingSnapshot"> - スナップショット・データã®å‡¦ç†ã‚¨ãƒ©ãƒ¼ + スナップショットデータã®å‡¦ç†ã‚¨ãƒ©ãƒ¼ </notification> <notification name="ErrorEncodingSnapshot"> スナップショットã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰åŒ–ã§ã‚¨ãƒ©ãƒ¼ãŒå‡ºã¾ã—ãŸï¼ @@ -304,11 +325,11 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ [SECOND_LIFE] ã¸ã®ãƒã‚°ã‚¤ãƒ³ã‚’続ã‘ã‚‹ã«ã¯ã€åˆ©ç”¨è¦ç´„ã«åŒæ„ã—ã¦ãã ã•ã„。 </notification> <notification name="CouldNotPutOnOutfit"> - æœè£…を装ç€ã§ãã¾ã›ã‚“。 -æœè£…フォルダã«è¡£æœã€èº«ä½“部ä½ã€ä»˜å±žå“ãŒã‚ã‚Šã¾ã›ã‚“。 + アウトフィットを装ç€ã§ãã¾ã›ã‚“。 +アウトフィットフォルダã«è¡£é¡žã€èº«ä½“部ä½ã€ã‚¢ã‚¿ãƒƒãƒãƒ¡ãƒ³ãƒˆãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="CannotWearTrash"> - ゴミ箱ã«ã‚ã‚‹æœã‚„ボディーパーツã®ç€ç”¨ã¯ã§ãã¾ã›ã‚“。 + ã”ã¿ç®±ã«ã‚る衣類や身体部ä½ã®ç€ç”¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="MaxAttachmentsOnOutfit"> オブジェクトを付ã‘られã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -318,10 +339,10 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ ã¾ã èªã¿è¾¼ã¾ã‚Œã¦ã„ãªã„ãŸã‚ã€ãã®ã‚¢ã‚¤ãƒ†ãƒ を装ç€ã§ãã¾ã›ã‚“。後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </notification> <notification name="MustHaveAccountToLogIn"> - ãŠã£ã¨! 記入æ¼ã‚ŒãŒã‚ã‚Šã¾ã™ã‚ˆã€‚ + ãŠã£ã¨ï¼è¨˜å…¥æ¼ã‚ŒãŒã‚ã‚Šã¾ã™ã‚ˆã€‚ ã‚¢ãƒã‚¿ãƒ¼ã®ãƒ•ã‚¡ãƒ¼ã‚¹ãƒˆãƒãƒ¼ãƒ ã¨ãƒ©ã‚¹ãƒˆãƒãƒ¼ãƒ ã®ä¸¡æ–¹ã‚’入力ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -[SECOND_LIFE]ã«å…¥ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¿…è¦ã§ã™ã€‚ アカウントを作æˆã—ã¾ã™ã‹ï¼Ÿ +[SECOND_LIFE] ã«å…¥ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¿…è¦ã§ã™ã€‚ アカウントを作æˆã—ã¾ã™ã‹ï¼Ÿ <url name="url"> https://join.secondlife.com/index.php?lang=ja-JP </url> @@ -335,25 +356,29 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ <usetemplate ignoretext="æ–°è¦ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šä½œæˆæ–¹æ³•" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="DeleteClassified"> - クラシファイド広告[NAME]ã®å‰Šé™¤ã‚’ã—ã¾ã™ã‹ï¼Ÿ + クラシファイド広告 [NAME] を削除ã—ã¾ã™ã‹ï¼Ÿ 支払ã„済ã¿ã®æ–™é‡‘ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="DeleteMedia"> ã“ã®é¢ã«ã‚るメディアを削除ã™ã‚‹é¸æŠžã‚’ã—ã¾ã—ãŸã€‚ 続ã‘ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="オブジェクトã‹ã‚‰ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’削除ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + <usetemplate ignoretext="オブジェクトã‹ã‚‰ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’削除ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="ClassifiedSave"> - クラシファイド広告[NAME]ã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ + クラシファイド広告 [NAME] ã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="ä¿å˜ã—ãªã„" yestext="ä¿å˜"/> </notification> + <notification name="ClassifiedInsufficientFunds"> + クラシファイド広告を出ã™ã«ã¯ã€è³‡é‡‘ãŒè¶³ã‚Šã¾ã›ã‚“。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DeleteAvatarPick"> - ピック[PICK]を削除ã—ã¾ã™ã‹ï¼Ÿ + ピック「 [PICK] ã€ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="PromptGoToEventsPage"> - [SECOND_LIFE]イベント・ウェブ・ページã«ç§»å‹•ã—ã¾ã™ã‹ï¼Ÿ + [SECOND_LIFE] イベント Web ページã«ç§»å‹•ã—ã¾ã™ã‹ï¼Ÿ <url name="url"> http://secondlife.com/events/?lang=ja-JP </url> @@ -379,7 +404,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ æ–°ã—ã„スã‚ン㯠[APP_NAME] ã‚’å†èµ·å‹•å¾Œã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ </notification> <notification name="GoToAuctionPage"> - [SECOND_LIFE]ウェブ・ページã«ç§»å‹•ã—〠入æœã‚ã‚‹ã„ã¯ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã®è©³ç´°ã‚’確èªã—ã¾ã™ã‹ï¼Ÿ + [SECOND_LIFE]ã® Web ページã«ç§»å‹•ã—ã€å…¥æœã‚ã‚‹ã„ã¯ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã®è©³ç´°ã‚’確èªã—ã¾ã™ã‹ï¼Ÿ <url name="url"> http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID] </url> @@ -429,7 +454,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="StartRegionEmpty"> ãƒã‚°ã‚¤ãƒ³ä½ç½®ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 -ãƒã‚°ã‚¤ãƒ³ä½ç½®ã®æ¬„ã«ãƒªãƒ¼ã‚¸ãƒ§ãƒ³åを入力ã™ã‚‹ã‹ã€ã€Œæœ€å¾Œã«ãƒã‚°ã‚¢ã‚¦ãƒˆã—ãŸå ´æ‰€ã€ã‹ã€Œè‡ªå®…（ホーム）ã€ã‚’é¸æŠžã—ã¦ãã ã•ã„。 +ãƒã‚°ã‚¤ãƒ³ä½ç½®ã®æ¬„ã«ãƒªãƒ¼ã‚¸ãƒ§ãƒ³åを入力ã™ã‚‹ã‹ã€ã€Œæœ€å¾Œã«ãƒã‚°ã‚¢ã‚¦ãƒˆã—ãŸå ´æ‰€ã€ã‹ã€Œãƒ›ãƒ¼ãƒ ã€ã‚’é¸æŠžã—ã¦ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CouldNotStartStopScript"> @@ -440,40 +465,37 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã㾠ファイルをダウンãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。 </notification> <notification name="CannotWriteFile"> - ファイル[[FILE]]を書ãè¾¼ã‚ã¾ã›ã‚“。 + ファイル [[FILE]] を書ãè¾¼ã‚ã¾ã›ã‚“。 </notification> <notification name="UnsupportedHardware"> - è¦å‘Šï¼š ãŠä½¿ã„ã®ã‚·ã‚¹ãƒ†ãƒ 㯠[APP_NAME] ã®å¿…è¦æœ€ä½Žé™ã®å‹•ä½œç’°å¢ƒã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 ã“ã®ã¾ã¾ [APP_NAME] を使用ã™ã‚‹ã¨ã€ãƒ‘フォーマンスã®ä½Žä¸‹ã‚’æ„Ÿã˜ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æれ入りã¾ã™ãŒ [SUPPORT_SITE] ã§ã¯ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ã‚·ã‚¹ãƒ†ãƒ ã«é–¢ã™ã‚‹æŠ€è¡“的サãƒãƒ¼ãƒˆã¯è¡Œã£ã¦ãŠã‚Šã¾ã›ã‚“。 + ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューター㯠[APP_NAME] ã®å¿…è¦æœ€ä½Žé™ã®å‹•ä½œç’°å¢ƒã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 パフォーマンスã®ä½Žä¸‹ã‚’æ„Ÿã˜ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æれ入りã¾ã™ãŒ [SUPPORT_SITE] ã§ã¯ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ã‚·ã‚¹ãƒ†ãƒ ã«é–¢ã™ã‚‹æŠ€è¡“的サãƒãƒ¼ãƒˆã¯è¡Œã£ã¦ãŠã‚Šã¾ã›ã‚“。 -最低動作環境 -[_URL] ã‚’é–‹ã„ã¦è©³ã—ã„æƒ…å ±ã‚’ç¢ºèªã—ã¾ã™ã‹ï¼Ÿ +[_URL] ã«ç§»å‹•ã—ã¦ç¢ºèªã‚’ã—ã¾ã™ã‹ï¼Ÿ <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=ja </url> - <usetemplate ignoretext="使用ã—ã¦ã„るコンピューターã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + <usetemplate ignoretext="使用ä¸ã®ã‚³ãƒ³ãƒ”ューターã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="UnknownGPU"> - ãŠä½¿ã„ã®ã‚·ã‚¹ãƒ†ãƒ ã«ã¯ã€ç¾åœ¨ [APP_NAME] ãŒèªè˜ã§ããªã„グラフィックカードãŒæ載ã•ã‚Œã¦ã„ã¾ã™ã€‚ -[APP_NAME] ã§ã¾ã テストã•ã‚Œã¦ã„ãªã„最新ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ãŸã‚ã ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚ [APP_NAME] ã¯æ£å¸¸ã«å®Ÿè¡Œã•ã‚Œã‚‹å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ãŒã€è¡¨ç¤ºè¨å®šã‚’調整ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 + ãŠä½¿ã„ã®ã‚·ã‚¹ãƒ†ãƒ ã«ã¯ã€[APP_NAME] ãŒèªè˜ã§ããªã„グラフィックカードãŒæ載ã•ã‚Œã¦ã„ã¾ã™ã€‚ +[APP_NAME] ã§ã¾ã テストã•ã‚Œã¦ã„ãªã„最新ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®ãŸã‚ã ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚ å•é¡Œãªã„ã¨ã¯æ€ã„ã¾ã™ãŒã€ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®è¨å®šã‚’調整ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 （ミー ＞ 環境è¨å®š ＞ グラフィック） <form name="form"> - <ignore name="ignore" text="使用ä¸ã®ã‚°ãƒ©ãƒ•ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ãŒèªè˜ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"/> + <ignore name="ignore" text="使用ä¸ã®ã‚°ãƒ©ãƒ•ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ãŒèªè˜ã•ã‚Œãªã„ã¨ã"/> </form> </notification> <notification name="DisplaySettingsNoShaders"> グラフィックドライãƒã‚’åˆæœŸåŒ–ä¸ã« [APP_NAME] ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ã¾ã—ãŸã€‚ -ドライãƒã®ä¸€èˆ¬çš„ãªã‚¨ãƒ©ãƒ¼ã‚’防ããŸã‚ã«ã€ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ã‚¯ã‚ªãƒªãƒ†ã‚£ãŒä½Žã«è¨å®šã•ã‚Œã¾ã™ã€‚ ãã®ãŸã‚ã€ä¸€éƒ¨ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ç‰¹æ€§ã«åˆ¶é™ãŒå‡ºã¾ã™ã€‚ +ドライãƒã®ä¸€èˆ¬çš„ãªã‚¨ãƒ©ãƒ¼ã‚’防ããŸã‚ã«ã€ç”»è³ªãŒä½Žã«è¨å®šã•ã‚Œã¾ã™ã€‚ ãã®ãŸã‚ã€ä¸€éƒ¨ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ç‰¹æ€§ã«åˆ¶é™ãŒå‡ºã¾ã™ã€‚ ãŠä½¿ã„ã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ã®ãƒ‰ãƒ©ã‚¤ãƒã‚’アップデートã™ã‚‹ã‚ˆã†ãŠã™ã™ã‚ã—ã¾ã™ã€‚ -グラフィックã®ã‚¯ã‚ªãƒªãƒ†ã‚£ã¯ã€ç’°å¢ƒè¨å®š ＞ グラフィック ã§è¨å®šã§ãã¾ã™ã€‚ +画質ã¯ã€ç’°å¢ƒè¨å®š ＞ グラフィック ã§è¨å®šã§ãã¾ã™ã€‚ </notification> <notification name="RegionNoTerraforming"> - ã“ã®åœ°åŸŸ[REGION] ã¯ã€ãƒ†ãƒ©ãƒ•ã‚©ãƒ¼ãƒŸãƒ³ã‚°ãŒã§ãã¾ã›ã‚“。 + [REGION] ã§ã¯ã€åœ°å½¢ã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“。 </notification> <notification name="CannotCopyWarning"> - ã‚ãªãŸã¯ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã‚³ãƒ”ーを -許ã•ã‚Œã¦ã„ãªã„ã®ã§ã€äººã«ã‚ã’る㨠-æŒã¡ç‰©ã‹ã‚‰å¤±ã‚ã‚Œã¾ã™ã€‚ 本当㫠-ã“れをã‚ã’ãŸã„ã§ã™ã‹ï¼Ÿ + ã‚ãªãŸã¯ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã‚³ãƒ”ーを許ã•ã‚Œã¦ã„ãªã„ã®ã§ã€äººã«ã‚ã’ã‚‹ã¨ã€ŒæŒã¡ç‰©ã€ã‹ã‚‰ãªããªã‚Šã¾ã™ã€‚ +本当ã«ã“れを渡ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="CannotGiveItem"> @@ -483,34 +505,32 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ å–引ãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="TooManyItems"> - 一度ã®ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªäº¤æ›ã§ã€42以上ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯é€ã‚Œã¾ã›ã‚“。 + 一度㫠42 個以上ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯æ¸¡ã›ã¾ã›ã‚“。 </notification> <notification name="NoItems"> - é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’è²æ¸¡ã§ãる権é™ãŒã‚ã‚Šã¾ã›ã‚“。 + é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を渡ã™æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="CannotCopyCountItems"> - ã‚ãªãŸã¯é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®[COUNT]ã®ã‚³ãƒ”ーを -許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰å¤±ã‚ã‚Œã¾ã™ã€‚ -本当ã«ã‚¢ã‚¤ãƒ†ãƒ ã‚’ã‚ã’ãŸã„ã§ã™ã‹ï¼Ÿ + ã‚ãªãŸã¯é¸æŠžã—㟠[COUNT] 個ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã®ã‚³ãƒ”ーを許ã•ã‚Œã¦ã„ã¾ã›ã‚“。 +ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã‹ã‚‰å¤±ã‚ã‚Œã¾ã™ã€‚ +本当ã«ã‚¢ã‚¤ãƒ†ãƒ を渡ã—ãŸã„ã§ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="CannotGiveCategory"> - é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã‚’è²æ¸¡ã§ãる権é™ãŒã‚ã‚Šã¾ã›ã‚“ + é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã‚’渡ã™æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ </notification> <notification name="FreezeAvatar"> ã“ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’フリーズã—ã¾ã™ã‹ï¼Ÿ -ã‚¢ãƒã‚¿ãƒ¼ã¯ä¸€æ™‚çš„ã«å‹•ã‘ãªããªã‚Šã€ -ãƒãƒ£ãƒƒãƒˆãªã©ã€ã“ã®ä¸–ç•Œã«å¯¾ã™ã‚‹é–¢ã‚ã‚Šã‚’æŒã¤ã“ã¨ãŒã§ããªããªã‚Šã¾ã™ã€‚ - <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="解å‡" yestext="フリーズ"/> +ã‚¢ãƒã‚¿ãƒ¼ã¯ä¸€æ™‚çš„ã«å‹•ã‘ãªããªã‚Šã€ãƒãƒ£ãƒƒãƒˆã‚’å«ã‚インワールドã§ä½•ã‚‚ã§ããªããªã‚Šã¾ã™ã€‚ + <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/> </notification> <notification name="FreezeAvatarFullname"> [AVATAR_NAME]をフリーズã—ã¾ã™ã‹ï¼Ÿ フリーズã•ã‚ŒãŸäººã¯ä¸€æ™‚çš„ã«å‹•ã‘ãªããªã‚Šã€ãƒãƒ£ãƒƒãƒˆãªã©ã€ã“ã®ä¸–ç•Œã«å¯¾ã™ã‚‹é–¢ã‚ã‚Šã‚’æŒã¤ã“ã¨ãŒã§ããªããªã‚Šã¾ã™ã€‚ - <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="解å‡" yestext="フリーズ"/> + <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="解除" yestext="フリーズ"/> </notification> <notification name="EjectAvatarFullname"> - ã‚ãªãŸã®åœŸåœ°ã‹ã‚‰[AVATAR_NAME]を追放ã—ã¾ã™ã‹ï¼Ÿ + ã‚ãªãŸã®åœŸåœ°ã‹ã‚‰ [AVATAR_NAME] を追放ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="追放ã¨ç¦æ¢" yestext="追放"/> </notification> <notification name="EjectAvatarNoBan"> @@ -529,9 +549,8 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="AcquireErrorObjectSpan"> å–得エラー： -オブジェクトãŒè¤‡æ•°ã®åœ°åŸŸã«ã¾ãŸãŒã£ã¦å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚ -å–å¾—ã™ã‚‹ã‚ªãƒ–ジェクトã¯ã€ -ã™ã¹ã¦åŒã˜åœ°åŸŸå†…ã«ç§»å‹•ã•ã›ã¦ãã ã•ã„。 +オブジェクトãŒè¤‡æ•°ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«ã¾ãŸãŒã£ã¦å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚ +ã™ã¹ã¦åŒã˜ãƒªãƒ¼ã‚¸ãƒ§ãƒ³å†…ã«ç§»å‹•ã•ã›ã¦ã‹ã‚‰å–å¾—ã—ã¦ãã ã•ã„。 </notification> <notification name="PromptGoToCurrencyPage"> [EXTRA] @@ -543,32 +562,30 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="UnableToLinkObjects"> - ã“れらã®[COUNT]オブジェクトをリンクã§ãã¾ã›ã‚“。 -最大[MAX]オブジェクトをリンクã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ + [COUNT] 個ã®ã‚ªãƒ–ジェクトをリンクã§ãã¾ã›ã‚“。 +リンクã§ãã‚‹ã®ã¯æœ€å¤§ [MAX] 個ã§ã™ã€‚ </notification> <notification name="CannotLinkIncompleteSet"> - セットã¨ã—ã¦æƒã£ã¦ã„るオブジェクトã®ã¿ãƒªãƒ³ã‚¯ã§ãã¾ã™ã€‚複数㮠-オブジェクトをé¸æŠžã—ã¦ãã ã•ã„。 + セットã§æƒã£ã¦ã„るオブジェクトã®ã¿ãƒªãƒ³ã‚¯ã§ãã¾ã™ã€‚ +複数ã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotLinkModify"> - ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトã«å¯¾ã™ã‚‹ä¿®æ£è¨±å¯ãŒã‚ãªãŸã«ãªã„ãŸã‚〠-リンクã§ãã¾ã›ã‚“。 + ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトã®ä¿®æ£è¨±å¯ãŒãªã„ãŸã‚リンクã§ãã¾ã›ã‚“。 -オブジェクトãŒã™ã¹ã¦ãƒãƒƒã‚¯ã•ã‚Œã¦ãŠã‚‰ãšã€ã‚ãªãŸã®ã‚‚ã®ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。 +ã©ã®ã‚ªãƒ–ジェクトもãƒãƒƒã‚¯ã•ã‚Œã¦ãŠã‚‰ãšã€ã‚ãªãŸã®ã‚‚ã®ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。 </notification> <notification name="CannotLinkDifferentOwners"> - 所有者ãŒç•°ãªã‚‹ãŸã‚ã€ã™ã¹ã¦ã®ã‚ªãƒ–ジェクトを -リンクã§ãã¾ã›ã‚“。 + 所有者ãŒç•°ãªã‚‹ãŸã‚ã€ã‚ªãƒ–ジェクトをリンクã§ãã¾ã›ã‚“。 自分ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクトã ã‘ã‚’é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="NoFileExtension"> - ファイル「[FILE]ã€ã®æ‹¡å¼µåãŒç„¡åŠ¹ã§ã™ã€‚ + 「 [FILE] ã€ã®æ‹¡å¼µåãŒç„¡åŠ¹ã§ã™ã€‚ ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µåãŒæ£ã—ã„ã‹ã©ã†ã‹ã‚’確èªã—ã¦ãã ã•ã„。 </notification> <notification name="InvalidFileExtension"> - ファイル拡張å[EXTENSION]ã¯ç„¡åŠ¹ã§ã™ + [EXTENSION] ã¯ç„¡åŠ¹ã§ã™ã€‚ æ£ã—ã„æ‹¡å¼µå：[VALIDS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -577,11 +594,11 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ [FILE] </notification> <notification name="SoundFileNotRIFF"> - ファイルãŒRIFF WAVEファイルã¨ã—ã¦èªè˜ã•ã‚Œã¾ã›ã‚“： + RIFF WAVE ファイルã¨ã—ã¦èªè˜ã•ã‚Œã¾ã›ã‚“： [FILE] </notification> <notification name="SoundFileNotPCM"> - ファイルãŒPCM WAVEオーディオ・ファイルã¨ã—ã¦èªè˜ã•ã‚Œã¾ã›ã‚“： + PCM WAVE オーディオファイルã¨ã—ã¦èªè˜ã•ã‚Œã¾ã›ã‚“： [FILE] </notification> <notification name="SoundFileInvalidChannelCount"> @@ -589,31 +606,31 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ [FILE] </notification> <notification name="SoundFileInvalidSampleRate"> - ファイルã®ã‚µãƒ³ãƒ—ル・レートãŒã‚µãƒãƒ¼ãƒˆå¤–ã§ã™ï¼ˆ44.1kを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰ï¼š + ファイルã®ã‚µãƒ³ãƒ—ルレートãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“（44.1k ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰ï¼š [FILE] </notification> <notification name="SoundFileInvalidWordSize"> - ファイルã®ãƒ¯ãƒ¼ãƒ‰ãƒ»ã‚µã‚¤ã‚ºãŒã‚µãƒãƒ¼ãƒˆå¤–ã§ã™ï¼ˆ8ã¾ãŸã¯16ビットを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰ï¼š + ファイルã®ãƒ¯ãƒ¼ãƒ‰ã‚µã‚¤ã‚ºãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“（8 ã¾ãŸã¯ 16 ビットã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼‰ï¼š [FILE] </notification> <notification name="SoundFileInvalidHeader"> - WAVヘッダーã«ãƒ‡ãƒ¼ã‚¿ãƒ»ãƒãƒ£ãƒ³ã‚¯ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“： + WAV ヘッダーã«ãƒ‡ãƒ¼ã‚¿ãƒãƒ£ãƒ³ã‚¯ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“： [FILE] </notification> <notification name="SoundFileInvalidTooLong"> - オーディオ・ファイルãŒé•·ã™ãŽã¾ã™ã€‚（最大10秒）： + オーディオファイルãŒé•·ã™ãŽã¾ã™ã€‚（最大 10 秒）： [FILE] </notification> <notification name="ProblemWithFile"> - ファイル[FILE]ã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã‚Šã¾ã™ã€‚ + 「 [FILE] ã€ã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚ [ERROR] </notification> <notification name="CannotOpenTemporarySoundFile"> - 書ãè¾¼ã¿ç”¨ã®ä¸€æ™‚圧縮サウンド・ファイルを開ãã“ã¨ãŒã§ãã¾ã›ã‚“：[FILE] + 書ãè¾¼ã¿ç”¨ã®ä¸€æ™‚圧縮サウンドファイルを開ãã“ã¨ãŒã§ãã¾ã›ã‚“：[FILE] </notification> <notification name="UnknownVorbisEncodeFailure"> - 未知ã®Vorbis æš—å·åŒ–ã«å¤±æ•—： [FILE] + ä¸æ˜Žã® Vorbis ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã«å¤±æ•—： [FILE] </notification> <notification name="CannotEncodeFile"> 次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ãŒã§ãã¾ã›ã‚“： [FILE] @@ -622,65 +639,62 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ ç ´æã—ãŸãƒªã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ï¼š [FILE] </notification> <notification name="UnknownResourceFileVersion"> - 未知ã®lindenリソースファイルã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [FILE] + ä¸æ˜Žã®ãƒªãƒ³ãƒ‡ãƒ³ãƒªã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [FILE] </notification> <notification name="UnableToCreateOutputFile"> - æœè£…ファイルを作æˆã§ãã¾ã›ã‚“： [FILE] + 出力ファイルを作æˆã§ãã¾ã›ã‚“： [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> ç¾åœ¨ [APP_NAME] ã§ã¯ã€ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã®ä¸€æ‹¬ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotUploadReason"> - 次ã®ç†ç”±ã§ã€[FILE] をアップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“： [REASON] + 次ã®ç†ç”±ã§ã€ã€Œ [FILE] ã€ã‚’アップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“： [REASON] ã‚ã¨ã§ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification name="LandmarkCreated"> 「 [LANDMARK_NAME] ã€ã‚’「 [FOLDER_NAME] ã€ãƒ•ã‚©ãƒ«ãƒ€ã«è¿½åŠ ã—ã¾ã—ãŸã€‚ </notification> <notification name="LandmarkAlreadyExists"> - ã“ã®ä½ç½®ã®ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’æ—¢ã«æŒã£ã¦ã„ã¾ã™ã€‚ + ç¾åœ¨åœ°ã®ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’æ—¢ã«æŒã£ã¦ã„ã¾ã™ã€‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotCreateLandmarkNotOwner"> - 土地ã®æ‰€æœ‰è€…ãŒè¨±å¯ã—ã¦ã„ãªã„ãŸã‚〠-ランドマークを作æˆã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 + 土地ã®æ‰€æœ‰è€…ãŒè¨±å¯ã—ã¦ã„ãªã„ãŸã‚ã€ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’作æˆã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="CannotRecompileSelectObjectsNoScripts"> - å†ç·¨é›†ã¯ä¸å¯èƒ½ã§ã™ã€‚ -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 + 「リコンパイルã€ã§ãã¾ã›ã‚“。 +スクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotRecompileSelectObjectsNoPermission"> - 「å†ç·¨é›†ã€ã¯ä¸å¯èƒ½ã§ã™ã€‚ + 「リコンパイルã€ã§ãã¾ã›ã‚“。 -変更修æ£æ¨©é™ã®ã‚ã‚‹ -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 +ä¿®æ£ä¿®æ£æ¨©é™ã®ã‚るスクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotResetSelectObjectsNoScripts"> - 「å†è¨å®šã€ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã›ã‚“。 + 「å†è¨å®šã€ãŒã§ãã¾ã›ã‚“。 -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 +スクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotResetSelectObjectsNoPermission"> - 「å†è¨å®šã€ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã›ã‚“。 + 「å†è¨å®šã€ãŒã§ãã¾ã›ã‚“。 -変更修æ£æ¨©é™ã®ã‚ã‚‹ -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 +ä¿®æ£æ¨©é™ã®ã‚るスクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotOpenScriptObjectNoMod"> - 編集権é™ã®ãªã„オブジェクトã®ã‚¹ã‚¯ãƒªãƒ—トを開ãã“ã¨ã¯ã§ãã¾ã›ã‚“。 + ä¿®æ£æ¨©é™ã®ãªã„オブジェクトã®ã‚¹ã‚¯ãƒªãƒ—トã¯é–‹ãã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="CannotSetRunningSelectObjectsNoScripts"> - スクリプトã®ã€Œå®Ÿè¡Œã€ã®è¨å®šãŒã§ãã¾ã›ã‚“。 + スクリプトã®ã€Œå®Ÿè¡Œã€ãŒã§ãã¾ã›ã‚“。 -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 +スクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotSetRunningNotSelectObjectsNoScripts"> - スクリプトを「実行ã—ãªã„ã€ã«è¨å®šã§ãã¾ã›ã‚“。 + スクリプトを「実行ã—ãªã„ã€è¨å®šã«ã§ãã¾ã›ã‚“。 -スクリプト化ã•ã‚ŒãŸã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 +スクリプトã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="NoFrontmostFloater"> - ä¿å˜ã™ã¹ãfrontmostフãƒãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã›ã‚“。 + ä¿å˜ã™ã‚‹ frontmost フãƒãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="SeachFilteredOnShortWords"> 指定ã—ãŸæ¤œç´¢ã‚¯ã‚¨ãƒªã¯å¤‰æ›´ã•ã‚Œã€çŸã™ãŽã‚‹èªžå¥ã¯å–り除ã‹ã‚Œã¦ã„ã¾ã™ã€‚ @@ -703,35 +717,35 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä½•åº¦ã‚‚å‡ºã‚‹å ´åˆã¯ã€[SUPPORT_SITE] ã‚’ã”確èªãã ã•ã„。 </notification> <notification name="blocked_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 -ã‚„ã‚Šç›´ã—ã¦ã‚‚テレãƒãƒ¼ãƒˆã§ããªã„å ´åˆã¯ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦å•é¡Œã‚’解決ã—ã¦ãã ã•ã„。 + 申ã—訳ã”ã–ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰å†åº¦ãŠè©¦ã—ãã ã•ã„。 +ãã‚Œã§ã‚‚テレãƒãƒ¼ãƒˆã§ããªã„å ´åˆã¯ã€ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€ãƒã‚°ã‚¤ãƒ³ã—ç›´ã—ã¦å•é¡Œã‚’解決ã—ã¦ãã ã•ã„。 </notification> <notification name="nolandmark_tport"> - 残念ãªãŒã‚‰ã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ç›®çš„地を探ã›ã¾ã›ã‚“ã§ã—ãŸã€‚ + 申ã—訳ã”ã–ã„ã¾ã›ã‚“。ランドマークã®ç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="timeout_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆæŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ -ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã«ã‚ˆã‚‹ãƒ†ãƒ¬ãƒãƒ¼ãƒˆæŽ¥ç¶šãŒå®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ +ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰å†åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="noaccess_tport"> - 残念ãªãŒã‚‰ã€ãã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“。 + 残念ãªãŒã‚‰ã€ç›®çš„地ã¸ã‚¢ã‚¯ã‚»ã‚¹ãŒè¨±å¯ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“。 </notification> <notification name="missing_attach_tport"> - 添付物ã¯ã€ã¾ã 到ç€ã—ã¦ã„ã¾ã›ã‚“。ã‚ã¨æ•°ç§’é–“ãŠå¾…ã¡ã„ãŸã ãã‹ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’ã‚„ã‚Šç›´ã—ã¦ã ã•ã„。 + 添付物ãŒã¾ã 届ã„ã¦ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã‚’ã™ã‚‹å‰ã«ã‚ã¨æ•°ç§’é–“ãŠå¾…ã¡ã„ãŸã ãã‹ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。 </notification> <notification name="too_many_uploads_tport"> - ã“ã®åœ°åŸŸã®è³‡ç”£ã‚ューãŒç¾åœ¨è¾¼ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間通りã«å‡¦ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚ -数分後ã«ã‚„ã‚Šç›´ã™ã‹ã€ã¾ãŸã¯æ··é›‘ã—ã¦ã„ãªã„ä»–ã®åœ°åŸŸã‚’ãŠè©¦ã—ãã ã•ã„。 + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¢ã‚»ãƒƒãƒˆã‚ューãŒç¾åœ¨æ··ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ã™ãã«å‡¦ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚ +数分後ã«ã‚„ã‚Šç›´ã™ã‹ã€æ··é›‘ã—ã¦ã„ãªã„ä»–ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="expired_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </notification> <notification name="expired_region_handoff"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯åœ°åŸŸé–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ + 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒªãƒ¼ã‚¸ãƒ§ãƒ³é–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ 数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </notification> <notification name="no_host"> - テレãƒãƒ¼ãƒˆç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„状態ã‹ã€ã¾ãŸã¯ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + テレãƒãƒ¼ãƒˆç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„状態ã‹ã€ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </notification> <notification name="no_inventory_host"> æŒã¡ç‰©ã‚·ã‚¹ãƒ†ãƒ ã¯ç¾åœ¨åˆ©ç”¨ã§ãã¾ã›ã‚“。 @@ -741,9 +755,8 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã㾠区画ãŒé¸å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotSetLandOwnerMultipleRegions"> - 複数ã®åœ°åŸŸãŒé¸æŠžã•ã‚ŒãŸãŸã‚〠-土地ã®æ‰€æœ‰æ¨©ã‚’å–å¾—ã§ãã¾ã›ã‚“。 -é¸æŠžã™ã‚‹é¢ç©ã‚’å°ã•ãã—ã¦ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + 複数ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒé¸æŠžã•ã‚ŒãŸãŸã‚ã€åœŸåœ°ã®æ‰€æœ‰æ¨©ã‚’å–å¾—ã§ãã¾ã›ã‚“。 +é¸æŠžã™ã‚‹é¢ç©ã‚’å°ã•ãã—ã¦ã€ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="ForceOwnerAuctionWarning"> ã“ã®åŒºç”»ã¯ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã«å‡ºã•ã‚Œã¦ã„ã¾ã™ã€‚ 所有権を変更ã™ã‚‹ã¨ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã¯ã‚ャンセルã¨ãªã‚Šã€æ—¢ã«ã‚ªãƒ¼ã‚¯ã‚·ãƒ§ãƒ³ã«å‚åŠ ã—ã¦ã„ã‚‹ä½äººãŒã„ã‚Œã°ãã®äººã«è¿·æƒ‘ã‚’ã‹ã‘ã¦ã—ã¾ã„ã¾ã™ã€‚ @@ -759,12 +772,12 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã㾠土地ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotReleaseLandNothingSelected"> - åœŸåœ°ã‚’ç ´æ£„ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“： + åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： 区画ãŒé¸å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotReleaseLandNoRegion"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： -地域ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 +リージョンãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 </notification> <notification name="CannotBuyLandNothingSelected"> 土地を購入ã§ãã¾ã›ã‚“： @@ -772,7 +785,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="CannotBuyLandNoRegion"> 土地を購入ã§ãã¾ã›ã‚“： -ã“ã®åœŸåœ°ãŒã‚る地域を見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ +ã“ã®åœŸåœ°ãŒã‚るリージョンを見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ </notification> <notification name="CannotCloseFloaterBuyLand"> [APP_NAME] ãŒã“ã®å–å¼•ä¾¡æ ¼ã‚’è¦‹ç©ã‚‚ã‚‹ã¾ã§ã¯ã€åœŸåœ°ã®è³¼å…¥ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 @@ -793,15 +806,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã㾠土地をè²æ¸¡ã§ãã¾ã›ã‚“： 複数ã®åŒºç”»ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ -ã“れより1ã¤ã®åŒºç”»ã‚’é¸æŠžã—ã¦ãã ã•ã„。 - </notification> - <notification name="ParcelCanPlayMedia"> - ã“ã®å ´æ‰€ã§ã¯ã€ã‚¹ãƒˆãƒªãƒ¼ãƒŸãƒ³ã‚°ãƒ¡ãƒ‡ã‚£ã‚¢ã®å†ç”ŸãŒå¯èƒ½ã§ã™ã€‚ -ストリーミングメディアã«ã¯ã€é«˜é€Ÿã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã‚’è¦ã—ã¾ã™ã€‚ - -利用å¯èƒ½ãªã¨ãã«ã‚¹ãƒˆãƒªãƒ¼ãƒŸãƒ³ã‚°ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å†ç”Ÿã—ã¾ã™ã‹ï¼Ÿ -（ã“ã®ã‚ªãƒ—ションã¯ã€ã€Œç’°å¢ƒè¨å®šã€ > 「プライãƒã‚·ãƒ¼ã€ã§ã‚ã¨ã‹ã‚‰ã§ã‚‚変更ã§ãã¾ã™ã€‚） - <usetemplate name="okcancelbuttons" notext="無効化" yestext="メディアをå†ç”Ÿ"/> +区画を 1 ã¤é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotDeedLandWaitingForServer"> 土地をè²æ¸¡ã§ãã¾ã›ã‚“： @@ -811,7 +816,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="CannotDeedLandNoTransfer"> 土地をè²æ¸¡ã§ãã¾ã›ã‚“： -ã“ã®åœ°åŸŸ [REGION] ã§ã¯åœŸåœ°ã®è²æ¸¡ãŒè¨±ã•ã‚Œã¦ã„ã¾ã›ã‚“。 +[REGION] ã§ã¯åœŸåœ°ã®è²æ¸¡ãŒè¨±ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotReleaseLandWatingForServer"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： @@ -821,9 +826,9 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="CannotReleaseLandSelected"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： -ã‚ãªãŸã¯ã€é¸æŠžã—ãŸã™ã¹ã¦ã®åŒºç”»ã‚’所有ã—ã¦ã„ã¾ã›ã‚“。 +ã‚ãªãŸã¯ã€é¸æŠžã—ãŸåŒºç”»ã®ã™ã¹ã¦ã‚’所有ã—ã¦ã„ã¾ã›ã‚“。 -1ã¤ã®åŒºç”»ã‚’é¸æŠžã—ã¦ãã ã•ã„。 +区画を 1 ã¤é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotReleaseLandDontOwn"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： @@ -836,7 +841,7 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ </notification> <notification name="CannotReleaseLandNoTransfer"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： -ã“ã® [REGION] ã§ã¯åœŸåœ°ã®è²æ¸¡ãŒè¨±ã•ã‚Œã¦ã„ã¾ã›ã‚“。 +[REGION] ã§ã¯åœŸåœ°ã®è²æ¸¡ãŒè¨±ã•ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="CannotReleaseLandPartialSelection"> åœŸåœ°ã‚’ç ´æ£„ã§ãã¾ã›ã‚“： @@ -845,9 +850,9 @@ L$ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã㾠区画全体をé¸æŠžã™ã‚‹ã‹ã€ã¾ãŸã¯ã€ã¾ãšæœ€åˆã«åŒºç”»ã‚’分割ã—ã¦ãã ã•ã„。 </notification> <notification name="ReleaseLandWarning"> - ã‚ãªãŸã¯ã€[AREA]平方メートルã®åœŸåœ°ã‚’ç ´æ£„ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã¯ã€[AREA] 平方メートルã®åœŸåœ°ã‚’ç ´æ£„ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“ã®åŒºç”»ã‚’ç ´æ£„ã™ã‚‹ã¨ã‚ãªãŸã®åœŸåœ°ã§ã¯ãªããªã‚Šã¾ã™ãŒã€ -L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 +L$ ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 åœŸåœ°ã‚’ç ´æ£„ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> @@ -864,7 +869,7 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 区画ã®ä¸€éƒ¨ã‚’é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="LandDivideWarning"> - ã“ã®åœŸåœ°ã‚’分割ã™ã‚‹ã¨ã€2ã¤ã®åŒºç”»ã«åˆ¥ã‚Œã¾ã™ã€‚ + ã“ã®åœŸåœ°ã‚’分割ã™ã‚‹ã¨ã€2 ã¤ã®åŒºç”»ã«åˆ¥ã‚Œã¾ã™ã€‚ 区画ã”ã¨ã®è¨å®šãŒå¯èƒ½ã«ãªã‚Šã¾ã™ã€‚ ã“ã®æ“作を行ã†ã¨ã€ä¸€éƒ¨ã®è¨å®šãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ 土地ã®åˆ†å‰²æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ @@ -884,19 +889,18 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 </notification> <notification name="CannotJoinLandEntireParcelSelected"> 土地を統åˆã§ãã¾ã›ã‚“： -1ã¤ã®åŒºç”»ã—ã‹é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。 +区画㌠1 ã¤ã—ã‹é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。 両方ã®åŒºç”»ã‚’ã¾ãŸã„ã§åœŸåœ°ã‚’é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="CannotJoinLandSelection"> 土地を統åˆã§ãã¾ã›ã‚“： -1ã¤ä»¥ä¸Šã®åŒºç”»ã‚’é¸æŠžã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ +区画を 1 ã¤ä»¥ä¸Šé¸æŠžã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ 両方ã®åŒºç”»ã‚’ã¾ãŸã„ã§åœŸåœ°ã‚’é¸æŠžã—ã¦ãã ã•ã„。 </notification> <notification name="JoinLandWarning"> - ã“ã®åœŸåœ°ã‚’çµ±åˆã™ã‚‹ã¨ã€é¸æŠžã•ã‚ŒãŸé•·æ–¹å½¢ã«äº¤å·®ã™ã‚‹ -å…¨ã¦ã®åŒºç”»ã‚’基ã«ã—ã¦1ã¤ã®å¤§ããªåŒºç”»ãŒä½œæˆã•ã‚Œã¾ã™ã€‚ + ã“ã®åœŸåœ°ã‚’çµ±åˆã™ã‚‹ã¨ã€é¸æŠžã•ã‚ŒãŸé•·æ–¹å½¢ã«äº¤å·®ã™ã‚‹å…¨ã¦ã®åŒºç”»ã‚’基ã«ã—ã¦ã€å¤§ããªåŒºç”»ãŒ 1 ã¤ä½œæˆã•ã‚Œã¾ã™ã€‚ æ–°ã—ã„区画ã®åå‰ã¨ã‚ªãƒ—ションをå†è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ 土地を統åˆã—ã¾ã™ã‹ï¼Ÿ @@ -911,7 +915,7 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="コピー"/> </notification> <notification name="ResolutionSwitchFail"> - 解åƒåº¦ã‚’ [RESX]x[RESY]ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ + 解åƒåº¦ã‚’ [RESX]x[RESY] ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="ErrorUndefinedGrasses"> エラー：未定義ã®æ¤ç‰©ï¼š[SPECIES] @@ -920,44 +924,42 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 エラー：未定義ã®æ¨¹æœ¨ï¼š[SPECIES] </notification> <notification name="CannotSaveWearableOutOfSpace"> - 「[NAME]ã€ã‚’æœã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã§ãã¾ã›ã‚“。 コンピューター㮠-ディスクスペースを少ã—増やã—ã¦ã‹ã‚‰ã€ã‚‚ã†ä¸€åº¦ -ä¿å˜ã—ã¦ã¿ã¦ãã ã•ã„。 + 「 [NAME] ã€ã‚’衣類ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã§ãã¾ã›ã‚“。 +コンピューターã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã‚’å°‘ã—増やã—ã¦ã‹ã‚‰ã€ã‚‚ã†ä¸€åº¦ä¿å˜ã—ã¦ã¿ã¦ãã ã•ã„。 </notification> <notification name="CannotSaveToAssetStore"> - [NAME] ã‚’ä¿å˜ã§ãã¾ã›ã‚“。 + 「 [NAME] ã€ã‚’ä¿å˜ã§ãã¾ã›ã‚“。 通常ã“ã‚Œã¯ä¸€æ™‚çš„ãªã‚¨ãƒ©ãƒ¼ã§ã™ã€‚ 数分後ã«ã‚‚ã†ä¸€åº¦ç€ç”¨ç‰©ã‚’カスタマイズ・ä¿å˜ã—ã¦ãã ã•ã„。 </notification> <notification name="YouHaveBeenLoggedOut"> - [SECOND_LIFE] ã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã¾ã—ãŸï¼š + ã—ã¾ã£ãŸã€ [SECOND_LIFE] ã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸã€‚ [MESSAGE] -「IMã¨ãƒãƒ£ãƒƒãƒˆã‚’見るã€ã‚’クリックã™ã‚‹ã¨ã€å¼•ã続ãæ—¢ã«é–‹ã„ã¦ã„ã‚‹ IM ã¨ãƒãƒ£ãƒƒãƒˆã‚’見るã“ã¨ãŒã§ãã¾ã™ã€‚ 「終了ã€ã‚’クリックã™ã‚‹ã¨ [APP_NAME] ã‚’ã™ãã«çµ‚了ã—ã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="終了" yestext="IMã¨ãƒãƒ£ãƒƒãƒˆã‚’表示"/> </notification> <notification name="OnlyOfficerCanBuyLand"> グループ用ã®åœŸåœ°ã®è³¼å…¥ãŒã§ãã¾ã›ã‚“： ã‚ãªãŸã«ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚°ãƒ«ãƒ¼ãƒ—ã®ãŸã‚ã«åœŸåœ°ã‚’購入ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> - <notification label="ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’è¿½åŠ " name="AddFriend"> - フレンドã¨ã—ã¦è¿½åŠ ã™ã‚‹ã¨ã€ãŠäº’ã„ã®ç¾åœ¨åœ°ã®åœ°å›³ã¸ã®è¡¨ç¤ºè¨±å¯ã€ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹è¡¨ç¤ºã®è¨å®šã‚’ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ + <notification label="フレンド登録" name="AddFriend"> + フレンド登録ã™ã‚‹ã¨ã€ãŠäº’ã„ã®ç¾åœ¨åœ°ã®åœ°å›³ã¸ã®è¡¨ç¤ºè¨±å¯ã€ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã®è¡¨ç¤ºè¨å®šãŒã§ãã¾ã™ã€‚ [NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—ã‚’é€ã‚Šã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> - <notification label="ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’è¿½åŠ " name="AddFriendWithMessage"> - フレンドã¨ã—ã¦è¿½åŠ ã™ã‚‹ã¨ã€ãŠäº’ã„ã®ç¾åœ¨åœ°ã®åœ°å›³ã¸ã®è¡¨ç¤ºè¨±å¯ã€ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹è¡¨ç¤ºã®è¨å®šã‚’ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ + <notification label="フレンド登録" name="AddFriendWithMessage"> + フレンド登録ã™ã‚‹ã¨ã€ãŠäº’ã„ã®ç¾åœ¨åœ°ã®åœ°å›³ã¸ã®è¡¨ç¤ºè¨±å¯ã€ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã®è¡¨ç¤ºè¨å®šãŒã§ãã¾ã™ã€‚ -[NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—ã®ã‚ªãƒ•ã‚¡ãƒ¼ã‚’ã—ã¾ã™ã‹ï¼Ÿ +[NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—を申ã—出ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> - フレンドã¨ã—ã¦ç™»éŒ²ã—ã¦ãã‚Œã¾ã™ã‹ï¼Ÿ + フレンド登録ã—ã¦ãã‚Œã¾ã™ã‹ï¼Ÿ </input> <button name="Offer" text="OK"/> <button name="Cancel" text="ã‚ャンセル"/> </form> </notification> <notification name="RemoveFromFriends"> - [FIRST_NAME] [LAST_NAME]をフレンドリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ + [FIRST_NAME] [LAST_NAME] をフレンドリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="RemoveMultipleFromFriends"> @@ -966,135 +968,134 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 </notification> <notification name="GodDeleteAllScriptedPublicObjectsByUser"> **[AVATAR_NAME]** -所有ã®ã™ã¹ã¦ã®ã‚¹ã‚¯ãƒªãƒ—ト・オブジェクトをã“ã®ã‚·ãƒ 内ã®ä»–ã®ã™ã¹ã¦ã®åœŸåœ°ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ +所有ã®ã™ã¹ã¦ã®ã‚¹ã‚¯ãƒªãƒ—トオブジェクトをã“ã®ã‚·ãƒ 内ã®ä»–ã®ã™ã¹ã¦ã®åœŸåœ°ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="GodDeleteAllScriptedObjectsByUser"> **[AVATAR_NAME]** -所有ã®ã™ã¹ã¦ã®ã‚¹ã‚¯ãƒªãƒ—ト・オブジェクトをã“ã®ã‚·ãƒ 内ã®ã™ã¹ã¦ã®åœŸåœ°ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ +所有ã®ã™ã¹ã¦ã®ã‚¹ã‚¯ãƒªãƒ—トオブジェクトをã“ã®ã‚·ãƒ 内ã®ã™ã¹ã¦ã®åœŸåœ°ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="GodDeleteAllObjectsByUser"> **[AVATAR_NAME]** -所有ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクト（スクリプト・オブジェクトã¨éžã‚¹ã‚¯ãƒªãƒ—ト・オブジェクト）を +所有ã®ã™ã¹ã¦ã®ã‚ªãƒ–ジェクト（スクリプトオブジェクトã¨éžã‚¹ã‚¯ãƒªãƒ—トオブジェクト）を ã“ã®ã‚·ãƒ 内ã®ã™ã¹ã¦ã®åœŸåœ°ã‹ã‚‰å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BlankClassifiedName"> - クラシファイドã«åå‰ã‚’指定ã—ã¦ãã ã•ã„。 + クラシファイドã®åå‰ã‚’指定ã—ã¦ãã ã•ã„。 </notification> <notification name="MinClassifiedPrice"> - 広告料ã®æ”¯æ‰•ã„金é¡ã¯ã€Lã¨[MIN_PRICE]ãŒä¸‹é™ã§ã™ã€‚ + 広告料ã¯æœ€ä½Ž L$ [MIN_PRICE] å¿…è¦ã§ã™ã€‚ 金é¡ã‚’増やã—ã¦ãã ã•ã„。 </notification> <notification name="ConfirmObjectDeleteLock"> - é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®1ã¤ä»¥ä¸ŠãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ + é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®ã†ã¡ã€å°‘ãªãã¨ã‚‚ 1 ã¤ãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoCopy"> - é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®1ã¤ä»¥ä¸ŠãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 + é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®ã†ã¡ã€å°‘ãªãã¨ã‚‚ 1 ã¤ãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoOwn"> - é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®1ã¤ä»¥ä¸Šã‚’ã€ã‚ãªãŸã¯æ‰€æœ‰ã—ã¦ã„ã¾ã›ã‚“。 + é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®ã†ã¡ã€å°‘ãªãã¨ã‚‚ 1 ã¤ãŒã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoCopy"> - 一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ +å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoOwn"> - 一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -1ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトをã€ã‚ãªãŸã¯æ‰€æœ‰ã—ã¦ã„ã¾ã›ã‚“。 + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ +å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoCopyNoOwn"> - 一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 -1ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトをã€ã‚ãªãŸã¯æ‰€æœ‰ã—ã¦ã„ã¾ã›ã‚“。 + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 +å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoCopyNoOwn"> - 一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 -1ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトをã€ã‚ãªãŸã¯æ‰€æœ‰ã—ã¦ã„ã¾ã›ã‚“。 + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ +å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“。 +å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 -本当ã«ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeLock"> - 一ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å–得を続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«ã“ã®ã¾ã¾å–得を続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeNoOwn"> - å–å¾—ã—よã†ã¨ã—ã¦ã„るオブジェクトã«ã¯ã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ãªã„オブジェクトãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚ -ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトをå–å¾—ã™ã‚‹ã¨ã€æ¬¡ã®ã‚ªãƒ¼ãƒŠãƒ¼ã®æ¨©é™ãŒãã®ã‚ªãƒ–ジェクトã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ -ãã®ãŸã‚ã€å°†æ¥ã€å¤‰æ›´ã‚„コピーã®èƒ½åŠ›ãŒåˆ¶é™ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ + å–å¾—ã—よã†ã¨ã—ã¦ã„るオブジェクトã«ã¯ã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚ +ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトをå–å¾—ã™ã‚‹ã¨ã€æ¬¡ã®æ‰€æœ‰è€…ã®æ¨©é™ãŒãã®ã‚ªãƒ–ジェクトã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ +ãã®ãŸã‚ã€å°†æ¥ã€ä¿®æ£ã‚„コピーã®èƒ½åŠ›ãŒåˆ¶é™ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å–得を続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«ã“ã®ã¾ã¾å–得を続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeLockNoOwn"> - 1ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ -å–å¾—ã—よã†ã¨ã—ã¦ã„るオブジェクトã«ã¯ã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ãªã„オブジェクトãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚ -ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトをå–å¾—ã™ã‚‹ã¨ã€æ¬¡ã®ã‚ªãƒ¼ãƒŠãƒ¼ã®æ¨©é™ãŒãã®ã‚ªãƒ–ジェクトã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ -ãã®ãŸã‚ã€å°†æ¥ã€å¤‰æ›´ã‚„コピーã®èƒ½åŠ›ãŒåˆ¶é™ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ + å°‘ãªãã¨ã‚‚ 1 ã¤ã®ã‚ªãƒ–ジェクトãŒãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ +å–å¾—ã—よã†ã¨ã—ã¦ã„るオブジェクトã«ã¯ã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚ +ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ãªã„オブジェクトをå–å¾—ã™ã‚‹ã¨ã€æ¬¡ã®æ‰€æœ‰è€…ã®æ¨©é™ãŒãã®ã‚ªãƒ–ジェクトã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ +ãã®ãŸã‚ã€å°†æ¥ã€ç·¨é›†ã‚„コピーã®èƒ½åŠ›ãŒåˆ¶é™ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ ã“ã®é¸æŠžå†…容ã®ã¾ã¾ã§ç¶šè¡Œã™ã‚‹ã“ã¨ã¯å¯èƒ½ã§ã™ãŒã€ -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã®å–得を続ã‘ã¾ã™ã‹ï¼Ÿ +本当ã«ã“ã®ã¾ã¾å–得を続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="CantBuyLandAcrossMultipleRegions"> - 複数ã®åœ°åŸŸãŒé¸æŠžã•ã‚ŒãŸãŸã‚ã€åœŸåœ°ã‚’購入ã§ãã¾ã›ã‚“。 + 複数ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒé¸æŠžã•ã‚ŒãŸãŸã‚ã€åœŸåœ°ã‚’購入ã§ãã¾ã›ã‚“。 é¸æŠžã™ã‚‹é¢ç©ã‚’å°ã•ãã—ã¦ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification name="DeedLandToGroup"> ã“ã®åŒºç”»ã®è²æ¸¡ã«éš›ã—ã¦ã¯ã€ -ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãŒå分ãªåœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’ä¿æœ‰ãŠã‚ˆã³ç¶æŒã—ã¦ã„ã‚‹ã“ã¨ãŒå¿…è¦ã§ã™ã€‚ -土地ã®è³¼å…¥ä¾¡æ ¼ã¯ã€ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”金ã•ã‚Œã¾ã›ã‚“。è²æ¸¡ã•ã‚ŒãŸåŒºç”»ãŒå£²ã‚Œã‚‹ã¨ã€è²©å£²ä¾¡æ ¼ã¯ã‚°ãƒ«ãƒ¼ãƒ—・メンãƒãƒ¼ã«å‡ç‰ã«åˆ†é…ã•ã‚Œã¾ã™ã€‚ +ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãŒå分ãªåœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’ä¿æœ‰ãŠã‚ˆã³ç¶æŒã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ +土地ã®è³¼å…¥ä¾¡æ ¼ã¯ã€æ‰€æœ‰è€…ã«è¿”金ã•ã‚Œã¾ã›ã‚“。è²æ¸¡ã•ã‚ŒãŸåŒºç”»ãŒå£²ã‚Œã‚‹ã¨ã€å£²ä¸Šé‡‘é¡ã¯ã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã«å‡ç‰ã«åˆ†é…ã•ã‚Œã¾ã™ã€‚ -ã“ã®[AREA]平方メートルã®åœŸåœ°ã‚’ã€ã‚°ãƒ«ãƒ¼ãƒ— -「[GROUP_NAME]ã€ã«è²æ¸¡ã—ã¾ã™ã‹ï¼Ÿ +ã“ã® [AREA] 平方メートルã®åœŸåœ°ã‚’ã€ã‚°ãƒ«ãƒ¼ãƒ— +「 [GROUP_NAME] ã€ã«è²æ¸¡ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="DeedLandToGroupWithContribution"> - ã“ã®åŒºç”»ã®è²æ¸¡ã«éš›ã—ã¦ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—㌠-å分ãªåœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’ä¿æœ‰ãŠã‚ˆã³ç¶æŒã—ã¦ã„ã‚‹ã“ã¨ãŒå¿…è¦ã§ã™ã€‚ + ã“ã®åŒºç”»ã®è²æ¸¡ã«éš›ã—ã¦ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ãŒå分ãªåœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’ä¿æœ‰ãŠã‚ˆã³ç¶æŒã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ ã“ã®è²æ¸¡ã«ã‚ˆã‚Šã€ -「[FIRST_NAME] [LAST_NAME]ã€ã‹ã‚‰ +「 [FIRST_NAME] [LAST_NAME] ã€ã‹ã‚‰ グループã«å¯¾ã—ã¦åœŸåœ°ãŒåŒæ™‚ã«æä¾›ã•ã‚Œã¾ã™ã€‚ -土地ã®è³¼å…¥ä¾¡æ ¼ã¯ã€ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”金ã•ã‚Œã¾ã›ã‚“。 -è²æ¸¡ã•ã‚ŒãŸåŒºç”»ãŒå£²ã‚Œã‚‹ã¨ã€è²©å£²æ–™é‡‘ã¯ã‚°ãƒ«ãƒ¼ãƒ—・メンãƒãƒ¼ã«å‡ç‰ã«åˆ†é…ã•ã‚Œã¾ã™ã€‚ +土地ã®è³¼å…¥ä¾¡æ ¼ã¯ã€æ‰€æœ‰è€…ã«ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 +è²æ¸¡ã•ã‚ŒãŸåŒºç”»ãŒå£²ã‚Œã‚‹ã¨ã€å£²ä¸Šé‡‘é¡ã¯ã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã«å‡ç‰ã«åˆ†é…ã•ã‚Œã¾ã™ã€‚ -ã“ã®[AREA]平方メートルã®åœŸåœ°ã‚’ã€ã‚°ãƒ«ãƒ¼ãƒ—「[GROUP_NAME]ã€ã«è²æ¸¡ã—ã¾ã™ã‹ï¼Ÿ +ã“ã® [AREA] 平方メートルã®åœŸåœ°ã‚’ã€ã€Œ [GROUP_NAME] ã€ã«è²æ¸¡ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="DisplaySetToSafe"> - -safeオプションを指定ã—ãŸã®ã§ã€ -表示è¨å®šã¯ã‚»ãƒ¼ãƒ•ãƒ»ãƒ¬ãƒ™ãƒ«ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ + -safe オプションを指定ã—ãŸã®ã§ã€ +表示è¨å®šã¯ã‚»ãƒ¼ãƒ•ãƒ¬ãƒ™ãƒ«ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ </notification> <notification name="DisplaySetToRecommended"> - 表示è¨å®šã¯ã€ã‚ãªãŸã®ã‚·ã‚¹ãƒ†ãƒ 構æˆã« -基ã¥ã„ã¦æŽ¨å¥¨ã•ã‚ŒãŸãƒ¬ãƒ™ãƒ«ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ + 表示è¨å®šã¯ã€ã‚ãªãŸã®ã‚·ã‚¹ãƒ†ãƒ 構æˆã«åŸºã¥ã„ã¦æŽ¨å¥¨ã•ã‚ŒãŸãƒ¬ãƒ™ãƒ«ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> 目的地ã¯ç¾åœ¨ã”利用ã„ãŸã ã‘ã¾ã›ã‚“。 @@ -1107,13 +1108,13 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 <notification name="AvatarMovedHome"> ホームãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç¾åœ¨ã”利用ã„ãŸã ã‘ã¾ã›ã‚“。 è¿‘ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ç§»å‹•ã—ã¾ã—ãŸã€‚ -æ–°ãŸã«ãƒ›ãƒ¼ãƒ ã‚’è¨å®šã—ãªãŠã—ãŸã»ã†ãŒã„ã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 +æ–°ãŸã«ãƒ›ãƒ¼ãƒ ã‚’è¨å®šã—ç›´ã™å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 </notification> <notification name="ClothingLoading"> ç¾åœ¨è¡£é¡žã‚’ダウンãƒãƒ¼ãƒ‰ä¸ã§ã™ã€‚ ã“ã®ã¾ã¾ [SECOND_LIFE] を通常通りã”使用ã„ãŸã ã‘ã¾ã™ã€‚他人ã‹ã‚‰ã¯ã‚ãªãŸã¯æ£ã—ã表示ã•ã‚Œã¾ã™ã€‚ <form name="form"> - <ignore name="ignore" text="衣類ãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã‚‹ã¾ã§æ™‚é–“ãŒã‹ã‹ã£ã¦ã„ã¾ã™"/> + <ignore name="ignore" text="衣類ãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã‚‹ã¾ã§æ™‚é–“ãŒã‹ã‹ã£ã¦ã„ã‚‹ã¨ã"/> </form> </notification> <notification name="FirstRun"> @@ -1140,8 +1141,8 @@ L$ã¯è¿”金ã•ã‚Œã¾ã›ã‚“。 ã¾ã‚‚ãªãã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ 矢å°ã‚ーを使用ã—ã¦æ©ãã¾ã™ã€‚ -ヘルプãŒå¿…è¦ãªã¨ãã‚„[SECOND_LIFE]ã«ã¤ã„ã¦çŸ¥ã‚ŠãŸã„ã¨ãã¯ã€ -F1ã‚ーを押ã—ã¦ãã ã•ã„。 +ヘルプãŒå¿…è¦ãªã¨ãã‚„ [SECOND_LIFE] ã«ã¤ã„ã¦çŸ¥ã‚ŠãŸã„ã¨ãã¯ã€ +F1 ã‚ーを押ã—ã¦ãã ã•ã„。 男性ã‚ã‚‹ã„ã¯å¥³æ€§ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’é¸æŠžã—ã¦ãã ã•ã„。 ã‚ãªãŸã®æ±ºå®šã¯å¾Œã§å¤‰æ›´ã§ãã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/> @@ -1153,29 +1154,28 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 [NAME] ã¯ã€ã‚ãªãŸã«ã‚ªãƒ–ジェクトã®ç·¨é›†æ¨©é™ã‚’与ãˆã¾ã—ãŸã€‚ </notification> <notification name="RevokedModifyRights"> - [NAME] ã®ã‚ªãƒ–ジェクトを編集ã™ã‚‹æ¨©é™ã¯å–り消ã•ã‚Œã¾ã—㟠+ [NAME] ã®ã‚ªãƒ–ジェクトを編集ã™ã‚‹æ¨©é™ã¯å–り消ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="FlushMapVisibilityCaches"> - ã“ã®æ‰‹é †ã¯ã€ã“ã®åœ°åŸŸã®åœ°å›³ã®ã‚ャッシュを消去ã—ã¾ã™ã€‚ -ã“ã‚ŒãŒä¾¿åˆ©ãªã®ã¯ãƒ‡ãƒãƒƒã‚°æ™‚ã®ã¿ã§ã™ã€‚ -（作æˆä¸ã¯5分間経ã¤ã¨ã€å…¨å“¡ã®åœ°å›³ãŒå†åº¦ãƒã‚°ã‚¤ãƒ³å¾Œã« -æ›´æ–°ã•ã‚Œã¾ã™ï¼‰ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®åœ°å›³ã®ã‚ャッシュを消去ã—ã¾ã™ã€‚ +デãƒãƒƒã‚°ç›®çš„ã®ã¿ã«ä¾¿åˆ©ãªæ“作ã§ã™ã€‚ +（作æˆä¸ã¯ 5 分間経ã¤ã¨ã€å…¨å“¡ã®åœ°å›³ãŒå†åº¦ãƒã‚°ã‚¤ãƒ³å¾Œã«æ›´æ–°ã•ã‚Œã¾ã™ï¼‰ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyOneObjectOnly"> - 一度ã«ä¸€ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトをã¨è²·ã†ã“ã¨ã¯ã§ãã¾ã›ã‚“。 オブジェクトを一ã¤ã ã‘é¸ã‚“ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 + 一度㫠1 ã¤ä»¥ä¸Šã®ã‚ªãƒ–ジェクトを買ã†ã“ã¨ã¯ã§ãã¾ã›ã‚“。 オブジェクトを 1 ã¤ã ã‘é¸ã‚“ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="OnlyCopyContentsOfSingleItem"> - 一度ã«è¤‡æ•°ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã‚³ãƒ”ーã§ãã¾ã›ã‚“。 -é¸æŠžã™ã‚‹ã‚ªãƒ–ジェクトを1ã¤ã ã‘ã«ã—ã¦ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + 一度ã«è¤‡æ•°ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ä¸èº«ã‚’コピーã§ãã¾ã›ã‚“。 +オブジェクトを 1 ã¤ã ã‘é¸æŠžã—ã¦ã€ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="KickUsersFromRegion"> - ã“ã®åœ°åŸŸã®å…¨ã¦ã®ä½äººã‚’ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„ã‚‹å…¨ã¦ã®ä½äººã‚’ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="EstateObjectReturn"> - [USER_NAME]ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクトを返å´ã—ã¾ã™ã‹ï¼Ÿ + [USER_NAME] ãŒæ‰€æœ‰ã—ã¦ã„るオブジェクトを返å´ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="InvalidTerrainBitDepth"> @@ -1186,17 +1186,16 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </notification> <notification name="InvalidTerrainSize"> 地域テクスãƒãƒ£ã‚’è¨å®šã§ãã¾ã›ã‚“ã§ã—ãŸï¼š -地形テクスãƒãƒ£[TEXTURE_NUM]ã¯ã€[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]ã§ã¯å¤§ãã™ãŽã¾ã™ã€‚ +地形テクスãƒãƒ£ã€Œ [TEXTURE_NUM] ã€ã¯ã€[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] ã§ã¯å¤§ãã™ãŽã¾ã™ã€‚ -テクスãƒãƒ£[TEXTURE_NUM]ã‚’24ビット512x512ã‹ãれ以下ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã¨äº¤æ›ã—ã€ã€Œé©ç”¨ã€ã‚’å†åº¦ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。 +「 [TEXTURE_NUM] ã€ã‚’ 24 ビット 512x512 ã‹ãれ以下ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã¨äº¤æ›ã—ã€ã€Œé©ç”¨ã€ã‚’å†åº¦ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。 </notification> <notification name="RawUploadStarted"> - アップãƒãƒ¼ãƒ‰é–‹å§‹ã€‚ 接続速度ã«ã‚ˆã£ã¦ã¯ã€ -最大2分間ã‹ã‹ã‚Šã¾ã™ã€‚ + アップãƒãƒ¼ãƒ‰ã‚’開始ã—ã¾ã—ãŸã€‚ 接続速度ã«ã‚ˆã£ã¦ã¯ã€æœ€å¤§ 2 分間ã‹ã‹ã‚Šã¾ã™ã€‚ </notification> <notification name="ConfirmBakeTerrain"> ç¾åœ¨ã®åœ°å½¢ã‚’構築ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -ã“ã®æ“作を行ã†ã¨ã€ç¾åœ¨ã®åœ°å½¢ãŒä¸Šæ˜‡ï¼ä¸‹é™ã®åˆ¶é™ç¯„囲ã®ä¸å¿ƒã«ãªã‚Šã€ã€Œå¾©å¸°ã€ãƒ„ールã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãªã‚Šã¾ã™ã€‚ +ã“ã®æ“作を行ã†ã¨ã€ç¾åœ¨ã®åœ°å½¢ãŒä¸Šæ˜‡ãƒ»ä¸‹é™ã®åˆ¶é™ç¯„囲ã®ä¸å¿ƒã¨ãªã‚Šã€ã€Œå¾©å…ƒã€ãƒ„ールã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãªã‚Šã¾ã™ã€‚ æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> @@ -1204,35 +1203,34 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 許å¯ä½äººã¯ [MAX_AGENTS] 人ã¾ã§ã§ã™ã€‚ </notification> <notification name="MaxBannedAgentsOnRegion"> - ç¦æ¢ä½äººã¯[MAX_BANNED]人ã¾ã§ã§ã™ã€‚ + ç¦æ¢ä½äººã¯ [MAX_BANNED] 人ã¾ã§ã§ã™ã€‚ </notification> <notification name="MaxAgentOnRegionBatch"> [NUM_ADDED] 個ã®ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆã‚’è¿½åŠ ã—よã†ã¨ã—ã¦å¤±æ•—ã—ã¾ã—ãŸï¼š [MAX_AGENTS] [LIST_TYPE] 制é™ã‚’ [NUM_EXCESS] 個超éŽã—ã¦ã„ã¾ã™ã€‚ </notification> <notification name="MaxAllowedGroupsOnRegion"> - 許å¯ã‚°ãƒ«ãƒ¼ãƒ—ã¯[MAX_GROUPS]グループã¾ã§ã§ã™ã€‚ + 許å¯ã‚°ãƒ«ãƒ¼ãƒ—㯠[MAX_GROUPS] グループã¾ã§ã§ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="構築ã™ã‚‹"/> </notification> <notification name="MaxManagersOnRegion"> - ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã¯[MAX_MANAGER]人ã¾ã§ã§ã™ã€‚ + ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã¯ [MAX_MANAGER] 人ã¾ã§ã§ã™ã€‚ </notification> <notification name="OwnerCanNotBeDenied"> - ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã‚’ä¸å‹•ç”£ã€Œç¦æ¢ä½äººã€ãƒªã‚¹ãƒˆã«è¿½åŠ ã§ãã¾ã›ã‚“。 + ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã‚’ä¸å‹•ç”£ã®ã€Œç¦æ¢ä½äººã€ãƒªã‚¹ãƒˆã«è¿½åŠ ã§ãã¾ã›ã‚“。 </notification> <notification name="CanNotChangeAppearanceUntilLoaded"> - æœãŠã‚ˆã³å½¢ãŒãƒãƒ¼ãƒ‰ã•ã‚Œã‚‹ã¾ã§ã€å®¹å§¿ã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“。 + 衣類ãŠã‚ˆã³ã‚·ã‚§ã‚¤ãƒ—ãŒèªã¿è¾¼ã¾ã‚Œã‚‹ã¾ã§ã¯ã€å®¹å§¿ã®å¤‰æ›´ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="ClassifiedMustBeAlphanumeric"> - クラシファイド広告ã®åå‰ã¯ã€ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã‹ -æ•°å—ã§å§‹ã‚ã¾ã™ã€‚ å¥èªç‚¹ã§ã¯å§‹ã‚られã¾ã›ã‚“。 + クラシファイド広告ã®åå‰ã¯ã€ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆã‹æ•°å—ã§å§‹ã‚ã¾ã™ã€‚å¥èªç‚¹ã§ã¯å§‹ã‚られã¾ã›ã‚“。 </notification> <notification name="CantSetBuyObject"> - オブジェクトãŒè²©å£²å¯¾è±¡ã§ã¯ãªã„ãŸã‚ã€ã‚ªãƒ–ジェクトã®è³¼å…¥ãŒè¨å®šã§ãã¾ã›ã‚“。 -販売対象ã®ã‚ªãƒ–ジェクトをè¨å®šã—ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + オブジェクトãŒè²©å£²å¯¾è±¡ã§ã¯ãªã„ãŸã‚ã€ã‚ªãƒ–ジェクトã®è³¼å…¥ãŒã§ãã¾ã›ã‚“。 +販売対象ã®ã‚ªãƒ–ジェクトを指定ã—ã¦ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification name="FinishedRawDownload"> - æœªåŠ å·¥ã®åœ°å½¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’次ã¸ã¨ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸï¼š -[DOWNLOAD_PATH]。 + æœªåŠ å·¥ã®åœ°å½¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸï¼š +[DOWNLOAD_PATH] </notification> <notification name="DownloadWindowsMandatory"> [APP_NAME] ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã”利用å¯èƒ½ã§ã™ã€‚ @@ -1296,59 +1294,57 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </notification> <notification name="DeedObjectToGroup"> ã“ã®ã‚ªãƒ–ジェクトをè²æ¸¡ã™ã‚‹ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã¯ä»¥ä¸‹ã®ã“ã¨ãŒå¯èƒ½ã§ã™ï¼š -* オブジェクトã«æ”¯æ‰•ã‚ã‚ŒãŸL$ã‚’å—é ˜ã—ã¾ã™ã€‚ - <usetemplate ignoretext="オブジェクトをグループã«è²æ¸¡ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="è²æ¸¡"/> +* オブジェクトã«æ”¯æ‰•ã‚れ㟠L$ ã‚’å—é ˜ã—ã¾ã™ã€‚ + <usetemplate ignoretext="オブジェクトをグループã«è²æ¸¡ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="å–り消ã—" yestext="è²æ¸¡"/> </notification> <notification name="WebLaunchExternalTarget"> Web ブラウザを開ã„ã¦ã“ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„を表示ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ブラウザを起動ã—㦠Web ページを見る" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="ブラウザを起動ã—㦠Web ページを見るã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="WebLaunchJoinNow"> [http://jp.secondlife.com/account/ マイアカウント] ページã«ç§»å‹•ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’管ç†ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’管ç†ã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> + <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’管ç†ã™ã‚‹ã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="WebLaunchSecurityIssues"> - [SECOND_LIFE] Wikiã§ã€ -ã‚»ã‚ュリティå•é¡Œã‚’å ±å‘Šã™ã‚‹æ–¹æ³•ã‚’ã”覧ãã ã•ã„。 - <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚»ã‚ュリティå•é¡Œã®å ±å‘Šã®ä»•æ–¹ã‚’確èªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + [SECOND_LIFE] Wiki ã§ã€ã‚»ã‚ュリティå•é¡Œã‚’å ±å‘Šã™ã‚‹æ–¹æ³•ã‚’ã”覧ãã ã•ã„。 + <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚»ã‚ュリティå•é¡Œã®å ±å‘Šã®ä»•æ–¹ã‚’確èªã™ã‚‹ã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="WebLaunchQAWiki"> - [SECOND_LIFE] å“質ä¿è¨¼é–¢é€£Wikiã‚’ã”覧ãã ã•ã„。 - <usetemplate ignoretext="ブラウザを起動ã—㦠QA Wiki を見る" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + [SECOND_LIFE] å“質ä¿è¨¼é–¢é€£ Wiki ã‚’ã”覧ãã ã•ã„。 + <usetemplate ignoretext="ブラウザを起動ã—㦠QA Wiki を見るã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="WebLaunchPublicIssue"> - [SECOND_LIFE]ã®ãƒ‘ブリックå•é¡Œãƒˆãƒ©ãƒƒã‚«ãƒ¼ã§ã€ + [SECOND_LIFE] ã®ãƒ‘ブリックå•é¡Œãƒˆãƒ©ãƒƒã‚«ãƒ¼ã§ã€ ãƒã‚°ã‚„ãã®ä»–ã®å•é¡Œã‚’å ±å‘Šã§ãã¾ã™ã€‚ - <usetemplate ignoretext="ブラウザを確èªã—ã¦ãƒ‘ブリックå•é¡Œãƒˆãƒ©ãƒƒã‚«ãƒ¼ã‚’使用ã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="ページã¸è¡Œã"/> + <usetemplate ignoretext="ブラウザを起動ã—ã¦ãƒ‘ブリックå•é¡Œãƒˆãƒ©ãƒƒã‚«ãƒ¼ã‚’使用ã™ã‚‹ã¨ã" name="okcancelignore" notext="ã‚ャンセル" yestext="ページã¸è¡Œã"/> </notification> <notification name="WebLaunchSupportWiki"> - Lindenå…¬å¼ãƒ–ãƒã‚°ã§ã€æœ€æ–°ã®ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚„æƒ…å ±ã‚’å…¥æ‰‹ã—ã¦ãã ã•ã„。 - <usetemplate ignoretext="ブラウザを起動ã—ã¦å…¬å¼ãƒ–ãƒã‚°ã‚’見る" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> + Linden å…¬å¼ãƒ–ãƒã‚°ã§ã€æœ€æ–°ã®ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚„æƒ…å ±ã‚’å…¥æ‰‹ã—ã¦ãã ã•ã„。 + <usetemplate ignoretext="ブラウザを起動ã—ã¦å…¬å¼ãƒ–ãƒã‚°ã‚’見るã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="WebLaunchLSLGuide"> スクリプトガイドを開ãã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¹ã‚¯ãƒªãƒ—トガイドを見る" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> + <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¹ã‚¯ãƒªãƒ—トガイドを見るã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="WebLaunchLSLWiki"> LSL ãƒãƒ¼ã‚¿ãƒ«ã§ã‚¹ã‚¯ãƒªãƒ—トã«é–¢ã™ã‚‹æƒ…å ±ã‚’ç¢ºèªã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ブラウザを起動ã—㦠LSL ãƒãƒ¼ã‚¿ãƒ«ã‚’見る" name="okcancelignore" notext="å–り消ã—" yestext="ページã«ç§»å‹•"/> + <usetemplate ignoretext="ブラウザを起動ã—㦠LSL ãƒãƒ¼ã‚¿ãƒ«ã‚’見るã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="ページã«ç§»å‹•"/> </notification> <notification name="ReturnToOwner"> é¸æŠžã—ãŸã‚ªãƒ–ジェクトをã€æ‰€æœ‰è€…ã«è¿”å´ã—ã¾ã™ã‹ï¼Ÿ -è²æ¸¡å¯èƒ½ãªã‚ªãƒ–ジェクト㯠-以å‰ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ +「å†è²©ãƒ»ãƒ—レゼントå¯ã€ã®è²æ¸¡ã•ã‚ŒãŸã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã™ã€‚ -*è¦å‘Š*　移転ãŒä¸å¯èƒ½ã®è²æ¸¡ã•ã‚ŒãŸã‚ªãƒ–ジェクトã¯å‰Šé™¤ã•ã‚Œã¾ã™ï¼ - <usetemplate ignoretext="オブジェクトを所有者ã«è¿”å´ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> +*è¦å‘Š*　「å†è²©ãƒ»ãƒ—レゼントä¸å¯ã€ã®è²æ¸¡ã•ã‚ŒãŸã‚ªãƒ–ジェクトã¯ã€å‰Šé™¤ã•ã‚Œã¾ã™ï¼ + <usetemplate ignoretext="オブジェクトを所有者ã«è¿”å´ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="GroupLeaveConfirmMember"> - ç¾åœ¨ã‚ãªãŸã¯ [GROUP]ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚ -ã“ã“ã‹ã‚‰æŠœã‘ã¾ã™ã‹ï¼Ÿ + ç¾åœ¨ã‚ãªãŸã¯ [GROUP] ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚ +ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を抜ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ConfirmKick"> - ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’グリッド外ã«ã‚ックã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="å…¨ã¦ã®ãƒ¦ãƒ¼ã‚¶ã‚’追ã„出ã™"/> + 本当ã«ä½äººå…¨å“¡ã‚’グリッドã‹ã‚‰è¿½ã„出ã—ã¾ã™ã‹ï¼Ÿ + <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="ä½äººå…¨å“¡ã‚’追ã„出ã™"/> </notification> <notification name="MuteLinden"> リンデンをブãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 @@ -1362,27 +1358,26 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RemoveItemWarn"> - コンテンツを削除ã™ã‚‹ã¨ã€è¨±å¯ãŒã‚ã£ã¦ã‚‚ã€ã‚ªãƒ–ジェクトã«ãƒ€ãƒ¡ãƒ¼ã‚¸ã‚’与ãˆã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ -ãã®ã‚¢ã‚¤ãƒ†ãƒ ã®å‰Šé™¤ã‚’続ã‘ã¾ã™ã‹ï¼Ÿ + コンテンツを削除ã™ã‚‹ã¨ã€è¨±å¯ãŒã‚ã£ã¦ã‚‚オブジェクトã«æ傷を与ãˆã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ +削除を続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="CantOfferCallingCard"> - ç¾åœ¨ã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’é€ã‚Œã¾ã›ã‚“。数分後ã«ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + ç¾åœ¨ã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’é€ã‚Œã¾ã›ã‚“。数分後ã«ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CantOfferFriendship"> - ç¾åœ¨ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—ã‚’é€ã‚Œã¾ã›ã‚“。数分後ã«è©¦ã—ã¦ãã ã•ã„。 + ç¾åœ¨ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—ã‚’é€ã‚Œã¾ã›ã‚“。数分後ã«ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="BusyModeSet"> å–ã‚Šè¾¼ã¿ä¸ãƒ¢ãƒ¼ãƒ‰ã«ãªã‚Šã¾ã—ãŸã€‚ ãƒãƒ£ãƒƒãƒˆã¨ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。 å—ä¿¡ã™ã‚‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ã¯å–ã‚Šè¾¼ã¿ä¸è¿”ç”メッセージãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ テレãƒãƒ¼ãƒˆã®ã‚ªãƒ•ã‚¡ãƒ¼ã¯å—ã‘å–ã‚Šæ‹’å¦ã¨ãªã‚Šã¾ã™ã€‚ アイテムã®ã‚ªãƒ•ã‚¡ãƒ¼ã¯ã™ã¹ã¦ã”ã¿ç®±ã«å…¥ã‚Šã¾ã™ã€‚ - <usetemplate ignoretext="ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹ã‚’å–ã‚Šè¾¼ã¿ä¸ãƒ¢ãƒ¼ãƒ‰ã«å¤‰æ›´ã™ã‚‹" name="okignore" yestext="OK"/> + <usetemplate ignoretext="ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹ã‚’å–ã‚Šè¾¼ã¿ä¸ãƒ¢ãƒ¼ãƒ‰ã«å¤‰æ›´ã™ã‚‹ã¨ã" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> åŠ å…¥ã§ãるグループã®æœ€å¤§é™ã«é”ã—ã¾ã—ãŸã€‚ ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«åŠ å…¥ã™ã‚‹ãŸã‚ã«ä»–ã®ã‚°ãƒ«ãƒ¼ãƒ—を脱退ã™ã‚‹ã‹ã€ã“ã®ç”³ã—入れをæ–ã£ã¦ãã ã•ã„。 [NAME] ãŒã‚ãªãŸã‚’グループã®ãƒ¡ãƒ³ãƒãƒ¼ã¨ã—ã¦å‹§èª˜ã—ã¦ã„ã¾ã™ã€‚ -[INVITE] <usetemplate name="okcancelbuttons" notext="辞退" yestext="å‚åŠ "/> </notification> <notification name="JoinedTooManyGroups"> @@ -1390,7 +1385,7 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> - ã©ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¦ã€ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã‚’追ã„出ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚ãªãŸã¯ç®¡ç†è€…ã«ã‚ˆã‚Šãƒã‚°ã‚ªãƒ•ã•ã‚Œã¾ã—ãŸã€‚ @@ -1400,7 +1395,7 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="KickAllUsers"> - ã©ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¦ã€ã‚°ãƒªãƒƒãƒ‰ã«ã„る全員を追ã„出ã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã¤ã‘ã¦ã‚°ãƒªãƒƒãƒ‰ã«ã„る全員を追ã„出ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚ãªãŸã¯ç®¡ç†è€…ã«ã‚ˆã‚Šãƒã‚°ã‚ªãƒ•ã•ã‚Œã¾ã—ãŸã€‚ @@ -1410,17 +1405,17 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="FreezeUser"> - ã©ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¦ã€ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’フリーズã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã‚’フリーズã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> - ã‚ãªãŸã¯ãƒ•ãƒªãƒ¼ã‚ºã•ã‚Œã¦ã„ã¾ã™ã€‚ å‹•ãã“ã¨ã‚‚ãƒãƒ£ãƒƒãƒˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã›ã‚“。 管ç†è€…ãŒIMを通ã˜ã¦ã‚ãªãŸã«é€£çµ¡ã—ã¾ã™ã€‚ + ã‚ãªãŸã¯ãƒ•ãƒªãƒ¼ã‚ºã•ã‚Œã¦ã„ã¾ã™ã€‚ å‹•ãã“ã¨ã‚‚ãƒãƒ£ãƒƒãƒˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã›ã‚“。 管ç†è€…㌠IM ã§ã‚ãªãŸã«é€£çµ¡ã—ã¾ã™ã€‚ </input> <button name="OK" text="OK"/> <button name="Cancel" text="å–り消ã—"/> </form> </notification> <notification name="UnFreezeUser"> - ã©ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¦ã€ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ãƒªãƒ¼ã‚ºã‚’解除ã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã®ãƒ•ãƒªãƒ¼ã‚ºã‚’解除ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚‚ã†ãƒ•ãƒªãƒ¼ã‚ºã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -1430,40 +1425,39 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="OfferTeleport"> - 次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã‚ãªãŸãŒä»Šã„ã‚‹å ´æ‰€ã¸ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã‚Šã¾ã™ã‹ï¼Ÿ + 次ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ç¾åœ¨åœ°ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã‚Šã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> - [REGION]ã«æ¥ã¾ã›ã‚“ã‹ï¼Ÿ + [REGION] ã«æ¥ã¾ã›ã‚“ã‹ï¼Ÿ </input> <button name="OK" text="OK"/> <button name="Cancel" text="å–り消ã—"/> </form> </notification> <notification name="OfferTeleportFromGod"> - ユーザーをゴッド・コールã§å‘¼ã³å¯„ã›ã¾ã™ã‹ï¼Ÿ + ç¾åœ¨åœ°ã«ä½äººã‚’ゴッドサモンã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> - [REGION]ã«æ¥ã¾ã›ã‚“ã‹ï¼Ÿ + [REGION] ã«æ¥ã¾ã›ã‚“ã‹ï¼Ÿ </input> <button name="OK" text="OK"/> <button name="Cancel" text="å–り消ã—"/> </form> </notification> <notification name="TeleportFromLandmark"> - 本当ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> + ã“ã®ã¾ã¾ <nolink>[LOCATION]</nolink> ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> </notification> <notification name="TeleportToPick"> [PICK] ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ピックã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> + <usetemplate ignoretext="ピックã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> </notification> <notification name="TeleportToClassified"> [CLASSIFIED] ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="クラシファイド広告ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> + <usetemplate ignoretext="クラシファイド広告ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> </notification> <notification label="ã‚ãªãŸã®ä¸å‹•ç”£å†…ã®å…¨å“¡ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡" name="MessageEstate"> - 今ã‚ãªãŸã®ä¸å‹•ç”£ã«ã„る人全員ã«é€ã‚‹ -çŸã„メッセージを入力ã—ã¦ãã ã•ã„。 + 今ã‚ãªãŸã®ä¸å‹•ç”£ã«ã„る人全員ã«é€ã‚‹ã€çŸã„メッセージを入力ã—ã¦ãã ã•ã„。 <form name="form"> <input name="message"/> <button name="OK" text="OK"/> @@ -1471,86 +1465,86 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification label="Lindenã®ä¸å‹•ç”£ã‚’変更" name="ChangeLindenEstate"> - ã‚ãªãŸã¯Linden所有ã®ä¸å‹•ç”£ï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + リンデンãŒæ‰€æœ‰ã™ã‚‹ã‚¨ã‚¹ãƒ†ãƒ¼ãƒˆï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -ã“ã‚Œã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®çµŒé¨“ã‚’æ ¹æœ¬ã‹ã‚‰æºã‚‹ãŒã—ã‹ããªã„「éžå¸¸ã«å±é™ºãªè¡Œç‚ºã€ã§ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã§å¤šæ•°ã®åœ°åŸŸãŒå¤‰æ›´ã•ã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã‚µãƒ¼ãƒãƒ¼ã«æ‚ªå½±éŸ¿ãŒç”Ÿã˜ã¾ã™ã€‚ +ä½äººã®ä½“験ã«æ ¹æœ¬çš„ã«å½±éŸ¿ã‚’与ãˆã‚‹ãŸã‚ã€éžå¸¸ã«å±é™ºãªè¡Œç‚ºã§ã™ã€‚ メインランドã§ã¯ã€ä½•åƒã¨ã„ã†ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤‰æ›´ã«ã‚ˆã‚‹å½±éŸ¿ã‚’å—ã‘ã€ãã®ãŸã‚スペースサーãƒãƒ¼ã«è² æ‹…ã‚’ã‹ã‘ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ -æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ +ãã‚Œã§ã‚‚続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification label="Lindenã®ä¸å‹•ç”£ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’変更" name="ChangeLindenAccess"> - ã‚ãªãŸã¯Linden所有ã®ä¸å‹•ç”£ï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãƒªã‚¹ãƒˆã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã¯ãƒªãƒ³ãƒ‡ãƒ³æ‰€æœ‰ã®ä¸å‹•ç”£ï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãƒªã‚¹ãƒˆã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“ã®è¡Œç‚ºã¯ã€Œå±é™ºã€ã§ã‚ã‚Šã€ã‚°ãƒªãƒƒãƒ‰ã‹ã‚‰ã‚ªãƒ–ジェクトやãŠé‡‘ã®è»¢é€ã‚’ã‚‚ãŸã‚‰ã™ãƒãƒƒã‚ングを引ãèµ·ã“ã™å¯èƒ½æ€§ãŒã‚ã‚‹ãŸã‚ã€å®Œå…¨ã«ãれをæ„図ã—ãŸå ´åˆã®ã¿è¡Œã†ã¹ãã‚‚ã®ã§ã™ã€‚ -ã“ã‚Œã«ã‚ˆã‚Šå¤šæ•°ã®åœ°åŸŸãŒå¤‰æ›´ã•ã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã‚µãƒ¼ãƒãƒ¼ã«æ‚ªå½±éŸ¿ãŒç”Ÿã˜ã¾ã™ã€‚ +ã“ã‚Œã«ã‚ˆã‚Šå¤šæ•°ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ãŒå¤‰æ›´ã•ã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã‚µãƒ¼ãƒãƒ¼ã«æ‚ªå½±éŸ¿ãŒç”Ÿã˜ã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedAgentAdd"> - ã“ã®ä¸å‹•ç”£ã®è¨±å¯ãƒªã‚¹ãƒˆã ã‘ã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚[ALL_ESTATES]ã®ã™ã¹ã¦ã®è¨±å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã®è¨±å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®è¨±å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedAgentRemove"> - 許å¯ãƒªã‚¹ãƒˆã‹ã‚‰ã®å‰Šé™¤ã‚’ã“ã®ä¸å‹•ç”£ã«ã¤ã„ã¦ã®ã¿è¡Œã„ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ã€[ALL_ESTATES]ã«ã¤ã„ã¦è¡Œã„ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã®è¨±å¯ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ã€[ALL_ESTATES] ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedGroupAdd"> - ã“ã®ä¸å‹•ç”£ã®ã‚°ãƒ«ãƒ¼ãƒ—許å¯ãƒªã‚¹ãƒˆã ã‘ã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚[ALL_ESTATES]ã®ã‚°ãƒ«ãƒ¼ãƒ—許å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã®ã‚°ãƒ«ãƒ¼ãƒ—許å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ [ALL_ESTATES] ã®ã‚°ãƒ«ãƒ¼ãƒ—許å¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateAllowedGroupRemove"> - 許å¯ãƒªã‚¹ãƒˆã‹ã‚‰ã®å‰Šé™¤ã‚’ã“ã®ä¸å‹•ç”£ã«ã¤ã„ã¦ã®ã¿è¡Œã„ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ã€[ALL_ESTATES]ã«ã¤ã„ã¦è¡Œã„ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã®è¨±å¯ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ã€[ALL_ESTATES] ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateBannedAgentAdd"> - ã“ã®ä¸å‹•ç”£ã«ã¤ã„ã¦ã®ã¿ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚[ALL_ESTATE]ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã§ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã—ã¾ã™ã‹ï¼Ÿ ãã‚Œã¨ã‚‚ [ALL_ESTATE] ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateBannedAgentRemove"> - ã“ã®ä½äººã‚’ã€ã“ã®ä¸å‹•ç”£ã®ã¿ã€ã¾ãŸã¯[ALL_ESTATES]ã¸ã¨ã‚¢ã‚¯ã‚»ã‚¹ã§ãるよã†ã«ã€ç¦æ¢ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä½äººãŒã€ã“ã®ä¸å‹•ç”£é™å®šã€ã¾ãŸã¯ [ALL_ESTATES] ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãるよã†ã«ã€ç¦æ¢ãƒªã‚¹ãƒˆã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateManagerAdd"> - ã“ã®ä¸å‹•ç”£ã®ã¿ã€ã¾ãŸã¯[ALL_ESTATES]ã«å¯¾ã—ã¦ã€ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£é™å®šã€ã¾ãŸã¯ [ALL_ESTATES] ã®ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ä¸å‹•ç”£ã‚’é¸æŠž" name="EstateManagerRemove"> - ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’ã€ã“ã®ä¸å‹•ç”£ã®ã¿ã€ã¾ãŸã¯[ALL_ESTATES]ã‹ã‚‰ã€å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ + ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’ã€ã“ã®ä¸å‹•ç”£é™å®šã€ã¾ãŸã¯ [ALL_ESTATES] ã‹ã‚‰ã€å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="å–り消ã—" name="yesnocancelbuttons" notext="ã™ã¹ã¦ã®ä¸å‹•ç”£" yestext="ã“ã®ä¸å‹•ç”£"/> </notification> <notification label="ã‚ックを確èª" name="EstateKickUser"> - ã“ã®ä¸å‹•ç”£ã‹ã‚‰[EVIL_USER]を追ã„出ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ä¸å‹•ç”£ã‹ã‚‰ [EVIL_USER] を追ã„出ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="EstateChangeCovenant"> - ä¸å‹•ç”£ç´„款を変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ + ä¸å‹•ç”£ç´„款を変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked"> - ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢を確èªã™ã‚‹éš›ã®æƒ…å ±ã«ä¸è¶³ãŒã‚ã£ãŸãŸã‚ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚ + ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢を確èªã™ã‚‹éš›ã®æƒ…å ±ã«ä¸è¶³ãŒã‚ã£ãŸãŸã‚ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚ 最新ビューワãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’ã”確èªãã ã•ã„。ã“ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã§ã®ã‚¢ã‚¯ã‚»ã‚¹ã«é–¢ã™ã‚‹è©³ç´°ã¯ãƒŠãƒ¬ãƒƒã‚¸ãƒ™ãƒ¼ã‚¹ã‚’ã”覧ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked_KB"> - ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 ナレッジベースを開ãレーティング区分ã«ã¤ã„ã¦å¦ã³ã¾ã™ã‹ï¼Ÿ <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja </url> - <usetemplate ignoretext="レーティング区分ã®åˆ¶é™ã®ãŸã‚ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="ナレッジベースを開ã"/> + <usetemplate ignoretext="レーティング区分ã®åˆ¶é™ã®ãŸã‚ã€ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ããªã„ã¨ã" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="ナレッジベースを開ã"/> </notification> <notification name="RegionEntryAccessBlocked_Notify"> - ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </notification> <notification name="RegionEntryAccessBlocked_Change"> - ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†è¨å®šã«ã‚ˆã‚Šã€ãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†è¨å®šã«ã‚ˆã‚Šã€ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 「è¨å®šã‚’変更ã€ã‚’クリックã—ã¦ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚’上ã’ã‚‹ã¨ã€å…¥ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ ã‚ãªãŸã¯ä»Šå¾Œ [REGIONMATURITY] コンテンツã®æ¤œç´¢åŠã³ã‚¢ã‚¯ã‚»ã‚¹ãŒå¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚ ã‚ã¨ã§è¨å®šã‚’å…ƒã«æˆ»ã—ãŸã„å ´åˆã¯ã€ã€Œç·¨é›†ã€ï¼žã€Œç’°å¢ƒè¨å®šã€ã‚’ã”覧ãã ã•ã„。 <form name="form"> <button name="OK" text="環境è¨å®šã®å¤‰æ›´"/> <button default="true" name="Cancel" text="é–‰ã˜ã‚‹"/> - <ignore name="ignore" text="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"/> + <ignore name="ignore" text="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚Œãªã„ã¨ã"/> </form> </notification> <notification name="LandClaimAccessBlocked"> @@ -1575,7 +1569,7 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†è¨å®šã«ã‚ˆã‚Šã€ã“ã®åœŸåœ°ã‚’å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 「è¨å®šã‚’変更ã€ã‚’クリックã—ã¦ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚’上ã’ã‚‹ã¨ã€å…¥ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ ã‚ãªãŸã¯ä»Šå¾Œ [REGIONMATURITY] コンテンツã®æ¤œç´¢åŠã³ã‚¢ã‚¯ã‚»ã‚¹ãŒå¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚ ã‚ã¨ã§è¨å®šã‚’å…ƒã«æˆ»ã—ãŸã„å ´åˆã¯ã€ã€Œç·¨é›†ã€ï¼žã€Œç’°å¢ƒè¨å®šã€ã‚’ã”覧ãã ã•ã„。 - <usetemplate ignoretext="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€åœŸåœ°ã‚’å–å¾—ã§ãã¾ã›ã‚“" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="è¨å®šã®å¤‰æ›´"/> + <usetemplate ignoretext="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€åœŸåœ°ã‚’å–å¾—ã§ããªã„ã¨ã" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="è¨å®šã®å¤‰æ›´"/> </notification> <notification name="LandBuyAccessBlocked"> ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šã€ã“ã®åœŸåœ°ã‚’購入ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 年齢を確èªã™ã‚‹éš›ã®æƒ…å ±ã«ä¸è¶³ãŒã‚ã£ãŸãŸã‚ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ã€‚ @@ -1599,58 +1593,57 @@ F1ã‚ーを押ã—ã¦ãã ã•ã„。 ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†è¨å®šã«ã‚ˆã‚Šã€ã“ã®åœŸåœ°ã‚’購入ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 「è¨å®šã‚’変更ã€ã‚’クリックã—ã¦ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã‚’上ã’ã‚‹ã¨ã€å…¥ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ ã‚ãªãŸã¯ä»Šå¾Œ [REGIONMATURITY] コンテンツã®æ¤œç´¢åŠã³ã‚¢ã‚¯ã‚»ã‚¹ãŒå¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚ ã‚ã¨ã§è¨å®šã‚’å…ƒã«æˆ»ã—ãŸã„å ´åˆã¯ã€ã€Œç·¨é›†ã€ï¼žã€Œç’°å¢ƒè¨å®šã€ã‚’ã”覧ãã ã•ã„。 - <usetemplate ignoretext="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€åœŸåœ°ã‚’購入ã§ãã¾ã›ã‚“" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="è¨å®šã®å¤‰æ›´"/> + <usetemplate ignoretext="é¸æŠžã—ãŸãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒåŽŸå› ã§ã€åœŸåœ°ã‚’購入ã§ããªã„ã¨ã" name="okcancelignore" notext="é–‰ã˜ã‚‹" yestext="è¨å®šã®å¤‰æ›´"/> </notification> <notification name="TooManyPrimsSelected"> é¸æŠžã—ãŸãƒ—リムãŒå¤šã™ãŽã¾ã™ã€‚ [MAX_PRIM_COUNT] 個é¸æŠžã™ã‚‹ã‹ã€ãƒ—リム数を減らã—ã¦ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemImportingEstateCovenant"> - ä¸å‹•ç”£ç´„款ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆæ™‚ã«å•é¡Œç™ºç”Ÿã€‚ + ä¸å‹•ç”£ç´„款ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆæ™‚ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemAddingEstateManager"> æ–°ã—ã„ä¸å‹•ç”£ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®è¿½åŠ ã«é–¢ã™ã‚‹å•é¡Œï¼š -1ã¤ä»¥ä¸Šã®ä¸å‹•ç”£ã§ã€ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ +ã„ãšã‚Œã‹ã®ä¸å‹•ç”£ã®ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ </notification> <notification name="ProblemAddingEstateGeneric"> ä¸å‹•ç”£ãƒªã‚¹ãƒˆã®è¿½åŠ ã«é–¢ã™ã‚‹å•é¡Œï¼š -1ã¤ä»¥ä¸Šã®ä¸å‹•ç”£ã§ã€ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ +ã„ãšã‚Œã‹ã®ä¸å‹•ç”£ã®ãƒªã‚¹ãƒˆãŒæº€æ¯ã«ãªã£ã¦ã„ã¾ã™ã€‚ </notification> <notification name="UnableToLoadNotecardAsset"> - ç¾åœ¨ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã®è³‡ç”£IDã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。 + ç¾åœ¨ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã®ã‚¢ã‚»ãƒƒãƒˆ ID ã‚’èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NotAllowedToViewNotecard"> - è¦æ±‚ã•ã‚ŒãŸè³‡ç”£IDã«é–¢ã™ã‚‹ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’閲覧ã™ã‚‹ã«ã¯æ¨©é™ãŒä¸å分ã§ã™ã€‚ + è¦æ±‚ã—ãŸã‚¢ã‚»ãƒƒãƒˆ ID ã«é–¢ã™ã‚‹ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’閲覧ã™ã‚‹ã«ã¯ã€æ¨©é™ãŒä¸å分ã§ã™ã€‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MissingNotecardAssetID"> - ノートカード用資産IDãŒãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“。 + ノートカード用ã®ã‚¢ã‚»ãƒƒãƒˆ ID ãŒãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="PublishClassified"> 注æ„：クラシファイド広告ã®æ–™é‡‘ã¯æ‰•ã„戻ã—ã•ã‚Œã¾ã›ã‚“。 -L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï¼Ÿ +L$ [AMOUNT] ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="SetClassifiedMature"> - ã“ã®åºƒå‘Šã«ã€ŒæŽ§ãˆã‚ã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯å«ã¾ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ + ã“ã®åºƒå‘Šã«ã€ŒModerateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯å«ã¾ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="SetGroupMature"> - ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã€ŒæŽ§ãˆã‚ã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ + ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã€ŒModerateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ <usetemplate canceltext="ã‚ャンセル" name="yesnocancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification label="å†èµ·å‹•ã‚’確èª" name="ConfirmRestart"> - ã“ã®åœ°åŸŸã‚’2分後ã«å†èµ·å‹•ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ 2 分後ã«å†èµ·å‹•ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ +続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> - <notification label="ã“ã®åœ°åŸŸå†…ã®å…¨å“¡ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡" name="MessageRegion"> - ã“ã®åœ°åŸŸã«ã„る人全員ã«é€ã‚‹ -çŸã„メッセージを入力ã—ã¦ãã ã•ã„。 + <notification label="ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡" name="MessageRegion"> + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„る人全員ã«é€ã‚‹çŸã„メッセージを入力ã—ã¦ãã ã•ã„。 <form name="form"> <input name="message"/> <button name="OK" text="OK"/> @@ -1658,16 +1651,16 @@ L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï </form> </notification> <notification label="地域ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†æŒ‡å®šå¤‰æ›´æ¸ˆã¿" name="RegionMaturityChange"> - ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒã‚¢ãƒƒãƒ—デートã•ã‚Œã¾ã—ãŸã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ãŒã‚¢ãƒƒãƒ—デートã•ã‚Œã¾ã—ãŸã€‚ 地図ã«å¤‰æ›´ãŒåæ˜ ã•ã‚Œã‚‹ã¾ã§æ•°åˆ†ã‹ã‹ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ -アダルト専用リージョンã«å…¥ã‚‹ã«ã¯ã€ä½äººã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¹´é½¢ç¢ºèªã‹æ”¯æ‰•æ–¹æ³•ã®ã„ãšã‚Œã‹ã§ã€Œç¢ºèªæ¸ˆã¿ã€ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 +Adult 専用リージョンã«å…¥ã‚‹ã«ã¯ã€ä½äººã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¹´é½¢ç¢ºèªã‹æ”¯æ‰•æ–¹æ³•ã®ã„ãšã‚Œã‹ã§ã€Œç¢ºèªæ¸ˆã¿ã€ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 </notification> <notification label="ボイスãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ä¸ä¸€è‡´" name="VoiceVersionMismatch"> [APP_NAME] ã®ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã€ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ãŠã‘るボイスãƒãƒ£ãƒƒãƒˆã®äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。 ボイスãƒãƒ£ãƒƒãƒˆã‚’æ£å¸¸ã«è¡Œã†ãŸã‚ã«ã¯ã€[APP_NAME] ã®ã‚¢ãƒƒãƒ—デートãŒå¿…è¦ã§ã™ã€‚ </notification> <notification label="オブジェクトを購入ã§ãã¾ã›ã‚“" name="BuyObjectOneOwner"> - 複数ã®ã‚ªãƒ¼ãƒŠãƒ¼ã‹ã‚‰åŒæ™‚ã«ã‚ªãƒ–ジェクトを購入ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 + 複数ã®æ‰€æœ‰è€…ã‹ã‚‰åŒæ™‚ã«ã‚ªãƒ–ジェクトを購入ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 å˜ä¸€ã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification label="コンテンツを購入ã§ãã¾ã›ã‚“" name="BuyContentsOneOnly"> @@ -1675,62 +1668,64 @@ L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï é¸æŠžã™ã‚‹ã‚ªãƒ–ジェクトを1ã¤ã ã‘ã«ã—ã¦ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification label="コンテンツを購入ã§ãã¾ã›ã‚“" name="BuyContentsOneOwner"> - 複数ã®ã‚ªãƒ¼ãƒŠãƒ¼ã‹ã‚‰åŒæ™‚ã«ã‚ªãƒ–ジェクトを購入ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 + 複数ã®æ‰€æœ‰è€…ã‹ã‚‰åŒæ™‚ã«ã‚ªãƒ–ジェクトを購入ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 å˜ä¸€ã®ã‚ªãƒ–ジェクトをé¸æŠžã—ã€ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification name="BuyOriginal"> - オリジナルã®ã‚ªãƒ–ジェクトを[OWNER]ã‹ã‚‰L$[PRICE]ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ -ã“ã‚Œã«ã‚ˆã‚Šã€ã‚ãªãŸãŒã‚ªãƒ–ジェクトã®ã‚ªãƒ¼ãƒŠãƒ¼ã«ãªã‚Šã¾ã™ã€‚ + オリジナルã®ã‚ªãƒ–ジェクトを [OWNER] ã‹ã‚‰ L$ [PRICE] ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ +購入ã™ã‚‹ã¨ã€ã‚ãªãŸãŒã‚ªãƒ–ジェクトã®æ‰€æœ‰è€…ã¨ãªã‚Šã¾ã™ã€‚ å¯èƒ½ãªæ“作ã¯ã€ -変更：[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠-å†è²©ï¼ãƒ—レゼント[RESELLPERM]ã§ã™ã€‚ +ä¿®æ£ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠+å†è²©ãƒ»ãƒ—レゼント：[RESELLPERM] ã§ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyOriginalNoOwner"> - L$[PRICE]ã§ã‚ªãƒªã‚¸ãƒŠãƒ«ã®ã‚ªãƒ–ジェクトを購入ã—ã¾ã™ã‹ï¼Ÿ -ã“ã‚Œã«ã‚ˆã‚Šã€ã‚ãªãŸãŒã‚ªãƒ–ジェクトã®ã‚ªãƒ¼ãƒŠãƒ¼ã«ãªã‚Šã¾ã™ã€‚ + L$ [PRICE] ã§ã‚ªãƒªã‚¸ãƒŠãƒ«ã®ã‚ªãƒ–ジェクトを購入ã—ã¾ã™ã‹ï¼Ÿ +購入ã™ã‚‹ã¨ã€ã‚ãªãŸãŒã‚ªãƒ–ジェクトã®æ‰€æœ‰è€…ã¨ãªã‚Šã¾ã™ã€‚ å¯èƒ½ãªæ“作ã¯ã€ -変更：[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠-å†è²©ï¼ãƒ—レゼント[RESELLPERM]ã§ã™ã€‚ +ä¿®æ£ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠+å†è²©ãƒ»ãƒ—レゼント：[RESELLPERM] ã§ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyCopy"> - コピーを[OWNER]ã‹ã‚‰L$[PRICE]ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ -購入ã—ãŸã‚ªãƒ–ジェクトã¯ã€ã‚ãªãŸã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ -å¯èƒ½ãªæ“作ã¯ã€å¤‰æ›´ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠-å†è²©ï¼ãƒ—レゼント[RESELLPERM]ã§ã™ã€‚ + コピーを [OWNER] ã‹ã‚‰ L$ [PRICE] ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ +購入ã—ãŸã‚ªãƒ–ジェクトã¯ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ +å¯èƒ½ãªæ“作ã¯ã€ +ä¿®æ£ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠+å†è²©ãƒ»ãƒ—レゼント：[RESELLPERM] ã§ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyCopyNoOwner"> - L$[PRICE]ã§ã‚³ãƒ”ーを購入ã—ã¾ã™ã‹ï¼Ÿ -購入ã—ãŸã‚ªãƒ–ジェクトã¯ã€ã‚ãªãŸã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ -å¯èƒ½ãªæ“作ã¯ã€å¤‰æ›´ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠-å†è²©ï¼ãƒ—レゼント[RESELLPERM]ã§ã™ã€‚ + L$ [PRICE] ã§ã‚³ãƒ”ーを購入ã—ã¾ã™ã‹ï¼Ÿ +購入ã—ãŸã‚ªãƒ–ジェクトã¯ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ +å¯èƒ½ãªæ“作ã¯ã€ +ä¿®æ£ï¼š[MODIFYPERM]ã€ã‚³ãƒ”ー：[COPYPERM]〠+å†è²©ãƒ»ãƒ—レゼント：[RESELLPERM] ã§ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyContents"> - コンテンツを[OWNER]ã‹ã‚‰L$[PRICE]ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ -購入ã—ãŸã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ã‚ãªãŸã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ + ä¸èº«ã‚’ [OWNER] ã‹ã‚‰ L$ [PRICE] ã§è³¼å…¥ã—ã¾ã™ã‹ï¼Ÿ +購入ã—ãŸä¸èº«ã¯ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="BuyContentsNoOwner"> - L＄[PRICE]ã§ã‚³ãƒ³ãƒ†ãƒ³ãƒ„を購入ã—ã¾ã™ã‹ï¼Ÿ -購入ã—ãŸã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ã‚ãªãŸã®æŒã¡ç‰©ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ + L＄ [PRICE] ã§ä¸èº«ã‚’購入ã—ã¾ã™ã‹ï¼Ÿ +購入ã—ãŸä¸èº«ã¯ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ã€‚ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ConfirmPurchase"> ã“ã®å–引ã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šè¡Œã‚ã‚Œã¾ã™ï¼š [ACTION] -ã“ã®è³¼å…¥ã‚’続行ã—ã¾ã™ã‹ï¼Ÿ +購入を続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ConfirmPurchasePassword"> ã“ã®å–引ã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šè¡Œã‚ã‚Œã¾ã™ï¼š [ACTION] -ã“ã®è³¼å…¥ã‚’続行ã—ã¾ã™ã‹ï¼Ÿ -パスワードをå†å…¥åŠ›ã—ã€ã€ŒOKã€ã‚’クリックã—ã¦ãã ã•ã„。 +購入を続ã‘ã¾ã™ã‹ï¼Ÿ +パスワードをå†å…¥åŠ›ã—ã€ã€Œ OK ã€ã‚’クリックã—ã¦ãã ã•ã„。 <form name="form"> <input name="message"/> <button name="ConfirmPurchase" text="OK"/> @@ -1739,31 +1734,31 @@ L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï </notification> <notification name="SetPickLocation"> メモ： -本ピックã®ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’æ›´æ–°ã—ã¾ã—ãŸãŒã€ +本ピックã®ä½ç½®ã‚’æ›´æ–°ã—ã¾ã—ãŸãŒã€ ä»–ã®è©³ç´°ã¯å…ƒã®å€¤ã®ã¾ã¾ã«ãªã‚Šã¾ã™ã€‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MoveInventoryFromObject"> - 「コピーç¦æ¢ã€ã®æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ãŒé¸æŠžã•ã‚Œã¾ã—ãŸã€‚ -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚³ãƒ”ーã•ã‚Œãªã„ã¾ã¾ã€ã‚ãªãŸã®æŒã¡ç‰©ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚ + 「コピーä¸å¯ã€ã®æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã—ã¾ã—ãŸã€‚ +ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚³ãƒ”ーã•ã‚Œãªã„ã¾ã¾ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚ アイテムを動ã‹ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="「コピーä¸å¯ã€ã®ã‚¢ã‚¤ãƒ†ãƒ をオブジェクトã‹ã‚‰å‹•ã‹ã™å‰ã«è¦å‘Šã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="「コピーä¸å¯ã€ã®ã‚¢ã‚¤ãƒ†ãƒ をオブジェクトã‹ã‚‰å‹•ã‹ã™å‰ã®è¦å‘Š" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> - 「コピーç¦æ¢ã€ã®æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ãŒé¸æŠžã•ã‚Œã¾ã—ãŸã€‚ -ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚³ãƒ”ーã•ã‚Œã‚‹ã®ã§ã¯ãªãã€ã‚ãªãŸã®æŒã¡ç‰©ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚ -ã“ã®ã‚ªãƒ–ジェクトã¯ã‚¹ã‚¯ãƒªãƒ—ト付ããªã®ã§ã€æŒã¡ç‰©ã«ç§»å‹•ã•ã›ã‚‹ã¨ + 「コピーä¸å¯ã€ã®æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã—ã¾ã—ãŸã€‚ +ã“れらã®ã‚¢ã‚¤ãƒ†ãƒ ã¯ã‚³ãƒ”ーã•ã‚Œãšã«ã€ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚ +ã“ã®ã‚ªãƒ–ジェクトã¯ã‚¹ã‚¯ãƒªãƒ—ト付ããªã®ã§ã€ã€ŒæŒã¡ç‰©ã€ã«ç§»å‹•ã•ã›ã‚‹ã¨ スクリプトã«èª¤å‹•ä½œãŒèµ·ãã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ を移動ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="スクリプト入りã®ã‚ªãƒ–ジェクトを壊ã™æã‚Œã®ã‚る「コピーä¸å¯ã€ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å‹•ã‹ã™å‰ã«è¦å‘Šã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="スクリプト入りã®ã‚ªãƒ–ジェクトを壊ã™æã‚Œã®ã‚る「コピーä¸å¯ã€ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å‹•ã‹ã™å‰ã®è¦å‘Š" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> è¦å‘Šï¼š クリックã§ã€Œã‚ªãƒ–ジェクトã«æ”¯æ‰•ã†ã€è¨å®šã‚’ã—ã¾ã—ãŸã€‚スクリプト㫠money()イベントãŒè¿½åŠ ã•ã‚Œã‚‹ã¨å‹•ä½œã—ã¾ã™ã€‚ <form name="form"> - <ignore name="ignore" text="money() スクリプトを入れãšã«ã‚ªãƒ–ジェクトを制作ä¸ã«ã€ã€Œã‚ªãƒ–ジェクトã«æ”¯æ‰•ã†ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’è¨å®š"/> + <ignore name="ignore" text="オブジェクトを作æˆä¸ã«ã€money() スクリプトを入れãšã«ã€Œã‚ªãƒ–ジェクトã«æ”¯æ‰•ã†ã€ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’è¨å®šã—ãŸã¨ã"/> </form> </notification> <notification name="OpenObjectCannotCopy"> @@ -1771,16 +1766,16 @@ L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï </notification> <notification name="WebLaunchAccountHistory"> [http://jp.secondlife.com/account/ マイアカウント] ページã«ç§»å‹•ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆå±¥æ´ã‚’確èªã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆå±¥æ´ã‚’見る" name="okcancelignore" notext="å–り消ã—" yestext="ページã«ç§»å‹•"/> + <usetemplate ignoretext="ブラウザを起動ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆå±¥æ´ã‚’見るã¨ã" name="okcancelignore" notext="å–り消ã—" yestext="ページã«ç§»å‹•"/> </notification> <notification name="ConfirmQuit"> - 終了ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="終了時ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="終了ã—ãªã„" yestext="終了"/> + 終了ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚続ã‘ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="終了時ã®ç¢ºèª" name="okcancelignore" notext="終了ã—ãªã„" yestext="終了"/> </notification> <notification name="HelpReportAbuseEmailLL"> ã“ã®ãƒ„ールを利用ã—㦠[http://secondlife.com/corporate/tos.php 利用è¦ç´„] ã‚„ [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] ã®é•åã‚’å ±å‘Šã—ã¦ãã ã•ã„。 -å ±å‘Šã•ã‚ŒãŸå«ŒãŒã‚‰ã›ã¯ã™ã¹ã¦èª¿æŸ»ãƒ»è§£æ±ºã•ã‚Œã¾ã™ã€‚ 解決ã•ã‚ŒãŸã‚‚ã®ã¯ [http://secondlife.com/support/incidentreport.php Incident Report] ã§è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ +å ±å‘Šã•ã‚ŒãŸå«ŒãŒã‚‰ã›ã¯ã™ã¹ã¦èª¿æŸ»ãƒ»è§£æ±ºã•ã‚Œã¾ã™ã€‚ </notification> <notification name="HelpReportAbuseSelectCategory"> å«ŒãŒã‚‰ã›å ±å‘Šã®ã‚«ãƒ†ã‚´ãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„。 @@ -1815,44 +1810,42 @@ L$[AMOUNT]ã§ã€ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã™ã公開ã—ã¾ã™ã‹ï (2) DMCA ã¾ãŸã¯ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®æ’¤åŽ»ã®æ‰‹é † コンテンツを [SECOND_LIFE] ã‹ã‚‰å‰Šé™¤ã—ã¦æ¬²ã—ã„ã¨ã„ã†ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ã™ã‚‹ã«ã¯ã€å¼Šç¤¾ [http://secondlife.com/corporate/dmca.php DMCA ãƒãƒªã‚·ãƒ¼] ã§æ示ã•ã‚Œã¦ã„ã‚‹ã¨ãŠã‚Šã€æœ‰åŠ¹ãªä¾µå®³ã®é€šçŸ¥ã‚’æ出ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。. -ã“ã®ã¾ã¾å«ŒãŒã‚‰ã›ã®å ±å‘Šã‚’続ã‘ãŸã„å ´åˆã¯ã€ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¦å ±å‘Šã‚’é€ã£ã¦ãã ã•ã„。 「コピーBotåŠã³æ¨©é™ã®æ‚ªç”¨ã€ã®ã‚«ãƒ†ã‚´ãƒªã‚’é¸ã‚“ã æ–¹ãŒé©åˆ‡ã®å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ +ã“ã®ã¾ã¾å«ŒãŒã‚‰ã›ã®å ±å‘Šã‚’続ã‘ãŸã„å ´åˆã¯ã€ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¦å ±å‘Šã‚’é€ã£ã¦ãã ã•ã„。 「コピー Bot åŠã³æ¨©é™ã®æ‚ªç”¨ã€ã®ã‚«ãƒ†ã‚´ãƒªã‚’é¸ã‚“ã æ–¹ãŒé©åˆ‡ã®å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ã”å”力ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚ Linden Lab </notification> <notification name="FailedRequirementsCheck"> - 以下ã®å¿…è¦ãªã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒã€[FLOATER]ã‹ã‚‰æŠœã‘è½ã¡ã¦ã„ã¾ã™ + 以下ã®å¿…è¦ãªã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒã€[FLOATER] ã‹ã‚‰æŠœã‘è½ã¡ã¦ã„ã¾ã™ [COMPONENTS] </notification> <notification label="æ—¢å˜ã®ä»˜å±žå“ã‚’ç½®æ›" name="ReplaceAttachment"> - 体ã®ã“ã®éƒ¨ä½ã«ã¯ã‚ªãƒ–ジェクトãŒè£…ç€ã•ã‚Œã¦ã„ã¾ã™ã€‚ + 体ã®ã“ã®éƒ¨ä½ã«ã¯æ—¢ã«ã‚ªãƒ–ジェクトãŒè£…ç€ã•ã‚Œã¦ã„ã¾ã™ã€‚ é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトã¨ç½®ãæ›ãˆã¾ã™ã‹ï¼Ÿ <form name="form"> - <ignore name="ignore" save_option="true" text="装ç€ã—ã¦ã„るアイテムã¨é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を入れ替ãˆã‚‹"/> + <ignore name="ignore" save_option="true" text="装ç€ã—ã¦ã„るアイテムã¨é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を入れ替ãˆã‚‹ã¨ã"/> <button ignore="自動的ã«äº¤æ›" name="Yes" text="OK"/> <button ignore="交æ›ã—ãªã„" name="No" text="ã‚ャンセル"/> </form> </notification> <notification label="å–ã‚Šè¾¼ã¿ä¸ã®è¦å‘Š" name="BusyModePay"> - ç¾åœ¨ã€å–ã‚Šè¾¼ã¿ä¸ã®ãŸã‚ã€ã“ã®æ”¯æ‰•ã„㨠-引ãæ›ãˆã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å—ã‘å–ã‚‹ã“ã¨ãŒ -ã§ãã¾ã›ã‚“。 + ç¾åœ¨ã€ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ãƒ¢ãƒ¼ãƒ‰ã®ãŸã‚ã€æ”¯æ‰•ã„ã¨å¼•ãæ›ãˆã«ã‚¢ã‚¤ãƒ†ãƒ ã‚’å—ã‘å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 -ã“ã®å–引を完了ã™ã‚‹å‰ã«ã€å–ã‚Šè¾¼ã¿ä¸ã®è¨å®šã‚’解除ã—ã¾ã™ã‹ï¼Ÿ +ã“ã®å–引を行ã†ãŸã‚ã«ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ã®è¨å®šã‚’解除ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> - <ignore name="ignore" save_option="true" text="å–ã‚Šè¾¼ã¿ä¸ãƒ¢ãƒ¼ãƒ‰ã®æ™‚ã«æ”¯æ‰•ã‚’ã™ã‚‹"/> - <button ignore="常ã«å–ã‚Šè¾¼ã¿ä¸ã®è¨å®š" name="Yes" text="OK"/> - <button ignore="å–ã‚Šè¾¼ã¿ä¸ã®è¨å®šã«ã—ãªã„" name="No" text="ã‚ャンセル"/> + <ignore name="ignore" save_option="true" text="å–ã‚Šè¾¼ã¿ä¸ãƒ¢ãƒ¼ãƒ‰æ™‚ã«æ”¯æ‰•ã‚’ã™ã‚‹ã¨ã"/> + <button ignore="常ã«ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ã®è¨å®šã‚’解除" name="Yes" text="OK"/> + <button ignore="常ã«ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ã®è¨å®šã‚’継続" name="No" text="ã‚ャンセル"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> 「 [FOLDERNAME] 〠ã¯ã€ã‚·ã‚¹ãƒ†ãƒ フォルダã§ã™ã€‚ システムフォルダを削除ã™ã‚‹ã¨ä¸å®‰å®šã«ãªã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ 続ã‘ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="システムフォルダを削除ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="システムフォルダを削除ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - ã”ã¿ç®±ã®é …目をã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="æŒã¡ç‰©ã®ã”ã¿ç®±ãƒ•ã‚©ãƒ«ãƒ€ã‚’空ã«ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + ã”ã¿ç®±ã®ä¸èº«ã‚’ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="æŒã¡ç‰©ã®ã”ã¿ç®±ãƒ•ã‚©ãƒ«ãƒ€ã‚’空ã«ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="ConfirmClearBrowserCache"> トラベルã€Webã€æ¤œç´¢ã®å±¥æ´ã‚’ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ @@ -1867,16 +1860,16 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="ã¯ã„"/> </notification> <notification name="ConfirmEmptyLostAndFound"> - 紛失物ã®é …目をã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="紛失物フォルダを空ã«ã™ã‚‹å‰ã«ç¢ºèªã™ã‚‹" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + 紛失物ã®ä¸èº«ã‚’ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="紛失物フォルダを空ã«ã™ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="CopySLURL"> 次㮠SLurl ãŒã‚¯ãƒªãƒƒãƒ—ボードã«ã‚³ãƒ”ーã•ã‚Œã¾ã—ãŸï¼š [SLURL] -Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚Webブラウザã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒãƒ¼ã«è²¼ã‚Šä»˜ã‘ã¦è©¦ã—ã¦ã¿ã¦ãã ã•ã„。 +Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚Web ブラウザã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãƒãƒ¼ã«è²¼ã‚Šä»˜ã‘ã¦è©¦ã—ã¦ã¿ã¦ãã ã•ã„。 <form name="form"> - <ignore name="ignore" text="クリップボード㫠SLurl ãŒã‚³ãƒ”ーã•ã‚Œã‚‹"/> + <ignore name="ignore" text="クリップボード㫠SLurl をコピーã™ã‚‹ã¨ã"/> </form> </notification> <notification name="WLSavePresetAlert"> @@ -1884,14 +1877,14 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="WLDeletePresetAlert"> - [SKY] を削除ã—ã¾ã™ã‹ï¼Ÿ + 「 [SKY] ã€ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="WLNoEditDefault"> デフォルトã®è¨å®šã‚’編集ã—ãŸã‚Šå‰Šé™¤ã—ãŸã‚Šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="WLMissingSky"> - ã“ã®ãƒ‡ã‚¤ãƒ»ã‚µã‚¤ã‚¯ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ¬¡ã®å˜åœ¨ã—ãªã„「空ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‚ç…§ã—ã¦ã„ã¾ã™ï¼š [SKY]。 + ã“ã®ãƒ‡ã‚¤ã‚µã‚¤ã‚¯ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ¬¡ã®å˜åœ¨ã—ãªã„「空ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‚ç…§ã—ã¦ã„ã¾ã™ï¼š [SKY]。 </notification> <notification name="PPSaveEffectAlert"> ãƒã‚¹ãƒˆãƒ—ãƒã‚»ã‚¹åŠ¹æžœãŒå˜åœ¨ã—ã¾ã™ã€‚ 上書ãã—ã¾ã™ã‹ï¼Ÿ @@ -1927,7 +1920,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ デフォルトã®è¨å®šã‚’編集ã—ãŸã‚Šå‰Šé™¤ã—ãŸã‚Šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="ChatterBoxSessionStartError"> - [RECIPIENT]ã¨ã®æ–°ã—ã„ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ + [RECIPIENT] ã¨æ–°ã—ã„ãƒãƒ£ãƒƒãƒˆã‚’開始ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1937,21 +1930,21 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ForceCloseChatterBoxSession"> - [NAME]ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚ + [NAME] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚ [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="Cannot_Purchase_an_Attachment"> - オブジェクトãŒå–り付ã‘られã¦ã„ã‚‹ã¨ãã¯è³¼å…¥ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + オブジェクトãŒå–り付ã‘られã¦ã„ã‚‹ã¾ã¾ã§ã¯è³¼å…¥ã§ãã¾ã›ã‚“。 </notification> - <notification label="デビット許å¯ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«ã¤ã„ã¦" name="DebitPermissionDetails"> - ã“ã®è¦æ±‚を許å¯ã™ã‚‹ã¨ã€ã‚¹ã‚¯ãƒªãƒ—トã‹ã‚‰ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ãƒªãƒ³ãƒ‡ãƒ³ãƒ‰ãƒ«ã‚’課金ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ -ã“ã®è¨±å¯ã‚’å–り消ã™ã«ã¯ã€ã‚ªãƒ–ジェクトã®ã‚ªãƒ¼ãƒŠãƒ¼ã¯ã‚ªãƒ–ジェクトを削除ã™ã‚‹ã‹ã€ã‚ªãƒ–ジェクトã®ã‚¹ã‚¯ãƒªãƒ—トをリセットã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 + <notification label="引ã出ã—許å¯ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«ã¤ã„ã¦" name="DebitPermissionDetails"> + ã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’許å¯ã™ã‚‹ã¨ã€ã‚¹ã‚¯ãƒªãƒ—トã§ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‹ã‚‰ãƒªãƒ³ãƒ‡ãƒ³ãƒ‰ãƒ«ã‚’引ã出ã›ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ +ã“ã®è¨±å¯ã‚’å–り消ã™ã«ã¯ã€ã‚ªãƒ–ジェクトã®æ‰€æœ‰è€…ãŒã‚ªãƒ–ジェクトを削除ã™ã‚‹ã‹ã€ã‚ªãƒ–ジェクトã®ã‚¹ã‚¯ãƒªãƒ—トをリセットã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AutoWearNewClothing"> - 作æˆã—よã†ã¨ã—ã¦ã„る衣類を自動的ã«è£…ç€ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="「マイ 容姿ã€ã‚’編集ä¸ã«ã€ä½œæˆã™ã‚‹è¡£é¡žã‚’装ç€ã™ã‚‹" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + 作æˆã™ã‚‹è¡£é¡žã‚’自動的ã«è£…ç€ã—ã¾ã™ã‹ï¼Ÿ + <usetemplate ignoretext="「容姿ã€ã‚’編集ä¸ã«ã€ä½œæˆã™ã‚‹è¡£é¡žã‚’装ç€ã™ã‚‹ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="NotAgeVerified"> 年齢確èªã‚’済ã¾ã›ã¦ã„ãªã„ã¨ã“ã®åŒºç”»ã‚’訪れるã“ã¨ãŒã§ãã¾ã›ã‚“。 [SECOND_LIFE] サイトã§å¹´é½¢ã®ç¢ºèªã‚’è¡Œã„ã¾ã™ã‹ï¼Ÿ @@ -1960,7 +1953,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ <url name="url" option="0"> https://secondlife.com/account/verification.php?lang=ja </url> - <usetemplate ignoretext="å¹´é½¢ã®ç¢ºèªã‚’済ã¾ã›ã¦ã„ã¾ã›ã‚“" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + <usetemplate ignoretext="å¹´é½¢ã®ç¢ºèªã‚’済ã¾ã›ã¦ã„ãªã„ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="Cannot enter parcel: no payment info on file"> æ”¯æ‰•æƒ…å ±ãŒç™»éŒ²ã•ã‚Œã¦ã„ãªã„ã¨ã“ã®ã‚¨ãƒªã‚¢ã‚’訪れるã“ã¨ãŒã§ãã¾ã›ã‚“。 [SECOND_LIFE] サイトã§ç™»éŒ²ã‚’è¡Œã„ã¾ã™ã‹ï¼Ÿ @@ -1969,53 +1962,53 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ <url name="url" option="0"> https://secondlife.com/account/index.php?lang=ja </url> - <usetemplate ignoretext="æ”¯æ‰•æƒ…å ±ãŒç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> + <usetemplate ignoretext="æ”¯æ‰•æƒ…å ±ãŒç™»éŒ²ã•ã‚Œã¦ã„ãªã„ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/> </notification> <notification name="MissingString"> - æ–‡å—列[STRING_NAME]ãŒstrings.xmlã«å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“ + æ–‡å—列 [STRING_NAME] ㌠strings.xml ã«å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“。 </notification> <notification name="SystemMessageTip"> [MESSAGE] </notification> <notification name="Cancelled"> - å–り消ã•ã‚Œã¾ã—㟠+ å–り消ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="CancelledSit"> - 座るã®ã‚’å–り消ã•ã‚Œã¾ã—㟠+ 座るã®ã‚’ã‚„ã‚ã¾ã—ãŸã€‚ </notification> <notification name="CancelledAttach"> - 添付ã¯å–り消ã•ã‚Œã¾ã—㟠+ 添付ãŒå–り消ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="ReplacedMissingWearable"> - æ¬ è½ã—ã¦ã„ã‚‹æœï¼èº«ä½“部ä½ã‚’デフォルトã«ç½®æ›ã—ã¾ã™ã€‚ + æ¬ è½ã—ã¦ã„る衣類や身体部ä½ã‚’デフォルトã«ç½®ãæ›ãˆã¾ã™ã€‚ </notification> <notification name="GroupNotice"> - 件å： [SUBJECT], ﾒｯｾｰｼﾞ： [MESSAGE] + 件å： [SUBJECT]ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ï¼š [MESSAGE] </notification> <notification name="FriendOnline"> - [FIRST] [LAST] ã¯ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ + [FIRST] [LAST] ã¯ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã§ã™ </notification> <notification name="FriendOffline"> - [FIRST] [LAST] ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ + [FIRST] [LAST] ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ </notification> <notification name="AddSelfFriend"> 残念ãªãŒã‚‰è‡ªåˆ†è‡ªèº«ã‚’フレンド登録ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="UploadingAuctionSnapshot"> - インワールドã¨ã‚¦ã‚§ãƒ–・サイトã®ã‚¹ãƒŠãƒƒãƒ—ショットをアップãƒãƒ¼ãƒ‰ä¸ã§ã™... -（所è¦æ™‚間：約5分） + インワールド㨠Web サイトã®ã‚¹ãƒŠãƒƒãƒ—ショットをアップãƒãƒ¼ãƒ‰ä¸ã§ã™... +（所è¦æ™‚間：約 5 分） </notification> <notification name="UploadPayment"> - アップãƒãƒ¼ãƒ‰ã« L$[AMOUNT] 支払ã„ã¾ã—ãŸã€‚ + アップãƒãƒ¼ãƒ‰ã« L$ [AMOUNT] 支払ã„ã¾ã—ãŸã€‚ </notification> <notification name="UploadWebSnapshotDone"> - Webサイトã®ã‚¹ãƒŠãƒƒãƒ—ショットãŒã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸã€‚ + Web サイトã®ã‚¹ãƒŠãƒƒãƒ—ショットãŒã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="UploadSnapshotDone"> インワールドã§ã®ã‚¹ãƒŠãƒƒãƒ—ショットã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒå®Œäº†ã—ã¾ã—ãŸã€‚ </notification> <notification name="TerrainDownloaded"> - raw地形ãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—㟠+ raw 地形ãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—㟠</notification> <notification name="GestureMissing"> ジェスãƒãƒ£ãƒ¼ã® [NAME] ãŒãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 @@ -2027,11 +2020,11 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ データベースã«ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="UnableToLoadLandmark"> - ランドマークをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。 ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + ランドマークをèªã¿è¾¼ã‚ã¾ã›ã‚“。 ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="CapsKeyOn"> CapsLock ã‚ーãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚ -パスワードã«å½±éŸ¿ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 +パスワードã«å½±éŸ¿ã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 </notification> <notification name="NotecardMissing"> ノートカードãŒãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«ã‚ã‚Šã¾ã›ã‚“。 @@ -2040,10 +2033,10 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ ã“ã®ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’見る権é™ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="RezItemNoPermissions"> - オブジェクトをrezã™ã‚‹ã«ã¯ãƒ‘ーミッション（承èªï¼‰ãŒä¸è¶³ã—ã¦ã¾ã™ã€‚ + オブジェクトを Rez ã™ã‚‹ã«ã¯æ¨©é™ãŒä¸è¶³ã—ã¦ã„ã¾ã™ã€‚ </notification> <notification name="UnableToLoadNotecard"> - ç¾åœ¨ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã®è³‡ç”£ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。 + ノートカードをèªã¿è¾¼ã‚ã¾ã›ã‚“。ã‚ã¨ã§å†åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="ScriptMissing"> データベースã«ã‚¹ã‚¯ãƒªãƒ—トãŒã‚ã‚Šã¾ã›ã‚“。 @@ -2055,36 +2048,35 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ スクリプトをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。 ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 </notification> <notification name="IncompleteInventory"> - ã‚ãªãŸã®æä¾›ã™ã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ã“ã®å ´æ‰€ã§ã¯ã¾ã 全部æƒã„ã¾ã›ã‚“。 -å°‘ã—ã—ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 + ã‚ãªãŸã®æä¾›ã™ã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã¯ã€ãƒãƒ¼ã‚«ãƒ«ã§ã¯ã¾ã 全部æƒã£ã¦ã„ã¾ã›ã‚“。 +ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="CannotModifyProtectedCategories"> - ä¿è·ã•ã‚ŒãŸã‚«ãƒ†ã‚´ãƒªãƒ¼ã¯ä¿®æ£ã§ãã¾ã›ã‚“。 + ä¿è·ã•ã‚ŒãŸã‚«ãƒ†ã‚´ãƒªã¯ä¿®æ£ã§ãã¾ã›ã‚“。 </notification> <notification name="CannotRemoveProtectedCategories"> - ä¿è·ã•ã‚ŒãŸã‚«ãƒ†ã‚´ãƒªãƒ¼ã¯å‰Šé™¤ã§ãã¾ã›ã‚“。 + ä¿è·ã•ã‚ŒãŸã‚«ãƒ†ã‚´ãƒªã¯å‰Šé™¤ã§ãã¾ã›ã‚“。 </notification> <notification name="OfferedCard"> - ã‚ãªãŸã¯[FIRST] [LAST] ã« -コーリング・カードをé€ã‚Šã¾ã—ãŸã€‚ + [FIRST] [LAST] ã«ã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’é€ã‚Šã¾ã—ãŸã€‚ </notification> <notification name="UnableToBuyWhileDownloading"> オブジェクトデータã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã¯è³¼å…¥ã§ãã¾ã›ã‚“。 -ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 +ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="UnableToLinkWhileDownloading"> オブジェクトデータã®ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ä¸ã¯ãƒªãƒ³ã‚¯ã§ãã¾ã›ã‚“。 -ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ãã ã•ã„。 +ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="CannotBuyObjectsFromDifferentOwners"> - オブジェクトã¯ä¸€åº¦ã«ã¤ã一人ã®æ‰€æœ‰è€…ã‹ã‚‰è³¼å…¥ã§ãã¾ã™ã€‚ + オブジェクトã¯ä¸€åº¦ã«ä¸€äººã®æ‰€æœ‰è€…ã‹ã‚‰è³¼å…¥ã§ãã¾ã™ã€‚ オブジェクトを 1 ã¤ã ã‘é¸ã‚“ã§ãã ã•ã„。 </notification> <notification name="ObjectNotForSale"> ã“ã®ã‚ªãƒ–ジェクトã¯è²©å£²å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="EnteringGodMode"> - レベル[LEVEL]ã®ã‚´ãƒƒãƒ‰ãƒ»ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚Šã¾ã™ + レベル [LEVEL] ã®ã‚´ãƒƒãƒ‰ãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚Šã¾ã™ </notification> <notification name="LeavingGodMode"> レベル [LEVEL] ã®ã‚´ãƒƒãƒ‰ãƒ¢ãƒ¼ãƒ‰ã‚’解除ã—ã¾ã™ @@ -2093,19 +2085,19 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ ã“れをコピーã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="InventoryAccepted"> - [NAME] ãŒã‚ãªãŸãŒæ¸¡ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’å—ã‘å–ã‚Šã¾ã—ãŸã€‚ + [NAME] ã¯ã€ã‚ãªãŸãŒæ¸¡ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’å—ã‘å–ã‚Šã¾ã—ãŸã€‚ </notification> <notification name="InventoryDeclined"> - [NAME]ã¯ã€æŒã¡ç‰©ã®æ供をæ–ã‚Šã¾ã—ãŸã€‚ + [NAME] ã¯ã€æŒã¡ç‰©ã®æ供をæ–ã‚Šã¾ã—ãŸã€‚ </notification> <notification name="ObjectMessage"> [NAME]： [MESSAGE] </notification> <notification name="CallingCardAccepted"> - コーリング・カードãŒå—ç†ã•ã‚Œã¾ã—ãŸã€‚ + コーリングカードãŒå—ç†ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="CallingCardDeclined"> - コーリング・カードãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ + コーリングカードãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="TeleportToLandmark"> ç”»é¢å³ã®ã€Œå ´æ‰€ã€ãƒ‘ãƒãƒ«ã‚’é–‹ã„ã¦ã€ã€Œãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã€ã‚¿ãƒ–ã‚’é¸ã¶ã¨ã€[NAME] ã¨ã„ã£ãŸå ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã§ãã¾ã™ã€‚ @@ -2125,7 +2117,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ コミュニティスタンダードã«æ˜Žè¨˜ã•ã‚Œã¦ã„るコンテンツ制é™ã«ã‚ˆã‚Šã€ã‚ãªãŸã®æ¤œç´¢èªžã®ä¸€éƒ¨ãŒé™¤å¤–ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="NoContentToSearch"> - å°‘ãªãã¨ã‚‚ã©ã‚Œã‹ä¸€ã¤ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ç¨®é¡žã‚’é¸æŠžã—ã¦æ¤œç´¢ã‚’è¡Œã£ã¦ãã ã•ã„。（一般ã€æŽ§ãˆã‚ã€ã‚¢ãƒ€ãƒ«ãƒˆï¼‰ + å°‘ãªãã¨ã‚‚ã©ã‚Œã‹ä¸€ã¤ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ç¨®é¡žã‚’é¸æŠžã—ã¦æ¤œç´¢ã‚’è¡Œã£ã¦ãã ã•ã„。（Generalã€Moderateã€Adult） </notification> <notification name="GroupVote"> [NAME] ã¯æŠ•ç¥¨ã®ç”³è«‹ã‚’ã—ã¦ã„ã¾ã™ï¼š @@ -2153,10 +2145,10 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ </form> </notification> <notification name="TransferObjectsHighlighted"> - ã“ã®åŒºç”»ä¸Šã«å˜åœ¨ã™ã‚‹ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã“ã®åŒºç”»ã®è³¼å…¥è€…ã«è²æ¸¡ã•ã‚Œã‚‹ã‚ªãƒ–ジェクトãŒã™ã¹ã¦å¼·èª¿è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ + ã“ã®åŒºç”»ã®è³¼å…¥è€…ã«å—ã‘渡ã•ã‚Œã‚‹ã‚ªãƒ–ジェクトã¯ã€ã™ã¹ã¦åŒºç”»ä¸Šã§å¼·èª¿è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã™ã€‚ -*è²æ¸¡ã•ã‚Œã‚‹æ¨¹æœ¨ã‚„æ¤ç‰©ã¯ã€å¼·èª¿è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。 +*å—ã‘渡ã•ã‚Œã‚‹æ¨¹æœ¨ã‚„æ¤ç‰©ã¯ã€å¼·èª¿è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã›ã‚“。 <form name="form"> <button name="Done" text="完了"/> </form> @@ -2178,35 +2170,35 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ プラグインをインストールã—ãªãŠã™ã‹ã€å•é¡ŒãŒè§£æ±ºã—ãªã„å ´åˆã¯ãƒ¡ãƒ¼ã‚«ãƒ¼ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 <form name="form"> - <ignore name="ignore" text="メディアプラグインã®å®Ÿè¡Œã«å¤±æ•—"/> + <ignore name="ignore" text="メディアプラグインã®å®Ÿè¡Œã«å¤±æ•—ã—ãŸã¨ã"/> </form> </notification> <notification name="OwnedObjectsReturned"> - é¸æŠžã—ãŸåœŸåœ°ã®åŒºç”»ä¸Šã«ã‚ã£ãŸã‚ãªãŸã®ã‚ªãƒ–ジェクトã¯ã€ã‚ãªãŸã®æŒã¡ç‰©ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ + é¸æŠžã—ãŸåœŸåœ°ã®åŒºç”»ä¸Šã«ã‚ã£ãŸã‚ãªãŸã®ã‚ªãƒ–ジェクトã¯ã€ã™ã¹ã¦ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="OtherObjectsReturned"> - é¸æŠžã•ã‚Œã¦ã„る土地ã®åŒºç”»ä¸Šã«ã‚ã£ãŸ + é¸æŠžã—ãŸåœŸåœ°ã®åŒºç”»ä¸Šã«ã‚ã£ãŸ [FIRST] [LAST] - ãŒæ‰€æœ‰ã™ã‚‹ã‚ªãƒ–ジェクトã¯ã€ã‚ªãƒ¼ãƒŠãƒ¼ã®æŒã¡ç‰©ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ + ãŒæ‰€æœ‰ã™ã‚‹ã‚ªãƒ–ジェクトã¯ã€ã™ã¹ã¦æ‰€æœ‰è€…ã®ã€ŒæŒã¡ç‰©ã€ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="OtherObjectsReturned2"> - 「[NAME]ã€ã¨ã„ã†åå‰ã®ä½äººãŒæ‰€æœ‰ã™ã‚‹ã€é¸æŠžã—ãŸåŒºç”»ã«ã‚るオブジェクトã¯ã€æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ + 「 [NAME] ã€ã¨ã„ã†åå‰ã®ä½äººãŒæ‰€æœ‰ã™ã‚‹ã€é¸æŠžã—ãŸåŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã¯ã€æœ¬äººã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="GroupObjectsReturned"> - é¸æŠžã•ã‚Œã¦ã„る区画上ã«ã‚ã‚Šã€[GROUPNAME] ã¨ã„ã†ã‚°ãƒ«ãƒ¼ãƒ—ã¨å…±æœ‰ã ã£ãŸã‚ªãƒ–ジェクトã¯ã€ã‚ªãƒ¼ãƒŠãƒ¼ã®æŒã¡ç‰©ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ -è²æ¸¡ã•ã‚Œã¦ã„ãŸè²æ¸¡å¯èƒ½ãªã‚ªãƒ–ジェクトã¯ã€å‰ã®ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ -グループã«è²æ¸¡ã•ã‚Œã¦ã„ãŸè²æ¸¡ä¸å¯èƒ½ãªã‚ªãƒ–ジェクトã¯ã€å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚ + é¸æŠžã—ãŸåŒºç”»ä¸Šã®ã€[GROUPNAME] ã¨ã„ã†ã‚°ãƒ«ãƒ¼ãƒ—ã¨å…±æœ‰ã—ã¦ã„ãŸã‚ªãƒ–ジェクトã¯ã€ãã‚Œãžã‚Œã®æ‰€æœ‰è€…ã®ã€ŒæŒã¡ç‰©ã€ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ +è²æ¸¡ã•ã‚Œã¦ã„ãŸã€Œå†è²©ãƒ»ãƒ—レゼントå¯ã€ã®ã‚ªãƒ–ジェクトã¯ã€ä»¥å‰ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ +グループã«è²æ¸¡ã•ã‚Œã¦ã„ãŸã€Œå†è²©ãƒ»ãƒ—レゼントä¸å¯ã€ã®ã‚ªãƒ–ジェクトã¯ã€å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="UnOwnedObjectsReturned"> - é¸æŠžã•ã‚ŒãŸåœŸåœ°ã®åŒºç”»ä¸Šã«ã‚ã‚Šã€ã‚ãªãŸã®æ‰€æœ‰ã§ã€Œãªã‹ã£ãŸã€ã‚ªãƒ–ジェクトã¯ã€æœ¬æ¥ã®ã‚ªãƒ¼ãƒŠãƒ¼ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ + é¸æŠžã—ãŸåœŸåœ°ã®åŒºç”»ä¸Šã®ã€ã‚ãªãŸã®æ‰€æœ‰ç‰©ã§ã¯ã€Œãªã‹ã£ãŸã€ã‚ªãƒ–ジェクトã¯ã€æœ¬æ¥ã®æ‰€æœ‰è€…ã«è¿”å´ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="ServerObjectMessage"> [NAME] ã‹ã‚‰ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ï¼š -[MSG] +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> ã“ã®åœŸåœ°ã§ã¯ãƒ€ãƒ¡ãƒ¼ã‚¸ãŒæœ‰åŠ¹ã§ã™ã€‚ -ケガをã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æ»ã‚“ã§ã—ã¾ã£ãŸå ´åˆã¯ãƒ›ãƒ¼ãƒ ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚ +ケガをã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æ»ã‚“ã§ã—ã¾ã£ãŸå ´åˆã¯ã€Œãƒ›ãƒ¼ãƒ ã€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚ </notification> <notification name="NoFly"> ã“ã®ã‚¨ãƒªã‚¢ã§ã¯é£›è¡ŒãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -2222,41 +2214,41 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ ã“ã®ã‚¨ãƒªã‚¢ã§ã¯åˆ¶ä½œãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ オブジェクトを制作ã—ãŸã‚Š Rez ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="ScriptsStopped"> - 管ç†è€…ãŒã“ã®åœ°åŸŸå†…ã®ã‚¹ã‚¯ãƒªãƒ—トを一時åœæ¢ã•ã›ã¾ã—ãŸã€‚ + 管ç†è€…ãŒã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã®ã‚¹ã‚¯ãƒªãƒ—トを一時åœæ¢ã—ã¾ã—ãŸã€‚ </notification> <notification name="ScriptsNotRunning"> - ã“ã®åœ°åŸŸã§ã¯ã‚¹ã‚¯ãƒªãƒ—トã®ä½¿ç”¨ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã‚¹ã‚¯ãƒªãƒ—トã®ä½¿ç”¨ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ </notification> <notification name="NoOutsideScripts"> ã“ã®åœŸåœ°ã§ã¯ã€å¤–部ã®ã‚¹ã‚¯ãƒªãƒ—トãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ -土地所有者ã®ã‚‚ã®ä»¥å¤–ã¯ã‚¹ã‚¯ãƒªãƒ—トã¯å®Ÿè¡Œã•ã‚Œã¾ã›ã‚“。 +土地所有者ã®ã‚‚ã®ä»¥å¤–ã¯ã‚¹ã‚¯ãƒªãƒ—トãŒå®Ÿè¡Œã•ã‚Œã¾ã›ã‚“。 </notification> <notification name="ClaimPublicLand"> ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„ãªã„ã¨å…¬å…±ã®åœŸåœ°ã‚’å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </notification> <notification name="RegionTPAccessBlocked"> - ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šãã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢確èªã‚’è¡Œã†ã‹ã€æœ€æ–°ãƒ“ューワをインストールã—ã¦ãã ã•ã„。 + ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢確èªã‚’è¡Œã†ã‹ã€æœ€æ–°ãƒ“ューワをインストールã—ã¦ãã ã•ã„。 ç¾åœ¨ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã§ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãªã‚¨ãƒªã‚¢ã«é–¢ã™ã‚‹è©³ç´°ã¯ãƒŠãƒ¬ãƒƒã‚¸ãƒ™ãƒ¼ã‚¹ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 </notification> <notification name="URBannedFromRegion"> - ã‚ãªãŸã¯åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã¸ã®ç«‹å…¥ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ + ã‚ãªãŸã¯ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã¸ã®ç«‹å…¥ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ </notification> <notification name="NoTeenGridAccess"> ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã¯ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã«æŽ¥ç¶šã§ãã¾ã›ã‚“。 </notification> <notification name="ImproperPaymentStatus"> - ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«å…¥ã‚‹ãŸã‚ã«é©ã—ãŸæ”¯æ‰•ã„ステータスãŒã‚ã‚Šã¾ã›ã‚“。 + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã«é©ã—ãŸæ”¯æ‰•ã„ステータスãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="MustGetAgeRgion"> - ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ã«ã¯å¹´é½¢ç¢ºèªæ¸ˆã¿ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã«ã¯ã€å¹´é½¢ç¢ºèªã‚’済ã¾ã›ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ </notification> <notification name="MustGetAgeParcel"> - ã“ã®åŒºç”»ã«å…¥ã‚‹ã«ã¯å¹´é½¢ç¢ºèªæ¸ˆã¿ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ + ã“ã®åŒºç”»ã«å…¥ã‚‹ãŸã‚ã«ã¯ã€å¹´é½¢ç¢ºèªã‚’済ã¾ã›ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ </notification> <notification name="NoDestRegion"> - 目的地ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ + 目的地ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="NotAllowedInDest"> 目的地ã«å…¥ã‚‹è¨±å¯ãŒã‚ã‚Šã¾ã›ã‚“。 @@ -2274,20 +2266,20 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ テレãƒãƒ¼ãƒˆãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="FullRegionTryAgain"> - å…¥ã‚ã†ã¨ã—ã¦ã„る地域（リージョン）ã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚ + å…¥ã‚ã†ã¨ã—ã¦ã„るリージョンã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚ ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰å†åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="GeneralFailure"> よãã‚る失敗 </notification> <notification name="RoutedWrongRegion"> - ç•°ãªã‚‹åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 + ç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="NoValidAgentID"> - エージェントIDãŒç„¡åŠ¹ã§ã™ã€‚ + エージェント ID ãŒç„¡åŠ¹ã§ã™ã€‚ </notification> <notification name="NoValidSession"> - セッションIDãŒç„¡åŠ¹ã§ã™ã€‚ + セッション ID ãŒç„¡åŠ¹ã§ã™ã€‚ </notification> <notification name="NoValidCircuit"> 回路コードãŒç„¡åŠ¹ã§ã™ã€‚ @@ -2302,7 +2294,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ 内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ </notification> <notification name="NoGoodTPDestination"> - ã“ã®åœ°åŸŸï¼ˆãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼‰ã§ã¯é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã€é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="InternalErrorRegionResolver"> 内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ @@ -2314,7 +2306,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ 有効ãªåŒºç”»ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="ObjectGiveItem"> - [NAME_SLURL] ãŒæ‰€æœ‰ã™ã‚‹ [OBJECTFROMNAME] ã¨ã„ã†åå‰ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã«ã“ã® [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š + [NAME_SLURL] ãŒæ‰€æœ‰ã™ã‚‹ [OBJECTFROMNAME] ã¨ã„ã†åå‰ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã« [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š [ITEM_SLURL] <form name="form"> <button name="Keep" text="å—ã‘å–ã‚‹"/> @@ -2323,7 +2315,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - （ä¸æ˜Žã®ä½äººï¼‰ãŒæ‰€æœ‰ã™ã‚‹ [OBJECTFROMNAME] ã¨ã„ã†åå‰ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã«ã“ã® [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š + （ä¸æ˜Žã®ä½äººï¼‰ãŒæ‰€æœ‰ã™ã‚‹ [OBJECTFROMNAME] ã¨ã„ã†åå‰ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã« [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š [ITEM_SLURL] <form name="form"> <button name="Keep" text="å—ã‘å–ã‚‹"/> @@ -2332,7 +2324,7 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ </form> </notification> <notification name="UserGiveItem"> - [NAME_SLURL] ãŒã‚ãªãŸã«ã“ã® [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š + [NAME_SLURL] ãŒã‚ãªãŸã« [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š [ITEM_SLURL] <form name="form"> <button name="Show" text="表示"/> @@ -2379,35 +2371,40 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ [MESSAGE] -（デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ãƒ»ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚） +（デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚） <form name="form"> <button name="Accept" text="å—ã‘入れる"/> <button name="Decline" text="辞退"/> - <button name="Send IM" text="IMã‚’é€ä¿¡"/> </form> </notification> <notification name="FriendshipOffered"> [TO_NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’申ã—出ã¾ã—ãŸã€‚ </notification> <notification name="OfferFriendshipNoMessage"> - [NAME]ã¯ã€ + [NAME] ã¯ã€ フレンド登録を申ã—込んã§ã„ã¾ã™ã€‚ -（デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ãƒ»ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚） +（デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚） <form name="form"> <button name="Accept" text="å—ã‘入れる"/> <button name="Decline" text="æ‹’å¦"/> </form> </notification> <notification name="FriendshipAccepted"> - [NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ 登録をå—ã‘入れã¾ã—ãŸã€‚ + [NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’å—ã‘入れã¾ã—ãŸã€‚ </notification> <notification name="FriendshipDeclined"> - [NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ 登録をæ–ã‚Šã¾ã—ãŸã€‚ + [NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’æ–ã‚Šã¾ã—ãŸã€‚ + </notification> + <notification name="FriendshipAcceptedByMe"> + フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‰¿èªã•ã‚Œã¾ã—ãŸã€‚ + </notification> + <notification name="FriendshipDeclinedByMe"> + フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] ãŒã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’渡ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -ã‚ãªãŸã®æŒã¡ç‰©ã«ãƒ–ックマークãŒè¿½åŠ ã•ã‚Œã€ã“ã®ä½äººã«ç´ æ—©ã IM ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ +ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ãƒ–ックマークãŒè¿½åŠ ã•ã‚Œã€ã“ã®ä½äººã«ç´ æ—©ã IM ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ <form name="form"> <button name="Accept" text="å—ã‘入れる"/> <button name="Decline" text="辞退"/> @@ -2422,27 +2419,27 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ ã“ã®ã¾ã¾ã“ã“ã«ã„ã‚‹ã¨ãƒã‚°ã‚¢ã‚¦ãƒˆã•ã‚Œã¾ã™ã€‚ </notification> <notification name="LoadWebPage"> - ウェブ・ページ[URL]ã‚’ãƒãƒ¼ãƒ‰ã—ã¾ã™ã‹ï¼Ÿ + Web ページ [URL] ã‚’èªã¿è¾¼ã¿ã¾ã™ã‹ï¼Ÿ [MESSAGE] -ãƒãƒ¼ãƒ‰å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€ã‚ªãƒ¼ãƒŠãƒ¼ï¼š[NAME]？ +èªã¿è¾¼ã¿å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€æ‰€æœ‰è€…：[NAME] <form name="form"> - <button name="Gotopage" text="移動"/> + <button name="Gotopage" text="ページã«ç§»å‹•"/> <button name="Cancel" text="å–り消ã—"/> </form> </notification> <notification name="FailedToFindWearableUnnamed"> - データベースã«[TYPE]ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠+ データベース㫠[TYPE] ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠</notification> <notification name="FailedToFindWearable"> - データベースã«[DESC]ã¨ã„ã†åå‰ã®[TYPE]ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ + データベース㫠[DESC] ã¨ã„ã†åå‰ã® [TYPE] ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="InvalidWearable"> ç€ç”¨ã—よã†ã¨ã—ã¦ã„るアイテムã¯ã‚ãªãŸã®ãƒ“ューワã§ã¯èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。 [APP_NAME] ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’アップグレードã—ã¦ã‹ã‚‰ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ç€ç”¨ã—ã¦ãã ã•ã„。 </notification> <notification name="ScriptQuestion"> - 「[NAME]ã€ãŒæ‰€æœ‰ã™ã‚‹ã‚ªãƒ–ジェクト「[OBJECTNAME]ã€ã‚’： + [NAME] ãŒæ‰€æœ‰ã™ã‚‹ã‚ªãƒ–ジェクト「 [OBJECTNAME] ã€ã‚’： [QUESTIONS] よã‚ã—ã„ã§ã™ã‹ï¼Ÿ @@ -2466,21 +2463,21 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ </form> </notification> <notification name="ScriptDialog"> - [FIRST] [LAST]ã®ã€Œ[TITLE]〠+ [FIRST] [LAST] ã®ã€Œ [TITLE] 〠[MESSAGE] <form name="form"> <button name="Ignore" text="無視ã™ã‚‹"/> </form> </notification> <notification name="ScriptDialogGroup"> - [GROUPNAME]ã®ã€Œ[TITLE]〠+ [GROUPNAME] ã®ã€Œ [TITLE] 〠[MESSAGE] <form name="form"> <button name="Ignore" text="無視ã™ã‚‹"/> </form> </notification> <notification name="ScriptToast"> - [FIRST] [LAST] ã®ã€Œ [TITLE] ã€ã¯ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ãƒ—ットをリクエストã—ã¦ã„ã¾ã™ã€‚ + [FIRST] [LAST] ã®ã€Œ [TITLE] ã€ã¯ã€ä½äººã‚¤ãƒ³ãƒ—ットをリクエストã—ã¦ã„ã¾ã™ã€‚ <form name="form"> <button name="Open" text="ダイアãƒã‚°ã‚’é–‹ã"/> <button name="Ignore" text="無視"/> @@ -2496,9 +2493,9 @@ Webページã«ã“れをリンクã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚ </notification> <notification name="FirstOverrideKeys"> ã‚ãªãŸã®ç§»å‹•ã‚ーをオブジェクトãŒæ“作ã—ã¦ã„ã¾ã™ã€‚ -矢å°ã‹AWSDã®ã‚ーã§å‹•ä½œã‚’確èªã—ã¦ãã ã•ã„。 -銃ãªã©ã®ã‚ªãƒ–ジェクトã ã¨ã€ä¸€äººç§°è¦–点（マウスルック）ã«å¤‰æ›´ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ +矢å°ã‹ AWSD ã®ã‚ーã§å‹•ä½œã‚’確èªã—ã¦ãã ã•ã„。 +銃ãªã©ã®ã‚ªãƒ–ジェクトã ã¨ã€ä¸€äººç§°è¦–点ã«å¤‰æ›´ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ +M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ </notification> <notification name="FirstSandbox"> ã“ã“ã¯ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã‚¨ãƒªã‚¢ã§ã™ã€‚ä½äººãŒåˆ¶ä½œã‚’å¦ã¶ã“ã¨ãŒã§ãã¾ã™ã€‚ @@ -2506,7 +2503,7 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ ã“ã“ã§åˆ¶ä½œã•ã‚ŒãŸã‚‚ã®ã¯æ™‚é–“ãŒçµŒã¤ã¨å‰Šé™¤ã•ã‚Œã¾ã™ã€‚制作ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€Œå–ã‚‹ã€ã‚’é¸ã³ã€æŒã¡ç‰©ã«å…¥ã‚Œã¦ãŠæŒã¡å¸°ã‚Šã™ã‚‹ã®ã‚’ãŠå¿˜ã‚Œãªã。 </notification> <notification name="MaxListSelectMessage"> - ã“ã®ãƒªã‚¹ãƒˆã‹ã‚‰[MAX_SELECT]個ã¾ã§ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã§ãã¾ã™ã€‚ + ã“ã®ãƒªã‚¹ãƒˆã‹ã‚‰ [MAX_SELECT] 個ã¾ã§ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã§ãã¾ã™ã€‚ </notification> <notification name="VoiceInviteP2P"> [NAME] ãŒã‚ãªãŸã‚’ボイスãƒãƒ£ãƒƒãƒˆã‚³ãƒ¼ãƒ«ã«æ‹›å¾…ã—ã¦ã„ã¾ã™ã€‚ @@ -2527,7 +2524,7 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ [FIRST] [LAST] ã¯ã‚¢ã‚¤ãƒ†ãƒ ã‚’å—ã‘å–ã‚Šã€è‡ªå‹•çš„ã«ãƒ–ãƒãƒƒã‚¯ãŒè§£é™¤ã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="VoiceInviteGroup"> - [NAME] 㯠[GROUP]. ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã‚³ãƒ¼ãƒ«ã«å‚åŠ ã—ã¾ã—ãŸã€‚ + [NAME] 㯠[GROUP] ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã‚³ãƒ¼ãƒ«ã«å‚åŠ ã—ã¾ã—ãŸã€‚ å—ã‘入れるをクリックã™ã‚‹ã‹ã€æ–ã‚‹å ´åˆã¯æ‹’å¦ã‚’クリックã—ã¦ãã ã•ã„。 ブãƒãƒƒã‚¯ã‚’クリックã™ã‚‹ã¨ã€ã“ã®ç™ºä¿¡è€…をブãƒãƒƒã‚¯ã—ã¾ã™ã€‚ <form name="form"> <button name="Accept" text="å—ã‘入れる"/> @@ -2554,7 +2551,7 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ </form> </notification> <notification name="VoiceChannelFull"> - ã‚ãªãŸãŒå‚åŠ ã—よã†ã¨ã—ã¦ã„るボイスコール[VOICE_CHANNEL_NAME]ã¯ã€å‚åŠ è€…ãŒæœ€å¤§é™ã«é”ã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 + ã‚ãªãŸãŒå‚åŠ ã—よã†ã¨ã—ã¦ã„るボイスコール [VOICE_CHANNEL_NAME] ã¯ã€å‚åŠ è€…ãŒæœ€å¤§é™ã«é”ã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="ProximalVoiceChannelFull"> ã“ã®ã‚¨ãƒªã‚¢ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã¯ã€æ··é›‘ã®ãŸã‚容é‡ã‚’超ãˆã¦ã—ã¾ã£ã¦ã„ã¾ã™ã€‚申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ä»–ã®ã‚¨ãƒªã‚¢ã§ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã‚’ãŠè©¦ã—ãã ã•ã„。 @@ -2575,7 +2572,7 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ [VOICE_CHANNEL_NAME] ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã‚ã¨ã§å†åº¦ãŠè©¦ã—ãã ã•ã„。 「近ãã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã€ã«å†æŽ¥ç¶šã•ã‚Œã¾ã™ã€‚ </notification> <notification name="VoiceLoginRetry"> - ã‚ãªãŸç”¨ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒ³ãƒãƒ«ã‚’作æˆã—ã¦ã„ã¾ã™ã€‚1分ã»ã©ã‹ã‹ã‚Šã¾ã™ã€‚ + ボイスãƒãƒ£ãƒ³ãƒãƒ«ã‚’作æˆã—ã¦ã„ã¾ã™ã€‚1 分ã»ã©ã‹ã‹ã‚Šã¾ã™ã€‚ </notification> <notification name="Cannot enter parcel: not a group member"> 特定ã®ã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã®ã¿ã“ã®ã‚¨ãƒªã‚¢ã‚’訪å•ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ @@ -2584,16 +2581,16 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ ç«‹å…¥ç¦æ¢ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã€åŒºç”»ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </notification> <notification name="Cannot enter parcel: not on access list"> - アクセス・リストã«å«ã¾ã‚Œã¦ã„ãªã„ãŸã‚ã€åŒºç”»ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 + アクセスリストã«å«ã¾ã‚Œã¦ã„ãªã„ãŸã‚ã€åŒºç”»ã«å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </notification> <notification name="VoiceNotAllowed"> - ã‚ãªãŸã«ã¯[VOICE_CHANNEL_NAME]ã®ãƒœã‚¤ã‚¹ãƒ»ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 + ã‚ãªãŸã«ã¯ [VOICE_CHANNEL_NAME] ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 </notification> <notification name="VoiceCallGenericError"> - [VOICE_CHANNEL_NAME]ã®ãƒœã‚¤ã‚¹ãƒ»ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šä¸ã«ã€ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 + [VOICE_CHANNEL_NAME] ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šä¸ã«ã€ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="ServerVersionChanged"> - ç•°ãªã‚‹ã‚µãƒ¼ãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª] + サーãƒãƒ¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª] </notification> <notification name="UnsupportedCommandSLURL"> クリックã—㟠SLurl ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -2613,7 +2610,7 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ </notification> <notification name="ConfirmCloseAll"> ã™ã¹ã¦ã® IM ã‚’é–‰ã˜ã¾ã™ã‹ï¼Ÿ - <usetemplate name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> + <usetemplate ignoretext="ã™ã¹ã¦ã® IM ã‚’é–‰ã˜ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/> </notification> <notification name="AttachmentSaved"> アタッãƒãƒ¡ãƒ³ãƒˆãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚ @@ -2657,13 +2654,13 @@ Mã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ 510 </global> <global name="UnsupportedGPU"> - - ã‚ãªãŸã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ãƒ»ã‚«ãƒ¼ãƒ‰ã¯å¿…é ˆå‹•ä½œç’°å¢ƒã®æ¡ä»¶ã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 + - ã‚ãªãŸã®ã‚°ãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚«ãƒ¼ãƒ‰ã¯å¿…é ˆå‹•ä½œç’°å¢ƒã®æ¡ä»¶ã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 </global> <global name="UnsupportedRAM"> - - ã‚ãªãŸã®ã‚·ã‚¹ãƒ†ãƒ ・メモリã¯å¿…é ˆå‹•ä½œç’°å¢ƒã®æ¡ä»¶ã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 + - ã‚ãªãŸã®ã‚·ã‚¹ãƒ†ãƒ メモリã¯å¿…é ˆå‹•ä½œç’°å¢ƒã®æ¡ä»¶ã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 </global> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> - 自分ã®åœŸåœ°ã‚’ãŠæŒã¡ã®å ´åˆã€ãƒ›ãƒ¼ãƒ ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã«è¨å®šã§ãã¾ã™ã€‚ -ãŠæŒã¡ã§ãªã„å ´åˆã¯ã€åœ°å›³ã§ã€Œã‚¤ãƒ³ãƒ•ã‚©ãƒãƒ–ã€ã‚’探ã—ã¦ãã ã•ã„。 + 自分ã®åœŸåœ°ã‚’ãŠæŒã¡ã®å ´åˆã€ã€Œãƒ›ãƒ¼ãƒ ã€ã«è¨å®šã§ãã¾ã™ã€‚ +ãŠæŒã¡ã§ãªã„å ´åˆã¯ã€åœ°å›³ã§ã€Œã‚¤ãƒ³ãƒ•ã‚©ãƒãƒ–ã€ã‚’ãŠæŽ¢ã—ãã ã•ã„。 </global> </notifications> diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml index 81a852522b..f12f07f3e9 100644 --- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml @@ -7,6 +7,11 @@ ボイスコントãƒãƒ¼ãƒ«ãƒ‘ãƒãƒ«ã®è¡¨ç¤ºãƒ»éžè¡¨ç¤º </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="話ã™" label_selected="話ã™" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="ジェスãƒãƒ£ãƒ¼" name="Gesture" tool_tip="ジェスãƒãƒ£ãƒ¼ã®è¡¨ç¤ºãƒ»éžè¡¨ç¤º"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..6eca8adfe5 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="ジェスãƒãƒ£ãƒ¼" name="Gesture" tool_tip="ジェスãƒãƒ£ãƒ¼ã®è¡¨ç¤ºãƒ»éžè¡¨ç¤º"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml index 7fc4e6f674..0aa0e8a8a9 100644 --- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml @@ -1,23 +1,54 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_classified_info"> <panel.string name="type_mature"> - 控ãˆã‚ + Moderate </panel.string> <panel.string name="type_pg"> - 一般コンテンツ + 「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ + </panel.string> + <panel.string name="l$_price"> + L$ [PRICE] + </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] テレãƒãƒ¼ãƒˆã€ [MAP] 地図〠[PROFILE] プãƒãƒ•ã‚£ãƒ¼ãƒ« + </panel.string> + <panel.string name="date_fmt"> + [year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + 有効 + </panel.string> + <panel.string name="auto_renew_off"> + 無効 </panel.string> <text name="title" value="ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šæƒ…å ±"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[name]"/> - <text name="classified_location" value="[loading...]"/> - <text name="content_type" value="[content type]"/> - <text name="category" value="[category]"/> - <check_box label="毎週自動更新" name="auto_renew"/> - <text name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼"> - L$ [PRICE] - </text> - <text name="classified_desc" value="[description]"/> + <text_editor name="classified_name" value="[name]"/> + <text name="classified_location_label" value="å ´æ‰€ï¼š"/> + <text_editor name="classified_location" value="[loading...]"/> + <text name="content_type_label" value="内容ã®ç¨®é¡žï¼š"/> + <text_editor name="content_type" value="[content type]"/> + <text name="category_label" value="カテゴリ："/> + <text_editor name="category" value="[category]"/> + <text name="creation_date_label" value="制作日："/> + <text_editor name="creation_date" tool_tip="制作日" value="[date]"/> + <text name="price_for_listing_label" value="æŽ²è¼‰ä¾¡æ ¼ï¼š"/> + <text_editor name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼" value="[price]"/> + <layout_stack name="descr_stack"> + <layout_panel name="clickthrough_layout_panel"> + <text name="click_through_label" value="クリック数："/> + <text_editor name="click_through_text" tool_tip="Click through data" value="[clicks]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="自動更新："/> + <text name="auto_renew" value="有効"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="説明："/> + <text_editor name="classified_desc" value="[description]"/> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml index 4cb5884f28..5e90076a74 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> （掲載後更新） </panel.string> + <string name="publish_label"> + 掲載 + </string> + <string name="save_label"> + ä¿å˜ + </string> <text name="title"> クラシファイド広告ã®ç·¨é›† </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <icon label="" name="edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="クリックã—ã¦ç”»åƒã‚’é¸æŠž"/> + </panel> <text name="Name:"> タイトル： </text> @@ -22,20 +30,19 @@ ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... </text> <button label="ç¾åœ¨åœ°ã«è¨å®š" name="set_to_curr_location_btn"/> - <combo_box name="content_type"> - <combo_item name="mature_ci"> - 控ãˆã‚コンテンツ - </combo_item> - <combo_item name="pg_ci"> - 一般コンテンツ - </combo_item> - </combo_box> + <text name="category_label" value="カテゴリ："/> + <text name="content_type_label" value="内容ã®ç¨®é¡žï¼š"/> + <icons_combo_box label="「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="content_type"> + <icons_combo_box.item label="「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="mature_ci" value="Mature"/> + <icons_combo_box.item label="「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="pg_ci" value="PG"/> + </icons_combo_box> + <text name="price_for_listing_label" value="æŽ²è¼‰ä¾¡æ ¼ï¼š"/> <spinner label="L$" name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼" value="50"/> <check_box label="毎週自動更新" name="auto_renew"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="ä¿å˜" name="save_changes_btn"/> + <button label="[LABEL]" name="save_changes_btn"/> <button label="ã‚ャンセル" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml index d1a2b31934..cd81565acb 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml @@ -42,13 +42,13 @@ <line_editor name="homepage_edit" value="http://"/> <check_box label="検索çµæžœã«è¡¨ç¤º" name="show_in_search_checkbox"/> <text name="title_acc_status_text" value="マイアカウント："/> + <text_editor name="acc_status_text" value="ä½äººã€‚ æ”¯æ‰•æƒ…å ±æœªç™»éŒ²ã€‚"/> <text name="my_account_link" value="[[URL] マイアカウントã«ç§»å‹•]"/> - <text name="acc_status_text" value="ä½äººã€‚ æ”¯æ‰•æƒ…å ±æœªç™»éŒ²ã€‚"/> <text name="title_partner_text" value="マイパートナー："/> - <text name="partner_edit_link" value="[[URL] 編集]" width="100"/> <panel name="partner_data_panel"> - <name_box name="partner_text" value="[FIRST] [LAST]"/> + <name_box initial_value="（å–å¾—ä¸ï¼‰" name="partner_text" value="[FIRST] [LAST]"/> </panel> + <text name="partner_edit_link" value="[[URL] 編集]" width="100"/> </panel> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/ja/panel_friends.xml b/indra/newview/skins/default/xui/ja/panel_friends.xml index 97e58ceaed..0c7114dbb7 100644 --- a/indra/newview/skins/default/xui/ja/panel_friends.xml +++ b/indra/newview/skins/default/xui/ja/panel_friends.xml @@ -3,8 +3,8 @@ <string name="Multiple"> 複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ </string> - <scroll_list name="friend_list" tool_tip="複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’é¸æŠžã™ã‚‹ã«ã¯ã€Shiftã‚ーã¾ãŸã¯Ctrlã‚ーを押ã—ãªãŒã‚‰åå‰ã‚’クリックã—ã¾ã™ã€‚"> - <column name="icon_online_status" tool_tip="オンライン状æ³"/> + <scroll_list name="friend_list" tool_tip="複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’é¸æŠžã™ã‚‹ã«ã¯ã€Shift ã‚ーã¾ãŸã¯ Ctrl ã‚ーを押ã—ãªãŒã‚‰åå‰ã‚’クリックã—ã¾ã™ã€‚"> + <column name="icon_online_status" tool_tip="オンライン状態"/> <column label="åå‰" name="friend_name" tool_tip="åå‰"/> <column name="icon_visible_online" tool_tip="フレンドã¯ã€ã‚ãªãŸãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã‹ã©ã†ã‹ç¢ºèªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"/> <column name="icon_visible_map" tool_tip="フレンドã¯ã€åœ°å›³ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"/> @@ -15,7 +15,7 @@ <text name="friend_name_label" right="-10"> フレンドをé¸æŠžã—ã¦æ¨©åˆ©ã‚’変更... </text> - <check_box label="オンライン状æ³ã®ç¢ºèªã‚’許å¯ã™ã‚‹" name="online_status_cb" tool_tip="コーリングカードã‚ã‚‹ã„ã¯ãƒ•ãƒ¬ãƒ³ãƒ‰ãƒªã‚¹ãƒˆã§ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ³ã‚’確èªã§ãるよã†è¨å®šã—ã¾ã™"/> + <check_box label="オンライン状態ã®ç¢ºèªã‚’許å¯ã™ã‚‹" name="online_status_cb" tool_tip="コーリングカードã‚ã‚‹ã„ã¯ãƒ•ãƒ¬ãƒ³ãƒ‰ãƒªã‚¹ãƒˆã§ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’確èªã§ãるよã†è¨å®šã—ã¾ã™"/> <check_box label="世界地図上ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’æ¤œç´¢å¯èƒ½ã«ã™ã‚‹" name="map_status_cb" tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒåœ°å›³ã§ç§ã®ä½ç½®ã‚’発見ã§ãるよã†ã«è¨å®šã—ã¾ã™"/> <check_box label="オブジェクトã®ä¿®æ£ã‚’許å¯ã™ã‚‹" name="modify_status_cb" tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ç§ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’æ”¹é€ ã™ã‚‹è¨±å¯ã‚’与ãˆã¾ã™"/> <text name="process_rights_label"> @@ -23,7 +23,7 @@ </text> </panel> <pad left="-95"/> - <button label="IM・コール" name="im_btn" tool_tip="インスタントメッセージ・セッションを開ãã¾ã™ã€‚" width="90"/> + <button label="IM・コール" name="im_btn" tool_tip="インスタントメッセージセッションを開ãã¾ã™ã€‚" width="90"/> <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="profile_btn" tool_tip="写真ã€ã‚°ãƒ«ãƒ¼ãƒ—ã€ãŠã‚ˆã³ãã®ä»–ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚" width="90"/> <button label="テレãƒãƒ¼ãƒˆ" name="offer_teleport_btn" tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã€ã‚ãªãŸã®ç¾åœ¨åœ°ã¸ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’申ã—出ã¾ã™ã€‚" width="90"/> <button label="支払ã†" name="pay_btn" tool_tip="リンデンドル (L$) ã‚’ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã‚ã’ã¾ã™ã€‚" width="90"/> diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index 247294c158..1b89b1b3cc 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml @@ -11,27 +11,45 @@ <panel.string name="incomplete_member_data_str"> メンãƒãƒ¼ã®ãƒ‡ãƒ¼ã‚¿ã‚’検索 </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> + <text name="prepend_founded_by"> + 創è¨è€…： + </text> + <name_box initial_value="（å–å¾—ä¸ï¼‰" name="founder_name"/> + <text name="join_cost_text"> + ç„¡æ–™ + </text> + <button label="å‚åŠ ã—ã¾ã™ï¼" name="btn_join"/> + </panel> <text_editor name="charter"> グループã®ç†å¿µã€æŒ‡é‡ã‚’記入ã—ã¦ãã ã•ã„ </text_editor> <name_list name="visible_members"> <name_list.columns label="メンãƒãƒ¼" name="name"/> <name_list.columns label="タイトル" name="title"/> + <name_list.columns label="ãƒã‚°ã‚¤ãƒ³" name="status"/> </name_list> + <text name="my_group_settngs_label"> + 個人ã®è¨å®š + </text> <text name="active_title_label"> - ç§ã®ã‚¿ã‚¤ãƒˆãƒ« + ç§ã®ã‚¿ã‚¤ãƒˆãƒ«ï¼š </text> <combo_box name="active_title" tool_tip="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—をアクティブã«ã—ãŸã¨ãã«ã€ã‚¢ãƒã‚¿ãƒ¼åã®ä¸Šã«è¡¨ç¤ºã•ã‚Œã‚‹ã‚¿ã‚¤ãƒˆãƒ«ã‚’è¨å®šã—ã¾ã™ã€‚"/> <check_box label="グループ通知をå—ä¿¡" name="receive_notices" tool_tip="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã®é€šçŸ¥ã‚’å—ä¿¡ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã‚’è¡Œã„ã¾ã™ã€‚ グループã‹ã‚‰ã‚¹ãƒ‘ムãŒé€ã‚‰ã‚Œã¦ãã‚‹å ´åˆã¯ã“ã®ãƒœãƒƒã‚¯ã‚¹ã®ãƒã‚§ãƒƒã‚¯ã‚’外ã—ã¦ãã ã•ã„。"/> <check_box label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã«è¡¨ç¤º" name="list_groups_in_profile" tool_tip="ã‚ãªãŸã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã‚’è¡Œã„ã¾ã™ã€‚"/> <panel name="preferences_container"> - <check_box label="会員募集" name="open_enrollement" tool_tip="招待ã•ã‚Œãªãã¦ã‚‚æ–°è¦ãƒ¡ãƒ³ãƒãƒ¼ãŒåŠ å…¥ã§ãã‚‹ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™ã€‚"/> - <check_box label="入会費" name="check_enrollment_fee" tool_tip="入会費ãŒå¿…è¦ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™ã€‚"/> + <text name="group_settngs_label"> + グループã®è¨å®š + </text> + <check_box label="誰ã§ã‚‚入会ã§ãã¾ã™" name="open_enrollement" tool_tip="招待ã•ã‚Œãªãã¦ã‚‚æ–°è¦ãƒ¡ãƒ³ãƒãƒ¼ãŒåŠ å…¥ã§ãã‚‹ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™ã€‚"/> + <check_box label="入会費ãŒã‹ã‹ã‚Šã¾ã™" name="check_enrollment_fee" tool_tip="入会費ãŒå¿…è¦ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™ã€‚"/> <spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費ã€ã«ãƒã‚§ãƒƒã‚¯ãŒå…¥ã£ã¦ã„ã‚‹å ´åˆã€æ–°è¦ãƒ¡ãƒ³ãƒãƒ¼ã¯æŒ‡å®šã•ã‚ŒãŸå…¥ä¼šè²»ã‚’支払ã‚ãªã‘ã‚Œã°ã‚°ãƒ«ãƒ¼ãƒ—ã«å…¥ã‚Œã¾ã›ã‚“。"/> - <check_box initial_value="true" label="検索ã«è¡¨ç¤º" name="show_in_group_list" tool_tip="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を検索çµæžœã«è¡¨ç¤ºã•ã›ã¾ã™"/> - <combo_box name="group_mature_check" tool_tip="ã‚ãªãŸã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã€ŒæŽ§ãˆã‚ã€ã«ãƒ¬ãƒ¼ãƒˆè¨å®šã•ã‚ŒãŸæƒ…å ±ãŒã‚ã‚‹ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™"> - <combo_box.item label="一般コンテンツ" name="pg"/> - <combo_box.item label="控ãˆã‚コンテンツ" name="mature"/> + <combo_box name="group_mature_check" tool_tip="ã‚ãªãŸã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã€ŒModerateã€ã«ãƒ¬ãƒ¼ãƒˆè¨å®šã•ã‚ŒãŸæƒ…å ±ãŒã‚ã‚‹ã‹ã©ã†ã‹ã‚’è¨å®šã—ã¾ã™"> + <combo_box.item label="「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="pg"/> + <combo_box.item label="「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„" name="mature"/> </combo_box> + <check_box initial_value="true" label="検索ã«è¡¨ç¤º" name="show_in_group_list" tool_tip="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—を検索çµæžœã«è¡¨ç¤ºã•ã›ã¾ã™"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index 252220b64d..4166108472 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - ç¾åœ¨ã®ã‚¿ãƒ–ã«ã¯ã€ä¿å˜ã•ã‚Œã¦ã„ãªã„変更ãŒã‚ã‚Šã¾ã™ã€‚ + ä¿å˜ã—ã¦ã„ãªã„変更ãŒã‚ã‚Šã¾ã™ </panel.string> <panel.string name="want_apply_text"> 変更をä¿å˜ã—ã¾ã™ã‹ï¼Ÿ @@ -12,27 +12,24 @@ <panel.string name="group_join_free"> ç„¡æ–™ </panel.string> - <text name="group_name" value="（ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...）"/> - <line_editor label="æ–°ã—ã„グループã®åå‰ã‚’入力" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/> - <text name="prepend_founded_by"> - 創始者： - </text> - <name_box initial_value="（å–å¾—ä¸ï¼‰" name="founder_name"/> - <text name="join_cost_text"> - ç„¡æ–™ - </text> - <button label="å‚åŠ ã—ã¾ã™ï¼" name="btn_join"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="一般"/> - <accordion_tab name="group_roles_tab" title="役割"/> - <accordion_tab name="group_notices_tab" title="通知"/> - <accordion_tab name="group_land_tab" title="土地・資産"/> - </accordion> - <panel name="button_row"> - <button label="作æˆ" label_selected="æ–°ã—ã„グループ" name="btn_create"/> - <button label="グループãƒãƒ£ãƒƒãƒˆ" name="btn_chat" width="100"/> - <button label="グループコール" name="btn_call"/> - <button label="ä¿å˜" label_selected="ä¿å˜" name="btn_apply"/> + <panel name="group_info_top"> + <text name="group_name" value="（ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...）"/> + <line_editor label="æ–°ã—ã„グループã®åå‰ã‚’入力ã—ã¦ãã ã•ã„" name="group_name_editor"/> </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="一般"/> + <accordion_tab name="group_roles_tab" title="役割"/> + <accordion_tab name="group_notices_tab" title="通知"/> + <accordion_tab name="group_land_tab" title="土地・資産"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="ãƒãƒ£ãƒƒãƒˆ" name="btn_chat"/> + <button label="グループコール" name="btn_call" tool_tip="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚³ãƒ¼ãƒ«ã™ã‚‹"/> + <button label="ä¿å˜" label_selected="ä¿å˜" name="btn_apply"/> + <button label="グループを作æˆ" name="btn_create" tool_tip="æ–°ã—ã„グループを作æˆ"/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml index 0f014bcd2f..c0449f1221 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml @@ -1,65 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="土地ã¨L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> 「土地利用ã®åˆè¨ˆã€ãŒã€Œå¯„付ç·é¡ã€ä»¥ä¸‹ã€ã¾ãŸã¯åŒã˜ã«ãªã‚‹ã¾ã§è¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> グループ所有地を確èªã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> グループã®ä¼šè¨ˆæƒ…å ±ã‚’ç¢ºèªã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。 - </string> - <string name="loading_txt"> + </panel.string> + <panel.string name="loading_txt"> ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž - </string> - <text name="group_land_heading"> - グループã®ä¿æœ‰åœ° - </text> - <scroll_list name="group_parcel_list"> - <column label="区画" name="name"/> - <column label="地域" name="location"/> - <column label="種類" name="type"/> - <column label="é¢ç©" name="area"/> - <column label="" name="hidden"/> - </scroll_list> - <button label="地図" label_selected="地図" name="map_button" width="60"/> - <text name="total_contributed_land_label"> - 寄付åˆè¨ˆï¼š - </text> - <text name="total_contributed_land_value" width="150"> - [AREA] 平方メートル - </text> - <text name="total_land_in_use_label"> - 土地利用ã®åˆè¨ˆï¼š - </text> - <text name="total_land_in_use_value" width="150"> - [AREA] 平方メートル - </text> - <text name="land_available_label"> - 利用å¯èƒ½ã®åœŸåœ°ï¼š - </text> - <text name="land_available_value" width="150"> - [AREA] 平方メートル - </text> - <text name="your_contribution_label"> - ã‚ãªãŸã®è²¢çŒ®ï¼š - </text> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> 土地ã®è²¢çŒ®ã‚’è¨å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ - </string> - <text name="your_contribution_units" width="80"> - 平方メートル - </text> - <text name="your_contribution_max_value" width="100"> - （最大 [AMOUNT]） - </text> - <text name="group_over_limit_text"> - 土地を使用ã™ã‚‹ã«ã¯ã€åœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆãŒã‚‚ã£ã¨å¿…è¦ã§ã™ - </text> - <text name="group_money_heading"> - グループL$ - </text> + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="区画" name="name"/> + <scroll_list.columns label="地域" name="location"/> + <scroll_list.columns label="種類" name="type"/> + <scroll_list.columns label="é¢ç©" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + 寄付åˆè¨ˆï¼š + </text> + <text name="total_contributed_land_value"> + [AREA] 平方メートル + </text> + <button label="地図" label_selected="地図" name="map_button"/> + <text name="total_land_in_use_label"> + 土地利用ã®åˆè¨ˆï¼š + </text> + <text name="total_land_in_use_value"> + [AREA] 平方メートル + </text> + <text name="land_available_label"> + 利用å¯èƒ½ã®åœŸåœ°ï¼š + </text> + <text name="land_available_value"> + [AREA] 平方メートル + </text> + <text name="your_contribution_label"> + ã‚ãªãŸã®è²¢çŒ®ï¼š + </text> + <text name="your_contribution_units"> + 平方メートル + </text> + <text name="your_contribution_max_value"> + （最大 [AMOUNT]） + </text> + <text name="group_over_limit_text"> + 土地利用をサãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã®åœŸåœ°ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆãŒè¶³ã‚Šã¾ã›ã‚“ + </text> + <text name="group_money_heading"> + グループ㮠L$ + </text> + </panel> <tab_container name="group_money_tab_container"> <panel label="計画" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml index e33d3d854e..a0c50c6122 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml @@ -39,7 +39,7 @@ <text name="string"> ã“ã“ã«ã‚¢ã‚¤ãƒ†ãƒ をドラッグ＆ドãƒãƒƒãƒ—ã—ã¦æ·»ä»˜ã—ã¦ãã ã•ã„： </text> - <button label="å–り外ã™" label_selected="添付物を削除" name="remove_attachment"/> + <button label="å–り外ã™" label_selected="添付物を削除" name="remove_attachment" tool_tip="ã‚ãªãŸã®é€šçŸ¥ã‹ã‚‰æ·»ä»˜ã•ã‚ŒãŸã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™"/> <button label="é€ä¿¡" label_selected="é€ä¿¡" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="æŒã¡ç‰©ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ã“ã®ãƒœãƒƒã‚¯ã‚¹ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€é€šçŸ¥ã¨ä¸€ç·’ã«é€ã‚Šã¾ã™ã€‚ 添付ã™ã‚‹ã«ã¯ã€ãã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã‚³ãƒ”ーã¨å†è²©ãƒ»ãƒ—レゼントã®æ¨©é™ãŒã‚ãªãŸã«ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml index 1f2d28ca4f..db6fe268c7 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="メンãƒãƒ¼ã¨å½¹å‰²" name="roles_tab"> <panel.string name="default_needs_apply_text"> - ç¾åœ¨ã®ã‚¿ãƒ–ã«ã¯ã€ä¿å˜ã•ã‚Œã¦ã„ãªã„変更ãŒã‚ã‚Šã¾ã™ã€‚ + ä¿å˜ã—ã¦ã„ãªã„変更ãŒã‚ã‚Šã¾ã™ </panel.string> <panel.string name="want_apply_text"> 変更をä¿å˜ã—ã¾ã™ã‹ï¼Ÿ diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml index bfadcb13d3..f2429ac12a 100644 --- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml @@ -9,11 +9,14 @@ <button label="フレンド登録" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn"/> + <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> diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml index 151fbf33f2..993c52b561 100644 --- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="ãŠæ°—ã«å…¥ã‚Šãƒãƒ¼"/> - <accordion_tab name="tab_landmarks" title="ランドマーク"/> + <accordion_tab name="tab_landmarks" title="マイ ランドマーク"/> <accordion_tab name="tab_inventory" title="æŒã¡ç‰©"/> <accordion_tab name="tab_library" title="ライブラリ"/> </accordion> diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml index 1d18a86b53..c217af38ba 100644 --- a/indra/newview/skins/default/xui/ja/panel_login.xml +++ b/indra/newview/skins/default/xui/ja/panel_login.xml @@ -19,7 +19,7 @@ <text name="password_text"> パスワード： </text> - <check_box label="記憶ã™ã‚‹" name="remember_check"/> + <check_box label="パスワードを記憶" name="remember_check"/> <text name="start_location_text"> 開始地点： </text> @@ -28,7 +28,7 @@ <combo_box.item label="ホーム" name="MyHome"/> <combo_box.item label="＜地域åを入力＞" name="Typeregionname"/> </combo_box> - <button label="ãƒã‚°ã‚¤ãƒ³" name="connect_btn" left_pad="30" width="60"/> + <button label="ãƒã‚°ã‚¤ãƒ³" left_pad="30" name="connect_btn" width="60"/> </layout_panel> <layout_panel name="links"> <text name="create_new_account_text"> diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index fe51d8507d..dda5bc0009 100644 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="panel_me"> <tab_container name="tabs"> - <panel label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="panel_profile"/> - <panel label="ピック" name="panel_picks"/> + <panel label="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="panel_profile"/> + <panel label="マイ ピック" name="panel_picks"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml index eba26bbe3d..6321dbb048 100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml @@ -15,14 +15,14 @@ </text> <text name="current_url" tool_tip="メディアソースã®ç¾åœ¨ã®ãƒšãƒ¼ã‚¸" value=""/> <button label="リセット" name="current_url_reset_btn"/> - <check_box initial_value="false" label="自動ループ" name="auto_loop"/> - <check_box initial_value="false" label="最åˆã®ã‚¯ãƒªãƒƒã‚¯" name="first_click_interact"/> + <check_box initial_value="false" label="ループå†ç”Ÿ" name="auto_loop"/> + <check_box initial_value="false" label="最åˆã«ã‚¯ãƒªãƒƒã‚¯ã—ãŸã¨ãã®å‹•ä½œ" name="first_click_interact"/> <check_box initial_value="false" label="自動ズーム" name="auto_zoom"/> <check_box initial_value="false" label="自動メディアå†ç”Ÿ" name="auto_play"/> <text name="media_setting_note"> 注æ„： ä½äººã¯ã“ã®è¨å®šã‚’無視ã§ãã¾ã™ </text> - <check_box initial_value="false" label="オブジェクトã®è¡¨é¢ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®è‡ªå‹•ã‚¹ã‚±ãƒ¼ãƒ«" name="auto_scale"/> + <check_box initial_value="false" label="オブジェクトã®è¡¨é¢ã‚µã‚¤ã‚ºã«åˆã‚ã›ã¦è‡ªå‹•èª¿æ•´" name="auto_scale"/> <text name="size_label"> サイズ： </text> diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml index 6accbd4852..ea4fdb9ce5 100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ã‚»ã‚ュリティ" name="Media Settings Security"> - <check_box initial_value="false" label="指定ã—ãŸURLパターンã®ã¿ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹" name="whitelist_enable"/> + <check_box initial_value="false" label="指定ã—㟠URL パターンã‹ã‚‰å§‹ã¾ã‚‹æŽ¥ç¶šã‚’許å¯ã™ã‚‹" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - ホームページã«å¤±æ•—ã—ãŸã‚¨ãƒ³ãƒˆãƒªãƒ¼ãŒãƒžãƒ¼ã‚¯ã•ã‚Œã¾ã—ãŸï¼š + ホームページã«å¤±æ•—ã—ãŸã‚¨ãƒ³ãƒˆãƒªãƒ¼ãŒã‚ã‚Šã¾ã—ãŸï¼š </text> <button label="è¿½åŠ " name="whitelist_add"/> <button label="削除" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - è¦å‘Šï¼š 「一般ã€ã‚¿ãƒ–ã§æŒ‡å®šã•ã‚ŒãŸãƒ›ãƒ¼ãƒ ページã¯ã€ã“ã®ãƒ›ãƒ¯ã‚¤ãƒˆãƒªã‚¹ãƒˆã‚’パスã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ 有効ãªã‚¨ãƒ³ãƒˆãƒªãƒ¼ãŒè¿½åŠ ã•ã‚Œã‚‹ã¾ã§ã¯ã€ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚ + è¦å‘Šï¼š 「一般ã€ã‚¿ãƒ–ã§æŒ‡å®šã•ã‚ŒãŸãƒ›ãƒ¼ãƒ ページã¯ã€ãƒ›ãƒ¯ã‚¤ãƒˆãƒªã‚¹ãƒˆã«æŽ²è¼‰ã•ã‚Œã¦ã„ã¾ã›ã‚“。 æ£ã—ã„機能ãŒè¨å®šã•ã‚Œã‚‹ã¾ã§ã€ã“ã®æ©Ÿèƒ½ã¯ä¸€æ™‚åœæ¢ã—ã¾ã™ã€‚ </text> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_my_profile.xml b/indra/newview/skins/default/xui/ja/panel_my_profile.xml index e74a726d11..17461ef771 100644 --- a/indra/newview/skins/default/xui/ja/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_my_profile.xml @@ -30,11 +30,14 @@ </panel> <text name="title_member_text" value="メンãƒãƒ¼ç™»éŒ²ï¼š"/> <text name="title_acc_status_text" value="アカウントã®çŠ¶æ…‹ï¼š"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> ä½äººã€‚ æ”¯æ‰•æƒ…å ±æœªç™»éŒ²ã€‚ リンデン。 - </text> + </text_editor> <text name="title_partner_text" value="パートナー："/> + <panel name="partner_data_panel"> + <name_box initial_value="（å–å¾—ä¸ï¼‰" name="partner_text"/> + </panel> <text name="title_groups_text" value="グループ："/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml index b271e86852..0426c4fe9a 100644 --- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="navigation_bar"> <panel name="navigation_panel"> - <button name="back_btn" tool_tip="å‰ã®å ´æ‰€ã¸æˆ»ã‚Šã¾ã™"/> - <button name="forward_btn" tool_tip="次ã®å ´æ‰€ã¸é€²ã¿ã¾ã™"/> + <pull_button name="back_btn" tool_tip="å‰ã®å ´æ‰€ã¸æˆ»ã‚Šã¾ã™"/> + <pull_button name="forward_btn" tool_tip="次ã®å ´æ‰€ã¸é€²ã¿ã¾ã™"/> <button name="home_btn" tool_tip="「ホームã€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ"/> <location_input label="å ´æ‰€" name="location_combo"/> <search_combo_box label="検索" name="search_combo_box" tool_tip="検索"> <combo_editor label="[SECOND_LIFE] を検索：" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite"> + <favorites_bar name="favorite" tool_tip="ランドマークをã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€Second Lifeã®ãŠæ°—ã«å…¥ã‚Šã®å ´æ‰€ã«ç´ æ—©ãアクセスï¼"> + <label name="favorites_bar_label" tool_tip="ランドマークをã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€Second Lifeã®ãŠæ°—ã«å…¥ã‚Šã®å ´æ‰€ã«ç´ æ—©ãアクセスï¼"> + ãŠæ°—ã«å…¥ã‚Šãƒãƒ¼ + </label> <chevron_button name=">>" tool_tip="ãŠæ°—ã«å…¥ã‚Šã‚’ã‚‚ã£ã¨è¡¨ç¤º"/> </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml index 3dbabc62be..5998206f27 100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <string name="min_width"> - 192 - </string> - <string name="max_width"> - 320 - </string> <line_editor label="ã“ã“をクリックã—ã¦ãƒãƒ£ãƒƒãƒˆã‚’開始ã—ã¾ã™ã€‚" name="chat_box" tool_tip="Enter ã‚ーを押ã—ã¦ç™ºè¨€ã—ã€Ctrl + Enter ã‚ーã§å«ã³ã¾ã™ã€‚"/> <button name="show_nearby_chat" tool_tip="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆãƒã‚°ã‚’表示・éžè¡¨ç¤º"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml new file mode 100644 index 0000000000..a670975dda --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <空> + </string> + <string name="parcel_media_name"> + 区画ストリーミングメディア + </string> + <string name="parcel_audio_name"> + 区画ストリーミングオーディオ + </string> + <string name="playing_suffix"> + （å†ç”Ÿä¸ï¼‰ + </string> + <panel name="minimized_controls"> + <button label="ã™ã¹ã¦åœæ¢" name="all_nearby_media_disable_btn" tool_tip="è¿‘ãã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ã™ã¹ã¦ã‚ªãƒ•ã«ã—ã¾ã™"/> + <button label="ã™ã¹ã¦é–‹å§‹" name="all_nearby_media_enable_btn" tool_tip="è¿‘ãã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ã™ã¹ã¦ã‚ªãƒ³ã«ã—ã¾ã™"/> + <button name="open_prefs_btn" tool_tip="メディアã®è¨å®šã‚’é–‹ãã¾ã™"/> + <button label="詳細 >>" label_selected="簡易 <<" name="more_less_btn" tool_tip="アドãƒãƒ³ã‚¹ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="ã™ã¹ã¦" name="All"/> + <combo_box.item label="ã“ã®åŒºç”»å†…" name="WithinParcel"/> + <combo_box.item label="ã“ã®åŒºç”»å¤–" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="近接" name="media_proximity"/> + <scroll_list.columns label="表示" name="media_visibility"/> + <scroll_list.columns label="クラス" name="media_class"/> + <scroll_list.columns label="åå‰" name="media_name"/> + <scroll_list.columns label="デãƒãƒƒã‚°" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’åœæ¢"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å†ç”Ÿ"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’一時åœæ¢"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã®éŸ³é‡"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã®éŸ³ã‚’ミュート"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã«è¿‘ã¥ã"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‹ã‚‰é ã–ã‹ã‚‹"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_notes.xml b/indra/newview/skins/default/xui/ja/panel_notes.xml index 6023bf125f..cbeb5a7f97 100644 --- a/indra/newview/skins/default/xui/ja/panel_notes.xml +++ b/indra/newview/skins/default/xui/ja/panel_notes.xml @@ -6,7 +6,7 @@ <panel name="profile_scroll_panel"> <text name="status_message" value="個人的メモ："/> <text name="status_message2" value="ã“ã®äººã«è¨±å¯ï¼š"/> - <check_box label="オンライン状æ³ã®ç¢ºèª" name="status_check"/> + <check_box label="オンライン状態ã®ç¢ºèª" name="status_check"/> <check_box label="地図ã§å±…å ´æ‰€ã‚’ç¢ºèª" name="map_check"/> <check_box label="ç§ã®ã‚ªãƒ–ジェクトã®ç·¨é›†ãƒ»å‰Šé™¤ãƒ»å–å¾—" name="objects_check"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_online_status.xml b/indra/newview/skins/default/xui/ja/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml index 7681ee461f..b941763388 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml @@ -2,7 +2,7 @@ <panel label="ã‚‚ã®" name="Outfits"> <tab_container name="appearance_tabs"> <inventory_panel label="マイ アウトフィット" name="outfitslist_tab"/> - <inventory_panel label="ç€ç”¨ä¸" name="cof_accordionpanel"/> + <inventory_panel label="ç€ç”¨ä¸" name="cof_tab"/> </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示ã—ã¾ã™"/> diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index 0c3690a10c..488a8c7a9b 100644 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml @@ -5,9 +5,10 @@ <string name="no_one_near" value="è¿‘ãã«èª°ã‚‚ã„ã¾ã›ã‚“"/> <string name="no_friends_online" value="オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã¯ã„ã¾ã›ã‚“"/> <string name="no_friends" value="フレンドã¯ã„ã¾ã›ã‚“"/> - <string name="no_groups" value="グループã¯ã‚ã‚Šã¾ã›ã‚“"/> <string name="people_filter_label" value="人をフィルター"/> <string name="groups_filter_label" value="グループをフィルター"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups 検索ã§ã‚°ãƒ«ãƒ¼ãƒ—を探ã—ã¦ã¿ã¾ã™ã‹ï¼Ÿ]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups 入会ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—を探ã—ã¾ã™ã€‚]"/> <filter_editor label="フィルター" name="filter_input"/> <tab_container name="tabs"> <panel label="è¿‘ã" name="nearby_panel"> @@ -16,7 +17,7 @@ <button name="add_friend_btn" tool_tip="é¸æŠžã—ãŸä½äººã‚’フレンドリストã«ç™»éŒ²"/> </panel> </panel> - <panel label="フレンド" name="friends_panel"> + <panel label="マイ フレンド" name="friends_panel"> <accordion name="friends_accordion"> <accordion_tab name="tab_online" title="オンライン"/> <accordion_tab name="tab_all" title="全員"/> @@ -26,8 +27,12 @@ <button name="add_btn" tool_tip="フレンド登録を申ã—出ã¾ã™"/> <button name="del_btn" tool_tip="é¸æŠžã—ãŸäººã‚’フレンドリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™"/> </panel> + <text name="no_friends_msg"> + フレンドを登録ã™ã‚‹ã«ã¯ã€[secondlife:///app/search/people ã‚°ãƒãƒ¼ãƒãƒ«æ¤œç´¢] ã‚’ã™ã‚‹ã‹ã€ä½äººã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。 +誰ã‹ä¸€ç·’ã«è¡Œå‹•ã‚’ã™ã‚‹äººã‚’ãŠæŽ¢ã—ã®æ™‚ã¯ã€[secondlife:///app/worldmap 地図をãŠè©¦ã—ã ã•ã„]。 + </text> </panel> - <panel label="グループ" name="groups_panel"> + <panel label="マイ グループ" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> <button name="groups_viewsort_btn" tool_tip="オプション"/> <button name="plus_btn" tool_tip="グループã«å‚åŠ / æ–°è¦ã‚°ãƒ«ãƒ¼ãƒ—を作æˆã—ã¾ã™"/> 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 b9a0744372..433ed0ad93 100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="利用å¯"/> <string name="allocated" value="割り当ã¦æ¸ˆ"/> <string name="title_place" value="å ´æ‰€ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«"/> - <string name="title_teleport_history" value="テレãƒãƒ¼ãƒˆå±¥æ´ã®å ´æ‰€"/> + <string name="title_teleport_history" value="テレãƒãƒ¼ãƒˆã®å±¥æ´"/> <string name="not_available" value="（該当ãªã—）"/> <string name="unknown" value="（ä¸æ˜Žï¼‰"/> <string name="public" value="（公開）"/> @@ -68,7 +68,7 @@ <text name="maturity_value" value="ä¸æ˜Ž"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="区画"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="レーティング区分："/> <text name="rating_value" value="ä¸æ˜Ž"/> <text name="voice_label" value="ボイス："/> @@ -86,15 +86,14 @@ <button label="åœŸåœ°æƒ…å ±" name="about_land_btn"/> </panel> </accordion_tab> - <accordion_tab name="region_information_tab" title="リージョン（地域） - "> - <panel> - <text name="region_name_label" value="地域:"/> + <accordion_tab name="region_information_tab" title="リージョン（地域） "> + <panel name="region_information_panel"> + <text name="region_name_label" value="リージョン（地域）:"/> <text name="region_name" value="Mooseland"/> <text name="region_type_label" value="種類："/> <text name="region_type" value="Moose"/> <text name="region_rating_label" value="レーティング区分："/> - <text name="region_rating" value="アダルト"/> + <text name="region_rating" value="Adult"/> <text name="region_owner_label" value="所有者："/> <text name="region_owner" value="moose Van Moose"/> <text name="region_group_label" value="グループ："/> @@ -105,15 +104,15 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="エステート（ä¸å‹•ç”£ï¼‰"> - <panel> - <text name="estate_name_label" value="ä¸å‹•ç”£ï¼š"/> + <panel name="estate_information_panel"> + <text name="estate_name_label" value="エステート（ä¸å‹•ç”£ï¼‰ï¼š"/> <text name="estate_rating_label" value="レーティング区分："/> <text name="estate_owner_label" value="所有者："/> <text name="covenant_label" value="約款："/> </panel> </accordion_tab> <accordion_tab name="sales_tab" title="販売ä¸"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="ä¾¡æ ¼ï¼š"/> <text name="area_label" value="é¢ç©ï¼š"/> <text name="traffic_label" value="トラフィック："/> diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index b1c7a3308f..a7fbc79884 100644 --- a/indra/newview/skins/default/xui/ja/panel_places.xml +++ b/indra/newview/skins/default/xui/ja/panel_places.xml @@ -2,14 +2,14 @@ <panel label="å ´æ‰€" name="places panel"> <string name="landmarks_tab_title" value="マイ ランドマーク"/> <string name="teleport_history_tab_title" value="テレãƒãƒ¼ãƒˆã®å±¥æ´"/> - <filter_editor label="å ´æ‰€ã‚’ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼" name="Filter"/> + <filter_editor label="ç§ã®å ´æ‰€ã‚’フィルターã™ã‚‹" name="Filter"/> <panel name="button_panel"> <button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn" tool_tip="該当ã™ã‚‹ã‚¨ãƒªã‚¢ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™"/> <button label="地図" name="map_btn"/> <button label="編集" name="edit_btn" tool_tip="ランドマークã®æƒ…å ±ã‚’ç·¨é›†ã—ã¾ã™"/> - <button name="overflow_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/> - <button label="é–‰ã˜ã‚‹" name="close_btn"/> - <button label="ã‚ャンセル" name="cancel_btn"/> + <button label="â–¼" name="overflow_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/> <button label="ä¿å˜" name="save_btn"/> + <button label="ã‚ャンセル" name="cancel_btn"/> + <button label="é–‰ã˜ã‚‹" name="close_btn"/> </panel> </panel> 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 d444cccd2d..87cd772143 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -1,27 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> +<panel label="アドãƒãƒ³ã‚¹" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="å¹ã出ã—ãƒãƒ£ãƒƒãƒˆ" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="å¹ã出ã—ãƒãƒ£ãƒƒãƒˆã®è‰²ã‚’é¸æŠžã—ã¾ã™"/> - <slider label="é€æ˜Žåº¦" name="bubble_chat_opacity"/> - <text name="AspectRatioLabel1" tool_tip="（幅/高ã•ï¼‰"> - 縦横比 - </text> - <combo_box name="aspect_ratio" tool_tip="（幅/高ã•ï¼‰"> - <combo_box.item label="4：3（標準CRT）" name="item1"/> - <combo_box.item label="5：4（1280x1024 LCD）" name="item2"/> - <combo_box.item label="8：5（ワイドスクリï¼ãƒ³ï¼‰" name="item3"/> - <combo_box.item label="16：9（ワイドスクリï¼ãƒ³ï¼‰" name="item4"/> - </combo_box> - <check_box label="自動検出" name="aspect_auto_detect"/> - <text name="heading1"> - カメラ： - </text> <slider label="視界角" name="camera_fov"/> <slider label="è·é›¢" name="camera_offset_scale"/> <text name="heading2"> @@ -29,20 +10,20 @@ </text> <check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードã®ã‚ªãƒ³ãƒ»ã‚ªãƒ•ã®åˆ‡ã‚Šæ›¿ãˆã«ã€è‡ªå‹•ã‚«ãƒ¡ãƒ©ãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’使ã„ã¾ã™"/> <check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードã«å…¥ã£ãŸã¨ãã«ã€è‡ªå‹•ã‚«ãƒ¡ãƒ©ãƒã‚¸ã‚·ãƒ§ãƒ³ã‚’使ã„ã¾ã™"/> - <text name="heading3"> - ã‚¢ãƒã‚¿ãƒ¼ï¼š - </text> <check_box label="一人称視点ã§è¡¨ç¤ºã™ã‚‹" name="first_person_avatar_visible"/> <check_box label="常ã«ã‚ーæ“作ã§å‹•ãよã†ã«ã™ã‚‹" name="arrow_keys_move_avatar_check"/> <check_box label="上矢å°ã‚ー2度押ã—+長押ã—ã§èµ°ã‚‹" name="tap_tap_hold_to_run"/> <check_box label="話ã™ã¨ãã«ã‚¢ãƒã‚¿ãƒ¼ã®å£ã‚’å‹•ã‹ã™" name="enable_lip_sync"/> - <check_box label="スクリプトã®ã‚¨ãƒ©ãƒ¼ã‚’表示ã™ã‚‹" name="show_script_errors"/> + <check_box label="å¹ã出ã—ãƒãƒ£ãƒƒãƒˆ" name="bubble_text_chat"/> + <slider label="é€æ˜Žåº¦" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="å¹ã出ã—ãƒãƒ£ãƒƒãƒˆã®è‰²ã‚’é¸æŠžã—ã¾ã™"/> + <check_box label="スクリプトã®ã‚¨ãƒ©ãƒ¼ã‚’表示：" name="show_script_errors"/> <radio_group name="show_location"> - <radio_item label="ãƒãƒ£ãƒƒãƒˆ" name="0"/> - <radio_item label="ウィンドウ" name="1"/> + <radio_item label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆ" name="0"/> + <radio_item label="別々ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="1"/> </radio_group> - <check_box label="トリガーã‚ーを押ã—ãŸã¨ãã«ã€ãƒžã‚¤ã‚¯ã‚’切り替ãˆã‚‹ï¼š" name="push_to_talk_toggle_check" tool_tip="トグルモードã®æ™‚ã«ãƒˆãƒªã‚¬ãƒ¼ã‚ーを1度押ã—ã¦æ”¾ã™ã¨ã€ãƒžã‚¤ã‚¯ã®ã‚ªãƒ³ãƒ»ã‚ªãƒ•è¨å®šã‚’切り替ãˆã¾ã™ã€‚ トグルモードã§ã¯ãªã„ã¨ãã¯ã€ãƒˆãƒªã‚¬ãƒ¼ã‚ーを押ã—ãŸçŠ¶æ…‹ã®æ™‚ã®ã¿ã‚ãªãŸã®å£°ãŒç›¸æ‰‹ã«èžã“ãˆã¾ã™ã€‚"/> + <check_box label="ボイスã®ã‚ªãƒ³ãƒ»ã‚ªãƒ•åˆ‡ã‚Šæ›¿ãˆã«ä½¿ç”¨ã™ã‚‹ãƒˆãƒªã‚¬ãƒ¼ã‚ー：" name="push_to_talk_toggle_check" tool_tip="トグルモードã®æ™‚ã«ãƒˆãƒªã‚¬ãƒ¼ã‚ーを 1 度押ã—ã¦æ”¾ã™ã¨ã€ãƒžã‚¤ã‚¯ã®ã‚ªãƒ³ãƒ»ã‚ªãƒ•è¨å®šã‚’切り替ãˆã¾ã™ã€‚ トグルモードã§ã¯ãªã„ã¨ãã¯ã€ãƒˆãƒªã‚¬ãƒ¼ã‚ーを押ã—ãŸçŠ¶æ…‹ã®æ™‚ã®ã¿ã‚ãªãŸã®å£°ãŒç›¸æ‰‹ã«èžã“ãˆã¾ã™ã€‚"/> <line_editor label="プッシュ・トゥ・スピークã®ãƒˆãƒªã‚¬ãƒ¼" name="modifier_combo"/> <button label="ã‚ーè¨å®š" name="set_voice_hotkey_button"/> - <button label="マウスã®ä¸å¤®ãƒœã‚¿ãƒ³" name="set_voice_middlemouse_button"/> + <button label="マウスã®ä¸å¤®ãƒœã‚¿ãƒ³" name="set_voice_middlemouse_button" tool_tip="マウスã®ä¸å¤®ãƒœã‚¿ãƒ³ã«ãƒªã‚»ãƒƒãƒˆã—ã¾ã™"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml index f0780a6cf8..7fd2e31698 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml @@ -4,7 +4,7 @@ 知らã›ã‚‹ï¼š </text> <check_box label="リンデンドルを使用・å—ã‘å–ã‚‹ã¨ã" name="notify_money_change_checkbox"/> - <check_box label="フレンドãŒãƒã‚°ã‚¢ã‚¦ãƒˆãƒ»ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã¨ã" name="friends_online_notify_checkbox"/> + <check_box label="フレンドãŒãƒã‚°ã‚¤ãƒ³ãƒ»ãƒã‚°ã‚¢ã‚¦ãƒˆã™ã‚‹ã¨ã" name="friends_online_notify_checkbox"/> <text name="show_label" width="300"> 常ã«è¡¨ç¤ºã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ï¼š </text> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 73d0855273..a521556c79 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ãƒãƒ£ãƒƒãƒˆ" name="chat"> + <text name="font_size"> + æ–‡å—ã®å¤§ãã•ï¼š + </text> <radio_group name="chat_font_size"> <radio_item label="å°" name="radio" value="0"/> <radio_item label="ä¸" name="radio2" value="1"/> <radio_item label="大" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + æ–‡å—ã®è‰²ï¼š + </text> <color_swatch label="自分" name="user"/> <text name="text_box1"> 自分 @@ -39,9 +45,9 @@ </text> <check_box initial_value="true" label="ãƒãƒ£ãƒƒãƒˆä¸ã«ã‚¿ã‚¤ãƒ”ング動作ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’å†ç”Ÿ" name="play_typing_animation"/> <check_box label="オフライン時ã«å—ã‘å–ã£ãŸ IM をメールã§å—ä¿¡" name="send_im_to_email"/> - <check_box label="ãƒãƒ£ãƒƒãƒˆå±¥æ´ã«æ–‡å—ã ã‘ã§è¡¨ç¤ºã™ã‚‹" name="plain_text_chat_history"/> - <radio_group name="chat_window" tool_tip="インスタントメッセージを別ウィンドウã€ã¾ãŸã¯1ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«è¤‡æ•°ã‚¿ãƒ–ã§è¡¨ç¤ºï¼ˆè¦å†èµ·å‹•ï¼‰"> - <radio_item label="複数ウィンドウ" name="radio" value="0"/> - <radio_item label="1ã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="radio2" value="1"/> + <check_box label="ãƒãƒ£ãƒƒãƒˆå±¥æ´ã«æ–‡å—ã ã‘表示ã™ã‚‹" name="plain_text_chat_history"/> + <radio_group name="chat_window" tool_tip="インスタントメッセージを別フãƒãƒ¼ã‚¿ãƒ¼ã€ã¾ãŸã¯1ã¤ã®ãƒ•ãƒãƒ¼ã‚¿ãƒ¼ã«è¤‡æ•°ã‚¿ãƒ–ã§è¡¨ç¤ºã—ã¾ã™ï¼ˆè¦å†èµ·å‹•ï¼‰"> + <radio_item label="別々ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="radio" value="0"/> + <radio_item label="タブ" name="radio2" value="1"/> </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index f216c3acbc..6df59ca189 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -24,9 +24,9 @@ </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="一般ã€æŽ§ãˆã‚ã€ã‚¢ãƒ€ãƒ«ãƒˆ" name="Desired_Adult"/> - <combo_box.item label="一般ã¨æŽ§ãˆã‚" name="Desired_Mature"/> - <combo_box.item label="一般" name="Desired_PG"/> + <combo_box.item label="Generalã€Moderateã€Adult" name="Desired_Adult"/> + <combo_box.item label="General 㨠Moderate" name="Desired_Mature"/> + <combo_box.item label="General" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> ãƒã‚°ã‚¤ãƒ³ä½ç½®ï¼š diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml index 12e8b04f84..b81889b412 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml @@ -3,22 +3,20 @@ <panel.string name="log_in_to_change"> ãƒã‚°ã‚¤ãƒ³ã—ã¦å¤‰æ›´ </panel.string> - <button label="å±¥æ´ã®æ¶ˆåŽ»" name="clear_cache"/> + <button label="å±¥æ´ã‚’消去" name="clear_cache" tool_tip="ãƒã‚°ã‚¤ãƒ³ç”»åƒã€æœ€å¾Œã«ã„ãŸå ´æ‰€ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆå±¥æ´ã€Webã€ãƒ†ã‚¯ã‚¹ãƒãƒ£ã‚ャッシュを削除ã—ã¾ã™"/> <text name="cache_size_label_l"> （ä½ç½®ã€ç”»åƒã€webã€æ¤œç´¢å±¥æ´ï¼‰ </text> - <check_box label="ç§ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ³ã‚’確èªã§ãã‚‹ã®ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã ã‘" name="online_visibility"/> - <check_box label="フレンドã¨ã‚°ãƒ«ãƒ¼ãƒ—以外ã‹ã‚‰ã¯ã‚³ãƒ¼ãƒ«ã¨IMã‚’å—ä¿¡ã—ãªã„" name="voice_call_friends_only_check"/> - <check_box label="コールãŒçµ‚了ã—ãŸã‚‰ãƒžã‚¤ã‚¯ã®ã‚¹ã‚¤ãƒƒãƒã‚’切る" name="auto_disengage_mic_check"/> - <check_box label="Cookieã‚’å—ã‘入れる" name="cookies_enabled"/> - <check_box label="メディアを有効ã«ã™ã‚‹" name="media_enabled"/> - <check_box label="メディアを自動å†ç”Ÿã™ã‚‹" name="autoplay_enabled"/> + <check_box label="ç§ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’確èªã§ãã‚‹ã®ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã ã‘" name="online_visibility"/> + <check_box label="フレンドã¨ã‚°ãƒ«ãƒ¼ãƒ—以外ã‹ã‚‰ã¯ã‚³ãƒ¼ãƒ«ã¨ IM ã‚’å—ä¿¡ã—ãªã„" name="voice_call_friends_only_check"/> + <check_box label="コールãŒçµ‚了ã—ãŸã‚‰è‡ªå‹•çš„ã«ãƒžã‚¤ã‚¯ã®ã‚¹ã‚¤ãƒƒãƒã‚’切る" name="auto_disengage_mic_check"/> + <check_box label="Cookie ã‚’å—ã‘入れる" name="cookies_enabled"/> <text name="Logs:"> ãƒã‚°ï¼š </text> <check_box label="è¿‘ãã®ãƒãƒ£ãƒƒãƒˆãƒã‚°ã‚’コンピューターã«ä¿å˜ã™ã‚‹" name="log_nearby_chat"/> <check_box label="IM ãƒã‚°ã‚’コンピューターã«ä¿å˜ã™ã‚‹" name="log_instant_messages"/> - <check_box label="ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã‚’è¿½åŠ ã™ã‚‹" name="show_timestamps_check_im"/> + <check_box label="日時を入れる" name="show_timestamps_check_im"/> <text name="log_path_desc"> ãƒã‚°ã®ä¿å˜å ´æ‰€ï¼š </text> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml index 12e21709ae..ad8c8437be 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml @@ -5,7 +5,7 @@ 一人称視点： </text> <text name=" Mouse Sensitivity"> - マウスã®ç²¾åº¦ + マウスã®æ„Ÿåº¦ </text> <check_box label="切り替ãˆ" name="invert_mouse"/> <text name="Network:"> @@ -18,29 +18,29 @@ kbps </text> <check_box label="カスタムãƒãƒ¼ãƒˆ" name="connection_port_enabled"/> - <spinner label="ãƒãƒ¼ãƒˆç•ªå·ï¼š" name="web_proxy_port"/> + <spinner label="ãƒãƒ¼ãƒˆç•ªå·ï¼š" name="connection_port"/> <text name="cache_size_label_l"> ã‚ャッシュサイズ </text> <text name="text_box5"> MB </text> - <button label="å‚ç…§" label_selected="å‚ç…§" name="set_cache"/> - <button label="リセット" label_selected="リセット" name="reset_cache"/> <text name="Cache location"> ã‚ャッシュã®ä¿å˜å ´æ‰€ï¼š </text> + <button label="å‚ç…§" label_selected="å‚ç…§" name="set_cache"/> + <button label="リセット" label_selected="リセット" name="reset_cache"/> <text name="Web:"> Web： </text> <radio_group name="use_external_browser"> - <radio_item label="内蔵ブラウザを使用" name="internal" tool_tip="内蔵ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„Webリンクãªã©ã‚’見ã¾ã™ã€‚[APP_NAME] 内ã«æ–°ã—ã„ウィンドウã§ã“ã®ãƒ–ラウザãŒé–‹ãã¾ã™ã€‚"/> - <radio_item label="外部ブラウザ（IEã‚„Firefox）を使用" name="external" tool_tip="デフォルトã®ã‚·ã‚¹ãƒ†ãƒ Webブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„Webリンク先ãªã©ã‚’見ã¾ã™ã€‚全画é¢ã§èµ·å‹•ä¸ã«ã¯ãŠã™ã™ã‚ã—ã¾ã›ã‚“。"/> + <radio_item label="内蔵ブラウザを使用" name="internal" tool_tip="内蔵ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンクãªã©ã‚’見ã¾ã™ã€‚[APP_NAME] 内ã«æ–°ã—ã„ウィンドウã§ã“ã®ãƒ–ラウザãŒé–‹ãã¾ã™ã€‚" value="0"/> + <radio_item label="指定ã®ãƒ–ラウザ（IE ã‚„ Firefox）を使用" name="external" tool_tip="デフォルトã®ã‚·ã‚¹ãƒ†ãƒ Web ブラウザã§ãƒ˜ãƒ«ãƒ—ã‚„ Web リンク先ãªã©ã‚’見ã¾ã™ã€‚全画é¢ã§èµ·å‹•ä¸ã«ã¯ãŠã™ã™ã‚ã—ã¾ã›ã‚“。" value="1"/> </radio_group> - <check_box initial_value="false" label="Webプãƒã‚ã‚·" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="使用ã™ã‚‹ãƒ—ãƒã‚ã‚·åã¾ãŸã¯IPアドレス"/> - <button label="å‚ç…§" label_selected="å‚ç…§" name="set_proxy"/> + <check_box initial_value="false" label="Web プãƒã‚シを有効ã«ã™ã‚‹" name="web_proxy_enabled"/> <text name="Proxy location"> プãƒã‚シ： </text> + <line_editor name="web_proxy_editor" tool_tip="使用ã™ã‚‹ãƒ—ãƒã‚ã‚·ã®ãƒ›ã‚¹ãƒˆåã¾ãŸã¯ IP アドレス"/> + <spinner label="ãƒãƒ¼ãƒˆç•ªå·ï¼š" name="web_proxy_port"/> </panel> 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 9fb0dd0b46..fe830d864f 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -2,13 +2,20 @@ <panel label="サウンド" name="Preference Media panel"> <slider label="全体ã®éŸ³é‡" name="System Volume"/> <check_box initial_value="true" label="最å°åŒ–ã§ãƒŸãƒ¥ãƒ¼ãƒˆ" name="mute_when_minimized"/> - <slider label="風" name="Wind Volume"/> <slider label="ボタン" name="UI Volume"/> - <slider label="メディア" name="Media Volume"/> + <slider label="風" name="Wind Volume"/> <slider label="効果音" name="SFX Volume"/> <slider label="ストリーミング音楽" name="Music Volume"/> - <check_box label="ボイスを有効ã«ã™ã‚‹" name="enable_voice_check"/> - <slider label="ボイス" name="Voice Volume"/> + <check_box label="有効" name="music_enabled"/> + <slider label="メディア" name="Media Volume"/> + <check_box label="有効" name="enable_media"/> + <slider label="ボイスãƒãƒ£ãƒƒãƒˆ" name="Voice Volume"/> + <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"/> + <text name="voice_chat_settings"> + ボイスãƒãƒ£ãƒƒãƒˆã®è¨å®š + </text> <text name="Listen from"> æ–¹å‘： </text> diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml index 8968b7c61e..e7bc989c52 100644 --- a/indra/newview/skins/default/xui/ja/panel_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_profile.xml @@ -28,11 +28,14 @@ </panel> <text name="title_member_text" value="ä½äººç™»éŒ²ï¼š"/> <text name="title_acc_status_text" value="アカウントã®çŠ¶æ…‹ï¼š"/> - <text name="acc_status_text"> + <text_editor name="acc_status_text"> ä½äººã€‚ æ”¯æ‰•æƒ…å ±æœªç™»éŒ²ã€‚ リンデン。 - </text> + </text_editor> <text name="title_partner_text" value="パートナー："/> + <panel name="partner_data_panel"> + <name_box initial_value="（å–å¾—ä¸ï¼‰" name="partner_text"/> + </panel> <text name="title_groups_text" value="グループ："/> </panel> </scroll_container> @@ -43,6 +46,7 @@ <button label="コール" name="call" tool_tip="ã“ã®ä½äººã«ã‚³ãƒ¼ãƒ«ã—ã¾ã™"/> <button label="地図" name="show_on_map_btn" tool_tip="ä½äººã‚’地図上ã§è¡¨ç¤ºã—ã¾ã™"/> <button label="テレãƒãƒ¼ãƒˆ" name="teleport" tool_tip="テレãƒãƒ¼ãƒˆã‚’é€ã‚Šã¾ã™"/> + <button label="â–¼" name="overflow_btn" tool_tip="ä½äººã«ãŠé‡‘を渡ã™ã‹æŒã¡ç‰©ã‚’共有ã—ã¾ã™"/> </layout_panel> <layout_panel name="profile_me_buttons_panel"> <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«ã®ç·¨é›†" name="edit_profile_btn" tool_tip="個人的ãªæƒ…å ±ã‚’ç·¨é›†ã—ã¾ã™"/> diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml index 9a517d79e9..5214f79141 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml @@ -30,7 +30,7 @@ 約款ã®å¤‰æ›´ã¯ä¸å‹•ç”£å…¨åŒºç”»ã«é©ç”¨ã¨ãªã‚Šã¾ã™ã€‚ </text> <text name="covenant_instructions" width="390"> - ã“ã®ä¸å‹•ç”£ç´„款ã®å¤‰æ›´ã‚’ã™ã‚‹éš›ã¯ã€ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’ドラッグ＆ドãƒãƒƒãƒ—ã—ã¦ãã ã•ã„。 + ã“ã®ä¸å‹•ç”£ç´„款を変更ã™ã‚‹éš›ã¯ã€ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’ドラッグ＆ドãƒãƒƒãƒ—ã—ã¦ãã ã•ã„。 </text> <text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200"> 地域 diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index fcc225c333..3113a68505 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ä¸å‹•ç”£" name="Estate"> - <text name="estate_help_text" width="400"> - ã“ã®ã‚¿ãƒ–ã®è¨å®šã¸ã®å¤‰æ›´ã¯ã€ã‚¨ã‚¹ãƒ†ãƒ¼ãƒˆå†…ã®ã™ã¹ã¦ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å½±éŸ¿ã•ã‚Œã¾ã™ã€‚ + <text name="estate_help_text"> + ã“ã®ã‚¿ãƒ–内ã®è¨å®šå¤‰æ›´ã¯ã€ä¸å‹•ç”£å†…ã®ã™ã¹ã¦ã®åœ°åŸŸã«å½±éŸ¿ã—ã¾ã™ã€‚ </text> <text name="estate_text"> ä¸å‹•ç”£ï¼š @@ -69,6 +69,6 @@ <button label="?" name="ban_resident_help"/> <button label="è¿½åŠ ..." name="add_banned_avatar_btn"/> <button label="削除..." name="remove_banned_avatar_btn"/> - <button label="メッセージをä¸å‹•ç”£ã¸é€ä¿¡..." name="message_estate_btn"/> - <button label="土地ã‹ã‚‰ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã™..." name="kick_user_from_estate_btn"/> + <button label="メッセージをä¸å‹•ç”£ã«é€ä¿¡..." name="message_estate_btn"/> + <button label="ä¸å‹•ç”£ã‹ã‚‰ä½äººã‚’追ã„出ã™..." name="kick_user_from_estate_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index 168141ee77..b72fac1a7c 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml @@ -15,39 +15,29 @@ <text name="region_type_lbl"> 種類： </text> - <text name="region_type" left_delta="70"> + <text left_delta="70" name="region_type"> ä¸æ˜Ž </text> <check_box label="土地整備をブãƒãƒƒã‚¯" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="飛行をブãƒãƒƒã‚¯" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="ダメージを許å¯" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="プッシュを制é™" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="土地ã®å†è²©ã‚’許å¯" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="土地ã®çµ±åˆãƒ»åˆ†å‰²ã‚’許å¯" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> <check_box label="土地ã®æ¤œç´¢è¡¨ç¤ºã‚’ブãƒãƒƒã‚¯" name="block_parcel_search_check" tool_tip="検索çµæžœã§ã€ã“ã®åœ°åŸŸã¨åŒºç”»ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã§ã™"/> - <button label="?" name="parcel_search_help"/> <spinner label="ã‚¢ãƒã‚¿ãƒ¼æ•°ä¸Šé™" name="agent_limit_spin"/> - <button label="?" name="agent_limit_help"/> <spinner label="物体ボーナス" name="object_bonus_spin"/> - <button label="?" name="object_bonus_help"/> <text label="æˆäººæŒ‡å®š" name="access_text"> 区分： </text> - <combo_box label="控ãˆã‚" name="access_combo"> - <combo_box.item label="アダルト" name="Adult"/> - <combo_box.item label="控ãˆã‚" name="Mature"/> - <combo_box.item label="一般" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="Moderate" name="access_combo"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Moderate" name="Mature" value="21"/> + <icons_combo_box.item label="General" name="PG" value="13"/> + </icons_combo_box> <button label="é©ç”¨" name="apply_btn"/> - <button label="ユーザー1åをホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="kick_btn"/> - <button label="ユーザー全員をホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="kick_all_btn"/> + <button label="ä½äºº 1 åをホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_btn"/> + <button label="ä½äººå…¨å“¡ã‚’ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_all_btn"/> <button label="メッセージを地域ã«é€ä¿¡..." name="im_btn"/> <button label="テレãƒãƒ–ã®ç®¡ç†..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml index df7e5d9129..188a60eb60 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general_layout.xml @@ -3,19 +3,19 @@ <text name="region_text_lbl"> 地域: </text> - <text name="region_text" left_delta="70"> + <text left_delta="70" name="region_text"> ä¸æ˜Ž </text> <text name="version_channel_text_lbl"> ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š </text> - <text name="version_channel_text" left_delta="70"> + <text left_delta="70" name="version_channel_text"> ä¸æ˜Ž </text> <text name="region_type_lbl"> 種類： </text> - <text name="region_type" left_delta="70"> + <text left_delta="70" name="region_type"> ä¸æ˜Ž </text> <check_box label="地形編集をブãƒãƒƒã‚¯" name="block_terraform_check"/> @@ -25,19 +25,19 @@ <check_box label="土地ã®å†è²©ã‚’許å¯" name="allow_land_resell_check"/> <check_box label="土地ã®çµ±åˆãƒ»åˆ†å‰²ã‚’許å¯" name="allow_parcel_changes_check"/> <check_box label="土地ã®æ¤œç´¢è¡¨ç¤ºã‚’ブãƒãƒƒã‚¯" name="block_parcel_search_check" tool_tip="検索çµæžœã§ã€ã“ã®åœ°åŸŸã¨åŒºç”»ã‚’表示ã™ã‚‹ã‹ã©ã†ã‹ã®è¨å®šã§ã™"/> - <spinner label="ã‚¢ãƒã‚¿ãƒ¼æ•°ä¸Šé™" name="agent_limit_spin" label_width="110" width="190"/> - <spinner label="物体ボーナス" name="object_bonus_spin" label_width="110" width="190"/> + <spinner label="ã‚¢ãƒã‚¿ãƒ¼æ•°ä¸Šé™" label_width="110" name="agent_limit_spin" width="190"/> + <spinner label="物体ボーナス" label_width="110" name="object_bonus_spin" width="190"/> <text label="レーティング区分" name="access_text"> レーティング区分： </text> - <combo_box label="控ãˆã‚" name="access_combo"> - <combo_box.item label="アダルト" name="Adult"/> - <combo_box.item label="控ãˆã‚" name="Mature"/> - <combo_box.item label="一般" name="PG"/> + <combo_box label="Moderate" name="access_combo"> + <combo_box.item label="Adult" name="Adult"/> + <combo_box.item label="Moderate" name="Mature"/> + <combo_box.item label="General" name="PG"/> </combo_box> <button label="é©ç”¨" name="apply_btn"/> - <button label="ユーザー1åをホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_btn"/> - <button label="ユーザー全員をホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_all_btn"/> + <button label="ä½äºº 1 åをホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_btn"/> + <button label="ä½äººå…¨å“¡ã‚’ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ..." name="kick_all_btn"/> <button label="メッセージを地域ã«é€ä¿¡..." name="im_btn"/> <button label="テレãƒãƒ–ã®ç®¡ç†..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index d77f9749c2..8df803b2dc 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -18,13 +18,13 @@ <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="RAW 地形ダウンãƒãƒ¼ãƒ‰..." name="download_raw_btn" + tool_tip="ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã®ã¿åˆ©ç”¨å¯èƒ½ã€ç®¡ç†è€…ã¯åˆ©ç”¨ä¸å¯ã§ã™" /> <button label="?" name="download_raw_help" /> - <button label="RAW地形アップãƒãƒ¼ãƒ‰..." name="upload_raw_btn" - tool_tip="ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã®ã¿åˆ©ç”¨å¯èƒ½ã€ç®¡ç†è€…ã¯åˆ©ç”¨ä¸å¯" /> + <button label="RAW 地形アップãƒãƒ¼ãƒ‰..." name="upload_raw_btn" + tool_tip="ä¸å‹•ç”£ã‚ªãƒ¼ãƒŠãƒ¼ã®ã¿åˆ©ç”¨å¯èƒ½ã€ç®¡ç†è€…ã¯åˆ©ç”¨ä¸å¯ã§ã™" /> <button label="?" name="upload_raw_help" /> <button label="地形ã®æ§‹ç¯‰" name="bake_terrain_btn" - tool_tip="ç¾åœ¨ã®åœ°å½¢ã‚’上昇ï¼ä¸‹é™ç¯„囲ã®ä¸é–“点ã¨ã—ã¦è¨å®š" /> + tool_tip="ç¾åœ¨ã®åœ°å½¢ã‚’上昇・下é™ç¯„囲ã®ä¸é–“点ã¨ã—ã¦è¨å®šã—ã¾ã™" /> <button label="?" name="bake_terrain_help" /> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 17e3260460..14fc0b4c22 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="地é¢ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼" name="Textures"> +<panel label="地é¢ãƒ†ã‚¯ã‚¹ãƒãƒ£" name="Textures"> <text name="region_text_lbl"> 地域： </text> @@ -7,7 +7,7 @@ 未知 </text> <text name="detail_texture_text"> - 地形ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼ (512x512ã€24ビット .tgaファイルãŒå¿…è¦) + 地形ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ （512x512ã€24ビット .tgaファイルãŒå¿…è¦ã§ã™ï¼‰ </text> <text name="height_text_lbl"> 1（低） @@ -19,22 +19,22 @@ 3 </text> <text name="height_text_lbl4"> - 4(高) + 4（高） </text> <text name="height_text_lbl5"> - テクスãƒãƒ£ãƒ¼æ¨™é«˜ç¯„囲 + テクスãƒãƒ£æ¨™é«˜ç¯„囲 </text> <text name="height_text_lbl6"> - å—西 + 北西 </text> <text name="height_text_lbl7"> - 北西 + åŒ—æ± </text> <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_1"/> @@ -52,7 +52,7 @@ 「最大値ã€ã§ã™ã€‚「高ã€ã®å€¤ã¯ã€4番ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®é«˜ã•ã®ã€Œæœ€ä½Žå€¤ã€ã§ã™ã€‚ </text> <text name="height_text_lbl12"> - ãã—ã¦ã€Œé«˜ã€ã®å€¤ã¯ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼#4ã®é«˜ã•ã®ä¸‹é™ã¨ãªã‚Šã¾ã™ã€‚ + ãã—ã¦ã€Œé«˜ã€ã®å€¤ã¯ãƒ†ã‚¯ã‚¹ãƒãƒ£#4ã®é«˜ã•ã®ä¸‹é™ã¨ãªã‚Šã¾ã™ã€‚ </text> <button label="é©ç”¨" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml index 1d81304860..494884c187 100644 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="マイ ã‚¢ãƒã‚¿ãƒ¼" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + ã‚¢ãƒã‚¿ãƒ¼ã®ã‚¹ã‚¯ãƒªãƒ—ト使用 + </text> <text name="loading_text"> ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... </text> diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml index 6a62af4ec6..d91eba9699 100644 --- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml @@ -3,20 +3,18 @@ <text name="script_memory"> 区画スクリプトメモリ </text> - <text name="parcels_listed"> - 区画所有者： - </text> - <text name="memory_used"> - 使用ã•ã‚ŒãŸãƒ¡ãƒ¢ãƒªï¼š - </text> + <text name="parcels_listed"/> + <text name="memory_used"/> <text name="loading_text"> ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... </text> <scroll_list name="scripts_list"> <scroll_list.columns label="サイズ （kb）" name="size" width="90"/> + <scroll_list.columns label="URL" name="urls"/> <scroll_list.columns label="オブジェクトå" name="name"/> <scroll_list.columns label="オブジェクトã®æ‰€æœ‰è€…" name="owner" width="120"/> - <scroll_list.columns label="区画・ä½ç½®" name="location"/> + <scroll_list.columns label="区画" name="parcel"/> + <scroll_list.columns label="å ´æ‰€" name="location"/> </scroll_list> <button label="リスト更新" name="refresh_list_btn"/> <button label="ãƒã‚¤ãƒ©ã‚¤ãƒˆ" name="highlight_btn"/> diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml index 48636f1e3b..3fd14ece06 100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml @@ -7,7 +7,9 @@ <panel label="ホーム" name="panel_home"/> </sidetray_tab> <sidetray_tab description="ã‚ãªãŸã®å…¬é–‹ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã¨ãƒ”ックを編集ã—ã¦ãã ã•ã„。" name="sidebar_me" tab_title="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«"> - <panel label="ミー" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="ミー" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="フレンドã€é€£çµ¡å…ˆã€è¿‘ãã®äººã‚’探ã—ã¦ãã ã•ã„。" name="sidebar_people" tab_title="人"> <panel_container name="panel_container"> @@ -18,10 +20,10 @@ <sidetray_tab description="è¡ŒããŸã„å ´æ‰€ã€è¡Œã£ãŸã“ã¨ã®ã‚ã‚‹å ´æ‰€ã‚’æŽ¢ã—ã¦ãã ã•ã„。" label="å ´æ‰€" name="sidebar_places" tab_title="å ´æ‰€"> <panel label="å ´æ‰€" name="panel_places"/> </sidetray_tab> - <sidetray_tab description="ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¦ãã ã•ã„。" name="sidebar_inventory" tab_title="マイ æŒã¡ç‰©"> + <sidetray_tab description="ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¦ãã ã•ã„。" name="sidebar_inventory" tab_title="æŒã¡ç‰©"> <panel label="æŒã¡ç‰©ã‚’編集" name="sidepanel_inventory"/> </sidetray_tab> - <sidetray_tab description="ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¦ãã ã•ã„。" name="sidebar_appearance" tab_title="マイ 容姿"> + <sidetray_tab description="ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¦ãã ã•ã„。" name="sidebar_appearance" tab_title="容姿"> <panel label="容姿ã®ç·¨é›†" name="sidepanel_appearance"/> </sidetray_tab> </side_tray> diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml index aef1f90298..ea17cd6526 100644 --- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml @@ -22,13 +22,13 @@ </text> </panel> <panel name="sidebar_appearance"> - <text name="tab_name" value="マイ 容姿"/> + <text name="tab_name" value="容姿"/> <text name="tab_description"> ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¾ã™ã€‚ </text> </panel> <panel name="sidebar_inventory"> - <text name="tab_name" value="マイ æŒã¡ç‰©"/> + <text name="tab_name" value="æŒã¡ç‰©"/> <text name="tab_description"> ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¾ã™ã€‚ </text> diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml index 8d375aa6cd..923455abba 100644 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml @@ -22,9 +22,10 @@ L$ [AMT] </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="所æŒé‡‘"/> - <button label="L$ ã®è³¼å…¥" name="buyL" tool_tip="クリックã—㦠L$ を購入ã—ã¾ã™"/> + <button label="購入" name="buyL" tool_tip="クリックã—㦠L$ を購入ã—ã¾ã™"/> <text name="TimeText" tool_tip="ç¾åœ¨æ™‚刻（太平洋）"> - 12：00 AM + 24:00 AM PST </text> + <button name="media_toggle_btn" tool_tip="ã™ã¹ã¦ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’開始・åœæ¢ï¼ˆéŸ³æ¥½ã€ãƒ“デオã€Web ページ）"/> <button name="volume_btn" tool_tip="ã‚°ãƒãƒ¼ãƒãƒ«éŸ³é‡è¨å®š"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml index 2264ae965b..c1bf81f7e7 100644 --- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml @@ -12,6 +12,6 @@ <accordion_tab name="6_months_and_older" title="åŠå¹´ä»¥ä¸Šå‰"/> </accordion> <panel label="bottom_panel" name="bottom_panel"> - <button name="gear_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/> + <button name="gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml index 59fceca2db..0a63cedf10 100644 --- a/indra/newview/skins/default/xui/ja/role_actions.xml +++ b/indra/newview/skins/default/xui/ja/role_actions.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> - <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・メンãƒãƒ¼ã‚’è¿½åŠ ã€æŽ’除ã—ã€æ‹›å¾…状ãªã—ã«æ–°ãƒ¡ãƒ³ãƒãƒ¼ã®å‚åŠ ã‚’èªã‚る権é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Membership"> + <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—メンãƒãƒ¼ã‚’è¿½åŠ ã€æŽ’除ã—ã€æ‹›å¾…状ãªã—ã«æ–°ãƒ¡ãƒ³ãƒãƒ¼ã®å‚åŠ ã‚’èªã‚る権é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Membership"> <action description="ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«äººã‚’招待" longdescription="「役割ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ã€Œãƒ¡ãƒ³ãƒãƒ¼ã€ã‚¿ãƒ–内ã«ã‚る「招待ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’招待ã—ã¾ã™ã€‚" name="member invite" value="1"/> <action description="メンãƒãƒ¼ã‚’ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰è¿½æ”¾" longdescription="「役割ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ã€Œãƒ¡ãƒ³ãƒãƒ¼ã€ã‚¿ãƒ–内ã«ã‚る「追放ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ¡ãƒ³ãƒãƒ¼ã‚’追放ã—ã¾ã™ã€‚ 「オーナーã€ã¯ã€ä»–ã®ã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ä»¥å¤–ã¯èª°ã§ã‚‚追放ã§ãã¾ã™ã€‚ 「オーナーã€ã§ã¯ãªã„人ãŒã€Œå…¨å“¡ï¼ˆEveryone）ã€ã«ã—ã‹å½¹å‰²ãŒãªã„å ´åˆã€ãƒ¡ãƒ³ãƒãƒ¼ã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰è¿½æ”¾ã•ã‚Œã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ 「役割ã€ã‹ã‚‰ãƒ¡ãƒ³ãƒãƒ¼ã‚’削除ã™ã‚‹ã«ã¯ã€ã€Œå½¹å‰²ã‹ã‚‰ãƒ¡ãƒ³ãƒãƒ¼ã‚’削除ã€ã®èƒ½åŠ›ãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" name="member eject" value="2"/> <action description="「自由å‚åŠ ã€ã¨ã€Œå…¥ä¼šè²»ã€ã®åˆ‡ã‚Šæ›¿ãˆ" longdescription="「自由å‚åŠ ã€ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã¨ã€æ‹›å¾…ã•ã‚Œãªãã¦ã‚‚æ–°ã—ã„メンãƒãƒ¼ãŒå…¥ä¼šã§ãã¾ã™ã€‚「入会費ã€ã¯ã€Œä¸€èˆ¬ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§å¤‰æ›´ã—ã¾ã™ã€‚" name="member options" value="3"/> @@ -8,29 +8,29 @@ <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—内ã®å½¹å‰²ã‚’è¿½åŠ ã€å‰Šé™¤ã€å¤‰æ›´ã—ã€å½¹å‰²ã«ãƒ¡ãƒ³ãƒãƒ¼ã‚’è¿½åŠ ã€å‰Šé™¤ã—ã€ã•ã‚‰ã«å½¹å‰²ã¸èƒ½åŠ›ã‚’割り当ã¦ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Roles"> <action description="æ–°ã—ã„役割を作æˆ" longdescription="æ–°ã—ã„「役割ã€ã¯ã€ã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「役割ã€ã‚¿ãƒ–ã§ä½œæˆã—ã¾ã™ã€‚" name="role create" value="4"/> <action description="役割を削除" longdescription="「役割ã€ã¯ã€ã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「役割ã€ã‚¿ãƒ–ã§å‰Šé™¤ã§ãã¾ã™ã€‚" name="role delete" value="5"/> - <action description="「役割ã€ã®åå‰ã€è‚©æ›¸ãã€èª¬æ˜Žã€ãƒ¡ãƒ³ãƒãƒ¼å…¬é–‹ã®æœ‰ç„¡ã‚’変更" longdescription="「役割ã€ã®åå‰ã€è‚©æ›¸ãã€èª¬æ˜Žã€ãƒ¡ãƒ³ãƒãƒ¼å…¬é–‹ã®æœ‰ç„¡ã‚’変更ã—ã¾ã™ã€‚ 「役割ã€ã‚’é¸æŠžå¾Œã«ã€ã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「役割ã€ã‚¿ãƒ– ã®ä¸‹ã§è¨å®šã§ãã¾ã™ã€‚" name="role properties" value="6"/> + <action description="「役割ã€ã®åå‰ã€ã‚¿ã‚¤ãƒˆãƒ«ã€èª¬æ˜Žã€ãƒ¡ãƒ³ãƒãƒ¼å…¬é–‹ã®æœ‰ç„¡ã‚’変更" longdescription="「役割ã€ã®åå‰ã€ã‚¿ã‚¤ãƒˆãƒ«ã€èª¬æ˜Žã€ãƒ¡ãƒ³ãƒãƒ¼å…¬é–‹ã®æœ‰ç„¡ã‚’変更ã—ã¾ã™ã€‚ 「役割ã€ã‚’é¸æŠžå¾Œã«ã€ã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「役割ã€ã‚¿ãƒ– ã®ä¸‹ã§è¨å®šã§ãã¾ã™ã€‚" name="role properties" value="6"/> <action description="メンãƒãƒ¼ã‚’割り当ã¦äººã®å½¹å‰²ã«å‰²ã‚Šå½“ã¦ã‚‹" longdescription="「割り当ã¦ã‚‰ã‚ŒãŸå½¹å‰²ã€ï¼ˆã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「メンãƒãƒ¼ã€ã‚¿ãƒ–）ã®ãƒªã‚¹ãƒˆã§ã€ãƒ¡ãƒ³ãƒãƒ¼ã‚’「役割ã€ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚ ã“ã®èƒ½åŠ›ãŒã‚るメンãƒãƒ¼ã¯ã€å‰²ã‚Šå½“ã¦ã‚‹äººãŒæ—¢ã«æ‰€å±žã™ã‚‹ã€Œå½¹å‰²ã€ã«ã®ã¿ãƒ¡ãƒ³ãƒãƒ¼ã‚’è¿½åŠ ã§ãã¾ã™ã€‚" name="role assign member limited" value="7"/> <action description="メンãƒãƒ¼ã‚’ä»»æ„ã®å½¹å‰²ã«å‰²ã‚Šå½“ã¦ã‚‹" longdescription="「割り当ã¦ã‚‰ã‚ŒãŸå½¹å‰²ã€ï¼ˆã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「メンãƒãƒ¼ã€ã‚¿ãƒ–）ã®ãƒªã‚¹ãƒˆã§ã€ãƒ¡ãƒ³ãƒãƒ¼ã‚’ã©ã®ã€Œå½¹å‰²ã€ã«ã‚‚割り当ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ *è¦å‘Š* ã“ã®ã€Œèƒ½åŠ›ã€ãŒã‚る「役割ã€ã‚’æŒã¤ãƒ¡ãƒ³ãƒãƒ¼ãªã‚‰èª°ã§ã‚‚自分自身ã¨ã€ä»–ã®ã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ä»¥å¤–ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’ç¾åœ¨ä»¥ä¸Šã®æ¨©é™ã®ã‚る「役割ã€ã«å‰²ã‚Šå½“ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã¤ã¾ã‚Šã€ã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ä»¥å¤–ã®äººãŒã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ã«è¿‘ã„力をæŒã¤ã‚ˆã†è¨å®šã§ãã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ ã“ã®ã€Œèƒ½åŠ›ã€ã‚’割り当ã¦ã‚‹å‰ã«ã€è‡ªåˆ†ãŒã—よã†ã¨ã—ã¦ã„ã‚‹ã“ã¨ã‚’よã把æ¡ã—ã¦ãã ã•ã„。" name="role assign member" value="8"/> <action description="役割ã‹ã‚‰ãƒ¡ãƒ³ãƒãƒ¼ã‚’解除" longdescription="「割り当ã¦ã‚‰ã‚ŒãŸå½¹å‰²ã€ï¼ˆã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「メンãƒãƒ¼ã€ã‚¿ãƒ–）ã®ãƒªã‚¹ãƒˆã§ã€ãƒ¡ãƒ³ãƒãƒ¼ã‚’「役割ã€ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚ 「オーナーã€ã¯å‰Šé™¤ã§ãã¾ã›ã‚“。" name="role remove member" value="9"/> <action description="役割ã®èƒ½åŠ›ã®å‰²ã‚Šå½“ã¦ã¨è§£é™¤" longdescription="「許å¯ã•ã‚ŒãŸèƒ½åŠ›ã€ï¼ˆã€Œå½¹å‰²ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ > 「役割ã€ã‚¿ãƒ–）ã®ãƒªã‚¹ãƒˆã«ã‚ã‚‹ã€å„「役割ã€ã®ã€Œèƒ½åŠ›ã€ã‚’割り当ã¦ãŸã‚Šã€å‰Šé™¤ã—ã¾ã™ã€‚ *è¦å‘Š* ã“ã®ã€Œèƒ½åŠ›ã€ãŒã‚る「役割ã€ã‚’æŒã¤ãƒ¡ãƒ³ãƒãƒ¼ãªã‚‰èª°ã§ã‚‚自分自身ã¨ã€ä»–ã®ã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ä»¥å¤–ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’ã™ã¹ã¦ã®ã€Œèƒ½åŠ›ã€ã€ã«å‰²ã‚Šå½“ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã¤ã¾ã‚Šã€ã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ä»¥å¤–ã®äººãŒã€Œã‚ªãƒ¼ãƒŠãƒ¼ã€ã«è¿‘ã„権é™ã‚’æŒã¤ã‚ˆã†è¨å®šã§ãã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ ã“ã®ã€Œèƒ½åŠ›ã€ã‚’割り当ã¦ã‚‹å‰ã«ã€è‡ªåˆ†ãŒã—よã†ã¨ã—ã¦ã„ã‚‹ã“ã¨ã‚’よã把æ¡ã—ã¦ãã ã•ã„。" name="role change actions" value="10"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®å…¬é–‹æ€§ã‚„ç†å¿µã€è¨˜ç« ã®å¤‰æ›´ã¨ã„ã£ãŸã€ã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚¢ã‚¤ãƒ‡ãƒ³ãƒ†ã‚£ãƒ†ã‚£ã‚’ä¿®æ£ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Group Identity"> - <action description="ç†å¿µã€è¨˜ç« ã€ã€ŒWeb上ã§å…¬é–‹ã€ã€ãŠã‚ˆã³ã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±å†…ã§å…¬é–‹ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’変更。" longdescription="ç†å¿µã€è¨˜ç« ã€ã€Œæ¤œç´¢ã«è¡¨ç¤ºã€ã®å¤‰æ›´ã‚’ã—ã¾ã™ã€‚ 「一般ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§è¡Œãˆã¾ã™ã€‚" name="group change identity" value="11"/> + <action description="ç†å¿µã€è¨˜ç« ã€ã€ŒWeb 上ã§å…¬é–‹ã€ã€ãŠã‚ˆã³ã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±å†…ã§å…¬é–‹ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’変更。" longdescription="ç†å¿µã€è¨˜ç« ã€ã€Œæ¤œç´¢ã«è¡¨ç¤ºã€ã®å¤‰æ›´ã‚’ã—ã¾ã™ã€‚ 「一般ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã§è¡Œãˆã¾ã™ã€‚" name="group change identity" value="11"/> </action_set> <action_set description="ã“れらã®ã€Œèƒ½åŠ›ã€ã«ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®æ‰€æœ‰åœ°ã®è²æ¸¡ã€ä¿®æ£ã€è²©å£²ã‚’ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã™ã€‚ ã€ŒåœŸåœ°æƒ…å ±ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’見るã«ã¯ã€åœ°é¢ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€ŒåœŸåœ°æƒ…å ±ã€ã‚’é¸ã¶ã‹ã€ãƒŠãƒ“ゲーションãƒãƒ¼ã®ã€Œiã€ã‚¢ã‚¤ã‚³ãƒ³ã‚’クリックã—ã¾ã™ã€‚" name="Parcel Management"> <action description="グループ用ã®åœŸåœ°ã®è²æ¸¡ã¨è³¼å…¥" longdescription="グループ用ã®åœŸåœ°ã®è²æ¸¡ã¨è³¼å…¥ã‚’è¡Œã„ã¾ã™ã€‚ ã“ã®æ“作ã«ã¯ã€åœŸåœ°æƒ…å ±ç”»é¢ ï¼ž 一般タブを使ã„ã¾ã™ã€‚" name="land deed" value="12"/> - <action description="Lindenç·ç£ã«åœŸåœ°ã‚’明ã‘渡ã™" longdescription="Lindenç·ç£ã«åœŸåœ°ã‚’明ã‘渡ã—ã¾ã™ã€‚ *è¦å‘Š* ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œä¸€èˆ¬ã€ã§ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åœŸåœ°ã‚’放棄ã—ã¦ã€å£²ã‚Šä¸Šã’ãªã—ã§Lindenç·ç£ã«æ˜Žã‘渡ã™ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®èƒ½åŠ›ã®å‰²ã‚Šå½“ã¦ã¯ã€ãã®ã“ã¨ã‚’ç†è§£ã—ãŸä¸Šã§è¡Œã£ã¦ãã ã•ã„。" name="land release" value="13"/> + <action description="リンデンç·ç£ã«åœŸåœ°ã‚’明ã‘渡ã™" longdescription="リンデンç·ç£ã«åœŸåœ°ã‚’明ã‘渡ã—ã¾ã™ã€‚ *è¦å‘Š* ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œä¸€èˆ¬ã€ã§ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åœŸåœ°ã‚’放棄ã—ã¦ã€å£²ã‚Šä¸Šã’ãªã—ã§ãƒªãƒ³ãƒ‡ãƒ³ç·ç£ã«æ˜Žã‘渡ã™ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®èƒ½åŠ›ã®å‰²ã‚Šå½“ã¦ã¯ã€ãã®ã“ã¨ã‚’ç†è§£ã—ãŸä¸Šã§è¡Œã£ã¦ãã ã•ã„。" name="land release" value="13"/> <action description="å£²ã‚Šåœ°æƒ…å ±ã®è¨å®š" longdescription="å£²ã‚Šåœ°æƒ…å ±ã‚’è¨å®šã—ã¾ã™ã€‚ *è¦å‘Š* ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œä¸€èˆ¬ã€ã‚¿ãƒ–ã§ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åœŸåœ°ã‚’自分ã®æ€ã„ã©ãŠã‚Šã«è²©å£²ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®èƒ½åŠ›ã®å‰²ã‚Šå½“ã¦ã¯ã€ãã®ã“ã¨ã‚’ç†è§£ã—ãŸä¸Šã§è¡Œã£ã¦ãã ã•ã„。" name="land set sale info" value="14"/> <action description="区画ã®å†åˆ†å‰²ã¨çµ±åˆ" longdescription="区画をå†åˆ†å‰²ã€çµ±åˆã—ã¾ã™ã€‚ 地é¢ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€Œåœ°å½¢ã‚’編集ã€ã‚’é¸ã³ã€ãƒžã‚¦ã‚¹ã‚’土地ã®ä¸Šã§ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ç¯„囲をé¸æŠžã—ã¾ã™ã€‚ å†åˆ†å‰²ã™ã‚‹ã«ã¯ã€åˆ†å‰²å¯¾è±¡ã‚’é¸ã‚“ã§ã€Œå†åˆ†å‰²ã€ã‚’クリックã—ã¾ã™ã€‚ çµ±åˆã™ã‚‹ã«ã¯ã€2ã¤ä»¥ä¸Šã®éš£æŽ¥ã™ã‚‹åŒºç”»ã‚’é¸ã‚“ã§ã€Œçµ±åˆã€ã‚’クリックã—ã¾ã™ã€‚" name="land divide join" value="15"/> </action_set> - <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€åŒºç”»åã€å…¬é–‹è¨å®šã€æ¤œç´¢ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ç™»éŒ²ã€ç€åœ°ç‚¹ãªã‚‰ã³ã«TPルートã®ã‚ªãƒ—ションを変更ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Identity"> + <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€åŒºç”»åã€å…¬é–‹è¨å®šã€æ¤œç´¢ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ç™»éŒ²ã€ç€åœ°ç‚¹ãªã‚‰ã³ã« TP ルートã®ã‚ªãƒ—ションを変更ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Identity"> <action description="ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã‚’切り替ãˆã‚«ãƒ†ã‚´ãƒªã‚’è¨å®š" longdescription="ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã«åˆ‡ã‚Šæ›¿ãˆã€ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–ã§åŒºç”»ã®ã‚«ãƒ†ã‚´ãƒªã‚’è¨å®šã—ã¾ã™ã€‚" name="land find places" value="17"/> <action description="区画åã€èª¬æ˜Žã€ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã®è¨å®šã‚’変更" longdescription="区画åã€èª¬æ˜Žã€ã€Œå ´æ‰€æ¤œç´¢ã«è¡¨ç¤ºã€ã®è¨å®šã‚’変更ã—ã¾ã™ã€‚ ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land change identity" value="18"/> - <action description="ç€åœ°ç‚¹ãŠã‚ˆã³ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒ«ãƒ¼ãƒˆã‚’è¨å®š" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åŒºç”»ä¸Šã§ç€åœ°ç‚¹ã‚’è¨å®šã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šå¤–部ã‹ã‚‰ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®åˆ°ç€ä½ç½®ã‚’指定ã§ãã‚‹ã¨å…±ã«ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒ«ãƒ¼ãƒˆã‚’è¨å®šã—ã¦ç´°ã‹ã制御ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æ“作ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land set landing point" value="19"/> + <action description="ç€åœ°ç‚¹ãŠã‚ˆã³ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ«ãƒ¼ãƒˆã‚’è¨å®š" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åŒºç”»ä¸Šã§ç€åœ°ç‚¹ã‚’è¨å®šã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šå¤–部ã‹ã‚‰ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®åˆ°ç€ä½ç½®ã‚’指定ã§ãã‚‹ã¨å…±ã«ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ«ãƒ¼ãƒˆã‚’è¨å®šã—ã¦ç´°ã‹ã制御ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æ“作ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land set landing point" value="19"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã€Œã‚ªãƒ–ジェクトを作æˆã€ã€ã€Œåœ°å½¢ã‚’編集ã€ã€éŸ³æ¥½ã¨ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¨å®šãªã©ã€åŒºç”»ã®ã‚ªãƒ—ションã«é–¢é€£ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Settings"> - <action description="音楽ã¨ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¨å®šã‚’変更" longdescription="ストリーミング・ミュージックã¨å‹•ç”»ã®è¨å®šã‚’変更ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ ï¼ž 「メディアã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land change media" value="20"/> - <action description="「地形を編集ã€ã«åˆ‡ã‚Šæ›¿ãˆ" longdescription="「地形を編集ã€ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚ *è¦å‘Š* ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ï¼žã€Œåœ°å½¢ã‚’編集ã€ã®é †ã§é€²ã‚€ã¨ã€èª°ã§ã‚‚ã‚ãªãŸã®åœŸåœ°ã®å½¢ã®æ•´å‚™ã‚„ã€ãƒªãƒ³ãƒ‡ãƒ³ãƒ—ラントã®è¨ç½®ã€ç§»å‹•ãŒã§ãã¾ã™ã€‚ ã“ã®èƒ½åŠ›ã‚’割り振るå‰ã«ã€ã“ã®ã“ã¨ã‚’よãç†è§£ã—ã¦ãŠã„ã¦ãã ã•ã„。 ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–ã‹ã‚‰ã€Œåœ°å½¢ã‚’編集ã€ã«åˆ‡ã‚Šæ›¿ãˆã‚‰ã‚Œã¾ã™ã€‚" name="land edit" value="21"/> + <action description="音楽ã¨ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¨å®šã‚’変更" longdescription="ストリーミングミュージックã¨å‹•ç”»ã®è¨å®šã‚’変更ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ ï¼ž 「メディアã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land change media" value="20"/> + <action description="「地形を編集ã€ã«åˆ‡ã‚Šæ›¿ãˆ" longdescription="「地形を編集ã€ã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚ *è¦å‘Š* ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ï¼žã€Œåœ°å½¢ã‚’編集ã€ã®é †ã§é€²ã‚€ã¨ã€èª°ã§ã‚‚ã‚ãªãŸã®åœŸåœ°ã®å½¢ã®æ•´å‚™ã‚„ã€ãƒªãƒ³ãƒ‡ãƒ³è£½ã®æ¨¹æœ¨ã®è¨ç½®ã€ç§»å‹•ãŒã§ãã¾ã™ã€‚ ã“ã®èƒ½åŠ›ã‚’割り振るå‰ã«ã€ã“ã®ã“ã¨ã‚’よãç†è§£ã—ã¦ãŠã„ã¦ãã ã•ã„。 ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–ã‹ã‚‰ã€Œåœ°å½¢ã‚’編集ã€ã«åˆ‡ã‚Šæ›¿ãˆã‚‰ã‚Œã¾ã™ã€‚" name="land edit" value="21"/> <action description="ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ—ションã€ã‚¿ãƒ–内ã®ã•ã¾ã–ã¾ãªè¨å®šã‚’切り替ãˆ" longdescription="「安全（ダメージãªã—）ã€ã€ã€Œé£›è¡Œã€ã‚’切り替ãˆã€ä½äººã«ä»¥ä¸‹ã‚’許å¯ã—ã¾ã™ï¼š グループ所有地ã®ã€ŒåœŸåœ°æƒ…å ±ã€ > 「オプションã€ã‚¿ãƒ–内ã®ã€ã€Œåœ°å½¢ã‚’編集ã€ã€ã€Œåˆ¶ä½œã€ã€ã€Œãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã®ä½œæˆã€ã€ã€Œã‚¹ã‚¯ãƒªãƒ—トã®å®Ÿè¡Œã€ã€‚" name="land options" value="22"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åŒºç”»ã«é–¢ã™ã‚‹è¦åˆ¶ã‚’迂回ã™ã‚‹ã“ã¨ã‚’ã€ãƒ¡ãƒ³ãƒãƒ¼ã«è¨±å¯ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Powers"> @@ -41,24 +41,24 @@ <action description="グループã®åœŸåœ°ã¸ã®ã€Œãƒ›ãƒ¼ãƒ è¨å®šã€ã‚’許å¯" longdescription="ã“ã®ã€Œå½¹å‰²ã€ã‚’æŒã¤ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«è²æ¸¡ã•ã‚ŒãŸåŒºç”»ä¸Šã§ã€Œä¸–ç•Œã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ > ランドマーク > ç¾åœ¨åœ°ã‚’ホームã«è¨å®š を使用ã—ã¦ã€ãƒ›ãƒ¼ãƒ ã®è¨å®šã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚" name="land allow set home" value="28"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ä½äººã®å‡çµã‚„追放をå«ã‚€ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åŒºç”»ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã€åˆ¶é™ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Parcel Access"> - <action description="区画アクセス・リストã®ç®¡ç†" longdescription="区画アクセス・リストã®ç®¡ç†ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚¢ã‚¯ã‚»ã‚¹ã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land manage allowed" value="29"/> + <action description="区画アクセスリストã®ç®¡ç†" longdescription="区画アクセス・リストã®ç®¡ç†ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚¢ã‚¯ã‚»ã‚¹ã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚" name="land manage allowed" value="29"/> <action description="区画ç¦æ¢ãƒªã‚¹ãƒˆã®ç®¡ç†" longdescription="ã€ŒåœŸåœ°æƒ…å ±ã€ > 「アクセスã€ã‚¿ãƒ–ã®ã€åŒºç”»ã®ç¦æ¢ãƒªã‚¹ãƒˆã®ç®¡ç†ãŒã§ãã¾ã™ã€‚" name="land manage banned" value="30"/> <action description="ã€Œå…¥å ´è¨±å¯ã‚’販売ã€ã®è¨å®šã‚’変更" longdescription="ã€ŒåœŸåœ°æƒ…å ±ã€ > 「アクセスã€ã‚¿ãƒ–ã§ã€åŒºç”»ã®ã€Œå…¥å ´è¨±å¯ã‚’販売ã€ã®è¨å®šã‚’変更ã—ã¾ã™ã€‚" name="land manage passes" value="31"/> - <action description="区画上ã®ä½äººã®è¿½æ”¾ã¨å‡çµ" longdescription="ã“ã®ã€Œèƒ½åŠ›ã€ã‚’æŒã¤ã€Œå½¹å‰²ã€ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有地ã«ã„ã¦æ¬²ã—ããªã„ä½äººã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã€ã€Œè¿½æ”¾ã€ã‚„「フリーズã€ã‚’é¸ã‚“ã§å¯¾å¿œã§ãã¾ã™ã€‚" name="land admin" value="32"/> + <action description="区画上ã®ä½äººã®è¿½æ”¾ã¨ãƒ•ãƒªãƒ¼ã‚º" longdescription="ã“ã®ã€Œèƒ½åŠ›ã€ã‚’æŒã¤ã€Œå½¹å‰²ã€ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有地ã«ã„ã¦æ¬²ã—ããªã„ä½äººã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã€ã€Œè¿½æ”¾ã€ã‚„「フリーズã€ã‚’é¸ã‚“ã§å¯¾å¿œã§ãã¾ã™ã€‚" name="land admin" value="32"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚ªãƒ–ジェクトã®è¿”å´ã€ãƒªãƒ³ãƒ‡ãƒ³ãƒ—ラントã®è¨ç½®ã‚„移動をã€ãƒ¡ãƒ³ãƒãƒ¼ã«è¨±å¯ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚ ã“ã‚Œã¯ãƒ¡ãƒ³ãƒãƒ¼ãŒã‚´ãƒŸå‡¦ç†ã‚„景観作æˆã‚’ã™ã‚‹éš›ã«ä¾¿åˆ©ã§ã™ãŒã€è¿”å´ã—ãŸã‚ªãƒ–ジェクトã¯å…ƒã«æˆ»ã›ãªã„ã®ã§ã€æ³¨æ„ã—ã¦è¡Œã„ã¾ã—ょã†ã€‚" name="Parcel Content"> <action description="グループ所有オブジェクトã®è¿”å´" longdescription="グループ所有ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®ã‚ªãƒ–ジェクトを返å´ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ–ジェクトã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land return group owned" value="48"/> <action description="グループã«è¨å®šã•ã‚Œã¦ã„るオブジェクトを返å´" longdescription="グループ所有ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ—ã«è¨å®šã•ã‚Œã¦ã„るオブジェクトを返å´ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ–ジェクトã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land return group set" value="33"/> - <action description="éžã‚°ãƒ«ãƒ¼ãƒ—・オブジェクトã®è¿”å´" longdescription="グループ所有ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ—以外ã®ã‚ªãƒ–ジェクトを返å´ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ–ジェクトã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land return non group" value="34"/> - <action description="Linden製ã®æ¤ç‰©ã‚’使用ã—ã¦æ™¯è¦³ä½œæˆ" longdescription="リンデン製ã®æ¨¹æœ¨ã€æ¤ç‰©ã€è‰ã‚’æ¤ãˆã‚‹ã€æ™¯è¦³ã¥ãã‚Šã®èƒ½åŠ›ã§ã™ã€‚ ã“れらã®æ¤ç‰©ã¯ã‚ãªãŸã®æŒã¡ç‰©å†…ã®ã€Œãƒ©ã‚¤ãƒ–ラリ〠> 「オブジェクトã€ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚ã‚Šã¾ã™ã€‚「制作ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã§ä½œæˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚" name="land gardening" value="35"/> + <action description="éžã‚°ãƒ«ãƒ¼ãƒ—オブジェクトã®è¿”å´" longdescription="グループ所有ã®åŒºç”»ä¸Šã®ã‚ªãƒ–ジェクトã®ã†ã¡ã€ã‚°ãƒ«ãƒ¼ãƒ—以外ã®ã‚ªãƒ–ジェクトを返å´ã™ã‚‹ã«ã¯ã€ã€ŒåœŸåœ°æƒ…å ±ã€ï¼žã€Œã‚ªãƒ–ジェクトã€ã‚¿ãƒ–を使ã„ã¾ã™ã€‚" name="land return non group" value="34"/> + <action description="リンデン製ã®æ¤ç‰©ã‚’使用ã—ã¦æ™¯è¦³ä½œæˆ" longdescription="リンデン製ã®æ¨¹æœ¨ã€æ¤ç‰©ã€è‰ã‚’æ¤ãˆã‚‹ã€æ™¯è¦³ã¥ãã‚Šã®èƒ½åŠ›ã§ã™ã€‚ ã“れらã®æ¤ç‰©ã¯ã‚ãªãŸã®æŒã¡ç‰©å†…ã®ã€Œãƒ©ã‚¤ãƒ–ラリ〠> 「オブジェクトã€ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚ã‚Šã¾ã™ã€‚「制作ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã§ä½œæˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚" name="land gardening" value="35"/> </action_set> <action_set description="ã“れらã®ã€Œèƒ½åŠ›ã€ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®ã‚ªãƒ–ジェクトをè²æ¸¡ã€ä¿®æ£ã€è²©å£²ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚ 変更ã¯ã€Œåˆ¶ä½œãƒ„ール〠> 「一般ã€ã‚¿ãƒ–ã§è¡Œã„ã¾ã™ã€‚ オブジェクトをå³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€Œç·¨é›†ã€ã‚’é–‹ãã¨è¨å®šå†…容を確èªã§ãã¾ã™ã€‚" name="Object Management"> <action description="グループã«ã‚ªãƒ–ジェクトをè²æ¸¡" longdescription="「制作ツール〠> 「一般ã€ã‚¿ãƒ–ã§ã€ã‚ªãƒ–ジェクトをグループã«è²æ¸¡ã—ã¾ã™ã€‚" name="object deed" value="36"/> <action description="グループ所有オブジェクトã®æ“作（移動ã€ã‚³ãƒ”ーã€ä¿®æ£ï¼‰" longdescription="「制作ツール〠> 「一般ã€ã‚¿ãƒ–ã§ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®ã‚ªãƒ–ジェクトをæ“作（移動ã€ã‚³ãƒ”ーã€ä¿®æ£ï¼‰ã—ã¾ã™ã€‚" name="object manipulate" value="38"/> <action description="グループ所有オブジェクトを販売å¯èƒ½ã«è¨å®š" longdescription="「制作ツール〠> 「一般ã€ã‚¿ãƒ–ã§ã€ã‚°ãƒ«ãƒ¼ãƒ—所有ã®ã‚ªãƒ–ジェクトを販売対象ã«è¨å®šã—ã¾ã™ã€‚" name="object set sale" value="39"/> </action_set> - <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ãƒ¡ãƒ³ãƒãƒ¼ã«ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®è² 債ã®æ”¯æ‰•ã„ã¨åˆ©åå—ã‘å–ã‚Šã‚’è¦æ±‚ã™ã‚‹æ¨©é™ã€ã‚°ãƒ«ãƒ¼ãƒ—å£åº§å±¥æ´ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’制é™ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Accounting"> - <action description="ã‚°ãƒ«ãƒ¼ãƒ—è² å‚µã®è¿”済ã¨ã‚°ãƒ«ãƒ¼ãƒ—é…当ã®å—é ˜" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã«ã¤ã„ã¦ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—è² å‚µã®æ”¯æ‰•ã„ã¨ã‚°ãƒ«ãƒ¼ãƒ—é…当ã®å—ã‘å–ã‚ŠãŒè‡ªå‹•çš„ã«è¡Œã‚ã‚Œã¾ã™ã€‚ ã¤ã¾ã‚Šã€ã“れらã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€æ¯Žæ—¥é…当ã•ã‚Œã‚‹ã‚°ãƒ«ãƒ¼ãƒ—所有ã®åœŸåœ°ã®å£²ã‚Šä¸Šã’金ã®ä¸€éƒ¨ã‚’å—ã‘å–ã‚‹ã¨å…±ã«ã€åŒºç”»ã®åºƒå‘Šè²»ãªã©ã‚’è² æ‹…ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚" name="accounting accountable" value="40"/> + <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ãƒ¡ãƒ³ãƒãƒ¼ã«ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®è² 債ã®æ”¯æ‰•ã„ã¨åˆ©åå—ã‘å–ã‚Šã‚’è¦æ±‚ã™ã‚‹æ¨©é™ã€ã‚°ãƒ«ãƒ¼ãƒ—å£åº§å±¥æ´ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’制é™ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Accounting"><action description="ã‚°ãƒ«ãƒ¼ãƒ—è² å‚µã®è¿”済ã¨ã‚°ãƒ«ãƒ¼ãƒ—é…当ã®å—é ˜" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã«ã¤ã„ã¦ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—è² å‚µã®æ”¯æ‰•ã„ã¨ã‚°ãƒ«ãƒ¼ãƒ—é…当ã®å—ã‘å–ã‚ŠãŒè‡ªå‹•çš„ã«è¡Œã‚ã‚Œã¾ã™ã€‚ + ã¤ã¾ã‚Šã€ã“れらã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€æ¯Žæ—¥é…当ã•ã‚Œã‚‹ã‚°ãƒ«ãƒ¼ãƒ—所有地ã®å£²ã‚Šä¸Šã’金ã®ä¸€éƒ¨ã‚’å—ã‘å–ã‚‹ã¨å…±ã«ã€åŒºç”»ã®åºƒå‘Šè²»ãªã©ã‚’è² æ‹…ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚" name="accounting accountable" value="40"/> </action_set> <action_set description="ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—通知ã®é€ä¿¡ã€å—ä¿¡ã€è¡¨ç¤ºã‚’メンãƒãƒ¼ã«è¨±å¯ã™ã‚‹æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚" name="Notices"> <action description="通知をé€ä¿¡" longdescription="ã“ã®ã€Œèƒ½åŠ›ã€ã‚’æŒã¤ã€Œå½¹å‰²ã€ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã€Œã‚°ãƒ«ãƒ¼ãƒ—〠> 「通知ã€ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰é€šçŸ¥ã‚’é€ä¿¡ã§ãã¾ã™ã€‚" name="notices send" value="42"/> @@ -68,9 +68,9 @@ <action description="æ案を作æˆ" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€æŠ•ç¥¨ã®å¯¾è±¡ã¨ãªã‚‹å•é¡Œæèµ·ã‚’ã€Œã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±ã€ï¼žã€Œå•é¡Œæèµ·ã€ã‚¿ãƒ–上ã§ä½œæˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" name="proposal start" value="44"/> <action description="å•é¡Œæèµ·ã«æŠ•ç¥¨ã™ã‚‹" longdescription="ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—æƒ…å ±ï¼žæ案タブã§æ案ã«æŠ•ç¥¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" name="proposal vote" value="45"/> </action_set> - <action_set description=" ã“れらã®ã‚¢ãƒ“リティã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚„グループ・ボイス・ãƒãƒ£ãƒƒãƒˆã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã®è¨±å¯ã‚„制é™ã®æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚ " name="Chat"> - <action description="グループ・ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹" longdescription=" ã“ã®ã‚¢ãƒ“リティをæŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ†ã‚ストãŠã‚ˆã³ãƒœã‚¤ã‚¹ã§å‚åŠ ã§ãã¾ã™ã€‚ " name="join group chat"/> - <action description="グループ・ボイス・ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹" longdescription=" ã“ã®ã‚¢ãƒ“リティをæŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・ボイス・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«å‚åŠ ã§ãã¾ã™ã€‚ 注： ボイス・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹ã‚¢ãƒ“リティãŒå¿…è¦ã§ã™ã€‚ " name="join voice chat"/> - <action description="グループ・ãƒãƒ£ãƒƒãƒˆã‚’管ç†ã™ã‚‹" longdescription=" ã“ã®ã‚¢ãƒ“リティをæŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—・ボイス・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ãŠã‚ˆã³ã‚°ãƒ«ãƒ¼ãƒ—・テã‚スト・ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚„å‚åŠ ã‚’ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ " name="moderate group chat"/> + <action_set description=" ã“れらã®èƒ½åŠ›ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚„グループボイスãƒãƒ£ãƒƒãƒˆã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã®è¨±å¯ã‚„制é™ã®æ¨©é™ãŒå«ã¾ã‚Œã¾ã™ã€‚ " name="Chat"> + <action description="グループãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹" longdescription=" ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ†ã‚ストãŠã‚ˆã³ãƒœã‚¤ã‚¹ã§å‚åŠ ã§ãã¾ã™ã€‚ " name="join group chat"/> + <action description="グループボイスãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹" longdescription=" ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«å‚åŠ ã§ãã¾ã™ã€‚ 注： ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ãƒãƒ£ãƒƒãƒˆã«å‚åŠ ã™ã‚‹èƒ½åŠ›ãŒå¿…è¦ã§ã™ã€‚ " name="join voice chat"/> + <action description="グループãƒãƒ£ãƒƒãƒˆã‚’管ç†ã™ã‚‹" longdescription=" ã“ã®èƒ½åŠ›ã‚’æŒã¤å½¹å‰²ã®ãƒ¡ãƒ³ãƒãƒ¼ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ボイスãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ãŠã‚ˆã³ã‚°ãƒ«ãƒ¼ãƒ—テã‚ストãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚„å‚åŠ ã‚’ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ " name="moderate group chat"/> </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml index c2d2af5346..ff9b5dc6aa 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml @@ -37,8 +37,8 @@ Mixed Sale </panel.string> <text name="title" value="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«"/> - <text name="where" value="（ワールド内）"/> - <panel label=""> + <text name="where" value="（インワールド）"/> + <panel label="" name="properties_panel"> <text name="Name:"> åå‰ï¼š </text> @@ -60,7 +60,7 @@ <text name="Group_label"> グループ： </text> - <button name="button set group" tool_tip="ã“ã®ã‚ªãƒ–ジェクト権é™ã‚’共有ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠž"/> + <button name="button set group" tool_tip="ã“ã®ã‚ªãƒ–ジェクト権é™ã‚’共有ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—ã‚’é¸æŠžã—ã¾ã™"/> <name_box initial_value="ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°..." name="Group Name Proxy"/> <button label="è²æ¸¡" label_selected="è²æ¸¡" name="button deed" tool_tip="ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’è²æ¸¡ã™ã‚‹ã¨ã€Œæ¬¡ã®æ‰€æœ‰è€…ã€ã®æ¨©é™ãŒé©ç”¨ã•ã‚Œã¾ã™ã€‚ グループ共有オブジェクトã¯ã€ã‚°ãƒ«ãƒ¼ãƒ—ã®ã‚ªãƒ•ã‚£ã‚µãƒ¼ãŒè²æ¸¡ã§ãã¾ã™ã€‚"/> <text name="label click action"> @@ -91,7 +91,7 @@ </text> <check_box label="ä¿®æ£" name="checkbox next owner can modify"/> <check_box label="コピー" name="checkbox next owner can copy"/> - <check_box label="å†è²©ãƒ»ãƒ—レゼント" name="checkbox next owner can transfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™"/> + <check_box label="å†è²©ãƒ»ãƒ—レゼント" name="checkbox next owner can transfer" tool_tip="次ã®æ‰€æœ‰è€…ã¯ã“ã®ã‚ªãƒ–ジェクトを他人ã«ã‚ã’ãŸã‚Šå†è²©ã§ãã¾ã™"/> </panel> <check_box label="販売ä¸" name="checkbox for sale"/> <combo_box name="sale type"> @@ -124,5 +124,6 @@ <button label="é–‹ã" name="open_btn"/> <button label="支払ã†" name="pay_btn"/> <button label="è²·ã†" name="buy_btn"/> + <button label="詳細" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index de628943ad..688e4751de 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -38,16 +38,16 @@ èªè¨¼ã—ã¦ã„ã¾ã™... </string> <string name="LoginMaintenance"> - アカウント・メンテナンスを実行ã—ã¦ã„ã¾ã™... + アカウントã®ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã‚’実行ã—ã¦ã„ã¾ã™... </string> <string name="LoginAttempt"> - å‰å›žã®ãƒã‚°ã‚¤ãƒ³ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™([NUMBER]回目) + å‰å›žã®ãƒã‚°ã‚¤ãƒ³ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™ï¼ˆ[NUMBER] 回目） </string> <string name="LoginPrecaching"> - ワールドをãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™... + ワールドをèªã¿è¾¼ã‚“ã§ã„ã¾ã™... </string> <string name="LoginInitializingBrowser"> - 埋ã‚è¾¼ã¿WebブラウザをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™... + 内蔵 Web ブラウザをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™... </string> <string name="LoginInitializingMultimedia"> マルãƒãƒ¡ãƒ‡ã‚£ã‚¢ã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™... @@ -56,7 +56,7 @@ フォントをãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ä¸... </string> <string name="LoginVerifyingCache"> - ã‚ャッシュ・ファイルを検証ã—ã¦ã„ã¾ã™(所è¦æ™‚é–“ã¯60～90秒)... + ã‚ャッシュファイルを検証ã—ã¦ã„ã¾ã™ï¼ˆæ‰€è¦æ™‚間㯠60 ～ 90 秒）... </string> <string name="LoginProcessingResponse"> å¿œç”を処ç†ã—ã¦ã„ã¾ã™... @@ -68,22 +68,22 @@ ç”»åƒã‚’デコードã—ã¦ã„ã¾ã™... </string> <string name="LoginInitializingQuicktime"> - QuickTimeã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™... + QuickTime ã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™... </string> <string name="LoginQuicktimeNotFound"> - QuickTimeãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ + QuickTime ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ </string> <string name="LoginQuicktimeOK"> - QuickTimeãŒæ£å¸¸ã«åˆæœŸåŒ–ã•ã‚Œã¾ã—ãŸã€‚ + QuickTime ãŒæ£å¸¸ã«åˆæœŸåŒ–ã•ã‚Œã¾ã—ãŸã€‚ </string> <string name="LoginWaitingForRegionHandshake"> - 地域ã®ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯ã‚’å¾…ã£ã¦ã„ã¾ã™... + リージョンã®ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯ã‚’å¾…ã£ã¦ã„ã¾ã™... </string> <string name="LoginConnectingToRegion"> - 地域ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™... + リージョンã«æŽ¥ç¶šã—ã¦ã„ã¾ã™... </string> <string name="LoginDownloadingClothing"> - æœã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™... + 衣類をダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™... </string> <string name="LoginFailedNoNetwork"> ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ï¼š 接続を確立ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ãŠä½¿ã„ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’ã”確èªãã ã•ã„。 @@ -101,19 +101,19 @@ 人 </string> <string name="TooltipNoName"> - (åå‰ãªã—) + （åå‰ãªã—） </string> <string name="TooltipOwner"> - オーナー: + 所有者: </string> <string name="TooltipPublic"> 公共 </string> <string name="TooltipIsGroup"> - (グループ) + （グループ） </string> <string name="TooltipForSaleL$"> - 売り出ã—ä¸:L$[AMOUNT] + 売り出ã—ä¸:L$ [AMOUNT] </string> <string name="TooltipFlagGroupBuild"> ã‚°ãƒ«ãƒ¼ãƒ—ä½œæˆ @@ -131,7 +131,7 @@ 飛行ç¦æ¢ </string> <string name="TooltipFlagGroupScripts"> - グループ・スクリプト + グループスクリプト </string> <string name="TooltipFlagNoScripts"> スクリプトãªã— @@ -140,42 +140,42 @@ 土地: </string> <string name="TooltipMustSingleDrop"> - 1ã¤ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã¿ã‚’ã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã§ãã¾ã™ + アイテム㯠1 ã¤ã ã‘ã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã§ãã¾ã™ </string> <string name="TooltipHttpUrl"> - クリックã—ã¦ã“ã®Webページを見る + クリックã—ã¦ã“ã® Web ページを見ã¾ã™ </string> <string name="TooltipSLURL"> - クリックã—ã¦ã“ã®å ´æ‰€ã®æƒ…å ±ã‚’è¦‹ã‚‹ + クリックã—ã¦ã“ã®å ´æ‰€ã®æƒ…å ±ã‚’è¦‹ã¾ã™ </string> <string name="TooltipAgentUrl"> - クリックã—ã¦ã“ã®ä½äººã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見る + クリックã—ã¦ã“ã®ä½äººã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見ã¾ã™ </string> <string name="TooltipGroupUrl"> - クリックã—ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®èª¬æ˜Žæ–‡ã‚’見る + クリックã—ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®èª¬æ˜Žæ–‡ã‚’見ã¾ã™ </string> <string name="TooltipEventUrl"> - クリックã—ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®èª¬æ˜Žæ–‡ã‚’見る + クリックã—ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®èª¬æ˜Žæ–‡ã‚’見ã¾ã™ </string> <string name="TooltipClassifiedUrl"> - クリックã—ã¦ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’見る + クリックã—ã¦ã“ã®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’見ã¾ã™ </string> <string name="TooltipParcelUrl"> - クリックã—ã¦ã“ã®åŒºç”»ã®èª¬æ˜Žæ–‡ã‚’見る + クリックã—ã¦ã“ã®åŒºç”»ã®èª¬æ˜Žæ–‡ã‚’見ã¾ã™ </string> <string name="TooltipTeleportUrl"> - クリックã—ã¦ã“ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹ + クリックã—ã¦ã“ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ </string> <string name="TooltipObjectIMUrl"> - クリックã—ã¦ã“ã®ã‚ªãƒ–ジェクトã®èª¬æ˜Žæ–‡ã‚’見る + クリックã—ã¦ã“ã®ã‚ªãƒ–ジェクトã®èª¬æ˜Žæ–‡ã‚’見ã¾ã™ </string> <string name="TooltipMapUrl"> - クリックã—ã¦ã“ã®å ´æ‰€ã‚’地図ã«è¡¨ç¤ºã™ã‚‹ + クリックã—ã¦ã“ã®å ´æ‰€ã‚’地図ã«è¡¨ç¤ºã—ã¾ã™ </string> <string name="TooltipSLAPP"> - クリックã—㦠secondlife:// コマンドを出㙠+ クリックã—㦠secondlife:// コマンドを出ã—ã¾ã™ </string> - <string name="CurrentURL" value=" ç¾åœ¨ã®URL： [CurrentURL]"/> + <string name="CurrentURL" value=" ç¾åœ¨ã® URL： [CurrentURL]"/> <string name="SLurlLabelTeleport"> テレãƒãƒ¼ãƒˆ </string> @@ -227,9 +227,6 @@ <string name="AvatarNameMultiple"> （複数） </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> （ãªã—） </string> @@ -387,28 +384,28 @@ æ³£ã </string> <string name="anim_dance1"> - ダンス1 + ダンス 1 </string> <string name="anim_dance2"> - ダンス2 + ダンス 2 </string> <string name="anim_dance3"> - ダンス3 + ダンス 3 </string> <string name="anim_dance4"> - ダンス4 + ダンス 4 </string> <string name="anim_dance5"> - ダンス5 + ダンス 5 </string> <string name="anim_dance6"> - ダンス6 + ダンス 6 </string> <string name="anim_dance7"> - ダンス7 + ダンス 7 </string> <string name="anim_dance8"> - ダンス8 + ダンス 8 </string> <string name="anim_express_disdain"> 侮蔑 @@ -593,11 +590,14 @@ <string name="hang_up"> インワールドボイスãƒãƒ£ãƒƒãƒˆã®é€šè©±ãŒåˆ‡æ–ã•ã‚Œã¾ã—㟠</string> + <string name="reconnect_nearby"> + 「近ãã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã€ã«å†æŽ¥ç¶šã•ã‚Œã¾ã™ + </string> <string name="ScriptQuestionCautionChatGranted"> - [REGIONNAME]ã®[REGIONPOS]ã¨ã„ã†å ´æ‰€ã«ã‚る「[OWNERNAME]ã€æ‰€æœ‰ã®ã€Œ[OBJECTNAME]ã€ã¨ã„ã†ã‚ªãƒ–ジェクトã¯ã€æ¬¡ã®æ¨©é™ã‚’許å¯ã—ã¾ã—ãŸï¼š [PERMISSIONS] + [REGIONNAME] ã® [REGIONPOS] ã¨ã„ã†å ´æ‰€ã«ã‚ã‚‹ã€ã€Œ [OWNERNAME] ã€ãŒæ‰€æœ‰ã™ã‚‹ã€Œ [OBJECTNAME] ã€ã¨ã„ã†ã‚ªãƒ–ジェクトã¯ã€æ¬¡ã®æ¨©é™ã‚’許å¯ã—ã¾ã—ãŸï¼š [PERMISSIONS] </string> <string name="ScriptQuestionCautionChatDenied"> - [REGIONNAME]ã®[REGIONPOS]ã¨ã„ã†å ´æ‰€ã«ã‚る「[OWNERNAME]ã€æ‰€æœ‰ã®ã€Œ[OBJECTNAME]ã€ã¨ã„ã†ã‚ªãƒ–ジェクトã¯ã€æ¬¡ã®æ¨©é™ã‚’æ‹’å¦ã—ã¾ã—ãŸï¼š [PERMISSIONS] + [REGIONNAME] ã® [REGIONPOS] ã¨ã„ã†å ´æ‰€ã«ã‚ã‚‹ã€ã€Œ [OWNERNAME] ã€ãŒæ‰€æœ‰ã™ã‚‹ã€Œ [OBJECTNAME] ã€ã¨ã„ã†ã‚ªãƒ–ジェクトã¯ã€æ¬¡ã®æ¨©é™ã‚’æ‹’å¦ã—ã¾ã—ãŸï¼š [PERMISSIONS] </string> <string name="ScriptTakeMoney"> リンデンドル（L$）を支払ㆠ@@ -636,13 +636,13 @@ 接続ã•ã‚Œã¦ã„ã¾ã›ã‚“ </string> <string name="SIM_ACCESS_PG"> - 一般 + General </string> <string name="SIM_ACCESS_MATURE"> - 控ãˆã‚ + Moderate </string> <string name="SIM_ACCESS_ADULT"> - アダルト + Adult </string> <string name="SIM_ACCESS_DOWN"> オフライン @@ -672,22 +672,22 @@ ãƒãƒ¼ãƒ‰ </string> <string name="targa_image_files"> - Targaç”»åƒ + Targa ç”»åƒ </string> <string name="bitmap_image_files"> ãƒ“ãƒƒãƒˆãƒžãƒƒãƒ—ç”»åƒ </string> <string name="avi_movie_file"> - AVIムービーファイル + AVI ムービーファイル </string> <string name="xaf_animation_file"> - XAFアニメーションファイル + XAF アニメーションファイル </string> <string name="xml_file"> - XMLファイル + XML ファイル </string> <string name="dot_raw_file"> - RAWファイル + RAW ファイル </string> <string name="compressed_image_files"> åœ§ç¸®ç”»åƒ @@ -758,6 +758,9 @@ <string name="invalid"> 無効 </string> + <string name="NewWearable"> + æ–°ã—ã„ [WEARABLE_ITEM] + </string> <string name="next"> 次㸠</string> @@ -792,7 +795,7 @@ ä¸åœ¨ä¸ã«æ–°ã—ã„通知ãŒå±Šãã¾ã—ãŸã€‚ </string> <string name="OverflowInfoChannelString"> - You have %d more notification + ã‚ãªãŸã«ã¯ã•ã‚‰ã« %d 通ã®é€šçŸ¥ãŒã‚ã‚Šã¾ã™ </string> <string name="BodyPartsRightArm"> å³è…• @@ -822,16 +825,16 @@ 高 </string> <string name="LeaveMouselook"> - ESC ã‚ーを押ã—ã¦ãƒ¯ãƒ¼ãƒ«ãƒ‰ãƒ“ューã«æˆ»ã‚‹ + ESC ã‚ーを押ã—ã¦ãƒ¯ãƒ¼ãƒ«ãƒ‰ãƒ“ューã«æˆ»ã‚Šã¾ã™ </string> <string name="InventoryNoMatchingItems"> - 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒæŒã¡ç‰©ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—㟠+ 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒæŒã¡ç‰©ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ [secondlife:///app/search/groups 「検索ã€] ã‚’ãŠè©¦ã—ãã ã•ã„。 </string> <string name="FavoritesNoMatchingItems"> ã“ã“ã«ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’ドラッグã—ã¦ã€ãŠæ°—ã«å…¥ã‚Šã«è¿½åŠ ã—ã¾ã™ã€‚ </string> <string name="InventoryNoTexture"> - æŒã¡ç‰©å†…ã«ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ã‚³ãƒ”ーãŒã‚ã‚Šã¾ã›ã‚“ + 「æŒã¡ç‰©ã€å†…ã«ã“ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ã‚³ãƒ”ーãŒã‚ã‚Šã¾ã›ã‚“ </string> <string name="no_transfer" value=" （å†è²©ãƒ»ãƒ—レゼントä¸å¯ï¼‰"/> <string name="no_modify" value=" （編集ä¸å¯ï¼‰"/> @@ -910,7 +913,7 @@ æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€ </string> <string name="InvFolder Inventory"> - インベントリ + æŒã¡ç‰© </string> <string name="InvFolder Uncompressed Images"> 圧縮ã•ã‚Œã¦ã„ãªã„ç”»åƒ @@ -955,7 +958,7 @@ 買ㆠ</string> <string name="BuyforL$"> - Buy for L$ + L$ ã§è³¼å…¥ </string> <string name="Stone"> 石 @@ -1256,7 +1259,7 @@ （ä¸æ˜Žï¼‰ </string> <string name="SummaryForTheWeek" value="今週ã®ã¾ã¨ã‚。開始日ã¯"/> - <string name="NextStipendDay" value="次回ã®ãŠå°é£ã„支給日ã¯"/> + <string name="NextStipendDay" value="ã§ã™ã€‚次回ã®ãŠå°é£ã„支給日："/> <string name="GroupIndividualShare" value=" グループ 個人ã®å‰²ã‚Šå½“ã¦"/> <string name="Balance"> 残高 @@ -1316,14 +1319,17 @@ 区画ã®ã‚¹ã‚¯ãƒªãƒ—トURL </string> <string name="ScriptLimitsURLsUsed"> - 使用ã•ã‚ŒãŸURL： [MAX] ä¸ [COUNT] ：[AVAILABLE] åˆ©ç”¨å¯ + 使用ã•ã‚ŒãŸ URL： [MAX] ä¸ [COUNT] ：[AVAILABLE] åˆ©ç”¨å¯ </string> <string name="ScriptLimitsURLsUsedSimple"> - 使用ã•ã‚ŒãŸURL： [COUNT] + 使用ã•ã‚ŒãŸ URL： [COUNT] </string> <string name="ScriptLimitsRequestError"> æƒ…å ±ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠</string> + <string name="ScriptLimitsRequestNoParcelSelected"> + 区画ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。 + </string> <string name="ScriptLimitsRequestWrongRegion"> エラー： ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±ã¯ç¾åœ¨åœ°ã®ã¿å–å¾—ã§ãã¾ã™ </string> @@ -1430,13 +1436,13 @@ HUD（ä¸å¤® 2） </string> <string name="ATTACH_HUD_TOP_RIGHT"> - HUDå³ä¸Š + HUD（å³ä¸Šï¼‰ </string> <string name="ATTACH_HUD_TOP_CENTER"> HUD（上・ä¸å¤®ï¼‰ </string> <string name="ATTACH_HUD_TOP_LEFT"> - HUD 左上 + HUD（左上） </string> <string name="ATTACH_HUD_CENTER_1"> HUD（ä¸å¤® 1） @@ -1465,6 +1471,9 @@ <string name="PanelContentsNewScript"> æ–°è¦ã‚¹ã‚¯ãƒªãƒ—ト </string> + <string name="BusyModeResponseDefault"> + メッセージをé€ã£ãŸä½äººã¯ã€èª°ã«ã‚‚邪é”ã‚’ã•ã‚ŒãŸããªã„ãŸã‚ç¾åœ¨ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ãƒ¢ãƒ¼ãƒ‰ã§ã™ã€‚ ã‚ãªãŸã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã€ã‚ã¨ã§ç¢ºèªã§ãるよã†ã« IM パãƒãƒ«ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ + </string> <string name="MuteByName"> （å称別） </string> @@ -1501,7 +1510,10 @@ （掲載後更新） </string> <string name="NoPicksClassifiedsText"> - ã“ã“ã«ã¯ãƒ”ック・クラシファイド広告ã¯ã‚ã‚Šã¾ã›ã‚“。 + ピックやクラシファイド広告を作æˆã—ã¦ã„ã¾ã›ã‚“。 作æˆã™ã‚‹ã«ã¯ã€ä¸‹ã«ã‚る「プラスã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¾ã™ã€‚ + </string> + <string name="NoAvatarPicksClassifiedsText"> + ピックã€ã¾ãŸã¯ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘ŠãŒã‚ã‚Šã¾ã›ã‚“ </string> <string name="PicksClassifiedsLoadingText"> ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... @@ -1679,7 +1691,7 @@ 土地ã®ãƒ¬ãƒ³ã‚¿ãƒ« </string> <string name="Property Rental"> - 建物ã®ãƒ¬ãƒ³ã‚¿ãƒ« + プãƒãƒ‘ティã®ãƒ¬ãƒ³ã‚¿ãƒ« </string> <string name="Special Attraction"> 特別アトラクション @@ -1706,7 +1718,7 @@ Linden 所在地 </string> <string name="Adult"> - アダルト + Adult </string> <string name="Arts&Culture"> アートã¨ã‚«ãƒ«ãƒãƒ£ãƒ¼ @@ -1849,13 +1861,13 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ピクセル形å¼æƒ…å ±ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ </string> <string name="MBTrueColorWindow"> - [APP_NAME] を実行ã™ã‚‹ã«ã¯ã€True Color（32ビット）ãŒå¿…è¦ã§ã™ã€‚ + [APP_NAME] を実行ã™ã‚‹ã«ã¯ã€True Color （32ビット）ãŒå¿…è¦ã§ã™ã€‚ ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューターã®ã€Œã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒ‘ãƒãƒ«ã€ï¼žã€Œç”»é¢ã€ï¼žã€Œè¨å®šã€ã«è¡Œãã€ã€Œæœ€é«˜ （32 ビット)ã€ã«è¨å®šã—ã¦ãã ã•ã„。 </string> <string name="MBAlpha"> [APP_NAME] 㯠8 ビットã®ã‚¢ãƒ«ãƒ•ã‚¡ãƒãƒ£ãƒ³ãƒãƒ«ã‚’å–å¾—ã§ããªã„ãŸã‚実行ã§ãã¾ã›ã‚“。 通常ビデオカードã®ãƒ‰ãƒ©ã‚¤ãƒã®å•é¡Œã§èµ·ã“ã‚Šã¾ã™ã€‚ ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューターã«æœ€æ–°ã®ãƒ“デオカードドライãƒãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã‹ã”確èªãã ã•ã„。 -ã¾ãŸã€ã€Œã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒ‘ãƒãƒ«ã€ï¼žã€Œç”»é¢ã€ï¼žã€Œè¨å®šã€å†…ã§ã€ãƒ¢ãƒ‹ã‚¿ãƒ¼ãŒã€Œæœ€é«˜ （32ビット）ã€ã«è¨å®šã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚‚ã”確èªãã ã•ã„。 +ã¾ãŸã€ã€Œã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ãƒ‘ãƒãƒ«ã€ï¼žã€Œç”»é¢ã€ï¼žã€Œè¨å®šã€å†…ã§ã€ãƒ¢ãƒ‹ã‚¿ãƒ¼ãŒã€Œæœ€é«˜ （32 ビット）ã€ã«è¨å®šã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚‚ã”確èªãã ã•ã„。 ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä½•åº¦ã‚‚å‡ºã‚‹å ´åˆã¯ã€[SUPPORT_SITE] ã¸ã”連絡ãã ã•ã„。 </string> <string name="MBPixelFmtSetErr"> @@ -1868,7 +1880,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã GL レンダーコンテã‚ストをアクティベートã§ãã¾ã›ã‚“ </string> <string name="MBVideoDrvErr"> - ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューターã®ãƒ“デオカードドライãƒãŒæ£å¸¸ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ããªã‹ã£ãŸã€ã¾ãŸã¯å¤ã„ã‹ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ãŸã‚ã€[APP_NAME] ã¯å®Ÿè¡Œã§ãã¾ã›ã‚“。 最新ã®ãƒ“デオカードドライãƒãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã®ã‚’確èªã—ã€ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠè©¦ã—ãã ã•ã„。 + ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューターã®ãƒ“デオカードドライãƒãŒæ£å¸¸ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ããªã‹ã£ãŸã€ã¾ãŸã¯å¤ã„ã‹ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ãŸã‚ã€[APP_NAME] ã¯å®Ÿè¡Œã§ãã¾ã›ã‚“。 最新ã®ãƒ“デオカードドライãƒãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã®ã‚’確èªã—ã€ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠè©¦ã—ãã ã•ã„。 ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä½•åº¦ã‚‚å‡ºã‚‹å ´åˆã¯ã€[SUPPORT_SITE] ã¸ã”連絡ãã ã•ã„。 </string> @@ -1897,7 +1909,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã 後ã‚髪ã®æ¯›å…ˆ </string> <string name="Baggy"> - ãŸã‚‹ã‚“ã§ã„ã‚‹ + ãŸã‚‹ã‚“ã 下ã¾ã¶ãŸ </string> <string name="Bangs"> å‰é«ª @@ -1987,7 +1999,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã 広 </string> <string name="Brow Size"> - 眉毛ã®å¤§ãã• + 眉毛上ã®éš†èµ· </string> <string name="Bug Eyes"> Bug Eyes @@ -2020,7 +2032,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã 膨らã¿å¤§ </string> <string name="Chaplin"> - Chaplin + ãƒãƒ£ãƒƒãƒ—リン </string> <string name="Cheek Bones"> ã»ãŠéª¨ @@ -2041,7 +2053,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã‚ã”ã®é•·ã• </string> <string name="Chin Heavy"> - ã‚ã”ã«é‡ç‚¹ + ã‚ã”を強調 </string> <string name="Chin In"> ã²ã„ãŸã‚ã” @@ -2233,7 +2245,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã²ãŸã„ã®è§’度 </string> <string name="Forehead Heavy"> - ã²ãŸã„ã«é‡ç‚¹ + ã²ãŸã„を強調 </string> <string name="Freckles"> ã—ã¿ãƒ»ãã°ã‹ã™ @@ -2383,7 +2395,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã‚ã”ã®å½¢ </string> <string name="Join"> - 寄ã›ãŸ + 寄ã›ãŸèƒ¸ </string> <string name="Jowls"> ãˆã‚‰ @@ -2488,7 +2500,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã å£ç´…ã®è‰² </string> <string name="Long"> - é•· + ãƒãƒ³ã‚° </string> <string name="Long Head"> å‰å¾Œå¹…ãŒåºƒã„é @@ -2884,7 +2896,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã 骨張ã£ãŸè„š </string> <string name="Separate"> - 離れ㟠+ 離れãŸèƒ¸ </string> <string name="Shallow"> ãªã ら㋠@@ -2932,7 +2944,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã é´ã®é•·ã• </string> <string name="Short"> - çŸ + ショート </string> <string name="Short Arms"> çŸ @@ -3046,7 +3058,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã 縦長 </string> <string name="Sunken"> - ã“ã‘㟠+ ã“ã‘ãŸã»ãŠ </string> <string name="Sunken Chest"> å° @@ -3061,7 +3073,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã å‰ã¸ </string> <string name="Tall"> - 高 + トール </string> <string name="Taper Back"> 後ã‚ã«å…ˆç´° @@ -3157,7 +3169,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ウエストã®é«˜ã• </string> <string name="Well-Fed"> - ã¤ã¾ã£ãŸ + ã¤ã¾ã£ãŸã»ãŠ </string> <string name="White Hair"> 白髪 @@ -3178,7 +3190,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ワイルド </string> <string name="Wrinkles"> - ã—ã‚ã‚ã‚Š + ã—ã‚ </string> <string name="LocationCtrlAddLandmarkTooltip"> マイ ランドマークã«è¿½åŠ @@ -3292,7 +3304,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã アドホックコンファレンス </string> <string name="inventory_item_offered-im"> - æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ãŒé€ã‚‰ã‚Œã¦ãã¾ã—㟠+ æŒã¡ç‰©ã‚¢ã‚¤ãƒ†ãƒ ã‚’é€ã‚Šã¾ã—㟠</string> <string name="share_alert"> æŒã¡ç‰©ã‹ã‚‰ã“ã“ã«ã‚¢ã‚¤ãƒ†ãƒ をドラッグã—ã¾ã™ @@ -3301,10 +3313,10 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã“ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã„るユーザーã¯ã‚ãªãŸã ã‘ã§ã™ã€‚ </string> <string name="offline_message"> - [FIRST] [LAST]ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ + [FIRST] [LAST] ã¯ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã™ã€‚ </string> <string name="invite_message"> - ã“ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«å¿œç”/接続ã™ã‚‹å ´åˆã¯ã€[BUTTON NAME]をクリックã—ã¦ãã ã•ã„。 + ã“ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«å¿œç”・接続ã™ã‚‹å ´åˆã¯ã€[BUTTON NAME] をクリックã—ã¦ãã ã•ã„。 </string> <string name="muted_message"> ã“ã®ä½äººã‚’ブãƒãƒƒã‚¯ã—ã¦ã„ã¾ã™ã€‚ メッセージをé€ã‚‹ã¨ã€ãƒ–ãƒãƒƒã‚¯ãŒè‡ªå‹•çš„ã«è§£é™¤ã•ã‚Œã¾ã™ã€‚ @@ -3328,7 +3340,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã‚ãªãŸã«ã¯ãã®èƒ½åŠ›ãŒã‚ã‚Šã¾ã›ã‚“。 </string> <string name="not_a_mod_error"> - ã‚ãªãŸã¯ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒ»ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 + ã‚ãªãŸã¯ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 </string> <string name="muted"> グループã®ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ãŒã€ã‚ãªãŸã®ãƒ†ã‚ストãƒãƒ£ãƒƒãƒˆã‚’ç¦æ¢ã—ã¾ã—ãŸã€‚ @@ -3337,13 +3349,13 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã グループモデレータãŒã‚ãªãŸã®ãƒ†ã‚ストãƒãƒ£ãƒƒãƒˆã‚’無効化ã—ã¾ã—㟠</string> <string name="add_session_event"> - [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ + [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ </string> <string name="message"> [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 </string> <string name="message_session_event"> - [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ + [RECIPIENT] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ </string> <string name="mute"> モデレートä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ @@ -3355,7 +3367,7 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã ã‚ãªãŸã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚ </string> <string name="close_on_no_ability"> - ã“ã®ãƒãƒ£ãƒƒãƒˆãƒ»ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’継続ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ + ã“ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’継続ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ </string> <string name="unread_chat_single"> [SOURCES] ã¯ä½•ã‹æ–°ã—ã„ã“ã¨ã‚’言ã„ã¾ã—ãŸã€‚ diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml index 72c183d03b..2f67d43707 100644 --- a/indra/newview/skins/default/xui/ja/teleport_strings.xml +++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<teleport_messages name=""> +<teleport_messages> <message_set name="errors"> <message name="invalid_tport"> テレãƒãƒ¼ãƒˆå‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ã—ç›´ã™å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 @@ -10,14 +10,14 @@ ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒä½•åº¦ã‚‚å‡ºã‚‹å ´åˆã¯ã€[SUPPORT_SITE] ã‚’ã”確èªãã ã•ã„。 </message> <message name="blocked_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + 申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 ã‚„ã‚Šç›´ã—ã¦ã‚‚テレãƒãƒ¼ãƒˆã§ããªã„å ´åˆã¯ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦å•é¡Œã‚’解決ã—ã¦ãã ã•ã„。 </message> <message name="nolandmark_tport"> - 残念ãªãŒã‚‰ã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ç›®çš„地を探ã›ã¾ã›ã‚“ã§ã—ãŸã€‚ + 残念ãªãŒã‚‰ã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã®ç›®çš„地を探ã›ã¾ã›ã‚“ã§ã—ãŸã€‚ </message> <message name="timeout_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆæŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ + 申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®æŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </message> <message name="noaccess_tport"> @@ -27,18 +27,18 @@ 添付物ã¯ã€ã¾ã 到ç€ã—ã¦ã„ã¾ã›ã‚“。ã‚ã¨æ•°ç§’é–“ãŠå¾…ã¡ã„ãŸã ãã‹ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’ã‚„ã‚Šç›´ã—ã¦ã ã•ã„。 </message> <message name="too_many_uploads_tport"> - ã“ã®åœ°åŸŸã®è³‡ç”£ã‚ューãŒç¾åœ¨è¾¼ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間通りã«å‡¦ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚ + ã“ã®åœ°åŸŸã®è³‡ç”£ã‚ューãŒç¾åœ¨è¾¼ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€è¦æ±‚ã•ã‚ŒãŸãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’処ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚ 数分後ã«ã‚„ã‚Šç›´ã™ã‹ã€ã¾ãŸã¯æ··é›‘ã—ã¦ã„ãªã„ä»–ã®åœ°åŸŸã‚’ãŠè©¦ã—ãã ã•ã„。 </message> <message name="expired_tport"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + 申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã¯è¦æ±‚ã•ã‚ŒãŸãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </message> <message name="expired_region_handoff"> - 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯åœ°åŸŸé–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ + 申ã—訳ã”ã–ã„ã¾ã›ã‚“ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã¯åœ°åŸŸé–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ 数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </message> <message name="no_host"> - テレãƒãƒ¼ãƒˆç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„状態ã‹ã€ã¾ãŸã¯ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 + テレãƒãƒ¼ãƒˆã®ç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„状態ã‹ã€ã¾ãŸã¯ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。 </message> <message name="no_inventory_host"> æŒã¡ç‰©ã‚·ã‚¹ãƒ†ãƒ ã¯ç¾åœ¨åˆ©ç”¨ã§ãã¾ã›ã‚“。 @@ -49,19 +49,22 @@ 目的地ã«é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚ </message> <message name="redirecting"> - 別ã®ç›®çš„地ã«å†æ¡ˆå†…ã—ã¦ã„ã¾ã™ã€‚ + 別ã®ç›®çš„地ã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¦ã„ã¾ã™ã€‚ </message> <message name="relaying"> 目的地ã«ä¸ç¶™ã—ã¦ã„ã¾ã™ã€‚ </message> <message name="sending_home"> - ホームä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚ + ホームä½ç½®ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚ </message> <message name="sending_landmark"> - ランドマークä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚ + ランドマークä½ç½®ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚ </message> <message name="completing"> - テレãƒãƒ¼ãƒˆã‚’完了ã—ã¦ã„ã¾ã™ã€‚ + テレãƒãƒ¼ãƒˆã‚’完了ã—ã¾ã™ã€‚ + </message> + <message name="completed_from"> + [T_SLURL] ã‹ã‚‰ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãŒå®Œäº†ã—ã¾ã—㟠</message> <message name="resolving"> 目的地を解決ã—ã¦ã„ã¾ã™ã€‚ diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml index 29a5aca90d..29a5aca90d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_about.xml +++ b/indra/newview/skins/default/xui/pl/floater_about.xml diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index d456ea26b4..d456ea26b4 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml index 0524b8ade3..0524b8ade3 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml index 37e35ed1e9..815c36606c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_auction.xml +++ b/indra/newview/skins/default/xui/pl/floater_auction.xml @@ -1,9 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» POSIADÅOÅšCI"> - <check_box label="ZawierajÄ…c żółte ogrodzenie" name="fence_check" /> - <button label="ZdjÄ™ce" label_selected="ZdjÄ™ce" name="snapshot_btn" /> - <button label="OK" label_selected="OK" name="ok_btn" /> - <string name="already for sale"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» POSIADÅOÅšCI LINDENÓW"> + <floater.string name="already for sale"> Nie możesz umieÅ›cić posiadÅ‚oÅ›ci na aukcji, jeżeli już zostaÅ‚a wystawiona na sprzedaż. - </string> + </floater.string> + <check_box initial_value="true" label="ZawierajÄ…c żółte ogrodzenie" name="fence_check"/> + <button label="ZdjÄ™ce" label_selected="ZdjÄ™ce" name="snapshot_btn"/> + <button label="Sprzedaj Każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/> + <button label="Wyczyść Ustawienia" label_selected="Wyczyść Ustawienia" name="reset_parcel_btn"/> + <button label="Rozpocznij AukcjÄ™" label_selected="Rozpocznij AukcjÄ™" name="start_auction_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml index 8c09f7294c..8c09f7294c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml index dce2330807..dce2330807 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml index f538be218c..f538be218c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml index 10f9d73284..10f9d73284 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml index ebe1c9dfd8..ebe1c9dfd8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml index 5e59482883..5e59482883 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml index 648888828b..648888828b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml index bad7982228..bad7982228 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 5957018144..95d82a3f9c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="camera_floater" title=""> <floater.string name="rotate_tooltip"> Obracaj kamerÄ™ wokół obiektu @@ -10,7 +10,22 @@ Poruszaj kamerÄ… w dół/górÄ™ oraz w prawo/lewo </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerÄ… w dół/górÄ™ oraz w prawo/lewo"/> - <joystick_zoom name="zoom" tool_tip="Najedź kamerÄ… w kierunku obiektu"/> + <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerÄ… w górÄ™, w dół, w lewo i w prawo"/> + <panel name="zoom" tool_tip="Najedź kamerÄ… w kierunku obiektu"> + <slider_bar name="zoom_slider" tool_tip="Przybliż kamerÄ™ do ogniskowej"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerÄ™ wokoÅ‚ osi"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Widok z TyÅ‚u"/> + <button name="group_view" tool_tip="PodglÄ…d Grupy"/> + <button name="front_view" tool_tip="Widok z Przodu"/> + <button name="mouselook_view" tool_tip="Widok Panoramiczny"/> + </panel> + </panel> + <panel name="buttons"> + <button label="" name="orbit_btn" tool_tip="Obracaj KamerÄ™"/> + <button label="" name="pan_btn" tool_tip="Kamera Horyzontalna"/> + <button label="" name="avatarview_btn" tool_tip="Widok Awatara"/> + <button label="" name="freecamera_btn" tool_tip="PodglÄ…d Obiektu"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml index 72b6617094..72b6617094 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index 904a2cc270..7bbdc35f94 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="ColorPicker" title="WYBÓR KOLORU"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="ColorPicker" title="WYBIERZ KOLOR"> <text name="r_val_text"> Czerwony: </text> @@ -18,14 +18,14 @@ <text name="l_val_text"> Luminacja: </text> - <check_box label="Zastosuj od razu" name="apply_immediate" /> - <button label="" label_selected="" name="color_pipette" /> - <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" /> - <button label="Wybierz" label_selected="Wybierz" name="select_btn" /> + <check_box label="Zastosuj teraz" name="apply_immediate"/> + <button label="" label_selected="" name="color_pipette"/> + <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> + <button label="Ok" label_selected="Ok" name="select_btn"/> <text name="Current color:"> Obecny Kolor: </text> <text name="(Drag below to save.)"> - (PrzeciÄ…gnij tutaj) + (PrzeciÄ…gnij tutaj by zapisać) </text> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml index 8221a4e1bd..8221a4e1bd 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_critical.xml +++ b/indra/newview/skins/default/xui/pl/floater_critical.xml diff --git a/indra/newview/skins/default/xui/pl/floater_customize.xml b/indra/newview/skins/default/xui/pl/floater_customize.xml index 0c01d15faf..0c01d15faf 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_customize.xml +++ b/indra/newview/skins/default/xui/pl/floater_customize.xml diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml index 6671bb853e..6671bb853e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml diff --git a/indra/newview/skins/default/xui/pl/floater_device_settings.xml b/indra/newview/skins/default/xui/pl/floater_device_settings.xml index e79478731d..e79478731d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_device_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_device_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml index e197d94b27..e197d94b27 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_env_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml index 4685eb6afe..4685eb6afe 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml index a3ccffac03..a3ccffac03 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml index 39695a67b6..39695a67b6 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml index ff2d702132..a5d85aca4e 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_hud.xml +++ b/indra/newview/skins/default/xui/pl/floater_hud.xml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_hud" title="SAMOUCZEK" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_hud" title="SAMOUCZEK"/> diff --git a/indra/newview/skins/default/xui/pl/floater_im.xml b/indra/newview/skins/default/xui/pl/floater_im.xml index 67c9d13496..67c9d13496 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_im.xml +++ b/indra/newview/skins/default/xui/pl/floater_im.xml diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml new file mode 100644 index 0000000000..f4dd7d00e1 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="panel_im"> + <layout_stack name="im_panels"> + <layout_panel label="Panel Kontroli WiadomoÅ›ci Prywatnej (IM)" name="panel_im_control_panel"/> + <layout_panel> + <line_editor label="Do" name="chat_editor"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml index 27f898a66b..27f898a66b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml index c98e0541d8..c98e0541d8 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml index 157be76c4d..157be76c4d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml index 665172dd49..665172dd49 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml index 9204262304..9204262304 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml index 22ac458b85..22ac458b85 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml index 69d563bdba..69d563bdba 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml index 13e6a8b16d..13e6a8b16d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml index 8120ff8c77..e03c5faaeb 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml @@ -1,12 +1,15 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script ed float" title="SKRYPT: NOWY SKRYPT"> - <button label="Zresetuj" label_selected="Zresetuj" name="Reset" /> - <check_box label="WÅ‚Ä…cz" name="running" /> - <check_box label="Mono" name="mono" /> - <string name="not_allowed"> - Nie masz praw by widzieć zawartość tego skryptu. - </string> - <string name="script_running"> + <floater.string name="not_allowed"> + Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostÄ™pnione Ci prawa to "brak kopiowania". Musisz posiadać peÅ‚ne prawa by móc zobaczyć lub edytować kod skryptu w zawartoÅ›ci obiektu. + </floater.string> + <floater.string name="script_running"> WÅ‚Ä…cz - </string> + </floater.string> + <floater.string name="Title"> + SKRYPT: [NAME] + </floater.string> + <button label="Zresetuj" label_selected="Zresetuj" name="Reset"/> + <check_box initial_value="true" label="WÅ‚Ä…cz" name="running"/> + <check_box initial_value="true" label="Mono" name="mono"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml index 5601aa4464..5601aa4464 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml index 74210c75e5..74210c75e5 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 88a878af72..87d74f6c15 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="MemLeak" title="SYMULACJA PRZECIEKÓW ALOKACJI PAMIĘCI"> - <spinner label="PrÄ™dkość Przecieków (byty na klatkÄ™):" name="leak_speed" /> - <spinner label="Max Przecieki (MB):" name="max_leak" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI"> + <spinner label="PrÄ™dkość Przecieków (byty na klatkÄ™):" name="leak_speed"/> + <spinner label="Max Przecieki (MB):" name="max_leak"/> <text name="total_leaked_label"> PrzeciekÅ‚o: [SIZE] KB </text> @@ -11,8 +11,8 @@ <text name="note_label_2"> [NOTE2] </text> - <button label="Start" name="start_btn" /> - <button label="Stop" name="stop_btn" /> - <button label="Uwolnij" name="release_btn" /> - <button label="Zamknij" name="close_btn" /> + <button label="Start" name="start_btn"/> + <button label="Stop" name="stop_btn"/> + <button label="Uwolnij" name="release_btn"/> + <button label="Zamknij" name="close_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml index e28cfd589d..e28cfd589d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml index 8055617371..8055617371 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml index 0bcf6ba4d5..847c93f891 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_my_friends.xml +++ b/indra/newview/skins/default/xui/pl/floater_my_friends.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_my_friends" title="KONTAKTY"> <tab_container name="friends_and_groups"> - <panel label="Znajomi" name="friends_panel" /> - <panel label="Grupy" name="groups_panel" /> + <panel label="Znajomi" name="friends_panel"/> + <panel label="Grupy" name="groups_panel"/> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml index fbbed0f11d..fbbed0f11d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_openobject.xml +++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml index dfb1b6616c..dfb1b6616c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_pay.xml +++ b/indra/newview/skins/default/xui/pl/floater_pay.xml diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml index 376f517aaa..376f517aaa 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml index 834552e2b0..1b0dd6113e 100644 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="perm prefs" title="PRAWA DOMYÅšLNE"> +<floater name="perm prefs" title="USTAWIENIA DOMYÅšLNE ÅADOWANIA"> <panel label="Prawa" name="permissions"> <button label="?" label_selected="?" name="help"/> <check_box label="UdostÄ™pnij grupie" name="share_with_group"/> diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml index 6bd91f97b1..6bd91f97b1 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml index 8f4018924d..8f4018924d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml index 2be663283f..2be663283f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index 7139c470a4..2a49864e93 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml @@ -1,10 +1,11 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_anim"> + <floater.string name="Title"> + Animacja: [NAME] + </floater.string> <text name="desc txt"> Opis: </text> - <button label="Używaj w Åšwiecie" label_selected="Stop" name="Anim play btn" - tool_tip="Animacja bÄ™dzie widoczna dla wszystkich." width="131" left="20"/> - <button label="Używaj lokalnie" label_selected="Stop" name="Anim audition btn" - tool_tip="Animacja bÄ™dzie widoczna tylko dla Ciebie." width="125" left="162"/> + <button label="Używaj w Åšwiecie" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom tÄ™ animacjÄ™ by widzieli jÄ… pozostali Rezydenci" width="131"/> + <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom tÄ™ animacjÄ™ widocznÄ… tylko przez Ciebie" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml index eae9ba2690..d3d6588397 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml @@ -1,2 +1,6 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="classified_preview" title="REKLAMA" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="classified_preview" title="INFO O REKLAMIE"> + <floater.string name="Title"> + Reklama: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_event.xml b/indra/newview/skins/default/xui/pl/floater_preview_event.xml index 9fc0ff4da6..9fc0ff4da6 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_event.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml index 1c7a3f6631..1c7a3f6631 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml index b9f80490ab..b9f80490ab 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml index 656b9bec38..656b9bec38 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml index 8bcd800411..8bcd800411 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml index ca3c1391db..ca3c1391db 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml index 18ce1b230f..18ce1b230f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml index 714a600262..714a600262 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml index e3e72e15a3..e3e72e15a3 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml index 7655f5fcac..7655f5fcac 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml index 255ab4264c..255ab4264c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml index 194a6da1bd..cf0abb2c23 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="modal container" title=""> - <button label="Anuluj" label_selected="Anuluj" name="Cancel" /> + <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <text name="Save item as:"> - By wybrać wciÅ›nij klawisz + NaciÅ›nij by uruchomić przycisk mówienia. </text> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml index a306ec2c34..a306ec2c34 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml index f87e2edecc..f87e2edecc 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml index c807087170..c807087170 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index 0826508fd6..c66ac0a98f 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Sound Preview" title="DŹWIĘK.WAV"> <text name="name_label"> Opis: @@ -6,6 +6,6 @@ <text name="description_label"> Opis: </text> - <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" /> - <button label="ZaÅ‚aduj (L$[AMOUNT])" label_selected="ZaÅ‚aduj (L$[AMOUNT])" name="ok_btn" /> + <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> + <button label="ZaÅ‚aduj (L$[AMOUNT])" label_selected="ZaÅ‚aduj (L$[AMOUNT])" name="ok_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml index 9f564452a9..9f564452a9 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 48366e2b64..011dc8ee7c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="WYBÓR TEKSTURY"> +<floater name="texture picker" title="ULUBIONE: TEKSTURA"> <string name="choose_picture"> Kliknij by wybrać obraz </string> <text name="Multiple"> - Wiele + Wiele Tekstur </text> <text name="unknown"> - Wymiary: [DIMENSIONS] + Rozmiar: [DIMENSIONS] </text> <button label="DomyÅ›lna" label_selected="DomyÅ›lna" name="Default"/> <button label="Å»adna" label_selected="Å»adna" name="None"/> <button label="Pusta" label_selected="Pusta" name="Blank"/> <check_box label="Pokaż Foldery" name="show_folders_check"/> - <search_editor label="Wpisz nazwÄ™ tutaj by wyszukać" name="inventory search editor"/> - <check_box label="Zastosuj od razu" name="apply_immediate_check"/> + <search_editor label="Filtruj Tektury" name="inventory search editor"/> + <check_box label="Zastosuj teraz" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> - <button label="Wybierz" label_selected="Wybierz" name="Select"/> + <button label="Ok" label_selected="Ok" name="Select"/> <string name="pick title"> Wybór: </string> diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index e898c283c5..e898c283c5 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml index e7299b0abb..e7299b0abb 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index b9a146df22..b9a146df22 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml index fc170d8d1b..fc170d8d1b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml index 7333633c1d..7333633c1d 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_water.xml +++ b/indra/newview/skins/default/xui/pl/floater_water.xml diff --git a/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml index 2d4582392c..2d4582392c 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml index 86ef9300da..86ef9300da 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 36e3b0651b..36e3b0651b 100755..100644 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml new file mode 100644 index 0000000000..4ba36de6fa --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_avatar"> + <string name="Subtitle"> + [AGE] + </string> + <string name="Details"> + [SL_PROFILE] + </string> + <slider name="volume_slider" tool_tip="Posiom GÅ‚oÅ›noÅ›ci" value="0.5"/> + <button label="Dodaj Znajomość" name="add_friend_btn"/> + <button label="IM" name="im_btn"/> + <button label="WiÄ™cej" name="view_profile_btn"/> + <panel name="moderator_panel"> + <button label="WyÅ‚Ä…cz KomunikacjÄ™ GÅ‚osowÄ…" name="disable_voice"/> + <button label="WÅ‚Ä…cz KomunikacjÄ™ GÅ‚osowÄ…" name="enable_voice"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml new file mode 100644 index 0000000000..d434443794 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_group.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_group"> + <string name="PrivateGroup"> + Grupa Prywatna + </string> + <string name="FreeToJoin"> + WstÄ™p Wolny + </string> + <string name="CostToJoin"> + L$[AMOUNT] by doÅ‚Ä…czyć + </string> + <string name="YouAreMember"> + JesteÅ› czÅ‚onkiem + </string> + <button label="DoÅ‚Ä…cz" name="join_btn"/> + <button label="Opuść" name="leave_btn"/> + <button label="Zobacz Profil" name="view_profile_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml new file mode 100644 index 0000000000..0d570940c1 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_remote_object"> + <text name="object_owner_label"> + WÅ‚aÅ›ciciel: + </text> + <button label="Mapa" name="map_btn"/> + <button label="Zablokuj" name="block_btn"/> + <button label="Zamknij" name="close_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml index 75c84c275d..75c84c275d 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml index 5084b59397..5084b59397 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_login.xml +++ b/indra/newview/skins/default/xui/pl/menu_login.xml diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml index 719959df6a..719959df6a 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 2a5842e553..2a5842e553 100755..100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml index c90d5761e6..c90d5761e6 100755..100644 --- a/indra/newview/skins/default/xui/pl/mime_types.xml +++ b/indra/newview/skins/default/xui/pl/mime_types.xml diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml new file mode 100644 index 0000000000..bd39ff7ac3 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Zawartość PrzeglÄ…darki Internetowej + </label> + <tooltip name="web_tooltip"> + To miejsce posiada zawartość internetowÄ… + </tooltip> + <playtip name="web_playtip"> + Pokaż Zawartość PrzeglÄ…darki Internetowej + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Film + </label> + <tooltip name="movie_tooltip"> + To miejsce posiada zawartość filmowÄ… + </tooltip> + <playtip name="movie_playtip"> + OglÄ…daj Film + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Obraz + </label> + <tooltip name="image_tooltip"> + To miejsce posiada zwartość graficznÄ… + </tooltip> + <playtip name="image_playtip"> + Zobacz zdjÄ™cie miejsca + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <tooltip name="audio_tooltip"> + To miejsce posiada zwartość audio + </tooltip> + <playtip name="audio_playtip"> + Rozpocznij odtwarzanie audio + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Synchroniczne Strumienie Medialne + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - Å»adne - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - Å»adne - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + Video + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Obraz + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + Film (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Skrypt Java + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Audio/Video + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Dokument PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Dokument Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Dokument RTF + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + JÄ™zyk Integracyjnej Synchronizacji Multimedialnej (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Strona Internetowa (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Obraz (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Obraz (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Obraz (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Obraz (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Obraz (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Obraz (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Strona Internetowa + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Tekst + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + Film (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + Film (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + Film (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + Film (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + Film (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + Film (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/pl/panel_audio_device.xml b/indra/newview/skins/default/xui/pl/panel_audio_device.xml index fc3b3776f0..fc3b3776f0 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_audio_device.xml +++ b/indra/newview/skins/default/xui/pl/panel_audio_device.xml diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml new file mode 100644 index 0000000000..5c362ab772 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="avatar_list_item"> + <string name="FormatSeconds"> + [COUNT]s + </string> + <string name="FormatMinutes"> + [COUNT]m + </string> + <string name="FormatHours"> + [COUNT]h + </string> + <string name="FormatDays"> + [COUNT]d + </string> + <string name="FormatWeeks"> + [COUNT]tyg + </string> + <string name="FormatMonths"> + [COUNT]mc + </string> + <string name="FormatYears"> + [COUNT]lat + </string> + <text name="avatar_name" value="Nieznane"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml new file mode 100644 index 0000000000..27d8981e80 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shirt_panel"> + <panel name="avatar_shirt_color_panel"> + <texture_picker label="MateriaÅ‚" name="Fabric" tool_tip="Kliknij by wybrać grafikÄ™"/> + <color_swatch label="Kolor/OdcieÅ„" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shirt_main_tab" title="Spódnica"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml new file mode 100644 index 0000000000..5efa402698 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_tattoo_panel"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatuaż GÅ‚owy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikÄ™"/> + <texture_picker label="Tatuaż Górnej Części CiaÅ‚a" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikÄ™"/> + <texture_picker label="Tatuaż Dolnej Części CiaÅ‚a" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikÄ™"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_friends.xml b/indra/newview/skins/default/xui/pl/panel_friends.xml index b6df36f199..b6df36f199 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_friends.xml +++ b/indra/newview/skins/default/xui/pl/panel_friends.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml index d09ff72226..d09ff72226 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml index 12d48279ad..12d48279ad 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml index dbfa8e3122..dbfa8e3122 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml new file mode 100644 index 0000000000..e8e819e7ce --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="group_list_item"> + <text name="group_name" value="Nieznana"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml index 1c19571ec0..1c19571ec0 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index dd46b4aeaa..6a0cbbd23a 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml @@ -16,7 +16,7 @@ Możesz wybrać wielu CzÅ‚onków naciskajÄ…c Ctrl i klikajÄ…c na ich imionach. <name_list name="member_list"> <name_list.columns label="CzÅ‚onek" name="name"/> <name_list.columns label="Dotacje" name="donated"/> - <name_list.columns label="Ostatnio w SL" name="online"/> + <name_list.columns label="Status" name="online"/> </name_list> <button label="ZaproÅ› do Grupy" name="member_invite"/> <button label="UsuÅ„ z Grupy" name="member_eject"/> @@ -29,7 +29,7 @@ jednÄ… lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji, Å‚Ä…cznie z funkcjÄ… Każdy i WÅ‚aÅ›ciciel. </panel.string> <panel.string name="cant_delete_role"> - Specjalne Funkcje Każdy i WÅ‚aÅ›ciciel nie mogÄ… zostać usuniÄ™te. + Funkcje "Wszyscy" oraz "WÅ‚aÅ›ciciele" sÄ… domyÅ›lnie oraz nie mogÄ… zostać usuniÄ™te. </panel.string> <panel.string name="power_folder_icon"> Inv_FolderClosed @@ -38,7 +38,7 @@ jednÄ… lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji, <scroll_list name="role_list"> <scroll_list.columns label="Funkcja" name="name"/> <scroll_list.columns label="TytuÅ‚" name="title"/> - <scroll_list.columns label="Liczba" name="members"/> + <scroll_list.columns label="#" name="members"/> </scroll_list> <button label="Stwórz NowÄ… FunkcjÄ™" name="role_create"/> <button label="UsuÅ„ FunkcjÄ™" name="role_delete"/> @@ -57,7 +57,7 @@ Istnieje wiele Przywilei. </tab_container> <panel name="members_footer"> <text name="static"> - Funkcje + Przypisani CzÅ‚onkowie </text> <scroll_list name="member_assigned_roles"> <scroll_list.columns label="" name="checkbox"/> @@ -73,13 +73,13 @@ Istnieje wiele Przywilei. </panel> <panel name="roles_footer"> <text name="static"> - Nazwa + Nazwa Funkcji </text> <line_editor name="role_name"> Liczba </line_editor> <text name="static3"> - TytuÅ‚ + Nazwa Funkcji </text> <line_editor name="role_title"> (proszÄ™ czekać) diff --git a/indra/newview/skins/default/xui/pl/panel_groups.xml b/indra/newview/skins/default/xui/pl/panel_groups.xml index 9df90fc797..9df90fc797 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_groups.xml +++ b/indra/newview/skins/default/xui/pl/panel_groups.xml diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml new file mode 100644 index 0000000000..dc73d08680 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="landmark_info"> + <string name="title_create_landmark" value="ZapamiÄ™taj Miejsce"/> + <string name="title_edit_landmark" value="Edytuj ZapamiÄ™tane Miejsce"/> + <string name="title_landmark" value="ZapamiÄ™tane Miejsce (LM)"/> + <string name="not_available" value="(N\A)"/> + <string name="unknown" value="(nieznane)"/> + <string name="public" value="(publiczne)"/> + <string name="server_update_text"> + Informacje o miejscu nie sÄ… dostÄ™pne bez aktualizacji serwera. + </string> + <string name="server_error_text"> + Informacje o miejscu nie sÄ… dostÄ™pne w tej chwili. Prosimy sprobować później. + </string> + <string name="server_forbidden_text"> + Informacje o miejscu sÄ… niedostÄ™pne z powodu braku dostÄ™pu. Prosimy sprawdzić swoje prawa z wÅ‚aÅ›cicielem posiadÅ‚oÅ›ci. + </string> + <string name="acquired_date"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </string> + <text name="title" value="Profil Miejsca"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="maturity_value" value="nieznany"/> + <panel name="landmark_info_panel"> + <text name="owner_label" value="WÅ‚aÅ›ciciel:"/> + <text name="creator_label" value="Twórca:"/> + <text name="created_label" value="Stworzone:"/> + </panel> + <panel name="landmark_edit_panel"> + <text name="title_label" value="TytuÅ‚:"/> + <text name="notes_label" value="Moje notatki:"/> + <text name="folder_label" value="Lokalizacja zapisanego miejsca:"/> + </panel> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index cec7e34da5..42088eae28 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -6,33 +6,29 @@ <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php </panel.string> - <panel name="login_widgets"> - <text name="first_name_text"> - ImiÄ™: - </text> - <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] ImiÄ™"/> - <text name="last_name_text"> - Nazwisko - </text> - <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nazwisko"/> - <text name="password_text"> - HasÅ‚o: - </text> - <button label="Zaloguj" label_selected="Zaloguj" name="connect_btn"/> - <text name="start_location_text"> - Miejsce Startu: - </text> - <combo_box name="start_location_combo"> - <combo_box.item label="Moje Ostatnie Miejsce" name="MyLastLocation"/> - <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> - <combo_box.item label="<Wpisz nazwÄ™ regionu>" name="Typeregionname"/> - </combo_box> - <check_box label="ZapamiÄ™taj HasÅ‚o" name="remember_check"/> - <text name="create_new_account_text"> - Załóż Nowe Konto - </text> - <text name="forgot_password_text"> - Nie pamiÄ™tasz swojego imienia lub hasÅ‚a? - </text> - </panel> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="first_name_text"> + ImiÄ™: + </text> + <line_editor label="ImiÄ™" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Nazwisko" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <check_box label="ZapamiÄ™taj hasÅ‚o" name="remember_check"/> + <text name="start_location_text"> + Rozpocznij w: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Moje Miejsce Startu" name="MyHome"/> + </combo_box> + <button label="PoÅ‚Ä…cz" name="connect_btn"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_new_account_text"> + Utwórz nowe konto + </text> + <text name="login_help"> + Potrzebujesz pomocy z logowaniem siÄ™? + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..4d91c3cdc8 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Dopasuj" name="Media settings for controls"> + <text name="controls_label"> + Ustawienia: + </text> + <combo_box name="controls"> + <combo_item name="Standard"> + Standardowe + </combo_item> + <combo_item name="Mini"> + Mini + </combo_item> + </combo_box> + <check_box initial_value="false" label="Pozwól na NawigacjÄ™ & Interaktywność" name="perms_owner_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_owner_control"/> + <check_box initial_value="false" label="Pozwól na NawigacjÄ™ & Interaktywność" name="perms_group_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_group_control"/> + <check_box initial_value="false" label="Pozwól na NawigacjÄ™ & Interaktywność" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_anyone_control"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml new file mode 100644 index 0000000000..162df37e52 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Outfits"> + <accordion name="outfits_accordion"> + <accordion_tab name="tab_cof" title="Aktualne Ubranie"/> + <accordion_tab name="tab_outfits" title="Moje Ubrania"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml new file mode 100644 index 0000000000..ff65cd2abb --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_people.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray panel --> +<panel label="Ludzie" name="people_panel"> + <string name="no_people" value="Brak ludzi"/> + <string name="no_one_near" value="Nikogo w pobliżu"/> + <string name="no_friends_online" value="Brak dostÄ™pnych przyjaciół"/> + <string name="no_friends" value="Brak przyjaciół"/> + <string name="no_groups" value="Brak grup"/> + <string name="people_filter_label" value="Filtruj Ludzi"/> + <string name="groups_filter_label" value="Filtruj Grupy"/> + <filter_editor label="Filtr" name="filter_input"/> + <tab_container name="tabs"> + <panel label="W POBLIÅ»U" name="nearby_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="nearby_view_sort_btn" tool_tip="Opcje"/> + <button name="add_friend_btn" tool_tip="Dodaj wybranych Rezydentów do swojej listy znajomych"/> + </panel> + </panel> + <panel label="ZNAJOMI" name="friends_panel"> + <accordion name="friends_accordion"> + <accordion_tab name="tab_online" title="DostÄ™pni"/> + <accordion_tab name="tab_all" title="Wszyscy"/> + </accordion> + <panel label="bottom_panel" name="bottom_panel"> + <button name="friends_viewsort_btn" tool_tip="Opcje"/> + <button name="add_btn" tool_tip="Zaproponuj znajomość"/> + <button name="del_btn" tool_tip="UsuÅ„ wybranÄ… osobÄ™ ze swojej listy znajomych"/> + </panel> + </panel> + <panel label="GRUPY" name="groups_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="groups_viewsort_btn" tool_tip="Opcje"/> + <button name="plus_btn" tool_tip="DoÅ‚Ä…cz do grupy/Stwórz nowÄ… grupÄ™"/> + <button name="activate_btn" tool_tip="Aktywuj wybranÄ… grupÄ™"/> + </panel> + </panel> + <panel label="OSTATNIE" name="recent_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="recent_viewsort_btn" tool_tip="Opcje"/> + <button name="add_friend_btn" tool_tip="Zaproponuj znajomość"/> + </panel> + </panel> + </tab_container> + <panel name="button_bar"> + <button label="Profil" name="view_profile_btn" tool_tip="Pokaż grafiki, grupy oraz inne informacje dostÄ™pne o Rezydentach"/> + <button label="IM" name="im_btn" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ… (IM)"/> + <button label="ZadzwoÅ„" name="call_btn" tool_tip="ZadzwoÅ„ do tego Rezydenta"/> + <button label="Podziel siÄ™" name="share_btn"/> + <button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportacjÄ™"/> + <button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/> + <button label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencÄ™"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml new file mode 100644 index 0000000000..5d69c25ff3 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_picks.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Ulubione" name="panel_picks"> + <string name="no_picks" value="Brak Ulubionych"/> + <string name="no_classifieds" value="Brak Reklam"/> + <text name="empty_picks_panel_text"> + Brak ulubionych/reklam w tym miejscu + </text> + <accordion name="accordion"> + <accordion_tab name="tab_picks" title="Ulubione"/> + <accordion_tab name="tab_classifieds" title="Reklamy"/> + </accordion> + <panel label="bottom_panel" name="edit_panel"> + <button name="new_btn" tool_tip="Stwórz w obecnym miejscu nowÄ… zakÅ‚adkÄ™ w ulubionych lub reklamÄ™"/> + </panel> + <panel name="buttons_cucks"> + <button label="Info" name="info_btn" tool_tip="Pokaż info o ulubionych"/> + <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadajÄ…cego miejsca"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż odpowiadajÄ…ce miejsce w Mapie Åšwiata"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml index 7195c30f20..7195c30f20 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml index 5599c21686..5599c21686 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index 97b4975f29..97b4975f29 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index ddd4c736d6..ddd4c736d6 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index e3cdaae840..d72f13fabd 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml @@ -1,33 +1,26 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Komunikacja" name="im"> - <text name="text_box"> - Mój Status Online: + <panel.string name="log_in_to_change"> + Zaloguj siÄ™ ponownie, aby zmienić + </panel.string> + <button label="Wyczyść HistoriÄ™" name="clear_cache"/> + <text name="cache_size_label_l"> + (Miejsca, obrazy, przeglÄ…darka internetowa, wyszukiwarka historii) </text> - <check_box label="Mój status online jest dostepny tylko dla Znajomych i Grup" - name="online_visibility" /> - <text name="text_box2"> - Ustawienia IM: + <check_box label="Mój status online jest dostÄ™pny tylko dla znajomych i grup do których należę" name="online_visibility"/> + <check_box label="Możliwość wysyÅ‚ania wiadomoÅ›ci prywatnej (IM) oraz rozmowy gÅ‚osowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check"/> + <check_box label="WyÅ‚Ä…cz mikrofon po zakoÅ„czeniu rozmowy gÅ‚osowej" name="auto_disengage_mic_check"/> + <check_box label="Akceptuj Ciasteczka" name="cookies_enabled"/> + <check_box label="Zezwól na Automatyczne Uruchomianie Mediów Strumieniowych" name="autoplay_enabled"/> + <text name="Logs:"> + Logi: </text> - <string name="log_in_to_change"> - zaloguj siÄ™ żeby zmienić - </string> - <check_box label="WysyÅ‚aj IMy na email ([EMAIL])" name="send_im_to_email" /> - <check_box label="DoÅ‚Ä…cz IMy do Konsola Czatu" name="include_im_in_chat_console" /> - <check_box label="Pokazuj czas w IM" name="show_timestamps_check" /> - <check_box label="Powiadamiaj o zalogowanych znajomych" - name="friends_online_notify_checkbox" /> - <text name="text_box3"> - PracuÅ› Mówi: + <check_box label="Zapisz logi rozmów ogólnych na moim komputerze" name="log_nearby_chat"/> + <check_box label="Zapisuj logi wiadomoÅ›ci prywatnych (IM) na moim komputerze" name="log_instant_messages"/> + <check_box label="Pokazuj czas" name="show_timestamps_check_im"/> + <text name="log_path_desc"> + Pokazuj miejsce logu </text> - <text name="text_box4"> - Ustawienia Zapisu: - </text> - <check_box label="Zapisuj IMy" name="log_instant_messages" /> - <check_box label="Pokazuj czas w zapisie IM" name="log_instant_messages_timestamp" /> - <check_box label="Pokazuj koniec ostatniego dialogu IM" name="log_show_history" /> - <check_box label="Zapisuj czat" name="log_chat" /> - <check_box label="Pokazuj czas w zapisie czatu" name="log_chat_timestamp" /> - <check_box label="Pokazuj nowe IMy w zapisie czatu" name="log_chat_IM" /> - <check_box label="Pokazuj czas Å‚Ä…cznie z datÄ…" name="log_date_timestamp" /> - <button label="Lokacja" label_selected="Lokacja" name="log_path_button" /> + <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="log_path_button"/> + <button label="Lista Zablokowanych" name="block_list"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml index 1e2289b496..1e2289b496 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml index f9b5d221a5..f9b5d221a5 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml diff --git a/indra/newview/skins/default/xui/pl/panel_profile.xml b/indra/newview/skins/default/xui/pl/panel_profile.xml new file mode 100644 index 0000000000..1ff115e0b5 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_profile.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Profil" name="panel_profile"> + <string name="no_partner_text" value="Brak"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value=":"/> + </panel> + <text name="me_homepage_text"> + Strona Domowa: + </text> + <text name="title_member_text" value="CzÅ‚onek od:"/> + <text name="title_acc_status_text" value="Status Konta:"/> + <text name="acc_status_text" value="Rezydent. Brak Danych Konta"/> + <text name="title_partner_text" value="Partner:"/> + <text name="title_groups_text" value="Groupy:"/> + </panel> + </scroll_container> + <panel name="profile_buttons_panel"> + <button label="Dodaj Znajomość" name="add_friend" tool_tip="Dodaj tego Rezydenta do znajomych"/> + <button label="IM" name="im" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ…"/> + <button label="ZadzwoÅ„" name="call" tool_tip="ZadzwoÅ„ do tego Rezydenta"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż tego Rezydenta na mapie"/> + <button label="Teleportuj" name="teleport" tool_tip="Zaoferuj TeleportacjÄ™"/> + <button label="â–¼" name="overflow_btn" tool_tip="ZapÅ‚ać lub wyÅ›lij obiekt temu Rezydentowi"/> + </panel> + <panel name="profile_me_buttons_panel"> + <button label="Edytuj Profil" name="edit_profile_btn"/> + <button label="Edytuj WyglÄ…d" name="edit_appearance_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml index f20387dd25..31b410c931 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Umowa" name="Covenant"> <text name="estate_section_lbl"> - MajÄ…tek: + MajÄ…tek </text> <text name="estate_name_lbl"> Nazwa: @@ -26,44 +26,44 @@ Brak umowy dla tego majÄ…tku. </text_editor> <button label="Wyresetuj" name="reset_covenant"/> - <text name="covenant_help_text" bottom_delta="-6"> + <text bottom_delta="-6" name="covenant_help_text"> Zmiany w umowie zostanÄ… wyÅ›wietlone we wszystkich posiadÅ‚oÅ›ciach majÄ…tku. </text> - <text name="covenant_instructions" bottom_delta="-36"> - PrzeciÄ…gnij oraz wrzuć notÄ™ by zmienić umowÄ™ dla tego majÄ…tku. + <text bottom_delta="-36" name="covenant_instructions"> + PrzeciÄ…gnij oraz wrzuć notkÄ™ by zmienić umowÄ™ dla tego majÄ…tku. </text> <text name="region_section_lbl"> - Region: + Region </text> <text name="region_name_lbl"> Nazwa: </text> - <text name="region_name_text" left="115"> + <text left="115" name="region_name_text"> leyla </text> <text name="region_landtype_lbl"> Typ: </text> - <text name="region_landtype_text" left="115"> + <text left="115" name="region_landtype_text"> Region Główny / Ziemia </text> <text name="region_maturity_lbl"> Rodzaj: </text> - <text name="region_maturity_text" left="115"> + <text left="115" name="region_maturity_text"> 'Adult' </text> <text name="resellable_lbl"> Odsprzedaj: </text> - <text name="resellable_clause" left="115" width="350"> + <text left="115" name="resellable_clause" width="350"> PosiadÅ‚ość zakupiona w tym regionie nie może być odsprzedana. </text> <text name="changeable_lbl"> Podziel: </text> - <text name="changeable_clause" left="115" width="350"> + <text left="115" name="changeable_clause" width="350"> PosiadÅ‚ość zakupiona w tym regionie nie może być Å‚Ä…czona/dzielona. </text> diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml index fe7b554a13..fe7b554a13 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 4275f3f647..4275f3f647 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml index 20296dac71..20296dac71 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index b206616e34..b206616e34 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml index d24579fc75..d24579fc75 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml new file mode 100644 index 0000000000..09c3d8ad04 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="script panel"> + <panel.string name="loading"> + Åadowanie... + </panel.string> + <panel.string name="can_not_view"> + Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostÄ™pnione Ci prawa to "brak kopiowania". Musisz posiadać peÅ‚ne prawa by móc zobaczyć lub edytować kod skryptu w zawartoÅ›ci obiektu. + </panel.string> + <panel.string name="public_objects_can_not_run"> + Publiczne obiekty nie mogÄ… uruchamiać skryptów + </panel.string> + <panel.string name="script_running"> + Uruchomione + </panel.string> + <panel.string name="Title"> + Skrypt: [NAME] + </panel.string> + <text_editor name="Script Editor"> + Åadowanie... + </text_editor> + <button label="Zapisz" label_selected="Zapisz" name="Save_btn"/> + <combo_box label="Wklej..." name="Insert..."/> + <menu_bar name="script_menu"> + <menu label="Plik" name="File"> + <menu_item_call label="Zapisz" name="Save"/> + <menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes"/> + </menu> + <menu label="Edytuj" name="Edit"> + <menu_item_call label="Cofnij" name="Undo"/> + <menu_item_call label="Do Przodu" name="Redo"/> + <menu_item_call label="Wytnij" name="Cut"/> + <menu_item_call label="Kopiuj" name="Copy"/> + <menu_item_call label="Wklej" name="Paste"/> + <menu_item_call label="Wybierz Wszystko" name="Select All"/> + <menu_item_call label="Odznacz" name="Deselect"/> + <menu_item_call label="Znajdź / ZamieÅ„..." name="Search / Replace..."/> + </menu> + <menu label="Pomoc" name="Help"> + <menu_item_call label="Pomoc..." name="Help..."/> + <menu_item_call label="Pomoc..." name="Keyword Help..."/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml index 70a6e39412..70a6e39412 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml new file mode 100644 index 0000000000..369097cd0b --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> +<side_tray name="sidebar"> + <sidetray_tab description="Miejsce Startu." name="sidebar_home" tab_title="Home"> + <panel label="miejsce startu" name="panel_home"/> + </sidetray_tab> + <sidetray_tab description="Znajdź swoich znajomych, kontakty oraz Rezydentów w pobliżu Ciebie." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Info o Grupie" name="panel_group_info_sidetray"/> + <panel label="Zablokowani Rezydenci & Obiekty" name="panel_block_list_sidetray"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Znajdź i odwiedź miejsca, w których byÅ‚eÅ› wczeÅ›niej." label="Miejsca" name="sidebar_places" tab_title="Places"> + <panel label="Miejsca" name="panel_places"/> + </sidetray_tab> + <sidetray_tab description="Edytuj swój publiczny profil oraz ulubione zakÅ‚adki." name="sidebar_me" tab_title="My Profile"> + <panel label="Ja" name="panel_me"/> + </sidetray_tab> + <sidetray_tab description="ZmieÅ„ swój obecny wyglÄ…d i ubranie." name="sidebar_appearance" tab_title="My Appearance"> + <panel label="Edytuj WyglÄ…d" name="sidepanel_appearance"/> + </sidetray_tab> + <sidetray_tab description="PrzeglÄ…daj SzafÄ™." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Edytuj SzafÄ™" name="sidepanel_inventory"/> + </sidetray_tab> +</side_tray> diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml new file mode 100644 index 0000000000..e47a15b67a --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> +<panel name="panel_stand_stop_flying"> + <button label="WstaÅ„" name="stand_btn" tool_tip="Kliknij tutaj by wstać."/> + <button label="Zatrzymaj Latanie" name="stop_fly_btn" tool_tip="Zatrzymaj Latanie"/> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml index 9226e67dff..9226e67dff 100755..100644 --- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml new file mode 100644 index 0000000000..d88d98f104 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Teleport History"> + <accordion name="history_accordion"> + <accordion_tab name="today" title="Dzisiaj"/> + <accordion_tab name="yesterday" title="Wczoraj"/> + <accordion_tab name="2_days_ago" title="2 dni temu"/> + <accordion_tab name="3_days_ago" title="3 dni temu"/> + <accordion_tab name="4_days_ago" title="4 dni temu"/> + <accordion_tab name="5_days_ago" title="5 dni temu"/> + <accordion_tab name="6_days_and_older" title="6 dni i wiÄ™cej"/> + <accordion_tab name="1_month_and_older" title="1 miesiÄ…c i wiÄ™cej"/> + <accordion_tab name="6_months_and_older" title="6 miesiÄ™cy i wiÄ™cej"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml index 5711eacf2f..5711eacf2f 100755..100644 --- a/indra/newview/skins/default/xui/pl/role_actions.xml +++ b/indra/newview/skins/default/xui/pl/role_actions.xml diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml new file mode 100644 index 0000000000..b70c76f652 --- /dev/null +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="item properties" title="WÅ‚aÅ›ciwoÅ›ci Obiektu w Szafie"> + <panel.string name="unknown"> + (nieznany) + </panel.string> + <panel.string name="public"> + (publiczny) + </panel.string> + <panel.string name="you_can"> + Ty możesz: + </panel.string> + <panel.string name="owner_can"> + WÅ‚aÅ›ciciel może: + </panel.string> + <panel.string name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> + <text name="title" value="WÅ‚aÅ›ciwoÅ›ci Obiektu"/> + <panel label=""> + <text name="LabelItemNameTitle"> + Nazwa: + </text> + <text name="LabelItemDescTitle"> + Opis: + </text> + <text name="LabelCreatorTitle"> + Twórca: + </text> + <button label="Profil..." name="BtnCreator"/> + <text name="LabelOwnerTitle"> + WÅ‚aÅ›ciciel: + </text> + <button label="Profil..." name="BtnOwner"/> + <text name="LabelAcquiredTitle"> + Nabyte: + </text> + <text name="LabelAcquiredDate"> + Wed May 24 12:50:46 2006 + </text> + <text name="OwnerLabel"> + Ty: + </text> + <check_box label="Edytuj" name="CheckOwnerModify"/> + <check_box label="Kopiuj" name="CheckOwnerCopy"/> + <check_box label="Oddawaj" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Każdemu: + </text> + <check_box label="Kopiuj" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Groupa: + </text> + <check_box label="Podziel siÄ™" name="CheckShareWithGroup"/> + <text name="NextOwnerLabel"> + NastÄ™pny wÅ‚aÅ›ciciel: + </text> + <check_box label="Edytuje" name="CheckNextOwnerModify"/> + <check_box label="Kopiuje" name="CheckNextOwnerCopy"/> + <check_box label="Oddaje" name="CheckNextOwnerTransfer"/> + <check_box label="Na Sprzedaż" name="CheckPurchase"/> + <combo_box name="combobox sale copy"> + <combo_box.item label="Kopia" name="Copy"/> + <combo_box.item label="OriginaÅ‚" name="Original"/> + </combo_box> + <spinner label="Cena:" name="Edit Cost"/> + <text name="CurrencySymbol"> + L$ + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index e8dcfac02d..e8dcfac02d 100755..100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml index 906978effe..906978effe 100755..100644 --- a/indra/newview/skins/default/xui/pl/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml index 0e777751d3..0e777751d3 100755..100644 --- a/indra/newview/skins/default/xui/pl/xui_version.xml +++ b/indra/newview/skins/default/xui/pl/xui_version.xml diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index 704e2f4107..39548dc497 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -1,19 +1,65 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_about" title="SOBRE O [CAPITALIZED_APP_NAME]"> -<tab_container name="about_tab"> - <panel name="credits_panel"> - <text_editor name="credits_editor"> - Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl e muitos outros. +<floater name="floater_about" title="SOBRE [CAPITALIZED_APP_NAME]"> + <floater.string name="AboutHeader"> + [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + </floater.string> + <floater.string name="AboutCompiler"> + ConstruÃdo com [COMPILER] versão [COMPILER_VERSION] + </floater.string> + <floater.string name="AboutPosition"> + Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]</nolink>([HOSTIP]) +[SERVER_VERSION] +[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] + </floater.string> + <floater.string name="AboutSystem"> + CPU: [CPU] +Memória: [MEMORY_MB] MBs +Versão OS: [OS_VERSION] +Placa de vÃdeo: [GRAPHICS_CARD_VENDOR] +Placa gráfica: [GRAPHICS_CARD] + </floater.string> + <floater.string name="AboutDriver"> + Versão do driver de vÃdeo Windows: [GRAPHICS_CARD_VENDOR] + </floater.string> + <floater.string name="AboutLibs"> + Versão OpenGL: [OPENGL_VERSION] - Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar +Versão libcurl: [LIBCURL_VERSION] +Versão J2C Decoder: [J2C_VERSION] +Versão do driver de áudio: [AUDIO_DRIVER_VERSION] +Versão Qt Webkit: [QT_WEBKIT_VERSION] +Versão Vivox: [VIVOX_VERSION] + </floater.string> + <floater.string name="none"> + (nenhum) + </floater.string> + <floater.string name="AboutTraffic"> + Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + </floater.string> + <tab_container name="about_tab"> + <panel label="Info" name="support_panel"> + <button label="Copiar para área de transferência" name="copy_btn"/> + </panel> + <panel label="Créditos" name="credits_panel"> + <text_editor name="credits_editor"> + O Second Life é o resultado do trabalho de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos mais. +Agradecemos também aos seguintes residentes por sua colaboração na mais nova versão do Second Life: (in progress) - Para ter sucesso nos negócios, seja ousado, seja o primeiro, seja diferente. --Henry Marchant - </text_editor> - </panel> - <panel name="licenses_panel"> - <text_editor name="credits_editor"> - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion + + + + + + + +Raras são as mentes capazes de tornar óbvio o até então inexistente. Dizer 'eu poderia ter pensado a mesma coisa' é comum, revelador e nem sempre a verdade; porque de fato não pensaram. + -- Douglas Adams + </text_editor> + </panel> + <panel label="Licenças" name="licenses_panel"> + <text_editor name="credits_editor"> + 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. @@ -34,10 +80,7 @@ Todos os direitos reservados. Veja licenças.txt para detalhes. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - </text_editor> - </panel> -</tab_container> - <string name="you_are_at"> - Você está em [POSITION] - </string> + </text_editor> + </panel> + </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 19981cf48c..ebb9bfc32d 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -1,7 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="SOBRE O TERRENO"> + <floater.string name="Minutes"> + [MINUTES] minutos + </floater.string> + <floater.string name="Minute"> + minuto + </floater.string> + <floater.string name="Seconds"> + [SECONDS] segundos + </floater.string> + <floater.string name="Remaining"> + faltam + </floater.string> <tab_container name="landtab"> - <panel label="Geral" name="land_general_panel"> + <panel label="GERAL" name="land_general_panel"> + <panel.string name="new users only"> + Somente novos usuários + </panel.string> + <panel.string name="anyone"> + Qualquer um + </panel.string> + <panel.string name="area_text"> + Ãrea + </panel.string> + <panel.string name="area_size_text"> + [AREA] m² + </panel.string> + <panel.string name="auction_id_text"> + ID do Leilão: [ID] + </panel.string> + <panel.string name="need_tier_to_modify"> + Você deve ter sua compra aprovada para modificar este terreno. + </panel.string> + <panel.string name="group_owned_text"> + (PossuÃdo pelo Grupo) + </panel.string> + <panel.string name="profile_text"> + Perfil... + </panel.string> + <panel.string name="info_text"> + Informação... + </panel.string> + <panel.string name="public_text"> + (público) + </panel.string> + <panel.string name="none_text"> + (nenhum) + </panel.string> + <panel.string name="sale_pending_text"> + (Venda Pendente) + </panel.string> + <panel.string name="no_selection_text"> + Nenhum lote selecionado. +Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar seus detalhes. + </panel.string> <text name="Name:"> Nome: </text> @@ -26,10 +78,12 @@ <text name="OwnerText"> Leyla Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="Profile..."/> <text name="Group:"> Grupo: </text> + <text name="GroupText"> + Leyla Linden + </text> <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/> <check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/> <button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/> @@ -73,59 +127,31 @@ 0 </text> <button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/> + <button label="Dados do script" name="Scripts..."/> <button label="Comprar para o Grupo..." label_selected="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 esta terra." width="125"/> <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/> <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/> <button label="Venda Linden..." label_selected="Venda Linden..." name="Linden Sale..." tool_tip="A terra precisa ser possuÃda, estar com o conteúdo configurado e não estar pronta para leilão."/> - <panel.string name="new users only"> - Somente novos usuários - </panel.string> - <panel.string name="anyone"> - Qualquer um - </panel.string> - <panel.string name="area_text"> - Ãrea - </panel.string> - <panel.string name="area_size_text"> - [AREA] m² - </panel.string> - <panel.string name="auction_id_text"> - ID do Leilão: [ID] - </panel.string> - <panel.string name="need_tier_to_modify"> - Você deve ter sua compra aprovada para modificar este terreno. - </panel.string> - <panel.string name="group_owned_text"> - (PossuÃdo pelo Grupo) - </panel.string> - <panel.string name="profile_text"> - Perfil... - </panel.string> - <panel.string name="info_text"> - Informação... - </panel.string> - <panel.string name="public_text"> - (público) + </panel> + <panel label="CONTRATO" name="land_covenant_panel"> + <panel.string name="can_resell"> + Terra comprada nesta região pode ser revendida. </panel.string> - <panel.string name="none_text"> - (nenhum) + <panel.string name="can_not_resell"> + Terra comprada nesta região não pode ser revendida. </panel.string> - <panel.string name="sale_pending_text"> - (Venda Pendente) + <panel.string name="can_change"> + Terra comprada nesta região pode ser compartilhada +ou sub-dividida. </panel.string> - <panel.string name="no_selection_text"> - Nenhum lote selecionado. -Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar seus detalhes. + <panel.string name="can_not_change"> + Terra comprada nesta região não pode ser compartilhada +ou sub-dividida. </panel.string> - </panel> - <panel label="Corretor" name="land_covenant_panel"> <text name="estate_section_lbl"> Propriedade: </text> - <text name="estate_name_lbl"> - Nome: - </text> <text name="estate_name_text"> mainland </text> @@ -144,9 +170,6 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se <text name="region_section_lbl"> Região: </text> - <text name="region_name_lbl"> - Nome: - </text> <text name="region_name_text"> leyla </text> @@ -174,37 +197,23 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se <text name="changeable_clause"> Terra nesta região não pode ser unida/sub-dividida. </text> - <panel.string name="can_resell"> - Terra comprada nesta região pode ser revendida. - </panel.string> - <panel.string name="can_not_resell"> - Terra comprada nesta região não pode ser revendida. - </panel.string> - <panel.string name="can_change"> - Terra comprada nesta região pode ser compartilhada -ou sub-dividida. + </panel> + <panel label="OBJETOS" name="land_objects_panel"> + <panel.string name="objects_available_text"> + [COUNT] de [MAX] ([AVAILABLE] disponÃveis) </panel.string> - <panel.string name="can_not_change"> - Terra comprada nesta região não pode ser compartilhada -ou sub-dividida. + <panel.string name="objects_deleted_text"> + [COUNT] de [MAX] ([DELETED] serão deletados) </panel.string> - </panel> - <panel label="Objetos" name="land_objects_panel"> <text name="parcel_object_bonus"> Fator de Bonus para Objetos na Região: [BONUS] </text> <text name="Simulator primitive usage:"> - Uso do simulador de primitivas: + Uso de prims: </text> <text left="214" name="objects_available" width="230"> [COUNT] de [MAX] ([AVAILABLE] disponÃveis) </text> - <panel.string name="objects_available_text"> - [COUNT] de [MAX] ([AVAILABLE] disponÃveis) - </panel.string> - <panel.string name="objects_deleted_text"> - [COUNT] de [MAX] ([DELETED] serão deletados) - </panel.string> <text name="Primitives parcel supports:" width="200"> Primitivas suportadas pelo lote: </text> @@ -248,39 +257,69 @@ ou sub-dividida. [COUNT] </text> <text left="4" name="Autoreturn" width="412"> - Auto-retornar objetos dos outros residentes (minutos, 0 para desligado): + Devolver objetos de outros residentes automaticamente (digite 0 para desligar) </text> <line_editor name="clean other time" right="-10"/> <text name="Object Owners:"> Donos dos Objetos: </text> - <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List" left="118"/> - <button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="230"/> + <button label="Atualizar Lista" label_selected="Atualizar Lista" left="118" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Retornar objetos..." label_selected="Retornar objetos..." left="230" name="Return objects..."/> <name_list name="owner list"> - <column label="Tipo" name="type"/> - <column label="Nome" name="name"/> - <column label="Contar" name="count"/> - <column label="Mais recente" name="mostrecent"/> + <name_list.columns label="Tipo" name="type"/> + <name_list.columns label="Nome" name="name"/> + <name_list.columns label="Contar" name="count"/> + <name_list.columns label="Mais recente" name="mostrecent"/> </name_list> </panel> - <panel label="Opções" name="land_options_panel"> + <panel label="OPÇÕES" name="land_options_panel"> + <panel.string name="search_enabled_tooltip"> + Permitir que as pessoas vejam este lote nos resultados de busca + </panel.string> + <panel.string name="search_disabled_small_tooltip"> + Esta opção está desabilitada porque a área deste lote tem 128 m² ou menos. +Apenas lotes maiores podem ser listados na busca. + </panel.string> + <panel.string name="search_disabled_permissions_tooltip"> + Esta opção está desabilitada porque você não pode modificar as opções deste lote. + </panel.string> + <panel.string name="mature_check_mature"> + Conteúdo Mature + </panel.string> + <panel.string name="mature_check_adult"> + Conteúdo Adult + </panel.string> + <panel.string name="mature_check_mature_tooltip"> + A informação do seu lote ou seu conteúdo são considerados mature. + </panel.string> + <panel.string name="mature_check_adult_tooltip"> + A informação do seu lote ou seu conteúdo são considerados adult. + </panel.string> + <panel.string name="landing_point_none"> + (nenhum) + </panel.string> + <panel.string name="push_restrict_text"> + Sem Empurrar + </panel.string> + <panel.string name="push_restrict_region_text"> + Sem Empurrar (Imposição na Região) + </panel.string> <text name="allow_label"> - Permitir outros residentes a: + Autorizar outros residentes a: </text> <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/> - <check_box label="Criar Landmarks" name="check landmark"/> <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/> - <text name="allow_label2" left="172"> + <text left="172" name="allow_label2"> Criar Objetos: </text> <check_box label="Residentes" name="edit objects check"/> <check_box label="Grupo" name="edit group objects check"/> - <text name="allow_label3" left="172"> + <text left="172" name="allow_label3"> Entrada do Objeto: </text> <check_box label="Residentes" name="all object entry check"/> <check_box label="Grupo" name="group object entry check"/> - <text name="allow_label4" left="172"> + <text left="172" name="allow_label4"> Executar Scripts: </text> <check_box label="Residentes" name="check other scripts"/> @@ -290,85 +329,37 @@ ou sub-dividida. </text> <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/> <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/> - <check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/> - <panel.string name="search_enabled_tooltip"> - Permitir que as pessoas vejam este lote nos resultados de busca - </panel.string> - <panel.string name="search_disabled_small_tooltip"> - Esta opção está desabilitada porque a área deste lote tem 128 m² ou menos. -Apenas lotes maiores podem ser listados na busca. - </panel.string> - <panel.string name="search_disabled_permissions_tooltip"> - Esta opção está desabilitada porque você não pode modificar as opções deste lote. - </panel.string> - <combo_box name="land category with adult" left="265" width="155"> - <combo_box.item name="item0" label="Qualquer Categoria" - /> - <combo_box.item name="item1" label="Locação Linden" - /> - <combo_box.item name="item2" label="Adult" - /> - <combo_box.item name="item3" label="Artes e Cultura" - /> - <combo_box.item name="item4" label="Negócios" - /> - <combo_box.item name="item5" label="Educacional" - /> - <combo_box.item name="item6" label="Jogos" - /> - <combo_box.item name="item7" label="Moradia" - /> - <combo_box.item name="item8" label="Amigável a Novos Usuários" - /> - <combo_box.item name="item9" label="Parques & Natureza" - /> - <combo_box.item name="item10" label="Residencial" - /> - <combo_box.item name="item11" label="Compras" - /> - <combo_box.item name="item12" label="Outros" - /> + <check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/> + <combo_box left="265" name="land category with adult" width="155"> + <combo_box.item label="Qualquer Categoria" name="item0"/> + <combo_box.item label="Locação Linden" name="item1"/> + <combo_box.item label="Adult" name="item2"/> + <combo_box.item label="Artes e Cultura" name="item3"/> + <combo_box.item label="Negócios" name="item4"/> + <combo_box.item label="Educacional" name="item5"/> + <combo_box.item label="Jogos" name="item6"/> + <combo_box.item label="Moradia" name="item7"/> + <combo_box.item label="Amigável a Novos Usuários" name="item8"/> + <combo_box.item label="Parques & Natureza" name="item9"/> + <combo_box.item label="Residencial" name="item10"/> + <combo_box.item label="Compras" name="item11"/> + <combo_box.item label="Outros" name="item12"/> </combo_box> - <combo_box name="land category" left="265" width="155"> - <combo_box.item name="item0" label="Qualquer Categoria" - /> - <combo_box.item name="item1" label="Locação Linden" - /> - <combo_box.item name="item3" label="Artes e Cultura" - /> - <combo_box.item name="item4" label="Negócios" - /> - <combo_box.item name="item5" label="Educacional" - /> - <combo_box.item name="item6" label="Jogos" - /> - <combo_box.item name="item7" label="Moradia" - /> - <combo_box.item name="item8" label="Amigável a Novos Usuários" - /> - <combo_box.item name="item9" label="Parques e Natureza" - /> - <combo_box.item name="item10" label="Residencial" - /> - <combo_box.item name="item11" label="Compras" - /> - <combo_box.item name="item12" label="Outros" - /> + <combo_box left="265" name="land category" width="155"> + <combo_box.item label="Qualquer Categoria" name="item0"/> + <combo_box.item label="Locação Linden" name="item1"/> + <combo_box.item label="Artes e Cultura" name="item3"/> + <combo_box.item label="Negócios" name="item4"/> + <combo_box.item label="Educacional" name="item5"/> + <combo_box.item label="Jogos" name="item6"/> + <combo_box.item label="Moradia" name="item7"/> + <combo_box.item label="Amigável a Novos Usuários" name="item8"/> + <combo_box.item label="Parques e Natureza" name="item9"/> + <combo_box.item label="Residencial" name="item10"/> + <combo_box.item label="Compras" name="item11"/> + <combo_box.item label="Outros" name="item12"/> </combo_box> - <button label="?" label_selected="?" left="426" name="?"/> <check_box label="Conteúdo Mature" name="MatureCheck" tool_tip=""/> - <panel.string name="mature_check_mature"> - Conteúdo Mature - </panel.string> - <panel.string name="mature_check_adult"> - Conteúdo Adult - </panel.string> - <panel.string name="mature_check_mature_tooltip"> - A informação do seu lote ou seu conteúdo são considerados mature. - </panel.string> - <panel.string name="mature_check_adult_tooltip"> - A informação do seu lote ou seu conteúdo são considerados adult. - </panel.string> <text name="Snapshot:"> Foto: </text> @@ -376,39 +367,28 @@ Apenas lotes maiores podem ser listados na busca. <text name="landing_point"> Ponto de Aterrissagem: [LANDING] </text> - <panel.string name="landing_point_none"> - (nenhum) - </panel.string> <button label="Definir" label_selected="Definir" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define para o ponto em que seu avatar se encontra neste lote."/> <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o ponto de aterrissagem."/> <text name="Teleport Routing: "> Rota de Tele-transporte: </text> - <combo_box width="160" left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote."> - <combo_box.item name="Blocked" label="Bloqueado" - /> - <combo_box.item name="LandingPoint" label="Ponto de Aterrissagem" - /> - <combo_box.item name="Anywhere" label="Qualquer lugar" - /> + <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="160"> + <combo_box.item label="Bloqueado" name="Blocked"/> + <combo_box.item label="Ponto de Aterrissagem" name="LandingPoint"/> + <combo_box.item label="Qualquer lugar" name="Anywhere"/> </combo_box> - <panel.string name="push_restrict_text"> - Sem Empurrar - </panel.string> - <panel.string name="push_restrict_region_text"> - Sem Empurrar (Imposição na Região) - </panel.string> </panel> - <panel label="MÃdia" name="land_media_panel"> + <panel label="MÃDIA" name="land_media_panel"> <text name="with media:" width="85"> Tipo de MÃdia: </text> <combo_box left="97" name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mÃdia"/> <text name="at URL:" width="85"> - URL da MÃdia: + Página web: </text> <line_editor left="97" name="media_url"/> <button label="Definir..." label_selected="Definir..." name="set_media_url"/> + <check_box label="Esconder a URL da MÃdia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mÃdia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponÃvel para tipos HTML."/> <text name="Description:"> Descrição: </text> @@ -419,18 +399,9 @@ Textura: </text> <texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/> <text name="replace_texture_help"> - (Objetos usando esta textura, mostrarão o filme ou -a página web depois que você clicar na seta de -reproduzir.) - </text> - <text name="Options:"> - Opções de -MÃdia: + Objetos com esta textura vão aparecer no filme ou página da web depois de clicar em Tocar. Selecione outras texturas clicando nas miniaturas. </text> <check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mÃdia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/> - <check_box label="MÃdia em Repetição" name="media_loop" tool_tip="Executar a mÃdia repetidamente. Quando a mÃdia terminar a execução, ela reiniciará do começo."/> - <check_box label="Esconder a URL da MÃdia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mÃdia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponÃvel para tipos HTML."/> - <check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do lote"/> <text left="102" name="media_size" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão." width="115"> Tamanho da mÃdia: </text> @@ -439,57 +410,45 @@ MÃdia: <text name="pixels"> pixels </text> - <text name="MusicURL:"> - URL da Música: - </text> - <line_editor left="97" name="music_url"/> - <text name="Sound:"> - Som: - </text> - <check_box label="Restringir gestos e sons de objetos a este lote" left="97" name="check sound local"/> - <button label="?" label_selected="?" name="?"/> - <text name="Voice settings:"> - Voz: + <text name="Options:"> + Opções de +MÃdia: </text> - <check_box left="97" label="Habilitar Voz" name="parcel_enable_voice_channel"/> - <check_box left="97" label="Habilitar Voz (definida pela Propriedade)" name="parcel_enable_voice_channel_is_estate_disabled"/> - <check_box left="117" label="Restringir Voz a este lote" name="parcel_enable_voice_channel_parcel"/> + <check_box label="MÃdia em Repetição" name="media_loop" tool_tip="Executar a mÃdia repetidamente. Quando a mÃdia terminar a execução, ela reiniciará do começo."/> + </panel> + <panel label="SOM" name="land_audio_panel"> + <check_box label="Ocultar URL" name="hide_music_url" tool_tip="Selecionar esta opção oculta o URL de música a visitantes não autorizados aos dados do terreno."/> + <check_box label="Ativar voz" name="parcel_enable_voice_channel"/> + <check_box label="Ativar voz (definições do terreno)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Limitar bate-papo de voz a este lote" name="parcel_enable_voice_channel_local"/> </panel> - <panel label="Acesso" name="land_access_panel"> + <panel label="ACESSO" name="land_access_panel"> + <panel.string name="access_estate_defined"> + (Definições do terreno) + </panel.string> + <panel.string name="estate_override"> + Uma ou mais destas opções está definida no nÃvel de propriedade. + </panel.string> <text name="Limit access to this parcel to:"> Acesso a Este Lote </text> - <check_box label="Permitir Acesso Público" name="public_access"/> + <check_box label="Acesso para público categoria [MATURITY]" name="public_access"/> <text name="Only Allow"> - Bloquear Acesso por: + Restringir acesso a contas confirmardas por: </text> - <check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/> - <check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/> - <panel.string name="estate_override"> - Uma ou mais destas opções está definida no nÃvel de propriedade. - </panel.string> + <check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes sem identificação."/> + <check_box label="Idade confirmada: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/> <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/> <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/> <combo_box name="pass_combo"> - <combo_box.item name="Anyone" label="Qualquer um" - /> - <combo_box.item name="Group" label="Grupo" - /> + <combo_box.item label="Qualquer um" name="Anyone"/> + <combo_box.item label="Grupo" name="Group"/> </combo_box> <spinner label="Preço em L$:" name="PriceSpin"/> <spinner label="Horas de Acesso:" name="HoursSpin"/> - <text label="Permitir Sempre" name="AllowedText"> - Residentes Permitidos - </text> - <name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/> - <button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/> - <button label="Remover" label_selected="Remover" name="remove_allowed"/> - <text label="Banir" name="BanCheck"> - Residentes Banidos - </text> - <name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/> - <button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/> - <button label="Remover" label_selected="Remover" name="remove_banned"/> + <panel name="Allowed_layout_panel"> + <name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/> + </panel> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml new file mode 100644 index 0000000000..892ccdf974 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_activeim.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_activeim" title="MI ativa"/> diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml index f3297ea5ee..78bcde251a 100644 --- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml @@ -1,70 +1,180 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Animation Preview" title=""> + <floater.string name="failed_to_initialize"> + Não foi possÃvel iniciar o movimento + </floater.string> + <floater.string name="anim_too_long"> + O arquivo de animação tem [LENGTH] segundos de duração. + +A duração máxima de animação permitida é de [MAX_LENGTH] segundos. + </floater.string> + <floater.string name="failed_file_read"> + Não foi possÃvel ler o arquivo de animação. + +[STATUS] + </floater.string> + <floater.string name="E_ST_OK"> + OK + </floater.string> + <floater.string name="E_ST_EOF"> + Fim de arquivo prematuro + </floater.string> + <floater.string name="E_ST_NO_CONSTRAINT"> + ImpossÃvel ler definição constraint. + </floater.string> + <floater.string name="E_ST_NO_FILE"> + ImpossÃvel abrir arquivo BVH. + </floater.string> + <floater.string name="E_ST_NO_HIER"> + Invalid HIERARCHY header. + </floater.string> + <floater.string name="E_ST_NO_JOINT"> + RAIZ ou JUNTA não encontrados. + </floater.string> + <floater.string name="E_ST_NO_NAME"> + ImpossÃvel obter nome JOINT. + </floater.string> + <floater.string name="E_ST_NO_OFFSET"> + ImpossÃvel localizar OFFSET. + </floater.string> + <floater.string name="E_ST_NO_CHANNELS"> + ImpossÃvel localizar CHANNELS. + </floater.string> + <floater.string name="E_ST_NO_ROTATION"> + ImpossÃvel obter ordem de rotação. + </floater.string> + <floater.string name="E_ST_NO_AXIS"> + ImpossÃvel obter eixo de rotação. + </floater.string> + <floater.string name="E_ST_NO_MOTION"> + ImpossÃvel localizar MOTION. + </floater.string> + <floater.string name="E_ST_NO_FRAMES"> + ImpossÃvel determinar número de quadros. + </floater.string> + <floater.string name="E_ST_NO_FRAME_TIME"> + ImpossÃvel determinar tempo dos quadros. + </floater.string> + <floater.string name="E_ST_NO_POS"> + ImpossÃvel definir posicionamento. + </floater.string> + <floater.string name="E_ST_NO_ROT"> + ImpossÃvel definir valores da rotação. + </floater.string> + <floater.string name="E_ST_NO_XLT_FILE"> + ImpossÃvel abrir arquivo de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_HEADER"> + ImpossÃvel ler cabeçalho de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_NAME"> + ImpossÃvel ler nomes traduzidos. + </floater.string> + <floater.string name="E_ST_NO_XLT_IGNORE"> + ImpossÃvel obter valor traduzido a ignorar. + </floater.string> + <floater.string name="E_ST_NO_XLT_RELATIVE"> + ImpossÃvel obter valor traduzido relativo. + </floater.string> + <floater.string name="E_ST_NO_XLT_OUTNAME"> + ImpossÃvel obter valor traduzido. + </floater.string> + <floater.string name="E_ST_NO_XLT_MATRIX"> + ImpossÃvel ler matriz de tradução. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGECHILD"> + ImpossÃvel obter nome mergechild. + </floater.string> + <floater.string name="E_ST_NO_XLT_MERGEPARENT"> + ImpossÃvel obter nome mergeparent. + </floater.string> + <floater.string name="E_ST_NO_XLT_PRIORITY"> + ImpossÃvel obter valor prioritário. + </floater.string> + <floater.string name="E_ST_NO_XLT_LOOP"> + ImpossÃvel obter valor do loop. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEIN"> + ImpossÃvel obter valor easeIn. + </floater.string> + <floater.string name="E_ST_NO_XLT_EASEOUT"> + ImpossÃvel obter valor easeOut. + </floater.string> + <floater.string name="E_ST_NO_XLT_HAND"> + ImpossÃvel obter valor de morph da mão. + </floater.string> + <floater.string name="E_ST_NO_XLT_EMOTE"> + ImpossÃvel ler nome do emote. + </floater.string> + <floater.string name="E_ST_BAD_ROOT"> + Nome da junta incorreto, use "quadril". + </floater.string> <text name="name_label"> Nome: </text> <text name="description_label"> Descrição: </text> - <spinner label_width="72" width="110" label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/> - <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/> - <spinner label_width="56" left="65" width="116" label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/> - <spinner label_width="40" left="185" label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/> + <spinner label="Prioridade" label_width="72" name="priority" tool_tip="Controla quais animações podem ser interrompidas por esta animação" width="110"/> + <check_box label="Loop" name="loop_check" tool_tip="Executa esta animação sem parar"/> + <spinner label="Dentro(%)" label_width="56" left="65" name="loop_in_point" tool_tip="Define o ponto em que a animação em loop reinicia" width="116"/> + <spinner label="Fora(%)" label_width="40" left="185" name="loop_out_point" tool_tip="Define o ponto em que a animação em loop acaba"/> <text name="hand_label"> Pose de Mão </text> - <combo_box left_delta="100" width="184" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação"> - <combo_box.item name="Spread" label="Espreguiçar" /> - <combo_box.item name="Relaxed" label="Relaxado" /> - <combo_box.item name="PointBoth" label="Apontar Ambos" /> - <combo_box.item name="Fist" label="Punho" /> - <combo_box.item name="RelaxedLeft" label="Relaxado para Esquerda" /> - <combo_box.item name="PointLeft" label="Apontar à Esquerda" /> - <combo_box.item name="FistLeft" label="Punho Esquerdo" /> - <combo_box.item name="RelaxedRight" label="Relaxado para Direita" /> - <combo_box.item name="PointRight" label="Apontar à Direita" /> - <combo_box.item name="FistRight" label="Punho Direito" /> - <combo_box.item name="SaluteRight" label="Saudar à Direita" /> - <combo_box.item name="Typing" label="Digitando" /> - <combo_box.item name="PeaceRight" label="PacÃfico à Direita" /> + <combo_box left_delta="100" name="hand_pose_combo" tool_tip="Controla os gestos das mãos durante a animação" width="184"> + <combo_box.item label="Abrir" name="Spread"/> + <combo_box.item label="Relaxado" name="Relaxed"/> + <combo_box.item label="Apontar ambas" name="PointBoth"/> + <combo_box.item label="Punho" name="Fist"/> + <combo_box.item label="E relaxada" name="RelaxedLeft"/> + <combo_box.item label="Apontar E" name="PointLeft"/> + <combo_box.item label="Punho E" name="FistLeft"/> + <combo_box.item label="D relaxada" name="RelaxedRight"/> + <combo_box.item label="Apontar D" name="PointRight"/> + <combo_box.item label="Punho D" name="FistRight"/> + <combo_box.item label="Saudação D" name="SaluteRight"/> + <combo_box.item label="Escrevendo" name="Typing"/> + <combo_box.item label="Paz D" name="PeaceRight"/> </combo_box> <text name="emote_label"> Expressão </text> - <combo_box left_delta="100" width="184" name="emote_combo" tool_tip="Controla o que a face faz durante a animação."> - <combo_box.item name="[None]" label="None]" /> - <combo_box.item name="Aaaaah" label="Aaaaah" /> - <combo_box.item name="Afraid" label="Temeroso" /> - <combo_box.item name="Angry" label="Raivoso" /> - <combo_box.item name="BigSmile" label="Sorrisão" /> - <combo_box.item name="Bored" label="Entediado" /> - <combo_box.item name="Cry" label="Chorar" /> - <combo_box.item name="Disdain" label="Desprezar" /> - <combo_box.item name="Embarrassed" label="Envergonhado" /> - <combo_box.item name="Frown" label="Franzir a testa" /> - <combo_box.item name="Kiss" label="Beijar" /> - <combo_box.item name="Laugh" label="Rir" /> - <combo_box.item name="Plllppt" label="Plllppt" /> - <combo_box.item name="Repulsed" label="Enojado" /> - <combo_box.item name="Sad" label="Triste" /> - <combo_box.item name="Shrug" label="Indiferença" /> - <combo_box.item name="Smile" label="Sorriso" /> - <combo_box.item name="Surprise" label="Surpreso" /> - <combo_box.item name="Wink" label="Piscar" /> - <combo_box.item name="Worry" label="Preocupado" /> + <combo_box left_delta="100" name="emote_combo" tool_tip="Controla as expressões faciais durante a animação" width="184"> + <combo_box.item label="(nenhum)" name="[None]"/> + <combo_box.item label="Aaaaah" name="Aaaaah"/> + <combo_box.item label="Com medo" name="Afraid"/> + <combo_box.item label="Bravo" name="Angry"/> + <combo_box.item label="Sorriso contagiante" name="BigSmile"/> + <combo_box.item label="À toa" name="Bored"/> + <combo_box.item label="Chorar" name="Cry"/> + <combo_box.item label="Desdenho" name="Disdain"/> + <combo_box.item label="Com vergonha" name="Embarrassed"/> + <combo_box.item label="Franzir testa" name="Frown"/> + <combo_box.item label="Beijo" name="Kiss"/> + <combo_box.item label="Rir" name="Laugh"/> + <combo_box.item label="Mostrar a lÃngua" name="Plllppt"/> + <combo_box.item label="Asco" name="Repulsed"/> + <combo_box.item label="Triste" name="Sad"/> + <combo_box.item label="Encolher os ombros" name="Shrug"/> + <combo_box.item label="Sorriso" name="Smile"/> + <combo_box.item label="Surpresa" name="Surprise"/> + <combo_box.item label="Piscar" name="Wink"/> + <combo_box.item label="Preocupado" name="Worry"/> </combo_box> <text name="preview_label" width="250"> Prever enquanto </text> - <combo_box left_delta="100" width="130" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns."> - <combo_box.item name="Standing" label="Parado" /> - <combo_box.item name="Walking" label="Andando" /> - <combo_box.item name="Sitting" label="Sentando" /> - <combo_box.item name="Flying" label="Voando" /> + <combo_box left_delta="100" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns." width="130"> + <combo_box.item label="Em pé" name="Standing"/> + <combo_box.item label="Andando" name="Walking"/> + <combo_box.item label="Sentado" name="Sitting"/> + <combo_box.item label="Voando" name="Flying"/> </combo_box> - <spinner label_width="125" width="192" label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/> - <spinner bottom_delta="-20" label_width="125" left="10" width="192" label="Facilitar a saÃda (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/> - <button bottom_delta="-32" name="play_btn" tool_tip="Executa/pausa sua animação."/> + <spinner label="Facilitar a entrada (sec)" label_width="125" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação" width="192"/> + <spinner bottom_delta="-20" label="Facilitar a saÃda (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saÃda da animação" width="192"/> + <button bottom_delta="-32" name="play_btn" tool_tip="Executar animação"/> + <button name="pause_btn" tool_tip="Pausar a animação"/> <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/> <text name="bad_animation_text"> Incapaz de ler o arquivo de animação. @@ -72,19 +182,6 @@ Nós recomendamos exportar arquivos BVH do Poser 4. </text> - <button label="Cancelar" name="cancel_btn"/> <button label="Carregar (L$[AMOUNT])" name="ok_btn"/> - <string name="failed_to_initialize"> - Não foi possÃvel iniciar o movimento - </string> - <string name="anim_too_long"> - O arquivo de animação tem [LENGTH] segundos de duração. - -A duração máxima de animação permitida é de [MAX_LENGTH] segundos. - </string> - <string name="failed_file_read"> - Não foi possÃvel ler o arquivo de animação. - -[STATUS] - </string> + <button label="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml index 34cd17d781..074f7bf001 100644 --- a/indra/newview/skins/default/xui/pt/floater_auction.xml +++ b/indra/newview/skins/default/xui/pt/floater_auction.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_auction" title="INICIAR A VENDA DE TERRENOS DA LINDEN"> - <check_box label="Incluir marcador de seleção amarelo" name="fence_check"/> - <button label="Foto" label_selected="Foto" name="snapshot_btn"/> - <button label="OK" label_selected="OK" name="ok_btn"/> - <text name="already for sale"> +<floater name="floater_auction" title="INICIAR VENDA DE TERRENO LINDEN START"> + <floater.string name="already for sale"> Você não pode leiloar terrenos que já estão configurados para venda. - </text> + </floater.string> + <check_box initial_value="true" label="Incluir marcador de seleção amarelo" name="fence_check"/> + <button label="Foto" label_selected="Foto" name="snapshot_btn"/> + <button label="Vender a qualquer um" label_selected="Vender a qualquer um" name="sell_to_anyone_btn"/> + <button label="Clear Settings" label_selected="Limpar configurações" name="reset_parcel_btn"/> + <button label="Iniciar Leilão" label_selected="Iniciar Leilão" name="start_auction_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml index 186ef30e1b..a2e6f7945a 100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml @@ -1,42 +1,47 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="avatarpicker" title="ESCOLHA O RESIDENTE" min_width="285" width="285"> +<floater min_width="285" name="avatarpicker" title="SELECIONE O RESIDENTE" width="285"> + <floater.string name="not_found"> + '[TEXT]' não encontrado + </floater.string> + <floater.string name="no_one_near"> + Ninguém por perto + </floater.string> + <floater.string name="no_results"> + Nenhum resultado + </floater.string> + <floater.string name="searching"> + Buscando... + </floater.string> + <string label="Selecionar" label_selected="Selecionar" name="Select"> + Selecionar + </string> + <string name="Close"> + Fechar + </string> <tab_container name="ResidentChooserTabs" width="275"> <panel label="Buscar" name="SearchPanel"> <text name="InstructSearchResidentName"> - Digite parte do nome do Residente: + Digite parte do nome de alguém: </text> - <button label="Encontrar" label_selected="Encontrar" name="Find"/> + <button label="OK" label_selected="OK" name="Find"/> </panel> - <panel label="Cartões de Visita" name="CallingCardsPanel"> - <text name="InstructSelectCallingCard"> - Selecione um cartão de visita: + <panel label="Amigos" name="FriendsPanel"> + <text name="InstructSelectFriend"> + Selecione alguém: </text> </panel> <panel label="Próximo a Mim" name="NearMePanel"> <text name="InstructSelectResident"> - Selecione residente -próximo: + Selecione alguém por perto: </text> - <button font="SansSerifSmall" left_delta="1" width="115" label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/> - <slider label="Faixa" name="near_me_range" bottom_delta="-36"/> + <slider bottom_delta="-36" label="Faixa" name="near_me_range"/> <text name="meters"> Metros </text> - <scroll_list bottom_delta="-169" height="159" name="NearMe" /> + <button font="SansSerifSmall" label="Atualizar Lista" label_selected="Atualizar Lista" left_delta="1" name="Refresh" width="115"/> + <scroll_list bottom_delta="-169" height="159" name="NearMe"/> </panel> </tab_container> - <button label="Selecionar" label_selected="Selecionar" name="Select"/> - <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <string name="not_found"> - '[TEXT]' não encontrado - </string> - <string name="no_one_near"> - Ninguém proximo - </string> - <string name="no_results"> - Nenhum resultado - </string> - <string name="searching"> - Buscando... - </string> + <button label="OK" label_selected="OK" name="ok_btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml index 04a78efb12..5fb64f64b3 100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml @@ -1,30 +1,43 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="avatar_texture_debug" title="TEXTURAS DO AVATAR"> - <text name="baked_label"> - Texturas sobrepostas - </text> +<floater name="avatar_texture_debug" title="TEXTURAS DE AVATAR"> + <floater.string name="InvalidAvatar"> + AVATAR INVÃLIDO + </floater.string> <text name="composite_label"> Texturas compostas </text> - <texture_picker label="Cabeça" name="baked_head"/> - <texture_picker label="Maquiagem" name="head_bodypaint"/> - <texture_picker label="Cabelo" name="hair"/> <button label="Tombar" label_selected="Tombar" name="Dump"/> - <texture_picker label="Olhos" name="baked_eyes"/> - <texture_picker label="Olho" name="eye_texture"/> - <texture_picker label="Parte de cima" name="baked_upper_body"/> - <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/> - <texture_picker label="Camiseta" name="undershirt"/> - <texture_picker label="Luvas" name="gloves"/> - <texture_picker label="Camisa" name="shirt"/> - <texture_picker label="Jaqueta" name="upper_jacket"/> - <texture_picker label="Parte de baixo" name="baked_lower_body"/> - <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/> - <texture_picker label="Roupas de baixo" name="underpants"/> - <texture_picker label="Meias" name="socks"/> - <texture_picker label="Calçados" name="shoes"/> - <texture_picker label="Calças" name="pants"/> - <texture_picker label="Jaqueta" name="jacket"/> - <texture_picker label="Saia" name="baked_skirt"/> - <texture_picker label="Saia" name="skirt_texture"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <texture_picker label="Cabelo" name="hair-baked"/> + <texture_picker label="Cabelo" name="hair_grain"/> + <texture_picker label="Cabelo alpha" name="hair_alpha"/> + <texture_picker label="Cabeça" name="head-baked"/> + <texture_picker label="Maquilagem" name="head_bodypaint"/> + <texture_picker label="Cabeça Alpha" name="head_alpha"/> + <texture_picker label="Tatuagem na cabeça" name="head_tattoo"/> + <texture_picker label="Olhos" name="eyes-baked"/> + <texture_picker label="Olho" name="eyes_iris"/> + <texture_picker label="Olhos Alpha" name="eyes_alpha"/> + <texture_picker label="Cintura acima" name="upper-baked"/> + <texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/> + <texture_picker label="Camiseta" name="upper_undershirt"/> + <texture_picker label="Luvas" name="upper_gloves"/> + <texture_picker label="Camisa" name="upper_shirt"/> + <texture_picker label="Jaqueta (cima)" name="upper_jacket"/> + <texture_picker label="Alpha de cima" name="upper_alpha"/> + <texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/> + <texture_picker label="Cintura para baixo" name="lower-baked"/> + <texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/> + <texture_picker label="Roupa de baixo" name="lower_underpants"/> + <texture_picker label="Meias" name="lower_socks"/> + <texture_picker label="Sapatos" name="lower_shoes"/> + <texture_picker label="Calças" name="lower_pants"/> + <texture_picker label="Jaqueta" name="lower_jacket"/> + <texture_picker label="Alpha inferior" name="lower_alpha"/> + <texture_picker label="Tatuagem de baixo" name="lower_tattoo"/> + <texture_picker label="Saia" name="skirt-baked"/> + <texture_picker label="Saia" name="skirt"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml index 82f055745f..b16ff6003e 100644 --- a/indra/newview/skins/default/xui/pt/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="beacons" title="BALIZAS"> <panel name="beacons_panel"> - <check_box label="Objetos programados com toque apenas" name="touch_only"/> - <check_box label="Objetos programados" name="scripted"/> - <check_box label="Objetos fÃsicos" name="physical"/> - <check_box label="Fontes de Som" name="sounds"/> - <check_box label="Fontes de PartÃculas" name="particles"/> - <check_box label="Renderização de Highlights" name="highlights"/> - <check_box label="Renderização de Balizas" name="beacons"/> - <text name="beacon_width_label"> - Largura da Baliza + <text name="label_show"> + Mostrar: </text> + <check_box label="Balizas" name="beacons"/> + <check_box label="Realce" name="highlights"/> + <text name="beacon_width_label" tool_tip="Largura da baliza"> + Largura: + </text> + <text name="label_objects"> + Para estes objetos: + </text> + <check_box label="FÃsicos" name="physical"/> + <check_box label="Com script" name="scripted"/> + <check_box label="Só tocar" name="touch_only"/> + <check_box label="Fontes de som" name="sounds"/> + <check_box label="Fontes de partÃculas" name="particles"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml index bce78fad21..71a1483dde 100644 --- a/indra/newview/skins/default/xui/pt/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="OPÇÕES DE GRADE"> - <spinner label="Uni. Grade (metros)" name="GridResolution" width="180" label_width="122"/> - <spinner label="Ext. da Grade (metros)" name="GridDrawSize" width="180" label_width="122"/> - <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/> - <check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/> + <spinner label="Unidade da grade (metros)" label_width="122" name="GridResolution" width="180"/> + <spinner label="Ext. da Grade (metros)" label_width="122" name="GridDrawSize" width="180"/> + <check_box label="Encaixar em sub-unidades" name="GridSubUnit"/> + <check_box label="Ver corte transversal" name="GridCrossSection"/> + <text name="grid_opacity_label" tool_tip="Opacidade da grade"> + Opacidade: + </text> <slider label="Opacidade da grade" name="GridOpacity" width="220"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml index 7443e19721..9f34111d8a 100644 --- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml @@ -1,44 +1,54 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floaterbulkperms" title="MUDANÇA CONJUNTA DAS PERMISSÕES DE CONTEÚDO"> - <text name="applyto"> - Tipos de Conteúdo - </text> +<floater name="floaterbulkperms" title="EDITAR AUTORIZAÇÕES DE CONTEÚDO"> + <floater.string name="nothing_to_modify_text"> + A seleção não contém nenhum conteúdo editável. + </floater.string> + <floater.string name="status_text"> + Definindo permissões em [NAME] + </floater.string> + <floater.string name="start_text"> + Iniciando solicitação de mudança de permissão... + </floater.string> + <floater.string name="done_text"> + Solicitação de mudança de permissão concluÃda. + </floater.string> <check_box label="Animação" name="check_animation"/> + <icon name="icon_animation" tool_tip="Animação"/> <check_box label="Partes do Corpo" name="check_bodypart"/> + <icon name="icon_bodypart" tool_tip="Partes do corpo"/> <check_box label="Roupas" name="check_clothing"/> + <icon name="icon_clothing" tool_tip="Vestuário"/> <check_box label="Gestos" name="check_gesture"/> - <check_box label="Landmarks" name="check_landmark"/> + <icon name="icon_gesture" tool_tip="Gestos"/> <check_box label="Notecards" name="check_notecard"/> + <icon name="icon_notecard" tool_tip="Anotações"/> <check_box label="Objetos" name="check_object"/> + <icon name="icon_object" tool_tip="Objects"/> <check_box label="Scripts" name="check_script"/> + <icon name="icon_script" tool_tip="Scripts"/> <check_box label="Sons" name="check_sound"/> + <icon name="icon_sound" tool_tip="Sons"/> <check_box label="Texturas" name="check_texture"/> - <button label="Marcar Todas" label_selected="Todas" name="check_all"/> - <button label="Desmarcar Todas" label_selected="Nenhuma" name="check_none"/> + <icon name="icon_texture" tool_tip="Texturas"/> + <button label="√ Tudo" label_selected="Todas" name="check_all"/> + <button label="Limpar" label_selected="Nenhuma" name="check_none"/> <text name="newperms"> - Novas Permissões + Novas autorizações de conteúdo + </text> + <text name="GroupLabel"> + Grupo: </text> - <check_box label="Compartilhar com o grupo" name="share_with_group"/> - <check_box label="Permitir que qualquer um copie" name="everyone_copy"/> + <check_box label="Compartilhar" name="share_with_group"/> + <text name="AnyoneLabel"> + Todos: + </text> + <check_box label="Copiar" name="everyone_copy"/> <text name="NextOwnerLabel"> - O próximo dono pode: + Próximo proprietário: </text> <check_box label="Modificar" name="next_owner_modify"/> <check_box label="Copiar" name="next_owner_copy"/> - <check_box label="Revender/Dar" name="next_owner_transfer"/> - <button label="Ajuda" name="help"/> - <button label="Aplicar" name="apply"/> - <button label="Fechar" name="close"/> - <string name="nothing_to_modify_text"> - A seleção não contém nenhum conteúdo editável. - </string> - <string name="status_text"> - Definindo permissões em [NAME] - </string> - <string name="start_text"> - Iniciando solicitação de mudança de permissão... - </string> - <string name="done_text"> - Solicitação de mudança de permissão concluÃda. - </string> + <check_box initial_value="true" label="Transferir" name="next_owner_transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/> + <button label="OK" name="apply"/> + <button label="Cancelar" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml index 1833cd4335..5e656f4730 100644 --- a/indra/newview/skins/default/xui/pt/floater_bumps.xml +++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml @@ -1,21 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_bumps" title="COLISÕES, IMPULSOS E BATIDAS"> - <text name="none_detected"> + <floater.string name="none_detected"> Nada detectado - </text> - <text name="bump"> + </floater.string> + <floater.string name="bump"> [TIME] [FIRST] [LAST] conflitou com você - </text> - <text name="llpushobject"> + </floater.string> + <floater.string name="llpushobject"> [TIME] [FIRST] [LAST] empurrou você com um script - </text> - <text name="selected_object_collide"> + </floater.string> + <floater.string name="selected_object_collide"> [TIME] [FIRST] [LAST] o atingiu com um objeto - </text> - <text name="scripted_object_collide"> + </floater.string> + <floater.string name="scripted_object_collide"> [TIME] [FIRST] [LAST] o atingiu com um objeto programado - </text> - <text name="physical_object_collide"> + </floater.string> + <floater.string name="physical_object_collide"> [TIME] [FIRST] [LAST] o atingiu com um objeto fÃsico - </text> + </floater.string> + <floater.string name="timeStr"> + [[hour,datetime,slt]:[min,datetime,slt]] + </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml index 322a07575a..c64523ceb3 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml @@ -7,8 +7,8 @@ Comprar por L$[AMOUNT] de(a) [NAME]? </text> <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/> - <button label="Comprar" label_selected="Comprar" name="buy_btn" width="73" left_delta="-77"/> - <check_box label="Vestir roupa agora" name="wear_check" left_delta="-130"/> + <button label="Comprar" label_selected="Comprar" left_delta="-77" name="buy_btn" width="73"/> + <check_box label="Vestir roupa agora" left_delta="-130" name="wear_check"/> <string name="no_copy_text"> (sem copiar) </string> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index f17c069ecf..1d0b3c4cd9 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml @@ -1,71 +1,66 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="buy currency" title="COMPRAR DINHEIRO"> - <text name="info_buying"> - Comprando Dinheiro: - </text> - <text name="info_cannot_buy"> - Não pode comprar agora: - </text> +<floater name="buy currency" title="Comprar L$"> + <floater.string name="buy_currency"> + Compre L$ [LINDENS] por aprox. [LOCALAMOUNT] + </floater.string> <text name="info_need_more"> - Você precisa de mais dinheiro: + Você precisa de mais L$ </text> - <text name="error_message"> - Algo não está certo. - </text> - <button label="Ir para o website" name="error_web"/> <text name="contacting"> Contatando LindeX... </text> - <text name="buy_action_unknown"> - Comprar L$ no câmbio atual da LindeX - </text> - <text name="buy_action"> - [NAME] L$ [PRICE] - </text> - <text name="currency_action" width="60"> + <text name="info_buying"> Comprar L$ </text> - <line_editor name="currency_amt" left_delta="65" width="70"> - 1234 - </line_editor> - <text name="currency_est" left_delta="72"> - por aproxim. [LOCALAMOUNT] - </text> - <text name="getting_data"> - Obtendo dados... - </text> <text name="balance_label"> - Você tem atualmente + Tenho </text> <text name="balance_amount"> L$ [AMT] </text> + <text name="currency_action" width="60"> + Comprar + </text> + <text name="currency_label"> + L$ + </text> + <line_editor label="L$" left_delta="65" name="currency_amt" width="70"> + 1234 + </line_editor> <text name="buying_label"> - Você está comprando + O preço é </text> - <text name="buying_amount"> - L$ [AMT] + <text left_delta="72" name="currency_est"> + aprox. [LOCALAMOUNT] + </text> + <text name="getting_data"> + Calculando... + </text> + <text name="buy_action"> + [NAME] L$ [PRICE] </text> <text name="total_label"> - Seu saldo será + Saldo resultante: </text> <text name="total_amount"> L$ [AMT] </text> <text name="currency_links"> - [http://www.secondlife.com/my/account/payment_method_management.php?lang=pt-BR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=pt-BR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=pt-BR exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] + </text> + <text name="exchange_rate_note"> + Digite o valor novamente para ver o câmbio atual. </text> <text name="purchase_warning_repurchase"> - Confirmando esta compra só compra a moeda. -Você precisará tentar novamente a operação. + Confirmar esta transação compra somente L$, não o objeto. </text> <text name="purchase_warning_notenough"> - Você não está comprando moeda suficiente. -Aumente a quantidade de compra. + O valor da transação não é suficiente. Aumente o volume da compra. </text> + <button label="Comprar já!" name="buy_btn"/> <button label="Fechar" name="cancel_btn"/> - <button label="Adquirir" name="buy_btn"/> - <string name="buy_currency"> - Comprar L$ [LINDENS] por aproxim. [LOCALAMOUNT] - </string> + <text name="info_cannot_buy"> + Transação incompleta + </text> + <button label="Prosseguir para a web" name="error_web"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml index 6e502ad6e5..9500ba94e5 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml @@ -1,27 +1,153 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="buy land" title="COMPRAR TERRA"> +<floater name="buy land" title="COMPRAR TERRENO"> + <floater.string name="can_resell"> + Pode ser revendida. + </floater.string> + <floater.string name="can_not_resell"> + Não pode ser revendida. + </floater.string> + <floater.string name="can_change"> + Pode ser unida ou subdivida. + </floater.string> + <floater.string name="can_not_change"> + Não pode ser unida ou subdividida. + </floater.string> + <floater.string name="cant_buy_for_group"> + Você não tem permissão para comprar terra para seu grupo ativo. + </floater.string> + <floater.string name="no_land_selected"> + Nenhuma terra selecionada. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor. + </floater.string> + <floater.string name="no_permission"> + Você não tem permissão para comprar uma terra para seu grupo ativo. + </floater.string> + <floater.string name="parcel_not_for_sale"> + O lote selecionado não está a venda. + </floater.string> + <floater.string name="group_already_owns"> + O grupo já possui o lote. + </floater.string> + <floater.string name="you_already_own"> + Você já possui o lote. + </floater.string> + <floater.string name="set_to_sell_to_other"> + O lote selecionado está configurado para ser vendido para outro grupo. + </floater.string> + <floater.string name="no_public_land"> + A área selecionada não tem terras públicas. + </floater.string> + <floater.string name="not_owned_by_you"> + Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor. + </floater.string> + <floater.string name="processing"> + Processando sua compra... + +(Isso pode levar um minuto.) + </floater.string> + <floater.string name="fetching_error"> + Houve um erro ao buscar informações sobre compra de terras. + </floater.string> + <floater.string name="buying_will"> + Comprar esta terra irá: + </floater.string> + <floater.string name="buying_for_group"> + Ao comprar terra para o grupo: + </floater.string> + <floater.string name="cannot_buy_now"> + Não foi possÃvel comprar agora: + </floater.string> + <floater.string name="not_for_sale"> + Não disponÃvel para venda: + </floater.string> + <floater.string name="none_needed"> + nada necessário + </floater.string> + <floater.string name="must_upgrade"> + Sua conta deve ser evoluÃda para adquirir um lote. + </floater.string> + <floater.string name="cant_own_land"> + Sua conta pode possuir uma terra. + </floater.string> + <floater.string name="land_holdings"> + Você tem [BUYER] m². + </floater.string> + <floater.string name="pay_to_for_land"> + Pagar L$ [AMOUNT] para [SELLER] por esta terra + </floater.string> + <floater.string name="buy_for_US"> + Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Este lote tem [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + Esse é um terreno premium e custa o equivalente a [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +suporta [AMOUNT2] objetos + </floater.string> + <floater.string name="sold_with_objects"> + vendido com objetos + </floater.string> + <floater.string name="sold_without_objects"> + objetos não incluÃdos + </floater.string> + <floater.string name="info_price_string"> + L$ [PRICE] +(L$ [PRICE_PER_SQM]/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + O grupo [GROUP] precisará de fundos suficientes de terras +contribuÃdas para cobrir este lote antes da aquisição se completar. + </floater.string> + <floater.string name="have_enough_lindens"> + Você tem L$ [AMOUNT], suficiente para comprar este lote. + </floater.string> + <floater.string name="not_enough_lindens"> + Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2]. + </floater.string> + <floater.string name="balance_left"> + Após a compra, restará L$ [AMOUNT]. + </floater.string> + <floater.string name="balance_needed"> + Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote. + </floater.string> + <floater.string name="no_parcel_selected"> + (nenhum lote selecionado) + </floater.string> + <floater.string name="icon_PG" value="Parcel_PG_Dark"/> + <floater.string name="icon_M" value="Parcel_M_Dark"/> + <floater.string name="icon_R" value="Parcel_R_Dark"/> <text name="region_name_label"> Região: </text> - <text name="region_name_text" left="560"> + <text left="560" name="region_name_text"> (desconhecido) </text> <text name="region_type_label"> Tipo: </text> - <text name="region_type_text" left="560"> + <text left="560" name="region_type_text"> (desconhecido) </text> <text name="estate_name_label"> Propriedade: </text> - <text name="estate_name_text" left="560"> + <text left="560" name="estate_name_text"> (desconhecido) </text> - <text name="estate_owner_label" width="105" right="565"> + <text name="estate_owner_label" right="565" width="105"> Dono da propriedade: </text> - <text name="estate_owner_text" left="560" > + <text left="560" name="estate_owner_text"> (desconhecido) </text> <text name="resellable_changeable_label"> @@ -40,7 +166,7 @@ <text_editor name="covenant_editor"> Carregando... </text_editor> - <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/> + <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/> <text name="info_parcel_label"> Lote: </text> @@ -58,8 +184,7 @@ </text> <text name="info_price"> L$ 1500 -(L$ 1.1/m²) -vendido com os objetos +(L$ 1,1/m²) inclui objetos </text> <text name="info_action"> Comprar este lote irá: @@ -67,7 +192,7 @@ vendido com os objetos <text name="error_message"> Algo ainda não está correto. </text> - <button label="Ir para a página da web" name="error_web" width="150" /> + <button label="Ir para a página da web" name="error_web" width="150"/> <text name="account_action"> Evoluir sua conta para membro Premium </text> @@ -75,16 +200,16 @@ vendido com os objetos Somente membros Premium podem possuir terra. </text> <combo_box name="account_level"> - <combo_box.item name="US$9.95/month,billedmonthly" label="US$9.95/mês, debitado mensalmente" /> - <combo_box.item name="US$7.50/month,billedquarterly" label="US$7.50/mês, debitado trimestralmente" /> - <combo_box.item name="US$6.00/month,billedannually" label="US$6.00/mês, debitado anualmente" /> + <combo_box.item label="US$9.95/mês, pagamento mensal" name="US$9.95/month,billedmonthly"/> + <combo_box.item label="US$7,50/mês, pagamento trimestral" name="US$7.50/month,billedquarterly"/> + <combo_box.item label="US$6.00/mês, pagamento trimestral" name="US$6.00/month,billedannually"/> </combo_box> <text name="land_use_action"> Aumente sua taxa de locação de terra para US$ 40/mês. </text> <text name="land_use_reason"> - Você possui 1309 m² de terra. -Este lote tem 512 m² de terra. + Você tem 1309 m². +Este lote mede 512 m². </text> <text name="purchase_action"> Pagar ao Residente Joe L$4000 pela terra @@ -95,142 +220,16 @@ Este lote tem 512 m² de terra. <text name="currency_action" width="116"> Compre L$ adicionais </text> - <line_editor name="currency_amt" left="190" width="65"> + <line_editor left="190" name="currency_amt" width="65"> 1000 </line_editor> <text name="currency_est"> - por aproxim. US$ [AMOUNT2] + cerca de [LOCAL_AMOUNT] </text> <text name="currency_balance"> Você tem L$2,100. </text> - <check_box label="Remover [AMOUNT] m² de contribuição do grupo." name="remove_contribution"/> + <check_box label="Subtrair [AMOUNT] m² da minha contribuição." name="remove_contribution"/> <button label="Adquirir" name="buy_btn"/> <button label="Cancelar" name="cancel_btn"/> - <string name="can_resell"> - Pode ser revendida. - </string> - <string name="can_not_resell"> - Não pode ser revendida. - </string> - <string name="can_change"> - Pode ser unida ou subdivida. - </string> - <string name="can_not_change"> - Não pode ser unida ou subdividida. - </string> - <string name="cant_buy_for_group"> - Você não tem permissão para comprar terra para seu grupo ativo. - </string> - <string name="no_land_selected"> - Nenhuma terra selecionada. - </string> - <string name="multiple_parcels_selected"> - Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor. - </string> - <string name="no_permission"> - Você não tem permissão para comprar uma terra para seu grupo ativo. - </string> - <string name="parcel_not_for_sale"> - O lote selecionado não está a venda. - </string> - <string name="group_already_owns"> - O grupo já possui o lote. - </string> - <string name="you_already_own"> - Você já possui o lote. - </string> - <string name="set_to_sell_to_other"> - O lote selecionado está configurado para ser vendido para outro grupo. - </string> - <string name="no_public_land"> - A área selecionada não tem terras públicas. - </string> - <string name="not_owned_by_you"> - Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor. - </string> - <string name="processing"> - Processando sua compra... - -(Isso pode levar um minuto.) - </string> - <string name="fetching_error"> - Houve um erro ao buscar informações sobre compra de terras. - </string> - <string name="buying_will"> - Comprar esta terra irá: - </string> - <string name="buying_for_group"> - Ao comprar terra para o grupo: - </string> - <string name="cannot_buy_now"> - Não foi possÃvel comprar agora: - </string> - <string name="not_for_sale"> - Não disponÃvel para venda: - </string> - <string name="none_needed"> - nada necessário - </string> - <string name="must_upgrade"> - Sua conta deve ser evoluÃda para adquirir um lote. - </string> - <string name="cant_own_land"> - Sua conta pode possuir uma terra. - </string> - <string name="land_holdings"> - Você possui [BUYER] m² de terra. - </string> - <string name="pay_to_for_land"> - Pagar L$ [AMOUNT] para [SELLER] por esta terra - </string> - <string name="buy_for_US"> - Comprar L$ [AMOUNT] por aprox. US$ [AMOUNT2], - </string> - <string name="parcel_meters"> - Este lote tem [AMOUNT] m². - </string> - <string name="premium_land"> - Esta terra é premium e será taxada como [AMOUNT] m². - </string> - <string name="discounted_land"> - Esta terra tem desconto e será taxada como [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -aceita [AMOUNT2] objetos - </string> - <string name="sold_with_objects"> - vendido com objetos - </string> - <string name="sold_without_objects"> - objetos não incluÃdos - </string> - <string name="info_price_string"> - L$ [PRICE] -(L$ [PRICE_PER_SQM]/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - O grupo [GROUP] precisará de fundos suficientes de terras -contribuÃdas para cobrir este lote antes da aquisição se completar. - </string> - <string name="have_enough_lindens"> - Você tem L$ [AMOUNT], suficiente para comprar este lote. - </string> - <string name="not_enough_lindens"> - Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2]. - </string> - <string name="balance_left"> - Após a compra, restará L$ [AMOUNT]. - </string> - <string name="balance_needed"> - Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote. - </string> - <string name="no_parcel_selected"> - (nenhum lote selecionado) - </string> - <string name="buy_currency"> - Comprar L$ [LINDENS] por aproxim. US$ [USD] - </string> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml index e9968ed8f8..d71eb04cc4 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="contents" title="COMPRAR CÓPIA DO OBJETO"> <text name="contents_text"> - e seus conteúdos: + Contém: </text> <text name="buy_text"> Comprar por L$[AMOUNT] de(a) [NAME]? diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index b61e261148..5114b19336 100644 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml @@ -10,7 +10,22 @@ Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita </floater.string> <panel name="controls"> - <joystick_track name="cam_track_stick" tool_tip="Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita"/> - <joystick_zoom name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco"/> + <joystick_track name="cam_track_stick" tool_tip="Move a câmera para cima e para baixo, direita e esquerda"/> + <panel name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco"> + <slider_bar name="zoom_slider" tool_tip="Zoom de câmera para focalizar"/> + </panel> + <joystick_rotate name="cam_rotate_stick" tool_tip="Órbita em torno do foco da câmera"/> + <panel name="camera_presets"> + <button name="rear_view" tool_tip="Vista de trás"/> + <button name="group_view" tool_tip="Visualizar grupo"/> + <button name="front_view" tool_tip="Vista frontal"/> + <button name="mouselook_view" tool_tip="Visâo do mouse"/> + </panel> + </panel> + <panel name="buttons"> + <button label="" name="orbit_btn" tool_tip="Câmera orbital"/> + <button label="" name="pan_btn" tool_tip="Câmera Pan"/> + <button label="" name="avatarview_btn" tool_tip="ver como o avatar"/> + <button label="" name="freecamera_btn" tool_tip="Visualizar objeto"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml index ae395734e9..60f01a3733 100644 --- a/indra/newview/skins/default/xui/pt/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pt/floater_choose_group.xml @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="groups" title="GRUPOS"> <text name="groupdesc"> Escolha um grupo: </text> - <button label="OK" label_selected="OK" name="OK" /> - <button label="Cancelar" label_selected="Cancelar" name="Cancel" /> + <button label="OK" label_selected="OK" name="OK"/> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml index 6a4263f4ff..4ea014335f 100644 --- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="ColorPicker" title="SELETOR DE COR"> +<floater name="ColorPicker" title="DESTAQUE DE COR"> <text name="r_val_text"> Vermelho: </text> @@ -18,15 +18,14 @@ <text name="l_val_text"> Lum: </text> - <check_box label="Aplicar imediatamente" name="apply_immediate"/> - <button left_delta="150" name="color_pipette" /> - <button left_delta="55" label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> - <button label="Selecionar" label_selected="Selecionar" name="select_btn"/> + <check_box label="inscrever-se agora" name="apply_immediate"/> + <button left_delta="150" name="color_pipette"/> + <button label="Cancelar" label_selected="Cancelar" left_delta="55" name="cancel_btn"/> + <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> Cor atual: </text> <text name="(Drag below to save.)"> - (Arraste abaixo - para salvar) + (Arrastar abaixo para salvar) </text> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml index 55946933e7..318c73e52d 100644 --- a/indra/newview/skins/default/xui/pt/floater_customize.xml +++ b/indra/newview/skins/default/xui/pt/floater_customize.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="APARÊNCIA" width="546"> <tab_container name="customize tab container" tab_min_width="115" width="544"> - <placeholder label="Partes de corpo" name="body_parts_placeholder"/> + <text label="Partes de corpo" name="body_parts_placeholder"> + Partes do corpo + </text> <panel label="Forma" name="Shape"> <button label="Reverter" label_selected="Reverter" name="Revert"/> <button label="Corpo" label_selected="Corpo" name="Body"/> @@ -14,8 +16,8 @@ <button label="Tórax" label_selected="Tórax" name="Torso"/> <button label="Pernas" label_selected="Pernas" name="Legs"/> <radio_group name="sex radio"> - <radio_item name="radio" label="Feminino" /> - <radio_item name="radio2" label="Masculino" /> + <radio_item label="Feminino" name="radio" value="0"/> + <radio_item label="Masculino" name="radio2" value="1"/> </radio_group> <text name="title"> [DESC] @@ -33,8 +35,7 @@ Localizado em [PATH] </text> <text name="not worn instructions"> - Coloque uma nova forma arrastando uma do seu inventário para seu avatar. -Alternativamente, você pode criar uma nova de um esboço e usá-la. + Para obter um fÃsico novo, arraste um do inventário para o seu avatar. Ou crie um novo. </text> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. @@ -47,10 +48,10 @@ Alternativamente, você pode criar uma nova de um esboço e usá-la. <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> </panel> <panel label="Pele" name="Skin"> - <button width="115" label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/> - <button width="115" label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/> - <button width="115" label="Maquiagem" label_selected="Maquiagem" name="Makeup"/> - <button width="115" label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/> + <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color" width="115"/> + <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail" width="115"/> + <button label="Maquiagem" label_selected="Maquiagem" name="Makeup" width="115"/> + <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail" width="115"/> <text name="title"> [DESC] </text> @@ -67,9 +68,7 @@ Alternativamente, você pode criar uma nova de um esboço e usá-la. Localizada em [PATH] </text> <text name="not worn instructions"> - Coloque uma nova pele arrastando uma de seu inventário para seu avatar. -Alternativamente, você pode criar uma nova forma a partir de um esboço -e usá-la. + Para obter uma pele nova, arraste uma do inventário para o seu avatar. Ou crie uma pele nova. </text> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. @@ -77,19 +76,19 @@ e usá-la. <text name="Item Action Label"> Pele: </text> - <texture_picker width="86" label="Tattoo: cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/> - <texture_picker width="86" label="Tattoo: superior" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/> - <texture_picker width="86" label="Tattoo: inferior" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/> + <texture_picker label="Tattoo: cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> + <texture_picker label="Tattoo: superior" name="Upper Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> + <texture_picker label="Tattoo: inferior" name="Lower Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> </panel> <panel label="Cabelo" name="Hair"> - <button width="115" label="Cor" label_selected="Cor" name="Color"/> - <button width="115" label="Estilo" label_selected="Estilo" name="Style"/> - <button width="115" label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/> - <button width="115" label="Rosto" label_selected="Rosto" name="Facial"/> + <button label="Cor" label_selected="Cor" name="Color" width="115"/> + <button label="Estilo" label_selected="Estilo" name="Style" width="115"/> + <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows" width="115"/> + <button label="Rosto" label_selected="Rosto" name="Facial" width="115"/> <text name="title"> [DESC] </text> @@ -106,9 +105,7 @@ e usá-la. Localizado em [PATH] </text> <text name="not worn instructions"> - Ponha um novo cabelo em seu avatar arrastando um do seu inventário. -Alternativamente, você pode criar um novo modelo a partir de um esboço -e usá-lo. + Para obter um cabelo novo, arraste um tipo de cabelo do inventário para o seu avatar. Ou crie um cabelo novo. </text> <text name="no modify instructions"> Você não ter permissão para modificar essa vestimenta. @@ -139,8 +136,7 @@ e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para colocar novos olhos, arraste um do seu inventário para seu avatar. -Alternativamente, você pode criar um novo modelo de um esboço e usá-lo. + Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos. </text> <text name="no modify instructions"> Você não tem permissão para alterar esta vestimenta. @@ -154,12 +150,14 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo. <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> </panel> - <panel label="Roupas" name="clothes_placeholder"/> + <text label="Roupas" name="clothes_placeholder"> + Roupa + </text> <panel label="Camisa" name="Shirt"> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/> - <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> + <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -179,9 +177,7 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por uma nova camisa em seu avatar, arraste uma do seu inventário para -seu avatar. Alternativamente, você pode criar um novo modelo a partir de -um esboço e usá-lo. + Para obter uma camisa nova, arraste uma do inventário para o seu avatar. Ou crie uma camisa nova. </text> <text name="no modify instructions"> Você não ter permissão para modificar esta vestimenta. @@ -192,9 +188,9 @@ um esboço e usá-lo. </panel> <panel label="Calças" name="Pants"> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/> - <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> + <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -214,9 +210,7 @@ um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por uma nova calça em seu avatar, basta arrastar uma outra do seu -inventário. Alternativamente, você pode criar um novo modelo a partir -de um esboço e usá-lo. + Para obter calças novas, arraste uma do inventário para o seu avatar. Ou crie calças novas. </text> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. @@ -242,10 +236,9 @@ de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por novos sapatos em seu avatar, basta arrastar um novo do seu -inventário. Alternativamente, você pode criar um novo modelo a partir -de um esboço e usá-lo. + Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos. </text> + <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> @@ -253,8 +246,7 @@ de um esboço e usá-lo. Sapatos: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/> - <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -277,10 +269,9 @@ de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por novas meias em seu avatar, basta arrastar uma nova do seu -inventário. Alternativamente, você pode criar novas meias a partir de -um esboço e usá-las. + Para obter meias novas, arraste um par do inventário para o seu avatar. Ou crie meias novas. </text> + <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> @@ -288,8 +279,7 @@ um esboço e usá-las. Meias: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/> - <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -312,10 +302,9 @@ um esboço e usá-las. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo -do seu inventário. Alternativamente, você pode criar um novo modelo a -partir de um esboço e usá-lo. + Para por uma jaqueta nova, arraste uma do inventário para o seu avatar. Ou crie uma jaqueta nova. </text> + <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> @@ -324,8 +313,7 @@ partir de um esboço e usá-lo. </text> <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/> - <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -348,10 +336,9 @@ partir de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo -do seu inventário. Alternativamente, você pode criar uma novo modelo a -partir de um esboço e usá-lo. + Para obter luvas novas, arraste um par do inventário para o seu avatar. Ou crie luvas novas. </text> + <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> @@ -359,8 +346,7 @@ partir de um esboço e usá-lo. Luvas: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/> - <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -383,10 +369,9 @@ partir de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo -de seu inventário. Alternativamente, você pode criar um novo modelo a -partir de um esboço e usá-lo. + Para obter uma camiseta nova, arraste uma do inventário para o seu avatar. Ou crie uma camiseta nova. </text> + <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/> <text name="no modify instructions"> Você não ter permissão para modificar essa vestimenta. </text> @@ -394,8 +379,7 @@ partir de um esboço e usá-lo. Camiseta: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/> - <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -418,10 +402,9 @@ partir de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por novas roupas de baixo em seu avatar, basta arrastar um novo -modelo do seu inventário. Alternativamente, você pode criar um novo -modelo a partir de um esboço e usá-lo. + Para obter roupa de baixo nova, arraste um modelo do inventário para o seu avatar. Ou crie uma roupa de baixo nova. </text> + <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> @@ -429,8 +412,7 @@ modelo a partir de um esboço e usá-lo. Roupas de Baixo: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/> - <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -453,10 +435,9 @@ modelo a partir de um esboço e usá-lo. Localizado em [PATH] </text> <text name="not worn instructions"> - Para por uma nova saia em seu avatar, basta arrastar um novo modelo -do seu inventário. Alternativamente, você pode criar um novo modelo a -partir de um esboço e usá-lo. + Para obter um saia nova, arraste uma saia do inventário para o seu avatar. Ou crie uma saia nova. </text> + <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> @@ -464,16 +445,86 @@ partir de um esboço e usá-lo. Saia: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/> - <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/> + <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> </panel> + <panel label="Tatuagem" name="Tattoo"> + <text name="title"> + [DESC]: + </text> + <text name="title_no_modify"> + [DESC]: não pode ser modificado + </text> + <text name="title_loading"> + [DESC]: Carregando... + </text> + <text name="title_not_worn"> + [DESC]: não vestido + </text> + <text name="path"> + Localização: [PATH] + </text> + <text name="not worn instructions"> + Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar. Ou crie uma tatuagem nova. + </text> + <button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/> + <text name="no modify instructions"> + Você não está autorizado a modificar este acessório. + </text> + <text name="Item Action Label"> + Tatuagem: + </text> + <texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/> + <texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/> + <texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/> + <button label="Tirar" label_selected="Tirar" name="Take Off"/> + <button label="Salvar" label_selected="Salvar" name="Save"/> + <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> + <button label="Reverter" label_selected="Reverter" name="Revert"/> + </panel> + <panel label="Alpha" name="Alpha"> + <text name="title"> + [DESC]: + </text> + <text name="title_no_modify"> + [DESC]: não pode ser modificado + </text> + <text name="title_loading"> + [DESC]: Carregando... + </text> + <text name="title_not_worn"> + [DESC]: não vestido + </text> + <text name="path"> + Localização: [PATH] + </text> + <text name="not worn instructions"> + Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar. Ou crie uma máscara nova. + </text> + <button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/> + <text name="no modify instructions"> + Você não está autorizado a modificar este acessório. + </text> + <text name="Item Action Label"> + Alpha: + </text> + <texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/> + <button label="Tirar" label_selected="Tirar" name="Take Off"/> + <button label="Salvar" label_selected="Salvar" name="Save"/> + <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> + <button label="Reverter" label_selected="Reverter" name="Revert"/> + </panel> </tab_container> <scroll_container left="249" name="panel_container"/> + <button label="Dados do script" label_selected="Dados do script" name="script_info" tool_tip="Mostrar scripts anexados ao seu avatar"/> + <button label="Criar look" label_selected="Criar look" name="make_outfit_btn"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> - <button label="Criar Vestimenta..." label_selected="Criar Vestimenta..." name="Make Outfit" left="117" width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_device_settings.xml b/indra/newview/skins/default/xui/pt/floater_device_settings.xml index fa4da834b8..48a4a6ef6f 100644 --- a/indra/newview/skins/default/xui/pt/floater_device_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_device_settings.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_device_settings" title="AJUSTES DO DISPOSITIVO DE CONVERSA POR VOZ"/> +<floater name="floater_device_settings" title="CONFIGURAÇÃO DE DISPOSITIVO DE VOZ"/> diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml index 4a43801b48..3ca8d934c9 100644 --- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_env_settings.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Environment Editor Floater" title="EDITOR DO AMBIENTE"> + <floater.string name="timeStr"> + [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] + </floater.string> <text name="EnvTimeText"> Hora do Dia </text> @@ -13,13 +16,12 @@ Nuvens <text name="EnvWaterColorText"> Cor da água </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/> + <color_swatch label="" name="EnvWaterColor" tool_tip="Selecionar a cor"/> <text name="EnvWaterFogText"> Névoa da água </text> <button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/> - <button label="Céu Avançado" name="EnvAdvancedSkyButton" width="155" left="167"/> - <button label="Ãgua Avançada" name="EnvAdvancedWaterButton" width="155" left="326"/> - <button label="?" name="EnvSettingsHelpButton"/> + <button label="Céu Avançado" left="167" name="EnvAdvancedSkyButton" width="155"/> + <button label="Ãgua Avançada" left="326" name="EnvAdvancedWaterButton" width="155"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml new file mode 100644 index 0000000000..4b2489654a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Evento" name="Event" title="DETALHES DO EVENTO"> + <floater.string name="none"> + nenhum + </floater.string> + <floater.string name="notify"> + Avisar + </floater.string> + <floater.string name="dont_notify"> + Não avisar + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Evento sem nome... Terror! Terror Aterrorizante. + </text> + <text name="event_category"> + (não categorizado) + </text> + <text name="event_runby_label"> + Organização: + </text> + <text initial_value="(pesquisando)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 hora + </text> + <text name="event_cover"> + Grátis + </text> + <text name="event_location_label"> + Localização: + </text> + <text name="event_location" value="LoteExemplo, Nome extenso (145, 228, 26)"/> + <text name="rating_label" value="Classificação:"/> + <text name="rating_value" value="(Desconhecido)"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Criar evento"/> + <button name="god_delete_event_btn" tool_tip="Excluir evento"/> + <button label="Avise-me" name="notify_btn"/> + <button label="Teletransportar" name="teleport_btn"/> + <button label="Mapa" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml index b0bc42685d..2e5b92aaf7 100644 --- a/indra/newview/skins/default/xui/pt/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml @@ -1,14 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="gestures" title="GESTOS ATIVOS"> - <text name="help_label"> - Clicar duas vezes no gesto para executar animações e sons. - </text> +<floater label="Lugares" name="gestures" title="GESTOS"> + <floater.string name="loading"> + Carregando... + </floater.string> + <floater.string name="playing"> + (Em execução) + </floater.string> + <floater.string name="copy_name"> + Cópia de [COPY_NAME] + </floater.string> <scroll_list name="gesture_list"> - <column label="Acionar" name="trigger"/> - <column label="Chave" name="shortcut"/> - <column label="Nome" name="name"/> + <scroll_list.columns label="Nome" name="name"/> + <scroll_list.columns label="Bate-papo" name="trigger"/> + <scroll_list.columns label="Chave" name="shortcut"/> </scroll_list> - <button label="Novo" name="new_gesture_btn"/> + <panel label="bottom_panel" name="bottom_panel"> + <menu_button name="gear_btn" tool_tip="Mais opções"/> + <button name="new_gesture_btn" tool_tip="Criar novo gesto"/> + <button name="activate_btn" tool_tip="Ativar/Desativar gesto selecionado"/> + <button name="del_btn" tool_tip="Excluir este gesto"/> + </panel> <button label="Editar" name="edit_btn"/> <button label="Executar" name="play_btn"/> <button label="Parar" name="stop_btn"/> diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml index 4b7b2eb34e..93b2f3e90d 100644 --- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml @@ -11,7 +11,7 @@ </text> <check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/> <check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) > Terreno."/> - <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/> + <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente sair, definir o destino com sua posição inicial."/> <check_box label="VisÃvel" name="check visible" tool_tip="Ajustar para fazer essa região visÃvel para os não-deuses"/> <check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/> <check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/> @@ -73,17 +73,17 @@ Destino: </text> <combo_box name="destination"> - <combo_box.item name="item1" label="Seleção" /> - <combo_box.item name="item2" label="Região do Agente" /> + <combo_box.item label="Seleção" name="item1"/> + <combo_box.item label="Região do Agente" name="item2"/> </combo_box> <text name="Request:"> Requisição: </text> <combo_box name="request"> - <combo_box.item name="item1" label="Passos de Colisão" /> - <combo_box.item name="item2" label="Contagem de scripts, padrão opcional" /> - <combo_box.item name="item3" label="Padrão de Objetos" /> - <combo_box.item name="item4" label="rez <asset_id>" /> + <combo_box.item label="Passos de Colisão" name="item1"/> + <combo_box.item label="Contagem de scripts, padrão opcional" name="item2"/> + <combo_box.item label="Padrão de Objetos" name="item3"/> + <combo_box.item label="rez <asset_id>" name="item4"/> </combo_box> <text name="Parameter:"> Parametro: diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml index 8921e6ea12..c666a941fe 100644 --- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Hardware Settings Floater" title="AJUSTES DE HARDWARE"> +<floater name="Hardware Settings Floater" title="CONFIGURAÇÃO DO HARDWARE"> <text name="Filtering:"> Filtragem: </text> @@ -8,21 +8,21 @@ Suavização: </text> <combo_box label="Suavização" name="fsaa" width="94"> - <combo_box.item name="FSAADisabled" label="Desabilitado"/> - <combo_box.item name="2x" label="2x"/> - <combo_box.item name="4x" label="4x"/> - <combo_box.item name="8x" label="8x"/> - <combo_box.item name="16x" label="16x"/> + <combo_box.item label="Desativado" name="FSAADisabled"/> + <combo_box.item label="2x" name="2x"/> + <combo_box.item label="4x" name="4x"/> + <combo_box.item label="8x" name="8x"/> + <combo_box.item label="16x" name="16x"/> </combo_box> <spinner label="Gama:" name="gamma"/> <text name="(brightness, lower is brighter)"> - (brilho, quanto menor, mais brilho, 0=usar padrão) + (0 = brilho padrão, menor = mais brilho) </text> <text name="Enable VBO:"> Habilitar VBO: </text> - <check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/> - <slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a Memória da Placa de VÃdeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/> - <spinner label="Relação de Distância de Nevoeiro:" name="fog"/> + <check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/> + <slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas. O padrão é definido pela memória da placa de vÃdeo. Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/> + <spinner label="Relação de Distância de Nevoeiro:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml new file mode 100644 index 0000000000..9cc8a0a6b2 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_help_browser" title="NAVEGADOR DA AJUDA"> + <floater.string name="loading_text"> + Carregando... + </floater.string> + <layout_stack name="stack1"> + <layout_panel name="external_controls"/> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml index 75c3409339..f6057c48f1 100644 --- a/indra/newview/skins/default/xui/pt/floater_im.xml +++ b/indra/newview/skins/default/xui/pt/floater_im.xml @@ -10,7 +10,7 @@ Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz. </string> <string name="muted_message"> - Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente. + Você bloqueou este residente. Se quiser retirar o bloqueio, basta enviar uma mensagem. </string> <string name="generic_request_error"> Erro na requisição, por favor, tente novamente. diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml new file mode 100644 index 0000000000..0fbb826a96 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<multi_floater name="floater_im_box" title="CONVERSAS"/> diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml new file mode 100644 index 0000000000..39dde3408b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="panel_im"> + <layout_stack name="im_panels"> + <layout_panel label="Painel de controle de MI" name="panel_im_control_panel"/> + <layout_panel> + <line_editor label="Para" name="chat_editor"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml index a0d8c02ef0..2ff1aa7915 100644 --- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml @@ -10,17 +10,17 @@ Prévia da imagem como: </text> - <combo_box label="Tipo de Roupas" name="clothing_type_combo" left="100" width="186"> - <combo_box.item name="Image" label="Imagem" /> - <combo_box.item name="Hair" label="Cabelo" /> - <combo_box.item name="FemaleHead" label="Cabeça Feminina" /> - <combo_box.item name="FemaleUpperBody" label="Parte Superior do Corpo Feminino" /> - <combo_box.item name="FemaleLowerBody" label="Parte Inferior do Corpo Feminino" /> - <combo_box.item name="MaleHead" label="Cabeça Masculina" /> - <combo_box.item name="MaleUpperBody" label="Parte Superior do Corpo Masculino" /> - <combo_box.item name="MaleLowerBody" label="Parte Inferiro do Corpo Masculino" /> - <combo_box.item name="Skirt" label="Saia" /> - <combo_box.item name="SculptedPrim" label="Primitiva Esculpida" /> + <combo_box label="Tipo de Roupas" left="100" name="clothing_type_combo" width="186"> + <combo_box.item label="Imagem" name="Image"/> + <combo_box.item label="Cabelo" name="Hair"/> + <combo_box.item label="Cabeça de mulher" name="FemaleHead"/> + <combo_box.item label="Cintura para cima, mulher" name="FemaleUpperBody"/> + <combo_box.item label="Cintura para baixo, mulher" name="FemaleLowerBody"/> + <combo_box.item label="Cabeça de homem" name="MaleHead"/> + <combo_box.item label="Cintura para cima, homem" name="MaleUpperBody"/> + <combo_box.item label="Cintura para baixo, homem" name="MaleLowerBody"/> + <combo_box.item label="Saia" name="Skirt"/> + <combo_box.item label="Prim esculpido" name="SculptedPrim"/> </combo_box> <text name="bad_image_text"> Incapaz de ler a imagem. diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml new file mode 100644 index 0000000000..cdebe533bd --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="incoming call" title="LIGAÇÃO DE DESCONHECIDO"> + <floater.string name="lifetime"> + 5 + </floater.string> + <floater.string name="localchat"> + Bate-papo local + </floater.string> + <floater.string name="anonymous"> + anônimo + </floater.string> + <floater.string name="VoiceInviteP2P"> + está ligando. + </floater.string> + <floater.string name="VoiceInviteAdHoc"> + entrou numa ligação de voz via conferência. + </floater.string> + <floater.string name="VoiceInviteGroup"> + entrou numa ligação de bate-papo de voz com o grupo [GROUP]. + </floater.string> + <text name="question"> + Sair do [CURRENT_CHAT] e entrar neste bate-papo? + </text> + <button label="Aceitar" label_selected="Aceitar" name="Accept"/> + <button label="Rejeitar" label_selected="Rejeitar" name="Reject"/> + <button label="Enviar MI" name="Start IM"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml index 97c2c6eaeb..6a00b1a628 100644 --- a/indra/newview/skins/default/xui/pt/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="inspect" title="INSPECIONAR OBJETO" min_width="450"> +<floater min_width="450" name="inspect" title="EXAMINAR OBJETOS"> + <floater.string name="timeStamp"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </floater.string> <scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world"> - <column label="Nome do Objeto" name="object_name"/> - <column label="Proprietário" name="owner_name"/> - <column label="Criador" name="creator_name"/> - <column label="Data de Criação" name="creation_date"/> + <scroll_list.columns label="Nome do Objeto" name="object_name"/> + <scroll_list.columns label="Proprietário" name="owner_name"/> + <scroll_list.columns label="Criador" name="creator_name"/> + <scroll_list.columns label="Data de Criação" name="creation_date"/> </scroll_list> - <button width="185" label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/> - <button width="165" left="205" label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/> + <button label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado" width="185"/> + <button label="Ver perfil do criador..." label_selected="" left="205" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado" width="165"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml index 1c2a3a9233..ae3312eab0 100644 --- a/indra/newview/skins/default/xui/pt/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml @@ -1,47 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="INVENTÃRIO"> - <search_editor label="Escreva aqui para busca" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="Todos os Itens" name="All Items"/> - <inventory_panel label="Itens Recentes" name="Recent Items"/> - </tab_container> - <menu_bar name="Inventory Menu"> - <menu label="Arquivo" name="File"> - <menu_item_call label="Abrir" name="Open"/> - <menu_item_call label="Nova Janela" name="New Window"/> - <menu_item_call label="Mostrar Filtros" name="Show Filters"/> - <menu_item_call label="Redefinir Filtros" name="Reset Current"/> - <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/> - <menu_item_call label="Limpar Lixeira" name="Empty Trash"/> - </menu> - <menu label="Criar" name="Create"> - <menu_item_call label="Nova Pasta" name="New Folder"/> - <menu_item_call label="Novo Script" name="New Script"/> - <menu_item_call label="Nova Nota" name="New Note"/> - <menu_item_call label="Novo Gesto" name="New Gesture"/> - <menu label="Nova Roupa" name="New Clothes"> - <menu_item_call label="Nova Camisa" name="New Shirt"/> - <menu_item_call label="Nova Calça" name="New Pants"/> - <menu_item_call label="Novos Sapatos" name="New Shoes"/> - <menu_item_call label="Novas Meias" name="New Socks"/> - <menu_item_call label="Nova Jaqueta" name="New Jacket"/> - <menu_item_call label="Nova Saia" name="New Skirt"/> - <menu_item_call label="Novas Luvas" name="New Gloves"/> - <menu_item_call label="Nova Anágua" name="New Undershirt"/> - <menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/> - </menu> - <menu label="Parte do corpo" name="New Body Parts"> - <menu_item_call label="Nova Forma" name="New Shape"/> - <menu_item_call label="Nova Pele" name="New Skin"/> - <menu_item_call label="Novo Cabelo" name="New Hair"/> - <menu_item_call label="Novos Olhos" name="New Eyes"/> - </menu> - </menu> - <menu label="Ordenar" name="Sort"> - <menu_item_check label="Por Nome" name="By Name"/> - <menu_item_check label="Por Data" name="By Date"/> - <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/> - <menu_item_check label="Pastas do sistema primeiro" name="System Folders To Top"/> - </menu> - </menu_bar> +<floater name="Inventory" title="MEU INVENTÃRIO"> + <floater.string name="Title"> + MEU INVENTÃRIO + </floater.string> + <floater.string name="TitleFetching"> + MEU INVENTÃRIO (Pegando [ITEM_COUNT] items...) [FILTER] + </floater.string> + <floater.string name="TitleCompleted"> + MEU INVENTÃRIO ([ITEM_COUNT] items) [FILTER] + </floater.string> + <floater.string name="Fetched"> + Obtido + </floater.string> + <panel label="Painel do inventário" name="Inventory Panel"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml index 2a6b02f9c2..8fe69c097d 100644 --- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="item properties" title="PROPRIEDADES DO ITEM DE INVENTÃRIO"> +<floater name="item properties" title="PROPRIEDADES DE ITEM NO INVENTÃRIO"> + <floater.string name="unknown"> + (desconhecido) + </floater.string> + <floater.string name="public"> + (público) + </floater.string> + <floater.string name="you_can"> + Você pode: + </floater.string> + <floater.string name="owner_can"> + Proprietário pode : + </floater.string> + <floater.string name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </floater.string> <text name="LabelItemNameTitle"> Nome: </text> @@ -27,55 +42,32 @@ Qua Mai 24 12:50:46 2006 </text> <text name="OwnerLabel"> - Você pode: + Você: </text> - <check_box label="Modificar" name="CheckOwnerModify"/> + <check_box label="Editar" name="CheckOwnerModify"/> <check_box label="Copiar" name="CheckOwnerCopy"/> - <check_box label="Revender/Doar" name="CheckOwnerTransfer"/> - <text name="BaseMaskDebug"> - B: - </text> - <text name="OwnerMaskDebug"> - O: - </text> - <text name="GroupMaskDebug"> - G: + <check_box label="Revender" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Todos: </text> - <text name="EveryoneMaskDebug"> - E: + <check_box label="Cortar" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Grupo: </text> - <text name="NextMaskDebug"> - N: - </text> - <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/> - <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/> + <check_box label="Compartilhar" name="CheckShareWithGroup"/> <text name="NextOwnerLabel" width="230"> - Próximo dono pode: + Próximo proprietário: </text> - <check_box label="Modificar" name="CheckNextOwnerModify"/> + <check_box label="Editar" name="CheckNextOwnerModify"/> <check_box label="Copiar" name="CheckNextOwnerCopy"/> - <check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/> - <text name="SaleLabel"> - Marcar Item: - </text> + <check_box label="Revender" name="CheckNextOwnerTransfer"/> <check_box label="À venda" name="CheckPurchase"/> - <radio_group name="RadioSaleType"> - <radio_item name="radio" label="Original" /> - <radio_item name="radio2" label="Cópia" /> - </radio_group> - <text name="TextPrice"> - Price: L$ + <combo_box name="combobox sale copy"> + <combo_box.item label="Cortar" name="Copy"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Preço:" name="Edit Cost"/> + <text name="CurrencySymbol"> + L$ </text> - <string name="unknown"> - (desconhecido) - </string> - <string name="public"> - (público) - </string> - <string name="you_can"> - Você pode: - </string> - <string name="owner_can"> - Proprietário pode : - </string> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml index 0793a0b161..ecc4fcc9e9 100644 --- a/indra/newview/skins/default/xui/pt/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Joystick" title="CONFIGURAÇÃO DO JOYSTICK"> - <check_box name="enable_joystick" label="Habilitar Joystick:"/> + <check_box label="Habilitar Joystick:" name="enable_joystick"/> <text left="135" name="joystick_type" width="360"/> - <spinner label="Mapeamento: eixo X" name="JoystickAxis1" label_width="124" width="164"/> - <spinner label="Mapeamento: eixo Y" name="JoystickAxis2" label_width="124" width="164"/> - <spinner label="Mapeamento: eixo Z" name="JoystickAxis0" label_width="124" width="164"/> - <spinner label="Mapeamento: Elevação" name="JoystickAxis4" label_width="124" width="164"/> - <spinner label="Mapeamento: Guinada" name="JoystickAxis5" label_width="124" width="164"/> - <spinner label="Mapeamento: Rolagem" name="JoystickAxis3" label_width="124" width="164"/> - <spinner label="Mapeamento: Zoom" name="JoystickAxis6" label_width="124" width="164"/> - <check_box label="Zoom Direto" name="ZoomDirect" left="194"/> + <spinner label="Mapeamento: eixo X" label_width="124" name="JoystickAxis1" width="164"/> + <spinner label="Mapeamento: eixo Y" label_width="124" name="JoystickAxis2" width="164"/> + <spinner label="Mapeamento: eixo Z" label_width="124" name="JoystickAxis0" width="164"/> + <spinner label="Mapeamento: Elevação" label_width="124" name="JoystickAxis4" width="164"/> + <spinner label="Mapeamento: Guinada" label_width="124" name="JoystickAxis5" width="164"/> + <spinner label="Mapeamento: Rolagem" label_width="124" name="JoystickAxis3" width="164"/> + <spinner label="Mapeamento: Zoom" label_width="124" name="JoystickAxis6" width="164"/> + <check_box label="Zoom Direto" left="194" name="ZoomDirect"/> <check_box label="Cursor 3D" name="Cursor3D"/> <check_box label="NÃvel Automático" name="AutoLeveling"/> <text name="Control Modes:"> Modos de Controle: </text> - <check_box name="JoystickAvatarEnabled" label="Avatar"/> - <check_box name="JoystickBuildEnabled" left="192" label="Construir"/> - <check_box name="JoystickFlycamEnabled" label="Camera aérea"/> + <check_box label="Avatar" name="JoystickAvatarEnabled"/> + <check_box label="Construir" left="192" name="JoystickBuildEnabled"/> + <check_box label="Camera aérea" name="JoystickFlycamEnabled"/> <text name="XScale"> Escala X </text> @@ -27,13 +27,13 @@ <text name="ZScale"> Escala Z </text> - <text name="PitchScale" left="3" width="115"> + <text left="3" name="PitchScale" width="115"> Escala de Elevação </text> - <text name="YawScale" left="3" width="115"> + <text left="3" name="YawScale" width="115"> Escala da Guinada </text> - <text name="RollScale" left="3" width="115"> + <text left="3" name="RollScale" width="115"> Escala de Rolagem </text> <text name="XDeadZone"> @@ -45,13 +45,13 @@ <text name="ZDeadZone"> Zona Morta Z </text> - <text name="PitchDeadZone" left="3" width="115"> + <text left="3" name="PitchDeadZone" width="115"> Zona Morta: Elevação </text> - <text name="YawDeadZone" left="3" width="115"> + <text left="3" name="YawDeadZone" width="115"> Zona Morta: Guinada </text> - <text name="RollDeadZone" left="3" width="115"> + <text left="3" name="RollDeadZone" width="115"> Zona Morta: Rolagem </text> <text name="Feathering"> @@ -60,10 +60,10 @@ <text name="ZoomScale2"> Escala de Zoom </text> - <text name="ZoomDeadZone" width="110" left="4"> + <text left="4" name="ZoomDeadZone" width="110"> Zona Morta de Zoom </text> - <button label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall"/> + <button font="SansSerifSmall" label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults"/> <button label="OK" label_selected="OK" name="ok_btn"/> <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> <stat_view label="Monitor do Joystick" name="axis_view"> diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml index 2728633438..9932318293 100644 --- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml @@ -1,155 +1,154 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_lagmeter" title="MEDIDOR DE ATRASO"> - <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/> - <text left="30" name="client_lag_cause" right="-10" /> - <text left="30" name="network_lag_cause" right="-10" /> - <text left="30" name="server_lag_cause" right="-32" /> - <text name="client"> - Cliente: - </text> - <text name="client_text" font="SansSerifSmall"> - Normal - </text> - <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/> - <text name="network"> - Rede: - </text> - <text name="network_text" font="SansSerifSmall"> - Normal - </text> - <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/> - <text name="server"> - Servidor: - </text> - <text name="server_text" font="SansSerifSmall"> - Normal - </text> - <button label="?" name="server_help"/> - <button label=">>" name="minimize"/> - <string name="max_title_msg"> +<floater name="floater_lagmeter" title="LAG - Ãndice"> + <floater.string name="max_title_msg"> Medidor de Atraso - </string> - <string name="max_width_px"> + </floater.string> + <floater.string name="max_width_px"> 360 - </string> - <string name="min_title_msg"> + </floater.string> + <floater.string name="min_title_msg"> Atraso - </string> - <string name="min_width_px"> + </floater.string> + <floater.string name="min_width_px"> 90 - </string> - <string name="client_text_msg"> + </floater.string> + <floater.string name="client_text_msg"> Cliente - </string> - <string name="client_frame_rate_critical_fps"> + </floater.string> + <floater.string name="client_frame_rate_critical_fps"> 10 - </string> - <string name="client_frame_rate_warning_fps"> + </floater.string> + <floater.string name="client_frame_rate_warning_fps"> 15 - </string> - <string name="client_frame_time_window_bg_msg"> + </floater.string> + <floater.string name="client_frame_time_window_bg_msg"> Normal, janela por baixo - </string> - <string name="client_frame_time_critical_msg"> + </floater.string> + <floater.string name="client_frame_time_critical_msg"> Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL] - </string> - <string name="client_frame_time_warning_msg"> + </floater.string> + <floater.string name="client_frame_time_warning_msg"> Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING] - </string> - <string name="client_frame_time_normal_msg"> + </floater.string> + <floater.string name="client_frame_time_normal_msg"> Normal - </string> - <string name="client_draw_distance_cause_msg"> + </floater.string> + <floater.string name="client_draw_distance_cause_msg"> Causa possÃvel: Distância de desenho ajustada muito alta - </string> - <string name="client_texture_loading_cause_msg"> + </floater.string> + <floater.string name="client_texture_loading_cause_msg"> Causa possÃvel: Carregamento de Imagens - </string> - <string name="client_texture_memory_cause_msg"> + </floater.string> + <floater.string name="client_texture_memory_cause_msg"> Causa possÃvel: Muitas imagens na memória - </string> - <string name="client_complex_objects_cause_msg"> + </floater.string> + <floater.string name="client_complex_objects_cause_msg"> Causa possÃvel: Muitos objetos complexos na cena - </string> - <string name="network_text_msg"> + </floater.string> + <floater.string name="network_text_msg"> Rede - </string> - <string name="network_packet_loss_critical_pct"> + </floater.string> + <floater.string name="network_packet_loss_critical_pct"> 10 - </string> - <string name="network_packet_loss_warning_pct"> + </floater.string> + <floater.string name="network_packet_loss_warning_pct"> 5 - </string> - <string name="network_packet_loss_critical_msg"> + </floater.string> + <floater.string name="network_packet_loss_critical_msg"> Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes - </string> - <string name="network_packet_loss_warning_msg"> + </floater.string> + <floater.string name="network_packet_loss_warning_msg"> Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes - </string> - <string name="network_performance_normal_msg"> + </floater.string> + <floater.string name="network_performance_normal_msg"> Normal - </string> - <string name="network_ping_critical_ms"> + </floater.string> + <floater.string name="network_ping_critical_ms"> 600 - </string> - <string name="network_ping_warning_ms"> + </floater.string> + <floater.string name="network_ping_warning_ms"> 300 - </string> - <string name="network_ping_critical_msg"> + </floater.string> + <floater.string name="network_ping_critical_msg"> Tempo de conexão de ping é cerca de [NETWORK_PING_CRITICAL] ms - </string> - <string name="network_ping_warning_msg"> + </floater.string> + <floater.string name="network_ping_warning_msg"> Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms - </string> - <string name="network_packet_loss_cause_msg"> + </floater.string> + <floater.string name="network_packet_loss_cause_msg"> PossÃvel conexão ruim ou 'Largura de Banda' escolhida muito alta. - </string> - <string name="network_ping_cause_msg"> + </floater.string> + <floater.string name="network_ping_cause_msg"> PossÃvel conexão ruim ou aplicativos compartilhando arquivos. - </string> - <string name="server_text_msg"> + </floater.string> + <floater.string name="server_text_msg"> Servidor - </string> - <string name="server_frame_rate_critical_fps"> + </floater.string> + <floater.string name="server_frame_rate_critical_fps"> 20 - </string> - <string name="server_frame_rate_warning_fps"> + </floater.string> + <floater.string name="server_frame_rate_warning_fps"> 30 - </string> - <string name="server_single_process_max_time_ms"> + </floater.string> + <floater.string name="server_single_process_max_time_ms"> 20 - </string> - <string name="server_frame_time_critical_msg"> + </floater.string> + <floater.string name="server_frame_time_critical_msg"> Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL] - </string> - <string name="server_frame_time_warning_msg"> + </floater.string> + <floater.string name="server_frame_time_warning_msg"> Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING] - </string> - <string name="server_frame_time_normal_msg"> + </floater.string> + <floater.string name="server_frame_time_normal_msg"> Normal - </string> - <string name="server_physics_cause_msg"> + </floater.string> + <floater.string name="server_physics_cause_msg"> Causa possÃvel: Muitos objetos fÃsicos - </string> - <string name="server_scripts_cause_msg"> + </floater.string> + <floater.string name="server_scripts_cause_msg"> Causa possÃvel: Muitos objetos com scripts - </string> - <string name="server_net_cause_msg"> + </floater.string> + <floater.string name="server_net_cause_msg"> Causa possÃvel: Muito tráfego na rede - </string> - <string name="server_agent_cause_msg"> + </floater.string> + <floater.string name="server_agent_cause_msg"> Causa possÃvel: Muitas pessoas se movendo na região - </string> - <string name="server_images_cause_msg"> + </floater.string> + <floater.string name="server_images_cause_msg"> Causa possÃvel: Muitos cálculos de imagem - </string> - <string name="server_generic_cause_msg"> + </floater.string> + <floater.string name="server_generic_cause_msg"> Causa possÃvel: Carga no simulador muito pesada - </string> - <string name="smaller_label"> + </floater.string> + <floater.string name="smaller_label"> >> - </string> - <string name="bigger_label"> + </floater.string> + <floater.string name="bigger_label"> << - </string> + </floater.string> + <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/> + <text name="client"> + Cliente + </text> + <text font="SansSerifSmall" name="client_text"> + Normal + </text> + <text left="30" name="client_lag_cause" right="-10"/> + <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/> + <text name="network"> + Rede + </text> + <text font="SansSerifSmall" name="network_text"> + Normal + </text> + <text left="30" name="network_lag_cause" right="-10"/> + <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/> + <text name="server"> + Servidor + </text> + <text font="SansSerifSmall" name="server_text"> + Normal + </text> + <text left="30" name="server_lag_cause" right="-32"/> + <button label=">>" name="minimize" tool_tip="Alternar o tamanho da janela"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml index d8588e2f05..2b0d6790f2 100644 --- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="land holdings floater" title="MEU TERRENO"> +<floater name="land holdings floater" title="MEUS TERRENOS"> <scroll_list name="parcel list"> - <column label="Nome do Lote" name="name"/> + <column label="Lote" name="name"/> <column label="Região" name="location"/> <column label="Tipo" name="type"/> <column label="Ãrea" name="area"/> </scroll_list> <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/> - <button width="130" label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/> + <button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Mostrar terreno na mápa-mundi" width="130"/> <text name="contrib_label"> Contribuições para os seus grupos: </text> @@ -18,19 +18,19 @@ <text name="allowed_label" width="380"> Propriedades de terreno permitidas com o plano de pagamento atual: </text> - <text name="allowed_text" left_delta="390"> + <text left_delta="390" name="allowed_text"> [AREA] m² </text> <text name="current_label"> Propriedades de terrenos atuais: </text> - <text name="current_text" left_delta="390"> + <text left_delta="390" name="current_text"> [AREA] m² </text> <text name="available_label"> DisponÃvel para compra de terras: </text> - <text name="available_text" left_delta="390"> + <text left_delta="390" name="available_text"> [AREA] m² </text> <string name="area_string"> diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml index c0b726c476..5ad116ac8a 100644 --- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script ed float" title="SCRIPT: NOVO SCRIPT"> - <button label="Resetar" label_selected="Resetar" name="Reset"/> - <check_box label="Correndo" name="running"/> - <check_box label="Mono" name="mono" left="86"/> - <string name="not_allowed"> - Você não tem permissão para visualizar este script. - </string> - <string name="script_running"> + <floater.string name="not_allowed"> + Você não pode ver ou editar o script, uma vez que está definido como "não" copiar. Você precisa de permissões para ver ou editar um script dentro de um objeto. + </floater.string> + <floater.string name="script_running"> Executando - </string> + </floater.string> + <floater.string name="Title"> + SCRIPT: [NAME] + </floater.string> + <button label="Resetar" label_selected="Resetar" name="Reset"/> + <check_box initial_value="true" label="Correndo" name="running"/> + <check_box initial_value="true" label="Mono" left="86" name="mono"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml index 49a9e7fcf5..73f187f0e4 100644 --- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="script ed float" title="LSL WIKI"> - <check_box label="Seguir o Cursor" name="lock_check" /> - <combo_box label="Bloquear" name="history_combo" left_delta="120" width="70"/> - <button label="Anterior" name="back_btn" left_delta="75"/> - <button label="Posterior" name="fwd_btn" /> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="script ed float" title="LSL REFERENCE"> + <check_box label="Seguir o Cursor" name="lock_check"/> + <combo_box label="Bloquear" left_delta="120" name="history_combo" width="70"/> + <button label="Anterior" left_delta="75" name="back_btn"/> + <button label="Posterior" name="fwd_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index ff60f77c4b..3a04528228 100644 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Map"> +<floater name="Map" title="Mini Mapa"> <floater.string name="mini_map_north"> N </floater.string> diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml index 1cd6d5662c..7491218067 100644 --- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml @@ -15,7 +15,7 @@ <button label="Ir" left_delta="505" name="go" width="35"/> </layout_panel> <layout_panel name="parcel_owner_controls"> - <button label="Enviar a URL atual para o terreno" name="assign"/> + <button label="Enviar esta página para lote" name="assign"/> </layout_panel> <layout_panel name="external_controls"> <button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/> diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml new file mode 100644 index 0000000000..5af002c502 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_media_settings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="media_settings" title="CONFIGURAÇÕES DE MÃDIA"> + <button label="OK" label_selected="OK" name="OK"/> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <button label="Aplicar" label_selected="Aplicar" name="Apply"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml index 4f93eb90e5..efb5da4ace 100644 --- a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="MemLeak" title="SIMULAÇÃO DE PERDA DE MEMÓRIA"> +<floater name="MemLeak" title="SIMULAR UM VAZAMENTO DE MEMÓRIA"> <spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/> <spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/> <text name="total_leaked_label"> diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml index 996a974254..f67a16bb46 100644 --- a/indra/newview/skins/default/xui/pt/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml @@ -1,13 +1,35 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="move_floater"> -<panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda"/> - <button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita"/> - <button label="" label_selected="" name="move up btn" tool_tip="Pular ou Voar"/> - <button label="" label_selected="" name="move down btn" tool_tip="Agaixar ou pousar"/> - <joystick_slide name="slide left btn" tool_tip="Mover para a esquerda"/> - <joystick_slide name="slide right btn" tool_tip="Mover para a direita"/> - <joystick_turn name="forward btn" tool_tip="Mover para a frente."/> - <joystick_turn name="backward btn" tool_tip="Mover para trás"/> -</panel> + <string name="walk_forward_tooltip"> + Andar para frente (flecha para cima ou W) + </string> + <string name="walk_back_tooltip"> + Andar para trás (flecha para baixo ou S) + </string> + <string name="run_forward_tooltip"> + Correr para frente (flecha para cima ou W) + </string> + <string name="run_back_tooltip"> + Correr para trás (flecha para baixo ou S) + </string> + <string name="fly_forward_tooltip"> + Voar para frente (flecha para cima ou W) + </string> + <string name="fly_back_tooltip"> + Voar para trás (flecha para baixo ou S) + </string> + <panel name="panel_actions"> + <button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/> + <button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/> + <button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/> + <button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/> + <joystick_turn name="forward btn" tool_tip="Andar para frente (flecha para cima ou W)"/> + <joystick_turn name="backward btn" tool_tip="Andar para trás (flecha para baixo ou S)"/> + </panel> + <panel name="panel_modes"> + <button label="" name="mode_walk_btn" tool_tip="Modo caminhar"/> + <button label="" name="mode_run_btn" tool_tip="Modo correr"/> + <button label="" name="mode_fly_btn" tool_tip="Modo voar"/> + <button label="Parar de voar" name="stop_fly_btn" tool_tip="Parar de voar"/> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml index cc669951c3..97fbd35fcc 100644 --- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="mute by name" title="SILENCIAR OBJETO PELO NOME"> +<floater name="mute by name" title="BLOQUEAR OBJETO POR NOME"> <text name="message"> - Silenciar pelo nome afeta apenas conversa de objeto e MI, -não sons. Você deve digitar o nome exato do objeto. + Bloquear o objeto: </text> <line_editor name="object_name"> Nome do objeto </line_editor> + <text name="note"> + * Bloquear apenas texto do objeto, não sons + </text> <button label="OK" name="OK"/> <button label="Cancelar" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml new file mode 100644 index 0000000000..5ba2dcd925 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="nearby_chat" title="Bate-papo local"/> diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml new file mode 100644 index 0000000000..dec8a7676a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="modal container" title="Salvar este look"> + <button label="Salvar" label_selected="Salvar" name="Save"/> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> + <text name="Save item as:"> + Veja o meu novo visual: + </text> + <line_editor name="name ed"> + [DESC] (new) + </line_editor> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml new file mode 100644 index 0000000000..8a536b90db --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="outgoing call" title="LIGANDO"> + <floater.string name="lifetime"> + 5 + </floater.string> + <floater.string name="localchat"> + Bate-papo local + </floater.string> + <floater.string name="anonymous"> + anônimo + </floater.string> + <floater.string name="VoiceInviteP2P"> + está ligando. + </floater.string> + <floater.string name="VoiceInviteAdHoc"> + entrou numa ligação de voz via conferência. + </floater.string> + <text name="connecting"> + Conectando com [CALLEE_NAME] + </text> + <text name="calling"> + Ligando para [CALLEE_NAME] + </text> + <text name="noanswer"> + Não há resposta. Tente novamente mais tarde. + </text> + <text name="nearby"> + Você saiu da ligação com [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] encerrou a ligação. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Você encerrou a ligação. [RECONNECT_NEARBY] + </text> + <text name="leaving"> + Saindo de [CURRENT_CHAT]. + </text> + <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml index 187df8fd18..81c861687f 100644 --- a/indra/newview/skins/default/xui/pt/floater_pay.xml +++ b/indra/newview/skins/default/xui/pt/floater_pay.xml @@ -1,21 +1,25 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> - <button label="L$1" label_selected="L$1" name="fastpay 1" left="112" /> - <button label="L$5" label_selected="L$5" name="fastpay 5" /> - <button label="L$10" label_selected="L$10" name="fastpay 10" left="112" /> - <button label="L$20" label_selected="L$20" name="fastpay 20" /> - <button label="Pagar" label_selected="Pagar" name="pay btn" /> - <button label="Cancelar" label_selected="Cancelar" name="cancel btn" /> - <text name="payee_label" width="110" left="5"> - Pagar residente: + <string name="payee_group"> + Pagar grupo + </string> + <string name="payee_resident"> + Pagar residente + </string> + <text left="5" name="payee_label" width="110"> + Pagar: </text> - <text name="payee_name" left="115"> + <icon name="icon_person" tool_tip="Pessoa"/> + <text left="115" name="payee_name"> [FIRST] [LAST] </text> - <text name="fastpay text" width="120" halign="left"> - Pagamento rápido: - </text> - <text name="amount text" left="4" > - Quantia: + <button label="L$1" label_selected="L$1" left="112" name="fastpay 1"/> + <button label="L$5" label_selected="L$5" name="fastpay 5"/> + <button label="L$10" label_selected="L$10" left="112" name="fastpay 10"/> + <button label="L$20" label_selected="L$20" name="fastpay 20"/> + <text left="4" name="amount text"> + Outro valor: </text> + <button label="Pagar" label_selected="Pagar" name="pay btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml index 3a3dd9e52e..464afd7f18 100644 --- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml @@ -1,31 +1,30 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> - <text name="payee_group" width="100" halign="left"> - Pagar Grupo: - </text> - <text name="payee_resident" width="120" halign="left" > - Pagar residente: - </text> - <text name="payee_name" left="105"> + <string halign="left" name="payee_group" width="100"> + Pagar grupo + </string> + <string halign="left" name="payee_resident" width="120"> + Pagar residente + </string> + <icon name="icon_person" tool_tip="Pessoa"/> + <text left="105" name="payee_name"> [FIRST] [LAST] </text> - <text name="object_name_label" left="5" width="95" halign="left"> + <text halign="left" left="5" name="object_name_label" width="95"> Via objeto: </text> - <text name="object_name_text" left="105" > - ... - </text> - <text name="fastpay text" width="115" halign="left"> - Pagamento Rápido: + <icon name="icon_object" tool_tip="Objects"/> + <text left="105" name="object_name_text"> + Meu objeto maravilho, fantástico e com nome comprido e imaginativo </text> - <text name="amount text" left="5" halign="left"> - Quantia: + <button label="L$1" label_selected="L$1" left="125" name="fastpay 1" width="70"/> + <button label="L$5" label_selected="L$5" left="200" name="fastpay 5" width="70"/> + <button label="L$10" label_selected="L$10" left="125" name="fastpay 10" width="70"/> + <button label="L$20" label_selected="L$20" left="200" name="fastpay 20" width="70"/> + <text halign="left" left="5" name="amount text"> + Outro valor: </text> - <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/> - <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70"/> - <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/> - <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70"/> - <button label="Pagar" label_selected="Pagar" name="pay btn" /> - <button label="Cancelar" label_selected="Cancelar" name="cancel btn" /> - <line_editor left="60" name="amount" width="50" /> + <line_editor left="60" name="amount" width="50"/> + <button label="Pagar" label_selected="Pagar" name="pay btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml index cf63726df2..d3c5b6ec23 100644 --- a/indra/newview/skins/default/xui/pt/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Postcard" title="FOTO POR EMAIL"> +<floater name="Postcard" title="ENVIAR FOTO VIA EMAIL"> <text name="to_label" width="135"> Email do Destinatário: </text> - <line_editor name="to_form" left="143" width="127" /> + <line_editor left="143" name="to_form" width="127"/> <text name="from_label"> Seu Email: </text> - <line_editor name="from_form" left="143" width="127" /> + <line_editor left="143" name="from_form" width="127"/> <text name="name_label"> Seu nome: </text> - <line_editor name="name_form" left="143" width="127" /> + <line_editor left="143" name="name_form" width="127"/> <text name="subject_label"> Assunto: </text> - <line_editor name="subject_form" left="143" width="127" /> + <line_editor left="143" name="subject_form" width="127"/> <line_editor label="Digite seu assunto aqui." name="subject_form"/> <text name="msg_label"> Mensagem: @@ -29,7 +29,7 @@ <button label="Cancelar" name="cancel_btn"/> <button label="Enviar" name="send_btn"/> <string name="default_subject"> - Cartão postal do [SECOND_LIFE] + Postal do [SECOND_LIFE]. </string> <string name="default_message"> Dá uma olhada nisto! diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml index d2c3c79160..803f2f87b8 100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Preferences" title="PREFERÊNCIAS" min_width="332" width="628"> +<floater min_width="332" name="Preferences" title="PREFERÊNCIAS" width="628"> <button label="OK" label_selected="OK" name="OK"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <button label="Aplicar" label_selected="Aplicar" name="Apply"/> - <button label="Sobre" label_selected="Sobre" name="About..."/> - <button label="Ajuda" label_selected="Ajuda" name="Help"/> - <tab_container name="pref core" tab_width="128" width="628" /> + <tab_container name="pref core" tab_width="128" width="628"> + <panel label="Público geral" name="general"/> + <panel label="VÃdeo" name="display"/> + <panel label="Privacidade" name="im"/> + <panel label="Som e mÃdia" name="audio"/> + <panel label="Bate-papo" name="chat"/> + <panel label="Notificações" name="msgs"/> + <panel label="Configurações" name="input"/> + <panel label="Avançado" name="advanced1"/> + </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml index 26ca8f87e0..b66159354f 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_anim"> + <floater.string name="Title"> + Animação: [NOME] + </floater.string> <text name="desc txt"> Descrição: </text> - <button label="Executar in World" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Executar esta animação para que outros vejam." width="131"/> - <button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Executar esta animação somente para você ver." width="125"/> + <button label="Tocar inworld" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/> + <button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Tocar essa animação de forma que apenas você possa ver" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml index 0e8814b9f8..bb626430ed 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml @@ -1,2 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="classified_preview" title="INFORMAÇÃO DO ANÚNCIO CLASSIFICADO"/> +<floater name="classified_preview" title="INFORMAÇÕES CLASSIFICADAS"> + <floater.string name="Title"> + Classificados: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/indra/newview/skins/default/xui/pt/floater_preview_event.xml index c03feacf0c..b422580f3b 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_event.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_event.xml @@ -1,2 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="event_preview" title="INFORMAÇÃO DO EVENTO"/> +<floater name="event_preview" title="DADOS DO EVENTO"> + <floater.string name="Title"> + Evento: [NAME] + </floater.string> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index 87bf86c282..48f27f1968 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="gesture_preview"> - <string name="stop_txt"> + <floater.string name="step_anim"> + Selecionar animação: + </floater.string> + <floater.string name="step_sound"> + Selecionar animação: + </floater.string> + <floater.string name="step_chat"> + Diga por bate-papo: + </floater.string> + <floater.string name="step_wait"> + Espere: + </floater.string> + <floater.string name="stop_txt"> Parar - </string> - <string name="preview_txt"> + </floater.string> + <floater.string name="preview_txt"> Prévia - </string> - <string name="none_text"> + </floater.string> + <floater.string name="none_text"> -- Nenhum -- - </string> + </floater.string> + <floater.string name="Title"> + Gesto: [NAME] + </floater.string> + <text name="name_text"> + Nome: + </text> <text name="desc_label"> Descrição: </text> @@ -22,37 +40,30 @@ <text name="key_label"> Tecla de Atalho: </text> - <combo_box label="Nenhum" name="modifier_combo" left="116" width="76"/> - <combo_box label="Nenhum" name="key_combo" width="76" left_delta="80"/> + <combo_box label="Nenhum" left="116" name="modifier_combo" width="76"/> + <combo_box label="Nenhum" left_delta="80" name="key_combo" width="76"/> <text name="library_label"> Biblioteca: </text> + <scroll_list name="library_list" width="84"/> + <button label="Incluir" left="118" name="add_btn" width="87"/> <text name="steps_label"> Passos: </text> - <scroll_list name="library_list" width="84"> - Animação -Som -Bate Papo -Esperar - </scroll_list> - <button label="Incluir" name="add_btn" left="118" width="87"/> - <button label="Mover Para Cima" name="up_btn" width="114" left_delta="-13"/> - <button label="Mover Para Baixo" name="down_btn" width="114"/> - <button label="Remover" name="delete_btn" width="84" left_delta="13"/> - <scroll_list left="226" name="step_list" width="205" /> - <text name="help_label"> - Todos os passos acontecem -simultaneamente, a menos que -você inclua passos de espera. - </text> + <scroll_list left="226" name="step_list" width="205"/> + <button label="P/ cima" left_delta="-13" name="up_btn" width="114"/> + <button label="P/ baixo" name="down_btn" width="114"/> + <button label="Remover" left_delta="13" name="delete_btn" width="84"/> <radio_group name="animation_trigger_type"> - <radio_item name="start" label="Iniciar" /> - <radio_item name="stop" label="Parar" /> + <radio_item label="OK" name="start"/> + <radio_item label="Pare" name="stop"/> </radio_group> - <check_box bottom_delta="34" label="até que as animações estejam concluÃdas" name="wait_anim_check"/> + <check_box bottom_delta="34" label="até que as animações estejam concluÃdas" name="wait_anim_check"/> <check_box bottom_delta="-30" label="tempo em segundos" name="wait_time_check"/> - <line_editor left_delta="130" name="wait_time_editor" /> + <line_editor left_delta="130" name="wait_time_editor"/> + <text name="help_label"> + Se não incluir etapas de espera, todas as etapas ocorrem ao mesmo tempo. + </text> <check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/> <button label="Prévia" name="preview_btn"/> <button label="Salvar" name="save_btn"/> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture_info.xml new file mode 100644 index 0000000000..aabcff70d3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture_info.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATALHO DE GESTO"/> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture_shortcut.xml new file mode 100644 index 0000000000..64bb7785f6 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture_shortcut.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATALHO DE GESTO"> + <text name="trigger_label"> + Bate-papo: + </text> + <text name="key_label"> + Tecla: + </text> + <combo_box label="Nenhum" name="modifier_combo"/> + <combo_box label="Nenhum" name="key_combo"/> + <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de comando. Por exemplo, substitua o comando 'olá' por 'oi' para trocar 'Olá, tudo bem' por 'Oi tudo bem'. O gesto também será executado."> + Trocar: + </text> + <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) de comando. Por exemplo, substitua o comando 'olá' por 'oi' para trocar 'Olá, tudo bem' por 'Oi tudo bem'. O gesto também será executado."/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture_steps.xml new file mode 100644 index 0000000000..aabcff70d3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture_steps.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Gesture" title="ATALHO DE GESTO"/> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml index 6f8944942a..e648a7d873 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml @@ -1,16 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="preview notecard" title="NOTA:"> - <button label="Salvar" label_selected="Salvar" name="Save"/> +<floater name="preview notecard" title="Anotação:"> + <floater.string name="no_object"> + O objeto com esta anotação não foi encontrado. + </floater.string> + <floater.string name="not_allowed"> + Você não está autorizado a ler esta nota. + </floater.string> + <floater.string name="Title"> + Anotação: [NAME] + </floater.string> + <floater.string label="Salvar" label_selected="Salvar" name="Save"> + Salvar + </floater.string> <text name="desc txt"> Descrição: </text> <text_editor name="Notecard Editor"> Carregando... </text_editor> - <string name="no_object"> - Não foi possÃvel encontrar o objeto que contém esta nota. - </string> - <string name="not_allowed"> - Você não tem permissão de visualizar esta nota. - </string> + <button label="Salvar" label_selected="Salvar" name="Save"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml index 3dd2f84f91..7c5a1538f2 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_sound"> + <floater.string name="Title"> + Som: [NAME] + </floater.string> <text name="desc txt"> Descrição: </text> - <button left_delta="-132" label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/> - <button width="135" left="152" label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/> + <button label="Tocar inworld" label_selected="Tocar inworld" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/> + <button label="Executar Localmente" label_selected="Executar Localmente" left="152" name="Sound audition btn" tool_tip="Tocar som de forma que apenas você possa ouvir" width="135"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml index 72bc42fa19..6f39635240 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml @@ -1,9 +1,47 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview_texture"> + <floater.string name="Title"> + Textura: [NAME] + </floater.string> + <floater.string name="Copy"> + Copiar para inventário + </floater.string> <text name="desc txt"> Descrição: </text> <text name="dimensions"> - Dimensões: [WIDTH] x [HEIGHT] + [WIDTH]px x [HEIGHT]px </text> + <text name="aspect_ratio"> + Visualizar relação de aspecto + </text> + <combo_box name="combo_aspect_ratio" tool_tip="Visualizar com proporção de aspecto fixa"> + <combo_item name="Unconstrained"> + Sem limites + </combo_item> + <combo_item name="1:1" tool_tip="SÃmbolo ou perfil RW do grupo"> + 1:1 + </combo_item> + <combo_item name="4:3" tool_tip="[SECOND_LIFE] perfil"> + 4:3 + </combo_item> + <combo_item name="10:7" tool_tip="Procurar anúncios classificados e marcos"> + 10:7 + </combo_item> + <combo_item name="3:2" tool_tip="Sobre terrenos"> + 3:2 + </combo_item> + <combo_item name="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" tool_tip="Perfis destacados"> + 16:9 + </combo_item> + <combo_item name="2:1"> + 2:1 + </combo_item> + </combo_box> + <button label="OK" name="Keep"/> + <button label="Descartar" name="Discard"/> + <button label="Salvar como" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml index 0d226a9502..08413a9231 100644 --- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_report_abuse" title="REPORTAR ABUSO"> - <check_box label="Incluir cópia da tela" name="screen_check"/> + <floater.string name="Screenshot"> + Captura de tela + </floater.string> + <check_box label="Usar esta captura de tela" name="screen_check"/> <text name="reporter_title"> Denunciador: </text> <text name="reporter_field"> - Loremipsum Dolorsitamut + Loremipsum Dolorsitamut Longnamez </text> <text name="sim_title"> Região: @@ -20,11 +23,11 @@ {128.1, 128.1, 15.4} </text> <text name="select_object_label"> - Clique no botão e em seguida no objeto: + Clique no botão e em seguida no objeto abusivo: </text> <button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto como o assunto deste report"/> <text name="object_name_label"> - Nome: + Objeto: </text> <text name="object_name"> Consetetur Sadipscing @@ -33,54 +36,53 @@ Proprietário: </text> <text name="owner_name"> - Hendrerit Vulputate + Hendrerit Vulputate Kamawashi Longname </text> <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report"> - <combo_box.item name="Select_category" label="Selecionar categoria"/> - <combo_box.item name="Age__Age_play" label="Idade > Idade no jogo"/> - <combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Idade > Residente adulto no Second Life Jovem"/> - <combo_box.item name="Age__Underage_resident_outside_of_Teen_Second_Life" label="Idade > Residente menor de idade fora do Second Life Teen"/> - <combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Assalto > Sandbox de combate / área não segura"/> - <combo_box.item name="Assault__Safe_area" label="Assalto > Ãrea segura"/> - <combo_box.item name="Assault__Weapons_testing_sandbox" label="Assalto > Testando armas em sandbox"/> - <combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Comércio > Falha em enviar produto ou serviço"/> - <combo_box.item name="Disclosure__Real_world_information" label="Revelar > Informação do mundo real"/> - <combo_box.item name="Disclosure__Remotely_monitoring chat" label="Revelar > Conversa monitorada remotamente"/> - <combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Revelar > Informação do Second Life/conversa/MIs"/> - <combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Distúrbio da paz > Uso injusto dos recursos da região"/> - <combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Distúrbio da paz > Objetos com excesso de scripts"/> - <combo_box.item name="Disturbing_the_peace__Object_littering" label="Distúrbio da paz > Objeto despejando lixo"/> - <combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Distúrbio da paz > Spam repetitivo"/> - <combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Distúrbio da paz > Spam de anúncio indesejado"/> - <combo_box.item name="Fraud__L$" label="Fraude > L$"/> - <combo_box.item name="Fraud__Land" label="Fraude > Terra"/> - <combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude > Esquema de pirâmide ou cartas encadeadas"/> - <combo_box.item name="Fraud__US$" label="Fraude > R$"/> - <combo_box.item name="Harassment__Advert_farms___visual_spam" label="Perturbação > Fazendas de Anúncios / spam visual"/> - <combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Perturbação > Difamação de indivÃduos ou grupos"/> - <combo_box.item name="Harassment__Impeding_movement" label="Perturbação > Impedindo movimentos"/> - <combo_box.item name="Harassment__Sexual_harassment" label="Perturbação > Perturbação sexual"/> - <combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Perturbação > Solicitando/incitando outros a violarem o ToS"/> - <combo_box.item name="Harassment__Verbal_abuse" label="Perturbação > Abuso verbal"/> - <combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Indecência > Conteúdo ou conduta amplamente ofensivos"/> - <combo_box.item name="Indecency__Inappropriate_avatar_name" label="Indecência > Nome de avatar inapropriado"/> - <combo_box.item name="Indecency__Mature_content_in_PG_region" label="Indecência > Conduta ou conteúdo inapropriados numa região PG"/> - <combo_box.item name="Indecency__Inappropriate_content_in_Mature_region" label="Indecência > Conduta ou conteúdo inapropriados numa região Mature"/> - <combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Violação de propriedade intelectual > Remoção de Conteúdo"/> - <combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Violação de Propriedade intelectual > Cópia Ilegal ou Aproveitar-se de Permissões"/> - <combo_box.item name="Intolerance" label="Intolerância"/> - <combo_box.item name="Land__Abuse_of_sandbox_resources" label="Terra > Abuso dos recursos da sandbox"/> - <combo_box.item name="Land__Encroachment__Objects_textures" label="Terra > Invasão > Objetos/texturas"/> - <combo_box.item name="Land__Encroachment__Particles" label="Terra > Invasão > PartÃculas"/> - <combo_box.item name="Land__Encroachment__Trees_plants" label="Terra > Violação > Ãrvores/plantas"/> - <combo_box.item name="Wagering_gambling" label="Apostas/jogos de azar"/> - <combo_box.item name="Other" label="Outro"/> + <combo_box.item label="Selecionar categoria" name="Select_category"/> + <combo_box.item label="Idade > Idade no jogo" name="Age__Age_play"/> + <combo_box.item label="Idade > Residente adulto ou adolescente" name="Age__Adult_resident_on_Teen_Second_Life"/> + <combo_box.item label="Idade > Residente menor de idade, fora do Second Life teen" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> + <combo_box.item label="Assalto > Sandbox de combate / área não segura" name="Assault__Combat_sandbox___unsafe_area"/> + <combo_box.item label="Assalto > Ãrea segura" name="Assault__Safe_area"/> + <combo_box.item label="Assalto > Testando armas em sandbox" name="Assault__Weapons_testing_sandbox"/> + <combo_box.item label="Comércio > Falha em enviar produto ou serviço" name="Commerce__Failure_to_deliver_product_or_service"/> + <combo_box.item label="Revelar > Informação do mundo real" name="Disclosure__Real_world_information"/> + <combo_box.item label="Revelar > Conversa monitorada remotamente" name="Disclosure__Remotely_monitoring chat"/> + <combo_box.item label="Revelar > Informação do Second Life/conversa/MIs" name="Disclosure__Second_Life_information_chat_IMs"/> + <combo_box.item label="Distúrbio da paz > Uso injusto dos recursos da região" name="Disturbing_the_peace__Unfair_use_of_region_resources"/> + <combo_box.item label="Distúrbio da paz > Objetos com excesso de scripts" name="Disturbing_the_peace__Excessive_scripted_objects"/> + <combo_box.item label="Distúrbio da paz > Objeto despejando lixo" name="Disturbing_the_peace__Object_littering"/> + <combo_box.item label="Distúrbio da paz > Spam repetitivo" name="Disturbing_the_peace__Repetitive_spam"/> + <combo_box.item label="Distúrbio da paz > Spam de anúncio indesejado" name="Disturbing_the_peace__Unwanted_advert_spam"/> + <combo_box.item label="Fraude > L$" name="Fraud__L$"/> + <combo_box.item label="Fraude > Terra" name="Fraud__Land"/> + <combo_box.item label="Fraude > Esquema de pirâmide ou cartas encadeadas" name="Fraud__Pyramid_scheme_or_chain_letter"/> + <combo_box.item label="Fraude > R$" name="Fraud__US$"/> + <combo_box.item label="Perturbação > Fazendas de Anúncios / spam visual" name="Harassment__Advert_farms___visual_spam"/> + <combo_box.item label="Perturbação > Difamação de indivÃduos ou grupos" name="Harassment__Defaming_individuals_or_groups"/> + <combo_box.item label="Perturbação > Impedindo movimentos" name="Harassment__Impeding_movement"/> + <combo_box.item label="Perturbação > Perturbação sexual" name="Harassment__Sexual_harassment"/> + <combo_box.item label="Perturbação > Solicitando/incitando outros a violarem o ToS" name="Harassment__Solicting_inciting_others_to_violate_ToS"/> + <combo_box.item label="Perturbação > Abuso verbal" name="Harassment__Verbal_abuse"/> + <combo_box.item label="Indecência > Conteúdo ou conduta amplamente ofensivos" name="Indecency__Broadly_offensive_content_or_conduct"/> + <combo_box.item label="Indecência > Nome de avatar inapropriado" name="Indecency__Inappropriate_avatar_name"/> + <combo_box.item label="Indecência > Conduta ou conteúdo inapropriados numa região PG" name="Indecency__Mature_content_in_PG_region"/> + <combo_box.item label="Indecência > Conduta ou conteúdo inapropriados numa região Mature" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="Violação de propriedade intelectual > Remoção de Conteúdo" name="Intellectual_property_infringement_Content_Removal"/> + <combo_box.item label="Violação de Propriedade intelectual > Cópia Ilegal ou Aproveitar-se de Permissões" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> + <combo_box.item label="Intolerância" name="Intolerance"/> + <combo_box.item label="Terra > Abuso dos recursos da sandbox" name="Land__Abuse_of_sandbox_resources"/> + <combo_box.item label="Terra > Invasão > Objetos/texturas" name="Land__Encroachment__Objects_textures"/> + <combo_box.item label="Terra > Invasão > PartÃculas" name="Land__Encroachment__Particles"/> + <combo_box.item label="Terra > Violação > Ãrvores/plantas" name="Land__Encroachment__Trees_plants"/> + <combo_box.item label="Apostas/jogos de azar" name="Wagering_gambling"/> + <combo_box.item label="Outro" name="Other"/> </combo_box> <text name="abuser_name_title"> Nome do Denunciado: </text> - <button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denunciado numa lista"/> - <check_box label="Não sei o nome do denunciado" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do denunciado"/> + <button label="Selecionar" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denunciado numa lista"/> <text name="abuser_name_title2"> Local do Abuso: </text> @@ -91,13 +93,11 @@ Detalhes: </text> <text name="bug_aviso"> - Por favor, seja especÃfico(a) sobre data, localidade, -natureza do abuso, texto relevante de conversa/MI e -selecione o objeto, se possÃvel. + Seja o mais especÃfico possÃvel </text> <text name="incomplete_title"> - Nota: Relatos incompletos não serão investigados. + * Denúncias incompletas não serão investigadas </text> - <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/> + <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml new file mode 100644 index 0000000000..e70a30fa24 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/> diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml new file mode 100644 index 0000000000..64a8a49c85 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="scriptlimits" title="DADOS DO SCRIPT"/> diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml index 3c0570791c..5be866d052 100644 --- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml @@ -1,5 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT"> + <floater.string name="Title"> + SCRIPT: [NAME] + </floater.string> <text name="desc txt"> Descrição: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml index 6e0e174c07..5fb6dd1c35 100644 --- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="queue" title="RESETAR PROGRESSO"> + <floater.string name="Starting"> + Iniciando [START] de [COUNT] items. + </floater.string> + <floater.string name="Done"> + Pronto. + </floater.string> + <floater.string name="Resetting"> + Redefinindo + </floater.string> + <floater.string name="Running"> + Executando + </floater.string> + <floater.string name="NotRunning"> + Inerte + </floater.string> <button label="Fechar" label_selected="Fechar" name="close"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml index 3a62f1711f..8878590a4e 100644 --- a/indra/newview/skins/default/xui/pt/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="script search" title="BUSCA DE SCRIPT" width="320"> - <check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text" left="75"/> +<floater name="script search" title="BUSCAR SCRIPT" width="320"> + <check_box label="Não diferenciar Maiúsculas de Minúsculas" left="75" name="case_text"/> <button label="Buscar" label_selected="Buscar" name="search_btn" width="85"/> - <button label="Substituir" label_selected="Substituir" name="replace_btn" left="100" width="85"/> - <button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn" left="190" width="122"/> + <button label="Substituir" label_selected="Substituir" left="100" name="replace_btn" width="85"/> + <button label="Substituir Tudo" label_selected="Substituir Tudo" left="190" name="replace_all_btn" width="122"/> <text name="txt" width="65"> Buscar </text> <text name="txt2" width="65"> Substituir </text> - <line_editor left="75" name="search_text" width="240" /> - <line_editor left="75" name="replace_text" width="240" /> + <line_editor left="75" name="search_text" width="240"/> + <line_editor left="75" name="replace_text" width="240"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml new file mode 100644 index 0000000000..4bf7181180 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_search.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_search" title="BUSCAR"> + <floater.string name="loading_text"> + Carregando... + </floater.string> + <floater.string name="done_text"> + Pronto + </floater.string> + <layout_stack name="stack1"> + <layout_panel name="browser_layout"> + <text name="refresh_search"> + Buscar novamente com status God + </text> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml index e41a565d11..7264a5a713 100644 --- a/indra/newview/skins/default/xui/pt/floater_select_key.xml +++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml @@ -2,6 +2,6 @@ <floater name="modal container" title=""> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Aperte uma tecla para selecionar + Pressione uma tecla para definir o seu botão Falar. </text> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index f58c4098ef..e6d4dc7ed6 100644 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml @@ -1,65 +1,65 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sell land" title="VENDER TERRENO"> - <scroll_container name="profile_scroll"> - <panel name="scroll_content_panel"> - <text name="info_parcel_label"> - Lote: - </text> - <text name="info_parcel"> - Nome do Lote - </text> - <text name="info_size_label"> - Tamanho: - </text> - <text name="info_size"> - [AREA] m² - </text> - <text name="info_action" bottom_delta="-67"> - Para vender este lote: - </text> - <icon bottom_delta="-66" name="step_price" /> - <text name="price_label"> - Defina um preço: - </text> - <text name="price_text"> - Escolha um preço apropriado para esta terra. - </text> - <text name="price_ld"> - L$ - </text> - <text name="price_per_m"> - (L$[PER_METER] por m²) - </text> - <text name="sell_to_label"> - Vender esta terra para: - </text> - <text name="sell_to_text"> - Escolha se venderá para qualquer um ou para um comprador em -particular. - </text> - <combo_box name="sell_to" bottom_delta="-32"> - <combo_box.item name="--selectone--" label="Selecione um --" /> - <combo_box.item name="Anyone" label="Qualquer um" /> - <combo_box.item name="Specificuser:" label="Usuário EspecÃfico:" /> - </combo_box> - <button label="Selecione..." name="sell_to_select_agent"/> - <text name="sell_objects_label"> - Vender os objetos com a terra? - </text> - <text name="sell_objects_text"> - Os objetos tranferÃveis do proprietário do terreno que estão neste -lote irão mudar de propriedade. - </text> - <radio_group name="sell_objects" bottom_delta="-58"> - <radio_item name="no" label="Não, manter a propriedade sobre os objetos" /> - <radio_item name="yes" label="Sim, vender objetos com a terra" /> - </radio_group> - <button label="Mostrar Objetos" name="show_objects"/> - <text name="nag_message_label"> - LEMBRE-SE: Todas as vendas são finais. - </text> - <button label="Definir Terra para Venda" name="sell_btn"/> - <button label="Cancelar" name="cancel_btn"/> - </panel> - </scroll_container> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text name="info_parcel_label"> + Lote: + </text> + <text name="info_parcel"> + NOME DO LOTE + </text> + <text name="info_size_label"> + Tamanho: + </text> + <text name="info_size"> + [AREA] m² + </text> + <text bottom_delta="-67" name="info_action"> + Para vender este terreno: + </text> + <text name="price_label"> + 1. Preço: + </text> + <text name="price_text"> + Determine o preço adequado. + </text> + <text name="price_ld"> + L$ + </text> + <line_editor name="price"> + 0 + </line_editor> + <text name="price_per_m"> + (L$[PER_METER] por m²) + </text> + <text name="sell_to_label"> + 2. Vender para: + </text> + <text name="sell_to_text"> + Vender para qualquer pessoa ou determinado comprador. + </text> + <combo_box bottom_delta="-32" name="sell_to"> + <combo_box.item label="- Selecione -" name="--selectone--"/> + <combo_box.item label="Todos" name="Anyone"/> + <combo_box.item label="Pessoa especÃfica:" name="Specificuser:"/> + </combo_box> + <button label="Selecionar" name="sell_to_select_agent"/> + <text name="sell_objects_label"> + 3. Vender o terreno com os objetos? + </text> + <text name="sell_objects_text"> + O objetos transferÃveis do terreno passam a ser do novo dono. + </text> + <radio_group bottom_delta="-58" name="sell_objects"> + <radio_item label="Não, os objetos continuam sendo meus" name="no"/> + <radio_item label="Sim, vender o terreno com os objetos" name="yes"/> + </radio_group> + <button label="Mostrar objetos" name="show_objects"/> + <text name="nag_message_label"> + LEMBRE-SE: Qualquer transação de compra e venda é irreversÃvel. + </text> + <button label="Colocar terreno à venda" name="sell_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml index 394a9771e0..c6694d13b2 100644 --- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="settings_debug" title="CONFIGURAÇÕES DE DEBUG"> - <combo_box name="boolean_combo"> - <combo_box.item name="TRUE" label="VERDADEIRO" /> - <combo_box.item name="FALSE" label="FALSO" /> - </combo_box> - <color_swatch label="Cor" name="color_swatch"/> +<floater name="settings_debug" title="DEBUG SETTINGS"> + <radio_group name="boolean_combo"> + <radio_item label="TRUE" name="TRUE" value="verdadeiro"/> + <radio_item label="FALSE" name="FALSE" value=""/> + </radio_group> + <color_swatch label="Cor" name="val_color_swatch"/> <spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_2"/> <spinner label="x" name="val_spinner_3"/> diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml index c3c4c73a89..a3934a6667 100644 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Snapshot" title="PRÉVIA DA FOTO"> +<floater name="Snapshot" title="VER FOTO"> <text name="type_label"> Destino da foto </text> <radio_group label="Tipo de Foto" name="snapshot_type_radio"> - <radio_item name="postcard" label="Enviar por email" /> - <radio_item name="texture" label="Salvar no seu inventário (L$[AMOUNT])" /> - <radio_item name="local" label="Salvar no seu disco rÃgido" /> + <radio_item label="Email" name="postcard"/> + <radio_item label="Meu inventário (L$[AMOUNT])" name="texture"/> + <radio_item label="Salvar no meu PC" name="local"/> </radio_group> <text name="file_size_label"> - Tamanho do arquivo: [SIZE] KB + [SIZE] KB </text> <button label="Atualizar a foto" name="new_snapshot_btn"/> <button label="Enviar" name="send_btn"/> <button label="Salvar (L$[AMOUNT])" name="upload_btn"/> <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo"> - <flyout_button.item name="save_item" label="Salvar"/> - <flyout_button.item name="saveas_item" label="Salvar como..."/> + <flyout_button.item label="Salvar" name="save_item"/> + <flyout_button.item label="Salvar como..." name="saveas_item"/> </flyout_button> <button label="Cancelar" name="discard_btn"/> - <button label="Mais >" name="more_btn" tool_tip="Opções Avançadas"/> - <button label="< Menos" name="less_btn" tool_tip="Opções Avançadas"/> + <button label="Mais" name="more_btn" tool_tip="Opções avançadas"/> + <button label="Menos" name="less_btn" tool_tip="Opções avançadas"/> <text name="type_label2"> Tamanho </text> @@ -28,50 +28,50 @@ Formato </text> <combo_box label="Resolução" name="postcard_size_combo"> - <combo_box.item name="CurrentWindow" label="Janela Atual" /> - <combo_box.item name="640x480" label="640x480" /> - <combo_box.item name="800x600" label="800x600" /> - <combo_box.item name="1024x768" label="1024x768" /> - <combo_box.item name="Custom" label="Customizado" /> + <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="Customizado" name="Custom"/> </combo_box> <combo_box label="Resolução" name="texture_size_combo"> - <combo_box.item name="CurrentWindow" label="Janela Atual" /> - <combo_box.item name="Small(128x128)" label="Pequeno (128x128)" /> - <combo_box.item name="Medium(256x256)" label="Médio (256x256)" /> - <combo_box.item name="Large(512x512)" label="Grande (512x512)" /> - <combo_box.item name="Custom" label="Customizado" /> + <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/> + <combo_box.item label="Médio (256x256)" name="Medium(256x256)"/> + <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> + <combo_box.item label="Customizado" name="Custom"/> </combo_box> <combo_box label="Resolução" name="local_size_combo"> - <combo_box.item name="CurrentWindow" label="Janela Atual" /> - <combo_box.item name="320x240" label="320x240" /> - <combo_box.item name="640x480" label="640x480" /> - <combo_box.item name="800x600" label="800x600" /> - <combo_box.item name="1024x768" label="1024x768" /> - <combo_box.item name="1280x1024" label="1280x1024" /> - <combo_box.item name="1600x1200" label="1600x1200" /> - <combo_box.item name="Custom" label="Customizado" /> + <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="320x240" name="320x240"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + <combo_box.item label="1280x1024" name="1280x1024"/> + <combo_box.item label="1600x1200" name="1600x1200"/> + <combo_box.item label="Customizado" name="Custom"/> </combo_box> <combo_box label="Formato" name="local_format_combo"> - <combo_box.item name="PNG" label="PNG" /> - <combo_box.item name="JPEG" label="JPEG" /> - <combo_box.item name="BMP" label="BMP" /> + <combo_box.item label="PNG" name="PNG"/> + <combo_box.item label="JPEG" name="JPEG"/> + <combo_box.item label="BMP" name="BMP"/> </combo_box> - <spinner label="Largura" name="snapshot_width" label_width="41" width="101"/> - <spinner label="Altura" name="snapshot_height" label_width="31" width="91" left="119"/> - <check_box label="Restringir proporções" name="keep_aspect_check"/> - <slider label="Qualidade da Imagem" name="image_quality_slider"/> + <spinner label="Largura" label_width="41" name="snapshot_width" width="101"/> + <spinner label="Altura" label_width="31" left="119" name="snapshot_height" width="91"/> + <check_box label="Limitar proproções" name="keep_aspect_check"/> + <slider label="Qualidade da imagem" name="image_quality_slider"/> <text name="layer_type_label"> Capturar: </text> <combo_box label="Camadas da Imagem" name="layer_types"> - <combo_box.item name="Colors" label="Cores" /> - <combo_box.item name="Depth" label="Formato" /> - <combo_box.item name="ObjectMattes" label="Decoração do Objeto" /> + <combo_box.item label="Cores" name="Colors"/> + <combo_box.item label="Formato" name="Depth"/> + <combo_box.item label="Decoração do Objeto" name="ObjectMattes"/> </combo_box> - <check_box label="Mostrar interface na Foto" name="ui_check"/> - <check_box bottom_delta="-17" label="Mostrar Objetos HUD na Foto" name="hud_check"/> + <check_box label="Interface" name="ui_check"/> + <check_box bottom_delta="-17" label="HUDs" name="hud_check"/> <check_box bottom_delta="-17" label="Manter aberto após salvar" name="keep_open_check"/> - <check_box bottom_delta="-17" label="Quadro Congelado (prévia da tela inteira)" name="freeze_frame_check"/> + <check_box bottom_delta="-17" label="Gerar quadro (tela inteira)" name="freeze_frame_check"/> <check_box bottom_delta="-29" label="Auto-atualizar" name="auto_snapshot_check"/> <string name="unknown"> desconhecido diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml index d5d252c0dd..e62260c2e3 100644 --- a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Sound Preview" title="SOUND.WAV"> +<floater name="Sound Preview" title="SOM.WAV"> <text name="name_label"> Nome: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_statistics.xml b/indra/newview/skins/default/xui/pt/floater_statistics.xml index c56c9fb2e0..ecbf638157 100644 --- a/indra/newview/skins/default/xui/pt/floater_statistics.xml +++ b/indra/newview/skins/default/xui/pt/floater_statistics.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="stats floater" title="STATÃSTICA"/> +<floater name="stats floater" title="ESTATÃSTICAS"/> diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml new file mode 100644 index 0000000000..11589b31b6 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Statistics" title="ESTATÃSTICAS"> + <scroll_container name="statistics_scroll"> + <container_view name="statistics_view"> + <stat_view label="Básico" name="basic"> + <stat_bar label="FPS" name="fps"/> + <stat_bar label="Bandwidth" name="bandwidth"/> + <stat_bar label="Bandwidth" name="packet_loss"/> + <stat_bar label="Ping Sim" name="ping"/> + </stat_view> + <stat_view label="Avançado" name="advanced"> + <stat_view label="Render" name="render"> + <stat_bar label="KTris Drawn" name="ktrisframe"/> + <stat_bar label="KTris Drawn" name="ktrissec"/> + <stat_bar label="Total Objects" name="objs"/> + <stat_bar label="New Objects" name="newobjs"/> + </stat_view> + <stat_view label="Texture" name="texture"> + <stat_bar label="Count" name="numimagesstat"/> + <stat_bar label="Raw Count" name="numrawimagesstat"/> + <stat_bar label="GL Mem" name="gltexmemstat"/> + <stat_bar label="Formatted Mem" name="formattedmemstat"/> + <stat_bar label="Raw Mem" name="rawmemstat"/> + <stat_bar label="Bound Mem" name="glboundmemstat"/> + </stat_view> + <stat_view label="Rede" name="network"> + <stat_bar label="Packets In" name="packetsinstat"/> + <stat_bar label="Packets Out" name="packetsoutstat"/> + <stat_bar label="Objects" name="objectkbitstat"/> + <stat_bar label="Texture" name="texturekbitstat"/> + <stat_bar label="Asset" name="assetkbitstat"/> + <stat_bar label="Layers" name="layerskbitstat"/> + <stat_bar label="Actual In" name="actualinkbitstat"/> + <stat_bar label="Actual Out" name="actualoutkbitstat"/> + <stat_bar label="VFS Pending Ops" name="vfspendingoperations"/> + </stat_view> + </stat_view> + <stat_view label="Simulator" name="sim"> + <stat_bar label="Time Dilation" name="simtimedilation"/> + <stat_bar label="Sim FPS" name="simfps"/> + <stat_bar label="Physics FPS" name="simphysicsfps"/> + <stat_view label="Physics Details" name="physicsdetail"> + <stat_bar label="Pinned Objects" name="physicspinnedtasks"/> + <stat_bar label="Low LOD Objects" name="physicslodtasks"/> + <stat_bar label="Memory Allocated" name="physicsmemoryallocated"/> + <stat_bar label="Agent Updates/Sec" name="simagentups"/> + <stat_bar label="Main Agents" name="simmainagents"/> + <stat_bar label="Child Agents" name="simchildagents"/> + <stat_bar label="Objects" name="simobjects"/> + <stat_bar label="Active Objects" name="simactiveobjects"/> + <stat_bar label="Active Scripts" name="simactivescripts"/> + <stat_bar label="Script Events" name="simscripteps"/> + <stat_bar label="Packets In" name="siminpps"/> + <stat_bar label="Packets Out" name="simoutpps"/> + <stat_bar label="Pending Downloads" name="simpendingdownloads"/> + <stat_bar label="Pending Uploads" name="simpendinguploads"/> + <stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/> + </stat_view> + <stat_view label="Time (ms)" name="simperf"> + <stat_bar label="Total Frame Time" name="simframemsec"/> + <stat_bar label="Net Time" name="simnetmsec"/> + <stat_bar label="Physics Time" name="simsimphysicsmsec"/> + <stat_bar label="Simulation Time" name="simsimothermsec"/> + <stat_bar label="Agent Time" name="simagentmsec"/> + <stat_bar label="Images Time" name="simimagesmsec"/> + <stat_bar label="Script Time" name="simscriptmsec"/> + </stat_view> + </stat_view> + </container_view> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml new file mode 100644 index 0000000000..38beec022c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="sys_well_window" title="AVISOS"> + <string name="title_im_well_window"> + CONVERSAS + </string> + <string name="title_notification_well_window"> + AVISOS + </string> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml index 5c775ab45d..6b35d3f919 100644 --- a/indra/newview/skins/default/xui/pt/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="telehub" title="TELEHUB" min_height="310" height="310" width="286"> +<floater height="310" min_height="310" name="telehub" title="TELEHUB" width="286"> <text name="status_text_connected"> Telehub conectado ao objeto [OBJECT] </text> @@ -17,16 +17,13 @@ <text name="spawn_points_text" width="265"> Pontos de Nascimento (posições, não objetos): </text> - <scroll_list name="spawn_points_list" width="265" /> - <button width="135" label="Adicionar Nascimento" name="add_spawn_point_btn"/> - <button width="130" label="Remover Nascimento" name="remove_spawn_point_btn" left="150"/> + <scroll_list name="spawn_points_list" width="265"/> + <button label="Adicionar Nascimento" name="add_spawn_point_btn" width="135"/> + <button label="Remover Nascimento" left="150" name="remove_spawn_point_btn" width="130"/> <text name="spawn_point_help"> - Selecione um objeto e clique Adicionar para -especificar a posição. -Em seguida, você pode mover ou apagar o objeto. -As posições são relativas ao centro do telehub. - -Selecione um item na lista para mostrar a posição -in-world. + Selecione o objeto e clique em 'Adicionar spawn' para especificar a posição. +O objeto pode ser excluÃdo ou movido posteriormente. +As posições são definidas em relação ao centro do telehub. +Selecione um item da lista para realçá-lo inworld. </text> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml index b63c4a9bbf..144bc0340e 100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="PEGAR: TEXTURA"> +<floater name="texture picker" title="DESTAQUE: TEXTURA"> <string name="choose_picture"> Clique para escolher uma imagem </string> <text name="Multiple"> - Multiplo + Multiplas texturas </text> <text name="unknown"> - Dimensões: [DIMENSIONS] + Tamanho: [DIMENSÕES] </text> <button label="Padrão" label_selected="Padrão" name="Default"/> <button label="Nenhum" label_selected="Nenhum" name="None"/> <button label="Branco" label_selected="Branco" name="Blank"/> - <check_box label="Mostrar Pastas" name="show_folders_check"/> - <search_editor label="Clique aqui para buscar" name="inventory search editor"/> - <check_box label="Aplicar Imediatamente" name="apply_immediate_check"/> + <check_box label="Exibir pastas" name="show_folders_check"/> + <search_editor label="Filtrar texturas" name="inventory search editor"/> + <check_box label="Applicar agora" name="apply_immediate_check"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> - <button label="Selecionar" label_selected="Selecionar" name="Select"/> + <button label="OK" label_selected="OK" name="Select"/> <string name="pick title"> Pegar: </string> diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index b9ab018606..fb44c5c3bf 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -1,45 +1,81 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" title="" short_title="CONSTRUIR" width="288"> +<floater name="toolbox floater" short_title="BUILD TOOLS" title="" width="288"> + <floater.string name="status_rotate"> + Arrastar as bandas coloridas para girar o objeto + </floater.string> + <floater.string name="status_scale"> + Clicar e arrastar para esticar o lado selecionado + </floater.string> + <floater.string name="status_move"> + Arrastar para mover, Shift-arrastar para copiar + </floater.string> + <floater.string name="status_modifyland"> + Clicar e reter para modificar a terra + </floater.string> + <floater.string name="status_camera"> + Clique e arraste para mexer a câmera + </floater.string> + <floater.string name="status_grab"> + Arraste para mexer, Ctrl para levantar, Ctrl+Shift para girar + </floater.string> + <floater.string name="status_place"> + Clique no mundo para construir + </floater.string> + <floater.string name="status_selectland"> + Clicar e arrastar para selecionar a terra + </floater.string> + <floater.string name="grid_screen_text"> + Tela + </floater.string> + <floater.string name="grid_local_text"> + Local + </floater.string> + <floater.string name="grid_world_text"> + Mundo + </floater.string> + <floater.string name="grid_reference_text"> + Referência + </floater.string> + <floater.string name="grid_attachment_text"> + Anexo + </floater.string> <button label="" label_selected="" name="button focus" tool_tip="Foco"/> <button label="" label_selected="" name="button move" tool_tip="Mover"/> <button label="" label_selected="" name="button edit" tool_tip="Editar"/> <button label="" label_selected="" name="button create" tool_tip="Criar"/> <button label="" label_selected="" name="button land" tool_tip="Terra"/> + <text name="text status" width="280"> + Arraste para mover, shift+Arrastar para Copiar + </text> <radio_group name="focus_radio_group"> <radio_item label="Zoom" name="radio zoom"/> <radio_item label="Órbita (Ctrl)" name="radio orbit"/> - <radio_item label="Pan (Ctrl-Shift)" name="radio pan"/> + <radio_item label="Pan (Ctrl+Shift)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> <radio_item label="Mover" name="radio move"/> <radio_item label="Suspender (Ctrl)" name="radio lift"/> - <radio_item label="Girar (Ctrl-Shift)" name="radio spin"/> + <radio_item label="Spin (Ctrl+Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> - <radio_item label="Posição" name="radio position"/> + <radio_item label="Movimentar" name="radio position"/> <radio_item label="Rotacionar (Ctrl)" name="radio rotate"/> - <radio_item label="Esticar (Ctrl-Shift)" name="radio stretch"/> - <radio_item label="Selecionar Textura" name="radio select face"/> + <radio_item label="Stretch (Ctrl+Shift)" name="radio stretch"/> + <radio_item label="Face selecionada" name="radio select face"/> </radio_group> - <check_box label="Editar partes unidas" name="checkbox edit linked parts"/> - <text name="text ruler mode"> - Régua: + <check_box label="Editar item linkado" name="checkbox edit linked parts"/> + <text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto"> + þ: [COUNT] </text> - <combo_box name="combobox grid mode"> - <combo_box.item name="World" label="Mundo" - /> - <combo_box.item name="Local" label="Local" - /> - <combo_box.item name="Reference" label="Referência" - /> - </combo_box> <check_box label="Esticar ambos os lados" name="checkbox uniform"/> - <check_box label="Esticar Texturas" name="checkbox stretch textures"/> - <check_box label="Usar Grade" name="checkbox snap to grid"/> - <button label="Opções..." label_selected="Opções..." name="Options..."/> - <text name="text status" width="280"> - Arraste para mover, shift+Arrastar para Copiar - </text> + <check_box initial_value="true" label="Esticar Texturas" name="checkbox stretch textures"/> + <check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/> + <combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado"> + <combo_box.item label="Grid SL" name="World"/> + <combo_box.item label="Grid local" name="Local"/> + <combo_box.item label="Grid de referência" name="Reference"/> + </combo_box> + <button label="Opções..." label_selected="Opções..." name="Options..." tool_tip="Mais opções de grade"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/> @@ -55,10 +91,10 @@ <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/> <button label="" label_selected="" name="ToolTree" tool_tip="Ãrvore"/> <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/> - <check_box label="Manter selecionado" name="checkbox sticky"/> - <check_box label="Copiar selecionado" name="checkbox copy selection"/> - <check_box label="Centro" name="checkbox copy centers"/> - <check_box label="Rotacionar" name="checkbox copy rotates"/> + <check_box label="Ficar com ferramenta selecionado" name="checkbox sticky"/> + <check_box label="Copiar seleção" name="checkbox copy selection"/> + <check_box initial_value="true" label="Copiar parte central" name="checkbox copy centers"/> + <check_box label="Girar cópia" name="checkbox copy rotates"/> <radio_group name="land_radio_group"> <radio_item label="Selecionar Terra" name="radio select land"/> <radio_item label="Aplainar" name="radio flatten"/> @@ -68,7 +104,6 @@ <radio_item label="Endurecer" name="radio noise"/> <radio_item label="Reverter" name="radio revert"/> </radio_group> - <button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/> <text name="Bulldozer:"> Escavadeira: </text> @@ -78,14 +113,51 @@ <text name="Strength:"> Força </text> - <text name="obj_count" left="134"> - Objetos selecionados: [COUNT] + <button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar a terra selecionada"/> + <text left="134" name="obj_count"> + Objects: [COUNT] </text> - <text name="prim_count" left="134"> - primitivas: [COUNT] + <text left="134" name="prim_count"> + Prims: [COUNT] </text> <tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288"> <panel label="Comum" name="General"> + <panel.string name="text deed continued"> + Doar + </panel.string> + <panel.string name="text deed"> + Doar + </panel.string> + <panel.string name="text modify info 1"> + Você pode modificar este objeto + </panel.string> + <panel.string name="text modify info 2"> + Você pode modificar estes objetos + </panel.string> + <panel.string name="text modify info 3"> + Você não pode modificar este objeto + </panel.string> + <panel.string name="text modify info 4"> + Você não pode modificar estes objetos + </panel.string> + <panel.string name="text modify warning"> + Selecione o objeto intereiro para configurar as autorizações + </panel.string> + <panel.string name="Cost Default"> + Preço: L$ + </panel.string> + <panel.string name="Cost Total"> + Total: L$ + </panel.string> + <panel.string name="Cost Per Unit"> + Preço unitário: L$ + </panel.string> + <panel.string name="Cost Mixed"> + Preço Misturado + </panel.string> + <panel.string name="Sale Mixed"> + Venda Misturada + </panel.string> <text name="Name:"> Nome: </text> @@ -98,135 +170,77 @@ <text name="Creator Name"> Thrax Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/> <text name="Owner:"> Proprietário: </text> <text name="Owner Name"> Thrax Linden </text> - <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/> <text name="Group:"> Grupo: </text> - <text name="Group Name Proxy"> - The Lindens - </text> - <button label="Definir..." label_selected="Definir..." name="button set group"/> - <text name="Permissions:"> - Permissões: - </text> - - <check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permite que todos os membros do grupo definido compartilhem e usem suas permissões para este objeto. Você precisa Doar ao Grupo para habilitar as restrições de função."/> - <string name="text deed continued"> - Doar... - </string> - <string name="text deed"> - Doar - </string> - <button label="Doar..." label_selected="Doar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser doados pelo gerente do grupo."/> - <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/> - <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/> - <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/> - <check_box label="À Venda" name="checkbox for sale"/> - <text name="Cost"> - Preço: L$ + <button label="Definir..." label_selected="Definir..." name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/> + <name_box initial_value="Carregando..." name="Group Name Proxy"/> + <button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/> + <check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenhas suas permissões de modificação para este objeto. Faça uma doação para ativar restrições de função."/> + <text name="label click action" width="220"> + Clique para: </text> + <combo_box name="clickaction" width="192"> + <combo_box.item label="Tocar (padrão)" name="Touch/grab(default)"/> + <combo_box.item label="Sentar no objeto" name="Sitonobject"/> + <combo_box.item label="Comprar objeto" name="Buyobject"/> + <combo_box.item label="Pagar Objeto" name="Payobject"/> + <combo_box.item label="Abrir" name="Open"/> + <combo_box.item label="Zoom" name="Zoom"/> + </combo_box> + <check_box label="À venda" name="checkbox for sale"/> <combo_box name="sale type"> <combo_box.item label="Cópia" name="Copy"/> <combo_box.item label="Conteúdo" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> - - <text name="label click action" width="220"> - Quando clicado com o botão esquerdo: - </text> - <combo_box name="clickaction" width="192"> - <combo_box.item name="Touch/grab(default)" label="Tocar/Pegar (padrão)" - /> - <combo_box.item name="Sitonobject" label="Sentar no objeto" - /> - <combo_box.item name="Buyobject" label="Comprar objeto" - /> - <combo_box.item name="Payobject" label="Pagar Objeto" - /> - <combo_box.item name="Open" label="Abrir" - /> - <combo_box.item name="Play" label="Executar a mÃdia do lote" - /> - <combo_box.item name="Opemmedia" label="Abrir a mÃdia do lote" - /> - </combo_box> - <panel name="perms_build"> - <text name="perm_modify"> - Você pode modificar este objeto - </text> - <text name="B:"> - B: - </text> - <text name="O:"> - O: - </text> - <text name="G:"> - G: - </text> - <text name="E:"> - E: - </text> - <text name="N:"> - N: - </text> - <text name="F:"> - F: - </text> - <text name="Next owner can:"> - Próximo Proprietário pode: - </text> - <check_box label="Modificar" name="checkbox next owner can modify"/> - <check_box label="Copiar" name="checkbox next owner can copy" left_delta="80"/> - <check_box name="checkbox next owner can transfer" left_delta="67"/> - </panel> - <string name="text modify info 1"> - Você pode modificar este objeto - </string> - <string name="text modify info 2"> - Você pode modificar estes objetos - </string> - <string name="text modify info 3"> - Você não pode modificar este objeto - </string> - <string name="text modify info 4"> - Você não pode modificar estes objetos - </string> - <string name="text modify warning"> - Você precisa selecionar o objeto todo para ajustar as permissões - </string> - <string name="Cost Default"> - Preço: L$ - </string> - <string name="Cost Total"> - Preço Total: L$ - </string> - <string name="Cost Per Unit"> - Preço Por: L$ - </string> - <string name="Cost Mixed"> - Preço Misturado - </string> - <string name="Sale Mixed"> - Venda Misturada - </string> + <spinner label="Preço: L$" name="Edit Cost"/> + <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/> + <panel name="perms_build"> + <text name="perm_modify"> + Você pode modificar este objeto + </text> + <text name="Anyone can:"> + Todos: + </text> + <check_box label="Movimentar" name="checkbox allow everyone move"/> + <check_box label="Copiar" name="checkbox allow everyone copy"/> + <text name="Next owner can:"> + Próximo proprietário: + </text> + <check_box label="Modificar" name="checkbox next owner can modify"/> + <check_box label="Copiar" left_delta="80" name="checkbox next owner can copy"/> + <check_box label="Transferir" left_delta="67" name="checkbox next owner can transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> + </panel> </panel> <panel label="Objeto" name="Object"> - <text name="select_single" width="272"> - Selecione apenas uma primitiva para editar os parâmetros. - </text> - <text name="edit_object"> - Editar os parâmetros do Objeto: - </text> <check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/> <check_box label="FÃsica" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados e sofram efeito da gravidade"/> - <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/> + <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="O objeto será excluÃdo um minuto depois de ser criado"/> <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/> <text name="label position"> Posição (metros) @@ -246,48 +260,27 @@ <spinner label="X" name="Rot X"/> <spinner label="Y" name="Rot Y"/> <spinner label="Z" name="Rot Z"/> - <text name="label material"> - Material - </text> - <combo_box name="material"> - <combo_box.item name="Stone" label="Pedra" - /> - <combo_box.item name="Metal" label="Metal" - /> - <combo_box.item name="Glass" label="Vidro" - /> - <combo_box.item name="Wood" label="Madeira" - /> - <combo_box.item name="Flesh" label="Carne" - /> - <combo_box.item name="Plastic" label="Plástico" - /> - <combo_box.item name="Rubber" label="Couro" - /> - </combo_box> - <text name="label basetype"> - Forma básica - </text> <combo_box name="comboBaseType"> - <combo_box.item name="Box" label="Caixa" - /> - <combo_box.item name="Cylinder" label="Cilindro" - /> - <combo_box.item name="Prism" label="Prisma" - /> - <combo_box.item name="Sphere" label="Esfera" - /> - <combo_box.item name="Torus" label="Toróide" - /> - <combo_box.item name="Tube" label="Tubo" - /> - <combo_box.item name="Ring" label="Anel" - /> - <combo_box.item name="Sculpted" label="Esculpida" - /> + <combo_box.item label="Caixa" name="Box"/> + <combo_box.item label="Cilindro" name="Cylinder"/> + <combo_box.item label="Prisma" name="Prism"/> + <combo_box.item label="Esfera" name="Sphere"/> + <combo_box.item label="Toróide" name="Torus"/> + <combo_box.item label="Tubo" name="Tube"/> + <combo_box.item label="Anel" name="Ring"/> + <combo_box.item label="Esculpida" name="Sculpted"/> + </combo_box> + <combo_box name="material"> + <combo_box.item label="Pedra" name="Stone"/> + <combo_box.item label="Metal" name="Metal"/> + <combo_box.item label="Vidro" name="Glass"/> + <combo_box.item label="Madeira" name="Wood"/> + <combo_box.item label="Carne" name="Flesh"/> + <combo_box.item label="Plástico" name="Plastic"/> + <combo_box.item label="Couro" name="Rubber"/> </combo_box> <text name="text cut"> - Recorte InÃcio e final + Path Cut (begin/end) </text> <spinner label="I" name="cut begin"/> <spinner label="F" name="cut end"/> @@ -301,17 +294,13 @@ Forma Vazia </text> <combo_box name="hole"> - <combo_box.item name="Default" label="Padrão" - /> - <combo_box.item name="Circle" label="Circulo" - /> - <combo_box.item name="Square" label="Quadrado" - /> - <combo_box.item name="Triangle" label="Triâgulo" - /> + <combo_box.item label="Padrão" name="Default"/> + <combo_box.item label="Circulo" name="Circle"/> + <combo_box.item label="Quadrado" name="Square"/> + <combo_box.item label="Triâgulo" name="Triangle"/> </combo_box> <text name="text twist"> - Torcer no InÃcio e final + Twist (begin/end) </text> <spinner label="I" name="Twist Begin"/> <spinner label="F" name="Twist End"/> @@ -329,13 +318,13 @@ <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut" width="156"> - Perfil Recortado no InÃcio e fim + Profile Cut (begin/end) </text> <text name="advanced_dimple"> - Cova InÃcio e final + Dimple (begin/end) </text> <text name="advanced_slice"> - Pedaço InÃcio e fim + Slice (begin/end) </text> <spinner label="I" name="Path Limit Begin"/> <spinner label="F" name="Path Limit End"/> @@ -351,22 +340,17 @@ Revoluções </text> <texture_picker label="Texture de Escultura" name="sculpt texture control" tool_tip="Click to choose a picture"/> - <check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/> - <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/> + <check_box label="Espelho" name="sculpt mirror control" tool_tip="Flips sculpted prim along the X axis"/> + <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverts the sculpted prims normals, making it appear inside-out"/> <text name="label sculpt type"> Tipo costura </text> <combo_box name="sculpt type control"> - <combo_box.item name="None" label="(nenhum)" - /> - <combo_box.item name="Sphere" label="Esfera" - /> - <combo_box.item name="Torus" label="Toróide" - /> - <combo_box.item name="Plane" label="Plano" - /> - <combo_box.item name="Cylinder" label="Cilindro" - /> + <combo_box.item label="(nenhum)" name="None"/> + <combo_box.item label="Esfera" name="Sphere"/> + <combo_box.item label="Toróide" name="Torus"/> + <combo_box.item label="Plano" name="Plane"/> + <combo_box.item label="Cilindro" name="Cylinder"/> </combo_box> </panel> <panel label="Recursos" name="Features"> @@ -376,7 +360,7 @@ <text name="edit_object"> Editar caracterÃsticas do Objeto: </text> - <check_box label="FlexÃbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/> + <check_box label="FlexÃbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/> <spinner label="Suavidade" name="FlexNumSections"/> <spinner label="Gravidade" name="FlexGravity"/> <spinner label="Arrastar" name="FlexFriction"/> @@ -386,17 +370,24 @@ <spinner label="Força Y" name="FlexForceY"/> <spinner label="Força Z" name="FlexForceZ"/> <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/> - <text name="label color"> - Cor - </text> - <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/> + <color_swatch label="" name="colorswatch" tool_tip="Selecionar a cor"/> + <texture_picker label="" name="light texture control" tool_tip="Clique para selecionar uma imagem de projeção (só com renderização suspesa ativada)"/> <spinner label="Intensidade" name="Light Intensity"/> + <spinner label="FOV" name="Light FOV"/> <spinner label="Raio" name="Light Radius"/> + <spinner label="Enfocar" name="Light Focus"/> <spinner label="Queda" name="Light Falloff"/> + <spinner label="Ambiente" name="Light Ambiance"/> </panel> <panel label="Textura" name="Texture"> + <panel.string name="string repeats per meter"> + Repetir por Metro + </panel.string> + <panel.string name="string repeats per face"> + Repetir por Face + </panel.string> <texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/> - <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/> + <color_swatch label="Cor" name="colorswatch" tool_tip="Selecionar a cor"/> <text name="color trans" width="100"> Transparência % </text> @@ -408,99 +399,69 @@ Mapeamento </text> <combo_box name="combobox texgen"> - <combo_box.item name="Default" label="Padrão" - /> - <combo_box.item name="Planar" label="Planar" - /> + <combo_box.item label="Padrão" name="Default"/> + <combo_box.item label="Planar" name="Planar"/> </combo_box> <text name="label shininess"> Brilho </text> <combo_box name="combobox shininess"> - <combo_box.item name="None" label="Nenhum" - /> - <combo_box.item name="Low" label="Baixo" - /> - <combo_box.item name="Medium" label="Médio" - /> - <combo_box.item name="High" label="Alto" - /> + <combo_box.item label="Nenhum" name="None"/> + <combo_box.item label="Baixo" name="Low"/> + <combo_box.item label="Médio" name="Medium"/> + <combo_box.item label="Alto" name="High"/> </combo_box> <text name="label bumpiness"> Ondulação </text> - <combo_box name="combobox bumpiness" width="100" > - <combo_box.item name="None" label="Nenhum" - /> - <combo_box.item name="Brightness" label="Claridade" - /> - <combo_box.item name="Darkness" label="Escuridão" - /> - <combo_box.item name="woodgrain" label="Granulação" - /> - <combo_box.item name="bark" label="Casca" - /> - <combo_box.item name="bricks" label="Tijolos" - /> - <combo_box.item name="checker" label="Caixa" - /> - <combo_box.item name="concrete" label="Concreto" - /> - <combo_box.item name="crustytile" label="Encaroçado" - /> - <combo_box.item name="cutstone" label="Pedra Cortante" - /> - <combo_box.item name="discs" label="Discos" - /> - <combo_box.item name="gravel" label="Cascalho" - /> - <combo_box.item name="petridish" label="Pedrisco" - /> - <combo_box.item name="siding" label="Revestimento" - /> - <combo_box.item name="stonetile" label="Empedrado" - /> - <combo_box.item name="stucco" label="Grafiato" - /> - <combo_box.item name="suction" label="Sulcos" - /> - <combo_box.item name="weave" label="Weave" - /> + <combo_box name="combobox bumpiness" width="100"> + <combo_box.item label="Nenhum" name="None"/> + <combo_box.item label="Claridade" name="Brightness"/> + <combo_box.item label="Escuridão" name="Darkness"/> + <combo_box.item label="Granulação" name="woodgrain"/> + <combo_box.item label="Casca" name="bark"/> + <combo_box.item label="Tijolos" name="bricks"/> + <combo_box.item label="Caixa" name="checker"/> + <combo_box.item label="Concreto" name="concrete"/> + <combo_box.item label="Encaroçado" name="crustytile"/> + <combo_box.item label="Pedra Cortante" name="cutstone"/> + <combo_box.item label="Discos" name="discs"/> + <combo_box.item label="Cascalho" name="gravel"/> + <combo_box.item label="Pedrisco" name="petridish"/> + <combo_box.item label="Revestimento" name="siding"/> + <combo_box.item label="Empedrado" name="stonetile"/> + <combo_box.item label="Grafiato" name="stucco"/> + <combo_box.item label="Sulcos" name="suction"/> + <combo_box.item label="Weave" name="weave"/> </combo_box> <text name="tex scale"> - Repetir por Face + Repeats / Face </text> <spinner label="Horizontal (U)" name="TexScaleU"/> <check_box label="Flip" name="checkbox flip s"/> <spinner label="Vertical (V)" name="TexScaleV"/> <check_box label="Flip" name="checkbox flip t"/> - <text name="tex rotate"> - Rotação (graus) - </text> - <string name="string repeats per meter"> - Repetir por Metro - </string> - <string name="string repeats per face"> - Repetir por Face - </string> - <text name="rpt"> - Repetir por Metro - </text> + <spinner label="RotationËš" name="TexRot"/> + <spinner label="Repeats / Meter" name="rptctrl"/> <button label="Aplicar" label_selected="Aplicar" name="button apply"/> <text name="tex offset"> - Deslocamento + Texture Offset </text> <spinner label="Horizontal (U)" name="TexOffsetU"/> <spinner label="Vertical (V)" name="TexOffsetV"/> - <text name="textbox autofix"> - Alinhar Texturas - </text> - <button label="Alinhar" label_selected="Alinhar" name="button align"/> + <panel name="Add_Media"> + <text name="media_tex"> + MÃdia + </text> + <button name="add_media" tool_tip="Adicionar mÃdia"/> + <button name="delete_media" tool_tip="Excluir esta textura de mÃdia"/> + <button name="edit_media" tool_tip="Editar esta mÃdia"/> + <button label="Alinhar" label_selected="Alinhar mÃdias" name="button align" tool_tip="Alinhar textura da mÃdia (após carregar mÃdia)"/> + </panel> </panel> <panel label="Conteúdo" name="Contents"> - <button label="Novo Script" label_selected="Novo Script" name="button new script"/> - <button label="Permissões" name="button permissions"/> - <panel name="ContentsInventory" width="272" /> + <button label="Novo Script" label_selected="Novo script" name="button new script"/> + <button label="Autorizações" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> @@ -508,62 +469,22 @@ Informações do Lote </text> <text name="label_area_price"> - Preço: L$[PRICE] por [AREA] m². + Preço: L$[PRICE] por [AREA] m² </text> <text name="label_area"> - Ãrea: [AREA] m². + Ãrea: [AREA] m² </text> - <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/> - <check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos: Green = Sua terra Aqua = Terra do seu grupo Red = PossuÃda por outros Yellow = À venda Purple = A leilão Grey = Pública"/> - <button label="?" label_selected="?" name="button show owners help" left_delta="100"/> + <button label="Sobre terrenos" label_selected="Sobre terrenos" name="button about land"/> + <check_box label="Mostrar donos" name="checkbox show owners" tool_tip="Colorir lotes de acordo com seus donos: Green = Sua terra Aqua = Terra do seu grupo Red = PossuÃda por outros Yellow = À venda Purple = A leilão Grey = Pública"/> <text name="label_parcel_modify"> Modificar Lote </text> - <button label="Sub-Dividir" label_selected="Sub-Dividir" name="button subdivide land"/> - <button label="Unir" label_selected="Unir" name="button join land"/> + <button label="Subdividir" label_selected="Subdividir" name="button subdivide land"/> + <button label="Juntar" label_selected="Juntar" name="button join land"/> <text name="label_parcel_trans"> Transações com a Terra </text> - <button label="Comprar Terra" label_selected="Comprar Terra" name="button buy land"/> - <button label="Abandonar Terra" label_selected="Abandonar Terra" name="button abandon land"/> + <button label="Comprar terreno" label_selected="Comprar terreno" name="button buy land"/> + <button label="Abandonar terreno" label_selected="Abandonar terreno" name="button abandon land"/> </panel> - <floater.string name="status_rotate"> - Arrastar as bandas coloridas para girar o objeto - </floater.string> - <floater.string name="status_scale"> - Clicar e arrastar para esticar o lado selecionado - </floater.string> - <floater.string name="status_move"> - Arrastar para mover, Shift-arrastar para copiar - </floater.string> - <floater.string name="status_modifyland"> - Clicar e reter para modificar a terra - </floater.string> - <floater.string name="status_camera"> - Clicar e arrastar para mudar a vista - </floater.string> - <floater.string name="status_grab"> - Arrastar para mover, Ctrl para levantar, Ctrl-Shift para rotacionar - </floater.string> - <floater.string name="status_place"> - Clique no mundo para construir - </floater.string> - <floater.string name="status_selectland"> - Clicar e arrastar para selecionar a terra - </floater.string> - <floater.string name="grid_screen_text"> - Tela - </floater.string> - <floater.string name="grid_local_text"> - Local - </floater.string> - <floater.string name="grid_world_text"> - Mundo - </floater.string> - <floater.string name="grid_reference_text"> - Referência - </floater.string> - <floater.string name="grid_attachment_text"> - Anexo - </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml index 15e69c450c..dc3bf73818 100644 --- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml @@ -1,58 +1,59 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="top_objects" title="CARREGANDO..."> +<floater name="top_objects" title="Principais objetos:"> + <floater.string name="top_scripts_title"> + Principais Scripts + </floater.string> + <floater.string name="top_scripts_text"> + [COUNT] scripts tomando um total de [TIME] ms + </floater.string> + <floater.string name="scripts_score_label"> + Tempo + </floater.string> + <floater.string name="scripts_mono_time_label"> + Hora Mono + </floater.string> + <floater.string name="top_colliders_title"> + Principais Colidentes + </floater.string> + <floater.string name="top_colliders_text"> + [COUNT] objetos principais experimentando muitas potenciais colisões + </floater.string> + <floater.string name="colliders_score_label"> + Placar + </floater.string> + <floater.string name="none_descriptor"> + Nenhum encontrado. + </floater.string> <text name="title_text"> Carregando... </text> <scroll_list name="objects_list"> - <column label="Placar" name="score"/> - <column label="Nome" name="name"/> - <column label="Proprietário" name="owner"/> - <column label="Local" name="location"/> - <column label="Tempo" name="time"/> - <column label="Hora Mono" name="mono_time"/> + <scroll_list.columns label="Placar" name="score"/> + <scroll_list.columns label="Nome" name="name"/> + <scroll_list.columns label="Proprietário" name="owner"/> + <scroll_list.columns label="Local" name="location"/> + <scroll_list.columns label="Tempo" name="time"/> + <scroll_list.columns label="Hora Mono" name="mono_time"/> + <scroll_list.columns label="URLs" name="URLs"/> </scroll_list> <text name="id_text"> ID do Objeto: </text> + <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> <button label="Mostrar Avisos" name="show_beacon_btn"/> <text name="obj_name_text"> - Nome do Objeto: + Nome do objeto: </text> + <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> <button label="Filtro" name="filter_object_btn"/> <text name="owner_name_text" width="130"> - Nome do Proprietário: + Proprietário: </text> - <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> - <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> <line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/> <button label="Filtro" name="filter_owner_btn"/> + <button label="Atualizar" name="refresh_btn"/> <button label="Retornar Selecionado" name="return_selected_btn" width="170"/> - <button label="Retornar Tudo" name="return_all_btn" left="190"/> + <button label="Retornar Tudo" left="190" name="return_all_btn"/> <button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/> - <button label="Desabilitar Tudo" name="disable_all_btn" left="190"/> - <button label="Atualizar" name="refresh_btn"/> - <string name="top_scripts_title"> - Principais Scripts - </string> - <string name="top_scripts_text"> - [COUNT] scripts tomando um total de [TIME] ms - </string> - <string name="scripts_score_label"> - Tempo - </string> - <string name="scripts_mono_time_label"> - Hora Mono - </string> - <string name="top_colliders_title"> - Principais Colidentes - </string> - <string name="top_colliders_text"> - [COUNT] objetos principais experimentando muitas potenciais colisões - </string> - <string name="colliders_score_label"> - Placar - </string> - <string name="none_descriptor"> - Nenhum encontrado. - </string> + <button label="Desabilitar Tudo" left="190" name="disable_all_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml index 7a0c187517..2fbbbde9e4 100644 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml @@ -4,8 +4,7 @@ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/> <text name="tos_heading"> - Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando o -[SECOND_LIFE], você precisa aceitar o acordo. + Leia com atenção os Termos do Serviço. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml new file mode 100644 index 0000000000..6ab10db96f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_voice_controls" title="Controles de voz"> + <string name="title_nearby"> + VOZ LOCAL + </string> + <string name="title_group"> + Ligação de grupo com [GROUP] + </string> + <string name="title_adhoc"> + Teleconferência + </string> + <string name="title_peer_2_peer"> + Ligação para [NAME] + </string> + <string name="no_one_near"> + Ninguém por perto ativou a voz + </string> + <layout_stack name="my_call_stack"> + <layout_panel name="my_panel"> + <text name="user_text" value="Mya Avatar:"/> + </layout_panel> + <layout_panel name="leave_call_btn_panel"> + <button label="Desligar" name="leave_call_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml index bad9aa0943..36b995d4fd 100644 --- a/indra/newview/skins/default/xui/pt/floater_water.xml +++ b/indra/newview/skins/default/xui/pt/floater_water.xml @@ -3,7 +3,7 @@ <text name="KeyFramePresetsText" width="154"> Pré-configurações da Ãgua: </text> - <combo_box left_delta="160" name="WaterPresetsCombo" width="150" /> + <combo_box left_delta="160" name="WaterPresetsCombo" width="150"/> <button label="Novo" label_selected="Novo" name="WaterNewPreset"/> <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/> <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/> @@ -13,19 +13,19 @@ Cor da névoa da Ãgua </text> <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/> + <color_swatch label="" name="WaterFogColor" tool_tip="Selecionar a cor"/> <text name="WaterFogDensText"> Expoente da Densidade de névoa </text> - <button label="?" name="WaterFogDensityHelp" left="209"/> + <button label="?" left="209" name="WaterFogDensityHelp"/> <text name="WaterUnderWaterFogModText"> Modificador da névoa Subaquática </text> - <button label="?" name="WaterUnderWaterFogModHelp" left="209"/> + <button label="?" left="209" name="WaterUnderWaterFogModHelp"/> <text name="BDensText"> Escala da Marola de Reflexão </text> - <button label="?" name="WaterNormalScaleHelp" left="415"/> + <button label="?" left="415" name="WaterNormalScaleHelp"/> <text name="BHText2"> 1 </text> @@ -38,29 +38,29 @@ <text name="HDText"> Escala de Fresnel </text> - <button label="?" name="WaterFresnelScaleHelp" left="415"/> + <button label="?" left="415" name="WaterFresnelScaleHelp"/> <text name="FresnelOffsetText"> Deslocamento de Fresnel </text> - <button label="?" name="WaterFresnelOffsetHelp" left="415"/> + <button label="?" left="415" name="WaterFresnelOffsetHelp"/> <text name="DensMultText"> Refratar a Escala para Cima </text> - <button label="?" name="WaterScaleAboveHelp" left="640"/> + <button label="?" left="640" name="WaterScaleAboveHelp"/> <text name="WaterScaleBelowText"> Refratar a Escala para Baixo </text> - <button label="?" name="WaterScaleBelowHelp" left="640"/> + <button label="?" left="640" name="WaterScaleBelowHelp"/> <text name="MaxAltText"> Multiplicador de Difusão </text> - <button label="?" name="WaterBlurMultiplierHelp" left="640"/> + <button label="?" left="640" name="WaterBlurMultiplierHelp"/> </panel> <panel label="Imagem" name="Waves"> <text name="BHText"> Direção da Onda Maior </text> - <button label="?" name="WaterWave1Help" left="170"/> + <button label="?" left="170" name="WaterWave1Help"/> <text name="WaterWave1DirXText"> X </text> @@ -70,7 +70,7 @@ <text name="BHText2"> Direção da Onda Pequena </text> - <button label="?" name="WaterWave2Help" left="170"/> + <button label="?" left="170" name="WaterWave2Help"/> <text name="WaterWave2DirXText"> X </text> diff --git a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml index 2b2c669a18..282bf0e268 100644 --- a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml @@ -3,7 +3,7 @@ <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <text name="Save item as:"> - Salvar item como: + Salvar item no inventário como: </text> <line_editor name="name ed"> Novo [DESC] diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml new file mode 100644 index 0000000000..865d939d24 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="whitelist_entry" title="LISTA BRANCA"> + <text name="media_label"> + Digite um URL ou série de URLs para a lista de domÃnios permitidos + </text> + <line_editor name="whitelist_entry" tool_tip="Digite um URL ou série de URLs para a lista branca"/> + <button label="OK" name="ok_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml new file mode 100644 index 0000000000..6a8ccbd002 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="window_size" title="TAMANHO DA JANELA"> + <string name="resolution_format"> + [RES_X] x [RES_Y] + </string> + <text name="windowsize_text"> + Definir tamanho da janela: + </text> + <combo_box name="window_size_combo" tool_tip="largura x altura"> + <combo_box.item label="1000 x 700 (padrão)" name="item0"/> + <combo_box.item label="1024 x 768" name="item1"/> + <combo_box.item label="1280 x 720 (720p)" name="item2"/> + <combo_box.item label="1920 x 1080 (1080p)" name="item3"/> + </combo_box> + <button label="Definir" name="set_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml index 034602d6ea..95bb899071 100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml @@ -1,53 +1,83 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="worldmap" title="MAPA MUNDI"> - <tab_container name="maptab"> - <panel label="Objetos" name="objects_mapview"/> - <panel label="Terreno" name="terrain_mapview"/> - </tab_container> - <text name="you_label"> - Você - </text> - <text name="home_label"> - Casa - </text> - <text name="auction_label"> - Leilão - </text> - <text name="land_for_sale_label"> - Terra à venda - </text> - <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para sua Casa"/> - <check_box label="Residente" name="people_chk"/> - <check_box label="Infohub" name="infohub_chk"/> - <check_box label="Telehub" name="telehubchk"/> - <check_box label="Terra à Venda" name="land_for_sale_chk"/> - <text name="events_label"> - Eventos: - </text> - <check_box label="PG" name="event_chk"/> - <check_box label="Mature" name="event_mature_chk"/> - <check_box label="Adult" name="event_adult_chk"/> - <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa"> - <combo_box.item name="item1" label="Amigos Conectados" /> - </combo_box> - <combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa"> - <combo_box.item name="item1" label="Landmarks" /> - </combo_box> - <line_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/> - <button label="Procurar" name="DoSearch" tool_tip="Procurar por região"/> - <text name="search_label"> - Resultados da Procura: - </text> - <text name="location_label"> - Localização: - </text> - <spinner name="spin x" tool_tip="Coordenada X da posição mostrada no mapa"/> - <spinner name="spin y" tool_tip="Coordenada Y da posição mostrada no mapa"/> - <spinner name="spin z" tool_tip="Coordenada Z da posição mostrada no Mapa"/> - <button font="SansSerifSmall" label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/> - <button font="SansSerifSmall" left_delta="91" width="135" label="Mostrar destino" label_selected="Mostrar Destino" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada"/> - <button font="SansSerifSmall" label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Parar de percorrer"/> - <button font="SansSerifSmall" left_delta="91" width="135" label="Mostra minha localização" label_selected="Mostra minha localização" name="Show My Location" tool_tip="Centraliza o mapa na posição do seu Avatar"/> - <button font="SansSerifSmall" label="Copiar SLurl para área de transferência" name="copy_slurl" tool_tip="Copia a posição atual como SLurl para ser usada na Web"/> - <slider label="Zoom" name="zoom slider"/> +<floater name="worldmap" title="MAPA-MÚNDI"> + <panel name="layout_panel_1"> + <text name="events_label"> + Legenda + </text> + </panel> + <panel + name="layout_panel_2"> + <button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/> + <text name="me_label"> + Eu + </text> + <check_box label="Residente" name="people_chk"/> + <text name="person_label"> + Pessoa + </text> + <check_box label="Infohub" name="infohub_chk"/> + <text name="infohub_label"> + Infohub + </text> + <check_box label="Terra à Venda" name="land_for_sale_chk"/> + <text name="land_sale_label"> + Venda de terreno + </text> + <text name="by_owner_label"> + pelo dono + </text> + <text name="auction_label"> + leilão de terrenos + </text> + <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para minha casa"/> + <text name="Home_label"> + Casa + </text> + <text name="events_label"> + Eventos: + </text> + <check_box label="PG" name="event_chk"/> + <text name="pg_label"> + Geral + </text> + <check_box initial_value="true" label="Mature" name="event_mature_chk"/> + <text name="mature_label"> + Moderado + </text> + <check_box label="Adult" name="event_adult_chk"/> + <text name="adult_label"> + Público adulto + </text> + </panel> + <panel + name="layout_panel_3"> + <text name="find_on_map_label"> + Localizar no mapa + </text> + </panel> + <panel + name="layout_panel_4"> + <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos no mapa"> + <combo_box.item label="Amigos conectados" name="item1"/> + </combo_box> + <combo_box label="Meus marcos" name="landmark combo" tool_tip="Mostrar marco no mapa"> + <combo_box.item label="Meus marcos" name="item1"/> + </combo_box> + <search_editor label="Regiões por nome" name="location" tool_tip="Digite o nome de uma Região"/> + <button label="Buscar" name="DoSearch" tool_tip="Procurar por região"/> + <button name="Clear" tool_tip="Limpara linhas e redefinir mapa"/> + <button font="SansSerifSmall" label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/> + <button font="SansSerifSmall" label="Copiar SLurl" name="copy_slurl" tool_tip="Copia a localização atual como um SLurl para usar na web."/> + <button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada" width="135"/> + </panel> + <panel + name="layout_panel_5"> + <text name="zoom_label"> + Zoom + </text> + </panel> + <panel + name="layout_panel_6"> + <slider label="Zoom" name="zoom slider"/> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml new file mode 100644 index 0000000000..a74ea15be0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_avatar"> + <string name="Subtitle"> + [IDADE] + </string> + <string name="Details"> + [PERFIL_SL] + </string> + <slider name="volume_slider" tool_tip="Volume de Voz" value="0.5"/> + <button label="Adicionar amigo" name="add_friend_btn"/> + <button label="MI" name="im_btn"/> + <button label="Perfil" name="view_profile_btn"/> + <panel name="moderator_panel"> + <button label="Disabilitar Voz" name="disable_voice"/> + <button label="Habilitar Voz" name="enable_voice"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml new file mode 100644 index 0000000000..889d35f269 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/inspect_group.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_group"> + <string name="PrivateGroup"> + Grupo privado + </string> + <string name="FreeToJoin"> + Livre para ingressar + </string> + <string name="CostToJoin"> + [AMOUNT]L$ para ingressar + </string> + <string name="YouAreMember"> + Você é um membro + </string> + <button label="Ingressar" name="join_btn"/> + <button label="Abandonar" name="leave_btn"/> + <button label="Visualizar Perfil" name="view_profile_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml new file mode 100644 index 0000000000..e9f1ca3a0b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/inspect_object.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_object"> + <string name="Creator"> + Autor: [CREATOR] + </string> + <string name="CreatorAndOwner"> + Autor: [CREATOR] +Proprietário: [OWNER] + </string> + <string name="Price"> + L$[AMOUNT] + </string> + <string name="PriceFree"> + Grátis! + </string> + <string name="Touch"> + Tocar + </string> + <string name="Sit"> + Sentar + </string> + <button label="Comprar" name="buy_btn"/> + <button label="Pagar" name="pay_btn"/> + <button label="Pegar uma cópia" name="take_free_copy_btn"/> + <button label="Tocar" name="touch_btn"/> + <button label="Sentar" name="sit_btn"/> + <button label="Abrir" name="open_btn"/> + <icon name="secure_browsing" tool_tip="Navegação segura"/> + <button label="Mais" name="more_info_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml new file mode 100644 index 0000000000..789194bf2e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater name="inspect_remote_object"> + <text name="object_owner_label"> + Proprietário: + </text> + <button label="Mapa" name="map_btn"/> + <button label="Bloquear" name="block_btn"/> + <button label="Fechar" name="close_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml new file mode 100644 index 0000000000..b6cf896836 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- *NOTE: See also menu_avatar_other.xml --> +<context_menu name="Avatar Pie"> + <menu_item_call label="Ver perfil" name="Profile..."/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="MI" name="Send IM..."/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Convidar para entrar no grupo" name="Invite..."/> + <menu_item_call label="Bloquear" name="Avatar Mute"/> + <menu_item_call label="Denunciar" name="abuse"/> + <menu_item_call label="Congelar" name="Freeze..."/> + <menu_item_call label="Ejetar" name="Eject..."/> + <menu_item_call label="Depurar" name="Debug..."/> + <menu_item_call label="Mais zoom" name="Zoom In"/> + <menu_item_call label="Pagar" name="Pay..."/> + <menu_item_call label="Perfil do objeto" name="Object Inspect"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml new file mode 100644 index 0000000000..04f6227141 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Attachment Pie"> + <menu_item_call label="Tocar" name="Attachment Object Touch"/> + <menu_item_call label="Editar" name="Edit..."/> + <menu_item_call label="Tirar" name="Detach"/> + <menu_item_call label="Largar" name="Drop"/> + <menu_item_call label="Ficar de pé" name="Stand Up"/> + <menu_item_call label="Minha aparência" name="Appearance..."/> + <menu_item_call label="Meus amigos" name="Friends..."/> + <menu_item_call label="Meus grupos" name="Groups..."/> + <menu_item_call label="Meu perfil" name="Profile..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml new file mode 100644 index 0000000000..beba969b7e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Avatar Icon Menu"> + <menu_item_call label="Ver perfil" name="Show Profile"/> + <menu_item_call label="Enviar MI..." name="Send IM"/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="Remover amigo..." name="Remove Friend"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml new file mode 100644 index 0000000000..21c2cb196a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- *NOTE: See also menu_attachment_other.xml --> +<context_menu name="Avatar Pie"> + <menu_item_call label="Ver perfil" name="Profile..."/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="MI" name="Send IM..."/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Convidar para entrar no grupo" name="Invite..."/> + <menu_item_call label="Bloquear" name="Avatar Mute"/> + <menu_item_call label="Denunciar" name="abuse"/> + <menu_item_call label="Congelar" name="Freeze..."/> + <menu_item_call label="Ejetar" name="Eject..."/> + <menu_item_call label="Depurar" name="Debug..."/> + <menu_item_call label="Mais zoom" name="Zoom In"/> + <menu_item_call label="Pagar" name="Pay..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml new file mode 100644 index 0000000000..abbf2e7032 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Self Pie"> + <menu_item_call label="Ficar de pé" name="Stand Up"/> + <context_menu label="Tirar â–¶" name="Take Off >"> + <context_menu label="Roupa â–¶" name="Clothes >"> + <menu_item_call label="Camisa" name="Shirt"/> + <menu_item_call label="Calças" name="Pants"/> + <menu_item_call label="Saia" name="Skirt"/> + <menu_item_call label="Sapatos" name="Shoes"/> + <menu_item_call label="Meias" name="Socks"/> + <menu_item_call label="Jaqueta" name="Jacket"/> + <menu_item_call label="Luvas" name="Gloves"/> + <menu_item_call label="Camiseta" name="Self Undershirt"/> + <menu_item_call label="Roupa de baixo" name="Self Underpants"/> + <menu_item_call label="Tatuagem" name="Self Tattoo"/> + <menu_item_call label="Alpha" name="Self Alpha"/> + <menu_item_call label="Todas as roupas" name="All Clothes"/> + </context_menu> + <context_menu label="HUD â–¶" name="Object Detach HUD"/> + <context_menu label="Tirar â–¶" name="Object Detach"/> + <menu_item_call label="Tirar tudo" name="Detach All"/> + </context_menu> + <menu_item_call label="Minha aparência" name="Appearance..."/> + <menu_item_call label="Meus amigos" name="Friends..."/> + <menu_item_call label="Meus grupos" name="Groups..."/> + <menu_item_call label="Meu perfil" name="Profile..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml new file mode 100644 index 0000000000..43b446a67e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="hide_camera_move_controls_menu"> + <menu_item_check label="Botão de gestos" name="ShowGestureButton"/> + <menu_item_check label="Botão de movimento" name="ShowMoveButton"/> + <menu_item_check label="Botão de ver" name="ShowCameraButton"/> + <menu_item_check label="Botão de fotos" name="ShowSnapshotButton"/> + <menu_item_call label="Cortar" name="NearbyChatBar_Cut"/> + <menu_item_call label="Copiar" name="NearbyChatBar_Copy"/> + <menu_item_call label="Colar" name="NearbyChatBar_Paste"/> + <menu_item_call label="Excluir" name="NearbyChatBar_Delete"/> + <menu_item_call label="Selecionar tudo" name="NearbyChatBar_Select_All"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml new file mode 100644 index 0000000000..062820fbca --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_favorites.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Popup"> + <menu_item_call label="Teletransportar" name="Teleport To Landmark"/> + <menu_item_call label="Ver/Editar marco" name="Landmark Open"/> + <menu_item_call label="Copiar SLurl" name="Copy slurl"/> + <menu_item_call label="Mostrar no mapa" name="Show On Map"/> + <menu_item_call label="Copiar" name="Landmark Copy"/> + <menu_item_call label="Colar" name="Landmark Paste"/> + <menu_item_call label="Excluir" name="Delete"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml new file mode 100644 index 0000000000..70d8ae7a8e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gesture_gear"> + <menu_item_call label="Adicionar/remover de favoritos" name="activate"/> + <menu_item_call label="Copiar" name="copy_gesture"/> + <menu_item_call label="Colar" name="paste"/> + <menu_item_call label="Copiar UUID" name="copy_uuid"/> + <menu_item_call label="Salvar para look atual" name="save_to_outfit"/> + <menu_item_call label="Editar" name="edit_gesture"/> + <menu_item_call label="Verificar" name="inspect"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml new file mode 100644 index 0000000000..1083845d68 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_group_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Entrar no grupo..." name="item_join"/> + <menu_item_call label="Novo grupo..." name="item_new"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml new file mode 100644 index 0000000000..472ca466c9 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="hide_navbar_menu"> + <menu_item_check label="Mostrar barra de navegação" name="ShowNavbarNavigationPanel"/> + <menu_item_check label="Mostrar barra de favoritos" name="ShowNavbarFavoritesPanel"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml new file mode 100644 index 0000000000..2d37cefd6f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="IM Well Button Context Menu"> + <menu_item_call label="Fechar tudo" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml new file mode 100644 index 0000000000..ead949ba13 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet AdHoc Menu"> + <menu_item_call label="Encerrar esta sessão" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml new file mode 100644 index 0000000000..dd177d1b8d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet Group Menu"> + <menu_item_call label="Sobre o grupo" name="Show Profile"/> + <menu_item_call label="Mostrar sessão" name="Chat"/> + <menu_item_call label="Encerrar esta sessão" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml new file mode 100644 index 0000000000..d821b3ded0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="IMChiclet P2P Menu"> + <menu_item_call label="Ver perfil" name="Show Profile"/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="Mostrar sessão" name="Send IM"/> + <menu_item_call label="Encerrar esta sessão" name="End Session"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml new file mode 100644 index 0000000000..cdd8959cd4 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Ver perfil" name="view_profile"/> + <menu_item_call label="Adicionar amigo..." name="add_friend"/> + <menu_item_call label="MI" name="im"/> + <menu_item_call label="Ligar" name="call"/> + <menu_item_call label="Teletransportar" name="teleport"/> + <menu_item_call label="Convidar para entrar no grupo" name="invite_to_group"/> + <menu_item_call label="Bloquear" name="block"/> + <menu_item_call label="Desbloquear" name="unblock"/> + <menu_item_call label="Denunciar" name="report"/> + <menu_item_call label="Congelar" name="freeze"/> + <menu_item_call label="Ejetar" name="eject"/> + <menu_item_call label="Depurar" name="debug"/> + <menu_item_call label="Localizar no mapa" name="find_on_map"/> + <menu_item_call label="Mais zoom" name="zoom_in"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Compartilhar" name="share"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml new file mode 100644 index 0000000000..b69d205533 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Tocar" name="touch"/> + <menu_item_call label="Sentar" name="sit"/> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Comprar" name="buy"/> + <menu_item_call label="Pegar" name="take"/> + <menu_item_call label="Pegar uma cópia" name="take_copy"/> + <menu_item_call label="Abrir" name="open"/> + <menu_item_call label="Editar" name="edit"/> + <menu_item_call label="Vestir" name="wear"/> + <menu_item_call label="Denunciar" name="report"/> + <menu_item_call label="Bloquear" name="block"/> + <menu_item_call label="Mais zoom" name="zoom_in"/> + <menu_item_call label="Tirar" name="remove"/> + <menu_item_call label="Mais informações" name="more_info"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml new file mode 100644 index 0000000000..2eba4ccb2d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="Ficar de pé" name="stand_up"/> + <menu_item_call label="Minha aparência" name="my_appearance"/> + <menu_item_call label="Meu perfil" name="my_profile"/> + <menu_item_call label="Meus amigos" name="my_friends"/> + <menu_item_call label="Meus grupos" name="my_groups"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index 486588158e..8b565b9645 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -10,9 +10,9 @@ <menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/> <menu_item_call label="Nova Pasta" name="New Folder"/> <menu_item_call label="Novo Script" name="New Script"/> - <menu_item_call label="Nova Nota" name="New Note"/> + <menu_item_call label="Nova anotação" name="New Note"/> <menu_item_call label="Novo Gesto" name="New Gesture"/> - <menu label="Nova Roupa" name="New Clothes"> + <menu label="Novas roupas" name="New Clothes"> <menu_item_call label="Nova Camisa" name="New Shirt"/> <menu_item_call label="Nova Calça" name="New Pants"/> <menu_item_call label="Novos Calçados" name="New Shoes"/> @@ -22,16 +22,32 @@ <menu_item_call label="Novas Luvas" name="New Gloves"/> <menu_item_call label="Nova Anágua" name="New Undershirt"/> <menu_item_call label="Nova roupa de baixo" name="New Underpants"/> + <menu_item_call label="Nova máscara alfa" name="New Alpha Mask"/> + <menu_item_call label="Nova tatuagem" name="New Tattoo"/> </menu> - <menu label="Parte do corpo" name="New Body Parts"> + <menu label="Nova parte do corpo" name="New Body Parts"> <menu_item_call label="Nova forma" name="New Shape"/> <menu_item_call label="Nova pele" name="New Skin"/> <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> </menu> + <menu label="Alterar fonte" name="Change Type"> + <menu_item_call label="Padrão" name="Default"/> + <menu_item_call label="Luvas" name="Gloves"/> + <menu_item_call label="Jaqueta" name="Jacket"/> + <menu_item_call label="Calças" name="Pants"/> + <menu_item_call label="Silhueta" name="Shape"/> + <menu_item_call label="Sapatos" name="Shoes"/> + <menu_item_call label="Camisa" name="Shirt"/> + <menu_item_call label="Saia" name="Skirt"/> + <menu_item_call label="Roupa de baixo" name="Underpants"/> + <menu_item_call label="Camiseta" name="Undershirt"/> + </menu> <menu_item_call label="Teletransporte" name="Landmark Open"/> <menu_item_call label="Abrir" name="Animation Open"/> <menu_item_call label="Abrir" name="Sound Open"/> + <menu_item_call label="Substituir equipamento" name="Replace Outfit"/> + <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/> <menu_item_call label="Remover item" name="Purge Item"/> <menu_item_call label="Restaurar item" name="Restore Item"/> <menu_item_call label="Abrir" name="Open"/> @@ -40,22 +56,21 @@ <menu_item_call label="Copy Asset UUID" name="Copy Asset UUID"/> <menu_item_call label="Copiar" name="Copy"/> <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Colar como link" name="Paste As Link"/> <menu_item_call label="Apagar" name="Delete"/> - <menu_item_call label="Remover os itens" name="Take Off Items"/> - <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/> - <menu_item_call label="Substituir equipamento" name="Replace Outfit"/> + <menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/> <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/> <menu_item_call label="Executar" name="Sound Play"/> - <menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/> - <menu_item_call label="Executar in World" name="Animation Play"/> + <menu_item_call label="Sobre o marco" name="About Landmark"/> + <menu_item_call label="Tocar inworld" name="Animation Play"/> <menu_item_call label="Executar localmente" name="Animation Audition"/> <menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/> <menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/> <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat"/> <menu_item_call label="Ativar" name="Activate"/> <menu_item_call label="Desativar" name="Deactivate"/> + <menu_item_call label="Salvar como" name="Save As"/> <menu_item_call label="Retirar de você" name="Detach From Yourself"/> - <menu_item_call label="Recuperar Última Posição" name="Restore to Last Position"/> <menu_item_call label="Vestir" name="Object Wear"/> <menu label="Anexar a" name="Attach To"/> <menu label="Anexar ao HUD" name="Attach To HUD"/> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml new file mode 100644 index 0000000000..81898c63bf --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_inventory_add"> + <menu label="Upload" name="upload"> + <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> + <menu_item_call label="Som (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="Volume (L$[COST] per file)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Nova pasta" name="New Folder"/> + <menu_item_call label="Novo script" name="New Script"/> + <menu_item_call label="Nova anotação" name="New Note"/> + <menu_item_call label="Novo gesto" name="New Gesture"/> + <menu label="Novas roupas" name="New Clothes"> + <menu_item_call label="Nova camisa" name="New Shirt"/> + <menu_item_call label="Novas calças" name="New Pants"/> + <menu_item_call label="Novos sapatos" name="New Shoes"/> + <menu_item_call label="Novas meias" name="New Socks"/> + <menu_item_call label="Nova blusa" name="New Jacket"/> + <menu_item_call label="Nova saia" name="New Skirt"/> + <menu_item_call label="Novas luvas" name="New Gloves"/> + <menu_item_call label="Nova camiseta" name="New Undershirt"/> + <menu_item_call label="Novas roupa de baixo" name="New Underpants"/> + <menu_item_call label="Novo alpha" name="New Alpha"/> + <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + </menu> + <menu label="Nova parte do corpo" name="New Body Parts"> + <menu_item_call label="Nova silhueta" name="New Shape"/> + <menu_item_call label="Nova pele" name="New Skin"/> + <menu_item_call label="Novo cabelo" name="New Hair"/> + <menu_item_call label="Novos olhos" name="New Eyes"/> + </menu> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml new file mode 100644 index 0000000000..8bae7afddc --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gear_default"> + <menu_item_call label="Nova janela de inventário" name="new_window"/> + <menu_item_call label="Ordenar por nome" name="sort_by_name"/> + <menu_item_call label="Ordenar por mais recente" name="sort_by_recent"/> + <menu_item_call label="Mostrar filtros" name="show_filters"/> + <menu_item_call label="Restabelecer filtros" name="reset_filters"/> + <menu_item_call label="Fechar todas as pastas" name="close_folders"/> + <menu_item_call label="Esvaziar lixeira" name="empty_trash"/> + <menu_item_call label="Esvaziar achados e perdidos" name="empty_lostnfound"/> + <menu_item_call label="Salvar textura como" name="Save Texture As"/> + <menu_item_call label="Encontrar original" name="Find Original"/> + <menu_item_call label="Encontrar todos os links" name="Find All Links"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml new file mode 100644 index 0000000000..9182ce321a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_land.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Land Pie"> + <menu_item_call label="Sobre terrenos" name="Place Information..."/> + <menu_item_call label="Sentar aqui" name="Sit Here"/> + <menu_item_call label="Comprar este terreno" name="Land Buy"/> + <menu_item_call label="Comprar passe" name="Land Buy Pass"/> + <menu_item_call label="Construir" name="Create"/> + <menu_item_call label="Editar a topografia" name="Edit Terrain"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml new file mode 100644 index 0000000000..6accfebee7 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_landmark.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="landmark_overflow_menu"> + <menu_item_call label="Copiar SLurl" name="copy"/> + <menu_item_call label="Excluir" name="delete"/> + <menu_item_call label="Criar destaque" name="pick"/> + <menu_item_call label="Adicionar à barra de favoritos" name="add_to_favbar"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index 7ec324cb3f..6cc83d11d0 100644 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml @@ -1,13 +1,30 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Login Menu"> - <menu label="Arquivo" name="File"> + <menu label="Eu" name="File"> + <menu_item_call label="Preferências" name="Preferences..."/> <menu_item_call label="Sair" name="Quit"/> </menu> - <menu label="Editar" name="Edit"> - <menu_item_call label="Preferências..." name="Preferences..."/> - </menu> <menu label="Ajuda" name="Help"> <menu_item_call label="Ajuda do [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Sobre o [APP_NAME]..." name="About Second Life..."/> + </menu> + <menu label="Depurar" name="Debug"> + <menu label="Editar" name="Edit"> + <menu_item_call label="Desfazer" name="Undo"/> + <menu_item_call label="Repetir" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Excluir" name="Delete"/> + <menu_item_call label="Replicar" name="Duplicate"/> + <menu_item_call label="Selecionar tudo" name="Select All"/> + <menu_item_call label="Desfazer seleção" name="Deselect"/> + </menu> + <menu_item_call label="Mostrar configurações" name="Debug Settings"/> + <menu_item_call label="Configurações da interface e cor" name="UI/Color Settings"/> + <menu label="Testes de UI" name="UI Tests"/> + <menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/> + <menu_item_call label="Mostrar TOS" name="TOS"/> + <menu_item_call label="Mostrar mensagem crÃtica" name="Critical"/> + <menu_item_call label="Teste de navegador web" name="Web Browser Test"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml index 1293f4e17f..f7b86b8f22 100644 --- a/indra/newview/skins/default/xui/pt/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_mini_map.xml @@ -3,6 +3,7 @@ <menu_item_call label="Zoom Perto" name="Zoom Close"/> <menu_item_call label="Zoom Médio" name="Zoom Medium"/> <menu_item_call label="Zoom Longe" name="Zoom Far"/> + <menu_item_check label="Girar mapa" name="Rotate Map"/> <menu_item_call label="Parar Acompanhamento" name="Stop Tracking"/> - <menu_item_call label="Perfil..." name="Profile"/> + <menu_item_call label="Mapa-múndi" name="World Map"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml new file mode 100644 index 0000000000..57c1471de3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_navbar.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Navbar Menu"> + <menu_item_check label="Mostrar coordenadas" name="Show Coordinates"/> + <menu_item_check label="Mostrar as propriedades do terreno" name="Show Parcel Properties"/> + <menu_item_call label="Marco" name="Landmark"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Excluir" name="Delete"/> + <menu_item_call label="Selecionar tudo" name="Select All"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml new file mode 100644 index 0000000000..f1ea83c837 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="NearBy Chat Menu"> + <menu_item_call label="Mostrar quem está aqui..." name="nearby_people"/> + <menu_item_check label="Mostrar texto bloqueado" name="muted_text"/> + <menu_item_check label="Mostrar Ãcones de amigos" name="show_buddy_icons"/> + <menu_item_check label="Mostrar nomes" name="show_names"/> + <menu_item_check label="Mostrar Ãcones e nomes" name="show_icons_and_names"/> + <menu_item_call label="Tamanho da fonte" name="font_size"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml new file mode 100644 index 0000000000..43ad4134ec --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Notification Well Button Context Menu"> + <menu_item_call label="Fechar tudo" name="Close All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml new file mode 100644 index 0000000000..5121c9d048 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_object.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Object Pie"> + <menu_item_call label="Tocar" name="Object Touch"/> + <menu_item_call label="Editar" name="Edit..."/> + <menu_item_call label="Construir" name="Build"/> + <menu_item_call label="Abrir" name="Open"/> + <menu_item_call label="Sentar aqui" name="Object Sit"/> + <menu_item_call label="Perfil do objeto" name="Object Inspect"/> + <menu_item_call label="Mais zoom" name="Zoom In"/> + <context_menu label="Colocar no(a)" name="Put On"> + <menu_item_call label="Vestir" name="Wear"/> + <context_menu label="Anexar >" name="Object Attach"/> + <context_menu label="Anexar o HUD >" name="Object Attach HUD"/> + </context_menu> + <context_menu label="Tirar >" name="Remove"> + <menu_item_call label="Denunciar abuso" name="Report Abuse..."/> + <menu_item_call label="Bloquear" name="Object Mute"/> + <menu_item_call label="Devolver" name="Return..."/> + <menu_item_call label="Excluir" name="Delete"/> + </context_menu> + <menu_item_call label="Comprar" name="Pie Object Bye"/> + <menu_item_call label="Pegar" name="Pie Object Take"/> + <menu_item_call label="Pegar uma cópia" name="Take Copy"/> + <menu_item_call label="Pagar" name="Pay..."/> + <menu_item_call label="Comprar" name="Buy..."/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml new file mode 100644 index 0000000000..7af760a6ee --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Object Icon Menu"> + <menu_item_call label="Perfil do objeto..." name="Object Profile"/> + <menu_item_call label="Bloquear..." name="Block"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml new file mode 100644 index 0000000000..849dec3108 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Participant List Context Menu"> + <menu_item_check label="Ordenar por nome" name="SortByName"/> + <menu_item_check label="Ordenar por conversas mais recentes" name="SortByRecentSpeakers"/> + <menu_item_call label="Ver perfil" name="View Profile"/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Compartilhar" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Bloquear voz" name="Block/Unblock"/> + <menu_item_check label="Bloquear texto" name="MuteText"/> + <context_menu label="Opções do moderador >" name="Moderator Options"> + <menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/> + <menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/> + <menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/> + <menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/> + <menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/> + </context_menu> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml new file mode 100644 index 0000000000..25a37488d7 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Ordenar por nome" name="sort_name"/> + <menu_item_check label="Ordenar por status" name="sort_status"/> + <menu_item_check label="Ver Ãcones de pessoas" name="view_icons"/> + <menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml new file mode 100644 index 0000000000..9a924ad7b9 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_call label="Ver dados" name="View Info"/> + <menu_item_call label="Bate-papo" name="Chat"/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Ativar" name="Activate"/> + <menu_item_call label="Sair" name="Leave"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml new file mode 100644 index 0000000000..86a9d2263f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Mostrar Ãcones de grupos" name="Display Group Icons"/> + <menu_item_call label="Sair do grupo selecionado" name="Leave Selected Group"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml new file mode 100644 index 0000000000..7c720f262b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Avatar Context Menu"> + <menu_item_call label="Ver perfil" name="View Profile"/> + <menu_item_call label="Adicionar amigo..." name="Add Friend"/> + <menu_item_call label="Remover amigo..." name="Remove Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Mapa" name="Map"/> + <menu_item_call label="Compartilhar" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> + <menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/> + <menu_item_call label="Teletransportar?" name="teleport"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml new file mode 100644 index 0000000000..fc08b3accb --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Multi-Selected People Context Menu"> + <menu_item_call label="Adicionar amigo..." name="Add Friends"/> + <menu_item_call label="Remover amigo..." name="Remove Friend"/> + <menu_item_call label="MI" name="IM"/> + <menu_item_call label="Ligar" name="Call"/> + <menu_item_call label="Compartilhar" name="Share"/> + <menu_item_call label="Pagar" name="Pay"/> +</context_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 new file mode 100644 index 0000000000..228ce46a31 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<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_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml new file mode 100644 index 0000000000..f3b89e01cd --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_group_plus"> + <menu_item_check label="Ordenar por mais recente" name="sort_most"/> + <menu_item_check label="Ordenar por nome" name="sort_name"/> + <menu_item_check label="Ver Ãcones de pessoas" name="view_icons"/> + <menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml new file mode 100644 index 0000000000..8b9e10fc02 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_picks.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Picks"> + <menu_item_call label="Info" name="pick_info"/> + <menu_item_call label="Editar" name="pick_edit"/> + <menu_item_call label="Teletransportar" name="pick_teleport"/> + <menu_item_call label="Mapa" name="pick_map"/> + <menu_item_call label="Excluir" name="pick_delete"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml new file mode 100644 index 0000000000..95a7c05262 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="picks_plus_menu"> + <menu_item_call label="Adicionar" name="create_pick"/> + <menu_item_call label="Novo anúncio" name="create_classified"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml new file mode 100644 index 0000000000..282ea20a7a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_place.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="place_overflow_menu"> + <menu_item_call label="Criar marco" name="landmark"/> + <menu_item_call label="Criar destaque" name="pick"/> + <menu_item_call label="Comprar passe" name="pass"/> + <menu_item_call label="Editar" name="edit"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml new file mode 100644 index 0000000000..d099d04f8d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_folder_gear"> + <menu_item_call label="Adicionar pasta" name="add_folder"/> + <menu_item_call label="Adicionar marco" name="add_landmark"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml new file mode 100644 index 0000000000..2059a9ed2d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_folder_gear"> + <menu_item_call label="Adicionar marco" name="add_landmark"/> + <menu_item_call label="Adicionar pasta" name="add_folder"/> + <menu_item_call label="Cortar" name="cut"/> + <menu_item_call label="Copiar" name="copy_folder"/> + <menu_item_call label="Colar" name="paste"/> + <menu_item_call label="Renomear" name="rename"/> + <menu_item_call label="Excluir" name="delete"/> + <menu_item_call label="Expanda" name="expand"/> + <menu_item_call label="Recolher" name="collapse"/> + <menu_item_call label="Expandir todas as pastas" name="expand_all"/> + <menu_item_call label="Recolher todas as pastas" name="collapse_all"/> + <menu_item_check label="Ordenar por data" name="sort_by_date"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..52a9d13735 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_ladmark_gear"> + <menu_item_call label="Teletransportar" name="teleport"/> + <menu_item_call label="Mais informações" name="more_info"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Adicionar marco" name="add_landmark"/> + <menu_item_call label="Adicionar pasta" name="add_folder"/> + <menu_item_call label="Cortar" name="cut"/> + <menu_item_call label="Copiar marco" name="copy_landmark"/> + <menu_item_call label="Copiar SLurl" name="copy_slurl"/> + <menu_item_call label="Colar" name="paste"/> + <menu_item_call label="Renomear" name="rename"/> + <menu_item_call label="Excluir" name="delete"/> + <menu_item_call label="Expandir todas as pastas" name="expand_all"/> + <menu_item_call label="Recolher todas as pastas" name="collapse_all"/> + <menu_item_check label="Ordenar por data" name="sort_by_date"/> + <menu_item_call label="Criar destaque" name="create_pick"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml new file mode 100644 index 0000000000..2635182290 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<toggleable_menu name="profile_overflow_menu"> + <menu_item_call label="Pagar" name="pay"/> + <menu_item_call label="Compartilhar" name="share"/> + <menu_item_call label="Bloquear" name="block"/> + <menu_item_call label="Desbloquear" name="unblock"/> + <menu_item_call label="Chutar" name="kick"/> + <menu_item_call label="Congelar" name="freeze"/> + <menu_item_call label="Descongelar" name="unfreeze"/> + <menu_item_call label="CSR" name="csr"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml index 67a4b51b61..6d4c84fc3c 100644 --- a/indra/newview/skins/default/xui/pt/menu_slurl.xml +++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml @@ -2,5 +2,5 @@ <menu name="Popup"> <menu_item_call label="Sobre a URL" name="about_url"/> <menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/> - <menu_item_call label="Mostrar no Mapa" name="show_on_map"/> + <menu_item_call label="Mapa" name="show_on_map"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml new file mode 100644 index 0000000000..f034509be8 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="Teleport History Gear Context Menu"> + <menu_item_call label="Expandir todas as pastas" name="Expand all folders"/> + <menu_item_call label="Recolher todas as pastas" name="Collapse all folders"/> + <menu_item_call label="Limpar histórico de teletransporte" name="Clear Teleport History"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml new file mode 100644 index 0000000000..b4216b7ddc --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Teleport History Item Context Menu"> + <menu_item_call label="Teletransportar" name="Teleport"/> + <menu_item_call label="Mais informações" name="More Information"/> + <menu_item_call label="Copiar para área de transferência" name="CopyToClipboard"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml new file mode 100644 index 0000000000..6a633cf74c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Teleport History Item Context Menu"> + <menu_item_call label="Abrir" name="TabOpen"/> + <menu_item_call label="Fechar" name="TabClose"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml new file mode 100644 index 0000000000..31c284c6ed --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_text_editor.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Text editor context menu"> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Excluir" name="Delete"/> + <menu_item_call label="Selecionar tudo" name="Select All"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml new file mode 100644 index 0000000000..ba5e055124 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar perfil de residente" name="show_agent"/> + <menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml new file mode 100644 index 0000000000..5b67a69c9a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_group.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar informações do grupo" name="show_group"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy_label"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml new file mode 100644 index 0000000000..e53a2572b8 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_http.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Abrir página da web" name="url_open"/> + <menu_item_call label="Abrir no navegador do SL" name="url_open_internal"/> + <menu_item_call label="Abrir no navegador externo" name="url_open_external"/> + <menu_item_call label="Copiar URL para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml new file mode 100644 index 0000000000..45c14355d0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar item de inventário" name="show_item"/> + <menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml new file mode 100644 index 0000000000..ba114cccaa --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_map.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Teletransportar para este lugar" name="teleport_to_location"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml new file mode 100644 index 0000000000..c197444181 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/> + <menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml new file mode 100644 index 0000000000..6cc668bfd3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar informações sobre este lote" name="show_parcel"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml new file mode 100644 index 0000000000..d0784149ac --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Executar este comando" name="run_slapp"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml new file mode 100644 index 0000000000..7216ccf0b3 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Mostrar informações sobre este lugar" name="show_place"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Teletransportar para este lugar" name="teleport_to_location"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml new file mode 100644 index 0000000000..f007425646 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<context_menu name="Url Popup"> + <menu_item_call label="Teletransportar para este lugar" name="teleport"/> + <menu_item_call label="Mostrar no mapa" name="show_on_map"/> + <menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/> +</context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 2c887fa50c..2b83386cad 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -1,217 +1,322 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu_bar name="Main Menu"> - <menu name="Me"> + <menu label="Eu" name="Me"> <menu_item_call label="Preferências" name="Preferences"/> - <menu_item_call name="Manage My Account"> - <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt" /> + <menu_item_call label="Meu painel" name="Manage My Account"> + <menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/> </menu_item_call> + <menu_item_call label="Comprar L$" name="Buy and Sell L$"/> + <menu_item_call label="Meu perfil" name="Profile"/> + <menu_item_call label="Minha aparência" name="Appearance"/> + <menu_item_check label="Meu inventário" name="Inventory"/> + <menu_item_check label="Meu inventário" name="ShowSidetrayInventory"/> + <menu_item_check label="Meus gestos" name="Gestures"/> + <menu label="Meu status" name="Status"> + <menu_item_call label="Ausente" name="Set Away"/> + <menu_item_call label="Ocupado" name="Set Busy"/> + </menu> + <menu_item_call label="Request Admin Status" name="Request Admin Options"/> + <menu_item_call label="Sair do modo admin" name="Leave Admin Options"/> + <menu_item_call label="Sair do [APP_NAME]" name="Quit"/> </menu> - <menu label="Arquivo" name="File"> - <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/> - <menu label="Upload" name="upload"> - <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> - <menu_item_call label="Som (L$[COST])..." name="Upload Sound"/> - <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> - <menu_item_call label="Bulk (L$[COST] por arquivo)..." name="Bulk Upload"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Definir Permissões Padrão..." name="perm prefs"/> - </menu> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Fechar janela" name="Close Window"/> - <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Salvar textura como..." name="Save Texture As..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Tirar Foto" name="Take Snapshot"/> - <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Sair" name="Quit"/> - </menu> - <menu label="Editar" name="Edit"> - <menu_item_call label="Voltar" name="Undo"/> - <menu_item_call label="Avançar" name="Redo"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Cortar" name="Cut"/> - <menu_item_call label="Copiar" name="Copy"/> - <menu_item_call label="Colar" name="Paste"/> - <menu_item_call label="Apagar" name="Delete"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Procurar..." name="Search..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Selecionar todos" name="Select All"/> - <menu_item_call label="Retirar seleção" name="Deselect"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Duplicar" name="Duplicate"/> - <menu_item_separator label="-----------" name="separator5"/> - <menu label="Anexar objeto" name="Attach Object"/> - <menu label="Desanexar objeto" name="Detach Object"/> - <menu label="Tirar a roupa" name="Take Off Clothing"> - <menu_item_call label="Camiseta" name="Shirt"/> - <menu_item_call label="Calças" name="Pants"/> - <menu_item_call label="Sapatos" name="Shoes"/> - <menu_item_call label="Meias" name="Socks"/> - <menu_item_call label="Blusa" name="Jacket"/> - <menu_item_call label="Luvas" name="Gloves"/> - <menu_item_call label="Anágua" name="Menu Undershirt"/> - <menu_item_call label="Roupa de baixo" name="Menu Underpants"/> - <menu_item_call label="saia" name="Skirt"/> - <menu_item_call label="Toda a roupa" name="All Clothes"/> - </menu> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Gestos..." name="Gestures..."/> - <menu_item_call label="Perfil..." name="Profile..."/> - <menu_item_call label="Aparência..." name="Appearance..."/> - <menu_item_separator label="-----------" name="separator7"/> - <menu_item_check label="Amigos..." name="Friends..."/> - <menu_item_call label="Grupos..." name="Groups..."/> - <menu_item_separator label="-----------" name="separator8"/> - <menu_item_call label="Preferências..." name="Preferences..."/> - </menu> - <menu label="Exibir" name="View"> - <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/> - <menu_item_call label="Visão do mouse" name="Mouselook"/> - <menu_item_check label="Construir" name="Build"/> - <menu_item_check label="Câmera voadora pelo joystick" name="Joystick Flycam"/> - <menu_item_call label="Resetar visão" name="Reset View"/> - <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Barra de ferramentas" name="Toolbar"/> - <menu_item_check label="Conversa local" name="Chat History"/> - <menu_item_check label="Comunicar" name="Instant Message"/> - <menu_item_check label="Inventário" name="Inventory"/> - <menu_item_check label="Falantes Ativos" name="Active Speakers"/> - <menu_item_check label="Lista de residentes e objetos silenciados" name="Mute List"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_check label="Controles de câmera" name="Camera Controls"/> - <menu_item_check label="Controles de movimento" name="Movement Controls"/> - <menu_item_check label="Mapa do mundo" name="World Map"/> - <menu_item_check label="Mini-Mapa" name="Mini-Map"/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/> - <menu_item_check label="Linhas de propriedades" name="Property Lines"/> - <menu_item_check label="Linhas de banimento" name="Banlines"/> - <menu_item_check label="Donos de terrenos" name="Land Owners"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu label="Dicas" name="Hover Tips"> - <menu_item_check label="Mostrar dicas" name="Show Tips"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Dicas de terreno" name="Land Tips"/> - <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/> - </menu> - <menu_item_check label="Luz para transparência" name="Highlight Transparent"/> - <menu_item_check label="Balizas" name="beacons"/> - <menu_item_check label="Esconder partÃculas" name="Hide Particles"/> - <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/> - <menu_item_separator label="-----------" name="separator5"/> - <menu_item_call label="Mais zoom" name="Zoom In"/> - <menu_item_call label="Zoom padrão" name="Zoom Default"/> - <menu_item_call label="Menos zoom" name="Zoom Out"/> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Tela cheia" name="Toggle Fullscreen"/> - <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/> + <menu label="Comunicar" name="Communicate"> + <menu_item_call label="Meus amigos" name="My Friends"/> + <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> <menu label="Mundo" name="World"> - <menu_item_call label="Conversa" name="Chat"/> - <menu_item_check label="Sempre Correr" name="Always Run"/> - <menu_item_check label="Voar" name="Fly"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/> - <menu_item_call label="Marcar como casa" name="Set Home to Here"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Teletransportar para casa" name="Teleport Home"/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Deixar ausente" name="Set Away"/> - <menu_item_call label="Deixar Ocupado" name="Set Busy"/> - <menu_item_call label="Parar Animação do Meu Avatar" name="Stop Animating My Avatar"/> - <menu_item_call label="Liberar teclas" name="Release Keys"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Histórico de conta..." name="Account History..."> - <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=pt"/> - </menu_item_call> - <menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."> - <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=pt"/> - </menu_item_call> - <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/> - <menu_item_separator label="-----------" name="separator5"/> - <menu_item_call label="Meu terreno..." name="My Land..."/> - <menu_item_call label="Sobre o terreno..." name="About Land..."/> - <menu_item_call label="Comprar terreno..." name="Buy Land..."/> - <menu_item_call label="Região/Propriedade..." name="Region/Estate..."/> - <menu_item_separator label="-----------" name="separator6"/> - <menu label="Configurações de ambiente" name="Environment Settings"> + <menu_item_check label="Mini Mapa" name="Mini-Map"/> + <menu_item_check label="Mapa-múndi" name="World Map"/> + <menu_item_call label="Foto" name="Take Snapshot"/> + <menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/> + <menu label="Perfil da região" name="Land"> + <menu_item_call label="Sobre terrenos" name="About Land"/> + <menu_item_call label="Região/Propriedade" name="Region/Estate"/> + </menu> + <menu_item_call label="Comprar este terreno" name="Buy Land"/> + <menu_item_call label="Meus terrenos" name="My Land"/> + <menu label="Mostrar" name="LandShow"> + <menu_item_check label="Controles de movimento" name="Movement Controls"/> + <menu_item_check label="Ver controles" name="Camera Controls"/> + <menu_item_check label="Limites" name="Ban Lines"/> + <menu_item_check label="Balizas" name="beacons"/> + <menu_item_check label="Limites do imóvel" name="Property Lines"/> + <menu_item_check label="Proprietários" name="Land Owners"/> + <menu_item_check label="Coordenadas" name="Coordinates"/> + <menu_item_check label="Propriedades do lote" name="Parcel Properties"/> + </menu> + <menu_item_call label="Teletransportar para inÃcio" name="Teleport Home"/> + <menu_item_call label="Definir como casa" name="Set Home to Here"/> + <menu label="Sol" name="Environment Settings"> <menu_item_call label="Amanhecer" name="Sunrise"/> <menu_item_call label="Meio-dia" name="Noon"/> <menu_item_call label="Pôr-do-Sol" name="Sunset"/> <menu_item_call label="Meia-noite" name="Midnight"/> - <menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/> - <menu_item_separator label="-----------" name="separator"/> + <menu_item_call label="Horário da propriedade" name="Revert to Region Default"/> <menu_item_call label="Editor de ambiente" name="Environment Editor"/> </menu> </menu> - <menu label="Ferramentas" name="Tools"> - <menu label="Selecionar ferramenta" name="Select Tool"> - <menu_item_call label="Foco" name="Focus"/> - <menu_item_call label="Mover" name="Move"/> - <menu_item_call label="Editar" name="Edit"/> - <menu_item_call label="Criar" name="Create"/> - <menu_item_call label="Terreno" name="Land"/> - </menu> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/> - <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/> - <menu_item_check label="Selecionar objetos pela vizinhança" name="Select By Surrounding"/> - <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/> - <menu_item_check label="Mostrar luz radiante para seleção" name="Show Light Radius for Selection"/> - <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_check label="Alinhar à grade" name="Snap to Grid"/> - <menu_item_call label="Alinhar xy do objeto à grade" name="Snap Object XY to Grid"/> - <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/> - <menu_item_call label="Opções de grade..." name="Grid Options..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_check label="Editar partes unidas" name="Edit Linked Parts"/> - <menu_item_call label="Unir" name="Link"/> - <menu_item_call label="Desunir" name="Unlink"/> - <menu_item_separator label="-----------" name="separator4"/> - <menu_item_call label="Foco na seleção" name="Focus on Selection"/> - <menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/> - <menu_item_call label="Comprar el objeto" name="Menu Object Take"> - <on_enable userdata="Comprar,Pegar" name="EnableBuyOrTake"/> - </menu_item_call> - <menu_item_call label="Pegar cópia" name="Take Copy"/> - <menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/> - <menu_item_separator label="-----------" name="separator6"/> - <menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/> - <menu label="Recompilar os scripts na seleção" name="Recompile Scripts in Selection"> - <menu_item_call label="Mono" name="Mono"/> - <menu_item_call label="LSL" name="LSL"/> - </menu> - <menu_item_call label="Resetar scripts selecionados" name="Reset Scripts in Selection"/> - <menu_item_call label="Ajustar scripts para rodar na seleção" name="Set Scripts to Running in Selection"/> - <menu_item_call label="Ajustar scripts para não rodar na seleção" name="Set Scripts to Not Running in Selection"/> + <menu label="Construir" name="BuildTools"> + <menu_item_check label="Construir" name="Show Build Tools"/> + <menu label="Selecionar ferramenta de construção" name="Select Tool"> + <menu_item_call label="Ferramenta enfoque" name="Focus"/> + <menu_item_call label="Ferramenta de movimentação" name="Move"/> + <menu_item_call label="Ferramenta de edição" name="Edit"/> + <menu_item_call label="Ferramenta criar" name="Create"/> + <menu_item_call label="Ferramenta de terrenos" name="Land"/> + </menu> + <menu label="Editar" name="Edit"> + <menu_item_call label="Desfazer" name="Undo"/> + <menu_item_call label="Repetir" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Excluir" name="Delete"/> + <menu_item_call label="Replicar" name="Duplicate"/> + <menu_item_call label="Selecionar tudo" name="Select All"/> + <menu_item_call label="Desfazer seleção" name="Deselect"/> + </menu> + <menu_item_call label="Link" name="Link"/> + <menu_item_call label="Desconectar links" name="Unlink"/> + <menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/> + <menu_item_call label="Focus on Selection" name="Focus on Selection"/> + <menu_item_call label="Ampliar seleção" name="Zoom to Selection"/> + <menu label="Objeto:" name="Object"> + <menu_item_call label="Comprar" name="Menu Object Buy"/> + <menu_item_call label="Pegar" name="Menu Object Take"/> + <menu_item_call label="Pegar uma cópia" name="Take Copy"/> + <menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/> + <menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/> + </menu> + <menu label="Scripts" name="Scripts"> + <menu_item_call label="Recompilar scripts (LSL)" name="Mono"/> + <menu_item_call label="Recompilar scripts (LSL)" name="LSL"/> + <menu_item_call label="Reset Scripts" name="Reset Scripts"/> + <menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/> + <menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/> + </menu> + <menu label="Opções" name="Options"> + <menu_item_call label="Set Default Upload Permissions" name="perm prefs"/> + <menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/> + <menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/> + <menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/> + <menu_item_check label="Selecionar contornando" name="Select By Surrounding"/> + <menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/> + <menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/> + <menu_item_check label="Show Selection Beam" name="Show Selection Beam"/> + <menu_item_check label="Mostrar na grade" name="Snap to Grid"/> + <menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/> + <menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/> + <menu_item_call label="Opções de grade" name="Grid Options"/> + </menu> + <menu label="Selecionar partes conectadas" name="Select Linked Parts"> + <menu_item_call label="Select Next Part" name="Select Next Part"/> + <menu_item_call label="Select Previous Part" name="Select Previous Part"/> + <menu_item_call label="Include Next Part" name="Include Next Part"/> + <menu_item_call label="Include Previous Part" name="Include Previous Part"/> + </menu> </menu> <menu label="Ajuda" name="Help"> - <menu_item_call label="Ajuda [SECOND_LIFE]" name="Second Life Help"/> - <menu_item_call label="Tutorial" name="Tutorial"/> - <menu_item_separator label="-----------" name="separator"/> - <menu_item_call label="Blog oficial da Linden..." name="Official Linden Blog..."/> - <menu_item_separator label="-----------" name="separator2"/> - <menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/> - <menu_item_separator label="-----------" name="separator3"/> - <menu_item_call label="Reportar Abuso..." name="Report Abuse..."/> - <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp; Hits..."/> - <menu_item_call label="Medidor de Lag" name="Lag Meter"/> - <menu_item_separator label="-----------" name="separator7"/> - <menu label="Reportando Bug" name="Bug Reporting"> - <menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/> - <menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/> - <menu_item_separator label="-----------" name="separator7"/> - <menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/> - <menu_item_call label="Questões de Segurança..." name="Security Issues..."/> - <menu_item_call label="Wiki de QA ..." name="QA Wiki..."/> - <menu_item_separator label="-----------" name="separator9"/> - <menu_item_call label="Reportar Bug..." name="Report Bug..."/> - </menu> - <menu_item_call label="Sobre [APP_NAME]..." name="About Second Life..."/> + <menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/> + <menu_item_call label="Denunciar abuso" name="Report Abuse"/> + <menu_item_call label="Relatar bug" name="Report Bug"/> + </menu> + <menu label="Avançado" name="Advanced"> + <menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/> + <menu_item_call label="Recarregar texturas" name="Rebake Texture"/> + <menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/> + <menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/> + <menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/> + <menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/> + <menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/> + <menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/> + <menu_item_check label="Compactar fotos para HD" name="CompressSnapshotsToDisk"/> + <menu label="Ferramentas de desempenho" name="Performance Tools"> + <menu_item_call label="Lag Meter" name="Lag Meter"/> + <menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/> + <menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/> + </menu> + <menu label="Realces e visibilidade" name="Highlighting and Visibility"> + <menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/> + <menu_item_check label="Hide Particles" name="Hide Particles"/> + <menu_item_check label="Ocultar seleções" name="Hide Selected"/> + <menu_item_check label="Realçar transparentes" name="Highlight Transparent"/> + <menu_item_check label="Mostrar anexos HUD" name="Show HUD Attachments"/> + <menu_item_check label="Mostrar retÃculo na vista subjetiva" name="ShowCrosshairs"/> + <menu_item_check label="Mostrar dicas de terreno" name="Land Tips"/> + </menu> + <menu label="Tipos de renderização" name="Rendering Types"> + <menu_item_check label="Simples" name="Simple"/> + <menu_item_check label="Alpha" name="Alpha"/> + <menu_item_check label="Ãrvore" name="Tree"/> + <menu_item_check label="Avatares" name="Character"/> + <menu_item_check label="SurfacePath" name="SurfacePath"/> + <menu_item_check label="Céu" name="Sky"/> + <menu_item_check label="Ãgua" name="Water"/> + <menu_item_check label="Chão" name="Ground"/> + <menu_item_check label="Volume" name="Volume"/> + <menu_item_check label="Grama" name="Grass"/> + <menu_item_check label="Nuvens" name="Clouds"/> + <menu_item_check label="Particles" name="Particles"/> + <menu_item_check label="Elevação" name="Bump"/> + </menu> + <menu label="Recursos de renderização" name="Rendering Features"> + <menu_item_check label="Interface" name="UI"/> + <menu_item_check label="Selecionado" name="Selected"/> + <menu_item_check label="Realçado" name="Highlighted"/> + <menu_item_check label="Texturas dinâmicas" name="Dynamic Textures"/> + <menu_item_check label="Foot Shadows" name="Foot Shadows"/> + <menu_item_check label="Fog" name="Fog"/> + <menu_item_check label="Flexible Objects" name="Flexible Objects"/> + </menu> + <menu_item_check label="Executar diversas instâncias" name="Run Multiple Threads"/> + <menu_item_call label="Limpar cache de grupo" name="ClearGroupCache"/> + <menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/> + <menu label="Atalhos" name="Shortcuts"> + <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> + <menu_item_check label="Busca" name="Search"/> + <menu_item_call label="Soltar objeto" name="Release Keys"/> + <menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/> + <menu_item_check label="Correr sempre" name="Always Run"/> + <menu_item_check label="Voar" name="Fly"/> + <menu_item_call label="Fechar janela" name="Close Window"/> + <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/> + <menu_item_call label="Gravar fotos no HD" name="Snapshot to Disk"/> + <menu_item_call label="Visão subjetiva" name="Mouselook"/> + <menu_item_check label="Flycam Joystick" name="Joystick Flycam"/> + <menu_item_call label="Visão padrão" name="Reset View"/> + <menu_item_call label="Olhar para quem fala por último" name="Look at Last Chatter"/> + <menu label="Selecionar ferramenta de construção" name="Select Tool"> + <menu_item_call label="Ferramenta enfoque" name="Focus"/> + <menu_item_call label="Ferramenta de movimentação" name="Move"/> + <menu_item_call label="Ferramenta de edição" name="Edit"/> + <menu_item_call label="Ferramenta criar" name="Create"/> + <menu_item_call label="Ferramenta de terrenos" name="Land"/> + </menu> + <menu_item_call label="Mais zoom" name="Zoom In"/> + <menu_item_call label="Zoom padrão" name="Zoom Default"/> + <menu_item_call label="Menos zoom" name="Zoom Out"/> + <menu_item_call label="Alternar tela inteira" name="Toggle Fullscreen"/> + </menu> + <menu_item_call label="Mostrar configurações de depuração" name="Debug Settings"/> + <menu_item_check label="Show Develop Menu" name="Debug Mode"/> + </menu> + <menu label="Desenvolver" name="Develop"> + <menu label="Painéis" name="Consoles"> + <menu_item_check label="Painel de textura" name="Texture Console"/> + <menu_item_check label="Debug Console" name="Debug Console"/> + <menu_item_call label="Painel de avisos" name="Notifications"/> + <menu_item_check label="Painel de tamanho de textura" name="Texture Size"/> + <menu_item_check label="Painel de texturas" name="Texture Category"/> + <menu_item_check label="Tempos" name="Fast Timers"/> + <menu_item_check label="Memória" name="Memory"/> + <menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/> + <menu_item_check label="Câmera:" name="Camera"/> + <menu_item_check label="Vento" name="Wind"/> + <menu_item_check label="Crachá" name="Badge"/> + </menu> + <menu label="Show Info" name="Display Info"> + <menu_item_check label="Mostrar hora" name="Show Time"/> + <menu_item_check label="Show Render Info" name="Show Render Info"/> + <menu_item_check label="Mostrar cor sob o cursor" name="Show Color Under Cursor"/> + <menu_item_check label="Mostrar mudanças a objetos" name="Show Updates"/> + </menu> + <menu label="Force an Error" name="Force Errors"> + <menu_item_call label="Force Breakpoint" name="Force Breakpoint"/> + <menu_item_call label="Force LLError And Crash" name="Force LLError And Crash"/> + <menu_item_call label="Force Bad Memory Access" name="Force Bad Memory Access"/> + <menu_item_call label="Force an Infinite Loop" name="Force Infinite Loop"/> + <menu_item_call label="Force Driver Crash" name="Force Driver Carsh"/> + <menu_item_call label="Force Software Exception" name="Force Software Exception"/> + <menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"/> + <menu_item_call label="Simulate a Memory Leak" name="Memory Leaking Simulation"/> + </menu> + <menu label="Render Tests" name="Render Tests"> + <menu_item_check label="Camera Offset" name="Camera Offset"/> + <menu_item_check label="Taxa de quadros aleatória" name="Randomize Framerate"/> + <menu_item_check label="Frame Test" name="Frame Test"/> + </menu> + <menu label="Rendering" name="Rendering"> + <menu_item_check label="Axes" name="Axes"/> + <menu_item_check label="Contornos" name="Wireframe"/> + <menu_item_check label="Global Illumination" name="Global Illumination"/> + <menu_item_check label="Texturas de animação" name="Animation Textures"/> + <menu_item_check label="Desativar texturas" name="Disable Textures"/> + <menu_item_check label="Render Attached Lights" name="Render Attached Lights"/> + <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> + <menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/> + </menu> + <menu label="Network" name="Network"> + <menu_item_check label="Pausar avatar" name="AgentPause"/> + <menu_item_call label="Drop a Packet" name="Drop a Packet"/> + </menu> + <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/> + <menu label="Mundo" name="World"> + <menu_item_check label="Impor sobre sol regional" name="Sim Sun Override"/> + <menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/> + <menu_item_check label="Fixed Weather" name="Fixed Weather"/> + <menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/> + </menu> + <menu label="Interface" name="UI"> + <menu_item_call label="Teste de navegador web" name="Web Browser Test"/> + <menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/> + <menu_item_call label="Memory Stats" name="Memory Stats"/> + <menu_item_check label="Double-Click Auto-Pilot" name="Double-ClickAuto-Pilot"/> + <menu_item_check label="Debug Clicks" name="Debug Clicks"/> + <menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/> + </menu> + <menu label="XUI" name="XUI"> + <menu_item_call label="Recarregar cores" name="Reload Color Settings"/> + <menu_item_call label="Show Font Test" name="Show Font Test"/> + <menu_item_call label="Load from XML" name="Load from XML"/> + <menu_item_call label="Salvar para XML" name="Save to XML"/> + <menu_item_check label="Mostrar nomes XUI" name="Show XUI Names"/> + <menu_item_call label="Enviar MIs de teste" name="Send Test IMs"/> + </menu> + <menu label="Avatar" name="Character"> + <menu label="Grab Baked Texture" name="Grab Baked Texture"> + <menu_item_call label="Ãris" name="Iris"/> + <menu_item_call label="Cabeça" name="Head"/> + <menu_item_call label="Cintura acima" name="Upper Body"/> + <menu_item_call label="Cintura para baixo" name="Lower Body"/> + <menu_item_call label="Saia" name="Skirt"/> + </menu> + <menu label="Testes de personagem" name="Character Tests"> + <menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/> + <menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/> + </menu> + <menu_item_call label="Force Params to Default" name="Force Params to Default"/> + <menu_item_check label="Dados da animação" name="Animation Info"/> + <menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/> + <menu_item_check label="Disable Level Of Detail" name="Disable LOD"/> + <menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/> + <menu_item_check label="Display Agent Target" name="Display Agent Target"/> + <menu_item_call label="Depurar texturas do avatar" name="Debug Avatar Textures"/> + </menu> + <menu_item_check label="Texturas HTTP" name="HTTP Textures"/> + <menu_item_check label="Console Window on next Run" name="Console Window"/> + <menu_item_check label="Mostrar menu admin" name="View Admin Options"/> + <menu_item_call label="Request Admin Status" name="Request Admin Options"/> + <menu_item_call label="Sair do modo admin" name="Leave Admin Options"/> + </menu> + <menu label="Admin" name="Admin"> + <menu label="Object"> + <menu_item_call label="Pegar uma cópia" name="Take Copy"/> + <menu_item_call label="Force Owner To Me" name="Force Owner To Me"/> + <menu_item_call label="Force Owner Permissive" name="Force Owner Permissive"/> + <menu_item_call label="Excluir" name="Delete"/> + <menu_item_call label="Lock" name="Lock"/> + </menu> + <menu label="Lote" name="Parcel"> + <menu_item_call label="Force Owner To Me" name="Owner To Me"/> + <menu_item_call label="Conteúdo da Linden Lab" name="Set to Linden Content"/> + <menu_item_call label="Pedir terras públicas" name="Claim Public Land"/> + </menu> + <menu label="Região" name="Region"> + <menu_item_call label="Dump Temporary Asset Data" name="Dump Temp Asset Data"/> + <menu_item_call label="Save Region State" name="Save Region State"/> + </menu> + <menu_item_call label="God Tools" name="God Tools"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml new file mode 100644 index 0000000000..789843cbba --- /dev/null +++ b/indra/newview/skins/default/xui/pt/mime_types_linux.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Conteúdo web + </label> + <tooltip name="web_tooltip"> + Este lugar possui conteúdo na web + </tooltip> + <playtip name="web_playtip"> + Mostrar conteúdo na web + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Filme + </label> + <tooltip name="movie_tooltip"> + Aqui tem um vÃdeo para você assistir + </tooltip> + <playtip name="movie_playtip"> + Mostrar vÃdeo + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Imagem + </label> + <tooltip name="image_tooltip"> + Aqui tem uma imagem para você ver + </tooltip> + <playtip name="image_playtip"> + Mostrar imagem + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Ãudio + </label> + <tooltip name="audio_tooltip"> + Aqui tem um clipe de áudio para você ouvir + </tooltip> + <playtip name="audio_playtip"> + Tocar clipe + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Stream em tempo real + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - Nenhum - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - Nenhum - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Ãudio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + VÃdeo + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Imagem + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + VÃdeo (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Ãudio/VÃdeo + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Arquivo PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Arquivo Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Rich Text (RTF) + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Synchronized Multimedia Integration Language (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Página web (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Ãudio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Ãudio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Ãudio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Ãudio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Imagem (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Imagem (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Imagem (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Imagem (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Imagem (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Imagem (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Página web + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Texto + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + VÃdeo (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + VÃdeo (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + VÃdeo (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + VÃdeo (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + VÃdeo (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + VÃdeo (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml new file mode 100644 index 0000000000..34b40e94ab --- /dev/null +++ b/indra/newview/skins/default/xui/pt/mime_types_mac.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mimetypes name="default"> + <widgetset name="web"> + <label name="web_label"> + Conteúdo Web + </label> + <tooltip name="web_tooltip"> + Esta localização tem conteúdo Web + </tooltip> + <playtip name="web_playtip"> + Exibir conteúdo Web + </playtip> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Filme + </label> + <tooltip name="movie_tooltip"> + Há um filme que vai passar aqui + </tooltip> + <playtip name="movie_playtip"> + Começar filme + </playtip> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Imagem + </label> + <tooltip name="image_tooltip"> + Ha uma imagem nesta localização + </tooltip> + <playtip name="image_playtip"> + Visualizar a imagem desta localização + </playtip> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <tooltip name="audio_tooltip"> + Há áudio nesta localização + </tooltip> + <playtip name="audio_playtip"> + Tocar o áudio desta localização + </playtip> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Real Time Streaming + </label> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - Nenhum - + </label> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - Nenhum - + </label> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Ãudio + </label> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + VÃdeo + </label> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Imagem + </label> + </mimetype> + <mimetype name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + Filme (QuickTime) + </label> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Ãudio/Video + </label> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + Documento PDF + </label> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Documento Postscript + </label> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Rich Text (RTF) + </label> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Linguagem sincronizada de integração multimidia (SMIL) + </label> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Página Web (XHTML) + </label> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Ãudio (MIDI) + </label> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Ãudio (MP3) + </label> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Ãudio (AIFF) + </label> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Ãudio (WAV) + </label> + </mimetype> + <mimetype name="image/bmp"> + <label name="image/bmp_label"> + Imagem (BMP) + </label> + </mimetype> + <mimetype name="image/gif"> + <label name="image/gif_label"> + Imagem (GIF) + </label> + </mimetype> + <mimetype name="image/jpeg"> + <label name="image/jpeg_label"> + Imagem (JPEG) + </label> + </mimetype> + <mimetype name="image/png"> + <label name="image/png_label"> + Imagem (PNG) + </label> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Imagem (SVG) + </label> + </mimetype> + <mimetype name="image/tiff"> + <label name="image/tiff_label"> + Imagem (TIFF) + </label> + </mimetype> + <mimetype name="text/html"> + <label name="text/html_label"> + Página Web + </label> + </mimetype> + <mimetype name="text/plain"> + <label name="text/plain_label"> + Texto + </label> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + </mimetype> + <mimetype name="video/mpeg"> + <label name="video/mpeg_label"> + Filme (MPEG) + </label> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + Filme (MP4) + </label> + </mimetype> + <mimetype name="video/quicktime"> + <label name="video/quicktime_label"> + Filme (QuickTime) + </label> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + Filme (Windows Media ASF) + </label> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + Filme (Windows Media WMV) + </label> + </mimetype> + <mimetype name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + Filme (AVI) + </label> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index c3ce53861f..60113bcf0b 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -9,74 +9,45 @@ <global name="implicitclosebutton"> Fechar </global> - <template name="okbutton"> - <form> - <button - name="OK" - text="$yestext"/> - </form> - </template> - - <template name="okignore"> - <form> - <button - name="OK" - text="$yestext"/> - <ignore text="$ignoretext"/> - </form> - </template> - - <template name="okcancelbuttons"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Cancel" - text="$notext"/> - </form> - </template> - - <template name="okcancelignore"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Cancel" - text="$notext"/> - <ignore text="$ignoretext"/> - </form> - </template> - - <template name="okhelpbuttons"> - <form> - <button - name="OK" - text="$yestext"/> - <button - name="Help" - text="$helptext"/> - </form> - </template> - - <template name="yesnocancelbuttons"> - <form> - <button - name="Yes" - text="$yestext"/> - <button - name="No" - text="$notext"/> - <button - name="Cancel" - text="$canceltext"/> - </form> - </template> - <notification functor="GenericAcknowledge" label="Mensagem de Alerta Desconhecida" name="MissingAlert"> - Sua versão do [APP_NAME] não sabe como mostrar a mensagem de alerta que acabou de receber. - -Detalhes do erro: O alerta chamado '[_NAME]' não foi encontrado em notifications.xml. + <template name="okbutton"> + <form> + <button name="OK_okbutton" text="$yestext"/> + </form> + </template> + <template name="okignore"> + <form> + <button name="OK_okignore" text="$yestext"/> + </form> + </template> + <template name="okcancelbuttons"> + <form> + <button name="OK_okcancelbuttons" text="$yestext"/> + <button name="Cancel_okcancelbuttons" text="$notext"/> + </form> + </template> + <template name="okcancelignore"> + <form> + <button name="OK_okcancelignore" text="$yestext"/> + <button name="Cancel_okcancelignore" text="$notext"/> + </form> + </template> + <template name="okhelpbuttons"> + <form> + <button name="OK_okhelpbuttons" text="$yestext"/> + <button name="Help" text="$helptext"/> + </form> + </template> + <template name="yesnocancelbuttons"> + <form> + <button name="Yes" text="$yestext"/> + <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> + </form> + </template> + <notification functor="GenericAcknowledge" label="Notificação desconhecida" name="MissingAlert"> + Esta versão do [APP_NAME] não consegue exibir o aviso recebido. Verifique se você possui a versão mais recente do Visualizador. + +Detalhes do erro: O aviso '[_NAME]' não foi localizado no arquivo notifications.xml. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FloaterNotFound"> @@ -96,24 +67,18 @@ Detalhes do erro: O alerta chamado '[_NAME]' não foi encontrado em no <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/> </notification> <notification name="BadInstallation"> - Ocorreu um erro atualizando o [APP_NAME]. Por favor, faça o download da última versão em secondlife.com. - <usetemplate - name="okbutton" - yestext="OK"/> + Um erro ocorreu ao atualizar o [APP_NAME]. [http://get.secondlife.com Baixe a versão atual] do Visualizador. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LoginFailedNoNetwork"> - Erro de Rede: Não conseguiu estabelecer uma conexão. + Falha de conexão com o [SECOND_LIFE_GRID]. '[DIAGNOSTIC]' -Por favor, verifique sua conexão de rede. - <usetemplate - name="okbutton" - yestext="OK"/> +Verifique se a conexão à internet está funcionando. + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MessageTemplateNotFound"> Modelo de Mensagem [PATH] não encontrado. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="WearableSave"> Salvar modificações? @@ -139,15 +104,18 @@ Por favor, selecione apenas um objeto e tente novamente. Salvar todas as mudanças de roupas/ partes do corpo? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar tudo"/> </notification> + <notification name="FriendsAndGroupsOnly"> + Residentes que não são amigos não veem que você decidiu ignorar ligações e MIs deles. + <usetemplate name="okbutton" yestext="Sim"/> + </notification> <notification name="GrantModifyRights"> - Conceder direitos de modificar a outros residentes lhes permite trocar, deletar ou pegar QUAISQUER objetos que você possa ter no mundo. -Seja MUITO cuidadoso(a) quando passar esta permissão. -Você deseja conceder direitos de modificar para [FIRST_NAME] [LAST_NAME]? + Conceder direitos de modificação a outros residentes vai autorizá-los a mudar, apagar ou pegar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização. +Deseja modificar os direitos de modificação de [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="GrantModifyRightsMultiple"> - Conceder direitos para modificar seus objetos a outro residente permite ele mudar QUAISQUER objetos que você possa ter no mundo. Tenha muito cuidado quando conceder essa permissão. -Você deseja permitir que os residentes selecionados tenham direito de edição? + Conceder direitos de modificação a outros residentes vai autorizá-los a mudar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização. +Deseja conceder direitos de modificação para os residentes selecionados? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="RevokeModifyRights"> @@ -177,7 +145,7 @@ Você deseja permitir que os residentes selecionados tenham direito de edição? Membros não podem ser removidos dessa função. Os membros podem, eles próprios, recusar a função. Deseja continuar? - <usetemplate ignoretext="Quando adicionar membro ao grupo como dono" name="okcancelignore" notext="Não" yestext="Sim"/> + <usetemplate ignoretext="Confirmar antes de adicionar novo Proprietário do grupo" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="AssignDangerousActionWarning"> Você está prestes a adicionar a habilidade '[ACTION_NAME]' para a função '[ROLE_NAME]' @@ -197,68 +165,31 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sà mesmo -- Adicionar esta habilidade a '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> - <notification name="ClickPublishHelpLand"> - Selecionando "Publicar na Busca" -Clicando neste Box, será mostrado: -- este lote nos resultados de busca -- os objetos públicos deste lote -- este lote na busca da web - </notification> - <notification name="ClickSoundHelpLand"> - MÃdia e Música podem apenas ser utilizadas dentro deste lote. As opções de Som e Voz podem ser restritas ao lote ou serão ouvidas por residentes fora do lote, dependendo de suas Classificações de maturidade. Ir para o Banco de Conhecimento para saber mais sobre como definir essas opções? - <url name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=5046 - </url> - <usetemplate - name="okcancelbuttons" - yestext="Ir para o Banco de Conhecimento" - notext="Fechar" /> - </notification> - <notification name="ClickSearchHelpAll"> - Os resultados de busca são organizados com base na aba em que você se encontra, sua Classificação de maturidade, a categoria escolhida e outros fatores. Para mais detalhes, por favor veja o Banco de Conhecimento. - <url name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4722 - </url> - <usetemplate - name="okcancelbuttons" - yestext="Ir para o Banco de Conhecimento" - notext="Fechar" /> - </notification> - <notification name="ClickPublishHelpLandDisabled"> - Você não pode fazer este lote visÃvel na busca porque ele está localizado numa região que proÃbe isso. - </notification> - <notification name="ClickPublishHelpAvatar"> - Selecionando "Mostrar na Busca" será mostrado: -- meu perfil nos resultados de busca -- um link para meu perfil nas páginas de grupos públicos - </notification> - <notification name="ClickPartnerHelpAvatar"> - Você pode propor a outro Residente ou dissolver uma parceria existente através do website [SECOND_LIFE]. - -Ir para o site do [SECOND_LIFE] para mais informações sobre parceria? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir para a Página"/> - </notification> - <notification name="ClickUploadHelpPermissions"> - Suas permissões padrão podem não funcionar em regiões antigas. - </notification> - <notification name="ClickWebProfileHelpAvatar"> - Se este Residente definiu uma URL de perfil na web, então você pode: - * Clicar em 'Carregar' para ver a página na aba Web. - * Clicar Carregar > 'Em navegador externo' para ver a página no seu navegador de web padrão. - * Clicar Carregar > 'URL de Casa' para voltar ao perfil do Residente na web se você navegou adiante. - -Quando você está vendo seu próprio perfil, você pode entrar com qualquer URL como sendo seu perfil na web e clicar OK para definÃ-la. -Outros residentes podem visitar a URL que você definiu, quando eles olharem seu perfil. + <notification name="AttachmentDrop"> + Você está prestes a largar seu anexo. + Tem certeza de que quer prosseguir? + <usetemplate ignoretext="Confirmar antes de largar anexos" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="JoinGroupCanAfford"> Unir-se a esse grupo custa L$[COST]. Deseja prosseguir? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unir-se"/> </notification> + <notification name="JoinGroupNoCost"> + Você está prestes a entrar no grupo [NAME]. +Deseja continuar? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/> + </notification> <notification name="JoinGroupCannotAfford"> Associar-se a este grupo custa L$[COST]. Você não tem L$ suficientes para associar-se a este grupo. </notification> + <notification name="CreateGroupCost"> + Criar este grupo custa L$100. +Grupos ser formados por mais de um membro, caso contrário serão definitivamente excluÃdos. +Convite outros membros dentro de 48 horas. + <usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Criar grupo por L$100"/> + </notification> <notification name="LandBuyPass"> Por L$[COST] você pode ingressar no terreno ('[PARCEL_NAME]') por [TIME] horas. Comprar um passe de acesso? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> @@ -273,10 +204,10 @@ Seu preço de venda será L$[SALE_PRICE] e está autorizado para venda para [NA <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Continuar"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> - ATENÇÃO: Ao clicar em 'vender para qualquer um' torna a sua terra disponÃvel para toda a comunidade [SECOND_LIFE], mesmo aqueles que não estão nesta região. + ATENÇÃO: Clicar em 'vender a qualquer um' torna o terreno disponÃvel para toda a comunidade do [SECOND_LIFE], inclusive residentes de outras regiões. -A área de [LAND_SIZE] m² de terra selecionada está posta para venda. -Seu preço de venda será L$ [SALE_PRICE] e está autorizado para [NAME]. +O terreno selecionado, de [LAND_SIZE] m², está sendo reservado para venda. +O preço será L$[SALE_PRICE] e [NAME] pode comprar o terreno. <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> @@ -335,6 +266,12 @@ Objetos: [N] Toda esta região possui dano habilitado. Scripts devem ser permitidos para fazer as armas funcionarem. </notification> + <notification name="MultipleFacesSelected"> + Diversas faces foram selecionadas. +Se você optar por prosseguir, diversas ocorrências a mÃdia serão colocadas nas diferentes faces do objeto. +Para colocar a mÃdia em só uma face, selecione Selecionar face e clique na face desejada do objeto. Depois clique em Adicionar. + <usetemplate ignoretext="A mÃdia será colocada nas diferentes faces selecionadas." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> <notification name="MustBeInParcel"> Você deve permanecer dentro do lote para definir o ponto de aterrissagem. </notification> @@ -369,6 +306,10 @@ Scripts devem ser permitidos para fazer as armas funcionarem. <notification name="CannotWearTrash"> Não é possÃvel usar roupas ou partes do corpo que estão no lixo. </notification> + <notification name="MaxAttachmentsOnOutfit"> + Não foi possÃvel anexar o objeto. +Ele ultrapassa o limite de anexos, de [MAX_ATTACHMENTS] objetos. Remova um objeto para poder anexar outro. + </notification> <notification name="CannotWearInfoNotComplete"> Você não pode vestir este item porque ele ainda não carregou. Por favor, tente novamente em um minuto. </notification> @@ -383,21 +324,30 @@ Você precisa de uma conta para entrar no [SECOND_LIFE]. Você gostaria de criar <usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Criar uma nova conta"/> </notification> <notification name="AddClassified"> - Anúncios classificados aparecem na seção 'Classificados' do diretório de Busca e no [http://secondlife.com/community/classifieds/?lang=pt-BR secondlife.com] por uma semana. -Preencha seu anúncio e então clique 'Publicar...' para adicioná-lo ao diretório. -Será solicitado a você um preço a ser pago, quando você clicar Publicar. -Pagando mais, faz com que seu anúncio apareça em posição mais alta na lista e também em posição mais alta, quando as pessoas buscarem por palavras-chave. - <usetemplate ignoretext="Quando adicionando um Classificado novo" name="okcancelignore" notext="Cancelar" yestext="OK"/> + Os anúncios serão publicados na seção 'Classificados' das buscas e em [http://secondlife.com/community/classifieds secondlife.com] durante uma semana. +Escreva seu anúncio e clique em 'Publicar...' +Depois, decida quanto deseja pagar pelo anúncio. +Quanto mais você pagar, mais alto será o posicionamento do seu anúncio nos classficados e nos resultados de busca das suas palavras-chave. + <usetemplate ignoretext="Como colocar um anúncio" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="DeleteClassified"> Apagar classificado'[NAME]'? Não há reembolso por taxas já pagas. <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Apagar"/> </notification> + <notification name="DeleteMedia"> + Você optor por excluir a mÃdia associada a esta face. +Tem certeza de que quer prosseguir? + <usetemplate ignoretext="Confirmar antes de apagar mÃdia de objetos" name="okcancelignore" notext="Não" yestext="Sim"/> + </notification> <notification name="ClassifiedSave"> Salvar as mudanças no classificado [NAME]? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar"/> </notification> + <notification name="ClassifiedInsufficientFunds"> + Fundos insuficientes para pagar o anúncio. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="DeleteAvatarPick"> Apagar pegar [PICK]? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Delete"/> @@ -415,26 +365,18 @@ Não há reembolso por taxas já pagas. <notification name="SelectHistoryItemToView"> Por favor, selecione um item do histórico para exibÃ-lo. </notification> - <notification name="ResetShowNextTimeDialogs"> - Você gostaria de reabilitar todas estas pop ups que você indicou previamente como 'Não me mostrar novamente'? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> - </notification> - <notification name="SkipShowNextTimeDialogs"> - Você gostaria de desabilitar todas as popups que podem ser puladas? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> - </notification> <notification name="CacheWillClear"> - O cache será limpo quando você reiniciar [APP_NAME]. + O cache será limpo quando o [APP_NAME] for iniciado. </notification> <notification name="CacheWillBeMoved"> - O Cache será removido após reiniciar [APP_NAME]. -Nota: Isto limpará o cache. + O cache será limpo quando o [APP_NAME] for iniciado. +Nota: Este procedimento limpa o cache. </notification> <notification name="ChangeConnectionPort"> - Configuração de porta terá efeito após reiniciar [APP_NAME]. + Reinicie o [APP_NAME] para ativar a reconfiguração da porta. </notification> <notification name="ChangeSkin"> - A nova pele será exibida após reiniciar [APP_NAME]. + Reinicie o [APP_NAME] para ativar a pele nova. </notification> <notification name="GoToAuctionPage"> Ir para a página do [SECOND_LIFE] para ver os detalhes do leilão ou fazer um lance? @@ -482,6 +424,11 @@ O objeto pode estar fora de alcance ou ter sido deletado. <notification name="SaveBytecodeFailReason"> Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON]. Por favor, tente salvar novamente o script mais tarde. </notification> + <notification name="StartRegionEmpty"> + Oops, você ainda não definiu sua região de partida. +Digite o nome da região na caixa 'Ponto de partida' ou selecione 'Última localização' ou 'Minha casa' como ponto de partida. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CouldNotStartStopScript"> Não foi possÃvel iniciar ou parar o script pois o objeto em que ele está não pôde ser encontrado. O objeto pode estar fora de alcance ou ter sido deletado. @@ -493,29 +440,28 @@ O objeto pode estar fora de alcance ou ter sido deletado. Não foi possÃvel escrever o arquivo [[FILE]] </notification> <notification name="UnsupportedHardware"> - Aviso: Seu sistema não é compatÃvel com os requisitos mÃnimos exigidos pelo [APP_NAME]. Se você continuar usando o [APP_NAME] pode experimentar uma performance ruim. Infelizmente não podemos oferecer suporte técnico para configurações de sistema não suportado. + Sabe de uma coisa? Seu computador não tem os requisitos mÃnimos do [APP_NAME]. Talvez o desempenho seja um pouco sofrÃvel. O suporte não pode atender pedidos de assistência técnicas em sistemas não suportados. MINSPECS -Você deseja visitar [_URL] para maiores informações? +Consultar [_URL] para mais informações? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=pt </url> - <usetemplate ignoretext="Ao detectar hardware não suportado" name="okcancelignore" notext="Não" yestext="Sim"/> + <usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="UnknownGPU"> - Seu sistema possui uma placa gráfica que nos é desconhecido neste momento. -Este é normalmente o caso de um novo hardware que nós não tivemos a chance de testar. [APP_NAME] vai muito provavelmente executar corretamente, mas talvez seja necessário ajustar suas configurações de gráficos para algo mais apropriado. -(Menu Editar > Preferências > Gráficos). + A placa de vÃdeo do seu sistema não é reconhecida pelo [APP_NAME]. +Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vÃdeo. +( Eu > Preferências > VÃdeo) <form name="form"> - <ignore name="ignore" text="Ao detectar uma placa de vÃdeo desconhecida"/> + <ignore name="ignore" text="Minha placa de vÃdeo não foi reconhecida."/> </form> </notification> <notification name="DisplaySettingsNoShaders"> - [APP_NAME] travou quando inicializava os drivers gráficos. -A Qualidade Gráfica será ajustada para baixa, para evitar alguns erros comuns de drivers. -Isto irá desabilitar alguns atributos gráficos. -Nós recomendamos a atualização dos drivers de sua placa gráfica. -A Qualidade Gráfica pode ser aumentada no Preferências > Gráficos. + O [APP_NAME] sofreu uma pane ao iniciar os drivers de vÃdeo. +A Qualidade do vÃdeo será definida como baixa para evitar os erros de driver mais comuns. Assim, alguns recursos de vÃdeo serão desativados. +Tente atualizar o driver da sua placa de vÃdeo. +Para aumentar a qualidade do vÃdeo, vá para Preferências > VÃdeo. </notification> <notification name="RegionNoTerraforming"> A região [REGION] não permite ser aplainada. @@ -566,6 +512,9 @@ Ele ou ela vai ficar temporariamente incapaz de se mover, usar o bate-papo ou in Ejetar [AVATAR_NAME] da sua terra? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ejetar"/> </notification> + <notification name="EjectAvatarFromGroup"> + Você ejetou [AVATAR_NAME] do grupo [GROUP_NAME] + </notification> <notification name="AcquireErrorTooManyObjects"> Erro de aquisição: Muitos objetos selecionados. </notification> @@ -576,7 +525,7 @@ Por favor, mova todos os objetos a serem adquiridos para uma mesma região. <notification name="PromptGoToCurrencyPage"> [EXTRA] -Vá para [_URL] para informação sobre compra de L$. +Para mais informações sobre como comprar L$, consulte [_URL]. <url name="url"> http://secondlife.com/app/currency/?lang=pt-BR </url> @@ -665,12 +614,19 @@ Esperada [VALIDS] Incapaz de criar arquivo de saÃda: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - Atualmente, não suportamos o envio de arquivos de animação em massa. + O [APP_NAME] ainda não faz o upload de vários arquivos de animação de uma vez. </notification> <notification name="CannotUploadReason"> Incapaz de carregar [FILE] devido ao seguinte motivo: [REASON] Por favor tente novamente mais tarde. </notification> + <notification name="LandmarkCreated"> + Você adicionou "[LANDMARK_NAME]" a sua pasta [FOLDER_NAME]. + </notification> + <notification name="LandmarkAlreadyExists"> + Você já tem um marco deste lugar. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="CannotCreateLandmarkNotOwner"> Você não pode criar um ponto de referência porque o proprietário do terreno não permite. Tente novamente a alguns metros de distância. </notification> @@ -693,6 +649,9 @@ Selecione objetos com scripts. Selecione objetos com scripts que você tem permissão para modificar. </notification> + <notification name="CannotOpenScriptObjectNoMod"> + ImpossÃvel abrir script em objeto sem ter autorização para modificar. + </notification> <notification name="CannotSetRunningSelectObjectsNoScripts"> Impossibilitado de definir quaisquer scripts para 'rodando'. @@ -715,49 +674,47 @@ Pesquisava por: [FINALQUERY] Os termos de sua pesquisa eram muito curtos então nenhuma pesquisa foi feita. </notification> <notification name="CouldNotTeleportReason"> - Não é possÃvel teletransportar-se. + O teletransporte falhou. [REASON] </notification> - - <notification name="invalid_tport"> -Problema encontrado ao processar seu pedido de Teletransporte. Você pode tentar reiniciar antes de tentar teletransportar-se. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em: -www.secondlife.com/support - </notification> - <notification name="invalid_region_handoff"> -Problema encontrado ao processar a passagem de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em: -www.secondlife.com/support - </notification> - <notification name="blocked_tport"> -Desculpe, teletransportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teletransporte, por favor tente deslogar e relogar para resolver o problema. - </notification> - <notification name="nolandmark_tport"> -Desculpe, mas o sistema não conseguiu localizar a landmark de destino. - </notification> - <notification name="timeout_tport"> -Desculpe, não foi possÃvel para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes. - </notification> - <notification name="noaccess_tport"> -Desculpe, você não tem acesso ao destino deste teletransporte. - </notification> - <notification name="missing_attach_tport"> -Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleransportar-se novamente. - </notification> - <notification name="too_many_uploads_tport"> -Afluxo nesta região é atualmente tão alto que seu pedido de teletransporte não será possÃvel em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada. - </notification> - <notification name="expired_tport"> -Desculpe, mas o sistema não conseguiu concluir o seu pedido de teletransporte em tempo hábil. Por favor, tente novamente em alguns minutos. - </notification> - <notification name="expired_region_handoff"> -Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos. - </notification> - <notification name="no_host"> -Não foi possÃvel encontrar o destino do teletransporte. O destino pode estar temporariamente indisponÃvel ou não existir mais. Por favor, tente novamente em poucos minutos. - </notification> - <notification name="no_inventory_host"> -O sistema de inventário está indisponÃvel no momento. - </notification> - + <notification name="invalid_tport"> + Houve um problema ao processar o teletransporte. Talvez seja preciso sair e entrar do Second Life para fazer o teletransporte. +Se você continuar a receber esta mensagem, consulte [SUPPORT_SITE]. + </notification> + <notification name="invalid_region_handoff"> + Problema encontrado ao processar a passagem de regiões. Talvez seja preciso sair e entrar do Second Life atravessar regiões novamente. +Se você continuar a receber esta mensagem, consulte [SUPPORT_SITE]. + </notification> + <notification name="blocked_tport"> + Desculpe, teletransportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teletransporte, por favor tente deslogar e relogar para resolver o problema. + </notification> + <notification name="nolandmark_tport"> + Desculpe, mas o sistema não conseguiu localizar a landmark de destino. + </notification> + <notification name="timeout_tport"> + Desculpe, não foi possÃvel para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes. + </notification> + <notification name="noaccess_tport"> + Desculpe, você não tem acesso ao destino deste teletransporte. + </notification> + <notification name="missing_attach_tport"> + Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleransportar-se novamente. + </notification> + <notification name="too_many_uploads_tport"> + Afluxo nesta região é atualmente tão alto que seu pedido de teletransporte não será possÃvel em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada. + </notification> + <notification name="expired_tport"> + Desculpe, mas o sistema não conseguiu concluir o seu pedido de teletransporte em tempo hábil. Por favor, tente novamente em alguns minutos. + </notification> + <notification name="expired_region_handoff"> + Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos. + </notification> + <notification name="no_host"> + Não foi possÃvel encontrar o destino do teletransporte. O destino pode estar temporariamente indisponÃvel ou não existir mais. Por favor, tente novamente em poucos minutos. + </notification> + <notification name="no_inventory_host"> + O sistema de inventário está indisponÃvel no momento. + </notification> <notification name="CannotSetLandOwnerNothingSelected"> Incapaz de estabelecer o proprietário do terreno: Nenhum lote selecionado. @@ -766,7 +723,8 @@ Nenhum lote selecionado. Não é possÃvel exigir a posse do terreno porque a seleção alcançou múltiplas regiões. Por favor, selecione uma área menor e tente novamente. </notification> <notification name="ForceOwnerAuctionWarning"> - Este lote está oferecido em leilão. Exigir a posse do terreno irá cancelar o leilão e possivelmente deixará alguns residentes infelizes, se os lances já começaram. Exigir posse? + Este lote vai a leilão. Forçar a mudança do dono cancela o leilão, podendo deixar residentes que já deram lances insatisfeitos. +Deseja forçar mudança de dono? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Retomar"/> </notification> <notification name="CannotContentifyNothingSelected"> @@ -794,7 +752,7 @@ Nenhum lote selecionado. Não é possÃvel achar a região em que este terreno se encontra. </notification> <notification name="CannotCloseFloaterBuyLand"> - Você não pode fechar a janela de Compra de Terreno até que o [APP_NAME] calcule o preço desta transação. + A janela Comprar terreno poderá ser fechada quando o [APP_NAME] determinar o preço da transação. </notification> <notification name="CannotDeedLandNothingSelected"> Não é possÃvel transferir posse do terreno: @@ -805,8 +763,8 @@ Nenhum lote selecionado. Nenhum grupo selecionado. </notification> <notification name="CannotDeedLandNoRegion"> - Não é possÃvel transferir posse do terreno: -Não é possÃvel se achar a região em que este terreno se encontra. + Houve um problema ao processar a doação do terreno: +A região do terreno não pôde ser localizada. </notification> <notification name="CannotDeedLandMultipleSelected"> Impossibilitado de passar a propriedade da terra: @@ -814,14 +772,6 @@ Selecionados vários lotes. Tente selecionar um único lote. </notification> - <notification name="ParcelCanPlayMedia"> - Esta localidade pode executar fluxo de mÃdia. -Fluxo de mÃdia necessita de uma conexão de Internet rápida. - -Executar fluxo de mÃdia quando disponÃvel? -(Você pode mudar esta opção mais tarde no Preferências > Ãudio & VÃdeo.) - <usetemplate name="okcancelbuttons" notext="Desabilitar" yestext="Exibir MÃdia"/> - </notification> <notification name="CannotDeedLandWaitingForServer"> Impossibilitado de passar a propriedade da terra: Esperando pelo servidor informar de quem é a propriedade. @@ -850,8 +800,8 @@ Você não tem permissão de liberar este lote. Os lotes que você possui estão em verde. </notification> <notification name="CannotReleaseLandRegionNotFound"> - Impossibilitado de abandonar a terra: -Não consegue achar a região em que esta terra se encontra. + Houve um problema ao processar o abandono do terreno: +A região do terreno não pôde ser localizada. </notification> <notification name="CannotReleaseLandNoTransfer"> Não é possÃvel abandonar terreno: @@ -888,12 +838,12 @@ Quer dividir o terreno? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Dividir"/> </notification> <notification name="CannotDivideLandNoRegion"> - Impossibilitado de dividir a terra: -Não consegue achar a região em que esta terra se encontra. + Houve um problema ao processar a divisão do terreno: +A região do terreno não pôde ser localizada. </notification> <notification name="CannotJoinLandNoRegion"> - Impossibilitado de unir a terra: -Não consegue achar a região em que esta terra se encontra. + Houve um problema ao processar a junção dos terrenos: +A região do terreno não pôde ser localizada. </notification> <notification name="CannotJoinLandNothingSelected"> Não é possÃvel unir terreno: @@ -918,17 +868,6 @@ Você vai ter que redefinir nome e as opções do novo lote. Unir a terra? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unir"/> </notification> - <notification name="ShowOwnersHelp"> - Mostrar donos: -Colorir os lotes para mostrar o tipo de dono. - -Green = Sua terra -Aqua = Terra do seu Grupo -Red = PossuÃda por outros -Yellow = À venda -Purple = A leilão -Grey = Pública - </notification> <notification name="ConfirmNotecardSave"> Esta nota precisa ser salva antes do item ser copiado ou visualizado. Salvar nota? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Salvar"/> @@ -950,13 +889,12 @@ Grey = Pública Não é possÃvel salvar '[NAME]' para um arquivo de vestimenta. Você precisa liberar algum espaço no seu computador e salvar o arquivo novamente. </notification> <notification name="CannotSaveToAssetStore"> - Impossibilitado de salvar [NAME] no armazenamento central de ativos. -Isso é geralmente uma falha temporária. Por favor personalize e salve novamente a vestimenta em poucos minutos. + Ocorreu um problema ao salvar [NAME]. +Em geral, essa é uma falha técnica temporária. Personalize e volte a salvar o item novamente dentro de alguns minutos. </notification> <notification name="YouHaveBeenLoggedOut"> - Você foi deslogado do [SECOND_LIFE]: + Ah não! O [SECOND_LIFE] teve de fechar. [MESSAGE] -Você ainda pode olhar o bate-papo e as mensagens instantâneas existentes, clicando em 'Exibir IM & bate-papo'. Caso contrário, clique em 'Sair' para sair do [APP_NAME] imediatamente. <usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM & bate-papo"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -1107,30 +1045,39 @@ Transferir propriedade destes [AREA] m² de terreno para o grupo '[GROUP_NA </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="AvatarMovedDesired"> + Esse destino não está disponÃvel no momento. +Você chegou a uma região próxima. </notification> - <notification name="AvatarMoved"> - Sua [TYPE] localização não está disponÃvel no momento. - [HELP] -Você foi movido para uma região vizinha. + <notification name="AvatarMovedLast"> + Esse destino não está disponÃvel no momento. +Você chegou a uma região próxima. + </notification> + <notification name="AvatarMovedHome"> + Esse destino não está disponÃvel no momento. +Você chegou a uma região próxima. +Pense em usar outra região como casa. </notification> <notification name="ClothingLoading"> - Sua vestimenta ainda está baixando. -Você pode usar o [SECOND_LIFE] normalmente e os outros o visualizarão corretamente. + As suas roupas estão sendo transferidas. +Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido corretamente. <form name="form"> - <ignore name="ignore" text="Quando o vestuário está levando muito tempo para fazer download"/> + <ignore name="ignore" text="A roupa está demorando para chegar"/> </form> </notification> <notification name="FirstRun"> - A instalação do [APP_NAME] está completa. + A instalação do [APP_NAME] está pronta. -Se esta é a primeira vez usando o[SECOND_LIFE], será necessário que você crie uma conta antes de poder se logar. -Retornar a [https://join.secondlife.com/index.php?lang=pt-BR secondlife.com] para criar uma nova conta? +Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. +Voltar para [http://join.secondlife.com secondlife.com] para criar sua conta? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/> </notification> <notification name="LoginPacketNeverReceived"> - Estamos com problemas de conexão. Pode ser problema com a conexão de sua internet ou com os servidores do [SECOND_LIFE]. + Estamos detectando um problema de conexão. Pode haver um problema com a sua conexão à internet ou com o [SECOND_LIFE_GRID]. -Voce tanto pode checar a conexão de sua internet e tentar novamente em alguns minutos, ou clicar em Teletransporte para tentar teletransportar-se para sua casa. +Cheque sua conexão e tente em alguns minutos, clique na Ajuda para acessar o [SUPPORT_SITE], ou tente voltar para casa clicando em 'Teletransportar'. <url name="url"> http://br.secondlife.com/support/ </url> @@ -1152,10 +1099,10 @@ Por favor, escolha se o seu avatar é feminino ou masculino. Você pode mudar de [NAME] L$ [PRICE] Você não possui suficientes L$ para fazer isso. </notification> <notification name="GrantedModifyRights"> - Foi garantido à você o privilégio de alterar o(s) objeto(s) de [FIRST_NAME] [LAST_NAME]' + [NAME] autorizou você a editar seus objetos. </notification> <notification name="RevokedModifyRights"> - Seu privilégio para alterar o(s) objeto(s) de [FIRST_NAME] [LAST_NAME]'s foi removido. + Seu direito de modificar objetos do/da [NAME] foi revogado </notification> <notification name="FlushMapVisibilityCaches"> Isto irá descarregar os caches de mapa relativos a esta região. @@ -1232,94 +1179,107 @@ Por favor, ponha o objeto à venda e tente novamente. [DOWNLOAD_PATH] </notification> <notification name="DownloadWindowsMandatory"> - Uma nova versão do [APP_NAME] está disponÃvel. + Existe uma nova versão do [APP_NAME] [MESSAGE] -Você deve baixar essa atualização para utilizar o [APP_NAME]. +Baixe a atualização para usar o [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Sair" yestext="Atualizar"/> </notification> <notification name="DownloadWindows"> - Uma versão atualizada do [APP_NAME] está disponÃvel. + Existe uma nova versão do [APP_NAME] [MESSAGE] -Essa atualização não é mandatória, mas sugerimos que você a instale para melhorar a performance e a estabilidade. +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade do visualizador. <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Atualizar"/> </notification> <notification name="DownloadWindowsReleaseForDownload"> - Uma versão atualizada do [APP_NAME] está disponÃvel. + Existe uma nova versão do [APP_NAME] [MESSAGE] -Essa atualização não é mandatória, mas sugerimos que você a instale para melhorar a performance e a estabilidade. +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade do visualizador. <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Atualizar"/> </notification> + <notification name="DownloadLinuxMandatory"> + Existe uma nova versão do [APP_NAME] +[MESSAGE] +Baixe a atualização para usar o [APP_NAME]. + <usetemplate name="okcancelbuttons" notext="Sair" yestext="Baixar"/> + </notification> + <notification name="DownloadLinux"> + Existe uma nova versão do [APP_NAME] +[MESSAGE] +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade. + <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Baixar"/> + </notification> + <notification name="DownloadLinuxReleaseForDownload"> + Existe uma nova versão do [APP_NAME] +[MESSAGE] +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade. + <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Baixar"/> + </notification> <notification name="DownloadMacMandatory"> - Uma nova versão do [APP_NAME] está disponÃvel. + Existe uma nova versão do [APP_NAME] [MESSAGE] -Você deve baixar esta atualização para utilizar o [APP_NAME]. +Baixe a atualização para usar o [APP_NAME]. -Baixar para sua pasta de Aplicativos? +Salvar na pasta Aplicativos? <usetemplate name="okcancelbuttons" notext="Sair" yestext="Atualizar"/> </notification> <notification name="DownloadMac"> - Uma nova versão do [APP_NAME] está disponÃvel. + Existe uma nova versão do [APP_NAME] [MESSAGE] -Essa atualização não é mandatória, mas sugerimos que você a instale para melhorar a performance e a estabilidade. +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade do visualizador. -Baixar para a sua pasta de Aplicativos? +Salvar na pasta Aplicativos? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Atualizar"/> </notification> <notification name="DownloadMacReleaseForDownload"> - Uma nova versão do [APP_NAME] está disponÃvel. - + Existe uma nova versão do [APP_NAME] [MESSAGE] -Essa atualização não é mandatória, mas sugerimos que você a instale para melhorar a performance e a estabilidade. +Não é preciso passar para a nova versão, mas ela pode melhorar o desempenho e estabilidade do visualizador. -Baixar para sua pasta de Aplicativos? +Salvar na pasta Aplicativos? <usetemplate name="okcancelbuttons" notext="Continuar" yestext="Atualizar"/> </notification> <notification name="DeedObjectToGroup"> Delegar este objeto causará ao grupo: * Receber os L$ pagos ao objeto - <usetemplate ignoretext="Ao transferir objetos aos grupos" name="okcancelignore" notext="Cancelar" yestext="Acionar"/> + <usetemplate ignoretext="Confirmar doações de um objeto a um grupo antes de fazer a doação" name="okcancelignore" notext="Cancelar" yestext="Acionar"/> </notification> <notification name="WebLaunchExternalTarget"> - Abrir o navegador do seu sistema para ver este conteúdo? - <usetemplate ignoretext="Ao abrir o navegador web do seu sistema para visualizar uma página Web" name="okcancelignore" notext="Cancelar" yestext="OK"/> + Abrir uma janela do navegador para ver essas informações? + <usetemplate ignoretext="Abrir o navegador para acessar uma página na web" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchJoinNow"> - Ir ao www.secondlife.com para gerenciar sua conta? - <usetemplate ignoretext="Ao abrir o navegador web para gerenciar sua conta" name="okcancelignore" notext="Cancelar" yestext="OK"/> + Deseja abrir o [http://secondlife.com/account/ Painel] para gerenciar sua conta? + <usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchSecurityIssues"> Visite a Wiki do [SECOND_LIFE] para detalhes de como Reportar um Problema de Segurança. - <usetemplate ignoretext="Ao abrir o navegador da web para visualizar a Wiki de Problemas de Segurança" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Abrir o navegador para ver como denunciar uma ocorrência" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchQAWiki"> Visite o Wiki de QA do [SECOND_LIFE]. - <usetemplate ignoretext="Ao abrir o navegador web para visualizar a Wiki de QA" name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Abrir meu navegador para ver a página Wiki" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="WebLaunchPublicIssue"> Visite o Rastreador Público de Problemas do [SECOND_LIFE], onde você poderá reportar Bugs e outros Problemas. - <usetemplate ignoretext="Ao abrir o navegador web para visualizar o Rastreador Público de Problemas" name="okcancelignore" notext="Cancelar" yestext="Ir para a Página"/> - </notification> - <notification name="WebLaunchPublicIssueHelp"> - Visite a Wiki [SECOND_LIFE] para informações sobre como utilizar o Rastrador de Público de Problemas. - <usetemplate ignoretext="Ao abrir o navegador web para visualizar a wiki do Rastreador Público de Problemas" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> + <usetemplate ignoretext="Abrir o navegador para usar o Monitor de problemas" name="okcancelignore" notext="Cancelar" yestext="Ir para a Página"/> </notification> <notification name="WebLaunchSupportWiki"> Ir até o Blog Oficial da Linden buscar pelas últimas notÃcias e informações. - <usetemplate ignoretext="Ao abrir o navegador da web para visualizar o blog" name="okcancelignore" notext="Cancelar" yestext="Ir até a página"/> + <usetemplate ignoretext="Abrir meu navegador para ler o blog" name="okcancelignore" notext="Cancelar" yestext="Ir até a página"/> </notification> <notification name="WebLaunchLSLGuide"> - Ir para a página guia do LSL para ajuda com script? - <usetemplate ignoretext="Ao abrir o navegador web para visualizar o Guia de Scripts." name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> + Abrir o Guia de scripts para obter ajuda? + <usetemplate ignoretext="Abrir meu navegador para usar o Guia de scripts" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> </notification> <notification name="WebLaunchLSLWiki"> - Ir para o portal LSL para ajuda com script? - <usetemplate ignoretext="Ao abrir o navegador da web para visualizar o Portal de LSL" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> + Consultar o LSL Portal para obter ajuda com scripts? + <usetemplate ignoretext="Abrir meu navegador para consultar o LSL Portal" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> </notification> <notification name="ReturnToOwner"> Você tem certeza que deseja retornar os objetos selecionados para seus proprietários? Objetos transferÃveis doados irão retornar aos proprietários anteriores. *AVISO* Objetos doados não – transferÃveis serão deletados! - <usetemplate ignoretext="Ao retornar objetos a seus proprietários" name="okcancelignore" notext="Cancelar" yestext="Retornar"/> + <usetemplate ignoretext="Confirmar antes de devolver objetos a seus donos" name="okcancelignore" notext="Cancelar" yestext="Retornar"/> </notification> <notification name="GroupLeaveConfirmMember"> Você é atualmente um membro do grupo [GROUP]. @@ -1331,14 +1291,14 @@ Deixar este grupo? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar todos os usuários"/> </notification> <notification name="MuteLinden"> - Desculpe, você não pode silenciar um Linden. + Desculpe, nenhum Linden pode ser bloqueado. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotStartAuctionAlreadyForSale"> Você não pode começar um leilão com um lote que já foi colocado à venda. Desabilite a venda da terra se você tem certeza que deseja iniciar um leilão. </notification> - <notification label="Silenciar objeto pelo nome falhou" name="MuteByNameFailed"> - Você já silenciou este nome. + <notification label="Falha ao bloquear objeto por nome" name="MuteByNameFailed"> + Você já bloqueou este residente. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RemoveItemWarn"> @@ -1354,16 +1314,19 @@ Deixar este grupo? <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="BusyModeSet"> - Definido o Modo Ocupado. -Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas irão receber a sua resposta de modo ocupado. Todas as ofertas de teletransporte serão recusadas. Todas as ofertas de inventário irão para a sua Lixeira. - <usetemplate ignoretext="Ao definir o Modo Ocupado" name="okignore" yestext="OK"/> + Modo ocupado ativado. +O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua resposta de modo ocupado. Todas as ofertas de teletransporte serão recusadas. Todas as ofertas de inventário serão colocadas na Lixeira. + <usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> - Você já pertence a muitos grupos para entrar em outro. Por favor, deixe pelo menos um grupo antes de entrar neste. Para sair de um grupo, selecione o Menu Editar e a opção Meus 'Grupos...' -[NAME] convidou você para entrar num grupo como membro. -[INVITE] + Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite. +[NAME] está te convidando para entrar em um grupo. <usetemplate name="okcancelbuttons" notext="Recusar" yestext="Entrar"/> </notification> + <notification name="JoinedTooManyGroups"> + Você atingiu o limite máximo de grupos. Sai de um grupo para entrar ou criar outro. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="KickUser"> Expulsar este usuário com qual mensagem? <form name="form"> @@ -1425,8 +1388,16 @@ Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas i </form> </notification> <notification name="TeleportFromLandmark"> - Você tem certeza que quer se teletransportar? - <usetemplate ignoretext="Ao se teletransportar a partir de uma Landmark no inventário" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> + Tem certeza de quer ser teletransportado para <nolink>[LOCATION]</nolink>? + <usetemplate ignoretext="Confirmar se eu quero ser teletransportado para marcos" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> + </notification> + <notification name="TeleportToPick"> + Teletransportar para [PICK]? + <usetemplate ignoretext="Confirmar se eu quero ser teletransportado para Destaques" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> + </notification> + <notification name="TeleportToClassified"> + Teletransportar para [CLASSIFIED]? + <usetemplate ignoretext="Confirmar se eu quero ser teletransportado lugar do anúncio" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/> </notification> <notification label="Mensagem para todos na sua Propriedade" name="MessageEstate"> Digite um breve anúncio que será enviado para todos que estejam atualmente na sua propriedade. @@ -1495,9 +1466,7 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar. Você não é permitido na Região devido à sua Classificação de maturidade. Isto pode ser o resultado da falta de informação de validação de sua idade. Por favor, verifique se você está com o último Visualizador instalado e vá ao Banco de Conhecimento para detalhes em como acessar áreas com esta classificação de maturidade. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked_KB"> Você não é permitido nesta região devido à sua Classificação de maturidade. @@ -1506,37 +1475,26 @@ Ir para o Banco de Conhecimento para maiores informações sobre Classificaçõe <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt </url> - <usetemplate - name="okcancelignore" - yestext="Ir para o Banco de Conhecimento" - notext="Fechar" - ignoretext="Quando a entrada na região está bloqueada devido à Classificação de maturidade"/> + <usetemplate ignoretext="Não posso entrar nessa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/> </notification> <notification name="RegionEntryAccessBlocked_Notify"> Você não é permitido nesta região devido à sua Classificação de maturidade. </notification> <notification name="RegionEntryAccessBlocked_Change"> - Você não é permitido nessa região devido à sua preferência de Classificação de maturidade. - -Você pode clicar em 'Mudar Preferência' para aumentar sua preferência de Classificação de maturidade agora e permitir sua entrada. Você estará habilitado a buscar e acessar conteúdo [REGIONMATURITY] a partir de agora. Se você desejar mais tarde voltar à configuração anterior, vá para Editar > Preferencias... > Geral. - <form name="form"> - <button - name="OK" - text="Mudar Preferência"/> - <button - default="true" - name="Cancel" - text="Fechar"/> - <ignore name="ignore" text="Quando a entrada na Região está bloqueada devido à preferência de Classificação de maturidade"/> - </form> + Você não pode entrar nessa região devido à sua seleção de maturidade. + +Clique em 'Mudar preferência' para aumentar o nÃvel de maturidade e entrar nessa região. De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] . Para modificar esta configuração, vá à Eu > Preferências > Geral. + <form name="form"> + <button name="OK" text="Mudar preferência"/> + <button default="true" name="Cancel" text="Fechar"/> + <ignore name="ignore" text="Minha preferência de maturidade impede que eu vá a uma região"/> + </form> </notification> <notification name="LandClaimAccessBlocked"> Você não pode reclamar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade. Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LandClaimAccessBlocked_KB"> Você não pode reclamar esta terra devido à sua Classificação de maturidade. @@ -1545,32 +1503,22 @@ Ir para a o Banco de Conhecimento para maiores informações sobre Classificaçà <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt </url> - <usetemplate - name="okcancelignore" - yestext="Ir para o Banco de Conhecimento" - notext="Fechar" - ignoretext="Quando reclamar a Terra está bloqueado devido à Classificação de maturidade"/> + <usetemplate ignoretext="Não reivindicar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/> </notification> <notification name="LandClaimAccessBlocked_Notify"> Você não pode reclamar esta terra devido à sua Classificação de maturidade. </notification> <notification name="LandClaimAccessBlocked_Change"> - Você não pode reclamar esta terra devido à sua preferência de Classsificação de maturidade. + Você não pode reivindicar essa região devido à sua preferência de maturidade -Você pode clicar em 'Mudar Preferência' para aumentar sua preferência de Classificação de maturidade agora e permitir sua entrada. Você estará habilitado a buscar e acessar conteúdo [REGIONMATURITY] a partir de agora. Se você desejar mais tarde voltar à configuração anterior, vá para Editar > Preferencias... > Geral. - <usetemplate - name="okcancelignore" - yestext="Mudar Preferência" - notext="Fechar" - ignoretext="Quando reclamar a Terra está bloqueado devido à preferência de Classificação de maturidade"/> +Clique em 'Mudar preferência' para aumentar o nÃvel de maturidade e entrar nessa região. De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] . Para modificar esta configuração, vá à Eu > Preferências > Geral. + <usetemplate ignoretext="Minha preferência de conteúdo impede que eu reivindique terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/> </notification> <notification name="LandBuyAccessBlocked"> Você não pode comprar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade. Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade. - <usetemplate - name="okbutton" - yestext="OK"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LandBuyAccessBlocked_KB"> Você não pode comprar esta terra devido à sua Classificação de maturidade. @@ -1579,27 +1527,19 @@ Ir para o Banco de Conhecimento para maiores informações sobre Classificaçõe <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt </url> - <usetemplate - name="okcancelignore" - yestext="Ir para o Banco de Conhecimento" - notext="Fechar" - ignoretext="Quando a compra de Terra está bloqueada devido à Classificação de maturidade"/> + <usetemplate ignoretext="Não posso comprar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/> </notification> <notification name="LandBuyAccessBlocked_Notify"> Você não pode comprar esta terra devido à sua Classificação de maturidade. </notification> <notification name="LandBuyAccessBlocked_Change"> - Você não pode comprar esta terra devido à sua preferência de Classificação de maturidade. + Você não pode comprar esse terreno devido à sua preferência de maturidade -Você pode clicar em 'Mudar Preferência' para aumentar sua preferência de Classificação de maturidade agora e permitir sua entrada. Você estará habilitado a buscar e acessar conteúdo [REGIONMATURITY] a partir de agora. Se você desejar mais tarde voltar à configuração anterior, vá para Editar > Preferencias... > Geral. - <usetemplate - name="okcancelignore" - yestext="Mudar Preferência" - notext="Fechar" - ignoretext="Quando a compra de Terra está bloqueada devido à preferência de Classificação de maturidade"/> +Clique em 'Mudar preferência' para aumentar o nÃvel de maturidade e entrar nessa região. De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] . Para modificar esta configuração, vá à Eu > Preferências > Geral. + <usetemplate ignoretext="Minha preferência de conteúdo não me deixa comprar terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/> </notification> <notification name="TooManyPrimsSelected"> - "Muitos prims foram selecionados. Por favor, selecione [MAX_PRIM_COUNT] ou menos e tente novamente." + Muitos prims foram selecionados. Selecione [MAX_PRIM_COUNT] ou menos prims, e tente de novo <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemImportingEstateCovenant"> @@ -1632,19 +1572,11 @@ Publicar este classificado agora por L$ [AMOUNT]? </notification> <notification name="SetClassifiedMature"> Este classificado contém conteúdo Mature? - <usetemplate - canceltext="Cancelar" - name="yesnocancelbuttons" - notext="Não" - yestext="Sim"/> + <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="SetGroupMature"> Este grupo contém conteúdo Mature? - <usetemplate - canceltext="Cancelar" - name="yesnocancelbuttons" - notext="Não" - yestext="Sim"/> + <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification label="Confirmar reiniciar" name="ConfirmRestart"> Você quer realmente reiniciar esta região em 2 minutos? @@ -1658,217 +1590,14 @@ Publicar este classificado agora por L$ [AMOUNT]? <button name="Cancel" text="Cancelar"/> </form> </notification> - <notification label="Bloquear Terraforma" name="HelpRegionBlockTerraform"> - Se esta opção for assinalada, donos de Terrenos não serão capazes de terraformar independentemente da configuração 'Editar Terreno' de suas terras por lote. - -Padrão: desligado - </notification> - <notification label="Bloquear Vôo" name="HelpRegionBlockFly"> - Se esta caixa estiver marcada, as pessoas não poderão voar nesta região independente das configurações por lote de 'Voar'. - -Padrão: desligado. - </notification> - <notification label="Mudança Conjunta das Permissões de Conteúdo" name="HelpBulkPermission"> - A ferramenta de Mudança Conjunta das Permissões lhe ajuda a mudar, rapidamente, as permissões de múltiplos itens que estão no conteúdo do(s) objeto(s) selecionado(s). Por favor observe que, no entanto, você está apenas definindo permissões para on itens que estão no conteúdo dos objetos selecionados -- não as permissões para o container dos próprios objetos. - -Também observe que as permissões não se aplicam aos conteúdos aninhados, contidos em quaisquer dos objetos. Sua solicitação opera apenas nos itens em exatamente um nÃvel de profundidade. - -Você pode escolher seletivamente quais tipos de itens modificar, usando a lista de conferência aqui, abaixo de 'Tipos de Conteúdo'. Quando você seleciona Texturas, as fotos são incluÃdas. - -* Esta ferramenta apenas mudará as permissões em itens que você pode mudar. -* Você não pode dar ao Próximo dono, as permissões que você já não tem. -* As permissões ao Próximo dono são meramente solicitações. Se um dos itens não puder assumir todas as novas permissões, nenhuma delas mudará. - -Quando você estiver pronto para mudar as permissões globais, clique 'Aplicar' e aguarde os resultados na tela. - -Se você fechar a janela de Permissões Conjuntas enquanto elas estiverem sendo alteradas, a operação será suspensa. - </notification> - <notification label="Permitir Dano" name="HelpRegionAllowDamage"> - Marcar essa caixa habilita o sistema de vitalidade em todos os lotes independente das configurações individuais. Se esta caixa ficar desmarcada, os proprietários de lotes individuais ainda estarão aptos a ativar o sistema de vitalidade de seus lotes. - -Padrão: desligado. - </notification> - <notification label="Limite de Agentes" name="HelpRegionAgentLimit"> - Define o número máximo de residentes permitidos nesta região. -Quanto mais residentes existirem em sua região, pior pode ser a performance. - -Padrão: 40 - </notification> - <notification label="Bonus de Objetos" name="HelpRegionObjectBonus"> - O Bônus de objetos é um multiplicador para primitivas permitidas em qualquer lote. O intervalo permitido é de 1 a 10. -Se fixado em '1 ', 512m² de cada lote permitem 117 objetos. -Fixado em '2 ', 512m² cada lote permitem 234, ou o dobro, e assim por diante. -O número máximo de objetos permitidos por região permanece 15000 não importa qual seja o Bônus de objeto. Uma vez estabelecido, esteja ciente de que a redução do Bônus de objetos pode retornar objetos ou apagá-los. - -Padrão: 1.0 - </notification> - <notification label="Maturidade" name="HelpRegionMaturity"> - Define a Classificação de Maturidade da região, como mostrado na barra de menu, no topo de qualquer visualizador do Residente e nas dicas no Mapa-Mundi, quando o cursor passa sobre esta Região. Esta definição também afeta o acesso a esta Região e aos resultados de busca. Outros Residentes podem apenas entrar em Regiões ou ver resultados de busca com a mesma Classificação de maturidade que eles escolheram em suas preferências. - -Pode levar algum tempo até que esta mudança se reflita no mapa. - </notification> - <notification label="Restringir Empurrar" name="HelpRegionRestrictPushObject"> - Esta caixa de verificação Configura toda a região para permissões restritivas de empurrar. -Quando habilitada, os agentes só podem empurrar a si mesmos ou serem empurrados pelo dono do lote. -(Empurrar se refere à função LSL llPushObject().) - -Padrão: Desligado. - </notification> - <notification label="Unir/dividir lote" name="HelpParcelChanges"> - Configura se os lotes que não pertencem ao dono da propriedade podem ser unidos ou subdivididos. -Se esta opção estiver desmarcada: - * Apenas os donos ou gerentes de propriedades podem unir ou dividir lotes. - * Eles podem unir ou subdividir lotes pertencentes ao dono ou ao grupo onde eles tem os poderes apropriados. -Se esta opção estiver marcada: - * Todos os donos de lotes podem unir ou subdividir os lotes que eles possuem. - * Para lotes pertencentes a grupos, aqueles com os poderes apropriados podem unir ou subdividir lotes. - -Padrão: Marcado. - </notification> - <notification label="Não Mostrar na Pesquisa" name="HelpRegionSearch"> - Ao marcar esta caixa irá bloquear os donos de lotes de listar seus lotes na busca - -Padrão: desligado - </notification> <notification label="Modificar a maturidade da Região" name="RegionMaturityChange"> - A classificação de maturidade para esta região foi atualizada. -Pode levar algum tempo para que a mudança seja refletida no mapa. - </notification> - <notification label="Revenda de Terreno" name="HelpRegionLandResell"> - Os gerentes e os donos de propriedades podem vender qualquer terreno pertencente ao dono da propriedade. -Se esta opção estiver desmarcada, os compradores não podem revender seus terrenos nesta região. -Se esta opção estiver marcada, compradores podem vender seus terrenos nesta região. - -Padrão: Desabilitada. - </notification> - <notification label="Desabilitar Scripts" name="HelpRegionDisableScripts"> - Quando a performance do simulador está ruim, um script pode ser o culpado. Abra a Barra de EstatÃsticas (Ctrl+Shift+1). Olhe no Simulador de FÃsica FPS. Se estiver abaixo de 45, então abra o painel 'Tempo' localizado na parte de baixo da Barra de EstatÃsticas. Se o Tempo de Script indicar 25 ms ou mais, clique no botão 'Get Top CScripts'. Será dado o nome e a localização do script que pode estar causando uma performance ruim. Marque a caixa 'Desabilitar Scripts' e aperte o botão 'Aplicar'. Isto temporariamente desabilitará todos os scripts nesta região. Uma vez que você chegar ao local, investigue o script para determinar se ele está causando o problema. Você pode querer entrar em contato com o proprietário do script, excluir ou devolver o objeto. Desmarque a caixa 'Desabilitar Script' e então clique em 'Aplicar' para reativar os scripts na região. Padrão: desligado. - </notification> - <notification label="Desabilitar Colisões" name="HelpRegionDisableCollisions"> - Quando a performance do simulador é pobre, os objetos fÃsicos podem ser os culpados.Abra a a Barra de EstatÃsticas (Ctrl+Shift+1). -Olhe a taxa de quadros por segundos (FPS) dos objetos fÃsicos. - -Se ela estiver abaixo de 45, abra o painel de Tempo, localizado na parte inferior da Barra de EstatÃsticas. Se o Tempo (FÃsicos) do Simulador mostrar 20 ms ou mais, clique o botão 'Pegue os Maiores Colidentes'. Será fornecido a você o nome e a localidade dos objetos fÃsicos que podem estar causando uma performance pobre. -Ativando a caixa Desabilitar Colisões e então pressionando o botão Aplicar, as colisões objeto-objeto serão temporariamente desabilitadas. Você pode precisar fazer isso para que possa viajar até a localidade onde observou um 'colidente-mor'. Uma vez tendo chegado à localidade, investigue o objeto – ele está constantemente colidindo com outros objetos? Você pode desejar contatar o dono do objeto ou deletar ou retornar o objeto. -Desative a caixa 'Desabilitar Colisões' e então use 'Aplicar' para reativar as colisões na região. - -Padrão: off - </notification> - <notification label="Desabilitar FÃsica" name="HelpRegionDisablePhysics"> - Desabilitar FÃsica é similar a desabilitar Colisões, com exceção de que todas as simulações fÃsicas serão desabilitadas. Isto significa que não só os objetos pararão de colidir, mas também que os avatares não poderão se mover. - -Isto só deve ser usado quando Desabilitar Colisões não trouxer performance suficiente à região para investigar um problema de FÃsica ou do 'Colidente-Mor'. - -Esteja certo de reabilitar FÃsica quando você terminar, ou os avatares não poderão se mover. - -Default: desligado - </notification> - <notification label="Principais Colidentes" name="HelpRegionTopColliders"> - Mostra uma lista de objetos com o maior número de potenciais colisões objeto-objeto. Estes objetos podem diminuir a performance do simulador. -Selecione Ver > Barra de EstatÃsticas e olhe em Simulador > Tempo > Tempo de Simulação (FÃsica) para ver se mais de 20 ms são gastos em fÃsica. - </notification> - <notification label="Principais Scripts" name="HelpRegionTopScripts"> - Mostra uma lista dos objetos gastando mais tempo rodando scripts LSL. Estes objetos podem diminuir a performance do simulador. -Selecione Ver > Barra de EstatÃsticas e olhe em Simulador > Tempo > Tempo de Script para ver se mais de 25 ms são gastos em scripts. - </notification> - <notification label="Reiniciar Região" name="HelpRegionRestart"> - Reinicia o processo do servidor rodando esta região, após um aviso de dois minutos. Todos os residentes nesta região serão desconectados. A região salvará seus dados e deverá retornar em até 90 segundos. - -Reiniciar a região não consertará a maioria dos problemas de performance, e deveria ser utilizada somente quando solicitado. - </notification> - <notification label="Altura da água" name="HelpRegionWaterHeight"> - Esta é a altura em metros onde a água aparece. Caso este ajuste seja diferente de 20 e você tenha águas adjacentes ao limite do seu terreno ou águas continentais, haverá uma abertura visÃvel. - -Padrão: 20 - </notification> - <notification label="Limite do aumento" name="HelpRegionTerrainRaise"> - Esta é a distância em metros que os donos de lotes podem elevar o terreno, a partir da altura nivelada do terreno. - -Padrão: 4 - </notification> - <notification label="Limite mais baixo" name="HelpRegionTerrainLower"> - Esta é a distância em metros que os donos de lotes podem abaixar o terreno, a partir da altura nivelada do terreno. - -Padrão: -4 - </notification> - <notification label="Carregar terreno RAW" name="HelpRegionUploadRaw"> - Este botão faz upload de um arquivo .RAW para a região em que você está. -O arquivo precisa conter as dimensões/número de canais corretos: RGB, 256x256 e 13 canais. A melhor forma de criar um arquivo da região é baixando o arquivo .RAW existente. Um bom primeiro passo seria modificar o primeiro canal (altura da região) e fazer o upload do arquivo. - -O upload pode levar certa de 45 segundos. Note que fazer upload do arquivo da região *não* moverá os objetos que estão na região, apenas o terreno e as permissões associadas a ele. Isso pode fazer com que alguns objetos fiquem debaixo da terra. - -Para mais informações sobre edição dos campos de altura da região, consulte a ajuda F1. - </notification> - <notification label="Baixar RAW de terreno" name="HelpRegionDownloadRaw"> - Este botão faz download de um arquivo contendo dados de altura do campo, dimensões do lote, status de lotes à venda e algumas permissões de lote para este terreno. Ao abrir o arquivo em programas como o Photoshop, você precisa especificar as dimensões do documento, que são: RGB, 256x256 com 13 canais. Este arquivo de terras não pode ser aberto de outra forma. - -Para mais informações sobre edição dos campos de altura da região, consulte a Ajuda F1. - </notification> - <notification label="Usar Sol da Propriedade" name="HelpRegionUseEstateSun"> - Esta caixa de opção faz com que a posição do sol nesta região seja a mesma que no resto da região. - -Padrão: ligada - </notification> - <notification label="Sol fixo" name="HelpRegionFixedSun"> - Esta caixa de opção ajusta a posição do sol no equalizador de fuso e interrompe o movimento do sol. - -Padrão: desligada - </notification> - <notification label="Nivelar Terreno" name="HelpRegionBakeTerrain"> - Este botão salva a forma atual do terreno como o novo padrão para a região. Uma vez nivelado, o terreno pode reverter à forma que foi salva, sempre que você ou outros utilizarem a ferramenta 'Revert' na edição de terreno. O terreno nivelado é também o ponto médio entre os limites de elevação e redução de terreno. - </notification> - <notification label="Gerentes da Propriedade" name="HelpEstateEstateManager"> - Um gerente da propriedade é um residente a quem você delegou o controle das configurações da região. Ele pode alterar qualquer configuração da região, com exceção de elevar, abaixar ou nivelar o terreno. Em particular, eles podem permitir ou banir residentes da sua propriedade. Gerentes da propriedade só podem ser adicionados ou removidos pelo dono da propriedade. - -Um gerente não pode adicionar ou remover outro gerente. Por favor, escolha somente residentes em quem você confia para serem gerentes da propriedade, pois você poderá ser responsabilizado pelas ações deles. - </notification> - <notification label="Usar hora Global" name="HelpEstateUseGlobalTime"> - Esta caixa de opção faz com que o Sol em sua propriedade siga a mesma posição do Sol nas propriedades da 'mainland' do Linden Lab. + O conteúdo desta região foi reclassificado. +Talvez leve algum tempo para a mudança ser refletida no mapa. -Padrão: ligado - </notification> - <notification label="Sol fixo" name="HelpEstateFixedSun"> - Esta caixa de opção ajusta a posição do sol no equalizador de fuso e interrompe o movimento do sol. - </notification> - <notification label="Acesso público" name="HelpEstateExternallyVisible"> - Esta caixa de verificação define se os Residentes que estão em outras propriedades podem entrar nesta, sem estar em uma lista de acesso. - -Padrão: on - </notification> - <notification label="Permitir Teletransporte direto" name="HelpEstateAllowDirectTeleport"> - Quando marcada, permite que os residentes se teletransportem diretamente para qualquer ponto da sua propriedade. Quando desmarcada, os residentes serão teleportados para o telehub mais próximo. - -Padrão: desmarcada - </notification> - <notification label="Permitir acesso" name="HelpEstateAllowResident"> - Acesso a esta propriedade estará limitado aos Residentes listados aqui e em quaisquer grupos abaixo. -Esta definição está disponÃvel apenas quando o Acesso Público estiver desmarcado. - </notification> - <notification label="Permitir acesso de grupo" name="HelpEstateAllowGroup"> - Acesso a esta propriedade estará limitado aos grupos listados aqui e a quaisquer Residentes acima. -Esta definição está disponÃvel apenas quando o Acesso Público estiver desmarcado. - </notification> - <notification label="Endereço de Email do Abuso" name="HelpEstateAbuseEmailAddress"> - Configurar isto para um endereço de email válido, fará com que relatos de abuso nesta propriedade sejam enviados para esse endereço. -DefinÃ-lo em branco fará com que os relatórios de abuso sejam enviados apenas para a Linden Lab. - </notification> - <notification label="Negar acesso" name="HelpEstateBanResident"> - Residentes desta lista estão proibidos de acessar a sua propriedade, independentemente de outras configurações. - </notification> - <notification label="Permitir Conversa por Voz" name="HelpEstateVoiceChat"> - Lotes nesta propriedade têm permissão para ter seus canais de voz próprios, nos quais os residentes podem ouvir e falar com os outros residentes próximos. - -Padrão: desligado +Para ir a regiões de conteúdo Adulto, é preciso ter uma conta verificada, seja comprovando a idade ou com dados de pagamento. </notification> <notification label="Discordância de Versão de Voz" name="VoiceVersionMismatch"> - Esta versão do [APP_NAME] não é compatÃvel com as caracterÃsticas do Canal de Voz desta região. Para que a Conversa por Voz funcione corretamente, você precisará atualizar o [APP_NAME]. - </notification> - <notification label="Corretor da Propriedade" name="HelpEstateCovenant"> - Definir um corretor da propriedade lhe permite vender lotes nesta propriedade. Se um corretor não for definido, você não pode vender terras. O cartão do seu corretor pode ficar vazio se você não desejar aplicar quaisquer regras ou avisar os compradores sobre qualquer coisa em relação ao lote antes da compra. - -Um corretor pode ser usado para comunicar regras, orientações, informações culturais ou simplesmente suas expectativas quanto ao futuro comprador. Isto pode incluir zoneamento, regulamentos para construções, opções de pagamento ou qualquer outra informação que você julgar importante que o novo proprietário veja e concorde antes da compra. - -O comprador precisa concordar com o corretor marcando a caixa de verificação antes de concluir a compra. Corretores são sempre visÃveis na caixa de diálogo 'Sobre a Terra' para todos os lotes que têm corretores definidos. + Esta versão do [APP_NAME] não é compatÃvel com o recurso 'Bate-papo de voz' desta região. Para o bate-papo de voz funcionar, atualize o [APP_NAME]. </notification> <notification label="ImpossÃvel Comprar Objetos" name="BuyObjectOneOwner"> Não é possÃvel comprar objetos de diferentes proprietários ao mesmo tempo. @@ -1956,53 +1685,36 @@ Por favor, re-insira sua senha e clique 'Confirmar Compra'. Estes itens serão movidos para o seu inventário, não copiados. Mover os itens do inventário? - <usetemplate ignoretext="Quando estiver movendo inventário não copiável a partir de objetos." name="okcancelignore" notext="Não mover" yestext="Mover"/> + <usetemplate ignoretext="Avisar antes de eu pegar items 'cópia proibida' de um objeto" name="okcancelignore" notext="Não mover" yestext="Mover"/> </notification> <notification name="MoveInventoryFromScriptedObject"> Você selecionou itens de inventário não copiáveis. Estes itens serão movidos para seu inventário, não copiados. Pelo fato de o objeto ter scripts, mover estes itens ao inventário pode provocar um mal funcionamento do script. Mover para o inventário o(s) item(s)? - <usetemplate ignoretext="Quando movendo objetos com scripts não copiáveis ao inventário" name="okcancelignore" notext="Não mover" yestext="Mover"/> + <usetemplate ignoretext="Avisar antes de eu pegar items 'cópia proibida' que podem quebrar objetos com script" name="okcancelignore" notext="Não mover" yestext="Mover"/> </notification> <notification name="ClickActionNotPayable"> - Aviso: A ação de 'Pagar Objeto' com clique foi definida, mas funcionará apenas se for adicionado um script com o evento money(). + Aviso: O clique em 'Pagar por objeto' foi processado, mas só pode funcionar se um script tiver um evento money(). <form name="form"> - <ignore name="ignore" text="Quando Definindo 'Pagar' em objetos sem eventos money()"/> + <ignore name="ignore" text="Definir 'Pagar por objeto' ao construir um objeto sem script money()"/> </form> </notification> <notification name="OpenObjectCannotCopy"> Não há itens neste objeto que você está autorizado a copiar. </notification> <notification name="WebLaunchAccountHistory"> - Ir para o site do [SECOND_LIFE] para visualizar o histórico de sua conta? - <usetemplate ignoretext="Ao abrir a página web de histórico de conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> - </notification> - <notification name="ClickOpenF1Help"> - Visitar o website de Suporte do [SECOND_LIFE]? - <usetemplate ignoretext="Quando visitando o website de Suporte do [SECOND_LIFE]" name="okcancelignore" notext="Cancelar" yestext="Ir"/> + Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta? + <usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/> </notification> <notification name="ConfirmQuit"> Tem certeza que deseja sair? - <usetemplate ignoretext="Quando Saindo do [APP_NAME]." name="okcancelignore" notext="Continuar" yestext="Sair"/> + <usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Use esta ferramenta para reportar violações aos [http://secondlife.com/corporate/tos.php?lang=pt-BR Termos de Serviço] e aos [http://secondlife.com/corporate/cs.php?lang=pt-BR Padrões da Comunidade]. - -Todos os abusos aos Termos de Serviço e aos Padrões da Comunidade reportados, são investigados e resolvidos. Você pode ver a resolução do incidente na Reportagem de Incidentes em: - -http://secondlife.com/support/incidentreport.php - </notification> - <notification name="HelpReportAbuseEmailEO"> - IMPORTANTE: Esta reportagem irá para o dono da região em que você se encontra atualmente e não para a Linden Lab. + Use esta ferramenta para denunciar infrações dos [http://secondlife.com/corporate/tos.php Termos do Serviço] e das [http://secondlife.com/corporate/cs.php Normas da Comunidade]. -Como um serviço aos residentes e visitantes, o dono da região em que você se encontra foi eleito para receber e resolver todas as reportagens originadas nesta região. A Linden Lab não irá investigar reportagens que você envia desta localidade. - -O dono da região resolverá as reportagens baseado nas regras locais desta região, como definido na Declaração da propriedade. -(Veja as declarações indo ao menu Mundo e selecionando Sobre a Terra.) - -A resolução desta reportagem se aplica apenas a esta região; o acesso de Residentes à s outras áreas do [SECOND_LIFE] não será afetado pelas decisões desta reportagem. -Apenas a Linden Lab pode restringir acesso a todo o [SECOND_LIFE]. +Todas as denúncias de abuso são investigadas e resolvidas. </notification> <notification name="HelpReportAbuseSelectCategory"> Por favor, selecione uma categoria para a reportagem deste abuso. @@ -2026,17 +1738,18 @@ Seja tão especÃfico quanto você puder, incluindo nomes e os detalhes do incid Fazer uma descrição precisa nos ajuda a arquivar e processar as reportagens de abuso. </notification> <notification name="HelpReportAbuseContainsCopyright"> - Caro Residente, + Caro residente, + +Aparentemente você fez uma denúncia de infranção de propriedade intelectual. Certifique-se de que sua denúncia está correta: -Você parece estar relatando violação de propriedade intelectual. Por favor, certifique-se de que está relatando corretamente: +(1) Procedimento do abuso Se você tem motivos para acreditar que um residente está burlando o sistema de autorização do [SECOND_LIFE] usando o CopyBot ou ferramentas parecidas para infringir direitos de propriedade intelectual, envie um relatório de abuso. A equipe anti-abuso investiga e impõe sanções em casos de infranção dos [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Termos de Serviço] ou das [http://secondlife.com/corporate/cs.php Normas da Comunidade]. Entretando, a equipe anti-abuso não lida com pedidos de remoção de conteúdo do [SECOND_LIFE]. Tais pedidos não serão atendidos. -(1) O Processo de abuso. Você pode apresentar um relatório de abuso se você acredita que um Residente está infringindo o sistema de permissões do [SECOND_LIFE], por exemplo, utilizando ferramentas CopyBot para copiar ou similar, para violar os direitos de propriedade intelectual. A Equipe de Abuso investiga e divulga a ação disciplinar adequada para o comportamento que viola o Estatuto da Comunidade do [SECOND_LIFE] ou os Termos de Serviço. No entanto, a mesma não controla e não irá responder aos pedidos para remover o conteúdo do mundo [SECOND_LIFE]. +(2) Procedimentos DMCA ou remoção de conteúdo. Para solicitar a remoção de conteúdo do [SECOND_LIFE], é imprescindÃvel enviar uma notificação de infração elaborada conforme as disposicões da [http://secondlife.com/corporate/dmca.php PolÃtica DMCA]. -(2) O processo de remoção de conteúdo ou DMCA. Para solicitar a remoção de conteúdo do [SECOND_LIFE], você deve enviar uma notificação válida de infração, conforme previsto em nossa PolÃtica de DMCA em http://secondlife.com/corporate/dmca.php. +Se você deseja continuar o procedimento de denúncia de abuso, feche esta janela e termine o relatório. A categoria 'CopyBot or Permissions Exploit' (robô de cópia ou exploit de autorização) -Se você ainda deseja prosseguir com o processo de abuso, por favor, feche esta janela e termine de enviar seu relatório. Pode ser necessário selecionar a categoria especÃfica 'CopyBot Infração de Permissões'. +Obrigado. -Obrigado, Linden Lab </notification> <notification name="FailedRequirementsCheck"> @@ -2047,9 +1760,9 @@ Linden Lab Já existe um objeto anexado a este ponto do seu corpo. Você deseja substituÃ-lo pelo objeto selecionado? <form name="form"> - <ignore name="ignore" save_option="true" text="Ao substituir os anexos existentes"/> - <button name="Yes" text="Sim"/> - <button name="No" text="Não"/> + <ignore name="ignore" save_option="true" text="Trocar um anexo atual pelo item selecionado"/> + <button ignore="Replace Automatically" name="Yes" text="Sim"/> + <button ignore="Never Replace" name="No" text="Não"/> </form> </notification> <notification label="Aviso de Modo Ocupado" name="BusyModePay"> @@ -2057,18 +1770,22 @@ Você deseja substituÃ-lo pelo objeto selecionado? Você gostaria de deixar o modo Ocupado antes de completar esta transação? <form name="form"> - <ignore name="ignore" save_option="true" text="Ao pagar uma pessoa ou objeto no modo ocupado"/> - <button name="Yes" text="Sim"/> - <button name="No" text="Não"/> + <ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/> + <button ignore="Always leave Busy Mode" name="Yes" text="Sim"/> + <button ignore="Never leave Busy Mode" name="No" text="Não"/> </form> </notification> + <notification name="ConfirmDeleteProtectedCategory"> + A pasta '[FOLDERNAME]' é uma pasta do sistema. Excluir pastas de sistema pode deixar o sistema instável. Tem certeza de que quer prosseguir? + <usetemplate ignoretext="Confirmar antes de excluir pastas do sistema." name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> <notification name="ConfirmEmptyTrash"> - Tem certeza de que deseja remover permanentemente o conteúdo da lixeira de seu inventário? - <usetemplate ignoretext="Ao esvaziar a pasta da lixeira no seu inventário" name="okcancelignore" notext="Não" yestext="Sim"/> + Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre? + <usetemplate ignoretext="Confirmar antes de esvaziar a pasta Lixeira" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="ConfirmClearBrowserCache"> - Você tem certeza que deseja limpar o cache do seu navegador? - <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> + 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="ConfirmClearCookies"> Você tem certeza de que deseja limpar os cookies? @@ -2079,39 +1796,18 @@ Você gostaria de deixar o modo Ocupado antes de completar esta transação? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/> </notification> <notification name="ConfirmEmptyLostAndFound"> - Deseja realmente remover permanentemente o conteúdo da pasta achados e perdidos? - <usetemplate ignoretext="Ao esvaziar pasta Achados e Perdidos do seu inventário" name="okcancelignore" notext="Não" yestext="Sim"/> + Tem certeza de que deseja excluir o conteúdo dos Achados e Perdidos? Para sempre? + <usetemplate ignoretext="Confirmar antes de esvaziar a pasta Achados e Perdidos" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="CopySLURL"> - A seguinte SLurl foi copiada para o seu clipboard: + O seguinte SLurl foi copiado para a área de transferência: [SLURL] -Coloque-a em uma página web para dar aos outros um fácil acesso a este local ou tente você, colando-a na barra de endereços do seu navegador. +Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de endereço de qualquer navegador da web. <form name="form"> - <ignore name="ignore" text="Ao copiar a SURL para o seu clipboard"/> + <ignore name="ignore" text="SLurl copiado para área de transferência."/> </form> </notification> - <notification name="GraphicsPreferencesHelp"> - Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do computador cliente. O Preferências > Interface Gráfica permite escolher entre quatro nÃveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Personalizar e manipulando as seguintes definições: - -Sombreamento: Ativar ou desativar vários tipos de sombreadores de pixel. - -Detalhes de Reflexão: Define os tipos de objetos que a água pode refletir. - -Renderização de Avatar: Define opções que afetam a forma como o cliente renderizará os avatares. - -Alcance: Afeta a distância do seu ponto de vista que os objetos serão renderizados na cena. - -Número máximo de partÃculas: Define o número máximo de partÃculas que será capaz de ver na sua tela de uma só vez. - -Qualidade de Pós-Processamento: Define a resolução com a qual o brilho será renderizado. - -Detalhes de malha: Ajusta a quantidade de detalhes ou número de triângulos utilizados na renderização de certos objetos. Um valor mais alto leva mais tempo para renderizar, mas torna esses objetos mais detalhados. - -Detalhe de Iluminação: Seleciona os tipos de luzes que você gostaria de renderizar. - -Detalhe de Terreno: Ajusta a quantidade de detalhes que você gostaria de ver para a textura do terreno. - </notification> <notification name="WLSavePresetAlert"> Você deseja substituir a pré-configuração salva? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> @@ -2130,149 +1826,6 @@ Detalhe de Terreno: Ajusta a quantidade de detalhes que você gostaria de ver pa Existe efeito de Pós-Processamento. Você deseja substituÃ-lo? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> - <notification name="HelpEditSky"> - Editar os controles graduais do WindLight para configurar e salvar um conjunto de céus. - </notification> - <notification name="HelpEditDayCycle"> - Definir quais céus colocar durante todo o dia. - </notification> - <notification name="EnvSettingsHelpButton"> - Essas configurações ajustam a forma como o ambiente parece localmente no seu computador. Sua placa de vÃdeo precisa suportar o sombreador atmosférico, a fim de ter acesso a todas as definições. - -Ajuste o controle gradual "Hora do Dia" para alterar a fase do dia localmente no visualizador. - -Ajuste o controle gradual de "Cobertura das nuvens" para controlar quantas nuvens cobrem o céu. - -Pegue uma cor na paleta de cores de "Cor da Ãgua" para mudar a cor desta. - -Ajuste o controle gradual de "Névoa de Ãgua" para controlar o quão densa é a névoa dentro da água. - -Clique "Usar Horário da Propriedade" para redefinir a hora do dia para o horário atual do dia da região e permanecer atrelado a ela. - -Clique "Céu Avançado " para abrir um editor com configurações mais avançadas para o céu. - -Clique "Ãgua Avançada " para abrir um editor com configurações mais avançadas para a água. - </notification> - <notification name="HelpDayCycle"> - O editor de Ciclo do Dia dá a você o controle do céu durante um ciclo de dia/noite do [SECOND_LIFE]. Este é o ciclo usado pelo controle gradual da hora do dia do editor de ambiente básico. - -O editor do ciclo de dia trabalha configurando quadros-chave. Estes são pontos (representados pelos Ãcones cinza no gráfico de horário) que possuem um pré-ajuste de céu associado a eles. Conforme o dia passa, o céu do Windlight " anima " a interpolação entre esses quadros-chave. - -A seta amarela acima da linha de tempo representa a sua vista atual, baseada no horário do dia. Clique e arraste para ver como o seu dia será animado. Você pode adicionar ou deletar os quadros-chave pressionando os botões Adicionar Chave e Deletar chave ao lado direito da linha de tempo. - -Você pode configurar a posição do tempo de um quadro-chave arrastando-o pela linha do tempo, ou configurando manualmente no quadro de configurações do seu quadro-chave. Será possÃvel a você associar o seu quadro-chave a este respectivo padrão WindLight. - -A duração do ciclo determina a duração geral do "dia". Configurá-la para um valor baixo (por exmplo, 2 min.) quer dizer que a linha do tempo de 24 horas será animada completamente em apenas dois minutos reais! Assim que estiver satisfeito com a linha do tempo e o ciclo dos quadros-chave, use os botões Play e Stop para uma prévia de como ficará o resultado. Lembre-se, você também pode utilizar a seta amarela indicadora do tempo acima da linha do tempo para ver o ciclo animado interativamente. Usando o botão do tempo da popriedade irá sincronizar a duração do seu dia ao ciclo diário da propriedade. - -Assim que estiver satisfeito com o seu ciclo diário, você pode salvá-lo ou carregá-lo através dos botões Salvar Dia Teste e Carregar Dia Teste. Note que, por enquanto, nós permitimos apenas um Ciclo de dia. - </notification> - <notification name="HelpBlueHorizon"> - Use os cursores Vermelho/Verde/Azul ( Red/Green/Blue -RGB) para ajustar as cores do céu. Você também pode usar o controle de Intensidade (I) para mover os três controles RGB simultaneamente. - </notification> - <notification name="HelpHazeHorizon"> - Haze Horizon é um dos parâmetros mais úteis para ajuste global de exposição de luz na cena. Ele é eficaz para simular diversas configurações de exposição, tais como configurações para super-exposição do sol e escuros halos de Iris. - </notification> - <notification name="HelpBlueDensity"> - A densidade global azul afeta a saturação da cor do céu e nevoeiro. Se você mover o controle gradual de intensidade (I) para a direita, as cores vão se tornar mais brilhantes e vibrantes. Se você movê-lo totalmente para a esquerda, as cores perdem intensidade e cor, eventualmente chegando a preto e branco. Se pretende um ajuste fino do equilÃbrio de cor do céu, você pode controlar os diversos elementos da saturação, utilizando os controles graduais para vermelho / verde / azul (RGB). - </notification> - <notification name="HelpHazeDensity"> - Densidade de Poeira controla o nÃvel de fumaça, poeira cinza na atmosfera. Eficaz para simular cenas com altos nÃveis de poeira e poluentes. É também efetivo em simular névoa e nevoeiro. - </notification> - <notification name="HelpDensityMult"> - O Multiplicador de Densidade pode ser usado para afetar a densidade atmosférica global. Com definições mais baixas, ele cria uma sensação de "ar rarefeito" e em definições mais altas, ele cria um efeito mais denso, mais esfumaçado. - </notification> - <notification name="HelpDistanceMult"> - Ajusta como a distância no WindLight é percebida. Um valor zero efetivamente desativa a influência do WindLight sobre terrenos e objetos. Valores superiores a 1 simulam os efeitos atmosféricos mais espessos a maiores distâncias. - </notification> - <notification name="HelpMaxAltitude"> - Max Altitude ajusta os cálculos de performance de altitude do WindLight, quando computa sua iluminação atmosférica. Em perÃodos vespertinos do dia, é útil para ajustar a "profundidade" de como o pôr-do-sol aparece. - </notification> - <notification name="HelpSunlightColor"> - Ajustar a cor e intensidade da luz direta na cena. - </notification> - <notification name="HelpSunAmbient"> - Ajusta a cor e a intensidade da luz ambiente atmosférica na cena. - </notification> - <notification name="HelpSunGlow"> - O controle gradual de Tamanho controla o tamanho do sol. -O controle gradual de Foco controla o quanto o sol aparecerá desfocado no céu. - </notification> - <notification name="HelpSceneGamma"> - Ajusta a distribuição na tela de luz e escuridão. - </notification> - <notification name="HelpStarBrightness"> - Ajusta o brilho das estrelas no céu. - </notification> - <notification name="HelpTimeOfDay"> - Controla a localização do sol no céu. Semelhante a elevação. - </notification> - <notification name="HelpEastAngle"> - Controla a localização do sol no céu. -Similar ao azimute. - </notification> - <notification name="HelpCloudColor"> - Edita as cores das nuvens, É normalmente recomendado manter o tom esbranquiçado, mas hey! Você pode se divertir se desejar. - </notification> - <notification name="HelpCloudDetail"> - Controla os detalhes da camada de imagem superior na imagem de nuvem principal. X e Y controla sua posição. D (Densidade) controla o quão cheio ou estratificada as nuvens devem aparecer. - </notification> - <notification name="HelpCloudDensity"> - Permite que você controle a posição das nuvens com os cursores X e Y e a densidade deles com o cursor D. - </notification> - <notification name="HelpCloudCoverage"> - Controla o quanto as nuvens cobrem o céu. - </notification> - <notification name="HelpCloudScale"> - Controla o dimensionamento da imagem de nuvens na cúpula celeste. - </notification> - <notification name="HelpCloudScrollX"> - Controla a velocidade das nuvens que se movem na direção X. - </notification> - <notification name="HelpCloudScrollY"> - Controla a velocidade que as núvens se movem na direção Y. - </notification> - <notification name="HelpClassicClouds"> - Marque esta check box para permitir a reprodução das nuvens clássicas mais velhas do [SECOND_LIFE], além das nuvens WindLight. - </notification> - <notification name="HelpWaterFogColor"> - Escolhe a cor da neblina subaquática. - </notification> - <notification name="HelpWaterFogDensity"> - Controla a densidade da neblina da água e a distância de visibilidade debaixo d'água. - </notification> - <notification name="HelpUnderWaterFogMod"> - Modifica o efeito do expoente de densidade de Neblina para controlar até onde você pode ver quando o seu avatar está imerso. - </notification> - <notification name="HelpWaterGlow"> - Controla o quanto a superfÃcie da água deve brilhar. - </notification> - <notification name="HelpWaterNormalScale"> - Controla o escalonamento das três marolas que compõem a água. - </notification> - <notification name="HelpWaterFresnelScale"> - Controla o quanto de luz será refletido por ângulos diferentes. - </notification> - <notification name="HelpWaterFresnelOffset"> - Controla o quanto da intensidade da luz é refletida. - </notification> - <notification name="HelpWaterScaleAbove"> - Controla o quanto de luz será refratado olhando acima da superfÃcie da água. - </notification> - <notification name="HelpWaterScaleBelow"> - Controla o quanto de luz sera refratado visto debaixo da superfÃcie da água. - </notification> - <notification name="HelpWaterBlurMultiplier"> - Controla como ondas e reflexos são misturados. - </notification> - <notification name="HelpWaterNormalMap"> - Controla o mapeamento normal em todos os nÃveis da água para determinar reflexões / refrações. - </notification> - <notification name="HelpWaterWave1"> - Controla aonde e com que velocidade a versão em escala maior do mapa normal se move nas direções X e Y . - </notification> - <notification name="HelpWaterWave2"> - Controla onde e a velocidade com que o mapa normal em escala menor se move nas direções X e Y. - </notification> <notification name="NewSkyPreset"> Me dê o nome para o novo céu. <form name="form"> @@ -2318,35 +1871,33 @@ Similar ao azimute. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="Cannot_Purchase_an_Attachment"> - Os itens não podem ser comprados enquanto forem parte de um anexo. + Objetos não podem ser adquiridos quando estão anexados. </notification> <notification label="Sobre o pedido de Permissão de Débito" name="DebitPermissionDetails"> Conceder esse pedido dá permissão ao script para tirar Linden dólares (L$) de sua conta. Para revogar esta permissão, o proprietário do objeto deve excluir o objeto ou resetar os scripts dele. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AutoWearNewClothing"> - Você gostaria de vestir automaticamente o item de vestuário que você criar? - <usetemplate ignoretext="Automaticamente vestir novo vestuário" name="okcancelignore" notext="Não" yestext="Sim"/> + Vestir automaticamente a roupa que você vai criar? + <usetemplate ignoretext="Vestir as roupas que eu criar enquanto edito minha aparência" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="NotAgeVerified"> - Você precisa ter a idade verificada para acessar este lote. -Gostaria de visitar o site do [SECOND_LIFE] para verificação de idade? + Ãrea restrita a residentes com idade comprovada. Deseja ir ao site do [SECOND_LIFE] para comprovar sua idade? [_URL] <url name="url" option="0"> https://secondlife.com/account/verification.php?lang=pt </url> - <usetemplate ignoretext="Alertar sobre a falta de verificação de idade" name="okcancelignore" notext="Não" yestext="Sim"/> + <usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="Cannot enter parcel: no payment info on file"> - Este lote exige que você tenha informações de pagamento no arquivo antes de poder acessá-lo. -Gostaria de visitar o site do [SECOND_LIFE] para configurá-lo? + Ãrea restrita a residentes que já cadastraram seus dados de pagamento Deseja ir ao site do [SECOND_LIFE] para cuidar disso? [_URL] <url name="url" option="0"> https://secondlife.com/account/index.php?lang=pt </url> - <usetemplate ignoretext="Avisar sobre a falta de informação de pagamento." name="okcancelignore" notext="Não" yestext="Sim"/> + <usetemplate ignoretext="Ainda não tenho cadastro de pagamento" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="MissingString"> A sequência [STRING_NAME] está faltando do strings.xml @@ -2376,7 +1927,7 @@ Gostaria de visitar o site do [SECOND_LIFE] para configurá-lo? [FIRST] [LAST] está Offline </notification> <notification name="AddSelfFriend"> - Você não pode adicionar a si mesmo como amigo + Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a). </notification> <notification name="UploadingAuctionSnapshot"> Fazendo o upload das fotos do site da web e do mundo... @@ -2395,11 +1946,10 @@ Gostaria de visitar o site do [SECOND_LIFE] para configurá-lo? Feito o download de Terrain.raw </notification> <notification name="GestureMissing"> - O Gesto [NAME] não se encontra na base de dados + O gesto [NAME] não está no banco de dados. </notification> <notification name="UnableToLoadGesture"> - ImpossÃvel de carregar o gesto [NAME]. -Por favor, tente novamente. + Falhar ao carregar o gesto [NAME]. </notification> <notification name="LandmarkMissing"> O landmark foi perdido na base de dados @@ -2408,14 +1958,14 @@ Por favor, tente novamente. ImpossÃvel carregar o landmark. Por favor, tente de novo. </notification> <notification name="CapsKeyOn"> - Seu botão CAPS LOCK está ativado. -Como isto afeta a senha digitada, você provavelmente desejará desativá-lo. + A tecla Maiúsc. está ligada. +Ela pode afetar a digitação da senha. </notification> <notification name="NotecardMissing"> Notecard foi perdido no banco de dados. </notification> <notification name="NotecardNoPermissions"> - Permissões insuficientes para visualizar o notecard + Você não está autorizado a ler esta nota. </notification> <notification name="RezItemNoPermissions"> Sem permissões suficientes para criar objetos. @@ -2453,11 +2003,11 @@ Por favor, tente novamente. Por favor, tente novamente. </notification> <notification name="CannotBuyObjectsFromDifferentOwners"> - ImpossÃvel comprar objetos de diferentes compradores ao mesmo tempo. -Por favor, compre apenas um objeto. + Só dá para comprar objetos de um dono por vez. +Selecione só um objeto. </notification> <notification name="ObjectNotForSale"> - Este objeto não está a venda. + Este objeto não está à venda. </notification> <notification name="EnteringGodMode"> Entrando em god mode, nÃvel [LEVEL] @@ -2466,10 +2016,10 @@ Por favor, compre apenas um objeto. Saindo do god mode, nÃvel [LEVEL] </notification> <notification name="CopyFailed"> - A cópia falhou porque você não tem permissão para copiar. + Você não está autorizado a copiar isso. </notification> <notification name="InventoryAccepted"> - [NAME] aceitou sua oferta de inventário. + [NAME] recebeu sua oferta de inventário. </notification> <notification name="InventoryDeclined"> [NAME] rejeitou sua oferta de inventário. @@ -2484,12 +2034,14 @@ Por favor, compre apenas um objeto. Seu cartão de visita foi negado. </notification> <notification name="TeleportToLandmark"> - Agora que você chegou à mainland, você pode se teletransportar para locais como '[NAME]' clicando no botão de Inventário, no canto direito inferior de sua tela, e selecionando a pasta Landmarks. -Dê um duplo-clique na landmark e clique Teletransportar para viajar para o local desejado. + Para se teletransportar para lugares como '[NAME]', abra o painel 'Lugares' à direita da tela e selecione a guia Marcos. +Basta clicar em qualquer marco e depois clicar em 'Teletransportar' na parte inferior da tela. +(Também é possÃvel clicar duas vezes no marco, ou clicar no marco com o botão direito e selecionar 'Teletransportar'.) </notification> <notification name="TeleportToPerson"> - Agora que você chegou à mainland, você pode contatar residentes como '[NAME]' clicando no botão de Inventário, canto direito inferior de sua tela, e selecionando a pasta Cartões de Visita. -Dê um duplo-clique num cartão de visita e em Mensagem Instantânea, digite sua mensagem. + Para entrar em contato com residentes como ''[NAME]', abra o painel 'Pessoas' à direita da tela. +Selecione o residente da lista e clique em 'MI' na parte de baixo do painel. +(Também é possÃvel clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar 'MI'.) </notification> <notification name="CantSelectLandFromMultipleRegions"> ImpossÃvel selecionar terra nas fronteiras do servidor. Tente selecionar um pedaço menor de terra. @@ -2511,6 +2063,9 @@ Dê um duplo-clique num cartão de visita e em Mensagem Instantânea, digite sua <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="PaymentRecived"> + [MESSAGE] + </notification> <notification name="EventNotification"> Notificação de evento: @@ -2533,8 +2088,20 @@ Dê um duplo-clique num cartão de visita e em Mensagem Instantânea, digite sua [NAMES] </notification> <notification name="NoQuickTime"> - O software QuickTime da Apple parece não estar instalado em seu sistema. -Se você deseja ver fluxo de mÃdia em terrenos que aceitem isso, você deverá ir ao site do QickTime (http://www.apple.com/quicktime) e instalar o player do QuickTime. + Aparentemente o QuickTime da Apple ainda não foi instalado no seu computador. +Para ver mÃdia em stream nas regiões que oferecem esse formato, vá ao [http://www.apple.com/quicktime site do QuickTime] e instale o QuickTime Player. + </notification> + <notification name="NoPlugin"> + Nenhum plugin de mÃdia detectado para lidar com o tipo de mime "[MIME_TYPE]". Este tipo de mÃdia não poderão ser acessados. + </notification> + <notification name="MediaPluginFailed"> + Falha no plugin de mÃdia abaixo: + [PLUGIN] + +Instale o plugin novamente ou contate o fabricante se o problema persistir. + <form name="form"> + <ignore name="ignore" text="Falha do plugin de mÃdia"/> + </form> </notification> <notification name="OwnedObjectsReturned"> Os objetos que lhe pertencem no lote selecionado do terreno, voltaram ao seu inventário. @@ -2543,7 +2110,7 @@ Se você deseja ver fluxo de mÃdia em terrenos que aceitem isso, você deverá Os objetos no lote selecionado de terra que pertence a [FIRST] [LAST], voltaram ao seu inventário. </notification> <notification name="OtherObjectsReturned2"> - Os objetos no lote de terra selecionado que pertence ao residente '[NAME]', voltaram aos seus donos. + Os objetos no lote selecionado, do residente [NAME], foram devolidos ao proprietãrio. </notification> <notification name="GroupObjectsReturned"> Os objetos no lote selecionado de terreno compartilhado pelo grupo [GROUPNAME], voltaram para os inventários de seus donos. @@ -2553,23 +2120,26 @@ Objetos não transferÃveis dados ao grupo foram deletados. <notification name="UnOwnedObjectsReturned"> Os objetos no lote selecionado que NÃO são seus, voltaram aos seus donos. </notification> + <notification name="ServerObjectMessage"> + Mensagem de [NAME]: +<nolink>[MSG]</nolink> + </notification> <notification name="NotSafe"> - Esta terra permite que você sofra ataques. -Você pode ser ferido aqui. Se você morrer, você será teletransportado à sua posição inicial. + A opção 'danos' desta região está ativada. +Você pode se dar mal aqui. Se você morre, você será teletransportado de volta para casa. </notification> <notification name="NoFly"> - Este terreno tem a opção Voar desabilitada. -Ou seja, você não pode voar aqui. + Esta área desativou a opção de voar. +Logo, não é possÃvel voar aqui. </notification> <notification name="PushRestricted"> - Esta terra é “Não empurreâ€. -Você não pode empurrar os outros, a não ser que seja o proprietário da terra. + Esta área não tolera empurrões. Não é possÃvel empurrar os outros aqui, a não ser que você seja o proprietário. </notification> <notification name="NoVoice"> - O uso de voz está desabilitado nesta terra. + Esta área desativou o bate-papo de voz. Você não vai ouvir ninguém falar. </notification> <notification name="NoBuild"> - Este terreno tem a opção de construir desabilitada, ou seja, você não pode criar objetos aqui. + Esta área desativou a opção de construir. Não é possÃvel construir ou fazer rez de objetos nesta área. </notification> <notification name="ScriptsStopped"> Um administrador não permitiu scripts temporariamente nesta região. @@ -2578,10 +2148,12 @@ Você não pode empurrar os outros, a não ser que seja o proprietário da terra Esta região não roda nenhum script. </notification> <notification name="NoOutsideScripts"> - Neste terreno, nenhum script funcionará, a não ser os scripts do próprio dono da terra. + Esta região não permite scripts de fora. + +Os únicos scripts que funcionam são os do proprietário do terreno. </notification> <notification name="ClaimPublicLand"> - Pode apenas reclamar terreno público na região em que você está. + Você só pode reivindicar terrenos públicos na região onde você está. </notification> <notification name="RegionTPAccessBlocked"> Você não é permitido na Região devido à sua Classificação de maturidade. Você precisa validar sua idade e/ou instalar o último Visualizador. @@ -2594,16 +2166,9 @@ Por favor, vá ao Banco de Conhecimento para detalhes sobre o acesso de áreas c <notification name="NoTeenGridAccess"> Sua conta não pode conectar a esta região da grade teen. </notification> - <notification name="NoHelpIslandTP"> - Você não pode se tele-transportar de volta à Ilha de Ajuda. -Vá para a Ilha de Ajuda Pública para repetir este tutorial. - </notification> <notification name="ImproperPaymentStatus"> Você não tem o status de pagamento adequado para entrar nesta região. </notification> - <notification name="MustGetAgeRegion"> - Você precisa ter sua idade verificada para entrar nesta região. - </notification> <notification name="MustGetAgeParcel"> Você precisa ter a idade verificada para entrar neste lote. </notification> @@ -2666,31 +2231,35 @@ Por favor, tente novamente em alguns instantes. Nenhum lote válido foi encontrado. </notification> <notification name="ObjectGiveItem"> - Um objeto nomeado [OBJECTFROMNAME] do dono [FIRST] [LAST] deu a você [OBJECTTYPE] nomeado '[OBJECTNAME]'. + Um objeto chamado [OBJECTFROMNAME] de [NAME_SLURL] lhe deu [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button name="Keep" text="Segure"/> <button name="Discard" text="Descarte"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - Um objeto nomeado [OBJECTFROMNAME], de dono desconhecido, deu a você um [OBJECTTYPE] nomeado [OBJECTNAME]. + Um objeto chamado [OBJECTFROMNAME] de (residente desconhecido) lhe deu [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button name="Keep" text="Segure"/> <button name="Discard" text="Descarte"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="UserGiveItem"> - [NAME]deu a voce um [OBJECTTYPE] nomeado '[OBJECTNAME]'. + [NAME_SLURL] lhe deu [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> - <button name="Keep" text="Mantenha"/> + <button name="Show" text="Mostrar"/> <button name="Discard" text="Descarte"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="GodMessage"> [NAME] + [MESSAGE] </notification> <notification name="JoinGroup"> @@ -2702,7 +2271,7 @@ Por favor, tente novamente em alguns instantes. </form> </notification> <notification name="TeleportOffered"> - [NAME] ofereceu um teletransporte para seu local: + [NAME] quer te teletransportar para a região deles: [MESSAGE] <form name="form"> @@ -2710,6 +2279,9 @@ Por favor, tente novamente em alguns instantes. <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification name="TeleportOfferSent"> + Oferta de teletransporte enviada para [TO_NAME] + </notification> <notification name="GotoURL"> [MESSAGE] [URL] @@ -2729,6 +2301,9 @@ Por favor, tente novamente em alguns instantes. <button name="Decline" text="Recusar"/> </form> </notification> + <notification name="FriendshipOffered"> + Você convidou [TO_NAME] para ser seu amigo(a) + </notification> <notification name="OfferFriendshipNoMessage"> [NAME] está lhe oferecendo sua amizade. @@ -2744,21 +2319,27 @@ Por favor, tente novamente em alguns instantes. <notification name="FriendshipDeclined"> [NAME] recusou seu convite de amizade </notification> + <notification name="FriendshipAcceptedByMe"> + Oferta de amizada aceita. + </notification> + <notification name="FriendshipDeclinedByMe"> + Oferta de amizada aceita. + </notification> <notification name="OfferCallingCard"> - [FIRST] [LAST] está oferecendo seu cartão de visita. -Isto adicionará uma anotação em seu inventário, de modo que você possa mandar rapidamente uma IM para este residente. + [FIRST] [LAST] estão te oferecendo um cartão de visita. +Ele colocará um item de inventário, para você possa contatá-lo facilmente. <form name="form"> <button name="Accept" text="Aceitar"/> <button name="Decline" text="Recusar"/> </form> </notification> <notification name="RegionRestartMinutes"> - A região será reiniciada em [MINUTES] minutos. -Se permanecer nesta região, você será desconectado. + Esta região será reiniciada em [MINUTES] minutos. +Se permanecer aqui, você será desconectado. </notification> <notification name="RegionRestartSeconds"> - Região será reiniciada em [SECONDS] segundos. -Se permanecer nesta região, você será desconectado. + Esta região será reiniciada em [SECONDS] segundos. +Se permanecer aqui, você será desconectado. </notification> <notification name="LoadWebPage"> Carregar página da web [URL]? @@ -2778,7 +2359,7 @@ Do objeto: [OBJECTNAME], dono: [NAME]? Falhou ao procurar [TYPE] nomeado [DESC] no banco de dados. </notification> <notification name="InvalidWearable"> - O item que você está tentando vestir usa uma caracterÃstica que seu Visualizador não lê. Por favor, atualize sua versão do [APP_NAME] para vestir este item. + O item que você está tentando usar tem um recurso que seu Visualizador não consegue ler. Atualize o [APP_NAME] para poder vestir esse item. </notification> <notification name="ScriptQuestion"> '[OBJECTNAME]', um objeto pertencente a '[NAME]', gostaria de: @@ -2788,16 +2369,16 @@ Está OK? <form name="form"> <button name="Yes" text="Sim"/> <button name="No" text="Não"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="ScriptQuestionCaution"> - '[OBJECTNAME]', um objeto de '[NAME]', gostaria de: + Um objeto chamado '[OBJECTNAME]', de '[NAME]' gostaria de: [QUESTIONS] -Se você não confia neste objeto ou em seu criador, você deveria negar o pedido. Para informações adicionais clique no botão Detalhes. +Se você não confia nos objetos deste autor, recuse-o. -Autorizar este pedido? +Deixar? <form name="form"> <button name="Grant" text="Autorizar"/> <button name="Deny" text="Negar"/> @@ -2818,39 +2399,20 @@ Autorizar este pedido? <button name="Ignore" text="Ignorar"/> </form> </notification> - <notification name="FirstBalanceIncrease"> - Você recebeu uma quantia de L$[AMOUNT]. -Objetos e outros usuários podem dar L$ a você. -Seu saldo é mostrado no canto superior direito da tela. - </notification> - <notification name="FirstBalanceDecrease"> - Você pagou L$[AMOUNT]. -O seu balanço de dinheiro está sendo mostrado no canto superior direito da tela. - </notification> - <notification name="FirstSit"> - Você está sentado. -Use as setas (ou AWSD) para mudar a visão. -Clique em 'Levantar' para levantar. - </notification> - <notification name="FirstMap"> - Clique e arraste para movimentar o mapa. -Dê um duplo clique para teletransportar-se. -Use os controles à direita para achar coisas e mostrar fundos diferentes. - </notification> - <notification name="FirstBuild"> - Você pode construir novos objetos em algumas áreas do [SECOND_LIFE]. -Use as ferramentas acima, à esquerda para construir e tente manter apertadas as teclas Ctrl ou Alt para mudar rapidamente as ferramentas. -Aperte ESC para parar de construir. - </notification> - <notification name="FirstLeftClickNoHit"> - Clicando com esquerdo, você interage com os objetos especiais. -Se o ponteiro do mouse mudar a uma mão, você pode interagir com o objeto. -Clique com o direito que será mostrado sempre um menu das ações que você pode fazer. + <notification name="ScriptToast"> + [FIRST] [LAST], '[TITLE]' está pedindo dados de usuário. + <form name="form"> + <button name="Open" text="Abrir diálogo"/> + <button name="Ignore" text="Ignorar"/> + <button name="Block" text="Bloquear"/> + </form> </notification> - <notification name="FirstTeleport"> - Esta região não permite teletransporte ponto-a-ponto. Assim, você foi teletransportado para o telehub mais próximo. -Seu destino está assinalado com um farol alto. -Siga a flecha vermelha até o farol, ou clique nela para apagar o farol. + <notification name="BuyLindenDollarSuccess"> + Obrigado e volte sempre! + +Seu saldo L$ será atualizado findo o processamento da transação. Se o processamento levar mais de 20 min, a transação pode vir a ser cancelada. Neste caso, o valor da compra será creditado ao seu saldo em US$. + +Para checar o status do pagamento, consulte seu Histórico de transações no [http://secondlife.com/account/ Painel] </notification> <notification name="FirstOverrideKeys"> Suas chaves do movimento estão sendo seguras agora por um objeto. @@ -2858,88 +2420,57 @@ Tente as teclas de setas ou AWSD para ver o que elas fazem. Alguns objetos (como armas) requerem que você passe para mouselook para usá-los. Pressione 'M' para fazer isto. </notification> - <notification name="FirstAppearance"> - Você está editando sua aparência. -Para girar e ver em zoom, use as teclas de setas. -Quando terminar, aperte 'Salvar Tudo' para salvar sua aparência e sair. -Você pode editar sua aparência quantas vezes quiser. - </notification> - <notification name="FirstInventory"> - Este é o seu inventário, que contém objetos, notecards, roupas e outras coisas suas. -* Para vestir um objeto ou uma pasta completa, arraste-o para si mesmo(a). -* Para trzer um objeto ao mundo, arraste-o ao chão. -* Para ler um notecard, dê um duplo-click nele. - </notification> <notification name="FirstSandbox"> - Esta é a região conhecida como sandbox. -Os objetos que você constrói aqui podem ser deletados depois que você deixa a área. -As sandboxes são limpas de forma periódica. -Por favor, veja a informação no alto da tela, próxima ao nome da região. -As regiões de sandbox não são comuns e são marcadas com sÃmbolos. - </notification> - <notification name="FirstFlexible"> - Este objeto tem a propriedade flexÃvel. -Objetos flexÃveis não podem ser fÃsicos e devem ser fantasmas até que a caixa de verificação seja desmarcada. - </notification> - <notification name="FirstDebugMenus"> - Você ativou o menu Avançado. -Este menu contém funcionalidades úteis para desenvolvedores debugarem o [SECOND_LIFE]. -Para mostrar esse menu no Windows pressione Ctrl+Alt+D. No Mac pressione ⌥⌘D. - </notification> - <notification name="FirstSculptedPrim"> - Você está editando uma primitiva esculpida. -Primitivas esculpidas requerem uma textura especial para especificar suas formas. -Você encontrará exemplos dessas texturas na Biblioteca do Inventário. - </notification> - <notification name="FirstMedia"> - Você começou a tocar uma mÃdia. MÃdias podem ser autorizadas a iniciar automaticamente se você assim escolher na janela de Preferências, sob Ãudio/VÃdeo. Atente para o risco de segurança que pode haver ao acessar websites de mÃdia que você não confia. + Este é um sandbox, uma área onde residentes podem aprender a construir. + +Qualquer objeto deixado aqui será apagado quando você sair. Não se esqueça de clicar duas vezes e selecionar 'Pegar' para levar seu projeto para o seu inventário. </notification> <notification name="MaxListSelectMessage"> Você pode selecionar até [MAX_SELECT] itens desta lista. </notification> <notification name="VoiceInviteP2P"> - [NAME] está lhe convidando para uma conversa com voz. -Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando. + [NAME] está te convidando para um bate-papo de voz. +Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique em Bloquear para bloquear ligações deste avatar. <form name="form"> <button name="Accept" text="Aceitar"/> <button name="Decline" text="Recusar"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="AutoUnmuteByIM"> - [FIRST] [LAST] recebeu uma Mensagem Instantânea sua e automaticamente não está mais no modo mudo. + [FIRST] [LAST] recebeu uma MI e foi desbloqueado(a) automaticamente. </notification> <notification name="AutoUnmuteByMoney"> - [FIRST] [LAST] recebeu pagamento seu e automaticamente não está mais no modo mudo. + [FIRST] [LAST] recebeu dinheiro e foi desbloqueado(a) automaticamente. </notification> <notification name="AutoUnmuteByInventory"> - [FIRST] [LAST] recebeu inventário seu e automaticamente não está mais mudo. + [FIRST] [LAST] recebeu dinheiro e foi desbloqueado(a) automaticamente. </notification> <notification name="VoiceInviteGroup"> - [NAME] juntou-se a uma conversa com voz do grupo [GROUP]. -Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando. + [NAME] atendeu uma ligação de bate-papo de voz com o grupo [GROUP]. +Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique em Bloquear para bloquear ligações deste avatar. <form name="form"> <button name="Accept" text="Aceitar"/> <button name="Decline" text="Recusar"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="VoiceInviteAdHoc"> - [NAME] juntou-se a uma chamada de Conferência com voz... -Clique Aceitar para juntar-se à chamada ou Recusar para recusar o convite. Clique Mudo para calar este usuário. + [NAME] atendeu uma ligação de teleconferência. +Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique em Bloquear para bloquear ligações deste avatar. <form name="form"> <button name="Accept" text="Aceitar"/> <button name="Decline" text="Recusar"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="InviteAdHoc"> - [NAME] está lhe convidando para uma conversa em conferência... - Clique Aceitar para se juntar à conversa, ou Recusar para recusar o convite. Clique Mudo para calar este usuário. + [NAME] está te convidando para uma teleconferência de bate-papo. +Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique em Bloquear para bloquear ligações deste avatar. <form name="form"> <button name="Accept" text="Aceitar"/> <button name="Decline" text="Recusar"/> - <button name="Mute" text="Mudo"/> + <button name="Mute" text="Bloquear"/> </form> </notification> <notification name="VoiceChannelFull"> @@ -2949,25 +2480,25 @@ Clique Aceitar para juntar-se à chamada ou Recusar para recusar o convite. Cliq Desculpe-nos. Esta área atingiu seu limite de capacidade para conversas com voz. Favor tentar usar voz em outra área. </notification> <notification name="VoiceChannelDisconnected"> - Você foi desconectado de [VOICE_CHANNEL_NAME]. Voce será reconectado agora à Conversa com voz local. + Você saiu da ligação com [VOICE_CHANNEL_NAME]. Agora você será reconectado ao bate-papo local. </notification> <notification name="VoiceChannelDisconnectedP2P"> - [VOICE_CHANNEL_NAME] desligou a chamada. Voce será reconectado agora à Conversa com voz local. + [VOICE_CHANNEL_NAME] encerrou a ligação. Agora você será reconectado ao bate-papo local. </notification> <notification name="P2PCallDeclined"> - [VOICE_CHANNEL_NAME] recusou sua chamada. Voce será reconectado agora à Conversa com voz local. + [VOICE_CHANNEL_NAME] recusou a ligação. Agora você será reconectado ao bate-papo local. </notification> <notification name="P2PCallNoAnswer"> - [VOICE_CHANNEL_NAME] não está disponÃvel para aceitar sua chamada. Voce será reconectado agora à Conversa com voz local. + [VOICE_CHANNEL_NAME] não está disponÃvel para atender sua ligação. Agora você será reconectado ao bate-papo local. </notification> <notification name="VoiceChannelJoinFailed"> - Falha na conexão com [VOICE_CHANNEL_NAME], tente novamente mais tarde. Voce será reconectado agora à Conversa com voz local. + Falha de conexão com [VOICE_CHANNEL_NAME]. Tente novamente mais tarde. Agora você será reconectado ao bate-papo local. </notification> <notification name="VoiceLoginRetry"> Estamos criando uma canal de voz para você. Isto pode levar até um minuto. </notification> <notification name="Cannot enter parcel: not a group member"> - Você não pode entrar nessa terra, você não é membro do grupo autorizado. + Só membros de um grupo podem acessar esta área. </notification> <notification name="Cannot enter parcel: banned"> Você não pode entrar nessa terra, você foi banido. @@ -2982,18 +2513,62 @@ Clique Aceitar para juntar-se à chamada ou Recusar para recusar o convite. Cliq Ocorreu um erro enquanto você tentava se conectar à conversa de voz de [VOICE_CHANNEL_NAME]. Favor tentar novamente mais tarde. </notification> <notification name="ServerVersionChanged"> - A região em que você entrou está rodando uma versão diferente de simulador. Clique aqui para mais detalhes. + Você chegou a uma região com uma versão diferente de servidor, que pode afetar o desempenho. [[URL] Consultar notas da versão.] + </notification> + <notification name="UnsupportedCommandSLURL"> + O SLurl no qual você clicou não é suportado. + </notification> + <notification name="BlockedSLURL"> + Um SLurl recebido de um navegador inidôneo foi bloqueado para a sua segurança. </notification> - <notification name="UnableToOpenCommandURL"> - A URL que vocÊ clicou não pode ser aberta no navegador web. + <notification name="ThrottledSLURL"> + Vários SLurls foram recebidos de um navegador inidôneo em pouco tempo. +Para sua segurança, os SLurls serão bloqueados por alguns instantes. + </notification> + <notification name="IMToast"> + [MESSAGE] + <form name="form"> + <button name="respondbutton" text="Responder"/> + </form> + </notification> + <notification name="ConfirmCloseAll"> + Tem certeza de que quer fechar todas as MIs? + <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="AttachmentSaved"> + Anexo salvo. + </notification> + <notification name="UnableToFindHelpTopic"> + Nenhum tópico de ajuda foi encontrado com relação a este elemento. + </notification> + <notification name="ObjectMediaFailure"> + Erro do servidor: Falha ao atualizar ou executar a mÃdia. +'[ERROR]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="TextChatIsMutedByModerator"> + Seu texto de bate-papo foi silenciado pelo moderador. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="VoiceIsMutedByModerator"> + Sua voz foi silenciada pelo moderador. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="ConfirmClearTeleportHistory"> + Tem certeza que deseja apagar todo o seu histórico de teletransporte? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> + <notification name="BottomTrayButtonCanNotBeShown"> + O botão selecionado não pode ser exibido no momento. +O botão será exibido quando houver espaço suficente. </notification> <global name="UnsupportedCPU"> - A velocidade da sua CPU não suporta os requisitos mÃnimos exigidos. </global> <global name="UnsupportedGLRequirements"> - Você não parece ter os requisitos de hardware recomendados para rodar o [APP_NAME]. O [APP_NAME] exige uma placa gráfica OpenGL que tem apoio a multi- texturas. Se este for o caso, você pode se certificar de que tem os drivers mais recentes para sua placa gráfica, e os patches e pacotes de serviços para seu sistema operacional. + Aparentemente a sua máquina não atende os requisitos de hardware do [APP_NAME]. [APP_NAME] requer placas de vÃdeo OpenGL com suporte a multitexturas. Se sua place de vÃdeo tiver este perfil, atualize o driver da placa de vÃdeo, assim como patches e service packs do sistema operacional. -Se continuar com problemas, por favor visite: http://www.secondlife.com/support +Se você continuar a receber esta mensagem, consulte o [SUPPORT_SITE]. </global> <global name="UnsupportedCPUAmount"> 796 @@ -3007,10 +2582,8 @@ Se continuar com problemas, por favor visite: http://www.secondlife.com/support <global name="UnsupportedRAM"> - A memória do seu sistema não suporta os requisitos mÃnimos exigidos. </global> - <global name="PermYes"> - Sim - </global> - <global name="PermNo"> - Não + <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> + Se você tem um terreno, seu terreno pode ser sua casa. +Outra opção é procurar por lugares com a tag 'Infohub' no mapa. </global> </notifications> diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml new file mode 100644 index 0000000000..73f6b2225f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_activeim_row"> + <string name="unknown_obj"> + Objeto desconhecido + </string> + <text name="object_name"> + Objeto sem nome + </text> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml new file mode 100644 index 0000000000..bd50d4953d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="vertical_stack"> + <layout_panel name="call_btn_panel"> + <button label="Ligar" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Desligar" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Controles de voz" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml new file mode 100644 index 0000000000..06d8823a74 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="avatar_list_item"> + <string name="FormatSeconds"> + [COUNT]s + </string> + <string name="FormatMinutes"> + [COUNT]min + </string> + <string name="FormatHours"> + [COUNT]h + </string> + <string name="FormatDays"> + [COUNT]dias + </string> + <string name="FormatWeeks"> + [COUNT]semanas + </string> + <string name="FormatMonths"> + [COUNT]meses + </string> + <string name="FormatYears"> + [COUNT]anos + </string> + <text name="avatar_name" value="Desconhecido"/> + <button name="profile_btn" tool_tip="Ver perfil"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml new file mode 100644 index 0000000000..c5f93d719a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="block_list_panel"> + <text name="title_text"> + Lista de bloqueados + </text> + <scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/> + <button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/> + <button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/> + <button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml new file mode 100644 index 0000000000..092135bd42 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray"> + <string name="SpeakBtnToolTip"> + Liga e desliga o microfone + </string> + <string name="VoiceControlBtnToolTip"> + Mostra/oculta os controles de voz + </string> + <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Falar" label_selected="Falar" name="speak_btn"/> + </talk_button> + </layout_panel> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/> + </layout_panel> + <layout_panel name="movement_panel"> + <button label="Movimentar" name="movement_btn" tool_tip="Mostra/oculta os controles de movimento"/> + </layout_panel> + <layout_panel name="cam_panel"> + <button label="Exibir" name="camera_btn" tool_tip="Mostra/oculta os controles da câmera"/> + </layout_panel> + <layout_panel name="snapshot_panel"> + <button label="" name="snapshots" tool_tip="Tirar foto"/> + </layout_panel> + <layout_panel name="im_well_panel"> + <chiclet_im_well name="im_well"> + <button name="Unread IM messages" tool_tip="Conversas"/> + </chiclet_im_well> + </layout_panel> + <layout_panel name="notification_well_panel"> + <chiclet_notification name="notification_well"> + <button name="Unread" tool_tip="Notificações"/> + </chiclet_notification> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..78d9826099 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="bottom_tray_lite"> + <layout_stack name="toolbar_stack_lite"> + <layout_panel name="gesture_panel"> + <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml new file mode 100644 index 0000000000..8441cd9913 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_classified_info"> + <panel.string name="l$_price"> + L$ [PRICE] + </panel.string> + <text name="title" value="Dados do anúncio"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text_editor name="classified_name" value="[nome]"/> + <text_editor name="classified_location" value="[carregando...]"/> + <text_editor name="content_type" value="[content type]"/> + <text_editor name="category" value="[category]"/> + <check_box label="Renovar automaticamente todas as semanas" name="auto_renew"/> + <text_editor name="price_for_listing" tool_tip="Preço do anúncio."/> + <text_editor name="classified_desc" value="[descrição]"/> + </panel> + </scroll_container> + <panel name="buttons"> + <button label="Teletransportar" name="teleport_btn"/> + <button label="Mapa" name="show_on_map_btn"/> + <button label="Editar" name="edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml new file mode 100644 index 0000000000..f8be9daf1b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_alpha_panel"> + <panel name="avatar_alpha_color_panel"> + <texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/> + <texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml new file mode 100644 index 0000000000..a754c5f070 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar anúncio" name="panel_edit_classified"> + <panel.string name="location_notice"> + (salvar para atualizar) + </panel.string> + <text name="title"> + Editar anúncio + </text> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/> + <text name="Name:"> + Cargo: + </text> + <text name="description_label"> + Descrição: + </text> + <text name="location_label"> + Localização: + </text> + <text name="classified_location"> + Carregando... + </text> + <button label="Usar configuração local" name="set_to_curr_location_btn"/> + <spinner label="L$" name="price_for_listing" tool_tip="Preço do anúncio" value="50"/> + <check_box label="Renovação automática semanal" name="auto_renew"/> + </panel> + </scroll_container> + <panel label="bottom_panel" name="bottom_panel"> + <button label="Salvar" name="save_changes_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml new file mode 100644 index 0000000000..2c73e67c4a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_eyes_panel"> + <panel name="avatar_eye_color_panel"> + <texture_picker label="Ãris" name="Iris" tool_tip="Selecionar imagem"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="eyes_main_tab" title="Olhos"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml new file mode 100644 index 0000000000..6b4141e4a7 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_gloves_panel"> + <panel name="avatar_gloves_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="gloves_main_tab" title="Luvas"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml new file mode 100644 index 0000000000..b49f5850aa --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_hair_panel"> + <panel name="avatar_hair_color_panel"> + <texture_picker label="Texture" name="Texture" tool_tip="Selecionar imagem"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="hair_color_tab" title="Cor"/> + <accordion_tab name="hair_style_tab" title="Estilo"/> + <accordion_tab name="hair_eyebrows_tab" title="Sombrancelhas"/> + <accordion_tab name="hair_facial_tab" title="Faciais"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml new file mode 100644 index 0000000000..dcccf76c26 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_jacket_panel"> + <panel name="avatar_jacket_color_panel"> + <texture_picker label="Tecido de cima" name="Upper Fabric" tool_tip="Selecionar imagem"/> + <texture_picker label="Tecido de baixo" name="Lower Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="jacket_main_tab" title="Jaqueta"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml new file mode 100644 index 0000000000..8cfa6933eb --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_pants_panel"> + <panel name="avatar_pants_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="pants_main_tab" title="Calças"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml new file mode 100644 index 0000000000..f56533652d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar destaques" name="panel_edit_pick"> + <text name="title"> + Editar destaques + </text> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/> + <text name="Name:"> + Cargo: + </text> + <text name="description_label"> + Descrição: + </text> + <text name="location_label"> + Localização: + </text> + <text name="pick_location"> + Carregando... + </text> + <button label="Usar configuração local" name="set_to_curr_location_btn"/> + </panel> + </scroll_container> + <panel label="bottom_panel" name="bottom_panel"> + <button label="Salvar [WHAT]" name="save_changes_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml index a989cab167..c9e5513424 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml @@ -1,45 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="edit_profile_panel"> - <string name="CaptionTextAcctInfo"> - [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] - </string> - <string name="AcctTypeResident" - value="Residente" /> - <string name="AcctTypeTrial" - value="Teste" /> - <string name="AcctTypeCharterMember" - value="Estatuto do membro" /> - <string name="AcctTypeEmployee" - value="Contratado da Linden Lab" /> - <string name="PaymentInfoUsed" - value="Infor. de pagamento utilizadas" /> - <string name="PaymentInfoOnFile" - value="Infor. de pagamento no arquivo" /> - <string name="NoPaymentInfoOnFile" - value="Sem infor. de pagamento no arquivo" /> - <string name="AgeVerified" - value="Idade Verificada" /> - <string name="NotAgeVerified" - value="Idade não Verificada" /> - <string name="partner_edit_link_url"> - http://www.secondlife.com/account/partners.php?lang=pt - </string> - <panel name="scroll_content_panel"> - <panel name="data_panel" > - <panel name="lifes_images_panel"> - <panel name="second_life_image_panel"> - <text name="second_life_photo_title_text"> - [SECOND_LIFE]: - </text> - </panel> - </panel> - <text name="title_partner_text" value="Parceiro:"/> - <panel name="partner_data_panel"> - <text name="partner_text" value="[FIRST] [LAST]"/> - </panel> - <text name="text_box3"> - Resposta no Modo Ocupado: - </text> - </panel> - </panel> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Editar perfil" name="edit_profile_panel"> + <string name="CaptionTextAcctInfo"> + [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] + </string> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <string name="AcctTypeResident" value="Residente"/> + <string name="AcctTypeTrial" value="Teste"/> + <string name="AcctTypeCharterMember" value="Estatuto do membro"/> + <string name="AcctTypeEmployee" value="Contratado da Linden Lab"/> + <string name="PaymentInfoUsed" value="Infor. de pagamento utilizadas"/> + <string name="PaymentInfoOnFile" value="Infor. de pagamento no arquivo"/> + <string name="NoPaymentInfoOnFile" value="Sem infor. de pagamento no arquivo"/> + <string name="AgeVerified" value="Idade Verificada"/> + <string name="NotAgeVerified" value="Idade não Verificada"/> + <string name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=pt + </string> + <string name="no_partner_text" value="Nenhum"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="data_panel"> + <panel name="lifes_images_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Selecione uma imagem"/> + </panel> + <panel name="first_life_image_panel"> + <text name="real_world_photo_title_text" value="Mundo real:"/> + </panel> + <icon label="" name="real_world_edit_icon" tool_tip="Selecione uma imagem"/> + <text name="title_homepage_text"> + Página web: + </text> + <check_box label="Mostrar nos resultados de busca" name="show_in_search_checkbox"/> + <text name="title_acc_status_text" value="Minha conta:"/> + <text_editor name="acc_status_text" value="Residente. Dados de pagamento: não constam"/> + <text name="my_account_link" value="[[URL] Abrir meu painel]"/> + <text name="title_partner_text" value="Parceiro(a):"/> + <panel name="partner_data_panel"> + <name_box initial_value="(pesquisando)" name="partner_text"/> + </panel> + <text name="partner_edit_link" value="[[URL] Editar]"/> + </panel> + </panel> + </scroll_container> + <panel name="profile_me_buttons_panel"> + <button label="Salvar alterações" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml new file mode 100644 index 0000000000..6a03c2e2ff --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shape_panel"> + <panel name="avatar_sex_panel"> + <text name="gender_text"> + Sexo: + </text> + <radio_group name="sex_radio"> + <radio_item label="Feminino" name="radio"/> + <radio_item label="Masculino" name="radio2"/> + </radio_group> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shape_body_tab" title="Corpo"/> + <accordion_tab name="shape_head_tab" title="Cabeça"/> + <accordion_tab name="shape_eyes_tab" title="Olhos"/> + <accordion_tab name="shape_ears_tab" title="Orelhas"/> + <accordion_tab name="shape_nose_tab" title="Nariz"/> + <accordion_tab name="shape_mouth_tab" title="Boca"/> + <accordion_tab name="shape_chin_tab" title="Queixo"/> + <accordion_tab name="shape_torso_tab" title="Tronco"/> + <accordion_tab name="shape_legs_tab" title="Pernas"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml new file mode 100644 index 0000000000..e9d4207e49 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shirt_panel"> + <panel name="avatar_shirt_color_panel"> + <texture_picker label="tecido" name="Fabric" tool_tip="Clique para escolher uma foto"/> + <color_swatch label="Cor/Matiz" name="Color/Tint" tool_tip="Clique para abrir o selecionador de cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shirt_main_tab" title="Camisa"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml new file mode 100644 index 0000000000..79cb641079 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_shoes_panel"> + <panel name="avatar_shoes_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="shoes_main_tab" title="Sapatos"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml new file mode 100644 index 0000000000..e3caf9f6f7 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_skin_panel"> + <panel name="avatar_skin_color_panel"> + <texture_picker label="Tatuagens na cabeça" name="Head Tattoos" tool_tip="Selecionar imagem"/> + <texture_picker label="Tatuagem parte de cima" name="Upper Tattoos" tool_tip="Selecionar imagem"/> + <texture_picker label="Tatuagem de baixo" name="Lower Tattoos" tool_tip="Selecionar imagem"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skin_color_tab" title="Cor da pele"/> + <accordion_tab name="skin_face_tab" title="Detalhe do rosto"/> + <accordion_tab name="skin_makeup_tab" title="Maquilagem"/> + <accordion_tab name="skin_body_tab" title="Detalhe do corpo"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml new file mode 100644 index 0000000000..00ec0691ea --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_skirt_panel"> + <panel name="avatar_skirt_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="skirt_main_tab" title="Saia"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml new file mode 100644 index 0000000000..88abc74716 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_socks_panel"> + <panel name="avatar_socks_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="socks_main_tab" title="Meias"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml new file mode 100644 index 0000000000..c11d800171 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_tattoo_panel"> + <panel name="avatar_tattoo_color_panel"> + <texture_picker label="Tatoo de cabeça" name="Head Tattoo" tool_tip="Clique para escolher uma foto"/> + <texture_picker label="Tatoo da parte superior do corpo" name="Upper Tattoo" tool_tip="Clique para escolher uma foto"/> + <texture_picker label="Tatoo da parte inferior do corpo" name="Lower Tattoo" tool_tip="Clique para escolher uma foto"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml new file mode 100644 index 0000000000..10c34a1c0a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_underpants_panel"> + <panel name="avatar_underpants_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="underpants_main_tab" title="Roupa de baixo"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml new file mode 100644 index 0000000000..fb7b919365 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="edit_undershirt_panel"> + <panel name="avatar_undershirt_color_panel"> + <texture_picker label="Tecido" name="Fabric" tool_tip="Selecionar imagem"/> + <color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/> + </panel> + <accordion name="wearable_accordion"> + <accordion_tab name="undershirt_main_tab" title="Camiseta"/> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml new file mode 100644 index 0000000000..b85d481941 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="VestÃvel" name="panel_edit_wearable"> + <string name="edit_shape_title"> + Editando forma + </string> + <string name="edit_skin_title"> + Editando pele + </string> + <string name="edit_hair_title"> + Editando cabelo + </string> + <string name="edit_eyes_title"> + Editando os olhos + </string> + <string name="edit_shirt_title"> + Editando camisa + </string> + <string name="edit_pants_title"> + Editando calças + </string> + <string name="edit_shoes_title"> + Editando sapatos + </string> + <string name="edit_socks_title"> + Editando meias + </string> + <string name="edit_jacket_title"> + Editando jaqueta + </string> + <string name="edit_skirt_title"> + Editando saia + </string> + <string name="edit_gloves_title"> + Editando luvas + </string> + <string name="edit_undershirt_title"> + Editando camiseta + </string> + <string name="edit_underpants_title"> + Editando roupa de baixo + </string> + <string name="edit_alpha_title"> + Editando máscara Alpha + </string> + <string name="edit_tattoo_title"> + Editando tatuagem + </string> + <string name="shape_desc_text"> + Forma: + </string> + <string name="skin_desc_text"> + Pele: + </string> + <string name="hair_desc_text"> + Cabelo: + </string> + <string name="eyes_desc_text"> + Olhos: + </string> + <string name="shirt_desc_text"> + Camisa: + </string> + <string name="pants_desc_text"> + Calças: + </string> + <string name="shoes_desc_text"> + Sapatos: + </string> + <string name="socks_desc_text"> + Meias: + </string> + <string name="jacket_desc_text"> + Jaqueta: + </string> + <string name="skirt_skirt_desc_text"> + Saia: + </string> + <string name="gloves_desc_text"> + Luvas: + </string> + <string name="undershirt_desc_text"> + Camiseta: + </string> + <string name="underpants_desc_text"> + Roupa de baixo: + </string> + <string name="alpha_desc_text"> + Máscara alpha: + </string> + <string name="tattoo_desc_text"> + Tatuagem: + </string> + <text name="edit_wearable_title" value="Editando forma"/> + <panel label="Camisa" name="wearable_type_panel"> + <text name="description_text" value="Forma:"/> + </panel> + <panel name="button_panel"> + <button label="Salvar como" name="save_as_button"/> + <button label="Reverter" name="revert_button"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml index d430d637ad..34073f9ce1 100644 --- a/indra/newview/skins/default/xui/pt/panel_friends.xml +++ b/indra/newview/skins/default/xui/pt/panel_friends.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="friends"> <string name="Multiple"> - Múltiplos amigos... + Diversos amigos </string> <scroll_list name="friend_list" tool_tip="Aperte shift ou control enquanto clica para selecionar múltiplos amigos"> <column name="icon_online_status" tool_tip="Status Online"/> @@ -11,10 +11,10 @@ <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/> <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/> </scroll_list> - <button width="86" label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/> - <button width="86" label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/> - <button width="86" label="Teletransp..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/> - <button width="86" label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/> - <button width="86" label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/> - <button width="86" label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/> + <button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea" width="86"/> + <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações" width="86"/> + <button label="Teletransportar" name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual" width="86"/> + <button label="Pagar" name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo" width="86"/> + <button label="Tirar" name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos" width="86"/> + <button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade para um residente" width="86"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml new file mode 100644 index 0000000000..502dae8d67 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="vertical_stack"> + <layout_panel name="group_info_btn_panel"> + <button label="Perfil do grupo" name="group_info_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Ligar para o grupo" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="Desligar" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Abrir controles de voz" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index 226011c138..85488f43af 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml @@ -1,70 +1,55 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Geral" name="general_tab"> - <string name="help_text"> - A aba Geral contém informações gerais sobre este grupo, a lista dos donos e membros visÃveis, preferências gerais do grupo e opções dos membros. Passe o mouse sobre as opções para mais ajuda. - </string> - <string name="group_info_unchanged"> - Informações gerais do grupo foram modificadas - </string> - <button label="?" label_selected="?" name="help_button"/> - <line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/> - <text name="group_name"> - Digite o nome do seu novo grupo aqui - </text> - <text name="prepend_founded_by"> - Fundado por: - </text> - <text name="founder_name" left_delta="74" > - (espera) - </text> - <text name="group_charter_label"> - Declaração do Grupo - </text> - <texture_picker label="InsÃgnia do Grupo" name="insignia" tool_tip="Clique para escolher uma imagem"/> + <panel.string name="help_text"> + A guia Geral contém informações gerais sobre o grupo, uma lista de membros, preferências do grupo e opções para membros. + +Para obter mais ajuda, passe o mouse sobre as opções. + </panel.string> + <panel.string name="group_info_unchanged"> + Informações gerais do grupo modificadas. + </panel.string> + <panel.string name="incomplete_member_data_str"> + Recuperando dados do membro + </panel.string> + <panel name="group_info_top"> + <texture_picker label="" name="insignia" tool_tip="Selecionar imagem"/> + <text name="prepend_founded_by"> + Fundador: + </text> + <name_box initial_value="(pesquisando)" name="founder_name"/> + <text name="join_cost_text"> + Grátis + </text> + <button label="ENTRAR AGORA!" name="btn_join"/> + </panel> <text_editor name="charter"> Declaração do grupo </text_editor> - <button label="Unir (L$0)" label_selected="Unir (L$0)" name="join_button"/> - <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/> - <text name="text_owners_and_visible_members"> - Proprietários & Membros visÃveis - </text> - <text name="text_owners_are_shown_in_bold"> - (Proprietários são mostrados em negrito ) - </text> <name_list name="visible_members"> - <name_list.columns label="Nome do membro" name="name"/> + <name_list.columns label="Membro" name="name"/> <name_list.columns label="TÃtulo" name="title"/> - <name_list.columns label="Último login" name="online"/> + <name_list.columns label="Status" name="status"/> </name_list> - <text name="text_group_preferences"> - Preferências do Grupo + <text name="my_group_settngs_label"> + Eu </text> + <text name="active_title_label"> + Meu cargo + </text> + <combo_box name="active_title" tool_tip="Define o cargo que é exibido com o nome do seu avatar quando o grupo está ativo."/> + <check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Define o seu recebimento de avisos deste grupo. Desmarque esta opção se o grupo envia spam."/> + <check_box label="Mostrar no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja incluir este grupo no seu perfil."/> <panel name="preferences_container"> - <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/> - <check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/> - <check_box label="Taxa de adesão:" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/> - <spinner width="60" left_delta="120" name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/> - <combo_box width="170" name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature."> - <combo_box.item name="select_mature" label="- Selecionar Maturidade -"/> - <combo_box.item name="mature" label="Conteúdo Mature"/> - <combo_box.item name="pg" label="Conteúdo PG"/> + <text name="group_settngs_label"> + Grupo + </text> + <check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/> + <check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/> + <spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção 'Taxa de associação' estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/> + <combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature." width="170"> + <combo_box.item label="Conteúdo PG" name="pg"/> + <combo_box.item label="Conteúdo Mature" name="mature"/> </combo_box> - <panel name="title_container"> - <text name="active_title_label"> - Meu tÃtulo ativo - </text> - <combo_box name="active_title" tool_tip="Define o tÃtulo que aparece em seu avatar quando o grupo estiver ativo."/> - </panel> - <check_box label="Receber notÃcias do grupo" name="receive_notices" tool_tip="Define se Você deseja receber notÃcias deste grupo. Desmarque esta caixa se o grupo está lhe fazendo spam."/> - <check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/> + <check_box initial_value="true" label="Mostre na busca" name="show_in_group_list" tool_tip="Incluir o grupo nos resultados de busca"/> </panel> - <string name="incomplete_member_data_str"> - Recuperando dados do membro - </string> - <string name="confirm_group_create_str"> - Criar este grupo irá custar L$100. -Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo? -Esteja consciente de que se ninguém mais se juntar a este grupo dentro de 48 horas, este será dissolvido e o nome não estará disponÃvel para uso futuro. - </string> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml new file mode 100644 index 0000000000..29d757346c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Perfil do grupo" name="GroupInfo"> + <panel.string name="default_needs_apply_text"> + Algumas modificações não foram salvas + </panel.string> + <panel.string name="want_apply_text"> + Deseja salvar essas mudanças? + </panel.string> + <panel.string name="group_join_btn"> + Entrar (L$[AMOUNT]) + </panel.string> + <panel.string name="group_join_free"> + Grátis + </panel.string> + <panel name="group_info_top"> + <text name="group_name" value="Carregando..."/> + <line_editor label="Digite o nome do grupo novo aqui" name="group_name_editor"/> + </panel> + <layout_stack name="layout"> + <layout_panel name="group_accordions"> + <accordion name="groups_accordion"> + <accordion_tab name="group_general_tab" title="Geral"/> + <accordion_tab name="group_roles_tab" title="Cargos"/> + <accordion_tab name="group_notices_tab" title="Avisos"/> + <accordion_tab name="group_land_tab" title="Terrenos/Bens"/> + </accordion> + </layout_panel> + <layout_panel name="button_row"> + <button label="Bate-papo" name="btn_chat"/> + <button label="Ligar para o grupo" name="btn_call" tool_tip="Ligar para este grupo"/> + <button label="Salvar" label_selected="Salvar" name="btn_apply"/> + <button label="Criar grupo" name="btn_create" tool_tip="Criar um grupo novo"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml index a02a17139b..c7def0ed96 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml @@ -1,23 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Convidar um membro" name="invite_panel" width="224"> + <panel.string name="confirm_invite_owner_str"> + Você tem certeza de que deseja convidar novo(s) proprietário(s)? Esta ação é permanente! + </panel.string> + <panel.string name="loading"> + (carregando...) + </panel.string> + <panel.string name="already_in_group"> + Alguns dos residentes selecionados já estão no grupo, portanto não receberam convite. + </panel.string> <text name="help_text" width="214"> - Voce pode selecionar vários residentes -para convidar ao seu grupo. Clique -'Abrir Seletor de Residente' para iniciar. + Selecione um ou mais residentes para convidar. Clique em 'Abrir seletor de residentes' para começar. </text> <button label="Abrir Seletor de Residente" name="add_button" tool_tip=""/> - <name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/> - <button left_delta="-7" width="214" label="Remove os selecionados acima da lista" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/> + <name_list name="invitee_list" tool_tip="Pressione Ctrl enquanto clica nos nomes dos residentes"/> + <button label="Remove os selecionados acima da lista" left_delta="-7" name="remove_button" tool_tip="Exclui os residentes selecionados acima da lista de convidados" width="214"/> <text name="role_text"> Escolha que Função atribuir a eles: </text> - <combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/> + <combo_box name="role_name" tool_tip="Selecione o cargo da lista de cargos que você pode designar a membros"/> <button label="Mandar convites" name="ok_button"/> <button label="Cancelar" name="cancel_button"/> - <string name="confirm_invite_owner_str"> - Você tem certeza de que deseja convidar novo(s) proprietário(s)? Esta ação é permanente! - </string> - <string name="loading"> - (carregando...) + <string name="GroupInvitation"> + Convite </string> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml index 5b09363e3c..6f21b78b10 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml @@ -1,84 +1,81 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terra & L$" name="land_money_tab"> - <string name="help_text"> - Lotes pertencentes ao grupo são listados adiante, com os detalhes de contribuição. Um aviso aparece até que o Total de Terra em Uso seja menor ou igual à Contribuição Total. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> - Você não tem permissão para ver as terras pertencentes ao grupo. - </string> - <string name="cant_view_group_accounting_text"> - Você não tem permissão para ver as informações sobre as contas do grupo. - </string> - <string name="loading_txt"> + <panel.string name="help_text"> + Será exibido um aviso até o Total de terrenos usados for igual ou inferior à contribuição total. + </panel.string> + <panel.string name="cant_view_group_land_text"> + Você não está autorizado a acessar terrenos de grupos + </panel.string> + <panel.string name="cant_view_group_accounting_text"> + Você não está autorizado a acessar os dados de contabilidade do grupo. + </panel.string> + <panel.string name="loading_txt"> Carregando... - </string> - <text name="group_land_heading" width="250"> - Terra percentente ao grupo - </text> - <scroll_list name="group_parcel_list"> - <column label="Nome do Lote" name="name"/> - <column label="Região" name="location"/> - <column label="Tipo" name="type"/> - <column label="Ãrea" name="area"/> - </scroll_list> - <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" left="282" width="130"/> - <text name="total_contributed_land_label"> - Contribuição Total: - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <text name="total_land_in_use_label"> - Total de Terra em Uso: - </text> - <text name="total_land_in_use_value"> - [AREA] m² - </text> - <text name="land_available_label"> - Terra DisponÃvel: - </text> - <text name="land_available_value"> - [AREA] m² - </text> - <text name="your_contribution_label"> - Sua Contribuição: - </text> - <string name="land_contrib_error"> - Não é possÃvel definir sua contribuição para o terreno. - </string> - <text name="your_contribution_units"> - ( m² ) - </text> - <text name="your_contribution_max_value"> - ([AMOUNT] máxima) - </text> - <text name="group_over_limit_text"> - Membros do grupo precisam contribuir com mais créditos de Terra para -garantir a terra em uso. - </text> - <text name="group_money_heading"> - Grupo L$ - </text> + </panel.string> + <panel.string name="land_contrib_error"> + Não foi possÃvel definir sua contribuição + </panel.string> + <panel name="layout_panel_landmoney"> + <scroll_list name="group_parcel_list"> + <scroll_list.columns label="Lote" name="name"/> + <scroll_list.columns label="Região" name="location"/> + <scroll_list.columns label="Tipo" name="type"/> + <scroll_list.columns label="Ãrea:" name="area"/> + </scroll_list> + <text name="total_contributed_land_label"> + Total contribuÃdo: + </text> + <text name="total_contributed_land_value"> + [AREA] m² + </text> + <button label="Mapa" label_selected="Mapa" name="map_button"/> + <text name="total_land_in_use_label"> + Total em uso: + </text> + <text name="total_land_in_use_value"> + [AREA] m² + </text> + <text name="land_available_label"> + DisponÃveis: + </text> + <text name="land_available_value"> + [AREA] m² + </text> + <text name="your_contribution_label"> + Sua contribuição: + </text> + <text name="your_contribution_units"> + m² + </text> + <text name="your_contribution_max_value"> + ([AMOUNT] max) + </text> + <text name="group_over_limit_text"> + O terreno em uso requer mais créditos + </text> + <text name="group_money_heading"> + L$ do grupo + </text> + </panel> <tab_container name="group_money_tab_container"> - <panel label="Planejamento" name="group_money_planning_tab"> + <panel label="PLANEJAMENTO" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> - Computando.. + Carregando... </text_editor> </panel> - <panel label="Detalhes" name="group_money_details_tab"> + <panel label="DETALHES" name="group_money_details_tab"> <text_editor name="group_money_details_text"> - Computando... + Carregando... </text_editor> - <button label="< Mais Cedo" label_selected="< Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/> - <button label="Mais Tarde >" label_selected="Tarde >" name="later_details_button" tool_tip="Adiantar o Tempo"/> + <button label="< Mais Cedo" label_selected="< Cedo" name="earlier_details_button" tool_tip="Atrás"/> + <button label="Mais Tarde >" label_selected="Tarde >" name="later_details_button" tool_tip="Próximo"/> </panel> - <panel label="Vendas" name="group_money_sales_tab"> + <panel label="VENDAS" name="group_money_sales_tab"> <text_editor name="group_money_sales_text"> - Computando... + Carregando... </text_editor> - <button label="< Mais Cedo" label_selected="< Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/> - <button label="Mais Tarde >" label_selected="Mais Tarde >" name="later_sales_button" tool_tip="Adiantar o Tempo"/> + <button label="< Mais Cedo" label_selected="< Mais Cedo" name="earlier_sales_button" tool_tip="Atrás"/> + <button label="Mais Tarde >" label_selected="Mais Tarde >" name="later_sales_button" tool_tip="Próximo"/> </panel> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml new file mode 100644 index 0000000000..19c34d2f10 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="group_list_item"> + <text name="group_name" value="Desconhecido"/> + <button name="profile_btn" tool_tip="Ver perfil"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml index d5c0f01e33..2abc8bc7c8 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml @@ -1,58 +1,54 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="NotÃcias" name="notices_tab"> - <text name="help_text"> + <panel.string name="help_text"> As notÃcias são uma maneira rápida de comunicar-se através de um grupo transmitindo uma mensagem e entregando um item anexo, opcionalmente. As notÃcias vão apenas a membros do grupo que têm a função habilitada para receber notÃcias. Você pode desligar NotÃcias na aba Geral. - </text> - <text name="no_notices_text"> - Não existem notÃcias anteriores. - </text> - <button label="?" label_selected="?" name="help_button"/> - <text name="lbl"> - Arquivo de notÃcias do grupo - </text> + </panel.string> + <panel.string name="no_notices_text"> + Não há nenhum aviso antigo + </panel.string> <text name="lbl2"> - As notÃcias são mantidas por 14 dias. -Listas de aviso estão limitadas a 200 por grupo, diariamente. + Cada aviso é armazenado por 14 dias. +Cada grupo pode enviar no máximo 200 avisos/dia </text> <scroll_list name="notice_list"> - <column label="Assunto" name="subject"/> - <column label="Para" name="from"/> - <column label="Data" name="date"/> + <scroll_list.columns label="Assunto" name="subject"/> + <scroll_list.columns label="Para" name="from"/> + <scroll_list.columns label="Data" name="date"/> </scroll_list> <text name="notice_list_none_found"> - Nenhum encontrado. + Nenhum resultado foi encontrado. </text> - <button label="Criar nova notÃcia" label_selected="Criar nova notÃcia" name="create_new_notice"/> - <button label="Atualizar" label_selected="Atualizar Lista" name="refresh_notices"/> + <button label="Criar um novo aviso" label_selected="Criar nova notÃcia" name="create_new_notice" tool_tip="Criar um novo aviso"/> + <button label="Atualizar" label_selected="Atualizar Lista" name="refresh_notices" tool_tip="Atualizar lista de avisos"/> <panel label="Criar nova notÃcia" name="panel_create_new_notice"> <text name="lbl"> Criar uma notÃcia </text> - <text name="lbl2"> - Você pode adicionar um item simples à notÃcia, arrastando-o do seu Inventário para o painel. Itens anexados devem ser copiáveis e transferÃveis e você não pode mandar uma pasta. - </text> - <text name="lbl3" left="20"> + <text left="20" name="lbl3"> Assunto: </text> - <line_editor name="create_subject" width="251" left_delta="61"/> - <text name="lbl4" left="15" width="60"> + <line_editor left_delta="61" name="create_subject" width="251"/> + <text left="15" name="lbl4" width="60"> Mensagem: </text> - <text_editor name="create_message" left_delta="66" width="330"/> + <text_editor left_delta="66" name="create_message" width="330"/> <text name="lbl5" width="68"> Anexo: </text> - <line_editor name="create_inventory_name" width="190" left_delta="74"/> - <button label="Remover o anexo" label_selected="Remover o anexo" name="remove_attachment"/> + <line_editor left_delta="74" name="create_inventory_name" width="190"/> + <text name="string"> + Arrastar e soltar o item aqui para anexá-lo: + </text> + <button label="Tirar" label_selected="Remover o anexo" name="remove_attachment" tool_tip="Remover anexo da notificação."/> <button label="Enviar" label_selected="Enviar" name="send_notice"/> - <panel name="drop_target" tool_tip="Arraste um item do inventário para dentro da caixa de mensagem para enviá-lo com a notÃcia. Você deve ter permissão para copiar e transferir o objeto, para enviá-lo com a notÃcia."/> + <group_drop_target name="drop_target" tool_tip="Arrastar um item do inventário para a caixa para enviá-lo com o aviso. É preciso ter autorização de cópia e transferência do item para anexá-lo ao aviso."/> </panel> <panel label="Visualizar NotÃcia Anterior" name="panel_view_past_notice"> <text name="lbl"> NotÃcia arquivada </text> <text name="lbl2"> - Para enviar uma notÃcia nova, clique no botão 'Criar Nova NotÃcia' acima. + Para enviar um novo aviso, clique no botão + </text> <text name="lbl3"> Asunto: @@ -60,6 +56,6 @@ Listas de aviso estão limitadas a 200 por grupo, diariamente. <text name="lbl4"> Mensagem: </text> - <button label="Abrir o anexo" label_selected="Abrir o anexo" name="open_attachment"/> + <button label="Abrir anexo" label_selected="Abrir o anexo" name="open_attachment"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml new file mode 100644 index 0000000000..5a8ea81074 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_group_notify.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="instant_message" name="panel_group_notify"> + <panel label="header" name="header"> + <text name="title" value="Nome do remetente / grupo"/> + </panel> + <text name="attachment" value="Anexo"/> + <button label="OK" name="btn_ok"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml index 087cf0c107..9c3792ec43 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml @@ -1,146 +1,104 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Membros e Funções" name="roles_tab"> - <string name="default_needs_apply_text"> - Existem alterações não aplicadas na sub-aba atual. - </string> - <string name="want_apply_text"> - Você quer submeter essas alterações? - </string> - <button label="?" name="help_button"/> - <panel name="members_header"> - <text name="static"> - Membros e Funções - </text> - <text name="static2"> - São atribuÃdas funções com habilidades aos membros do grupo. -Estes ajustes podem ser facilmente customizados para uma flexibilidade -e organização maiores. - </text> - </panel> - <panel name="roles_header"> - <text name="static"> - Funções - </text> - <text name="role_properties_modifiable"> - Selecionar uma função abaixo. Você pode modificar o nome, a descrição -e o tÃtulo do membro. - </text> - <text name="role_properties_not_modifiable"> - Selecione uma função abaixo para ver suas propriedades, membros e -habilidades permitidas. - </text> - <text bottom_delta="-28" name="role_actions_modifiable"> - Você também pode atribuir habilidades à função. - </text> - <text name="role_actions_not_modifiable"> - Você pode ver, mas não pode alterar habilidades atribuÃdas. - </text> - </panel> - <panel name="actions_header"> - <text name="static"> - Habilidades - </text> - <text name="static2"> - Você pode ver a descrição de uma habilidade e quais funções e membros -podem executar essa habilidade. - </text> - </panel> + <panel.string name="default_needs_apply_text"> + Algumas modificações não foram salvas + </panel.string> + <panel.string name="want_apply_text"> + Deseja salvar essas mudanças? + </panel.string> <tab_container height="164" name="roles_tab_container"> - <panel height="148" label="Membros" name="members_sub_tab" tool_tip="Membros"> - <line_editor bottom="127" name="search_text"/> - <button label="Pesquisar" name="search_button" width="75"/> - <button label="Mostrar todos" name="show_all_button" left_delta="80"/> - <name_list name="member_list" bottom_delta="-105" height="104" > - <column label="Nome do membro" name="name"/> - <column label="Tarifa doada" name="donated"/> - <column label="Último login" name="online"/> - </name_list> - <button label="Convidar Novo Membro..." name="member_invite" width="165"/> - <button label="Ejetar do Grupo" name="member_eject"/> - <string name="help_text"> + <panel height="148" label="MEMBROS" name="members_sub_tab" tool_tip="Membros"> + <panel.string name="help_text"> Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes. - </string> + </panel.string> + <filter_editor label="Filtrar por membro" name="filter_input"/> + <name_list bottom_delta="-105" height="104" name="member_list"> + <name_list.columns label="Membro" name="name"/> + <name_list.columns label="Doações" name="donated"/> + <name_list.columns label="Status" name="online"/> + </name_list> + <button label="Convidar" name="member_invite" width="165"/> + <button label="Ejetar" name="member_eject"/> </panel> - <panel height="148" label="Funções" name="roles_sub_tab"> - <line_editor bottom="127" name="search_text"/> - <button label="Busca" name="search_button" width="75"/> - <button label="Mostrar todos" name="show_all_button" left_delta="80"/> - <scroll_list name="role_list" bottom_delta="-104" height="104"> - <column label="Nome da função" name="name"/> - <column label="TÃtulo" name="title"/> - <column label="Membro" name="members"/> + <panel height="148" label="CARGOS" name="roles_sub_tab"> + <panel.string name="help_text"> + Cada cargo tem um nome e uma lista das funções que membros designados podem desempenhar. + Os membros podem ter um ou mais cargos. + Cada grupo pode ter 10 cargos, incluindo Membro e Dono do Grupo. + </panel.string> + <panel.string name="cant_delete_role"> + As funções 'Todos' e 'Owners' são especiais e não podem ser apagadas. + </panel.string> + <panel.string name="power_folder_icon"> + Inv_FolderClosed + </panel.string> + <filter_editor label="Filtrar por cargo" name="filter_input"/> + <scroll_list bottom_delta="-104" height="104" name="role_list"> + <scroll_list.columns label="Cargo" name="name"/> + <scroll_list.columns label="TÃtulo" name="title"/> + <scroll_list.columns label="#" name="members"/> </scroll_list> - <button label="Criar nova função..." name="role_create"/> + <button label="Adicionar cargo" name="role_create"/> <button label="Apagar função" name="role_delete"/> - <string name="help_text"> - As funções têm um tÃtulo e uma lista de habilidades -permitidas que os membros podem executar. Os membros poderão ter um ou mais funções. - Um grupo poderá ter até 10 funções, incluÃndo as funções dos membros e do dono do grupo. - </string> - <string name="cant_delete_role"> - As funções 'todos' e 'donos' são especiais e não podem ser deletadas. - </string> </panel> - <panel height="148" label="Habilidades" name="actions_sub_tab"> - <line_editor bottom="127" name="search_text"/> - <button label="Busca" name="search_button" width="75"/> - <button label="Mostrar todos" name="show_all_button" left_delta="80"/> - <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/> - <string name="help_text"> + <panel height="148" label="FUNÇÕES" name="actions_sub_tab" tool_tip="Você pode ver a descrição de uma função e quais cargos e membros podem desempenhá-la."> + <panel.string name="help_text"> As habilidades permitem que os membros nas funções façam coisas especÃficas dentro do grupo. Há uma grande variedade de habilidades. - </string> + </panel.string> + <filter_editor label="Filtrar por função" name="filter_input"/> + <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecione uma função para ver mais detalhes"/> </panel> </tab_container> <panel name="members_footer"> <text name="static"> - Funções atribuÃdas + Cargos desempenhados </text> <text name="static2"> Habilidades permitidas </text> - <scroll_list name="member_allowed_actions" tool_tip="Para detalhes de cada habilidade permitida, veja a aba Habilidades."/> + <scroll_list name="member_allowed_actions" tool_tip="Clique na guia Funções para ver mais detalhes"/> </panel> <panel name="roles_footer"> <text name="static"> - Nome - </text> - <text name="static2"> - Descrição + Nome da função </text> <line_editor name="role_name"> Empregados </line_editor> <text name="static3"> - TÃtulo + TÃtulo da função </text> <line_editor name="role_title"> (esperando) </line_editor> + <text name="static2"> + Descrição + </text> <text_editor name="role_description"> (esperando) </text_editor> <text name="static4"> - Membros atribuÃdos + Cargos desempenhados </text> + <check_box label="Revelar membros" name="role_visible_in_list" tool_tip="Define se os membros dessa função são visÃveis na guia geral para pessoas de fora do grupo."/> <text name="static5" tool_tip="Uma lista de habilidades que a função selecionada atualmente pode executar."> Habilidades permitidas </text> - <check_box label="Membros estão visÃveis" name="role_visible_in_list" tool_tip="Selecione se os membros desta função estarão visÃveis na aba Diversos, para as pessoas de fora do grupo."/> - <scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habilidade permitida, veja a aba correspondente."/> + <scroll_list name="role_allowed_actions" tool_tip="Clique na guia Funções para ver mais detalhes"/> </panel> <panel name="actions_footer"> <text name="static"> - Descrição + Descrição da função </text> <text_editor name="action_description"> Essa habilidade permite tirar alguem do grupo. Somente o dono do grupo poderá retirar outro dono do grupo. </text_editor> <text name="static2"> - Funções com habilidades + Cargos com esta função </text> <text name="static3"> - Membros com habilidades + Membros com esta função </text> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml new file mode 100644 index 0000000000..11e1ba0039 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="button_stack"> + <layout_panel name="view_profile_btn_panel"> + <button label="Perfil" name="view_profile_btn"/> + </layout_panel> + <layout_panel name="add_friend_btn_panel"> + <button label="Adicionar amigo" name="add_friend_btn"/> + </layout_panel> + <layout_panel name="teleport_btn_panel"> + <button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/> + </layout_panel> + <layout_panel name="share_btn_panel"> + <button label="Compartilhar" name="share_btn"/> + </layout_panel> + <layout_panel name="share_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="Desligar" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Controles de voz" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml new file mode 100644 index 0000000000..6196c06d09 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="landmark_info"> + <string name="title_create_landmark" value="Criar Landmark"/> + <string name="title_edit_landmark" value="Editar Landmark"/> + <string name="title_landmark" value="Landmark"/> + <string name="not_available" value="(N\A)"/> + <string name="unknown" value="(desconhecido)"/> + <string name="public" value="(público)"/> + <string name="server_update_text"> + Informação do lugar não disponÃvel sem atualização do servidor. + </string> + <string name="server_error_text"> + Informações sobre esta localização não está disponÃvel neste momento, por favor, tente novamente mais tarde. + </string> + <string name="server_forbidden_text"> + Informações sobre esta localização está indisponÃvel devido a restrições de acesso. Por favor, verifique as permissões com o proprietário da parcela. + </string> + <string name="acquired_date"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </string> + <button name="back_btn" tool_tip="Atrás"/> + <text name="title" value="Perfil do Lugar"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="maturity_value" value="desconhecido"/> + <panel name="landmark_info_panel"> + <text name="owner_label" value="Proprietário:"/> + <text name="creator_label" value="Criador:"/> + <text name="created_label" value="Criado:"/> + </panel> + <panel name="landmark_edit_panel"> + <text name="title_label" value="TÃtulo:"/> + <text name="notes_label" value="Minhas notas:"/> + <text name="folder_label" value="Localização da Landmark:"/> + </panel> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml new file mode 100644 index 0000000000..3f357bcefe --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Landmarks"> + <accordion name="landmarks_accordion"> + <accordion_tab name="tab_favorites" title="Barra 'Destaques'"/> + <accordion_tab name="tab_landmarks" title="Meus marcos"/> + <accordion_tab name="tab_inventory" title="Meu inventário"/> + <accordion_tab name="tab_library" title="Biblioteca"/> + </accordion> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> + <button name="add_btn" tool_tip="Adicionar marco"/> + <dnd_button name="trash_btn" tool_tip="Excluir marco selecionado"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index d7ff3f29df..415451b49f 100644 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml @@ -1,39 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_login"> <panel.string name="create_account_url"> - http://join.secondlife.com/index.php?lang=pt-BR + http://join.secondlife.com/ </panel.string> <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=pt </panel.string> -<panel name="login_widgets"> - <text name="first_name_text"> - Primeiro nome: - </text> - <text name="last_name_text"> - Sobrenome: - </text> - <text name="password_text"> - Senha: - </text> - <text name="start_location_text"> - Posição inicial: - </text> - <combo_box name="start_location_combo"> - <combo_box.item name="MyHome" label="Minha casa" /> - <combo_box.item name="MyLastLocation" label="Minha última localização" /> - <combo_box.item name="Typeregionname" label="< Digite o nome da região >" /> - </combo_box> - <check_box label="Lembrar senha" name="remember_check"/> - <button label="Entrar" label_selected="Entrar" name="connect_btn"/> - <text name="create_new_account_text"> - Registrar-se para uma conta - </text> - <text name="forgot_password_text" left="-240" width="230"> - Esqueceu seu nome de usuário ou senha? - </text> - <text name="channel_text"> - [VERSION] - </text> -</panel> + <layout_stack name="login_widgets"> + <layout_panel name="login"> + <text name="first_name_text"> + Primeiro nome: + </text> + <line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <check_box label="Lembrar senha" name="remember_check"/> + <text name="start_location_text"> + Começar em: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="Minha casa" name="MyHome"/> + </combo_box> + <button label="conectar" name="connect_btn"/> + </layout_panel> + <layout_panel name="links"> + <text name="create_new_account_text"> + Cadastre-se + </text> + <text name="login_help"> + Precisa de ajuda ao conectar? + </text> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml new file mode 100644 index 0000000000..f64b9f319f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Coisas" name="main inventory panel"> + <panel.string name="Title"> + Coisas + </panel.string> + <filter_editor label="Filtro" name="inventory search editor"/> + <tab_container name="inventory filter tabs"> + <inventory_panel label="Todos os itens" name="All Items"/> + <inventory_panel label="Itens recentes" name="Recent Items"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> + <button name="add_btn" tool_tip="Adicionar novo item"/> + <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/> + </panel> + <menu_bar name="Inventory Menu"> + <menu label="Arquivo" name="File"> + <menu_item_call label="Abrir" name="Open"/> + <menu label="Upload" name="upload"> + <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> + <menu_item_call label="Som (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="Volume (L$[COST] per file)..." name="Bulk Upload"/> + </menu> + <menu_item_call label="Nova janela" name="New Window"/> + <menu_item_call label="Mostrar filtros" name="Show Filters"/> + <menu_item_call label="Restabelecer filtros" name="Reset Current"/> + <menu_item_call label="Fechar todas as pastas" name="Close All Folders"/> + <menu_item_call label="Esvaziar lixeira" name="Empty Trash"/> + <menu_item_call label="Esvaziar achados e perdidos" name="Empty Lost And Found"/> + </menu> + <menu label="Crie" name="Create"> + <menu_item_call label="Nova pasta" name="New Folder"/> + <menu_item_call label="Novo script" name="New Script"/> + <menu_item_call label="Nova anotação" name="New Note"/> + <menu_item_call label="Novo gesto" name="New Gesture"/> + <menu label="Novas roupas" name="New Clothes"> + <menu_item_call label="Nova camisa" name="New Shirt"/> + <menu_item_call label="Novas calças" name="New Pants"/> + <menu_item_call label="Novos sapatos" name="New Shoes"/> + <menu_item_call label="Novas meias" name="New Socks"/> + <menu_item_call label="Nova blusa" name="New Jacket"/> + <menu_item_call label="Nova saia" name="New Skirt"/> + <menu_item_call label="Novas luvas" name="New Gloves"/> + <menu_item_call label="Nova camiseta" name="New Undershirt"/> + <menu_item_call label="Novas roupa de baixo" name="New Underpants"/> + <menu_item_call label="Novo alpha" name="New Alpha"/> + <menu_item_call label="Nova tatuagem" name="New Tattoo"/> + </menu> + <menu label="Nova parte do corpo" name="New Body Parts"> + <menu_item_call label="Nova silhueta" name="New Shape"/> + <menu_item_call label="Nova pele" name="New Skin"/> + <menu_item_call label="Novo cabelo" name="New Hair"/> + <menu_item_call label="Novos olhos" name="New Eyes"/> + </menu> + </menu> + <menu label="Classificar" name="Sort"> + <menu_item_check label="Por nome" name="By Name"/> + <menu_item_check label="Por data" name="By Date"/> + <menu_item_check label="Pastas sempre por nome" name="Folders Always By Name"/> + <menu_item_check label="Pastas do sistema no topo" name="System Folders To Top"/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml new file mode 100644 index 0000000000..412f75ca78 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_me.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Meu perfil" name="panel_me"> + <tab_container name="tabs"> + <panel label="MEU PERFIL" name="panel_profile"/> + <panel label="MEUS DESTAQUES" name="panel_picks"/> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml new file mode 100644 index 0000000000..9815b8d0b4 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Público geral" name="Media Settings General"> + <text name="home_label"> + Página web: + </text> + <text name="home_fails_whitelist_label"> + (Esta página não atende à lista de páginas aprovadas) + </text> + <line_editor name="home_url" tool_tip="Website desta mÃdia"/> + <text name="preview_label"> + Visualizar + </text> + <text name="current_url_label"> + Página atual: + </text> + <text name="current_url" tool_tip="Website desta mÃdia" value=""/> + <button label="Redefinir" name="current_url_reset_btn"/> + <check_box initial_value="false" label="Loop contÃnuo" name="auto_loop"/> + <check_box initial_value="false" label="Interagir no primeiro clique" name="first_click_interact"/> + <check_box initial_value="false" label="Zoom automático" name="auto_zoom"/> + <check_box initial_value="false" label="MÃdia auto-executável" name="auto_play"/> + <text name="media_setting_note"> + Nota: Residentes podem redefinir a configuração. + </text> + <check_box initial_value="false" label="Dimensionamento automático na frente do objeto" name="auto_scale"/> + <text name="size_label"> + Tamanho: + </text> + <text name="X_label"> + X + </text> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..009dd0d752 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Customizar" name="Media settings for controls"> + <text name="controls_label"> + Controles: + </text> + <combo_box name="controls"> + <combo_item name="Standard"> + Padrão + </combo_item> + <combo_item name="Mini"> + Mini + </combo_item> + </combo_box> + <check_box initial_value="false" label="Permitir navegação & interatividade" name="perms_owner_interact"/> + <check_box initial_value="false" label="Exibir barra de controle" name="perms_owner_control"/> + <check_box initial_value="false" label="Permitir navegação & interatividade" name="perms_group_interact"/> + <check_box initial_value="false" label="Exibir barra de controle" name="perms_group_control"/> + <check_box initial_value="false" label="Permitir navegação & interatividade" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Exibir barra de controle" name="perms_anyone_control"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml new file mode 100644 index 0000000000..646969946c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Segurança" name="Media Settings Security"> + <check_box initial_value="false" label="Acesso permitido a URLs com padrão especÃfico" name="whitelist_enable"/> + <text name="home_url_fails_some_items_in_whitelist"> + URLs com falha de acesso na página inicial são indicados com um: + </text> + <button label="Adicionar" name="whitelist_add"/> + <button label="Excluir" name="whitelist_del"/> + <text name="home_url_fails_whitelist"> + Aviso: A página inicial especificada na aba Geral não consta na lista de acesso. Seu acesso será autorizado quando a lista for retificada. + </text> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_my_profile.xml b/indra/newview/skins/default/xui/pt/panel_my_profile.xml new file mode 100644 index 0000000000..b1ca318add --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_my_profile.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Perfil" name="panel_profile"> + <string name="no_partner_text" value="Nenhum"/> + <string name="no_group_text" value="Nenhum"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <panel name="second_life_image_panel"> + <icon label="" name="2nd_life_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <icon label="" name="real_world_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/> + <text name="title_rw_descr_text" value="Mundo real:"/> + </panel> + <text name="title_member_text" value="Residente desde:"/> + <text name="title_acc_status_text" value="Conta:"/> + <text name="title_partner_text" value="Parceiro(a):"/> + <panel name="partner_data_panel"> + <name_box initial_value="(pesquisando)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupos:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/> + <button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: fÃsico, roupas, etc."/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml new file mode 100644 index 0000000000..511c4426bb --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="navigation_bar"> + <panel name="navigation_panel"> + <pull_button name="back_btn" tool_tip="Voltar para região anterior"/> + <pull_button name="forward_btn" tool_tip="Avançar uma região"/> + <button name="home_btn" tool_tip="Teletransportar para minha casa"/> + <location_input label="Onde" name="location_combo"/> + <search_combo_box label="Busca" name="search_combo_box" tool_tip="Busca"> + <combo_editor label="Buscar no [SECOND_LIFE]" name="search_combo_editor"/> + </search_combo_box> + </panel> + <favorites_bar name="favorite" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!"> + <label name="favorites_bar_label" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!"> + Barra Destaques + </label> + <chevron_button name=">>" tool_tip="Mostrar mais favoritos"/> + </favorites_bar> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml new file mode 100644 index 0000000000..bdbf29e70b --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> +<panel name="nearby_chat"> + <panel name="chat_caption"> + <text name="sender_name"> + Bate-papo local + </text> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml new file mode 100644 index 0000000000..9b993488be --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="chat_bar"> + <line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/> + <button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml new file mode 100644 index 0000000000..a81d3e19f8 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="empty_item_text"> + <vazio> + </string> + <string name="parcel_media_name"> + MÃdia em stream deste lote + </string> + <string name="parcel_audio_name"> + Ãudio em stream do lote + </string> + <string name="playing_suffix"> + (em execução) + </string> + <panel name="minimized_controls"> + <button label="Parar tudo" name="all_nearby_media_disable_btn" tool_tip="Desligar mÃdias por perto"/> + <button label="Executar tudo" name="all_nearby_media_enable_btn" tool_tip="Ligar mÃdias por perto"/> + <button name="open_prefs_btn" tool_tip="Preferências de mÃdia"/> + <button label="Mais >>" label_selected="Menos <<" name="more_less_btn" tool_tip="Controles avançados"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Tudo" name="All"/> + <combo_box.item label="Neste lote" name="WithinParcel"/> + <combo_box.item label="Fora deste lote" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="Proximidade" name="media_proximity"/> + <scroll_list.columns label="VisÃveis" name="media_visibility"/> + <scroll_list.columns label="Classe" name="media_class"/> + <scroll_list.columns label="Nome" name="media_name"/> + <scroll_list.columns label="Depurar" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Para mÃdia selecionada"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Tocar mÃdia selecionada"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pausar mÃdia selecionada"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume da mÃdia selecionada"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Silenciar mÃdia selecionada"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Enfocar mÃdia"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Desenfocar mÃdia selecionada"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_notes.xml b/indra/newview/skins/default/xui/pt/panel_notes.xml new file mode 100644 index 0000000000..9aa842d9a5 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_notes.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Anotações e Privacidade" name="panel_notes"> + <layout_stack name="layout"> + <panel name="notes_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <text name="status_message" value="Minhas anotações privadas:"/> + <text name="status_message2" value="Deixar esta pessoa:"/> + <check_box label="Ver meu status" name="status_check"/> + <check_box label="Ver minha localização no mapa" name="map_check"/> + <check_box label="Pegar, editar ou excluir objetos meus" name="objects_check"/> + </panel> + </scroll_container> + </panel> + <panel name="notes_buttons_panel"> + <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/> + <button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/> + <button label="Ligar" name="call" tool_tip="Ligar para este residente"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/> + <button label="Teletransportar" name="teleport" tool_tip="Oferecer teletransporte"/> + </panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_online_status.xml b/indra/newview/skins/default/xui/pt/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_online_status.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="friend_online_status" name="friend_online_status"/> diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml new file mode 100644 index 0000000000..8d648a98fa --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Coisas" name="Outfits"> + <tab_container name="appearance_tabs"> + <inventory_panel label="MEUS LOOKS" name="outfitslist_tab"/> + <inventory_panel label="EM USO" name="cof_tab"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> + <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/> + <button label="Salvar este look" name="make_outfit_btn" tool_tip="Salvar aparência como um look"/> + <button label="Vestir" name="wear_btn" tool_tip="Vestir look selecionado"/> + <button label="M" name="look_edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml new file mode 100644 index 0000000000..736b8f1fdd --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<menu name="menu_gear_default"> + <menu_item_call label="Substituir look atual" name="wear"/> + <menu_item_call label="Adicionar ao look atual" name="add"/> + <menu_item_call label="Tirar do look atual" name="remove"/> + <menu_item_call label="Renomear" name="rename"/> + <menu_item_call label="Remover link" name="remove_link"/> + <menu_item_call label="Excluir visual" name="delete"/> +</menu> diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml new file mode 100644 index 0000000000..5061788757 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_people.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray panel --> +<panel label="Pessoas" name="people_panel"> + <string name="no_people" value="Nenhuma pessoa"/> + <string name="no_one_near" value="Ninguém por perto"/> + <string name="no_friends_online" value="Nenhum amigo online"/> + <string name="no_friends" value="Nenhum amigo"/> + <string name="people_filter_label" value="Filtro de pessoas"/> + <string name="groups_filter_label" value="Filtro de grupos"/> + <filter_editor label="Filtro" name="filter_input"/> + <tab_container name="tabs"> + <panel label="PROXIMIDADE" name="nearby_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="nearby_view_sort_btn" tool_tip="Opções"/> + <button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/> + </panel> + </panel> + <panel label="MEUS AMIGOS" name="friends_panel"> + <accordion name="friends_accordion"> + <accordion_tab name="tab_online" title="Online"/> + <accordion_tab name="tab_all" title="Todos"/> + </accordion> + <panel label="bottom_panel" name="bottom_panel"> + <button name="friends_viewsort_btn" tool_tip="Opções"/> + <button name="add_btn" tool_tip="Oferecer amizade para um residente"/> + <button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/> + </panel> + <text name="no_friends_msg"> + Para adicionar amigos, use a [secondlife:///app/search/people busca de pessoas] ou clique em um usuário para adicioná-lo. +Para conhecer mais gente, use [secondlife:///app/worldmap o Mapa]. + </text> + </panel> + <panel label="MEUS GRUPOS" name="groups_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="groups_viewsort_btn" tool_tip="Opções"/> + <button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/> + <button name="activate_btn" tool_tip="Ativar o grupo selecionado"/> + </panel> + </panel> + <panel label="RECENTE" name="recent_panel"> + <panel label="bottom_panel" name="bottom_panel"> + <button name="recent_viewsort_btn" tool_tip="Opções"/> + <button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/> + </panel> + </panel> + </tab_container> + <panel name="button_bar"> + <button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/> + <button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/> + <button label="Chamada" name="call_btn" tool_tip="Ligar para este residente"/> + <button label="Compartilhar" name="share_btn"/> + <button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte"/> + <button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir informação de grupo"/> + <button label="Bate- papo de grupo" name="chat_btn" tool_tip="abrir sessão de bate- papo"/> + <button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml new file mode 100644 index 0000000000..007965a8c9 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_pick_info.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_pick_info"> + <text name="title" value="Detalhes do destaque"/> + <scroll_container name="profile_scroll"> + <panel name="scroll_content_panel"> + <text name="pick_name" value="[NAME]"/> + <text name="pick_location" value="[carregando...]"/> + <text name="pick_desc" value="[descrição]"/> + </panel> + </scroll_container> + <panel name="buttons"> + <button label="Teletransportar" name="teleport_btn"/> + <button label="Mapa" name="show_on_map_btn"/> + <button label="Editar" name="edit_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml new file mode 100644 index 0000000000..453954bc3e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_picks.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Destaques" name="panel_picks"> + <string name="no_picks" value="Sem destaques"/> + <string name="no_classifieds" value="Sem classificados"/> + <text name="empty_picks_panel_text"> + Não ha nenhum destaque/ classificado aqui + </text> + <accordion name="accordion"> + <accordion_tab name="tab_picks" title="Destaques"/> + <accordion_tab name="tab_classifieds" title="Classificados"/> + </accordion> + <panel label="bottom_panel" name="edit_panel"> + <button name="new_btn" tool_tip="Criar um novo destaque ou classificado na localização atual"/> + </panel> + <panel name="buttons_cucks"> + <button label="Info" name="info_btn" tool_tip="Exibir informação de destaque"/> + <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área correspondente"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Exibir a área correspondente no Mapa Mundi"/> + </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 new file mode 100644 index 0000000000..453c56d280 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="place_profile"> + <string name="on" value="Ligar"/> + <string name="off" value="Desligar"/> + <string name="anyone" value="Todos"/> + <string name="available" value="disponÃvel"/> + <string name="allocated" value="alocados"/> + <string name="title_place" value="Perfil da região"/> + <string name="title_teleport_history" value="Histórico de teletransportes"/> + <string name="not_available" value="(N\A)"/> + <string name="unknown" value="(Desconhecido)"/> + <string name="public" value="(público)"/> + <string name="none_text" value="(nenhum)"/> + <string name="sale_pending_text" value="(Venda em andamento)"/> + <string name="group_owned_text" value="(Propriedade do grupo)"/> + <string name="price_text" value="L$"/> + <string name="area_text" value="m²"/> + <string name="all_residents_text" value="Todos os residentes"/> + <string name="group_text" value="Grupo"/> + <string name="can_resell"> + Esta região permite a compra e venda de lotes. + </string> + <string name="can_not_resell"> + Esta região não permite a compra e venda de lotes. + </string> + <string name="can_change"> + Esta região permite a junção ou subdivisão de lotes. + </string> + <string name="can_not_change"> + Esta região não permite a junção ou subdivisão de lotes. + </string> + <string name="server_update_text"> + Dados sobre o local requerem atualização do servidor. + </string> + <string name="server_error_text"> + Dados sobre o local não disponÃveis no momento. Favor tentar mais tarde. + </string> + <string name="server_forbidden_text"> + Dados sobre o local controlados por lista de acesso. Verifique se você está autorizado a acessá-los com o dono do lote. + </string> + <string name="acquired_date"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </string> + <button name="back_btn" tool_tip="Atrás"/> + <text name="title" value="Perfil da região"/> + <scroll_container name="place_scroll"> + <panel name="scrolling_panel"> + <text name="owner_label" value="Proprietário:"/> + <text name="maturity_value" value="(Desconhecido)"/> + <accordion name="advanced_info_accordion"> + <accordion_tab name="parcel_characteristics_tab" title="Lote"> + <panel name="parcel_characteristics_panel"> + <text name="rating_label" value="Classificação:"/> + <text name="rating_value" value="(Desconhecido)"/> + <text name="voice_label" value="Voz:"/> + <text name="voice_value" value="Ligar"/> + <text name="fly_label" value="Voar:"/> + <text name="fly_value" value="Ligar"/> + <text name="push_label" value="Push:"/> + <text name="push_value" value="Desligar"/> + <text name="build_label" value="Construir:"/> + <text name="build_value" value="Ligar"/> + <text name="scripts_label" value="Scripts:"/> + <text name="scripts_value" value="Ligar"/> + <text name="damage_label" value="Dano:"/> + <text name="damage_value" value="Desligar"/> + <button label="Sobre terrenos" name="about_land_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="region_information_tab" title="Região"> + <panel name="region_information_panel"> + <text name="region_name_label" value="Região:"/> + <text name="region_type_label" value="Tipo:"/> + <text name="region_rating_label" value="Classificação:"/> + <text name="region_owner_label" value="Proprietário:"/> + <text name="region_group_label" value="Grupo:"/> + <button label="Região/Propriedade" name="region_info_btn"/> + </panel> + </accordion_tab> + <accordion_tab name="estate_information_tab" title="Propriedade"> + <panel name="estate_information_panel"> + <text name="estate_name_label" value="Propriedade:"/> + <text name="estate_rating_label" value="Classificação:"/> + <text name="estate_owner_label" value="Proprietário:"/> + <text name="covenant_label" value="Contrato:"/> + </panel> + </accordion_tab> + <accordion_tab name="sales_tab" title="À venda"> + <panel name="sales_panel"> + <text name="sales_price_label" value="Preço:"/> + <text name="area_label" value="Ãrea:"/> + <text name="traffic_label" value="Trânsito:"/> + <text name="primitives_label" value="Prims:"/> + <text name="parcel_scripts_label" value="Scripts:"/> + <text name="terraform_limits_label" value="Limite de terraplenagem:"/> + <text name="subdivide_label" value="Juntar/subdividir:"/> + <text name="resale_label" value="Revenda:"/> + <text name="sale_to_label" value="À venda para:"/> + </panel> + </accordion_tab> + </accordion> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml new file mode 100644 index 0000000000..d9045e1a37 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_places.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Lugares" name="places panel"> + <string name="landmarks_tab_title" value="MEUS MARCOS"/> + <string name="teleport_history_tab_title" value="HISTÓRICO DE TELETRANSPORTES"/> + <filter_editor label="Filtrar meus lugares" name="Filter"/> + <panel name="button_panel"> + <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/> + <button label="Mapa" name="map_btn"/> + <button label="Editar" name="edit_btn" tool_tip="Editar dados do marco"/> + <button label="â–¼" name="overflow_btn" tool_tip="Mostrar opções adicionais"/> + <button label="Salvar" name="save_btn"/> + <button label="Cancelar" name="cancel_btn"/> + <button label="Fechar" name="close_btn"/> + </panel> +</panel> 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 5ca80bd74d..7ed64404e6 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -1,12 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<panel name="advanced"> - <text name="AspectRatioLabel1" tool_tip="largura / altura"> - Relação de Aspecto: +<panel label="Avançado" name="advanced"> + <panel.string name="aspect_ratio_text"> + [NUM]:[DEN] + </panel.string> + <slider label="Ângulo de visão" name="camera_fov"/> + <slider label="Distância" name="camera_offset_scale"/> + <text name="heading2"> + Posicionamento automático da: </text> - <combo_box name="aspect_ratio" tool_tip="largura / altura"> - <combo_box.item label="4:3 (CRT Padrão)" name="item1"/> - <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> - <combo_box.item label="8:5 (tela ampla)" name="item3"/> - <combo_box.item label="16:9 (tela ampla)" name="item4"/> - </combo_box> + <check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/> + <check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/> + <check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/> + <check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/> + <check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/> + <check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/> + <check_box label="Balão de bate-papo" name="bubble_text_chat"/> + <slider label="Opacidade" name="bubble_chat_opacity"/> + <color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/> + <check_box label="Mostrar erros de script" name="show_script_errors"/> + <radio_group name="show_location"> + <radio_item label="Bate-papo local" name="0"/> + <radio_item label="Janelas separadas" name="1"/> + </radio_group> + <check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/> + <line_editor label="Botao apertar e falar" name="modifier_combo"/> + <button label="Definir chave" name="set_voice_hotkey_button"/> + <button label="Botão do meio do mouse" name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml index e060d784da..2ffe720ccf 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Popups" name="popups" title="Popups"> - <text name="dont_show_label"> - Não mostrar estas popups: + <text name="tell_me_label"> + Avisar: </text> - <button label="Habilitar esta popup" label_selected="Habilitar este popup" name="enable_popup"/> - <button label="Habilitar todas as popups..." label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..." name="reset_dialogs_btn" tool_tip="Habilitar todas as popups opcionais e notificações de “primeiro usoâ€." width="200"/> + <check_box label="Quando eu gasto ou recebo L$" name="notify_money_change_checkbox"/> + <check_box label="Quando meus amigos entram e saem" name="friends_online_notify_checkbox"/> <text name="show_label"> - Mostrar estas popups: + Mostrar sempre: </text> - <button label="Desabilitar todas estas popups..." name="skip_dialogs_btn" tool_tip="Desabilitar todas as popups opcionais e notificações de “primeiro usoâ€." width="200"/> - <text name="text_box2"> - Ofertas de notecards, texturas e landmarks: + <text name="dont_show_label"> + Nunca mostrar: </text> - <check_box label="Aceitar automaticamente" name="accept_new_inventory"/> - <check_box label="Visualizar automaticamente após aceitar" name="show_new_inventory"/> - <check_box label="Mostrar automaticamente objetos aceitos recentemente no inventário." name="show_in_inventory"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml index aa40f97fe3..d9b18724e2 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml @@ -1,17 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat" name="chat"> - <text name="text_box"> - Tamanho da Fonte -do Chat: - </text> <radio_group name="chat_font_size"> - <radio_item name="radio" label="Pequeno" /> - <radio_item name="radio2" label="Médio" /> - <radio_item name="radio3" label="Grande" /> + <radio_item label="Pequeno" name="radio" value="0"/> + <radio_item label="Média" name="radio2" value="1"/> + <radio_item label="Grande" name="radio3" value="2"/> </radio_group> <color_swatch label="Você" name="user"/> <text name="text_box1"> - Você + Eu </text> <color_swatch label="Outros" name="agent"/> <text name="text_box2"> @@ -37,23 +33,14 @@ do Chat: <text name="text_box7"> Dono </text> - <color_swatch label="Bolha" name="background"/> - <text name="text_box8"> - Bolha - </text> <color_swatch label="URLs" name="links"/> <text name="text_box9"> URLs </text> - <check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/> - <spinner label="Ocultar Chat depois" label_width="108" name="fade_chat_time" width="160"/> - <spinner left="373" name="max_chat_count"/> - <slider label="Opacidade" name="console_opacity"/> - <check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/> - <check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/> - <check_box label="Teclas de Setas sempre movem o avatar durante a conversa" name="arrow_keys_move_avatar_check"/> - <check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/> - <check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/> - <check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/> - <slider label="Opacidade" name="bubble_chat_opacity"/> + <check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/> + <check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/> + <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada, ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinÃcio)"> + <radio_item label="Janelas separadas" name="radio" value="0"/> + <radio_item label="Guias" name="radio2" value="1"/> + </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index 8bde39545c..7a3e69c988 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -1,90 +1,67 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Geral" name="general_panel"> - <combo_box name="start_location_combo"> - <combo_box.item name="MyHome" tool_tip="Como padrão, registrar na minha casa." label="Minha Casa"/> - <combo_box.item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade." label="Minha Última Localidade"/> - </combo_box> - <check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/> - <combo_box name="fade_out_combobox"> - <combo_box.item name="Never" label="Nunca"/> - <combo_box.item name="Show Temporarily" label="Mostrar Temporariamente"/> - <combo_box.item name="Always" label="Sempre"/> - </combo_box> - <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/> - <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/> - <text name="group_titles_textbox"> - TÃtulos dos Grupos: - </text> - <check_box label="Ocultar todos os TÃtulos de Grupos" name="show_all_title_checkbox"/> - <check_box label="Ocultar meu TÃtulo no Grupo" name="show_my_title_checkbox"/> - <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/> - <text name="UI Size:"> - Tamanho da UI: + <text name="language_textbox"> + Linguagem: </text> - <check_box label="Usar escala independente da resolução" name="ui_auto_scale"/> - <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/> - <check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/> - <text name="maturity_desired_label"> - Classificação: + <combo_box name="language_combobox"> + <combo_box.item label="Padrão" name="System Default Language"/> + <combo_box.item label="English (Inglês)" name="English"/> + <combo_box.item label="Dansk (Dinamarquês) - Beta" name="Danish"/> + <combo_box.item label="Deutsch (Alemão) - Beta" name="Deutsch(German)"/> + <combo_box.item label="Español (Espanhol) - Beta" name="Spanish"/> + <combo_box.item label="Français (Francês) - Beta" name="French"/> + <combo_box.item label="Italiano - Beta" name="Italian"/> + <combo_box.item label="Nederlands (Holandês) - Beta" name="Dutch"/> + <combo_box.item label="Polski (Polonês) - Beta" name="Polish"/> + <combo_box.item label="Português - Beta" name="Portugese"/> + <combo_box.item label="日本語 (Japonês) - Beta" name="(Japanese)"/> + </combo_box> + <text name="language_textbox2"> + (Reinicie para mostrar o novo idioma) </text> <text name="maturity_desired_prompt"> Eu quero acessar conteúdo classificado: </text> + <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item name="Desired_Adult" label="PG, Mature e Adult"/> - <combo_box.item name="Desired_Mature" label="PG e Mature"/> - <combo_box.item name="Desired_PG" label="PG"/> + <combo_box.item label="PG, Mature e Adult" name="Desired_Adult"/> + <combo_box.item label="PG e Mature" name="Desired_Mature"/> + <combo_box.item label="PG" name="Desired_PG"/> </combo_box> - <text name="maturity_desired_textbox"> - PG - </text> <text name="start_location_textbox"> - Posição Inicial: + Ponto de partida: </text> - <text name="show_names_textbox"> - Mostrar Nomes: + <combo_box name="start_location_combo"> + <combo_box.item label="Minha Última Localidade" name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade."/> + <combo_box.item label="Minha Casa" name="MyHome" tool_tip="Como padrão, registrar na minha casa."/> + </combo_box> + <check_box initial_value="true" label="Mostrar ao entrar" name="show_location_checkbox"/> + <text name="name_tags_textbox"> + Mostrar nomes: </text> + <radio_group name="Name_Tag_Preference"> + <radio_item label="Desligar" name="radio" value="0"/> + <radio_item label="Ligar" name="radio2" value="1"/> + <radio_item label="Brevemente" name="radio3" value="2"/> + </radio_group> + <check_box label="Mostrar meu nome" name="show_my_name_checkbox1"/> + <check_box initial_value="true" label="Nomes pequenos" name="small_avatar_names_checkbox"/> + <check_box label="Mostrar cargo" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> - Cores para Meus Efeitos: - </text> - <text name="seconds_textbox"> - segundos - </text> - <text name="crash_report_textbox"> - Relatórios de Falhas: + Meus efeitos: </text> - <text name="language_textbox"> - Linguagem: + <text name="title_afk_text"> + Entrar no modo ausente em: </text> - <text name="language_textbox2"> - (Precisa de reinÃcio para efetivar) - </text> - <string name="region_name_prompt"> - Digite o nome da Região - </string> - <combo_box name="crash_behavior_combobox"> - <combo_box.item name="Askbeforesending" label="Perguntar antes de enviar"/> - <combo_box.item name="Alwayssend" label="Sempre enviar"/> - <combo_box.item name="Neversend" label="Nunca Enviar"/> - </combo_box> - <combo_box name="language_combobox"> - <combo_box.item name="System Default Language" label="Padrão do Sistema"/> - <combo_box.item name="English" label="English (Inglês)"/> - <combo_box.item name="Danish" label="Dansk (Dinamarquês) - Beta"/> - <combo_box.item name="Deutsch(German)" label="Deutsch (Alemão) - Beta"/> - <combo_box.item name="Spanish" label="Español (Espanhol) - Beta"/> - <combo_box.item name="French" label="Français (Francês) - Beta"/> - <combo_box.item name="Italian" label="Italiano - Beta"/> - <combo_box.item name="Hungarian" label="Magyar (Húngaro) - Beta"/> - <combo_box.item name="Dutch" label="Nederlands (Holandês) - Beta"/> - <combo_box.item name="Polish" label="Polski (Polonês) - Beta"/> - <combo_box.item name="Portugese" label="Português - Beta"/> - <combo_box.item name="Russian" label="РуÑÑкий (Russo) - Beta"/> - <combo_box.item name="Turkish" label="Türkçe (Turco) - Beta"/> - <combo_box.item name="Ukrainian" label="УкраїнÑька (Ucraniano) - Beta"/> - <combo_box.item name="Chinese" label="ä¸æ–‡ (简体) (Chinês) - Beta"/> - <combo_box.item name="(Japanese)" label="日本語 (Japonês) - Beta"/> - <combo_box.item name="(Korean)" label="í•œêµì–´ (Coreano) - Beta"/> + <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/> + <combo_box label="Entrar no modo ausente em:" name="afk"> + <combo_box.item label="2 minutos" name="item0"/> + <combo_box.item label="5 minutos" name="item1"/> + <combo_box.item label="10 minutos" name="item2"/> + <combo_box.item label="30 minutos" name="item3"/> + <combo_box.item label="(nunca)" name="item4"/> </combo_box> - <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/> + <text name="text_box3"> + Mensagem do modo ocupado: + </text> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml index d7982ab940..121272bf6c 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml @@ -1,43 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Gráficos" name="Display panel"> - <button label="?" name="GraphicsPreferencesHelpButton"/> - <check_box label="Execute Second Life em uma janela" name="windowed mode"/> - <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480"> - Se desmarcado, o visualizador exibirá tela inteira quando fizer o acesso. - </text_editor> - <text name="WindowSizeLabel"> - Tamanho da Janela: + <text name="UI Size:"> + Interface: </text> - <combo_box name="windowsize combo"> - <combo_box.item name="640x480" label="640x480" /> - <combo_box.item name="800x600" label="800x600" /> - <combo_box.item name="720x480" label="720x480 (NTSC)" /> - <combo_box.item name="768x576" label="768x576 (PAL)" /> - <combo_box.item name="1024x768" label="1024x768" /> - </combo_box> - <text name="DisplayResLabel"> - Resolução de Display: - </text> - <text name="AspectRatioLabel1" tool_tip="largura / altura"> - Relação de Aspecto: - </text> - <combo_box name="aspect_ratio" tool_tip="largura / altura"> - <combo_box.item name="4:3(StandardCRT)" label="4:3 (CRT Padrão)" /> - <combo_box.item name="5:4(1280x1024LCD)" label="5:4 (1280x1024 LCD)" /> - <combo_box.item name="8:5(Widescreen)" label="8:5 (tela ampla)" /> - <combo_box.item name="16:9(Widescreen)" label="16:9 (tela ampla)" /> - </combo_box> - <check_box label="Auto-detectar a relação" name="aspect_auto_detect"/> - <text name="HigherText"> - Qualidade e - </text> - <text name="QualityText"> - Performance: + <text name="QualitySpeed"> + Qualidade e velocidade: </text> <text name="FasterText"> Mais rápido </text> + <text name="BetterText"> + Melhor + </text> <text name="ShadersPrefText"> Baixo </text> @@ -50,96 +25,82 @@ rápido <text name="ShadersPrefText4"> Ultra </text> - <text name="HigherText2"> - Mais alto - </text> - <text name="QualityText2"> - Qualidade - </text> - <check_box label="Personalizar" left="395" name="CustomSettings"/> - <panel name="CustomGraphics Panel"> - <text name="ShadersText"> - Sombreadores: - </text> - <check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/> - <check_box label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/> - <check_box label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/> - <check_box label="Reflexos de Ãgua" name="Reflections"/> - <text name="ReflectionDetailText"> - Detalhes de Reflexão: - </text> - <radio_group name="ReflectionDetailRadio"> - <radio_item name="0" label="Terreno e Ãrvores" /> - <radio_item name="1" label="Todos os objetos estáticos" /> - <radio_item name="2" label="Todos os avatares e Objetos" /> - <radio_item name="3" label="Tudo" /> - </radio_group> - <text name="AvatarRenderingText"> - Renderização de Avatar: - </text> - <check_box label="Atributos do Avatar" name="AvatarImpostors"/> - <check_box label="Melhoria de Hardware" name="AvatarVertexProgram"/> - <check_box label="Vestimenta do Avatar" name="AvatarCloth"/> - <text name="DrawDistanceMeterText1"> - m - </text> - <text name="DrawDistanceMeterText2"> - m - </text> - <slider label="Distancia de desenho:" label_width="150" name="DrawDistance" width="255"/> - <slider label="Contador máx. de partÃculas:" label_width="150" name="MaxParticleCount" width="262"/> - <slider label="Qualidade de Pós-processamento:" label_width="178" name="RenderPostProcess" width="223"/> - <text name="MeshDetailText"> - Detalhes de Malha: - </text> - <slider label=" Objetos:" name="ObjectMeshDetail"/> - <slider label=" Primitivas Flexiveis:" name="FlexibleMeshDetail"/> - <slider label=" Ãrvores:" name="TreeMeshDetail"/> - <slider label=" Avatares:" name="AvatarMeshDetail"/> - <slider label=" Terreno:" name="TerrainMeshDetail"/> - <slider label=" Céu:" name="SkyMeshDetail"/> - <text name="PostProcessText"> - Baixo - </text> - <text name="ObjectMeshDetailText"> - Baixo - </text> - <text name="FlexibleMeshDetailText"> - Baixo - </text> - <text name="TreeMeshDetailText"> - Baixo - </text> - <text name="AvatarMeshDetailText"> - Baixo - </text> - <text name="TerrainMeshDetailText"> - Baixo - </text> - <text name="SkyMeshDetailText"> - Baixo - </text> - <text name="LightingDetailText"> - Detalhes de Iluminação: - </text> - <radio_group name="LightingDetailRadio"> - <radio_item name="SunMoon" label="Sol e Lua apenas" /> - <radio_item name="LocalLights" label="Luzes locais nas proximidades" /> - </radio_group> - <text name="TerrainDetailText"> - Detalhe do Terreno: - </text> - <radio_group left_delta="45" name="TerrainDetailRadio" width="276"> - <radio_item name="0" label="Baixo" /> - <radio_item name="2" label="Alto" /> - </radio_group> + <panel label="CustomGraphics" name="CustomGraphics Panel"> + <text name="ShadersText"> + Sombreadores: + </text> + <check_box initial_value="true" label="Bump de Mapeamento e Brilho" name="BumpShiny"/> + <check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/> + <check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/> + <check_box initial_value="true" label="Reflexos de Ãgua" name="Reflections"/> + <text name="ReflectionDetailText"> + Detalhes de Reflexão: + </text> + <radio_group name="ReflectionDetailRadio"> + <radio_item label="Terreno e árvores" name="0"/> + <radio_item label="Todos os objetos estáticos" name="1"/> + <radio_item label="Todos os avatares e Objetos" name="2"/> + <radio_item label="Tudo" name="3"/> + </radio_group> + <text name="AvatarRenderingText"> + Renderização de Avatar: + </text> + <check_box initial_value="true" label="Atributos do Avatar" name="AvatarImpostors"/> + <check_box initial_value="true" label="Melhoria de Hardware" name="AvatarVertexProgram"/> + <check_box initial_value="true" label="Vestimenta do Avatar" name="AvatarCloth"/> + <slider label="Distancia de desenho:" label_width="150" name="DrawDistance" width="255"/> + <text name="DrawDistanceMeterText2"> + m + </text> + <slider label="Contador máx. de partÃculas:" label_width="150" name="MaxParticleCount" width="262"/> + <slider label="Qualidade de Pós-processamento:" label_width="178" name="RenderPostProcess" width="223"/> + <text name="MeshDetailText"> + Detalhes de Malha: + </text> + <slider label=" Objetos:" name="ObjectMeshDetail"/> + <slider label=" Primitivas Flexiveis:" name="FlexibleMeshDetail"/> + <slider label=" Ãrvores:" name="TreeMeshDetail"/> + <slider label=" Avatares:" name="AvatarMeshDetail"/> + <slider label=" Terreno:" name="TerrainMeshDetail"/> + <slider label=" Céu:" name="SkyMeshDetail"/> + <text name="PostProcessText"> + Baixo + </text> + <text name="ObjectMeshDetailText"> + Baixo + </text> + <text name="FlexibleMeshDetailText"> + Baixo + </text> + <text name="TreeMeshDetailText"> + Baixo + </text> + <text name="AvatarMeshDetailText"> + Baixo + </text> + <text name="TerrainMeshDetailText"> + Baixo + </text> + <text name="SkyMeshDetailText"> + Baixo + </text> + <text name="LightingDetailText"> + Detalhes de Iluminação: + </text> + <radio_group name="LightingDetailRadio"> + <radio_item label="Sol e Lua apenas" name="SunMoon" value="0"/> + <radio_item label="Luzes locais nas proximidades" name="LocalLights" value="1"/> + </radio_group> + <text name="TerrainDetailText"> + Detalhe do Terreno: + </text> + <radio_group left_delta="45" name="TerrainDetailRadio" width="276"> + <radio_item label="Baixo" name="0"/> + <radio_item label="Alto" name="2"/> + </radio_group> </panel> - <button label="Configurações Recomendadas" name="Defaults" width="190" left="110"/> - <button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/> - <panel.string name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> - <panel.string name="aspect_ratio_text"> - [NUM]:[DEN] - </panel.string> + <button label="Aplicar" label_selected="Aplicar" name="Apply"/> + <button label="Redefinir" left="110" name="Defaults" width="190"/> + <button label="Avançado" name="Advanced"/> + <button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml index 84c6c934c8..0cf2b7a4af 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml @@ -1,33 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Comunicação" name="im"> - <text name="text_box"> - Minha situação online: + <panel.string name="log_in_to_change"> + autentique-se para mudar + </panel.string> + <button label="Limpar histórico" name="clear_cache" tool_tip="Apagar imagem do login, última localização, histórico de teletransporte, cache de texturas e web"/> + <text name="cache_size_label_l"> + (Locações, imagens, web, histórico de busca) </text> - <check_box label="Apenas meus Amigos e Grupos podem me ver online" name="online_visibility"/> - <text name="text_box2"> - Opções MI: + <check_box label="Apenas amigos e grupos sabem que estou online" name="online_visibility"/> + <check_box label="Apenas amigos e grupos podem me chamar ou enviar MI" name="voice_call_friends_only_check"/> + <check_box label="Desligar o microfone quando terminar chamadas" name="auto_disengage_mic_check"/> + <check_box label="Aceitar cookies" name="cookies_enabled"/> + <text name="Logs:"> + Logs: </text> - <string name="log_in_to_change"> - Logar para Alterar - </string> - <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email"/> - <check_box label="Incluir MIs no console do chat" name="include_im_in_chat_console"/> - <check_box label="Mostrar data e hora na MI" name="show_timestamps_check"/> - <check_box label="Mostrar notificação de Amigo online" name="friends_online_notify_checkbox"/> - <text name="text_box3" width="134"> - Resposta no Modo -Ocupado: + <check_box label="Salvar logs de bate- papo das proximidades no meu computador" name="log_nearby_chat"/> + <check_box label="Salvar logs de MI no meu computador" name="log_instant_messages"/> + <check_box label="Adicionar timestamp" name="show_timestamps_check_im"/> + <text name="log_path_desc"> + Localização dos logs: </text> - <text name="text_box4"> - Opções de Registro: - </text> - <check_box label="Salvar um registro das MIs em meu computador" name="log_instant_messages"/> - <check_box label="Mostrar a hora nas MIs" name="log_instant_messages_timestamp"/> - <check_box label="Mostrar o final da última conversa em MI" name="log_show_history"/> - <check_box label="Salvar um registro da Conversa local em meu computador" name="log_chat"/> - <check_box label="Mostrar a hora no registro da Conversa local" name="log_chat_timestamp"/> - <check_box label="Mostrar MIs recebidas no registro de Conversa local" name="log_chat_IM"/> - <check_box label="Incluir data e hora" name="log_date_timestamp"/> - <button label="Mudar Local" label_selected="Alterar Caminho" name="log_path_button" width="120"/> <line_editor left="278" name="log_path_string" right="-20"/> + <button label="Navegar" label_selected="Navegar" name="log_path_button" width="120"/> + <button label="Lista dos bloqueados" name="block_list"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml index 3c94090131..f220bb156f 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml @@ -1,33 +1,46 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Câmera" name="Input panel"> - <text name=" Mouselook Options:"> - Mouselook: +<panel label="Configurações" name="Input panel"> + <button bottom_delta="-40" label="Outros dispositivos" name="joystick_setup_button" width="165"/> + <text name="Mouselook:"> + Visão subjetiva: </text> - <text name=" Mouse Sensitivity:"> - Sensibilidade do Mouse: + <text name=" Mouse Sensitivity"> + Sensibilidade do mouse </text> - <check_box label="Inverter o Mouse" name="invert_mouse"/> - <text name=" Auto Fly Options:"> - Vôo Automático: + <check_box label="Inverter" name="invert_mouse"/> + <text name="Network:"> + Rede: </text> - <check_box label="Voar/Aterrissar pressionando teclas para cima/baixo" name="automatic_fly"/> - <text name=" Camera Options:"> - Opções de Câmera: + <text name="Maximum bandwidth"> + Largura de banda máxima </text> - <text name="camera_fov_label" width="218"> - Angulo de Visão da Câmera: + <text name="text_box2"> + kbps </text> - <slider bottom_delta="-6" width="128" left="360" name="camera_fov" /> - <text name="Camera Follow Distance:" width="218"> - Distância de Acompanhamento da Camêra: + <check_box label="Personalizar porta" name="connection_port_enabled"/> + <spinner label="Número da porta:" name="connection_port"/> + <text name="cache_size_label_l"> + Tamanho do cache </text> - <slider bottom_delta="-6" width="128" left="360" name="camera_offset_scale" /> - <check_box label="Edição automática do movimento da câmera" name="edit_camera_movement" tool_tip="Usar posicionamento automático da câmera quando entrar e sair do modo de edição"/> - <check_box label="Movimento Automático da Câmera na edição de aparência" name="appearance_camera_movement" tool_tip="Usar posicionamento automático da câmera em modo de edição"/> - <text name="text2"> - Opções de Exibição -do Avatar: + <text name="text_box5"> + MB </text> - <check_box label="Mostra o avatar em primeira pessoa" name="first_person_avatar_visible"/> - <button bottom_delta="-40" label="Configuração do Joystick" name="joystick_setup_button" width="165"/> + <text name="Cache location"> + Localização do cache: + </text> + <button label="Navegar" label_selected="Navegar" name="set_cache"/> + <button label="Redefinir" label_selected="Redefinir" name="reset_cache"/> + <text name="Web:"> + Web: + </text> + <radio_group name="use_external_browser"> + <radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]." value="0"/> + <radio_item label="Usar meu navegador (IE, Firefox, Safari)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado." value="1"/> + </radio_group> + <check_box initial_value="false" label="Ativar web proxy" name="web_proxy_enabled"/> + <text name="Proxy location"> + Localização do proxy: + </text> + <line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/> + <spinner label="Número da porta:" name="web_proxy_port"/> </panel> 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 5574679cde..5dbd3d4904 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml @@ -1,39 +1,45 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Ãudio & VÃdeo" name="Preference Media panel"> - <slider label="Mestre" name="System Volume"/> +<panel label="Sons" name="Preference Media panel"> + <slider label="Volume principal" name="System Volume"/> + <check_box initial_value="true" label="Silenciar ao minimizar" name="mute_when_minimized"/> + <slider label="Botões" name="UI Volume"/> <slider label="Ambiente" name="Wind Volume"/> - <slider label="Sons" name="SFX Volume"/> + <slider label="Efeitos sonoros" name="SFX Volume"/> + <slider label="Streaming de música" name="Music Volume"/> + <check_box label="Ativado" name="music_enabled"/> <slider label="MÃdia" name="Media Volume"/> - <slider label="UI" name="UI Volume"/> - <slider label="Música" name="Music Volume"/> - <slider label="Voz" name="Voice Volume"/> - <text_editor name="voice_unavailable"> - Bate-papo de Voz nâo está disponÃvel - </text_editor> - <check_box label="Habilitar bate-papo de Voz" name="enable_voice_check"/> - <radio_group name="ear_location"> - <radio_item name="0" label="Ouvir o bate-papo de voz pela posição de câmera" /> - <radio_item name="1" label="Ouvir o bate-papo de voz pela posição do avatar" /> - </radio_group> - <button label="Configurações do dispositivo" name="device_settings_btn" width="180"/> - <text name="muting_text"> - Volume: - </text> - <text name="streaming_prefs_text"> - Preferências de -Streaming: + <check_box label="Ativado" name="enable_media"/> + <slider label="Bate-papo de voz" name="Voice Volume"/> + <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="verdadeiro"/> + <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="verdadeiro"/> + <text name="voice_chat_settings"> + Configuração de bate-papo de voz </text> - <text name="audio_prefs_text"> - Preferências de Ãudio: + <text name="Listen from"> + Ouvir a partir de: </text> - <panel label="Volume" name="Volume Panel"/> - <check_box label="Tocar música em streaming" name="streaming_music"/> - <check_box label="Tocar streaming de MÃdia" name="streaming_video"/> - <check_box label="Tocar mÃdia automaticamente" name="auto_streaming_video"/> - <check_box label="Silenciar Ãudio quando minimizar janela" name="mute_when_minimized"/> - <slider label="Efeito Doppler" name="Doppler Effect"/> - <slider label="Fator Distância" name="Distance Factor"/> - <slider label="Fator Rolloff" name="Rolloff Factor"/> - <spinner label="Mudar nÃvel de alerta de L$" name="L$ Change Threshold" label_width="165" width="229"/> - <spinner label="Mudar nÃvel de alerta de Saúde" name="Health Change Threshold" label_width="165" width="229"/> + <radio_group name="ear_location"> + <radio_item label="Posição de câmera" name="0"/> + <radio_item label="Posição do avatar" name="1"/> + </radio_group> + <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> + <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> diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml new file mode 100644 index 0000000000..a1254b4da0 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="MediaControls"> + <string name="min_width"> + 300 + </string> + <string name="min_height"> + 75 + </string> + <string name="zoom_medium_padding"> + 1.1 + </string> + <string name="top_world_view_avoid_zone"> + 50 + </string> + <layout_stack name="progress_indicator_area"> + <panel name="media_progress_indicator"> + <progress_bar name="media_progress_bar" tool_tip="Carregando mÃdia"/> + </panel> + </layout_stack> + <layout_stack name="media_controls"> + <layout_panel name="back"> + <button name="back_btn" tool_tip="Navegar para trás"/> + </layout_panel> + <layout_panel name="fwd"> + <button name="fwd_btn" tool_tip="Navegar para frente"/> + </layout_panel> + <layout_panel name="home"> + <button name="home_btn" tool_tip="Página web:"/> + </layout_panel> + <layout_panel name="media_stop"> + <button name="media_stop_btn" tool_tip="Parar mÃdia"/> + </layout_panel> + <layout_panel name="reload"> + <button name="reload_btn" tool_tip="Recarregar"/> + </layout_panel> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Parar de carregar"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Tocar mÃdia"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pausar mÃdia"/> + </layout_panel> + <layout_panel name="media_address"> + <line_editor name="media_address_url" tool_tip="URL da mÃdia"/> + <layout_stack name="media_address_url_icons"> + <layout_panel> + <icon name="media_whitelist_flag" tool_tip="Lista ativada"/> + </layout_panel> + <layout_panel> + <icon name="media_secure_lock_flag" tool_tip="Navegação segura"/> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="media_play_position"> + <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Andamento do vÃdeo"/> + </layout_panel> + <layout_panel name="skip_back"> + <button name="skip_back_btn" tool_tip="Passo para trás"/> + </layout_panel> + <layout_panel name="skip_forward"> + <button name="skip_forward_btn" tool_tip="Passo para frente"/> + </layout_panel> + <layout_panel name="media_volume"> + <button name="media_mute_button" tool_tip="Silenciar esta mÃdia"/> + <slider name="volume_slider" tool_tip="Volume"/> + </layout_panel> + <layout_panel name="zoom_frame"> + <button name="zoom_frame_btn" tool_tip="Enfocar mÃdia"/> + </layout_panel> + <layout_panel name="close"> + <button name="close_btn" tool_tip="Menos zoom"/> + </layout_panel> + <layout_panel name="new_window"> + <button name="new_window_btn" tool_tip="Abrir URL em navegador"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_profile.xml b/indra/newview/skins/default/xui/pt/panel_profile.xml index ff53aa6a41..805e3aaebd 100644 --- a/indra/newview/skins/default/xui/pt/panel_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_profile.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="panel_profile"> +<panel label="Perfil" name="panel_profile"> <string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] @@ -11,4 +11,42 @@ http://www.secondlife.com/account/partners.php?lang=pt </string> <string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=pt-BR"/> + <string name="no_partner_text" value="Ninguém"/> + <string name="no_group_text" value="Nenhum"/> + <string name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <scroll_container name="profile_scroll"> + <panel name="profile_scroll_panel"> + <panel name="second_life_image_panel"> + <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> + </panel> + <panel name="first_life_image_panel"> + <text name="title_rw_descr_text" value="Mundo real:"/> + </panel> + <text name="title_member_text" value="Residente desde:"/> + <text name="title_acc_status_text" value="Conta:"/> + <text name="title_partner_text" value="Parceiro(a):"/> + <panel name="partner_data_panel"> + <name_box initial_value="(pesquisando)" name="partner_text"/> + </panel> + <text name="title_groups_text" value="Grupos:"/> + </panel> + </scroll_container> + </layout_panel> + <layout_panel name="profile_buttons_panel"> + <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/> + <button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/> + <button label="Ligar" name="call" tool_tip="Ligar para este residente"/> + <button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/> + <button label="Teletransportar" name="teleport" tool_tip="Oferecer teletransporte"/> + <button label="â–¼" name="overflow_btn" tool_tip="Pagar ou compartilhar inventário com o residente"/> + </layout_panel> + <layout_panel name="profile_me_buttons_panel"> + <button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/> + <button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: fÃsico, roupas, etc."/> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_profile_view.xml b/indra/newview/skins/default/xui/pt/panel_profile_view.xml new file mode 100644 index 0000000000..62a16c6fbe --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_profile_view.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_target_profile"> + <string name="status_online"> + Conectado + </string> + <string name="status_offline"> + Desconectado + </string> + <text_editor name="user_name" value="Carregando..."/> + <text name="status" value="Conectado"/> + <tab_container name="tabs"> + <panel label="PERFIL" name="panel_profile"/> + <panel label="DESTAQUES" name="panel_picks"/> + <panel label="ANOTAÇÕES E PRIVACIDADE" name="panel_notes"/> + </tab_container> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml index 4977a1fac9..65ac89baf8 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Corretagem" name="Covenant"> <text name="estate_section_lbl"> - Propriedade: + Propriedade </text> <text bottom_delta="-19" name="estate_name_lbl"> Nome: @@ -22,7 +22,7 @@ Última modificação: Quarta, 31 de dezembro de 1969 à s 16:00:00 horas </text> <button label="?" name="covenant_help"/> - <text_editor name="covenant_editor" bottom="-247" height="162" > + <text_editor bottom="-247" height="162" name="covenant_editor"> Não há nenhuma regra fornecida para esta Propriedade. </text_editor> <button label="Resetar" name="reset_covenant"/> @@ -30,12 +30,11 @@ As mudanças das regras serão mostradas em todos os lotes da propriedade. </text> - <text bottom_delta="-36" name="covenant_instructions"> - Arraste e solte um notecard, para mudar as Regras desta - Propriedade. + <text bottom_delta="-36" name="covenant_instructions"> + Arrastar e soltar uma anotação para alterar o contrato em vigor nesta propriedade. </text> <text bottom_delta="-36" name="region_section_lbl"> - Região: + Região </text> <text name="region_name_lbl"> Nome: diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml index 724df20155..2119a06e55 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml @@ -22,18 +22,18 @@ <line_editor name="target_avatar_name"> (nenhum) </line_editor> - <button label="Escolher..." name="choose_avatar_btn"/> + <button label="Selecionar" name="choose_avatar_btn"/> <text name="options_text_lbl"> Opções: </text> - <check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/> - <check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/> - <check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/> + <check_box label="Com scripts" name="return_scripts" tool_tip="Só devolver objetos com scripts"/> + <check_box label="No terreno de outra pessoa" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/> + <check_box label="Em todas as regiões desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/> <button label="Retornar" name="return_btn"/> - <button width="280" label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/> - <button label="?" name="top_colliders_help" left="297"/> - <button width="280" label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/> - <button label="?" name="top_scripts_help" left="297"/> + <button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões" width="280"/> + <button label="?" left="297" name="top_colliders_help"/> + <button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts" width="280"/> + <button label="?" left="297" name="top_scripts_help"/> <button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/> <button label="?" name="restart_help"/> <button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/> diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index f43402be15..0f173ab21a 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Propriedade" name="Estate"> <text name="estate_help_text"> - Mudanças nas definições nesta guia irão afetar -todas as regiões desta propriedade. + Mudar as opções desta guia afeta todas as regiões desta propriedade. </text> <text name="estate_text"> Propriedade: @@ -11,7 +10,7 @@ todas as regiões desta propriedade. (desconhecido) </text> <text name="owner_text"> - Proprietário: + Proprietário do imóvel: </text> <text name="estate_owner"> (desconhecido) @@ -24,10 +23,10 @@ todas as regiões desta propriedade. <check_box label="Permitir acesso público" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Acesso restrito a Residentes... + Restringir acesso a contas confirmardas por: </text> - <check_box label="com info. de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/> - <check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/> + <check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação."/> + <check_box label="Verificação de idade" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/> <check_box label="Permitir conversa de voz" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml new file mode 100644 index 0000000000..89fcb05658 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Região" name="General"> + <text name="region_text_lbl"> + Região: + </text> + <text name="region_text"> + (Desconhecido) + </text> + <text name="version_channel_text_lbl"> + Versão: + </text> + <text name="version_channel_text"> + (Desconhecido) + </text> + <text name="region_type_lbl"> + Tipo: + </text> + <text name="region_type"> + (Desconhecido) + </text> + <check_box label="Bloquear terraplanagem" name="block_terraform_check"/> + <check_box label="Bloquear voos" name="block_fly_check"/> + <check_box label="Permitir danos" name="allow_damage_check"/> + <check_box label="Limitar empurrões" name="restrict_pushobject"/> + <check_box label="Permitir revenda de terrenos" name="allow_land_resell_check"/> + <check_box label="Permitir junção e divisão de terrenos" name="allow_parcel_changes_check"/> + <check_box label="Não mostrar nos resultados de pesquisa" name="block_parcel_search_check" tool_tip="Mostrar esta região e lotes nos resultados de pesquisa"/> + <spinner label="Limite do agente" name="agent_limit_spin"/> + <spinner label="Bônus do objeto" name="object_bonus_spin"/> + <text label="NÃvel de maturidade" name="access_text"> + Classificação: + </text> + <combo_box label="Moderado" name="access_combo"> + <combo_box.item label="Público adulto" name="Adult"/> + <combo_box.item label="Moderado" name="Mature"/> + <combo_box.item label="Geral" name="PG"/> + </combo_box> + <button label="Aplicar" name="apply_btn"/> + <button label="Teletransportar para inÃcio..." name="kick_btn"/> + <button label="Teletransportar todos para inÃcio..." name="kick_all_btn"/> + <button label="Enviar mensagem para região..." name="im_btn"/> + <button label="Gerenciar telehub..." name="manage_telehub_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml index 4787b59a8d..7f37919af2 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_texture.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="Texturas de Chão" name="Textures"> <text name="region_text_lbl"> Região: @@ -36,22 +36,22 @@ <text name="height_text_lbl9"> Noroeste </text> - <spinner label="Baixo" name="height_start_spin_0" /> - <spinner label="Baixo" name="height_start_spin_1" /> - <spinner label="Baixo" name="height_start_spin_2" /> - <spinner label="Baixo" name="height_start_spin_3" /> - <spinner label="Alto" name="height_range_spin_0" /> - <spinner label="Alto" name="height_range_spin_1" /> - <spinner label="Alto" name="height_range_spin_2" /> - <spinner label="Alto" name="height_range_spin_3" /> + <spinner label="Baixo" name="height_start_spin_0"/> + <spinner label="Baixo" name="height_start_spin_1"/> + <spinner label="Baixo" name="height_start_spin_2"/> + <spinner label="Baixo" name="height_start_spin_3"/> + <spinner label="Alto" name="height_range_spin_0"/> + <spinner label="Alto" name="height_range_spin_1"/> + <spinner label="Alto" name="height_range_spin_2"/> + <spinner label="Alto" name="height_range_spin_3"/> <text name="height_text_lbl10"> - Estes valores respresentam o tipo de escala para as texturas acima. + Os valores representam o intervalo de mistura das texturas acima. </text> <text name="height_text_lbl11"> - Medido em metros, o valor Baixo é a altura máxima da Textura #1, + 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_lbl12"> e o valor Alto é a altura MÃnima da Textura #4. </text> - <button label="Aplicar" name="apply_btn" /> + <button label="Aplicar" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml new file mode 100644 index 0000000000..6f022945c2 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="script panel"> + <panel.string name="loading"> + Carregando... + </panel.string> + <panel.string name="can_not_view"> + Você não pode ver ou editar o script, uma vez que está definido como "não" copiar ". Você precisa de permissões para ver ou editar um script dentro de um objeto. + </panel.string> + <panel.string name="public_objects_can_not_run"> + Objetos públicos não podem executar scripts + </panel.string> + <panel.string name="script_running"> + Executando + </panel.string> + <panel.string name="Title"> + Script: [NOME] + </panel.string> + <text_editor name="Script Editor"> + Carregando... + </text_editor> + <button label="Salvar" label_selected="Salvar" name="Save_btn"/> + <combo_box label="Inserir..." name="Insert..."/> + <menu_bar name="script_menu"> + <menu label="Arquivo" name="File"> + <menu_item_call label="Salvar" name="Save"/> + <menu_item_call label="Reverter todas as alterações" name="Revert All Changes"/> + </menu> + <menu label="Editar" name="Edit"> + <menu_item_call label="desfazer" name="Undo"/> + <menu_item_call label="Refazer" name="Redo"/> + <menu_item_call label="Cortar" name="Cut"/> + <menu_item_call label="Copiar" name="Copy"/> + <menu_item_call label="Colar" name="Paste"/> + <menu_item_call label="Selecionar tudo" name="Select All"/> + <menu_item_call label="Desmarcar" name="Deselect"/> + <menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/> + </menu> + <menu label="Ajuda" name="Help"> + <menu_item_call label="ajuda..." name="Help..."/> + <menu_item_call label="ajuda palavra- chave..." name="Keyword Help..."/> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..daf87c4dc6 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MEU AVATAR" name="script_limits_my_avatar_panel"> + <text name="script_memory"> + Uso de scripts + </text> + <text name="loading_text"> + Carregando... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Tamanho (kb)" name="size"/> + <scroll_list.columns label="URLs" name="urls"/> + <scroll_list.columns label="Nome do objeto" name="name"/> + <scroll_list.columns label="Localização" name="location"/> + </scroll_list> + <button label="Atualizar lista" name="refresh_list_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..94274b2cfe --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="MEMÓRIA DA REGIÃO" name="script_limits_region_memory_panel"> + <text name="script_memory"> + Memória de scripts no lote + </text> + <text name="loading_text"> + Carregando... + </text> + <scroll_list name="scripts_list"> + <scroll_list.columns label="Tamanho (kb)" name="size"/> + <scroll_list.columns label="URLs" name="urls"/> + <scroll_list.columns label="Nome do objeto" name="name"/> + <scroll_list.columns label="Dono do objeto" name="owner"/> + <scroll_list.columns label="Lote" name="parcel"/> + <scroll_list.columns label="Localização" name="location"/> + </scroll_list> + <button label="Atualizar lista" name="refresh_list_btn"/> + <button label="Destaque" name="highlight_btn"/> + <button label="Devolver" name="return_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray.xml b/indra/newview/skins/default/xui/pt/panel_side_tray.xml new file mode 100644 index 0000000000..09ac074b5a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_side_tray.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> +<side_tray name="sidebar"> + <sidetray_tab description="Exibir ou não barra lateral" name="sidebar_openclose" tab_title="Exibir ou não barra lateral"/> + <sidetray_tab description="Casa." name="sidebar_home" tab_title="Home"> + <panel label="casa" name="panel_home"/> + </sidetray_tab> + <sidetray_tab description="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile"> + <panel_container name="panel_container"> + <panel label="Eu" name="panel_me"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Encontre seus amigos, contatos e pessoas nas proximidades." name="sidebar_people" tab_title="People"> + <panel_container name="panel_container"> + <panel label="Perfil do grupo" name="panel_group_info_sidetray"/> + <panel label="Residentes& Objetos bloqueados" name="panel_block_list_sidetray"/> + </panel_container> + </sidetray_tab> + <sidetray_tab description="Encontre lugares para ir e lugares que você ja visitou." label="Lugares" name="sidebar_places" tab_title="Places"> + <panel label="Lugares" name="panel_places"/> + </sidetray_tab> + <sidetray_tab description="Busca no seu inventário." name="sidebar_inventory" tab_title="My Inventory"> + <panel label="Editar inventário" name="sidepanel_inventory"/> + </sidetray_tab> + <sidetray_tab description="Muda sua aparência e visual atual." name="sidebar_appearance" tab_title="My Appearance"> + <panel label="Editar aparência" name="sidepanel_appearance"/> + </sidetray_tab> +</side_tray> diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml new file mode 100644 index 0000000000..7c06119901 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="sidetray_tab_panel"> + <text name="sidetray_tab_title" value="Bandeja lateral"/> + <button name="show_help" tool_tip="Mostrar ajuda"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml new file mode 100644 index 0000000000..05869cf67a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> +<panel name="panel_stand_stop_flying"> + <button label="Levantar-se" name="stand_btn" tool_tip="Clique aqui para ficar de pé."/> + <button label="Parar de voar" name="stop_fly_btn" tool_tip="Parar de voar"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml index 7f3d2b34a6..a320d9d56d 100644 --- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml @@ -1,38 +1,31 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="status"> - <text name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você está. Clique Sobre a Terra para informações."> - Nome do pedaço de terra vai aqui - </text> - <text name="BalanceText" tool_tip="Saldo"> - Carregando... - </text> - <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinheiro"/> - <text name="TimeText" tool_tip="Hora atual (do PacÃfico)"> - 12:00 AM - </text> - <string name="StatBarDaysOfWeek"> + <panel.string name="StatBarDaysOfWeek"> Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado - </string> - <string name="StatBarMonthsOfYear"> + </panel.string> + <panel.string name="StatBarMonthsOfYear"> Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro - </string> - <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/> - <button label="" label_selected="" name="health" tool_tip="Saúde"/> - <text name="HealthText" tool_tip="Saúde"> - 100% - </text> - <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/> - <button label="" label_selected="" name="no_build" tool_tip="Construir/Rezzar não permitido"/> - <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/> - <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/> - <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponÃvel aqui"/> - <button label="" label_selected="" name="buyland" tool_tip="Comprar este lote"/> - <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no [SECOND_LIFE]"/> - <button label="" label_selected="" name="search_btn" tool_tip="Buscar no [SECOND_LIFE]"/> - <string name="packet_loss_tooltip"> + </panel.string> + <panel.string name="packet_loss_tooltip"> Perda de pacote - </string> - <string name="bandwidth_tooltip"> + </panel.string> + <panel.string name="bandwidth_tooltip"> Banda - </string> + </panel.string> + <panel.string name="time"> + [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt] + </panel.string> + <panel.string name="timeTooltip"> + [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] + </panel.string> + <panel.string name="buycurrencylabel"> + L$ [AMT] + </panel.string> + <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/> + <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/> + <text name="TimeText" tool_tip="Hora atual (PacÃfico)"> + 24:00 AM PST + </text> + <button name="media_toggle_btn" tool_tip="Tocar/Pausar todas mÃdias (música, vÃdeo, páginas web)"/> + <button name="volume_btn" tool_tip="Volume geral"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml new file mode 100644 index 0000000000..ba83fee7ba --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Teleport History"> + <accordion name="history_accordion"> + <accordion_tab name="today" title="Hoje"/> + <accordion_tab name="yesterday" title="Ontem"/> + <accordion_tab name="2_days_ago" title="2 dias atrás"/> + 5 + <accordion_tab name="3_days_ago" title="3 dias atrás"/> + <accordion_tab name="4_days_ago" title="4 dias atrás"/> + <accordion_tab name="5_days_ago" title="5 dias atrás"/> + <accordion_tab name="6_days_and_older" title="6 dias e mais velhos"/> + <accordion_tab name="1_month_and_older" title="1 mês e mais velhos"/> + <accordion_tab name="6_months_and_older" title="6 meses e mais velhos"/> + </accordion> + <panel name="bottom_panel"> + <button name="gear_btn" tool_tip="Mostrar opções adicionais"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml new file mode 100644 index 0000000000..65f80fddd2 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="teleport_history_item"> + <button name="profile_btn" tool_tip="Mostrar dados do item"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml index 2fda713ec7..584ef8a666 100644 --- a/indra/newview/skins/default/xui/pt/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pt/panel_world_map.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="world_map"> + <panel.string name="Loading"> + Carregando... + </panel.string> + <panel.string name="InvalidLocation"> + Localização inválida + </panel.string> <panel.string name="world_map_north"> N </panel.string> diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml index 8d192d4002..2e6e4dd133 100644 --- a/indra/newview/skins/default/xui/pt/role_actions.xml +++ b/indra/newview/skins/default/xui/pt/role_actions.xml @@ -1,186 +1,71 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> - <action_set - description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite." - name="Membership"> - <action description="Convidar pessoas para este grupo" - longdescription="Convide pessoas para este grupo usando o botão 'Convidar nova pessoa...' em Membros & aba Funções > sub-aba Membros." - name="member invite" /> - <action description="Expulsar membros deste grupo" - longdescription="Expulse membros deste grupo usando o botão 'Expulsar do grupo' em Membros & aba Funções > sub-aba Membros. Um proprietário pode expulsar qualquer um, exceto outro proprietário. Se você não é um proprietário, um membro pode expulsá-lo do grupo se, e somente se, ele apenas tiver a função de todos e não outras funções. Para remover membros de funções, você precisa ter a habilidade 'Remover membros de funções'." - name="member eject" /> - <action - description="Ativar/desativar 'Abrir registro' e mudar 'Taxa de assinatura'" - longdescription="Ative/desative 'Abrir registro' para permitir que novos membros se unam sem um convite, e mude a 'Taxa de registro' na seção Preferência de grupo da aba Geral." - name="member options" /> + <action_set description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite." name="Membership"> + <action description="Convidar pessoas para este grupo" longdescription="Em Membros > Cargos, use o botão 'Convidar' para convidar pessoas para entrar no grupo." name="member invite"/> + <action description="Expulsar membros deste grupo" longdescription="Em Membros > Cargos, use o botão 'Ejetar' para tirar pessoas do grupo. Proprietários podem expulsar qualquer pessoa, menos outro proprietário. Se você não é Proprietário, um membro só pode ser expulso se tiver cargo 'Todos' e nenhum outro cargo. Para destituir um membro de seu cargo, você precisa ter a função 'Destituir membro com cargo'." name="member eject"/> + <action description="Alterna entre 'Inscrições abertas' e 'Taxa de associação'." longdescription="Ative 'Inscrições abertas' para que novos membros entrem no grupo sem convite, mude a 'Taxa de associação' na seção Geral." name="member options"/> </action_set> - <action_set - description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções." - name="Roles"> - <action description="Criar novas funções" - longdescription="Crie novas funções em Membros & aba Funções > sub-aba Funções." - name="role create" /> - <action description="Apagar funções" - longdescription="Apague funções em Membros & aba Funções > sub-aba Funções." - name="role delete" /> - <action description="Mudar nomes de função, tÃtulos e descrições" - longdescription="Mude o nome de funções, tÃtulos e descrições na parte inferior de Membros & aba Funções > sub-aba Funções após selecionar uma função." - name="role properties" /> - <action description="Designar membros para a função do designador" - longdescription="Designe membros a funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Um membro com este poder pode somente adicionar membros para a função que o designador já possui." - name="role assign member limited" /> - <action description="Designar membros para qualquer função" - longdescription="Designe membros a qualquer função na seção de funções designadas de Membros & aba Funções > sub-aba Membros. *AVISO* Quaisquer membros em uma função com esta habilidade podem designar a si próprios--e quaisquer outros membros não proprietários--para funções que têm mais poderes do que as atuais, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade." - name="role assign member" /> - <action description="Remover membros das funções" - longdescription="Remova membros de funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Proprietários não podem ser removidos." - name="role remove member" /> - <action description="Determinar e remover habilidades em funções" - longdescription="Designe e remova habilidades em funções na seção habilidades pertmitidas de Membros & aba Funções > sub-aba Funções. *AVISO* Quaisquer membros em uma função com esta habilidade podem desginar a si próprios--e quaisquer outros membros não proprietários--todas as habilidades, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade." - name="role change actions" /> + <action_set description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções." name="Roles"> + <action description="Criar novas funções" longdescription="Crie novos cargos na guia Cargos." name="role create"/> + <action description="Apagar funções" longdescription="Exclua cargos na guia Cargos." name="role delete"/> + <action description="Modificar o nome, tÃtulo e a descrição de cargos, e se o acesso a essas informações é público ou não" longdescription="Modificar o nome, tÃtulo e a descrição de cargos, e se o acesso a essas informações é público ou não. Essas configurações ficam na guia Cargos, depois da seleção do cargo." name="role properties"/> + <action description="Designar membros para a função do designador" longdescription="Na lista Cargos desempenhados, distribua os cargos aos membros (em Cargos > guia Membros). Membros exercendo esta função devem exercer um cargo para poder adicionar outros membros ao mesmo cargo." name="role assign member limited"/> + <action description="Designar membros para qualquer função" longdescription="Designe cargos aos membros na lista Cargos desempenhados (Cargos > guia Membros). *ATENÇÃO* Qualquer membro exercendo um cargo com esta função pode se designar -- ou designar outros membros não-proprietários -- a cargos com mais poder do que têm. Ou seja, membros com essa função podem assumir poderes quase iguais aos do proprietário. Pense bem antes de dar esta função a alguém." name="role assign member"/> + <action description="Remover membros das funções" longdescription="Use a lista Cargos desempenhados para destituir membros de seus cargos (Cargos > guia Membros). Proprietários não podem ser destituÃdos." name="role remove member"/> + <action description="Determinar e remover habilidades em funções" longdescription="Use a lista Funções autorizadas para adicionar e tirar as funções de cada cargo (Cargos > guia Cargos). *ATENÇÃO* Qualquer membro exercendo um cargo com esta função pode dar a sim mesmo -- ou a outros membros não-proprietários -- todas as funções. Membros excercendo todas as funções podem assumir poderes quase iguais aos do proprietário. Pense bem antes de dar esta função a alguém." name="role change actions"/> </action_set> - <action_set - description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insÃgnia." - name="Group Identity"> - <action - description="Mudar apresentação, insÃgnia, 'Publicar na web', e quais membros estão publicamente visÃveis em Informações do Grupo." - longdescription="Mude a apresentação, insÃgnia, 'Publicar na web' e quais membros estão publicamente visÃveis em Informações do grupo. É feito na aba Geral." - name="group change identity" /> + <action_set description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insÃgnia." name="Group Identity"> + <action description="Mudar apresentação, insÃgnia, 'Publicar na web', e quais membros estão publicamente visÃveis em Informações do Grupo." longdescription="Modificar o estatuto, sÃmbolo e exibição nos resultados de busca. Use a seção Geral." name="group change identity"/> </action_set> - <action_set - description="Estas habilidades incluem poderes para transferir, modificar e vender terrenos do grupo. Vá pra a janela Sobre o terreno, clique com o botão direito no terreno e selecione 'Sobre o terreno...' ou clique na informação da parcela na barra do menu." - name="Parcel Management"> - <action description="Transferir e comprar terreno para o grupo" - longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral." - name="land deed" /> - <action description="Abandonar terreno para Governador Linden" - longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno > aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade." - name="land release" /> - <action description="Definir terreno para informação de venda" - longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno > aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade." - name="land set sale info" /> - <action description="Subdividir e unir parcelas" - longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. " - name="land divide join" /> + <action_set description="Estas funções incluem poderes de transferir, vender e modificar os terrenos do grupo. Para acessar a janela 'Sobre terrenos', clique no chão com o botão direito e selecione 'Sobre terrenos'. Ou clique no Ãcone 'i' da barra de navegação." name="Parcel Management"> + <action description="Transferir e comprar terreno para o grupo" longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral." name="land deed"/> + <action description="Abandonar terreno para Governador Linden" longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno > aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade." name="land release"/> + <action description="Definir terreno para informação de venda" longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno > aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade." name="land set sale info"/> + <action description="Subdividir e unir parcelas" longdescription="Juntar ou dividir lotes. Clique no chão com o botão direito, selecione 'Editar terreno' e arraste o mouse sobre o terreno para ver as opções. Para dividir um terreno, selecione a área a ser dividida e clique em 'Dividir'. Para juntar terrenos, selecione dois ou mais lotes adjacentes e clique em 'Juntar'." name="land divide join"/> </action_set> - <action_set - description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem & opções de rota de TP." - name="Parcel Identity"> - <action - description="Ativar/desativar 'Exibir em locais de encontro' e definir categoria" - longdescription="Ativar/desativar 'Exibir em locais de encontro' e configurar uma categoria de parcela em Sobre o terreno > aba Opções." - name="land find places" /> - <action - description="Mudar nome da parcela, descrição, e configurações 'Publicar na web'" - longdescription="Mude o nome da parcela, descrição e configurações de 'Publicar na web'. É feito em Sobre o terreno > aba Opções." - name="land change identity" /> - <action description="Definir ponto de aterrissagem e rota de teletransporte" - longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno > aba Opções." - name="land set landing point" /> + <action_set description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem & opções de rota de TP." name="Parcel Identity"> + <action description="Alternar 'Exibir nos resultados de busca' e selecionar a categoria" longdescription="Alterne entre 'Exibir nos resultados de busca' ou não, e selecione a categoria do terreno em 'Sobre o terreno'." name="land find places"/> + <action description="Mude o nome, a descrição e a exibição do terreno nos resultados de busca." longdescription="Mude o nome, a descrição e a exibição do terreno nos resultados de busca. Veja essas opções em Sobre o terreno > guia Opções." name="land change identity"/> + <action description="Definir ponto de aterrissagem e rota de teletransporte" longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno > aba Opções." name="land set landing point"/> </action_set> - <action_set - description="Estas habilidade incluem poderes que afetam opções de parcela, como 'Criar objetos', 'Editar terreno' e música & configurações de mÃdia." - name="Parcel Settings"> - <action description="Mudar música & configurações de mÃdia" - longdescription="Mude streaming de música e configurações de vÃdeo em Sobre o terreno > aba MÃdia." - name="land change media" /> - <action description="Ativar/desativar 'Editar terreno'" - longdescription="Ative/desative 'Editar terreno'. *AVISO* Sobre o terreno > aba Opções > Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno > aba Opções." - name="land edit" /> - <action - description="Ativar/desativar variados Sobre o Terreno > Opções de configuração" - longdescription="Ative/desative 'Seguro (sem dano)', 'Voar', e permita a outros residentes: 'Criar objetos', 'Editar terreno', 'Criar pontos de referência', e 'Executar scripts' em um terreno pertencente ao grupo em Sobre o terreno > aba Opções." - name="land options" /> + <action_set description="Estas habilidade incluem poderes que afetam opções de parcela, como 'Criar objetos', 'Editar terreno' e música & configurações de mÃdia." name="Parcel Settings"> + <action description="Mudar música & configurações de mÃdia" longdescription="Mude streaming de música e configurações de vÃdeo em Sobre o terreno > aba MÃdia." name="land change media"/> + <action description="Ativar/desativar 'Editar terreno'" longdescription="Ative/desative 'Editar terreno'. *AVISO* Sobre o terreno > aba Opções > Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno > aba Opções." name="land edit"/> + <action description="Ativar/desativar variados Sobre o Terreno > Opções de configuração" longdescription="Alterna as opções 'Seguro (zero danos)', 'Voar' e autorizar outros residentes a: 'Editar terreno', 'Contruir', 'Criar marcos' e 'Executar scripts' nos terrenos do grupo. Clique em Sobre o terreno > guia Opções." name="land options"/> </action_set> - <action_set - description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo." - name="Parcel Powers"> - <action description="Sempre permitir 'Editar terreno'" - longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." - name="land allow edit land" /> - <action description="Sempre permitir 'Voar'" - longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." - name="land allow fly" /> - <action description="Sempre permitir 'Criar objetos'" - longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." - name="land allow create" /> - <action description="Sempre permitir 'Criar ponto de referência'" - longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." - name="land allow landmark" /> - <action description="Permitir 'Colocar casa aqui' no terreno do grupo" - longdescription="Membros em uma função com esta habilidade podem usar o menu Mundo > Definir lar aqui em uma parcela do grupo (definir terreno ou transferir para este grupo)." - name="land allow set home" /> + <action_set description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo." name="Parcel Powers"> + <action description="Sempre permitir 'Editar terreno'" longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." name="land allow edit land"/> + <action description="Sempre permitir 'Voar'" longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." name="land allow fly"/> + <action description="Sempre permitir 'Criar objetos'" longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." name="land allow create"/> + <action description="Sempre permitir 'Criar ponto de referência'" longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções." name="land allow landmark"/> + <action description="Permitir 'Colocar casa aqui' no terreno do grupo" longdescription="Membros exercendo cargos com esta função podem selecionar no menu Mundo > Marcos > Definir como casa em lotes doados ao grupo." name="land allow set home"/> </action_set> - <action_set - description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes." - name="Parcel Access"> - <action description="Gerenciar listas de acesso à parcela" - longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno > aba Acesso." - name="land manage allowed" /> - <action description="Gerenciar lista de banidos da parcela" - longdescription="Gerencie a lista de banidos da parcela em Sobre o terreno > aba Banido." - name="land manage banned" /> - <action description="Mudar configurações de parcela 'Vender passes...'" - longdescription="Mude configurações de 'Vender passes...' em Sobre o terreno > aba Acesso." - name="land manage passes" /> - <action description="Expulsar e congelar residentes nas parcelas" - longdescription="Membros em uma função com esta habilidade podem lidar com um residente indesejado em uma parcela pertencente ao grupo clicando com o botão direitos sobre ele, Mais > e selecionado 'Expulsar...' ou 'Congelar...'." - name="land admin" /> + <action_set description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes." name="Parcel Access"> + <action description="Gerenciar listas de acesso à parcela" longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno > aba Acesso." name="land manage allowed"/> + <action description="Gerenciar lista de banidos da parcela" longdescription="Administre as listas de acesso e bloqueio em Sobre o terreno > guia Acesso." name="land manage banned"/> + <action description="Modificar as opções 'Vender passes para'" longdescription="Mude as opções 'Vender passes para' em Sobre o terreno > guia Acesso." name="land manage passes"/> + <action description="Expulsar e congelar residentes nas parcelas" longdescription="Membros exercendo cargos com esta função podem lidar com residentes problemáticos nos terrenos do grupo. Clique no residente com o botão direito, depois selecione 'Ejetar' ou 'Congelar'." name="land admin"/> </action_set> - <action_set - description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possÃvel desfazer a mudança dos objetos." - name="Parcel Content"> - <action description="Retornar objetos que pertencem ao grupo" - longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno > aba Objetos." - name="land return group owned" /> - <action description="Retornar objetos definidos para o grupo" - longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno > aba Objetos." - name="land return group set" /> - <action description="Retornar objetos que não pertencem ao grupo" - longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno > aba Objetos." - name="land return non group" /> - <action description="Ajardinar usando plantas Linden" - longdescription="A habilidade de ajardinar permite colocar e mover árvores Linden, plantas e gramas. Estes itens podem ser encontrando na Biblioteca de seu inventário > pasta Objetos ou podem ser criados através do botão Construir." - name="land gardening" /> + <action_set description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possÃvel desfazer a mudança dos objetos." name="Parcel Content"> + <action description="Retornar objetos que pertencem ao grupo" longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno > aba Objetos." name="land return group owned"/> + <action description="Retornar objetos definidos para o grupo" longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno > aba Objetos." name="land return group set"/> + <action description="Retornar objetos que não pertencem ao grupo" longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno > aba Objetos." name="land return non group"/> + <action description="Ajardinar usando plantas Linden" longdescription="Função de paisagismo: poder de plantar e mudar árvores, plantas e grama Linden. A pasta Biblioteca > Objetos do inventário contém material de paisagismo. Use o menu Construir para criar suas próprias plantas." name="land gardening"/> </action_set> - <action_set - description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. " - name="Object Management"> - <action description="Transferir objetos para o grupo" - longdescription="Transfere objetos para o grupo em Editar ferramentas > aba Geral." - name="object deed" /> - <action description="Manipular (mover, copiar, modificar) objetos do grupo" - longdescription="Manipule (mover,copiar, modificar) objetos pertencentes ao grupo em Editar Ferramentas > aba Geral." - name="object manipulate" /> - <action description="Definir objetos pertencentes ao grupo para venda" - longdescription="Defina objetos pertencentes ao grupo para venda em Editar Ferramentas > aba Geral." - name="object set sale" /> + <action_set description="Estas funções incluem poderes de transferir, vender e modificar os objetos do grupo. Essas opções ficam nas Ferramentas de contrução > guia Geral. Clique em um objeto com o botão direito e selecione Editar para ver as configurações do objeto." name="Object Management"> + <action description="Transferir objetos para o grupo" longdescription="Transfira objetos para o grupo em Ferramentas de construção > guia Geral." name="object deed"/> + <action description="Manipular (mover, copiar, modificar) objetos do grupo" longdescription="Manipule (transportar, copiar, modificar) objetos do grupo nas Ferramentas de construção > guia Geral." name="object manipulate"/> + <action description="Definir objetos pertencentes ao grupo para venda" longdescription="Ponha objetos do grupo à venda nas Ferramentas de construção > guia Geral." name="object set sale"/> </action_set> - <action_set - description="Estas habilidades incluem poderes que requerem que membros paguem dÃvidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo." - name="Accounting"> - <action description="Pagar débitos e receber dividendos do grupo" - longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. " - name="accounting accountable" /> + <action_set description="Estas habilidades incluem poderes que requerem que membros paguem dÃvidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo." name="Accounting"> + <action description="Pagar débitos e receber dividendos do grupo" longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. " name="accounting accountable"/> </action_set> - <action_set - description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo." - name="Notices"> - <action description="Enviar aviso" - longdescription="Membros em uma função com esta habiliade podem enviar avisos em Informações de grupo > aba Avisos." - name="notices send" /> - <action description="Receber novos avisos e ver os anteriores" - longdescription="Membros em uma função com esta habilidade podem receber os novos avisos e ver os anteriores em Informações de grupo > aba Avisos." - name="notices receive" /> + <action_set description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo." name="Notices"> + <action description="Enviar aviso" longdescription="Membros que exercem cargos com esta função podem enviar avisos na seção Avisos." name="notices send"/> + <action description="Receber novos avisos e ver os anteriores" longdescription="Membros que exercem cargos com esta função podem receber e ler avisos antigos na seção Avisos." name="notices receive"/> </action_set> - <action_set - description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação." - name="Proposals"> - <action description="Criar proposta" - longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo > aba Propostas." - name="proposal start" /> - <action description="Votar em propostas" - longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo > aba Propostas." - name="proposal vote" /> + <action_set description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação." name="Proposals"> + <action description="Criar proposta" longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo > aba Propostas." name="proposal start"/> + <action description="Votar em propostas" longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo > aba Propostas." name="proposal vote"/> </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml new file mode 100644 index 0000000000..b8bbb4051a --- /dev/null +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Looks" name="appearance panel"> + <string name="No Outfit" value="Nenhum"/> + <panel name="panel_currentlook"> + <text name="currentlook_title"> + (não salvo) + </text> + </panel> + <filter_editor label="Filtrar looks" name="Filter"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml new file mode 100644 index 0000000000..75b737b8bd --- /dev/null +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Coisas" name="objects panel"> + <panel label="" name="sidepanel__inventory_panel"> + <panel name="button_panel"> + <button label="Perfil" name="info_btn"/> + <button label="Vestir" name="wear_btn"/> + <button label="Tocar" name="play_btn"/> + <button label="Teletransportar" name="teleport_btn"/> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml new file mode 100644 index 0000000000..4fc50bac67 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="item properties" title="Perfil do objeto"> + <panel.string name="unknown"> + (desconhecido) + </panel.string> + <panel.string name="public"> + (público) + </panel.string> + <panel.string name="you_can"> + você pode: + </panel.string> + <panel.string name="owner_can"> + Proprietário pode: + </panel.string> + <panel.string name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> + <text name="title" value="Perfil do objeto"/> + <text name="where" value="(Inventário)"/> + <panel label=""> + <text name="LabelItemNameTitle"> + Nome: + </text> + <text name="LabelItemDescTitle"> + Descrição: + </text> + <text name="LabelCreatorTitle"> + Criador: + </text> + <button label="Perfil..." name="BtnCreator"/> + <text name="LabelOwnerTitle"> + Proprietário: + </text> + <button label="Perfil..." name="BtnOwner"/> + <text name="LabelAcquiredTitle"> + Adquirido: + </text> + <text name="LabelAcquiredDate"> + Quarta 24 de Maio 12:50:46 2006 + </text> + <panel name="perms_inv"> + <text name="perm_modify"> + Você pode: + </text> + <check_box label="Modificar" name="CheckOwnerModify"/> + <check_box label="Copiar" name="CheckOwnerCopy"/> + <check_box label="Transferir" name="CheckOwnerTransfer"/> + <text name="AnyoneLabel"> + Todos: + </text> + <check_box label="Copiar" name="CheckEveryoneCopy"/> + <text name="GroupLabel"> + Grupo: + </text> + <check_box label="Compartilhar" name="CheckShareWithGroup" tool_tip="Permitir que todos os membros do grupo tenham o seu nÃvel de modificação para este objeto. Faça uma doação para ativar restrições de função."/> + <text name="NextOwnerLabel"> + Próximo proprietário: + </text> + <check_box label="Modificar" name="CheckNextOwnerModify"/> + <check_box label="Copiar" name="CheckNextOwnerCopy"/> + <check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/> + </panel> + <check_box label="À venda" name="CheckPurchase"/> + <combo_box name="combobox sale copy"> + <combo_box.item label="Copiar" name="Copy"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Preço: L$" name="Edit Cost"/> + </panel> + <panel name="button_panel"> + <button label="Cancelar" name="cancel_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml new file mode 100644 index 0000000000..7981cd106f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="object properties" title="Perfil do objeto"> + <panel.string name="text deed continued"> + Doar + </panel.string> + <panel.string name="text deed"> + Doar + </panel.string> + <panel.string name="text modify info 1"> + Você pode modificar este objeto + </panel.string> + <panel.string name="text modify info 2"> + Você pode modificar estes objetos + </panel.string> + <panel.string name="text modify info 3"> + Você não pode modificar este objeto + </panel.string> + <panel.string name="text modify info 4"> + Você não pode modificar estes objetos + </panel.string> + <panel.string name="text modify warning"> + O objeto contém links ligando suas partes + </panel.string> + <panel.string name="Cost Default"> + Preço: L$ + </panel.string> + <panel.string name="Cost Total"> + Preço total: L$ + </panel.string> + <panel.string name="Cost Per Unit"> + Preço unitário: L$ + </panel.string> + <panel.string name="Cost Mixed"> + Preço misto + </panel.string> + <panel.string name="Sale Mixed"> + Venda mista + </panel.string> + <text name="title" value="Perfil do objeto"/> + <text name="where" value="(inworld)"/> + <panel label=""> + <text name="Name:"> + Nome: + </text> + <text name="Description:"> + Descrição: + </text> + <text name="CreatorNameLabel"> + Criador: + </text> + <text name="Creator Name"> + Erica Linden + </text> + <text name="Owner:"> + Proprietário: + </text> + <text name="Group_label"> + Grupo: + </text> + <button name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/> + <name_box initial_value="Carregando..." name="Group Name Proxy"/> + <button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/> + <text name="label click action"> + Clique para: + </text> + <combo_box name="clickaction"> + <combo_box.item label="Tocar (padrão)" name="Touch/grab(default)"/> + <combo_box.item label="Sentar em objeto" name="Sitonobject"/> + <combo_box.item label="Comprar objeto" name="Buyobject"/> + <combo_box.item label="Pagar por objeto" name="Payobject"/> + <combo_box.item label="Abrir" name="Open"/> + </combo_box> + <panel name="perms_inv"> + <text name="perm_modify"> + Você pode modificar este objeto + </text> + <text name="Anyone can:"> + Todos: + </text> + <check_box label="Copiar" name="checkbox allow everyone copy"/> + <check_box label="Movimentar" name="checkbox allow everyone move"/> + <text name="GroupLabel"> + Grupo: + </text> + <check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenham o seu nÃvel de modificação para este objeto. Faça uma doação para ativar restrições de função."/> + <text name="NextOwnerLabel"> + Próximo proprietário: + </text> + <check_box label="Modificar" name="checkbox next owner can modify"/> + <check_box label="Copiar" name="checkbox next owner can copy"/> + <check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/> + </panel> + <check_box label="À venda" name="checkbox for sale"/> + <combo_box name="sale type"> + <combo_box.item label="Copiar" name="Copy"/> + <combo_box.item label="Conteúdo" name="Contents"/> + <combo_box.item label="Original" name="Original"/> + </combo_box> + <spinner label="Preço: L$" name="Edit Cost"/> + <check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/> + <text name="B:"> + B: + </text> + <text name="O:"> + O: + </text> + <text name="G:"> + G: + </text> + <text name="E:"> + E: + </text> + <text name="N:"> + N: + </text> + <text name="F:"> + F: + </text> + </panel> + <panel name="button_panel"> + <button label="Abrir" name="open_btn"/> + <button label="Pagar" name="pay_btn"/> + <button label="Comprar" name="buy_btn"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 9acfce99dd..195345abc0 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1,13 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> - <string name="create_account_url">http://join.secondlife.com/index.php?lang=pt-BR</string> + <string name="CAPITALIZED_APP_NAME"> + SECOND LIFE + </string> + <string name="SUPPORT_SITE"> + Portal de Apoio do Second Life + </string> + <string name="StartupDetectingHardware"> + Detectando hardware... + </string> + <string name="StartupLoading"> + Carregando + </string> <string name="LoginInProgress"> Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde. </string> + <string name="LoginInProgressNoFrozen"> + Logando... + </string> <string name="LoginAuthenticating"> Autenticando </string> @@ -26,8 +40,11 @@ <string name="LoginInitializingMultimedia"> Inicializando multimÃdia... </string> + <string name="LoginInitializingFonts"> + Carregando fontes... + </string> <string name="LoginVerifyingCache"> - Verificando arquivos no cache (pode levar 60-90 segundos)... + Verificando arquivos cache (pode levar de 60-90 segundos)... </string> <string name="LoginProcessingResponse"> Processando Resposta... @@ -56,6 +73,15 @@ <string name="LoginDownloadingClothing"> Baixando roupas... </string> + <string name="LoginFailedNoNetwork"> + Erro de Rede: Não foi possÃvel estabelecer a conexão, verifique sua conexão de rede. + </string> + <string name="Quit"> + Sair + </string> + <string name="create_account_url"> + http://join.secondlife.com/index.php?lang=pt-BR + </string> <string name="AgentLostConnection"> Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet. </string> @@ -74,39 +100,9 @@ <string name="TooltipIsGroup"> (Grupo) </string> - <string name="TooltipFlagScript"> - Script - </string> - <string name="TooltipFlagPhysics"> - FÃsica - </string> - <string name="TooltipFlagTouch"> - Toque - </string> - <string name="TooltipFlagL$"> - L$ - </string> - <string name="TooltipFlagDropInventory"> - Dar Inventário - </string> - <string name="TooltipFlagPhantom"> - Imaterial - </string> - <string name="TooltipFlagTemporary"> - Temporário - </string> - <string name="TooltipFlagRightClickMenu"> - (Clique com o botão direito para acessar o menu) - </string> - <string name="TooltipFreeToCopy"> - Cópia Permitida - </string> <string name="TooltipForSaleL$"> À venda: L$[AMOUNT] </string> - <string name="TooltipForSaleMsg"> - À venda: [MESSAGE] - </string> <string name="TooltipFlagGroupBuild"> ConstruÃdo por Grupo </string> @@ -134,6 +130,73 @@ <string name="TooltipMustSingleDrop"> Apenas um item único pode ser arrastado para este local </string> + <string name="TooltipHttpUrl"> + Clique para ver essa página web + </string> + <string name="TooltipSLURL"> + Clique para ver a informação desta localização + </string> + <string name="TooltipAgentUrl"> + Clique para ver o perfil deste residente + </string> + <string name="TooltipGroupUrl"> + Clique para ver a descrição deste Grupo + </string> + <string name="TooltipEventUrl"> + Clique para ver a descrição deste evento + </string> + <string name="TooltipClassifiedUrl"> + Clique para ver este classificado + </string> + <string name="TooltipParcelUrl"> + Clique para ver a descrição desta parcela + </string> + <string name="TooltipTeleportUrl"> + Clique para teletransportar para esta localização + </string> + <string name="TooltipObjectIMUrl"> + Clique para ver a descrição deste objeto + </string> + <string name="TooltipMapUrl"> + Clique para ver esta localização no mapa + </string> + <string name="TooltipSLAPP"> + Clique para ativar no secondlife:// commando + </string> + <string name="CurrentURL" value="URL atual: [CurrentURL]"/> + <string name="SLurlLabelTeleport"> + Teletransportar para + </string> + <string name="SLurlLabelShowOnMap"> + Mostrar no mapa para + </string> + <string name="BUTTON_CLOSE_DARWIN"> + Fechar (⌘W) + </string> + <string name="BUTTON_CLOSE_WIN"> + Fechar (Ctrl+W) + </string> + <string name="BUTTON_RESTORE"> + Restaurar + </string> + <string name="BUTTON_MINIMIZE"> + Minimizar + </string> + <string name="BUTTON_TEAR_OFF"> + Separar-se da janela + </string> + <string name="BUTTON_DOCK"> + conectar-se à barra + </string> + <string name="BUTTON_HELP"> + Mostrar ajuda + </string> + <string name="Searching"> + Buscando... + </string> + <string name="NoneFound"> + Não encontrado. + </string> <string name="RetrievingData"> Buscando... </string> @@ -149,9 +212,6 @@ <string name="AvatarNameWaiting"> (aguardando) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (nenhum) </string> @@ -188,8 +248,77 @@ <string name="AssetErrorUnknownStatus"> Status desconhecido </string> - <string name="AvatarEditingApparance"> - (Editando Aparência) + <string name="texture"> + textura + </string> + <string name="sound"> + som + </string> + <string name="calling card"> + cartão de visitas + </string> + <string name="landmark"> + landmark + </string> + <string name="legacy script"> + script obsoleto + </string> + <string name="clothing"> + roupas + </string> + <string name="object"> + objeto + </string> + <string name="note card"> + notecard + </string> + <string name="folder"> + pasta + </string> + <string name="root"> + raiz + </string> + <string name="lsl2 script"> + script LSL2 + </string> + <string name="lsl bytecode"> + bytecode LSL + </string> + <string name="tga texture"> + textura tga + </string> + <string name="body part"> + parte do corpo + </string> + <string name="snapshot"> + fotografia + </string> + <string name="lost and found"> + Achados e Perdidos + </string> + <string name="targa image"> + imagem targa + </string> + <string name="trash"> + Lixo + </string> + <string name="jpeg image"> + imagem jpeg + </string> + <string name="animation"> + animação + </string> + <string name="gesture"> + gesto + </string> + <string name="simstate"> + simstate + </string> + <string name="favorite"> + favorito + </string> + <string name="symbolic link"> + link </string> <string name="AvatarAway"> Distante @@ -411,7 +540,19 @@ Carregando... </string> <string name="worldmap_offline"> - Desconectado + Offline + </string> + <string name="worldmap_results_none_found"> + Nenhum encontrado. + </string> + <string name="Ok"> + OK + </string> + <string name="Premature end of file"> + término prematuro do arquivo + </string> + <string name="ST_NO_JOINT"> + Não é possÃvel encontrar a raiz (ROOT) ou junção (JOINT). </string> <string name="whisper"> sussurra: @@ -419,6 +560,60 @@ <string name="shout"> grita: </string> + <string name="ringing"> + Conectando à conversa de Voz no mundo + </string> + <string name="connected"> + Conectado + </string> + <string name="unavailable"> + Voz não disponÃvel na sua localização atual + </string> + <string name="hang_up"> + Desconectado da conversa de Voz no mundo + </string> + <string name="reconnect_nearby"> + Agora você será reconectado ao bate-papo local. + </string> + <string name="ScriptQuestionCautionChatGranted"> + '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS]. + </string> + <string name="ScriptQuestionCautionChatDenied"> + '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS]. + </string> + <string name="ScriptTakeMoney"> + Tomar linden dólares (L$) de você + </string> + <string name="ActOnControlInputs"> + Atue nas suas entradas de controle + </string> + <string name="RemapControlInputs"> + Remapeie suas entradas de controle + </string> + <string name="AnimateYourAvatar"> + Faça uma animação para o seu avatar + </string> + <string name="AttachToYourAvatar"> + Anexe ao seu avatar + </string> + <string name="ReleaseOwnership"> + Libere a propriedade e torne-a pública + </string> + <string name="LinkAndDelink"> + Una e desuna de outros objetos + </string> + <string name="AddAndRemoveJoints"> + Adicione e remova junções com outros objetos + </string> + <string name="ChangePermissions"> + Modifique as permissões + </string> + <string name="TrackYourCamera"> + Acompanhe sua câmera + </string> + <string name="ControlYourCamera"> + Controle sua camera + </string> <string name="SIM_ACCESS_PG"> PG </string> @@ -437,8 +632,6 @@ <string name="land_type_unknown"> (desconhecido) </string> - <string name="covenant_never_modified">Última modificação: (nunca)</string> - <string name="covenant_modified">Última modificação: </string> <string name="all_files"> Todos os Arquivos </string> @@ -484,17 +677,904 @@ <string name="choose_the_directory"> Escolher Diretório </string> + <string name="AvatarSetNotAway"> + deixar como não away + </string> + <string name="AvatarSetAway"> + deixar como Away + </string> + <string name="AvatarSetNotBusy"> + deixar como não Ocupado + </string> + <string name="AvatarSetBusy"> + Deixar como Busy + </string> + <string name="shape"> + Silhueta + </string> + <string name="skin"> + Pele + </string> + <string name="hair"> + Cabelo + </string> + <string name="eyes"> + Olhos + </string> + <string name="shirt"> + Camisa + </string> + <string name="pants"> + calças + </string> + <string name="shoes"> + Sapatos + </string> + <string name="socks"> + Meias + </string> + <string name="jacket"> + Blusa + </string> + <string name="gloves"> + Luvas + </string> + <string name="undershirt"> + camiseta + </string> + <string name="underpants"> + roupa debaixo + </string> + <string name="skirt"> + saia + </string> + <string name="alpha"> + Alpha + </string> + <string name="tattoo"> + Tattoo + </string> + <string name="invalid"> + inválido + </string> + <string name="next"> + Próximo + </string> + <string name="ok"> + OK + </string> + <string name="GroupNotifyGroupNotice"> + Anúncio de grupo + </string> + <string name="GroupNotifyGroupNotices"> + Anúncios do grupo + </string> + <string name="GroupNotifySentBy"> + Enviado por + </string> + <string name="GroupNotifyAttached"> + Anexo: + </string> + <string name="GroupNotifyViewPastNotices"> + Ver últimos anúncios ou optar por não receber essas mensagens aqui. + </string> + <string name="GroupNotifyOpenAttachment"> + Abrir anexo + </string> + <string name="GroupNotifySaveAttachment"> + Salvar anexo + </string> + <string name="TeleportOffer"> + Oferta de teletransporte + </string> + <string name="StartUpNotifications"> + [%d] Novas notificações chegaram enquanto você estava fora... + </string> + <string name="OverflowInfoChannelString"> + Você tem mais [%d] notificações + </string> + <string name="BodyPartsRightArm"> + Braço direito + </string> + <string name="BodyPartsHead"> + Cabeça + </string> + <string name="BodyPartsLeftArm"> + Braço esquerdo + </string> + <string name="BodyPartsLeftLeg"> + Perna esquerda + </string> + <string name="BodyPartsTorso"> + Tronco + </string> + <string name="BodyPartsRightLeg"> + Perna direita + </string> + <string name="GraphicsQualityLow"> + Baixo + </string> + <string name="GraphicsQualityMid"> + Meio + </string> + <string name="GraphicsQualityHigh"> + Alto + </string> + <string name="LeaveMouselook"> + Pressione ESC para retornar para visão do mundo + </string> + <string name="InventoryNoMatchingItems"> + Nenhum item correspondente foi encontrado no inventário. Tente fazer uma [secondlife:///app/search/groups "Busca"]. + </string> + <string name="FavoritesNoMatchingItems"> + Arraste um marco para adicioná-lo aos seus favoritos. + </string> + <string name="InventoryNoTexture"> + Você não possui uma cópia desta textura no seu inventário + </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)"/> + <string name="worn" value="(vestido)"/> + <string name="link" value="(link)"/> + <string name="broken_link" value="(link_quebrado)""/> + <string name="LoadingContents"> + Carregando conteúdo... + </string> + <string name="NoContents"> + Nenhum conteúdo + </string> + <string name="WornOnAttachmentPoint" value="(vestido em [ATTACHMENT_POINT])"/> + <string name="Chat" value="Bate papo :"/> + <string name="Sound" value="Som :"/> + <string name="Wait" value="--- Aguarde :"/> + <string name="AnimFlagStop" value="Parar animação :"/> + <string name="AnimFlagStart" value="Iniciar animação :"/> + <string name="Wave" value="Aceno"/> + <string name="HelloAvatar" value="Olá, avatar!"/> + <string name="ViewAllGestures" value="Ver tudo >>"/> + <string name="Animations" value="Animações,"/> + <string name="Calling Cards" value="Cartões de visitas,"/> + <string name="Clothing" value="Vestuário,"/> + <string name="Gestures" value="Gestos,"/> + <string name="Landmarks" value="Landmarks,"/> + <string name="Notecards" value="Notecards,"/> + <string name="Objects" value="Objetos,"/> + <string name="Scripts" value="Scripts,"/> + <string name="Sounds" value="Sons,"/> + <string name="Textures" value="Texturas,"/> + <string name="Snapshots" value="Fotografias,"/> + <string name="No Filters" value="Não"/> + <string name="Since Logoff" value="- desde desligado"/> + <string name="InvFolder My Inventory"> + Meu Inventorio + </string> + <string name="InvFolder My Favorites"> + Meus Favoritos + </string> + <string name="InvFolder Library"> + Biblioteca + </string> + <string name="InvFolder Textures"> + Texturas + </string> + <string name="InvFolder Sounds"> + Sons + </string> + <string name="InvFolder Calling Cards"> + Cartões de Visitas + </string> + <string name="InvFolder Landmarks"> + Landmarks + </string> + <string name="InvFolder Scripts"> + Scripts + </string> + <string name="InvFolder Clothing"> + Vestuário + </string> + <string name="InvFolder Objects"> + Objetos + </string> + <string name="InvFolder Notecards"> + Notecards + </string> + <string name="InvFolder New Folder"> + Nova Pasta + </string> + <string name="InvFolder Inventory"> + Inventário + </string> + <string name="InvFolder Uncompressed Images"> + Imagens Descompactadas + </string> + <string name="InvFolder Body Parts"> + Partes do Corpo + </string> + <string name="InvFolder Trash"> + Lixo + </string> + <string name="InvFolder Photo Album"> + Ãlbum de Fotografias + </string> + <string name="InvFolder Lost And Found"> + Achados e Perdidos + </string> + <string name="InvFolder Uncompressed Sounds"> + Sons Descompactados + </string> + <string name="InvFolder Animations"> + Animações + </string> + <string name="InvFolder Gestures"> + Gestos + </string> + <string name="InvFolder favorite"> + Favoritos + </string> + <string name="InvFolder Current Outfit"> + Vestimanta Atual + </string> + <string name="InvFolder My Outfits"> + Minhas Vestimentas + </string> + <string name="InvFolder Friends"> + Amigos + </string> + <string name="InvFolder All"> + Tudo + </string> + <string name="Buy"> + Comprar + </string> + <string name="BuyforL$"> + Comprar por L$ + </string> + <string name="Stone"> + Pedra + </string> + <string name="Metal"> + Metal + </string> + <string name="Glass"> + Vidro + </string> + <string name="Wood"> + Madeira + </string> + <string name="Flesh"> + Carne + </string> + <string name="Plastic"> + Plástico + </string> + <string name="Rubber"> + Borrracha + </string> + <string name="Light"> + Luz + </string> + <string name="KBShift"> + Shift + </string> + <string name="KBCtrl"> + Ctrl + </string> + <string name="Chest"> + Peito + </string> + <string name="Skull"> + Crânio + </string> + <string name="Left Shoulder"> + Ombro esquerdo + </string> + <string name="Right Shoulder"> + Ombro direito + </string> + <string name="Left Hand"> + Mão esquerda + </string> + <string name="Right Hand"> + Mão direita + </string> + <string name="Left Foot"> + Pé esquerdo + </string> + <string name="Right Foot"> + Pé direito + </string> + <string name="Spine"> + Espinha + </string> + <string name="Pelvis"> + Pelvis + </string> + <string name="Mouth"> + Boca + </string> + <string name="Chin"> + Queixo + </string> + <string name="Left Ear"> + Orelha esquerda + </string> + <string name="Right Ear"> + Orelha direita + </string> + <string name="Left Eyeball"> + Globo ocular esquerdo + </string> + <string name="Right Eyeball"> + Globo ocular direito + </string> + <string name="Nose"> + Nariz + </string> + <string name="R Upper Arm"> + Braço superior D + </string> + <string name="R Forearm"> + Antebraço D + </string> + <string name="L Upper Arm"> + Braço superior E + </string> + <string name="L Forearm"> + Antebraço E + </string> + <string name="Right Hip"> + Quadril direito + </string> + <string name="R Upper Leg"> + Coxa D + </string> + <string name="R Lower Leg"> + Perna inferior D + </string> + <string name="Left Hip"> + Quadril esquerdo + </string> + <string name="L Upper Leg"> + Coxa E + </string> + <string name="L Lower Leg"> + Perna inferior E + </string> + <string name="Stomach"> + Estômago + </string> + <string name="Left Pec"> + Pec esquerdo + </string> + <string name="Right Pec"> + Pec direito + </string> + <string name="YearsMonthsOld"> + [AGEYEARS] [AGEMONTHS] de idade + </string> + <string name="YearsOld"> + [AGEYEARS] de idade + </string> + <string name="MonthsOld"> + [AGEMONTHS] de idade + </string> + <string name="WeeksOld"> + [AGEWEEKS] de idade + </string> + <string name="DaysOld"> + [AGEDAYS] de idade + </string> + <string name="TodayOld"> + Cadastrado hoje + </string> + <string name="AgeYearsA"> + [COUNT] ano + </string> + <string name="AgeYearsB"> + [COUNT] anos + </string> + <string name="AgeYearsC"> + [COUNT] anos + </string> + <string name="AgeMonthsA"> + [COUNT] mês + </string> + <string name="AgeMonthsB"> + [COUNT] meses + </string> + <string name="AgeMonthsC"> + [COUNT] meses + </string> + <string name="AgeWeeksA"> + [COUNT] semana + </string> + <string name="AgeWeeksB"> + [COUNT] semanas + </string> + <string name="AgeWeeksC"> + [COUNT] semanas + </string> + <string name="AgeDaysA"> + [COUNT] dia + </string> + <string name="AgeDaysB"> + [COUNT] dias + </string> + <string name="AgeDaysC"> + [COUNT] dias + </string> + <string name="GroupMembersA"> + [COUNT] membro + </string> + <string name="GroupMembersB"> + [COUNT] membros + </string> + <string name="GroupMembersC"> + [COUNT] membros + </string> + <string name="AcctTypeResident"> + Residente + </string> + <string name="AcctTypeTrial"> + Prova + </string> + <string name="AcctTypeCharterMember"> + Lista de membros + </string> + <string name="AcctTypeEmployee"> + Empregado da Linden Lab + </string> + <string name="PaymentInfoUsed"> + Info de Pagamento usada + </string> + <string name="PaymentInfoOnFile"> + Info de Pagamento no Arquivo + </string> + <string name="NoPaymentInfoOnFile"> + Nenhuma Info de Pagamento no Arquivo + </string> + <string name="AgeVerified"> + Idade-verificada + </string> + <string name="NotAgeVerified"> + Idade não-verificada + </string> + <string name="Center 2"> + Centro 2 + </string> + <string name="Top Right"> + Topo direita + </string> + <string name="Top"> + Topo + </string> + <string name="Top Left"> + Topo esquerda + </string> + <string name="Center"> + Centro + </string> + <string name="Bottom Left"> + Inferior esquerdo + </string> + <string name="Bottom"> + Inferior + </string> + <string name="Bottom Right"> + Inferior direito + </string> + <string name="CompileQueueDownloadedCompiling"> + Downloaded, agora compilando + </string> + <string name="CompileQueueScriptNotFound"> + Script não encontrado no servidor. + </string> + <string name="CompileQueueProblemDownloading"> + Problema no download + </string> + <string name="CompileQueueInsufficientPermDownload"> + Permissões insuficientes para fazer o download do script. + </string> + <string name="CompileQueueInsufficientPermFor"> + Permissões insuficientes para + </string> + <string name="CompileQueueUnknownFailure"> + Falha desconhecida para download + </string> + <string name="CompileQueueTitle"> + Progresso do Recompilamento + </string> + <string name="CompileQueueStart"> + recompilar + </string> + <string name="ResetQueueTitle"> + Reset Progresso + </string> + <string name="ResetQueueStart"> + reset + </string> + <string name="RunQueueTitle"> + Definir funcionamento do progresso + </string> + <string name="RunQueueStart"> + deixar funcionando + </string> + <string name="NotRunQueueTitle"> + Definir progresso não funcionando + </string> + <string name="NotRunQueueStart"> + não deixar funcionando + </string> + <string name="CompileSuccessful"> + Compilação bem sucedida + </string> + <string name="CompileSuccessfulSaving"> + Compilação bem sucedida, salvando... + </string> + <string name="SaveComplete"> + Salvo. + </string> + <string name="ObjectOutOfRange"> + Script (objecto fora de alcance) + </string> + <string name="GodToolsObjectOwnedBy"> + Objeto [OBJECT] de propriedade de [OWNER] + </string> + <string name="GroupsNone"> + nenhum + </string> + <string name="Group" value="(grupo)"/> + <string name="Unknown"> + (Desconhecido) + </string> + <string name="SummaryForTheWeek" value="Resumo para esta semana, com inÃcio em"/> + <string name="NextStipendDay" value="Próximo dia de salário é"/> + <string name="GroupIndividualShare" value="Grupo Divisão individualI"/> + <string name="Balance"> + Balanço + </string> + <string name="Credits"> + Créditos + </string> + <string name="Debits"> + Débitos + </string> + <string name="Total"> + Total + </string> + <string name="NoGroupDataFound"> + Não ha dados de grupo para o grupo + </string> + <string name="IMParentEstate"> + propriedade dos pais + </string> + <string name="IMMainland"> + continente + </string> + <string name="IMTeen"> + adolescente + </string> + <string name="RegionInfoError"> + erro + </string> + <string name="RegionInfoAllEstatesOwnedBy"> + todas as propriedades pertencem a [OWNER] + </string> + <string name="RegionInfoAllEstatesYouOwn"> + todas as propriedades que você possui + </string> + <string name="RegionInfoAllEstatesYouManage"> + todas as propriedades que você gerencia para [OWNER] + </string> + <string name="RegionInfoAllowedResidents"> + Residentes autorizados: ([ALLOWEDAGENTS], max [MAXACCESS]) + </string> + <string name="RegionInfoAllowedGroups"> + Grupos permitidos: ([ALLOWEDGROUPS], max [MAXACCESS]) + </string> + <string name="ScriptLimitsParcelScriptMemory"> + Memória de scripts no lote + </string> + <string name="ScriptLimitsParcelsOwned"> + Lotes listados: [PARCELS] + </string> + <string name="ScriptLimitsMemoryUsed"> + Memória usada: [COUNT] kb de [MAX] kb; [AVAILABLE] kb disponÃveis + </string> + <string name="ScriptLimitsMemoryUsedSimple"> + Memória usada: [COUNT] kb + </string> + <string name="ScriptLimitsParcelScriptURLs"> + URL dos scripts do lote + </string> + <string name="ScriptLimitsURLsUsed"> + URLs usados: [COUNT] de [MAX]; [AVAILABLE] disponÃveis + </string> + <string name="ScriptLimitsURLsUsedSimple"> + URLs usados: [COUNT] + </string> + <string name="ScriptLimitsRequestError"> + Erro ao solicitar dados + </string> + <string name="ScriptLimitsRequestNoParcelSelected"> + Nenhum lote foi selecionado + </string> + <string name="ScriptLimitsRequestWrongRegion"> + Erro: dados de script só disponÃveis na região da posição atual + </string> + <string name="ScriptLimitsRequestWaiting"> + Obtendo dados... + </string> + <string name="ScriptLimitsRequestDontOwnParcel"> + Você não está autorizado a examinar este lote. + </string> + <string name="SITTING_ON"> + Sentado em + </string> + <string name="ATTACH_CHEST"> + Peito + </string> + <string name="ATTACH_HEAD"> + Cabeça + </string> + <string name="ATTACH_LSHOULDER"> + Ombro esquerdo + </string> + <string name="ATTACH_RSHOULDER"> + Ombro direito + </string> + <string name="ATTACH_LHAND"> + Mão esquerda + </string> + <string name="ATTACH_RHAND"> + Mão direita + </string> + <string name="ATTACH_LFOOT"> + Pé esquerdo + </string> + <string name="ATTACH_RFOOT"> + Pé direito + </string> + <string name="ATTACH_BACK"> + Atrás + </string> + <string name="ATTACH_PELVIS"> + Pélvis + </string> + <string name="ATTACH_MOUTH"> + Boca + </string> + <string name="ATTACH_CHIN"> + Queixo + </string> + <string name="ATTACH_LEAR"> + Orelha esquerda + </string> + <string name="ATTACH_REAR"> + Orelha direita + </string> + <string name="ATTACH_LEYE"> + Olho esquerdo + </string> + <string name="ATTACH_REYE"> + Olho direito + </string> + <string name="ATTACH_NOSE"> + Nariz + </string> + <string name="ATTACH_RUARM"> + Braço direito + </string> + <string name="ATTACH_RLARM"> + Antebraço direito + </string> + <string name="ATTACH_LUARM"> + Braço esquerdo + </string> + <string name="ATTACH_LLARM"> + Antebraço esquerdo + </string> + <string name="ATTACH_RHIP"> + Quadril direito + </string> + <string name="ATTACH_RULEG"> + Coxa direita + </string> + <string name="ATTACH_RLLEG"> + Perna direita + </string> + <string name="ATTACH_LHIP"> + Quadril esquerdo + </string> + <string name="ATTACH_LULEG"> + Coxa esquerda + </string> + <string name="ATTACH_LLLEG"> + Perna esquerda + </string> + <string name="ATTACH_BELLY"> + Barriga + </string> + <string name="ATTACH_RPEC"> + Peitorais D + </string> + <string name="ATTACH_LPEC"> + Peitorais E + </string> + <string name="ATTACH_HUD_CENTER_2"> + HUD Central 2 + </string> + <string name="ATTACH_HUD_TOP_RIGHT"> + HUD superior direito + </string> + <string name="ATTACH_HUD_TOP_CENTER"> + HUD centro superior + </string> + <string name="ATTACH_HUD_TOP_LEFT"> + HUD superior esquerdo + </string> + <string name="ATTACH_HUD_CENTER_1"> + HUD Central 1 + </string> + <string name="ATTACH_HUD_BOTTOM_LEFT"> + HUD esquerda inferior + </string> + <string name="ATTACH_HUD_BOTTOM"> + HUD inferior + </string> + <string name="ATTACH_HUD_BOTTOM_RIGHT"> + HUD direito inferior + </string> + <string name="CursorPos"> + Linha [LINE], Coluna [COLUMN] + </string> + <string name="PanelDirCountFound"> + [COUNT] encontrado + </string> + <string name="PanelContentsNewScript"> + Novo Script + </string> + <string name="MuteByName"> + (por nome) + </string> + <string name="MuteAgent"> + (residente) + </string> + <string name="MuteObject"> + (objeto) + </string> + <string name="MuteGroup"> + (grupo) + </string> + <string name="RegionNoCovenant"> + Não ha Contrato fornecido para essa Região. + </string> + <string name="RegionNoCovenantOtherOwner"> + Não ha Contrato fornecido para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda. + </string> + <string name="covenant_last_modified"> + Última modificação: + </string> + <string name="none_text" value="(nenhum)"/> + <string name="never_text" value="(nunca)"/> + <string name="GroupOwned"> + Propriedade do Grupo + </string> + <string name="Public"> + Público + </string> + <string name="ClassifiedClicksTxt"> + Cliques: [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil + </string> + <string name="ClassifiedUpdateAfterPublish"> + (vai atualizar depois de publicado) + </string> + <string name="NoPicksClassifiedsText"> + Você não criou nenhum Destaque ou Anúncio. Clique no botão "+" para criar um Destaque ou Anúncio. + </string> + <string name="NoAvatarPicksClassifiedsText"> + O usuário não tem nenhum destaque ou anúncio + </string> + <string name="PicksClassifiedsLoadingText"> + Carregando... + </string> + <string name="MultiPreviewTitle"> + Preview + </string> + <string name="MultiPropertiesTitle"> + Propriedades + </string> + <string name="InvOfferAnObjectNamed"> + um objeto chamado + </string> + <string name="InvOfferOwnedByGroup"> + possuÃdo pelo grupo + </string> + <string name="InvOfferOwnedByUnknownGroup"> + possuÃdo por um grupo desconhecido + </string> + <string name="InvOfferOwnedBy"> + possuÃdo por + </string> + <string name="InvOfferOwnedByUnknownUser"> + possuÃdo por usuário desconhecido + </string> + <string name="InvOfferGaveYou"> + deu a você + </string> + <string name="InvOfferYouDecline"> + Você declina + </string> + <string name="InvOfferFrom"> + de + </string> + <string name="GroupMoneyTotal"> + Total + </string> + <string name="GroupMoneyBought"> + comprou + </string> + <string name="GroupMoneyPaidYou"> + pagou a você + </string> + <string name="GroupMoneyPaidInto"> + depositado + </string> + <string name="GroupMoneyBoughtPassTo"> + comprou passe para + </string> + <string name="GroupMoneyPaidFeeForEvent"> + pagou taxa para o evento + </string> + <string name="GroupMoneyPaidPrizeForEvent"> + pagou prêmio para o evento + </string> + <string name="GroupMoneyBalance"> + Balanço + </string> + <string name="GroupMoneyCredits"> + Créditos + </string> + <string name="GroupMoneyDebits"> + Débitos + </string> + <string name="ViewerObjectContents"> + Conteúdo + </string> + <string name="AcquiredItems"> + Itens adquiridos + </string> + <string name="Cancel"> + Cancelar + </string> + <string name="UploadingCosts"> + Uploading [%s] custos + </string> + <string name="UnknownFileExtension"> + Extensão de arquivo desconhecida [.%s] +Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh + </string> + <string name="MuteObject2"> + Bloquear + </string> + <string name="AddLandmarkNavBarMenu"> + Adicionar Landmark... + </string> + <string name="EditLandmarkNavBarMenu"> + Editar Landmark... + </string> <string name="accel-mac-control"> - ⌃ + ⌃ </string> <string name="accel-mac-command"> - ⌘ + ⌘ </string> <string name="accel-mac-option"> - ⌥ + ⌥ </string> <string name="accel-mac-shift"> - ⇧ + ⇧ </string> <string name="accel-win-control"> Ctrl+ @@ -505,80 +1585,1621 @@ <string name="accel-win-shift"> Shift+ </string> - <string name="GraphicsQualityLow"> - Baixo + <string name="FileSaved"> + Arquivo salvo </string> - <string name="GraphicsQualityMid"> - Meio + <string name="Receiving"> + Recebendo </string> - <string name="GraphicsQualityHigh"> - Alto + <string name="AM"> + AM + </string> + <string name="PM"> + PM + </string> + <string name="PST"> + PST + </string> + <string name="PDT"> + PDT + </string> + <string name="Forward"> + Avante + </string> + <string name="Left"> + Esquerda + </string> + <string name="Right"> + Direita + </string> + <string name="Back"> + Atrás + </string> + <string name="North"> + Norte + </string> + <string name="South"> + Sul + </string> + <string name="West"> + Oeste + </string> + <string name="East"> + Leste + </string> + <string name="Up"> + Acima + </string> + <string name="Down"> + Abaixo + </string> + <string name="Any Category"> + Qualquer categoria + </string> + <string name="Shopping"> + Compras + </string> + <string name="Land Rental"> + Aluguel de terrenos + </string> + <string name="Property Rental"> + Aluguel de propriedade + </string> + <string name="Special Attraction"> + Atração especial + </string> + <string name="New Products"> + Novos Produtos + </string> + <string name="Employment"> + Emprego + </string> + <string name="Wanted"> + Desejado </string> + <string name="Service"> + Serviço + </string> + <string name="Personal"> + Pessoal + </string> + <string name="None"> + Nenhum + </string> + <string name="Linden Location"> + Locação Linden + </string> + <string name="Adult"> + Adult + </string> + <string name="Arts&Culture"> + Artes e Cultura + </string> + <string name="Business"> + Negócios + </string> + <string name="Educational"> + Educacional + </string> + <string name="Gaming"> + Jogos + </string> + <string name="Hangout"> + Moradia + </string> + <string name="Newcomer Friendly"> + Amigável a Novos Usuários + </string> + <string name="Parks&Nature"> + Parques & Natureza + </string> + <string name="Residential"> + Residencial + </string> + <string name="Stage"> + Estágio + </string> + <string name="Other"> + Outros + </string> + <string name="Any"> + Qualquer + </string> + <string name="You"> + Você + </string> + <string name="Multiple Media"> + MÃdia múltipla + </string> + <string name="Play Media"> + Tocar/Pausar mÃdia + </string> + <string name="MBCmdLineError"> + Um erro foi encontrado analisando a linha de comando. +Consulte: http://wiki.secondlife.com/wiki/Client_parameters +Erro: + </string> + <string name="MBCmdLineUsg"> + [APP_NAME] Uso de linha de comando: + </string> + <string name="MBUnableToAccessFile"> + [APP_NAME] não é capaz de acessar um arquivo que ele precisa. - <!-- PARCEL_CATEGORY_UI_STRING --> - <string name="Linden Location">Locação Linden</string> - <string name="Adult">Adult</string> - <string name="Arts&Culture">Artes e Cultura</string> - <string name="Business">Negócios</string> - <string name="Educational">Educacional</string> - <string name="Gaming">Jogos</string> - <string name="Hangout">Moradia</string> - <string name="Newcomer Friendly">Amigável a Novos Usuários</string> - <string name="Parks&Nature">Parques & Natureza</string> - <string name="Residential">Residencial</string> - <string name="Shopping">Compras</string> - <string name="Other">Outros</string> - <string name="ringing"> - Conectando à conversa de Voz no mundo +Isto pode ocorrer porque você de alguma maneira tem várias cópias em execução, ou o seu sistema acredita de maneira incorreta que um arquivo está aberto. +Se a mensagem persistir, reinicie o computador e tente novamente. +Se o error persistir, pode ser necessário desinstalar completamente [APP_NAME] e reinstalá-lo. </string> - <string name="connected"> - Conectado + <string name="MBFatalError"> + Erro Fatal </string> - <string name="unavailable"> - Voz não disponÃvel na sua localização atual + <string name="MBRequiresAltiVec"> + [APP_NAME] exige um processador com AltiVec (G4 ou superior). </string> - <string name="hang_up"> - Desconectado da conversa de Voz no mundo + <string name="MBAlreadyRunning"> + [APP_NAME] já está em execução. +Verifique a sua barra de tarefas para obter uma cópia do programa minimizado. +Se a mensagem persistir, reinicie o computador. + </string> + <string name="MBFrozenCrashed"> + [APP_NAME] parece ter congelado ou falhado na execução anterior. Você gostaria de enviar um relatório de falha? + </string> + <string name="MBAlert"> + Alerta + </string> + <string name="MBNoDirectX"> + [APP_NAME] é incapaz de detectar o DirectX 9.0b ou superior. +[APP_NAME] usa o DirectX para a detecção de hardware e / ou controladores desatualizados que podem causar problemas de estabilidade, desempenho ruim e falhas. Embora você possa executar [APP_NAME] sem ele, nós recomendamos fortemente que utilize o DirectX 9.0b. + +Deseja continuar? + </string> + <string name="MBWarning"> + Aviso + </string> + <string name="MBNoAutoUpdate"> + Atualização automática ainda não está implementada para o Linux. +Faça o download da versão mais recente do www.secondlife.com. + </string> + <string name="MBRegClassFailed"> + RegisterClass falhou + </string> + <string name="MBError"> + Erro + </string> + <string name="MBFullScreenErr"> + Incapaz de funcionar com tela cheia de [WIDTH] x [HEIGHT]. +Executando em janela. + </string> + <string name="MBDestroyWinFailed"> + Erro de desligamento ao destruir janela (DestroyWindow() failed) + </string> + <string name="MBShutdownErr"> + Erro de desligamento + </string> + <string name="MBDevContextErr"> + Não é possÃvel fazer contexto do dispositivo GL + </string> + <string name="MBPixelFmtErr"> + Não é possÃvel encontrar um formato de pixel adequado + </string> + <string name="MBPixelFmtDescErr"> + Não é possÃvel encontrar descrição de formato de pixel + </string> + <string name="MBTrueColorWindow"> + [APP_NAME] requer True Color (32-bit) para ser executado. +Por favor, vá para as configurações de vÃdeo do computador e defina o modo de cores para 32-bit. + </string> + <string name="MBAlpha"> + [APP_NAME] é incapaz de executar porque ele não consegue obter um canal alpha de 8 bits. Geralmente isso ocorre devido a problemas de drivers da placa de vÃdeo. +Por favor, certifique-se que os últimos drivers da placa de vÃdeo estão instalados. +Também não se esqueça de definir seu monitor para True Color (32-bit), em painéis de controle Configurações> Display>. +Se você continuar a receber esta mensagem, contate o [SUPPORT_SITE]. + </string> + <string name="MBPixelFmtSetErr"> + ão é possÃvel definir o formato de pixel + </string> + <string name="MBGLContextErr"> + Não é possÃvel criar o contexto de renderização GL + </string> + <string name="MBGLContextActErr"> + Não é possÃvel ativar o contexto de renderização GL + </string> + <string name="MBVideoDrvErr"> + [APP_NAME] é incapaz de funcionar por causa do seu driver de video não ter sido instalado corretamente, estão desatualizados, ou não são suportados pelo hardware. Por favor certifique-se que você possui os drivers de placa de vÃdeo mais recente e mesmo assim, tente reinstalá-los. + +If you continue to receive this message, contact the [SUPPORT_SITE]. + </string> + <string name="5 O'Clock Shadow"> + Sombra descuidada + </string> + <string name="All White"> + Todo branco + </string> + <string name="Anime Eyes"> + Olhos de Anime + </string> + <string name="Arced"> + arqueado + </string> + <string name="Arm Length"> + Comprimento do Braço + </string> + <string name="Attached"> + Anexado + </string> + <string name="Attached Earlobes"> + Lóbulos da orelha anexados + </string> + <string name="Back Fringe"> + corte traseiro + </string> + <string name="Baggy"> + folgado + </string> + <string name="Bangs"> + Franja + </string> + <string name="Beady Eyes"> + Olhos malévolos + </string> + <string name="Belly Size"> + Tamanho da barriga + </string> + <string name="Big"> + Grande + </string> + <string name="Big Butt"> + Traseiro Grande + </string> + <string name="Big Hair Back"> + Cabelo volumoso: Trás + </string> + <string name="Big Hair Front"> + Cabelo volumoso: Frente + </string> + <string name="Big Hair Top"> + cabelo volumoso: Topo + </string> + <string name="Big Head"> + cabeça grande + </string> + <string name="Big Pectorals"> + Peitorais grandes + </string> + <string name="Big Spikes"> + espinhos grandes + </string> + <string name="Black"> + Negro + </string> + <string name="Blonde"> + Loiro + </string> + <string name="Blonde Hair"> + Cabelo Loiro + </string> + <string name="Blush"> + Blush + </string> + <string name="Blush Color"> + cor do Blush + </string> + <string name="Blush Opacity"> + Opacidade do Blush + </string> + <string name="Body Definition"> + definição do Corpo + </string> + <string name="Body Fat"> + Gordura corporal + </string> + <string name="Body Freckles"> + Sardas do corpo + </string> + <string name="Body Thick"> + Corpo cheio + </string> + <string name="Body Thickness"> + Espessura do corpo + </string> + <string name="Body Thin"> + Corpo magro + </string> + <string name="Bow Legged"> + pernas arqueadas + </string> + <string name="Breast Buoyancy"> + Flexibilidade dos seios + </string> + <string name="Breast Cleavage"> + Separação dos seios + </string> + <string name="Breast Size"> + Tamanho dos seios + </string> + <string name="Bridge Width"> + Largura do nariz + </string> + <string name="Broad"> + Largo + </string> + <string name="Brow Size"> + tamanho da sobrancelha + </string> + <string name="Bug Eyes"> + Olhos saltados + </string> + <string name="Bugged Eyes"> + Olhos esbugalhados + </string> + <string name="Bulbous"> + Bulbos + </string> + <string name="Bulbous Nose"> + Nariz em bulbo + </string> + <string name="Bushy Eyebrows"> + Sobrancelhas grossas + </string> + <string name="Bushy Hair"> + Cabelo grosso + </string> + <string name="Butt Size"> + Tamanho do traseiro + </string> + <string name="bustle skirt"> + Movimentação de saia + </string> + <string name="no bustle"> + Sem movimento + </string> + <string name="more bustle"> + Mais movimento + </string> + <string name="Chaplin"> + Chaplin + </string> + <string name="Cheek Bones"> + Maças do rosto + </string> + <string name="Chest Size"> + Tamanho do peito + </string> + <string name="Chin Angle"> + ângulo do queixo + </string> + <string name="Chin Cleft"> + Fissura do queixo + </string> + <string name="Chin Curtains"> + Barba de contorno + </string> + <string name="Chin Depth"> + Profundidade do queixo + </string> + <string name="Chin Heavy"> + Queixo pronunciado + </string> + <string name="Chin In"> + Queixo para dentro + </string> + <string name="Chin Out"> + Queixo para fora + </string> + <string name="Chin-Neck"> + Queixo-pescoço + </string> + <string name="Clear"> + Limpar + </string> + <string name="Cleft"> + Fenda + </string> + <string name="Close Set Eyes"> + Fechar conjunto de olhos + </string> + <string name="Closed"> + Fechado + </string> + <string name="Closed Back"> + Trás fechada + </string> + <string name="Closed Front"> + Frente fechada + </string> + <string name="Closed Left"> + Esquerda fechada + </string> + <string name="Closed Right"> + Direita fechada + </string> + <string name="Coin Purse"> + Pubis + </string> + <string name="Collar Back"> + Colarinho posterior + </string> + <string name="Collar Front"> + Colarinho anterior + </string> + <string name="Corner Down"> + Canto para baixo + </string> + <string name="Corner Up"> + Canto para cima + </string> + <string name="Creased"> + Vincado + </string> + <string name="Crooked Nose"> + Nariz torto + </string> + <string name="Cuff Flare"> + bainha larga + </string> + <string name="Dark"> + Escuro + </string> + <string name="Dark Green"> + Verde escuro + </string> + <string name="Darker"> + mais escuro + </string> + <string name="Deep"> + Profundidade + </string> + <string name="Default Heels"> + Salto Padrão + </string> + <string name="Dense"> + Densidade + </string> + <string name="Double Chin"> + Queixo duplo + </string> + <string name="Downturned"> + Curvado para baixo + </string> + <string name="Duffle Bag"> + pubis + </string> + <string name="Ear Angle"> + ângulo da orelha + </string> + <string name="Ear Size"> + Tamanho da orelha + </string> + <string name="Ear Tips"> + Pontas das orelhas + </string> + <string name="Egg Head"> + Cabeça oval + </string> + <string name="Eye Bags"> + Olheiras + </string> + <string name="Eye Color"> + Cor dos olhos + </string> + <string name="Eye Depth"> + Profundidade dos olhos + </string> + <string name="Eye Lightness"> + Luminosidade dos olhos + </string> + <string name="Eye Opening"> + Abertura dos olhos + </string> + <string name="Eye Pop"> + Olho Saltado + </string> + <string name="Eye Size"> + Tamanho dos olhos + </string> + <string name="Eye Spacing"> + Espaçamento dos olhos + </string> + <string name="Eyebrow Arc"> + Arco da sobrancelha + </string> + <string name="Eyebrow Density"> + densidade da sobrancelha + </string> + <string name="Eyebrow Height"> + Altura da sobrancelha + </string> + <string name="Eyebrow Points"> + Pontas da sobrancelha + </string> + <string name="Eyebrow Size"> + Tamanho da sobrancelha + </string> + <string name="Eyelash Length"> + Comprimento das pestanas + </string> + <string name="Eyeliner"> + Delineador + </string> + <string name="Eyeliner Color"> + Cor do delineador + </string> + <string name="Eyes Bugged"> + Olhos esbugalhados + </string> + <string name="Face Shear"> + Face raspada + </string> + <string name="Facial Definition"> + Definição facial + </string> + <string name="Far Set Eyes"> + Distância entre os olhos + </string> + <string name="Fat Lips"> + Lábios carnudos + </string> + <string name="Female"> + Feminino + </string> + <string name="Fingerless"> + Dedos + </string> + <string name="Fingers"> + Dedos + </string> + <string name="Flared Cuffs"> + Punhos largos + </string> + <string name="Flat"> + Chato + </string> + <string name="Flat Butt"> + Traseiro chato + </string> + <string name="Flat Head"> + Cabeça chata + </string> + <string name="Flat Toe"> + Dedos dos pés chatos + </string> + <string name="Foot Size"> + Tamanho dos pés + </string> + <string name="Forehead Angle"> + ângulo da testa + </string> + <string name="Forehead Heavy"> + Testa pronunciada + </string> + <string name="Freckles"> + Sardas + </string> + <string name="Front Fringe"> + Franja + </string> + <string name="Full Back"> + Trás cheia + </string> + <string name="Full Eyeliner"> + Delienador cheio + </string> + <string name="Full Front"> + Frente cheia + </string> + <string name="Full Hair Sides"> + Cabelos laterais cheios + </string> + <string name="Full Sides"> + Lados cheios + </string> + <string name="Glossy"> + Brilhante + </string> + <string name="Glove Fingers"> + Dedos da luva + </string> + <string name="Glove Length"> + comprimento das luvas + </string> + <string name="Hair"> + Cabelo + </string> + <string name="Hair Back"> + Cabelo: Trás + </string> + <string name="Hair Front"> + Cabelo: Frente + </string> + <string name="Hair Sides"> + Cabelos: Lateral + </string> + <string name="Hair Sweep"> + Cabelo penteado + </string> + <string name="Hair Thickess"> + Espessura do cabelo + </string> + <string name="Hair Thickness"> + Espessura do cabelo + </string> + <string name="Hair Tilt"> + Divisão do cabelo + </string> + <string name="Hair Tilted Left"> + Divistão do cabelo esquerda + </string> + <string name="Hair Tilted Right"> + Divisão do cabelo direita + </string> + <string name="Hair Volume"> + Cabelo: Volume + </string> + <string name="Hand Size"> + Tamanho das mãos + </string> + <string name="Handlebars"> + bigode + </string> + <string name="Head Length"> + Comprimento da cabeça + </string> + <string name="Head Shape"> + Formato da cabeça + </string> + <string name="Head Size"> + Tamanho da cabeça + </string> + <string name="Head Stretch"> + Extensão da cabeça + </string> + <string name="Heel Height"> + Altura do salto + </string> + <string name="Heel Shape"> + Formato do salto + </string> + <string name="Height"> + Altura + </string> + <string name="High"> + alto + </string> + <string name="High Heels"> + Salto alto + </string> + <string name="High Jaw"> + Maxilar alto + </string> + <string name="High Platforms"> + Plataformas alta + </string> + <string name="High and Tight"> + Alto e justo + </string> + <string name="Higher"> + Mais alto + </string> + <string name="Hip Length"> + Comprimento do quadril + </string> + <string name="Hip Width"> + Largura do quadril + </string> + <string name="In"> + Dentro + </string> + <string name="In Shdw Color"> + Cor da sombra interna + </string> + <string name="In Shdw Opacity"> + Opacidade da sombra interna + </string> + <string name="Inner Eye Corner"> + Canto interno dos olhos + </string> + <string name="Inner Eye Shadow"> + Sombra interna dos olhos + </string> + <string name="Inner Shadow"> + Sombra interna + </string> + <string name="Jacket Length"> + Comprimento da blusa + </string> + <string name="Jacket Wrinkles"> + Dobras da Blusa + </string> + <string name="Jaw Angle"> + Ângulo da mandÃbula + </string> + <string name="Jaw Jut"> + Posição do maxilar + </string> + <string name="Jaw Shape"> + Formato do maxilar + </string> + <string name="Join"> + Juntar + </string> + <string name="Jowls"> + Papo + </string> + <string name="Knee Angle"> + Ângulo do joelho + </string> + <string name="Knock Kneed"> + Joelhos para dentro + </string> + <string name="Large"> + Grande + </string> + <string name="Large Hands"> + Mãos grandes + </string> + <string name="Left Part"> + Parte esquerda + </string> + <string name="Leg Length"> + Comprimento da perna + </string> + <string name="Leg Muscles"> + Musculatura da perna + </string> + <string name="Less"> + Menos + </string> + <string name="Less Body Fat"> + Menos gordura corporal + </string> + <string name="Less Curtains"> + Menos barba + </string> + <string name="Less Freckles"> + Menos sardas + </string> + <string name="Less Full"> + Menos + </string> + <string name="Less Gravity"> + Menos gravidade + </string> + <string name="Less Love"> + Menos cintura + </string> + <string name="Less Muscles"> + Menos músculos + </string> + <string name="Less Muscular"> + Menos musculoso + </string> + <string name="Less Rosy"> + Menos rosado + </string> + <string name="Less Round"> + Menos arredondado + </string> + <string name="Less Saddle"> + Menos ancas + </string> + <string name="Less Square"> + Menos quadrado + </string> + <string name="Less Volume"> + Menos volume + </string> + <string name="Less soul"> + Menos alma + </string> + <string name="Lighter"> + Lighter + </string> + <string name="Lip Cleft"> + Fenda dos lábios + </string> + <string name="Lip Cleft Depth"> + Prfundidade da fenda dos lábios + </string> + <string name="Lip Fullness"> + Volume dos lábios + </string> + <string name="Lip Pinkness"> + Rosado dos lábios + </string> + <string name="Lip Ratio"> + Proporção dos lábios + </string> + <string name="Lip Thickness"> + Espessura dos lábios + </string> + <string name="Lip Width"> + Largura dos lábios + </string> + <string name="Lipgloss"> + Brilho dos lábios + </string> + <string name="Lipstick"> + Batom + </string> + <string name="Lipstick Color"> + Cor do batom + </string> + <string name="Long"> + Longo + </string> + <string name="Long Head"> + Cabeça alongada + </string> + <string name="Long Hips"> + Lábios longos + </string> + <string name="Long Legs"> + Pernas longas + </string> + <string name="Long Neck"> + Pescoço longo + </string> + <string name="Long Pigtails"> + Chiquinhas longas + </string> + <string name="Long Ponytail"> + Rabo de cavalo longo + </string> + <string name="Long Torso"> + Torso longo + </string> + <string name="Long arms"> + Braços longos + </string> + <string name="Loose Pants"> + Pantalonas + </string> + <string name="Loose Shirt"> + Saia folgada + </string> + <string name="Loose Sleeves"> + Manga longa + </string> + <string name="Love Handles"> + Pneu + </string> + <string name="Low"> + baixo + </string> + <string name="Low Heels"> + Salto baixo + </string> + <string name="Low Jaw"> + maxilar baixo + </string> + <string name="Low Platforms"> + Plataformas baixas + </string> + <string name="Low and Loose"> + baixo e solto + </string> + <string name="Lower"> + diminuir + </string> + <string name="Lower Bridge"> + nariz baixo + </string> + <string name="Lower Cheeks"> + bochechas abaixadas + </string> + <string name="Male"> + Masculino + </string> + <string name="Middle Part"> + Parte do meio + </string> + <string name="More"> + Mais + </string> + <string name="More Blush"> + Mais blush + </string> + <string name="More Body Fat"> + Mais gordura corporal + </string> + <string name="More Curtains"> + Mais barba + </string> + <string name="More Eyeshadow"> + Mais sombra dos olhos + </string> + <string name="More Freckles"> + Mais sardas + </string> + <string name="More Full"> + Mais volume + </string> + <string name="More Gravity"> + Mais gravidade + </string> + <string name="More Lipstick"> + Mais batom + </string> + <string name="More Love"> + Mais cintura + </string> + <string name="More Lower Lip"> + Mais lábio inferior + </string> + <string name="More Muscles"> + Mais músculos + </string> + <string name="More Muscular"> + Mais musculoso + </string> + <string name="More Rosy"> + Mais rosado + </string> + <string name="More Round"> + Mais arredondado + </string> + <string name="More Saddle"> + Mais ancas + </string> + <string name="More Sloped"> + Mais inclinado + </string> + <string name="More Square"> + Mais quadrado + </string> + <string name="More Upper Lip"> + Mais lábios superiores + </string> + <string name="More Vertical"> + Mais vertical + </string> + <string name="More Volume"> + Mais Volume + </string> + <string name="More soul"> + Mais alma + </string> + <string name="Moustache"> + Bigode + </string> + <string name="Mouth Corner"> + Canto da boca + </string> + <string name="Mouth Position"> + Posição da boca + </string> + <string name="Mowhawk"> + Moicano + </string> + <string name="Muscular"> + Muscular + </string> + <string name="Mutton Chops"> + Costeletas + </string> + <string name="Nail Polish"> + Esmate das unhas + </string> + <string name="Nail Polish Color"> + Cor do esmalte das unhas + </string> + <string name="Narrow"> + Estreito + </string> + <string name="Narrow Back"> + Costas estreitas + </string> + <string name="Narrow Front"> + Frente estreita + </string> + <string name="Narrow Lips"> + Lábios estreitos + </string> + <string name="Natural"> + Natural + </string> + <string name="Neck Length"> + Comprimento do pescoço + </string> + <string name="Neck Thickness"> + Espessura do pescoço + </string> + <string name="No Blush"> + Sem Blush + </string> + <string name="No Eyeliner"> + Sem delineador + </string> + <string name="No Eyeshadow"> + Sem Sombra dos olhos + </string> + <string name="No Lipgloss"> + Sem brilho labial + </string> + <string name="No Lipstick"> + Sem batom + </string> + <string name="No Part"> + Sem parte + </string> + <string name="No Polish"> + Sem esmalte + </string> + <string name="No Red"> + Sem vermelho + </string> + <string name="No Spikes"> + Sem espinhos + </string> + <string name="No White"> + Sem branco + </string> + <string name="No Wrinkles"> + Sem dobras + </string> + <string name="Normal Lower"> + Normal inferior + </string> + <string name="Normal Upper"> + Normal superior + </string> + <string name="Nose Left"> + Nariz para esquerda + </string> + <string name="Nose Right"> + Nariz para direita + </string> + <string name="Nose Size"> + Tamanho do nariz + </string> + <string name="Nose Thickness"> + Espessura do nariz + </string> + <string name="Nose Tip Angle"> + Ângulo da ponta do nariz + </string> + <string name="Nose Tip Shape"> + Formato da ponta do nariz + </string> + <string name="Nose Width"> + Largura do nariz + </string> + <string name="Nostril Division"> + Divisão das narinas + </string> + <string name="Nostril Width"> + Largura das narinas + </string> + <string name="Opaque"> + Opaco + </string> + <string name="Open"> + Abrir + </string> + <string name="Open Back"> + Aberto atrás + </string> + <string name="Open Front"> + Aberto na frente + </string> + <string name="Open Left"> + Aberto esquerdo + </string> + <string name="Open Right"> + Aberto direito + </string> + <string name="Orange"> + Laranja + </string> + <string name="Out"> + Fora + </string> + <string name="Out Shdw Color"> + Cor da sombra externa + </string> + <string name="Out Shdw Opacity"> + Opacidade da sombra externa + </string> + <string name="Outer Eye Corner"> + Canto externo do olho + </string> + <string name="Outer Eye Shadow"> + Sombra externa do olho + </string> + <string name="Outer Shadow"> + Sombra externa + </string> + <string name="Overbite"> + Overbite + </string> + <string name="Package"> + Pubis + </string> + <string name="Painted Nails"> + Unhas pintadas + </string> + <string name="Pale"> + Pálido + </string> + <string name="Pants Crotch"> + Cavalo da calça + </string> + <string name="Pants Fit"> + Pants Fit + </string> + <string name="Pants Length"> + Comprimento das calças + </string> + <string name="Pants Waist"> + Cintura da calça + </string> + <string name="Pants Wrinkles"> + Dobras das calças + </string> + <string name="Part"> + Parte + </string> + <string name="Part Bangs"> + Parts da franja + </string> + <string name="Pectorals"> + Peitoral + </string> + <string name="Pigment"> + Pigmento + </string> + <string name="Pigtails"> + Chiquinhas + </string> + <string name="Pink"> + Rosa + </string> + <string name="Pinker"> + Mais rosado + </string> + <string name="Platform Height"> + Altura da plataforma + </string> + <string name="Platform Width"> + Largura da plataforma + </string> + <string name="Pointy"> + Pontudo + </string> + <string name="Pointy Heels"> + Salto agulha + </string> + <string name="Ponytail"> + Rabo de cavalo + </string> + <string name="Poofy Skirt"> + Saia bufante + </string> + <string name="Pop Left Eye"> + Olho saltado esquerdo + </string> + <string name="Pop Right Eye"> + Olho saltado direito + </string> + <string name="Puffy"> + Inchado + </string> + <string name="Puffy Eyelids"> + Pálpebras inchadas + </string> + <string name="Rainbow Color"> + Cor do arco iris + </string> + <string name="Red Hair"> + Cabelo ruivo + </string> + <string name="Regular"> + Normal + </string> + <string name="Right Part"> + Parte direita + </string> + <string name="Rosy Complexion"> + Rosado da face + </string> + <string name="Round"> + Arredondado + </string> + <string name="Ruddiness"> + Rubor + </string> + <string name="Ruddy"> + Corado + </string> + <string name="Rumpled Hair"> + Cabelo desalinhado + </string> + <string name="Saddle Bags"> + Saddle Bags + </string> + <string name="Scrawny Leg"> + Pernas magricelas + </string> + <string name="Separate"> + Separar + </string> + <string name="Shallow"> + raso + </string> + <string name="Shear Back"> + Trás rente + </string> + <string name="Shear Face"> + Face raspada + </string> + <string name="Shear Front"> + Frente rente + </string> + <string name="Shear Left Up"> + Esquerda rente para cima + </string> + <string name="Shear Right Up"> + Trás rente para cima + </string> + <string name="Sheared Back"> + Rente atrás + </string> + <string name="Sheared Front"> + Rente frente + </string> + <string name="Shift Left"> + Deslocar à esquerda + </string> + <string name="Shift Mouth"> + Deslocar boca + </string> + <string name="Shift Right"> + Deslocar direita + </string> + <string name="Shirt Bottom"> + Deslocar inferior + </string> + <string name="Shirt Fit"> + Deslocar ajuste + </string> + <string name="Shirt Wrinkles"> + Deslocar dobras + </string> + <string name="Shoe Height"> + Altura do sapato + </string> + <string name="Short"> + Curto + </string> + <string name="Short Arms"> + Braços curtos + </string> + <string name="Short Legs"> + Pernas curtas + </string> + <string name="Short Neck"> + Pescoço curto + </string> + <string name="Short Pigtails"> + Chiquinhas curtas + </string> + <string name="Short Ponytail"> + Rabo de cavalo curto + </string> + <string name="Short Sideburns"> + Costeletas curtas + </string> + <string name="Short Torso"> + Tronco curto + </string> + <string name="Short hips"> + Quadril curto + </string> + <string name="Shoulders"> + Ombros + </string> + <string name="Side Fringe"> + pontas laterais + </string> + <string name="Sideburns"> + Costeletas + </string> + <string name="Sides Hair"> + Cabelo lateral + </string> + <string name="Sides Hair Down"> + Cabelo lateral long + </string> + <string name="Sides Hair Up"> + Cabelo lateral superior + </string> + <string name="Skinny Neck"> + Pescoço fino + </string> + <string name="Skirt Fit"> + Ajuste de saia + </string> + <string name="Skirt Length"> + Comprimento da saia + </string> + <string name="Slanted Forehead"> + Testa inclinada + </string> + <string name="Sleeve Length"> + Comprimento da manga + </string> + <string name="Sleeve Looseness"> + Folga da manga + </string> + <string name="Slit Back"> + Abertura : Atrás + </string> + <string name="Slit Front"> + Abertura: Frente + </string> + <string name="Slit Left"> + Abertura: Esquerda + </string> + <string name="Slit Right"> + Abertura: Direita + </string> + <string name="Small"> + Pequeno + </string> + <string name="Small Hands"> + Mãos pequenas + </string> + <string name="Small Head"> + Cabeça pequena + </string> + <string name="Smooth"> + Suavizar + </string> + <string name="Smooth Hair"> + Suavizar cabelo + </string> + <string name="Socks Length"> + Comprimento das meias + </string> + <string name="Soulpatch"> + Cavanhaque + </string> + <string name="Sparse"> + Disperso + </string> + <string name="Spiked Hair"> + Cabelo espetado + </string> + <string name="Square"> + Quadrado + </string> + <string name="Square Toe"> + Dedo quadrado + </string> + <string name="Squash Head"> + Cabeça de Pera + </string> + <string name="Stretch Head"> + Cabeça esticada + </string> + <string name="Sunken"> + Afundar + </string> + <string name="Sunken Chest"> + Peito afundado + </string> + <string name="Sunken Eyes"> + Olhos afundados + </string> + <string name="Sweep Back"> + Pentear para trás + </string> + <string name="Sweep Forward"> + Pentear para frente + </string> + <string name="Tall"> + Alto + </string> + <string name="Taper Back"> + Afinar atrás + </string> + <string name="Taper Front"> + Afinar a frente + </string> + <string name="Thick Heels"> + Salto grosso + </string> + <string name="Thick Neck"> + Pescoço grosso + </string> + <string name="Thick Toe"> + Dedo grosso + </string> + <string name="Thin"> + Fino + </string> + <string name="Thin Eyebrows"> + Sobrancelhas finas + </string> + <string name="Thin Lips"> + Lábios finos + </string> + <string name="Thin Nose"> + Nariz fino + </string> + <string name="Tight Chin"> + Queixo apertado + </string> + <string name="Tight Cuffs"> + Punho justo + </string> + <string name="Tight Pants"> + Calça justa + </string> + <string name="Tight Shirt"> + Camisa justa + </string> + <string name="Tight Skirt"> + Saia justa + </string> + <string name="Tight Sleeves"> + Tight Sleeves + </string> + <string name="Toe Shape"> + Formato dos dedos + </string> + <string name="Toe Thickness"> + Espessura dos dos dedos + </string> + <string name="Torso Length"> + Comprimento do tronco + </string> + <string name="Torso Muscles"> + Músculos do tronco + </string> + <string name="Torso Scrawny"> + Tronco magricela + </string> + <string name="Unattached"> + Desanexado + </string> + <string name="Uncreased"> + Uncreased + </string> + <string name="Underbite"> + Underbite + </string> + <string name="Unnatural"> + Não natural + </string> + <string name="Upper Bridge"> + Parte alta do nariz + </string> + <string name="Upper Cheeks"> + Bochechas altas + </string> + <string name="Upper Chin Cleft"> + fenda do queixo alta + </string> + <string name="Upper Eyelid Fold"> + Curvatura dos cÃlios supériores + </string> + <string name="Upturned"> + Voltado para cima + </string> + <string name="Very Red"> + Bem vermelho + </string> + <string name="Waist Height"> + Altura da cintura + </string> + <string name="Well-Fed"> + Corpulento + </string> + <string name="White Hair"> + Grisalho + </string> + <string name="Wide"> + Amplo + </string> + <string name="Wide Back"> + Costas largas + </string> + <string name="Wide Front"> + Testa larga + </string> + <string name="Wide Lips"> + Lábios amplos + </string> + <string name="Wild"> + Selvagem + </string> + <string name="Wrinkles"> + Rugas + </string> + <string name="LocationCtrlAddLandmarkTooltip"> + Adicionar à s minhas Landmarks + </string> + <string name="LocationCtrlEditLandmarkTooltip"> + Editar minhas Landmarks + </string> + <string name="LocationCtrlInfoBtnTooltip"> + Ver mais informações sobre a localização atual + </string> + <string name="LocationCtrlComboBtnTooltip"> + Meu histórico de localizações + </string> + <string name="UpdaterWindowTitle"> + [APP_NAME] Atualização + </string> + <string name="UpdaterNowUpdating"> + Atualizando agora o [APP_NAME]... + </string> + <string name="UpdaterNowInstalling"> + Instalando [APP_NAME]... + </string> + <string name="UpdaterUpdatingDescriptive"> + Seu visualizador [APP_NAME] está sendo atualizado para a versão mais recente. Isso pode levar algum tempo, então por favor seja paciente. + </string> + <string name="UpdaterProgressBarTextWithEllipses"> + Fazendo o download da atualização... + </string> + <string name="UpdaterProgressBarText"> + Fazendo o download da atualização + </string> + <string name="UpdaterFailDownloadTitle"> + Falha no download da atualização + </string> + <string name="UpdaterFailUpdateDescriptive"> + Um erro ocorreu ao atualizar [APP_NAME]. Por favor, faça o download da versão mais recente em www.secondlife.com. + </string> + <string name="UpdaterFailInstallTitle"> + Falha ao instalar a atualização + </string> + <string name="UpdaterFailStartTitle"> + Falha ao iniciar o visualizador + </string> + <string name="IM_logging_string"> + -- Log de mensagem instantânea habilitado -- + </string> + <string name="IM_typing_start_string"> + [NAME] está digitando... + </string> + <string name="Unnamed"> + (Anônimo) + </string> + <string name="IM_moderated_chat_label"> + (Moderado: Voz desativado por padrão) + </string> + <string name="IM_unavailable_text_label"> + Bate-papo de texto não está disponÃvel para esta chamada. + </string> + <string name="IM_muted_text_label"> + Seu bate- papo de texto foi desabilitado por um Moderador do Grupo. + </string> + <string name="IM_default_text_label"> + Clique aqui para menagem instantânea. + </string> + <string name="IM_to_label"> + Para + </string> + <string name="IM_moderator_label"> + (Moderador) + </string> + <string name="started_call"> + Iniciou uma ligação de voz + </string> + <string name="joined_call"> + Entrou na ligação + </string> + <string name="ringing-im"> + Entrando em ligação de voz... + </string> + <string name="connected-im"> + Conectado. Para sair, clique em Desligar + </string> + <string name="hang_up-im"> + Saiu da ligação de voz </string> - <string name="ScriptQuestionCautionChatGranted"> - '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS]. - </string> - <string name="ScriptQuestionCautionChatDenied"> - '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS]. - </string> - <string name="ScriptTakeMoney"> - Tomar linden dólares (L$) de você - </string> - <string name="ActOnControlInputs"> - Atue nas suas entradas de controle - </string> - <string name="RemapControlInputs"> - Remapeie suas entradas de controle - </string> - <string name="AnimateYourAvatar"> - Faça uma animação para o seu avatar - </string> - <string name="AttachToYourAvatar"> - Anexe ao seu avatar - </string> - <string name="ReleaseOwnership"> - Libere a propriedade e torne-a pública - </string> - <string name="LinkAndDelink"> - Una e desuna de outros objetos - </string> - <string name="AddAndRemoveJoints"> - Adicione e remova junções com outros objetos - </string> - <string name="ChangePermissions"> - Modifique as permissões - </string> - <string name="TrackYourCamera"> - Acompanhe sua câmera - </string> - <string name="ControlYourCamera"> - Controle sua camera - </string> <string name="only_user_message"> Você é o único usuário desta sessão. </string> @@ -588,6 +3209,12 @@ <string name="invite_message"> Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz. </string> + <string name="muted_message"> + Você bloqueou este residente. Se quiser retirar o bloqueio, basta enviar uma mensagem. + </string> + <string name="generic"> + Erro de solicitação, tente novamente mais tarde. + </string> <string name="generic_request_error"> Erro na requisição, por favor, tente novamente. </string> @@ -606,46 +3233,37 @@ <string name="not_a_mod_error"> Você não é um moderador de sessão. </string> + <string name="muted"> + Bate-papo de texto desativado por um moderador. + </string> <string name="muted_error"> Um moderador do grupo desabilitou seu bate-papo em texto. </string> <string name="add_session_event"> Não foi possÃvel adicionar usuários na sessão de bate-papo com [RECIPIENT]. </string> + <string name="message"> + Não foi possÃvel enviar sua mensagem para o bate-papo com [RECIPIENT]. + </string> <string name="message_session_event"> Não foi possÃvel enviar sua mensagem na sessão de bate- papo com [RECIPIENT]. </string> + <string name="mute"> + Erro durante a moderação. + </string> + <string name="removed"> + Você foi tirado do grupo. + </string> <string name="removed_from_group"> Você foi removido do grupo. </string> <string name="close_on_no_ability"> Você não possui mais a habilidade de estar na sessão de bate-papo. </string> - <string name="AcctTypeResident"> - Residente - </string> - <string name="AcctTypeTrial"> - Teste - </string> - <string name="AcctTypeCharterMember"> - Estatuto do membro - </string> - <string name="AcctTypeEmployee"> - Contratado da Linden Lab - </string> - <string name="PaymentInfoUsed"> - Infor. de pagamento utilizadas - </string> - <string name="PaymentInfoOnFile"> - Infor. de pagamento no arquivo - </string> - <string name="NoPaymentInfoOnFile"> - Sem infor. de pagamento no arquivo - </string> - <string name="AgeVerified"> - Idade Verificada - </string> - <string name="NotAgeVerified"> - Idade não Verificada - </string> + <string name="unread_chat_single"> + [SOURCES] disse alguma coisa + </string> + <string name="unread_chat_multiple"> + [SOURCES] disseram alguma coisa + </string> </strings> diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml index 6eecc45bcf..1a0461082b 100644 --- a/indra/newview/skins/default/xui/pt/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml @@ -2,12 +2,12 @@ <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> - Problema encontrado ao processar seu pedido de Teletransporte. Você pode tentar reiniciar antes de tentar teletransportar-se. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em: -www.secondlife.com/support + Houve um problema ao processar o teletransporte. Talvez seja preciso sair e entrar do Second Life para fazer o teletransporte. +Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE]. </message> <message name="invalid_region_handoff"> - Problema encontrado ao processar a passagem de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em: -www.secondlife.com/support + Problema encontrado ao processar a passagem de regiões. Talvez seja preciso sair e entrar do Second Life atravessar regiões novamente. +Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE]. </message> <message name="blocked_tport"> Desculpe, teletransportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teletransporte, por favor tente deslogar e relogar para resolver o problema. diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index dd61ac6ae5..eecc79d36c 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -86,7 +86,7 @@ public: #ifdef __GNUC__ __attribute__ ((noinline)) #endif - BOOL isGodlike() const { return FALSE; } + bool isGodlike() const { return FALSE; } }; LLAgent gAgent; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 15a51bbe14..3f379fcf75 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -854,16 +854,10 @@ class Linux_i686Manifest(LinuxManifest): print "Skipping %s - not found" % libfile pass - - if(self.args['buildtype'].lower() == 'release'): - print "* packaging stripped viewer binary." - self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin") - else: - print "* packaging un-stripped viewer binary." - self.path("secondlife-bin","bin/do-not-directly-run-secondlife-bin") + self.path("secondlife-bin","bin/do-not-directly-run-secondlife-bin") - self.path("../linux_crash_logger/linux-crash-logger-stripped","bin/linux-crash-logger.bin") - self.path("../linux_updater/linux-updater-stripped", "bin/linux-updater.bin") + self.path("../linux_crash_logger/linux-crash-logger","bin/linux-crash-logger.bin") + self.path("../linux_updater/linux-updater", "bin/linux-updater.bin") self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin") if self.prefix("res-sdl"): self.path("*") @@ -914,23 +908,16 @@ class Linux_i686Manifest(LinuxManifest): if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): self.path("libortp.so") self.path("libsndfile.so.1") - #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OAL lib + #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib self.path("libvivoxsdk.so") self.path("libvivoxplatform.so") self.end_prefix("lib") -class Linux_x86_64Manifest(LinuxManifest): - def construct(self): - super(Linux_x86_64Manifest, self).construct() - self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin") - self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") - if self.prefix("res-sdl"): - self.path("*") - # recurse - self.end_prefix("res-sdl") + if self.args['buildtype'].lower() == 'release': + print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" + self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure - self.path("featuretable_linux.txt") - self.path("secondlife-i686.supp") +################################################################ if __name__ == "__main__": main() diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index 4eadc64b5a..d5795ef4a0 100644 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -61,7 +61,7 @@ namespace tut uuid2 == LLUUID::null && uuid3 == LLUUID::null)); ensure("LLPermission Get Functions failed", (permissions.getMaskBase() == PERM_ALL && permissions.getMaskOwner() == PERM_ALL && permissions.getMaskGroup() == PERM_ALL && permissions.getMaskEveryone() == PERM_ALL && permissions.getMaskNextOwner() == PERM_ALL)); - ensure("Ownership functions failed", (permissions.isGroupOwned() == FALSE && permissions.isOwned() == FALSE)); + ensure("Ownership functions failed", ((! permissions.isGroupOwned()) && (! permissions.isOwned()))); } template<> template<> @@ -204,7 +204,7 @@ namespace tut LLPermissions perm1; LLUUID uuid; BOOL is_group_owned = FALSE; - ensure("1:getOwnership:failed ", (FALSE == perm1.getOwnership(uuid,is_group_owned))); + ensure("1:getOwnership:failed ", ! perm1.getOwnership(uuid,is_group_owned)); LLPermissions perm; LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); @@ -213,11 +213,11 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); perm.getOwnership(uuid,is_group_owned); - ensure("2:getOwnership:failed ", ((uuid == owner) && (FALSE == is_group_owned))); + ensure("2:getOwnership:failed ", ((uuid == owner) && (! is_group_owned))); perm.init(creator,LLUUID::null,lastOwner,group); perm.getOwnership(uuid,is_group_owned); - ensure("3:getOwnership:failed ", ((uuid == group) && (TRUE == is_group_owned))); + ensure("3:getOwnership:failed ", ((uuid == group) && is_group_owned)); } template<> template<> @@ -240,17 +240,17 @@ namespace tut LLUUID agent("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); - bool is_atomic = TRUE; - ensure("setOwnerAndGroup():failed ", (TRUE == perm.setOwnerAndGroup(agent,owner,group,is_atomic))); + bool is_atomic = true; + ensure("setOwnerAndGroup():failed ", perm.setOwnerAndGroup(agent,owner,group,is_atomic)); LLUUID owner2("68edcf47-ccd7-45b8-9f90-1649d7f12807"); LLUUID group2("9c8eca51-53d5-42a7-bb58-cef070395db9"); // cant change - agent need to be current owner - ensure("setOwnerAndGroup():failed ", (FALSE == perm.setOwnerAndGroup(agent,owner2,group2,is_atomic))); + ensure("setOwnerAndGroup():failed ", ! perm.setOwnerAndGroup(agent,owner2,group2,is_atomic)); // should be able to change - agent and owner same as current owner - ensure("setOwnerAndGroup():failed ", (TRUE == perm.setOwnerAndGroup(owner,owner,group2,is_atomic))); + ensure("setOwnerAndGroup():failed ", perm.setOwnerAndGroup(owner,owner,group2,is_atomic)); } template<> template<> @@ -259,7 +259,7 @@ namespace tut LLPermissions perm; LLUUID agent; LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); - ensure("deedToGroup():failed ", (TRUE == perm.deedToGroup(agent,group))); + ensure("deedToGroup():failed ", perm.deedToGroup(agent,group)); } template<> template<> void permission_object_t::test<11>() @@ -268,12 +268,12 @@ namespace tut LLUUID agent; BOOL set = 1; U32 bits = PERM_TRANSFER | PERM_MODIFY; - ensure("setBaseBits():failed ", (TRUE == perm.setBaseBits(agent, set, bits))); - ensure("setOwnerBits():failed ", (TRUE == perm.setOwnerBits(agent, set, bits))); + ensure("setBaseBits():failed ", perm.setBaseBits(agent, set, bits)); + ensure("setOwnerBits():failed ", perm.setOwnerBits(agent, set, bits)); LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); - ensure("setBaseBits():failed ", (FALSE == perm.setBaseBits(agent1, set, bits))); - ensure("setOwnerBits():failed ", (FALSE == perm.setOwnerBits(agent1, set, bits))); + ensure("setBaseBits():failed ", ! perm.setBaseBits(agent1, set, bits)); + ensure("setOwnerBits():failed ", ! perm.setOwnerBits(agent1, set, bits)); } template<> template<> @@ -284,14 +284,14 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); BOOL set = 1; U32 bits = 10; - ensure("setGroupBits():failed ", (TRUE == perm.setGroupBits(agent,group, set, bits))); - ensure("setEveryoneBits():failed ", (TRUE == perm.setEveryoneBits(agent,group, set, bits))); - ensure("setNextOwnerBits():failed ", (TRUE == perm.setNextOwnerBits(agent,group, set, bits))); - - LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); - ensure("setGroupBits():failed ", (FALSE == perm.setGroupBits(agent1,group, set, bits))); - ensure("setEveryoneBits():failed ", (FALSE == perm.setEveryoneBits(agent1,group, set, bits))); - ensure("setNextOwnerBits():failed ", (FALSE == perm.setNextOwnerBits(agent1,group, set, bits))); + ensure("setGroupBits():failed ", perm.setGroupBits(agent,group, set, bits)); + ensure("setEveryoneBits():failed ", perm.setEveryoneBits(agent,group, set, bits)); + ensure("setNextOwnerBits():failed ", perm.setNextOwnerBits(agent,group, set, bits)); + + LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); + ensure("setGroupBits():failed ", ! perm.setGroupBits(agent1,group, set, bits)); + ensure("setEveryoneBits():failed ", ! perm.setEveryoneBits(agent1,group, set, bits)); + ensure("setNextOwnerBits():failed ", ! perm.setNextOwnerBits(agent1,group, set, bits)); } template<> template<> @@ -301,14 +301,14 @@ namespace tut LLUUID agent; LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); U32 bits = 10; - ensure("allowOperationBy():failed ", (TRUE == perm.allowOperationBy(bits,agent,group))); + ensure("allowOperationBy():failed ", perm.allowOperationBy(bits,agent,group)); LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); perm.init(creator,owner,lastOwner,group); - ensure("allowOperationBy():failed ", (TRUE == perm.allowOperationBy(bits,agent1,group))); + ensure("allowOperationBy():failed ", perm.allowOperationBy(bits,agent1,group)); } template<> template<> @@ -321,15 +321,12 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); LLUUID agent; - ensure("1:allowModifyBy():failed ", (TRUE == perm.allowModifyBy(agent))); - ensure("2:allowModifyBy():failed ", (TRUE == perm.allowModifyBy(agent,group))); + ensure("1:allowModifyBy():failed ", perm.allowModifyBy(agent)); + ensure("2:allowModifyBy():failed ", perm.allowModifyBy(agent,group)); - U32 val1 = 0x7FFFFFFF; - S32 sVal = 1 << 14; - sVal = val1 & sVal; LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); - ensure("3:allowModifyBy():failed ", (sVal == perm.allowModifyBy(agent1))); - ensure("4:allowModifyBy():failed ", (sVal == perm.allowModifyBy(agent1,group))); + ensure("3:allowModifyBy():failed ", perm.allowModifyBy(agent1)); + ensure("4:allowModifyBy():failed ", perm.allowModifyBy(agent1,group)); } template<> template<> @@ -342,15 +339,12 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); LLUUID agent; - ensure("1:allowCopyBy():failed ", (TRUE == perm.allowModifyBy(agent))); - ensure("2:allowCopyBy():failed ", (TRUE == perm.allowModifyBy(agent,group))); + ensure("1:allowCopyBy():failed ", perm.allowModifyBy(agent)); + ensure("2:allowCopyBy():failed ", perm.allowModifyBy(agent,group)); - U32 val1 = 0x7FFFFFFF; - S32 sVal = 1 << 15; - sVal = val1 & sVal; LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); - ensure("3:allowCopyBy():failed ", (sVal == perm.allowCopyBy(agent1))); - ensure("4:allowCopyBy():failed ", (sVal == perm.allowCopyBy(agent1,group))); + ensure("3:allowCopyBy():failed ", perm.allowCopyBy(agent1)); + ensure("4:allowCopyBy():failed ", perm.allowCopyBy(agent1,group)); } template<> template<> @@ -363,15 +357,12 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); LLUUID agent; - ensure("1:allowMoveBy():failed ", (TRUE == perm.allowMoveBy(agent))); - ensure("2:allowMoveBy():failed ", (TRUE == perm.allowMoveBy(agent,group))); + ensure("1:allowMoveBy():failed ", perm.allowMoveBy(agent)); + ensure("2:allowMoveBy():failed ", perm.allowMoveBy(agent,group)); - U32 val1 = 0x7FFFFFFF; - S32 sVal = 1 << 19; - sVal = val1 & sVal; LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); - ensure("3:allowMoveBy():failed ", (sVal == perm.allowMoveBy(agent1))); - ensure("4:allowMoveBy():failed ", (sVal == perm.allowMoveBy(agent1,group))); + ensure("3:allowMoveBy():failed ", perm.allowMoveBy(agent1)); + ensure("4:allowMoveBy():failed ", perm.allowMoveBy(agent1,group)); } template<> template<> @@ -383,20 +374,17 @@ namespace tut LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); LLUUID agent; - ensure("1:allowMoveBy():failed ", (TRUE == perm.allowTransferTo(agent))); + ensure("1:allowMoveBy():failed ", perm.allowTransferTo(agent)); perm.init(creator,owner,lastOwner,group); - U32 val1 = 0x7FFFFFFF; - S32 sVal = 1 << 13; - sVal = val1 & sVal; - ensure("2:allowMoveBy():failed ", (sVal == perm.allowTransferTo(agent))); + ensure("2:allowMoveBy():failed ", perm.allowTransferTo(agent)); } template<> template<> void permission_object_t::test<18>() { LLPermissions perm,perm1; - ensure("1:Operator==:failed ", perm == perm1); + ensure_equals("1:Operator==:failed ", perm, perm1); LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); @@ -404,7 +392,7 @@ namespace tut LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); perm = perm1; - ensure("2:Operator==:failed ", perm == perm1); + ensure_equals("2:Operator==:failed ", perm, perm1); } template<> template<> @@ -416,7 +404,7 @@ namespace tut LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8"); perm.init(creator,owner,lastOwner,group); - ensure("2:Operator==:failed ", perm != perm1); + ensure_not_equals("2:Operator==:failed ", perm, perm1); } template<> template<> @@ -453,7 +441,7 @@ namespace tut } perm1.importFile(fp); fclose(fp); - ensure("exportFile()/importFile():failed to export and import the data ", perm1 == perm); + ensure_equals("exportFile()/importFile():failed to export and import the data ", perm1, perm); } template<> template<> @@ -479,7 +467,7 @@ namespace tut std::istringstream istream(ostream.str()); perm1.importLegacyStream(istream); - ensure("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1 == perm); + ensure_equals("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1, perm); } template<> template<> @@ -502,7 +490,7 @@ namespace tut stream1 << perm; perm1.init(creator,owner,lastOwner,group); stream2 << perm1; - ensure("1:operator << failed",(stream1.str() == stream2.str())); + ensure_equals("1:operator << failed", stream1.str(), stream2.str()); } template<> template<> @@ -533,19 +521,19 @@ namespace tut { LLAggregatePermissions AggrPermission; LLAggregatePermissions AggrPermission1; - ensure("getU8() function failed", (AggrPermission.getU8() == 0)); - ensure("isEmpty() function failed", (AggrPermission.isEmpty() == TRUE)); + ensure_equals("getU8() function failed", AggrPermission.getU8(), 0); + ensure("isEmpty() function failed", AggrPermission.isEmpty()); AggrPermission.getValue(PERM_TRANSFER); ensure_equals("getValue() function failed", AggrPermission.getValue(PERM_TRANSFER), 0x00); AggrPermission.aggregate(PERM_ITEM_UNRESTRICTED); - ensure("aggregate() function failed", (AggrPermission.isEmpty() == FALSE)); + ensure("aggregate() function failed", ! AggrPermission.isEmpty()); AggrPermission1.aggregate(AggrPermission); - ensure("aggregate() function failed", (AggrPermission1.isEmpty() == FALSE)); + ensure("aggregate() function failed", ! AggrPermission1.isEmpty()); std::ostringstream stream1; stream1 << AggrPermission; - ensure("operator<< failed", (stream1.str() == "{PI_COPY=All, PI_MODIFY=All, PI_TRANSFER=All}")); + ensure_equals("operator<< failed", stream1.str(), "{PI_COPY=All, PI_MODIFY=All, PI_TRANSFER=All}"); } } diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 0ff53f3e00..e5a846f15a 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -66,11 +66,11 @@ static void gluiCallbackWrapper( int control_id ); static bool isTexture( GLuint texture ) { bool result = false; - + // glIsTexture will sometimes return false for real textures... do this instead. if(texture != 0) result = true; - + return result; } @@ -95,24 +95,24 @@ mediaPanel::~mediaPanel() glDeleteTextures( 1, &mPickTextureHandle ); mPickTextureHandle = 0; } - + if ( isTexture( mMediaTextureHandle ) ) { std::cerr << "remMediaPanel: deleting media texture " << mMediaTextureHandle << std::endl; glDeleteTextures( 1, &mMediaTextureHandle ); mMediaTextureHandle = 0; } - + if(mPickTexturePixels) { delete mPickTexturePixels; } - + if(mMediaSource) { delete mMediaSource; } - + } //////////////////////////////////////////////////////////////////////////////// @@ -128,6 +128,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind mCurMouseY( 0 ), mFuzzyMedia( true ), mSelectedPanel( 0 ), + mDistanceCameraToSelectedGeometry( 0.0f ), mMediaBrowserControlEnableCookies( 0 ), mMediaBrowserControlBackButton( 0 ), mMediaBrowserControlForwardButton( 0 ), @@ -151,7 +152,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind //mBookmarks.push_back( std::pair< std::string, std::string >( "description", "url" ) ); // read bookmarks from file. - // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory + // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory // to app directory (WITHOUT build configuration dir) (this is cwd in Windows within MSVC) // For example, test_apps\llplugintest and not test_apps\llplugintest\Release // This may need to be changed for Mac/Linux builds. @@ -193,7 +194,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind // initialize linden lab APR module ll_init_apr(); - // Set up llerror logging + // Set up llerror logging { LLError::initForApplication("."); LLError::setDefaultLevel(LLError::LEVEL_INFO); @@ -273,7 +274,7 @@ void LLMediaPluginTest::reshape( int width, int height ) void LLMediaPluginTest::bindTexture(GLuint texture, GLint row_length, GLint alignment) { glEnable( GL_TEXTURE_2D ); - + glBindTexture( GL_TEXTURE_2D, texture ); glPixelStorei( GL_UNPACK_ROW_LENGTH, row_length ); glPixelStorei( GL_UNPACK_ALIGNMENT, alignment ); @@ -285,27 +286,57 @@ bool LLMediaPluginTest::checkGLError(const char *name) { bool result = false; GLenum error = glGetError(); - + if(error != GL_NO_ERROR) { // For some reason, glGenTextures is returning GL_INVALID_VALUE... std::cout << name << " ERROR 0x" << std::hex << error << std::dec << std::endl; result = true; } - + return result; } //////////////////////////////////////////////////////////////////////////////// // -void LLMediaPluginTest::drawGeometry( int panel ) +GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z ) +{ + GLdouble camera_pos_x = 0.0f; + GLdouble camera_pos_y = 0.0f; + GLdouble camera_pos_z = 0.0f; + + GLdouble modelMatrix[16]; + GLdouble projMatrix[16]; + GLint viewport[4]; + + glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix); + glGetDoublev(GL_PROJECTION_MATRIX, projMatrix); + glGetIntegerv(GL_VIEWPORT, viewport); + + gluUnProject( + (viewport[2]-viewport[0])/2 , (viewport[3]-viewport[1])/2, + 0.0, + modelMatrix, projMatrix, viewport, + &camera_pos_x, &camera_pos_y, &camera_pos_z ); + + GLfloat distance = + sqrt( ( camera_pos_x - point_x ) * ( camera_pos_x - point_x ) + + ( camera_pos_y - point_y ) * ( camera_pos_y - point_y ) + + ( camera_pos_z - point_z ) * ( camera_pos_z - point_z ) ); + + return distance; +} + +//////////////////////////////////////////////////////////////////////////////// +// +void LLMediaPluginTest::drawGeometry( int panel, bool selected ) { // texture coordinates for each panel GLfloat non_opengl_texture_coords[ 8 ] = { 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f }; GLfloat opengl_texture_coords[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; - + GLfloat *texture_coords = mMediaPanels[ panel ]->mAppTextureCoordsOpenGL?opengl_texture_coords:non_opengl_texture_coords; - + // base coordinates for each panel GLfloat base_vertex_pos[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f }; @@ -316,31 +347,35 @@ void LLMediaPluginTest::drawGeometry( int panel ) const int panel_x = ( panel / num_rows ); const int panel_y = ( panel % num_rows ); - const float spacing = 0.1f; + // default spacing is small - make it larger if checkbox set - for testing positional audio + float spacing = 0.1f; + if ( mLargePanelSpacing ) + spacing = 2.0f; + const GLfloat offset_x = num_cols * ( 1.0 + spacing ) / 2; const GLfloat offset_y = num_rows * ( 1.0 + spacing ) / 2; - + // Adjust for media aspect ratios - { + { float aspect = 1.0f; if(mMediaPanels[ panel ]->mMediaHeight != 0) { aspect = (float)mMediaPanels[ panel ]->mMediaWidth / (float)mMediaPanels[ panel ]->mMediaHeight; } - + if(aspect > 1.0f) { // media is wider than it is high -- adjust the top and bottom in for( int corner = 0; corner < 4; ++corner ) { float temp = base_vertex_pos[corner * 2 + 1]; - + if(temp < 0.5f) temp += 0.5 - (0.5f / aspect); else temp -= 0.5 - (0.5f / aspect); - + base_vertex_pos[corner * 2 + 1] = temp; } } @@ -350,7 +385,7 @@ void LLMediaPluginTest::drawGeometry( int panel ) for( int corner = 0; corner < 4; ++corner ) { float temp = base_vertex_pos[corner * 2]; - + if(temp < 0.5f) temp += 0.5f - (0.5f * aspect); else @@ -371,6 +406,15 @@ void LLMediaPluginTest::drawGeometry( int panel ) glVertex3f( x, y, 0.0f ); }; glEnd(); + + // calculate distance to this panel if it's selected + if ( selected ) + { + GLfloat point_x = base_vertex_pos[ 0 ] + panel_x * ( 1.0 + spacing ) - offset_x + spacing / 2.0f; + GLfloat point_y = base_vertex_pos[ 0 + 1 ] + panel_y * ( 1.0 + spacing ) - offset_y + spacing / 2.0f; + GLfloat point_z = 0.0f; + mDistanceCameraToSelectedGeometry = distanceToCamera( point_x, point_y, point_z ); + }; } ////////////////////////////////////////////////////////////////////////////// @@ -403,7 +447,7 @@ void LLMediaPluginTest::draw( int draw_type ) if ( draw_type == DrawTypePickTexture ) { // only bother with pick if we have something to render - // Actually, we need to pick even if we're not ready to render. + // Actually, we need to pick even if we're not ready to render. // Otherwise you can't select and remove a panel which has gone bad. //if ( mMediaPanels[ panel ]->mReadyToRender ) { @@ -420,7 +464,7 @@ void LLMediaPluginTest::draw( int draw_type ) glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); // draw geometry using pick texture - drawGeometry( panel ); + drawGeometry( panel, false ); glMatrixMode( GL_TEXTURE ); glPopMatrix(); @@ -431,13 +475,13 @@ void LLMediaPluginTest::draw( int draw_type ) { bool texture_valid = false; bool plugin_exited = false; - + if(mMediaPanels[ panel ]->mMediaSource) { texture_valid = mMediaPanels[ panel ]->mMediaSource->textureValid(); plugin_exited = mMediaPanels[ panel ]->mMediaSource->isPluginExited(); } - + // save texture matrix (changes for each panel) glMatrixMode( GL_TEXTURE ); glPushMatrix(); @@ -465,14 +509,14 @@ void LLMediaPluginTest::draw( int draw_type ) mMediaPanels[ panel ]->mTextureScaleY, 1.0f ); }; - + float intensity = plugin_exited?0.25f:1.0f; - + // highlight the selected panel if ( mSelectedPanel && ( mMediaPanels[ panel ]->mId == mSelectedPanel->mId ) ) { startPanelHighlight( intensity, intensity, 0.0f, 5.0f ); - drawGeometry( panel ); + drawGeometry( panel, true ); endPanelHighlight(); } else @@ -481,21 +525,21 @@ void LLMediaPluginTest::draw( int draw_type ) if ( !mMediaPanels[ panel ]->mReadyToRender ) { startPanelHighlight( intensity, 0.0f, 0.0f, 2.0f ); - drawGeometry( panel ); + drawGeometry( panel, false ); endPanelHighlight(); } else - // just display a border around the media + // just display a border around the media { startPanelHighlight( 0.0f, intensity, 0.0f, 2.0f ); - drawGeometry( panel ); + drawGeometry( panel, false ); endPanelHighlight(); }; - + if ( mMediaPanels[ panel ]->mReadyToRender && texture_valid ) { // draw visual geometry - drawGeometry( panel ); + drawGeometry( panel, false ); } // restore texture matrix (changes for each panel) @@ -551,7 +595,7 @@ void LLMediaPluginTest::idle() // GLUI requires this if ( glutGetWindow() != mAppWindow ) glutSetWindow( mAppWindow ); - + // random creation/destruction of panels enabled? const time_t panel_timeout_time = 5; if ( mRandomPanelCount ) @@ -704,7 +748,7 @@ void LLMediaPluginTest::idle() for( int panel_index = 0; panel_index < (int)mMediaPanels.size(); ++panel_index ) { mediaPanel *panel = mMediaPanels[ panel_index ]; - + // call plugins idle function so it can potentially update itself panel->mMediaSource->idle(); @@ -717,7 +761,7 @@ void LLMediaPluginTest::idle() //std::cout << "texture invalid, skipping update..." << std::endl; } else - if ( panel && + if ( panel && ( panel->mMediaWidth != panel->mMediaSource->getWidth() || panel->mMediaHeight != panel->mMediaSource->getHeight() ) ) { @@ -733,7 +777,7 @@ void LLMediaPluginTest::idle() int y_offset = dirty_rect.mBottom; int width = dirty_rect.mRight - dirty_rect.mLeft; int height = dirty_rect.mTop - dirty_rect.mBottom; - + if((dirty_rect.mRight <= panel->mTextureWidth) && (dirty_rect.mTop <= panel->mTextureHeight)) { // Offset the pixels pointer properly @@ -752,23 +796,23 @@ void LLMediaPluginTest::idle() glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); }; - + checkGLError("glTexParameteri"); - + if(panel->mMediaSource->getTextureFormatSwapBytes()) { glPixelStorei(GL_UNPACK_SWAP_BYTES, 1); checkGLError("glPixelStorei"); } - + // draw portion that changes into texture - glTexSubImage2D( GL_TEXTURE_2D, 0, - x_offset, + glTexSubImage2D( GL_TEXTURE_2D, 0, + x_offset, y_offset, - width, + width, height, - panel->mMediaSource->getTextureFormatPrimary(), - panel->mMediaSource->getTextureFormatType(), + panel->mMediaSource->getTextureFormatPrimary(), + panel->mMediaSource->getTextureFormatType(), pixels ); if(checkGLError("glTexSubImage2D")) @@ -788,9 +832,9 @@ void LLMediaPluginTest::idle() glPixelStorei(GL_UNPACK_SWAP_BYTES, 0); checkGLError("glPixelStorei"); } - + panel->mMediaSource->resetDirty(); - + panel->mReadyToRender = true; } else @@ -811,8 +855,8 @@ void LLMediaPluginTest::idle() //////////////////////////////////////////////////////////////////////////////// // -void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, - int& media_x, int& media_y, +void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, + int& media_x, int& media_y, int& id ) { if ( ! mSelectedPanel ) @@ -828,7 +872,7 @@ void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, // OpenGL app == coordinate system this way // NOTE: unrelated to settings in plugin - this // is just for this app - mCurMouseY = mWindowHeight - window_y; + mCurMouseY = mWindowHeight - window_y; // extract x (0..1023, y (0..1023) and id (0..15) from RGB components unsigned long pixel_read_color_bits = ( mPixelReadColor[ 0 ] << 16 ) | ( mPixelReadColor[ 1 ] << 8 ) | mPixelReadColor[ 2 ]; @@ -880,14 +924,14 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel ) mSelectedPanel->mMediaSource->setVolume( 0.0f ); mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_LOW ); }; - + mSelectedPanel = panel; if( mSelectedPanel && mSelectedPanel->mMediaSource ) { mSelectedPanel->mMediaSource->setVolume( (float)mMediaTimeControlVolume / 100.0f ); mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_NORMAL ); - + if(!mSelectedPanel->mStartUrl.empty()) { mUrlEdit->set_text(const_cast<char*>(mSelectedPanel->mStartUrl.c_str()) ); @@ -900,7 +944,7 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel ) mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source ) { mediaPanel *result = NULL; - + for( int panel = 0; panel < (int)mMediaPanels.size(); ++panel ) { if ( mMediaPanels[ panel ]->mMediaSource == source ) @@ -908,7 +952,7 @@ mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source ) result = mMediaPanels[ panel ]; } } - + return result; } @@ -1066,7 +1110,7 @@ void LLMediaPluginTest::gluiCallback( int control_id ) { if ( mSelectedPanel ) { - // get value from spinner + // get value from spinner float seconds_to_seek = mMediaTimeControlSeekSeconds; mSelectedPanel->mMediaSource->seek( seconds_to_seek ); mSelectedPanel->mMediaSource->start(); @@ -1194,7 +1238,7 @@ void LLMediaPluginTest::mouseButton( int button, int state, int x, int y ) windowPosToTexturePos( x, y, media_x, media_y, id ); // only select a panel if we're on a panel - // (HACK: strictly speaking this rules out clicking on + // (HACK: strictly speaking this rules out clicking on // the origin of a panel but that's very unlikely) if ( media_x > 0 && media_y > 0 ) { @@ -1327,18 +1371,18 @@ void LLMediaPluginTest::makeChrome() mGluiMediaTimeControlWindow->add_column( false ); mIdMediaTimeControlVolume = start_id++; GLUI_Spinner* spinner = mGluiMediaTimeControlWindow->add_spinner( "Volume", 2, &mMediaTimeControlVolume, mIdMediaTimeControlVolume, gluiCallbackWrapper); - spinner->set_float_limits( 0, 100 ); + spinner->set_float_limits( 0, 100 ); mGluiMediaTimeControlWindow->add_column( true ); mIdMediaTimeControlSeekSeconds = start_id++; spinner = mGluiMediaTimeControlWindow->add_spinner( "", 2, &mMediaTimeControlSeekSeconds, mIdMediaTimeControlSeekSeconds, gluiCallbackWrapper); - spinner->set_float_limits( 0, 200 ); + spinner->set_float_limits( 0, 200 ); spinner->set_w( 32 ); spinner->set_speed( 0.025f ); mGluiMediaTimeControlWindow->add_column( false ); mIdMediaTimeControlSeek = start_id++; mGluiMediaTimeControlWindow->add_button( "SEEK", mIdMediaTimeControlSeek, gluiCallbackWrapper ); mGluiMediaTimeControlWindow->add_column( false ); - + // top window - media controls for "browser" media types (e.g. web browser) mGluiMediaBrowserControlWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_TOP ); @@ -1385,6 +1429,13 @@ void LLMediaPluginTest::makeChrome() mDisableTimeout = 0; glui_window_misc_control->add_checkbox( "Disable plugin timeout", &mDisableTimeout, mIdDisableTimeout, gluiCallbackWrapper ); glui_window_misc_control->set_main_gfx_window( mAppWindow ); + glui_window_misc_control->add_column( true ); + + mIdLargePanelSpacing = start_id++; + mLargePanelSpacing = 0; + glui_window_misc_control->add_checkbox( "Large Panel Spacing", &mLargePanelSpacing, mIdLargePanelSpacing, gluiCallbackWrapper ); + glui_window_misc_control->set_main_gfx_window( mAppWindow ); + glui_window_misc_control->add_column( true ); // bottom window - status mBottomGLUIWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_BOTTOM ); @@ -1449,7 +1500,7 @@ void LLMediaPluginTest::makePickTexture( int id, GLuint* texture_handle, unsigne // std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url ) { - // default to web + // default to web std::string mime_type = "text/html"; // we may need a more advanced MIME type accessor later :-) @@ -1479,7 +1530,7 @@ std::string LLMediaPluginTest::pluginNameFromMimeType( std::string& mime_type ) else if ( mime_type == "text/html" ) plugin_name = "media_plugin_webkit.dylib"; - + #elif LL_WINDOWS std::string plugin_name( "media_plugin_null.dll" ); @@ -1523,7 +1574,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) // tell the plugin what size we asked for media_source->setSize( media_width, media_height ); - // Use the launcher start and initialize the plugin + // Use the launcher start and initialize the plugin #if LL_DARWIN || LL_LINUX std::string launcher_name( "SLPlugin" ); #elif LL_WINDOWS @@ -1580,7 +1631,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) // id wasn't found so we can use it if ( ! id_exists ) { - panel->mId = nid; + panel->mId = nid; break; }; }; @@ -1592,7 +1643,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) } else { - // now we have the ID we can use it to make the + // now we have the ID we can use it to make the // pick texture (id is baked into texture pixels) makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels ); @@ -1615,17 +1666,17 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) { // checkGLError("LLMediaPluginTest::updateMediaPanel"); - - if ( ! panel ) + + if ( ! panel ) return; - + if(!panel->mMediaSource || !panel->mMediaSource->textureValid()) { panel->mReadyToRender = false; return; } - - // take a reference copy of the plugin values since they + + // take a reference copy of the plugin values since they // might change during this lifetime of this function int plugin_media_width = panel->mMediaSource->getWidth(); int plugin_media_height = panel->mMediaSource->getHeight(); @@ -1633,18 +1684,18 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) int plugin_texture_height = panel->mMediaSource->getBitsHeight(); // If the texture isn't created or the media or texture dimensions changed AND - // the sizes are valid then we need to delete the old media texture (if necessary) + // the sizes are valid then we need to delete the old media texture (if necessary) // then make a new one. if ((panel->mMediaTextureHandle == 0 || panel->mMediaWidth != plugin_media_width || - panel->mMediaHeight != plugin_media_height || + panel->mMediaHeight != plugin_media_height || panel->mTextureWidth != plugin_texture_width || panel->mTextureHeight != plugin_texture_height) && - ( plugin_media_width > 0 && plugin_media_height > 0 && + ( plugin_media_width > 0 && plugin_media_height > 0 && plugin_texture_width > 0 && plugin_texture_height > 0 ) ) { - std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height - << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height + std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height + << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height << ") for panel with ID=" << panel->mId << " - making texture" << std::endl; // delete old GL texture @@ -1654,13 +1705,13 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) glDeleteTextures( 1, &panel->mMediaTextureHandle ); panel->mMediaTextureHandle = 0; } - + std::cerr << "before: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl; - + // make a GL texture based on the dimensions the plugin told us GLuint new_texture = 0; glGenTextures( 1, &new_texture ); - + checkGLError("glGenTextures"); std::cout << "glGenTextures returned " << new_texture << std::endl; @@ -1679,7 +1730,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) std::cerr << "after: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl; }; - + // update our record of the media and texture dimensions // NOTE: do this after we we check for sizes changes panel->mMediaWidth = plugin_media_width; @@ -1699,7 +1750,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) panel->mAppTextureCoordsOpenGL = panel->mMediaSource->getTextureCoordsOpenGL(); // Check to see if we have enough to render this panel. - // If we do, set a flag that the display functions use so + // If we do, set a flag that the display functions use so // they only render a panel with media if it's ready. if ( panel->mMediaWidth < 0 || panel->mMediaHeight < 0 || @@ -1716,26 +1767,26 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel ) void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) { // no media panels so we can't change anything - have to add - if ( mMediaPanels.size() == 0 ) + if ( mMediaPanels.size() == 0 ) return; // sanity check - if ( ! panel ) + if ( ! panel ) return; - + int index; for(index = 0; index < (int)mMediaPanels.size(); index++) { if(mMediaPanels[index] == panel) break; } - + if(index >= (int)mMediaPanels.size()) { // panel isn't in mMediaPanels return; } - + std::cout << "Replacing media panel with index " << panel->mId << std::endl; int panel_id = panel->mId; @@ -1760,7 +1811,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) // tell the plugin what size we asked for media_source->setSize( media_width, media_height ); - // Use the launcher start and initialize the plugin + // Use the launcher start and initialize the plugin #if LL_DARWIN || LL_LINUX std::string launcher_name( "SLPlugin" ); #elif LL_WINDOWS @@ -1799,12 +1850,12 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) panel->mAppTextureCoordsOpenGL = false; // really need an 'undefined' state here too panel->mReadyToRender = false; - panel->mId = panel_id; - + panel->mId = panel_id; + // Replace the entry in the panels array mMediaPanels[index] = panel; - // now we have the ID we can use it to make the + // now we have the ID we can use it to make the // pick texture (id is baked into texture pixels) makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels ); @@ -1820,7 +1871,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) // void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string mime_type ) { - // Make a new media source with a random size which we'll either + // Make a new media source with a random size which we'll either // directly or the media plugin will tell us what it wants later. // Use a random size so we can test support for weird media sizes. // (Almost everything else will get filled in later once the @@ -1829,8 +1880,8 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string width = ( ( rand() % 170 ) + 30 ) * 4; height = ( ( rand() % 170 ) + 30 ) * 4; - // adjust this random size if it's a browser so we get - // a more useful size for testing.. + // adjust this random size if it's a browser so we get + // a more useful size for testing.. if ( mime_type == "text/html" || mime_type == "example/example" ) { width = ( ( rand() % 100 ) + 100 ) * 4; @@ -1843,11 +1894,11 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) { // always leave one panel - if ( mMediaPanels.size() == 1 ) + if ( mMediaPanels.size() == 1 ) return; // sanity check - don't think this can happen but see above for a case where it might... - if ( ! panel ) + if ( ! panel ) return; std::cout << "Removing media panel with index " << panel->mId << " - total panels = " << mMediaPanels.size() - 1 << std::endl; @@ -1855,7 +1906,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) if(mSelectedPanel == panel) mSelectedPanel = NULL; - delete panel; + delete panel; // remove from storage list for( int i = 0; i < (int)mMediaPanels.size(); ++i ) @@ -1867,7 +1918,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) }; }; - // select the first panel + // select the first panel selectPanel( mMediaPanels[ 0 ] ); } @@ -1887,18 +1938,20 @@ void LLMediaPluginTest::updateStatusBar() static bool cached_supports_browser_media = true; static bool cached_supports_time_media = false; static int cached_movie_time = -1; + static GLfloat cached_distance = -1.0f; static std::string cached_plugin_version = ""; - if ( + if ( cached_id == mSelectedPanel->mId && cached_media_width == mSelectedPanel->mMediaWidth && cached_media_height == mSelectedPanel->mMediaHeight && cached_texture_width == mSelectedPanel->mTextureWidth && cached_texture_height == mSelectedPanel->mTextureHeight && - cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() && + cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() && cached_supports_time_media == mSelectedPanel->mMediaSource->pluginSupportsMediaTime() && cached_plugin_version == mSelectedPanel->mMediaSource->getPluginVersion() && - cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() + cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() && + cached_distance == mDistanceCameraToSelectedGeometry ) { // nothing changed so don't spend time in this shitty function @@ -1906,7 +1959,7 @@ void LLMediaPluginTest::updateStatusBar() }; std::ostringstream stream( "" ); - + stream.str( "" ); stream.clear(); @@ -1927,7 +1980,15 @@ void LLMediaPluginTest::updateStatusBar() stream << " x "; stream << std::setw( 4 ) << std::setfill( '0' ); stream << mSelectedPanel->mTextureHeight; + stream << " | "; + stream << "Distance: "; + stream << std::setw( 6 ); + stream << std::setprecision( 3 ); + stream << std::setprecision( 3 ); + stream << mDistanceCameraToSelectedGeometry; + stream << " | "; + if ( mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() ) stream << "BROWSER"; else @@ -2005,7 +2066,7 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e { // Uncomment this to make things much, much quieter. // return; - + switch(event) { case MEDIA_EVENT_CONTENT_UPDATED: @@ -2065,11 +2126,11 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e case MEDIA_EVENT_CLICK_LINK_HREF: std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, uri is " << self->getClickURL() << std::endl; break; - + case MEDIA_EVENT_CLICK_LINK_NOFOLLOW: std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << std::endl; break; - + case MEDIA_EVENT_PLUGIN_FAILED: std::cerr << "Media event: MEDIA_EVENT_PLUGIN_FAILED" << std::endl; break; @@ -2195,13 +2256,13 @@ int main( int argc, char* argv[] ) glutSetWindow( app_window_handle ); gApplication = new LLMediaPluginTest( app_window_handle, app_window_width, app_window_height ); - + // update at approximately 60hz int update_ms = 1000 / 60; - + GLUI_Master.set_glutTimerFunc( update_ms, glutIdle, update_ms); glutMainLoop(); - + delete gApplication; } diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h index c2b2baba95..e7c7699343 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.h +++ b/indra/test_apps/llplugintest/llmediaplugintest.h @@ -89,7 +89,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1); bool checkGLError(const char *name = "OpenGL"); - void drawGeometry( int panel ); + void drawGeometry( int panel, bool selected ); void startPanelHighlight( float red, float green, float blue, float line_width ); void endPanelHighlight(); enum { DrawTypePickTexture, DrawTypeMediaTexture }; @@ -113,6 +113,9 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void dumpPanelInfo(); void updateStatusBar(); + GLfloat distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z ); + + // Inherited from LLPluginClassMediaOwner /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent); @@ -142,6 +145,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner float mViewPos[ 3 ]; float mViewRotation[ 16 ]; + float mDistanceCameraToSelectedGeometry; + int mIdControlAddPanel; int mIdControlRemPanel; @@ -159,6 +164,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner int mRandomBookmarks; int mIdDisableTimeout; int mDisableTimeout; + int mIdLargePanelSpacing; + int mLargePanelSpacing; int mIdControlCrashPlugin; int mIdControlHangPlugin; int mIdControlExitApp; diff --git a/install.xml b/install.xml index 2461ac8786..3cd40d8893 100644 --- a/install.xml +++ b/install.xml @@ -193,16 +193,16 @@ <key>darwin</key> <map> <key>md5sum</key> - <string>84821102cb819257a66c8f38732647fc</string> + <string>71defd179827bf172b76d6020023e0e8</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100119.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100222a.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>ee8e1b4bbcf137a84d6a85a1c51386ff</string> + <string>d58ac1a8396ac983b67cc3e3541457e3</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100119.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100222a.tar.bz2</uri> </map> <key>linux64</key> <map> @@ -214,9 +214,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>acbf7a4165a917a4e087879d1756b355</string> + <string>94fd43f534e2055858d524086384907d</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100119.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100219.tar.bz2</uri> </map> </map> </map> @@ -298,6 +298,25 @@ </map> </map> </map> + <key>pulseaudio</key> + <map> + <key>copyright</key> + <string>Copyright 2004-2006 Lennart Poettering, Copyright 2006 Pierre Ossman (ossman@cendio.se) for Cendio AB</string> + <key>description</key> + <string>pulseaudio: headers only</string> + <key>license</key> + <string>lgpl</string> + <key>packages</key> + <map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>30cb00069fe2a545fbf7be1070386236</string> + <key>url</key> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri> + </map> + </map> + </map> <key>elfio</key> <map> <key>license</key> @@ -436,9 +455,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>978ad7c67fe4a2419bfc841e2956ff9f</string> + <string>9de3f44be65645c7f6af236139596942</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19a-nommap.tar.bz2</uri> </map> <key>linux64</key> <map> @@ -955,9 +974,9 @@ anguage Infrstructure (CLI) international standard</string> <key>linux</key> <map> <key>md5sum</key> - <string>4c75b2f1e8524c7844ee3ea1cd59a3db</string> + <string>4b1913c509ea8bec78523960700d7005</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri> </map> <key>windows</key> <map> @@ -1367,23 +1386,23 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>316f86790b7afb5c9bd4f95bc193b80f</string> + <string>bce6f58d3d63bda049bb7059583ed8e8</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.7930-darwin-20100205.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-darwin-20100225.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>13f6886fa3e6675838e47adcabb0f0ac</string> + <string>12aac7288af3565ac2730796cb6d8de6</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.7930-linux-20100205.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-linux-20100225.tar.bz2</uri> </map> <key>windows</key> <map> <key>md5sum</key> - <string>2a81e3c42799c33742746925f16b54ca</string> + <string>8af04ae8c536e8db80f67e6e5305fb61</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.7930-windows-20100205.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-windows-20100225.tar.bz2</uri> </map> </map> </map> diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index c50ae4ad80..d4f791c202 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -1383,6 +1383,10 @@ version 2.0 { AgentID LLUUID } { KickedFromEstateID U32 } } + { + AgentInfo Single + { AgentEffectiveMaturity U32 } + } } // DataHomeLocationReply data->sim |
