diff options
Diffstat (limited to 'indra')
169 files changed, 1395 insertions, 937 deletions
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/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..d48f4ad0f5 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -65,7 +65,7 @@ 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, const std::string &user_data_path, const std::string &language_code) { LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; @@ -73,7 +73,7 @@ bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::s mPlugin = new LLPluginProcessParent(this); mPlugin->setSleepTime(mSleepTime); - mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path); + mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path,language_code); return true; } diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 58e91fa0b4..ce49241e84 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -49,7 +49,11 @@ 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, + const std::string &user_data_path, + const std::string &language_code); // undoes everything init() didm called by the media manager when destroying a source virtual void reset(); diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 52b5a319ec..9b43ec0e3e 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -156,6 +156,7 @@ void LLPluginProcessChild::idle(void) setState(STATE_PLUGIN_INITIALIZING); LLPluginMessage message("base", "init"); message.setValue("user_data_path", mUserDataPath); + message.setValue("language_code", mLanguageCode); sendMessageToPlugin(message); } break; @@ -329,6 +330,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) { mPluginFile = parsed.getValue("file"); mUserDataPath = parsed.getValue("user_data_path"); + mLanguageCode = parsed.getValue("language_code"); } else if(message_name == "shm_add") { diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h index 58f8935ed1..af76ec1fa5 100644 --- a/indra/llplugin/llpluginprocesschild.h +++ b/indra/llplugin/llpluginprocesschild.h @@ -99,6 +99,7 @@ private: std::string mPluginFile; std::string mUserDataPath; + std::string mLanguageCode; LLPluginInstance *mInstance; diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index efd5df687e..0ce2c759ba 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -98,13 +98,14 @@ 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, const std::string &user_data_path, const std::string &language_code) { mProcess.setExecutable(launcher_filename); mPluginFile = plugin_filename; mCPUUsage = 0.0f; mDebug = debug; mUserDataPath = user_data_path; + mLanguageCode = language_code; setState(STATE_INITIALIZED); } @@ -363,6 +364,7 @@ void LLPluginProcessParent::idle(void) LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin"); message.setValue("file", mPluginFile); message.setValue("user_data_path", mUserDataPath); + message.setValue("language_code", mLanguageCode); sendMessage(message); } diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 524cd9923f..23702814c8 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -59,7 +59,12 @@ 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, + const std::string &user_data_path, + const std::string &language_code); + void idle(void); // returns true if the plugin is on its way to steady state @@ -144,6 +149,7 @@ private: std::string mPluginFile; std::string mUserDataPath; + std::string mLanguageCode; LLPluginProcessParentOwner *mOwner; 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/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/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index e66ac3049f..afde904be6 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -45,7 +45,7 @@ // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified #if LL_LINUX -# define LL_QTWEBKIT_USES_PIXMAPS 1 +# define LL_QTWEBKIT_USES_PIXMAPS 0 #else # define LL_QTWEBKIT_USES_PIXMAPS 0 #endif // LL_LINUX diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 7b55282ee5..ea10917901 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1759,6 +1759,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it if (mAvatarObject) { + mAvatarObject->setCompositeUpdatesEnabled(TRUE); mAvatarObject->updateVisualParams(); mAvatarObject->invalidateAll(); } diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 4106dd914d..3ca8f0add3 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) @@ -1129,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 @@ -1142,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"); @@ -1172,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(), @@ -1199,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; } } } @@ -1733,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/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 62e539b9c9..282760f988 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -85,6 +85,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; @@ -101,9 +102,21 @@ public: virtual void changed() { LLFloaterLand::refreshAll(); } }; -// fills target textbox with maturity info(icon and text) +// 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 -void FillMaturityTextBox(LLTextBox* target_textbox, LLFloater* names_floater); +// 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 @@ -557,7 +570,7 @@ void LLPanelLandGeneral::refresh() if (regionp) { - FillMaturityTextBox(mContentRating, gFloaterView->getParentFloater(this)); + insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY); mLandType->setText(regionp->getSimProductName()); } @@ -806,16 +819,19 @@ void LLPanelLandGeneral::refreshNames() } mTextGroup->setText(group); - const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID(); - if(auth_buyer_id.notNull()) + if (parcel->getForSale()) { - std::string name; - name = LLSLURL("agent", auth_buyer_id, "inspect").getSLURLString(); - mSaleInfoForSale2->setTextArg("[BUYER]", name); - } - else - { - mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone")); + const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID(); + if(auth_buyer_id.notNull()) + { + std::string name; + name = LLSLURL("agent", auth_buyer_id, "inspect").getSLURLString(); + mSaleInfoForSale2->setTextArg("[BUYER]", name); + } + else + { + mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone")); + } } } @@ -2061,8 +2077,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(); @@ -2463,19 +2485,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()) { @@ -2861,7 +2890,7 @@ void LLPanelLandCovenant::refresh() LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text"); if (region_maturity) { - FillMaturityTextBox(region_maturity, gFloaterView->getParentFloater(this)); + insert_maturity_into_textbox(region_maturity, gFloaterView->getParentFloater(this), MATURITY); } LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); @@ -2943,9 +2972,10 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name) } } -// fills target textbox with maturity info(icon and text) +// inserts maturity info(icon and text) into target textbox // names_floater - pointer to floater which contains strings with maturity icons filenames -void FillMaturityTextBox(LLTextBox* target_textbox, LLFloater* names_floater) +// 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) @@ -2973,7 +3003,19 @@ void FillMaturityTextBox(LLTextBox* target_textbox, LLFloater* names_floater) 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->setText(std::string("icon"),style); + 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/llfolderview.cpp b/indra/newview/llfolderview.cpp index cc807c2370..0de41ee591 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -417,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(); @@ -481,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 ); @@ -837,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(); } @@ -1826,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(); diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 76607e4874..d3e3d2b57b 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -121,7 +121,6 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p) mHasVisibleChildren(FALSE), mIndentation(0), mItemHeight(p.item_height), - mNumDescendantsSelected(0), mPassedFilter(FALSE), mLastFilterGeneration(-1), mStringMatchOffset(std::string::npos), @@ -497,22 +496,6 @@ BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selecte return FALSE; } -void LLFolderViewItem::recursiveDeselect(BOOL deselect_self) -{ - if (mIsSelected && deselect_self) - { - mIsSelected = FALSE; - - // update ancestors' count of selected descendents - LLFolderViewFolder* parent_folder = getParentFolder(); - while(parent_folder) - { - parent_folder->mNumDescendantsSelected--; - parent_folder = parent_folder->getParentFolder(); - } - } -} - BOOL LLFolderViewItem::isMovable() { @@ -1459,7 +1442,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } for (items_t::iterator iter = mItems.begin(); @@ -1470,7 +1452,6 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem { rv = TRUE; child_selected = TRUE; - mNumDescendantsSelected++; } } if(openitem && child_selected) @@ -1503,14 +1484,6 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, folders_t::iterator fit = iter++; if((*fit)->changeSelection(selection, selected)) { - if (selected) - { - mNumDescendantsSelected++; - } - else - { - mNumDescendantsSelected--; - } rv = TRUE; } } @@ -1520,14 +1493,6 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, items_t::iterator iit = iter++; if((*iit)->changeSelection(selection, selected)) { - if (selected) - { - mNumDescendantsSelected++; - } - else - { - mNumDescendantsSelected--; - } rv = TRUE; } } @@ -1544,7 +1509,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie { folders_t::iterator fit = iter++; num_selected += (*fit)->extendSelection(selection, last_selected, selected_items); - mNumDescendantsSelected += num_selected; } // handle selection of our immediate children... @@ -1637,7 +1601,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (item->changeSelection(item, TRUE)) { selected_items.put(item); - mNumDescendantsSelected++; num_selected++; } } @@ -1648,7 +1611,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie if (selection->changeSelection(selection, TRUE)) { selected_items.put(selection); - mNumDescendantsSelected++; num_selected++; } } @@ -1656,47 +1618,6 @@ S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVie return num_selected; } -void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self) -{ - // make sure we don't have negative values - llassert(mNumDescendantsSelected >= 0); - - if (mIsSelected && deselect_self) - { - mIsSelected = FALSE; - - // update ancestors' count of selected descendents - LLFolderViewFolder* parent_folder = getParentFolder(); - while(parent_folder) - { - parent_folder->mNumDescendantsSelected--; - parent_folder = parent_folder->getParentFolder(); - } - } - - if (0 == mNumDescendantsSelected) - { - return; - } - - for (items_t::iterator iter = mItems.begin(); - iter != mItems.end();) - { - items_t::iterator iit = iter++; - LLFolderViewItem* item = (*iit); - item->recursiveDeselect(TRUE); - } - - for (folders_t::iterator iter = mFolders.begin(); - iter != mFolders.end();) - { - folders_t::iterator fit = iter++; - LLFolderViewFolder* folder = (*fit); - folder->recursiveDeselect(TRUE); - } - -} - void LLFolderViewFolder::destroyView() { for (items_t::iterator iter = mItems.begin(); @@ -1730,8 +1651,6 @@ BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item) { if(item->remove()) { - //RN: this seem unneccessary as remove() moves to trash - //removeView(item); return TRUE; } return FALSE; @@ -1746,7 +1665,6 @@ void LLFolderViewFolder::removeView(LLFolderViewItem* item) return; } // deselect without traversing hierarchy - item->recursiveDeselect(TRUE); getRoot()->removeFromSelectionList(item); extractItem(item); delete item; diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index be8e73a5a9..655ad89e99 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -150,7 +150,6 @@ protected: BOOL mHasVisibleChildren; S32 mIndentation; S32 mItemHeight; - S32 mNumDescendantsSelected; BOOL mPassedFilter; S32 mLastFilterGeneration; std::string::size_type mStringMatchOffset; @@ -231,9 +230,6 @@ public: // this method is used to group select items virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items){ return FALSE; } - // this method is used to group select items - virtual void recursiveDeselect(BOOL deselect_self); - // gets multiple-element selection virtual BOOL getSelectionList(std::set<LLUUID> &selection) const {return TRUE;} @@ -246,10 +242,10 @@ public: // destroys this item recursively virtual void destroyView(); - S32 getNumSelectedDescendants() { return mNumDescendantsSelected; } - BOOL isSelected() { return mIsSelected; } + void setUnselected() { mIsSelected = FALSE; } + void setIsCurSelection(BOOL select) { mIsCurSelection = select; } BOOL getIsCurSelection() { return mIsCurSelection; } @@ -441,8 +437,6 @@ public: // this method is used to group select items virtual S32 extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items); - virtual void recursiveDeselect(BOOL deselect_self); - // Returns true is this object and all of its children can be removed. virtual BOOL isRemovable(); diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index ba43e16f32..03a47b5983 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/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 27a40c6ba0..ceeffea1c9 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)) @@ -4276,7 +4276,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 +4702,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/llloginhandler.cpp b/indra/newview/llloginhandler.cpp index 3340fe1511..4e0a7594ba 100644 --- a/indra/newview/llloginhandler.cpp +++ b/indra/newview/llloginhandler.cpp @@ -36,6 +36,7 @@ // viewer includes #include "llsecapi.h" +#include "lllogininstance.h" // to check if logged in yet #include "llpanellogin.h" // save_password_to_disk() #include "llstartup.h" // getStartupState() #include "llslurl.h" @@ -94,6 +95,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/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 115c7a1aa5..021e1f5159 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1410,6 +1410,11 @@ 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) { mSnapshotCtrl->setValue(id); @@ -1651,6 +1656,7 @@ static const S32 CB_ITEM_PG = 1; LLPanelClassifiedEdit::LLPanelClassifiedEdit() : LLPanelClassifiedInfo() , mIsNew(false) + , mIsNewWithErrors(false) , mCanClose(false) , mPublishFloater(NULL) { @@ -1709,21 +1715,12 @@ BOOL LLPanelClassifiedEdit::postBuild() return TRUE; } -void LLPanelClassifiedEdit::onOpen(const LLSD& key) +void LLPanelClassifiedEdit::fillIn(const LLSD& key) { - LLUUID classified_id = key["classified_id"]; + setAvatarId(gAgent.getID()); - mIsNew = classified_id.isNull(); - - scrollToTop(); - - if(mIsNew) + if(key.isUndefined()) { - setAvatarId(gAgent.getID()); - - resetData(); - resetControls(); - setPosGlobal(gAgent.getPositionGlobal()); LLUUID snapshot_id = LLUUID::null; @@ -1746,25 +1743,55 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key) childSetValue("classified_name", makeClassifiedName()); childSetValue("classified_desc", desc); setSnapshotId(snapshot_id); - setClassifiedLocation(createLocationText(getLocationNotice(), region_name, getPosGlobal())); - // server will set valid parcel id setParcelId(LLUUID::null); + } + else + { + setClassifiedId(key["classified_id"]); + setClassifiedName(key["name"]); + setDescription(key["desc"]); + setSnapshotId(key["snapshot_id"]); + setCategory((U32)key["category"].asInteger()); + setContentType((U32)key["content_type"].asInteger()); + setClassifiedLocation(key["location_text"]); + childSetValue("auto_renew", key["auto_renew"]); + childSetValue("price_for_listing", key["price_for_listing"].asInteger()); + } +} + +void LLPanelClassifiedEdit::onOpen(const LLSD& key) +{ + mIsNew = key.isUndefined(); + + scrollToTop(); + + // classified is not created yet + bool is_new = isNew() || isNewWithErrors(); + + if(is_new) + { + resetData(); + resetControls(); + + fillIn(key); - enableVerbs(true); - enableEditing(true); + if(isNew()) + { + LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this); + } } else { LLPanelClassifiedInfo::onOpen(key); - enableVerbs(false); - enableEditing(false); } - std::string save_btn_label = isNew() ? getString("publish_label") : getString("save_label"); + 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); } @@ -1776,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); @@ -1785,19 +1820,22 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global)); // *HACK see LLPanelClassifiedEdit::sendUpdate() - getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category - 1); - getChild<LLComboBox>("category")->resetDirty(); + setCategory(c_info->category - 1); bool mature = is_cf_mature(c_info->flags); bool auto_renew = is_cf_auto_renew(c_info->flags); - getChild<LLIconsComboBox>("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")); } } } @@ -1828,7 +1866,12 @@ 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(); @@ -1877,15 +1920,31 @@ void LLPanelClassifiedEdit::stretchSnapshot() getChild<LLUICtrl>("edit_icon")->setShape(mSnapshotCtrl->getRect()); } +U32 LLPanelClassifiedEdit::getContentType() +{ + LLComboBox* ct_cb = getChild<LLComboBox>("content_type"); + return ct_cb->getCurrentIndex(); +} + +void LLPanelClassifiedEdit::setContentType(U32 content_type) +{ + LLIconsComboBox* ct_cb = getChild<LLIconsComboBox>("content_type"); + ct_cb->setCurrentByIndex(content_type); + ct_cb->resetDirty(); +} + +bool LLPanelClassifiedEdit::getAutoRenew() +{ + return childGetValue("auto_renew").asBoolean(); +} + void LLPanelClassifiedEdit::sendUpdate() { LLAvatarClassifiedInfo c_data; if(getClassifiedId().isNull()) { - LLUUID id; - id.generate(); - setClassifiedId(id); + setClassifiedId(LLUUID::generateNewID()); } c_data.agent_id = gAgent.getID(); @@ -1902,6 +1961,14 @@ 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() @@ -1910,6 +1977,13 @@ U32 LLPanelClassifiedEdit::getCategory() return cat_cb->getCurrentIndex(); } +void LLPanelClassifiedEdit::setCategory(U32 category) +{ + LLComboBox* cat_cb = getChild<LLComboBox>("category"); + cat_cb->setCurrentByIndex(category); + cat_cb->resetDirty(); +} + U8 LLPanelClassifiedEdit::getFlags() { bool auto_renew = childGetValue("auto_renew").asBoolean(); @@ -2005,17 +2079,14 @@ void LLPanelClassifiedEdit::onSaveClick() notifyInvalidName(); return; } - if(isNew()) + if(isNew() || isNewWithErrors()) { if(gStatusBar->getBalance() < getPriceForListing()) { LLNotificationsUtil::add("ClassifiedInsufficientFunds"); return; } - } - if(isNew()) - { mPublishFloater = LLFloaterReg::findTypedInstance<LLPublishClassifiedFloater>( "publish_classified", LLSD()); diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 58e7c9a4b4..1157649a16 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -256,6 +256,8 @@ public: void setClassifiedLocation(const std::string& location); + std::string getClassifiedLocation(); + void setPosGlobal(const LLVector3d& pos) { mPosGlobal = pos; } LLVector3d& getPosGlobal() { return mPosGlobal; } @@ -366,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); @@ -382,28 +386,38 @@ public: 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(); @@ -429,6 +443,7 @@ protected: private: bool mIsNew; + bool mIsNewWithErrors; bool mCanClose; LLPublishClassifiedFloater* mPublishFloater; diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 6fcba80845..dedd1afcde 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1642,7 +1642,7 @@ void LLPanelObjectInventory::updateInventory() // We're still interested in this task's inventory. std::set<LLUUID> selected_items; BOOL inventory_has_focus = FALSE; - if (mHaveInventory && mFolders->getNumSelectedDescendants()) + if (mHaveInventory) { mFolders->getSelectionList(selected_items); inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders); diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 5ac0587550..82bbcaf38b 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -76,8 +76,6 @@ #define LABEL_PICK = "Pick" #define LABEL_CHANGES = "Changes" -std::string SET_LOCATION_NOTICE("(will update after save)"); - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -410,7 +408,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 +576,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 +593,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 f0860e7027..0a7c39db46 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -192,7 +192,6 @@ LLPanelPicks::LLPanelPicks() mPicksAccTab(NULL), mClassifiedsAccTab(NULL), mPanelClassifiedInfo(NULL), - mPanelClassifiedEdit(NULL), mNoClassifieds(false), mNoPicks(false) { @@ -385,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; @@ -421,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()) @@ -657,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) @@ -693,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() @@ -780,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()); @@ -800,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); @@ -860,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; } } @@ -941,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() @@ -965,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); @@ -1153,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 11e811275b..a98b8c413e 100644 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -98,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); @@ -114,6 +116,8 @@ private: void onPanelClassifiedEdit(); void onClickMenuEdit(); + bool onEnableMenuItem(const LLSD& user_data); + void createNewPick(); void createNewClassified(); @@ -140,7 +144,7 @@ private: void createPickInfoPanel(); void createPickEditPanel(); void createClassifiedInfoPanel(); - void createClassifiedEditPanel(); + void createClassifiedEditPanel(LLPanelClassifiedEdit** panel); LLMenuGL* mPopupMenu; LLPanelProfile* mProfilePanel; @@ -149,10 +153,16 @@ 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; @@ -245,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;} @@ -255,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); @@ -269,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/llpopupview.cpp b/indra/newview/llpopupview.cpp index 1668a91eed..d8ad59c90c 100644 --- a/indra/newview/llpopupview.cpp +++ b/indra/newview/llpopupview.cpp @@ -220,10 +220,6 @@ void LLPopupView::removePopup(LLView* popup) { if (popup) { - if (gFocusMgr.childHasKeyboardFocus(popup)) - { - gFocusMgr.setKeyboardFocus(NULL); - } popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); if(iter != mPopups.end()) { 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/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 4649b9cbef..49770030c6 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -1140,6 +1140,10 @@ 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; mHeaderEntriesMaxWriteIdx = llmax(mHeaderEntriesMaxWriteIdx, idx); mUpdatedEntryMap[idx] = entry ; @@ -1450,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 ; + } } } 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..2f4a69a53c 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l || !existing_inspector->getVisible() || existing_inspector->getKey()["object_id"].asUUID() != hover_object->getID())) { + + // Add price to tooltip for items on sale + bool for_sale = for_sale_selection(nodep); + if(for_sale) + { + LLStringUtil::format_map_t args; + args["[PRICE]"] = llformat ("%d", nodep->mSaleInfo.getSalePrice()); + tooltip_msg.append(LLTrans::getString("TooltipPrice", args) ); + } + if (nodep->mName.empty()) { tooltip_msg.append(LLTrans::getString("TooltipNoName")); @@ -931,7 +941,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (media_impl.notNull() && (media_impl->hasMedia())) { is_media_displaying = true; - LLStringUtil::format_map_t args; + //LLStringUtil::format_map_t args; media_plugin = media_impl->getMediaPlugin(); if(media_plugin) @@ -954,14 +964,17 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l } } } - - // Avoid showing tip over media that's displaying + + + // Avoid showing tip over media that's displaying unless it's for sale // also check the primary node since sometimes it can have an action even though // the root node doesn't - bool needs_tip = !is_media_displaying && - (has_media || - needs_tooltip(nodep) || - needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); + + bool needs_tip = (!is_media_displaying || + for_sale) && + (has_media || + needs_tooltip(nodep) || + needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); if (show_all_object_tips || needs_tip) { diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 85efe2724e..64dcd62a6a 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1258,7 +1258,8 @@ 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)) + std::string language_code = LLUI::getLanguage(); + if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path, language_code)) { return media_source; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 757169c410..09e4de622f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4457,20 +4457,37 @@ 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 + std::string paid_you = LLTrans::getString("paid_you_ldollars"); + std::string new_description = base_name + paid_you + ammount; + + args["MESSAGE"] = new_description; + args["NAME"] = name; LLSD payload; payload["from_id"] = from_id; 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 6dc18085e0..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; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index fd90c024f1..431aa6f955 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 7dc8772753..32c24b3ebd 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -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; @@ -1364,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++) diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index df3493c434..9514abc5bc 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -232,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/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/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_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_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_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_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 303ca2b883..46023bcf19 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -369,9 +369,9 @@ <spinner label="Ziehen" name="FlexFriction"/> <spinner label="Wind" name="FlexWind"/> <spinner label="Spannung" name="FlexTension"/> - <spinner label="Erzwingen X" name="FlexForceX"/> - <spinner label="Erzwingen Y" name="FlexForceY"/> - <spinner label="Erzwingen Z" name="FlexForceZ"/> + <spinner label="Kraft X" name="FlexForceX"/> + <spinner label="Kraft Y" name="FlexForceY"/> + <spinner label="Kraft Z" name="FlexForceZ"/> <check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/> <color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> <texture_picker label="" name="light texture control" tool_tip="Klicken, um eine Bild auszuwählen (dieser Effekt funktioniert nur, wenn zeitversetzte Wiedergabe aktiviert ist)"/> @@ -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_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index a80be2b594..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,7 +30,7 @@ </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: @@ -40,7 +39,7 @@ <text name="pg_label"> 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_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/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index acfbee7f36..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$. @@ -920,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"> @@ -1314,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. @@ -1355,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. @@ -1375,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 @@ -1385,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. @@ -1405,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] @@ -1435,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"/> @@ -2200,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. @@ -2367,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"> @@ -2433,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"/> 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 2bbbaf2537..6480b640cd 100644 --- a/indra/newview/skins/default/xui/de/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/de/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] 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_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index cf61f0870d..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 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 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_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_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 2885e5bd3a..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="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/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 c4b540d08a..fc01b69461 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -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> @@ -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> 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 2b0cb66f61..2764befeac 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1119,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" /> @@ -1886,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 @@ -1906,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_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_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_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_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 3b1ecb4c20..12d169b70a 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 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 01799e6f89..09dac75660 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5442,27 +5442,6 @@ Grant this request? </form> </notification> - <notification - icon="notify.tga" - name="ScriptToast" - type="notify"> - [FIRST] [LAST]'s '[TITLE]' is requesting Resident 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_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 74d63ab328..7383edf63d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -186,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" 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..15517fb805 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 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 1e7c51259c..9e5ef10d42 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -353,7 +353,7 @@ left_pad="12" name="rating_label" value="Rating:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -380,7 +380,7 @@ name="voice_label" top_delta="0" value="Voice:" - width="60" /> + width="90" /> <text follows="left|right|top" height="18" @@ -406,7 +406,7 @@ left_pad="8" name="fly_label" value="Fly:" - width="60" /> + width="90" /> <text follows="left|right|top" height="16" @@ -432,7 +432,7 @@ left_pad="8" name="push_label" value="Push:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -458,7 +458,7 @@ left_pad="8" name="build_label" value="Build:" - width="60" /> + width="90" /> <text follows="left|right|top" height="15" @@ -484,7 +484,7 @@ left_pad="8" name="scripts_label" value="Scripts:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" @@ -510,7 +510,7 @@ left_pad="8" name="damage_label" value="Damage:" - width="60" /> + width="90" /> <text follows="left|right|top" height="14" 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/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 433b7691fa..d46783e058 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -303,7 +303,7 @@ follows="left|top|right" layout="topleft" name="perm_modify" - width="200"> + width="310"> You can modify this object </text> <text diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4b8cf88682..a3ce14532e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -85,7 +85,9 @@ or.</string> <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> @@ -3022,4 +3024,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="unread_chat_multiple"> [SOURCES] have said something new </string>" + + <string name="paid_you_ldollars">"paid you L$"</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/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_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 9c08fbb2c8..a0886b3e00 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -11,7 +11,7 @@ <menu_item_check label="Mi Inventario" name="Inventory"/> <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/> <menu_item_check label="Mis gestos" name="Gestures"/> - <menu label="Mi estatus" name="Status"> + <menu label="Mi estado" name="Status"> <menu_item_call label="Ausente" name="Set Away"/> <menu_item_call label="Ocupado" name="Set Busy"/> </menu> diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml index c5494d8199..1a7040d01f 100644 --- a/indra/newview/skins/default/xui/es/panel_login.xml +++ b/indra/newview/skins/default/xui/es/panel_login.xml @@ -12,12 +12,19 @@ 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"/> @@ -26,6 +33,9 @@ <text name="create_new_account_text"> Registrarme </text> + <text name="forgot_password_text"> + ¿Olvidaste el nombre o la contraseña? + </text> <text name="login_help"> ¿Necesitas ayuda para conectarte? </text> 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 8993fa139f..ca157314aa 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -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"> 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 6ec3a04a02..87e7dc1e8a 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml @@ -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> 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 ebf2b1084b..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 de 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/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index d0e96583f0..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 @@ -380,7 +389,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <combo_box.item label="Lieu d'arrivée fixe" name="LandingPoint"/> <combo_box.item label="Lieu d'arrivée libre" name="Anywhere"/> </combo_box> - </panel> + </panel> <panel label="MÉDIA" name="land_media_panel"> <text name="with media:" width="85"> Type : @@ -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_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_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 433dc944cf..9fc9d14026 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml @@ -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_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index addbaf2199..f8e1926586 100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml @@ -5,20 +5,17 @@ Légende </text> </panel> - <panel> - <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de mon avatar"/> + <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"/> <text name="person_label"> Résident </text> - <check_box label="Infohub" name="infohub_chk"/> <text name="infohub_label"> Infohub </text> - <check_box label="Terrain à vendre" name="land_for_sale_chk"/> <text name="land_sale_label"> Vente de terrains </text> @@ -28,55 +25,46 @@ <text name="auction_label"> enchères </text> - <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Me téléporter jusqu'à mon domicile"/> + <button name="Go Home" tool_tip="Me téléporter jusqu’à mon domicile"/> <text name="Home_label"> Domicile </text> <text name="events_label"> Événements : </text> - <check_box label="PG" name="event_chk"/> <text name="pg_label"> Général </text> - <check_box initial_value="true" label="Mature" name="event_mature_chk"/> + <check_box initial_value="true" name="event_mature_chk"/> <text name="mature_label"> Modéré </text> - <check_box label="Adult" name="event_adult_chk"/> <text name="adult_label"> Adulte </text> </panel> - <panel> + <panel name="layout_panel_3"> <text name="find_on_map_label"> Situer sur la carte </text> </panel> - <panel> + <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> <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"/> - <button label="Trouver" label_selected=">" name="DoSearch" tool_tip="Recherchez sur la carte"/> + <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 name="search_results"> - <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" name="Teleport" tool_tip="Téléporter à l'endroit 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" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné"/> + <button label="Téléporter" name="Teleport" tool_tip="Me téléporter à l'emplacement sélectionné"/> + <button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l’emplacement actuel sous la forme d’une SLurl à utiliser sur le Web."/> + <button label="Afficher la sélection" name="Show Destination" tool_tip="Centrer la carte sur l'emplacement sélectionné"/> </panel> - <panel> + <panel name="layout_panel_5"> <text name="zoom_label"> Zoomer </text> </panel> - <panel> - <slider label="Zoom" 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_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_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_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/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 7d2a33509b..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. @@ -495,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 ? @@ -1295,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. @@ -1336,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é. @@ -1356,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"/> @@ -1386,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] ? @@ -1418,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"/> @@ -2415,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"/> 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_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_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index 39885e1e12..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, utilisez la [secondlife:///app/search/people recherche] ou cliquez sur un résident pour l'ajouter à vos amis. -Si vous souhaitez rencontrer d'autres résidents, cliquez sur [secondlife:///app/worldmap la 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..f2bdb3d745 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -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 f740dcd326..f0c40d7e92 100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml @@ -2,7 +2,7 @@ <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"/> 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_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index e1acbe3817..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"> @@ -21,7 +21,7 @@ domaine. Limiter l'accès aux comptes vérifiés par : </text> <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="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/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 d78b78f7d0..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> 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_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/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_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/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/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml index a670975dda..eae9ac03c3 100644 --- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml @@ -49,7 +49,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_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 433ed0ad93..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/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/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/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/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml index 415451b49f..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"/> + <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> |