diff options
753 files changed, 9974 insertions, 5791 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 2e4d803252..ef9f09bd23 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -17,11 +17,11 @@ Agathos Frascati CT-317 CT-352 Aimee Trescothick - VWR-1813 VWR-3321 VWR-3336 VWR-3903 VWR-4083 + VWR-4106 VWR-6348 VWR-6358 VWR-6360 @@ -42,9 +42,12 @@ Aimee Trescothick VWR-11100 VWR-11111 VWR-11844 + VWR-12631 + VWR-12696 + VWR-12748 + VWR-14087 VWR-14267 VWR-14278 - VWR-14087 Alejandro Rosenthal VWR-1184 Aleric Inglewood diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index ed06c85e1a..b92ccd1d77 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -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/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp index 23ede97af3..6751c235f6 100644 --- a/indra/llcommon/llcursortypes.cpp +++ b/indra/llcommon/llcursortypes.cpp @@ -72,6 +72,9 @@ ECursorType getCursorFromString(const std::string& cursor_string) cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE; cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN; cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE; + cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT; + cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY; + cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN; } std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string); diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h index a1b8178bfe..143c2c64cf 100644 --- a/indra/llcommon/llcursortypes.h +++ b/indra/llcommon/llcursortypes.h @@ -68,6 +68,9 @@ enum ECursorType { UI_CURSOR_TOOLPAUSE, UI_CURSOR_TOOLMEDIAOPEN, UI_CURSOR_PIPETTE, + UI_CURSOR_TOOLSIT, + UI_CURSOR_TOOLBUY, + UI_CURSOR_TOOLOPEN, UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor) }; 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/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 6a2449cf4b..cb62e46271 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -65,15 +65,19 @@ LLPluginClassMedia::~LLPluginClassMedia() reset(); } -bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path) +bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) { LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; - LL_DEBUGS("Plugin") << "user_data_path: " << user_data_path << LL_ENDL; mPlugin = new LLPluginProcessParent(this); mPlugin->setSleepTime(mSleepTime); - mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path); + + // Queue up the media init message -- it will be sent after all the currently queued messages. + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "init"); + sendMessage(message); + + mPlugin->init(launcher_filename, plugin_filename, debug); return true; } @@ -678,6 +682,20 @@ void LLPluginClassMedia::paste() sendMessage(message); } +void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path"); + message.setValue("path", user_data_path); + sendMessage(message); +} + +void LLPluginClassMedia::setLanguageCode(const std::string &language_code) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_language_code"); + message.setValue("language", language_code); + sendMessage(message); +} + LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) { // convert a LinkTargetType value from llqtwebkit to an ETargetType diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 58e91fa0b4..6318c67f12 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -49,7 +49,9 @@ public: virtual ~LLPluginClassMedia(); // local initialization, called by the media manager when creating a source - virtual bool init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path); + virtual bool init(const std::string &launcher_filename, + const std::string &plugin_filename, + bool debug); // undoes everything init() didm called by the media manager when destroying a source virtual void reset(); @@ -173,6 +175,10 @@ public: void paste(); bool canPaste() const { return mCanPaste; }; + + // These can be called before init(), and they will be queued and sent before the media init message. + void setUserDataPath(const std::string &user_data_path); + void setLanguageCode(const std::string &language_code); /////////////////////////////////// // media browser class functions diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 52b5a319ec..ccaf95b36d 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -155,7 +155,6 @@ void LLPluginProcessChild::idle(void) { setState(STATE_PLUGIN_INITIALIZING); LLPluginMessage message("base", "init"); - message.setValue("user_data_path", mUserDataPath); sendMessageToPlugin(message); } break; @@ -328,7 +327,6 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) if(message_name == "load_plugin") { mPluginFile = parsed.getValue("file"); - mUserDataPath = parsed.getValue("user_data_path"); } else if(message_name == "shm_add") { diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h index 58f8935ed1..0e5e85406a 100644 --- a/indra/llplugin/llpluginprocesschild.h +++ b/indra/llplugin/llpluginprocesschild.h @@ -98,8 +98,6 @@ private: std::string mPluginFile; - std::string mUserDataPath; - LLPluginInstance *mInstance; typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType; diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index efd5df687e..895c858979 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -98,14 +98,12 @@ void LLPluginProcessParent::errorState(void) setState(STATE_ERROR); } -void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path) +void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) { mProcess.setExecutable(launcher_filename); mPluginFile = plugin_filename; mCPUUsage = 0.0f; - mDebug = debug; - mUserDataPath = user_data_path; - + mDebug = debug; setState(STATE_INITIALIZED); } @@ -362,7 +360,6 @@ void LLPluginProcessParent::idle(void) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin"); message.setValue("file", mPluginFile); - message.setValue("user_data_path", mUserDataPath); sendMessage(message); } diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 524cd9923f..cc6c513615 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -59,7 +59,10 @@ public: LLPluginProcessParent(LLPluginProcessParentOwner *owner); ~LLPluginProcessParent(); - void init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path); + void init(const std::string &launcher_filename, + const std::string &plugin_filename, + bool debug); + void idle(void); // returns true if the plugin is on its way to steady state @@ -143,8 +146,6 @@ private: std::string mPluginFile; - std::string mUserDataPath; - LLPluginProcessParentOwner *mOwner; typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType; diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 7a3d6ec4f2..e619f89e1d 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -469,6 +469,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) else { fontlist.push_back(fontp->mFontFreetype); + delete fontp; + fontp = NULL; } } } diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 6a0d8ef3d6..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 diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 9d23daf56d..3a8efadaa4 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,13 +706,10 @@ void LLComboBox::onListMouseUp() void LLComboBox::onItemSelected(const LLSD& data) { - const std::string name = mList->getSelectedItemLabel(); - - S32 cur_id = getCurrentIndex(); - mLastSelectedIndex = cur_id; - if (cur_id != -1) + mLastSelectedIndex = getCurrentIndex(); + if (mLastSelectedIndex != -1) { - setLabel(name); + setLabel(getSelectedItemLabel()); if (mAllowTextEntry) { @@ -717,7 +717,6 @@ void LLComboBox::onItemSelected(const LLSD& data) mTextEntry->selectAll(); } } - // hiding the list reasserts the old value stored in the text editor/dropdown button hideList(); @@ -912,7 +911,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 +1013,7 @@ BOOL LLComboBox::setCurrentByID(const LLUUID& id) if (found) { - setLabel(mList->getSelectedItemLabel()); + setLabel(getSelectedItemLabel()); mLastSelectedIndex = mList->getFirstSelectedIndex(); } @@ -1030,7 +1029,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 +1068,24 @@ 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) +{} + +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..f0bd432f3a 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. @@ -230,6 +230,38 @@ private: commit_callback_t mPrearrangeCallback; commit_callback_t mTextEntryCallback; commit_callback_t mSelectionCallback; - S32 mLastSelectedIndex; + boost::signals2::connection mTopLostSignalConnection; + S32 mLastSelectedIndex; }; + +// 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*/ 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/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 e91d753a39..4cb336f7ea 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); } @@ -2508,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 ) ) { 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/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/llradiogroup.cpp b/indra/llui/llradiogroup.cpp index 4087b484aa..e27792dc1d 100644 --- a/indra/llui/llradiogroup.cpp +++ b/indra/llui/llradiogroup.cpp @@ -106,7 +106,6 @@ LLRadioGroup::LLRadioGroup(const LLRadioGroup::Params& p) void LLRadioGroup::initFromParams(const Params& p) { - LLUICtrl::initFromParams(p); for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin(); it != p.items().end(); ++it) @@ -124,6 +123,9 @@ void LLRadioGroup::initFromParams(const Params& p) LLRadioCtrl* item = LLUICtrlFactory::create<LLRadioCtrl>(item_params, this); mRadioButtons.push_back(item); } + + // call this *after* setting up mRadioButtons so we can handle setValue() calls + LLUICtrl::initFromParams(p); } @@ -138,10 +140,6 @@ BOOL LLRadioGroup::postBuild() { mRadioButtons[0]->setTabStop(true); } - if (mControlVariable) - { - setSelectedIndex(mControlVariable->getValue().asInteger()); - } return TRUE; } diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 77caaaa425..18ec5b51dd 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -630,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; diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 1dcfb4e296..30fc7babae 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -2061,12 +2061,5 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y) tuple->mButton->onCommit(); } } - /** - * EXT - 4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater) - * - * During hovering mouse(with left mouse button hold) over tabs, a newly just activated corresponding - * to the tab(that is hovered in the given instant of time) panel may caught mouse capture. - */ - gFocusMgr.setMouseCapture(this); } } diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index b348ec2d29..5121ef5351 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -86,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"); @@ -1607,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) { @@ -1877,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) diff --git a/indra/llui/llui.h b/indra/llui/llui.h index af8d4ea03b..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; }; diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 35428e4227..e8e3459673 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -310,7 +310,6 @@ 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"); } @@ -323,6 +322,38 @@ void LLUrlEntryAgent::onAgentNameReceived(const LLUUID& id, callObservers(id.asString(), first + " " + last); } +std::string LLUrlEntryAgent::getTooltip(const std::string &string) const +{ + // return a tooltip corresponding to the URL type instead of the generic one + std::string url = getUrl(string); + + if (LLStringUtil::endsWith(url, "/mute")) + { + return LLTrans::getString("TooltipAgentMute"); + } + if (LLStringUtil::endsWith(url, "/unmute")) + { + return LLTrans::getString("TooltipAgentUnmute"); + } + if (LLStringUtil::endsWith(url, "/im")) + { + return LLTrans::getString("TooltipAgentIM"); + } + if (LLStringUtil::endsWith(url, "/pay")) + { + return LLTrans::getString("TooltipAgentPay"); + } + if (LLStringUtil::endsWith(url, "/offerteleport")) + { + return LLTrans::getString("TooltipAgentOfferTeleport"); + } + if (LLStringUtil::endsWith(url, "/requestfriend")) + { + return LLTrans::getString("TooltipAgentRequestFriend"); + } + return LLTrans::getString("TooltipAgentUrl"); +} + std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb) { if (!gCacheName) @@ -346,6 +377,31 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa } else if (gCacheName->getFullName(agent_id, full_name)) { + // customize label string based on agent SLapp suffix + if (LLStringUtil::endsWith(url, "/mute")) + { + return LLTrans::getString("SLappAgentMute") + " " + full_name; + } + if (LLStringUtil::endsWith(url, "/unmute")) + { + return LLTrans::getString("SLappAgentUnmute") + " " + full_name; + } + if (LLStringUtil::endsWith(url, "/im")) + { + return LLTrans::getString("SLappAgentIM") + " " + full_name; + } + if (LLStringUtil::endsWith(url, "/pay")) + { + return LLTrans::getString("SLappAgentPay") + " " + full_name; + } + if (LLStringUtil::endsWith(url, "/offerteleport")) + { + return LLTrans::getString("SLappAgentOfferTeleport") + " " + full_name; + } + if (LLStringUtil::endsWith(url, "/requestfriend")) + { + return LLTrans::getString("SLappAgentRequestFriend") + " " + full_name; + } return full_name; } else diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index c947ef7259..84d0968779 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -169,6 +169,7 @@ class LLUrlEntryAgent : public LLUrlEntryBase public: LLUrlEntryAgent(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); + /*virtual*/ std::string getTooltip(const std::string &string) const; private: void onAgentNameReceived(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group); diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 63e627ceb5..57beb71a01 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) + { + lldebugs << "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/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index ad97bc45fc..022b97f481 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -2781,6 +2781,9 @@ const char* cursorIDToName(int id) case UI_CURSOR_TOOLPAUSE: return "UI_CURSOR_TOOLPAUSE"; case UI_CURSOR_TOOLMEDIAOPEN: return "UI_CURSOR_TOOLMEDIAOPEN"; case UI_CURSOR_PIPETTE: return "UI_CURSOR_PIPETTE"; + case UI_CURSOR_TOOLSIT: return "UI_CURSOR_TOOLSIT"; + case UI_CURSOR_TOOLBUY: return "UI_CURSOR_TOOLBUY"; + case UI_CURSOR_TOOLOPEN: return "UI_CURSOR_TOOLOPEN"; } llerrs << "cursorIDToName: unknown cursor id" << id << llendl; @@ -2883,6 +2886,9 @@ void LLWindowMacOSX::setCursor(ECursorType cursor) case UI_CURSOR_TOOLPLAY: case UI_CURSOR_TOOLPAUSE: case UI_CURSOR_TOOLMEDIAOPEN: + case UI_CURSOR_TOOLSIT: + case UI_CURSOR_TOOLBUY: + case UI_CURSOR_TOOLOPEN: result = setImageCursor(gCursors[cursor]); break; @@ -2924,6 +2930,9 @@ void LLWindowMacOSX::initCursors() initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1); initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1); initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1); + initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15); + initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15); + initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15); initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10); initPixmapCursor(UI_CURSOR_SIZENESW, 10, 10); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index c80392ad45..8df9dad581 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -46,6 +46,7 @@ #include "llerror.h" #include "llgl.h" #include "llstring.h" +#include "lldir.h" // System includes #include <commdlg.h> @@ -1545,6 +1546,11 @@ void LLWindowWin32::initCursors() mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE")); // Color cursors + gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "res", "toolbuy.cur"); + + mCursor[UI_CURSOR_TOOLSIT] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolsit.cur").c_str()); + mCursor[UI_CURSOR_TOOLBUY] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolbuy.cur").c_str()); + mCursor[UI_CURSOR_TOOLOPEN] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolopen.cur").c_str()); mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY")); mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE")); mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN")); diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp index f5b077fea0..49bbca6c52 100644 --- a/indra/media_plugins/example/media_plugin_example.cpp +++ b/indra/media_plugins/example/media_plugin_example.cpp @@ -119,17 +119,6 @@ void MediaPluginExample::receiveMessage( const char* message_string ) std::string plugin_version = "Example media plugin, Example Version 1.0.0.0"; message.setValue( "plugin_version", plugin_version ); sendMessage( message ); - - // Plugin gets to decide the texture parameters to use. - message.setMessage( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" ); - message.setValueS32( "default_width", mWidth ); - message.setValueS32( "default_height", mHeight ); - message.setValueS32( "depth", mDepth ); - message.setValueU32( "internalformat", GL_RGBA ); - message.setValueU32( "format", GL_RGBA ); - message.setValueU32( "type", GL_UNSIGNED_BYTE ); - message.setValueBoolean( "coords_opengl", false ); - sendMessage( message ); } else if ( message_name == "idle" ) @@ -191,7 +180,20 @@ void MediaPluginExample::receiveMessage( const char* message_string ) else if ( message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA ) { - if ( message_name == "size_change" ) + if ( message_name == "init" ) + { + // Plugin gets to decide the texture parameters to use. + LLPluginMessage message( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" ); + message.setValueS32( "default_width", mWidth ); + message.setValueS32( "default_height", mHeight ); + message.setValueS32( "depth", mDepth ); + message.setValueU32( "internalformat", GL_RGBA ); + message.setValueU32( "format", GL_RGBA ); + message.setValueU32( "type", GL_UNSIGNED_BYTE ); + message.setValueBoolean( "coords_opengl", false ); + sendMessage( message ); + } + else if ( message_name == "size_change" ) { std::string name = message_in.getValue( "name" ); S32 width = message_in.getValueS32( "width" ); diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index 26173314a7..a69da3ff5a 100644 --- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp @@ -946,33 +946,6 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string) message.setValue("plugin_version", getVersion()); sendMessage(message); - - // Plugin gets to decide the texture parameters to use. - message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); - // lame to have to decide this now, it depends on the movie. Oh well. - mDepth = 4; - - mCurrentWidth = 1; - mCurrentHeight = 1; - mPreviousWidth = 1; - mPreviousHeight = 1; - mNaturalWidth = 1; - mNaturalHeight = 1; - mWidth = 1; - mHeight = 1; - mTextureWidth = 1; - mTextureHeight = 1; - - message.setValueU32("format", GL_RGBA); - message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV); - - message.setValueS32("depth", mDepth); - message.setValueS32("default_width", mWidth); - message.setValueS32("default_height", mHeight); - message.setValueU32("internalformat", GL_RGBA8); - message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left. - message.setValueBoolean("allow_downsample", true); // we respond with grace and performance if asked to downscale - sendMessage(message); } else if(message_name == "idle") { @@ -1037,7 +1010,36 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string) } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) { - if(message_name == "size_change") + if(message_name == "init") + { + // Plugin gets to decide the texture parameters to use. + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); + // lame to have to decide this now, it depends on the movie. Oh well. + mDepth = 4; + + mCurrentWidth = 1; + mCurrentHeight = 1; + mPreviousWidth = 1; + mPreviousHeight = 1; + mNaturalWidth = 1; + mNaturalHeight = 1; + mWidth = 1; + mHeight = 1; + mTextureWidth = 1; + mTextureHeight = 1; + + message.setValueU32("format", GL_RGBA); + message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV); + + message.setValueS32("depth", mDepth); + message.setValueS32("default_width", mWidth); + message.setValueS32("default_height", mHeight); + message.setValueU32("internalformat", GL_RGBA8); + message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left. + message.setValueBoolean("allow_downsample", true); // we respond with grace and performance if asked to downscale + sendMessage(message); + } + else if(message_name == "size_change") { std::string name = message_in.getValue("name"); S32 width = message_in.getValueS32("width"); diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index e230fcc280..1f88301ca7 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -859,36 +859,6 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) plugin_version += codec.str(); message.setValue("plugin_version", plugin_version); sendMessage(message); - - // Plugin gets to decide the texture parameters to use. - message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); - #if defined(LL_WINDOWS) - // Values for Windows - mDepth = 3; - message.setValueU32("format", GL_RGB); - message.setValueU32("type", GL_UNSIGNED_BYTE); - - // We really want to pad the texture width to a multiple of 32 bytes, but since we're using 3-byte pixels, it doesn't come out even. - // Padding to a multiple of 3*32 guarantees it'll divide out properly. - message.setValueU32("padding", 32 * 3); - #else - // Values for Mac - mDepth = 4; - message.setValueU32("format", GL_BGRA_EXT); - #ifdef __BIG_ENDIAN__ - message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV ); - #else - message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8); - #endif - - // Pad texture width to a multiple of 32 bytes, to line up with cache lines. - message.setValueU32("padding", 32); - #endif - message.setValueS32("depth", mDepth); - message.setValueU32("internalformat", GL_RGB); - message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left. - message.setValueBoolean("allow_downsample", true); - sendMessage(message); } else if(message_name == "idle") { @@ -953,7 +923,41 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) { - if(message_name == "size_change") + if(message_name == "init") + { + // This is the media init message -- all necessary data for initialization should have been received. + + // Plugin gets to decide the texture parameters to use. + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); + #if defined(LL_WINDOWS) + // Values for Windows + mDepth = 3; + message.setValueU32("format", GL_RGB); + message.setValueU32("type", GL_UNSIGNED_BYTE); + + // We really want to pad the texture width to a multiple of 32 bytes, but since we're using 3-byte pixels, it doesn't come out even. + // Padding to a multiple of 3*32 guarantees it'll divide out properly. + message.setValueU32("padding", 32 * 3); + #else + // Values for Mac + mDepth = 4; + message.setValueU32("format", GL_BGRA_EXT); + #ifdef __BIG_ENDIAN__ + message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV ); + #else + message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8); + #endif + + // Pad texture width to a multiple of 32 bytes, to line up with cache lines. + message.setValueU32("padding", 32); + #endif + message.setValueS32("depth", mDepth); + message.setValueU32("internalformat", GL_RGB); + message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left. + message.setValueBoolean("allow_downsample", true); + sendMessage(message); + } + else if(message_name == "size_change") { std::string name = message_in.getValue("name"); S32 width = message_in.getValueS32("width"); diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index c7aba04492..24c53638d2 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -43,6 +43,13 @@ #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 0 +#else +# define LL_QTWEBKIT_USES_PIXMAPS 0 +#endif // LL_LINUX + #if LL_LINUX # include "linux_volume_catcher.h" #endif // LL_LINUX @@ -81,10 +88,12 @@ public: private: std::string mProfileDir; + std::string mHostLanguage; enum { - INIT_STATE_UNINITIALIZED, // Browser instance hasn't been set up yet + INIT_STATE_UNINITIALIZED, // LLQtWebkit hasn't been set up yet + INIT_STATE_INITIALIZED, // LLQtWebkit has been set up, but no browser window has been created yet. INIT_STATE_NAVIGATING, // Browser instance has been set up and initial navigate to about:blank has been issued INIT_STATE_NAVIGATE_COMPLETE, // initial navigate to about:blank has completed INIT_STATE_WAIT_REDRAW, // First real navigate begin has been received, waiting for page changed event to start handling redraws @@ -142,7 +151,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; @@ -150,7 +163,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 ) @@ -171,13 +193,6 @@ private: if ( mInitState > INIT_STATE_UNINITIALIZED ) return true; - // not enough information to initialize the browser yet. - if ( mWidth < 0 || mHeight < 0 || mDepth < 0 || - mTextureWidth < 0 || mTextureHeight < 0 ) - { - return false; - }; - // set up directories char cwd[ FILENAME_MAX ]; // I *think* this is defined on all platforms we use if (NULL == getcwd( cwd, FILENAME_MAX - 1 )) @@ -188,12 +203,12 @@ private: std::string application_dir = std::string( cwd ); #if LL_DARWIN - // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on. - // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger. - // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it - // which gets hit when the plugin is probed by webkit. - // Unsetting the environment variable here works around this issue. - unsetenv("USERBREAK"); + // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on. + // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger. + // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it + // which gets hit when the plugin is probed by webkit. + // Unsetting the environment variable here works around this issue. + unsetenv("USERBREAK"); #endif #if LL_WINDOWS @@ -234,64 +249,92 @@ private: bool result = LLQtWebKit::getInstance()->init( application_dir, component_dir, mProfileDir, native_window_handle ); if ( result ) { - // create single browser window - mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight ); + mInitState = INIT_STATE_INITIALIZED; + + return true; + }; + + return false; + }; + + //////////////////////////////////////////////////////////////////////////////// + // + bool initBrowserWindow() + { + // already initialized + if ( mInitState > INIT_STATE_INITIALIZED ) + return true; + + // not enough information to initialize the browser yet. + if ( mWidth < 0 || mHeight < 0 || mDepth < 0 || + mTextureWidth < 0 || mTextureHeight < 0 ) + { + return false; + }; + + // Set up host language before creating browser window + if(!mHostLanguage.empty()) + { + LLQtWebKit::getInstance()->setHostLanguage(mHostLanguage); + } + + // create single browser window + mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight ); #if LL_WINDOWS - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); + // Enable plugins + LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_DARWIN - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); + // Enable plugins + LLQtWebKit::getInstance()->enablePlugins(true); #elif LL_LINUX - // Enable plugins - LLQtWebKit::getInstance()->enablePlugins(true); + // Enable plugins + LLQtWebKit::getInstance()->enablePlugins(true); #endif - // Enable cookies - LLQtWebKit::getInstance()->enableCookies( true ); + // Enable cookies + LLQtWebKit::getInstance()->enableCookies( true ); - // tell LLQtWebKit about the size of the browser window - LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); + // tell LLQtWebKit about the size of the browser window + LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); - // observer events that LLQtWebKit emits - LLQtWebKit::getInstance()->addObserver( mBrowserWindowId, this ); + // observer events that LLQtWebKit emits + LLQtWebKit::getInstance()->addObserver( mBrowserWindowId, this ); - // append details to agent string - LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" ); + // append details to agent string + LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" ); - // don't flip bitmap - LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true ); - - // set background color - // convert background color channels from [0.0, 1.0] to [0, 255]; - LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, int(mBackgroundR * 255.0f), int(mBackgroundG * 255.0f), int(mBackgroundB * 255.0f) ); - - // Set state _before_ starting the navigate, since onNavigateBegin might get called before this call returns. - setInitState(INIT_STATE_NAVIGATING); - - // Don't do this here -- it causes the dreaded "white flash" when loading a browser instance. - // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially - // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date. - // Build a data URL like this: "data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#RRGGBB%22%3E%3C/body%3E%3C/html%3E" - // where RRGGBB is the background color in HTML style - std::stringstream url; - - url << "data:text/html,%3Chtml%3E%3Cbody%20bgcolor=%22#"; - // convert background color channels from [0.0, 1.0] to [0, 255]; - url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundR * 255.0f); - url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundG * 255.0f); - url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundB * 255.0f); - url << "%22%3E%3C/body%3E%3C/html%3E"; - - lldebugs << "data url is: " << url.str() << llendl; - - LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, url.str() ); -// LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" ); - - return true; - }; +#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]; + LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, int(mBackgroundR * 255.0f), int(mBackgroundG * 255.0f), int(mBackgroundB * 255.0f) ); + + // Set state _before_ starting the navigate, since onNavigateBegin might get called before this call returns. + setInitState(INIT_STATE_NAVIGATING); + + // Don't do this here -- it causes the dreaded "white flash" when loading a browser instance. + // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially + // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date. + // Build a data URL like this: "data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#RRGGBB%22%3E%3C/body%3E%3C/html%3E" + // where RRGGBB is the background color in HTML style + std::stringstream url; + + url << "data:text/html,%3Chtml%3E%3Cbody%20bgcolor=%22#"; + // convert background color channels from [0.0, 1.0] to [0, 255]; + url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundR * 255.0f); + url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundG * 255.0f); + url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundB * 255.0f); + url << "%22%3E%3C/body%3E%3C/html%3E"; + + lldebugs << "data url is: " << url.str() << llendl; + + LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, url.str() ); +// LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" ); - return false; - }; + return true; + } void setVolume(F32 vol); @@ -654,9 +697,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) { if(message_name == "init") { - std::string user_data_path = message_in.getValue("user_data_path"); // n.b. always has trailing platform-specific dir-delimiter - mProfileDir = user_data_path + "browser_profile"; - LLPluginMessage message("base", "init_response"); LLSD versions = LLSD::emptyMap(); versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION; @@ -668,19 +708,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) plugin_version += LLQtWebKit::getInstance()->getVersion(); message.setValue("plugin_version", plugin_version); sendMessage(message); - - // Plugin gets to decide the texture parameters to use. - mDepth = 4; - - message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); - message.setValueS32("default_width", 1024); - message.setValueS32("default_height", 1024); - message.setValueS32("depth", mDepth); - message.setValueU32("internalformat", GL_RGBA); - message.setValueU32("format", GL_RGBA); - message.setValueU32("type", GL_UNSIGNED_BYTE); - message.setValueBoolean("coords_opengl", true); - sendMessage(message); } else if(message_name == "idle") { @@ -745,7 +772,7 @@ 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) + else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) { if(message_name == "set_volume") { @@ -755,7 +782,50 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) { - if(message_name == "size_change") + if(message_name == "init") + { + // This is the media init message -- all necessary data for initialization should have been received. + if(initBrowser()) + { + + // Plugin gets to decide the texture parameters to use. + mDepth = 4; + + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); + message.setValueS32("default_width", 1024); + 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); + } + else + { + // if initialization failed, we're done. + mDeleteMe = true; + } + + } + else if(message_name == "set_user_data_path") + { + std::string user_data_path = message_in.getValue("path"); // n.b. always has trailing platform-specific dir-delimiter + mProfileDir = user_data_path + "browser_profile"; + + // FIXME: Should we do anything with this if it comes in after the browser has been initialized? + } + else if(message_name == "set_language_code") + { + mHostLanguage = message_in.getValue("language"); + + // FIXME: Should we do anything with this if it comes in after the browser has been initialized? + } + else if(message_name == "size_change") { std::string name = message_in.getValue("name"); S32 width = message_in.getValueS32("width"); @@ -777,29 +847,36 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) mWidth = width; mHeight = height; - // initialize (only gets called once) - initBrowser(); - - // size changed so tell the browser - LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); - -// std::cerr << "webkit plugin: set size to " << mWidth << " x " << mHeight -// << ", rowspan is " << LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) << std::endl; - - S32 real_width = LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) / LLQtWebKit::getInstance()->getBrowserDepth(mBrowserWindowId); - - // The actual width the browser will be drawing to is probably smaller... let the host know by modifying texture_width in the response. - if(real_width <= texture_width) + if(initBrowserWindow()) { - texture_width = real_width; + + // size changed so tell the browser + LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight ); + + // std::cerr << "webkit plugin: set size to " << mWidth << " x " << mHeight + // << ", rowspan is " << LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) << std::endl; + + S32 real_width = LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) / LLQtWebKit::getInstance()->getBrowserDepth(mBrowserWindowId); + + // The actual width the browser will be drawing to is probably smaller... let the host know by modifying texture_width in the response. + if(real_width <= texture_width) + { + texture_width = real_width; + } + else + { + // This won't work -- it'll be bigger than the allocated memory. This is a fatal error. + // std::cerr << "Fatal error: browser rowbytes greater than texture width" << std::endl; + mDeleteMe = true; + return; + } } else { - // This won't work -- it'll be bigger than the allocated memory. This is a fatal error. -// std::cerr << "Fatal error: browser rowbytes greater than texture width" << std::endl; + // Setting up the browser window failed. This is a fatal error. mDeleteMe = true; - return; } + mTextureWidth = texture_width; mTextureHeight = texture_height; diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 14eb75e457..8ad3b2085d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -347,6 +347,7 @@ set(viewer_SOURCE_FILES llpatchvertexarray.cpp llplacesinventorybridge.cpp llplacesinventorypanel.cpp + llpopupview.cpp llpolymesh.cpp llpolymorph.cpp llpreview.cpp @@ -844,6 +845,7 @@ set(viewer_HEADER_FILES llplacesinventorypanel.h llpolymesh.h llpolymorph.h + llpopupview.h llpreview.h llpreviewanim.h llpreviewgesture.h diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e5d72310cd..8edf766132 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5492,7 +5492,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0</real> + <real>0.9</real> </map> <key>PlainTextChatHistory</key> diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif Binary files differnew file mode 100644 index 0000000000..f366026c33 --- /dev/null +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif Binary files differnew file mode 100644 index 0000000000..e9e6a20cd9 --- /dev/null +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif Binary files differnew file mode 100644 index 0000000000..bea3d9d442 --- /dev/null +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif 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/llagent.cpp b/indra/newview/llagent.cpp index 1da7d450c9..c5d7f6f118 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5845,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/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 11ac103b3a..ea10917901 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; @@ -1759,6 +1759,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it if (mAvatarObject) { + mAvatarObject->setCompositeUpdatesEnabled(TRUE); mAvatarObject->updateVisualParams(); mAvatarObject->invalidateAll(); } @@ -2240,7 +2241,7 @@ void LLAgentWearables::updateServer() void LLAgentWearables::populateMyOutfitsFolder(void) { - llinfos << "starting outfit populate" << llendl; + llinfos << "starting outfit population" << llendl; LLLibraryOutfitsFetch* outfits = new LLLibraryOutfitsFetch(); @@ -2312,17 +2313,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. @@ -2353,31 +2365,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(); @@ -2415,31 +2424,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); } } @@ -2476,7 +2513,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(); @@ -2492,17 +2529,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(); diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5c21be8c32..f2d15757c9 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -436,9 +436,9 @@ void LLWearableHoldingPattern::checkMissingWearables() } } + mWaitTime.reset(); if (!pollMissingWearables()) { - mWaitTime.reset(); doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollMissingWearables,this)); } } @@ -494,11 +494,12 @@ 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) @@ -807,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) + 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 = 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) + 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; @@ -1085,6 +1130,22 @@ void LLAppearanceManager::updateAgentWearables(LLWearableHoldingPattern* holder, // dec_busy_count(); } +static void remove_non_link_items(LLInventoryModel::item_array_t &items) +{ + LLInventoryModel::item_array_t pruned_items; + for (LLInventoryModel::item_array_t::const_iterator iter = items.begin(); + iter != items.end(); + ++iter) + { + const LLViewerInventoryItem *item = (*iter); + if (item && item->getIsLinkType()) + { + pruned_items.push_back((*iter)); + } + } + items = pruned_items; +} + void LLAppearanceManager::updateAppearanceFromCOF() { // update dirty flag to see if the state of the COF matches @@ -1098,13 +1159,17 @@ void LLAppearanceManager::updateAppearanceFromCOF() bool follow_folder_links = true; LLUUID current_outfit_id = getCOF(); - // Find all the wearables that are in the COF's subtree. + // Find all the wearables that are in the COF's subtree. lldebugs << "LLAppearanceManager::updateFromCOF()" << llendl; LLInventoryModel::item_array_t wear_items; LLInventoryModel::item_array_t obj_items; LLInventoryModel::item_array_t gest_items; getUserDescendents(current_outfit_id, wear_items, obj_items, gest_items, follow_folder_links); - + // Get rid of non-links in case somehow the COF was corrupted. + remove_non_link_items(wear_items); + remove_non_link_items(obj_items); + remove_non_link_items(gest_items); + if(!wear_items.count()) { LLNotificationsUtil::add("CouldNotPutOnOutfit"); @@ -1128,7 +1193,7 @@ void LLAppearanceManager::updateAppearanceFromCOF() { LLViewerInventoryItem *item = wear_items.get(i); LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL; - if (item && linked_item) + if (item && item->getIsLinkType() && linked_item) { LLFoundData found(linked_item->getUUID(), linked_item->getAssetUUID(), @@ -1155,11 +1220,11 @@ void LLAppearanceManager::updateAppearanceFromCOF() { if (!item) { - llwarns << "attempt to wear a null item " << llendl; + llwarns << "Attempt to wear a null item " << llendl; } else if (!linked_item) { - llwarns << "attempt to wear a broken link " << item->getName() << llendl; + llwarns << "Attempt to wear a broken link [ name:" << item->getName() << " ] " << llendl; } } } @@ -1689,6 +1754,13 @@ BOOL LLAppearanceManager::getIsProtectedCOFItem(const LLUUID& obj_id) const { if (!getIsInCOF(obj_id)) return FALSE; + // If a non-link somehow ended up in COF, allow deletion. + const LLInventoryObject *obj = gInventory.getObject(obj_id); + if (obj && !obj->getIsLinkType()) + { + return FALSE; + } + // For now, don't allow direct deletion from the COF. Instead, force users // to choose "Detach" or "Take Off". return TRUE; diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index e7e2f33520..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); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 948d38befb..11c252406a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -702,9 +702,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 +1515,7 @@ bool LLAppViewer::cleanup() LLAvatarIconIDCache::getInstance()->save(); llinfos << "Shutting down Threads" << llendflush; - + // Let threads finish LLTimer idleTimer; idleTimer.reset(); @@ -1529,19 +1529,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; @@ -2191,10 +2198,12 @@ bool LLAppViewer::initConfiguration() // Display splash screen. Must be after above check for previous // crash as this dialog is always frontmost. - std::ostringstream splash_msg; - splash_msg << "Loading " << LLTrans::getString("SECOND_LIFE") << "..."; + std::string splash_msg; + LLStringUtil::format_map_t args; + args["[APP_NAME]"] = LLTrans::getString("SECOND_LIFE"); + splash_msg = LLTrans::getString("StartupLoading", args); LLSplashScreen::show(); - LLSplashScreen::update(splash_msg.str()); + LLSplashScreen::update(splash_msg); //LLVolumeMgr::initClass(); LLVolumeMgr* volume_manager = new LLVolumeMgr(); @@ -3035,11 +3044,11 @@ bool LLAppViewer::initCache() if (mPurgeCache) { - LLSplashScreen::update("Clearing cache..."); + LLSplashScreen::update(LLTrans::getString("StartupClearingCache")); purgeCache(); } - LLSplashScreen::update("Initializing Texture Cache..."); + LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache")); // Init the texture cache // Allocate 80% of the cache size for textures @@ -3052,7 +3061,7 @@ bool LLAppViewer::initCache() S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, read_only); texture_cache_size -= extra; - LLSplashScreen::update("Initializing VFS..."); + LLSplashScreen::update(LLTrans::getString("StartupInitializingVFS")); // Init the VFS S64 vfs_size = cache_size - texture_cache_size; @@ -3821,7 +3830,7 @@ void LLAppViewer::idleShutdown() S32 finished_uploads = total_uploads - pending_uploads; F32 percent = 100.f * finished_uploads / total_uploads; gViewerWindow->setProgressPercent(percent); - gViewerWindow->setProgressString("Saving your settings..."); + gViewerWindow->setProgressString(LLTrans::getString("SavingSettings")); return; } @@ -3833,7 +3842,7 @@ void LLAppViewer::idleShutdown() // Wait for a LogoutReply message gViewerWindow->setShowProgress(TRUE); gViewerWindow->setProgressPercent(100.f); - gViewerWindow->setProgressString("Logging out..."); + gViewerWindow->setProgressString(LLTrans::getString("LoggingOut")); return; } 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/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 12cff32780..63d9ed19ad 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -480,10 +480,12 @@ bool LLAppViewerWin32::initHardwareTest() gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE); // Disable so debugger can work - std::ostringstream splash_msg; - splash_msg << LLTrans::getString("StartupLoading") << " " << LLAppViewer::instance()->getSecondLifeTitle() << "..."; + std::string splash_msg; + LLStringUtil::format_map_t args; + args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle(); + splash_msg = LLTrans::getString("StartupLoading", args); - LLSplashScreen::update(splash_msg.str()); + LLSplashScreen::update(splash_msg); } if (!restoreErrorTrap()) diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index a2322e28b4..80cf8f1d61 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -55,6 +55,7 @@ #include "llviewermenufile.h" #include "llviewerwindow.h" #include "lltexlayer.h" +#include "lltrans.h" // library includes #include "lldir.h" @@ -181,7 +182,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content) // deal with L$ errors if (reason == "insufficient funds") { - LLFloaterBuyCurrency::buyCurrency("Uploading costs", LLGlobalEconomy::Singleton::getInstance()->getPriceUpload()); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs"), LLGlobalEconomy::Singleton::getInstance()->getPriceUpload()); } else { 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/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index 844f0ac509..6842d3dc74 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -64,42 +64,6 @@ BOOL LLFloaterInventory::postBuild() return TRUE; } - -void LLFloaterInventory::draw() -{ - updateTitle(); - LLFloater::draw(); -} - -void LLFloaterInventory::updateTitle() -{ - LLLocale locale(LLLocale::USER_LOCALE); - std::string item_count_string; - LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); - - LLStringUtil::format_map_t string_args; - string_args["[ITEM_COUNT]"] = item_count_string; - string_args["[FILTER]"] = mPanelMainInventory->getFilterText(); - - if (LLInventoryModel::backgroundFetchActive()) - { - setTitle(getString("TitleFetching", string_args)); - } - else if (LLInventoryModel::isEverythingFetched()) - { - setTitle(getString("TitleCompleted", string_args)); - } - else - { - setTitle(getString("Title")); - } -} - -void LLFloaterInventory::changed(U32 mask) -{ - updateTitle(); -} - LLInventoryPanel* LLFloaterInventory::getPanel() { if (mPanelMainInventory) diff --git a/indra/newview/llfloaterinventory.h b/indra/newview/llfloaterinventory.h index b661c391a7..473d2b189d 100644 --- a/indra/newview/llfloaterinventory.h +++ b/indra/newview/llfloaterinventory.h @@ -63,13 +63,9 @@ public: static void cleanup(); // Inherited functionality - /*virtual*/ void changed(U32 mask); - /*virtual*/ void draw(); /*virtual*/ void onOpen(const LLSD& key); LLInventoryPanel* getPanel(); -protected: - void updateTitle(); private: LLPanelMainInventory* mPanelMainInventory; }; diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 26c6db9652..65003d9b5c 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()); } @@ -803,16 +820,19 @@ void LLPanelLandGeneral::refreshNames() } mTextGroup->setText(group); - const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID(); - if(auth_buyer_id.notNull()) - { - std::string name; - name = LLSLURL::buildCommand("agent", auth_buyer_id, "inspect"); - mSaleInfoForSale2->setTextArg("[BUYER]", name); - } - else + if (parcel->getForSale()) { - mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone")); + const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID(); + if(auth_buyer_id.notNull()) + { + std::string name; + name = LLSLURL::buildCommand("agent", auth_buyer_id, "inspect"); + mSaleInfoForSale2->setTextArg("[BUYER]", name); + } + else + { + mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone")); + } } } @@ -2058,8 +2078,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 +2486,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 +2891,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 +2972,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/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 224514dd48..e998d10fcc 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -110,6 +110,9 @@ const F32 MAX_USER_FAR_CLIP = 512.f; const F32 MIN_USER_FAR_CLIP = 64.f; +//control value for middle mouse as talk2push button +const static std::string MIDDLE_MOUSE_CV = "MiddleMouse"; + class LLVoiceSetKeyDialog : public LLModalDialog { public: @@ -537,10 +540,10 @@ void LLFloaterPreference::onOpen(const LLSD& key) { childSetText("maturity_desired_textbox", maturity_combo->getSelectedItemLabel()); childSetVisible("maturity_desired_combobox", false); - - // Display selected maturity icons. - onChangeMaturity(); } + + // Display selected maturity icons. + onChangeMaturity(); // Enabled/disabled popups, might have been changed by user actions // while preferences floater was closed. @@ -1008,9 +1011,17 @@ void LLFloaterPreference::setKey(KEY key) void LLFloaterPreference::onClickSetMiddleMouse() { - childSetValue("modifier_combo", "MiddleMouse"); + LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo"); + // update the control right away since we no longer wait for apply - getChild<LLUICtrl>("modifier_combo")->onCommit(); + p2t_line_editor->setControlValue(MIDDLE_MOUSE_CV); + + //push2talk button "middle mouse" control value is in English, need to localize it for presentation + LLPanel* advanced_preferences = dynamic_cast<LLPanel*>(p2t_line_editor->getParent()); + if (advanced_preferences) + { + p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse")); + } } /* void LLFloaterPreference::onClickSkipDialogs() @@ -1289,7 +1300,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); } @@ -1297,7 +1308,21 @@ 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)); + } + + // Panel Advanced + if (hasChild("modifier_combo")) + { + //localizing if push2talk button is set to middle mouse + if (MIDDLE_MOUSE_CV == childGetValue("modifier_combo").asString()) + { + childSetValue("modifier_combo", getString("middle_mouse")); + } + } + apply(); return true; } diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 0f3c176cea..42a7eeff26 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -84,6 +84,8 @@ #include "llassetuploadresponders.h" #include "llagentui.h" +#include "lltrans.h" + const U32 INCLUDE_SCREENSHOT = 0x01 << 0; //----------------------------------------------------------------------------- @@ -372,8 +374,7 @@ void LLFloaterReporter::onClickSend(void *userdata) return; } - - LLUploadDialog::modalUploadDialog("Uploading...\n\nReport"); + LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report")); // *TODO don't upload image if checkbox isn't checked std::string url = gAgent.getRegion()->getCapability("SendUserReport"); std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot"); diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index fdf128945e..daba3d8460 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -110,7 +110,7 @@ BOOL LLFloaterScriptLimits::postBuild() if(!mTab) { - llinfos << "Error! couldn't get scriptlimits_panels, aborting Script Information setup" << llendl; + llwarns << "Error! couldn't get scriptlimits_panels, aborting Script Information setup" << llendl; return FALSE; } @@ -214,7 +214,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content) LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(!instance) { - llinfos << "Failed to get llfloaterscriptlimits instance" << llendl; + llwarns << "Failed to get llfloaterscriptlimits instance" << llendl; } } @@ -227,7 +227,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content) void fetchScriptLimitsRegionInfoResponder::error(U32 status, const std::string& reason) { - llinfos << "Error from responder " << reason << llendl; + llwarns << "Error from responder " << reason << llendl; } void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref) @@ -281,26 +281,40 @@ void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref) OSMessageBox(nice_llsd.str(), "summary response:", 0); - llinfos << "summary response:" << *content << llendl; + llwarns << "summary response:" << *content << llendl; #endif LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(!instance) { - llinfos << "Failed to get llfloaterscriptlimits instance" << llendl; + llwarns << "Failed to get llfloaterscriptlimits instance" << llendl; } else { LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels"); - LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel"); - panel_memory->setRegionSummary(content); + if(tab) + { + LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel"); + if(panel_memory) + { + panel_memory->childSetValue("loading_text", LLSD(std::string(""))); + + LLButton* btn = panel_memory->getChild<LLButton>("refresh_list_btn"); + if(btn) + { + btn->setEnabled(true); + } + + panel_memory->setRegionSummary(content); + } + } } } void fetchScriptLimitsRegionSummaryResponder::error(U32 status, const std::string& reason) { - llinfos << "Error from responder " << reason << llendl; + llwarns << "Error from responder " << reason << llendl; } void fetchScriptLimitsRegionDetailsResponder::result(const LLSD& content_ref) @@ -383,7 +397,7 @@ result (map) if(!instance) { - llinfos << "Failed to get llfloaterscriptlimits instance" << llendl; + llwarns << "Failed to get llfloaterscriptlimits instance" << llendl; } else { @@ -397,19 +411,19 @@ result (map) } else { - llinfos << "Failed to get scriptlimits memory panel" << llendl; + llwarns << "Failed to get scriptlimits memory panel" << llendl; } } else { - llinfos << "Failed to get scriptlimits_panels" << llendl; + llwarns << "Failed to get scriptlimits_panels" << llendl; } } } void fetchScriptLimitsRegionDetailsResponder::error(U32 status, const std::string& reason) { - llinfos << "Error from responder " << reason << llendl; + llwarns << "Error from responder " << reason << llendl; } void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref) @@ -471,7 +485,7 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref) if(!instance) { - llinfos << "Failed to get llfloaterscriptlimits instance" << llendl; + llwarns << "Failed to get llfloaterscriptlimits instance" << llendl; } else { @@ -481,29 +495,46 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref) LLPanelScriptLimitsAttachment* panel = (LLPanelScriptLimitsAttachment*)tab->getChild<LLPanel>("script_limits_my_avatar_panel"); if(panel) { + panel->childSetValue("loading_text", LLSD(std::string(""))); + + LLButton* btn = panel->getChild<LLButton>("refresh_list_btn"); + if(btn) + { + btn->setEnabled(true); + } + panel->setAttachmentDetails(content); } else { - llinfos << "Failed to get script_limits_my_avatar_panel" << llendl; + llwarns << "Failed to get script_limits_my_avatar_panel" << llendl; } } else { - llinfos << "Failed to get scriptlimits_panels" << llendl; + llwarns << "Failed to get scriptlimits_panels" << llendl; } } } void fetchScriptLimitsAttachmentInfoResponder::error(U32 status, const std::string& reason) { - llinfos << "Error from responder " << reason << llendl; + llwarns << "Error from responder " << reason << llendl; } ///---------------------------------------------------------------------------- // Memory Panel ///---------------------------------------------------------------------------- +LLPanelScriptLimitsRegionMemory::~LLPanelScriptLimitsRegionMemory() +{ + if(!mParcelId.isNull()) + { + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this); + mParcelId.setNull(); + } +}; + BOOL LLPanelScriptLimitsRegionMemory::getLandScriptResources() { LLSD body; @@ -544,6 +575,11 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id) { if (!parcel_id.isNull()) { + if(!mParcelId.isNull()) + { + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this); + mParcelId.setNull(); + } LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id); } @@ -557,7 +593,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 @@ -597,7 +633,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) if(!list) { - llinfos << "Error getting the scripts_list control" << llendl; + llwarns << "Error getting the scripts_list control" << llendl; return; } @@ -734,8 +770,6 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) // save the structure to make object return easier mContent = content; - - childSetValue("loading_text", LLSD(std::string(""))); } void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content) @@ -754,7 +788,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content) } else { - llinfos << "summary doesn't contain memory info" << llendl; + llwarns << "summary doesn't contain memory info" << llendl; return; } @@ -772,7 +806,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content) } else { - llinfos << "summary doesn't contain urls info" << llendl; + llwarns << "summary doesn't contain urls info" << llendl; return; } @@ -919,8 +953,6 @@ void LLPanelScriptLimitsRegionMemory::clearList() // static void LLPanelScriptLimitsRegionMemory::onClickRefresh(void* userdata) { - llinfos << "LLPanelRegionGeneralInfo::onClickRefresh" << llendl; - LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(instance) { @@ -930,6 +962,13 @@ void LLPanelScriptLimitsRegionMemory::onClickRefresh(void* userdata) LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel"); if(panel_memory) { + //To stop people from hammering the refesh button and accidentally dosing themselves - enough requests can crash the viewer! + //turn the button off, then turn it on when we get a response + LLButton* btn = panel_memory->getChild<LLButton>("refresh_list_btn"); + if(btn) + { + btn->setEnabled(false); + } panel_memory->clearList(); panel_memory->StartRequestChain(); @@ -969,7 +1008,6 @@ void LLPanelScriptLimitsRegionMemory::showBeacon() // static void LLPanelScriptLimitsRegionMemory::onClickHighlight(void* userdata) { - llinfos << "LLPanelRegionGeneralInfo::onClickHighlight" << llendl; LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(instance) { @@ -1075,7 +1113,6 @@ void LLPanelScriptLimitsRegionMemory::returnObjects() // static void LLPanelScriptLimitsRegionMemory::onClickReturn(void* userdata) { - llinfos << "LLPanelRegionGeneralInfo::onClickReturn" << llendl; LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(instance) { @@ -1178,6 +1215,12 @@ void LLPanelScriptLimitsAttachment::setAttachmentDetails(LLSD content) setAttachmentSummary(content); childSetValue("loading_text", LLSD(std::string(""))); + + LLButton* btn = getChild<LLButton>("refresh_list_btn"); + if(btn) + { + btn->setEnabled(true); + } } BOOL LLPanelScriptLimitsAttachment::postBuild() @@ -1218,7 +1261,7 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content) } else { - llinfos << "attachment details don't contain memory summary info" << llendl; + llwarns << "attachment details don't contain memory summary info" << llendl; return; } @@ -1236,7 +1279,7 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content) } else { - llinfos << "attachment details don't contain urls summary info" << llendl; + llwarns << "attachment details don't contain urls summary info" << llendl; return; } @@ -1267,16 +1310,23 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content) // static void LLPanelScriptLimitsAttachment::onClickRefresh(void* userdata) -{ - llinfos << "Refresh clicked" << llendl; - +{ LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits"); if(instance) { LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels"); LLPanelScriptLimitsAttachment* panel_attachments = (LLPanelScriptLimitsAttachment*)tab->getChild<LLPanel>("script_limits_my_avatar_panel"); + LLButton* btn = panel_attachments->getChild<LLButton>("refresh_list_btn"); + + //To stop people from hammering the refesh button and accidentally dosing themselves - enough requests can crash the viewer! + //turn the button off, then turn it on when we get a response + if(btn) + { + btn->setEnabled(false); + } panel_attachments->clearList(); panel_attachments->requestAttachmentDetails(); + return; } else diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h index 0cba4d72f2..3c32b9f701 100644 --- a/indra/newview/llfloaterscriptlimits.h +++ b/indra/newview/llfloaterscriptlimits.h @@ -153,10 +153,7 @@ public: mParcelMemoryMax(0), mParcelMemoryUsed(0) {}; - ~LLPanelScriptLimitsRegionMemory() - { - LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this); - }; + ~LLPanelScriptLimitsRegionMemory(); // LLPanel virtual BOOL postBuild(); diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index f7fd7bb472..f74d912842 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -186,7 +186,7 @@ LLFolderView::LLFolderView(const Params& p) mNeedsAutoRename(FALSE), mDebugFilters(FALSE), mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME), // This gets overridden by a pref immediately - mFilter( new LLInventoryFilter(p.name) ), + mFilter( new LLInventoryFilter(p.title) ), mShowSelectionContext(FALSE), mShowSingleSelection(FALSE), mArrangeGeneration(0), @@ -285,10 +285,7 @@ LLFolderView::~LLFolderView( void ) LLView::deleteViewByHandle(mPopupMenuHandle); - if(mRenamer == gFocusMgr.getTopCtrl()) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(mRenamer); mAutoOpenItems.removeAllNodes(); clearSelection(); @@ -420,11 +417,6 @@ 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(); @@ -484,6 +476,13 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen } } + if(!mHasVisibleChildren)// is there any filtered items ? + { + //Nope. We need to display status textbox, let's reserve some place for it + running_height = mStatusTextBox->getTextPixelHeight(); + target_height = running_height; + } + LLRect scroll_rect = mScrollContainer->getContentWindowRect(); reshape( llmax(scroll_rect.getWidth(), total_width), running_height ); @@ -840,11 +839,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(); } @@ -972,7 +974,7 @@ void LLFolderView::finishRenamingItem( void ) mRenameItem->rename( mRenamer->getText() ); } - gFocusMgr.setTopCtrl( NULL ); + gViewerWindow->removePopup(mRenamer); if( mRenameItem ) { @@ -989,7 +991,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 ) { @@ -1421,7 +1423,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); } } @@ -1829,7 +1831,9 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask ) BOOL handled = childrenHandleRightMouseDown(x, y, mask) != NULL; S32 count = mSelectedItems.size(); LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get(); - if(handled && (count > 0) && menu) + if ( handled + && ( count > 0 && (hasVisibleChildren() || mFilter->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS) ) // show menu only if selected items are visible + && menu ) { if (mCallbackRegistrar) mCallbackRegistrar->pushScope(); @@ -1902,7 +1906,7 @@ void LLFolderView::deleteAllChildren() { if(mRenamer == gFocusMgr.getTopCtrl()) { - gFocusMgr.setTopCtrl(NULL); + gViewerWindow->removePopup(mRenamer); } LLView::deleteViewByHandle(mPopupMenuHandle); mPopupMenuHandle = LLHandle<LLView>(); diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 38255b3cea..42390dfd17 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -93,8 +93,9 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler public: struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params> { - Mandatory<LLPanel*> parent_panel; - Optional<LLUUID> task_id; + Mandatory<LLPanel*> parent_panel; + Optional<LLUUID> task_id; + Optional<std::string> title; }; LLFolderView(const Params&); virtual ~LLFolderView( void ); diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 76607e4874..bb4c75d3ac 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), @@ -256,11 +255,30 @@ void LLFolderViewItem::refreshFromListener() // temporary attempt to display the inventory folder in the user locale. // mantipov: *NOTE: be sure this code is synchronized with LLFriendCardsManager::findChildFolderUUID // it uses the same way to find localized string - if (LLFolderType::lookupIsProtectedType(preferred_type)) + + // HACK: EXT - 6028 ([HARD CODED]? Inventory > Library > "Accessories" folder) + // Translation of Accessories folder in Library inventory folder + bool accessories = false; + if(mLabel == std::string("Accessories")) + { + //To ensure that Accessories folder is in Library we have to check its parent folder. + //Due to parent LLFolderViewFloder is not set to this item yet we have to check its parent via Inventory Model + LLInventoryCategory* cat = gInventory.getCategory(mListener->getUUID()); + if(cat) + { + const LLUUID& parent_folder_id = cat->getParentUUID(); + accessories = (parent_folder_id == gInventory.getLibraryRootFolderID()); + } + } + + //"Accessories" inventory category has folder type FT_NONE. So, this folder + //can not be detected as protected with LLFolderType::lookupIsProtectedType + if (accessories || LLFolderType::lookupIsProtectedType(preferred_type)) { LLTrans::findString(mLabel, "InvFolder " + mLabel); }; + setToolTip(mLabel); setIcon(mListener->getIcon()); time_t creation_date = mListener->getCreationDate(); if (mCreationDate != creation_date) @@ -497,22 +515,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 +1461,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } for (items_t::iterator iter = mItems.begin(); @@ -1470,7 +1471,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } if(openitem && child_selected) @@ -1503,14 +1503,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 +1512,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 +1528,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 +1620,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (item->changeSelection(item, TRUE)) { selected_items.put(item); - mNumDescendantsSelected++; num_selected++; } } @@ -1648,7 +1630,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (selection->changeSelection(selection, TRUE)) { selected_items.put(selection); - mNumDescendantsSelected++; num_selected++; } } @@ -1656,47 +1637,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 +1670,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 +1684,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/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index bcfb516b81..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); diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index aeac3841f9..7f93a357de 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -54,6 +54,7 @@ #include "llgroupactions.h" #include "llnotificationsutil.h" #include "lluictrlfactory.h" +#include "lltrans.h" #include <boost/regex.hpp> #if LL_MSVC @@ -1062,6 +1063,24 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data) msg->getU64("RoleData","Powers",powers,i); msg->getU32("RoleData","Members",member_count,i); + //there are 3 predifined roles - Owners, Officers, Everyone + //there names are defined in lldatagroups.cpp + //lets change names from server to localized strings + if(name == "Everyone") + { + name = LLTrans::getString("group_role_everyone"); + } + else if(name == "Officers") + { + name = LLTrans::getString("group_role_officers"); + } + else if(name == "Owners") + { + name = LLTrans::getString("group_role_owners"); + } + + + lldebugs << "Adding role data: " << name << " {" << role_id << "}" << llendl; LLGroupRoleData* rd = new LLGroupRoleData(role_id,name,title,desc,powers,member_count); group_data->mRoles[role_id] = rd; diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 8cdc50eb70..77eaebb0bc 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -127,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); } @@ -682,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/llimview.cpp b/indra/newview/llimview.cpp index 1dc601e260..b3f085ef6d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1565,7 +1565,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/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 27a40c6ba0..1f918c72ea 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -683,14 +683,15 @@ void LLInvFVBridge::addTrashContextMenuOptions(menuentry_vec_t &items, void LLInvFVBridge::addDeleteContextMenuOptions(menuentry_vec_t &items, menuentry_vec_t &disabled_items) { + + const LLInventoryObject *obj = getInventoryObject(); + // Don't allow delete as a direct option from COF folder. - if (isCOFFolder()) + if (obj && obj->getIsLinkType() && isCOFFolder()) { return; } - const LLInventoryObject *obj = getInventoryObject(); - // "Remove link" and "Delete" are the same operation. if (obj && obj->getIsLinkType() && !get_is_item_worn(mUUID)) { @@ -2689,8 +2690,7 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) LLViewerInventoryCategory *cat = getCategory(); // BAP removed protected check to re-enable standard ops in untyped folders. // Not sure what the right thing is to do here. - if (!isCOFFolder() && cat && cat->getPreferredType()!=LLFolderType::FT_OUTFIT /*&& - LLAssetType::lookupIsProtectedCategoryType(cat->getPreferredType())*/) + if (!isCOFFolder() && cat && (cat->getPreferredType() != LLFolderType::FT_OUTFIT)) { // Do not allow to create 2-level subfolder in the Calling Card/Friends folder. EXT-694. if (!LLFriendCardsManager::instance().isCategoryInFriendFolder(cat)) @@ -3808,7 +3808,9 @@ std::string LLGestureBridge::getLabelSuffix() const { if( LLGestureManager::instance().isGestureActive(mUUID) ) { - return LLItemBridge::getLabelSuffix() + " (active)"; + LLStringUtil::format_map_t args; + args["[GESLABEL]"] = LLItemBridge::getLabelSuffix(); + return LLTrans::getString("ActiveGesture", args); } else { @@ -4157,7 +4159,7 @@ std::string LLObjectBridge::getLabelSuffix() const // e.g. "(worn on ...)" / "(attached to ...)" LLStringUtil::format_map_t args; - args["[ATTACHMENT_POINT]"] = attachment_point_name.c_str(); + args["[ATTACHMENT_POINT]"] = LLTrans::getString(attachment_point_name); return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args); } else @@ -4276,7 +4278,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) items.push_back(std::string("Attach Separator")); items.push_back(std::string("Detach From Yourself")); } - else if (!isItemInTrash() && !isLinkedObjectInTrash() && !isLinkedObjectMissing()) + else if (!isItemInTrash() && !isLinkedObjectInTrash() && !isLinkedObjectMissing() && !isCOFFolder()) { items.push_back(std::string("Attach Separator")); items.push_back(std::string("Object Wear")); @@ -4702,7 +4704,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags) disabled_items.push_back(std::string("Wearable Edit")); } // Don't allow items to be worn if their baseobj is in the trash. - if (isLinkedObjectInTrash() || isLinkedObjectMissing()) + if (isLinkedObjectInTrash() || isLinkedObjectMissing() || isCOFFolder()) { disabled_items.push_back(std::string("Wearable Wear")); disabled_items.push_back(std::string("Wearable Add")); 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 8097985ade..d7720b735c 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -118,6 +118,7 @@ BOOL LLInventoryPanel::postBuild() 0); LLFolderView::Params p; p.name = getName(); + p.title = getLabel(); p.rect = folder_rect; p.parent_panel = this; p.tool_tip = p.name; @@ -292,9 +293,6 @@ void LLInventoryPanel::modelChanged(U32 mask) bridge->clearDisplayName(); view_item->refresh(); - - // Set the new tooltip with the new display name. - view_item->setToolTip(bridge->getDisplayName()); } } } diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 37b03dbd7d..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; @@ -142,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(); @@ -182,7 +176,6 @@ protected: LLInventoryModel* mInventory; LLInventoryObserver* mInventoryObserver; BOOL mAllowMultiSelect; - std::string mSortOrderSetting; LLFolderView* mFolders; LLScrollContainer* mScroller; @@ -196,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/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 bf33d8527e..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(); @@ -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/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 6f0b7df935..70a7bf644b 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -114,6 +114,23 @@ public: }; 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 @@ -1166,6 +1183,7 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo() , mTeleportClicksNew(0) , mMapClicksNew(0) , mProfileClicksNew(0) + , mSnapshotCtrl(NULL) { sAllPanels.push_back(this); } @@ -1195,7 +1213,8 @@ BOOL LLPanelClassifiedInfo::postBuild() mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight(); mScrollingPanelWidth = mScrollingPanel->getRect().getWidth(); - mSnapshotRect = getChild<LLUICtrl>("classified_snapshot")->getRect(); + mSnapshotCtrl = getChild<LLTextureCtrl>("classified_snapshot"); + mSnapshotRect = getDefaultSnapshotRect(); return TRUE; } @@ -1229,12 +1248,13 @@ void LLPanelClassifiedInfo::reshape(S32 width, S32 height, BOOL called_from_pare mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height); } - mSnapshotRect = getChild<LLUICtrl>("classified_snapshot")->getRect(); + 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; @@ -1249,11 +1269,15 @@ 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()); @@ -1270,6 +1294,10 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key) 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); } @@ -1285,6 +1313,8 @@ 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]); @@ -1295,7 +1325,12 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t 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)); @@ -1316,10 +1351,28 @@ 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() @@ -1357,14 +1410,14 @@ 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); - if(!mSnapshotStreched) - { - LLUICtrl* snapshot = getChild<LLUICtrl>("classified_snapshot"); - snapshot->setRect(mSnapshotRect); - } + mSnapshotCtrl->setValue(id); mSnapshotStreched = false; } @@ -1374,7 +1427,10 @@ void LLPanelClassifiedInfo::draw() // Stretch in draw because it takes some time to load a texture, // going to try to stretch snapshot until texture is loaded - stretchSnapshot(); + if(!mSnapshotStreched) + { + stretchSnapshot(); + } } LLUUID LLPanelClassifiedInfo::getSnapshotId() @@ -1435,6 +1491,13 @@ void LLPanelClassifiedInfo::setClickThrough( 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; } } @@ -1474,10 +1537,9 @@ void LLPanelClassifiedInfo::stretchSnapshot() // *NOTE dzaporozhan // Could be moved to LLTextureCtrl - LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("classified_snapshot"); - LLViewerFetchedTexture* texture = texture_ctrl->getTexture(); + LLViewerFetchedTexture* texture = mSnapshotCtrl->getTexture(); - if(!texture || mSnapshotStreched) + if(!texture) { return; } @@ -1485,11 +1547,16 @@ void LLPanelClassifiedInfo::stretchSnapshot() if(0 == texture->getOriginalWidth() || 0 == texture->getOriginalHeight()) { // looks like texture is not loaded yet - llinfos << "Missing image size" << llendl; 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(); @@ -1499,13 +1566,66 @@ void LLPanelClassifiedInfo::stretchSnapshot() t_height *= ratio; rc.setCenterAndSize(rc.getCenterX(), rc.getCenterY(), llfloor(t_width), llfloor(t_height)); - texture_ctrl->setRect(rc); + 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"); } @@ -1514,6 +1634,7 @@ void LLPanelClassifiedInfo::onTeleportClick() { if (!getPosGlobal().isExactlyZero()) { + sendClickMessage("teleport"); gAgent.teleportViaLocation(getPosGlobal()); LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal()); } @@ -1535,7 +1656,9 @@ static const S32 CB_ITEM_PG = 1; LLPanelClassifiedEdit::LLPanelClassifiedEdit() : LLPanelClassifiedInfo() , mIsNew(false) + , mIsNewWithErrors(false) , mCanClose(false) + , mPublishFloater(NULL) { } @@ -1587,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; @@ -1625,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()); + } +} - enableVerbs(true); - enableEditing(true); +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(); + + 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); } @@ -1652,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); @@ -1660,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")); } } } @@ -1702,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); } @@ -1727,6 +1896,7 @@ void LLPanelClassifiedEdit::resetControls() getChild<LLComboBox>("content_type")->setCurrentByIndex(0); childSetValue("auto_renew", false); childSetValue("price_for_listing", MINIMUM_PRICE_FOR_LISTING); + childSetEnabled("price_for_listing", TRUE); } bool LLPanelClassifiedEdit::canClose() @@ -1734,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) +{ + LLComboBox* ct_cb = getChild<LLComboBox>("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(); @@ -1757,12 +1961,27 @@ 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() @@ -1821,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()); @@ -1855,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() @@ -1913,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 43b47d4e3e..1157649a16 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -202,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(); @@ -238,6 +256,8 @@ public: void setClassifiedLocation(const std::string& location); + std::string getClassifiedLocation(); + void setPosGlobal(const LLVector3d& pos) { mPosGlobal = pos; } LLVector3d& getPosGlobal() { return mPosGlobal; } @@ -246,6 +266,14 @@ 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; } @@ -257,6 +285,14 @@ public: 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); @@ -279,22 +315,30 @@ protected: 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; - bool mSnapshotStreched; - LLRect mSnapshotRect; - LLScrollContainer* mScrollContainer; LLPanel* mScrollingPanel; @@ -315,6 +359,7 @@ private: class LLPanelClassifiedEdit : public LLPanelClassifiedInfo { + LOG_CLASS(LLPanelClassifiedEdit); public: static LLPanelClassifiedEdit* create(); @@ -323,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); @@ -331,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(); @@ -369,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/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp index 56d52ccc65..143a64d08b 100644 --- a/indra/newview/llpanellandmarkinfo.cpp +++ b/indra/newview/llpanellandmarkinfo.cpp @@ -383,22 +383,41 @@ std::string LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCatego if (cat) { name = cat->getName(); - - // translate category name, if it's right below the root - // FIXME: it can throw notification about non existent string in strings.xml - if (cat->getParentUUID().notNull() && cat->getParentUUID() == gInventory.getRootFolderID()) - { - LLTrans::findString(name, "InvFolder " + name); - } + parent_id = cat->getParentUUID(); + bool is_under_root_category = parent_id == gInventory.getRootFolderID(); // we don't want "My Inventory" to appear in the name - while ((parent_id = cat->getParentUUID()).notNull() && parent_id != gInventory.getRootFolderID()) + while ((parent_id = cat->getParentUUID()).notNull()) { cat = gInventory.getCategory(parent_id); llassert(cat); if (cat) { - name = cat->getName() + "/" + name; + if (is_under_root_category || cat->getParentUUID() == gInventory.getRootFolderID()) + { + std::string localized_name; + if (is_under_root_category) + { + // translate category name, if it's right below the root + // FIXME: it can throw notification about non existent string in strings.xml + bool is_found = LLTrans::findString(localized_name, "InvFolder " + name); + name = is_found ? localized_name : name; + } + else + { + // FIXME: it can throw notification about non existent string in strings.xml + bool is_found = LLTrans::findString(localized_name, "InvFolder " + cat->getName()); + + // add translated category name to folder's full name + name = (is_found ? localized_name : cat->getName()) + "/" + name; + } + + break; + } + else + { + name = cat->getName() + "/" + name; + } } } } diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 45a8dc4cbe..4842fcac38 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -534,7 +534,7 @@ void LLLandmarksPanel::initLandmarksInventoryPanel() // subscribe to have auto-rename functionality while creating New Folder mLandmarksInventoryPanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mLandmarksInventoryPanel, _1, _2)); - initAccordion("tab_landmarks", mLandmarksInventoryPanel, true); + mMyLandmarksAccordionTab = initAccordion("tab_landmarks", mLandmarksInventoryPanel, true); } void LLLandmarksPanel::initMyInventoryPanel() @@ -588,7 +588,7 @@ void LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel* inventory_list inventory_list->saveFolderState(); } -void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab) +LLAccordionCtrlTab* LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab) { LLAccordionCtrlTab* accordion_tab = getChild<LLAccordionCtrlTab>(accordion_tab_name); @@ -596,6 +596,7 @@ void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPl accordion_tab->setDropDownStateChangedCallback( boost::bind(&LLLandmarksPanel::onAccordionExpandedCollapsed, this, _2, inventory_list)); accordion_tab->setDisplayChildren(expand_tab); + return accordion_tab; } void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list) @@ -656,9 +657,6 @@ void LLLandmarksPanel::initListCommandsHandlers() mListCommands->childSetAction(OPTIONS_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onActionsButtonClick, this)); mListCommands->childSetAction(TRASH_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onTrashButtonClick, this)); - mListCommands->getChild<LLButton>(ADD_BUTTON_NAME)->setHeldDownCallback(boost::bind(&LLLandmarksPanel::onAddButtonHeldDown, this)); - static const LLSD add_landmark_command("add_landmark"); - mListCommands->childSetAction(ADD_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onAddAction, this, add_landmark_command)); LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>(TRASH_BUTTON_NAME); trash_btn->setDragAndDropHandler(boost::bind(&LLLandmarksPanel::handleDragAndDropToTrash, this @@ -676,6 +674,8 @@ void LLLandmarksPanel::initListCommandsHandlers() mGearLandmarkMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_places_gear_landmark.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); mGearFolderMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_places_gear_folder.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); mMenuAdd = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_place_add_button.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); + + mListCommands->childSetAction(ADD_BUTTON_NAME, boost::bind(&LLLandmarksPanel::showActionMenu, this, mMenuAdd, ADD_BUTTON_NAME)); } @@ -713,11 +713,6 @@ void LLLandmarksPanel::onActionsButtonClick() showActionMenu(menu,OPTIONS_BUTTON_NAME); } -void LLLandmarksPanel::onAddButtonHeldDown() -{ - showActionMenu(mMenuAdd,ADD_BUTTON_NAME); -} - void LLLandmarksPanel::showActionMenu(LLMenuGL* menu, std::string spawning_view_name) { if (menu) @@ -777,6 +772,17 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const "category"), gInventory.findCategoryUUIDForType( LLFolderType::FT_LANDMARK)); } + else + { + //in case My Landmarks tab is completely empty (thus cannot be determined as being selected) + menu_create_inventory_item(mLandmarksInventoryPanel->getRootFolder(), NULL, LLSD("category"), + gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK)); + + if (mMyLandmarksAccordionTab) + { + mMyLandmarksAccordionTab->changeOpenClose(false); + } + } } } @@ -917,7 +923,7 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const return false; } } - else if (!root_folder_view) + else if (!root_folder_view && "category" != command_name) { return false; } @@ -953,7 +959,8 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const // ... but except Received folder return !isReceivedFolderSelected(); } - else return false; + //"Add a folder" is enabled by default (case when My Landmarks is empty) + else return true; } else if("create_pick" == command_name) { diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index f1ce1a18b5..c9217a4b2f 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -112,7 +112,7 @@ private: void initMyInventoryPanel(); void initLibraryInventoryPanel(); void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list); - void initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab); + LLAccordionCtrlTab* initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab); void onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list); void deselectOtherThan(const LLPlacesInventoryPanel* inventory_list); @@ -121,7 +121,6 @@ private: void updateListCommands(); void onActionsButtonClick(); void showActionMenu(LLMenuGL* menu, std::string spawning_view_name); - void onAddButtonHeldDown(); void onTrashButtonClick() const; void onAddAction(const LLSD& command_name) const; void onClipboardAction(const LLSD& command_name) const; @@ -170,6 +169,8 @@ private: typedef std::vector<LLAccordionCtrlTab*> accordion_tabs_t; accordion_tabs_t mAccordionTabs; + + LLAccordionCtrlTab* mMyLandmarksAccordionTab; }; #endif //LL_LLPANELLANDMARKS_H diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 50cfc7d177..d40141c91d 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -44,6 +44,7 @@ #include "llfiltereditor.h" #include "llfloaterreg.h" #include "llpreviewtexture.h" +#include "llresmgr.h" #include "llscrollcontainer.h" #include "llsdserialize.h" #include "llspinctrl.h" @@ -117,7 +118,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 +146,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)); @@ -538,7 +539,7 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // virtual void LLPanelMainInventory::changed(U32) { - // empty, but must have this defined for abstract base class. + updateItemcountText(); } @@ -550,6 +551,34 @@ void LLPanelMainInventory::draw() mFilterEditor->setText(mFilterSubString); } LLPanel::draw(); + updateItemcountText(); +} + +void LLPanelMainInventory::updateItemcountText() +{ + LLLocale locale(LLLocale::USER_LOCALE); + std::string item_count_string; + LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount()); + + LLStringUtil::format_map_t string_args; + string_args["[ITEM_COUNT]"] = item_count_string; + string_args["[FILTER]"] = getFilterText(); + + std::string text = ""; + + if (LLInventoryModel::backgroundFetchActive()) + { + text = getString("ItemcountFetching", string_args); + } + else if (LLInventoryModel::isEverythingFetched()) + { + text = getString("ItemcountCompleted", string_args); + } + else + { + text = getString("ItemcountUnknown"); + } + childSetText("ItemcountText",text); } void LLPanelMainInventory::setFilterTextFromFilter() diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index d9ea0da2da..b43e057f83 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -113,7 +113,8 @@ protected: void setSortBy(const LLSD& userdata); void saveTexture(const LLSD& userdata); bool isSaveTextureEnabled(const LLSD& userdata); - + void updateItemcountText(); + private: LLFloaterInventoryFinder* getFinder(); diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index a73c25a979..4f2d6374ca 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -82,6 +82,8 @@ LLPanelNearByMedia::LLPanelNearByMedia() mParcelMediaItem(NULL), mParcelAudioItem(NULL) { + mHoverTimer.stop(); + mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) && gSavedSettings.getBOOL("MediaTentativeAutoPlay"); @@ -188,33 +190,25 @@ void LLPanelNearByMedia::onMouseLeave(S32 x, S32 y, MASK 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 - //gFocusMgr.setTopCtrl(this); } else { mHoverTimer.stop(); - //if (gFocusMgr.getTopCtrl() == this) - //{ - // gFocusMgr.setTopCtrl(NULL); - //} } } -/*virtual*/ -void LLPanelNearByMedia::onTopLost () -{ - //LLUICtrl* new_top = gFocusMgr.getTopCtrl(); - //if (!new_top || !new_top->hasAncestor(this)) - //{ - // setVisible(FALSE); - //} -} - /*virtual*/ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent) { @@ -234,13 +228,6 @@ const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f; /*virtual*/ void LLPanelNearByMedia::draw() { - //LLUICtrl* new_top = gFocusMgr.getTopCtrl(); - //if (new_top != this) - //{ - // // reassert top ctrl - // gFocusMgr.setTopCtrl(this); - //} - // keep bottom of panel on screen LLRect screen_rect = calcScreenRect(); if (screen_rect.mBottom < 0) diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index 4f864519f5..af4659365f 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -53,8 +53,8 @@ public: /*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 onTopLost (); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 5ddbdf7f01..7505581904 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -609,7 +609,7 @@ void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* mo { if (price > 0 && price > gStatusBar->getBalance()) { - LLFloaterBuyCurrency::buyCurrency("This costs", price); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_costs"), price); } else { @@ -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, @@ -1575,9 +1575,10 @@ void LLPanelObjectInventory::reset() LLRect dummy_rect(0, 1, 1, 0); LLFolderView::Params p; p.name = "task inventory"; + p.title = "task inventory"; p.task_id = getTaskUUID(); p.parent_panel = this; - p.tool_tip= p.name; + p.tool_tip= LLTrans::getString("PanelContentsTooltip"); mFolders = LLUICtrlFactory::create<LLFolderView>(p); // this ensures that we never say "searching..." or "no items found" mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); @@ -1642,7 +1643,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/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 5ac0587550..f0dc493ebe 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -72,12 +72,6 @@ #define XML_BTN_ON_TXTR "edit_icon" #define XML_BTN_SAVE "save_changes_btn" -#define SAVE_BTN_LABEL "[WHAT]" -#define LABEL_PICK = "Pick" -#define LABEL_CHANGES = "Changes" - -std::string SET_LOCATION_NOTICE("(will update after save)"); - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -150,8 +144,6 @@ BOOL LLPanelPickInfo::postBuild() { mSnapshotCtrl = getChild<LLTextureCtrl>(XML_SNAPSHOT); - childSetLabelArg(XML_BTN_SAVE, SAVE_BTN_LABEL, std::string("Pick")); - childSetAction("teleport_btn", boost::bind(&LLPanelPickInfo::onClickTeleport, this)); childSetAction("show_on_map_btn", boost::bind(&LLPanelPickInfo::onClickMap, this)); childSetAction("back_btn", boost::bind(&LLPanelPickInfo::onClickBack, this)); @@ -410,7 +402,7 @@ void LLPanelPickEdit::onOpen(const LLSD& key) childSetValue("pick_name", pick_name.empty() ? region_name : pick_name); childSetValue("pick_desc", pick_desc); setSnapshotId(snapshot_id); - setPickLocation(createLocationText(SET_LOCATION_NOTICE, pick_name, region_name, getPosGlobal())); + setPickLocation(createLocationText(getLocationNotice(), pick_name, region_name, getPosGlobal())); enableSaveButton(true); } @@ -578,7 +570,7 @@ void LLPanelPickEdit::onClickSetLocation() region_name = region->getName(); } - setPickLocation(createLocationText(SET_LOCATION_NOTICE, parcel_name, region_name, getPosGlobal())); + setPickLocation(createLocationText(getLocationNotice(), parcel_name, region_name, getPosGlobal())); mLocationChanged = true; enableSaveButton(TRUE); @@ -595,6 +587,12 @@ void LLPanelPickEdit::onClickSave() notifyParent(params); } +std::string LLPanelPickEdit::getLocationNotice() +{ + static std::string notice = getString("location_notice"); + return notice; +} + void LLPanelPickEdit::processProperties(void* data, EAvatarProcessorType type) { if(mNeedData) diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h index 4f27760a8d..94ee2f83ab 100644 --- a/indra/newview/llpanelpick.h +++ b/indra/newview/llpanelpick.h @@ -248,6 +248,8 @@ protected: */ void onClickSave(); + std::string getLocationNotice(); + protected: bool mLocationChanged; diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 2ff2597f08..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 */) @@ -414,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; @@ -450,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()) @@ -607,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()) { @@ -626,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"); @@ -678,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) @@ -714,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() @@ -756,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); } @@ -807,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()); @@ -827,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); @@ -887,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; } } @@ -968,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() @@ -992,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); @@ -1180,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/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 9e5f9da0ea..cdd79b1559 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -569,7 +569,7 @@ void LLPanelPlaceProfile::onForSaleBannerClick() { if(parcel->getSalePrice() - gStatusBar->getBalance() > 0) { - LLFloaterBuyCurrency::buyCurrency("Buying selected land ", parcel->getSalePrice()); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("buying_selected_land"), parcel->getSalePrice()); } else { 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 559997254e..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) @@ -95,13 +102,8 @@ void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility ) else { mHoverTimer.stop(); - } -} -/*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/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp index f1e450a083..ed0fb54051 100644 --- a/indra/newview/llplacesinventorypanel.cpp +++ b/indra/newview/llplacesinventorypanel.cpp @@ -92,6 +92,7 @@ BOOL LLPlacesInventoryPanel::postBuild() 0); LLPlacesFolderView::Params p; p.name = getName(); + p.title = getLabel(); p.rect = folder_rect; p.parent_panel = this; mFolders = (LLFolderView*)LLUICtrlFactory::create<LLPlacesFolderView>(p); 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/llprogressview.cpp b/indra/newview/llprogressview.cpp index 0476e785a5..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; diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index eb71cc52c8..f35cb3516a 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -154,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); 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/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 025dd6029a..d4d6a74f0c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1040,7 +1040,7 @@ bool idle_startup() if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState()) { std::ostringstream emsg; - emsg << "Login failed.\n"; + emsg << LLTrans::getString("LoginFailed") << "\n"; if(LLLoginInstance::getInstance()->authFailure()) { LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): " diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 9fb496c214..9206b4a43a 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -239,20 +239,16 @@ BOOL LLStatusBar::postBuild() childSetActionTextbox("stat_btn", onClickStatGraph); - LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder"); - mPanelVolumePulldown = new LLPanelVolumePulldown(); - popup_holder->addChild(mPanelVolumePulldown); + addChild(mPanelVolumePulldown); + mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT); + mPanelVolumePulldown->setVisible(FALSE); mPanelNearByMedia = new LLPanelNearByMedia(); - popup_holder->addChild(mPanelNearByMedia); - gViewerWindow->getRootView()->addMouseDownCallback(boost::bind(&LLStatusBar::onClickScreen, this, _1, _2)); + addChild(mPanelNearByMedia); mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT); mPanelNearByMedia->setVisible(FALSE); - mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT); - mPanelVolumePulldown->setVisible(FALSE); - return TRUE; } @@ -528,11 +524,11 @@ static void onClickScriptDebug(void*) void LLStatusBar::onMouseEnterVolume() { LLButton* volbtn = getChild<LLButton>( "volume_btn" ); - LLRect vol_btn_screen_rect = volbtn->calcScreenRect(); + LLRect vol_btn_rect = volbtn->getRect(); LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect(); - volume_pulldown_rect.setLeftTopAndSize(vol_btn_screen_rect.mLeft - - (volume_pulldown_rect.getWidth() - vol_btn_screen_rect.getWidth())/2, - vol_btn_screen_rect.mBottom, + 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()); @@ -540,8 +536,10 @@ void LLStatusBar::onMouseEnterVolume() // show the master volume pull-down - mPanelVolumePulldown->setVisible(TRUE); + LLUI::clearPopups(); + LLUI::addPopup(mPanelVolumePulldown); mPanelNearByMedia->setVisible(FALSE); + mPanelVolumePulldown->setVisible(TRUE); } void LLStatusBar::onMouseEnterNearbyMedia() @@ -549,7 +547,7 @@ 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->calcScreenRect(); + 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, @@ -560,8 +558,11 @@ void LLStatusBar::onMouseEnterNearbyMedia() // show the master volume pull-down mPanelNearByMedia->setShape(nearby_media_rect); - mPanelNearByMedia->setVisible(TRUE); + LLUI::clearPopups(); + LLUI::addPopup(mPanelNearByMedia); + mPanelVolumePulldown->setVisible(FALSE); + mPanelNearByMedia->setVisible(TRUE); } @@ -650,18 +651,6 @@ void LLStatusBar::onClickStatGraph(void* data) LLFloaterReg::showInstance("lagmeter"); } -void LLStatusBar::onClickScreen(S32 x, S32 y) -{ - if (mPanelNearByMedia->getVisible()) - { - LLRect screen_rect = mPanelNearByMedia->calcScreenRect(); - if (!screen_rect.pointInRect(x, y)) - { - mPanelNearByMedia->setVisible(FALSE); - } - } -} - BOOL can_afford_transaction(S32 cost) { return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost))); diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 6ed95f2cbf..386b636367 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -1883,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/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 0053ce8df8..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); } @@ -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..43913f3632 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -658,6 +658,15 @@ struct compare_decode_pair } }; +struct KillView +{ + void operator()(LLView* viewp) + { + viewp->getParent()->removeChild(viewp); + viewp->die(); + } +}; + void LLTextureView::draw() { if (!mFreezeView) @@ -665,12 +674,16 @@ 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; - mGLTexMemBar = 0; - + + if (mGLTexMemBar) + { + removeChild(mGLTexMemBar); + mGLTexMemBar->die(); + mGLTexMemBar = 0; + } + typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t; display_list_t display_image_list; @@ -683,6 +696,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/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index c47c017143..e6d13a7613 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -53,7 +53,7 @@ S32 BUTTON_WIDTH = 90; 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), @@ -63,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"); @@ -159,7 +163,12 @@ mAddedDefaultBtn(false) * 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 */ - h_pad = 2*HPAD; + 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; + } } if (mIsScriptDialog) { @@ -224,7 +233,7 @@ 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")); diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index e791eea469..152975e7de 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -53,7 +53,15 @@ 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; } @@ -77,7 +85,7 @@ private: /* * 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 depent on number of buttons. + * @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); diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fb78b6a415..d15db536e6 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -412,24 +412,24 @@ ECursorType cursor_from_object(LLViewerObject* object) case CLICK_ACTION_SIT: if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // not already sitting? { - cursor = UI_CURSOR_HAND; + cursor = UI_CURSOR_TOOLSIT; } break; case CLICK_ACTION_BUY: - cursor = UI_CURSOR_HAND; + cursor = UI_CURSOR_TOOLBUY; break; case CLICK_ACTION_OPEN: // Open always opens the parent. if (parent && parent->allowOpen()) { - cursor = UI_CURSOR_HAND; + cursor = UI_CURSOR_TOOLOPEN; } break; case CLICK_ACTION_PAY: if ((object && object->flagTakesMoney()) || (parent && parent->flagTakesMoney())) { - cursor = UI_CURSOR_HAND; + cursor = UI_CURSOR_TOOLBUY; } break; case CLICK_ACTION_ZOOM: @@ -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) @@ -955,10 +965,13 @@ 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 && + + bool needs_tip = (!is_media_displaying || + for_sale) && (has_media || needs_tooltip(nodep) || needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); 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/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 8370c98470..65e9d8971a 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -117,6 +117,7 @@ #include "llmoveview.h" #include "llnearbychat.h" #include "llpanelblockedlist.h" +#include "llpanelclassified.h" #include "llpreviewanim.h" #include "llpreviewgesture.h" #include "llpreviewnotecard.h" @@ -219,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 f02e854db6..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 diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 344c4c469b..b9509a98f5 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -50,6 +50,7 @@ #include "llcallbacklist.h" #include "llparcel.h" #include "llaudioengine.h" // for gAudiop +#include "llurldispatcher.h" #include "llvoavatar.h" #include "llvoavatarself.h" #include "llviewerregion.h" @@ -700,9 +701,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg) 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(); } @@ -1090,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. @@ -1229,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)) @@ -1243,7 +1258,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ { LLPluginClassMedia* media_source = new LLPluginClassMedia(owner); media_source->setSize(default_width, default_height); - if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path)) + media_source->setUserDataPath(user_data_path); + media_source->setLanguageCode(LLUI::getLanguage()); + if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) { return media_source; } @@ -2340,6 +2357,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. diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 9dbffa78b3..bc51e713a1 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -322,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 { @@ -405,6 +408,7 @@ private: LLColor4 mBackgroundColor; bool mNavigateSuspended; bool mNavigateSuspendedDeferred; + bool mTrustedBrowser; private: BOOL mIsUpdated ; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index bc3b8ac9d6..5c40d02f8d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -86,6 +86,7 @@ #include "lltoolmgr.h" #include "lltoolpie.h" #include "lltoolselectland.h" +#include "lltrans.h" #include "llviewergenericmessage.h" #include "llviewerhelp.h" #include "llviewermenufile.h" // init_menu_file() @@ -103,6 +104,7 @@ #include "llfloatercamera.h" #include "lluilistener.h" #include "llappearancemgr.h" +#include "lltrans.h" using namespace LLVOAvatarDefines; @@ -3272,7 +3274,7 @@ void handle_buy_object(LLSaleInfo sale_info) if (price > 0 && price > gStatusBar->getBalance()) { - LLFloaterBuyCurrency::buyCurrency("This object costs", price); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_object_costs"), price); return; } @@ -7046,7 +7048,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id ) void handle_disconnect_viewer(void *) { - LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect"); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("TestingDisconnect")); } void force_error_breakpoint(void *) diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 84b270f8cc..00762894cd 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -1001,7 +1001,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty if (balance < expected_upload_cost) { // insufficient funds, bail on this upload - LLFloaterBuyCurrency::buyCurrency("Uploading costs", expected_upload_cost); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs"), expected_upload_cost); return; } } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 361f4e2326..bd0012057c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -272,7 +272,7 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_ } else { - LLFloaterBuyCurrency::buyCurrency("Giving", amount); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving"), amount); } } @@ -1500,7 +1500,9 @@ void inventory_offer_handler(LLOfferInfo* info) std::string typestr = ll_safe_string(LLAssetType::lookupHumanReadable(info->mType)); if (!typestr.empty()) { - args["OBJECTTYPE"] = typestr; + // human readable matches string name from strings.xml + // lets get asset type localized name + args["OBJECTTYPE"] = LLTrans::getString(typestr); } else { @@ -3078,7 +3080,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) << x << ":" << y << " current pos " << gAgent.getPositionGlobal() << LL_ENDL; - LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region."); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("SentToInvalidRegion")); return; } @@ -4458,20 +4460,39 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) // have missed something during an event. // *TODO: Translate LLSD args; - args["MESSAGE"] = desc; + // this is a marker to retrieve avatar name from server message: // "<avatar name> paid you L$" const std::string marker = "paid you L$"; + args["MESSAGE"] = desc; + // extract avatar name from system message - std::string name = desc.substr(0, desc.find(marker, 0)); + S32 marker_pos = desc.find(marker, 0); + + std::string base_name = desc.substr(0, marker_pos); + + std::string name = base_name; LLStringUtil::trim(name); // if name extracted and name cache contains avatar id send loggable notification LLUUID from_id; if(name.size() > 0 && gCacheName->getUUID(name, from_id)) { + //description always comes not localized. lets fix this + + //ammount paid + std::string ammount = desc.substr(marker_pos + marker.length(),desc.length() - marker.length() - marker_pos); + + //reform description + LLStringUtil::format_map_t str_args; + str_args["NAME"] = base_name; + str_args["AMOUNT"] = ammount; + std::string new_description = LLTrans::getString("paid_you_ldollars", str_args); + + + args["MESSAGE"] = new_description; args["NAME"] = name; LLSD payload; payload["from_id"] = from_id; diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 2c5c0a37e8..b967436df6 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -210,25 +210,29 @@ void LLViewerParcelMedia::play(LLParcel* parcel) // A new impl will be created below. } } - - if(!sMediaImpl) + + // Don't ever try to play if the media type is set to "none/none" + if(stricmp(mime_type.c_str(), "none/none") != 0) { - LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL; - - // There is no media impl, make a new one - sMediaImpl = LLViewerMedia::newMediaImpl( - placeholder_texture_id, - media_width, - media_height, - media_auto_scale, - media_loop); - sMediaImpl->setIsParcelMedia(true); - sMediaImpl->navigateTo(media_url, mime_type, true); - } + if(!sMediaImpl) + { + LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL; + + // There is no media impl, make a new one + sMediaImpl = LLViewerMedia::newMediaImpl( + placeholder_texture_id, + media_width, + media_height, + media_auto_scale, + media_loop); + sMediaImpl->setIsParcelMedia(true); + sMediaImpl->navigateTo(media_url, mime_type, true); + } - //LLFirstUse::useMedia(); + //LLFirstUse::useMedia(); - LLViewerParcelMediaAutoPlay::playStarted(); + LLViewerParcelMediaAutoPlay::playStarted(); + } } // static @@ -312,11 +316,14 @@ std::string LLViewerParcelMedia::getURL() if(sMediaImpl.notNull()) url = sMediaImpl->getMediaURL(); - if (url.empty()) - url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaCurrentURL(); - - if (url.empty()) - url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaURL(); + if(stricmp(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaType().c_str(), "none/none") != 0) + { + if (url.empty()) + url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaCurrentURL(); + + if (url.empty()) + url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaURL(); + } return url; } diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp index ad2723b66b..f55d6d89c4 100644 --- a/indra/newview/llviewerparcelmediaautoplay.cpp +++ b/indra/newview/llviewerparcelmediaautoplay.cpp @@ -86,6 +86,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() LLParcel *this_parcel = NULL; LLViewerRegion *this_region = NULL; std::string this_media_url; + std::string this_media_type; LLUUID this_media_texture_id; S32 this_parcel_id = 0; LLUUID this_region_id; @@ -101,7 +102,9 @@ BOOL LLViewerParcelMediaAutoPlay::tick() if (this_parcel) { - this_media_url = std::string(this_parcel->getMediaURL()); + this_media_url = this_parcel->getMediaURL(); + + this_media_type = this_parcel->getMediaType(); this_media_texture_id = this_parcel->getMediaID(); @@ -118,14 +121,15 @@ BOOL LLViewerParcelMediaAutoPlay::tick() mLastRegionID = this_region_id; } - mTimeInParcel += mPeriod; // increase mTimeInParcel by the amount of time between ticks + mTimeInParcel += mPeriod; // increase mTimeInParcel by the amount of time between ticks - if ((!mPlayed) && // if we've never played - (mTimeInParcel > AUTOPLAY_TIME) && // and if we've been here for so many seconds - (this_media_url.size() != 0) && // and if the parcel has media - (LLViewerParcelMedia::sMediaImpl.isNull())) // and if the media is not already playing + if ((!mPlayed) && // if we've never played + (mTimeInParcel > AUTOPLAY_TIME) && // and if we've been here for so many seconds + (!this_media_url.empty()) && // and if the parcel has media + (stricmp(this_media_type.c_str(), "none/none") != 0) && + (LLViewerParcelMedia::sMediaImpl.isNull())) // and if the media is not already playing { - if (this_media_texture_id.notNull()) // and if the media texture is good + if (this_media_texture_id.notNull()) // and if the media texture is good { LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, FALSE) ; diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 8059f866ba..41d9f6d067 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -827,7 +827,11 @@ void send_stats() S32 window_height = gViewerWindow->getWindowHeightRaw(); S32 window_size = (window_width * window_height) / 1024; misc["string_1"] = llformat("%d", window_size); - // misc["string_2"] = + if (gDebugTimers.find(0) != gDebugTimers.end() && gFrameTimeSeconds > 0) + { + misc["string_2"] = llformat("Texture Time: %.2f, Total Time: %.2f", gDebugTimers[0].getElapsedTimeF32(), gFrameTimeSeconds); + } + // misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21 // misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21 diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 01d437f9eb..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); //---------------------------------------------------------------------------------------------- @@ -369,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 @@ -1417,9 +1417,8 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/) if (!mForceToSaveRawImage) { mNeedsAux = FALSE; - } destroyRawImage(); - + } return res; } @@ -2742,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 @@ -2768,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 && diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 84377198eb..a09a711cc7 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -300,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; @@ -455,6 +455,7 @@ public: F32 getElapsedLastReferencedSavedRawImageTime() const ; BOOL isFullyLoaded() const; + BOOL hasFetcher() const { return mHasFetcher;} protected: /*virtual*/ void switchToCachedImage(); S32 getCurrentDiscardLevelForFetching() ; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 30f2d2c41b..adac4b9b40 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" @@ -690,23 +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 (top_ctrl->pointInView(local_x, local_y)) - { - return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down) ; - } - else - { - if (down) - { - gFocusMgr.setTopCtrl(NULL); - } - } - } + //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) ) @@ -1123,7 +1124,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated) { // if we're in world, show a progress bar to hide reloading of textures llinfos << "Restoring GL during activate" << llendl; - restoreGL("Restoring..."); + restoreGL(LLTrans::getString("ProgressRestoring")); } else { @@ -1383,7 +1384,7 @@ LLViewerWindow::LLViewerWindow( if (NULL == mWindow) { - LLSplashScreen::update("Shutting down..."); + LLSplashScreen::update(LLTrans::getString("ShuttingDown")); #if LL_LINUX || LL_SOLARIS llwarns << "Unable to create window, be sure screen is set at 32-bit color and your graphics driver is configured correctly. See README-linux.txt or README-solaris.txt for further information." << llendl; @@ -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; @@ -2018,9 +2021,9 @@ void LLViewerWindow::drawDebugText() void LLViewerWindow::draw() { -#if LL_DEBUG +//#if LL_DEBUG LLView::sIsDrawing = TRUE; -#endif +//#endif stop_glerror(); LLUI::setLineWidth(1.f); @@ -2132,9 +2135,9 @@ void LLViewerWindow::draw() 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 @@ -2426,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")) @@ -2554,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)) @@ -4704,7 +4758,7 @@ void LLViewerWindow::restartDisplay(BOOL show_progress_bar) stopGL(); if (show_progress_bar) { - restoreGL("Changing Resolution..."); + restoreGL(LLTrans::getString("ProgressChangingResolution")); } else { @@ -4791,7 +4845,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size, llinfos << "Restoring GL during resolution change" << llendl; if (show_progress_bar) { - restoreGL("Changing Resolution..."); + restoreGL(LLTrans::getString("ProgressChangingResolution")); } else { 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 72b9c6df98..f5e83ed025 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5785,11 +5785,6 @@ void LLVOAvatar::invalidateAll() { } -// virtual -void LLVOAvatar::setCompositeUpdatesEnabled( BOOL b ) -{ -} - void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake ) { if (global_color == mTexSkinColor) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b5f0ec7176..d5485413f4 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -526,7 +526,9 @@ protected: public: virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result); virtual void invalidateAll(); - virtual void setCompositeUpdatesEnabled(BOOL b); + virtual void setCompositeUpdatesEnabled(bool b) {} + virtual void setCompositeUpdatesEnabled(U32 index, bool b) {} + virtual bool isCompositeUpdateEnabled(U32 index) { return false; } //-------------------------------------------------------------------- // Static texture/mesh/baked dictionary diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 131c6ac1a1..98ca76ed01 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -489,7 +489,7 @@ BOOL LLVOAvatarSelf::buildMenus() { LLMenuItemCallGL::Params item_params; item_params.name = attachment->getName(); - item_params.label = attachment->getName(); + item_params.label = LLTrans::getString(attachment->getName()); item_params.on_click.function_name = "Object.AttachToAvatar"; item_params.on_click.parameter = attach_index; item_params.on_enable.function_name = "Object.EnableWear"; @@ -765,6 +765,7 @@ void LLVOAvatarSelf::removeMissingBakedTextures() { for (U32 i = 0; i < mBakedTextureDatas.size(); i++) { + mBakedTextureDatas[i].mTexLayerSet->setUpdatesEnabled(TRUE); invalidateComposite(mBakedTextureDatas[i].mTexLayerSet, FALSE); } updateMeshTextures(); @@ -952,6 +953,7 @@ void LLVOAvatarSelf::wearableUpdated( EWearableType type, BOOL upload_result ) { if (mBakedTextureDatas[index].mTexLayerSet) { + mBakedTextureDatas[index].mTexLayerSet->setUpdatesEnabled(true); invalidateComposite(mBakedTextureDatas[index].mTexLayerSet, upload_result); } break; @@ -1292,19 +1294,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(); } } @@ -1360,17 +1366,31 @@ void LLVOAvatarSelf::invalidateAll() //----------------------------------------------------------------------------- // setCompositeUpdatesEnabled() //----------------------------------------------------------------------------- -void LLVOAvatarSelf::setCompositeUpdatesEnabled( BOOL b ) +void LLVOAvatarSelf::setCompositeUpdatesEnabled( bool b ) { for (U32 i = 0; i < mBakedTextureDatas.size(); i++) { - if (mBakedTextureDatas[i].mTexLayerSet ) - { - mBakedTextureDatas[i].mTexLayerSet->setUpdatesEnabled( b ); - } + setCompositeUpdatesEnabled(i, b); } } +void LLVOAvatarSelf::setCompositeUpdatesEnabled(U32 index, bool b) +{ + if (mBakedTextureDatas[index].mTexLayerSet ) + { + mBakedTextureDatas[index].mTexLayerSet->setUpdatesEnabled( b ); + } +} + +bool LLVOAvatarSelf::isCompositeUpdateEnabled(U32 index) +{ + if (mBakedTextureDatas[index].mTexLayerSet) + { + return mBakedTextureDatas[index].mTexLayerSet->getUpdatesEnabled(); + } + return false; +} + void LLVOAvatarSelf::setupComposites() { for (U32 i = 0; i < mBakedTextureDatas.size(); i++) @@ -1723,7 +1743,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 diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc70996f0b..9514abc5bc 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; @@ -231,7 +232,9 @@ public: public: /* virtual */ void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result); /* virtual */ void invalidateAll(); - /* virtual */ void setCompositeUpdatesEnabled(BOOL b); // only works for self + /* virtual */ void setCompositeUpdatesEnabled(bool b); // only works for self + /* virtual */ void setCompositeUpdatesEnabled(U32 index, bool b); + /* virtual */ bool isCompositeUpdateEnabled(U32 index); void setupComposites(); void updateComposites(); diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index acfbc23f62..3334c17a8f 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -56,6 +56,35 @@ using namespace LLVOAvatarDefines; // static S32 LLWearable::sCurrentDefinitionVersion = 1; +// support class - remove for 2.1 (hackity hack hack) +class LLOverrideBakedTextureUpdate +{ +public: + LLOverrideBakedTextureUpdate(bool temp_state) + { + mAvatar = gAgent.getAvatarObject(); + U32 num_bakes = (U32) LLVOAvatarDefines::BAKED_NUM_INDICES; + for( U32 index = 0; index < num_bakes; ++index ) + { + composite_enabled[index] = mAvatar->isCompositeUpdateEnabled(index); + } + mAvatar->setCompositeUpdatesEnabled(temp_state); + } + + ~LLOverrideBakedTextureUpdate() + { + U32 num_bakes = (U32)LLVOAvatarDefines::BAKED_NUM_INDICES; + for( U32 index = 0; index < num_bakes; ++index ) + { + mAvatar->setCompositeUpdatesEnabled(index, composite_enabled[index]); + } + } + +private: + bool composite_enabled[LLVOAvatarDefines::BAKED_NUM_INDICES]; + LLVOAvatarSelf *mAvatar; +}; + // Private local functions static std::string terse_F32_to_string(F32 f); static std::string asset_id_to_filename(const LLUUID &asset_id); @@ -216,6 +245,10 @@ BOOL LLWearable::importFile( LLFILE* file ) char text_buffer[2048]; /* Flawfinder: ignore */ S32 fields_read = 0; + // suppress texlayerset updates while wearables are being imported. Layersets will be updated + // when the wearables are "worn", not loaded. Note state will be restored when this object is destroyed. + LLOverrideBakedTextureUpdate stop_bakes(false); + // read header and version fields_read = fscanf( file, "LLWearable version %d\n", &mDefinitionVersion ); if( fields_read != 1 ) diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index d7e5b464a6..19f303ab88 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -45,6 +45,7 @@ #include "llhttpnode.h" #include "llregionhandle.h" #include "llsurface.h" +#include "lltrans.h" #include "llviewercamera.h" #include "llviewertexture.h" #include "llviewertexturelist.h" @@ -258,7 +259,7 @@ void LLWorld::removeRegion(const LLHost &host) llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl; llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl; - LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in."); + LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected")); return; } diff --git a/indra/newview/res-sdl/ll_icon.BMP b/indra/newview/res-sdl/ll_icon.BMP Binary files differindex 4a44aafbfa..6f9366df41 100644 --- a/indra/newview/res-sdl/ll_icon.BMP +++ b/indra/newview/res-sdl/ll_icon.BMP 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/res/ll_icon.png b/indra/newview/res/ll_icon.png Binary files differindex 414b703111..ae573b3874 100644 --- a/indra/newview/res/ll_icon.png +++ b/indra/newview/res/ll_icon.png diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur Binary files differnew file mode 100644 index 0000000000..7fd552a78e --- /dev/null +++ b/indra/newview/res/toolbuy.cur diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur Binary files differnew file mode 100644 index 0000000000..1562f5bc95 --- /dev/null +++ b/indra/newview/res/toolopen.cur diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur Binary files differnew file mode 100644 index 0000000000..a1f99cfe6d --- /dev/null +++ b/indra/newview/res/toolsit.cur diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 38291e45c9..7a965cf57e 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -2,19 +2,12 @@ // #include "resource.h" -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) -#include "winresrc.h" - #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -// Commented out because it only compiles if you have MFC installed. -//#include "winres.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -84,9 +77,8 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN - "SPLASHSCREEN", DIALOG BEGIN LEFTMARGIN, 7 @@ -127,6 +119,9 @@ TOOLPIPETTE CURSOR "toolpipette.cur" TOOLPLAY CURSOR "toolplay.cur" TOOLPAUSE CURSOR "toolpause.cur" TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" +TOOLOPEN CURSOR "toolopen.cur" +TOOLSIT CURSOR "toolsit.cur" +TOOLBUY CURSOR "toolbuy.cur" ///////////////////////////////////////////////////////////////////////////// // @@ -134,8 +129,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,200030 - PRODUCTVERSION 2,0,0,200030 + FILEVERSION 2,0,0,3422 + PRODUCTVERSION 2,0,0,3422 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -166,12 +161,6 @@ BEGIN END END - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// 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 c617dacec5..d45d6155dd 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -344,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" /> @@ -359,7 +359,7 @@ reference="White"/> <color name="GroupNotifyDimmedTextColor" - reference="LtGray" /> + reference="DkGray" /> <color name="GroupOverTierColor" value="0.43 0.06 0.06 1" /> diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png Binary files differindex c9fbde987a..8342d7cfee 100644 --- a/indra/newview/skins/default/textures/icons/SL_Logo.png +++ b/indra/newview/skins/default/textures/icons/SL_Logo.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 4768cf14fb..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" /> 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..6e7d16aa79 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -81,9 +81,12 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel <text name="Group:"> Gruppe: </text> - <button label="Vælg..." label_selected="Vælg..." name="Set..."/> + <text name="GroupText"> + Leyla Linden + </text> + <button label="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."/> + <button label="Dedikér" name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/> <check_box label="Ejer bidrager ved dedikering" name="check contrib" tool_tip="NÃ¥r land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav."/> <text name="For Sale:"> Til salg: @@ -94,7 +97,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel <text name="For Sale: Price L$[PRICE]."> Pris: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> - <button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..."/> + <button label="Sælg land" name="Sell Land..."/> <text name="For sale to"> Til salg til: [BUYER] </text> @@ -123,12 +126,13 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel <text name="DwellText"> 0 </text> - <button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/> - <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..."/> - <button label="Kræv tilbage..." label_selected="Kræv tilbage..." name="Reclaim Land..."/> - <button label="Linden salg..." label_selected="Linden salg..." name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede pÃ¥ auktion."/> + <button label="Køb land" name="Buy Land..."/> + <button label="Script Info" name="Scripts..."/> + <button label="Køb til gruppe" name="Buy For Group..."/> + <button label="Køb adgang" name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette omrÃ¥de."/> + <button label="Efterlad land" name="Abandon Land..."/> + <button label="Kræv tilbage" name="Reclaim Land..."/> + <button label="Linden salg" name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede pÃ¥ auktion."/> </panel> <panel label="REGLER" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -227,7 +231,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel [COUNT] </text> <button label="Vis" label_selected="Vis" name="ShowOwner"/> - <button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..." tool_tip="Returnér objekter til deres ejere."/> + <button label="Returnér" name="ReturnOwner..." tool_tip="Returnér objekter til deres ejere."/> <text name="Set to group:"> Sat til gruppe: </text> @@ -235,7 +239,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel [COUNT] </text> <button label="Vis" label_selected="Vis" name="ShowGroup"/> - <button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..." tool_tip="Returnér objekter til deres ejere."/> + <button label="Returnér" name="ReturnGroup..." tool_tip="Returnér objekter til deres ejere."/> <text name="Owned by others:"> Ejet af andre: </text> @@ -243,7 +247,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel [COUNT] </text> <button label="Vis" label_selected="Vis" name="ShowOther"/> - <button label="Returnér..." label_selected="Returnér..." name="ReturnOther..." tool_tip="Returnér objekter til deres ejere."/> + <button label="Returnér" name="ReturnOther..." tool_tip="Returnér objekter til deres ejere."/> <text name="Selected / sat upon:"> Valgt/siddet pÃ¥: </text> @@ -257,7 +261,7 @@ GÃ¥ til 'Verden' > 'Om land' eller vælg en anden parcel Objekt ejere: </text> <button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Returnér objekter..." label_selected="Returnér objekter..." name="Return objects..."/> + <button label="Returnér objekter" name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Type" name="type"/> <name_list.columns label="Navn" name="name"/> @@ -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 b5ec1cb302..7d4a81d655 100644 --- a/indra/newview/skins/default/xui/da/floater_world_map.xml +++ b/indra/newview/skins/default/xui/da/floater_world_map.xml @@ -5,70 +5,30 @@ Forklaring </text> </panel> - <panel - name="layout_panel_2"> - <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"> + <panel> + <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 + land auktion </text> - <button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleportér til min hjemmelokation"/> - <text name="Home_label"> - Hjem - </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 - name="layout_panel_3"> - <text name="find_on_map_label"> - Find pÃ¥ kort - </text> - </panel> - <panel - name="layout_panel_4"> - <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 - name="layout_panel_5"> - <text name="zoom_label"> - Zoom + <text name="adult_label"> + Voksen </text> </panel> - <panel - name="layout_panel_6"> - <slider label="Zoom" name="zoom slider"/> + <panel> + <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_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml index 667638c529..0e2d04ffbb 100644 --- a/indra/newview/skins/default/xui/da/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom tæt" name="Zoom Close"/> <menu_item_call label="Zoom mellem" name="Zoom Medium"/> <menu_item_call label="Zoom langt" name="Zoom Far"/> 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_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 74753c64d4..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 name="parcel_characteristics_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 name="region_information_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 name="estate_information_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 name="sales_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 666c6936fe..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,44 +36,18 @@ <panel.string name="Sale Mixed"> Blandet salg </panel.string> - <panel name="properties_panel" label=""> - <text name="Name:"> - Navn: + <text name="title" value="Objekt profil"/> + <text name="where" value="(verden)"/> + <panel label=""> + <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_inv"> <text name="perm_modify"> Du kan redigere dette objekt @@ -81,39 +55,42 @@ <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_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index 05e2d4d754..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> @@ -15,7 +24,7 @@ <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 @@ -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: 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 a434b3a2fa..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> 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 7426e97d9e..f380393163 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml @@ -41,8 +41,8 @@ Verkleinern Sie Ihre Auswahl. Das ausgewählte Land beinhaltet kein öffentliches Land. </floater.string> <floater.string name="not_owned_by_you"> - Sie haben Land ausgewählt, das einer anderen Person gehört. -Verkleinern Sie Ihre Auswahl. + 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... 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 cf7b208c1a..f284d7cd6b 100644 --- a/indra/newview/skins/default/xui/de/floater_customize.xml +++ b/indra/newview/skins/default/xui/de/floater_customize.xml @@ -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. @@ -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. @@ -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,7 +236,7 @@ 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"> @@ -269,7 +269,7 @@ 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"> @@ -302,7 +302,7 @@ 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"> @@ -311,8 +311,8 @@ <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 font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/> <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/> @@ -336,7 +336,7 @@ 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"> @@ -369,7 +369,7 @@ 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"> @@ -402,7 +402,7 @@ 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"> @@ -435,7 +435,7 @@ 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"> @@ -453,7 +453,7 @@ </panel> <panel label="Tätowierung" name="Tattoo"> <text name="title"> - [BESCHR] + Tätowierung </text> <text name="title_no_modify"> [BESCHR]: bearbeiten nicht möglich @@ -487,7 +487,7 @@ </panel> <panel label="Alpha" name="Alpha"> <text name="title"> - [BESCHR] + Alpha </text> <text name="title_no_modify"> [BESCHR]: bearbeiten nicht möglich diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml index a41ac521a3..cf663e2e1b 100644 --- a/indra/newview/skins/default/xui/de/floater_event.xml +++ b/indra/newview/skins/default/xui/de/floater_event.xml @@ -9,6 +9,18 @@ <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"> @@ -21,12 +33,21 @@ 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> 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 2bb123ad51..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,7 +2,7 @@ <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"> @@ -35,8 +35,8 @@ <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> 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_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_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml index fb89eeb600..ec3c45dccf 100644 --- a/indra/newview/skins/default/xui/de/floater_pay.xml +++ b/indra/newview/skins/default/xui/de/floater_pay.xml @@ -18,7 +18,7 @@ <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="Bezahlen" label_selected="Bezahlen" name="pay btn"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/> 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 ff85efad50..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,7 +22,7 @@ <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="Bezahlen" label_selected="Bezahlen" name="pay btn"/> <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76"/> 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 49e6d031d6..e37e298478 100644 --- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml @@ -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"/> 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 d7db97722c..ec79b862b4 100644 --- a/indra/newview/skins/default/xui/de/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="notification_chiclet" title="MELDUNGEN"> +<floater name="sys_well_window" title="MELDUNGEN"> <string name="title_im_well_window"> GESPRÄCHE </string> 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 d20ab8d1c3..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,5 +1,5 @@ <?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> diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 7646efccd4..46023bcf19 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -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> @@ -364,14 +364,14 @@ Objekteigenschaften bearbeiten: </text> <check_box label="Flexibler Pfad" name="Flexible1D Checkbox Ctrl" tool_tip="Bewirkt, dass sich das Objekt um die Z-Achse biegen kann. (Nur Client-Seite)"/> - <spinner label="Weichheit" name="FlexNumSections" width="140"/> - <spinner label="Schwerkraft" name="FlexGravity" width="140"/> - <spinner label="Ziehen" name="FlexFriction" width="140"/> - <spinner label="Wind" name="FlexWind" width="140"/> - <spinner label="Spannung" name="FlexTension" width="140"/> - <spinner label="Erzwingen X" name="FlexForceX" width="140"/> - <spinner label="Erzwingen Y" name="FlexForceY" width="140"/> - <spinner label="Erzwingen Z" name="FlexForceZ" width="140"/> + <spinner label="Weichheit" name="FlexNumSections"/> + <spinner label="Schwerkraft" name="FlexGravity"/> + <spinner label="Ziehen" name="FlexFriction"/> + <spinner label="Wind" name="FlexWind"/> + <spinner label="Spannung" name="FlexTension"/> + <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)"/> @@ -477,7 +477,7 @@ <text name="label_area"> Gebiet: [AREA] m². </text> - <button label="Ãœber Land" label_selected="Ãœber Land" name="button about land"/> + <button label="Land-Info" label_selected="Land-Info" name="button about land"/> <check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Die Parzellen farblich nach Eigentümtertyp anzeigen Grün = Ihr Land Blau = Das Land Ihrer Gruppe Rot = Im Eigentum anderer Geld = Zum Verkauf Lila = Zur Auktion Grau = Öffentlich"/> <text name="label_parcel_modify"> Parzelle ändern 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_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 5258364656..a1f41f53ad 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -5,8 +5,7 @@ Legende </text> </panel> - <panel - name="layout_panel_2"> + <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 @@ -31,16 +30,16 @@ </text> <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/> <text name="Home_label"> - Startseite + Zuhause </text> <text name="events_label"> Events: </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> @@ -49,14 +48,12 @@ Adult </text> </panel> - <panel - name="layout_panel_3"> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Auf Karte anzeigen </text> </panel> - <panel - name="layout_panel_4"> + <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> @@ -74,14 +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 - name="layout_panel_5"> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel - name="layout_panel_6"> + <panel name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> 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_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml index a3ebfb3b10..7139b98965 100644 --- a/indra/newview/skins/default/xui/de/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom Nah" name="Zoom Close"/> <menu_item_call label="Zoom Mittel" name="Zoom Medium"/> <menu_item_call label="Zoom Weit" name="Zoom Far"/> diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml index 320f93c796..8bb7b66482 100644 --- a/indra/newview/skins/default/xui/de/menu_object.xml +++ b/indra/newview/skins/default/xui/de/menu_object.xml @@ -5,6 +5,7 @@ <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"> @@ -18,6 +19,7 @@ <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="Bezahlen" name="Pay..."/> 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 a69ef3891a..1db964357f 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml @@ -5,6 +5,7 @@ <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="Bezahlen" name="Pay"/> <menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index a04532376c..c628cb4b61 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -43,6 +43,8 @@ <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"/> @@ -81,7 +83,8 @@ <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"/> @@ -159,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"/> @@ -169,7 +172,7 @@ <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 label="Tastaturkürzel" name="Shortcuts"> @@ -405,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 da4a96962e..864e579c3d 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -107,10 +107,10 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut. </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="Ja"/> + <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! + Wenn Sie einem anderen Einwohner, 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? <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> </notification> @@ -185,7 +185,7 @@ Fortfahren? <notification name="JoinGroupNoCost"> Sie treten der Gruppe [NAME] bei. Fortfahren? - <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Zusammenlegen"/> + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Beitreten"/> </notification> <notification name="JoinGroupCannotAfford"> Der Beitritt zu dieser Gruppe kostet [COST] L$. @@ -207,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"> @@ -455,7 +455,6 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht. <notification name="UnsupportedHardware"> 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. Weitere Informationen finden Sie auf [_URL]. <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=de @@ -921,13 +920,13 @@ Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen 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"> @@ -1315,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. @@ -1356,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. @@ -1376,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 @@ -1386,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. @@ -1406,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] @@ -1436,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"/> @@ -1741,7 +1740,7 @@ 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. </notification> @@ -2062,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. @@ -2079,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: @@ -2201,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. @@ -2353,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. @@ -2362,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"> @@ -2428,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"/> @@ -2562,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. 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 d824eff338..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,21 +4,51 @@ Moderat </panel.string> <panel.string name="type_pg"> - Allgemeiner Inhalt + Genereller Inhalt </panel.string> <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_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]"/> - <check_box label="Jede Woche automatisch erneuern" name="auto_renew"/> - <text_editor name="price_for_listing" tool_tip="Preis für Anzeige."/> - <text_editor name="classified_desc" value="[description]"/> + <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 2e0370c579..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> @@ -22,20 +30,19 @@ wird geladen... </text> <button label="Aktuellen Standort verwenden" 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> + <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_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml index 0d3c082a16..f300679e16 100644 --- a/indra/newview/skins/default/xui/de/panel_group_general.xml +++ b/indra/newview/skins/default/xui/de/panel_group_general.xml @@ -47,7 +47,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen. <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."/> <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"/> 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_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index eed365a1bb..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"> 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_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index a119c86b47..cc45f25c82 100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -7,6 +7,8 @@ <string name="no_friends" value="Keine Freunde"/> <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"> @@ -20,15 +22,15 @@ <accordion_tab name="tab_online" title="Online"/> <accordion_tab name="tab_all" title="Alle"/> </accordion> - <text name="no_friends_msg"> - Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie 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 label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Optionen"/> <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="MEINE GRUPPEN" name="groups_panel"> <panel label="bottom_panel" name="bottom_panel"> 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 3af4ee5a1e..82e5febf8d 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -83,7 +83,7 @@ <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"> diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml index 7359a4fda4..2215ea3988 100644 --- a/indra/newview/skins/default/xui/de/panel_places.xml +++ b/indra/newview/skins/default/xui/de/panel_places.xml @@ -7,9 +7,9 @@ <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_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index 626e35dd0b..45b560c759 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -9,7 +9,7 @@ <radio_item label="Groß" name="radio3" value="2"/> </radio_group> <text name="font_colors"> - Schriftfarbe: + Schriftfarben: </text> <color_swatch label="Sie" name="user"/> <text name="text_box1"> @@ -45,7 +45,7 @@ </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"/> + <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"/> 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 bd9e10b641..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,13 +20,13 @@ (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: 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_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index b01db30c82..96a86ed85d 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <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="Listen from"> + <text name="voice_chat_settings"> Voice-Chat-Einstellungen </text> + <text name="Listen from"> + Zuhören von: + </text> <radio_group name="ear_location"> <radio_item label="Kameraposition" name="0"/> <radio_item label="Avatarposition" name="1"/> diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml index cb598f89f6..cda2788e40 100644 --- a/indra/newview/skins/default/xui/de/panel_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_profile.xml @@ -41,10 +41,10 @@ </scroll_container> </layout_panel> <layout_panel name="profile_buttons_panel"> - <button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an" width="109"/> - <button label="IM" name="im" tool_tip="Instant Messenger öffnen" width="24"/> + <button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an"/> + <button label="IM" name="im" tool_tip="Instant Messenger öffnen"/> <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="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen"/> <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> 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 59a4c148a8..92ad9741bc 100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml @@ -70,5 +70,5 @@ <button label="Hinzufügen..." name="add_banned_avatar_btn"/> <button label="Entfernen..." name="remove_banned_avatar_btn"/> <button label="Nachricht an Grundstück" name="message_estate_btn"/> - <button label="Einwohner hinauswerfen" name="kick_user_from_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_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 283df990ae..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,10 +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)"> 24:00 H PST </text> - <button name="media_toggle_btn" tool_tip="Klicken, um Medien ein-/auszuschalten"/> + <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 81f1ebdf91..990543b725 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="Objektprofil"/> <text name="where" value="(inworld)"/> - <panel name="properties_panel" label=""> + <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"/> @@ -124,5 +124,6 @@ <button label="Öffnen" name="open_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 28b259896d..fc01b69461 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -636,7 +636,7 @@ Nicht verbunden </string> <string name="SIM_ACCESS_PG"> - Allgemein + Generell </string> <string name="SIM_ACCESS_MATURE"> Moderat @@ -753,11 +753,14 @@ Alpha </string> <string name="tattoo"> - Taetowierung + Tätowierung </string> <string name="invalid"> ungültig </string> + <string name="NewWearable"> + Neue/r/s [WEARABLE_ITEM] + </string> <string name="next"> Weiter </string> @@ -828,7 +831,7 @@ 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. @@ -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 @@ -1468,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> @@ -1506,6 +1512,9 @@ <string name="NoPicksClassifiedsText"> 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... </string> @@ -3268,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 58ea7cec9c..33977e9f1a 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"> @@ -263,7 +275,7 @@ Leyla Linden </text> left_pad="4" right="-10" name="Set..." - width="50" + width="90" top_delta="-2"/> <check_box enabled="false" @@ -395,7 +407,7 @@ Leyla Linden </text> name="Cancel Land Sale" left_pad="5" top_pad="-25" - width="145" /> + width="180" /> <text type="string" length="1" @@ -474,10 +486,10 @@ Leyla Linden </text> height="23" label="Buy Land" layout="topleft" - left_delta="82" + left_delta="52" name="Buy Land..." top_pad="7" - width="100" /> + width="130" /> <button enabled="true" follows="left|top" @@ -487,7 +499,7 @@ Leyla Linden </text> left="10" name="Scripts..." top_pad="1" - width="100" /> + width="150" /> <button enabled="false" follows="left|top" @@ -504,11 +516,11 @@ Leyla Linden </text> height="23" label="Buy Pass" layout="topleft" - left_delta="-105" + left_delta="-135" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land." top_delta="0" - width="100" /> + width="130" /> <button follows="left|top" height="23" @@ -1044,7 +1056,7 @@ Leyla Linden </text> left="10" name="Autoreturn" top_pad="0" - width="294"> + width="310"> Auto return other Residents' objects (minutes, 0 for off): </text> <line_editor @@ -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" @@ -1874,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 @@ -1894,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_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 1ffedde29b..9dff4abe2c 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -218,14 +218,14 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="1" initial_value="0" label="In(%)" - label_width="49" + label_width="70" layout="topleft" top_pad="5" - left="30" + left="15" max_val="100" name="loop_in_point" tool_tip="Sets point in animation that looping returns to" - width="115" /> + width="130" /> <spinner bottom_delta="0" follows="left|top" @@ -238,8 +238,8 @@ Maximum animation length is [MAX_LENGTH] seconds. max_val="100" name="loop_out_point" tool_tip="Sets point in animation that ends a loop" - label_width="49" - width="115" /> + label_width="60" + width="120" /> <text type="string" length="1" @@ -256,10 +256,10 @@ Maximum animation length is [MAX_LENGTH] seconds. <combo_box height="23" layout="topleft" - left_pad="0" + left_pad="20" name="hand_pose_combo" tool_tip="Controls what hands do during animation" - width="150"> + width="130"> <combo_box.item label="Spread" name="Spread" @@ -328,9 +328,9 @@ Maximum animation length is [MAX_LENGTH] seconds. </text> <combo_box height="23" - width="150" + width="130" layout="topleft" - left_pad="0" + left_pad="20" name="emote_combo" tool_tip="Controls what face does during animation"> <combo_box.item @@ -409,9 +409,9 @@ Maximum animation length is [MAX_LENGTH] seconds. </text> <combo_box height="23" - width="150" + width="130" layout="topleft" - left_pad="0" + left_pad="20" name="preview_base_anim" tool_tip="Use this to test your animation behavior while your avatar performs common actions."> <combo_box.item @@ -433,27 +433,27 @@ Maximum animation length is [MAX_LENGTH] seconds. increment="0.01" initial_value="0" label="Ease In (sec)" - label_width="110" + label_width="140" layout="topleft" left="10" max_val="10" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in" top_pad="10" - width="200" /> + width="210" /> <spinner follows="left|top" height="23" increment="0.01" initial_value="0" label="Ease Out (sec)" - label_width="110" + label_width="140" layout="topleft" top_pad="0" max_val="10" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out" - width="200" /> + width="210" /> <button follows="top|right" height="23" 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 98508e5113..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 diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index fd10938539..6f2b0fc3ea 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -307,7 +307,7 @@ label_selected="Save" layout="topleft" name="Save" - right="190" + right="186" top="477" width="82" /> <button @@ -319,7 +319,7 @@ name="Save As" top="477" right="304" - width="110" /> + 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_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index bcf15d7193..0255e202fb 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -228,7 +228,7 @@ name="rating_label" top_delta="3" value="Rating:" - width="58" /> + width="90" /> <text follows="left|right|top" height="16" 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_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_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index 0d381fe5cb..ba2e0d3277 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -14,22 +14,6 @@ single_instance="false" title="MY INVENTORY" width="467"> - <floater.string - name="Title"> - MY INVENTORY - </floater.string> - <floater.string - name="TitleFetching"> - MY INVENTORY (Fetching [ITEM_COUNT] Items...) [FILTER] - </floater.string> - <floater.string - name="TitleCompleted"> - MY INVENTORY ([ITEM_COUNT] Items) [FILTER] - </floater.string> - <floater.string - name="Fetched"> - Fetched - </floater.string> <panel bottom="560" class="panel_main_inventory" 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_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index d7a7daf30c..b5a3764e73 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -10,7 +10,7 @@ help_topic="preferences" single_instance="true" title="PREFERENCES" - width="620"> + width="658"> <button follows="right|bottom" height="23" @@ -48,7 +48,7 @@ tab_width="115" tab_padding_right="5" top="21" - width="620"> + width="658"> <panel class="panel_preference" filename="panel_preferences_general.xml" diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index ead5b8c8f2..e9099211a3 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -25,10 +25,6 @@ name="Title"> Notecard: [NAME] </floater.string> - <floater.string - name="Save"> - Save - </floater.string> <icon follows="top|right" height="18" 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 663899d4b3..12ade86b5f 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -3,7 +3,7 @@ legacy_header_height="18" background_visible="true" follows="left|top|right|bottom" - height="369" + height="250" layout="topleft" left="0" name="script_floater" @@ -11,8 +11,8 @@ can_dock="true" can_minimize="true" visible="false" - width="520" + 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 01548dd820..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" @@ -149,7 +149,7 @@ left="10" name="type_label2" top_pad="5" - width="120"> + width="127"> Size </text> <text @@ -199,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" @@ -228,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" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 4e59a9b1ca..43a221d0e1 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -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"> @@ -705,7 +705,7 @@ left="135" name="button apply to selection" tool_tip="Modify selected land" - width="78"> + width="82"> <button.commit_callback function="BuildTool.applyToSelection"/> </button> @@ -741,7 +741,7 @@ halign="center" left="0" name="Object Info Tabs" - tab_max_width="54" + tab_max_width="100" tab_min_width="40" tab_position="top" tab_height="25" @@ -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" @@ -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" @@ -2051,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" @@ -2064,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" @@ -2078,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" @@ -2091,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" @@ -2104,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" @@ -2117,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" @@ -2131,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" @@ -2145,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" @@ -2816,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/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 7b6081d7be..85853f39bb 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -156,18 +156,19 @@ name="notify_container" tab_group="-2" width="1024"/> - <menu_holder top="0" - follows="all" - height="768" - mouse_opaque="false" - name="Menu Holder" - 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" + mouse_opaque="false" + name="Menu Holder" + width="1024"/> <snapshot_floater_view enabled="false" follows="all" height="768" 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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 936f4a3fab..5680b91c05 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 @@ -2848,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 @@ -2952,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. @@ -2994,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). @@ -3015,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. @@ -3057,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] @@ -3137,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 @@ -5379,27 +5379,6 @@ Grant this request? </form> </notification> - <notification - icon="notify.tga" - name="ScriptToast" - type="notify"> - [FIRST] [LAST]'s '[TITLE]' is requesting user input. - <form name="form"> - <button - index="0" - name="Open" - text="Open Dialog"/> - <button - index="1" - name="Ignore" - text="Ignore"/> - <button - index="2" - name="Block" - text="Block"/> - </form> - </notification> - <!-- <notification icon="notify.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 1e2e74f882..876ff9961b 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 @@ -69,7 +69,7 @@ name="last_interaction" text_color="LtGray_50" value="0s" - width="24" /> + width="35" /> <button follows="right" height="16" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 015a2e91ff..e70a0512d6 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -59,9 +59,9 @@ height="28" layout="topleft" min_height="28" - width="100" + width="105" top_delta="0" - min_width="100" + min_width="54" name="speak_panel" user_resize="false"> <talk_button @@ -73,11 +73,13 @@ left="0" name="talk" top="5" - width="100"> + width="105"> <speak_button + halign="left" name="speak_btn" label="Speak" label_selected="Speak" + pad_left="12" /> <show_button> <show_button.init_callback 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 869a05f27d..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,14 +22,22 @@ name="l$_price"> L$[PRICE] </panel.string> -<panel.string + <panel.string name="click_through_text_fmt"> - [TELEPORT] teleport, [MAP] map, [MAP] profile + [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" @@ -59,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" @@ -71,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="10" + left="0" name="classified_snapshot" - top="10" + top="0" width="275" /> + </panel> <text_editor allow_scroll="false" bg_visible="false" @@ -94,7 +112,7 @@ font="SansSerifBig" font.style="BOLD" left="10" - top_pad="0" + top_pad="10" name="classified_name" read_only="true" text_color="white" @@ -117,7 +135,7 @@ bg_visible="false" follows="left|top" h_pad="0" - height="25" + height="30" layout="topleft" left="10" name="classified_location" @@ -135,9 +153,27 @@ left="10" name="content_type_label" text_color="white" - top_pad="0" + 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" @@ -145,11 +181,11 @@ h_pad="0" height="18" layout="topleft" - left_pad="0" + left_pad="2" name="content_type" read_only="true" - width="150" - top_pad="-10" + width="130" + top_delta="1" v_pad="0" value="[content type]" /> <text @@ -213,7 +249,7 @@ left="10" name="price_for_listing_label" text_color="white" - top_pad="0" + top_pad="5" value="Price for listing:" width="140" /> <text_editor @@ -231,26 +267,26 @@ tool_tip="Price for listing." v_pad="0" value="[price]" - width="150" /> + width="105" /> <layout_stack animate="false" name="descr_stack" layout="topleft" - follows="top|left" + follows="all" orientation="vertical" left="10" - top_pad="0" + top_pad="5" width="290" - height="250"> + height="215"> <layout_panel auto_resize="false" name="clickthrough_layout_panel" layout="topleft" - follows="top|left" + follows="all" left="0" top="0" width="290" - height="26" + height="16" user_resize="false"> <text follows="left|top" @@ -284,28 +320,37 @@ auto_resize="false" name="price_layout_panel" layout="topleft" - follows="top|left" + follows="all" left="0" top="0" width="290" - height="26" + height="16" user_resize="false"> - <check_box - enabled="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" - label="Auto renew each week" layout="topleft" follows="top|left" - left="0" + left_pad="0" name="auto_renew" - top="0" - v_pad="0" - width="290" /> + top_pad="-10" + value="Enabled" + width="150" /> </layout_panel> <layout_panel name="descr_layout_panel" layout="topleft" - follows="top|left" + follows="all" left="0" top="0" width="290" @@ -327,7 +372,7 @@ allow_html="true" allow_scroll="true" bg_visible="false" - follows="left|top|right" + follows="all" h_pad="0" height="200" layout="topleft" @@ -335,8 +380,8 @@ max_length="1023" name="classified_desc" read_only="true" - top_pad="5" - width="290" + top_pad="7" + width="280" v_pad="0" value="[description]" word_wrap="true" /> 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 6cc6c51fe0..7383edf63d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -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" @@ -62,24 +68,33 @@ height="690" left="0" 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="10" - left="11" + top="0" + left="0" name="classified_snapshot" /> - <icon + <icon height="197" image_name="spacer24.tga" layout="topleft" name="edit_icon" label="" tool_tip="Click to select an image" - top="10" - left="11" - width="286" /> + top="0" + left="0" + width="272" /> + </panel> <text type="string" length="1" @@ -171,7 +186,7 @@ left="10" top_pad="5" name="set_to_curr_location_btn" - width="156" /> + width="200" /> <text follows="left|top" font.style="BOLD" @@ -202,25 +217,41 @@ top_pad="15" value="Content type:" width="250" /> - <combo_box - allow_text_entry="false" - follows="left|top" - height="23" + <icons_combo_box + follows="left|top" + height="23" + label="General Content" + layout="topleft" left="10" - name="content_type" + 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" @@ -272,7 +303,7 @@ <button follows="bottom|left" height="23" - label="Save" + label="[LABEL]" layout="topleft" name="save_changes_btn" left="0" 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 657e369beb..08ee0306dd 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -12,6 +12,10 @@ help_topic="profile_edit_pick" top="0" width="333"> + <panel.string + name="location_notice"> + (will update after save) + </panel.string> <button follows="top|right" height="23" @@ -164,7 +168,7 @@ left="8" top_pad="0" name="set_to_curr_location_btn" - width="156" /> + width="200" /> </panel> </scroll_container> <panel @@ -179,7 +183,7 @@ <button follows="bottom|left" height="23" - label="Save [WHAT]" + label="Save Pick" layout="topleft" name="save_changes_btn" left="0" 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 5147bb72d0..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 @@ -44,11 +44,16 @@ background_visible="true" 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="SansSerifHugeBold" + h_pad="0" height="26" left_pad="10" text_color="LtGray" 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_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index e6f67078d1..c7768c6eb6 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -10,9 +10,34 @@ name="main inventory panel" width="330"> <panel.string - name="Title"> - Things + name="Itemcount"> </panel.string> + <panel.string + name="ItemcountFetching"> + Fetching [ITEM_COUNT] Items... [FILTER] + </panel.string> + <panel.string + name="ItemcountCompleted"> + [ITEM_COUNT] Items [FILTER] + </panel.string> + <panel.string + name="ItemcountUnknown"> + + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="12" + name="ItemcountText" + font="SansSerifMedium" + text_color="EmphasisColor" + top_pad="0" + width="300"> + Items: + </text> <menu_bar bg_visible="false" follows="left|top|right" @@ -21,8 +46,8 @@ left="10" mouse_opaque="false" name="Inventory Menu" - top="0" - visible="true" + top="+10" + visible="true" width="290"> <menu height="101" @@ -377,30 +402,30 @@ <filter_editor text_pad_left="10" follows="left|top|right" - height="23" + height="23" label="Filter Inventory" layout="topleft" left="10" -max_length="300" + max_length="300" name="inventory search editor" - top="26" + top="+31" width="303" /> <tab_container - bg_opaque_color="DkGray2" + 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"> + follows="all" + halign="center" + height="300" + 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" @@ -415,6 +440,7 @@ halign="center" layout="topleft" left="0" name="All Items" + sort_order_setting="InventorySortOrder" top="16" width="290" /> <inventory_panel diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index 7c0ce9e62e..d14712a7fa 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -95,6 +95,7 @@ follows="top|left" font="SansSerif" left="10" + name="nearby_media" width="100"> Nearby Media </text> @@ -105,6 +106,7 @@ font="SansSerif" top_pad="15" left="10" + name="show" width="40"> Show: </text> @@ -130,7 +132,7 @@ <combo_box.item label="On other Avatars" value="4" - ame="OnOthers" /> + name="OnOthers" /> </combo_box> <scroll_list name="media_list" @@ -179,6 +181,7 @@ top_pad="5" height="30" left="10" + name="media_controls_panel" right="-10"> <layout_stack name="media_controls" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 375f5b6593..13791a6d32 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -232,7 +232,7 @@ top="10" width="293" wrap="true"> - To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend. + 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> 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 01a27a08c7..9e5ef10d42 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -325,6 +325,7 @@ top_pad="10" width="313"> <accordion_tab + height="170" layout="topleft" name="parcel_characteristics_tab" title="Parcel"> @@ -352,7 +353,7 @@ left_pad="12" name="rating_label" value="Rating:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -379,7 +380,7 @@ name="voice_label" top_delta="0" value="Voice:" - width="60" /> + width="90" /> <text follows="left|right|top" height="18" @@ -405,7 +406,7 @@ left_pad="8" name="fly_label" value="Fly:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -431,7 +432,7 @@ left_pad="8" name="push_label" value="Push:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -457,7 +458,7 @@ left_pad="8" name="build_label" value="Build:" - width="60" /> + width="90" /> <text follows="left|right|top" height="15" @@ -483,7 +484,7 @@ left_pad="8" name="scripts_label" value="Scripts:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -509,7 +510,7 @@ left_pad="8" name="damage_label" value="Damage:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -537,6 +538,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="150" layout="topleft" name="region_information_tab" title="Region"> @@ -664,6 +666,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="190" layout="topleft" name="estate_information_tab" title="Estate"> @@ -753,6 +756,7 @@ </accordion_tab> <accordion_tab expanded="false" + height="320" layout="topleft" name="sales_tab" title="For Sale"> 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 4be4d6b432..c658e0de6f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -13,6 +13,10 @@ name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <panel.string + name="middle_mouse"> + Middle Mouse + </panel.string> <icon follows="left|top" height="18" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 188fd3b7bc..516457dd93 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -51,13 +51,13 @@ Always show: </text> <scroll_list - follows="top|left" + follows="top|left|right" height="140" layout="topleft" left="10" multi_select="true" name="enabled_popups" - width="475" /> + width="495" /> <button enabled_control="FirstSelectedDisabledPopups" follows="top|left" @@ -99,11 +99,11 @@ Never show: </text> <scroll_list - follows="top|left" + follows="top|left|right" height="140" layout="topleft" left="10" multi_select="true" name="disabled_popups" - width="475" /> + width="495" /> </panel> 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 3d434361b9..eb2112c586 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -337,6 +337,7 @@ top_pad="5" width="400" /> <text + name="show_ims_in_label" follows="left|top" layout="topleft" left="30" @@ -346,6 +347,7 @@ Show IMs in: </text> <text + name="requires_restart_label" follows="left|top" layout="topleft" top_delta="0" 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 d11aebe943..e667fa9a2b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -365,12 +365,12 @@ use_ellipses="false" hover="false" commit_on_focus_lost = "true" - follows="left|top" + follows="left|top|right" height="60" layout="topleft" left="50" name="busy_response" - width="440" + width="450" word_wrap="true"> log_in_to_change </text_editor> 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 f20526b491..c74de043e9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -635,7 +635,7 @@ left_delta="-230" name="LightingDetailText" top_pad="8" - width="128"> + width="140"> Lighting detail: </text> <radio_group @@ -672,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_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 8723e0a832..15f8b33f5b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -142,14 +142,14 @@ increment="1" initial_value="13000" label="Port number:" - label_width="75" + label_width="105" layout="topleft" left_delta="160" max_val="13050" min_val="13000" name="connection_port" - top_delta="-2" - width="140" /> + top_delta="3" + width="170" /> <text type="string" length="1" @@ -273,7 +273,7 @@ layout="topleft" left="0" name="internal" - value="0" + value="" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." top="0" width="480" /> @@ -283,7 +283,7 @@ layout="topleft" left_delta="0" name="external" - value="1" + value="true" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." top_delta="20" width="480" /> 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 d336e18011..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 @@ -59,7 +59,7 @@ left_delta="0" name="owner_text" top_pad="2" - width="180"> + width="80"> Estate owner: </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_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index c188c1bf8b..0c870e155b 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -3,7 +3,7 @@ background_opaque="true" background_visible="true" bg_opaque_color="MouseGray" - chrome="true" + chrome="true" follows="top|right" height="19" layout="topleft" @@ -11,7 +11,7 @@ mouse_opaque="false" name="status" top="19" - tab_stop="false" + tab_stop="false" width="1000"> <panel.string name="StatBarDaysOfWeek"> @@ -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" @@ -88,7 +88,7 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="80"> + width="100"> 24:00 AM PST </text> <button 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 7713f8ef7c..d46783e058 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" @@ -303,7 +303,7 @@ follows="left|top|right" layout="topleft" name="perm_modify" - width="200"> + width="310"> You can modify this object </text> <text @@ -550,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 59c54f0cad..d24873e9e6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -14,7 +14,14 @@ <!-- starting up --> <string name="StartupDetectingHardware">Detecting hardware...</string> - <string name="StartupLoading">Loading</string> + <string name="StartupLoading">Loading [APP_NAME]...</string> + <string name="StartupClearingCache">Clearing cache...</string> + <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingVFS">Initializing VFS...</string> + + <!-- progress --> + <string name="ProgressRestoring">Restoring...</string> + <string name="ProgressChangingResolution">Changing Resolution...</string> <!-- Legacy strings, almost never used --> <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> @@ -40,12 +47,18 @@ <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> - + <string name="SavingSettings">Saving your settings...</string> + <string name="LoggingOut">Logging out...</string> + <string name="ShuttingDown">Shutting down...</string> + <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string> + <string name="SentToInvalidRegion">You were sent to an invalid region.</string> + <string name="TestingDisconnect">Testing viewer disconnect</string> <!-- Tooltip, lltooltipview.cpp --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> @@ -68,6 +81,12 @@ <string name="TooltipHttpUrl">Click to view this web page</string> <string name="TooltipSLURL">Click to view this location's information</string> <string name="TooltipAgentUrl">Click to view this Resident's profile</string> + <string name="TooltipAgentMute">Click to mute this Resident</string> + <string name="TooltipAgentUnmute">Click to unmute this Resident</string> + <string name="TooltipAgentIM">Click to IM this Resident</string> + <string name="TooltipAgentPay">Click to Pay this Resident</string> + <string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string> + <string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</string> <string name="TooltipGroupUrl">Click to view this group's description</string> <string name="TooltipEventUrl">Click to view this event's description</string> <string name="TooltipClassifiedUrl">Click to view this classified</string> @@ -76,12 +95,22 @@ <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> <string name="SLurlLabelShowOnMap">Show Map for</string> + <!-- label strings for secondlife:///app/agent SLapps --> + <string name="SLappAgentMute">Mute</string> + <string name="SLappAgentUnmute">Unmute</string> + <string name="SLappAgentIM">IM</string> + <string name="SLappAgentPay">Pay</string> + <string name="SLappAgentOfferTeleport">Offer Teleport to </string> + <string name="SLappAgentRequestFriend">Friend Request </string> + <!-- ButtonToolTips, llfloater.cpp --> <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> @@ -132,6 +161,7 @@ <string name="AssetErrorUnknownStatus">Unknown status</string> <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> + <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem --> <string name="texture">texture</string> <string name="sound">sound</string> <string name="calling card">calling card</string> @@ -156,6 +186,7 @@ <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> + <string name="symbolic folder link">folder link</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> @@ -1821,6 +1852,7 @@ Clears (deletes) the media and all params from the given face. <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> <string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" /> + <string name="ActiveGesture" value="[GESLABEL] (active)"/> <!-- Inventory permissions --> <string name="PermYes">Yes</string> <string name="PermNo">No</string> @@ -1877,6 +1909,7 @@ Clears (deletes) the media and all params from the given face. <string name="InvFolder favorite">Favorites</string> <string name="InvFolder Current Outfit">Current Outfit</string> <string name="InvFolder My Outfits">My Outfits</string> + <string name="InvFolder Accessories">Accessories</string> <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> <string name="InvFolder Friends">Friends</string> @@ -2106,6 +2139,7 @@ Clears (deletes) the media and all params from the given face. <!-- panel contents --> <string name="PanelContentsNewScript">New Script</string> + <string name="PanelContentsTooltip">Content of object</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> @@ -3013,4 +3047,30 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="unread_chat_multiple"> [SOURCES] have said something new </string>" + + <!-- Financial operations strings --> + <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> + <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string> + <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> + <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> + <string name="for a parcel of land">for a parcel of land</string> + <string name="for a land access pass">for a land access pass</string> + <string name="for deeding land">for deeding land</string> + <string name="to create a group">to create a group</string> + <string name="to join a group">to join a group</string> + <string name="to upload">to upload</string> + + <string name="giving">Giving</string> + <string name="uploading_costs">Uploading costs</string> + <string name="this_costs">This costs</string> + <string name="buying_selected_land">Buying selected land</string> + <string name="this_object_costs">This object costs"</string> + + <string name="group_role_everyone">Everyone</string> + <string name="group_role_officers">Officers</string> + <string name="group_role_owners">Owners</string> + + <string name="uploading_abuse_report">Uploading... + +Abuse Report</string> </strings> 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/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index a42f9a8e3e..cb1aa5eaa1 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -54,7 +54,7 @@ Gracias a los siguientes Residentes por ayudarnos a estar seguros de que, hoy po -No es frecuente el pensamiento 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. +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> 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 bcb970c79d..006a82eab6 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="ACERCA DEL TERRENO"> + <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] minutos </floater.string> @@ -15,7 +24,7 @@ <tab_container name="landtab"> <panel label="GENERAL" name="land_general_panel"> <panel.string name="new users only"> - Sólo usuarios nuevos + Sólo nuevos Residentes </panel.string> <panel.string name="anyone"> Cualquiera @@ -84,9 +93,9 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="GroupText"> Leyla Linden </text> - <button label="Configurar..." label_selected="Configurar..." name="Set..."/> + <button label="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."/> + <button label="Transferir" name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/> <check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/> <text name="For Sale:"> En venta: @@ -97,7 +106,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="For Sale: Price L$[PRICE]."> Precio: [PRICE] L$ ([PRICE_PER_SQM] L$/m²). </text> - <button label="Vender el terreno..." label_selected="Vender el terreno..." name="Sell Land..."/> + <button label="Vender el terreno" name="Sell Land..."/> <text name="For sale to"> En venta a: [BUYER] </text> @@ -107,7 +116,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="Selling with no objects in parcel." width="216"> Los objetos no se incluyen en la venta. </text> - <button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale" width="165"/> + <button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale"/> <text name="Claimed:"> Reclamada: </text> @@ -126,13 +135,13 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="DwellText"> 0 </text> - <button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/> + <button label="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" 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."/> + <button label="Comprar para el grupo" name="Buy For Group..."/> + <button label="Comprar un pase" left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/> + <button label="Abandonar el terreno" name="Abandon Land..."/> + <button label="Reclamar el terreno" name="Reclaim Land..."/> + <button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/> </panel> <panel label="CONTRATO" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -231,7 +240,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <button label="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> @@ -239,7 +248,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <button label="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> @@ -247,7 +256,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> + <button label="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> @@ -262,7 +271,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s Propietarios de los objetos: </text> <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"/> + <button label="Devolver los objetos" left="270" name="Return objects..." width="164"/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nombre" name="name"/> @@ -307,17 +316,17 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. </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"> + <text 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"> + <text 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"> + <text name="allow_label4"> Ejecutar scripts: </text> <check_box label="Todos los residentes" left="255" name="check other scripts"/> @@ -397,7 +406,7 @@ la textura: </text> <texture_picker label="" left="97" name="media texture" tool_tip="Pulse para elegir una imagen"/> <text name="replace_texture_help" width="285"> - 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. + 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 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"> @@ -415,7 +424,7 @@ los media: <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="SONIDO" name="land_audio_panel"> - <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Marcando 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="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"/> @@ -424,6 +433,9 @@ los media: <panel.string name="access_estate_defined"> (Definido por el Estado) </panel.string> + <panel.string name="allow_public_access"> + Permitir el acceso público ([MATURITY]) + </panel.string> <panel.string name="estate_override"> Una o más de esta opciones está configurada a nivel del estado </panel.string> @@ -435,7 +447,7 @@ los media: Restringir el acceso a residentes verificados con: </text> <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. Para más información, véase [SUPPORT_SITE]."/> + <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"> 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 2fc18e55f6..a40d53a8a8 100644 --- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml @@ -115,14 +115,14 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos. <text name="description_label"> Descripción: </text> - <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"/> + <spinner label="Prioridad:" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta"/> + <check_box label="Bucle:" name="loop_check" tool_tip="Hace esta animación en bucle"/> + <spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar"/> + <spinner label="Acaba(%)" 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" name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación" width="164"> + <combo_box name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación"> <combo_box.item label="Extendidas" name="Spread"/> <combo_box.item label="Relajadas" name="Relaxed"/> <combo_box.item label="Ambas señalan" name="PointBoth"/> @@ -140,7 +140,7 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos. <text name="emote_label"> Expresión </text> - <combo_box left_delta="120" name="emote_combo" tool_tip="Controla qué hace la cara durante la animación" width="164"> + <combo_box name="emote_combo" tool_tip="Controla qué hace la cara durante la animación"> <combo_box.item label="(ninguno)" name="[None]"/> <combo_box.item label="Aaaaah" name="Aaaaah"/> <combo_box.item label="Con miedo" name="Afraid"/> @@ -162,17 +162,17 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos. <combo_box.item label="Guiño" name="Wink"/> <combo_box.item label="Preocupación" name="Worry"/> </combo_box> - <text name="preview_label" width="250"> + <text name="preview_label"> Vista previa mientras </text> - <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 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 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="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"/> + <spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones"/> + <spinner 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="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"/> @@ -180,8 +180,7 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos. <text name="bad_animation_text"> No se ha podido leer el archivo de la animación. -Recomendamos usar archivos BVH exportados de -Poser 4. +Recomendamos usar archivos BVH exportados de Poser 4. </text> <button label="Subir ([AMOUNT] L$)" name="ok_btn"/> <button label="Cancelar" name="cancel_btn"/> 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 b53b9a3889..089ff3cd68 100644 --- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml @@ -17,10 +17,10 @@ <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="Oho" name="eyes_iris"/> + <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="Parte superior del cuerpo: bodypaint" name="upper_bodypaint"/> + <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"/> @@ -28,7 +28,7 @@ <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="Parte inferior del cuerpo: bodypaint" name="lower_bodypaint"/> + <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"/> 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 0d280320e2..81c54cf600 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml @@ -46,7 +46,7 @@ [AMT] L$ </text> <text name="currency_links"> - [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 pago] + [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. 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 496e719c6d..9a0a566a55 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml @@ -41,8 +41,8 @@ Inténtelo seleccionando un área más pequeña. 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. + Está seleccionado un terreno propiedad de otro Residente. +Prueba a seleccionar un área más pequeña. </floater.string> <floater.string name="processing"> Procesando su compra... diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml index 40c5603706..787c37e12c 100644 --- a/indra/newview/skins/default/xui/es/floater_camera.xml +++ b/indra/newview/skins/default/xui/es/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Mover la cámara arriba y abajo, izquierda y derecha </floater.string> + <floater.string name="orbit_mode_title"> + Orbital + </floater.string> + <floater.string name="pan_mode_title"> + Panorámica + </floater.string> + <floater.string name="avatar_view_mode_title"> + Posición de tu cámara + </floater.string> + <floater.string name="free_mode_title"> + Centrar el objeto + </floater.string> <panel name="controls"> <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"> diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml index 97191a1336..4b332cd9c3 100644 --- a/indra/newview/skins/default/xui/es/floater_customize.xml +++ b/indra/newview/skins/default/xui/es/floater_customize.xml @@ -35,7 +35,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una anatomÃa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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. @@ -68,7 +68,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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. @@ -105,7 +105,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vÃstetelo. + 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. @@ -136,7 +136,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos. + 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. @@ -177,7 +177,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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. @@ -210,7 +210,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos. + 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. @@ -236,7 +236,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos. + 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"> @@ -269,7 +269,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos. + 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"> @@ -302,7 +302,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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"> @@ -336,7 +336,7 @@ Situados en [PATH] </text> <text name="not worn instructions"> - Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos. + 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"> @@ -369,7 +369,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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"> @@ -402,7 +402,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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"> @@ -435,7 +435,7 @@ Situada en [PATH] </text> <text name="not worn instructions"> - Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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"> @@ -468,7 +468,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte un tatuaje nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vÃstetelo. + 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"> @@ -502,7 +502,7 @@ Situado en [PATH] </text> <text name="not worn instructions"> - Ponte una capa Alfa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela. + 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"> diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml index f2ce40e994..4bc5221796 100644 --- a/indra/newview/skins/default/xui/es/floater_event.xml +++ b/indra/newview/skins/default/xui/es/floater_event.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Event" name="Event" title="DETALLES DEL EVENTO"> +<floater label="Evento" name="Event" title="DETALLES DEL EVENTO"> <floater.string name="none"> - Ninguno + ninguno </floater.string> <floater.string name="notify"> Notificar @@ -9,6 +9,18 @@ <floater.string name="dont_notify"> No notificar </floater.string> + <floater.string name="moderate"> + Moderado + </floater.string> + <floater.string name="adult"> + Adulto + </floater.string> + <floater.string name="general"> + General + </floater.string> + <floater.string name="unknown"> + desconocida + </floater.string> <layout_stack name="layout"> <layout_panel name="profile_stack"> <text name="event_name"> @@ -21,12 +33,21 @@ Organizado por: </text> <text initial_value="(obteniendo)" name="event_runby"/> + <text name="event_date_label"> + Fecha: + </text> <text name="event_date"> 10/10/2010 </text> + <text name="event_duration_label"> + Duración: + </text> <text name="event_duration"> 1 hora </text> + <text name="event_covercharge_label"> + Entrada: + </text> <text name="event_cover"> Gratis </text> @@ -36,6 +57,9 @@ <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> <text name="rating_label" value="Calificación:"/> <text name="rating_value" value="desconocida"/> + <expandable_text name="event_desc"> + 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 name="button_panel"> <button name="create_event_btn" tool_tip="Crear el evento"/> 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 b604f7f46f..73187f208b 100644 --- a/indra/newview/skins/default/xui/es/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml @@ -2,7 +2,7 @@ <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="Expulsar a todos los Residentes" label_selected="Expulsar a todos los Residentes" 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"> diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml index d87623c3df..3850b94fd6 100644 --- a/indra/newview/skins/default/xui/es/floater_im.xml +++ b/indra/newview/skins/default/xui/es/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="Mensaje Instantáneo"> <string name="only_user_message"> - Usted es el único usuario en esta sesión. + Eres el único Residente en esta sesión. </string> <string name="offline_message"> [FIRST] [LAST] no está conectado. @@ -10,7 +10,7 @@ Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> <string name="muted_message"> - Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje. + 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. @@ -31,7 +31,7 @@ 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]. + No es posible añadir Residentes 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]. diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml index 1269943879..7cb41d3f5b 100644 --- a/indra/newview/skins/default/xui/es/floater_moveview.xml +++ b/indra/newview/skins/default/xui/es/floater_moveview.xml @@ -18,6 +18,15 @@ <string name="fly_back_tooltip"> Volar hacia atrás (cursor abajo o S) </string> + <string name="walk_title"> + Caminar + </string> + <string name="run_title"> + Correr + </string> + <string name="fly_title"> + Volar + </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)"/> @@ -30,6 +39,5 @@ <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_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml index 869babee44..9f9902a3a0 100644 --- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/es/floater_outfit_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 lo que estoy llevando + Guardar lo que llevo puesto como un vestuario nuevo: </text> <line_editor name="name ed"> diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml index 52c6593f75..e2a53693b5 100644 --- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml @@ -28,10 +28,10 @@ Has sido desconectado de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_other"> - [VOICE_CHANNEL_NAME] ha finalizado la llamada. [RECONNECT_NEARBY] + [VOICE_CHANNEL_NAME] ha colgado la llamada. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_agent"> - Has finalizado la llamada. [RECONNECT_NEARBY] + Has finalizado la llamada. [RECONNECT_NEARBY] </text> <text name="leaving"> Saliendo de [CURRENT_CHAT]. diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml new file mode 100644 index 0000000000..5eed89d522 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="Publicación de clasificados"> + <text name="explanation_text"> + Tu anuncio clasificado se mostrará durante una semana a partir del dÃa en que se publicó. + +Recuerda, no se reembolsarán las cantidades abonadas por clasificados. + </text> + <spinner label="Precio por el anuncio:" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + Más información (enlace a ayuda de clasificados) + </text> + <button label="Publicar" name="publish_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml index 095112dbdc..410f7b5e36 100644 --- a/indra/newview/skins/default/xui/es/floater_script_limits.xml +++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="scriptlimits" title="INFORMACIÓN DEl SCRIPT"/> +<floater name="scriptlimits" title="INFORMACIÓN DEL SCRIPT"/> 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 d597926d39..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:"> - Pulsa una tecla para configurarla como botón de Apretar para Hablar. + Pulsa una tecla para configurarla como tu botón para hablar. </text> </floater> diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index 78d9b2a9c8..cbacce304c 100644 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml @@ -4,7 +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, lee cuidadosamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este 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_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml index 9996860137..2c1f6cfbfb 100644 --- a/indra/newview/skins/default/xui/es/floater_water.xml +++ b/indra/newview/skins/default/xui/es/floater_water.xml @@ -7,7 +7,7 @@ <button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/> <button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Configuraciones" name="Settings"> + <panel label="CONFIGURACIÓN" name="Settings"> <text name="BHText"> Color del agua </text> @@ -55,7 +55,7 @@ </text> <button label="?" left="640" name="WaterBlurMultiplierHelp"/> </panel> - <panel label="Imagen" name="Waves"> + <panel label="IMAGEN" name="Waves"> <text name="BHText"> Sentido de la onda grande </text> diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml index 0697f05553..9bc3750951 100644 --- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml @@ -6,9 +6,9 @@ <button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/> <button label="Guardar" label_selected="Guardar" name="WLSavePreset"/> <button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/> - <button font="SansSerifSmall" width="150" left_delta="90" label="Editor del ciclo de un dÃa" label_selected="Editor del ciclo de un dÃa" name="WLDayCycleMenuButton"/> + <button font="SansSerifSmall" label="Editor del ciclo de un dÃa" label_selected="Editor del ciclo de un dÃa" left_delta="90" name="WLDayCycleMenuButton" width="150"/> <tab_container name="WindLight Tabs"> - <panel label="Atmósfera" name="Atmosphere"> + <panel label="ATMÓSFERA" name="Atmosphere"> <text name="BHText"> Coloración </text> @@ -62,7 +62,7 @@ </text> <button label="?" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Iluminación" name="Lighting"> + <panel label="LUZ" name="Lighting"> <text name="SLCText"> Color del Sol y de la Luna </text> @@ -118,11 +118,11 @@ </text> <button label="?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Nubes" name="Clouds"> + <panel label="NUBES" name="Clouds"> <text name="WLCloudColorText"> Color de las nubes </text> - <button label="?" name="WLCloudColorHelp" left="190" /> + <button label="?" left="190" name="WLCloudColorHelp"/> <text name="BHText"> R </text> @@ -138,7 +138,7 @@ <text name="WLCloudColorText2"> Posición/Densidad de las nubes </text> - <button label="?" name="WLCloudDensityHelp" left="190"/> + <button label="?" left="190" name="WLCloudDensityHelp"/> <text name="BHText5"> X </text> @@ -156,12 +156,12 @@ Altitud de las nubes </text> <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText" font="SansSerifSmall"> + <text font="SansSerifSmall" name="WLCloudDetailText"> Detalle de las nubes (Posición/Densidad) </text> <button label="?" name="WLCloudDetailHelp"/> - <text name="BHText8" bottom="-113"> + <text bottom="-113" name="BHText8"> X </text> <text name="BHText9"> @@ -182,7 +182,7 @@ <button label="?" name="WLCloudScrollYHelp"/> <check_box label="Bloquear" name="WLCloudLockY"/> <check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp" left="618"/> + <button label="?" left="618" name="WLClassicCloudsHelp"/> </panel> </tab_container> <string name="WLDefaultSkyNames"> 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 24b5ece0aa..38a12002f5 100644 --- a/indra/newview/skins/default/xui/es/floater_world_map.xml +++ b/indra/newview/skins/default/xui/es/floater_world_map.xml @@ -5,21 +5,17 @@ Leyenda </text> </panel> - <panel - name="layout_panel_2"> - <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 mi avatar"/> + <panel name="layout_panel_2"> + <button name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/> <text name="me_label"> Yo </text> - <check_box label="Residente" name="people_chk"/> <text name="person_label"> Persona </text> - <check_box label="Punto de Info" name="infohub_chk"/> <text name="infohub_label"> Punto de Info </text> - <check_box label="Terreno en venta" name="land_for_sale_chk"/> <text name="land_sale_label"> Venta de terreno </text> @@ -29,59 +25,46 @@ <text name="auction_label"> subasta de terreno </text> - <button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a mi Base"/> + <button name="Go Home" tool_tip="Teleportar a mi Base"/> <text name="Home_label"> Base </text> <text name="events_label"> Eventos: </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"/> + <check_box initial_value="verdadero" name="event_mature_chk"/> <text name="mature_label"> Moderado </text> - <check_box label="'Adult'" name="event_adult_chk"/> <text name="adult_label"> Adulto </text> </panel> - <panel - name="layout_panel_3"> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Encontrar en el mapa </text> </panel> - <panel - name="layout_panel_4"> - <combo_box label="Amigos conectados" name="friend combo" tool_tip="Ver a los amigos en el mapa"> + <panel name="layout_panel_4"> + <combo_box label="Amigos online" name="friend combo" tool_tip="Ver a los amigos en el mapa"> <combo_box.item label="Mis amigos conectados" name="item1"/> </combo_box> <combo_box label="Mis hitos" name="landmark combo" tool_tip="Hito a ver en el mapa"> <combo_box.item label="Mis hitos" name="item1"/> </combo_box> - <search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escriba el nombre de una región"/> + <search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escribe el nombre de una región"/> <button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/> <button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/> - <scroll_list name="search_results"> - <scroll_list.columns label="" name="icon"/> - <scroll_list.columns label="" name="sim_name"/> - </scroll_list> - <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/> + <button label="Teleportar" name="Teleport" tool_tip="Teleportar a la localización seleccionada"/> <button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/> - <button label="Ver lo elegido" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/> + <button label="Ver lo elegido" name="Show Destination" tool_tip="Centrar el mapa en la localización seleccionada"/> </panel> - <panel - name="layout_panel_5"> + <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/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml index 1004471025..46b6d3ece6 100644 --- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml @@ -1,7 +1,7 @@ <?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="Quitarse â–¶" name="Take Off >"> + <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"/> diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml index 1aa0a26ca8..602798b108 100644 --- a/indra/newview/skins/default/xui/es/menu_inventory.xml +++ b/indra/newview/skins/default/xui/es/menu_inventory.xml @@ -62,7 +62,7 @@ <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="About Landmark"/> - <menu_item_call label="Ejecutarla en el mundo" name="Animation Play"/> + <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..."/> 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 9c5a5719ee..8e464177fe 100644 --- a/indra/newview/skins/default/xui/es/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <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"/> diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml index 581ecd6698..1677b9461e 100644 --- a/indra/newview/skins/default/xui/es/menu_object.xml +++ b/indra/newview/skins/default/xui/es/menu_object.xml @@ -5,14 +5,15 @@ <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="Levantarme" name="Object Stand Up"/> <menu_item_call label="Perfil del objeto" name="Object Inspect"/> <menu_item_call label="Acercar el zoom" name="Zoom In"/> - <context_menu label="Ponerse â–¶" name="Put On"> + <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="Quitarse â–¶" name="Remove"> + <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..."/> diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml index f4e7671a92..60c92eec75 100644 --- a/indra/newview/skins/default/xui/es/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Participant List Context Menu"> - <menu_item_check label="Ordenar según el nombre" name="SortByName"/> - <menu_item_check label="Ordenar según los intervinientes recientes" name="SortByRecentSpeakers"/> + <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"/> @@ -11,10 +11,10 @@ <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="Autorizar el chat de texto" name="AllowTextChat"/> - <menu_item_call label="Silenciar a este participante" name="ModerateVoiceMuteSelected"/> + <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="Designorar a este participante" name="ModerateVoiceUnMuteSelected"/> - <menu_item_call label="Designorar a todos los demás" name="ModerateVoiceUnMuteOthers"/> + <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_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml index 8342497525..51bd2c7208 100644 --- a/indra/newview/skins/default/xui/es/menu_people_groups.xml +++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml @@ -2,7 +2,7 @@ <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="Llamada" name="Call"/> + <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_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 61cefd7b76..a0886b3e00 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -9,9 +9,9 @@ <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="Mi Inventario" name="ShowSidetrayInventory"/> <menu_item_check label="Mis gestos" name="Gestures"/> - <menu label="Mi estatus" name="Status"> + <menu label="Mi estado" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> <menu_item_call label="Ocupado" name="Set Busy"/> </menu> @@ -47,13 +47,13 @@ <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 aquà mi Base" name="Set Home to Here"/> + <menu_item_call label="Fijar mi Base aquÃ" name="Set Home to Here"/> <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="Tiempo del Estado" name="Revert to Region Default"/> + <menu_item_call label="Hora del Estado" name="Revert to Region Default"/> <menu_item_call label="Editor del entorno" name="Environment Editor"/> </menu> </menu> @@ -100,7 +100,7 @@ <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="Sólo seleccionar los objetos movibles" name="Select Only Movable 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"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 0f64550725..db1cc1caea 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -106,15 +106,15 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente. </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Ã"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="GrantModifyRights"> - Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso. + 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"> - Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso. + 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> @@ -144,7 +144,7 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente. 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="Confirma que vas a añadir un nuevo Propietario al grupo" 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]'. @@ -164,7 +164,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sà mi </notification> <notification name="AttachmentDrop"> Vas a soltar tu anexado. - ¿Quieres seguir? + ¿Estás seguro de que quieres continuar? <usetemplate ignoretext="Confirmar antes de soltar anexados" name="okcancelignore" notext="No" yestext="SÃ"/> </notification> <notification name="JoinGroupCanAfford"> @@ -441,9 +441,8 @@ 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"> - Debes saber que tu ordenador no cumple los requirimientos mÃnimos para [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. + 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 ¿Ir a [_URL] para más información? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=es @@ -452,7 +451,7 @@ MINSPECS </notification> <notification name="UnknownGPU"> Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce. -Esto suele suceder con hardware nuevo que aun no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas. +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="No se ha podido identificar mi tarjeta gráfica"/> @@ -734,7 +733,7 @@ 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"> - Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ha empezado. + 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> @@ -904,7 +903,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela. Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el Ãtem de aquà a unos minutos. </notification> <notification name="YouHaveBeenLoggedOut"> - Vaya, has sido desconectado de [SECOND_LIFE] + Vaya, se te ha cerrado la sesión en [SECOND_LIFE] [MESSAGE] <usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/> </notification> @@ -1309,8 +1308,8 @@ Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ConfirmKick"> - ¿DE VERDAD quiere expulsar a todos los usuarios de este grid? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los usuarios"/> + ¿Quieres realmente expulsar a todos los Residentes de la cuadrÃcula? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/> </notification> <notification name="MuteLinden"> Lo sentimos, pero no puedes ignorar a un Linden. @@ -1347,11 +1346,11 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue <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 antes de crear uno nuevo o entrar en alguno. + 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? + ¿Con qué mensaje quieres expulsar a este Residente? <form name="form"> <input name="message"> Un administrador le ha desconectado. @@ -1371,7 +1370,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue </form> </notification> <notification name="FreezeUser"> - ¿Con qué mensaje se congelará a este usuario? + ¿Con qué mensaje quieres congelar a este Residente? <form name="form"> <input name="message"> Ha sido usted congelado. No puede moverse o escribir en el chat. Un administrador contactará con usted a través de un mensaje instantáneo (MI). @@ -1381,7 +1380,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue </form> </notification> <notification name="UnFreezeUser"> - ¿Con qué mensaje se descongelará a este usuario? + ¿Con qué mensaje quieres congelar a este Residente? <form name="form"> <input name="message"> Ya no está usted congelado. @@ -1401,7 +1400,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue </form> </notification> <notification name="OfferTeleportFromGod"> - ¿Convocar a este usuario a su posición? + ¿Obligar a este Residente a ir a tu localización? <form name="form"> <input name="message"> Ven conmigo a [REGION] @@ -1431,11 +1430,11 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue </form> </notification> <notification label="Cambiar un estado Linden" name="ChangeLindenEstate"> - Va a hacer cambios en un estado propiedad de Linden (mainland, grid teen, orientación, etc.). + Estás a punto de cambiar un estado propiedad de Linden (continente, teen grid, orientación, etc.). -Esto es EXTREMADAMENTE PELIGROSO, porque puede afectar radicalmente al funcionamiento de los usuarios. En mainland, se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor. +Esto es EXTREMADAMENTE PELIGROSO porque puede afectar en gran manera la experiencia de los Residentes. En el Continente, cambiará miles de regiones y hará que se trastorne el servidor. -¿Proceder? +¿Continuar? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification label="Cambiar el acceso a un estado Linden" name="ChangeLindenAccess"> @@ -1526,7 +1525,7 @@ 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 ignoretext="No puedo reclamar este terreno, dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/> + <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. @@ -1550,7 +1549,7 @@ 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 ignoretext="No puedo comprar este terreno, dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/> + <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. @@ -1615,7 +1614,7 @@ Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferen </notification> <notification label="Cambiada la calificación de la región" name="RegionMaturityChange"> Se ha actualizado el nivel de calificación de esta región. -Llevará algún tiempo que el cambio se refleje en el mapa. +Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa. Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago. </notification> @@ -1731,11 +1730,11 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u <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? + ¿Estás seguro de que quieres salir? <usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] y las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. + 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]. Se investigan y resuelven todas las infracciones denunciadas. </notification> @@ -2062,7 +2061,7 @@ Pulsa en un hito para seleccionarlo, y, luego, pulsa 'Teleportar' en l </notification> <notification name="TeleportToPerson"> 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 superior del panel. +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"> @@ -2424,14 +2423,6 @@ Si no confias en este objeto y en su creador, deberÃas rehusar esta petición. <button name="Ignore" text="Ignorar"/> </form> </notification> - <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="BuyLindenDollarSuccess"> ¡Gracias por tu pago! @@ -2557,7 +2548,7 @@ Por tu seguridad, serán bloqueadas durante unos segundos. </notification> <notification name="ConfirmCloseAll"> ¿Seguro que quieres cerrar todos los MI? - <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/> + <usetemplate ignoretext="Confirmar antes de cerrar todos los MIs" name="okcancelignore" notext="Cancelar" yestext="OK"/> </notification> <notification name="AttachmentSaved"> Se ha guardado el adjunto. 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 index 7c11b3d193..cddbad1195 100644 --- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml @@ -6,5 +6,5 @@ <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="Quitar al Residente o al objeto de la lista de ignorados"/> + <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_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml index d46eadde48..f583cf2957 100644 --- a/indra/newview/skins/default/xui/es/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml @@ -3,16 +3,46 @@ <panel.string name="l$_price"> [PRICE] L$ </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil + </panel.string> + <panel.string name="date_fmt"> + [day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + Activada + </panel.string> + <panel.string name="auto_renew_off"> + Desactivada + </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 name="classified_location_label" value="Localización:"/> <text_editor name="classified_location" value="[cargando...]"/> + <text name="content_type_label" value="Tipo de contenido:"/> <text_editor name="content_type" value="[tipo de contenido]"/> + <text name="category_label" value="CategorÃa:"/> <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]"/> + <text name="creation_date_label" value="Fecha de creación:"/> + <text_editor name="creation_date" tool_tip="Fecha de creación" value="[date]"/> + <text name="price_for_listing_label" value="Precio por publicarlo:"/> + <text_editor name="price_for_listing" tool_tip="Precio por publicarlo." value="[price]"/> + <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="Información sobre Click through" value="[clicks]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="Renovación:"/> + <text name="auto_renew" value="Activada"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="Descripción:"/> + <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/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml index e612104b3f..7afa50c0a2 100644 --- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> (se actualizará tras guardarlo) </panel.string> + <string name="publish_label"> + Publicar + </string> + <string name="save_label"> + Guardar + </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"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/> + </panel> <text name="Name:"> TÃtulo: </text> @@ -22,12 +30,19 @@ cargando... </text> <button label="Configurarlo en esta localización" name="set_to_curr_location_btn"/> + <text name="category_label" value="CategorÃa:"/> + <text name="content_type_label" value="Tipo de contenido:"/> + <icons_combo_box label="Contenido general" name="content_type"> + <icons_combo_box.item label="Contenido moderado" name="mature_ci" value="Moderado"/> + <icons_combo_box.item label="Contenido general" name="pg_ci" value="General"/> + </icons_combo_box> + <text name="price_for_listing_label" value="Precio por publicarlo:"/> <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="[LABEL]" name="save_changes_btn"/> <button label="Cancelar" name="cancel_btn"/> </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 0dc22c107b..e1cac7c2c3 100644 --- a/indra/newview/skins/default/xui/es/panel_friends.xml +++ b/indra/newview/skins/default/xui/es/panel_friends.xml @@ -16,5 +16,5 @@ <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="Ofrece amistad a un Residente"/> + <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 index 82123016b1..b398293175 100644 --- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml @@ -5,7 +5,7 @@ <button label="Perfil del grupo" name="group_info_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> - <button label="Llamada de grupo" name="call_btn"/> + <button label="Llamar al grupo" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Colgar" name="end_call_btn"/> 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 2a64464fd9..0d877f78f2 100644 --- a/indra/newview/skins/default/xui/es/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml @@ -14,7 +14,7 @@ </text> <button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/> <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="Quita de la lista a los Residentes seleccionados arriba" width="214"/> + <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> 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 0e4288f772..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 @@ -54,7 +54,7 @@ Se necesitan más créditos de terreno para mantener el terreno en uso </text> <text name="group_money_heading"> - L$ del grupp + L$ del grupo </text> </panel> <tab_container name="group_money_tab_container"> 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 f4a6839156..58e1919782 100644 --- a/indra/newview/skins/default/xui/es/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml @@ -36,7 +36,7 @@ El máximo es de 200 por dÃa y grupo. <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="Quitar el adjunto de tu aviso"/> + <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"/> <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> 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 384864cba4..5ef81162bc 100644 --- a/indra/newview/skins/default/xui/es/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml @@ -6,22 +6,22 @@ <panel.string name="want_apply_text"> ¿Quieres guardar estos cambios? </panel.string> - <tab_container height="164" name="roles_tab_container"> - <panel height="148" label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros"> + <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. </panel.string> <filter_editor label="Filtrar los miembros" name="filter_input"/> - <name_list bottom_delta="-105" height="104" name="member_list"> + <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" width="175"/> + <button label="Invitar" name="member_invite"/> <button label="Expulsar" name="member_eject"/> </panel> - <panel height="148" label="ROLES" name="roles_sub_tab"> + <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 @@ -35,7 +35,7 @@ incluyendo el de Todos y el de Propietarios. Inv_FolderClosed </panel.string> <filter_editor label="Filtrar los roles" name="filter_input"/> - <scroll_list bottom_delta="-104" height="104" name="role_list"> + <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"/> 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 index f218324d50..7d4db6a630 100644 --- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml @@ -8,7 +8,7 @@ <button label="Añadir como amigo" name="add_friend_btn"/> </layout_panel> <layout_panel name="teleport_btn_panel"> - <button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> + <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"/> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index 8313306cf9..1a7040d01f 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -12,19 +12,29 @@ Nombre: </text> <line_editor label="Nombre" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <text name="last_name_text"> + Apellido: + </text> <line_editor label="Apellido" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> + <text name="password_text"> + Contraseña: + </text> <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 última localización" name="MyLastLocation"/> <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"> - Registrarse + Registrarme + </text> + <text name="forgot_password_text"> + ¿Olvidaste el nombre o la contraseña? </text> <text name="login_help"> ¿Necesitas ayuda para conectarte? diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml index 8fe3144d05..46326d1e8b 100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml @@ -4,16 +4,16 @@ Página inicial: </text> <text name="home_fails_whitelist_label"> - (Esta página no supera la lista blanca especificada) + (La Lista Blanca especificada no aprueba esta página) </text> - <line_editor name="home_url" tool_tip="La página inicial para el origen de este media"/> + <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="La página actual para el origen de este media" value=""/> + <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"/> 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 index 4b4fff5edb..c72f562a68 100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml @@ -2,11 +2,11 @@ <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"> - Las entradas contra las que falle la página inicial se marcan: + 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 inicial especificada en la pestaña General no supera esta lista blanca. Se ha desactivado hasta que se añada una entrada válida. + 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 index 6c00a05d12..5a6fd8b144 100644 --- a/indra/newview/skins/default/xui/es/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_my_profile.xml @@ -28,8 +28,8 @@ </scroll_container> </layout_panel> <layout_panel name="profile_me_buttons_panel"> - <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/> - <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu fÃsico, ropas, etc."/> + <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 index 6c6e4c7ee8..e8e95c3bac 100644 --- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml @@ -9,7 +9,7 @@ <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Ã"> + <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> diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml index cd8836f40f..885c780e00 100644 --- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml @@ -13,9 +13,9 @@ (ejecutándose) </string> <panel name="minimized_controls"> - <button label="Para todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/> + <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="Abre las preferencias de los media"/> + <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"> @@ -29,24 +29,24 @@ <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="Limpiar" name="media_debug"/> + <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 los media seleccionados"/> + <button name="stop_btn" tool_tip="Parar los media seleccionados"/> </layout_panel> <layout_panel name="play"> - <button name="play_btn" tool_tip="Ejecuta los media seleccionados"/> + <button name="play_btn" tool_tip="Ejecutar los media seleccionados"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pausa los media seleccionados"/> + <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="Silencia el audio de los media seleccionados"/> + <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"/> diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml index 11bbcd7695..2f60df7743 100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml @@ -6,9 +6,9 @@ </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Ver más opciones"/> - <dnd_button name="trash_btn" tool_tip="Quita el Ãtem seleccionado"/> - <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guarda la apariencia como un vestuario"/> - <button label="Llevar" name="wear_btn" tool_tip="Viste el vestuario seleccionado"/> + <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_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index 001446be21..55e3df5a0a 100644 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -7,12 +7,14 @@ <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"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Intenta encontrar el grupo con una búsqueda]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Intenta encontrar grupos a los que unirte.]"/> <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ñade al Residente seleccionado a la lista de tus amigos"/> + <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"> @@ -22,7 +24,7 @@ </accordion> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Opciones"/> - <button name="add_btn" tool_tip="Ofrece amistad a un Residente"/> + <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"> @@ -40,18 +42,18 @@ Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el <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ñade al Residente seleccionado a la lista de tus amigos"/> + <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="Muestra imágenes, grupos y otra información del Residente"/> + <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="Llama a este grupo"/> + <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_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml index 2c873ef464..6fe7895d45 100644 --- a/indra/newview/skins/default/xui/es/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml @@ -70,10 +70,17 @@ <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_name" value="Mooseland"/> <text name="region_type_label" value="Tipo:"/> + <text name="region_type" value="Moose"/> <text name="region_rating_label" value="Calificación:"/> + <text name="region_rating" value="Adulto"/> <text name="region_owner_label" value="Propietario:"/> + <text name="region_owner" value="moose Van Moose"/> <text name="region_group_label" value="Grupo:"/> + <text name="region_group"> + The Mighty Moose of mooseville soundvillemoose + </text> <button label="Región/Estado" name="region_info_btn"/> </panel> </accordion_tab> 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 17e3b45beb..a7e5429adc 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat de texto" name="chat"> <text name="font_size"> - Font size: + Tamaño de la fuente: </text> <radio_group name="chat_font_size"> <radio_item label="Disminuir" name="radio" value="0"/> @@ -9,7 +9,7 @@ <radio_item label="Aumentar" name="radio3" value="2"/> </radio_group> <text name="font_colors"> - Font colors: + Colores de la fuente: </text> <color_swatch label="Usted" name="user"/> <text name="text_box1"> 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 ed24ccacd7..ca157314aa 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -20,7 +20,7 @@ (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"> @@ -44,7 +44,7 @@ <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 label="Ver yo 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"> @@ -62,6 +62,6 @@ <combo_box.item label="nunca" name="item4"/> </combo_box> <text name="text_box3"> - Respuesta cuando estoy en el modo ocupado: + 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 c5ecffc026..87e7dc1e8a 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml @@ -6,11 +6,11 @@ <text name="QualitySpeed"> Calidad y velocidad: </text> - <text left="95" name="FasterText"> - El más rápido + <text name="FasterText"> + Más rápido </text> <text name="BetterText"> - Mejor + Más calidad </text> <text name="ShadersPrefText"> Bajo @@ -52,7 +52,7 @@ m </text> <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/> - <slider label="Calidad del procesamiento:" label_width="142" name="RenderPostProcess"/> + <slider label="Calidad de procesamiento:" label_width="142" name="RenderPostProcess"/> <text name="MeshDetailText"> Detalle de la malla: </text> @@ -83,24 +83,23 @@ <text name="SkyMeshDetailText"> Bajo </text> - <text name="LightingDetailText" width="135"> - Detalles de la iluminación: + <text name="LightingDetailText"> + Detalles de iluminación: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Sólo el Sol y la Luna" name="SunMoon" value="0"/> - <radio_item label="Puntos de luz cercanos" name="LocalLights" value="1"/> + <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"> - Nivel de detalle del - terreno: + Detalle del terreno: </text> - <radio_group left_delta="60" name="TerrainDetailRadio"> + <radio_group name="TerrainDetailRadio"> <radio_item label="Bajo" name="0"/> <radio_item label="Alto" name="2"/> </radio_group> </panel> <button label="Aplicar" label_selected="Aplicar" name="Apply"/> - <button label="Por defecto" left="110" name="Defaults" width="195"/> + <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 a08e5194e8..3632ecca7b 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> Conéctate para que cambie </panel.string> - <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpiar la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/> + <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> 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 68ca63d85f..2465612a64 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml @@ -18,7 +18,7 @@ kbps </text> <check_box label="Personalizar el puerto" name="connection_port_enabled"/> - <spinner label="Número del puerto:" name="connection_port"/> + <spinner label="Nº del puerto:" name="connection_port"/> <text name="cache_size_label_l"> Tamaño de la caché </text> @@ -42,5 +42,5 @@ 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"/> + <spinner label="Nº del 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 053fb00967..1e8b0c736c 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -7,12 +7,12 @@ <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="Medios de comunicación" name="Media Volume"/> - <check_box label="Activados" name="enable_media"/> + <slider label="Multimedia" name="Media Volume"/> + <check_box label="Activada" name="enable_media"/> <slider label="Chat de voz" name="Voice Volume"/> - <check_box label="Activada" name="enable_voice_check"/> - <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marca 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="Desmarcar esto esconderá los media anexados a otros avatares cercanos" value="SÃ"/> + <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> 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 index 037aae2e43..174922e28e 100644 --- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml @@ -14,7 +14,7 @@ </string> <layout_stack name="progress_indicator_area"> <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="El media se está cargando"/> + <progress_bar name="media_progress_bar" tool_tip="Los media se están cargando"/> </panel> </layout_stack> <layout_stack name="media_controls"> @@ -28,7 +28,7 @@ <button name="home_btn" tool_tip="Página inicial"/> </layout_panel> <layout_panel name="media_stop"> - <button name="media_stop_btn" tool_tip="Para los media"/> + <button name="media_stop_btn" tool_tip="Parar los media"/> </layout_panel> <layout_panel name="reload"> <button name="reload_btn" tool_tip="Recargar"/> @@ -67,7 +67,7 @@ <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 a la mitad"/> + <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"/> diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml index 6347c0e047..d725bfe618 100644 --- a/indra/newview/skins/default/xui/es/panel_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_profile.xml @@ -42,11 +42,11 @@ <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 o dar algo del inventario con el Residente"/> + <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="Modifica tu información personal"/> - <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu fÃsico, ropas, etc."/> + <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_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 1a230166fb..c51c3815d1 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -25,8 +25,8 @@ <text name="Only Allow"> Restringir el acceso a cuentas verificadas por: </text> - <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsar 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. Para más información, véase [SUPPORT_SITE].."/> + <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"/> @@ -39,7 +39,7 @@ </string> <button label="?" name="abuse_email_address_help"/> <button label="Aplicar" name="apply_btn"/> - <button label="Echar usuarios del estado..." name="kick_user_from_estate_btn"/> + <button label="Expulsar a un Residente del Estado..." name="kick_user_from_estate_btn"/> <button label="Enviar un mensaje al estado..." name="message_estate_btn"/> <text name="estate_manager_label"> Administradores del estado: diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml index ca8da6ccaf..54b60b276c 100644 --- a/indra/newview/skins/default/xui/es/panel_region_general.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general.xml @@ -19,35 +19,26 @@ desconocido </text> <check_box label="No permitir modificar el terreno" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="Prohibir volar" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="Permitir el daño" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> - <check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/> - <button label="?" name="parcel_search_help"/> - <spinner label="Nº máximo de avatares" name="agent_limit_spin" label_width="120" width="180"/> - <button label="?" name="agent_limit_help"/> - <spinner label="Plus de objetos" name="object_bonus_spin" label_width="120" width="180"/> - <button label="?" name="object_bonus_help"/> + <check_box label="Bloquear el mostrar el terreno en +la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/> + <spinner label="Nº máximo de avatares" label_width="120" name="agent_limit_spin" width="180"/> + <spinner label="Plus de objetos" label_width="120" name="object_bonus_spin" width="180"/> <text label="Calificación" name="access_text"> Calificación: </text> - <combo_box label="'Mature'" name="access_combo"> - <combo_box.item label="'Adult'" name="Adult"/> - <combo_box.item label="'Mature'" name="Mature"/> - <combo_box.item label="'PG'" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="'Mature'" name="access_combo"> + <icons_combo_box.item label="'Adult'" name="Adult" value="42"/> + <icons_combo_box.item label="'Mature'" name="Mature" value="21"/> + <icons_combo_box.item label="'PG'" name="PG" value="13"/> + </icons_combo_box> <button label="Aplicar" name="apply_btn"/> - <button label="Teleportar a su Base a un usuario..." name="kick_btn"/> - <button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/> - <button label="Enviar un mensaje a toda la región..." name="im_btn" width="250" /> + <button label="Teleportar a su Base a un Residente..." name="kick_btn"/> + <button label="Teleportar a sus Bases a todos los Residentes..." name="kick_all_btn"/> + <button label="Enviar un mensaje a toda la región..." name="im_btn" width="250"/> <button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn" width="210"/> </panel> 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 index 827898973a..9ff88e2f79 100644 --- a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml @@ -4,13 +4,13 @@ Región: </text> <text name="region_text"> - desconocido + desconocida </text> <text name="version_channel_text_lbl"> Versión: </text> <text name="version_channel_text"> - desconocido + desconocida </text> <text name="region_type_lbl"> Tipo: @@ -24,7 +24,7 @@ <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="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/> + <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"> @@ -36,8 +36,8 @@ <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="Teleportar a su Base a un Residente..." name="kick_btn"/> + <button label="Teleportar a sus Bases a todos los Residentes..." 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 ecca21e672..047e8f2f30 100644 --- a/indra/newview/skins/default/xui/es/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml @@ -25,16 +25,16 @@ Rangos de la elevación de la textura </text> <text name="height_text_lbl6"> - Suroeste + Noroeste </text> <text name="height_text_lbl7"> - Noroeste + Noreste </text> <text name="height_text_lbl8"> - Sureste + Suroeste </text> <text name="height_text_lbl9"> - Noreste + Sureste </text> <spinner label="Baja" name="height_start_spin_0"/> <spinner label="Baja" name="height_start_spin_1"/> @@ -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 BAJO es la altura MÃXIMA de la textura #1, y el valor ALTO es la altura MÃNIMA de la textura #4. + 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_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml index 4226744ae9..1afa68106e 100644 --- a/indra/newview/skins/default/xui/es/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml @@ -22,10 +22,10 @@ [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$"/> + <button label="Comprar" 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="Inicia/Detiene todos los media (música, vÃdeo, páginas web)"/> + <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_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml index 479af3f2bf..10b37b6880 100644 --- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="teleport_history_item"> - <button name="profile_btn" tool_tip="Muestra la información del Ãtem"/> + <button name="profile_btn" tool_tip="Mostrar la información del Ãtem"/> </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 index ceb6e521cd..0d2eb0ac35 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml @@ -52,7 +52,7 @@ <text name="GroupLabel"> Grupo: </text> - <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles."/> + <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> diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml index 524550fd6e..923201e4f3 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="Perfil del objeto"/> <text name="where" value="(en el mundo)"/> - <panel name="properties_panel" label=""> + <panel label="" name="properties_panel"> <text name="Name:"> Nombre: </text> @@ -54,20 +54,23 @@ <text name="Owner:"> Propietario: </text> + <text name="Owner Name"> + Erica Linden + </text> <text name="Group_label"> Grupo: </text> <button 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."/> + <button label="Transferir" label_selected="Transferir" 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."/> <text name="label click action"> - Al tocarlo: + Pulsa para: </text> <combo_box name="clickaction"> <combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/> <combo_box.item label="Sentarme 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="Pagar el objeto" name="Payobject"/> <combo_box.item label="Abrir" name="Open"/> </combo_box> <panel name="perms_inv"> @@ -77,27 +80,27 @@ <text name="Anyone can:"> Cualquiera: </text> - <check_box label="Copiarlo" name="checkbox allow everyone copy"/> - <check_box label="Moverlo" name="checkbox allow everyone move"/> + <check_box label="Copiar" name="checkbox allow everyone copy"/> + <check_box label="Mover" 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 y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles"/> + <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación de 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"/> + <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="El próximo propietario puede dar o revender este objeto"/> </panel> <check_box label="En venta" name="checkbox for sale"/> <combo_box name="sale type"> - <combo_box.item label="Copiarlo" name="Copy"/> + <combo_box.item label="Copiar" name="Copy"/> <combo_box.item label="Contenidos" name="Contents"/> <combo_box.item label="Original" name="Original"/> </combo_box> <spinner label="Precio: L$" name="Edit Cost"/> - <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objetos en los resultados de la búsqueda"/> + <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/> <text name="B:"> B: </text> @@ -121,5 +124,6 @@ <button label="Abrir" name="open_btn"/> <button label="Pagar" name="pay_btn"/> <button label="Comprar" name="buy_btn"/> + <button label="Detalles" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 29486faa15..6aca1439aa 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -164,6 +164,7 @@ Pulsa para ejecutar el comando secondlife:// </string> <string name="CurrentURL" value="URL actual: [CurrentURL]"/> + <string name="TooltipPrice" value="[PRICE] L$"/> <string name="SLurlLabelTeleport"> Teleportarse a </string> @@ -737,6 +738,9 @@ <string name="invalid"> inválido/a </string> + <string name="NewWearable"> + Nuevo [WEARABLE_ITEM] + </string> <string name="next"> Siguiente </string> @@ -804,7 +808,7 @@ Pulsa ESC para salir de la vista subjetiva </string> <string name="InventoryNoMatchingItems"> - No se han encontrado Ãtems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"]. + 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. @@ -1268,13 +1272,13 @@ todos los estados que administras para [OWNER] </string> <string name="RegionInfoAllowedResidents"> - Resientes autorizados: ([ALLOWEDAGENTS] de un máx. de [MAXACCESS]) + 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 script en la parcela + Memoria de los scripts de la parcela </string> <string name="ScriptLimitsParcelsOwned"> Parcelas listadas: [PARCELS] @@ -1319,10 +1323,10 @@ Cabeza </string> <string name="ATTACH_LSHOULDER"> - Hombro izq. + Hombro izquierdo </string> <string name="ATTACH_RSHOULDER"> - Hombro der. + Hombro derecho </string> <string name="ATTACH_LHAND"> Mano izq. @@ -1337,7 +1341,7 @@ Pie der. </string> <string name="ATTACH_BACK"> - Espalda + Anterior </string> <string name="ATTACH_PELVIS"> Pelvis @@ -1397,10 +1401,10 @@ Vientre </string> <string name="ATTACH_RPEC"> - Pecho der. + Pecho derecho </string> <string name="ATTACH_LPEC"> - Pecho izq. + Pecho izquierdo </string> <string name="ATTACH_HUD_CENTER_2"> HUD: Centro 2 @@ -1435,6 +1439,9 @@ <string name="PanelContentsNewScript"> Script nuevo </string> + <string name="BusyModeResponseDefault"> + El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI. + </string> <string name="MuteByName"> (por el nombre) </string> @@ -1471,7 +1478,7 @@ (se actualizará tras la publicación) </string> <string name="NoPicksClassifiedsText"> - No has creado destacados o clasificados. Pulsa el botón Más para crear uno. + 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 @@ -3187,7 +3194,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. (Moderador) </string> <string name="started_call"> - Iniciar una llamada de voz + Llamada de voz iniciada </string> <string name="joined_call"> Entrando a la llamada de voz @@ -3199,7 +3206,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Conectado, pulsa Colgar para salir </string> <string name="hang_up-im"> - Colgar la llamada de voz + Se colgó la llamada de voz </string> <string name="only_user_message"> Usted es el único usuario en esta sesión. @@ -3211,7 +3218,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz. </string> <string name="muted_message"> - Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje. + 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. diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml index 0a605277f2..7e7ed6202f 100644 --- a/indra/newview/skins/default/xui/es/teleport_strings.xml +++ b/indra/newview/skins/default/xui/es/teleport_strings.xml @@ -60,6 +60,9 @@ Vuelva a intentarlo en un momento. <message name="completing"> Completando el teleporte. </message> + <message name="completed_from"> + Teleporte realizado desde [T_SLURL] + </message> <message name="resolving"> Especificando el destino. </message> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index e7e2d8a0ee..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 @@ -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 : 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_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml index 02192c65ec..b005ce3b36 100644 --- a/indra/newview/skins/default/xui/fr/floater_event.xml +++ b/indra/newview/skins/default/xui/fr/floater_event.xml @@ -9,6 +9,18 @@ <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"> @@ -21,12 +33,21 @@ 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> 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_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_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml index feb2fe1027..7647452e91 100644 --- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml @@ -9,7 +9,7 @@ <floater.string name="Title"> 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_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_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index dc40d31a79..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"> 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_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml index f01d865f29..ccb862acac 100644 --- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml @@ -63,7 +63,7 @@ <check_box label="HUD" name="hud_check"/> <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/> <check_box label="Conserver les proportions" name="keep_aspect_check"/> - <check_box label="Figer l'image (plein écran)" name="freeze_frame_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 47b761aed9..dbdd32974c 100644 --- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="notification_chiclet" title="NOTIFICATIONS"> +<floater name="sys_well_window" title="NOTIFICATIONS"> <string name="title_im_well_window"> CONVERSATIONS </string> diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 64722ff1a7..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> @@ -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_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 09ec46fd59..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,96 +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 - name="layout_panel_2"> - <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 - name="layout_panel_3"> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Situer sur la carte </text> </panel> - <panel - name="layout_panel_4"> - <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"/> + <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"/> - <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"/> + <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 - name="layout_panel_5"> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoomer </text> </panel> - <panel - name="layout_panel_6"> - <slider label="Zoom" left="-270" name="zoom slider"/> - </panel> </floater> 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 e370e8d3b8..c8643708da 100644 --- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml @@ -10,8 +10,8 @@ <menu_item_call label="Chaussettes" name="Socks"/> <menu_item_call label="Veste" name="Jacket"/> <menu_item_call label="Gants" name="Gloves"/> - <menu_item_call label="Sous-vêtements (homme)" name="Self Undershirt"/> - <menu_item_call label="Sous-vêtements (femme)" name="Self Underpants"/> + <menu_item_call label="Débardeur" name="Self Undershirt"/> + <menu_item_call label="Caleçon" name="Self Underpants"/> <menu_item_call label="Tatouage" name="Self Tattoo"/> <menu_item_call label="Alpha" name="Self Alpha"/> <menu_item_call label="Tous les habits" name="All Clothes"/> 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 e5746dd4c2..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,7 +9,7 @@ <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"/> diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml index 0e5abdad0a..57b0a768c2 100644 --- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml @@ -18,8 +18,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/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_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml index a9facb2c30..9dc40af502 100644 --- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom rapproché" name="Zoom Close"/> <menu_item_call label="Zoom moyen" name="Zoom Medium"/> <menu_item_call label="Zoom éloigné" name="Zoom Far"/> diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 1837be9c5d..6492a83e06 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -5,6 +5,7 @@ <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"> @@ -18,6 +19,7 @@ <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..."/> 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 08a97ee403..26bd3978a9 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml @@ -5,6 +5,7 @@ <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_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml index ab5016465d..58bd16064a 100644 --- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml @@ -5,7 +5,7 @@ <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 c54a4341f1..ff4a40b1ce 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -43,6 +43,8 @@ <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"/> @@ -81,7 +83,8 @@ <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"/> @@ -149,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="Surface"/> <menu_item_check label="Ciel" name="Sky"/> <menu_item_check label="Eau" name="Water"/> <menu_item_check label="Sol" name="Ground"/> @@ -394,8 +396,8 @@ <menu_item_call label="Chaussettes" name="Socks"/> <menu_item_call label="Veste" name="Jacket"/> <menu_item_call label="Gants" name="Gloves"/> - <menu_item_call label="Sous-vêtements (homme)" name="Menu Undershirt"/> - <menu_item_call label="Sous-vêtements (femme)" name="Menu Underpants"/> + <menu_item_call label="Débardeur" name="Menu Undershirt"/> + <menu_item_call label="Caleçon" name="Menu Underpants"/> <menu_item_call label="Jupe" name="Skirt"/> <menu_item_call label="Alpha" name="Alpha"/> <menu_item_call label="Tatouage" name="Tattoo"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 28f9f9e52c..0fb609d653 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -107,7 +107,7 @@ Veuillez ne sélectionner qu'un seul objet. </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="Oui"/> + <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. @@ -445,9 +445,8 @@ L'objet est peut-être inaccessible ou a peut-être été supprimé. Impossible d'écrire le fichier [[FILE]] </notification> <notification name="UnsupportedHardware"> - Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. 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 Consulter [_URL] pour en savoir plus ? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=fr @@ -496,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 ? @@ -1296,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. @@ -1337,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é. @@ -1357,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"/> @@ -1387,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] ? @@ -1419,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"/> @@ -2335,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. @@ -2410,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"/> @@ -2543,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_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml index 784c6baae9..c6aae57c2d 100644 --- a/indra/newview/skins/default/xui/fr/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml @@ -9,16 +9,46 @@ <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_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]"/> - <check_box label="Renouvellement automatique toutes les semaines" name="auto_renew"/> - <text_editor name="price_for_listing" tool_tip="Coût de l'annonce."/> - <text_editor name="classified_desc" value="[description]"/> + <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="Renouv. auto :"/> + <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..2e2b848c93 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"/> + <check_box label="Renouvellement auto 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 d10a7f37e1..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"> 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 75b6c044f6..1efc9b00a4 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml @@ -34,10 +34,10 @@ Modification des gants </string> <string name="edit_undershirt_title"> - Modification des sous-vêtements (homme) + Modification du débardeur </string> <string name="edit_underpants_title"> - Modification des sous-vêtements (femme) + Modification du caleçon </string> <string name="edit_alpha_title"> Modification du masque alpha @@ -79,10 +79,10 @@ Gants : </string> <string name="undershirt_desc_text"> - Sous-vêtements (homme) : + Débardeur : </string> <string name="underpants_desc_text"> - Sous-vêtements (femme) : + Caleçon : </string> <string name="alpha_desc_text"> Masque alpha : 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 7fc10833ea..e1eeaa8601 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml @@ -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" name="role_delete" width="120"/> + <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_my_profile.xml b/indra/newview/skins/default/xui/fr/panel_my_profile.xml index 73affc3420..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,7 +26,7 @@ </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 :"/> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index 71e65232aa..a1c4c92618 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -13,8 +13,8 @@ (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 label="Arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias près de vous"/> + <button label="Jouer" 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> 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_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index 84749806ff..8d17d9ffdf 100644 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml @@ -7,6 +7,8 @@ <string name="no_friends" value="Pas d'amis"/> <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"> @@ -20,15 +22,15 @@ <accordion_tab name="tab_online" title="En ligne"/> <accordion_tab name="tab_all" title="Tout"/> </accordion> - <text name="no_friends_msg"> - Pour ajouter des amis, essayez [secondlife:///app/search/people la recherche globale] ou cliquez sur un utilisateur pour l'ajouter à vos amis. -Si vous voulez rencontrer d'autres résidents, ouvrez la [secondlife:///app/worldmap carte]. - </text> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="Options"/> <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="MES GROUPES" name="groups_panel"> <panel label="bottom_panel" name="bottom_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 2cd8744ae5..598e94166e 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -18,16 +18,16 @@ <string name="all_residents_text" value="Tous les résidents"/> <string name="group_text" value="Groupe"/> <string name="can_resell"> - Le terrain acheté dans cette région peut être revendu. + Le terrain acheté dans la région peut être revendu. </string> <string name="can_not_resell"> - Le terrain acheté dans cette région ne peut pas être revendu. + Le terrain acheté dans la région ne peut pas être revendu. </string> <string name="can_change"> - Le terrain acheté dans cette région peut être fusionné ou divisé. + Le terrain acheté dans la région peut être fusionné ou divisé. </string> <string name="can_not_change"> - Le terrain acheté dans cette région ne peut pas être fusionné ou divisé. + Le terrain acheté dans la région ne peut être fusionné ou divisé. </string> <string name="server_update_text"> Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur. @@ -69,58 +69,58 @@ <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parcelle"> <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ée"/> - <text name="fly_label" value="Voler :"/> + <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 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 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 :"/> + <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 name="sales_panel"> - <text name="sales_price_label" value="Prix :"/> + <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 f6a64f0c58..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 Mes 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_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 71f7990073..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,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat écrit" name="chat"> <text name="font_size"> - 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"> - Font colors: + Couleurs de police : </text> <color_swatch label="Vous" name="user"/> <text name="text_box1"> 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 c3bbe18a7c..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,7 +44,7 @@ <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"> 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 aa004d2c84..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,7 +17,7 @@ <text name="QualitySpeed"> Qualité et vitesse : </text> - <text left="35" name="FasterText"> + <text name="FasterText"> Plus rapide </text> <text name="BetterText"> 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 27d2b2182b..4c055a2b8d 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <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="Listen from"> + <text name="voice_chat_settings"> Paramètres du chat vocal </text> + <text name="Listen from"> + Écouter à partir de : + </text> <radio_group name="ear_location"> <radio_item label="Position de la caméra" name="0"/> <radio_item label="Position de l'avatar" name="1"/> diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml index c439435d1a..f801aee312 100644 --- a/indra/newview/skins/default/xui/fr/panel_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_profile.xml @@ -24,7 +24,7 @@ <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 :"/> @@ -42,8 +42,8 @@ </layout_panel> <layout_panel name="profile_buttons_panel"> <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="IM" name="im" tool_tip="Ouvrir une session IM"/> + <button label="Appeler" name="call" tool_tip="Appeler ce résident"/> <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"/> diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml index cd1d0c4886..a30306d116 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml @@ -70,13 +70,12 @@ toutes les parcelles du domaine. Le terrain acheté dans cette région peut être revendu. </string> <string name="can_not_resell"> - Le terrain acheté dans cette région ne peut pas être revendu. + Le terrain acheté dans la région ne peut pas être revendu. </string> <string name="can_change"> - Le terrain acheté dans cette région peut être fusionné ou divisé. + Le terrain acheté dans la région peut être fusionné ou divisé. </string> <string name="can_not_change"> - Le terrain acheté dans cette région ne peut pas être fusionné ou -divisé. + Le terrain acheté dans la région ne peut être fusionné ou divisé. </string> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index 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..c0b667137a 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml @@ -28,25 +28,25 @@ 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. </text> <text name="height_text_lbl11"> - En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1 et la valeur Haut correspond à la hauteur minimum de la texture n°4. + En mètres, la valeur Bas correspond à la hauteur max. de la texture n°1 </text> <text name="height_text_lbl12"> - et la valeur Haut correspond à la hauteur minimum de la texture n°4. + et la valeur Haut correspond à la hauteur min. de la texture n°4. </text> <text name="height_text_lbl13"> Nord-est @@ -63,10 +63,10 @@ Ces valeurs représentent les limites de mélange pour les textures ci-dessus. </text> <text name="height_text_lbl15"> - En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1, + La valeur Bas correspond à la hauteur max. de la Texture 1, </text> <text name="height_text_lbl16"> - et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4. + et la valeur Haut correspond à la hauteur min. de la Texture 4. </text> <button label="Appliquer" name="apply_btn"/> </panel> 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 e58e806f99..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,10 +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)"> 00h00 PST </text> - <button name="media_toggle_btn" tool_tip="Cliquer pour activer/désactiver le média"/> + <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 def71d96b4..cc99b1a07c 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml @@ -38,33 +38,33 @@ </panel.string> <text name="title" value="Profil de l'objet"/> <text name="where" value="(dans Second Life)"/> - <panel name="properties_panel" label=""> + <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 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 droits 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 c9a5b5917d..c031762d4b 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -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. Essayer la [secondlife:///app/search/groups "Recherche"]. + Objet inexistant dans l'inventaire. Voir [secondlife:///app/search/groups "Rechercher"]. </string> <string name="FavoritesNoMatchingItems"> Faites glisser un repère ici pour l'ajouter à vos Favoris. @@ -1468,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> @@ -1506,6 +1512,9 @@ <string name="NoPicksClassifiedsText"> 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... </string> 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_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml index a2fcaa63f6..767f727d40 100644 --- a/indra/newview/skins/default/xui/it/floater_about.xml +++ b/indra/newview/skins/default/xui/it/floater_about.xml @@ -5,7 +5,7 @@ [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> <floater.string name="AboutCompiler"> - Fatto con [COMPILER] versione [COMPILER_VERSION] + Generato con [COMPILER] versione [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> Tu sei in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] a [REGION] ospitata da [HOSTNAME] ([HOSTIP]) @@ -15,12 +15,12 @@ <floater.string name="AboutSystem"> CPU: [CPU] Memoria: [MEMORY_MB] MB -Versione Sistema Operativo: [OS_VERSION] -Venditore Scheda Grafica: [GRAPHICS_CARD_VENDOR] -Scheda Grafica: [GRAPHICS_CARD] +Versione sistema operativo: [OS_VERSION] +Venditore scheda grafica: [GRAPHICS_CARD_VENDOR] +Scheda grafica: [GRAPHICS_CARD] </floater.string> <floater.string name="AboutDriver"> - Versione Driver Scheda Grafica: [GRAPHICS_DRIVER_VERSION] + Versione driver Windows per grafica: [GRAPHICS_DRIVER_VERSION] </floater.string> <floater.string name="AboutLibs"> Versione OpenGL: [OPENGL_VERSION] @@ -35,7 +35,7 @@ Versione Vivox: [VIVOX_VERSION] (nessuno) </floater.string> <floater.string name="AboutTraffic"> - Pacchetti Perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) Informazioni </floater.string> <tab_container name="about_tab"> <panel label="Informazioni" name="support_panel"> diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index 4c82475a6f..2323220872 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -82,9 +82,9 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz Gruppo: </text> <text left="119" name="GroupText" width="227"/> - <button label="Imposta..." label_selected="Imposta..." name="Set..."/> + <button label="Imposta" name="Set..."/> <check_box label="Permetti cessione al gruppo" left="119" name="check deed" tool_tip="Un funzionario del gruppo può cedere questa terra al gruppo stesso cosicchè essa sarà  supportata dalle terre del gruppo."/> - <button label="Cedi..." label_selected="Cedi..." name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/> + <button label="Cedi" name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/> <check_box label="Il proprietario fa un contributo con la cessione" left="119" name="check contrib" tool_tip="Quando la terra è ceduta al gruppo, il proprietario precedente contribuisce con abbastanza allocazione di terra per supportarlo."/> <text name="For Sale:"> In vendita: @@ -126,11 +126,11 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz 0 </text> <button label="Acquista il terreno..." label_selected="Acquista il terreno..." left="130" name="Buy Land..." width="125"/> - <button label="Acquista per il gruppo..." label_selected="Acquista per il gruppo..." name="Buy For Group..."/> + <button label="Acquista per il gruppo" name="Buy For Group..."/> <button label="Compra pass..." label_selected="Compra pass..." left="130" name="Buy Pass..." tool_tip="Un pass ti da un accesso temporaneo in questo territorio." width="125"/> - <button label="Abbandona la terra..." label_selected="Abbandona la terra..." name="Abandon Land..."/> - <button label="Reclama la terra..." label_selected="Reclama la terra..." name="Reclaim Land..."/> - <button label="Vendita Linden..." label_selected="Vendita Linden..." name="Linden Sale..." tool_tip="La terra deve essere posseduta, con contenuto impostato, e non già messa in asta."/> + <button label="Abbandona la terra" name="Abandon Land..."/> + <button label="Reclama la terra" name="Reclaim Land..."/> + <button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere posseduta, con contenuto impostato, e non già messa in asta."/> </panel> <panel label="COVENANT" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -231,7 +231,7 @@ o suddivisa. [COUNT] </text> <button label="Mostra" label_selected="Mostra" name="ShowOwner" right="-135" width="60"/> - <button label="Restituisci..." label_selected="Restituisci..." name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> + <button label="Restituisci" name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> <text left="14" name="Set to group:" width="180"> Imposta al gruppo: </text> @@ -239,7 +239,7 @@ o suddivisa. [COUNT] </text> <button label="Mostra" label_selected="Mostra" name="ShowGroup" right="-135" width="60"/> - <button label="Restituisci..." label_selected="Restituisci..." name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> + <button label="Restituisci" name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> <text left="14" name="Owned by others:" width="180"> Posseduti da altri: </text> @@ -247,7 +247,7 @@ o suddivisa. [COUNT] </text> <button label="Mostra" label_selected="Mostra" name="ShowOther" right="-135" width="60"/> - <button label="Restituisci..." label_selected="Restituisci..." name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> + <button label="Restituisci" name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> <text left="14" name="Selected / sat upon:" width="193"> Selezionati / sui quali sei sopra: </text> diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml index 74a994825d..f483b19624 100644 --- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_animation_preview.xml @@ -23,22 +23,22 @@ La lunghezza massima è [MAX_LENGTH] secondi. Impossibile leggere la definizione del vincolo. </floater.string> <floater.string name="E_ST_NO_FILE"> - Non può aprire il file BVH. + Impossibile aprire il file BVH. </floater.string> <floater.string name="E_ST_NO_HIER"> - HIERARCHY header non valido. + Intestazione HIERARCHY non valida. </floater.string> <floater.string name="E_ST_NO_JOINT"> - Impossibile trovare la RADICE o UNIONE. ???????????? + Impossibile trovare la ROOT o JOINT. </floater.string> <floater.string name="E_ST_NO_NAME"> - Impossibile trovare il nome MISTO. ?????? + Impossibile trovare il nome JOINT. </floater.string> <floater.string name="E_ST_NO_OFFSET"> Impossibile trovare OFFSET. </floater.string> <floater.string name="E_ST_NO_CHANNELS"> - Impossibile trovare CHANNELS. ????? + Impossibile trovare CHANNELS. </floater.string> <floater.string name="E_ST_NO_ROTATION"> Impossibile ottenere un ordine di rotazione. @@ -47,22 +47,22 @@ La lunghezza massima è [MAX_LENGTH] secondi. Rotazione dell'asse non disponibile. </floater.string> <floater.string name="E_ST_NO_MOTION"> - Impossibile trovare il GESTO. + Impossibile trovare MOTION. </floater.string> <floater.string name="E_ST_NO_FRAMES"> - Impossibile ottenere il numero dei frames. + Impossibile ottenere il numero dei frame. </floater.string> <floater.string name="E_ST_NO_FRAME_TIME"> Impossibile ottenere il tempo del frame. </floater.string> <floater.string name="E_ST_NO_POS"> - Impossibile ottenre una posizione dei valori. + Impossibile ottenere i valori della posizione. </floater.string> <floater.string name="E_ST_NO_ROT"> Impossibile ottenere i valori di rotazione. </floater.string> <floater.string name="E_ST_NO_XLT_FILE"> - Impossibile aprire la traduzione del file. + Impossibile aprire il file di traduzione. </floater.string> <floater.string name="E_ST_NO_XLT_HEADER"> Impossibile leggere l'intestazione della traduzione. @@ -71,31 +71,31 @@ La lunghezza massima è [MAX_LENGTH] secondi. Impossibile leggere i nomi della traduzione. </floater.string> <floater.string name="E_ST_NO_XLT_IGNORE"> - Impossibile leggere la traduzione ignora il valore. ????? + Impossibile leggere la traduzione, ignora il valore. </floater.string> <floater.string name="E_ST_NO_XLT_RELATIVE"> Impossibile leggere la traduzione del valore relativo. </floater.string> <floater.string name="E_ST_NO_XLT_OUTNAME"> - Cannot read translation outname value. + Valore non trovato. </floater.string> <floater.string name="E_ST_NO_XLT_MATRIX"> Impossibile leggere la matrice di traduzione. </floater.string> <floater.string name="E_ST_NO_XLT_MERGECHILD"> - Impossibile unire il nome del bambino. + Impossibile trovare il nome mergechild. </floater.string> <floater.string name="E_ST_NO_XLT_MERGEPARENT"> - Impossibile unire il nome del genitore. + Impossibile ottenere il nome mergeparent. </floater.string> <floater.string name="E_ST_NO_XLT_PRIORITY"> - Impossibile ottenre il valore di priorità . + Impossibile ottenere il valore di priorità . </floater.string> <floater.string name="E_ST_NO_XLT_LOOP"> - Impossibile ottenere il valore di loop. + Impossibile ottenere il valore di ripetizione. </floater.string> <floater.string name="E_ST_NO_XLT_EASEIN"> - Impossibile essere in agio nei valori. ????????? + Impossibile ottenere i valori easeIn. </floater.string> <floater.string name="E_ST_NO_XLT_EASEOUT"> Cannot get ease Out values. @@ -112,32 +112,32 @@ La lunghezza massima è [MAX_LENGTH] secondi. <text name="description_label"> Descrizione: </text> - <spinner label="Priorità " label_width="72" name="priority" tool_tip="Controlla quali altre animazioni possono prevalere su questa animazione" width="110"/> - <check_box label="Ciclica" name="loop_check" tool_tip="Rendi questa animazione in loop"/> - <spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il momento nel quale l'animazione inizia il loop"/> - <spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il momento nel quale l'animazione ferma il loop"/> + <spinner label="Priorità " label_width="72" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione" width="110"/> + <check_box label="Ciclica" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/> + <spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l'animazione"/> + <spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l'animazione"/> <text name="hand_label"> Postura della mano </text> - <combo_box left_delta="100" name="hand_pose_combo" tool_tip="Controlla ciò che fanno le mani durante l'animazione" width="184"> + <combo_box left_delta="100" name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l'animazione" width="184"> <combo_box.item label="Stendi" name="Spread"/> <combo_box.item label="Rilassato" name="Relaxed"/> - <combo_box.item label="indica entrambi" name="PointBoth"/> + <combo_box.item label="Indica entrambi" name="PointBoth"/> <combo_box.item label="Pugno" name="Fist"/> <combo_box.item label="Sinistra rilassata" name="RelaxedLeft"/> <combo_box.item label="Indica sinistra" name="PointLeft"/> - <combo_box.item label="Pugno sinistra" name="FistLeft"/> + <combo_box.item label="Pugno con la sinistra" name="FistLeft"/> <combo_box.item label="Destra rilassata" name="RelaxedRight"/> <combo_box.item label="Indica destra" name="PointRight"/> - <combo_box.item label="Pugno Destro" name="FistRight"/> - <combo_box.item label="Saluta Destra" name="SaluteRight"/> - <combo_box.item label="Scrivendo" name="Typing"/> - <combo_box.item label="Pace Destra" name="PeaceRight"/> + <combo_box.item label="Pugno destro" name="FistRight"/> + <combo_box.item label="Saluta a destra" name="SaluteRight"/> + <combo_box.item label="Battitura" name="Typing"/> + <combo_box.item label="Pace a destra" name="PeaceRight"/> </combo_box> <text name="emote_label"> Espressione </text> - <combo_box left_delta="100" name="emote_combo" tool_tip="Controlla ciò che fà il viso durante l'animazione" width="184"> + <combo_box left_delta="100" name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l'animazione" width="184"> <combo_box.item label="(Nessuno)" name="[None]"/> <combo_box.item label="Aaaaah" name="Aaaaah"/> <combo_box.item label="Spavento" name="Afraid"/> @@ -147,7 +147,7 @@ La lunghezza massima è [MAX_LENGTH] secondi. <combo_box.item label="Pianto" name="Cry"/> <combo_box.item label="Disdegno" name="Disdain"/> <combo_box.item label="Imbarazzato" name="Embarrassed"/> - <combo_box.item label="Accigliato ?????" name="Frown"/> + <combo_box.item label="Accigliato" name="Frown"/> <combo_box.item label="Bacio" name="Kiss"/> <combo_box.item label="Risata" name="Laugh"/> <combo_box.item label="Plllppt" name="Plllppt"/> @@ -165,13 +165,13 @@ La lunghezza massima è [MAX_LENGTH] secondi. <combo_box left_delta="154" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell'animazione mentre l'avatar svolge azioni abituali." width="130"> <combo_box.item label="In piedi" name="Standing"/> <combo_box.item label="Camminando" name="Walking"/> - <combo_box.item label="Sedendo" name="Sitting"/> - <combo_box.item label="Volando" name="Flying"/> + <combo_box.item label="Seduto" name="Sitting"/> + <combo_box.item label="Volo" name="Flying"/> </combo_box> - <spinner label="Avvio lento (sec)" label_width="125" name="ease_in_time" tool_tip="Tempo (in seconds) oltre il quale le animazioni si miscelano" width="192"/> - <spinner bottom_delta="-20" label="Arresto lento (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tempo (in seconds) oltre il quale le animazioni terminano di miscelarsi" width="192"/> + <spinner label="Avvio lento (sec)" label_width="125" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni" width="192"/> + <spinner bottom_delta="-20" label="Arresto lento (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni" width="192"/> <button bottom_delta="-32" name="play_btn" tool_tip="Riproduci la tua animazione"/> - <button name="pause_btn" tool_tip="La tua animazione in Pause"/> + <button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/> <button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell'animazione"/> <text name="bad_animation_text"> Impossibile leggere il file dell'animazione. diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml index e84d396138..a54751e629 100644 --- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml @@ -8,8 +8,7 @@ </text> <button label="Annulla" label_selected="Annulla" name="cancel_btn" width="73"/> <button label="Compra" label_selected="Compra" left_delta="-77" name="buy_btn" width="73"/> - <check_box bottom="-234" label="Indossa adesso -l'indumento" left_delta="-125" name="wear_check"/> + <check_box bottom="-234" label="Indossa adesso l'indumento" left_delta="-125" name="wear_check"/> <string name="no_copy_text"> (non copiabile) </string> diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml index 9fa5bd5570..e9c5334746 100644 --- a/indra/newview/skins/default/xui/it/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="buy land" title="COMPRA LA TERRA"> +<floater name="buy land" title="ACQUISTA TERRENO"> <text name="region_name_label"> Regione: </text> @@ -58,8 +58,8 @@ </text> <text name="info_price"> L$ 1500 -(L$ 1.1/m²) -sold with objects +( 1.1 L$/m²) +venduto con oggetti </text> <text name="info_action"> Comprando questa terra: @@ -75,16 +75,16 @@ sold with objects Solo i membri premium possono possedere terra. </text> <combo_box name="account_level"> - <combo_box.item label="US$9.95/mese, addebitato mensilmente" name="US$9.95/month,billedmonthly"/> - <combo_box.item label="US$7.50/mese, addebitato trimestralmente" name="US$7.50/month,billedquarterly"/> - <combo_box.item label="US$6.00/mese, addebitato annualmente" name="US$6.00/month,billedannually"/> + <combo_box.item label="US$ 9.95 al mese, addebitato mensilmente" name="US$9.95/month,billedmonthly"/> + <combo_box.item label="US$ 7.50 al mese, addebitato trimestralmente" name="US$7.50/month,billedquarterly"/> + <combo_box.item label="US$ 6.00 al mese, addebitato annualmente" name="US$6.00/month,billedannually"/> </combo_box> <text name="land_use_action"> Aumenta il tasso di pagamento mensile delle tasse d'uso della terra a 40 US$/mese. </text> <text name="land_use_reason"> Tu occupi 1309 m² di terreno. -This parcel is 512 m² di terreno. +Questo lotto consiste in 512 m² di terreno. </text> <text name="purchase_action"> Paga il residente Joe 4000 L$ per la terra @@ -99,7 +99,7 @@ This parcel is 512 m² di terreno. 1000 </line_editor> <text name="currency_est"> - per circa. [LOCAL_AMOUNT] + per circa [LOCAL_AMOUNT] </text> <text name="currency_balance"> Possiedi 2.100 L$. @@ -181,26 +181,26 @@ Prova a selezionare un'area più piccola. Il tuo account può possedere terra. </string> <string name="land_holdings"> - Tu occupi [BUYER] m² di terreno. + Sei proprietario di [BUYER] m² di terreno. </string> <string name="pay_to_for_land"> Paga [AMOUNT] L$ a [SELLER] per questa terra </string> <string name="buy_for_US"> - Compra L$ [AMOUNT] per circa. [LOCAL_AMOUNT], + Acquista L$ [AMOUNT] per circa [LOCAL_AMOUNT], </string> <string name="parcel_meters"> - Questo parcel è [AMOUNT] m² + Questo lotto è di [AMOUNT] m² </string> <string name="premium_land"> - Questo terreno è premium, e costerà [AMOUNT] m². + Questo terreno è premium, e costerà come [AMOUNT] m². </string> <string name="discounted_land"> - Questo terreno è scontato, e costerà [AMOUNT] m². + Questo terreno è scontato, e costerà come [AMOUNT] m². </string> <string name="meters_supports_object"> [AMOUNT] m² -mantiene [AMOUNT2] oggetti +consente [AMOUNT2] oggetti </string> <string name="sold_with_objects"> venduta con oggetti @@ -210,7 +210,7 @@ mantiene [AMOUNT2] oggetti </string> <string name="info_price_string"> L$ [PRICE] -(L$ [PREZZO_PER_QM]/m²) +([PREZZO_PER_MQ] L$/m²) [VENDUTO_CON_OGGETTI] </string> <string name="insufficient_land_credits"> diff --git a/indra/newview/skins/default/xui/it/floater_device_settings.xml b/indra/newview/skins/default/xui/it/floater_device_settings.xml index 2410a16882..97aa64086d 100644 --- a/indra/newview/skins/default/xui/it/floater_device_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_device_settings.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_device_settings" title="OPZIONI PER IL DISPOSITIVO VOICE CHAT"/> +<floater name="floater_device_settings" title="OPZIONI CHAT VOCALE"/> diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml index 08326b1da3..384e7c1272 100644 --- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml @@ -22,8 +22,7 @@ Attiva VBO: </text> <check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance. Ma, su un vecchio hardware, spesso l'implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/> - <slider label="Texture Memory (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. Memoria della scheda video in Defaults. Ridurre questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le textures poco definite."/> - <spinner label="Indice della distanza -della nebbia:" name="fog"/> + <slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/> + <spinner label="Indice della distanza della nebbia:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_inventory.xml b/indra/newview/skins/default/xui/it/floater_inventory.xml index 5049bb3e58..e332891ed2 100644 --- a/indra/newview/skins/default/xui/it/floater_inventory.xml +++ b/indra/newview/skins/default/xui/it/floater_inventory.xml @@ -10,7 +10,7 @@ Inventario ([ITEM_COUNT] Items) [FILTER] </floater.string> <floater.string name="Fetched"> - Raggiunto ?????????? + Completato </floater.string> <panel label="Pannello dell'Inventario" name="Inventory Panel"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml index aaf7b71656..d3dc4d7eae 100644 --- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml @@ -56,7 +56,7 @@ </text> <check_box label="Condividi" name="CheckShareWithGroup"/> <text name="NextOwnerLabel" width="230"> - Prossimo Proprietario: + Proprietario successivo: </text> <check_box label="Modifica" name="CheckNextOwnerModify"/> <check_box label="Copiare" left_delta="88" name="CheckNextOwnerCopy"/> diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml index 81cd46ec4d..dd1a2b67d7 100644 --- a/indra/newview/skins/default/xui/it/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="mute by name" title="BLOCCA OGGETTO PER NOME"> +<floater name="mute by name" title="BLOCCA OGGETTO IN BASE AL NOME"> <text name="message"> Blocca un oggetto: </text> diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml index b4536e31cc..f179364080 100644 --- a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="outgoing call" title="CHIAMANDO"> +<floater name="outgoing call" title="CHIAMATA IN CORSO"> <floater.string name="localchat"> - Voice Chat nei dintorni + Chat vocale nei dintorni </floater.string> <floater.string name="anonymous"> anonimo </floater.string> <floater.string name="VoiceInviteP2P"> - stà chiamando. + sta chiamando. </floater.string> <floater.string name="VoiceInviteAdHoc"> - ha aderito ad una chiamata Voice Chat con una chat in conferenza. + ha aderito ad una chiamata in chat vocale in conferenza. </floater.string> <text name="connecting"> - Connettendo a [CALLEE_NAME] + Collegamento in corso a [CALLEE_NAME] </text> <text name="calling"> - Chiamando [CALLEE_NAME] + Chiamata a [CALLEE_NAME] </text> <text name="noanswer"> - Nessuna risposta. Per favore riprova più tardi. + Nessuna risposta. Riprova più tardi. </text> <text name="leaving"> - Abbandonando [CURRENT_CHAT]. + Chiusura chat [CURRENT_CHAT]. </text> - <button label="Cancella" label_selected="Cancella" name="Cancel"/> + <button label="Annulla" label_selected="Annulla" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml index 59004bbbd7..c1ea8ec9c8 100644 --- a/indra/newview/skins/default/xui/it/floater_pay.xml +++ b/indra/newview/skins/default/xui/it/floater_pay.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> <string name="payee_group"> - Paga Gruppo + Paga gruppo </string> <string name="payee_resident"> - Paga Residente + Paga residente </string> <text left="5" name="payee_label" width="105"> Paga: @@ -18,7 +18,7 @@ <button label="10 L$" label_selected="10 L$" left="118" name="fastpay 10" width="80"/> <button label="20 L$" label_selected="20 L$" left="210" name="fastpay 20"/> <text left="4" name="amount text"> - O, scegli importo: + Oppure, scegli importo: </text> <line_editor left="70" name="amount" width="49"/> <button label="Paga" label_selected="Paga" left="127" name="pay btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml index c51a2b7b31..97e04c8bf4 100644 --- a/indra/newview/skins/default/xui/it/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Give Money" title=""> <string halign="left" name="payee_group" width="100"> - Paga Gruppo + Paga gruppo </string> <string halign="left" name="payee_resident" width="120"> - Pags Residente + Paga residente </string> <icon name="icon_person" tool_tip="Persona"/> <text left="120" name="payee_name"> @@ -22,7 +22,7 @@ <button label="10 L$" label_selected="10 L$" left="125" name="fastpay 10" width="70"/> <button label="20 L$" label_selected="20 L$" left="200" name="fastpay 20" width="70"/> <text halign="left" left="5" name="amount text"> - O, scegli importo: + Oppure, scegli importo: </text> <line_editor left="74" name="amount" width="50"/> <button label="Paga" label_selected="Paga" name="pay btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml index a1e430b6b2..2692779e7c 100644 --- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_report_abuse" title="DENUNCIA DI ABUSO"> <floater.string name="Screenshot"> - Fotografia + Immagine </floater.string> - <check_box label="Utilizza questa fotografia" name="screen_check"/> + <check_box label="Utilizza questa immagine" name="screen_check"/> <text name="reporter_title"> Segnalato da: </text> @@ -82,7 +82,7 @@ <text name="abuser_name_title"> Nome di chi ha commesso l'abuso: </text> - <button label="Scegli un residente" label_selected="" name="select_abuser" tool_tip="Scegli il nome di chi ha commesso l'abuso dalla lista"/> + <button label="Scegli" label_selected="" name="select_abuser" tool_tip="Scegli il nome di chi ha commesso l'abuso dalla lista"/> <text name="abuser_name_title2"> Luogo dell'abuso: </text> @@ -93,10 +93,10 @@ Dettagli: </text> <text name="bug_aviso"> - Specifica data, luogo, natura dell'abuso, testo rilevante di chat/IM, e se possibile indica l'oggetto. + Fornisci informazioni specifiche il più possibile </text> <text name="incomplete_title"> - * Nota: segnalazioni incomplete non saranno esaminate + * le segnalazioni incomplete non saranno esaminate </text> <button label="Segnala abuso" label_selected="Segnala abuso" name="send_btn"/> <button label="Annulla" label_selected="Annulla" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml index 2a4fa05b54..0f8d24ebbd 100644 --- a/indra/newview/skins/default/xui/it/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="sell land" title="VENDI LA TERRA"> +<floater name="sell land" title="VENDI TERRENO"> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <text name="info_parcel_label"> - Parcel: + Lotto: </text> <text left="82" name="info_parcel"> - NOME DEL PARCEL + NOME DEL LOTTO </text> <text name="info_size_label"> - Misura: + Dimensioni: </text> <text left="82" name="info_size"> [AREA] m² </text> <text bottom_delta="-57" height="28" name="info_action"> - Vendere questo parcel: + Per vendere questo lotto: </text> <text name="price_label"> 1. Imposta un prezzo: @@ -30,36 +30,36 @@ 0 </line_editor> <text name="price_per_m"> - (L$[PER_METER] per m²) + ([PER_METER] L$ per m²) </text> <text name="sell_to_label"> - 2. Vendi la terra a: + 2. Vendi il terreno a: </text> <text name="sell_to_text"> - Scegli se vendere a chiunque o ad un specifico compratore. + Scegli se vendere a chiunque o ad un determinato acquirente. </text> <combo_box name="sell_to"> <combo_box.item label="- Seleziona uno -" name="--selectone--"/> <combo_box.item label="Chiunque" name="Anyone"/> - <combo_box.item label="Persona Specifica:" name="Specificuser:"/> + <combo_box.item label="Persona specifica:" name="Specificuser:"/> </combo_box> <button label="Seleziona" name="sell_to_select_agent"/> <text name="sell_objects_label"> 3. Vendi gli oggetti con la terra? </text> <text name="sell_objects_text"> - Gli oggetti trasferibili del proprietaio della Terra cambieranno proprietà . + Gli oggetti trasferibili del proprietario presenti sul lotto cambieranno di proprietà . </text> <radio_group bottom_delta="-58" name="sell_objects"> - <radio_item label="No, mantieni la proprietà sugli oggetti" name="no"/> + <radio_item label="No, mantieni la proprietà degli oggetti" name="no"/> <radio_item label="Si, vendi gli oggetti con la terra" name="yes"/> </radio_group> - <button label="Mostra Oggetti" name="show_objects"/> + <button label="Mostra oggetti" name="show_objects"/> <text name="nag_message_label"> RICORDA: Tutte le vendite sono definitive. </text> - <button label="Imposta Terra in Vendita" name="sell_btn"/> - <button label="Cancella" name="cancel_btn"/> + <button label="Imposta terreno come in vendita" name="sell_btn"/> + <button label="Annulla" name="cancel_btn"/> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml index 7c8e6ba1a1..aed2a03a21 100644 --- a/indra/newview/skins/default/xui/it/floater_stats.xml +++ b/indra/newview/skins/default/xui/it/floater_stats.xml @@ -2,68 +2,68 @@ <floater name="Statistics" title="STATISTICHE"> <scroll_container name="statistics_scroll"> <container_view name="statistics_view"> - <stat_view label="Base" name="basic"> + <stat_view label="Di base" name="basic"> <stat_bar label="FPS" name="fps"/> - <stat_bar label="Larghezza Banda" name="bandwidth"/> - <stat_bar label="Perdita Pacchetti" name="packet_loss"/> + <stat_bar label="Larghezza banda" name="bandwidth"/> + <stat_bar label="Perdita pacchetti" name="packet_loss"/> <stat_bar label="Tempo Ping Sim" name="ping"/> </stat_view> - <stat_view label="Avanzato" name="advanced"> + <stat_view label="Avanzata" name="advanced"> <stat_view label="Render" name="render"> - <stat_bar label="KTris Disegnate" name="ktrisframe"/> - <stat_bar label="KTris Disegnate" name="ktrissec"/> - <stat_bar label="Totale Oggetti" name="objs"/> - <stat_bar label="Nuovi Oggetti" name="newobjs"/> + <stat_bar label="KTris disegnate" name="ktrisframe"/> + <stat_bar label="KTris disegnate" name="ktrissec"/> + <stat_bar label="Totale oggetti" name="objs"/> + <stat_bar label="Nuovi oggetti" name="newobjs"/> </stat_view> <stat_view label="Texture" name="texture"> <stat_bar label="Conteggio" name="numimagesstat"/> - <stat_bar label="Conteggio Grezzo" name="numrawimagesstat"/> + <stat_bar label="Conteggio grezzo" name="numrawimagesstat"/> <stat_bar label="Memoria GL" name="gltexmemstat"/> - <stat_bar label="Memoria Formattata" name="formattedmemstat"/> - <stat_bar label="Memoria Complessiva" name="rawmemstat"/> - <stat_bar label="Memoria Impegnata" name="glboundmemstat"/> + <stat_bar label="Memoria formattata" name="formattedmemstat"/> + <stat_bar label="Memoria complessiva" name="rawmemstat"/> + <stat_bar label="Memoria impegnata" name="glboundmemstat"/> </stat_view> <stat_view label="Rete" name="network"> - <stat_bar label="Pacchetti In Ingresso" name="packetsinstat"/> - <stat_bar label="Pacchetti In Uscita" name="packetsoutstat"/> + <stat_bar label="Pacchetti in ingresso" name="packetsinstat"/> + <stat_bar label="Pacchetti in uscita" name="packetsoutstat"/> <stat_bar label="Oggetti" name="objectkbitstat"/> <stat_bar label="Texture" name="texturekbitstat"/> - <stat_bar label="Risorse Server" name="assetkbitstat"/> + <stat_bar label="Risorse server" name="assetkbitstat"/> <stat_bar label="Layer" name="layerskbitstat"/> - <stat_bar label="Effettivi In Ingresso" name="actualinkbitstat"/> - <stat_bar label="Effettivi in Uscita" name="actualoutkbitstat"/> + <stat_bar label="Effettivi in ingresso" name="actualinkbitstat"/> + <stat_bar label="Effettivi in uscita" name="actualoutkbitstat"/> <stat_bar label="Operazioni pendenti VFS" name="vfspendingoperations"/> </stat_view> </stat_view> <stat_view label="Simulatore" name="sim"> <stat_bar label="Dilatazione temporale" name="simtimedilation"/> <stat_bar label="FPS Sim" name="simfps"/> - <stat_bar label="FPS Motore Fisico" name="simphysicsfps"/> - <stat_view label="Dettagli Motore Fisico" name="physicsdetail"> - <stat_bar label="Oggetti Pinzati" name="physicspinnedtasks"/> + <stat_bar label="FPS motore fisico" name="simphysicsfps"/> + <stat_view label="Dettagli motore fisico" name="physicsdetail"> + <stat_bar label="Oggetti pinzati" name="physicspinnedtasks"/> <stat_bar label="Oggetti a basso LOD" name="physicslodtasks"/> - <stat_bar label="Memoria Allocata" name="physicsmemoryallocated"/> - <stat_bar label="Agenti Aggiornamenti al Sec" name="simagentups"/> - <stat_bar label="Agenti Principali" name="simmainagents"/> - <stat_bar label="Agenti Figli" name="simchildagents"/> + <stat_bar label="Memoria allocata" name="physicsmemoryallocated"/> + <stat_bar label="Aggiornamenti agenti al sec" name="simagentups"/> + <stat_bar label="Avatar principali" name="simmainagents"/> + <stat_bar label="Avatar secondari" name="simchildagents"/> <stat_bar label="Oggetti" name="simobjects"/> - <stat_bar label="Oggetti Attivi" name="simactiveobjects"/> - <stat_bar label="Script Attivi" name="simactivescripts"/> - <stat_bar label="Eventi Script" name="simscripteps"/> - <stat_bar label="Pacchetti In Ingresso" name="siminpps"/> - <stat_bar label="Pacchetti In Uscita" name="simoutpps"/> - <stat_bar label="Download Pendenti" name="simpendingdownloads"/> - <stat_bar label="Upload Pendenti" name="simpendinguploads"/> - <stat_bar label="Numero totale byte non risposti" name="simtotalunackedbytes"/> + <stat_bar label="Oggetti attivi" name="simactiveobjects"/> + <stat_bar label="Script attivi" name="simactivescripts"/> + <stat_bar label="Eventi di script" name="simscripteps"/> + <stat_bar label="Pacchetti in ingresso" name="siminpps"/> + <stat_bar label="Pacchetti in uscita" name="simoutpps"/> + <stat_bar label="Download in attesa" name="simpendingdownloads"/> + <stat_bar label="Caricamenti in attesa" name="simpendinguploads"/> + <stat_bar label="Numero totale byte non confermati (Unacked)" name="simtotalunackedbytes"/> </stat_view> <stat_view label="Tempo (ms)" name="simperf"> - <stat_bar label="Tempo Totale Frame" name="simframemsec"/> - <stat_bar label="Tempo Netto" name="simnetmsec"/> - <stat_bar label="Tempo Motore Fisico" name="simsimphysicsmsec"/> - <stat_bar label="Tempo Simulazione" name="simsimothermsec"/> - <stat_bar label="Tempo Agenti" name="simagentmsec"/> - <stat_bar label="Tempo Immagini" name="simimagesmsec"/> - <stat_bar label="Tempo Script" name="simscriptmsec"/> + <stat_bar label="Tempo totale Frame" name="simframemsec"/> + <stat_bar label="Tempo netto" name="simnetmsec"/> + <stat_bar label="Tempo motore fisico" name="simsimphysicsmsec"/> + <stat_bar label="Tempo simulazione" name="simsimothermsec"/> + <stat_bar label="Tempo avatar" name="simagentmsec"/> + <stat_bar label="Tempo immagini" name="simimagesmsec"/> + <stat_bar label="Tempo script" name="simscriptmsec"/> </stat_view> </stat_view> </container_view> diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml index f3f8072f56..bc7f2197d0 100644 --- a/indra/newview/skins/default/xui/it/floater_tos.xml +++ b/indra/newview/skins/default/xui/it/floater_tos.xml @@ -4,7 +4,7 @@ <button label="Annulla" label_selected="Annulla" name="Cancel"/> <check_box label="Accetto i Termini di Servizio" name="agree_chk"/> <text name="tos_heading"> - Per favore leggi attentamente i seguenti Termini di Servizio. Per continuare il log in [SECOND_LIFE], devi accettare le condizioni. + Sei pregato di leggere attentamente i seguenti Termini del servizio. Per continuare l'accesso a [SECOND_LIFE], devi accettare le condizioni. </text> <text_editor name="tos_text"> TOS_TEXT diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml index edb9490914..8e51af0d9f 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory.xml @@ -12,7 +12,7 @@ <menu_item_call label="Nuovo Script" name="New Script"/> <menu_item_call label="Nuova Notecard" name="New Note"/> <menu_item_call label="Nuova Gesture" name="New Gesture"/> - <menu label="Maglietta Intima" name="New Clothes"> + <menu label="Maglietta intima" name="New Clothes"> <menu_item_call label="Nuova Maglietta" name="New Shirt"/> <menu_item_call label="Nuovi Pantaloni" name="New Pants"/> <menu_item_call label="Nuove Scarpe" name="New Shoes"/> @@ -23,46 +23,46 @@ <menu_item_call label="Nuova Canottiera" name="New Undershirt"/> <menu_item_call label="Nuove Mutande" name="New Underpants"/> <menu_item_call label="Nuovo Alfa Mask" name="New Alpha Mask"/> - <menu_item_call label="Nuovo Tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> </menu> - <menu label="Nuove Parti del Corpo" name="New Body Parts"> + <menu label="Nuove parti del corpo" name="New Body Parts"> <menu_item_call label="Nuova Forma del corpo" name="New Shape"/> <menu_item_call label="Nuova Pelle" name="New Skin"/> <menu_item_call label="Nuovi Capelli" name="New Hair"/> <menu_item_call label="Nuovi Occhi" name="New Eyes"/> </menu> - <menu label="Cambia Tipo" name="Change Type"> + <menu label="Cambia tipo" name="Change Type"> <menu_item_call label="Predefinito" name="Default"/> <menu_item_call label="Guanti" name="Gloves"/> <menu_item_call label="Giacca" name="Jacket"/> <menu_item_call label="Pantaloni" name="Pants"/> - <menu_item_call label="Shape" name="Shape"/> + <menu_item_call label="Figura corporea" name="Shape"/> <menu_item_call label="Scarpe" name="Shoes"/> <menu_item_call label="Camicia" name="Shirt"/> <menu_item_call label="Gonna" name="Skirt"/> <menu_item_call label="Slip" name="Underpants"/> - <menu_item_call label="Maglietta Intima" name="Undershirt"/> + <menu_item_call label="Maglietta intima" name="Undershirt"/> </menu> <menu_item_call label="Teletrasportati" name="Landmark Open"/> <menu_item_call label="Apri" name="Animation Open"/> <menu_item_call label="Apri" name="Sound Open"/> <menu_item_call label="Elimina oggetto" name="Purge Item"/> <menu_item_call label="Ripristina oggetto" name="Restore Item"/> - <menu_item_call label="Vai al Link" name="Goto Link"/> + <menu_item_call label="Vai al link" name="Goto Link"/> <menu_item_call label="Apri" name="Open"/> <menu_item_call label="Proprietà " name="Properties"/> <menu_item_call label="Rinomina" name="Rename"/> <menu_item_call label="Copia UUID dell'oggetto" name="Copy Asset UUID"/> <menu_item_call label="Copia" name="Copy"/> <menu_item_call label="Incolla" name="Paste"/> - <menu_item_call label="Incolla come Link" name="Paste As Link"/> + <menu_item_call label="Incolla come link" name="Paste As Link"/> <menu_item_call label="Cancella" name="Delete"/> <menu_item_call label="Togli gli oggetti" name="Take Off Items"/> <menu_item_call label="Aggiungi all'outfit" name="Add To Outfit"/> <menu_item_call label="Sostituisci outfit" name="Replace Outfit"/> <menu_item_call label="Inizia la conferenza chat" name="Conference Chat Folder"/> <menu_item_call label="Esegui" name="Sound Play"/> - <menu_item_call label="Informazioni sul Landmark" name="About Landmark"/> + <menu_item_call label="Informazioni sul punto di riferimento" name="About Landmark"/> <menu_item_call label="Esegui inworld" name="Animation Play"/> <menu_item_call label="Esegui localmente" name="Animation Audition"/> <menu_item_call label="Invia un Instant Message" name="Send Instant Message"/> diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index d33dabc4c3..e458944f79 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_inventory_add"> - <menu label="Carica sul server" name="upload"> + <menu label="Carica nel server" name="upload"> <menu_item_call label="Immagine ([COST]L$)..." name="Upload Image"/> <menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/> <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> <menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/> </menu> - <menu_item_call label="Nuova Cartella" name="New Folder"/> - <menu_item_call label="Nuovo Script" name="New Script"/> - <menu_item_call label="Nuova Notecard" name="New Note"/> - <menu_item_call label="Nuova Gesture" name="New Gesture"/> - <menu label="Nuovi Abiti" name="New Clothes"> - <menu_item_call label="Nuova Camicia" name="New Shirt"/> - <menu_item_call label="Nuovi Pantaloni" name="New Pants"/> - <menu_item_call label="Nuove Scarpe" name="New Shoes"/> - <menu_item_call label="Nuove Calze" name="New Socks"/> - <menu_item_call label="Nuova Giacca" name="New Jacket"/> - <menu_item_call label="Nuova Gonna" name="New Skirt"/> - <menu_item_call label="Nuovi Guanti" name="New Gloves"/> - <menu_item_call label="Nuova Maglietta Intima" name="New Undershirt"/> - <menu_item_call label="Nuovi Slip" name="New Underpants"/> - <menu_item_call label="Nuovo Alfa (Trasparenza)" name="New Alpha"/> - <menu_item_call label="Nuovo Tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuova cartella" name="New Folder"/> + <menu_item_call label="Nuovo script" name="New Script"/> + <menu_item_call label="Nuovo appunto" name="New Note"/> + <menu_item_call label="Nuova gesture" name="New Gesture"/> + <menu label="Maglietta intima" name="New Clothes"> + <menu_item_call label="Nuova camicia" name="New Shirt"/> + <menu_item_call label="Nuovi pantaloni" name="New Pants"/> + <menu_item_call label="Nuove scarpe" name="New Shoes"/> + <menu_item_call label="Nuove calze" name="New Socks"/> + <menu_item_call label="Nuova giacca" name="New Jacket"/> + <menu_item_call label="Nuova gonna" name="New Skirt"/> + <menu_item_call label="Nuovi guanti" name="New Gloves"/> + <menu_item_call label="Nuova maglietta intima" name="New Undershirt"/> + <menu_item_call label="Nuovi slip" name="New Underpants"/> + <menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/> + <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> </menu> - <menu label="Nuove Parti del Corpo" name="New Body Parts"> - <menu_item_call label="Nuova Shape" name="New Shape"/> - <menu_item_call label="Nuova Pelle" name="New Skin"/> - <menu_item_call label="Nuovi Capelli" name="New Hair"/> - <menu_item_call label="Nuovi Occhi" name="New Eyes"/> + <menu label="Nuove parti del corpo" name="New Body Parts"> + <menu_item_call label="Nuova figura corporea" name="New Shape"/> + <menu_item_call label="Nuova pelle" name="New Skin"/> + <menu_item_call label="Nuovi capelli" name="New Hair"/> + <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml index 7caa7fd226..fa574230e0 100644 --- a/indra/newview/skins/default/xui/it/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom ravvicinato" name="Zoom Close"/> <menu_item_call label="Zoom Medio" name="Zoom Medium"/> <menu_item_call label="Zoom Distante" name="Zoom Far"/> diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml index e84b321ccf..000d219ed0 100644 --- a/indra/newview/skins/default/xui/it/menu_picks.xml +++ b/indra/newview/skins/default/xui/it/menu_picks.xml @@ -4,5 +4,5 @@ <menu_item_call label="Modifica" name="pick_edit"/> <menu_item_call label="Teleport" name="pick_teleport"/> <menu_item_call label="Mappa" name="pick_map"/> - <menu_item_call label="Cancella" name="pick_delete"/> + <menu_item_call label="Elimina" name="pick_delete"/> </context_menu> diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml index 2c5b8a848c..32d7abc259 100644 --- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_ladmark_gear"> <menu_item_call label="Teleport" name="teleport"/> - <menu_item_call label="Maggiori Informazioni" name="more_info"/> - <menu_item_call label="Mostra sulla Mappa" name="show_on_map"/> - <menu_item_call label="Aggiungi Landmark" name="add_landmark"/> - <menu_item_call label="Aggiungi Cartella" name="add_folder"/> + <menu_item_call label="Maggiori informazioni" name="more_info"/> + <menu_item_call label="Mostra sulla mappa" name="show_on_map"/> + <menu_item_call label="Aggiungi Punto di riferimento" name="add_landmark"/> + <menu_item_call label="Aggiungi cartella" name="add_folder"/> <menu_item_call label="Taglia" name="cut"/> - <menu_item_call label="Copia Landmark" name="copy_landmark"/> + <menu_item_call label="Copia punto di riferimento" name="copy_landmark"/> <menu_item_call label="Copia SLurl" name="copy_slurl"/> <menu_item_call label="Incolla" name="paste"/> - <menu_item_call label="Rinomina" name="rename"/> - <menu_item_call label="Cancella" name="delete"/> + <menu_item_call label="Modifica nome" name="rename"/> + <menu_item_call label="Elimina" name="delete"/> <menu_item_call label="Apri tutte le cartelle" name="expand_all"/> <menu_item_call label="Chiudi tutte le cartelle" name="collapse_all"/> - <menu_item_check label="Ordina per Data" name="sort_by_date"/> - <menu_item_call label="Crea Luogo Consigliato" name="create_pick"/> + <menu_item_check label="Ordina in base alla data" name="sort_by_date"/> + <menu_item_call label="Crea Luogo consigliato" name="create_pick"/> </menu> diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml index 4a7c9b11c7..b55a786719 100644 --- a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml @@ -2,7 +2,7 @@ <panel name="panel_im_control_panel"> <panel name="panel_call_buttons"> <button label="Chiama" name="call_btn"/> - <button label="Abbandona Chiamata" name="end_call_btn"/> - <button label="Voice Controls" name="voice_ctrls_btn"/> + <button label="Abbandona chiamata" name="end_call_btn"/> + <button label="Regolazione voce" name="voice_ctrls_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml index cf833924ae..c79d73b339 100644 --- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml @@ -4,7 +4,7 @@ Lista bloccata </text> <scroll_list name="blocked" tool_tip="Lista dei residenti bloccati"/> - <button label="Blocca il Residente..." label_selected="Blocca Residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/> + <button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/> <button label="Blocca l'oggetto per nome..." label_selected="Blocca l'oggetto per nome..." name="Block object by name..."/> <button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi dalla lista il residente o l'oggetto bloccato"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml index 7f2e82e4ff..c1a9ce7dd2 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Modifica scelta ????" name="panel_edit_pick"> +<panel label="Modifica scelta" name="panel_edit_pick"> <text name="title"> - Modifica scelta ???? + Modifica scelta </text> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> @@ -16,13 +16,13 @@ Luogo: </text> <text name="pick_location"> - caricando... + caricamento... </text> <button label="Imposta come luogo attuale" name="set_to_curr_location_btn"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> <button label="Salva [WHAT]" name="save_changes_btn"/> - <button label="Cancella" name="cancel_btn"/> + <button label="Annulla" name="cancel_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_friends.xml b/indra/newview/skins/default/xui/it/panel_friends.xml index a3a985f5aa..ec9d69e65e 100644 --- a/indra/newview/skins/default/xui/it/panel_friends.xml +++ b/indra/newview/skins/default/xui/it/panel_friends.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="friends"> <string name="Multiple"> - Amici multipli + Più amici </string> <scroll_list name="friend_list" tool_tip="Tieni premuto shift o control mentre clicchi per selezionare più di un amico"> <column name="icon_online_status" tool_tip="Stato Online"/> diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml index 0ca1ce2064..a1b19b5855 100644 --- a/indra/newview/skins/default/xui/it/panel_group_general.xml +++ b/indra/newview/skins/default/xui/it/panel_group_general.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Generale" name="general_tab"> <panel.string name="help_text"> - La tabella generale contiene informazioni generali su questo gruppo, lista dei membri, preferenze generali del gruppo e opzioni dei membri. + La scheda generale contiene informazioni generali su questo gruppo, lista dei soci, preferenze del gruppo e opzioni dei soci. -Muovi il tuo mouse sopra le opzioni per maggior aiuto. +Muovi il tuo mouse sopra le opzioni per maggiore aiuto. </panel.string> <panel.string name="group_info_unchanged"> Le informazioni generali sul gruppo sono cambiate @@ -15,23 +15,23 @@ Muovi il tuo mouse sopra le opzioni per maggior aiuto. Statuto del gruppo </text_editor> <name_list name="visible_members"> - <name_list.columns label="Membro" name="name"/> + <name_list.columns label="Socio" name="name"/> <name_list.columns label="Titolo" name="title"/> </name_list> <text name="active_title_label"> - Mio Titolo + Il mio titolo </text> - <combo_box name="active_title" tool_tip="Imposta il titolo nella tag del tuo avatar quando questo gruppo è attivo."/> - <check_box label="Ricevi notice dal gruppo" name="receive_notices" tool_tip="Imposta se vuoi ricevere Notice da questo. De-seleziona questa casella se il gruppo ti manda spam."/> - <check_box label="Mostra nel mio Profilo" name="list_groups_in_profile" tool_tip="Imposta se vuoi mostrare questo gruppo nel tuo profilo"/> + <combo_box name="active_title" tool_tip="Imposta il titolo che compare con il nome del tuo avatar quando questo gruppo è attivo."/> + <check_box label="Ricevi avvisi dal gruppo" name="receive_notices" tool_tip="Imposta se vuoi ricevere avvisi da questo gruppo. Deseleziona questa casella se il gruppo ti manda messaggi indesiderati."/> + <check_box label="Mostra nel mio profilo" name="list_groups_in_profile" tool_tip="Imposta se vuoi mostrare questo gruppo nel tuo profilo"/> <panel name="preferences_container"> <check_box label="Iscrizione libera" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di aderire senza essere invitati."/> <check_box label="Tassa d'iscrizione" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa d'iscrizione per aderire al gruppo"/> - <spinner label="L$" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa d'iscrizione quando tassa d'iscrizione è selezionata." width="60"/> + <spinner label="L$" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi soci devono pagare questa tassa d'iscrizione quando è selezionata." width="60"/> <combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi Mature."> <combo_box.item label="Contenuto PG" name="pg"/> <combo_box.item label="Contenuto Mature" name="mature"/> </combo_box> - <check_box initial_value="true" label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Permetti alle persone di vedere questo gruppo nei risultati del Cerca"/> + <check_box initial_value="true" label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Permetti alle persone di vedere questo gruppo nei risultati della ricerca"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml index 26255943ed..a439c3ddb5 100644 --- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Informazioni sul gruppo" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - Ci sono variazioni non salvate nella tabella attuale + Ci sono modifiche non salvate nella scheda attuale </panel.string> <panel.string name="want_apply_text"> - Vuoi salvare queste variazioni? + Vuoi salvare le modifiche? </panel.string> <panel.string name="group_join_btn"> - Aderisci (L$[AMOUNT]) + Aderisci ([AMOUNT] L$) </panel.string> <panel.string name="group_join_free"> Gratis </panel.string> - <text name="group_name" value="(Caricando...)"/> - <line_editor label="Scrivi qui il nuovo nome del tuo gruppo" name="group_name_editor"/> - <texture_picker label="" name="insignia" tool_tip="Clicca per scegliere uan fotografia"/> + <text name="group_name" value="(Caricamento in corso...)"/> + <line_editor label="Scrivi qui il nome del gruppo" name="group_name_editor"/> + <texture_picker label="" name="insignia" tool_tip="Clicca per scegliere una fotografia"/> <text name="prepend_founded_by"> Fondatore: </text> - <name_box initial_value="(recuperando)" name="founder_name"/> + <name_box initial_value="(recupero)" name="founder_name"/> <text name="join_cost_text"> Gratis </text> - <button label="ADERISCI ORA!" name="btn_join"/> + <button label="ADERISCI ADESSO!" name="btn_join"/> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="Generale"/> <accordion_tab name="group_roles_tab" title="Ruoli"/> - <accordion_tab name="group_notices_tab" title="Notice"/> - <accordion_tab name="group_land_tab" title="Terra/Beni ?????"/> + <accordion_tab name="group_notices_tab" title="Avvisi"/> + <accordion_tab name="group_land_tab" title="Terra/Beni"/> </accordion> <panel name="button_row"> <button label="Crea" label_selected="Nuovo gruppo" name="btn_create"/> diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml index bc98fdacaf..1a2934b7ff 100644 --- a/indra/newview/skins/default/xui/it/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml @@ -4,7 +4,7 @@ Ci sono modifiche non salvate nella scheda attuale </panel.string> <panel.string name="want_apply_text"> - Vuoi salvare queste modifiche? + Vuoi salvare le modifiche? </panel.string> <tab_container height="164" name="roles_tab_container"> <panel height="148" label="MEMBRI" name="members_sub_tab" tool_tip="Membri"> @@ -15,24 +15,25 @@ cliccando sui loro nomi. </panel.string> <filter_editor label="Filtra Membri" name="filter_input"/> <name_list bottom_delta="-105" height="104" name="member_list"> - <name_list.columns label="Nome del Membro" name="name"/> + <name_list.columns label="Socio" name="name"/> <name_list.columns label="Donazioni" name="donated"/> - <name_list.columns label="Status" name="online"/> + <name_list.columns label="Online" name="online"/> </name_list> <button label="Invita" name="member_invite" width="165"/> <button label="Espelli" name="member_eject"/> </panel> <panel height="148" label="RUOLI" name="roles_sub_tab"> <panel.string name="help_text"> - I ruoli hanno un titolo con un elenco di abilità permesse che i membri possono eseguire. - I membri possono avere uno o più ruoli. Un gruppo può avere fino a 10 ruoli, inclusi il ruolo base o "Membro" e - il ruolo del Capogruppo. + I ruoli hanno un titolo con un elenco di abilità permesse +che i membri possono eseguire. I membri possono avere +uno o più ruoli. Un gruppo può avere fino a 10 ruoli, +fra cui il ruolo base o "Tutti" e il ruolo del Proprietario, ovvero il capogruppo. </panel.string> <panel.string name="cant_delete_role"> I Ruoli 'Everyone' e 'Owners' sono speciali e non possono essere cancellati. </panel.string> <panel.string name="power_folder_icon"> - Cartella Inventario chiusa + Inv_FolderClosed </panel.string> <filter_editor label="Filtra i ruoli" name="filter_input"/> <scroll_list bottom_delta="-104" height="104" name="role_list"> @@ -43,7 +44,7 @@ cliccando sui loro nomi. <button label="Crea nuovo ruolo" name="role_create"/> <button label="Elimina ruolo" name="role_delete"/> </panel> - <panel height="148" label="ABILITA'" name="actions_sub_tab" tool_tip="Puoi vedere la descrizione dell'abilità e quali Ruoli o Membri possono eseguirla."> + <panel height="148" label="ABILITÀ" name="actions_sub_tab" tool_tip="Puoi vedere la descrizione dell'abilità e quali ruoli o membri possono eseguirla."> <panel.string name="help_text"> Le abilità permettono ai membri nei ruoli di fare cose specifiche in questo gruppo. C'è una vasta gamma di abilità . @@ -59,7 +60,7 @@ in questo gruppo. C'è una vasta gamma di abilità . <text name="static2"> Abilità permesse </text> - <scroll_list name="member_allowed_actions" tool_tip="Per i dettagli di ogni abilità consentita vedi il pannello abilità ."/> + <scroll_list name="member_allowed_actions" tool_tip="Per i dettagli di ogni abilità consentita vedi la scheda abilità ."/> </panel> <panel name="roles_footer"> <text name="static"> @@ -83,11 +84,11 @@ in questo gruppo. C'è una vasta gamma di abilità . <text name="static4"> Ruoli assegnati </text> - <check_box label="Mostrare i membri" name="role_visible_in_list" tool_tip="Imposta nella tabella Generale per i membri con questo ruolo di poter essere visti dalle persone esterne a questo gruppo."/> + <check_box label="Visualizza membri" name="role_visible_in_list" tool_tip="Imposta nella scheda Generale per i membri di questo ruolo la visibilità da parte dei residenti esterni al gruppo."/> <text name="static5" tool_tip="Una lista delle abilità che il ruolo ora selezionato può eseguire."> Abilità permesse </text> - <scroll_list name="role_allowed_actions" tool_tip="Per i dettagli di ogni abilità consentita vedi il pannello abilità ."/> + <scroll_list name="role_allowed_actions" tool_tip="Per i dettagli di ogni abilità consentita vedi la scheda abilità ."/> </panel> <panel name="actions_footer"> <text name="static"> diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml index 7706a044fa..aec58738b8 100644 --- a/indra/newview/skins/default/xui/it/panel_login.xml +++ b/indra/newview/skins/default/xui/it/panel_login.xml @@ -6,29 +6,33 @@ <panel.string name="forgot_password_url"> http://secondlife.com/account/request.php?lang=it </panel.string> - <layout_stack name="login_widgets"> - <layout_panel name="login"> - <text name="first_name_text"> - Nome: - </text> - <line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> - <line_editor label="Cognome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> - <check_box label="Ricordare" name="remember_check"/> - <text name="start_location_text"> - Iniziare presso: - </text> - <combo_box name="start_location_combo"> - <combo_box.item label="Casa mia" name="MyHome"/> - </combo_box> - <button label="Log In" name="connect_btn"/> - </layout_panel> - <layout_panel name="links"> - <text name="create_new_account_text"> - Aderire - </text> - <text name="login_help"> - Aiuto quando log in? - </text> - </layout_panel> - </layout_stack> + <panel name="login_widgets"> + <text name="first_name_text"> + Nome: + </text> + <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Nome"/> + <text name="last_name_text"> + Cognome: + </text> + <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Cognome"/> + <text name="password_text"> + Password: + </text> + <button label="Accedi" label_selected="Accedi" name="connect_btn"/> + <text name="start_location_text"> + Luogo di partenza: + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="La mia ultima ubicazione" name="MyLastLocation"/> + <combo_box.item label="La mia casa" name="MyHome"/> + <combo_box.item label="<Scrivi nome regione>" name="Typeregionname"/> + </combo_box> + <check_box label="Ricorda password" name="remember_check"/> + <text name="create_new_account_text"> + Crea nuovo account + </text> + <text name="forgot_password_text"> + Hai dimenticato il nome o la password? + </text> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index edaab6e60c..8c2479a019 100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml @@ -9,9 +9,9 @@ <inventory_panel label="Elementi recenti" name="Recent Items"/> </tab_container> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/> + <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> <button name="add_btn" tool_tip="Aggiungi nuovo elemento"/> - <dnd_button name="trash_btn" tool_tip="Rimuovi l'elemento selezionato"/> + <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> </panel> <menu_bar name="Inventory Menu"> <menu label="File" name="File"> @@ -22,42 +22,42 @@ <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> <menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/> </menu> - <menu_item_call label="Nuova Finestra" name="New Window"/> - <menu_item_call label="Mostra Filtri" name="Show Filters"/> - <menu_item_call label="Cancella Filtri" name="Reset Current"/> - <menu_item_call label="Chiudi tutte le Cartelle" name="Close All Folders"/> - <menu_item_call label="Svuota Cestino" name="Empty Trash"/> - <menu_item_call label="Svuota Oggetti Smarriti" name="Empty Lost And Found"/> + <menu_item_call label="Nuova finestra" name="New Window"/> + <menu_item_call label="Mostra filtri" name="Show Filters"/> + <menu_item_call label="Ripristina filtri" name="Reset Current"/> + <menu_item_call label="Chiudi tutte le cartelle" name="Close All Folders"/> + <menu_item_call label="Svuota cestino" name="Empty Trash"/> + <menu_item_call label="Svuota oggetti smarriti" name="Empty Lost And Found"/> </menu> <menu label="Crea" name="Create"> - <menu_item_call label="Nuova Cartella" name="New Folder"/> - <menu_item_call label="Nuovo Script" name="New Script"/> - <menu_item_call label="Nuova Notecard" name="New Note"/> - <menu_item_call label="Nuova Gesture" name="New Gesture"/> - <menu label="Nuovi Abiti" name="New Clothes"> - <menu_item_call label="Nuova Camicia" name="New Shirt"/> - <menu_item_call label="Nuovi Pantaloni" name="New Pants"/> - <menu_item_call label="Nuove Scarpe" name="New Shoes"/> - <menu_item_call label="Nuove Calze" name="New Socks"/> - <menu_item_call label="Nuova Giacca" name="New Jacket"/> - <menu_item_call label="Nuova Gonna" name="New Skirt"/> - <menu_item_call label="Nuovi Guanti" name="New Gloves"/> - <menu_item_call label="Nuova Maglietta Intima" name="New Undershirt"/> - <menu_item_call label="Nuovi Slip" name="New Underpants"/> - <menu_item_call label="Nuovo Alfa (Trasparenza)" name="New Alpha"/> - <menu_item_call label="Nuovo Tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuova cartella" name="New Folder"/> + <menu_item_call label="Nuovo script" name="New Script"/> + <menu_item_call label="Nuovo appunto" name="New Note"/> + <menu_item_call label="Nuova gesture" name="New Gesture"/> + <menu label="Maglietta intima" name="New Clothes"> + <menu_item_call label="Nuova camicia" name="New Shirt"/> + <menu_item_call label="Nuovi pantaloni" name="New Pants"/> + <menu_item_call label="Nuove scarpe" name="New Shoes"/> + <menu_item_call label="Nuove calze" name="New Socks"/> + <menu_item_call label="Nuova giacca" name="New Jacket"/> + <menu_item_call label="Nuova gonna" name="New Skirt"/> + <menu_item_call label="Nuovi guanti" name="New Gloves"/> + <menu_item_call label="Nuova maglietta intima" name="New Undershirt"/> + <menu_item_call label="Nuovi slip" name="New Underpants"/> + <menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/> + <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> </menu> - <menu label="Nuove Parti del Corpo" name="New Body Parts"> - <menu_item_call label="Nuova Shape" name="New Shape"/> - <menu_item_call label="Nuova Pelle" name="New Skin"/> - <menu_item_call label="Nuovi Capelli" name="New Hair"/> - <menu_item_call label="Nuovi Occhi" name="New Eyes"/> + <menu label="Nuove parti del corpo" name="New Body Parts"> + <menu_item_call label="Nuova figura corporea" name="New Shape"/> + <menu_item_call label="Nuova pelle" name="New Skin"/> + <menu_item_call label="Nuovi capelli" name="New Hair"/> + <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> </menu> <menu label="Ordina" name="Sort"> - <menu_item_check label="Per Nome" name="By Name"/> - <menu_item_check label="Per Data" name="By Date"/> - <menu_item_check label="Cartelle sempre per Nome" name="Folders Always By Name"/> + <menu_item_check label="In base al nome" name="By Name"/> + <menu_item_check label="In base alla data" name="By Date"/> + <menu_item_check label="Cartelle sempre in base al nome" name="Folders Always By Name"/> <menu_item_check label="Cartelle di sistema all'inizio" name="System Folders To Top"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml index cb629e5cfb..5ed7b23679 100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml @@ -4,27 +4,27 @@ Home Page: </text> <text name="home_fails_whitelist_label"> - (Questa pagina non passa la lista bianca specifica) + (Questa pagina non supera la revisione o lista bianca specifica) </text> - <line_editor name="home_url" tool_tip="La home page per questa fonte media"/> + <line_editor name="home_url" tool_tip="La home page per questa fonte multimediale"/> <text name="preview_label"> Anteprima </text> <text name="current_url_label"> Pagina attuale: </text> - <text name="current_url" tool_tip="La pagina attuale per questa fonte media" value=""/> - <button label="Resetta" name="current_url_reset_btn"/> - <check_box initial_value="false" label="Auto Loop" name="auto_loop"/> - <check_box initial_value="false" label="Primo Click Interagisce" name="first_click_interact"/> - <check_box initial_value="false" label="Auto Zoom" name="auto_zoom"/> - <check_box initial_value="false" label="Auto Play Media" name="auto_play"/> + <text name="current_url" tool_tip="La pagina attuale per questa fonte multimediale" value=""/> + <button label="Reimposta" name="current_url_reset_btn"/> + <check_box initial_value="false" label="Ripetizione automatica" name="auto_loop"/> + <check_box initial_value="false" label="Interazione col primo clic" name="first_click_interact"/> + <check_box initial_value="false" label="Zoom automatico" name="auto_zoom"/> + <check_box initial_value="false" label="Riproduzione multimediale automatica" name="auto_play"/> <text name="media_setting_note"> - Nota: I Residenti possono annullare questa impostazione + Nota: I residenti possono annullare questa impostazione </text> - <check_box initial_value="false" label="Auto Scale Media on Face of Object" name="auto_scale"/> + <check_box initial_value="false" label="Messa in scala automatica dell'elemento multimediale sulla faccia dell'oggetto" name="auto_scale"/> <text name="size_label"> - Misura: + Dimensioni: </text> <text name="X_label"> X diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml index 4771457825..7c059b443d 100644 --- a/indra/newview/skins/default/xui/it/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/it/panel_pick_info.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_pick_info"> - <text name="title" value="Scegli Info ????"/> + <text name="title" value="Scegli Info"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <text name="pick_name" value="[nome]"/> - <text name="pick_location" value="[Caricando...]"/> + <text name="pick_location" value="[caricamento...]"/> <text name="pick_desc" value="[descrizione]"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index 13ffabbebf..bb05d549cc 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml @@ -6,8 +6,8 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Chat a Bolle" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Scegli il colore delle vignette della Chat"/> + <check_box label="Chat a bolla" name="bubble_text_chat"/> + <color_swatch name="background" tool_tip="Scegli il colore delle vignette della chat"/> <slider label="Opacità " name="bubble_chat_opacity"/> <text name="AspectRatioLabel1" tool_tip="larghezza/altezza"> Rapporto di visualizzazione @@ -20,29 +20,29 @@ </combo_box> <check_box label="Rilevamento automatico" name="aspect_auto_detect"/> <text name="heading1"> - Camera: + Fotocamera: </text> <slider label="Angolazione della visuale" name="camera_fov"/> <slider label="Distanza" name="camera_offset_scale"/> <text name="heading2"> - Posizionamento Automatico per: + Posizionamento automatico per: </text> - <check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera entrando e uscendo dalla modalità modifica"/> - <check_box label="Aspetto Fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/> + <check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/> + <check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/> <text name="heading3"> Avatar: </text> <check_box label="Mostra in modalità Mouselook" name="first_person_avatar_visible"/> - <check_box label="Cammino sempre con le frecce di movimento" name="arrow_keys_move_avatar_check"/> - <check_box label="Doppio Click-Tieni Premuto per correre" name="tap_tap_hold_to_run"/> - <check_box label="Consente il movimento delle labbra dell'Avatar quando parla" name="enable_lip_sync"/> + <check_box label="Le frecce di direzione mi fanno sempre spostare" name="arrow_keys_move_avatar_check"/> + <check_box label="Doppio click e tieni premuto per correre" name="tap_tap_hold_to_run"/> + <check_box label="Consente il movimento delle labbra dell'avatar quando parla" name="enable_lip_sync"/> <check_box label="Mostra errori degli script" name="show_script_errors"/> <radio_group name="show_location"> <radio_item label="In chat" name="0"/> <radio_item label="In una finestra" name="1"/> </radio_group> - <check_box label="Modalità del microfono "interruttore ON/OFF" quando premo l'interruttore PARLA:" name="push_to_talk_toggle_check" tool_tip="In modalità "interruttore ON/OFF" premi il tasto per attivare o disattivare il microfono. Quando non usi questa modalità , il microfono è attivo solo se tieni premuto il tasto."/> - <line_editor label="Premi il pulsante per parlare" name="modifier_combo"/> - <button label="Imposta" name="set_voice_hotkey_button"/> - <button label="Pulsante centrale del Mouse" name="set_voice_middlemouse_button"/> + <check_box label="Attiva/disattiva modalità microfono quando premo il tasto di comando Parla:" name="push_to_talk_toggle_check" tool_tip="In modalità "interruttore ON/OFF" premi il tasto una volta per attivare o disattivare il microfono. Quando non usi questa modalità , il microfono è attivo solo se tieni premuto il tasto di comando."/> + <line_editor label="Pulsante di comando della funzione Premi per parlare" name="modifier_combo"/> + <button label="Imposta tasto" name="set_voice_hotkey_button"/> + <button label="Pulsante centrale del mouse" name="set_voice_middlemouse_button"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml index 02da9de4a4..e5d57cffbe 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Pop-up" name="popups" title="Pop-up"> <text name="tell_me_label"> - Dimmi: + Avvisami: </text> <check_box label="Quando spendo o ottengo L$" name="notify_money_change_checkbox"/> <check_box label="Quando i miei amici entrano o escono da SL" name="friends_online_notify_checkbox"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index 9c064c2716..582ffd43f3 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text Chat" name="chat"> <radio_group name="chat_font_size"> - <radio_item label="Piccolo" name="radio"/> - <radio_item label="Medio" name="radio2"/> + <radio_item label="Piccola" name="radio"/> + <radio_item label="Media" name="radio2"/> <radio_item label="Grande" name="radio3"/> </radio_group> <color_swatch label="Tuo" name="user"/> @@ -38,7 +38,7 @@ URLs </text> <check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/> - <check_box label="Spediscimi nella email gli IM quando sono OFF-LINE" name="send_im_to_email"/> + <check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/> <radio_group name="chat_window" tool_tip="Mostra i tuoi Instant Messages in finestre separate, o in una finestra con diverse tabelle (Requires restart)"> <radio_item label="Finestre multiple" name="radio"/> <radio_item label="Una finestra" name="radio2"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index 80b152752b..7463c88d96 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -4,7 +4,7 @@ Lingua: </text> <combo_box name="language_combobox"> - <combo_box.item label="System default" name="System Default Language"/> + <combo_box.item label="Default di sistema" name="System Default Language"/> <combo_box.item label="English" name="English"/> <combo_box.item label="Dansk (Danese) - Beta" name="Danish"/> <combo_box.item label="Deutsch (Tedesco) - Beta" name="Deutsch(German)"/> @@ -17,7 +17,7 @@ <combo_box.item label="日本語 (Giapponese) - Beta" name="(Japanese)"/> </combo_box> <text name="language_textbox2"> - (Richiede restart) + (Richiede il riavvio) </text> <text name="maturity_desired_prompt"> Voglio accedere al contenuto di tipo: @@ -29,15 +29,15 @@ <combo_box.item label="PG" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> - Luogo d'inizio: + Luogo di partenza: </text> <combo_box name="start_location_combo"> <combo_box.item label="Ultimo posto visitato" name="MyLastLocation" tool_tip="Vai nell'ultimo posto visitato di default quando fai login."/> <combo_box.item label="Casa mia" name="MyHome" tool_tip="Vai a casa di default quando fai login"/> </combo_box> - <check_box initial_value="true" label="Mostra su login" name="show_location_checkbox"/> + <check_box initial_value="true" label="Mostra con il login" name="show_location_checkbox"/> <text name="name_tags_textbox"> - Nome sulle tags: + Nome: </text> <radio_group name="Name_Tag_Preference"> <radio_item label="Off" name="radio"/> @@ -45,14 +45,14 @@ <radio_item label="Mostra brevemente" name="radio3"/> </radio_group> <check_box label="Mostra il mio nome" name="show_my_name_checkbox1"/> - <check_box initial_value="true" label="Nome piccolo sulle tags" name="small_avatar_names_checkbox"/> + <check_box initial_value="true" label="Nome in piccolo" name="small_avatar_names_checkbox"/> <check_box label="Mostra titoli del gruppo" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> - Miei effetti: + I miei effetti: </text> <color_swatch label="" name="effect_color_swatch" tool_tip="Clicca per aprire la tavolozza dei colori"/> <text name="title_afk_text"> - Pausa di Away: + Pausa assenza: </text> <spinner label="Assente dopo:" name="afk_timeout_spinner"/> <text name="seconds_textbox"> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index c4d46291dd..2ac60412ff 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Suoni" name="Preference Media panel"> - <slider label="Principale" name="System Volume"/> + <slider label="Comando volume centrale" name="System Volume"/> <check_box initial_value="true" label="Spegni suono se minimizzato" name="mute_when_minimized"/> <slider label="Ambiente" name="Wind Volume"/> <slider label="Pulsanti" name="UI Volume"/> - <slider label="MultiMedia" name="Media Volume"/> - <slider label="Effetto Suoni" name="SFX Volume"/> - <slider label="Musica" name="Music Volume"/> + <slider label="Multimediale" name="Media Volume"/> + <slider label="Effetti sonori" name="SFX Volume"/> + <slider label="Musica in streaming" name="Music Volume"/> <check_box label="Voce" name="enable_voice_check"/> <slider label="Voice" name="Voice Volume"/> <text name="Listen from"> Ascolta da: </text> <radio_group name="ear_location"> - <radio_item label="Posizione della Camera" name="0"/> - <radio_item label="Posizione dell'Avatar" name="1"/> + <radio_item label="Posizione della fotocamera" name="0"/> + <radio_item label="Posizione dell'avatar" name="1"/> </radio_group> <button label="Dispositivi di Input/Output" name="device_settings_btn" width="165"/> <panel label="Impostazioni del dispositivo" name="device_settings_panel"> @@ -25,7 +25,7 @@ Input </text> <text name="My volume label"> - Mio volume: + Il mio volume: </text> <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il volume utilizzando questa barra"/> <text name="wait_text"> diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml index dc7d59084e..9e95fbc600 100644 --- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml @@ -2,27 +2,27 @@ <panel name="MediaControls"> <layout_stack name="media_controls"> <layout_panel name="media_address"> - <line_editor name="media_address_url" tool_tip="Media URL"/> + <line_editor name="media_address_url" tool_tip="URL multimedia"/> <layout_stack name="media_address_url_icons"> <layout_panel> - <icon name="media_whitelist_flag" tool_tip="Lista Bianca attivata"/> + <icon name="media_whitelist_flag" tool_tip="Lista bianca attivata"/> </layout_panel> <layout_panel> - <icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/> + <icon name="media_secure_lock_flag" tool_tip="Navigazione sicura"/> </layout_panel> </layout_stack> </layout_panel> <layout_panel name="media_play_position"> - <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Avanzamento riproduzione Movie"/> + <slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Avanzamento riproduzione filmato"/> </layout_panel> <layout_panel name="media_volume"> - <button name="media_mute_button" tool_tip="Silenzia questo Media ????"/> - <slider name="volume_slider" tool_tip="Volume Media"/> + <button name="media_mute_button" tool_tip="Silenzia questo elemento multimediale"/> + <slider name="volume_slider" tool_tip="Volume multimedia"/> </layout_panel> </layout_stack> <layout_stack> <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="Media stà caricando"/> + <progress_bar name="media_progress_bar" tool_tip="L'elemento multimediale è in caricamento"/> </panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml index b6dc60a9c2..35d683aa9b 100644 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml @@ -24,10 +24,10 @@ avranno effetto su tutte le regioni della proprietà . <check_box label="Permetti accesso pubblico" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Accesso ristretto ai Residenti verificati con: + Consenti l'accesso soltanto ai residenti verificati tramite: </text> - <check_box label="Informazioni di pagamento on File" name="limit_payment" tool_tip="Espelli residenti non identificati"/> - <check_box label="Verifica dell'età " name="limit_age_verified" tool_tip="Espelli i residenti che non hanno verificato l'età . Vedi [SUPPORT_SITE] per maggiori informazioni."/> + <check_box label="Informazioni di pagamento in archivio" name="limit_payment" tool_tip="Espelli residenti non identificati"/> + <check_box label="Verifica età " name="limit_age_verified" tool_tip="Espelli i residenti che non hanno verificato l'età . Vedi [SUPPORT_SITE] per maggiori informazioni."/> <check_box label="Permetti la chat voice" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Permetti teleport diretto" name="allow_direct_teleport"/> diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml index 5e5f229ce4..753e89f2fd 100644 --- a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="sidetray_tab_panel"> - <text name="sidetray_tab_title" value="Vaschetta laterale"/> + <text name="sidetray_tab_title" value="Pannello laterale"/> <button name="show_help" tool_tip="Mostra Aiuto"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml index 1349b36e2c..8d18e0ee0b 100644 --- a/indra/newview/skins/default/xui/it/panel_world_map.xml +++ b/indra/newview/skins/default/xui/it/panel_world_map.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="world_map"> <panel.string name="Loading"> - Sto Caricando... + Caricamento in corso... </panel.string> <panel.string name="InvalidLocation"> Luogo non valido diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 910e6e0960..28b12f2bdf 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -17,13 +17,13 @@ Ricerca hardware... </string> <string name="StartupLoading"> - In Caricamento + Caricamento in corso </string> <string name="LoginInProgress"> In connessione. [APP_NAME] può sembrare rallentata. Attendi. </string> <string name="LoginInProgressNoFrozen"> - Logging in... + Accesso in corso... </string> <string name="LoginAuthenticating"> In autenticazione @@ -80,7 +80,7 @@ Errore di rete: Non è stato possibile stabilire un collegamento, controlla la tua connessione. </string> <string name="Quit"> - Termina + Esci </string> <string name="create_account_url"> http://join.secondlife.com/index.php?lang=it-IT @@ -152,10 +152,10 @@ Clicca per vedere questa inserzione </string> <string name="TooltipParcelUrl"> - Clicca per vedere la descrizione della parcel + Clicca per vedere la descrizione del lotto </string> <string name="TooltipTeleportUrl"> - Clicca per teleportarti a questa destinazione + Clicca per effettuare il teleport a questa destinazione </string> <string name="TooltipObjectIMUrl"> Clicca per vedere la descrizione dell'oggetto @@ -166,7 +166,7 @@ <string name="TooltipSLAPP"> Clicca per avviare il comando secondlife:// </string> - <string name="CurrentURL" value=" URL attuale: [CurrentURL]"/> + <string name="CurrentURL" value="URL attuale: [CurrentURL]"/> <string name="SLurlLabelTeleport"> Teleportati a </string> @@ -174,7 +174,7 @@ Mostra la mappa per </string> <string name="BUTTON_CLOSE_DARWIN"> - Chiudi (⌘W) + Chiudi (⌘W) </string> <string name="BUTTON_CLOSE_WIN"> Chiudi (Ctrl+W) @@ -195,10 +195,10 @@ Disà ncora </string> <string name="BUTTON_HELP"> - Mostra gli aiuti + Mostra Aiuto </string> <string name="Searching"> - In ricerca... + Ricerca in corso... </string> <string name="NoneFound"> Nessun risultato. @@ -267,19 +267,19 @@ biglietto da visita </string> <string name="landmark"> - landmark + punto di riferimento </string> <string name="legacy script"> script (vecchia versione) </string> <string name="clothing"> - abito + vestiario </string> <string name="object"> oggetto </string> <string name="note card"> - notecard + biglietto </string> <string name="folder"> cartella @@ -309,7 +309,7 @@ immagine targa </string> <string name="trash"> - cestino + Cestino </string> <string name="jpeg image"> immagine jpeg @@ -546,7 +546,7 @@ Si </string> <string name="texture_loading"> - In Caricamento... + Caricamento in corso... </string> <string name="worldmap_offline"> Offline @@ -684,25 +684,25 @@ Scegli la cartella </string> <string name="AvatarSetNotAway"> - Imposta non assente + Imposta come non assente </string> <string name="AvatarSetAway"> - Imposta assente + Imposta come assente </string> <string name="AvatarSetNotBusy"> - Imposta non occupato + Imposta come non occupato </string> <string name="AvatarSetBusy"> - Imposta occupato + Imposta come occupato </string> <string name="shape"> - Shape + Figura corporea </string> <string name="skin"> - Skin + Pelle </string> <string name="hair"> - Capelli + Capigliature </string> <string name="eyes"> Occhi @@ -717,7 +717,7 @@ Scarpe </string> <string name="socks"> - Calze + Calzini </string> <string name="jacket"> Giacca @@ -729,7 +729,7 @@ Maglietta intima </string> <string name="underpants"> - slip + Slip </string> <string name="skirt"> Gonna @@ -744,16 +744,16 @@ non valido </string> <string name="next"> - Seguente + Avanti </string> <string name="ok"> OK </string> <string name="GroupNotifyGroupNotice"> - Notice di gruppo + Avviso di gruppo </string> <string name="GroupNotifyGroupNotices"> - Notice di gruppo + Avvisi di gruppo </string> <string name="GroupNotifySentBy"> Inviato da @@ -762,7 +762,7 @@ Allegato: </string> <string name="GroupNotifyViewPastNotices"> - Visualizza i notice passati o scegli qui di non riceverne. + Visualizza gli avvisi precedenti o scegli qui di non riceverne. </string> <string name="GroupNotifyOpenAttachment"> Apri l'allegato @@ -771,7 +771,7 @@ Salva l'allegato </string> <string name="TeleportOffer"> - Offerta di Teletrasporto + Offerta di Teleport </string> <string name="StartUpNotification"> [%d] una nuova notifica è arrivata mentre eri assente... @@ -819,40 +819,40 @@ Non hai una copia di questa texture in inventario. </string> - <string name="no_transfer" value=" (no transfer)"/> - <string name="no_modify" value=" (no modify)"/> - <string name="no_copy" value=" (no copy)"/> - <string name="worn" value=" (indossato)"/> - <string name="link" value=" (link)"/> - <string name="broken_link" value=" (broken_link)"/> + <string name="no_transfer" value="(nessun trasferimento)"/> + <string name="no_modify" value="(nessuna modifica)"/> + <string name="no_copy" value="(nessuna copia)"/> + <string name="worn" value="(indossato)"/> + <string name="link" value="(link)"/> + <string name="broken_link" value="(broken_link)""/> <string name="LoadingContents"> - Contenuto in caricamento... + Caricamento del contenuto... </string> <string name="NoContents"> Nessun contenuto </string> - <string name="WornOnAttachmentPoint" value=" (indossato su [ATTACHMENT_POINT])"/> - <string name="Chat" value=" Chat :"/> - <string name="Sound" value=" Suono :"/> - <string name="Wait" value=" --- Attendi :"/> - <string name="AnimFlagStop" value=" Ferma l'Animazione :"/> - <string name="AnimFlagStart" value=" Inizia l'Animazione :"/> - <string name="Wave" value=" Wave"/> - <string name="HelloAvatar" value=" Ciao, avatar!"/> - <string name="ViewAllGestures" value=" Visualizza tutte le gesture >>"/> - <string name="Animations" value=" Animazioni,"/> - <string name="Calling Cards" value=" Biglietti da visita,"/> - <string name="Clothing" value=" Vestiti,"/> - <string name="Gestures" value=" Gesture,"/> - <string name="Landmarks" value=" Landmark,"/> - <string name="Notecards" value=" Notecard,"/> - <string name="Objects" value=" Oggetti,"/> - <string name="Scripts" value=" Script,"/> - <string name="Sounds" value=" Suoni,"/> - <string name="Textures" value=" Texture,"/> - <string name="Snapshots" value=" Fotografie,"/> - <string name="No Filters" value="No "/> - <string name="Since Logoff" value=" - Dalla disconnessione"/> + <string name="WornOnAttachmentPoint" value="(indossato su [ATTACHMENT_POINT])"/> + <string name="Chat" value="Chat :"/> + <string name="Sound" value="Suono :"/> + <string name="Wait" value="--- Attendi :"/> + <string name="AnimFlagStop" value="Ferma l'animazione :"/> + <string name="AnimFlagStart" value="Inizia l'animazione :"/> + <string name="Wave" value="Saluta con la mano"/> + <string name="HelloAvatar" value="Ciao, avatar!"/> + <string name="ViewAllGestures" value="Visualizza tutto >>"/> + <string name="Animations" value="Animazioni,"/> + <string name="Calling Cards" value="Biglietti da visita,"/> + <string name="Clothing" value="Vestiti,"/> + <string name="Gestures" value="Gesture,"/> + <string name="Landmarks" value="Punti di riferimento,"/> + <string name="Notecards" value="Biglietti,"/> + <string name="Objects" value="Oggetti,"/> + <string name="Scripts" value="Script,"/> + <string name="Sounds" value="Suoni,"/> + <string name="Textures" value="Texture,"/> + <string name="Snapshots" value="Fotografie,"/> + <string name="No Filters" value="No"/> + <string name="Since Logoff" value="- Dall'uscita"/> <string name="InvFolder My Inventory"> Il mio inventario </string> @@ -869,22 +869,22 @@ di questa texture in inventario. Suoni </string> <string name="InvFolder Calling Cards"> - Biglieti da visita + Biglietti da visita </string> <string name="InvFolder Landmarks"> - Landmark + Punti di riferimento </string> <string name="InvFolder Scripts"> Script </string> <string name="InvFolder Clothing"> - Vestiti + Vestiario </string> <string name="InvFolder Objects"> Oggetti </string> <string name="InvFolder Notecards"> - Notecard + Biglietti </string> <string name="InvFolder New Folder"> Nuova cartella @@ -920,22 +920,22 @@ di questa texture in inventario. Preferiti </string> <string name="InvFolder Current Outfit"> - Outfit attuale + Abbigliamento attuale </string> <string name="InvFolder My Outfits"> - I miei Outfit + Il mio vestiario </string> <string name="InvFolder Friends"> Amici </string> <string name="InvFolder All"> - Tutti + Tutto </string> <string name="Buy"> - Compra + Acquista </string> <string name="BuyforL$"> - Compra per L$ + Acquista per L$ </string> <string name="Stone"> Pietra @@ -962,7 +962,7 @@ di questa texture in inventario. Luce </string> <string name="KBShift"> - Shift + Maiusc </string> <string name="KBCtrl"> Ctrl @@ -1112,13 +1112,13 @@ di questa texture in inventario. [COUNT] giorni </string> <string name="GroupMembersA"> - [COUNT] membro + [COUNT] iscritto </string> <string name="GroupMembersB"> - [COUNT] membri + [COUNT] iscritti </string> <string name="GroupMembersC"> - [COUNT] membri + [COUNT] iscritti </string> <string name="AcctTypeResident"> Residente @@ -1127,10 +1127,10 @@ di questa texture in inventario. In prova </string> <string name="AcctTypeCharterMember"> - Membro onorario + Socio onorario </string> <string name="AcctTypeEmployee"> - Impiegato Linden Lab + Dipendente Linden Lab </string> <string name="PaymentInfoUsed"> Informazioni di pagamento usate @@ -1139,7 +1139,7 @@ di questa texture in inventario. Informazioni di pagamento registrate </string> <string name="NoPaymentInfoOnFile"> - Nessuna informazione di pagamento + Nessuna informazione di pagamento disponibile </string> <string name="AgeVerified"> Età verificata @@ -1154,7 +1154,7 @@ di questa texture in inventario. In alto a destra </string> <string name="Top"> - In alto + in alto </string> <string name="Top Left"> In alto a sinistra @@ -1196,22 +1196,22 @@ di questa texture in inventario. ricompila </string> <string name="ResetQueueTitle"> - Avanzamento reset + Azzera avanzamento </string> <string name="ResetQueueStart"> - reset + azzera </string> <string name="RunQueueTitle"> - Avanzamento attivazione + Attiva avanzamento </string> <string name="RunQueueStart"> - Attiva + attiva </string> <string name="NotRunQueueTitle"> - Avanzamento disattivazione + Disattiva avanzamento </string> <string name="NotRunQueueStart"> - Disattivazione + disattiva </string> <string name="CompileSuccessful"> Compilazione riuscita! @@ -1231,18 +1231,18 @@ di questa texture in inventario. <string name="GroupsNone"> nessuno </string> - <string name="Group" value=" (gruppo)"/> + <string name="Group" value="(gruppo)"/> <string name="Unknown"> (Sconosciuto) </string> <string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal"/> - <string name="NextStipendDay" value="Il prossimo giorno di stipendio è "/> - <string name="GroupIndividualShare" value=" Gruppo Dividendi individuali"/> + <string name="NextStipendDay" value="Il prossimo giorno di stipendio è"/> + <string name="GroupIndividualShare" value="Gruppo Dividendi individuali"/> <string name="Balance"> Saldo </string> <string name="Credits"> - Crediti + Ringraziamenti </string> <string name="Debits"> Debiti @@ -1257,7 +1257,7 @@ di questa texture in inventario. Proprietà principale </string> <string name="IMMainland"> - mainland + continente </string> <string name="IMTeen"> teen @@ -1266,13 +1266,13 @@ di questa texture in inventario. errore </string> <string name="RegionInfoAllEstatesOwnedBy"> - la proprietà posseduta da [OWNER] + tutte le proprietà immobiliari di [OWNER] </string> <string name="RegionInfoAllEstatesYouOwn"> - Le proprietà che possiedi + tutte le tue proprietà immobiliari </string> <string name="RegionInfoAllEstatesYouManage"> - Le proprietà di cui sei manager per conto di [OWNER] + tutte le proprietà immobiliari che gestisci per conto di [OWNER] </string> <string name="RegionInfoAllowedResidents"> Residenti ammessi: ([ALLOWEDAGENTS], massimo [MAXACCESS]) @@ -1287,10 +1287,10 @@ di questa texture in inventario. [COUNT] trovato/i </string> <string name="PanelContentsNewScript"> - Nuovo Script + Nuovo script </string> <string name="MuteByName"> - (per nome) + (in base al nome) </string> <string name="MuteAgent"> (residente) @@ -1302,18 +1302,18 @@ di questa texture in inventario. (gruppo) </string> <string name="RegionNoCovenant"> - Non esiste nessun regolamento per questa proprietà . + Non esiste alcun regolamento per questa proprietà . </string> <string name="RegionNoCovenantOtherOwner"> - Non esiste nessun regolamento per questa proprietà . Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita. + Non esiste alcun regolamento per questa proprietà . Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita. </string> <string name="covenant_last_modified"> Ultima modifica: </string> - <string name="none_text" value=" (nessuno) "/> - <string name="never_text" value=" (mai) "/> + <string name="none_text" value="(nessuno)"/> + <string name="never_text" value="(mai)"/> <string name="GroupOwned"> - Posseduta da un gruppo + Di proprietà di un gruppo </string> <string name="Public"> Pubblica @@ -1328,22 +1328,22 @@ di questa texture in inventario. Anteprima </string> <string name="MultiPropertiesTitle"> - Proprietà + Beni immobiliari </string> <string name="InvOfferAnObjectNamed"> - Un oggetto chiamato + Un oggetto denominato </string> <string name="InvOfferOwnedByGroup"> - Posseduto dal gruppo + di proprietà del gruppo </string> <string name="InvOfferOwnedByUnknownGroup"> - Posseduto da un gruppo sconosciuto + di proprietà di un gruppo sconosciuto </string> <string name="InvOfferOwnedBy"> - Posseduto da + di proprietà di </string> <string name="InvOfferOwnedByUnknownUser"> - Posseduto da un'utente sconosciuto + di proprietà di un utente sconosciuto </string> <string name="InvOfferGaveYou"> Ti ha offerto @@ -1379,7 +1379,7 @@ di questa texture in inventario. Saldo </string> <string name="GroupMoneyCredits"> - Crediti + Ringraziamenti </string> <string name="GroupMoneyDebits"> Debiti @@ -1391,7 +1391,7 @@ di questa texture in inventario. Oggetti acquisiti </string> <string name="Cancel"> - Cancella + Annulla </string> <string name="UploadingCosts"> Costi di caricamento [%s] @@ -1401,22 +1401,22 @@ di questa texture in inventario. Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> <string name="AddLandmarkNavBarMenu"> - Aggiungi landmark... + Aggiungi punto di riferimento... </string> <string name="EditLandmarkNavBarMenu"> - Modifica landmark... + Modifica punto di riferimento... </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+ @@ -1428,22 +1428,22 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Shift+ </string> <string name="FileSaved"> - File Salvato + File salvato </string> <string name="Receiving"> In ricezione </string> <string name="AM"> - AM + antemeridiane </string> <string name="PM"> - PM + pomeridiane </string> <string name="PST"> - PST + Ora Pacifico </string> <string name="PDT"> - PDT + Ora legale Pacifico </string> <string name="Forward"> Avanti @@ -1455,7 +1455,7 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Destra </string> <string name="Back"> - Dietro + Indietro </string> <string name="North"> Nord @@ -1476,13 +1476,13 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Giù </string> <string name="Any Category"> - Tutte le categorie + Qualsiasi categoria </string> <string name="Shopping"> - Shopping + Acquisti </string> <string name="Land Rental"> - Affitto terreni + Affitto terreno </string> <string name="Property Rental"> Affitto proprietà @@ -1494,13 +1494,13 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Nuovi prodotti </string> <string name="Employment"> - Impiego + Lavoro </string> <string name="Wanted"> - Richiesti + Cercasi </string> <string name="Service"> - Servizi + Servizio </string> <string name="Personal"> Personale @@ -1539,7 +1539,7 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Residenziale </string> <string name="Stage"> - Stage + Fase </string> <string name="Other"> Altro @@ -1551,10 +1551,10 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Tu </string> <string name="Multiple Media"> - Media Multipli + Più supporti </string> <string name="Play Media"> - Media Play/Pausa + Riproduci/Pausa supporto </string> <string name="MBCmdLineError"> Un errore è stato riscontrato analizzando la linea di comando. @@ -1562,17 +1562,17 @@ Per informazioni: http://wiki.secondlife.com/wiki/Client_parameters Errore: </string> <string name="MBCmdLineUsg"> - uso linea di comando del programma [APP_NAME] : + Uso linea di comando del programma [APP_NAME] : </string> <string name="MBUnableToAccessFile"> Il programma [APP_NAME] non è in grado di accedere ad un file necessario. -Potrebbe darsi che tu abbia copie multiple attivate, o il tuo sistema reputa erroneamente che il file sia già aperto. +Potrebbe darsi che tu abbia copie multiple attivate o che il tuo sistema reputi erroneamente che il file sia già aperto. Se il problema persiste, riavvia il computer e riprova. -Se il problema persiste ancora, dovresti completamente disinstallare l'applicazione [APP_NAME] e reinstallarla. +Se il problema continua ancora, dovresti completamente disinstallare l'applicazione [APP_NAME] e reinstallarla. </string> <string name="MBFatalError"> - Errore fatale + Errore critico </string> <string name="MBRequiresAltiVec"> Il programma [APP_NAME] richiede un processore con AltiVec (G4 o superiore). @@ -1591,7 +1591,7 @@ Vuoi mandare un crash report? </string> <string name="MBNoDirectX"> Il programmma [APP_NAME] non riesce a trovare una DirectX 9.0b o superiore. -[APP_NAME] usa le DirectX per determinare hardware e/o i driver non aggiornati che possono causare problemi di stabilità , scarsa performance e interruzioni. Sebbene tu possa avviare il programma [APP_NAME] senza di esse, raccomandiamo caldamente di installare le DirectX 9.0b. +[APP_NAME] usa DirectX per rilevare hardware e/o i driver non aggiornati che possono causare problemi di stabilità , scarsa performance e interruzioni. Benché tu possa avviare il programma [APP_NAME] senza di esse, consigliamo caldamente l'esecuzione con DirectX 9.0b. Vuoi continuare? </string> @@ -1599,8 +1599,8 @@ Vuoi continuare? Attenzione </string> <string name="MBNoAutoUpdate"> - L'aggiornamento automatico non è stato ancora implementato per Linux. -Raccomandiamo di scaricare l'utima versione da www.secondlife.com. + L'aggiornamento automatico non è stato ancora realizzato per Linux. +Consigliamo di scaricare l'ultima versione direttamente da www.secondlife.com. </string> <string name="MBRegClassFailed"> RegisterClass non riuscito @@ -1609,8 +1609,8 @@ Raccomandiamo di scaricare l'utima versione da www.secondlife.com. Errore </string> <string name="MBFullScreenErr"> - Impossibile visualizzare a schermo intero a risoluzione [WIDTH] x [HEIGHT]. -Visualizzazione corrente ridotta a finestra. + Impossibile visualizzare a schermo intero con risoluzione [WIDTH] x [HEIGHT]. +Visualizzazione corrente in modalità finestra. </string> <string name="MBDestroyWinFailed"> Errore di arresto durante il tentativo di chiusura della finestra (DestroyWindow() non riuscito) @@ -1628,14 +1628,14 @@ Visualizzazione corrente ridotta a finestra. Impossibile ottenere una descrizione del formato pixel </string> <string name="MBTrueColorWindow"> - [APP_NAME] richiede True Color (32-bit) per funzionare. -Vai alle impostazioni dello schermo del tuo computer e imposta il colore in modalità 32-bit. + [APP_NAME] richiede True Color (32 bit) per funzionare. +Vai alle impostazioni dello schermo del tuo computer e imposta il colore in modalità 32 bit. </string> <string name="MBAlpha"> - [APP_NAME] non funziona poichè è impossibile trovare un canale alpha ad 8 Bit. Questo problema normalmente deriva dai driver della scheda video. + [APP_NAME] non funziona poichè è impossibile trovare un canale alpha a 8 bit. Questo problema normalmente deriva dai driver della scheda video. Assicurati di avere installato i driver della scheda video più recenti. -Assicurati anche che il monitor sia impostato a True Color (32-bit) nel pannello di controllo > Display > Settings. -Se il messaggio persiste, contatta contatta [SUPPORT_SITE]. +Assicurati anche che il monitor sia impostato a True Color (32 bit) nel Pannello di controllo > Schermo > Impostazioni. +Se il messaggio persiste, contatta [SUPPORT_SITE]. </string> <string name="MBPixelFmtSetErr"> Impossibile impostare il formato pixel @@ -1647,7 +1647,7 @@ Se il messaggio persiste, contatta contatta [SUPPORT_SITE]. Impossibile attivare il GL rendering </string> <string name="MBVideoDrvErr"> - [APP_NAME] Non riesce ad avviarsi perchè i driver della tua scheda video non sono stati installati correttamente, non sono aggiornati, o sono per un hardware non supportato. Assicurati di avere i driver della scheda video più recenti e anche se li hai installati, prova a reinstallarli di nuovo. + [APP_NAME] Non riesce ad avviarsi perchè i driver della tua scheda video non sono stati installati correttamente, non sono aggiornati, o sono per un hardware non supportato. Assicurati di avere i driver della scheda video più recenti e anche se li hai installati, prova a installarli di nuovo. Se il messaggio persiste, contatta [SUPPORT_SITE]. </string> @@ -1673,43 +1673,43 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Lobi attaccati </string> <string name="Back Bangs"> - #Back Bangs + Frangetta da dietro </string> <string name="Back Bangs Down"> - #Back Bangs Down + Frangetta da dietro giù </string> <string name="Back Bangs Up"> - #Back Bangs Up + Frangetta da dietro su </string> <string name="Back Fringe"> Frangetta all'indietro </string> <string name="Back Hair"> - #Back Hair + Capelli da dietro </string> <string name="Back Hair Down"> - #Back Hair Down + Capelli da dietro giù </string> <string name="Back Hair Up"> - #Back Hair Up + Capelli da dietro su </string> <string name="Baggy"> - Con le borse + Larghi </string> <string name="Bangs"> Frange </string> <string name="Bangs Down"> - #Bangs Down + Frangetta giù </string> <string name="Bangs Up"> - #Bangs Up + Frangetta su </string> <string name="Beady Eyes"> Occhi piccoli </string> <string name="Belly Size"> - punto vita + Punto vita </string> <string name="Big"> Grande @@ -1718,22 +1718,22 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Sedere grande </string> <string name="Big Eyeball"> - #Big Eyeball + Bulbo oculare grande </string> <string name="Big Hair Back"> - Gonfiore dei capelli: dietro + Capigliatura grande: Indietro </string> <string name="Big Hair Front"> - Gonfiore dei capelli: davanti + Capigliatura grande: anteriore </string> <string name="Big Hair Top"> - Gonfiore dei capelli: sopra + Capigliatura grande: in alto </string> <string name="Big Head"> - Grandezza testa + Grande testa </string> <string name="Big Pectorals"> - Grandezza pettorali + Grandi pettorali </string> <string name="Big Spikes"> Capelli con punte @@ -1766,13 +1766,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Lentiggini e nei </string> <string name="Body Thick"> - Corpo robusto + Corpo più robusto </string> <string name="Body Thickness"> Robustezza del corpo </string> <string name="Body Thin"> - Magrezza del corpo + Corpo più magro </string> <string name="Bow Legged"> Gambe arcuate @@ -1781,7 +1781,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Altezza del seno </string> <string name="Breast Cleavage"> - Avvicinamento dei seni + Décolleté </string> <string name="Breast Size"> Grandezza del seno @@ -1796,7 +1796,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Grandezza delle sopracciglia </string> <string name="Bug Eyes"> - Sporgenza degli occhi + Occhi sporgenti </string> <string name="Bugged Eyes"> Occhi sporgenti @@ -1817,19 +1817,19 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Grandezza del sedere </string> <string name="bustle skirt"> - Arricciatura posteriore + Crinolina </string> <string name="no bustle"> - Meno arricciatura + Nessuna crinolina </string> <string name="more bustle"> - Più arricciatura + Più crinolina </string> <string name="Chaplin"> Baffetti </string> <string name="Cheek Bones"> - Mascella + Zigomi </string> <string name="Chest Size"> Ampiezza del torace @@ -1838,7 +1838,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Angolo del mento </string> <string name="Chin Cleft"> - Fessura inf. del mento + Fossetta sul mento </string> <string name="Chin Curtains"> Barba sottomento @@ -1847,16 +1847,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Profondità mento </string> <string name="Chin Heavy"> - Appuntita verso l'alto + Mento forte </string> <string name="Chin In"> Mento in dentro </string> <string name="Chin Out"> - Mento in fuori + Mento sporgente </string> <string name="Chin-Neck"> - Grandezza mento-collo + Mento-collo </string> <string name="Clear"> Trasparente @@ -1871,46 +1871,46 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Chiusa </string> <string name="Closed Back"> - Spacco chiuso dietro + Chiuso dietro </string> <string name="Closed Front"> - Spacco chiuso davanti + Chiuso davanti </string> <string name="Closed Left"> - Spacco chiuso sx + Chiuso sinistra </string> <string name="Closed Right"> - Spacco chiuso dx + Chiuso destra </string> <string name="Coin Purse"> Meno pronunciati </string> <string name="Collar Back"> - Scollatura posteriore + Colletto posteriore </string> <string name="Collar Front"> - Scollatura anteriore + Colletto anteriore </string> <string name="Corner Down"> Angolo all'ingiù </string> <string name="Corner Normal"> - Angolo Normale + Angolo normale </string> <string name="Corner Up"> Angolo all'insù </string> <string name="Creased"> - Alzato + Piega </string> <string name="Crooked Nose"> Naso storto </string> <string name="Cropped Hair"> - Capelli raccolti + Capelli corti </string> <string name="Cuff Flare"> - Fondo pantalone + Svasato con risvolto </string> <string name="Dark"> Scuro @@ -1922,7 +1922,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Più scuro </string> <string name="Deep"> - Più pronunciato + Profondo </string> <string name="Default Heels"> Tacchi standard @@ -1931,40 +1931,40 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Punta del piede standard </string> <string name="Dense"> - Meno rade + Folti </string> <string name="Dense hair"> - #Dense Hair + Capelli folti </string> <string name="Double Chin"> Doppio mento </string> <string name="Downturned"> - Naso all'ingiù + All'ingiù </string> <string name="Duffle Bag"> Più pronunciati </string> <string name="Ear Angle"> - Orecchie a sventola + Angolo orecchie </string> <string name="Ear Size"> Grandezza orecchie </string> <string name="Ear Tips"> - Tipo di orecchio + Estremità orecchie </string> <string name="Egg Head"> Ovalizzazione testa </string> <string name="Eye Bags"> - Borse sotto agli occhi + Occhiaie </string> <string name="Eye Color"> Colore degli occhi </string> <string name="Eye Depth"> - Occhi incavati + Profondità degli occhi </string> <string name="Eye Lightness"> Luminosità degli occhi @@ -1973,7 +1973,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Apertura degli occhi </string> <string name="Eye Pop"> - Differenza apertura occhi + Prominenza degli occhi </string> <string name="Eye Size"> Grandezza occhi @@ -1982,7 +1982,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Distanza occhi </string> <string name="Eyeball Size"> - #Eyeball Size + Grandezza bulbo oculare </string> <string name="Eyebrow Arc"> Arco delle sopracciglia @@ -2009,64 +2009,64 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Colore dell'eyeliner </string> <string name="Eyes Back"> - #Eyes Back + Occhi indietro </string> <string name="Eyes Bugged"> Occhi sporgenti </string> <string name="Eyes Forward"> - #Eyes Forward + Occhi in avanti </string> <string name="Eyes Long Head"> - #Eyes Long Head + Occhi testa lunga </string> <string name="Eyes Shear Left Up"> - Distorsione occhi in alto a sx + Occhio a sinistra verso l'alto </string> <string name="Eyes Shear Right Up"> - Distorsione occhi in alto a dx + Occhio a destra verso il basso </string> <string name="Eyes Short Head"> - #Eyes Short Head + Occhi testa corta </string> <string name="Eyes Spread"> - #Eyes Spread + Spaziatura occhi </string> <string name="Eyes Sunken"> - #Eyes Sunken + Occhi infossati </string> <string name="Eyes Together"> - #Eyes Together + Occhi ravvicinati </string> <string name="Face Shear"> - Distorsione del viso + Taglio del viso </string> <string name="Facial Definition"> - Lineamenti del viso + Definizione del viso </string> <string name="Far Set Eyes"> Occhi distanti </string> <string name="Fat"> - #Fat + Grasso </string> <string name="Fat Head"> - #Fat Head + Testa grossa </string> <string name="Fat Lips"> Labbra carnose </string> <string name="Fat Lower"> - #Fat Lower + Inferiore carnoso </string> <string name="Fat Lower Lip"> Labbro inferiore sporgente </string> <string name="Fat Torso"> - #Fat Torso + Torace grosso </string> <string name="Fat Upper"> - #Fat Upper + Torace grosso </string> <string name="Fat Upper Lip"> Labbro superiore sporgente @@ -2081,7 +2081,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Dita </string> <string name="Flared Cuffs"> - Fondo largo + Risvolti svasati </string> <string name="Flat"> Piatto @@ -2090,88 +2090,88 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Sedere piatto </string> <string name="Flat Head"> - Viso piatto + Testa piatta </string> <string name="Flat Toe"> Punta piatta </string> <string name="Foot Size"> - Grandezza piede + Misura piede </string> <string name="Forehead Angle"> Angolo della fronte </string> <string name="Forehead Heavy"> - Appuntita verso il basso + Fronte sporgente </string> <string name="Freckles"> Lentiggini </string> <string name="Front Bangs Down"> - #Front Bangs Down + Frangette in giù </string> <string name="Front Bangs Up"> - #Front Bangs Up + Frangette in su </string> <string name="Front Fringe"> Frangetta </string> <string name="Front Hair"> - #Front Hair + Capelli davanti </string> <string name="Front Hair Down"> - #Front Hair Down + Capelli davanti sciolti </string> <string name="Front Hair Up"> - #Front Hair Up + Capelli davanti raccolti </string> <string name="Full Back"> - Scostati + Dietro gonfi </string> <string name="Full Eyeliner"> - Con eyeliner + Eyeliner marcato </string> <string name="Full Front"> - Anteriore pieno + Anteriore gonfio </string> <string name="Full Hair Sides"> - Riempimento lati + Lati capelli gonfi </string> <string name="Full Sides"> - Pieni + Lati gonfi </string> <string name="Glossy"> Lucido </string> <string name="Glove Fingers"> - Dita dei guanti + Dita con guanti </string> <string name="Glove Length"> Lunghezza guanti </string> <string name="Hair"> - Capelli + Capigliature </string> <string name="Hair Back"> - Capelli: dietro + Capelli: Indietro </string> <string name="Hair Front"> - Capelli: davanti + Capelli: anteriore </string> <string name="Hair Sides"> Capelli: lati </string> <string name="Hair Sweep"> - Traslazione + Direzione capigliatura </string> <string name="Hair Thickess"> - Spessore + Foltezza </string> <string name="Hair Thickness"> - Spessore barba + Foltezza </string> <string name="Hair Tilt"> - Rotazione capelli + Inclinazione </string> <string name="Hair Tilted Left"> Verso sinistra @@ -2180,16 +2180,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Verso destra </string> <string name="Hair Volume"> - Capelli: volume + Capelli: Volume </string> <string name="Hand Size"> Grandezza mani </string> <string name="Handlebars"> - Baffi lunghi + Baffi a manubrio </string> <string name="Head Length"> - Sporgenza del viso + Lunghezza testa </string> <string name="Head Shape"> Forma della testa @@ -2198,7 +2198,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Grandezza della testa </string> <string name="Head Stretch"> - Compressione lat testa + Allungamento testa </string> <string name="Heel Height"> Altezza tacchi @@ -2222,7 +2222,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Alta </string> <string name="High and Tight"> - Cavallo alto + Alto e stretto </string> <string name="Higher"> Più alto @@ -2267,7 +2267,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Forma del mento </string> <string name="Join"> - Avvicinati + Iscriviti </string> <string name="Jowls"> Guance @@ -2297,7 +2297,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Meno </string> <string name="Less Body Fat"> - Meno grasso + Meno grasso corporeo </string> <string name="Less Curtains"> Meno @@ -2339,16 +2339,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Meno </string> <string name="Lighter"> - Più chiaro + Più leggero </string> <string name="Lip Cleft"> - Distanza divis. labbro sup. + Distanza fossetta labbro </string> <string name="Lip Cleft Depth"> - Prof. spacco labbro sup. + Prof. fossetta labbro </string> <string name="Lip Fullness"> - Riempimento delle labbra + Volume labbra </string> <string name="Lip Pinkness"> Tonalità rosa labbra @@ -2375,7 +2375,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Lungo </string> <string name="Long Head"> - Viso sporgente + Testa lunga </string> <string name="Long Hips"> Bacino alto @@ -2387,7 +2387,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Collo lungo </string> <string name="Long Pigtails"> - Ciuffi laterali lunghi + Codini lunghi </string> <string name="Long Ponytail"> Codino lungo @@ -2399,16 +2399,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Braccia lunghe </string> <string name="Longcuffs"> - Longcuffs + Maniche lunghe </string> <string name="Loose Pants"> - Non attillati + Pantaloni ampi </string> <string name="Loose Shirt"> - Non attillata + Camicia ampia </string> <string name="Loose Sleeves"> - Maniche lente + Maniche non attillate </string> <string name="Love Handles"> Maniglie dell'amore @@ -2426,7 +2426,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Bassa </string> <string name="Low and Loose"> - Cavallo basso + Basso e ampio </string> <string name="Lower"> Più basso @@ -2435,7 +2435,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Parte bassa del setto </string> <string name="Lower Cheeks"> - Guance + Guance inferiori </string> <string name="Male"> Maschio @@ -2444,13 +2444,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Riga nel mezzo </string> <string name="More"> - Di più + Altro </string> <string name="More Blush"> Più fard </string> <string name="More Body Fat"> - Più grasso + Più grasso corporeo </string> <string name="More Curtains"> Più @@ -2519,7 +2519,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Posizione della bocca </string> <string name="Mowhawk"> - Vuoti + Moicana </string> <string name="Muscular"> Muscolatura @@ -2597,10 +2597,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Superiore normale </string> <string name="Nose Left"> - Storto a sinistra + Naso a sinistra </string> <string name="Nose Right"> - Storto a destra + Naso a destra </string> <string name="Nose Size"> Grandezza naso @@ -2630,13 +2630,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Opaco </string> <string name="Open"> - Aperto + Apri </string> <string name="Open Back"> Retro aperto </string> <string name="Open Front"> - Aperto Frontale + Davanti aperto </string> <string name="Open Left"> Lato sin. aperto @@ -2672,7 +2672,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Genitali </string> <string name="Painted Nails"> - Unghie colorate + Unghie smaltate </string> <string name="Pale"> Pallido @@ -2687,7 +2687,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Lunghezza pantaloni </string> <string name="Pants Waist"> - Altezza slip + Taglia pantalone </string> <string name="Pants Wrinkles"> Pantaloni con le grinze @@ -2705,7 +2705,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Pigmento </string> <string name="Pigtails"> - Ciuffi + Codini </string> <string name="Pink"> Rosa @@ -2807,16 +2807,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Meno pronunciato </string> <string name="Shear Back"> - Accostamento posteriore + Taglio posteriore </string> <string name="Shear Face"> - Distorsione viso + Taglio del viso </string> <string name="Shear Front"> - Riempimento davanti + Taglio anteriore </string> <string name="Shear Left"> - A sinistra + Taglio a sinistra </string> <string name="Shear Left Up"> Distorto a sinistra @@ -2828,10 +2828,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Distorto a destra </string> <string name="Sheared Back"> - Accostati + Taglio verso dietro </string> <string name="Sheared Front"> - Anteriormente vuoto + Taglio verso davanti </string> <string name="Shift Left"> A sinistra @@ -2867,10 +2867,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Collo corto </string> <string name="Short Pigtails"> - Ciuffi laterali corti + Codini corti </string> <string name="Short Ponytail"> - Codino Corto + Codino corto </string> <string name="Short Sideburns"> Basette corte @@ -2900,13 +2900,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Basette </string> <string name="Sides Hair"> - Capigliatura later. + Capigliatura di lato </string> <string name="Sides Hair Down"> - Giù + Capigliatura di lato sciolta </string> <string name="Sides Hair Up"> - Su + Capigliatura di lato raccolta </string> <string name="Skinny"> Skinny @@ -2930,19 +2930,19 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Morbidezza maniche </string> <string name="Slit Back"> - Spacco: posteriore + Spacco: Indietro </string> <string name="Slit Front"> Spacco: anteriore </string> <string name="Slit Left"> - Spacco: sinistro + Spacco: Sinistra </string> <string name="Slit Right"> - Spacco: destro + Spacco: Destra </string> <string name="Small"> - Piccolo + Piccola </string> <string name="Small Hands"> Mani piccole @@ -3032,37 +3032,37 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Punta spessa </string> <string name="Thickness"> - Thickness + Spessore </string> <string name="Thin"> - Ossute + Sottili </string> <string name="Thin Eyebrows"> - Sopracciglia fini + Sopracciglia sottili </string> <string name="Thin Lips"> - Labbra fini + Labbra sottili </string> <string name="Thin Nose"> - Naso fino + Naso sottile </string> <string name="Tight Chin"> - Mento magro + Mento stretto </string> <string name="Tight Cuffs"> Fondo stretto </string> <string name="Tight Pants"> - Attillati + Pantaloni attillati </string> <string name="Tight Shirt"> - Attilata + Camicia attillata </string> <string name="Tight Skirt"> - Attillata + Gonna attillata </string> <string name="Tight Sleeves"> - Attillate + Maniche strette </string> <string name="Tilt Left"> Tilt Left @@ -3089,7 +3089,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Distaccato </string> <string name="Uncreased"> - Abbassato + Senza piega </string> <string name="Underbite"> Denti inf. in fuori @@ -3104,13 +3104,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Parte alta degli zigomi </string> <string name="Upper Chin Cleft"> - Fessura sup. del mento + Fossetta sup. del mento </string> <string name="Upper Eyelid Fold"> Piega palpebra sup. </string> <string name="Upturned"> - Naso all'insù + All'insù </string> <string name="Very Red"> Molto rossi @@ -3125,13 +3125,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Capelli bianchi </string> <string name="Wide"> - Spalancati + Largo </string> <string name="Wide Back"> - Laterali post. larghi + Dietro largo </string> <string name="Wide Front"> - Laterali ant. larghi + Davanti largo </string> <string name="Wide Lips"> Labbra larghe @@ -3143,31 +3143,31 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Grinze </string> <string name="LocationCtrlAddLandmarkTooltip"> - Aggiungi ai miei landmark + Aggiungi ai miei punti di riferimento </string> <string name="LocationCtrlEditLandmarkTooltip"> - Modifica i miei landmark + Modifica i miei punti di riferimento </string> <string name="LocationCtrlInfoBtnTooltip"> - maggiori informazioni sulla posizione attuale + Maggiori informazioni sulla posizione attuale </string> <string name="LocationCtrlComboBtnTooltip"> - Lo storico delle mie posizioni + La cronologia delle mie posizioni </string> <string name="UpdaterWindowTitle"> Aggiornamento [APP_NAME] </string> <string name="UpdaterNowUpdating"> - [APP_NAME] In aggiornamento... + Aggiornamento di [APP_NAME]... </string> <string name="UpdaterNowInstalling"> - [APP_NAME] In installazione... + Installazione di [APP_NAME]... </string> <string name="UpdaterUpdatingDescriptive"> - Il Viewer del programma [APP_NAME] si sta aggiornando all'ultima versione. Potrebbe volerci del tempo, attendi. + Il Viewer del programma [APP_NAME] si sta aggiornando all'ultima versione. Potrebbe volerci del tempo, attendi. </string> <string name="UpdaterProgressBarTextWithEllipses"> - Aggiornamento in download... + Download dell'aggiornamento... </string> <string name="UpdaterProgressBarText"> Download dell'aggiornamento @@ -3176,13 +3176,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. Download dell'aggiornamento non riuscito </string> <string name="UpdaterFailUpdateDescriptive"> - Il programma [APP_NAME] ha riscontrato un'errore nel tentativo di aggiornamento. Consigliamo di scaricare l'ultima versione direttamente da www.secondlife.com. + Il programma [APP_NAME] ha riscontrato un'errore durante il tentativo di aggiornamento. Consigliamo di scaricare l'ultima versione direttamente da www.secondlife.com. </string> <string name="UpdaterFailInstallTitle"> - Tentativo di installazione aggiornamento non riuscito + Installazione dell'aggiornamento non riuscita </string> <string name="UpdaterFailStartTitle"> - Errore nell'apertura del viewer + Errore nell'avvio del viewer </string> <string name="IM_logging_string"> -- Registrazione messaggi instantanei abilitata -- @@ -3194,7 +3194,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. (anonimo) </string> <string name="IM_moderated_chat_label"> - (Moderato: Voice spento di default) + (Moderato: Voci disattivate di default) </string> <string name="IM_unavailable_text_label"> La chat di testo non è disponibile per questa chiamata. @@ -3203,7 +3203,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. La chat di testo è stata disabilitata da un moderatore di gruppo. </string> <string name="IM_default_text_label"> - Clicca qua per inviare un messaggio instantaneo. + Clicca qui per inviare un messaggio instantaneo. </string> <string name="IM_to_label"> A diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml index eff7516050..4a1fcee0f9 100644 --- a/indra/newview/skins/default/xui/it/teleport_strings.xml +++ b/indra/newview/skins/default/xui/it/teleport_strings.xml @@ -2,12 +2,12 @@ <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> - C'è stato un problema nell'elaborare la tua richiesta di teleport. Potresti aver bisogno di ricollegarti prima di poter usare il teleport. Se continui ad avere problemi, controlla per favore le FAQ del Supporto Tecnico a: -www.secondlife.com/support. + C'è stato un problema nell'elaborare la tua richiesta di teleport. Potresti dover effettuare nuovamente l'accesso prima di poter usare il teleport. +Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE]. </message> <message name="invalid_region_handoff"> - C'è stato un problema nell'elaborare il cambio di regione. Potresti aver bisogno di ricollegarti prima di poterlo effetuare. Se continui ad avere problemi, controlla per favore le FAQ del Supporto Tecnico a: -www.secondlife.com/support. + Si è verificato un problema nel tentativo di attraversare regioni. È possibile che per potere attraversare le regioni, tu debba effettuare nuovamente l'accesso. +Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE]. </message> <message name="blocked_tport"> Spiacenti, il teletrasporto è bloccato al momento. Prova di nuovo tra pochi istanti. Se ancora non potrai teletrasportarti, per favore scollegati e ricollegati per risolvere il problema. diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index 9105c2613d..0eaad11cc7 100644 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml @@ -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 a16348529b..bdd1cc60b7 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"> 誰ã§ã‚‚ @@ -387,10 +396,6 @@ ホームページ： </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:"> 説明： @@ -437,6 +442,9 @@ <panel.string name="access_estate_defined"> （エステートã«é™å®šï¼‰ </panel.string> + <panel.string name="allow_public_access"> + ãƒ‘ãƒ–ãƒªãƒƒã‚¯ã‚¢ã‚¯ã‚»ã‚¹ã‚’è¨±å¯ ï¼ˆ[MATURITY]） + </panel.string> <panel.string name="estate_override"> 1 ã¤ä»¥ä¸Šã®ã‚ªãƒ—ションãŒã€ä¸å‹•ç”£ãƒ¬ãƒ™ãƒ«ã§è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚ </panel.string> 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 a50f36b6f3..a274e25326 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml @@ -41,8 +41,8 @@ é¸æŠžã•ã‚ŒãŸåœ°åŸŸã«ã€å…¬å…±ã®åœŸåœ°ã¯ã‚ã‚Šã¾ã›ã‚“ </floater.string> <floater.string name="not_owned_by_you"> - ä»–ã®ä½¿ç”¨è€…ã«æ‰€æœ‰ã•ã‚ŒãŸåœŸåœ°ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚ -ã“れよりå°ã•ãªç¯„囲をé¸æŠžã—ã¦ãã ã•ã„。 + ä»–ã®ä½äººãŒæ‰€æœ‰ã™ã‚‹åœŸåœ°ã‚’é¸æŠžã—ã¦ã„ã¾ã™ã€‚ +ã‚‚ã£ã¨ç‹ã„範囲をé¸æŠžã—ã¦ã¿ã¦ãã ã•ã„。 </floater.string> <floater.string name="processing"> 購入処ç†ä¸... 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_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 index 306b262b70..671f9077d9 100644 --- a/indra/newview/skins/default/xui/ja/floater_event.xml +++ b/indra/newview/skins/default/xui/ja/floater_event.xml @@ -9,6 +9,18 @@ <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"> @@ -21,12 +33,21 @@ 主催者： </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> 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_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_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_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml index 606dda12bd..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 c8375389ce..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_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_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index e51e63999a..153b4068ad 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -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="詳ã—ã„è¨å®š"/> 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 6536eb253c..45e97bdf5d 100644 --- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="notification_chiclet" title="通知"> +<floater name="sys_well_window" title="通知"> <string name="title_im_well_window"> 会話 </string> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index e9de43189c..a8261a7493 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -69,7 +69,7 @@ </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"/> + <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"/> 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_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index 04120b4bea..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,8 +5,7 @@ è¡¨è¨˜ãƒ»è¨˜å· </text> </panel> - <panel - name="layout_panel_2"> + <panel name="layout_panel_2"> <button label="ç¾åœ¨åœ°ã‚’表示" label_selected="ç¾åœ¨åœ°ã‚’表示" name="Show My Location" tool_tip="ã‚¢ãƒã‚¿ãƒ¼ã®ä½ç½®ã‚’地図ã®ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™"/> <text name="me_label"> 自分 @@ -24,7 +23,7 @@ 土地販売 </text> <text name="by_owner_label"> - 所有者ã®è²©å£² + 所有者ã«ã¦ </text> <text name="auction_label"> 土地オークション @@ -49,39 +48,35 @@ Adult </text> </panel> - <panel - name="layout_panel_3"> + <panel name="layout_panel_3"> <text name="find_on_map_label"> - 地図上ã§æŽ¢ã™ + 地図上ã§è¦‹ã¤ã‘ã‚‹ </text> </panel> - <panel - name="layout_panel_4"> - <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="SLurl をコピー" name="copy_slurl" tool_tip="ç¾åœ¨åœ°ã® SLurl をコピーã—㦠Web ã§ä½¿ç”¨ã—ã¾ã™ã€‚"/> + <button label="é¸æŠžã‚’表示ã™ã‚‹" label_selected="目的地を表示" name="Show Destination" tool_tip="é¸æŠžã—ãŸå ´æ‰€ã‚’地図ã®ä¸å¿ƒã«è¡¨ç¤ºã—ã¾ã™"/> </panel> - <panel - name="layout_panel_5"> + <panel name="layout_panel_5"> <text name="zoom_label"> ズーム</text> </panel> - <panel - name="layout_panel_6"> + <panel name="layout_panel_6"> <slider label="ズーム" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml index ec49c3a98d..0a89c5e63a 100644 --- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="ズーム（近）" name="Zoom Close"/> <menu_item_call label="ズーム（ä¸ï¼‰" name="Zoom Medium"/> <menu_item_call label="ズーム（é ）" name="Zoom Far"/> diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml index 1ff2dfec7b..e59a500534 100644 --- a/indra/newview/skins/default/xui/ja/menu_object.xml +++ b/indra/newview/skins/default/xui/ja/menu_object.xml @@ -5,6 +5,7 @@ <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"> @@ -18,6 +19,7 @@ <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..."/> 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 4788803789..8d84b0e521 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml @@ -5,6 +5,7 @@ <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_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index a97e7f2f5d..bcad812457 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -6,12 +6,12 @@ <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="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_check label="ジェスãƒãƒ£ãƒ¼" name="Gestures"/> + <menu label="ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹" name="Status"> <menu_item_call label="一時退å¸ä¸" name="Set Away"/> <menu_item_call label="å–ã‚Šè¾¼ã¿ä¸" name="Set Busy"/> </menu> @@ -43,6 +43,8 @@ <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"/> @@ -81,6 +83,7 @@ <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"/> @@ -238,7 +241,7 @@ <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"> @@ -341,7 +344,7 @@ <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="Show Look At"/> @@ -358,7 +361,7 @@ </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="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"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 2f877a6aba..ddb2ae49f7 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -111,7 +111,7 @@ </notification> <notification name="FriendsAndGroupsOnly"> フレンド以外ã‹ã‚‰ã®ã‚³ãƒ¼ãƒ«ã‚„インスタントメッセージを無視ã™ã‚‹è¨å®šã«ã—ãŸã“ã¨ã‚’ã€ç›¸æ‰‹ã«çŸ¥ã‚‰ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。 - <usetemplate name="okbutton" yestext="ã¯ã„"/> + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="GrantModifyRights"> 他人ã«ä¿®æ£æ¨©é™ã‚’与ãˆã‚‹ã¨ã€æ¨©é™ã‚’与ãˆã‚‰ã‚ŒãŸäººã¯ã‚ãªãŸãŒæ‰€æœ‰ã™ã‚‹ã‚¤ãƒ³ãƒ¯ãƒ¼ãƒ«ãƒ‰ã®ã‚ªãƒ–ジェクトを変更ã€å‰Šé™¤ã€æŒã¡å¸°ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æ¨©é™ã‚’与ãˆã‚‹éš›ã«ã¯å分ã«æ³¨æ„ã—ã¦ãã ã•ã„。 @@ -339,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> @@ -470,7 +470,6 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã <notification name="UnsupportedHardware"> ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューター㯠[APP_NAME] ã®å¿…è¦æœ€ä½Žé™ã®å‹•ä½œç’°å¢ƒã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 パフォーマンスã®ä½Žä¸‹ã‚’æ„Ÿã˜ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æれ入りã¾ã™ãŒ [SUPPORT_SITE] ã§ã¯ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ã‚·ã‚¹ãƒ†ãƒ ã«é–¢ã™ã‚‹æŠ€è¡“的サãƒãƒ¼ãƒˆã¯è¡Œã£ã¦ãŠã‚Šã¾ã›ã‚“。 -最低動作環境 [_URL] ã«ç§»å‹•ã—ã¦ç¢ºèªã‚’ã—ã¾ã™ã‹ï¼Ÿ <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=ja @@ -586,7 +585,7 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µåãŒæ£ã—ã„ã‹ã©ã†ã‹ã‚’確èªã—ã¦ãã ã•ã„。 </notification> <notification name="InvalidFileExtension"> - [EXTENSION]ã¯ç„¡åŠ¹ã§ã™ã€‚ + [EXTENSION] ã¯ç„¡åŠ¹ã§ã™ã€‚ æ£ã—ã„æ‹¡å¼µå：[VALIDS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1344,8 +1343,8 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification name="ConfirmKick"> - ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’グリッドã®å¤–ã«ã‚ックã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ - <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="å…¨ã¦ã®ãƒ¦ãƒ¼ã‚¶ã‚’追ã„出ã™"/> + 本当ã«ä½äººå…¨å“¡ã‚’グリッドã‹ã‚‰è¿½ã„出ã—ã¾ã™ã‹ï¼Ÿ + <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="ä½äººå…¨å“¡ã‚’追ã„出ã™"/> </notification> <notification name="MuteLinden"> リンデンをブãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 @@ -1386,7 +1385,7 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> - ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã¤ã‘ã¦ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã‚’追ã„出ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚ãªãŸã¯ç®¡ç†è€…ã«ã‚ˆã‚Šãƒã‚°ã‚ªãƒ•ã•ã‚Œã¾ã—ãŸã€‚ @@ -1406,7 +1405,7 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="FreezeUser"> - ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã¤ã‘ã¦ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’フリーズã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã‚’フリーズã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚ãªãŸã¯ãƒ•ãƒªãƒ¼ã‚ºã•ã‚Œã¦ã„ã¾ã™ã€‚ å‹•ãã“ã¨ã‚‚ãƒãƒ£ãƒƒãƒˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã›ã‚“。 管ç†è€…㌠IM ã§ã‚ãªãŸã«é€£çµ¡ã—ã¾ã™ã€‚ @@ -1416,7 +1415,7 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="UnFreezeUser"> - ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã¤ã‘ã¦ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ãƒªãƒ¼ã‚ºã‚’解除ã—ã¾ã™ã‹ï¼Ÿ + ã©ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ·»ãˆã¦ã“ã®ä½äººã®ãƒ•ãƒªãƒ¼ã‚ºã‚’解除ã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> ã‚‚ã†ãƒ•ãƒªãƒ¼ã‚ºã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -1436,7 +1435,7 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification name="OfferTeleportFromGod"> - ユーザーをゴッドサモンã§å‘¼ã³å¯„ã›ã¾ã™ã‹ï¼Ÿ + ç¾åœ¨åœ°ã«ä½äººã‚’ゴッドサモンã—ã¾ã™ã‹ï¼Ÿ <form name="form"> <input name="message"> [REGION] ã«æ¥ã¾ã›ã‚“ã‹ï¼Ÿ @@ -1447,15 +1446,15 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 </notification> <notification name="TeleportFromLandmark"> ã“ã®ã¾ã¾ <nolink>[LOCATION]</nolink> ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ - <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/> + <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"> 今ã‚ãªãŸã®ä¸å‹•ç”£ã«ã„る人全員ã«é€ã‚‹ã€çŸã„メッセージを入力ã—ã¦ãã ã•ã„。 @@ -1466,11 +1465,11 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。 </form> </notification> <notification label="Lindenã®ä¸å‹•ç”£ã‚’変更" name="ChangeLindenEstate"> - ã‚ãªãŸã¯ãƒªãƒ³ãƒ‡ãƒ³æ‰€æœ‰ã®ä¸å‹•ç”£ï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ + リンデンãŒæ‰€æœ‰ã™ã‚‹ã‚¨ã‚¹ãƒ†ãƒ¼ãƒˆï¼ˆãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã€ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã€ã‚ªãƒªã‚¨ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ãªã©ï¼‰ã‚’変更ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ -ã“ã‚Œã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®çµŒé¨“ã‚’æ ¹æœ¬ã‹ã‚‰æºã‚‹ãŒã—ã‹ããªã„「éžå¸¸ã«å±é™ºãªè¡Œç‚ºã€ã§ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¡ã‚¤ãƒ³ãƒ©ãƒ³ãƒ‰ã§å¤šæ•°ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ãŒå¤‰æ›´ã•ã‚Œã€ã‚¹ãƒšãƒ¼ã‚¹ã‚µãƒ¼ãƒãƒ¼ã«æ‚ªå½±éŸ¿ãŒç”Ÿã˜ã¾ã™ã€‚ +ä½äººã®ä½“験ã«æ ¹æœ¬çš„ã«å½±éŸ¿ã‚’与ãˆã‚‹ãŸã‚ã€éžå¸¸ã«å±é™ºãªè¡Œç‚ºã§ã™ã€‚ メインランドã§ã¯ã€ä½•åƒã¨ã„ã†ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤‰æ›´ã«ã‚ˆã‚‹å½±éŸ¿ã‚’å—ã‘ã€ãã®ãŸã‚スペースサーãƒãƒ¼ã«è² æ‹…ã‚’ã‹ã‘ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ -æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ +ãã‚Œã§ã‚‚続ã‘ã¾ã™ã‹ï¼Ÿ <usetemplate name="okcancelbuttons" notext="å–り消ã—" yestext="OK"/> </notification> <notification label="Lindenã®ä¸å‹•ç”£ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’変更" name="ChangeLindenAccess"> @@ -1931,7 +1930,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ForceCloseChatterBoxSession"> - [NAME]ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚ + [NAME] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚ [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1944,8 +1943,8 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã <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] サイトã§å¹´é½¢ã®ç¢ºèªã‚’è¡Œã„ã¾ã™ã‹ï¼Ÿ @@ -2229,27 +2228,27 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„ãªã„ã¨å…¬å…±ã®åœŸåœ°ã‚’å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 </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"> 目的地ã«å…¥ã‚‹è¨±å¯ãŒã‚ã‚Šã¾ã›ã‚“。 @@ -2267,14 +2266,14 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã テレãƒãƒ¼ãƒˆãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚ </notification> <notification name="FullRegionTryAgain"> - å…¥ã‚ã†ã¨ã—ã¦ã„るリージョン（地域）ã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚ + å…¥ã‚ã†ã¨ã—ã¦ã„るリージョンã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚ ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰å†åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="GeneralFailure"> よãã‚る失敗 </notification> <notification name="RoutedWrongRegion"> - ç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 + ç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="NoValidAgentID"> エージェント ID ãŒç„¡åŠ¹ã§ã™ã€‚ @@ -2295,7 +2294,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã 内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ </notification> <notification name="NoGoodTPDestination"> - ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§ã¯é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ + ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã€é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ </notification> <notification name="InternalErrorRegionResolver"> 内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ @@ -2382,7 +2381,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã [TO_NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’申ã—出ã¾ã—ãŸã€‚ </notification> <notification name="OfferFriendshipNoMessage"> - [NAME]ã¯ã€ + [NAME] ã¯ã€ フレンド登録を申ã—込んã§ã„ã¾ã™ã€‚ （デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚） @@ -2397,6 +2396,12 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã <notification name="FriendshipDeclined"> [NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’æ–ã‚Šã¾ã—ãŸã€‚ </notification> + <notification name="FriendshipAcceptedByMe"> + フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‰¿èªã•ã‚Œã¾ã—ãŸã€‚ + </notification> + <notification name="FriendshipDeclinedByMe"> + フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ + </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] ãŒã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’渡ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ãƒ–ックマークãŒè¿½åŠ ã•ã‚Œã€ã“ã®ä½äººã«ç´ æ—©ã IM ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ @@ -2418,9 +2423,9 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã [MESSAGE] -èªã¿è¾¼ã¿å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€æ‰€æœ‰è€…：[NAME]？ +èªã¿è¾¼ã¿å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€æ‰€æœ‰è€…：[NAME] <form name="form"> - <button name="Gotopage" text="移動"/> + <button name="Gotopage" text="ページã«ç§»å‹•"/> <button name="Cancel" text="å–り消ã—"/> </form> </notification> @@ -2472,7 +2477,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»ã </form> </notification> <notification name="ScriptToast"> - [FIRST] [LAST] ã®ã€Œ [TITLE] ã€ã¯ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ãƒ—ットをリクエストã—ã¦ã„ã¾ã™ã€‚ + [FIRST] [LAST] ã®ã€Œ [TITLE] ã€ã¯ã€ä½äººã‚¤ãƒ³ãƒ—ットをリクエストã—ã¦ã„ã¾ã™ã€‚ <form name="form"> <button name="Open" text="ダイアãƒã‚°ã‚’é–‹ã"/> <button name="Ignore" text="無視"/> @@ -2585,7 +2590,7 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚ [VOICE_CHANNEL_NAME] ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šä¸ã«ã€ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。 </notification> <notification name="ServerVersionChanged"> - ç•°ãªã‚‹ã‚µãƒ¼ãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª] + サーãƒãƒ¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª] </notification> <notification name="UnsupportedCommandSLURL"> クリックã—㟠SLurl ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 @@ -2605,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"> アタッãƒãƒ¡ãƒ³ãƒˆãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚ 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 f3c68c9f59..0aa0e8a8a9 100644 --- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml @@ -9,16 +9,46 @@ <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_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]"/> - <check_box label="毎週自動更新" name="auto_renew"/> - <text_editor name="price_for_listing" tool_tip="æŽ²è¼‰ä¾¡æ ¼"/> - <text_editor name="classified_desc" value="[description]"/> + <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 fa46e6d35a..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"> - 「Moderateã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ - </combo_item> - <combo_item name="pg_ci"> - 「Generalã€ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ - </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_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml index 88c05fbae7..e58fa979d7 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ピック編集" name="panel_edit_pick"> + <panel.string name="location_notice"> + （掲載後更新） + </panel.string> <text name="title"> ピック編集 </text> @@ -22,7 +25,7 @@ </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> - <button label="[WHAT] ã‚’ä¿å˜" name="save_changes_btn"/> + <button label="ピックをä¿å˜" name="save_changes_btn"/> <button label="ã‚ャンセル" name="cancel_btn"/> </panel> </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 c0449f1221..ef6d8cce47 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 @@ -45,7 +45,7 @@ ã‚ãªãŸã®è²¢çŒ®ï¼š </text> <text name="your_contribution_units"> - 平方メートル + m² </text> <text name="your_contribution_max_value"> （最大 [AMOUNT]） 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 db6fe268c7..8a629be910 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml @@ -17,7 +17,7 @@ Ctrl ã‚ーを押ã—ãªãŒã‚‰ãƒ¡ãƒ³ãƒãƒ¼åをクリックã™ã‚‹ã¨ <name_list name="member_list"> <name_list.columns label="メンãƒãƒ¼" name="name"/> <name_list.columns label="寄付" name="donated"/> - <name_list.columns label="ステータス" name="online"/> + <name_list.columns label="ãƒã‚°ã‚¤ãƒ³" name="online"/> </name_list> <button label="招待" name="member_invite"/> <button label="追放" name="member_eject"/> @@ -44,7 +44,7 @@ Ctrl ã‚ーを押ã—ãªãŒã‚‰ãƒ¡ãƒ³ãƒãƒ¼åをクリックã™ã‚‹ã¨ <filter_editor label="役割をé¸åˆ¥" name="filter_input"/> <scroll_list name="role_list"> <scroll_list.columns label="役割" name="name"/> - <scroll_list.columns label="肩書ã" name="title"/> + <scroll_list.columns label="タイトル" name="title"/> <scroll_list.columns label="#" name="members"/> </scroll_list> <button label="æ–°ã—ã„役割" name="role_create"/> diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index 36c7b75f97..9981d13bbb 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ã‚‚ã®" name="main inventory panel"> - <panel.string name="Title"> - ã‚‚ã® + <panel.string name="ItemcountFetching"> + [ITEM_COUNT] 個ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å–å¾—ä¸ã§ã™... [FILTER] </panel.string> - <filter_editor label="æŒã¡ç‰©ã‚’フィルター" name="inventory search editor"/> - <tab_container name="inventory filter tabs"> - <inventory_panel label="æŒã¡ç‰©" name="All Items"/> - <inventory_panel label="最新" name="Recent Items"/> - </tab_container> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示ã—ã¾ã™"/> - <button name="add_btn" tool_tip="æ–°ã—ã„ã‚¢ã‚¤ãƒ†ãƒ ã‚’è¿½åŠ ã—ã¾ã™"/> - <dnd_button name="trash_btn" tool_tip="é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™"/> - </panel> + <panel.string name="ItemcountCompleted"> + [ITEM_COUNT] 個ã®ã‚¢ã‚¤ãƒ†ãƒ 　[FILTER] + </panel.string> + <text name="ItemcountText"> + アイテム： + </text> <menu_bar name="Inventory Menu"> <menu label="ファイル" name="File"> <menu_item_call label="é–‹ã" name="Open"/> @@ -61,4 +57,14 @@ <menu_item_check label="システムフォルダを上ã«ä¸¦ã¹ã‚‹" name="System Folders To Top"/> </menu> </menu_bar> + <filter_editor label="æŒã¡ç‰©ã‚’フィルター" name="inventory search editor"/> + <tab_container name="inventory filter tabs"> + <inventory_panel label="æŒã¡ç‰©" name="All Items"/> + <inventory_panel label="最新" name="Recent Items"/> + </tab_container> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示ã—ã¾ã™"/> + <button name="add_btn" tool_tip="æ–°ã—ã„ã‚¢ã‚¤ãƒ†ãƒ ã‚’è¿½åŠ ã—ã¾ã™"/> + <dnd_button name="trash_btn" tool_tip="é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ を削除ã—ã¾ã™"/> + </panel> </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 index a670975dda..fb273de420 100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml @@ -19,10 +19,17 @@ <button label="詳細 >>" label_selected="簡易 <<" name="more_less_btn" tool_tip="アドãƒãƒ³ã‚¹ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«"/> </panel> <panel name="nearby_media_panel"> + <text name="nearby_media"> + è¿‘ãã®ãƒ¡ãƒ‡ã‚£ã‚¢ + </text> + <text name="show"> + 表示： + </text> <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.item label="ä»–ã®ã‚¢ãƒã‚¿ãƒ¼" name="OnOthers"/> </combo_box> <scroll_list name="media_list"> <scroll_list.columns label="近接" name="media_proximity"/> @@ -31,7 +38,7 @@ <scroll_list.columns label="åå‰" name="media_name"/> <scroll_list.columns label="デãƒãƒƒã‚°" name="media_debug"/> </scroll_list> - <panel> + <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> <button name="stop_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’åœæ¢"/> @@ -49,7 +56,7 @@ <button name="mute_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã®éŸ³ã‚’ミュート"/> </layout_panel> <layout_panel name="zoom"> - <button name="zoom_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã«è¿‘ã¥ã"/> + <button name="zoom_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã«ã‚ºãƒ¼ãƒ "/> </layout_panel> <layout_panel name="unzoom"> <button name="unzoom_btn" tool_tip="é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‹ã‚‰é ã–ã‹ã‚‹"/> 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_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml index bad4cdbc05..488a8c7a9b 100644 --- a/indra/newview/skins/default/xui/ja/panel_people.xml +++ b/indra/newview/skins/default/xui/ja/panel_people.xml @@ -7,6 +7,8 @@ <string name="no_friends" 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"> @@ -20,15 +22,15 @@ <accordion_tab name="tab_online" title="オンライン"/> <accordion_tab name="tab_all" title="全員"/> </accordion> - <text name="no_friends_msg"> - ãŠå‹é”ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã€[secondlife:///app/search/people ã‚°ãƒãƒ¼ãƒãƒ«æ¤œç´¢] ã‚’ã™ã‚‹ã‹ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’クリックã—ã¦è¡Œã£ã¦ãã ã•ã„。 -誰ã‹ä¸€ç·’ã«è¡Œå‹•ã‚’ã™ã‚‹äººã‚’ãŠæŽ¢ã—ã®æ™‚ã¯ã€[secondlife:///app/worldmap 地図をãŠè©¦ã—ã ã•ã„]。 - </text> <panel label="bottom_panel" name="bottom_panel"> <button name="friends_viewsort_btn" tool_tip="オプション"/> <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="bottom_panel" name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 132fb95fe7..9de04f0d6a 100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml @@ -69,7 +69,7 @@ <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="区画"> <panel name="parcel_characteristics_panel"> - <text name="rating_label" value="レーティング区分："/> + <text name="rating_label" value="レーティング："/> <text name="rating_value" value="ä¸æ˜Ž"/> <text name="voice_label" value="ボイス："/> <text name="voice_value" value="オン"/> @@ -88,11 +88,11 @@ </accordion_tab> <accordion_tab name="region_information_tab" title="リージョン（地域） "> <panel name="region_information_panel"> - <text name="region_name_label" value="地域:"/> + <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_label" value="レーティング："/> <text name="region_rating" value="Adult"/> <text name="region_owner_label" value="所有者："/> <text name="region_owner" value="moose Van Moose"/> @@ -105,8 +105,8 @@ </accordion_tab> <accordion_tab name="estate_information_tab" title="エステート（ä¸å‹•ç”£ï¼‰"> <panel name="estate_information_panel"> - <text name="estate_name_label" value="ä¸å‹•ç”£ï¼š"/> - <text name="estate_rating_label" value="レーティング区分："/> + <text name="estate_name_label" value="エステート："/> + <text name="estate_rating_label" value="レーティング："/> <text name="estate_owner_label" value="所有者："/> <text name="covenant_label" value="約款："/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml index e2dba19c1d..acfa0bf4e8 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 87cd772143..a8520a51cc 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -3,6 +3,9 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <panel.string name="middle_mouse"> + マウスã®ä¸å¤® + </panel.string> <slider label="視界角" name="camera_fov"/> <slider label="è·é›¢" name="camera_offset_scale"/> <text name="heading2"> 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 b0572804cb..e5780697b1 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ãƒãƒ£ãƒƒãƒˆ" name="chat"> <text name="font_size"> - Font size: + æ–‡å—ã®å¤§ãã•ï¼š </text> <radio_group name="chat_font_size"> <radio_item label="å°" name="radio" value="0"/> @@ -9,7 +9,7 @@ <radio_item label="大" name="radio3" value="2"/> </radio_group> <text name="font_colors"> - Font colors: + æ–‡å—ã®è‰²ï¼š </text> <color_swatch label="自分" name="user"/> <text name="text_box1"> @@ -46,6 +46,12 @@ <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"/> + <text name="show_ims_in_label"> + IM ã®è¡¨ç¤ºæ–¹æ³•ï¼š + </text> + <text name="requires_restart_label"> + （å†èµ·å‹•å¾Œã«åæ˜ ï¼‰ + </text> <radio_group name="chat_window" tool_tip="インスタントメッセージを別フãƒãƒ¼ã‚¿ãƒ¼ã€ã¾ãŸã¯1ã¤ã®ãƒ•ãƒãƒ¼ã‚¿ãƒ¼ã«è¤‡æ•°ã‚¿ãƒ–ã§è¡¨ç¤ºã—ã¾ã™ï¼ˆè¦å†èµ·å‹•ï¼‰"> <radio_item label="別々ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦" name="radio" value="0"/> <radio_item label="タブ" name="radio2" value="1"/> 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 6df59ca189..4ccb70b321 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -44,7 +44,7 @@ <radio_item label="オン" name="radio2" value="1"/> <radio_item label="一時的ã«è¡¨ç¤º" name="radio3" value="2"/> </radio_group> - <check_box label="ç§ã®åå‰ã‚’表示" name="show_my_name_checkbox1"/> + <check_box label="自分ã®åå‰ã‚’表示" name="show_my_name_checkbox1"/> <check_box initial_value="true" label="å°ã•ã„ã‚¢ãƒã‚¿ãƒ¼å" name="small_avatar_names_checkbox"/> <check_box label="グループタイトルを表示" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> @@ -53,12 +53,12 @@ <text name="title_afk_text"> 一時退å¸ã¾ã§ã®æ™‚間： </text> - <color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã"/> + <color_swatch label="" name="effect_color_swatch" tool_tip="クリックã§ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/> <combo_box label="一時退å¸ã¾ã§ã®æ™‚間：" name="afk"> - <combo_box.item label="2分" name="item0"/> - <combo_box.item label="5分" name="item1"/> - <combo_box.item label="10分" name="item2"/> - <combo_box.item label="30分" name="item3"/> + <combo_box.item label="2 分" name="item0"/> + <combo_box.item label="5 分" name="item1"/> + <combo_box.item label="10 分" name="item2"/> + <combo_box.item label="30 分" name="item3"/> <combo_box.item label="一時退å¸è¨å®šãªã—" name="item4"/> </combo_box> <text name="text_box3"> 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 af64a217f6..fe830d864f 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -13,9 +13,12 @@ <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="Listen from"> + <text name="voice_chat_settings"> ボイスãƒãƒ£ãƒƒãƒˆã®è¨å®š </text> + <text name="Listen from"> + æ–¹å‘： + </text> <radio_group name="ear_location"> <radio_item label="カメラã®ä½ç½®ã‹ã‚‰èžã" name="0"/> <radio_item label="ã‚¢ãƒã‚¿ãƒ¼ã®ä½ç½®ã‹ã‚‰èžã" name="1"/> 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 71551c7680..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,6 +1,6 @@ <?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"> @@ -70,5 +70,5 @@ <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="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 be92c24663..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="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="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 aa8c126423..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,8 +25,8 @@ <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> @@ -36,8 +36,8 @@ <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_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 526e6cdeb9..14fc0b4c22 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -25,16 +25,16 @@ テクスãƒãƒ£æ¨™é«˜ç¯„囲 </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"/> 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 5364b8726f..3fd14ece06 100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml @@ -20,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 a9e13cfd9f..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,10 +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="ç¾åœ¨æ™‚刻（太平洋）"> 24:00 AM PST </text> - <button name="media_toggle_btn" tool_tip="クリックã—ã¦ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’切り替ãˆã¾ã™"/> + <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/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml index 4fba4b1567..94be8ba73d 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml @@ -10,7 +10,7 @@ MyOutfit With a really Long Name like MOOSE </text> </panel> - <filter_editor label="アウトフィットã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼" name="Filter"/> + <filter_editor label="アウトフィットをフィルター" name="Filter"/> <button label="装ç€" name="wear_btn"/> <button label="æ–°ã—ã„アウトフィット" name="newlook_btn"/> </panel> 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 439891bab1..ff9b5dc6aa 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«"/> <text name="where" value="（インワールド）"/> - <panel name="properties_panel" label=""> + <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 76b702e581..fb70c7db09 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -23,7 +23,22 @@ ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã®æ¤œå‡ºä¸ã§ã™... </string> <string name="StartupLoading"> - ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚° + [APP_NAME] をインストールä¸ã§ã™... + </string> + <string name="StartupClearingCache"> + ã‚ャッシュをクリアä¸ã§ã™... + </string> + <string name="StartupInitializingTextureCache"> + テクスãƒãƒ£ã‚ャッシュをåˆæœŸåŒ–ä¸ã§ã™... + </string> + <string name="StartupInitializingVFS"> + VFS ã‚’åˆæœŸåŒ–ä¸ã§ã™... + </string> + <string name="ProgressRestoring"> + 復元ä¸ã§ã™... + </string> + <string name="ProgressChangingResolution"> + 解åƒåº¦ã‚’変更ä¸ã§ã™... </string> <string name="Fullbright"> 明るã•å…¨é–‹ï¼ˆãƒ¬ã‚¬ã‚·ãƒ¼ï¼‰ @@ -88,6 +103,9 @@ <string name="LoginFailedNoNetwork"> ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ï¼š 接続を確立ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ãŠä½¿ã„ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’ã”確èªãã ã•ã„。 </string> + <string name="LoginFailed"> + ãƒã‚°ã‚¤ãƒ³ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ + </string> <string name="Quit"> 終了 </string> @@ -97,6 +115,24 @@ <string name="AgentLostConnection"> ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ä¸éƒ½åˆãŒç™ºç”Ÿã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ ã”使用ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã‚’ã”確èªãã ã•ã„。 </string> + <string name="SavingSettings"> + è¨å®šã‚’ä¿å˜ä¸ã§ã™... + </string> + <string name="LoggingOut"> + ãƒã‚°ã‚¢ã‚¦ãƒˆä¸ã§ã™... + </string> + <string name="ShuttingDown"> + シャットダウンä¸ã§ã™... + </string> + <string name="YouHaveBeenDisconnected"> + ã‚ãªãŸãŒã„ãŸãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã¸ã®æŽ¥ç¶šãŒåˆ‡ã‚Œã¾ã—ãŸã€‚ + </string> + <string name="SentToInvalidRegion"> + 無効ãªãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸã€‚ + </string> + <string name="TestingDisconnect"> + ビューワã®æŽ¥ç¶šã‚’åˆ‡ã‚‹ãƒ†ã‚¹ãƒˆä¸ + </string> <string name="TooltipPerson"> 人 </string> @@ -151,6 +187,24 @@ <string name="TooltipAgentUrl"> クリックã—ã¦ã“ã®ä½äººã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見ã¾ã™ </string> + <string name="TooltipAgentMute"> + クリックã—ã¦ã“ã®ä½äººã«å¯¾ã—ã¦ç„¡è¦–è¨å®šã‚’ã—ã¾ã™ + </string> + <string name="TooltipAgentUnmute"> + クリックã—ã¦ã“ã®ä½äººã«å¯¾ã™ã‚‹ç„¡è¦–è¨å®šã‚’解除ã—ã¾ã™ + </string> + <string name="TooltipAgentIM"> + クリックã—ã¦ã“ã®ä½äººã« IM ã‚’é€ã‚Šã¾ã™ + </string> + <string name="TooltipAgentPay"> + クリックã—ã¦ã“ã®ä½äººã«æ”¯æ‰•ã„ã¾ã™ + </string> + <string name="TooltipAgentOfferTeleport"> + クリックã—ã¦ã“ã®ä½äººã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã‚Šã¾ã™ + </string> + <string name="TooltipAgentRequestFriend"> + クリックã—ã¦ã“ã®ä½äººã«ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã‚Šã¾ã™ + </string> <string name="TooltipGroupUrl"> クリックã—ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®èª¬æ˜Žæ–‡ã‚’見ã¾ã™ </string> @@ -176,12 +230,31 @@ クリックã—㦠secondlife:// コマンドを出ã—ã¾ã™ </string> <string name="CurrentURL" value=" ç¾åœ¨ã® URL： [CurrentURL]"/> + <string name="TooltipPrice" value="L$[PRICE]-"/> <string name="SLurlLabelTeleport"> テレãƒãƒ¼ãƒˆ </string> <string name="SLurlLabelShowOnMap"> 地図ã«è¡¨ç¤º </string> + <string name="SLappAgentMute"> + 無視 + </string> + <string name="SLappAgentUnmute"> + ミュート解除 + </string> + <string name="SLappAgentIM"> + IM + </string> + <string name="SLappAgentPay"> + 支払ㆠ+ </string> + <string name="SLappAgentOfferTeleport"> + 次ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã‚Šã¾ã™ï¼š + </string> + <string name="SLappAgentRequestFriend"> + フレンド登録リクエスト + </string> <string name="BUTTON_CLOSE_DARWIN"> é–‰ã˜ã‚‹ （⌘W） </string> @@ -335,6 +408,9 @@ <string name="symbolic link"> リンク </string> + <string name="symbolic folder link"> + フォルダã®ãƒªãƒ³ã‚¯ + </string> <string name="AvatarEditingAppearance"> （容姿ã®ç·¨é›†ä¸ï¼‰ </string> @@ -758,6 +834,9 @@ <string name="invalid"> 無効 </string> + <string name="NewWearable"> + æ–°ã—ã„ [WEARABLE_ITEM] + </string> <string name="next"> 次㸠</string> @@ -825,7 +904,7 @@ ESC ã‚ーを押ã—ã¦ãƒ¯ãƒ¼ãƒ«ãƒ‰ãƒ“ューã«æˆ»ã‚Šã¾ã™ </string> <string name="InventoryNoMatchingItems"> - 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒæŒã¡ç‰©ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ [secondlife:///app/search/groups 「検索ã€] ã‚’ãŠè©¦ã—ãã ã•ã„。 + 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚[secondlife:///app/search/groups 「検索ã€]ã‚’ãŠè©¦ã—ãã ã•ã„。 </string> <string name="FavoritesNoMatchingItems"> ã“ã“ã«ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’ドラッグã—ã¦ã€ãŠæ°—ã«å…¥ã‚Šã«è¿½åŠ ã—ã¾ã™ã€‚ @@ -846,6 +925,7 @@ コンテンツãªã— </string> <string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT] ã«è£…ç€ä¸ï¼‰"/> + <string name="ActiveGesture" value="[GESLABEL] （アクティブ）"/> <string name="PermYes"> ã¯ã„ </string> @@ -945,6 +1025,9 @@ <string name="InvFolder My Outfits"> マイ アウトフィット </string> + <string name="InvFolder Accessories"> + アクセサリ + </string> <string name="InvFolder Friends"> フレンド </string> @@ -955,7 +1038,7 @@ 買ㆠ</string> <string name="BuyforL$"> - Buy for L$ + L$ ã§è³¼å…¥ </string> <string name="Stone"> 石 @@ -1298,7 +1381,7 @@ 許å¯ã•ã‚ŒãŸä½äººï¼š （[ALLOWEDAGENTS] 人ã€æœ€å¤§ [MAXACCESS] 人） </string> <string name="RegionInfoAllowedGroups"> - 許å¯ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—： （[ALLOWEDGROUPS]ã€æœ€å¤§ [MAXACCESS] グループ） + 許å¯ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—： （[ALLOWEDGROUPS]ã€æœ€å¤§ [MAXACCESS] ） </string> <string name="ScriptLimitsParcelScriptMemory"> 区画スクリプトメモリ @@ -1468,6 +1551,12 @@ <string name="PanelContentsNewScript"> æ–°è¦ã‚¹ã‚¯ãƒªãƒ—ト </string> + <string name="PanelContentsTooltip"> + オブジェクトã®ä¸èº« + </string> + <string name="BusyModeResponseDefault"> + メッセージをé€ã£ãŸä½äººã¯ã€èª°ã«ã‚‚邪é”ã‚’ã•ã‚ŒãŸããªã„ãŸã‚ç¾åœ¨ã€Œå–ã‚Šè¾¼ã¿ä¸ã€ãƒ¢ãƒ¼ãƒ‰ã§ã™ã€‚ ã‚ãªãŸã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã€ã‚ã¨ã§ç¢ºèªã§ãるよã†ã« IM パãƒãƒ«ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ + </string> <string name="MuteByName"> （å称別） </string> @@ -1506,6 +1595,9 @@ <string name="NoPicksClassifiedsText"> ピックやクラシファイド広告を作æˆã—ã¦ã„ã¾ã›ã‚“。 作æˆã™ã‚‹ã«ã¯ã€ä¸‹ã«ã‚る「プラスã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¾ã™ã€‚ </string> + <string name="NoAvatarPicksClassifiedsText"> + ピックã€ã¾ãŸã¯ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘ŠãŒã‚ã‚Šã¾ã›ã‚“ + </string> <string name="PicksClassifiedsLoadingText"> ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... </string> @@ -3366,4 +3458,31 @@ www.secondlife.com ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ãã ã <string name="unread_chat_multiple"> [SOURCES] ã¯ä½•ã‹æ–°ã—ã„ã“ã¨ã‚’言ã„ã¾ã—ãŸã€‚ </string> + <string name="paid_you_ldollars"> + [NAME] 㯠L$[AMOUNT] 支払ã„ã¾ã—㟠+ </string> + <string name="giving"> + Giving + </string> + <string name="uploading_costs"> + アップãƒãƒ¼ãƒ‰ä»£é‡‘ + </string> + <string name="this_costs"> + This costs + </string> + <string name="buying_selected_land"> + é¸æŠžã—ãŸåœŸåœ°ã‚’購入 + </string> + <string name="this_object_costs"> + This object costs" + </string> + <string name="group_role_everyone"> + 全員 + </string> + <string name="group_role_officers"> + オフィサー + </string> + <string name="group_role_owners"> + オーナー + </string> </strings> diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml index adcf0e42c3..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"> テレãƒãƒ¼ãƒˆå‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ã—ç›´ã™å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 @@ -63,6 +63,9 @@ <message name="completing"> テレãƒãƒ¼ãƒˆã‚’完了ã—ã¾ã™ã€‚ </message> + <message name="completed_from"> + [T_SLURL] ã‹ã‚‰ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãŒå®Œäº†ã—ã¾ã—㟠+ </message> <message name="resolving"> 目的地を解決ã—ã¦ã„ã¾ã™ã€‚ </message> diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml index 3a77de70d2..8f27e08f66 100644 --- a/indra/newview/skins/default/xui/nl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml @@ -26,14 +26,14 @@ <text name="OwnerText" left="102" width="242"> Leyla Linden </text> - <button label="Profiel..." label_selected="Profiel..." name="Profile..."/> + <button label="Profiel" name="Profile..."/> <text name="Group:"> Groep: </text> <text left="102" name="GroupText" width="242"/> - <button label="Instellen..." label_selected="Instellen..." name="Set..."/> + <button label="Instellen" name="Set..."/> <check_box label="Overdracht aan groep toestaan" name="check deed" tool_tip="Een groepofficier kan dit land aan de groep overdragen, zodat het ondersteund wordt door de landallocatie van de groep."/> - <button label="Overdragen..." label_selected="Overdragen..." name="Deed..." tool_tip="U mag alleen land overdragen indien u een officier bent in de geselecteerde groep."/> + <button label="Overdragen" name="Deed..." tool_tip="U mag alleen land overdragen indien u een officier bent in de geselecteerde groep."/> <check_box label="Eigenaar maakt bijdrage met overdracht" name="check contrib" tool_tip="Wanneer het land is overgedragen aan de groep, draagt de voormalig eigenaar voldoende landtoewijzing bij om het te ondersteunen."/> <text name="For Sale:"> Te koop: @@ -44,7 +44,7 @@ <text name="For Sale: Price L$[PRICE]."> Prijs: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> - <button label="Verkoop land..." label_selected="Verkoop land..." name="Sell Land..."/> + <button label="Verkoop land" name="Sell Land..."/> <text name="For sale to"> Te koop voor: [BUYER] </text> @@ -74,11 +74,11 @@ 0 </text> <button left="130" width="125" label="Koop land..." label_selected="Koop land..." name="Buy Land..."/> - <button label="Koop voor groep..." label_selected="Koop voor groep..." name="Buy For Group..."/> + <button label="Koop voor groep" name="Buy For Group..."/> <button left="130" width="125" label="Koop toegangspas..." label_selected="Koop toegangspas..." name="Buy Pass..." tool_tip="Een toegangspas geeft u tijdelijk toegang tot dit land."/> - <button label="Land Afstaan..." label_selected="Land Afstaan..." name="Abandon Land..."/> - <button label="Land terugvorderen..." label_selected="Land terugvorderen..." name="Reclaim Land..."/> - <button label="Lindenverkoop..." label_selected="Lindenverkoop..." name="Linden Sale..." tool_tip="Land moet in bezit zijn, de inhoud moet ingesteld zijn en niet al ter veiling zijn aangeboden."/> + <button label="Land Afstaan" name="Abandon Land..."/> + <button label="Land terugvorderen" name="Reclaim Land..."/> + <button label="Lindenverkoop" name="Linden Sale..." tool_tip="Land moet in bezit zijn, de inhoud moet ingesteld zijn en niet al ter veiling zijn aangeboden."/> <panel.string name="new users only"> Alleen nieuwe gebruikers </panel.string> @@ -224,7 +224,7 @@ of opgedeeld. [COUNT] </text> <button label="Toon" label_selected="Toon" name="ShowOwner" right="-135" width="60"/> - <button label="Retourneren..." label_selected="Retourneren..." name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> + <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> <text name="Set to group:" left="14" width="180"> Groep toewijzen: </text> @@ -232,7 +232,7 @@ of opgedeeld. [COUNT] </text> <button label="Toon" label_selected="Toon" name="ShowGroup" right="-135" width="60"/> - <button label="Retourneren..." label_selected="Retourneren..." name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> + <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> <text name="Owned by others:" left="14" width="128"> Eigendom van anderen: </text> @@ -240,7 +240,7 @@ of opgedeeld. [COUNT] </text> <button label="Toon" label_selected="Toon" name="ShowOther" right="-135" width="60"/> - <button label="Retourneren..." label_selected="Retourneren..." name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> + <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> <text name="Selected / sat upon:" left="14" width="193"> Geselecteerd/Er op gezeten </text> @@ -256,7 +256,7 @@ of opgedeeld. Objecteigenaren: </text> <button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List" bottom="-213"/> - <button label="Retourneer objecten..." label_selected="Retourneer objecten..." name="Return objects..." width="164" bottom="-213"/> + <button label="Retourneer objecten" name="Return objects..." width="164" bottom="-213"/> <name_list name="owner list" height="104"> <column label="Type" name="type"/> <column label="Naam" name="name"/> diff --git a/indra/newview/skins/default/xui/nl/menu_mini_map.xml b/indra/newview/skins/default/xui/nl/menu_mini_map.xml index 0a6dfa3465..f7c09660ea 100644 --- a/indra/newview/skins/default/xui/nl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/nl/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom dichtbij" name="Zoom Close"/> <menu_item_call label="Zoom gemiddeld" name="Zoom Medium"/> <menu_item_call label="Zoom veraf" name="Zoom Far"/> 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..8a4b1a4d53 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -26,13 +26,13 @@ <text name="OwnerText"> Leyla Linden </text> - <button label="Profile..." label_selected="Profile..." name="Profile..."/> + <button label="Profile" name="Profile..."/> <text name="Group:"> Grupa: </text> - <button label="Ustaw..." label_selected="Ustaw..." name="Set..."/> + <button label="Ustaw" name="Set..."/> <check_box label="UdostÄ™pnij przypisywanie na grupÄ™" name="check deed" tool_tip="Oficer grupy ma prawo przepisać prawo wÅ‚asnoÅ›ci posiadÅ‚oÅ›ci na grupÄ™. PosiadÅ‚ość wspierana jest przez przydziaÅ‚y pochodzÄ…ce od czÅ‚onków grupy."/> - <button label="Przypisz..." label_selected="Przypisz..." name="Deed..." tool_tip="Prawo przypisania posiadÅ‚oÅ›ci na grupÄ™ może dokonać jedynie oficer grupy."/> + <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania posiadÅ‚oÅ›ci na grupÄ™ może dokonać jedynie oficer grupy."/> <check_box label="WÅ‚aÅ›cicel dokonuje wpÅ‚at zwiÄ…zanych z posiadÅ‚oÅ›ciÄ…" name="check contrib" tool_tip="Kiedy posiadÅ‚ość zostaje przypisana na grupÄ™, poprzedni wÅ‚aÅ›ciciel realizuje wpÅ‚aty z niÄ… zwiÄ…zane w celu jej utrzymania."/> <text name="For Sale:"> Na Sprzedaż: @@ -43,7 +43,7 @@ <text name="For Sale: Price L$[PRICE]."> Cena: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> - <button label="Sprzedaj PosiadÅ‚ość..." label_selected="Sprzedaj PosiadÅ‚ość..." name="Sell Land..."/> + <button label="Sprzedaj PosiadÅ‚ość" name="Sell Land..."/> <text name="For sale to"> Na sprzedaż dla: [BUYER] </text> @@ -73,11 +73,11 @@ 0 </text> <button label="Kup PosiadÅ‚ość..." label_selected="Kup PosiadÅ‚ość..." left="130" name="Buy Land..." width="125"/> - <button label="Kup dla Grupy..." label_selected="Kup dla Grupy..." name="Buy For Group..."/> + <button label="Kup dla Grupy" name="Buy For Group..."/> <button label="Kup PrzepustkÄ™..." label_selected="Kup PrzeputkÄ™..." left="130" name="Buy Pass..." tool_tip="Przepustka udostÄ™pnia tymczasowy wstÄ™p na posiadÅ‚ość." width="125"/> - <button label="Porzuć z PosiadÅ‚oÅ›ci..." label_selected="Porzuć z PosiadÅ‚oÅ›ci..." name="Abandon Land..."/> - <button label="Odzyskaj PosiadÅ‚ość..." label_selected="Odzyskaj PosiadÅ‚ość..." name="Reclaim Land..."/> - <button label="Sprzedaż przez Lindenów..." label_selected="Sprzedaż przez Lindenów..." name="Linden Sale..." tool_tip="PosiadÅ‚ość musi mieć wÅ‚aÅ›ciciela, zawartość oraz nie może być wystawiona na aukcÄ™."/> + <button label="Porzuć z PosiadÅ‚oÅ›ci" name="Abandon Land..."/> + <button label="Odzyskaj PosiadÅ‚ość" name="Reclaim Land..."/> + <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="PosiadÅ‚ość musi mieć wÅ‚aÅ›ciciela, zawartość oraz nie może być wystawiona na aukcÄ™."/> <panel.string name="new users only"> Tylko nowi użytkownicy </panel.string> @@ -224,7 +224,7 @@ Idź do Åšwiat > O PosiadÅ‚oÅ›ci albo wybierz innÄ… posiadÅ‚ość żeby pokaz [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowOwner"/> - <button label="Zwróć..." label_selected="Zwróć..." name="ReturnOwner..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli."/> + <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli."/> <text name="Set to group:"> Grupy: </text> @@ -232,7 +232,7 @@ Idź do Åšwiat > O PosiadÅ‚oÅ›ci albo wybierz innÄ… posiadÅ‚ość żeby pokaz [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowGroup"/> - <button label="Zwróć..." label_selected="Zwróć..." name="ReturnGroup..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli.."/> + <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli.."/> <text name="Owned by others:"> Innych Rezydentów: </text> @@ -240,7 +240,7 @@ Idź do Åšwiat > O PosiadÅ‚oÅ›ci albo wybierz innÄ… posiadÅ‚ość żeby pokaz [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowOther"/> - <button label="Zwróć..." label_selected="Zwróć..." name="ReturnOther..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli."/> + <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich wÅ‚aÅ›cicieli."/> <text name="Selected / sat upon:"> Wybranych: </text> 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 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_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 5957018144..95d82a3f9c 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_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index 904a2cc270..7bbdc35f94 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_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml index ff2d702132..a5d85aca4e 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_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_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml index 8120ff8c77..e03c5faaeb 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_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 88a878af72..87d74f6c15 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_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml index 0bcf6ba4d5..847c93f891 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_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_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index 7139c470a4..2a49864e93 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 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_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml index 194a6da1bd..cf0abb2c23 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_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index 0826508fd6..c66ac0a98f 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_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 48366e2b64..011dc8ee7c 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/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_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml index 4152fb41c8..dbebeadfbe 100644 --- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <menu_item_call label="Zoom Blisko" name="Zoom Close"/> <menu_item_call label="Zoom Åšrednio" name="Zoom Medium"/> <menu_item_call label="Zoom Daleko" name="Zoom Far"/> 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_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_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_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml index dd46b4aeaa..6a0cbbd23a 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_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 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_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index e3cdaae840..d72f13fabd 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_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 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_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_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_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/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/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index d6e1c925b0..39548dc497 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_about" title="SOBRE O [CAPITALIZED_APP_NAME]"> +<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> @@ -7,7 +7,7 @@ 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] ([HOSTIP]) + 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> @@ -42,12 +42,19 @@ Versão Vivox: [VIVOX_VERSION] </panel> <panel label="Créditos" 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. + 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. - 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 +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 + + + + + + +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"> 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 bf6faf50cc..7b943f2f67 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floaterland" title="SOBRE O TERRENO"> + <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] minutos </floater.string> @@ -15,7 +24,7 @@ <tab_container name="landtab"> <panel label="GERAL" name="land_general_panel"> <panel.string name="new users only"> - Somente novos usuários + Somente novos residentes </panel.string> <panel.string name="anyone"> Qualquer um @@ -81,9 +90,12 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se <text name="Group:"> Grupo: </text> - <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/> + <text name="GroupText"> + Leyla Linden + </text> + <button label="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."/> + <button label="Passar" name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/> <check_box label="Proprietário faz contribuição com delegação" name="check contrib" tool_tip="Quando a terra é delegada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/> <text name="For Sale:"> À Venda: @@ -94,7 +106,7 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se <text name="For Sale: Price L$[PRICE]."> Preço: L$[PRICE] (L$[PRICE_PER_SQM]/m²). </text> - <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/> + <button label="Vender Terra" name="Sell Land..."/> <text name="For sale to"> À venda para: [BUYER] </text> @@ -124,11 +136,12 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se 0 </text> <button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/> - <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/> + <button label="Dados do script" name="Scripts..."/> + <button label="Comprar para o Grupo" name="Buy For Group..."/> <button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a 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."/> + <button label="Reclamar Terra" name="Reclaim Land..."/> + <button label="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> <panel label="CONTRATO" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -229,7 +242,7 @@ ou sub-dividida. [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/> + <button label="Retornar" name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/> <text left="14" name="Set to group:" width="180"> Configurados ao grupo: </text> @@ -237,7 +250,7 @@ ou sub-dividida. [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/> + <button label="Retornar" name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/> <text left="14" name="Owned by others:" width="128"> Propriedade de Outros: </text> @@ -245,7 +258,7 @@ ou sub-dividida. [COUNT] </text> <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/> + <button label="Retornar" name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/> <text left="14" name="Selected / sat upon:" width="193"> Selecionado/Sentado: </text> @@ -253,7 +266,7 @@ 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:"> @@ -301,7 +314,7 @@ Apenas lotes maiores podem ser listados na busca. 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="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."/> @@ -384,9 +397,6 @@ Apenas lotes maiores podem ser listados na busca. </text> <line_editor left="97" name="media_url"/> <button label="Definir..." label_selected="Definir..." name="set_media_url"/> - <text name="CurrentURL:"> - Página atual: - </text> <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: @@ -398,9 +408,7 @@ 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.) + 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."/> <text left="102" name="media_size" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão." width="115"> @@ -418,13 +426,18 @@ MÃdia: <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.string name="access_estate_defined"> (Definições do terreno) </panel.string> + <panel.string name="allow_public_access"> + Acesso para público: [MATURITY] + </panel.string> <panel.string name="estate_override"> Uma ou mais destas opções está definida no nÃvel de propriedade. </panel.string> @@ -435,7 +448,7 @@ MÃdia: <text name="Only Allow"> Restringir acesso a contas confirmardas por: </text> - <check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes não identificados."/> + <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"/> 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 020cfbc811..78bcde251a 100644 --- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml @@ -106,6 +106,9 @@ A duração máxima de animação permitida é de [MAX_LENGTH] segundos. <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> 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 0d52fec23b..5fb64f64b3 100644 --- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml @@ -7,26 +7,37 @@ Texturas compostas </text> <button label="Tombar" label_selected="Tombar" name="Dump"/> - <texture_picker label="Cabelo" name="hair_grain"/> - <texture_picker label="Cabelo alpha" name="hair_alpha"/> - <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="Olho" name="eyes_iris"/> - <texture_picker label="Olhos Alpha" name="eyes_alpha"/> - <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="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"/> + <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_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index b3cce2d78f..1d0b3c4cd9 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/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"> Digite o valor novamente para ver o câmbio atual. 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 f0e5808df3..73b483acf2 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml @@ -1,5 +1,132 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <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"> + Terrenos de outros residentes foram selecionados. +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> @@ -106,130 +233,4 @@ Este lote mede 512 m². <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ê tem [BUYER] m². - </string> - <string name="pay_to_for_land"> - Pagar L$ [AMOUNT] para [SELLER] por esta terra - </string> - <string name="buy_for_US"> - Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Este lote tem [AMOUNT] m² - </string> - <string name="premium_land"> - Esse é um terreno premium e custa o equivalente a [AMOUNT] m². - </string> - <string name="discounted_land"> - Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -suporta [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_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml index 5114b19336..7989ce66bc 100644 --- a/indra/newview/skins/default/xui/pt/floater_camera.xml +++ b/indra/newview/skins/default/xui/pt/floater_camera.xml @@ -9,6 +9,18 @@ <floater.string name="move_tooltip"> Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita </floater.string> + <floater.string name="orbit_mode_title"> + Órbita + </floater.string> + <floater.string name="pan_mode_title"> + Pan + </floater.string> + <floater.string name="avatar_view_mode_title"> + Predefinições + </floater.string> + <floater.string name="free_mode_title"> + Visualizar objeto + </floater.string> <panel name="controls"> <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"> @@ -25,7 +37,7 @@ <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="avatarview_btn" tool_tip="Predefinições"/> <button label="" name="freecamera_btn" tool_tip="Visualizar objeto"/> </panel> </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 d60a815f30..4ea014335f 100644 --- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml @@ -21,7 +21,7 @@ <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"/> + <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> Cor atual: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml index 447ca8c543..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 label="Feminino" name="radio"/> - <radio_item label="Masculino" name="radio2"/> + <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. @@ -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. @@ -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> - <placeholder 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="Selecionar a cor"/> - <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/> <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. @@ -193,8 +189,8 @@ um esboço e usá-lo. <panel label="Calças" name="Pants"> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/> <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> @@ -254,7 +247,6 @@ de um esboço e usá-lo. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/> <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> @@ -289,7 +280,6 @@ um esboço e usá-las. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -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> @@ -325,7 +314,6 @@ partir de um esboço e usá-lo. <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -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> @@ -360,7 +347,6 @@ partir de um esboço e usá-lo. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -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> @@ -395,7 +380,6 @@ partir de um esboço e usá-lo. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> @@ -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> @@ -430,7 +413,6 @@ modelo a partir de um esboço e usá-lo. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/> <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> @@ -465,13 +446,12 @@ partir de um esboço e usá-lo. </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> - <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/> <button label="Remover" label_selected="Remover" name="Take Off"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Tatuagem" name="Tattoo"> <text name="title"> [DESC]: </text> @@ -488,27 +468,24 @@ partir de um esboço e usá-lo. 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 e coloque-a. + 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"> - Alpha: + Tatuagem: </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="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/> + <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="Tatuagem" name="Tattoo"> + <panel label="Alpha" name="Alpha"> <text name="title"> [DESC]: </text> @@ -525,19 +502,20 @@ Ou crie uma máscara nova e coloque-a. 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. + 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"> - Tatuagem: + Alpha: </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="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/> + <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"/> @@ -545,6 +523,7 @@ Ou crie uma tatuagem nova. </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"/> 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..1cd4dcbda4 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_event.xml @@ -0,0 +1,72 @@ +<?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> + <floater.string name="moderate"> + Moderado + </floater.string> + <floater.string name="adult"> + Adulto + </floater.string> + <floater.string name="general"> + Público geral + </floater.string> + <floater.string name="unknown"> + Desconhecido + </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_label"> + Data: + </text> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration_label"> + Duração: + </text> + <text name="event_duration"> + 1 hora + </text> + <text name="event_covercharge_label"> + Cover: + </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)"/> + <expandable_text name="event_desc"> + 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 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_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml index 4b7b2eb34e..2e63d86281 100644 --- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml @@ -2,7 +2,7 @@ <floater name="godtools floater" title="FERRAMENTAS DE DEUS"> <tab_container name="GodTools Tabs"> <panel label="Grade" name="grid"> - <button label="Desconectar todos os usuários" label_selected="Desconectar todos os usuários" name="Kick all users"/> + <button label="Chutar todos" label_selected="Chutar todos" name="Kick all users"/> <button label="Limpar os cachês de visibilidade do mapa da região." label_selected="Limpar os cachês de visibilidade do mapa da região." name="Flush This Region's Map Visibility Caches"/> </panel> <panel label="Região" name="region"> @@ -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_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml index 281bdbd183..9cc8a0a6b2 100644 --- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml @@ -1,8 +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"> - <button label="Abrir no navegador" name="open_browser"/> - </layout_panel> + <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 f6057c48f1..c81d0dd7ef 100644 --- a/indra/newview/skins/default/xui/pt/floater_im.xml +++ b/indra/newview/skins/default/xui/pt/floater_im.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <multi_floater name="im_floater" title="Mensagem Instantânea"> <string name="only_user_message"> - Você é o único usuário desta sessão. + Você é o único residente nesta sessão </string> <string name="offline_message"> [FIRST] [LAST] está offline. @@ -31,7 +31,7 @@ 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]. + Não foi possÃvel adicionar residentes ao 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]. diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml index a21d4a6f1e..0fbb826a96 100644 --- a/indra/newview/skins/default/xui/pt/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<multi_floater name="floater_im_box" title="Mensagens instantâneas"/> +<multi_floater name="floater_im_box" title="CONVERSAS"/> diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml index 79124966d1..cdebe533bd 100644 --- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml @@ -1,5 +1,8 @@ <?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> @@ -12,6 +15,9 @@ <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> diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml index 409261a136..ae3312eab0 100644 --- a/indra/newview/skins/default/xui/pt/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Inventory" title="INVENTÃRIO"> +<floater name="Inventory" title="MEU INVENTÃRIO"> <floater.string name="Title"> - Inventário + MEU INVENTÃRIO </floater.string> <floater.string name="TitleFetching"> - Inventário ([ITEM_COUNT] Items) [FILTER] [FILTER] + MEU INVENTÃRIO (Pegando [ITEM_COUNT] items...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> - Inventário ([ITEM_COUNT] Items) [FILTER] + MEU INVENTÃRIO ([ITEM_COUNT] items) [FILTER] </floater.string> <floater.string name="Fetched"> Obtido 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 1717088eae..5ad116ac8a 100644 --- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml @@ -7,7 +7,7 @@ Executando </floater.string> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <button label="Resetar" label_selected="Resetar" name="Reset"/> <check_box initial_value="true" label="Correndo" name="running"/> 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 f9a5e08e97..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,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="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"/> 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_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml index 7c4436537d..9c02570076 100644 --- a/indra/newview/skins/default/xui/pt/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml @@ -18,10 +18,19 @@ <string name="fly_back_tooltip"> Voar para trás (flecha para baixo ou S) </string> + <string name="walk_title"> + Andar + </string> + <string name="run_title"> + Correr + </string> + <string name="fly_title"> + Voar + </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 o alto (tecla E)"/> + <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)"/> @@ -30,6 +39,5 @@ <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_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 index 2078185315..8a536b90db 100644 --- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml @@ -1,5 +1,8 @@ <?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> @@ -21,6 +24,15 @@ <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> 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 161c7c6d4b..464afd7f18 100644 --- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml @@ -15,7 +15,7 @@ </text> <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> <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"/> diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml index dc29bcf6b1..803f2f87b8 100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Público geral" name="general"/> <panel label="VÃdeo" name="display"/> <panel label="Privacidade" name="im"/> - <panel label="Som" name="audio"/> + <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"/> 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 c7d3affd73..b66159354f 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Descrição: </text> - <button label="Executar in World" 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="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_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index af4dceaa89..48f27f1968 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml @@ -24,6 +24,9 @@ <floater.string name="Title"> Gesto: [NAME] </floater.string> + <text name="name_text"> + Nome: + </text> <text name="desc_label"> Descrição: </text> 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 6194bfffd6..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,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="preview notecard" title="NOTA:"> +<floater name="preview notecard" title="Anotação:"> <floater.string name="no_object"> - Não foi possÃvel encontrar o objeto que contém esta nota. + 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. 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 8691542d95..7c5a1538f2 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Descrição: </text> - <button label="Executar in-World" label_selected="Executar in-World" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/> + <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 066cf05163..6f39635240 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml @@ -12,6 +12,9 @@ <text name="dimensions"> [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 @@ -38,7 +41,7 @@ 2:1 </combo_item> </combo_box> - <button label="OK" name="keep"/> - <button label="Cancelar" name="discard"/> + <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_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml new file mode 100644 index 0000000000..988f8f2ce1 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="publish_classified" title="Publicando anúncio"> + <text name="explanation_text"> + Seu anúncio será publicado por uma semana a partir da data de publicação. + +Lembre-se, o pagamento do anúncio não é reembolsável + </text> + <spinner label="Preço do anúncio:" name="price_for_listing" tool_tip="Preço do anúncio." value="50"/> + <text name="l$_text" value="L$"/> + <text name="more_info_text"> + Mais informações (link para ajuda com anúncios) + </text> + <button label="Publicar" name="publish_btn"/> + <button label="Cancelar" name="cancel_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 7988056a3b..08413a9231 100644 --- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml @@ -41,8 +41,8 @@ <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report"> <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 no Second Life Jovem" 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="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"/> 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 5fafb0d1b8..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,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT"> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <text name="desc txt"> Descrição: 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 15772da434..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:"> - Pressione uma tecla para definir o botão disparador do Falar. + Pressione uma tecla para definir o seu botão Falar. </text> </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 dfffb89f30..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,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="settings_debug" title="DEBUG SETTINGS"> - <combo_box name="boolean_combo"> - <combo_box.item label="TRUE" name="TRUE"/> - <combo_box.item label="FALSE" name="FALSE"/> - </combo_box> + <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"/> diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml index b5d070c9d5..a3934a6667 100644 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml @@ -4,12 +4,12 @@ Destino da foto </text> <radio_group label="Tipo de Foto" name="snapshot_type_radio"> - <radio_item label="Enviar por email" name="postcard"/> - <radio_item label="Salvar no seu inventário (L$[AMOUNT])" name="texture"/> - <radio_item label="Salvar no seu disco rÃgido" name="local"/> + <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"/> @@ -19,8 +19,8 @@ <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> @@ -58,8 +58,8 @@ </combo_box> <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="Restringir proporções" name="keep_aspect_check"/> - <slider label="Qualidade da Imagem" name="image_quality_slider"/> + <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> @@ -68,10 +68,10 @@ <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_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml index b4760835b0..38beec022c 100644 --- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="sys_well_window" title="AVISOS"> <string name="title_im_well_window"> - MIs + CONVERSAS </string> <string name="title_notification_well_window"> AVISOS 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 69ea67699c..144bc0340e 100644 --- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml @@ -16,7 +16,7 @@ <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="Ok" label_selected="Ok" 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_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml index c6a62c9118..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="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: </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"> 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" left="190" name="return_all_btn"/> <button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/> <button label="Desabilitar Tudo" left="190" name="disable_all_btn"/> - <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> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml index 9a9666f9db..2fbbbde9e4 100644 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml @@ -4,7 +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"> - Leia com atenção os Termos do Serviço. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato. + 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 index 8348b375b1..5ef8479b7a 100644 --- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml @@ -13,13 +13,14 @@ Ligação para [NAME] </string> <string name="no_one_near"> - Ninguém por perto + Ninguém por perto ativou a voz </string> - <panel name="control_panel"> - <layout_stack> - <layout_panel name="leave_btn_panel"> - <button label="Desligar" 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="Meu 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 36b995d4fd..b4613e0890 100644 --- a/indra/newview/skins/default/xui/pt/floater_water.xml +++ b/indra/newview/skins/default/xui/pt/floater_water.xml @@ -8,7 +8,7 @@ <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/> <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/> <tab_container name="Water Tabs"> - <panel label="Configurações" name="Settings"> + <panel label="DEFINIÇÕES" name="Settings"> <text name="BHText"> Cor da névoa da Ãgua </text> @@ -56,7 +56,7 @@ </text> <button label="?" left="640" name="WaterBlurMultiplierHelp"/> </panel> - <panel label="Imagem" name="Waves"> + <panel label="IMAGEM" name="Waves"> <text name="BHText"> Direção da Onda Maior </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 index 8f616396ca..865d939d24 100644 --- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/pt/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="LISTA BRANCA"> <text name="media_label"> Digite um URL ou série de URLs para a lista de domÃnios permitidos </text> diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml index 951e37a1a6..22632a4ef8 100644 --- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml @@ -5,11 +5,11 @@ </text> <combo_box left_delta="130" name="WLPresetsCombo"/> <button label="Novo" label_selected="Novo" name="WLNewPreset"/> - <button label="Salvar" label_selected="Salvar" name="WLSavePreset" left_delta="72"/> - <button label="Deletar" label_selected="Deletar" name="WLDeletePreset" left_delta="72"/> - <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="84" /> + <button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/> + <button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/> + <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/> <tab_container name="WindLight Tabs"> - <panel label="Atmosfera" name="Atmosphere"> + <panel label="ATMOSFERA" name="Atmosphere"> <text name="BHText"> Horizonte Azul </text> @@ -53,17 +53,17 @@ <text name="DensMultText"> Multiplicador de Densidade </text> - <button label="?" name="WLDensityMultHelp" left="635"/> + <button label="?" left="635" name="WLDensityMultHelp"/> <text name="WLDistanceMultText"> Multiplicador de Distância </text> - <button label="?" name="WLDistanceMultHelp" left="635"/> + <button label="?" left="635" name="WLDistanceMultHelp"/> <text name="MaxAltText"> Altitude Máxima </text> - <button label="?" name="WLMaxAltitudeHelp" left="635"/> + <button label="?" left="635" name="WLMaxAltitudeHelp"/> </panel> - <panel label="Iluminação" name="Lighting"> + <panel label="ILUMINAÇÃO" name="Lighting"> <text name="SLCText"> Cor do Sol/Lua </text> @@ -119,7 +119,7 @@ </text> <button label="?" name="WLStarBrightnessHelp"/> </panel> - <panel label="Nuvens" name="Clouds"> + <panel label="NUVENS" name="Clouds"> <text name="WLCloudColorText"> Cor da Nuvem </text> @@ -157,10 +157,10 @@ Escala da Nuvem </text> <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText" font="SansSerifSmall"> + <text font="SansSerifSmall" name="WLCloudDetailText"> Detalhe da Nuvem (XY/Densidade) </text> - <button label="?" name="WLCloudDetailHelp" left="421"/> + <button label="?" left="421" name="WLCloudDetailHelp"/> <text name="BHText8"> X </text> @@ -181,7 +181,7 @@ <button label="?" name="WLCloudScrollYHelp"/> <check_box label="Travar" name="WLCloudLockY"/> <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp" left="645"/> + <button label="?" left="645" name="WLClassicCloudsHelp"/> </panel> </tab_container> </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 75f9d13ad3..115192203f 100644 --- a/indra/newview/skins/default/xui/pt/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml @@ -5,13 +5,15 @@ Legenda </text> </panel> - <panel - name="layout_panel_2"> + <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="person_label"> + <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 @@ -20,51 +22,57 @@ <text name="land_sale_label"> Venda de terreno </text> + <text name="by_owner_label"> + o proprietário + </text> <text name="auction_label"> - pelo dono + leilão de terrenos </text> - <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para minha casa"/> + <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para meu inÃcio"/> <text name="Home_label"> - Casa + InÃcio </text> <text name="events_label"> Eventos: </text> <check_box label="PG" name="event_chk"/> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> + <text name="pg_label"> + Público geral + </text> + <check_box initial_value="verdadeiro" label="Mature" name="event_mature_chk"/> <text name="mature_label"> Moderado </text> <check_box label="Adult" name="event_adult_chk"/> + <text name="adult_label"> + Adulto + </text> </panel> - <panel - name="layout_panel_3"> + <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"> + <panel name="layout_panel_4"> + <combo_box label="Amigos online" 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 font="SansSerifSmall" label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/> + <search_editor label="Regiões por nome" name="location" tool_tip="Digite o nome da região"/> + <button label="Buscar" name="DoSearch" tool_tip="Buscar região"/> + <button name="Clear" tool_tip="Limpar linhas e redefinir mapa"/> + <button font="SansSerifSmall" label="Teletransportar" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o lugar selecionado"/> <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"/> + <button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centrar mapa no local selecionado" width="135"/> </panel> - <panel - name="layout_panel_5"> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel - name="layout_panel_6"> + <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 index 8f35acf19e..a74ea15be0 100644 --- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml @@ -13,7 +13,7 @@ <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="Mais" name="view_profile_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"/> diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml index 99d5ae9bec..abbf2e7032 100644 --- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/pt/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="Ficar de pé" name="Stand Up"/> - <context_menu label="Tirar >" name="Take Off >"> - <context_menu label="Roupa >" name="Clothes >"> + <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"/> @@ -16,8 +16,8 @@ <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"/> + <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..."/> 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_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml index 46c536e64b..cdd8959cd4 100644 --- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml @@ -7,6 +7,7 @@ <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"/> @@ -14,4 +15,5 @@ <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_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index de33849d0c..8b565b9645 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -10,7 +10,7 @@ <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="Novas roupas" name="New Clothes"> <menu_item_call label="Nova Camisa" name="New Shirt"/> @@ -46,9 +46,10 @@ <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="Ir para o link" name="Goto Link"/> <menu_item_call label="Abrir" name="Open"/> <menu_item_call label="Propriedades" name="Properties"/> <menu_item_call label="Renomear" name="Rename"/> @@ -57,13 +58,11 @@ <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 o marco" name="About Landmark"/> - <menu_item_call label="Executar in World" name="Animation Play"/> + <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..."/> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml index d1bdcd3a8a..81898c63bf 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml @@ -8,7 +8,7 @@ </menu> <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="Novas roupas" name="New Clothes"> <menu_item_call label="Nova camisa" name="New Shirt"/> diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index 3dd5d2c152..6cc83d11d0 100644 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml @@ -21,8 +21,8 @@ </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_item_call label="Mostrar bandeja lateral" name="Show Side Tray"/> <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"/> 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 f7b86b8f22..380bd8cf11 100644 --- a/indra/newview/skins/default/xui/pt/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pt/menu_mini_map.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="popup"> +<menu name="Popup"> <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"/> 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 index 658f44d692..a5969cacc3 100644 --- a/indra/newview/skins/default/xui/pt/menu_object.xml +++ b/indra/newview/skins/default/xui/pt/menu_object.xml @@ -5,19 +5,22 @@ <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="Ficar de pé" name="Object Stand Up"/> <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="Pegar" name="Pie Object Take"/> <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..."/> diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml index 6db1fe7105..849dec3108 100644 --- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pt/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="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/desbloquear" name="Block/Unblock"/> - <menu_item_check label="Silenciar texto" name="MuteText"/> - <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"/> + <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_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_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml index eb47f51ed0..7c720f262b 100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml @@ -2,9 +2,12 @@ <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 index 855e7c9920..fc08b3accb 100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/pt/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="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"/> diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml index b3e09bc695..2635182290 100644 --- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml @@ -2,4 +2,10 @@ <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_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index acadc952ca..2b83386cad 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -9,8 +9,8 @@ <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_call label="Mostrar inventário na bandeja lateral" name="ShowSidetrayInventory"/> - <menu_item_call label="Meus gestos" name="Gestures"/> + <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"/> @@ -24,35 +24,36 @@ <menu_item_call label="Meus grupos" name="My Groups"/> <menu_item_check label="Bate-papo local" name="Nearby Chat"/> <menu_item_call label="Pessoas por perto" name="Active Speakers"/> - <menu_item_check label="MÃdia por perto" name="Nearby Media"/> </menu> <menu label="Mundo" name="World"> - <menu_item_check label="Movimentar" name="Movement Controls"/> - <menu_item_check label="Exibir" name="Camera Controls"/> - <menu_item_call label="Sobre terrenos" name="About Land"/> - <menu_item_call label="Região/Propriedade" name="Region/Estate"/> - <menu_item_call label="Comprar terreno" name="Buy Land"/> + <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="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 label="Marcos" name="Landmarks"> - <menu_item_call label="Colocar marco aqui" name="Create Landmark Here"/> - <menu_item_call label="Definir como casa" name="Set Home to Here"/> - </menu> - <menu_item_call label="InÃcio" name="Teleport Home"/> - <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="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="Usar o horário deste lugar" name="Revert to Region Default"/> + <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> @@ -78,10 +79,12 @@ </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 Take"/> + <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"/> @@ -94,25 +97,18 @@ <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_check label="Edit Linked Parts" name="Edit Linked Parts"/> <menu_item_call label="Set Default Upload Permissions" name="perm prefs"/> <menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/> - <menu label="Seleção" name="Selection"> - <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> - <menu label="Mostrar" name="Show"> - <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> - <menu label="Grade" name="Grid"> - <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="Use Selection for Grid" name="Use Selection for Grid"/> - <menu_item_call label="Opções de grade" name="Grid Options"/> - </menu> + <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"/> @@ -123,15 +119,14 @@ </menu> <menu label="Ajuda" name="Help"> <menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/> - <menu_item_call label="Tutorial" name="Tutorial"/> <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_check label="Status 'ausente' em 30 minutos" name="Go Away/AFK When Idle"/> <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"/> @@ -178,8 +173,8 @@ <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_item_check label="Mostrar MIs no bate-papo" name="IMInChat"/> <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"/> @@ -219,6 +214,7 @@ <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"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 57130fb5cd..1480343dc1 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/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="Notificação desconhecida" name="MissingAlert"> @@ -92,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="OK"/> + </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"> @@ -150,14 +165,21 @@ 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="ClickUnimplemented"> - Infelizmente isso ainda não foi implementado. + <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. @@ -322,6 +344,10 @@ Tem certeza de que quer prosseguir? 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"/> @@ -339,14 +365,6 @@ Tem certeza de que quer prosseguir? <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 o [APP_NAME] for iniciado. </notification> @@ -422,18 +440,17 @@ 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="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/> </notification> <notification name="UnknownGPU"> - O [APP_NAME] não consegue reconhecer a placa de vÃdeo do seu computador. -Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. O [APP_NAME] provavelmente vai funcionar com sua placa de vÃdeo, mas talvez seja necessário checar as configurações de vÃdeo. + 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="Minha placa de vÃdeo não foi reconhecida."/> @@ -605,6 +622,10 @@ Por favor tente novamente mais tarde. <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> @@ -652,7 +673,7 @@ 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"> @@ -701,7 +722,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"> @@ -749,14 +771,6 @@ Selecionados vários lotes. Tente selecionar um único lote. </notification> - <notification name="ParcelCanPlayMedia"> - Há mÃdia em stream disponÃvel aqui. -O streaming requer uma conexão rápida. - -Executar as mÃdias em stream detectadas? -(Esta opção pode ser modificada sob Preferências > Privacidade.) - <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. @@ -878,9 +892,8 @@ Unir a terra? 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ê saiu do [SECOND_LIFE]: + Ah não! O [SECOND_LIFE] teve de fechar. [MESSAGE] -Ainda é possÃvel ler suas MIs e o bate-papo. Para isso, clique 'Ver MIs e bate-papo'. Ou clique em 'Sair' para sair do [APP_NAME] completamente. <usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM & bate-papo"/> </notification> <notification name="OnlyOfficerCanBuyLand"> @@ -1031,6 +1044,7 @@ 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. @@ -1272,8 +1286,8 @@ Deixar este grupo? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Deixar"/> </notification> <notification name="ConfirmKick"> - Você quer REALMENTE expulsar todos os usuários deste grid? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar todos os usuários"/> + Tem CERTEZA de que deseja expulsar todos os residentes do grid? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/> </notification> <notification name="MuteLinden"> Desculpe, nenhum Linden pode ser bloqueado. @@ -1304,13 +1318,16 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua <usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> - 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 ser membro do grupo. -[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? + Chutar este residente com qual mensagem? <form name="form"> <input name="message"> Um administrador desligou você. @@ -1330,7 +1347,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua </form> </notification> <notification name="FreezeUser"> - Paralise este usuário com qual mensagem? + Congelar este residente com qual mensagem? <form name="form"> <input name="message"> Você foi congelado. Você não pode se mover ou conversar. Um administrador irá contatá-lo via mensagem instantânea (MI). @@ -1340,7 +1357,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua </form> </notification> <notification name="UnFreezeUser"> - Liberar este usuário com qual mensagem? + Descongelar este residente com qual mensagem? <form name="form"> <input name="message"> Você não está mais congelado. @@ -1360,7 +1377,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua </form> </notification> <notification name="OfferTeleportFromGod"> - God user convocou para a sua localização? + Convocar residente à sua localização com poderes de deus? <form name="form"> <input name="message"> Junte-se a mim em [REGION] @@ -1370,7 +1387,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua </form> </notification> <notification name="TeleportFromLandmark"> - Você tem certeza que quer se 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"> @@ -1390,11 +1407,11 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua </form> </notification> <notification label="Mudar propriedade Linden" name="ChangeLindenEstate"> - Você está prestes a mudar uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.) + Você está prestes a modificar uma propriedade da Linden (continente, teen, grid, orientação, etc) -Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar. +Esta ação é EXTREMAMENTE PERIGOSA -- ela pode afetar a experiência dos residentes. No continente, isso vai mudar milhares de regiões e deixar o spaceserver sobrecarregado. -Proceder? +Deseja prosseguir? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar Propriedade"/> </notification> <notification label="Mudar o acesso à propriedade Linden" name="ChangeLindenAccess"> @@ -1573,8 +1590,10 @@ Publicar este classificado agora por L$ [AMOUNT]? </form> </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. + O conteúdo desta região foi reclassificado. +Talvez leve algum tempo para a mudança ser refletida no mapa. + +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 o recurso 'Bate-papo de voz' desta região. Para o bate-papo de voz funcionar, atualize o [APP_NAME]. @@ -1694,7 +1713,7 @@ Mover para o inventário o(s) item(s)? <notification name="HelpReportAbuseEmailLL"> 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]. -Todas as denúncias de abuso são investigadas e resolvidas. Para saber o que foi feito, consulte o [http://secondlife.com/support/incidentreport.php relatório de ocorrências]. +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. @@ -1929,8 +1948,7 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de 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 @@ -2020,8 +2038,8 @@ Basta clicar em qualquer marco e depois clicar em 'Teletransportar' na (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"> - 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. + 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"> @@ -2091,7 +2109,7 @@ Instale o plugin novamente ou contate o fabricante se o problema persistir. 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. @@ -2103,7 +2121,7 @@ Objetos não transferÃveis dados ao grupo foram deletados. </notification> <notification name="ServerObjectMessage"> Mensagem de [NAME]: -[MSG] +<nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> A opção 'danos' desta região está ativada. @@ -2233,9 +2251,9 @@ Por favor, tente novamente em alguns instantes. [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="Bloquear"/> </form> </notification> <notification name="GodMessage"> @@ -2260,6 +2278,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] @@ -2297,9 +2318,15 @@ 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"/> @@ -2371,22 +2398,6 @@ Deixar? <button name="Ignore" text="Ignorar"/> </form> </notification> - <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="FirstBalanceIncrease"> - Você acaba de ganhar L$[AMOUNT]. -Seu saldo em L$ está no canto direito superior. - </notification> - <notification name="FirstBalanceDecrease"> - Você acaba de pagar L$[AMOUNT]. -Seu saldo em L$ está no canto direito superior. - </notification> <notification name="BuyLindenDollarSuccess"> Obrigado e volte sempre! @@ -2394,58 +2405,17 @@ Seu saldo L$ será atualizado findo o processamento da transação. Se o proces Para checar o status do pagamento, consulte seu Histórico de transações no [http://secondlife.com/account/ Painel] </notification> - <notification name="FirstSit"> - Você está sentado(a). -Use as teclas de seta (ou AWSD) para olhar à sua volta. -Clique o botão 'Ficar de pé' para ficar de pé. - </notification> - <notification name="FirstMap"> - Clique a arraste o mapa para olhar à sua volta. -Clique duas vezes para se teletransportar. -Use os controles à direita para achar coisas e exibir outros planos de fundo. - </notification> - <notification name="FirstBuild"> - Você abriu as Ferramentas de construção. Todos os objetos à sua volta foram criados com essas ferrametnas. - </notification> - <notification name="FirstTeleport"> - Você só pode se teletransportar para certas áreas nesta região. A seta aponta o seu destino especÃfico. Clique na seta para ignorá-la. - </notification> <notification name="FirstOverrideKeys"> Suas chaves do movimento estão sendo seguras agora por um objeto. 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. -Use as teclas de seta para olhar à sua volta. -Quando terminar, clique em 'Salvar tudo'. - </notification> - <notification name="FirstInventory"> - Este é seu inventário, onde ficam todos os seus pertences. - -* Para vestir uma peça, arraste-a para o seu corpo. -* Para fazer rez de um objeto, arraste-o para o chão. -* Para ler uma anotação, clique duas vezes nela. - </notification> <notification name="FirstSandbox"> 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="FirstFlexible"> - Este objeto é flexÃvel. Flexis devem ser phantom, não fÃsicos. - </notification> - <notification name="FirstDebugMenus"> - Você abriu o menu Avançado. - -Para alternar este menu, - Windows Ctrl+Alt+D - Mac: ⌥⌘D - </notification> - <notification name="FirstSculptedPrim"> - Você está editando um prim esculpido. Prims esculpidos requerem uma textura especial para definir o formato. - </notification> <notification name="MaxListSelectMessage"> Você pode selecionar até [MAX_SELECT] itens desta lista. </notification> @@ -2552,6 +2522,10 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes. <button name="respondbutton" text="Responder"/> </form> </notification> + <notification name="ConfirmCloseAll"> + Tem certeza de que quer fechar todas as MIs? + <usetemplate ignoretext="Confirmar antes de fechar todas as MIs" name="okcancelignore" notext="Cancelar" yestext="OK"/> + </notification> <notification name="AttachmentSaved"> Anexo salvo. </notification> 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 index aa8fd0b2d2..bd50d4953d 100644 --- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/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="Ligar" name="call_btn"/> - <button label="Desligar" name="end_call_btn"/> - <button label="Controles de voz" name="voice_ctrls_btn"/> - </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 index ecaf062e41..06d8823a74 100644 --- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml @@ -22,4 +22,5 @@ [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_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml index 2a66620800..092135bd42 100644 --- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml @@ -7,8 +7,13 @@ 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_box label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/> + <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"/> @@ -19,5 +24,15 @@ <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 index 6f48a36182..31d9bc2b26 100644 --- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml @@ -1,17 +1,48 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_classified_info"> + <panel.string name="l$_price"> + L$ [PRICE] + </panel.string> + <panel.string name="click_through_text_fmt"> + [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil + </panel.string> + <panel.string name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string name="auto_renew_on"> + Ativado + </panel.string> + <panel.string name="auto_renew_off"> + Desativado + </panel.string> <text name="title" value="Dados do anúncio"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="classified_name" value="[nome]"/> - <text name="classified_location" value="[carregando...]"/> - <text name="content_type" value="[content type]"/> - <text name="category" value="[category]"/> - <check_box label="Renovar automaticamente todas as semanas" name="auto_renew"/> - <text name="price_for_listing" tool_tip="Preço do anúncio."> - L$ [PRICE] - </text> - <text name="classified_desc" value="[descrição]"/> + <text_editor name="classified_name" value="[nome]"/> + <text name="classified_location_label" value="Localização:"/> + <text_editor name="classified_location" value="[carregando...]"/> + <text name="content_type_label" value="Tipo de conteúdo:"/> + <text_editor name="content_type" value="[content type]"/> + <text name="category_label" value="Categoria:"/> + <text_editor name="category" value="[category]"/> + <text name="creation_date_label" value="Data de criação"/> + <text_editor name="creation_date" tool_tip="Data de criação" value="[date]"/> + <text name="price_for_listing_label" value="Preço do anúncio:"/> + <text_editor name="price_for_listing" tool_tip="Preço do anúncio." value="[price]"/> + <layout_stack name="descr_stack"> + <layout_panel name="clickthrough_layout_panel"> + <text name="click_through_label" value="Cliques:"/> + <text_editor name="click_through_text" tool_tip="Dados de click-through" value="[cliques]"/> + </layout_panel> + <layout_panel name="price_layout_panel"> + <text name="auto_renew_label" value="Renovação automática:"/> + <text name="auto_renew" value="Ativado"/> + </layout_panel> + <layout_panel name="descr_layout_panel"> + <text name="classified_desc_label" value="Descrição:"/> + <text_editor name="classified_desc" value="[descrição]"/> + </layout_panel> + </layout_stack> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml index a754c5f070..f6fb223599 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml @@ -3,12 +3,20 @@ <panel.string name="location_notice"> (salvar para atualizar) </panel.string> + <string name="publish_label"> + Publicar + </string> + <string name="save_label"> + Salvar + </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"/> + <panel name="snapshot_panel"> + <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/> + </panel> <text name="Name:"> Cargo: </text> @@ -22,12 +30,19 @@ Carregando... </text> <button label="Usar configuração local" name="set_to_curr_location_btn"/> + <text name="category_label" value="Categoria:"/> + <text name="content_type_label" value="Tipo de conteúdo:"/> + <icons_combo_box label="Público geral" name="content_type"> + <icons_combo_box.item label="Moderado" name="mature_ci" value="Adulto"/> + <icons_combo_box.item label="Público geral" name="pg_ci" value="Adequado para menores"/> + </icons_combo_box> + <text name="price_for_listing_label" value="Preço do anúncio:"/> <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="[LABEL]" 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 d7e7d30a73..c9e5513424 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml @@ -34,9 +34,12 @@ </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="acc_status_text" value="Residente. Dados de pagamento: não constam"/> <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> diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml index 1bf7986825..34073f9ce1 100644 --- a/indra/newview/skins/default/xui/pt/panel_friends.xml +++ b/indra/newview/skins/default/xui/pt/panel_friends.xml @@ -16,5 +16,5 @@ <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 a um residente" 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 index 9dc53d54eb..502dae8d67 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/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="Perfil do grupo" name="group_info_btn"/> - <panel name="panel_call_buttons"> - <button label="Ligar para o grupo" name="call_btn"/> - <button label="Desligar" name="end_call_btn"/> - <button label="Abrir controles de voz" name="voice_ctrls_btn"/> - </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 6ff4f82ba7..85488f43af 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml @@ -11,13 +11,28 @@ Para obter mais ajuda, passe o mouse sobre as opções. <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> <name_list name="visible_members"> <name_list.columns label="Membro" name="name"/> <name_list.columns label="TÃtulo" name="title"/> + <name_list.columns label="Status" name="status"/> </name_list> + <text name="my_group_settngs_label"> + Eu + </text> <text name="active_title_label"> Meu cargo </text> @@ -25,8 +40,11 @@ Para obter mais ajuda, passe o mouse sobre as opções. <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="Adesão aberta" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/> - <check_box label="Taxa de associação" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/> + <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"/> 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 index c547e4c646..29d757346c 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Sobre o grupo" name="GroupInfo"> +<panel label="Perfil do grupo" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - As mudanças feitas nesta guia ainda não foram salvas + Algumas modificações não foram salvas </panel.string> <panel.string name="want_apply_text"> Deseja salvar essas mudanças? @@ -12,25 +12,24 @@ <panel.string name="group_join_free"> Grátis </panel.string> - <text name="group_name" value="Carregando..."/> - <line_editor label="Digite o nome do grupo aqui" name="group_name_editor"/> - <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"/> - <accordion name="groups_accordion"> - <accordion_tab name="group_general_tab" title="Público 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> - <panel name="button_row"> - <button label="Crie" label_selected="Novo grupo" name="btn_create"/> - <button label="Salvar" label_selected="Salvar" name="btn_apply"/> + <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 4ed1b950a4..c7def0ed96 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml @@ -7,12 +7,10 @@ (carregando...) </panel.string> <panel.string name="already_in_group"> - Alguns avatares já estão nesse grupo e portanto não foram convidados. + 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="Pressione Ctrl enquanto clica nos nomes dos residentes"/> 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 aa7c7de75f..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,64 +1,62 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terra & L$" name="land_money_tab"> - <string name="help_text"> + <panel.string name="help_text"> Será exibido um aviso até o Total de terrenos usados for igual ou inferior à contribuição total. - </string> - <button label="?" name="help_button"/> - <string name="cant_view_group_land_text"> + </panel.string> + <panel.string name="cant_view_group_land_text"> Você não está autorizado a acessar terrenos de grupos - </string> - <string name="cant_view_group_accounting_text"> + </panel.string> + <panel.string name="cant_view_group_accounting_text"> Você não está autorizado a acessar os dados de contabilidade do grupo. - </string> - <string name="loading_txt"> + </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="Lote" name="name"/> - <column label="Região" name="location"/> - <column label="Tipo" name="type"/> - <column label="Ãrea" name="area"/> - </scroll_list> - <button label="Mapa" label_selected="Mapa" left="282" name="map_button" width="130"/> - <text name="total_contributed_land_label"> - Total contribuÃdo: - </text> - <text name="total_contributed_land_value"> - [AREA] m² - </text> - <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> - <string name="land_contrib_error"> + </panel.string> + <panel.string name="land_contrib_error"> Não foi possÃvel definir sua contribuição - </string> - <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"> - Grupo L$ - </text> + </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"> <text_editor name="group_money_planning_text"> 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 index c9fd7cdfe3..19c34d2f10 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/pt/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="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 66252a0473..2abc8bc7c8 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml @@ -39,7 +39,7 @@ Cada grupo pode enviar no máximo 200 avisos/dia <text name="string"> Arrastar e soltar o item aqui para anexá-lo: </text> - <button label="Tirar" label_selected="Remover o anexo" name="remove_attachment"/> + <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"/> <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> 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 cf9e9f2b8d..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,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Membros e Funções" name="roles_tab"> <panel.string name="default_needs_apply_text"> - As mudanças feitas nesta guia ainda não foram salvas + Algumas modificações não foram salvas </panel.string> <panel.string name="want_apply_text"> Deseja salvar essas mudanças? @@ -52,7 +52,7 @@ Há uma grande variedade de habilidades. </tab_container> <panel name="members_footer"> <text name="static"> - Membros atribuÃdos + Cargos desempenhados </text> <text name="static2"> Habilidades permitidas 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 index f7102f2fb2..2535340f4c 100644 --- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/pt/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="Desconhecido"/> - <button label="Perfil" name="view_profile_btn"/> - <button label="Adicionar amigo" name="add_friend_btn"/> - <button label="Teletransportar" name="teleport_btn"/> - <button label="Compartilhar" name="share_btn"/> - <panel name="panel_call_buttons"> - <button label="Ligar" name="call_btn"/> - <button label="Desligar" name="end_call_btn"/> - <button label="Controles de voz" name="voice_ctrls_btn"/> - </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="pay_btn_panel"> + <button label="Pagar" name="pay_btn"/> + </layout_panel> + <layout_panel name="call_btn_panel"> + <button label="Ligar" name="call_btn"/> + </layout_panel> + <layout_panel name="end_call_btn_panel"> + <button label="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 index 97e7f51beb..6196c06d09 100644 --- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/pt/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="Atrás"/> <text name="title" value="Perfil do Lugar"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml index 693905e04c..3f357bcefe 100644 --- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Barra 'Destaques'"/> - <accordion_tab name="tab_landmarks" title="Marcos"/> + <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> diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index 3540a338ea..61cdbaef13 100644 --- a/indra/newview/skins/default/xui/pt/panel_login.xml +++ b/indra/newview/skins/default/xui/pt/panel_login.xml @@ -12,12 +12,19 @@ Primeiro nome: </text> <line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/> + <text name="last_name_text"> + Sobrenome: + </text> <line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/> - <check_box label="Lembrar" name="remember_check"/> + <text name="password_text"> + Senha: + </text> + <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="Última posição" name="MyLastLocation"/> <combo_box.item label="Minha casa" name="MyHome"/> </combo_box> <button label="conectar" name="connect_btn"/> @@ -26,6 +33,9 @@ <text name="create_new_account_text"> Cadastre-se </text> + <text name="forgot_password_text"> + Esqueceu seu nome ou senha? + </text> <text name="login_help"> Precisa de ajuda ao conectar? </text> diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index 1bc080886d..f64b9f319f 100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -32,7 +32,7 @@ <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 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="Novas roupas" name="New Clothes"> <menu_item_call label="Nova camisa" name="New Shirt"/> diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml index c3fda2e886..412f75ca78 100644 --- a/indra/newview/skins/default/xui/pt/panel_me.xml +++ b/indra/newview/skins/default/xui/pt/panel_me.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Meu perfil" name="panel_me"> <tab_container name="tabs"> - <panel label="PERFIL" name="panel_profile"/> - <panel label="DESTAQUES" name="panel_picks"/> + <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_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml index adc93cc2f0..646969946c 100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Segurança" name="Media Settings Security"> - <check_box initial_value="false" label="Acesso restrito a URLs especificados (pelo prefixo)" name="whitelist_enable"/> + <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> diff --git a/indra/newview/skins/default/xui/pt/panel_my_profile.xml b/indra/newview/skins/default/xui/pt/panel_my_profile.xml index 8fd30873a7..b1ca318add 100644 --- a/indra/newview/skins/default/xui/pt/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_my_profile.xml @@ -1,37 +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> - <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"/> - </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="me_homepage_text"> - Página web: - </text> - <text name="title_member_text" value="Membro desde:"/> - <text name="title_acc_status_text" value="Conta:"/> - <text name="acc_status_text" value="Residente. Dados de pagamento: não constam"/> - <text name="title_partner_text" value="Parceiro(a):"/> - <text name="title_groups_text" value="Grupos:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Adicionar amigo" name="add_friend"/> - <button label="MI" name="im"/> - <button label="Ligar" name="call"/> - <button label="Mapa" name="show_on_map_btn"/> - <button label="Teletransportar" name="teleport"/> - </panel> - <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: corpo, roupa, etc."/> - </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="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 index 49e1d916c7..511c4426bb 100644 --- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pt/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="Voltar para região anterior"/> - <button name="forward_btn" tool_tip="Avançar uma região"/> + <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"> + <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_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 index a5b2542e77..9aa842d9a5 100644 --- a/indra/newview/skins/default/xui/pt/panel_notes.xml +++ b/indra/newview/skins/default/xui/pt/panel_notes.xml @@ -13,7 +13,7 @@ </scroll_container> </panel> <panel name="notes_buttons_panel"> - <button label="Adicionar" name="add_friend" tool_tip="Oferecer amizade ao residente"/> + <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"/> 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 index 98a9be29c8..8d648a98fa 100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/pt/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="Vestimenta atual"/> - <accordion_tab name="tab_outfits" title="Minhas vestimentas"/> - </accordion> +<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 index 5ef6edf9ec..736b8f1fdd 100644 --- 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 @@ -4,6 +4,6 @@ <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="Tirar" name="remove_link"/> - <menu_item_call label="Excluir" name="delete"/> + <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 index 9d71c37c55..66938e8f6f 100644 --- a/indra/newview/skins/default/xui/pt/panel_people.xml +++ b/indra/newview/skins/default/xui/pt/panel_people.xml @@ -5,9 +5,10 @@ <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="no_groups" value="Nenhum grupo"/> <string name="people_filter_label" value="Filtro de pessoas"/> <string name="groups_filter_label" value="Filtro de grupos"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Tente encontrar o grupo na Busca]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Tente procurar grupos que lhe interessam]"/> <filter_editor label="Filtro" name="filter_input"/> <tab_container name="tabs"> <panel label="PROXIMIDADE" name="nearby_panel"> @@ -16,18 +17,22 @@ <button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/> </panel> </panel> - <panel label="AMIGOS" name="friends_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 o residente"/> + <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 residente para adicioná-lo. +Para conhecer mais gente, use [secondlife:///app/worldmap o Mapa]. + </text> </panel> - <panel label="GRUPOS" name="groups_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"/> @@ -44,10 +49,11 @@ <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="Chamar este residente"/> + <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_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index 210991f984..5c81c7649b 100644 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml @@ -6,7 +6,7 @@ <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="Localização do histórico de teletransportes"/> + <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)"/> @@ -41,6 +41,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="Atrás"/> <text name="title" value="Perfil da região"/> <scroll_container name="place_scroll"> <panel name="scrolling_panel"> @@ -50,12 +51,12 @@ <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="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_label" value="Empurrar:"/> <text name="push_value" value="Desligar"/> <text name="build_label" value="Construir:"/> <text name="build_value" value="Ligar"/> @@ -69,10 +70,17 @@ <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_name" value="Alcelândia"/> <text name="region_type_label" value="Tipo:"/> + <text name="region_type" value="Alce"/> <text name="region_rating_label" value="Classificação:"/> + <text name="region_rating" value="Adulto"/> <text name="region_owner_label" value="Proprietário:"/> + <text name="region_owner" value="moose Van Moose"/> <text name="region_group_label" value="Grupo:"/> + <text name="region_group"> + The Mighty Moose of mooseville soundvillemoose + </text> <button label="Região/Propriedade" name="region_info_btn"/> </panel> </accordion_tab> @@ -92,7 +100,7 @@ <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="subdivide_label" value="Capacidade de juntar/subdividir:"/> <text name="resale_label" value="Revenda:"/> <text name="sale_to_label" value="À venda para:"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml index 5c0f3cd11d..d9045e1a37 100644 --- a/indra/newview/skins/default/xui/pt/panel_places.xml +++ b/indra/newview/skins/default/xui/pt/panel_places.xml @@ -2,13 +2,14 @@ <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 lugares" name="Filter"/> + <filter_editor label="Filtrar meus lugares" name="Filter"/> <panel name="button_panel"> - <button label="Teletransportar" name="teleport_btn"/> + <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"/> - <button label="Fechar" name="close_btn"/> - <button label="Cancelar" name="cancel_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 431f3ca8e1..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,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="Avançado" name="advanced"> <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box label="Balão de bate-papo" name="bubble_text_chat"/> - <color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/> - <slider label="Opacidade" name="bubble_chat_opacity"/> - <text name="AspectRatioLabel1" tool_tip="largura / altura"> - Relação de aspecto - </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="Auto-detectar" name="aspect_auto_detect"/> - <text name="heading1"> - Câmera: - </text> <slider label="Ângulo de visão" name="camera_fov"/> <slider label="Distância" name="camera_offset_scale"/> <text name="heading2"> @@ -29,20 +10,20 @@ </text> <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"/> - <text name="heading3"> - Avatares: - </text> <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="No bate papo" name="0"/> - <radio_item label="Em uma janela" name="1"/> + <radio_item label="Bate-papo local" name="0"/> + <radio_item label="Janelas separadas" name="1"/> </radio_group> - <check_box label="Alternar para o modo microfone quando eu pressionar a tecla de falar:" 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."/> + <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"/> + <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 4cb823d432..2ffe720ccf 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml @@ -6,9 +6,9 @@ <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"> - Sempre mostrar esses alertas: + Mostrar sempre: </text> <text name="dont_show_label"> - Nunca mostrar esses alertas: + Nunca mostrar: </text> </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 d6d8be7dc7..18348d0332 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Chat" name="chat"> + <text name="font_size"> + Tamanho da fonte: + </text> <radio_group name="chat_font_size"> - <radio_item label="Pequeno" name="radio"/> - <radio_item label="Média" name="radio2"/> - <radio_item label="Grande" name="radio3"/> + <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> + <text name="font_colors"> + Cor da fonte: + </text> <color_swatch label="Você" name="user"/> <text name="text_box1"> Eu @@ -39,8 +45,8 @@ </text> <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 ou em uma única janela com uma aba para cada pessoa (requer reinÃcio)"> - <radio_item label="Janelas diferentes" name="radio"/> - <radio_item label="Uma janela" name="radio2"/> + <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 17f43943c1..7a3e69c988 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -40,9 +40,9 @@ Mostrar nomes: </text> <radio_group name="Name_Tag_Preference"> - <radio_item label="Desligar" name="radio"/> - <radio_item label="Ligar" name="radio2"/> - <radio_item label="Brevemente" name="radio3"/> + <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"/> @@ -50,14 +50,17 @@ <text name="effects_color_textbox"> Meus efeitos: </text> - <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/> <text name="title_afk_text"> Entrar no modo ausente em: </text> - <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/> - <text name="seconds_textbox"> - segundos - </text> + <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> <text name="text_box3"> Mensagem do modo ocupado: </text> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml index 252415ae2d..121272bf6c 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml @@ -88,8 +88,8 @@ rápido Detalhes de Iluminação: </text> <radio_group name="LightingDetailRadio"> - <radio_item label="Sol e Lua apenas" name="SunMoon"/> - <radio_item label="Luzes locais nas proximidades" name="LocalLights"/> + <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: 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 fc83a0e97a..0cf2b7a4af 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> autentique-se para mudar </panel.string> - <button label="Limpar histórico" name="clear_cache"/> + <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> @@ -11,17 +11,16 @@ <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"/> - <check_box label="Permitir toque automático da mÃdia" name="autoplay_enabled"/> <text name="Logs:"> Logs: </text> <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"/> - <line_editor left="278" name="log_path_string" right="-20"/> <text name="log_path_desc"> - Localização dos logs + Localização dos logs: </text> + <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 002b3fa8a7..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,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Entrada e câmera" name="Input panel"> +<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: @@ -18,29 +18,29 @@ kbps </text> <check_box label="Personalizar porta" name="connection_port_enabled"/> - <spinner label="Número da porta:" name="web_proxy_port"/> + <spinner label="Número da porta:" name="connection_port"/> <text name="cache_size_label_l"> Tamanho do cache </text> <text name="text_box5"> MB </text> - <button label="Navegar" label_selected="Navegar" name="set_cache"/> - <button label="Redefinir" label_selected="Definir" name="reset_cache"/> <text name="Cache location"> - Localização do cache + 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]."/> - <radio_item label="Usar meu navegador (IE, Firefox)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado."/> + <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="Proxy web" name="web_proxy_enabled"/> - <line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/> - <button label="Navegar" label_selected="Navegar" name="set_proxy"/> + <check_box initial_value="false" label="Ativar web proxy" name="web_proxy_enabled"/> <text name="Proxy location"> - Localização do proxy + 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 37855672c9..5dbd3d4904 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml @@ -2,13 +2,20 @@ <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="Ambiente" name="Wind Volume"/> <slider label="Botões" name="UI Volume"/> - <slider label="MÃdia" name="Media Volume"/> + <slider label="Ambiente" name="Wind Volume"/> <slider label="Efeitos sonoros" name="SFX Volume"/> <slider label="Streaming de música" name="Music Volume"/> - <check_box label="Voz" name="enable_voice_check"/> - <slider label="Voz" name="Voice Volume"/> + <check_box label="Ativado" name="music_enabled"/> + <slider label="MÃdia" name="Media Volume"/> + <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="Listen from"> Ouvir a partir de: </text> 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 index d8013c974f..a1254b4da0 100644 --- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/pt/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="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"> @@ -15,14 +56,24 @@ <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_stack> - <layout_stack> - <panel name="media_progress_indicator"> - <progress_bar name="media_progress_bar" tool_tip="Carregando mÃdia"/> - </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 a9a5116d3c..805e3aaebd 100644 --- a/indra/newview/skins/default/xui/pt/panel_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_profile.xml @@ -12,37 +12,41 @@ </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> - <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="Mundo real:"/> - </panel> - <text name="me_homepage_text"> - Homepage: - </text> - <text name="title_member_text" value="Membro desde:"/> - <text name="title_acc_status_text" value="Status da conta:"/> - <text name="acc_status_text" value="Residente. Nenhuma info de pagamento no arquivo."/> - <text name="title_partner_text" value="Parceiro:"/> - <text name="title_groups_text" value="Grupos:"/> - </panel> - </scroll_container> - <panel name="profile_buttons_panel"> - <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade para o residente"/> - <button label="MI" name="im" tool_tip="Abrir sessão de Mensagem instantânea"/> - <button label="Chamada" name="call" tool_tip="Chamar este residente"/> - <button label="Mapa" name="show_on_map_btn" tool_tip="exibir o residente no mapa"/> - <button label="Teletransporte" name="teleport" tool_tip="Oferecer teletransporte"/> - <button label="â–¼" name="overflow_btn" tool_tip="Pagar dinheiro ou compartilhar inventário com o residente"/> - </panel> - <panel name="profile_me_buttons_panel"> - <button label="Editar perfil" name="edit_profile_btn"/> - <button label="Editar aparência" 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="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_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml index 122cae940c..65ac89baf8 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml @@ -31,7 +31,7 @@ da propriedade. </text> <text bottom_delta="-36" name="covenant_instructions"> - Arrastar e soltar um notecard para alterar o Covenant para esta propriedade. + 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 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 c893472de1..e5d394865c 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: @@ -26,7 +25,7 @@ todas as regiões desta propriedade. <text name="Only Allow"> Restringir acesso a contas confirmardas por: </text> - <check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação"/> + <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"/> @@ -40,7 +39,7 @@ todas as regiões desta propriedade. </string> <button label="?" name="abuse_email_address_help"/> <button label="Aplicar" name="apply_btn"/> - <button label="Chutar usuário da propriedade..." name="kick_user_from_estate_btn"/> + <button label="Expulsar da propriedade..." name="kick_user_from_estate_btn"/> <button label="Enviar mensagem à Propriedade" name="message_estate_btn"/> <text name="estate_manager_label"> Gerentes da propriedade: diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml index 1a06d91aa8..d1a5eaa11e 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml @@ -19,35 +19,25 @@ desconhecido </text> <check_box label="Bloquear Terraform" name="block_terraform_check"/> - <button label="?" name="terraform_help"/> <check_box label="Bloquear Vôo" name="block_fly_check"/> - <button label="?" name="fly_help"/> <check_box label="Permitir Dano" name="allow_damage_check"/> - <button label="?" name="damage_help"/> <check_box label="Restringir Empurrar" name="restrict_pushobject"/> - <button label="?" name="restrict_pushobject_help"/> <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/> - <button label="?" name="land_resell_help"/> <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/> - <button label="?" name="parcel_changes_help"/> <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/> - <button label="?" name="parcel_search_help"/> <spinner label="Limit do Agente" name="agent_limit_spin"/> - <button label="?" name="agent_limit_help"/> <spinner label="Objeto Bonus" name="object_bonus_spin"/> - <button label="?" name="object_bonus_help"/> <text label="Maturidade" name="access_text"> Classificação: </text> - <combo_box label="Mature" name="access_combo"> - <combo_box.item label="Adult" name="Adult"/> - <combo_box.item label="Mature" name="Mature"/> - <combo_box.item label="PG" name="PG"/> - </combo_box> - <button label="?" name="access_help"/> + <icons_combo_box label="Mature" name="access_combo"> + <icons_combo_box.item label="Adult" name="Adult" value="42"/> + <icons_combo_box.item label="Mature" name="Mature" value="21"/> + <icons_combo_box.item label="PG" name="PG" value="13"/> + </icons_combo_box> <button label="Aplicar" name="apply_btn"/> - <button label="Teletransportar um usuário para Casa..." name="kick_btn"/> - <button label="Teletransportar Todos os Usuários..." name="kick_all_btn"/> + <button label="Teletransportar um residente para inÃcio..." name="kick_btn"/> + <button label="Teletransportar todos para inÃcio..." name="kick_all_btn"/> <button label="Enviar Mensagem para a 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_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml new file mode 100644 index 0000000000..d2d5fb649c --- /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 um residente 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 7f37919af2..35928ccc67 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml @@ -25,16 +25,16 @@ Escalas de Elevação de Terreno </text> <text name="height_text_lbl6"> - Sudeste + Noroeste </text> <text name="height_text_lbl7"> - Noroeste + Nordeste </text> <text name="height_text_lbl8"> Sudoeste </text> <text name="height_text_lbl9"> - Noroeste + Sudeste </text> <spinner label="Baixo" name="height_start_spin_0"/> <spinner label="Baixo" name="height_start_spin_1"/> 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 index 7892fc9e0c..09ac074b5a 100644 --- a/indra/newview/skins/default/xui/pt/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/pt/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="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="Info de grupo" name="panel_group_info_sidetray"/> + <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="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile"> - <panel label="Eu" name="panel_me"/> + <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> - <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> </side_tray> 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 9485915263..ae2879f4a9 100644 --- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml @@ -21,9 +21,11 @@ <panel.string name="buycurrencylabel"> L$ [AMT] </panel.string> - <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo: Comprar mais L$"/> + <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/> + <button label="Comprar" name="buyL" tool_tip="Comprar mais L$"/> <text name="TimeText" tool_tip="Hora atual (PacÃfico)"> - 12:00 AM + 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 index 9dc5aed91e..ba83fee7ba 100644 --- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml @@ -4,6 +4,7 @@ <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"/> @@ -11,4 +12,7 @@ <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/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml index 73ec6fb068..b8bbb4051a 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Looks" name="appearance panel"> <string name="No Outfit" value="Nenhum"/> - <filter_editor label="Filtrar looks" name="Filter"/> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> - <button name="newlook_btn" tool_tip="Novo look"/> - <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/> - <button label="Vestir" name="wear_btn"/> + <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_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml index 556c631bf7..4fc50bac67 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="item properties" title="Propriedaded do item de inventário"> +<panel name="item properties" title="Perfil do objeto"> <panel.string name="unknown"> (desconhecido) </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="Propriedade do item"/> + <text name="title" value="Perfil do objeto"/> + <text name="where" value="(Inventário)"/> <panel label=""> <text name="LabelItemNameTitle"> Nome: @@ -37,34 +38,36 @@ <text name="LabelAcquiredDate"> Quarta 24 de Maio 12:50:46 2006 </text> - <text name="OwnerLabel"> - Você: - </text> - <check_box label="Editar" name="CheckOwnerModify"/> - <check_box label="Copiar" name="CheckOwnerCopy"/> - <check_box label="Revender" name="CheckOwnerTransfer"/> - <text name="AnyoneLabel"> - Qualquer um: - </text> - <check_box label="Copiar" name="CheckEveryoneCopy"/> - <text name="GroupLabel"> - Grupo: - </text> - <check_box label="Compartilhar" name="CheckShareWithGroup"/> - <text name="NextOwnerLabel"> - Próximo proprietário: - </text> - <check_box label="Editar" name="CheckNextOwnerModify"/> - <check_box label="Copiar" name="CheckNextOwnerCopy"/> - <check_box label="Revender" name="CheckNextOwnerTransfer"/> + <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:" name="Edit Cost"/> - <text name="CurrencySymbol"> - L$ - </text> + <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 index 7c626d7805..9193730018 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="object properties" title="Propriedades do objeto"> +<panel name="object properties" title="Perfil do objeto"> <panel.string name="text deed continued"> Doar </panel.string> @@ -36,26 +36,33 @@ <panel.string name="Sale Mixed"> Venda mista </panel.string> - <panel name="properties_panel" label=""> + <text name="title" value="Perfil do objeto"/> + <text name="where" value="(inworld)"/> + <panel label="" name="properties_panel"> <text name="Name:"> Nome: </text> <text name="Description:"> Descrição: </text> - <text name="Creator:"> + <text name="CreatorNameLabel"> Criador: </text> + <text name="Creator Name"> + Erica Linden + </text> <text name="Owner:"> Proprietário: </text> - <text name="Group:"> + <text name="Owner Name"> + Erica Linden + </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."/> - <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."/> + <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> @@ -66,14 +73,6 @@ <combo_box.item label="Pagar por objeto" name="Payobject"/> <combo_box.item label="Abrir" name="Open"/> </combo_box> - <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"/> <panel name="perms_inv"> <text name="perm_modify"> Você pode modificar este objeto @@ -81,39 +80,50 @@ <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:"> + <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"/> - <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> + <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"/> - <button label="Cancelar" name="cancel_btn"/> - <button label="Salvar" name="save_btn"/> + <button label="Detalhes" name="details_btn"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 0e2a8a88f1..5b8f76c2e9 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/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"> Portal de Apoio do Second Life </string> @@ -161,6 +164,7 @@ Clique para ativar no secondlife:// commando </string> <string name="CurrentURL" value="URL atual: [CurrentURL]"/> + <string name="TooltipPrice" value="L$[PRICE]-"/> <string name="SLurlLabelTeleport"> Teletransportar para </string> @@ -185,9 +189,6 @@ <string name="BUTTON_DOCK"> conectar-se à barra </string> - <string name="BUTTON_UNDOCK"> - desconectar-se da barra - </string> <string name="BUTTON_HELP"> Mostrar ajuda </string> @@ -212,9 +213,6 @@ <string name="AvatarNameWaiting"> (aguardando) </string> - <string name="AvatarNameHippos"> - (hippos) - </string> <string name="GroupNameNone"> (nenhum) </string> @@ -575,6 +573,9 @@ <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> @@ -737,6 +738,9 @@ <string name="invalid"> inválido </string> + <string name="NewWearable"> + Novo [WEARABLE_ITEM] + </string> <string name="next"> Próximo </string> @@ -767,9 +771,6 @@ <string name="TeleportOffer"> Oferta de teletransporte </string> - <string name="StartUpNotification"> - [%d] nova notificação chegou enquanto você estava fora... - </string> <string name="StartUpNotifications"> [%d] Novas notificações chegaram enquanto você estava fora... </string> @@ -807,7 +808,10 @@ Pressione ESC para retornar para visão do mundo </string> <string name="InventoryNoMatchingItems"> - Nenhum item correspondente encontrado no inventário. + 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 @@ -1268,11 +1272,164 @@ todas as propriedades que você gerencia para [OWNER] </string> <string name="RegionInfoAllowedResidents"> - Residentes permitidos : ([ALLOWEDAGENTS], max [MAXACCESS]) + 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> @@ -1282,6 +1439,9 @@ <string name="PanelContentsNewScript"> Novo Script </string> + <string name="BusyModeResponseDefault"> + O residente para o qual escreveu está no modo 'ocupado', ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde. + </string> <string name="MuteByName"> (por nome) </string> @@ -1317,6 +1477,15 @@ <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> @@ -1393,6 +1562,9 @@ 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> @@ -1664,39 +1836,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Attached Earlobes"> Lóbulos da orelha anexados </string> - <string name="Back Bangs"> - Franja traseira - </string> - <string name="Back Bangs Down"> - franja traseira longa - </string> - <string name="Back Bangs Up"> - franja traseira arrepiada - </string> <string name="Back Fringe"> corte traseiro </string> - <string name="Back Hair"> - cabelo traseiro - </string> - <string name="Back Hair Down"> - cabelo de trás longo - </string> - <string name="Back Hair Up"> - cabelo de trás arrepiado - </string> <string name="Baggy"> folgado </string> <string name="Bangs"> Franja </string> - <string name="Bangs Down"> - franja longa - </string> - <string name="Bangs Up"> - franja arrepiada - </string> <string name="Beady Eyes"> Olhos malévolos </string> @@ -1709,9 +1857,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Big Butt"> Traseiro Grande </string> - <string name="Big Eyeball"> - Globo ocular grande - </string> <string name="Big Hair Back"> Cabelo volumoso: Trás </string> @@ -1886,9 +2031,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Corner Down"> Canto para baixo </string> - <string name="Corner Normal"> - Canto normal - </string> <string name="Corner Up"> Canto para cima </string> @@ -1898,9 +2040,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Crooked Nose"> Nariz torto </string> - <string name="Cropped Hair"> - Cabelo curto rente - </string> <string name="Cuff Flare"> bainha larga </string> @@ -1919,15 +2058,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Default Heels"> Salto Padrão </string> - <string name="Default Toe"> - Dedo do pé padrão - </string> <string name="Dense"> Densidade </string> - <string name="Dense hair"> - Cabelo Denso - </string> <string name="Double Chin"> Queixo duplo </string> @@ -1973,9 +2106,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eye Spacing"> Espaçamento dos olhos </string> - <string name="Eyeball Size"> - Tamanho do globo ocular - </string> <string name="Eyebrow Arc"> Arco da sobrancelha </string> @@ -2000,36 +2130,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eyeliner Color"> Cor do delineador </string> - <string name="Eyes Back"> - Eyes Back - </string> <string name="Eyes Bugged"> Olhos esbugalhados </string> - <string name="Eyes Forward"> - Eyes Forward - </string> - <string name="Eyes Long Head"> - Eyes Long Head - </string> - <string name="Eyes Shear Left Up"> - Ponta esquerda dos olhos para cima - </string> - <string name="Eyes Shear Right Up"> - Ponta direita dos olhos para cima - </string> - <string name="Eyes Short Head"> - Eyes Short Head - </string> - <string name="Eyes Spread"> - Extensão dos Olhos - </string> - <string name="Eyes Sunken"> - Olhos afundados - </string> - <string name="Eyes Together"> - Olhos juntos - </string> <string name="Face Shear"> Face raspada </string> @@ -2039,30 +2142,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Far Set Eyes"> Distância entre os olhos </string> - <string name="Fat"> - Gordo - </string> - <string name="Fat Head"> - Cabeça gorda - </string> <string name="Fat Lips"> Lábios carnudos </string> - <string name="Fat Lower"> - Inferior carnudo - </string> - <string name="Fat Lower Lip"> - Lábio superior carnudo - </string> - <string name="Fat Torso"> - Tronco corpulento - </string> - <string name="Fat Upper"> - Superior carnudo - </string> - <string name="Fat Upper Lip"> - lábio superior carnudo - </string> <string name="Female"> Feminino </string> @@ -2099,24 +2181,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Freckles"> Sardas </string> - <string name="Front Bangs Down"> - Franja da frente longa - </string> - <string name="Front Bangs Up"> - Franja da frene arrepiada - </string> <string name="Front Fringe"> Franja </string> - <string name="Front Hair"> - Cabelo da frente - </string> - <string name="Front Hair Down"> - Cabelo da frente baixo - </string> - <string name="Front Hair Up"> - cabelo da frente arrepiado - </string> <string name="Full Back"> Trás cheia </string> @@ -2390,9 +2457,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Long arms"> Braços longos </string> - <string name="Longcuffs"> - Punho longo - </string> <string name="Loose Pants"> Pantalonas </string> @@ -2555,9 +2619,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="No Eyeshadow"> Sem Sombra dos olhos </string> - <string name="No Heels"> - Sem salto - </string> <string name="No Lipgloss"> Sem brilho labial </string> @@ -2615,9 +2676,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Nostril Width"> Largura das narinas </string> - <string name="Old"> - Velho - </string> <string name="Opaque"> Opaco </string> @@ -2717,9 +2775,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Pointy Heels"> Salto agulha </string> - <string name="Pointy Toe"> - Dedo dos pés pontudo - </string> <string name="Ponytail"> Rabo de cavalo </string> @@ -2744,15 +2799,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Red Hair"> Cabelo ruivo </string> - <string name="Red Skin"> - Pele vermelha - </string> <string name="Regular"> Normal </string> - <string name="Regular Muscles"> - Músculos normais - </string> <string name="Right Part"> Parte direita </string> @@ -2762,9 +2811,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Round"> Arredondado </string> - <string name="Round Forehead"> - Testa arredonda - </string> <string name="Ruddiness"> Rubor </string> @@ -2777,24 +2823,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Saddle Bags"> Saddle Bags </string> - <string name="Saddlebags"> - Saddlebags - </string> - <string name="Scrawny"> - Magricela - </string> <string name="Scrawny Leg"> Pernas magricelas </string> <string name="Separate"> Separar </string> - <string name="Shading"> - Sombreamento - </string> - <string name="Shadow hair"> - Sombra do cabelo - </string> <string name="Shallow"> raso </string> @@ -2807,15 +2841,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Shear Front"> Frente rente </string> - <string name="Shear Left"> - Rente esquerda - </string> <string name="Shear Left Up"> Esquerda rente para cima </string> - <string name="Shear Right"> - Direita rente - </string> <string name="Shear Right Up"> Trás rente para cima </string> @@ -2876,15 +2904,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Shoulders"> Ombros </string> - <string name="Side Bangs"> - Franja lateral - </string> - <string name="Side Bangs Down"> - Franja lateral longa - </string> - <string name="Side Bangs Up"> - Franja lateral arrepiada - </string> <string name="Side Fringe"> pontas laterais </string> @@ -2900,9 +2919,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Sides Hair Up"> Cabelo lateral superior </string> - <string name="Skinny"> - Magro - </string> <string name="Skinny Neck"> Pescoço fino </string> @@ -2951,9 +2967,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Socks Length"> Comprimento das meias </string> - <string name="Some"> - Alguns - </string> <string name="Soulpatch"> Cavanhaque </string> @@ -2972,9 +2985,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Squash Head"> Cabeça de Pera </string> - <string name="Squash/Stretch Head"> - Cabeça esticada/forma de pera - </string> <string name="Stretch Head"> Cabeça esticada </string> @@ -2993,18 +3003,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Sweep Forward"> Pentear para frente </string> - <string name="Swept Back"> - Pentear para trás - </string> - <string name="Swept Back Hair"> - Cabelo penteado para trás - </string> - <string name="Swept Forward"> - Penteado para frente - </string> - <string name="Swept Forward Hair"> - Cabelo penteado para frente - </string> <string name="Tall"> Alto </string> @@ -3023,9 +3021,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Thick Toe"> Dedo grosso </string> - <string name="Thickness"> - Espessura - </string> <string name="Thin"> Fino </string> @@ -3056,12 +3051,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Tight Sleeves"> Tight Sleeves </string> - <string name="Tilt Left"> - Inclinado à esquerda - </string> - <string name="Tilt Right"> - Inclinado à direita - </string> <string name="Toe Shape"> Formato dos dedos </string> @@ -3203,6 +3192,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <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="only_user_message"> Você é o único usuário desta sessão. </string> @@ -3212,6 +3216,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <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> @@ -3230,19 +3240,37 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <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="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 1a0461082b..92ffee0233 100644 --- a/indra/newview/skins/default/xui/pt/teleport_strings.xml +++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml @@ -59,6 +59,9 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE]. <message name="completing"> Completando teletransporte. </message> + <message name="completed_from"> + Teletransporte de [T_SLURL] concluÃdo + </message> <message name="resolving"> Identificando destino. </message> 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/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt index b8b83df386..2ff64f217f 100644 --- a/indra/test_apps/llplugintest/bookmarks.txt +++ b/indra/test_apps/llplugintest/bookmarks.txt @@ -18,20 +18,20 @@ (Flash) Scribd,http://www.scribd.com/doc/14427744/Second-Life-Quickstart-Guide (Flash) MAME,http://yvern.com/fMAME/fMAME.html (QT) Local sample,file:///C|/Program Files/QuickTime/Sample.mov -(QT) Movie - Watchmen Trailer,http://movies.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov -(QT) Movie - Transformers - Revenge of the Fallen,http://movies.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr1_h.320.mov -(QT) Movie - Terminator Salvation,http://movies.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h.320.mov -(QT) Movie - Angels and Demons,http://movies.apple.com/movies/sony_pictures/angelsanddemons/angelsanddemons-video_h.320.mov -(QT) Movie - Sin City Trailer,http://movies.apple.com/movies/miramax/sin_city/sin_city_480.mov -(QT) Movie - The Incredibles Trailer,http://movies.apple.com/movies/disney/the_incredibles/the_incredibles-tlr_a480.mov +(QT) Movie - Watchmen Trailer,http://trailers.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov +(QT) Movie - Transformers - Revenge of the Fallen,http://trailers.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr1_h.320.mov +(QT) Movie - Terminator Salvation,http://trailers.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h.320.mov +(QT) Movie - Angels and Demons,http://trailers.apple.com/movies/sony_pictures/angelsanddemons/angelsanddemons-video_h.320.mov +(QT) Movie - Sin City Trailer,http://trailers.apple.com/movies/miramax/sin_city/sin_city_480.mov +(QT) Movie - The Incredibles Trailer,http://trailers.apple.com/movies/disney/the_incredibles/the_incredibles-tlr_a480.mov (QT) Movie - Streaming Apple Event,http://stream.qtv.apple.com/events/mar/0903lajkszg/m_090374535329zdwg_650_ref.mov (QT) Movie - MPEG-4 from Amazon S3,http://s3.amazonaws.com/callum-linden/flashdemo/interactive_flash_demo.mp4 -(QT) Movie - Star Trek,http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h.320.mov -(QT) Movie - Ice Age 3,http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrd_h.320.mov -(QT) Movie - AstroBoy,http://movies.apple.com/movies/summit/astroboy/astroboy-tsr_h.320.mov -(QT) Movie - Ante Up,http://movies.apple.com/movies/independent/anteup/anteup_h.320.mov -(QT) Movie - Every Little Step,http://movies.apple.com/movies/sony/everylittlestep/everylittlestep-clip_h.320.mov -(QT) Movie - The Informers,http://movies.apple.com/movies/independent/theinformers/theinformers_h.320.mov +(QT) Movie - Star Trek,http://trailers.apple.com/movies/paramount/star_trek/startrek-tlr3_h.320.mov +(QT) Movie - Ice Age 3,http://trailers.apple.com/movies/fox/ice_age_iii/iceage3-tlrd_h.320.mov +(QT) Movie - AstroBoy,http://trailers.apple.com/movies/summit/astroboy/astroboy-tsr_h.320.mov +(QT) Movie - Ante Up,http://trailers.apple.com/movies/independent/anteup/anteup_h.320.mov +(QT) Movie - Every Little Step,http://trailers.apple.com/movies/sony/everylittlestep/everylittlestep-clip_h.320.mov +(QT) Movie - The Informers,http://trailers.apple.com/movies/independent/theinformers/theinformers_h.320.mov (QT) Animated GIF,http://upload.wikimedia.org/wikipedia/commons/4/44/Optical.greysquares.arp-animated.gif (QT) Apple Text Descriptors,http://ubrowser.com/tmp/apple_text.txt (EX) Example Plugin,example://blah diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 0ff53f3e00..5677308fb0 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 @@ -1542,8 +1593,8 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) } std::string user_data_path = std::string( cwd ) + "/"; #endif - - media_source->init( launcher_name, plugin_name, false, user_data_path ); + media_source->setUserDataPath(user_data_path); + media_source->init( launcher_name, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters @@ -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 @@ -1780,7 +1831,8 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) std::string user_data_path = std::string( cwd ) + "/"; #endif - media_source->init( launcher_name, plugin_name, false, user_data_path ); + media_source->setUserDataPath(user_data_path); + media_source->init( launcher_name, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters @@ -1799,12 +1851,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 +1872,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 +1881,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 +1895,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 +1907,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 +1919,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel ) }; }; - // select the first panel + // select the first panel selectPanel( mMediaPanels[ 0 ] ); } @@ -1887,18 +1939,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 +1960,7 @@ void LLMediaPluginTest::updateStatusBar() }; std::ostringstream stream( "" ); - + stream.str( "" ); stream.clear(); @@ -1927,7 +1981,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 +2067,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 +2127,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 +2257,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 17091d65a6..7337241cf8 100644 --- a/install.xml +++ b/install.xml @@ -298,25 +298,6 @@ </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> @@ -967,23 +948,23 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>95f44f0023dddc80be4398fc4f213861</string> + <string>8321cbd098e6e791a02cb00ed3bcff6c</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100208.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100312.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>4c75b2f1e8524c7844ee3ea1cd59a3db</string> + <string>ba22560ea01b03c40f3a37013b335f56</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri> + <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-linux-20100311.tar.bz2</uri> </map> <key>windows</key> <map> <key>md5sum</key> - <string>1e9798dc424a6f6c2bea50649bbcc7ae</string> + <string>ee5d242ea468ba9a82d2bf8581aa308d</string> <key>url</key> - <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100210.tar.bz2</uri> + <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100312.tar.bz2</uri> </map> </map> </map> @@ -1285,6 +1266,25 @@ anguage Infrstructure (CLI) international standard</string> </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>quicktime</key> <map> <key>copyright</key> |
