Local merge

597 files changed, 8204 insertions, 4018 deletions

diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index c2c45bec9a..f1dda1b2e2 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -122,7 +122,6 @@ public:
 	U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
 };
 
-
 LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info);
 LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info);
 LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info);
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
index 1b0e03cb2a..411977474b 100644
--- a/indra/llcommon/llworkerthread.cpp
+++ b/indra/llcommon/llworkerthread.cpp
@@ -65,6 +65,27 @@ LLWorkerThread::~LLWorkerThread()
 	// ~LLQueuedThread() will be called here
 }
 
+//called only in destructor.
+void LLWorkerThread::clearDeleteList()
+{
+	// Delete any workers in the delete queue (should be safe - had better be!)
+	if (!mDeleteList.empty())
+	{
+		llwarns << "Worker Thread: " << mName << " destroyed with " << mDeleteList.size()
+				<< " entries in delete list." << llendl;
+
+		mDeleteMutex->lock();
+		for (delete_list_t::iterator iter = mDeleteList.begin(); iter != mDeleteList.end(); ++iter)
+		{
+			(*iter)->mRequestHandle = LLWorkerThread::nullHandle();
+			(*iter)->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
+			delete *iter ;
+		}
+		mDeleteList.clear() ;
+		mDeleteMutex->unlock() ;
+	}
+}
+
 // virtual
 S32 LLWorkerThread::update(U32 max_time_ms)
 {
@@ -320,7 +341,20 @@ bool LLWorkerClass::checkWork(bool aborting)
 	if (mRequestHandle != LLWorkerThread::nullHandle())
 	{
 		LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle);
-		llassert_always(workreq);
+		if(!workreq)
+		{
+			if(mWorkerThread->isQuitting() || mWorkerThread->isStopped()) //the mWorkerThread is not running
+			{
+				mRequestHandle = LLWorkerThread::nullHandle();
+				clearFlags(WCF_HAVE_WORK);
+				return true ;
+			}
+			else
+			{
+				llassert_always(workreq);
+			}
+		}
+
 		LLQueuedThread::status_t status = workreq->getStatus();
 		if (status == LLWorkerThread::STATUS_ABORTED)
 		{
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index a1e85d2ecc..1756ebab6b 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -80,6 +80,9 @@ public:
 		S32 mParam;
 	};
 
+protected:
+	void clearDeleteList() ;
+
 private:
 	typedef std::list<LLWorkerClass*> delete_list_t;
 	delete_list_t mDeleteList;
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 853f6f173d..532b6b6524 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -209,6 +209,16 @@ set(llui_HEADER_FILES
 set_source_files_properties(${llui_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
+SET(llurlentry_TEST_DEPENDENCIES
+    llurlmatch.cpp
+    llurlregistry.cpp
+    )
+
+set_source_files_properties(llurlentry.cpp
+    PROPERTIES LL_TEST_ADDITIONAL_SOURCE_FILES
+    "${llurlentry_TEST_DEPENDENCIES}"
+    )
+
 list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
 
 add_library (llui ${llui_SOURCE_FILES})
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index aa69dfe0cc..2ed1082f56 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -103,13 +103,6 @@ void LLAccordionCtrl::draw()
 	LLLocalClipRect clip(local_rect);
 	
 	LLPanel::draw();
-	/*
-	S32 width = getRect().getWidth();
-	S32 height = getRect().getHeight();
-
-	gl_rect_2d(0, 0 , width - 1 ,height - 1,LLColor4::green,true);
-	gl_line_2d(0, 0 , width - 1 ,height - 1,LLColor4::black);
-	*/
 }
 
 
@@ -125,7 +118,6 @@ BOOL LLAccordionCtrl::postBuild()
 		scrollbar_size,
 		getRect().getHeight() - 1);
 	
-
 	LLScrollbar::Params sbparams;
 	sbparams.name("scrollable vertical");
 	sbparams.rect(scroll_rect);
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index daa9e08f14..1067c3f1d5 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -33,8 +33,9 @@
 #include "linden_common.h"
 
 #include "lluictrl.h"
-
+#include "llscrollbar.h"
 #include "llaccordionctrltab.h"
+#include "lllocalcliprect.h"
 
 #include "lltextbox.h"
 
@@ -46,6 +47,8 @@ static const S32 HEADER_HEIGHT = 20;
 static const S32 HEADER_IMAGE_LEFT_OFFSET = 5;
 static const S32 HEADER_TEXT_LEFT_OFFSET = 30;
 static const F32 AUTO_OPEN_TIME = 1.f;
+static const S32 VERTICAL_MULTIPLE = 16;
+static const S32 PARENT_BORDER_MARGIN = 5;
 
 static LLDefaultChildRegistry::Register<LLAccordionCtrlTab> t1("accordion_tab");
 
@@ -277,6 +280,7 @@ LLAccordionCtrlTab::Params::Params()
 	,header_image_pressed("header_image_pressed")
 	,header_image_focused("header_image_focused")
 	,header_text_color("header_text_color")
+	,fit_panel("fit_panel",true)
 {
 	mouse_opaque(false);
 }
@@ -293,6 +297,9 @@ LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
 	,mPaddingTop(p.padding_top)
 	,mPaddingBottom(p.padding_bottom)
 	,mCanOpenClose(true)
+	,mFitPanel(p.fit_panel)
+	,mContainerPanel(NULL)
+	,mScrollbar(NULL)
 {
 	mStoredOpenCloseState = false;
 	mWasStateStored = false;
@@ -321,54 +328,42 @@ void LLAccordionCtrlTab::setDisplayChildren(bool display)
 		mExpandedHeight : HEADER_HEIGHT);
 	setRect(rect);
 
-	for(child_list_const_iter_t it = getChildList()->begin();
-		getChildList()->end() != it; ++it)
-	{
-		LLView* child = *it;
-		if(DD_HEADER_NAME == child->getName())
-			continue;
+	if(mContainerPanel)
+		mContainerPanel->setVisible(getDisplayChildren());
 
-		child->setVisible(getDisplayChildren());
+	if(mDisplayChildren)
+	{
+		adjustContainerPanel();
 	}
+	else
+	{
+		if(mScrollbar)
+			mScrollbar->setVisible(false);
+	}
+
 }
 
 void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
 {
 	LLRect headerRect;
 
-	LLUICtrl::reshape(width, height, TRUE);
-
 	headerRect.setLeftTopAndSize(
 		0,height,width,HEADER_HEIGHT);
 	mHeader->setRect(headerRect);
 	mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
 
-	for(child_list_const_iter_t it = getChildList()->begin(); 
-		getChildList()->end() != it; ++it)
-	{
-		LLView* child = *it;
-		if(DD_HEADER_NAME == child->getName())
-			continue;
-		if(!child->getVisible())
-			continue;
-
-		LLRect childRect = child->getRect();
-		S32 childWidth = width - getPaddingLeft() - getPaddingRight();
-		S32 childHeight = height - getHeaderHeight() - getPaddingTop() - getPaddingBottom();
+	if(!mDisplayChildren)
+		return;
 
-		child->reshape(childWidth,childHeight);
-		
-		childRect.setLeftTopAndSize(
-			getPaddingLeft(),
-			childHeight + getPaddingBottom(),
-			childWidth, 
-			childHeight);
+	LLRect childRect;
 
-		child->setRect(childRect);
-		
-		break;//suppose that there is only one panel
-	}
+	childRect.setLeftTopAndSize(
+		getPaddingLeft(),
+		height - getHeaderHeight() - getPaddingTop(),
+		width - getPaddingLeft() - getPaddingRight(), 
+		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
 
+	adjustContainerPanel(childRect);
 }
 
 void LLAccordionCtrlTab::changeOpenClose(bool is_open)
@@ -439,7 +434,7 @@ void LLAccordionCtrlTab::setAccordionView(LLView* panel)
 }
 
 
-LLView*	LLAccordionCtrlTab::getAccordionView()
+LLView*	LLAccordionCtrlTab::findContainerView()
 {
 	for(child_list_const_iter_t it = getChildList()->begin(); 
 		getChildList()->end() != it; ++it)
@@ -474,6 +469,43 @@ void LLAccordionCtrlTab::setHeaderVisible(bool value)
 BOOL LLAccordionCtrlTab::postBuild()
 {
 	mHeader->setVisible(mHeaderVisible);
+	
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	LLRect scroll_rect;
+	scroll_rect.setOriginAndSize( 
+		getRect().getWidth() - scrollbar_size,
+		1,
+		scrollbar_size,
+		getRect().getHeight() - 1);
+
+	mContainerPanel = findContainerView();
+
+	if(!mFitPanel)
+	{
+		LLScrollbar::Params sbparams;
+		sbparams.name("scrollable vertical");
+		sbparams.rect(scroll_rect);
+		sbparams.orientation(LLScrollbar::VERTICAL);
+		sbparams.doc_size(getRect().getHeight());
+		sbparams.doc_pos(0);
+		sbparams.page_size(getRect().getHeight());
+		sbparams.step_size(VERTICAL_MULTIPLE);
+		sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+		sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2));
+
+
+		mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
+		LLView::addChild( mScrollbar );
+		mScrollbar->setFollowsRight();
+		mScrollbar->setFollowsTop();
+		mScrollbar->setFollowsBottom();
+
+		mScrollbar->setVisible(false);
+	}
+
+	mContainerPanel->setVisible(mDisplayChildren);
+
 	return LLUICtrl::postBuild();
 }
 bool	LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
@@ -562,6 +594,12 @@ BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 	if( !header->hasFocus() )
 		return LLUICtrl::handleKey(key, mask, called_from_parent);
 
+	if ( (key == KEY_RETURN )&& mask == MASK_NONE)
+	{
+		changeOpenClose(getDisplayChildren());
+		return TRUE;
+	}
+
 	if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
 	{
 		if(getDisplayChildren() == false)
@@ -622,6 +660,7 @@ void    LLAccordionCtrlTab::storeOpenCloseState()
 	mStoredOpenCloseState = getDisplayChildren();
 	mWasStateStored = true;
 }
+
 void   LLAccordionCtrlTab::restoreOpenCloseState()
 {
 	if(!mWasStateStored)
@@ -632,3 +671,195 @@ void   LLAccordionCtrlTab::restoreOpenCloseState()
 	}
 	mWasStateStored = false;
 }
+
+void LLAccordionCtrlTab::adjustContainerPanel	()
+{
+	S32 width = getRect().getWidth();
+	S32 height = getRect().getHeight();
+
+	LLRect child_rect;
+	child_rect.setLeftTopAndSize(
+		getPaddingLeft(),
+		height - getHeaderHeight() - getPaddingTop(),
+		width - getPaddingLeft() - getPaddingRight(), 
+		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+
+	adjustContainerPanel(child_rect);
+}
+
+void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
+{
+	if(!mContainerPanel)
+		return; 
+
+	if(!mFitPanel)
+	{
+		show_hide_scrollbar(child_rect);
+		updateLayout(child_rect);
+	}
+	else
+	{
+		mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight());
+		mContainerPanel->setRect(child_rect);
+	}
+}
+
+S32 LLAccordionCtrlTab::getChildViewHeight()
+{
+	if(!mContainerPanel)
+		return 0;
+	return mContainerPanel->getRect().getHeight();
+}
+
+void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect)
+{
+	if(getChildViewHeight() > child_rect.getHeight() )
+		showScrollbar(child_rect);
+	else
+		hideScrollbar(child_rect);
+}
+void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect)
+{
+	if(!mContainerPanel || !mScrollbar)
+		return;
+	bool was_visible = mScrollbar->getVisible();
+	mScrollbar->setVisible(true);
+	
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	{
+		ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size, 
+			child_rect.getHeight()-PARENT_BORDER_MARGIN, 
+			scrollbar_size, 
+			child_rect.getHeight()-2*PARENT_BORDER_MARGIN);
+	}
+
+	LLRect orig_rect = mContainerPanel->getRect();
+
+	mScrollbar->setPageSize(child_rect.getHeight());
+	mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos());
+	
+	if(was_visible)
+	{
+		S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1);
+		mScrollbar->setDocPos(scroll_pos);
+	}
+	else//shrink child panel
+	{
+		updateLayout(child_rect);
+	}
+	
+}
+
+void	LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect )
+{
+	if(!mContainerPanel || !mScrollbar)
+		return;
+
+	if(mScrollbar->getVisible() == false)
+		return;
+	mScrollbar->setVisible(false);
+	mScrollbar->setDocPos(0);
+
+	//shrink child panel
+	updateLayout(child_rect);
+}
+
+void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
+{
+	LLRect child_rect;
+
+	S32 width = getRect().getWidth();
+	S32 height = getRect().getHeight();
+
+	child_rect.setLeftTopAndSize(
+		getPaddingLeft(),
+		height - getHeaderHeight() - getPaddingTop(),
+		width - getPaddingLeft() - getPaddingRight(), 
+		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+
+	updateLayout(child_rect);
+}
+
+void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
+{
+	if (child && child->getVisible() && child->getRect().isValid())
+	{
+		LLRect screen_rect;
+		localRectToScreen(child->getRect(),&screen_rect);
+		
+		if ( root_rect.overlaps(screen_rect)  && LLUI::sDirtyRect.overlaps(screen_rect))
+		{
+			glMatrixMode(GL_MODELVIEW);
+			LLUI::pushMatrix();
+			{
+				LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom, 0.f);
+				child->draw();
+
+			}
+			LLUI::popMatrix();
+		}
+	}
+}
+
+void LLAccordionCtrlTab::draw()
+{
+	if(mFitPanel)
+		LLUICtrl::draw();
+	else
+	{
+		LLRect root_rect = getRootView()->getRect();
+		drawChild(root_rect,mHeader);
+		drawChild(root_rect,mScrollbar );
+		{
+			LLRect child_rect;
+
+			S32 width = getRect().getWidth();
+			S32 height = getRect().getHeight();
+
+			child_rect.setLeftTopAndSize(
+				getPaddingLeft(),
+				height - getHeaderHeight() - getPaddingTop(),
+				width - getPaddingLeft() - getPaddingRight(), 
+				height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+
+			LLLocalClipRect clip(child_rect);
+			drawChild(root_rect,mContainerPanel);
+		}
+		
+
+		gGL.getTexUnit(0)->disable();
+	}
+}
+
+void	LLAccordionCtrlTab::updateLayout	( const LLRect& child_rect )
+{
+	LLView*	child = getAccordionView();
+	if(!mContainerPanel)
+		return;
+
+	S32 panel_top = child_rect.getHeight();
+	S32 panel_width = child_rect.getWidth();
+
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	if(mScrollbar->getVisible() != false)
+	{
+		panel_top+=mScrollbar->getDocPos();
+		panel_width-=scrollbar_size;
+	}
+
+	//set sizes for first panels and dragbars
+	LLRect panel_rect = child->getRect();
+	ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
+}
+void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
+{
+	if(!panel)
+		return;
+	LLRect panel_rect = panel->getRect();
+	panel_rect.setLeftTopAndSize( left, top, width, height);
+	panel->reshape( width, height, 1);
+	panel->setRect(panel_rect);
+}
+
+
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 2e0260ab16..462ccc6d53 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -41,6 +41,7 @@ class LLUICtrlFactory;
 class LLUIImage;
 class LLButton;
 class LLTextBox;
+class LLScrollbar;
 
 
 
@@ -84,6 +85,8 @@ public:
 
 		Optional<bool>			header_visible;
 
+		Optional<bool>			fit_panel;
+
 		Optional<S32>			padding_left;
 		Optional<S32>			padding_right;
 		Optional<S32>			padding_top;
@@ -107,7 +110,7 @@ public:
 
 	//set LLAccordionCtrlTab panel
 	void		setAccordionView(LLView* panel);
-	LLView*		getAccordionView();
+	LLView*		getAccordionView() { return mContainerPanel; };
 
 	bool getCollapsible() {return mCollapsible;};
 
@@ -123,6 +126,8 @@ public:
 	S32 notify(const LLSD& info);
 	bool notifyChildren(const LLSD& info);
 
+	void draw();
+
 	void    storeOpenCloseState		();
 	void    restoreOpenCloseState	();
 
@@ -164,9 +169,26 @@ public:
 
 	void showAndFocusHeader();
 
-private:
+	void setFitPanel( bool fit ) { mFitPanel = true; }
 
-	
+protected:
+	void adjustContainerPanel	(const LLRect& child_rect);
+	void adjustContainerPanel	();
+	S32	 getChildViewHeight		();
+
+	void onScrollPosChangeCallback(S32, LLScrollbar*);
+
+	void show_hide_scrollbar	(const LLRect& child_rect);
+	void showScrollbar			(const LLRect& child_rect);
+	void hideScrollbar			(const LLRect& child_rect);
+
+	void updateLayout			( const LLRect& child_rect );
+	void ctrlSetLeftTopAndSize	(LLView* panel, S32 left, S32 top, S32 width, S32 height);
+
+	void drawChild(const LLRect& root_rect,LLView* child);
+
+	LLView* findContainerView	();
+private:
 
 	class LLAccordionCtrlTabHeader;
 	LLAccordionCtrlTabHeader* mHeader; //Header
@@ -176,6 +198,7 @@ private:
 	bool mHeaderVisible;
 
 	bool mCanOpenClose;
+	bool mFitPanel;
 
 	S32	mPaddingLeft;
 	S32	mPaddingRight;
@@ -185,6 +208,8 @@ private:
 	bool mStoredOpenCloseState;
 	bool mWasStateStored;
 
+	LLScrollbar*	mScrollbar;
+	LLView*			mContainerPanel;
 
 	LLUIColor mDropdownBGColor;
 };
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 6a0d8ef3d6..59b551a16d 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -216,6 +216,7 @@ public:
 	void			setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
 	void 			setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
 	LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; }
+	LLFontGL::HAlign getImageOverlayHAlign() const	{ return mImageOverlayAlignment; }
 
 	void            autoResize();	// resize with label of current btn state 
 	void            resize(LLUIString label); // resize with label input
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 9d23daf56d..c1d512e148 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -160,7 +160,7 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p)
 
 	createLineEditor(p);
 
-	setTopLostCallback(boost::bind(&LLComboBox::hideList, this));
+	mTopLostSignalConnection = setTopLostCallback(boost::bind(&LLComboBox::hideList, this));
 }
 
 void LLComboBox::initFromParams(const LLComboBox::Params& p)
@@ -187,6 +187,9 @@ BOOL LLComboBox::postBuild()
 LLComboBox::~LLComboBox()
 {
 	// children automatically deleted, including mMenu, mButton
+
+	// explicitly disconect this signal, since base class destructor might fire top lost
+	mTopLostSignalConnection.disconnect();
 }
 
 
@@ -320,15 +323,19 @@ void LLComboBox::setValue(const LLSD& value)
 		LLScrollListItem* item = mList->getFirstSelected();
 		if (item)
 		{
-			setLabel( mList->getSelectedItemLabel() );
+			setLabel(getSelectedItemLabel());
 		}
 		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
+	else
+	{
+		mLastSelectedIndex = -1;
+	}
 }
 
 const std::string LLComboBox::getSimple() const
 {
-	const std::string res = mList->getSelectedItemLabel();
+	const std::string res = getSelectedItemLabel();
 	if (res.empty() && mAllowTextEntry)
 	{
 		return mTextEntry->getText();
@@ -407,7 +414,7 @@ BOOL LLComboBox::remove(S32 index)
 	if (index < mList->getItemCount())
 	{
 		mList->deleteSingleItem(index);
-		setLabel(mList->getSelectedItemLabel());
+		setLabel(getSelectedItemLabel());
 		return TRUE;
 	}
 	return FALSE;
@@ -448,7 +455,7 @@ BOOL LLComboBox::setCurrentByIndex( S32 index )
 	BOOL found = mList->selectNthItem( index );
 	if (found)
 	{
-		setLabel(mList->getSelectedItemLabel());
+		setLabel(getSelectedItemLabel());
 		mLastSelectedIndex = index;
 	}
 	return found;
@@ -612,16 +619,14 @@ void LLComboBox::showList()
 
 	mList->setFocus(TRUE);
 
-	// register ourselves as a "top" control
-	// effectively putting us into a special draw layer
-	// and not affecting the bounding rectangle calculation
-	gFocusMgr.setTopCtrl(this);
-
 	// Show the list and push the button down
 	mButton->setToggleState(TRUE);
 	mList->setVisible(TRUE);
 	
+	LLUI::addPopup(this);
+
 	setUseBoundingRect(TRUE);
+//	updateBoundingRect();
 }
 
 void LLComboBox::hideList()
@@ -644,10 +649,8 @@ void LLComboBox::hideList()
 		mList->mouseOverHighlightNthItem(-1);
 
 		setUseBoundingRect(FALSE);
-		if( gFocusMgr.getTopCtrl() == this )
-		{
-			gFocusMgr.setTopCtrl(NULL);
-		}
+		LLUI::removePopup(this);
+//		updateBoundingRect();
 	}
 }
 
@@ -703,19 +706,12 @@ void LLComboBox::onListMouseUp()
 
 void LLComboBox::onItemSelected(const LLSD& data)
 {
-	const std::string name = mList->getSelectedItemLabel();
+	setValue(data);
 
-	S32 cur_id = getCurrentIndex();
-	mLastSelectedIndex = cur_id;
-	if (cur_id != -1)
+	if (mAllowTextEntry && mLastSelectedIndex != -1)
 	{
-		setLabel(name);
-
-		if (mAllowTextEntry)
-		{
-			gFocusMgr.setKeyboardFocus(mTextEntry);
-			mTextEntry->selectAll();
-		}
+		gFocusMgr.setKeyboardFocus(mTextEntry);
+		mTextEntry->selectAll();
 	}
 
 	// hiding the list reasserts the old value stored in the text editor/dropdown button
@@ -912,7 +908,7 @@ void LLComboBox::updateSelection()
 	}
 	else if (mList->selectItemByPrefix(left_wstring, FALSE))
 	{
-		LLWString selected_item = utf8str_to_wstring(mList->getSelectedItemLabel());
+		LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel());
 		LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size());
 		mTextEntry->setText(wstring_to_utf8str(wtext));
 		mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size());
@@ -1014,7 +1010,7 @@ BOOL LLComboBox::setCurrentByID(const LLUUID& id)
 
 	if (found)
 	{
-		setLabel(mList->getSelectedItemLabel());
+		setLabel(getSelectedItemLabel());
 		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
 
@@ -1030,7 +1026,7 @@ BOOL LLComboBox::setSelectedByValue(const LLSD& value, BOOL selected)
 	BOOL found = mList->setSelectedByValue(value, selected);
 	if (found)
 	{
-		setLabel(mList->getSelectedItemLabel());
+		setLabel(getSelectedItemLabel());
 	}
 	return found;
 }
@@ -1069,3 +1065,42 @@ BOOL LLComboBox::selectItemRange( S32 first, S32 last )
 {
 	return mList->selectItemRange(first, last);
 }
+
+
+static LLDefaultChildRegistry::Register<LLIconsComboBox> register_icons_combo_box("icons_combo_box");
+
+LLIconsComboBox::Params::Params()
+:	icon_column("icon_column", ICON_COLUMN),
+	label_column("label_column", LABEL_COLUMN)
+{}
+
+LLIconsComboBox::LLIconsComboBox(const LLIconsComboBox::Params& p)
+:	LLComboBox(p),
+	mIconColumnIndex(p.icon_column),
+	mLabelColumnIndex(p.label_column)
+{}
+
+void LLIconsComboBox::setValue(const LLSD& value)
+{
+	BOOL found = mList->selectByValue(value);
+	if (found)
+	{
+		LLScrollListItem* item = mList->getFirstSelected();
+		if (item)
+		{
+			setLabel(getSelectedItemLabel());
+		}
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
+	}
+	else
+	{
+		mLastSelectedIndex = -1;
+	}
+}
+
+const std::string LLIconsComboBox::getSelectedItemLabel(S32 column) const
+{
+	mButton->setImageOverlay(LLComboBox::getSelectedItemLabel(mIconColumnIndex), mButton->getImageOverlayHAlign());
+
+	return LLComboBox::getSelectedItemLabel(mLabelColumnIndex);
+}
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4f27588467..965061ead2 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -150,7 +150,7 @@ public:
 	// Get name of current item. Returns an empty string if not found.
 	const std::string	getSimple() const;
 	// Get contents of column x of selected row
-	const std::string getSelectedItemLabel(S32 column = 0) const;
+	virtual const std::string getSelectedItemLabel(S32 column = 0) const;
 
 	// Sets the label, which doesn't have to exist in the label.
 	// This is probably a UI abuse.
@@ -221,6 +221,7 @@ protected:
 	LLPointer<LLUIImage>	mArrowImage;
 	LLUIString			mLabel;
 	BOOL				mHasAutocompletedText;
+	S32                 mLastSelectedIndex;
 
 private:
 	BOOL				mAllowTextEntry;
@@ -230,6 +231,38 @@ private:
 	commit_callback_t	mPrearrangeCallback;
 	commit_callback_t	mTextEntryCallback;
 	commit_callback_t	mSelectionCallback;
-	S32                 mLastSelectedIndex;
+        boost::signals2::connection mTopLostSignalConnection;
+};
+
+// A combo box with icons for the list of items.
+class LLIconsComboBox
+:	public LLComboBox
+{
+public:
+	struct Params
+	:	public LLInitParam::Block<Params, LLComboBox::Params>
+	{
+		Optional<S32>		icon_column,
+							label_column;
+		Params();
+	};
+
+	/*virtual*/ void setValue(const LLSD& value);
+	/*virtual*/ const std::string getSelectedItemLabel(S32 column = 0) const;
+
+private:
+	enum EColumnIndex
+	{
+		ICON_COLUMN = 0,
+		LABEL_COLUMN
+	};
+
+	friend class LLUICtrlFactory;
+	LLIconsComboBox(const Params&);
+	virtual ~LLIconsComboBox() {};
+
+	S32			mIconColumnIndex;
+	S32			mLabelColumnIndex;
 };
+
 #endif
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index b6d73cda3c..4cb336f7ea 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -527,10 +527,7 @@ void LLFloater::setVisible( BOOL visible )
 
 	if( !visible )
 	{
-		if( gFocusMgr.childIsTopCtrl( this ) )
-		{
-			gFocusMgr.setTopCtrl(NULL);
-		}
+		LLUI::removePopup(this);
 
 		if( gFocusMgr.childHasMouseCapture( this ) )
 		{
@@ -704,10 +701,7 @@ void LLFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLFloater::releaseFocus()
 {
-	if( gFocusMgr.childIsTopCtrl( this ) )
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
+	LLUI::removePopup(this);
 
 	setFocus(FALSE);
 
@@ -1360,7 +1354,7 @@ void LLFloater::bringToFront( S32 x, S32 y )
 // virtual
 void LLFloater::setVisibleAndFrontmost(BOOL take_focus)
 {
-	gFocusMgr.setTopCtrl(NULL);
+	LLUI::clearPopups();
 	setVisible(TRUE);
 	setFrontmost(take_focus);
 }
@@ -1554,7 +1548,12 @@ void LLFloater::onClickClose( LLFloater* self )
 {
 	if (!self)
 		return;
-	self->closeFloater(false);
+	self->onClickCloseBtn();
+}
+
+void	LLFloater::onClickCloseBtn()
+{
+	closeFloater(false);
 }
 
 
@@ -2503,10 +2502,7 @@ void LLFloaterView::syncFloaterTabOrder()
 	if (modal_dialog)
 	{
 		// If we have a visible modal dialog, make sure that it has focus
-		if( gFocusMgr.getTopCtrl() != modal_dialog )
-		{
-			gFocusMgr.setTopCtrl( modal_dialog );
-		}
+		LLUI::addPopup(modal_dialog);
 		
 		if( !gFocusMgr.childHasKeyboardFocus( modal_dialog ) )
 		{
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 19e8288807..c1e8813f87 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -307,6 +307,8 @@ protected:
 
 	void			destroy() { die(); } // Don't call this directly.  You probably want to call closeFloater()
 
+	virtual	void	onClickCloseBtn();
+
 private:
 	void			setForeground(BOOL b);	// called only by floaterview
 	void			cleanupHandles(); // remove handles to dead floaters
@@ -346,6 +348,7 @@ protected:
 	LLResizeBar*	mResizeBar[4];
 	LLResizeHandle*	mResizeHandle[4];
 
+	LLButton*		mButtons[BUTTON_COUNT];
 private:
 	LLRect			mExpandedRect;
 	
@@ -379,7 +382,6 @@ private:
 	handle_set_t	mDependents;
 
 	bool			mButtonsEnabled[BUTTON_COUNT];
-	LLButton*		mButtons[BUTTON_COUNT];
 	F32				mButtonScale;
 	BOOL			mAutoFocus;
 	LLHandle<LLFloater> mSnappedTo;
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 35fbc7b0a8..b3af258456 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -38,8 +38,6 @@
 
 const F32 FOCUS_FADE_TIME = 0.3f;
 
-// NOTE: the LLFocusableElement implementation has been moved here from lluictrl.cpp.
-
 LLFocusableElement::LLFocusableElement()
 :	mFocusLostCallback(NULL),
 	mFocusReceivedCallback(NULL),
@@ -124,8 +122,7 @@ boost::signals2::connection	LLFocusableElement::setTopLostCallback(const focus_s
 LLFocusMgr gFocusMgr;
 
 LLFocusMgr::LLFocusMgr()
-	:
-	mLockedView( NULL ),
+:	mLockedView( NULL ),
 	mMouseCaptor( NULL ),
 	mKeyboardFocus( NULL ),
 	mLastKeyboardFocus( NULL ),
@@ -133,16 +130,11 @@ LLFocusMgr::LLFocusMgr()
 	mKeystrokesOnly(FALSE),
 	mTopCtrl( NULL ),
 	mAppHasFocus(TRUE)   // Macs don't seem to notify us that we've gotten focus, so default to true
-	#ifdef _DEBUG
-		, mMouseCaptorName("none")
-		, mKeyboardFocusName("none")
-		, mTopCtrlName("none")
-	#endif
 {
 }
 
 
-void LLFocusMgr::releaseFocusIfNeeded( const LLView* view )
+void LLFocusMgr::releaseFocusIfNeeded( LLView* view )
 {
 	if( childHasMouseCapture( view ) )
 	{
@@ -162,10 +154,7 @@ void LLFocusMgr::releaseFocusIfNeeded( const LLView* view )
 		}
 	}
 
-	if( childIsTopCtrl( view ) )
-	{
-		setTopCtrl( NULL );
-	}
+	LLUI::removePopup(view);
 }
 
 
@@ -248,11 +237,6 @@ void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL
 			return;
 		}
 
-		#ifdef _DEBUG
-			LLUICtrl* focus_ctrl = dynamic_cast<LLUICtrl*>(new_focus);
-			mKeyboardFocusName = focus_ctrl ? focus_ctrl->getName() : std::string("none");
-		#endif
-
 		// If we've got a default keyboard focus, and the caller is
 		// releasing keyboard focus, move to the default.
 		if (mDefaultKeyboardFocus != NULL && mKeyboardFocus == NULL)
@@ -334,20 +318,12 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* f
 	if( mKeyboardFocus == focus )
 	{
 		mKeyboardFocus = NULL;
-		#ifdef _DEBUG
-			mKeyboardFocusName = std::string("none");
-		#endif
 	}
 }
 
 
 void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
 {
-	//if (mFocusLocked)
-	//{
-	//	return;
-	//}
-
 	if( new_captor != mMouseCaptor )
 	{
 		LLMouseHandler* old_captor = mMouseCaptor;
@@ -370,24 +346,14 @@ void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
 			old_captor->onMouseCaptureLost();
 		}
 
-		#ifdef _DEBUG
-			mMouseCaptorName = new_captor ? new_captor->getName() : std::string("none");
-		#endif
 	}
 }
 
 void LLFocusMgr::removeMouseCaptureWithoutCallback( const LLMouseHandler* captor )
 {
-	//if (mFocusLocked)
-	//{
-	//	return;
-	//}
 	if( mMouseCaptor == captor )
 	{
 		mMouseCaptor = NULL;
-		#ifdef _DEBUG
-			mMouseCaptorName = std::string("none");
-		#endif
 	}
 }
 
@@ -416,10 +382,6 @@ void LLFocusMgr::setTopCtrl( LLUICtrl* new_top  )
 	{
 		mTopCtrl = new_top;
 
-		#ifdef _DEBUG
-			mTopCtrlName = new_top ? new_top->getName() : std::string("none");
-		#endif
-
 		if (old_top)
 		{
 			old_top->onTopLost();
@@ -432,9 +394,6 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( const LLUICtrl* top_view )
 	if( mTopCtrl == top_view )
 	{
 		mTopCtrl = NULL;
-		#ifdef _DEBUG
-			mTopCtrlName = std::string("none");
-		#endif
 	}
 }
 
@@ -478,9 +437,9 @@ void LLFocusMgr::setAppHasFocus(BOOL focus)
 	}
 	
 	// release focus from "top ctrl"s, which generally hides them
-	if (!focus && mTopCtrl)
+	if (!focus)
 	{
-		setTopCtrl(NULL);
+		LLUI::clearPopups();
 	}
 	mAppHasFocus = focus; 
 }
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h
index 83ecd1d301..86d3ccf111 100644
--- a/indra/llui/llfocusmgr.h
+++ b/indra/llui/llfocusmgr.h
@@ -65,10 +65,10 @@ public:
 	virtual BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
 	virtual BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
 
+	virtual void	onTopLost();	// called when registered as top ctrl and user clicks elsewhere
 protected:	
 	virtual void	onFocusReceived();
 	virtual void	onFocusLost();
-	virtual void	onTopLost();	// called when registered as top ctrl and user clicks elsewhere
 	focus_signal_t*  mFocusLostCallback;
 	focus_signal_t*  mFocusReceivedCallback;
 	focus_signal_t*  mFocusChangedCallback;
@@ -119,7 +119,7 @@ public:
 	BOOL			childIsTopCtrl( const LLView* parent ) const;
 
 	// All Three
-	void			releaseFocusIfNeeded( const LLView* top_view );
+	void			releaseFocusIfNeeded( LLView* top_view );
 	void			lockFocus();
 	void			unlockFocus();
 	BOOL			focusLocked() const { return mLockedView != NULL; }
@@ -149,12 +149,6 @@ private:
 
 	typedef std::map<LLHandle<LLView>, LLHandle<LLView> > focus_history_map_t;
 	focus_history_map_t mFocusHistory;
-
-	#ifdef _DEBUG
-		std::string		mMouseCaptorName;
-		std::string		mKeyboardFocusName;
-		std::string		mTopCtrlName;
-	#endif
 };
 
 extern LLFocusMgr gFocusMgr;
diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h
index 899f6b9326..8ade327044 100644
--- a/indra/llui/llhandle.h
+++ b/indra/llui/llhandle.h
@@ -67,6 +67,13 @@ public:
 		return *this; 
 	}
 
+	template<typename Subclass>
+	LLHandle<T>& operator =(const LLHandle<Subclass>& other)  
+	{ 
+		mTombStone = other.mTombStone;
+		return *this; 
+	}
+
 	bool isDead() const 
 	{ 
 		return mTombStone->getTarget() == NULL; 
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 387af05935..6cff68c20b 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -111,7 +111,7 @@ void LLModalDialog::onOpen(const LLSD& key)
 	
 		// This is a modal dialog.  It sucks up all mouse and keyboard operations.
 		gFocusMgr.setMouseCapture( this );
-		gFocusMgr.setTopCtrl( this );
+		LLUI::addPopup(this);
 		setFocus(TRUE);
 
 		sModalStack.push_front( this );
@@ -153,7 +153,7 @@ void LLModalDialog::setVisible( BOOL visible )
 			gFocusMgr.setMouseCapture( this );
 
 			// The dialog view is a root view
-			gFocusMgr.setTopCtrl( this );
+			LLUI::addPopup(this);
 			setFocus( TRUE );
 		}
 		else
@@ -291,7 +291,7 @@ void LLModalDialog::onAppFocusGained()
 		// This is a modal dialog.  It sucks up all mouse and keyboard operations.
 		gFocusMgr.setMouseCapture( instance );
 		instance->setFocus(TRUE);
-		gFocusMgr.setTopCtrl( instance );
+		LLUI::addPopup(instance);
 
 		instance->centerOnScreen();
 	}
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 3cc92baa8d..d17be8b94a 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -185,6 +185,8 @@ LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p)
 {
 	sCount++;
 
+	mTextWidth = getWidth();
+
 	// initialize rounded rect image
 	if (!mRoundedRectImage)
 	{
@@ -340,7 +342,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
 					0,
 					LLFontGL::NO_SHADOW,
 					string_chars, 
-					getWidth(),
+					getTextWidth(),
 					&right_x, 
 					TRUE);
 }
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
index 5fecf5aade..b1c8901fc4 100644
--- a/indra/llui/llscrolllistcell.h
+++ b/indra/llui/llscrolllistcell.h
@@ -151,11 +151,16 @@ public:
 	/*virtual*/ const std::string &	getToolTip() const;
 	/*virtual*/ BOOL	needsToolTip() const;
 
+	S32				getTextWidth() const { return mTextWidth;}
+	void			setTextWidth(S32 value) { mTextWidth = value;} 
+	virtual void	setWidth(S32 width) { LLScrollListCell::setWidth(width); mTextWidth = width; }
+
 	void			setText(const LLStringExplicit& text);
 	void			setFontStyle(const U8 font_style);
 
 private:
 	LLUIString		mText;
+	S32				mTextWidth;
 	const LLFontGL*	mFont;
 	LLColor4		mColor;
 	U8				mUseColor;
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 77caaaa425..18ec5b51dd 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -630,7 +630,9 @@ void LLScrollListCtrl::calcColumnWidths()
 			LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
 			if (!cellp) continue;
 
-			column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+			// get text value width only for text cells
+			column->mMaxContentWidth = cellp->isText() ?
+					llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth) : column->mMaxContentWidth;
 		}
 
 		max_item_width += column->mMaxContentWidth;
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index e819c5fdea..ebdc82115f 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -219,7 +219,10 @@ public:
 	void			deselectAllItems(BOOL no_commit_on_change = FALSE);	// by default, go ahead and commit on selection change
 
 	void			clearHighlightedItems();
-	void			mouseOverHighlightNthItem( S32 index );
+	
+	virtual void	mouseOverHighlightNthItem( S32 index );
+
+	S32				getHighlightedItemInx() const { return mHighlightedItem; } 
 	
 	void			setDoubleClickCallback( callback_t cb ) { mOnDoubleClickCallback = cb; }
 	void			setMaximumSelectCallback( callback_t cb) { mOnMaximumSelectCallback = cb; }
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 85ae13a889..30fc7babae 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1649,7 +1649,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
 		if(mCustomIconCtrlUsed)
 		{
 			LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton);
-			LLIconCtrl* icon_ctrl = button->getIconCtrl();
+			LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL;
 			image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0;
 		}
 		else
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index b348ec2d29..5121ef5351 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -86,6 +86,9 @@ std::list<std::string> gUntranslated;
 /*static*/ LLHelp*			LLUI::sHelpImpl = NULL;
 /*static*/ std::vector<std::string> LLUI::sXUIPaths;
 /*static*/ LLFrameTimer		LLUI::sMouseIdleTimer;
+/*static*/ LLUI::add_popup_t	LLUI::sAddPopupFunc;
+/*static*/ LLUI::remove_popup_t	LLUI::sRemovePopupFunc;
+/*static*/ LLUI::clear_popups_t	LLUI::sClearPopupsFunc;
 
 // register filtereditor here
 static LLDefaultChildRegistry::Register<LLFilterEditor> register_filter_editor("filter_editor");
@@ -1607,6 +1610,13 @@ void LLUI::cleanupClass()
 	sImageProvider->cleanUp();
 }
 
+void LLUI::setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t& remove_popup,  const clear_popups_t& clear_popups)
+{
+	sAddPopupFunc = add_popup;
+	sRemovePopupFunc = remove_popup;
+	sClearPopupsFunc = clear_popups;
+}
+
 //static
 void LLUI::dirtyRect(LLRect rect)
 {
@@ -1877,6 +1887,34 @@ LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
 	return *sSettingGroups["config"]; // default group
 }
 
+//static 
+void LLUI::addPopup(LLView* viewp)
+{
+	if (sAddPopupFunc)
+	{
+		sAddPopupFunc(viewp);
+	}
+}
+
+//static 
+void LLUI::removePopup(LLView* viewp)
+{
+	if (sRemovePopupFunc)
+	{
+		sRemovePopupFunc(viewp);
+	}
+}
+
+//static
+void LLUI::clearPopups()
+{
+	if (sClearPopupsFunc)
+	{
+		sClearPopupsFunc();
+	}
+}
+
+
 //static
 // spawn_x and spawn_y are top left corner of view in screen GL coordinates
 void LLUI::positionViewNearMouse(LLView* view, S32 spawn_x, S32 spawn_y)
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index af8d4ea03b..30f3623ded 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -160,12 +160,17 @@ public:
 	// Methods
 	//
 	typedef std::map<std::string, LLControlGroup*> settings_map_t;
+	typedef boost::function<void(LLView*)> add_popup_t;
+	typedef boost::function<void(LLView*)> remove_popup_t;
+	typedef boost::function<void(void)> clear_popups_t;
+
 	static void initClass(const settings_map_t& settings,
 						  LLImageProviderInterface* image_provider,
 						  LLUIAudioCallback audio_callback = NULL,
 						  const LLVector2 *scale_factor = NULL,
 						  const std::string& language = LLStringUtil::null);
 	static void cleanupClass();
+	static void setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t&, const clear_popups_t& );
 
 	static void pushMatrix();
 	static void popMatrix();
@@ -208,6 +213,10 @@ public:
 	static void resetMouseIdleTimer() { sMouseIdleTimer.reset(); }
 	static LLWindow* getWindow() { return sWindow; }
 
+	static void addPopup(LLView*);
+	static void removePopup(LLView*);
+	static void clearPopups();
+
 	// Ensures view does not overlap mouse cursor, but is inside
 	// the view's parent rectangle.  Used for tooltips, inspectors.
 	// Optionally override the view's default X/Y, which are relative to the
@@ -227,6 +236,9 @@ private:
 	static LLImageProviderInterface* sImageProvider;
 	static std::vector<std::string> sXUIPaths;
 	static LLFrameTimer		sMouseIdleTimer;
+	static add_popup_t		sAddPopupFunc;
+	static remove_popup_t	sRemovePopupFunc;
+	static clear_popups_t	sClearPopupsFunc;
 };
 
 
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 20c939874b..35428e4227 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -34,6 +34,8 @@
 #include "linden_common.h"
 #include "llurlentry.h"
 #include "lluri.h"
+#include "llurlmatch.h"
+#include "llurlregistry.h"
 
 #include "llcachename.h"
 #include "lltrans.h"
@@ -308,6 +310,7 @@ LLUrlEntryAgent::LLUrlEntryAgent()
 							boost::regex::perl|boost::regex::icase);
 	mMenuName = "menu_url_agent.xml";
 	mIcon = "Generic_Person";
+	mTooltip = LLTrans::getString("TooltipAgentUrl");
 	mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
 }
 
@@ -602,6 +605,20 @@ std::string LLUrlEntrySLLabel::getUrl(const std::string &string) const
 	return getUrlFromWikiLink(string);
 }
 
+std::string LLUrlEntrySLLabel::getTooltip(const std::string &string) const
+{
+	// return a tooltip corresponding to the URL type instead of the generic one (EXT-4574)
+	std::string url = getUrl(string);
+	LLUrlMatch match;
+	if (LLUrlRegistry::instance().findUrl(url, match))
+	{
+		return match.getTooltip();
+	}
+
+	// unrecognized URL? should not happen
+	return LLUrlEntryBase::getTooltip(string);
+}
+
 //
 // LLUrlEntryWorldMap Describes secondlife:///<location> URLs
 //
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 3abada0f24..c947ef7259 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -83,7 +83,7 @@ public:
 	LLUIColor getColor() const { return mColor; }
 
 	/// Given a matched Url, return a tooltip string for the hyperlink
-	std::string getTooltip() const { return mTooltip; }
+	virtual std::string getTooltip(const std::string &string) const { return mTooltip; }
 
 	/// Return the name of a XUI file containing the context menu items
 	std::string getMenuName() const { return mMenuName; }
@@ -257,6 +257,7 @@ public:
 	LLUrlEntrySLLabel();
 	/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
 	/*virtual*/ std::string getUrl(const std::string &string) const;
+	/*virtual*/ std::string getTooltip(const std::string &string) const;
 };
 
 ///
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 722dbe41b3..faa02e1904 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -174,7 +174,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 		match.setValues(match_start, match_end,
 						match_entry->getUrl(url),
 						match_entry->getLabel(url, cb),
-						match_entry->getTooltip(),
+						match_entry->getTooltip(url),
 						match_entry->getIcon(),
 						match_entry->getColor(),
 						match_entry->getMenuName(),
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 63e627ceb5..d34083a384 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -73,9 +73,9 @@ S32		LLView::sLastBottomXML = S32_MIN;
 std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack;
 
 
-#if LL_DEBUG
+//#if LL_DEBUG
 BOOL LLView::sIsDrawing = FALSE;
-#endif
+//#endif
 
 // Compiler optimization, generate extern template
 template class LLView* LLView::getChild<class LLView>(
@@ -150,6 +150,10 @@ LLView::~LLView()
 {
 	dirtyRect();
 	//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
+	if (LLView::sIsDrawing)
+	{
+		llwarns << "Deleting view " << mName << " during UI draw() phase" << llendl;
+	}
 // 	llassert(LLView::sIsDrawing == FALSE);
 	
 //	llassert_always(sDepth == 0); // avoid deleting views while drawing! It can subtly break list iterators
@@ -592,11 +596,6 @@ void LLView::setVisible(BOOL visible)
 {
 	if ( mVisible != visible )
 	{
-		if( !visible && (gFocusMgr.getTopCtrl() == this) )
-		{
-			gFocusMgr.setTopCtrl( NULL );
-		}
-
 		mVisible = visible;
 
 		// notify children of visibility change if root, or part of visible hierarchy
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index c4d7313743..efae00f0e5 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -171,9 +171,9 @@ private:
 	// widgets in general are not copyable
 	LLView(const LLView& other) {};
 public:
-#if LL_DEBUG
+//#if LL_DEBUG
 	static BOOL sIsDrawing;
-#endif
+//#endif
 	enum ESoundFlags
 	{
 		SILENT = 0,
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 1c6c9e6e9d..b77deb003f 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -407,3 +407,30 @@ BOOL LLWindowManager::isWindowValid(LLWindow *window)
 {
 	return sWindowList.find(window) != sWindowList.end();
 }
+
+S32 LLDisplayInfo::getDisplayWidth() const
+{
+#if LL_WINDOWS
+	return LLWindowWin32::getDisplayWidth();
+#elif LL_DARWIN
+	return LLWindowMacOSX::getDisplayWidth();
+#elif LL_SDL
+	return LLWindowSDL::getDisplayWidth();
+#else
+	return 1024; //*FIXME
+#endif
+}
+
+S32 LLDisplayInfo::getDisplayHeight() const
+{
+#if LL_WINDOWS
+	return LLWindowWin32::getDisplayHeight();
+#elif LL_DARWIN
+	return LLWindowMacOSX::getDisplayHeight();
+#elif LL_SDL
+	return LLWindowSDL::getDisplayHeight();
+#else
+	return 768; //*FIXME
+#endif
+}
+
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 55b221e716..b769f5071b 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -281,4 +281,19 @@ extern const std::string gURLProtocolWhitelistHandler[];
 
 void simpleEscapeString ( std::string& stringIn  );
 
+//=============================================================================
+//
+//	CLASS		LLDisplayInfo
+class LLDisplayInfo
+
+/*!	@brief		Class to query the information about some display settings
+*/
+{
+public:
+	LLDisplayInfo(){}; ///< Default constructor
+
+	S32 getDisplayWidth() const; ///< display width
+	S32 getDisplayHeight() const; ///< display height
+};
+
 #endif // _LL_window_h_
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index ed5d7b1e74..ed8c874dcb 100644
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -40,4 +40,5 @@ void setupCocoa();
 CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY);
 OSErr releaseImageCursor(CursorRef ref);
 OSErr setImageCursor(CursorRef ref);
-
+void getScreenSize(int* width, int* height);
+void getVisibleScreen(int *x, int *y, int* width, int* height);
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 59b25e1726..5cab2619fd 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -116,3 +116,22 @@ OSErr setImageCursor(CursorRef ref)
 	return noErr;
 }
 
+void getScreenSize(int* width, int* height)
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSRect screen_rect = [[NSScreen mainScreen] frame];
+	if (width)  *width  = (int)(screen_rect.size.width);
+	if (height) *height = (int)(screen_rect.size.height);
+	[pool release];
+}
+
+void getVisibleScreen(int *x, int *y, int* width, int* height)
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSRect visible_rect = [[NSScreen mainScreen] visibleFrame];
+	if (width)  *width = (int)(visible_rect.size.width);
+	if (height) *height = (int)(visible_rect.size.height);
+	if (x) *x = (int)(visible_rect.origin.x);
+	if (y) *y = (int)(visible_rect.origin.y);
+	[pool release];
+}
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index ad97bc45fc..924acaf148 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1122,7 +1122,33 @@ BOOL LLWindowMacOSX::getMaximized()
 
 BOOL LLWindowMacOSX::maximize()
 {
-	// TODO
+	if (mWindow)
+	{
+		// *HACK: Because Mac OSX doesn't have a concept of a "maximized" window, we just
+		// stretch it out to the visible screen size.
+		Rect win_rect;
+
+		int visible_x;
+		int visible_y;
+		int visible_width;
+		int visible_height;
+		int screen_width;
+		int screen_height;
+
+		getScreenSize(&screen_width, &screen_height);
+		getVisibleScreen(&visible_x, &visible_y, &visible_width, &visible_height);
+
+		int mac_os_menu_bar_height = screen_height - (visible_height + visible_y);
+		::SetRect(&win_rect,
+				  visible_x,
+				  mac_os_menu_bar_height,
+				  visible_width + visible_x,
+				  visible_height + mac_os_menu_bar_height);
+
+		::SetWindowBounds(mWindow, kWindowStructureRgn, &win_rect);
+
+		return TRUE;
+	}
 	return FALSE;
 }
 
@@ -3464,6 +3490,26 @@ MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers)
 	return mask;
 }	
 
+// static
+S32 LLWindowMacOSX::getDisplayWidth()
+{
+	S32 width = 1024;
+	// Need to invoke cocoa before use getScreenSize()
+	setupCocoa();
+	getScreenSize(&width, NULL);
+	return width;
+}
+
+// static
+S32 LLWindowMacOSX::getDisplayHeight()
+{
+	S32 height = 768;
+	// Need to invoke cocoa before use getScreenSize()
+	setupCocoa();
+	getScreenSize(NULL, &height);
+	return height;
+}
+
 #if LL_OS_DRAGDROP_ENABLED
 
 OSErr LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow,
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 7c6b324029..86036a261c 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -123,6 +123,8 @@ public:
 	// Provide native key event data
 	/*virtual*/ LLSD getNativeKeyData();
 
+	static S32 getDisplayWidth();
+	static S32 getDisplayHeight();
 
 protected:
 	LLWindowMacOSX(LLWindowCallbacks* callbacks,
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 1f705f9e60..cb4e04511c 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -187,6 +187,47 @@ Display* LLWindowSDL::get_SDL_Display(void)
 }
 #endif // LL_X11
 
+// static
+S32 LLWindowSDL::getDisplayWidth()
+{
+#if LL_GTK
+	if (LLWindowSDL::ll_try_gtk_init())
+	{
+		return gdk_screen_width();
+	}
+#endif // LL_GTK
+
+#if LL_X11
+	Display *display = XOpenDisplay(NULL);
+	int screen_num = DefaultScreen(display);
+	S32 width = DisplayWidth(display, screen_num);
+	XCloseDisplay(display);
+	return width;
+#endif //LL_X11
+
+	return 1024;
+}
+
+// static
+S32 LLWindowSDL::getDisplayHeight()
+{
+#if LL_GTK
+	if (LLWindowSDL::ll_try_gtk_init())
+	{
+		return gdk_screen_height();
+	}
+#endif // LL_GTK
+
+#if LL_X11
+	Display *display = XOpenDisplay(NULL);
+	int screen_num = DefaultScreen(display);
+	S32 height = DisplayHeight(display, screen_num);
+	XCloseDisplay(display);
+	return height;
+#endif //LL_X11
+
+	return 768;
+}
 
 LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
 			 const std::string& title, S32 x, S32 y, S32 width,
@@ -909,7 +950,68 @@ BOOL LLWindowSDL::getMaximized()
 
 	if (mWindow)
 	{
-		// TODO
+#if LL_X11
+		if (mSDL_Display)
+		{
+			maybe_lock_display();
+
+			// Return data in the specified format, XA_ATOM.
+			U8*	prop;
+			// Actual format of the property.
+			int format;
+			// Actual number of items stored in the prop return data.
+			unsigned long nitems;
+			// Number of bytes remaining to be read in the property if a partial read was performed.
+			unsigned long bytes_after;
+			// Atom identifier that defines the actual type of the property.
+			Atom type;
+
+			// Atom used to obtain list of hints describing the window state.
+			Atom wm_state = XInternAtom(mSDL_Display, "_NET_WM_STATE", False);
+
+			// Atoms indicates that the window is vertically/horizontally maximized. 
+			Atom max_vert = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
+			Atom max_horz = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
+
+			// How many atoms in which we interested are present in list of hints.
+			U32 pass = 0;
+
+			do
+			{
+				nitems = 0;
+				bytes_after = 0;
+				type = None;
+				if ( (XGetWindowProperty (mSDL_Display,
+										  mSDL_XWindowID,
+										  wm_state,
+										  0, UINT_MAX,
+										  False, XA_ATOM,
+										  &type, &format,
+										  &nitems, &bytes_after,
+										  &prop) == Success)
+					 && type != None )
+				{
+					Atom *atoms = (Atom *)prop;
+					for (unsigned long i=0; i<nitems; ++i)
+					{
+						if (atoms[i] == max_horz)
+							++pass;
+						else if (atoms[i] == max_vert)
+							++pass;
+					}
+					XFree (atoms);
+				}
+				else
+				{
+					break;
+				}
+			} while (bytes_after > 0);
+
+			result = (pass == 2);
+
+			maybe_unlock_display();
+		}
+#endif // LL_X11
 	}
 
 	return(result);
@@ -917,7 +1019,103 @@ BOOL LLWindowSDL::getMaximized()
 
 BOOL LLWindowSDL::maximize()
 {
-	// TODO
+#if LL_X11
+	if (mSDL_Display && !mFullscreen)
+	{
+		maybe_lock_display();
+
+		BOOL is_maximize_allowed = FALSE;
+
+		// Check if maximize is allowed
+		{
+			// Return data in the specified format, XA_ATOM.
+			U8*	prop;
+			// Actual format of the property.
+			int format;
+			// Actual number of items stored in the prop return data.
+			unsigned long nitems;
+			// Number of bytes remaining to be read in the property if a partial read was performed.
+			unsigned long bytes_after;
+			// Atom identifier that defines the actual type of the property.
+			Atom type;
+
+			// Atom used to obtain a list of atoms indicating user operations that the Window Manager supports for this window.
+			Atom allowed_act  = XInternAtom(mSDL_Display, "_NET_WM_ALLOWED_ACTIONS", False);
+
+			// Atoms that indicates that the window may be vertically/horizontally maximized.
+			Atom max_vert_act = XInternAtom(mSDL_Display, "_NET_WM_ACTION_MAXIMIZE_HORZ", False);
+			Atom max_horz_act = XInternAtom(mSDL_Display, "_NET_WM_ACTION_MAXIMIZE_VERT", False);
+
+			// How many atoms in which we interested are present in list of hints.
+			U32 pass = 0;
+
+			do
+			{
+				nitems = 0;
+				bytes_after = 0;
+				type = None;
+				if ( (XGetWindowProperty (mSDL_Display,
+										  mSDL_XWindowID,
+										  allowed_act,
+										  0, UINT_MAX,
+										  False, XA_ATOM,
+										  &type, &format,
+										  &nitems, &bytes_after,
+										  &prop) == Success)
+					 && type != None )
+				{
+					Atom *atoms = (Atom *)prop;
+					for (unsigned long i=0; i<nitems; ++i)
+					{
+						if (atoms[i] == max_vert_act)
+							++pass;
+						else if (atoms[i] == max_horz_act)
+							++pass;
+					}
+					XFree (atoms);
+				}
+				else
+				{
+					break;
+				}
+			} while (bytes_after > 0);
+
+			is_maximize_allowed = (pass == 2);
+		}
+
+		// Send maximize event to X11 system
+		if (is_maximize_allowed)
+		{
+			XEvent xev;
+
+			// Atom describing the window state.
+			Atom wm_state = XInternAtom(mSDL_Display, "_NET_WM_STATE", False);
+
+			// Atoms indicates that the window is vertically/horizontally maximized. 
+			Atom max_vert = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
+			Atom max_horz = XInternAtom(mSDL_Display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
+
+			memset(&xev, 0, sizeof(xev));
+			xev.type = ClientMessage;
+			xev.xclient.window = mSDL_XWindowID;
+			xev.xclient.message_type = wm_state;
+			xev.xclient.format = 32;
+			xev.xclient.data.l[0] = 1;  // add/set property
+			xev.xclient.data.l[1] = max_vert;
+			xev.xclient.data.l[2] = max_horz;
+			xev.xclient.data.l[3] = 0;
+			xev.xclient.data.l[4] = 0;
+
+			XSendEvent(mSDL_Display,
+					   DefaultRootWindow(mSDL_Display),
+					   False,
+					   SubstructureNotifyMask, &xev);
+		}
+
+		maybe_unlock_display();
+		return is_maximize_allowed;
+	}
+#endif // LL_X11
 	return FALSE;
 }
 
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index e6bdd46a77..2311a361fa 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -148,6 +148,9 @@ public:
 	static Display* get_SDL_Display(void);
 #endif // LL_X11	
 
+	static S32 getDisplayWidth();
+	static S32 getDisplayHeight();
+
 protected:
 	LLWindowSDL(LLWindowCallbacks* callbacks,
 		const std::string& title, int x, int y, int width, int height, U32 flags,
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index c80392ad45..4be5d06c2b 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -3714,5 +3714,16 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 	return std::vector<std::string>();
 }
 
+// static
+S32 LLWindowWin32::getDisplayWidth()
+{
+	return ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
+}
+
+// static
+S32 LLWindowWin32::getDisplayHeight()
+{
+	return ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
+}
 
 #endif // LL_WINDOWS
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 9d57735772..c221ec0192 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -120,6 +120,9 @@ public:
 
 	static std::vector<std::string> getDynamicFallbackFontList();
 
+	static S32 getDisplayWidth();
+	static S32 getDisplayHeight();
+
 protected:
 	LLWindowWin32(LLWindowCallbacks* callbacks,
 		const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, 
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index c7aba04492..e66ac3049f 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -43,6 +43,13 @@
 #include "llpluginmessageclasses.h"
 #include "media_plugin_base.h"
 
+// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
+#if LL_LINUX
+# define LL_QTWEBKIT_USES_PIXMAPS 1
+#else
+# define LL_QTWEBKIT_USES_PIXMAPS 0
+#endif // LL_LINUX
+
 #if LL_LINUX
 # include "linux_volume_catcher.h"
 #endif // LL_LINUX
@@ -142,7 +149,11 @@ private:
 		{
 			const unsigned char* browser_pixels = LLQtWebKit::getInstance()->grabBrowserWindow( mBrowserWindowId );
 
-			unsigned int buffer_size = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ) * LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId );
+			unsigned int rowspan = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId );
+			unsigned int height = LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId );
+#if !LL_QTWEBKIT_USES_PIXMAPS
+			unsigned int buffer_size = rowspan * height;
+#endif // !LL_QTWEBKIT_USES_PIXMAPS
 			
 //			std::cerr << "webkit plugin: updating" << std::endl;
 			
@@ -150,7 +161,16 @@ private:
 			if ( mPixels && browser_pixels )
 			{
 //				std::cerr << "    memcopy of " << buffer_size << " bytes" << std::endl;
+
+#if LL_QTWEBKIT_USES_PIXMAPS
+				// copy the pixel data upside-down because of the co-ord system
+				for (int y=0; y<height; ++y)
+				{
+					memcpy( &mPixels[(height-y-1)*rowspan], &browser_pixels[y*rowspan], rowspan );
+				}
+#else
 				memcpy( mPixels, browser_pixels, buffer_size );
+#endif // LL_QTWEBKIT_USES_PIXMAPS
 			}
 
 			if ( mWidth > 0 && mHeight > 0 )
@@ -258,8 +278,10 @@ private:
 			// append details to agent string
 			LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" );
 
+#if !LL_QTWEBKIT_USES_PIXMAPS
 			// don't flip bitmap
 			LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
+#endif // !LL_QTWEBKIT_USES_PIXMAPS
 			
 			// set background color
 			// convert background color channels from [0.0, 1.0] to [0, 255];
@@ -677,7 +699,11 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 				message.setValueS32("default_height", 1024);
 				message.setValueS32("depth", mDepth);
 				message.setValueU32("internalformat", GL_RGBA);
+#if LL_QTWEBKIT_USES_PIXMAPS
+				message.setValueU32("format", GL_BGRA_EXT); // I hope this isn't system-dependant... is it?  If so, we'll have to check the root window's pixel layout or something... yuck.
+#else
 				message.setValueU32("format", GL_RGBA);
+#endif // LL_QTWEBKIT_USES_PIXMAPS
 				message.setValueU32("type", GL_UNSIGNED_BYTE);
 				message.setValueBoolean("coords_opengl", true);
 				sendMessage(message);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 14eb75e457..8ad3b2085d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -347,6 +347,7 @@ set(viewer_SOURCE_FILES
     llpatchvertexarray.cpp
     llplacesinventorybridge.cpp
     llplacesinventorypanel.cpp
+    llpopupview.cpp
     llpolymesh.cpp
     llpolymorph.cpp
     llpreview.cpp
@@ -844,6 +845,7 @@ set(viewer_HEADER_FILES
     llplacesinventorypanel.h
     llpolymesh.h
     llpolymorph.h
+    llpopupview.h
     llpreview.h
     llpreviewanim.h
     llpreviewgesture.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f87cdbc43e..8edf766132 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4334,7 +4334,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>home</string>
+      <string>last</string>
     </map>
     <key>LoginPage</key>
     <map>
@@ -5492,7 +5492,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.9</real>
     </map>
     
    <key>PlainTextChatHistory</key>
diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
index 1e00530c90..efe6c4f323 100644
--- a/indra/newview/installers/windows/install_icon.ico
+++ b/indra/newview/installers/windows/install_icon.ico
diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico
index c4ec6c70bd..05e1546860 100644
--- a/indra/newview/installers/windows/uninstall_icon.ico
+++ b/indra/newview/installers/windows/uninstall_icon.ico
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 1da7d450c9..c5d7f6f118 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5845,15 +5845,22 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void *
 		mesgsys->getUUIDFast(_PREHASH_WearableData, _PREHASH_TextureID, texture_id, texture_block);
 		mesgsys->getU8Fast(_PREHASH_WearableData, _PREHASH_TextureIndex, texture_index, texture_block);
 
-		if (texture_id.notNull() 
-			&& (S32)texture_index < BAKED_NUM_INDICES 
+		if ((S32)texture_index < BAKED_NUM_INDICES 
 			&& gAgentQueryManager.mActiveCacheQueries[texture_index] == query_id)
 		{
-			//llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl;
-			avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id);
-			//avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id );
-			gAgentQueryManager.mActiveCacheQueries[texture_index] = 0;
-			num_results++;
+			if (texture_id.notNull())
+			{
+				//llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl;
+				avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id);
+				//avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id );
+				gAgentQueryManager.mActiveCacheQueries[texture_index] = 0;
+				num_results++;
+			}
+			else
+			{
+				// no cache of this bake. request upload.
+				avatarp->requestLayerSetUpload((EBakedTextureIndex)texture_index);
+			}
 		}
 	}
 
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 11ac103b3a..7b55282ee5 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -119,9 +119,9 @@ protected:
 	void importedFolderDone(void);
 	void contentsDone(void);
 	enum ELibraryOutfitFetchStep mCurrFetchStep;
-	typedef std::vector< std::pair< LLUUID, std::string > > cloth_folder_vec_t;
-	cloth_folder_vec_t mLibraryClothingFolders;
-	cloth_folder_vec_t mImportedClothingFolders;
+	typedef std::vector<LLUUID> clothing_folder_vec_t;
+	clothing_folder_vec_t mLibraryClothingFolders;
+	clothing_folder_vec_t mImportedClothingFolders;
 	bool mOutfitsPopulated;
 	LLUUID mClothingID;
 	LLUUID mLibraryClothingID;
@@ -2240,7 +2240,7 @@ void LLAgentWearables::updateServer()
 
 void LLAgentWearables::populateMyOutfitsFolder(void)
 {	
-	llinfos << "starting outfit populate" << llendl;
+	llinfos << "starting outfit population" << llendl;
 
 	LLLibraryOutfitsFetch* outfits = new LLLibraryOutfitsFetch();
 	
@@ -2312,17 +2312,28 @@ void LLLibraryOutfitsFetch::folderDone(void)
 	LLInventoryModel::item_array_t wearable_array;
 	gInventory.collectDescendents(mMyOutfitsID, cat_array, wearable_array, 
 								  LLInventoryModel::EXCLUDE_TRASH);
-	
 	// Early out if we already have items in My Outfits.
 	if (cat_array.count() > 0 || wearable_array.count() > 0)
 	{
 		mOutfitsPopulated = true;
 		return;
 	}
-	
+
 	mClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING);
 	mLibraryClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING, false, true);
-	
+
+	// If Library->Clothing->Initial Outfits exists, use that.
+	LLNameCategoryCollector matchFolderFunctor("Initial Outfits");
+	gInventory.collectDescendentsIf(mLibraryClothingID,
+									cat_array, wearable_array, 
+									LLInventoryModel::EXCLUDE_TRASH,
+									matchFolderFunctor);
+	if (cat_array.count() > 0)
+	{
+		const LLViewerInventoryCategory *cat = cat_array.get(0);
+		mLibraryClothingID = cat->getUUID();
+	}
+
 	mCompleteFolders.clear();
 	
 	// Get the complete information on the items in the inventory.
@@ -2353,31 +2364,28 @@ void LLLibraryOutfitsFetch::outfitsDone(void)
 	{
 		const LLViewerInventoryCategory *cat = iter->get();
 		
-		// Get the names and id's of every outfit in the library, except for ruth and other "misc" outfits.
-		if (cat->getName() != "More Outfits" && cat->getName() != "Ruth")
+		// Get the names and id's of every outfit in the library, skip "Ruth"
+		// because it's a low quality legacy outfit
+		if (cat->getName() != "Ruth")
 		{
 			// Get the name of every outfit in the library 
 			folders.push_back(cat->getUUID());
-			mLibraryClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName()));
+			mLibraryClothingFolders.push_back(cat->getUUID());
 		}
 	}
-	
-	// Collect the contents of your Inventory Clothing folder
 	cat_array.clear();
 	wearable_array.clear();
-	gInventory.collectDescendents(mClothingID, cat_array, wearable_array, 
-								  LLInventoryModel::EXCLUDE_TRASH);
 
 	// Check if you already have an "Imported Library Clothing" folder
-	for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin();
-		 iter != cat_array.end();
-		 ++iter)
+	LLNameCategoryCollector matchFolderFunctor(mImportedClothingName);
+	gInventory.collectDescendentsIf(mClothingID, 
+									cat_array, wearable_array, 
+									LLInventoryModel::EXCLUDE_TRASH,
+									matchFolderFunctor);
+	if (cat_array.size() > 0)
 	{
-		const LLViewerInventoryCategory *cat = iter->get();
-		if (cat->getName() == mImportedClothingName)
-		{
-			mImportedClothingID = cat->getUUID();
-		}
+		const LLViewerInventoryCategory *cat = cat_array.get(0);
+		mImportedClothingID = cat->getUUID();
 	}
 	
 	mCompleteFolders.clear();
@@ -2415,31 +2423,59 @@ private:
 	LLLibraryOutfitsFetch * mLibraryOutfitsFetcher;
 };
 
+// Copy the clothing folders from the library into the imported clothing folder
 void LLLibraryOutfitsFetch::libraryDone(void)
 {
-	// Copy the clothing folders from the library into the imported clothing folder if necessary.
-	if (mImportedClothingID == LLUUID::null)
+	if (mImportedClothingID != LLUUID::null)
 	{
-		gInventory.removeObserver(this);
-		LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this);
-		mImportedClothingID = gInventory.createNewCategory(mClothingID,
-														   LLFolderType::FT_NONE,
-														   mImportedClothingName);
+		// Skip straight to fetching the contents of the imported folder
+		importedFolderFetch();
+		return;
+	}
+
+	// Remove observer; next autopopulation step will be triggered externally by LLLibraryOutfitsCopyDone.
+	gInventory.removeObserver(this);
+	
+	LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this);
+	mImportedClothingID = gInventory.createNewCategory(mClothingID,
+													   LLFolderType::FT_NONE,
+													   mImportedClothingName);
+	// Copy each folder from library into clothing unless it already exists.
+	for (clothing_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin();
+		 iter != mLibraryClothingFolders.end();
+		 ++iter)
+	{
+		const LLUUID& src_folder_id = (*iter); // Library clothing folder ID
+		const LLViewerInventoryCategory *cat = gInventory.getCategory(src_folder_id);
+		if (!cat)
+		{
+			llwarns << "Library folder import for uuid:" << src_folder_id << " failed to find folder." << llendl;
+			continue;
+		}
 		
-		for (cloth_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin();
-			 iter != mLibraryClothingFolders.end();
-			 ++iter)
+		if (!LLAppearanceManager::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id))
 		{
-			LLUUID folder_id = gInventory.createNewCategory(mImportedClothingID,
-															LLFolderType::FT_NONE,
-															iter->second);
-			LLAppearanceManager::getInstance()->shallowCopyCategoryContents(iter->first, folder_id, copy_waiter);
+			llinfos << "Skipping non-outfit folder name:" << cat->getName() << llendl;
+			continue;
 		}
-	}
-	else
-	{
-		// Skip straight to fetching the contents of the imported folder
-		importedFolderFetch();
+		
+		// Don't copy the category if it already exists.
+		LLNameCategoryCollector matchFolderFunctor(cat->getName());
+		LLInventoryModel::cat_array_t cat_array;
+		LLInventoryModel::item_array_t wearable_array;
+		gInventory.collectDescendentsIf(mImportedClothingID, 
+										cat_array, wearable_array, 
+										LLInventoryModel::EXCLUDE_TRASH,
+										matchFolderFunctor);
+		if (cat_array.size() > 0)
+		{
+			continue;
+		}
+
+		LLUUID dst_folder_id = gInventory.createNewCategory(mImportedClothingID,
+															LLFolderType::FT_NONE,
+															cat->getName());
+		LLAppearanceManager::getInstance()->shallowCopyCategoryContents(src_folder_id, dst_folder_id, copy_waiter);
 	}
 }
 
@@ -2476,7 +2512,7 @@ void LLLibraryOutfitsFetch::importedFolderDone(void)
 		
 		// Get the name of every imported outfit
 		folders.push_back(cat->getUUID());
-		mImportedClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName()));
+		mImportedClothingFolders.push_back(cat->getUUID());
 	}
 	
 	mCompleteFolders.clear();
@@ -2492,17 +2528,25 @@ void LLLibraryOutfitsFetch::contentsDone(void)
 	LLInventoryModel::cat_array_t cat_array;
 	LLInventoryModel::item_array_t wearable_array;
 	
-	for (cloth_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin();
+	for (clothing_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin();
 		 folder_iter != mImportedClothingFolders.end();
 		 ++folder_iter)
 	{
+		const LLUUID &folder_id = (*folder_iter);
+		const LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id);
+		if (!cat)
+		{
+			llwarns << "Library folder import for uuid:" << folder_id << " failed to find folder." << llendl;
+			continue;
+		}
+		
 		// First, make a folder in the My Outfits directory.
-		LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, folder_iter->second);
+		LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, cat->getName());
 		
 		cat_array.clear();
 		wearable_array.clear();
 		// Collect the contents of each imported clothing folder, so we can create new outfit links for it
-		gInventory.collectDescendents(folder_iter->first, cat_array, wearable_array, 
+		gInventory.collectDescendents(folder_id, cat_array, wearable_array, 
 									  LLInventoryModel::EXCLUDE_TRASH);
 		
 		for (LLInventoryModel::item_array_t::const_iterator wearable_iter = wearable_array.begin();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 71df064236..f08d8decfe 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -528,22 +528,29 @@ public:
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
 		LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL;
 
-		gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
-			
-		if (item && linked_item)
+		if (linked_item)
 		{
-			LLFoundData found(linked_item->getUUID(),
-							  linked_item->getAssetUUID(),
-							  linked_item->getName(),
-							  linked_item->getType(),
-							  linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
-				);
-			found.mWearable = mWearable;
-			mHolder->mFoundList.push_front(found);
+			gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
+			
+			if (item)
+			{
+				LLFoundData found(linked_item->getUUID(),
+						  linked_item->getAssetUUID(),
+						  linked_item->getName(),
+						  linked_item->getType(),
+						  linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
+						  );
+				found.mWearable = mWearable;
+				mHolder->mFoundList.push_front(found);
+			}
+			else
+			{
+				llwarns << "inventory item not found for recovered wearable" << llendl;
+			}
 		}
 		else
 		{
-			llwarns << "inventory item or link not found for recovered wearable" << llendl;
+			llwarns << "inventory link not found for recovered wearable" << llendl;
 		}
 	}
 private:
@@ -568,12 +575,16 @@ public:
 		mWearable->setItemID(item_id);
 		LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder);
 		mHolder->mTypesToRecover.erase(mType);
-		link_inventory_item( gAgent.getID(),
-							 item_id,
-							 LLAppearanceManager::instance().getCOF(),
-							 itemp->getName(),
-							 LLAssetType::AT_LINK,
-							 cb);
+		llassert(itemp);
+		if (itemp)
+		{
+			link_inventory_item( gAgent.getID(),
+					     item_id,
+					     LLAppearanceManager::instance().getCOF(),
+					     itemp->getName(),
+					     LLAssetType::AT_LINK,
+					     cb);
+		}
 	}
 private:
 	LLWearableHoldingPattern* mHolder;
@@ -796,47 +807,91 @@ void LLAppearanceManager::shallowCopyCategory(const LLUUID& src_id, const LLUUID
 void LLAppearanceManager::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id,
 													  LLPointer<LLInventoryCallback> cb)
 {
-	LLInventoryModel::cat_array_t cats;
-	LLInventoryModel::item_array_t items;
-	gInventory.collectDescendents(src_id, cats, items,
-								  LLInventoryModel::EXCLUDE_TRASH);
-	for (S32 i = 0; i < items.count(); ++i)
+	LLInventoryModel::cat_array_t* cats;
+	LLInventoryModel::item_array_t* items;
+	gInventory.getDirectDescendentsOf(src_id, cats, items);
+	for (LLInventoryModel::item_array_t::const_iterator iter = items->begin();
+		 iter != items->end();
+		 ++iter)
 	{
-		const LLViewerInventoryItem* item = items.get(i).get();
-		if (item->getActualType() == LLAssetType::AT_LINK)
-		{
-			link_inventory_item(gAgent.getID(),
-								item->getLinkedUUID(),
-								dst_id,
-								item->getName(),
-								LLAssetType::AT_LINK, cb);
-		}
-		else if (item->getActualType() == LLAssetType::AT_LINK_FOLDER)
+		const LLViewerInventoryItem* item = (*iter);
+		switch (item->getActualType())
 		{
-			LLViewerInventoryCategory *catp = item->getLinkedCategory();
-			// Skip copying outfit links.
-			if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT)
+			case LLAssetType::AT_LINK:
 			{
 				link_inventory_item(gAgent.getID(),
 									item->getLinkedUUID(),
 									dst_id,
 									item->getName(),
-									LLAssetType::AT_LINK_FOLDER, cb);
+									LLAssetType::AT_LINK, cb);
+				break;
 			}
+			case LLAssetType::AT_LINK_FOLDER:
+			{
+				LLViewerInventoryCategory *catp = item->getLinkedCategory();
+				// Skip copying outfit links.
+				if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT)
+				{
+					link_inventory_item(gAgent.getID(),
+										item->getLinkedUUID(),
+										dst_id,
+										item->getName(),
+										LLAssetType::AT_LINK_FOLDER, cb);
+				}
+				break;
+			}
+			case LLAssetType::AT_CLOTHING:
+			case LLAssetType::AT_OBJECT:
+			case LLAssetType::AT_BODYPART:
+			case LLAssetType::AT_GESTURE:
+			{
+				copy_inventory_item(gAgent.getID(),
+									item->getPermissions().getOwner(),
+									item->getUUID(),
+									dst_id,
+									item->getName(),
+									cb);
+				break;
+			}
+			default:
+				// Ignore non-outfit asset types
+				break;
 		}
-		else
+	}
+}
+
+BOOL LLAppearanceManager::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
+{
+	// These are the wearable items that are required for considering this
+	// folder as containing a complete outfit.
+	U32 required_wearables = 0;
+	required_wearables |= 1LL << WT_SHAPE;
+	required_wearables |= 1LL << WT_SKIN;
+	required_wearables |= 1LL << WT_HAIR;
+	required_wearables |= 1LL << WT_EYES;
+
+	// These are the wearables that the folder actually contains.
+	U32 folder_wearables = 0;
+	LLInventoryModel::cat_array_t* cats;
+	LLInventoryModel::item_array_t* items;
+	gInventory.getDirectDescendentsOf(folder_id, cats, items);
+	for (LLInventoryModel::item_array_t::const_iterator iter = items->begin();
+		 iter != items->end();
+		 ++iter)
+	{
+		const LLViewerInventoryItem* item = (*iter);
+		if (item->isWearableType())
 		{
-			copy_inventory_item(
-				gAgent.getID(),
-				item->getPermissions().getOwner(),
-				item->getUUID(),
-				dst_id,
-				item->getName(),
-				cb);
+			const EWearableType wearable_type = item->getWearableType();
+			folder_wearables |= 1LL << wearable_type;
 		}
 	}
+
+	// If the folder contains the required wearables, return TRUE.
+	return ((required_wearables & folder_wearables) == required_wearables);
 }
 
+
 void LLAppearanceManager::purgeBaseOutfitLink(const LLUUID& category)
 {
 	LLInventoryModel::cat_array_t cats;
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index e7e2f33520..9d6cd34ad7 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -60,6 +60,9 @@ public:
 	void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id,
 							 LLPointer<LLInventoryCallback> cb);
 
+	// Return whether this folder contains minimal contents suitable for making a full outfit.
+	BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
+
 	// Copy all items in a category.
 	void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id,
 									 LLPointer<LLInventoryCallback> cb);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 948d38befb..bdfe0d9142 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -304,7 +304,8 @@ static std::string gLaunchFileOnQuit;
 
 // Used on Win32 for other apps to identify our window (eg, win_setup)
 const char* const VIEWER_WINDOW_CLASSNAME = "Second Life";
-
+static const S32 FIRST_RUN_WINDOW_WIDTH = 1024;
+static const S32 FIRST_RUN_WINDOW_HIGHT = 768;
 //----------------------------------------------------------------------------
 
 // List of entries from strings.xml to always replace
@@ -702,9 +703,9 @@ bool LLAppViewer::init()
 	settings_map["account"] = &gSavedPerAccountSettings;
 
 	LLUI::initClass(settings_map,
-					LLUIImageList::getInstance(),
-					ui_audio_callback,
-					&LLUI::sGLScaleFactor);
+		LLUIImageList::getInstance(),
+		ui_audio_callback,
+		&LLUI::sGLScaleFactor);
 	
 	// Setup paths and LLTrans after LLUI::initClass has been called
 	LLUI::setupPaths();
@@ -1515,7 +1516,7 @@ bool LLAppViewer::cleanup()
 	LLAvatarIconIDCache::getInstance()->save();
 
 	llinfos << "Shutting down Threads" << llendflush;
-	
+
 	// Let threads finish
 	LLTimer idleTimer;
 	idleTimer.reset();
@@ -1529,19 +1530,26 @@ bool LLAppViewer::cleanup()
 		pending += LLVFSThread::updateClass(0);
 		pending += LLLFSThread::updateClass(0);
 		F64 idle_time = idleTimer.getElapsedTimeF64();
-		if (!pending || idle_time >= max_idle_time)
+		if(!pending)
+		{
+			break ; //done
+		}
+		else if(idle_time >= max_idle_time)
 		{
 			llwarns << "Quitting with pending background tasks." << llendl;
 			break;
 		}
 	}
-	
+
 	// Delete workers first
 	// shotdown all worker threads before deleting them in case of co-dependencies
 	sTextureCache->shutdown();
 	sTextureFetch->shutdown();
 	sImageDecodeThread->shutdown();
 	
+	sTextureFetch->shutDownTextureCacheThread() ;
+	sTextureFetch->shutDownImageDecodeThread() ;
+
 	delete sTextureCache;
     sTextureCache = NULL;
 	delete sTextureFetch;
@@ -2362,12 +2370,35 @@ bool LLAppViewer::initWindow()
 	// store setting in a global for easy access and modification
 	gNoRender = gSavedSettings.getBOOL("DisableRendering");
 
+	S32 window_x = gSavedSettings.getS32("WindowX");
+	S32 window_y = gSavedSettings.getS32("WindowY");
+	S32 window_width = gSavedSettings.getS32("WindowWidth");
+	S32 window_height = gSavedSettings.getS32("WindowHeight");
+
+	bool show_maximized = gSavedSettings.getBOOL("WindowMaximized");
+
+	bool first_run = gSavedSettings.getBOOL("FirstLoginThisInstall");
+
+	if (first_run)//for first login 
+	{
+		window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded
+		window_height = FIRST_RUN_WINDOW_HIGHT;
+		
+		//if screen resolution is lower then 1024*768 then show maximized
+		LLDisplayInfo display_info;
+		if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH
+			|| display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HIGHT)
+		{
+			show_maximized = true;
+		}
+	}
+
 	// always start windowed
 	BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
 	gViewerWindow = new LLViewerWindow(gWindowTitle, 
 		VIEWER_WINDOW_CLASSNAME,
-		gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
-		gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
+		window_x, window_y,
+		window_width, window_height,
 		FALSE, ignorePixelDepth);
 
 	LLNotificationsUI::LLNotificationManager::getInstance();
@@ -2378,7 +2409,7 @@ bool LLAppViewer::initWindow()
 		gViewerWindow->toggleFullscreen(FALSE);
 	}
 	
-	if (gSavedSettings.getBOOL("WindowMaximized"))
+	if (show_maximized)
 	{
 		gViewerWindow->mWindow->maximize();
 		gViewerWindow->getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio"));
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index f8f8f50cd6..80d9b14345 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -392,7 +392,12 @@ void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
 		_exit(1);
 	}
 	
-	// TODO:palmer REMOVE THIS VERY SOON.  THIS WILL NOT BE IN VIEWER 2.0
+	// TODO from palmer: Find a better way to handle managing old crash logs
+	// when this is a separate imbedable module.  Ideally just sort crash stack
+	// logs based on date, and grab the latest one as opposed to deleting them
+	// for thoughts on what the module would look like.
+	// See: https://wiki.lindenlab.com/wiki/Viewer_Crash_Reporter_Round_4
+	
 	// Remove the crash stack log from previous executions.
 	// Since we've started logging a new instance of the app, we can assume 
 	// The old crash stack is invalid for the next crash report.
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 50d8672083..45c540b3a3 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -183,6 +183,15 @@ void LLAvatarList::sortByName()
 	sort();
 }
 
+void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/)
+{
+	mDirty = val;
+	if(mDirty && force_refresh)
+	{
+		refresh();
+	}
+}
+
 //////////////////////////////////////////////////////////////////////////
 // PROTECTED SECTION
 //////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 0e4215e91a..00c72f1f9d 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -73,7 +73,7 @@ public:
 	virtual void clear();
 
 	void setNameFilter(const std::string& filter);
-	void setDirty(bool val = true)						{ mDirty = val; }
+	void setDirty(bool val = true, bool force_refresh = false);
 	uuid_vector_t& getIDs() 							{ return mIDs; }
 	bool contains(const LLUUID& id);
 
diff --git a/indra/newview/llclassifiedstatsresponder.cpp b/indra/newview/llclassifiedstatsresponder.cpp
index ecd1879090..95f17aa7ba 100644
--- a/indra/newview/llclassifiedstatsresponder.cpp
+++ b/indra/newview/llclassifiedstatsresponder.cpp
@@ -43,11 +43,12 @@
 #include "llview.h"
 #include "message.h"
 
-LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id)
-: mClassifiedPanelHandle(classified_panel_handle),
+LLClassifiedStatsResponder::LLClassifiedStatsResponder(LLUUID classified_id)
+:
 mClassifiedID(classified_id)
 {
 }
+
 /*virtual*/
 void LLClassifiedStatsResponder::result(const LLSD& content)
 {
@@ -58,17 +59,12 @@ void LLClassifiedStatsResponder::result(const LLSD& content)
 	S32 search_map = content["search_map_clicks"].asInteger();
 	S32 search_profile = content["search_profile_clicks"].asInteger();
 
-	LLPanelClassified* classified_panelp = (LLPanelClassified*)mClassifiedPanelHandle.get();
-
-	if(classified_panelp)
-	{
-		classified_panelp->setClickThrough(mClassifiedID, 
-											teleport + search_teleport, 
-											map + search_map,
-											profile + search_profile,
-											true);
-	}
-
+	LLPanelClassifiedInfo::setClickThrough(
+		mClassifiedID, 
+		teleport + search_teleport, 
+		map + search_map,
+		profile + search_profile,
+		true);
 }
 
 /*virtual*/
@@ -77,5 +73,3 @@ void LLClassifiedStatsResponder::error(U32 status, const std::string& reason)
 	llinfos << "LLClassifiedStatsResponder::error("
 		<< status << ": " << reason << ")" << llendl;
 }
-
-
diff --git a/indra/newview/llclassifiedstatsresponder.h b/indra/newview/llclassifiedstatsresponder.h
index 9c52ed5ae1..4a74f7b129 100644
--- a/indra/newview/llclassifiedstatsresponder.h
+++ b/indra/newview/llclassifiedstatsresponder.h
@@ -40,7 +40,7 @@
 class LLClassifiedStatsResponder : public LLHTTPClient::Responder
 {
 public:
-	LLClassifiedStatsResponder(LLHandle<LLView> classified_panel_handle, LLUUID classified_id);
+	LLClassifiedStatsResponder(LLUUID classified_id);
 	//If we get back a normal response, handle it here
 	virtual void result(const LLSD& content);
 	//If we get back an error (not found, etc...), handle it here
@@ -48,7 +48,6 @@ public:
 	virtual void error(U32 status, const std::string& reason);
 
 protected:
-	LLHandle<LLView> mClassifiedPanelHandle;
 	LLUUID mClassifiedID;
 };
 
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 169a963d0d..f113cc49d4 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -81,11 +81,13 @@ void LLDebugView::init()
 
 	r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), 
   									 (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
+	
 	mFastTimerView = new LLFastTimerView(r);
 	mFastTimerView->setFollowsTop();
 	mFastTimerView->setFollowsLeft();
 	mFastTimerView->setVisible(FALSE);			// start invisible
 	addChild(mFastTimerView);
+	mFastTimerView->setRect(rect);
 
 	r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), 
 									 (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 3818ee6f78..362010d65a 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -35,6 +35,7 @@
 
 #include "llscrollcontainer.h"
 #include "llwindow.h"
+#include "llviewerwindow.h"
 
 static LLDefaultChildRegistry::Register<LLExpandableTextBox> t1("expandable_text");
 
@@ -382,7 +383,7 @@ void LLExpandableTextBox::expandTextBox()
 	setFocus(TRUE);
 	// this lets us receive top_lost event(needed to collapse text box)
 	// it also draws text box above all other ui elements
-	gFocusMgr.setTopCtrl(this);
+	gViewerWindow->addPopup(this);
 
 	mExpanded = true;
 }
@@ -401,10 +402,7 @@ void LLExpandableTextBox::collapseTextBox()
 
 	updateTextBoxRect();
 
-	if(gFocusMgr.getTopCtrl() == this)
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
+	gViewerWindow->removePopup(this);
 }
 
 void LLExpandableTextBox::onFocusLost()
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h
index 58316ddb98..9d4a8aef76 100644
--- a/indra/newview/llexpandabletextbox.h
+++ b/indra/newview/llexpandabletextbox.h
@@ -144,6 +144,7 @@ public:
 	 */
 	/*virtual*/ void onTopLost();
 
+
 	/**
 	 * Draws text box, collapses text box if its expanded and its parent's position changed
 	 */
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 4fa97e789b..8bc3b5a75f 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -44,6 +44,7 @@
 #include "llfontgl.h"
 #include "llsdserialize.h"
 #include "lltooltip.h"
+#include "llbutton.h"
 
 #include "llappviewer.h"
 #include "llviewertexturelist.h"
@@ -99,6 +100,8 @@ LLFastTimerView::LLFastTimerView(const LLRect& rect)
 	FTV_NUM_TIMERS = LLFastTimer::NamedTimer::instanceCount();
 	mPrintStats = -1;	
 	mAverageCyclesPerTimer = 0;
+	setCanMinimize(false);
+	setCanClose(true);
 }
 
 
@@ -139,6 +142,18 @@ LLFastTimer::NamedTimer* LLFastTimerView::getLegendID(S32 y)
 
 BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+
+	{
+		S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
+		S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
+		if(mButtons[BUTTON_CLOSE]->getVisible()
+			&&  mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)  )
+		{
+			return LLFloater::handleMouseDown(x, y, mask);;
+		}
+	}
+	
+
 	if (x < mBarRect.mLeft) 
 	{
 		LLFastTimer::NamedTimer* idp = getLegendID(y);
@@ -188,6 +203,15 @@ BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLFastTimerView::handleMouseUp(S32 x, S32 y, MASK mask)
 {
+	{
+		S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
+		S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
+		if(mButtons[BUTTON_CLOSE]->getVisible()
+			&&  mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)  )
+		{
+			return LLFloater::handleMouseUp(x, y, mask);;
+		}
+	}
 	return FALSE;
 }
 
@@ -1191,5 +1215,8 @@ void LLFastTimerView::doAnalysis(std::string baseline, std::string target, std::
 		return ;
 	}
 }
-
+void	LLFastTimerView::onClickCloseBtn()
+{
+	setVisible(false);
+}
 
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index f5c8f23818..ac06990913 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -63,7 +63,9 @@ public:
 
 	LLFastTimer::NamedTimer* getLegendID(S32 y);
 	F64 getTime(const std::string& name);
-	
+
+protected:
+	virtual	void	onClickCloseBtn();
 private:	
 	typedef std::vector<std::vector<S32> > bar_positions_t;
 	bar_positions_t mBarStart;
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 26c6db9652..7051447409 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -102,6 +102,10 @@ public:
 	virtual void changed() { LLFloaterLand::refreshAll(); }
 };
 
+// fills target textbox with maturity info(icon and text)
+// names_floater - pointer to floater which contains strings with maturity icons filenames
+void FillMaturityTextBox(LLTextBox* target_textbox, LLFloater* names_floater);
+
 //---------------------------------------------------------------------------
 // LLFloaterLand
 //---------------------------------------------------------------------------
@@ -554,7 +558,7 @@ void LLPanelLandGeneral::refresh()
 		
 		if (regionp)
 		{
-			mContentRating->setText(regionp->getSimAccessString());
+			FillMaturityTextBox(mContentRating, gFloaterView->getParentFloater(this));
 			mLandType->setText(regionp->getSimProductName());
 		}
 
@@ -2858,7 +2862,7 @@ void LLPanelLandCovenant::refresh()
 	LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");
 	if (region_maturity)
 	{
-		region_maturity->setText(region->getSimAccessString());
+		FillMaturityTextBox(region_maturity, gFloaterView->getParentFloater(this));
 	}
 	
 	LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
@@ -2939,3 +2943,38 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name)
 		if (editor) editor->setText(name);
 	}
 }
+
+// fills target textbox with maturity info(icon and text)
+// names_floater - pointer to floater which contains strings with maturity icons filenames
+void FillMaturityTextBox(LLTextBox* target_textbox, LLFloater* names_floater)
+{
+	LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+	if (!region)
+		return;
+
+	LLStyle::Params style;
+
+	U8 sim_access = region->getSimAccess();
+
+	switch(sim_access)
+	{
+	case SIM_ACCESS_PG:
+		style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_general")));
+		break;
+
+	case SIM_ACCESS_ADULT:
+		style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_adult")));
+		break;
+
+	case SIM_ACCESS_MATURE:
+		style.image(LLUI::getUIImage(names_floater->getString("maturity_icon_moderate")));
+		break;
+
+	default:
+		break;
+	}
+
+	// any text may be here instead of "icon" except ""
+	target_textbox->setText(std::string("icon"),style);
+	target_textbox->appendText(LLViewerParcelMgr::getInstance()->getSelectionRegion()->getSimAccessString(), false);
+}
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 62ec17f89a..ee68faf84b 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -242,6 +242,12 @@ void LLFloaterMediaSettings::onBtnApply( void* userdata )
 	sInstance->commitFields();
 
 	sInstance->apply();
+
+	sInstance->mInitialValues.clear();
+	sInstance->mPanelMediaSettingsGeneral->getValues( sInstance->mInitialValues );
+	sInstance->mPanelMediaSettingsSecurity->getValues( sInstance->mInitialValues );
+	sInstance->mPanelMediaSettingsPermissions->getValues( sInstance->mInitialValues );
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 780393a9c0..8bffe9bf57 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -537,10 +537,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	{
 		childSetText("maturity_desired_textbox",  maturity_combo->getSelectedItemLabel());
 		childSetVisible("maturity_desired_combobox", false);
-
-		// Display selected maturity icons.
-		onChangeMaturity();
 	}
+
+	// Display selected maturity icons.
+	onChangeMaturity();
 	
 	// Enabled/disabled popups, might have been changed by user actions
 	// while preferences floater was closed.
@@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting()
 	if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|")
 	{
 		llwarns << "cleaning old BusyModeResponse" << llendl;
-		gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse"));
+		//LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885)
+		gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault"));
 	}
 }
 
@@ -1288,7 +1289,7 @@ BOOL LLPanelPreference::postBuild()
 	if (hasChild("media_enabled"))
 	{
 		bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia");
-		getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+		
 		getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled);
 		getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled);
 	}
@@ -1296,7 +1297,11 @@ BOOL LLPanelPreference::postBuild()
 	{
 		getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic"));
 	}
-	
+	if (hasChild("voice_call_friends_only_check"))
+	{
+		getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+	}
+
 	apply();
 	return true;
 }
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index fdf128945e..122bdc8bc7 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -557,7 +557,7 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id)
 // virtual
 void LLPanelScriptLimitsRegionMemory::setErrorStatus(U32 status, const std::string& reason)
 {
-	llerrs << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
+	llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
 }
 
 // callback from the name cache with an owner name to add to the list
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 23f19a38a6..cc807c2370 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -179,6 +179,7 @@ LLFolderView::LLFolderView(const Params& p)
 	mSourceID(p.task_id),
 	mRenameItem( NULL ),
 	mNeedsScroll( FALSE ),
+	mEnableScroll( true ),
 	mPinningSelectedItem(FALSE),
 	mNeedsAutoSelect( FALSE ),
 	mAutoSelectOverride(FALSE),
@@ -284,10 +285,7 @@ LLFolderView::~LLFolderView( void )
 
 	LLView::deleteViewByHandle(mPopupMenuHandle);
 
-	if(mRenamer == gFocusMgr.getTopCtrl())
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
+	gViewerWindow->removePopup(mRenamer);
 
 	mAutoOpenItems.removeAllNodes();
 	clearSelection();
@@ -971,7 +969,7 @@ void LLFolderView::finishRenamingItem( void )
 		mRenameItem->rename( mRenamer->getText() );
 	}
 
-	gFocusMgr.setTopCtrl( NULL );	
+	gViewerWindow->removePopup(mRenamer);
 
 	if( mRenameItem )
 	{
@@ -988,7 +986,7 @@ void LLFolderView::closeRenamer( void )
 	// will commit current name (which could be same as original name)
 	mRenamer->setFocus( FALSE );
 	mRenamer->setVisible( FALSE );
-	gFocusMgr.setTopCtrl( NULL );
+	gViewerWindow->removePopup(mRenamer);
 
 	if( mRenameItem )
 	{
@@ -1420,7 +1418,7 @@ void LLFolderView::startRenamingSelectedItem( void )
 		mRenamer->setFocus( TRUE );
 		mRenamer->setTopLostCallback(boost::bind(onRenamerLost, _1));
 		mRenamer->setFocusLostCallback(boost::bind(onRenamerLost, _1));
-		gFocusMgr.setTopCtrl( mRenamer );
+		gViewerWindow->addPopup(mRenamer);
 	}
 }
 
@@ -1901,7 +1899,7 @@ void LLFolderView::deleteAllChildren()
 {
 	if(mRenamer == gFocusMgr.getTopCtrl())
 	{
-		gFocusMgr.setTopCtrl(NULL);
+		gViewerWindow->removePopup(mRenamer);
 	}
 	LLView::deleteViewByHandle(mPopupMenuHandle);
 	mPopupMenuHandle = LLHandle<LLView>();
@@ -1913,7 +1911,7 @@ void LLFolderView::deleteAllChildren()
 
 void LLFolderView::scrollToShowSelection()
 {
-	if (mSelectedItems.size())
+	if (mEnableScroll && mSelectedItems.size())
 	{
 		mNeedsScroll = TRUE;
 	}
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index faf6a9cf23..38255b3cea 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -269,6 +269,7 @@ public:
 	void dumpSelectionInformation();
 
 	virtual S32	notify(const LLSD& info) ;
+	void setEnableScroll(bool enable_scroll) { mEnableScroll = enable_scroll; }
 	
 private:
 	void updateRenamerPosition();
@@ -300,6 +301,7 @@ protected:
 	LLLineEditor*					mRenamer;
 
 	BOOL							mNeedsScroll;
+	bool							mEnableScroll;
 	BOOL							mPinningSelectedItem;
 	LLRect							mScrollConstraintRect;
 	BOOL							mNeedsAutoSelect;
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp
index ac060cef15..18f81fe506 100644
--- a/indra/newview/llfriendcard.cpp
+++ b/indra/newview/llfriendcard.cpp
@@ -44,24 +44,28 @@
 
 // Constants;
 
-static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "InvFolder Friends";
-static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "InvFolder All";
+static const std::string INVENTORY_STRING_FRIENDS_SUBFOLDER = "Friends";
+static const std::string INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER = "All";
 
 // helper functions
 
-// NOTE: Usage of LLTrans::getString(); in next two functions to set localized
-// folders' names is caused by a hack in the LLFolderViewItem::refreshFromListener()
-// method for protected asset types.
-// So, localized names will be got from the strings with "InvFolder LABEL_NAME"
-// in the strings.xml
+// NOTE: For now Friends & All folders are created as protected folders of the LLFolderType::FT_CALLINGCARD type.
+// So, their names will be processed in the LLFolderViewItem::refreshFromListener() to be localized
+// using "InvFolder LABEL_NAME" as LLTrans::findString argument.
+
+// We must use in this file their hard-coded names to ensure found them on different locales. EXT-5829.
+// These hard-coded names will be stored in InventoryItems but shown localized in FolderViewItems
+
+// If hack in the LLFolderViewItem::refreshFromListener() to localize protected folder is removed
+// or these folders are not protected these names should be localized in another place/way.
 inline const std::string get_friend_folder_name()
 {
-	return LLTrans::getString(INVENTORY_STRING_FRIENDS_SUBFOLDER);
+	return INVENTORY_STRING_FRIENDS_SUBFOLDER;
 }
 
 inline const std::string get_friend_all_subfolder_name()
 {
-	return LLTrans::getString(INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER);
+	return INVENTORY_STRING_FRIENDS_ALL_SUBFOLDER;
 }
 
 void move_from_to_arrays(LLInventoryModel::cat_array_t& from, LLInventoryModel::cat_array_t& to)
@@ -350,9 +354,9 @@ const LLUUID& LLFriendCardsManager::findFriendAllSubfolderUUIDImpl() const
 	return findChildFolderUUID(friendFolderUUID, friendAllSubfolderName);
 }
 
-const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const
+const LLUUID& LLFriendCardsManager::findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const
 {
-	LLNameCategoryCollector matchFolderFunctor(localizedName);
+	LLNameCategoryCollector matchFolderFunctor(nonLocalizedName);
 
 	return get_folder_uuid(parentFolderUUID, matchFolderFunctor);
 }
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index b94d5ec2c0..1cda52c1d7 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -120,7 +120,7 @@ private:
 		return (mBuddyIDSet.end() != mBuddyIDSet.find(avatarID));
 	}
 
-	const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const;
+	const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const;
 	const LLUUID& findFriendFolderUUIDImpl() const;
 	const LLUUID& findFriendAllSubfolderUUIDImpl() const;
 	const LLUUID& findFriendCardInventoryUUIDImpl(const LLUUID& avatarID);
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index f3ac676edd..0e9da25c58 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -74,6 +74,11 @@ public:
 	void setNameFilter(const std::string& filter);
 	void toggleIcons();
 	bool getIconsVisible() const { return mShowIcons; }
+
+	// *WORKAROUND: two methods to overload appropriate Params due to localization issue:
+	// no_groups_msg & no_filtered_groups_msg attributes are not defined as translatable in VLT. See EXT-5931
+	void setNoGroupsMsg(const std::string& msg) { mNoGroupsMsg = msg; }
+	void setNoFilteredGroupsMsg(const std::string& msg) { mNoFilteredGroupsMsg = msg; }
 	
 private:
 	void setDirty(bool val = true)		{ mDirty = val; }
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 8cdc50eb70..77eaebb0bc 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -127,12 +127,6 @@ void LLIMFloater::onFocusReceived()
 {
 	LLIMModel::getInstance()->setActiveSessionID(mSessionID);
 
-	// return focus to the input field when active tab in the multitab container is clicked.
-	if (isChatMultiTab() && mInputEditor)
-	{
-		mInputEditor->setFocus(TRUE);
-	}
-
 	LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true);
 }
 
@@ -682,15 +676,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void*
 		//in disconnected state IM input editor should be disabled
 		self->mInputEditor->setEnabled(!gDisconnected);
 	}
-
-	// when IM Floater is a part of the multitab container LLTabContainer set focus to the first
-	// child on tab button's mouse up. This leads input field lost focus. See EXT-3852.
-	if (isChatMultiTab())
-	{
-		// So, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child.
-		// do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is.
-		gFocusMgr.setMouseCapture(NULL);
-	}
 }
 
 // static
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index d518318b0e..9eb11a6ac4 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -96,8 +96,29 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp,
 
 	LLUUID session_id = floaterp->getKey();
 
-	floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id));
-	mSessions[session_id] = floaterp;
+	LLIconCtrl* icon = 0;
+
+	if(gAgent.isInGroup(session_id, TRUE))
+	{
+		LLGroupIconCtrl::Params icon_params = LLUICtrlFactory::instance().getDefaultParams<LLGroupIconCtrl>();
+		icon_params.group_id = session_id;
+		icon = LLUICtrlFactory::instance().createWidget<LLGroupIconCtrl>(icon_params);
+
+		mSessions[session_id] = floaterp;
+		floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id));
+	}
+	else
+	{
+		LLUUID avatar_id = LLIMModel::getInstance()->getOtherParticipantID(session_id);
+
+		LLAvatarIconCtrl::Params icon_params = LLUICtrlFactory::instance().getDefaultParams<LLAvatarIconCtrl>();
+		icon_params.avatar_id = avatar_id;
+		icon = LLUICtrlFactory::instance().createWidget<LLAvatarIconCtrl>(icon_params);
+
+		mSessions[session_id] = floaterp;
+		floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id));
+	}
+	mTabContainer->setTabImage(floaterp, icon);
 }
 
 void LLIMFloaterContainer::onCloseFloater(LLUUID& id)
@@ -134,6 +155,8 @@ void LLIMFloaterContainer::setMinimized(BOOL b)
 	if (isMinimized() == b) return;
 	
 	LLMultiFloater::setMinimized(b);
+	// Hide minimized floater (see EXT-5315)
+	setVisible(!b);
 
 	if (isMinimized()) return;
 
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 1dc601e260..b3f085ef6d 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1565,7 +1565,7 @@ void LLCallDialog::onOpen(const LLSD& key)
 	LLDockableFloater::onOpen(key);
 
 	// it should be over the all floaters. EXT-5116
-	gFloaterView->bringToFront(this);
+	gFloaterView->bringToFront(this, FALSE);
 }
 
 void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 326f2a5577..83a466a243 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url)
 	U32 folder_count=0;
 	U32 max_batch_size=5;
 
-	U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
+	U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
 
 	LLSD body;
 	LLSD body_lib;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 048ed10886..8097985ade 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -681,6 +681,21 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 	return handled;
 }
 
+// virtual
+void LLInventoryPanel::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	LLPanel::onMouseEnter(x, y, mask);
+	// don't auto-scroll a list when cursor is over Inventory. See EXT-3981.
+	mFolders->setEnableScroll(false);
+}
+
+// virtual
+void LLInventoryPanel::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	LLPanel::onMouseLeave(x, y, mask);
+	mFolders->setEnableScroll(true);
+}
+
 void LLInventoryPanel::onFocusLost()
 {
 	// inventory no longer handles cut/copy/paste/delete
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index f312b588b9..928a458b84 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel
 	// Data
 	//--------------------------------------------------------------------
 public:
-	static const std::string DEFAULT_SORT_ORDER;
-	static const std::string RECENTITEMS_SORT_ORDER;
-	static const std::string INHERIT_SORT_ORDER;
-
 	struct Filter : public LLInitParam::Block<Filter>
 	{
 		Optional<U32>			sort_order;
@@ -122,6 +118,10 @@ public:
 								   void* cargo_data,
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
+
+	void onMouseEnter(S32 x, S32 y, MASK mask);
+	void onMouseLeave(S32 x, S32 y, MASK mask);
+
 	// LLUICtrl methods
 	 /*virtual*/ void onFocusLost();
 	 /*virtual*/ void onFocusReceived();
@@ -138,8 +138,6 @@ public:
 	U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
 	void setFilterSubString(const std::string& string);
 	const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
-	void setSortOrder(U32 order);
-	U32 getSortOrder() { return mFolders->getSortOrder(); }
 	void setSinceLogoff(BOOL sl);
 	void setHoursAgo(U32 hours);
 	BOOL getSinceLogoff();
@@ -178,7 +176,6 @@ protected:
 	LLInventoryModel*			mInventory;
 	LLInventoryObserver*		mInventoryObserver;
 	BOOL 						mAllowMultiSelect;
-	std::string					mSortOrderSetting;
 
 	LLFolderView*				mFolders;
 	LLScrollContainer*			mScroller;
@@ -192,6 +189,20 @@ protected:
 	 */
 	const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder;
 
+
+	//--------------------------------------------------------------------
+	// Sorting
+	//--------------------------------------------------------------------
+public:
+	static const std::string DEFAULT_SORT_ORDER;
+	static const std::string RECENTITEMS_SORT_ORDER;
+	static const std::string INHERIT_SORT_ORDER;
+	
+	void setSortOrder(U32 order);
+	U32 getSortOrder() const { return mFolders->getSortOrder(); }
+private:
+	std::string					mSortOrderSetting;
+
 	//--------------------------------------------------------------------
 	// Hidden folders
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 114fef8712..883d4cdf4b 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -47,6 +47,8 @@
 
 static LLDefaultChildRegistry::Register<LLNameListCtrl> r("name_list");
 
+static const S32 info_icon_size = 16;
+
 void LLNameListCtrl::NameTypeNames::declareValues()
 {
 	declare("INDIVIDUAL", LLNameListCtrl::INDIVIDUAL);
@@ -138,6 +140,29 @@ void LLNameListCtrl::showInspector(const LLUUID& avatar_id, bool is_group)
 		LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", avatar_id));
 }
 
+void	LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index )
+{
+	if (getHighlightedItemInx()!= target_index)
+	{
+		if(getHighlightedItemInx()!=-1)
+		{
+			LLScrollListItem* item = getItemList()[getHighlightedItemInx()];
+			LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex));
+			if(cell)
+				cell->setTextWidth(cell->getTextWidth() + info_icon_size);
+		}
+		if(target_index != -1)
+		{
+			LLScrollListItem* item = getItemList()[target_index];
+			LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex));
+			if(cell)
+				cell->setTextWidth(cell->getTextWidth() - info_icon_size);
+		}
+	}
+
+	LLScrollListCtrl::mouseOverHighlightNthItem(target_index);
+}
+
 //virtual
 BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
 {
@@ -164,7 +189,7 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
 
 				// Spawn at right side of cell
 				LLPointer<LLUIImage> icon = LLUI::getUIImage("Info_Small");
-				LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 );
+				LLCoordGL pos( sticky_rect.mRight - info_icon_size, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 );
 
 				// Should we show a group or an avatar inspector?
 				bool is_group = hit_item->getValue()["is_group"].asBoolean();
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 23b1cb6897..1c26ee5db4 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -120,6 +120,8 @@ public:
 	void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
 
 	/*virtual*/ void updateColumns();
+
+	/*virtual*/ void	mouseOverHighlightNthItem( S32 index );
 private:
 	void showInspector(const LLUUID& avatar_id, bool is_group);
 
diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 0d5c431d75..a163b6fd62 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -122,9 +122,17 @@ protected:
 class LLSysHandler : public LLEventHandler
 {
 public:
+	LLSysHandler();
 	virtual ~LLSysHandler() {};
 
 	virtual bool processNotification(const LLSD& notify)=0;
+
+protected :
+	static void init();
+	void removeExclusiveNotifications(const LLNotificationPtr& notif);
+
+	typedef std::list< std::set<std::string> > exclusive_notif_sets;
+	static exclusive_notif_sets sExclusiveNotificationGroups;
 };
 
 /**
@@ -171,6 +179,7 @@ public:
 
 protected:
 	virtual void onDeleteToast(LLToast* toast);
+	virtual void onRejectToast(const LLUUID& id);
 	virtual void initChannel();
 };
 
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 9de9998cbd..88bb769109 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -43,6 +43,75 @@
 
 using namespace LLNotificationsUI;
 
+// static
+std::list< std::set<std::string> > LLSysHandler::sExclusiveNotificationGroups;
+
+// static
+void LLSysHandler::init()
+{
+	std::set<std::string> online_offline_group;
+	online_offline_group.insert("FriendOnline");
+	online_offline_group.insert("FriendOffline");
+
+	sExclusiveNotificationGroups.push_back(online_offline_group);
+}
+
+LLSysHandler::LLSysHandler()
+{
+	if(sExclusiveNotificationGroups.empty())
+	{
+		init();
+	}
+}
+
+void LLSysHandler::removeExclusiveNotifications(const LLNotificationPtr& notif)
+{
+	LLScreenChannel* channel = dynamic_cast<LLScreenChannel *>(mChannel);
+	if (channel == NULL)
+	{
+		return;
+	}
+
+	class ExclusiveMatcher: public LLScreenChannel::Matcher
+	{
+	public:
+		ExclusiveMatcher(const std::set<std::string>& excl_group,
+				const std::string& from_name) :
+			mExclGroup(excl_group), mFromName(from_name)
+		{
+		}
+		bool matches(const LLNotificationPtr notification) const
+		{
+			for (std::set<std::string>::const_iterator it = mExclGroup.begin(); it
+					!= mExclGroup.end(); it++)
+			{
+				std::string from_name = LLHandlerUtil::getSubstitutionName(notification);
+				if (notification->getName() == *it && from_name == mFromName)
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+	private:
+		const std::set<std::string>& mExclGroup;
+		const std::string& mFromName;
+	};
+
+
+	for (exclusive_notif_sets::iterator it = sExclusiveNotificationGroups.begin(); it
+			!= sExclusiveNotificationGroups.end(); it++)
+	{
+		std::set<std::string> group = *it;
+		std::set<std::string>::iterator g_it = group.find(notif->getName());
+		if (g_it != group.end())
+		{
+			channel->killMatchedToasts(ExclusiveMatcher(group,
+					LLHandlerUtil::getSubstitutionName(notif)));
+		}
+	}
+}
+
 const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"),
 		REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM(
 				"ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER(
@@ -249,9 +318,15 @@ LLUUID LLHandlerUtil::spawnIMSession(const std::string& name, const LLUUID& from
 // static
 std::string LLHandlerUtil::getSubstitutionName(const LLNotificationPtr& notification)
 {
-	return notification->getSubstitutions().has("NAME")
+	std::string res = notification->getSubstitutions().has("NAME")
 		? notification->getSubstitutions()["NAME"]
 		: notification->getSubstitutions()["[NAME]"];
+	if (res.empty())
+	{
+		LLUUID from_id = notification->getPayload()["FROM_ID"];
+		gCacheName->getFullName(from_id, res);
+	}
+	return res;
 }
 
 // static
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index be76959d07..4e2c5085ed 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -40,6 +40,7 @@
 #include "lltoastnotifypanel.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
+#include "llnotificationmanager.h"
 
 using namespace LLNotificationsUI;
 
@@ -82,6 +83,10 @@ LLTipHandler::LLTipHandler(e_notification_type type, const LLSD& id)
 
 	// Getting a Channel for our notifications
 	mChannel = LLChannelManager::getInstance()->createNotificationChannel();
+
+	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
+	if(channel)
+		channel->setOnRejectToastCallback(boost::bind(&LLTipHandler::onRejectToast, this, _1));
 }
 
 //--------------------------------------------------------------------------
@@ -167,6 +172,8 @@ bool LLTipHandler::processNotification(const LLSD& notify)
 		p.is_tip = true;
 		p.can_be_stored = false;
 		
+		removeExclusiveNotifications(notification);
+
 		LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
 		if(channel)
 			channel->addToast(p);
@@ -185,4 +192,14 @@ void LLTipHandler::onDeleteToast(LLToast* toast)
 
 //--------------------------------------------------------------------------
 
+void LLTipHandler::onRejectToast(const LLUUID& id)
+{
+	LLNotificationPtr notification = LLNotifications::instance().find(id);
 
+	if (notification
+			&& LLNotificationManager::getInstance()->getHandlerForNotification(
+					notification->getType()) == this)
+	{
+		LLNotifications::instance().cancel(notification);
+	}
+}
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index b4c13da91e..115c7a1aa5 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -41,6 +41,7 @@
 #include "lldir.h"
 #include "lldispatcher.h"
 #include "llfloaterreg.h"
+#include "llhttpclient.h"
 #include "llnotifications.h"
 #include "llnotificationsutil.h"
 #include "llparcel.h"
@@ -83,6 +84,7 @@ const S32 DECLINE_TO_STATE = 0;
 
 //static
 std::list<LLPanelClassified*> LLPanelClassified::sAllPanels;
+std::list<LLPanelClassifiedInfo*> LLPanelClassifiedInfo::sAllPanels;
 
 // "classifiedclickthrough"
 // strings[0] = classified_id
@@ -103,15 +105,32 @@ public:
 		S32 teleport_clicks = atoi(strings[1].c_str());
 		S32 map_clicks = atoi(strings[2].c_str());
 		S32 profile_clicks = atoi(strings[3].c_str());
-		LLPanelClassified::setClickThrough(classified_id, teleport_clicks,
-										   map_clicks,
-										   profile_clicks,
-										   false);
+
+		LLPanelClassifiedInfo::setClickThrough(
+			classified_id, teleport_clicks, map_clicks, profile_clicks, false);
+
 		return true;
 	}
 };
 static LLDispatchClassifiedClickThrough sClassifiedClickThrough;
 
+// Just to debug errors. Can be thrown away later.
+class LLClassifiedClickMessageResponder : public LLHTTPClient::Responder
+{
+	LOG_CLASS(LLClassifiedClickMessageResponder);
+
+public:
+	// If we get back an error (not found, etc...), handle it here
+	virtual void errorWithContent(
+		U32 status,
+		const std::string& reason,
+		const LLSD& content)
+	{
+		llwarns << "Sending click message failed (" << status << "): [" << reason << "]" << llendl;
+		llwarns << "Content: [" << content << "]" << llendl;
+	}
+};
+
 
 /* Re-expose this if we need to have classified ad HTML detail
    pages.  JC
@@ -497,7 +516,7 @@ void LLPanelClassified::sendClassifiedInfoRequest()
 		if (!url.empty())
 		{
 			llinfos << "Classified stat request via capability" << llendl;
-			LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(((LLView*)this)->getHandle(), mClassifiedID));
+			LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(mClassifiedID));
 		}
 	}
 }
@@ -1155,11 +1174,23 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo()
  , mInfoLoaded(false)
  , mScrollingPanel(NULL)
  , mScrollContainer(NULL)
+ , mScrollingPanelMinHeight(0)
+ , mScrollingPanelWidth(0)
+ , mSnapshotStreched(false)
+ , mTeleportClicksOld(0)
+ , mMapClicksOld(0)
+ , mProfileClicksOld(0)
+ , mTeleportClicksNew(0)
+ , mMapClicksNew(0)
+ , mProfileClicksNew(0)
+ , mSnapshotCtrl(NULL)
 {
+	sAllPanels.push_back(this);
 }
 
 LLPanelClassifiedInfo::~LLPanelClassifiedInfo()
 {
+	sAllPanels.remove(this);
 }
 
 // static
@@ -1182,6 +1213,9 @@ BOOL LLPanelClassifiedInfo::postBuild()
 	mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
 	mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
 
+	mSnapshotCtrl = getChild<LLTextureCtrl>("classified_snapshot");
+	mSnapshotRect = getDefaultSnapshotRect();
+
 	return TRUE;
 }
 
@@ -1213,11 +1247,14 @@ void LLPanelClassifiedInfo::reshape(S32 width, S32 height, BOOL called_from_pare
 	{
 		mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height);
 	}
+
+	mSnapshotRect = getDefaultSnapshotRect();
+	stretchSnapshot();
 }
 
 void LLPanelClassifiedInfo::onOpen(const LLSD& key)
 {
-	LLUUID avatar_id = key["avatar_id"];
+	LLUUID avatar_id = key["classified_creator_id"];
 	if(avatar_id.isNull())
 	{
 		return;
@@ -1232,14 +1269,35 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key)
 
 	resetData();
 	resetControls();
+	scrollToTop();
 
 	setClassifiedId(key["classified_id"]);
-	setClassifiedName(key["name"]);
-	setDescription(key["desc"]);
-	setSnapshotId(key["snapshot_id"]);
+	setClassifiedName(key["classified_name"]);
+	setDescription(key["classified_desc"]);
+	setSnapshotId(key["classified_snapshot_id"]);
+	setFromSearch(key["from_search"]);
+
+	llinfos << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << llendl;
 
 	LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this);
 	LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
+	gGenericDispatcher.addHandler("classifiedclickthrough", &sClassifiedClickThrough);
+
+	// While we're at it let's get the stats from the new table if that
+	// capability exists.
+	std::string url = gAgent.getRegion()->getCapability("SearchStatRequest");
+	if (!url.empty())
+	{
+		llinfos << "Classified stat request via capability" << llendl;
+		LLSD body;
+		body["classified_id"] = getClassifiedId();
+		LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(getClassifiedId()));
+	}
+
+	// Update classified click stats.
+	// *TODO: Should we do this when opening not from search?
+	sendClickMessage("profile");
+
 	setInfoLoaded(false);
 }
 
@@ -1255,20 +1313,32 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
 			setSnapshotId(c_info->snapshot_id);
 			setParcelId(c_info->parcel_id);
 			setPosGlobal(c_info->pos_global);
+			setSimName(c_info->sim_name);
+
 			setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global));
 			childSetValue("category", LLClassifiedInfo::sCategories[c_info->category]);
 
 			static std::string mature_str = getString("type_mature");
 			static std::string pg_str = getString("type_pg");
 			static LLUIString  price_str = getString("l$_price");
+			static std::string date_fmt = getString("date_fmt");
 
 			bool mature = is_cf_mature(c_info->flags);
 			childSetValue("content_type", mature ? mature_str : pg_str);
-			childSetValue("auto_renew", is_cf_auto_renew(c_info->flags));
+			getChild<LLIconCtrl>("content_type_moderate")->setVisible(mature);
+			getChild<LLIconCtrl>("content_type_general")->setVisible(!mature);
+
+			std::string auto_renew_str = is_cf_auto_renew(c_info->flags) ? 
+				getString("auto_renew_on") : getString("auto_renew_off");
+			childSetValue("auto_renew", auto_renew_str);
 
 			price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing));
 			childSetValue("price_for_listing", LLSD(price_str));
 
+			std::string date_str = date_fmt;
+			LLStringUtil::format(date_str, LLSD().with("datetime", (S32) c_info->creation_date));
+			childSetText("creation_date", date_str);
+
 			setInfoLoaded(true);
 		}
 	}
@@ -1281,23 +1351,38 @@ void LLPanelClassifiedInfo::resetData()
 	setClassifiedLocation(LLStringUtil::null);
 	setClassifiedId(LLUUID::null);
 	setSnapshotId(LLUUID::null);
-	mPosGlobal.clearVec();
-	childSetValue("category", LLStringUtil::null);
-	childSetValue("content_type", LLStringUtil::null);
+	setPosGlobal(LLVector3d::zero);
+	setParcelId(LLUUID::null);
+	setSimName(LLStringUtil::null);
+	setFromSearch(false);
+
+	// reset click stats
+	mTeleportClicksOld	= 0;
+	mMapClicksOld		= 0;
+	mProfileClicksOld	= 0;
+	mTeleportClicksNew	= 0;
+	mMapClicksNew		= 0;
+	mProfileClicksNew	= 0;
+
+	childSetText("category", LLStringUtil::null);
+	childSetText("content_type", LLStringUtil::null);
+	childSetText("click_through_text", LLStringUtil::null);
+	childSetText("price_for_listing", LLStringUtil::null);
+	childSetText("auto_renew", LLStringUtil::null);
+	childSetText("creation_date", LLStringUtil::null);
+	childSetText("click_through_text", LLStringUtil::null);
+	getChild<LLIconCtrl>("content_type_moderate")->setVisible(FALSE);
+	getChild<LLIconCtrl>("content_type_general")->setVisible(FALSE);
 }
 
 void LLPanelClassifiedInfo::resetControls()
 {
-	if(getAvatarId() == gAgent.getID())
-	{
-		childSetEnabled("edit_btn", TRUE);
-		childSetVisible("edit_btn", TRUE);
-	}
-	else
-	{
-		childSetEnabled("edit_btn", FALSE);
-		childSetVisible("edit_btn", FALSE);
-	}
+	bool is_self = getAvatarId() == gAgent.getID();
+
+	childSetEnabled("edit_btn", is_self);
+	childSetVisible("edit_btn", is_self);
+	childSetVisible("price_layout_panel", is_self);
+	childSetVisible("clickthrough_layout_panel", is_self);
 }
 
 void LLPanelClassifiedInfo::setClassifiedName(const std::string& name)
@@ -1327,7 +1412,20 @@ void LLPanelClassifiedInfo::setClassifiedLocation(const std::string& location)
 
 void LLPanelClassifiedInfo::setSnapshotId(const LLUUID& id)
 {
-	childSetValue("classified_snapshot", id);
+	mSnapshotCtrl->setValue(id);
+	mSnapshotStreched = false;
+}
+
+void LLPanelClassifiedInfo::draw()
+{
+	LLPanel::draw();
+
+	// Stretch in draw because it takes some time to load a texture,
+	// going to try to stretch snapshot until texture is loaded
+	if(!mSnapshotStreched)
+	{
+		stretchSnapshot();
+	}
 }
 
 LLUUID LLPanelClassifiedInfo::getSnapshotId()
@@ -1336,6 +1434,69 @@ LLUUID LLPanelClassifiedInfo::getSnapshotId()
 }
 
 // static
+void LLPanelClassifiedInfo::setClickThrough(
+	const LLUUID& classified_id,
+	S32 teleport,
+	S32 map,
+	S32 profile,
+	bool from_new_table)
+{
+	llinfos << "Click-through data for classified " << classified_id << " arrived: ["
+			<< teleport << ", " << map << ", " << profile << "] ("
+			<< (from_new_table ? "new" : "old") << ")" << llendl;
+
+	for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
+	{
+		LLPanelClassifiedInfo* self = *iter;
+		if (self->getClassifiedId() != classified_id)
+		{
+			continue;
+		}
+
+		// *HACK: Skip LLPanelClassifiedEdit instances: they don't display clicks data.
+		// Those instances should not be in the list at all.
+		if (typeid(*self) != typeid(LLPanelClassifiedInfo))
+		{
+			continue;
+		}
+
+		llinfos << "Updating classified info panel" << llendl;
+
+		// We need to check to see if the data came from the new stat_table 
+		// or the old classified table. We also need to cache the data from 
+		// the two separate sources so as to display the aggregate totals.
+
+		if (from_new_table)
+		{
+			self->mTeleportClicksNew = teleport;
+			self->mMapClicksNew = map;
+			self->mProfileClicksNew = profile;
+		}
+		else
+		{
+			self->mTeleportClicksOld = teleport;
+			self->mMapClicksOld = map;
+			self->mProfileClicksOld = profile;
+		}
+
+		static LLUIString ct_str = self->getString("click_through_text_fmt");
+
+		ct_str.setArg("[TELEPORT]",	llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld));
+		ct_str.setArg("[MAP]",		llformat("%d", self->mMapClicksNew + self->mMapClicksOld));
+		ct_str.setArg("[PROFILE]",	llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld));
+
+		self->childSetText("click_through_text", ct_str.getString());
+		// *HACK: remove this when there is enough room for click stats in the info panel
+		self->childSetToolTip("click_through_text", ct_str.getString());  
+
+		llinfos << "teleport: " << llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld)
+				<< ", map: "    << llformat("%d", self->mMapClicksNew + self->mMapClicksOld)
+				<< ", profile: " << llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld)
+				<< llendl;
+	}
+}
+
+// static
 std::string LLPanelClassifiedInfo::createLocationText(
 	const std::string& original_name, 
 	const std::string& sim_name, 
@@ -1366,8 +1527,100 @@ std::string LLPanelClassifiedInfo::createLocationText(
 	return location_text;
 }
 
+void LLPanelClassifiedInfo::stretchSnapshot()
+{
+	// *NOTE dzaporozhan
+	// Could be moved to LLTextureCtrl
+
+	LLViewerFetchedTexture* texture = mSnapshotCtrl->getTexture();
+
+	if(!texture)
+	{
+		return;
+	}
+
+	if(0 == texture->getOriginalWidth() || 0 == texture->getOriginalHeight())
+	{
+		// looks like texture is not loaded yet
+		return;
+	}
+
+	LLRect rc = mSnapshotRect;
+	// *HACK dzaporozhan
+	// LLTextureCtrl uses BTN_HEIGHT_SMALL as bottom for texture which causes
+	// drawn texture to be smaller than expected. (see LLTextureCtrl::draw())
+	// Lets increase texture height to force texture look as expected.
+	rc.mBottom -= BTN_HEIGHT_SMALL;
+
+	F32 t_width = texture->getFullWidth();
+	F32 t_height = texture->getFullHeight();
+
+	F32 ratio = llmin<F32>( (rc.getWidth() / t_width), (rc.getHeight() / t_height) );
+
+	t_width *= ratio;
+	t_height *= ratio;
+
+	rc.setCenterAndSize(rc.getCenterX(), rc.getCenterY(), llfloor(t_width), llfloor(t_height));
+	mSnapshotCtrl->setShape(rc);
+
+	mSnapshotStreched = true;
+}
+
+LLRect LLPanelClassifiedInfo::getDefaultSnapshotRect()
+{
+	// Using scroll container makes getting default rect a hard task
+	// because rect in postBuild() and in first reshape() is not the same.
+	// Using snapshot_panel makes it easier to reshape snapshot.
+	return getChild<LLUICtrl>("snapshot_panel")->getLocalRect();
+}
+
+void LLPanelClassifiedInfo::scrollToTop()
+{
+	LLScrollContainer* scrollContainer = findChild<LLScrollContainer>("profile_scroll");
+	if (scrollContainer)
+		scrollContainer->goToTop();
+}
+
+// static
+// *TODO: move out of the panel
+void LLPanelClassifiedInfo::sendClickMessage(
+		const std::string& type,
+		bool from_search,
+		const LLUUID& classified_id,
+		const LLUUID& parcel_id,
+		const LLVector3d& global_pos,
+		const std::string& sim_name)
+{
+	// You're allowed to click on your own ads to reassure yourself
+	// that the system is working.
+	LLSD body;
+	body["type"]			= type;
+	body["from_search"]		= from_search;
+	body["classified_id"]	= classified_id;
+	body["parcel_id"]		= parcel_id;
+	body["dest_pos_global"]	= global_pos.getValue();
+	body["region_name"]		= sim_name;
+
+	std::string url = gAgent.getRegion()->getCapability("SearchStatTracking");
+	llinfos << "Sending click msg via capability (url=" << url << ")" << llendl;
+	llinfos << "body: [" << body << "]" << llendl;
+	LLHTTPClient::post(url, body, new LLClassifiedClickMessageResponder());
+}
+
+void LLPanelClassifiedInfo::sendClickMessage(const std::string& type)
+{
+	sendClickMessage(
+		type,
+		fromSearch(),
+		getClassifiedId(),
+		getParcelId(),
+		getPosGlobal(),
+		getSimName());
+}
+
 void LLPanelClassifiedInfo::onMapClick()
 {
+	sendClickMessage("map");
 	LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal());
 	LLFloaterReg::showInstance("world_map", "center");
 }
@@ -1376,6 +1629,7 @@ void LLPanelClassifiedInfo::onTeleportClick()
 {
 	if (!getPosGlobal().isExactlyZero())
 	{
+		sendClickMessage("teleport");
 		gAgent.teleportViaLocation(getPosGlobal());
 		LLFloaterWorldMap::getInstance()->trackLocation(getPosGlobal());
 	}
@@ -1384,6 +1638,7 @@ void LLPanelClassifiedInfo::onTeleportClick()
 void LLPanelClassifiedInfo::onExit()
 {
 	LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(), this);
+	gGenericDispatcher.addHandler("classifiedclickthrough", NULL); // deregister our handler
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1397,6 +1652,7 @@ LLPanelClassifiedEdit::LLPanelClassifiedEdit()
  : LLPanelClassifiedInfo()
  , mIsNew(false)
  , mCanClose(false)
+ , mPublishFloater(NULL)
 {
 }
 
@@ -1448,6 +1704,8 @@ BOOL LLPanelClassifiedEdit::postBuild()
 	childSetAction("save_changes_btn", boost::bind(&LLPanelClassifiedEdit::onSaveClick, this));
 	childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelClassifiedEdit::onSetLocationClick, this));
 
+	mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelClassifiedEdit::onTextureSelected, this));
+
 	return TRUE;
 }
 
@@ -1457,6 +1715,8 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key)
 
 	mIsNew = classified_id.isNull();
 
+	scrollToTop();
+
 	if(mIsNew)
 	{
 		setAvatarId(gAgent.getID());
@@ -1502,6 +1762,9 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key)
 		enableEditing(false);
 	}
 
+	std::string save_btn_label = isNew() ? getString("publish_label") : getString("save_label");
+	childSetLabelArg("save_changes_btn", "[LABEL]", save_btn_label);
+
 	resetDirty();
 	setInfoLoaded(false);
 }
@@ -1521,15 +1784,17 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t
 			setPosGlobal(c_info->pos_global);
 
 			setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global));
-			getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category + 1);
+			// *HACK see LLPanelClassifiedEdit::sendUpdate()
+			getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category - 1);
 			getChild<LLComboBox>("category")->resetDirty();
 
 			bool mature = is_cf_mature(c_info->flags);
 			bool auto_renew = is_cf_auto_renew(c_info->flags);
 
-			getChild<LLComboBox>("content_type")->setCurrentByIndex(mature ? CB_ITEM_MATURE : CB_ITEM_PG);
+			getChild<LLIconsComboBox>("content_type")->setCurrentByIndex(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);
@@ -1570,12 +1835,12 @@ void LLPanelClassifiedEdit::resetDirty()
 	getChild<LLUICtrl>("price_for_listing")->resetDirty();
 }
 
-void LLPanelClassifiedEdit::setSaveCallback(const commit_callback_t& cb)
+void LLPanelClassifiedEdit::setSaveCallback(const commit_signal_t::slot_type& cb)
 {
-	getChild<LLButton>("save_changes_btn")->setClickedCallback(cb);
+	mSaveButtonClickedSignal.connect(cb);
 }
 
-void LLPanelClassifiedEdit::setCancelCallback(const commit_callback_t& cb)
+void LLPanelClassifiedEdit::setCancelCallback(const commit_signal_t::slot_type& cb)
 {
 	getChild<LLButton>("cancel_btn")->setClickedCallback(cb);
 }
@@ -1585,9 +1850,10 @@ void LLPanelClassifiedEdit::resetControls()
 	LLPanelClassifiedInfo::resetControls();
 
 	getChild<LLComboBox>("category")->setCurrentByIndex(0);
-	getChild<LLComboBox>("content_type")->setCurrentByIndex(0);
+	getChild<LLIconsComboBox>("content_type")->setCurrentByIndex(0);
 	childSetValue("auto_renew", false);
 	childSetValue("price_for_listing", MINIMUM_PRICE_FOR_LISTING);
+	childSetEnabled("price_for_listing", TRUE);
 }
 
 bool LLPanelClassifiedEdit::canClose()
@@ -1595,6 +1861,22 @@ bool LLPanelClassifiedEdit::canClose()
 	return mCanClose;
 }
 
+void LLPanelClassifiedEdit::draw()
+{
+	LLPanel::draw();
+
+	// Need to re-stretch on every draw because LLTextureCtrl::onSelectCallback
+	// does not trigger callbacks when user navigates through images.
+	stretchSnapshot();
+}
+
+void LLPanelClassifiedEdit::stretchSnapshot()
+{
+	LLPanelClassifiedInfo::stretchSnapshot();
+
+	getChild<LLUICtrl>("edit_icon")->setShape(mSnapshotCtrl->getRect());
+}
+
 void LLPanelClassifiedEdit::sendUpdate()
 {
 	LLAvatarClassifiedInfo c_data;
@@ -1608,7 +1890,9 @@ void LLPanelClassifiedEdit::sendUpdate()
 
 	c_data.agent_id = gAgent.getID();
 	c_data.classified_id = getClassifiedId();
-	c_data.category = getCategory();
+	// *HACK 
+	// Categories on server start with 1 while combo-box index starts with 0
+	c_data.category = getCategory() + 1;
 	c_data.name = getClassifiedName();
 	c_data.description = getDescription();
 	c_data.parcel_id = getParcelId();
@@ -1623,14 +1907,14 @@ void LLPanelClassifiedEdit::sendUpdate()
 U32 LLPanelClassifiedEdit::getCategory()
 {
 	LLComboBox* cat_cb = getChild<LLComboBox>("category");
-	return cat_cb->getCurrentIndex() + 1;
+	return cat_cb->getCurrentIndex();
 }
 
 U8 LLPanelClassifiedEdit::getFlags()
 {
 	bool auto_renew = childGetValue("auto_renew").asBoolean();
 
-	LLComboBox* content_cb = getChild<LLComboBox>("content_type");
+	LLComboBox* content_cb = getChild<LLIconsComboBox>("content_type");
 	bool mature = content_cb->getCurrentIndex() == CB_ITEM_MATURE;
 	
 	return pack_classified_flags_request(auto_renew, false, mature, false);
@@ -1682,6 +1966,11 @@ S32 LLPanelClassifiedEdit::getPriceForListing()
 	return childGetValue("price_for_listing").asInteger();
 }
 
+void LLPanelClassifiedEdit::setPriceForListing(S32 price)
+{
+	childSetValue("price_for_listing", price);
+}
+
 void LLPanelClassifiedEdit::onSetLocationClick()
 {
 	setPosGlobal(gAgent.getPositionGlobal());
@@ -1725,9 +2014,45 @@ void LLPanelClassifiedEdit::onSaveClick()
 		}
 	}
 
+	if(isNew())
+	{
+		mPublishFloater = LLFloaterReg::findTypedInstance<LLPublishClassifiedFloater>(
+			"publish_classified", LLSD());
+
+		if(!mPublishFloater)
+		{
+			mPublishFloater = LLFloaterReg::getTypedInstance<LLPublishClassifiedFloater>(
+				"publish_classified", LLSD());
+
+			mPublishFloater->setPublishClickedCallback(boost::bind
+				(&LLPanelClassifiedEdit::onPublishFloaterPublishClicked, this));
+		}
+
+		// set spinner value before it has focus or value wont be set
+		mPublishFloater->setPrice(getPriceForListing());
+		mPublishFloater->openFloater(mPublishFloater->getKey());
+		mPublishFloater->center();
+	}
+	else
+	{
+		doSave();
+	}
+}
+
+void LLPanelClassifiedEdit::doSave()
+{
 	mCanClose = true;
 	sendUpdate();
 	resetDirty();
+
+	mSaveButtonClickedSignal(this, LLSD());
+}
+
+void LLPanelClassifiedEdit::onPublishFloaterPublishClicked()
+{
+	setPriceForListing(mPublishFloater->getPrice());
+
+	doSave();
 }
 
 std::string LLPanelClassifiedEdit::getLocationNotice()
@@ -1774,4 +2099,52 @@ void LLPanelClassifiedEdit::onTexturePickerMouseLeave(LLUICtrl* ctrl)
 	ctrl->setVisible(FALSE);
 }
 
+void LLPanelClassifiedEdit::onTextureSelected()
+{
+	setSnapshotId(mSnapshotCtrl->getValue().asUUID());
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+LLPublishClassifiedFloater::LLPublishClassifiedFloater(const LLSD& key)
+ : LLFloater(key)
+{
+}
+
+LLPublishClassifiedFloater::~LLPublishClassifiedFloater()
+{
+}
+
+BOOL LLPublishClassifiedFloater::postBuild()
+{
+	LLFloater::postBuild();
+
+	childSetAction("publish_btn", boost::bind(&LLFloater::closeFloater, this, false));
+	childSetAction("cancel_btn", boost::bind(&LLFloater::closeFloater, this, false));
+
+	return TRUE;
+}
+
+void LLPublishClassifiedFloater::setPrice(S32 price)
+{
+	childSetValue("price_for_listing", price);
+}
+
+S32 LLPublishClassifiedFloater::getPrice()
+{
+	return childGetValue("price_for_listing").asInteger();
+}
+
+void LLPublishClassifiedFloater::setPublishClickedCallback(const commit_signal_t::slot_type& cb)
+{
+	getChild<LLButton>("publish_btn")->setClickedCallback(cb);
+}
+
+void LLPublishClassifiedFloater::setCancelClickedCallback(const commit_signal_t::slot_type& cb)
+{
+	getChild<LLButton>("cancel_btn")->setClickedCallback(cb);
+}
+
 //EOF
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index 9e33e55b88..58e7c9a4b4 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -202,8 +202,26 @@ private:
 	void* mUserData;
 };
 
+class LLPublishClassifiedFloater : public LLFloater
+{
+public:
+	LLPublishClassifiedFloater(const LLSD& key);
+	virtual ~LLPublishClassifiedFloater();
+
+	/*virtual*/ BOOL postBuild();
+
+	void setPrice(S32 price);
+	S32 getPrice();
+
+	void setPublishClickedCallback(const commit_signal_t::slot_type& cb);
+	void setCancelClickedCallback(const commit_signal_t::slot_type& cb);
+
+private:
+};
+
 class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver
 {
+	LOG_CLASS(LLPanelClassifiedInfo);
 public:
 
 	static LLPanelClassifiedInfo* create();
@@ -246,16 +264,41 @@ public:
 
 	LLUUID getParcelId() { return mParcelId; }
 
+	void setSimName(const std::string& sim_name) { mSimName = sim_name; }
+
+	std::string getSimName() { return mSimName; }
+
+	void setFromSearch(bool val) { mFromSearch = val; }
+
+	bool fromSearch() { return mFromSearch; }
+
 	bool getInfoLoaded() { return mInfoLoaded; }
 
 	void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; }
 
+	static void setClickThrough(
+		const LLUUID& classified_id,
+		S32 teleport,
+		S32 map,
+		S32 profile,
+		bool from_new_table);
+
+	static void sendClickMessage(
+			const std::string& type,
+			bool from_search,
+			const LLUUID& classified_id,
+			const LLUUID& parcel_id,
+			const LLVector3d& global_pos,
+			const std::string& sim_name);
+
 	void setExitCallback(const commit_callback_t& cb);
 
 	void setEditClassifiedCallback(const commit_callback_t& cb);
 
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
+	/*virtual*/ void draw();
+
 protected:
 
 	LLPanelClassifiedInfo();
@@ -269,16 +312,29 @@ protected:
 		const std::string& sim_name, 
 		const LLVector3d& pos_global);
 
+	void stretchSnapshot();
+	void sendClickMessage(const std::string& type);
+
+	LLRect getDefaultSnapshotRect();
+
+	void scrollToTop();
+
 	void onMapClick();
 	void onTeleportClick();
 	void onExit();
 
+	bool mSnapshotStreched;
+	LLRect mSnapshotRect;
+	LLTextureCtrl* mSnapshotCtrl;
+
 private:
 
 	LLUUID mAvatarId;
 	LLUUID mClassifiedId;
 	LLVector3d mPosGlobal;
 	LLUUID mParcelId;
+	std::string mSimName;
+	bool mFromSearch;
 	bool mInfoLoaded;
 
 	LLScrollContainer*		mScrollContainer;
@@ -286,10 +342,22 @@ private:
 
 	S32 mScrollingPanelMinHeight;
 	S32 mScrollingPanelWidth;
+
+	// Needed for stat tracking
+	S32 mTeleportClicksOld;
+	S32 mMapClicksOld;
+	S32 mProfileClicksOld;
+	S32 mTeleportClicksNew;
+	S32 mMapClicksNew;
+	S32 mProfileClicksNew;
+
+	typedef std::list<LLPanelClassifiedInfo*> panel_list_t;
+	static panel_list_t sAllPanels;
 };
 
 class LLPanelClassifiedEdit : public LLPanelClassifiedInfo
 {
+	LOG_CLASS(LLPanelClassifiedEdit);
 public:
 
 	static LLPanelClassifiedEdit* create();
@@ -306,9 +374,9 @@ public:
 
 	/*virtual*/ void resetDirty();
 
-	void setSaveCallback(const commit_callback_t& cb);
+	void setSaveCallback(const commit_signal_t::slot_type& cb);
 
-	void setCancelCallback(const commit_callback_t& cb);
+	void setCancelCallback(const commit_signal_t::slot_type& cb);
 
 	/*virtual*/ void resetControls();
 
@@ -316,6 +384,10 @@ public:
 
 	bool canClose();
 
+	void draw();
+
+	void stretchSnapshot();
+
 protected:
 
 	LLPanelClassifiedEdit();
@@ -332,6 +404,8 @@ protected:
 
 	S32 getPriceForListing();
 
+	void setPriceForListing(S32 price);
+
 	U8 getFlags();
 
 	std::string getLocationNotice();
@@ -344,12 +418,22 @@ protected:
 	void onChange();
 	void onSaveClick();
 
+	void doSave();
+
+	void onPublishFloaterPublishClicked();
+
 	void onTexturePickerMouseEnter(LLUICtrl* ctrl);
 	void onTexturePickerMouseLeave(LLUICtrl* ctrl);
 
+	void onTextureSelected();
+
 private:
 	bool mIsNew;
 	bool mCanClose;
+
+	LLPublishClassifiedFloater* mPublishFloater;
+
+	commit_signal_t mSaveButtonClickedSignal;
 };
 
 #endif // LL_LLPANELCLASSIFIED_H
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 50cfc7d177..421c9df9a1 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -117,7 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory()
 
 	// Controls
 	// *TODO: Just use persistant settings for each of these
-	U32 sort_order = gSavedSettings.getU32("InventorySortOrder");
+	U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER);
 	BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );
 	BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );
 	BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );
@@ -145,7 +145,7 @@ BOOL LLPanelMainInventory::postBuild()
 	if (mActivePanel)
 	{
 		// "All Items" is the previous only view, so it gets the InventorySortOrder
-		mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
+		mActivePanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER));
 		mActivePanel->getFilter()->markDefault();
 		mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
 		mActivePanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mActivePanel, _1, _2));
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index c02f154dc8..4f2d6374ca 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -82,6 +82,8 @@ LLPanelNearByMedia::LLPanelNearByMedia()
 	  mParcelMediaItem(NULL),
 	  mParcelAudioItem(NULL)
 {
+	mHoverTimer.stop();
+
 	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
 							gSavedSettings.getBOOL("MediaTentativeAutoPlay");
 
@@ -188,33 +190,25 @@ void LLPanelNearByMedia::onMouseLeave(S32 x, S32 y, MASK mask)
 }
 
 /*virtual*/ 
+void LLPanelNearByMedia::onTopLost()
+{
+	setVisible(FALSE);
+}
+
+
+/*virtual*/ 
 void LLPanelNearByMedia::handleVisibilityChange ( BOOL new_visibility )
 {
 	if (new_visibility)	
 	{
 		mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
-		//gFocusMgr.setTopCtrl(this);
 	}
 	else
 	{
 		mHoverTimer.stop();
-		//if (gFocusMgr.getTopCtrl() == this)
-		//{
-		//	gFocusMgr.setTopCtrl(NULL);
-		//}
 	}
 }
 
-/*virtual*/ 
-void LLPanelNearByMedia::onTopLost ()
-{
-	//LLUICtrl* new_top = gFocusMgr.getTopCtrl();
-	//if (!new_top || !new_top->hasAncestor(this))
-	//{
-	//	setVisible(FALSE);
-	//}
-}
-
 /*virtual*/
 void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
@@ -234,13 +228,6 @@ const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f;
 /*virtual*/
 void LLPanelNearByMedia::draw()
 {
-	//LLUICtrl* new_top = gFocusMgr.getTopCtrl();
-	//if (new_top != this)
-	//{
-	//	// reassert top ctrl
-	//	gFocusMgr.setTopCtrl(this);
-	//}
-
 	// keep bottom of panel on screen
 	LLRect screen_rect = calcScreenRect();
 	if (screen_rect.mBottom < 0)
@@ -549,11 +536,10 @@ void LLPanelNearByMedia::refreshParcelItems()
 	MediaClass choice = (MediaClass)choice_llsd.asInteger();
 	// Only show "special parcel items" if "All" or "Within" filter
 	// (and if media is "enabled")
-	bool should_include = gSavedSettings.getBOOL("AudioStreamingMedia") &&
-						  (choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL);
+	bool should_include = (choice == MEDIA_CLASS_ALL || choice == MEDIA_CLASS_WITHIN_PARCEL);
 	
 	// First Parcel Media: add or remove it as necessary
-	if (should_include && LLViewerMedia::hasParcelMedia())
+	if (gSavedSettings.getBOOL("AudioStreamingMedia") &&should_include && LLViewerMedia::hasParcelMedia())
 	{
 		// Yes, there is parcel media.
 		if (NULL == mParcelMediaItem)
@@ -716,11 +702,14 @@ void LLPanelNearByMedia::refreshList()
 		}
 	}
 	}	
-	mDisableAllCtrl->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") &&
+	mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") || 
+		                         gSavedSettings.getBOOL("AudioStreamingMedia")) &&
 								(LLViewerMedia::isAnyMediaShowing() || 
 								 LLViewerMedia::isParcelMediaPlaying() ||
 								 LLViewerMedia::isParcelAudioPlaying()));
-	mEnableAllCtrl->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") &&
+
+	mEnableAllCtrl->setEnabled( (gSavedSettings.getBOOL("AudioStreamingMusic") ||
+								gSavedSettings.getBOOL("AudioStreamingMedia")) &&
 							   (disabled_count > 0 ||
 								// parcel media (if we have it, and it isn't playing, enable "start")
 								(LLViewerMedia::hasParcelMedia() && ! LLViewerMedia::isParcelMediaPlaying()) ||
@@ -979,20 +968,13 @@ void LLPanelNearByMedia::onMoreLess()
 
 void LLPanelNearByMedia::updateControls()
 {
-	if (! gSavedSettings.getBOOL("AudioStreamingMedia"))
-	{
-		// Just show disabled controls
-		showDisabledControls();
-		return;
-	}
-	
 	LLUUID selected_media_id = mMediaList->getValue().asUUID();
 	
 	if (selected_media_id == PARCEL_AUDIO_LIST_ITEM_UUID)
 	{
 		if (!LLViewerMedia::hasParcelAudio() || !gSavedSettings.getBOOL("AudioStreamingMusic"))
 		{
-			// Shouldn't happen, but do this anyway
+			// disable controls if audio streaming music is disabled from preference
 			showDisabledControls();
 		}
 		else {
@@ -1005,9 +987,9 @@ void LLPanelNearByMedia::updateControls()
 	}
 	else if (selected_media_id == PARCEL_MEDIA_LIST_ITEM_UUID)
 	{
-		if (!LLViewerMedia::hasParcelMedia())
+		if (!LLViewerMedia::hasParcelMedia() || !gSavedSettings.getBOOL("AudioStreamingMedia"))
 		{
-			// Shouldn't happen, but do this anyway
+			// disable controls if audio streaming media is disabled from preference
 			showDisabledControls();
 		}
 		else {
@@ -1034,7 +1016,7 @@ void LLPanelNearByMedia::updateControls()
 	else {
 		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(selected_media_id);
 		
-		if (NULL == impl)
+		if (NULL == impl || !gSavedSettings.getBOOL("AudioStreamingMedia"))
 		{
 			showDisabledControls();
 		}
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
index 4f864519f5..af4659365f 100644
--- a/indra/newview/llpanelnearbymedia.h
+++ b/indra/newview/llpanelnearbymedia.h
@@ -53,8 +53,8 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
 	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+	/*virtual*/ void onTopLost();
 	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
-	/*virtual*/ void onTopLost ();
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
 	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
 
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 5ddbdf7f01..6fcba80845 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -770,8 +770,8 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
 		LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
 		if(object)
 		{
-			LLInventoryItem* inv = NULL;
-			if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID)))
+			const LLInventoryItem *inv = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID));
+			if (inv)
 			{
 				const LLPermissions& perm = inv->getPermissions();
 				bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index d2a518a06a..03e8ab644e 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -519,6 +519,8 @@ BOOL LLPanelPeople::postBuild()
 	mRecentList->setShowIcons("RecentListShowIcons");
 
 	mGroupList = getChild<LLGroupList>("group_list");
+	mGroupList->setNoGroupsMsg(getString("no_groups_msg"));
+	mGroupList->setNoFilteredGroupsMsg(getString("no_filtered_groups_msg"));
 
 	mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
 	mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
@@ -683,9 +685,15 @@ void LLPanelPeople::updateFriendList()
 			online_friendsp.push_back(buddy_id);
 	}
 
-	mOnlineFriendList->setDirty();
-	mAllFriendList->setDirty();
-
+	/*
+	 * Avatarlists  will be hidden by showFriendsAccordionsIfNeeded(), if they do not have items.
+	 * But avatarlist can be updated only if it is visible @see LLAvatarList::draw();   
+	 * So we need to do force update of lists to avoid inconsistency of data and view of avatarlist. 
+	 */
+	mOnlineFriendList->setDirty(true, !mOnlineFriendList->filterHasMatches());// do force update if list do NOT have items
+	mAllFriendList->setDirty(true, !mAllFriendList->filterHasMatches());
+	//update trash and other buttons according to a selected item
+	updateButtons();
 	showFriendsAccordionsIfNeeded();
 }
 
@@ -1434,9 +1442,6 @@ void LLPanelPeople::onFriendListRefreshComplete(LLUICtrl*ctrl, const LLSD& param
 	{
 		showAccordion("tab_all", param.asInteger());
 	}
-
-	LLAccordionCtrl* accordion = getChild<LLAccordionCtrl>("friends_accordion");
-	accordion->arrange();
 }
 
 void LLPanelPeople::setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed)
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 2ff2597f08..f0860e7027 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -140,10 +140,11 @@ public:
 		params["open_tab_name"] = "panel_picks";
 		params["show_tab_panel"] = "classified_details";
 		params["classified_id"] = c_info->classified_id;
-		params["classified_avatar_id"] = c_info->creator_id;
+		params["classified_creator_id"] = c_info->creator_id;
 		params["classified_snapshot_id"] = c_info->snapshot_id;
 		params["classified_name"] = c_info->name;
 		params["classified_desc"] = c_info->description;
+		params["from_search"] = true;
 		LLSideTray::getInstance()->showPanel("panel_profile_view", params);
 	}
 
@@ -174,31 +175,6 @@ LLClassifiedHandler gClassifiedHandler;
 
 //////////////////////////////////////////////////////////////////////////
 
-/**
- * Copy&Pasted from old LLPanelClassified. This class does nothing at the moment.
- * Subscribing to "classifiedclickthrough" removes a few warnings.
- */
-class LLClassifiedClickThrough : public LLDispatchHandler
-{
-public:
-
-	// "classifiedclickthrough"
-	// strings[0] = classified_id
-	// strings[1] = teleport_clicks
-	// strings[2] = map_clicks
-	// strings[3] = profile_clicks
-	virtual bool operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& strings)
-	{
-		if (strings.size() != 4) 
-			return false;
-
-		return true;
-	}
-};
 
 //-----------------------------------------------------------------------------
 // LLPanelPicks
@@ -217,12 +193,9 @@ LLPanelPicks::LLPanelPicks()
 	mClassifiedsAccTab(NULL),
 	mPanelClassifiedInfo(NULL),
 	mPanelClassifiedEdit(NULL),
-	mClickThroughDisp(NULL),
 	mNoClassifieds(false),
 	mNoPicks(false)
 {
-	mClickThroughDisp = new LLClassifiedClickThrough();
-	gGenericDispatcher.addHandler("classifiedclickthrough", mClickThroughDisp);
 }
 
 LLPanelPicks::~LLPanelPicks()
@@ -231,8 +204,6 @@ LLPanelPicks::~LLPanelPicks()
 	{
 		LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this);
 	}
-
-	delete mClickThroughDisp;
 }
 
 void* LLPanelPicks::create(void* data /* = NULL */)
@@ -607,7 +578,11 @@ void LLPanelPicks::onClickTeleport()
 	if(pick_item)
 		pos = pick_item->getPosGlobal();
 	else if(c_item)
+	{
 		pos = c_item->getPosGlobal();
+		LLPanelClassifiedInfo::sendClickMessage("teleport", false,
+			c_item->getClassifiedId(), LLUUID::null, pos, LLStringUtil::null);
+	}
 
 	if (!pos.isExactlyZero())
 	{
@@ -626,7 +601,11 @@ void LLPanelPicks::onClickMap()
 	if (pick_item)
 		pos = pick_item->getPosGlobal();
 	else if(c_item)
+	{
+		LLPanelClassifiedInfo::sendClickMessage("map", false,
+			c_item->getClassifiedId(), LLUUID::null, pos, LLStringUtil::null);
 		pos = c_item->getPosGlobal();
+	}
 
 	LLFloaterWorldMap::getInstance()->trackLocation(pos);
 	LLFloaterReg::showInstance("world_map", "center");
@@ -756,26 +735,20 @@ void LLPanelPicks::openClassifiedInfo()
 	if (selected_value.isUndefined()) return;
 
 	LLClassifiedItem* c_item = getSelectedClassifiedItem();
+	LLSD params;
+	params["classified_id"] = c_item->getClassifiedId();
+	params["classified_creator_id"] = c_item->getAvatarId();
+	params["classified_snapshot_id"] = c_item->getSnapshotId();
+	params["classified_name"] = c_item->getClassifiedName();
+	params["classified_desc"] = c_item->getDescription();
+	params["from_search"] = false;
 
-	openClassifiedInfo(c_item->getClassifiedId(), c_item->getAvatarId(),
-					   c_item->getSnapshotId(), c_item->getClassifiedName(),
-					   c_item->getDescription());
+	openClassifiedInfo(params);
 }
 
-void LLPanelPicks::openClassifiedInfo(const LLUUID &classified_id, 
-									  const LLUUID &avatar_id,
-									  const LLUUID &snapshot_id,
-									  const std::string &name, const std::string &desc)
+void LLPanelPicks::openClassifiedInfo(const LLSD &params)
 {
 	createClassifiedInfoPanel();
-
-	LLSD params;
-	params["classified_id"] = classified_id;
-	params["avatar_id"] = avatar_id;
-	params["snapshot_id"] = snapshot_id;
-	params["name"] = name;
-	params["desc"] = desc;
-
 	getProfilePanel()->openPanel(mPanelClassifiedInfo, params);
 }
 
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index 3f757e482e..11e811275b 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -55,7 +55,6 @@ class LLPanelPickEdit;
 class LLToggleableMenu;
 class LLPanelClassifiedInfo;
 class LLPanelClassifiedEdit;
-class LLClassifiedClickThrough;
 
 // *TODO
 // Panel Picks has been consolidated with Classifieds (EXT-2095), give LLPanelPicks
@@ -120,9 +119,7 @@ private:
 
 	void openPickInfo();
 	void openClassifiedInfo();
-	void openClassifiedInfo(const LLUUID &classified_id, const LLUUID &avatar_id,
-							const LLUUID &snapshot_id, const std::string &name,
-							const std::string &desc);
+	void openClassifiedInfo(const LLSD& params);
 	friend class LLPanelProfile;
 
 	void showAccordion(const std::string& name, bool show);
@@ -159,8 +156,6 @@ private:
 	LLAccordionCtrlTab* mPicksAccTab;
 	LLAccordionCtrlTab* mClassifiedsAccTab;
 
-	LLClassifiedClickThrough* mClickThroughDisp;
-	
 	//true if picks list is empty after processing picks
 	bool mNoPicks;
 	//true if classifieds list is empty after processing classifieds
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index b5d85dfd4b..18da8dd48c 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -171,15 +171,13 @@ void LLPanelProfile::onOpen(const LLSD& key)
 		}
 		else if (panel == "classified_details")
 		{
-			LLUUID classified_id = key["classified_id"].asUUID();
-			LLUUID avatar_id     = key["classified_avatar_id"].asUUID();
-			LLUUID snapshot_id   = key["classified_snapshot_id"].asUUID();
-			std::string name     = key["classified_name"].asString();
-			std::string desc     = key["classified_desc"].asString();
 			LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
 			if (picks)
 			{
-				picks->openClassifiedInfo(classified_id, avatar_id, snapshot_id, name, desc);
+				LLSD params = key;
+				params.erase("show_tab_panel");
+				params.erase("open_tab_name");
+				picks->openClassifiedInfo(params);
 			}
 		}
 	}
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index 559997254e..ae52bd3703 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -56,6 +56,8 @@
 // Default constructor
 LLPanelVolumePulldown::LLPanelVolumePulldown()
 {
+	mHoverTimer.stop();
+
     mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2));
 	mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2));
 	LLUICtrlFactory::instance().buildPanel(this, "panel_volume_pulldown.xml");
@@ -77,6 +79,11 @@ void LLPanelVolumePulldown::onMouseEnter(S32 x, S32 y, MASK mask)
 	LLPanel::onMouseEnter(x,y,mask);
 }
 
+/*virtual*/
+void LLPanelVolumePulldown::onTopLost()
+{
+	setVisible(FALSE);
+}
 
 /*virtual*/
 void LLPanelVolumePulldown::onMouseLeave(S32 x, S32 y, MASK mask)
@@ -95,13 +102,8 @@ void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility )
 	else
 	{
 		mHoverTimer.stop();
-	}
-}
 
-/*virtual*/ 
-void LLPanelVolumePulldown::onTopLost()
-{
-	setVisible(FALSE);
+	}
 }
 
 void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data)
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h
index 9f20caa1a8..7fb025f329 100644
--- a/indra/newview/llpanelvolumepulldown.h
+++ b/indra/newview/llpanelvolumepulldown.h
@@ -47,8 +47,8 @@ class LLPanelVolumePulldown : public LLPanel
 	/*virtual*/ void draw();
 	/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
 	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
 	/*virtual*/ void onTopLost();
+	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
 	/*virtual*/ BOOL postBuild();
 	
  private:
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
new file mode 100644
index 0000000000..1668a91eed
--- /dev/null
+++ b/indra/newview/llpopupview.cpp
@@ -0,0 +1,250 @@
+/** 
+ * @file llpopupview.cpp
+ * @brief Holds transient popups
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+
+#include "llpopupview.h"
+
+static LLRegisterPanelClassWrapper<LLPopupView> r("popup_holder");
+
+bool view_visible_and_enabled(LLView* viewp)
+{
+	return viewp->getVisible() && viewp->getEnabled();
+}
+
+bool view_visible(LLView* viewp)
+{
+	return viewp->getVisible();
+}
+
+
+LLPopupView::LLPopupView()
+{
+	// register ourself as handler of UI popups
+	LLUI::setPopupFuncs(boost::bind(&LLPopupView::addPopup, this, _1), boost::bind(&LLPopupView::removePopup, this, _1), boost::bind(&LLPopupView::clearPopups, this));
+}
+
+LLPopupView::~LLPopupView()
+{
+	// set empty callback function so we can't handle popups anymore
+	LLUI::setPopupFuncs(LLUI::add_popup_t(), LLUI::remove_popup_t(), LLUI::clear_popups_t());
+}
+
+void LLPopupView::draw()
+{
+	S32 screen_x, screen_y;
+
+	// remove dead popups
+	for (popup_list_t::iterator popup_it = mPopups.begin();
+		popup_it != mPopups.end();)
+	{
+		if (!popup_it->get())
+		{
+			mPopups.erase(popup_it++);
+		}
+		else
+		{
+			popup_it++;
+		}
+	}
+
+	// draw in reverse order (most recent is on top)
+	for (popup_list_t::reverse_iterator popup_it = mPopups.rbegin();
+		popup_it != mPopups.rend();)
+	{
+		LLView* popup = popup_it->get();
+
+		if (popup->getVisible())
+		{
+			popup->localPointToScreen(0, 0, &screen_x, &screen_y);
+
+			LLUI::pushMatrix();
+			{
+				LLUI::translate( (F32) screen_x, (F32) screen_y, 0.f);
+				popup->draw();
+			}
+			LLUI::popMatrix();
+		}
+		++popup_it;
+	}
+
+	LLPanel::draw();
+}
+
+BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func, 
+								   boost::function<bool(LLView*)> predicate, 
+								   S32 x, S32 y,
+								   bool close_popups)
+{
+	for (popup_list_t::iterator popup_it = mPopups.begin();
+		popup_it != mPopups.end();)
+	{
+		LLView* popup = popup_it->get();
+		if (!popup 
+			|| !predicate(popup))
+		{
+			++popup_it;
+			continue;
+		}
+
+		S32 popup_x, popup_y;
+		if (localPointToOtherView(x, y, &popup_x, &popup_y, popup) 
+			&& popup->pointInView(popup_x, popup_y))
+		{
+			if (func(popup, popup_x, popup_y))
+			{
+				return TRUE;
+			}
+		}
+
+		if (close_popups)
+		{
+			popup_list_t::iterator cur_popup_it = popup_it++;
+			mPopups.erase(cur_popup_it);
+			popup->onTopLost();
+		}
+		else
+		{
+			++popup_it;
+		}
+	}
+
+	return FALSE;
+}
+
+
+BOOL LLPopupView::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true))
+	{
+		return FALSE;
+	}
+	return TRUE;
+}
+
+BOOL LLPopupView::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true))
+	{
+		return FALSE;
+	}
+	return TRUE;
+}
+
+BOOL LLPopupView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	if (!handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true))
+	{
+		return FALSE;
+	}
+	return TRUE;
+}
+
+BOOL LLPopupView::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleDoubleClick, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleHover(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleHover, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleScrollWheel, _1, _2, _3, clicks), view_visible_and_enabled, x, y, false);
+}
+
+BOOL LLPopupView::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	return handleMouseEvent(boost::bind(&LLMouseHandler::handleToolTip, _1, _2, _3, mask), view_visible, x, y, false);
+}
+
+void LLPopupView::addPopup(LLView* popup)
+{
+	if (popup)
+	{
+		popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle());
+		if(iter != mPopups.end())
+		{
+			mPopups.erase(iter);
+		}
+		mPopups.push_front(popup->getHandle());
+	}
+}
+
+void LLPopupView::removePopup(LLView* popup)
+{
+	if (popup)
+	{
+		if (gFocusMgr.childHasKeyboardFocus(popup))
+		{
+			gFocusMgr.setKeyboardFocus(NULL);
+		}
+		popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle());
+		if(iter != mPopups.end())
+		{
+			mPopups.erase(iter);
+		}
+		popup->onTopLost();
+	}
+}
+
+void LLPopupView::clearPopups()
+{
+	for (popup_list_t::iterator popup_it = mPopups.begin();
+		popup_it != mPopups.end();)
+	{
+		LLView* popup = popup_it->get();
+
+		popup_list_t::iterator cur_popup_it = popup_it;
+		++popup_it;
+
+		mPopups.erase(cur_popup_it);
+		popup->onTopLost();
+	}
+}
+
diff --git a/indra/newview/llpopupview.h b/indra/newview/llpopupview.h
new file mode 100644
index 0000000000..1ec61d5450
--- /dev/null
+++ b/indra/newview/llpopupview.h
@@ -0,0 +1,67 @@
+/** 
+ * @file llpopupview.h
+ * @brief Holds transient popups
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPOPUPVIEW_H
+#define LL_LLPOPUPVIEW_H
+
+#include "llpanel.h"
+
+class LLPopupView : public LLPanel
+{
+public:
+	LLPopupView();
+	~LLPopupView();
+
+	/*virtual*/ void draw();
+	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+
+	void addPopup(LLView* popup);
+	void removePopup(LLView* popup);
+	void clearPopups();
+
+	typedef std::list<LLHandle<LLView> > popup_list_t;
+	popup_list_t getCurrentPopups() { return mPopups; }
+
+private:
+	BOOL handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)>, boost::function<bool(LLView*)>, S32 x, S32 y, bool close_popups);
+	popup_list_t mPopups;
+};
+#endif //LL_LLROOTVIEW_H
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 0476e785a5..120b584cd9 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -128,11 +128,13 @@ void LLProgressView::setVisible(BOOL visible)
 {
 	if (getVisible() && !visible)
 	{
+
 		mFadeTimer.start();
 	}
 	else if (!getVisible() && visible)
 	{
-		gFocusMgr.setTopCtrl(this);
+		gViewerWindow->addPopup(this);
+
 		setFocus(TRUE);
 		mFadeTimer.stop();
 		mProgressTimer.start();
@@ -187,6 +189,8 @@ void LLProgressView::draw()
 			// Fade is complete, release focus
 			gFocusMgr.releaseFocusIfNeeded( this );
 			LLPanel::setVisible(FALSE);
+			gViewerWindow->removePopup(this);
+
 			gStartTexture = NULL;
 		}
 		return;
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index c75d90be6f..a4426b370e 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -687,7 +687,10 @@ void LLNotificationsUI::LLScreenChannel::startFadingToasts()
 	while (it != mToastList.end())
 	{
 		ToastElem& elem = *it;
-		elem.toast->startFading();
+		if (elem.toast->getVisible())
+		{
+			elem.toast->startFading();
+		}
 		++it;
 	}
 }
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 32fd42aded..eb71cc52c8 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -135,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id)
 
 void LLScriptFloater::getAllowedRect(LLRect& rect)
 {
-	rect = gViewerWindow->getWorldViewRectRaw();
+	rect = gViewerWindow->getWorldViewRectScaled();
 }
 
 void LLScriptFloater::createForm(const LLUUID& notification_id)
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 0630981d7e..6ebe55e362 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -100,6 +100,8 @@ BOOL LLSidepanelTaskInfo::postBuild()
 	mPayBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onPayButtonClicked, this));
 	mBuyBtn = getChild<LLButton>("buy_btn");
 	mBuyBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onBuyButtonClicked, this));
+	mDetailsBtn = getChild<LLButton>("details_btn");
+	mDetailsBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onDetailsButtonClicked, this));
 
 	mLabelGroupName = getChild<LLNameBox>("Group Name Proxy");
 
@@ -1122,6 +1124,15 @@ void LLSidepanelTaskInfo::updateVerbs()
 	//mEditBtn->setEnabled(obj && obj->permModify());
 	*/
 
+	LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection();
+	const BOOL multi_select = (object_selection->getNumNodes() > 1);
+
+	mOpenBtn->setVisible(!multi_select);
+	mPayBtn->setVisible(!multi_select);
+	mBuyBtn->setVisible(!multi_select);
+	mDetailsBtn->setVisible(multi_select);
+	mDetailsBtn->setEnabled(multi_select);
+
 	mOpenBtn->setEnabled(enable_object_open());
 	mPayBtn->setEnabled(enable_pay_object());
 	mBuyBtn->setEnabled(enable_buy_object());
@@ -1145,6 +1156,11 @@ void LLSidepanelTaskInfo::onBuyButtonClicked()
 	doClickAction(CLICK_ACTION_BUY);
 }
 
+void LLSidepanelTaskInfo::onDetailsButtonClicked()
+{
+	LLFloaterReg::showInstance("inspect", LLSD());
+}
+
 // virtual
 void LLSidepanelTaskInfo::save()
 {
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index cf36c20767..e41627435f 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -109,10 +109,12 @@ protected:
 	void 						onOpenButtonClicked();
 	void 						onPayButtonClicked();
 	void 						onBuyButtonClicked();
+	void 						onDetailsButtonClicked();
 private:
 	LLButton*					mOpenBtn;
 	LLButton*					mPayBtn;
 	LLButton*					mBuyBtn;
+	LLButton*					mDetailsBtn;
 
 protected:
 	LLViewerObject*				getObject();
diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp
index ffd9bc7624..e5323db466 100644
--- a/indra/newview/llsplitbutton.cpp
+++ b/indra/newview/llsplitbutton.cpp
@@ -165,7 +165,7 @@ void LLSplitButton::showButtons()
 
 	// register ourselves as a "top" control
 	// effectively putting us into a special draw layer
-	gFocusMgr.setTopCtrl(this);
+	gViewerWindow->addPopup(this);
 
 	mItemsPanel->setFocus(TRUE);
 
@@ -182,10 +182,7 @@ void LLSplitButton::hideButtons()
 	mArrowBtn->setToggleState(FALSE);
 
 	setUseBoundingRect(FALSE);
-	if(gFocusMgr.getTopCtrl() == this)
-	{
-		gFocusMgr.setTopCtrl(NULL);
-	}
+	gViewerWindow->removePopup(this);
 }
 
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 732c23982b..9206b4a43a 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -239,20 +239,16 @@ BOOL LLStatusBar::postBuild()
 
 	childSetActionTextbox("stat_btn", onClickStatGraph);
 
-	LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
-
 	mPanelVolumePulldown = new LLPanelVolumePulldown();
-	popup_holder->addChild(mPanelVolumePulldown);
+	addChild(mPanelVolumePulldown);
+	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+	mPanelVolumePulldown->setVisible(FALSE);
 
 	mPanelNearByMedia = new LLPanelNearByMedia();
-	popup_holder->addChild(mPanelNearByMedia);
-	gViewerWindow->getRootView()->addMouseDownCallback(boost::bind(&LLStatusBar::onClickScreen, this, _1, _2));
+	addChild(mPanelNearByMedia);
 	mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 	mPanelNearByMedia->setVisible(FALSE);
 
-	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
-	mPanelVolumePulldown->setVisible(FALSE);
-
 	return TRUE;
 }
 
@@ -360,12 +356,14 @@ void LLStatusBar::refresh()
 	
 	// Disable media toggle if there's no media, parcel media, and no parcel audio
 	// (or if media is disabled)
-	mMediaToggle->setEnabled(gSavedSettings.getBOOL("AudioStreamingMedia") && 
-							 (LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio()));
+	bool button_enabled = (gSavedSettings.getBOOL("AudioStreamingMusic")||gSavedSettings.getBOOL("AudioStreamingMedia")) && 
+						  (LLViewerMedia::hasInWorldMedia() || LLViewerMedia::hasParcelMedia() || LLViewerMedia::hasParcelAudio());
+	mMediaToggle->setEnabled(button_enabled);
 	// Note the "sense" of the toggle is opposite whether media is playing or not
-	mMediaToggle->setValue(! (LLViewerMedia::isAnyMediaShowing() || 
+	bool any_media_playing = (LLViewerMedia::isAnyMediaShowing() || 
 							  LLViewerMedia::isParcelMediaPlaying() ||
-							  LLViewerMedia::isParcelAudioPlaying()));
+							  LLViewerMedia::isParcelAudioPlaying());
+	mMediaToggle->setValue(!any_media_playing);
 }
 
 void LLStatusBar::setVisibleForMouselook(bool visible)
@@ -526,11 +524,11 @@ static void onClickScriptDebug(void*)
 void LLStatusBar::onMouseEnterVolume()
 {
 	LLButton* volbtn =  getChild<LLButton>( "volume_btn" );
-	LLRect vol_btn_screen_rect = volbtn->calcScreenRect();
+	LLRect vol_btn_rect = volbtn->getRect();
 	LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
-	volume_pulldown_rect.setLeftTopAndSize(vol_btn_screen_rect.mLeft -
-	     (volume_pulldown_rect.getWidth() - vol_btn_screen_rect.getWidth())/2,
-			       vol_btn_screen_rect.mBottom,
+	volume_pulldown_rect.setLeftTopAndSize(vol_btn_rect.mLeft -
+	     (volume_pulldown_rect.getWidth() - vol_btn_rect.getWidth())/2,
+			       vol_btn_rect.mBottom,
 			       volume_pulldown_rect.getWidth(),
 			       volume_pulldown_rect.getHeight());
 
@@ -538,8 +536,10 @@ void LLStatusBar::onMouseEnterVolume()
 
 
 	// show the master volume pull-down
-	mPanelVolumePulldown->setVisible(TRUE);
+	LLUI::clearPopups();
+	LLUI::addPopup(mPanelVolumePulldown);
 	mPanelNearByMedia->setVisible(FALSE);
+	mPanelVolumePulldown->setVisible(TRUE);
 }
 
 void LLStatusBar::onMouseEnterNearbyMedia()
@@ -547,7 +547,7 @@ void LLStatusBar::onMouseEnterNearbyMedia()
 	LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
 	LLRect nearby_media_rect = mPanelNearByMedia->getRect();
 	LLButton* nearby_media_btn =  getChild<LLButton>( "media_toggle_btn" );
-	LLRect nearby_media_btn_rect = nearby_media_btn->calcScreenRect();
+	LLRect nearby_media_btn_rect = nearby_media_btn->getRect();
 	nearby_media_rect.setLeftTopAndSize(nearby_media_btn_rect.mLeft - 
 										(nearby_media_rect.getWidth() - nearby_media_btn_rect.getWidth())/2,
 										nearby_media_btn_rect.mBottom,
@@ -558,8 +558,11 @@ void LLStatusBar::onMouseEnterNearbyMedia()
 	
 	// show the master volume pull-down
 	mPanelNearByMedia->setShape(nearby_media_rect);
-	mPanelNearByMedia->setVisible(TRUE);
+	LLUI::clearPopups();
+	LLUI::addPopup(mPanelNearByMedia);
+
 	mPanelVolumePulldown->setVisible(FALSE);
+	mPanelNearByMedia->setVisible(TRUE);
 }
 
 
@@ -648,18 +651,6 @@ void LLStatusBar::onClickStatGraph(void* data)
 	LLFloaterReg::showInstance("lagmeter");
 }
 
-void LLStatusBar::onClickScreen(S32 x, S32 y)
-{
-	if (mPanelNearByMedia->getVisible())
-	{
-		LLRect screen_rect = mPanelNearByMedia->calcScreenRect();
-		if (!screen_rect.pointInRect(x, y))
-		{
-			mPanelNearByMedia->setVisible(FALSE);
-		}
-	}
-}
-
 BOOL can_afford_transaction(S32 cost)
 {
 	return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 662e6dcabe..6ed95f2cbf 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1130,7 +1130,8 @@ LLTexLayerInterface::LLTexLayerInterface(LLTexLayerSet* const layer_set):
 }
 
 LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWearable *wearable):
-	mTexLayerSet( layer.mTexLayerSet )
+	mTexLayerSet( layer.mTexLayerSet ),
+	mInfo(NULL)
 {
 	// don't add visual params for cloned layers
 	setInfo(layer.getInfo(), wearable);
@@ -1140,11 +1141,12 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
 
 BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
 {
-	//llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating
-        if (mInfo != NULL) // above llassert(), but softened into a warning
-        {
-                llwarns << "BAD STUFF!  mInfo != NULL" << llendl;
-        }
+	// setInfo should only be called once. Code is not robust enough to handle redefinition of a texlayer.
+	// Not a critical warning, but could be useful for debugging later issues. -Nyx
+	if (mInfo != NULL) 
+	{
+			llwarns << "mInfo != NULL" << llendl;
+	}
 	mInfo = info;
 	//mID = info->mID; // No ID
 
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 91c303c79e..4649b9cbef 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -750,6 +750,8 @@ LLTextureCache::LLTextureCache(bool threaded)
 
 LLTextureCache::~LLTextureCache()
 {
+	clearDeleteList() ;
+	writeUpdatedEntries() ;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -757,6 +759,9 @@ LLTextureCache::~LLTextureCache()
 //virtual
 S32 LLTextureCache::update(U32 max_time_ms)
 {
+	static LLFrameTimer timer ;
+	static const F32 MAX_TIME_INTERVAL = 300.f ; //seconds.
+
 	S32 res;
 	res = LLWorkerThread::update(max_time_ms);
 
@@ -792,6 +797,12 @@ S32 LLTextureCache::update(U32 max_time_ms)
 		responder->completed(success);
 	}
 	
+	if(!res && timer.getElapsedTimeF32() > MAX_TIME_INTERVAL)
+	{
+		timer.reset() ;
+		writeUpdatedEntries() ;
+	}
+
 	return res;
 }
 
@@ -1082,6 +1093,8 @@ S32 LLTextureCache::openAndReadEntry(const LLUUID& id, Entry& entry, bool create
 				entry.init(id, time(NULL));
 				// Update Header
 				writeEntriesHeader();
+				
+				//the new entry, write immediately.
 				// Write Entry
 				S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
 				LLAPRFile* aprfile = openHeaderEntriesFile(false, offset);
@@ -1097,12 +1110,20 @@ S32 LLTextureCache::openAndReadEntry(const LLUUID& id, Entry& entry, bool create
 		// Remove this entry from the LRU if it exists
 		mLRU.erase(id);
 		// Read the entry
-		S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
-		LLAPRFile* aprfile = openHeaderEntriesFile(true, offset);
-		S32 bytes_read = aprfile->read((void*)&entry, (S32)sizeof(Entry));
-		llassert_always(bytes_read == sizeof(Entry));
+		idx_entry_map_t::iterator iter = mUpdatedEntryMap.find(idx) ;
+		if(iter != mUpdatedEntryMap.end())
+		{
+			entry = iter->second ;
+		}
+		else
+		{
+			S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
+			LLAPRFile* aprfile = openHeaderEntriesFile(true, offset);
+			S32 bytes_read = aprfile->read((void*)&entry, (S32)sizeof(Entry));
+			llassert_always(bytes_read == sizeof(Entry));			
+			closeHeaderEntriesFile();
+		}
 		llassert_always(entry.mImageSize == 0 || entry.mImageSize == -1 || entry.mImageSize > entry.mBodySize);
-		closeHeaderEntriesFile();
 	}
 	return idx;
 }
@@ -1120,12 +1141,8 @@ void LLTextureCache::writeEntryAndClose(S32 idx, Entry& entry)
 				mTexturesSizeMap[entry.mID] = entry.mBodySize;
 			}
 // 			llinfos << "Updating TE: " << idx << ": " << id << " Size: " << entry.mBodySize << " Time: " << entry.mTime << llendl;
-			S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
-			LLAPRFile* aprfile = openHeaderEntriesFile(false, offset);
-			S32 bytes_written = aprfile->write((void*)&entry, (S32)sizeof(Entry));
-			llassert_always(bytes_written == sizeof(Entry));
 			mHeaderEntriesMaxWriteIdx = llmax(mHeaderEntriesMaxWriteIdx, idx);
-			closeHeaderEntriesFile();
+			mUpdatedEntryMap[idx] = entry ;
 		}
 	}
 }
@@ -1140,6 +1157,7 @@ U32 LLTextureCache::openAndReadEntries(std::vector<Entry>& entries)
 	mTexturesSizeTotal = 0;
 
 	LLAPRFile* aprfile = openHeaderEntriesFile(false, (S32)sizeof(EntriesInfo));
+	updatedHeaderEntriesFile() ;
 	for (U32 idx=0; idx<num_entries; idx++)
 	{
 		Entry entry;
@@ -1190,6 +1208,47 @@ void LLTextureCache::writeEntriesAndClose(const std::vector<Entry>& entries)
 	}
 }
 
+void LLTextureCache::writeUpdatedEntries()
+{
+	lockHeaders() ;
+	if (!mReadOnly && !mUpdatedEntryMap.empty())
+	{
+		openHeaderEntriesFile(false, 0);
+		updatedHeaderEntriesFile() ;
+		closeHeaderEntriesFile();
+	}
+	unlockHeaders() ;
+}
+
+//mHeaderMutex is locked and mHeaderAPRFile is created before calling this.
+void LLTextureCache::updatedHeaderEntriesFile()
+{
+	if (!mReadOnly && !mUpdatedEntryMap.empty() && mHeaderAPRFile)
+	{
+		//entriesInfo
+		mHeaderAPRFile->seek(APR_SET, 0);
+		S32 bytes_written = mHeaderAPRFile->write((U8*)&mHeaderEntriesInfo, sizeof(EntriesInfo)) ;
+		llassert_always(bytes_written == sizeof(EntriesInfo));
+		
+		//write each updated entry
+		S32 entry_size = (S32)sizeof(Entry) ;
+		S32 prev_idx = -1 ;
+		S32 delta_idx ;
+		for (idx_entry_map_t::iterator iter = mUpdatedEntryMap.begin(); iter != mUpdatedEntryMap.end(); ++iter)
+		{
+			delta_idx = iter->first - prev_idx - 1;
+			prev_idx = iter->first ;
+			if(delta_idx)
+			{
+				mHeaderAPRFile->seek(APR_CUR, delta_idx * entry_size);
+			}
+			
+			bytes_written = mHeaderAPRFile->write((void*)(&iter->second), entry_size);
+			llassert_always(bytes_written == entry_size);
+		}
+		mUpdatedEntryMap.clear() ;
+	}
+}
 //----------------------------------------------------------------------------
 
 // Called from either the main thread or the worker thread
@@ -1574,6 +1633,11 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort)
 	{
 		worker = iter->second;
 		complete = worker->complete();
+
+		if(!complete && abort)
+		{
+			abortRequest(handle, true) ;
+		}
 	}
 	if (worker && (complete || abort))
 	{
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index 64ec881fc3..b840619c1f 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -68,6 +68,7 @@ private:
 		Entry(const LLUUID& id, S32 imagesize, S32 bodysize, U32 time) :
 			mID(id), mImageSize(imagesize), mBodySize(bodysize), mTime(time) {}
 		void init(const LLUUID& id, U32 time) { mID = id, mImageSize = 0; mBodySize = 0; mTime = time; }
+		Entry& operator=(const Entry& entry) {mID = entry.mID, mImageSize = entry.mImageSize; mBodySize = entry.mBodySize; mTime = entry.mTime; return *this;}
 		LLUUID mID; // 16 bytes
 		S32 mImageSize; // total size of image if known
 		S32 mBodySize; // size of body file in body cache
@@ -166,6 +167,8 @@ private:
 	S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
 	S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
 	bool removeHeaderCacheEntry(const LLUUID& id);
+	void writeUpdatedEntries() ;
+	void updatedHeaderEntriesFile() ;
 	void lockHeaders() { mHeaderMutex.lock(); }
 	void unlockHeaders() { mHeaderMutex.unlock(); }
 	
@@ -204,6 +207,9 @@ private:
 	S64 mTexturesSizeTotal;
 	LLAtomic32<BOOL> mDoPurge;
 
+	typedef std::map<S32, Entry> idx_entry_map_t;
+	idx_entry_map_t mUpdatedEntryMap;
+
 	// Statics
 	static F32 sHeaderCacheVersion;
 	static U32 sCacheMaxEntries;
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 8ca92c3d87..837f837430 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -183,6 +183,8 @@ public:
 
 	void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder);
 
+	LLViewerFetchedTexture* getTexture() { return mTexturep; }
+
 private:
 	BOOL allowDrop(LLInventoryItem* item);
 	BOOL doDrop(LLInventoryItem* item);
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 0053ce8df8..b1b3ae473c 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -431,11 +431,11 @@ LLTextureFetchWorker::~LLTextureFetchWorker()
 // 			<< " Desired=" << mDesiredDiscard << llendl;
 	llassert_always(!haveWork());
 	lockWorkMutex();
-	if (mCacheReadHandle != LLTextureCache::nullHandle())
+	if (mCacheReadHandle != LLTextureCache::nullHandle() && mFetcher->mTextureCache)
 	{
 		mFetcher->mTextureCache->readComplete(mCacheReadHandle, true);
 	}
-	if (mCacheWriteHandle != LLTextureCache::nullHandle())
+	if (mCacheWriteHandle != LLTextureCache::nullHandle() && mFetcher->mTextureCache)
 	{
 		mFetcher->mTextureCache->writeComplete(mCacheWriteHandle, true);
 	}
@@ -1429,6 +1429,8 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
 
 LLTextureFetch::~LLTextureFetch()
 {
+	clearDeleteList() ;
+
 	// ~LLQueuedThread() called here
 }
 
@@ -1737,6 +1739,26 @@ S32 LLTextureFetch::update(U32 max_time_ms)
 	return res;
 }
 
+//called in the MAIN thread after the TextureCacheThread shuts down.
+void LLTextureFetch::shutDownTextureCacheThread() 
+{
+	if(mTextureCache)
+	{
+		llassert_always(mTextureCache->isQuitting() || mTextureCache->isStopped()) ;
+		mTextureCache = NULL ;
+	}
+}
+	
+//called in the MAIN thread after the ImageDecodeThread shuts down.
+void LLTextureFetch::shutDownImageDecodeThread() 
+{
+	if(mImageDecodeThread)
+	{
+		llassert_always(mImageDecodeThread->isQuitting() || mImageDecodeThread->isStopped()) ;
+		mImageDecodeThread = NULL ;
+	}
+}
+
 // WORKER THREAD
 void LLTextureFetch::startThread()
 {
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 5213c4f488..ef2ec520bf 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -58,6 +58,8 @@ public:
 	~LLTextureFetch();
 
 	/*virtual*/ S32 update(U32 max_time_ms);	
+	void shutDownTextureCacheThread() ; //called in the main thread after the TextureCacheThread shuts down.
+	void shutDownImageDecodeThread() ;  //called in the main thread after the ImageDecodeThread shuts down.
 
 	bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
 					   S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 98731f90f4..6cd8a78b25 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -658,6 +658,14 @@ struct compare_decode_pair
 	}
 };
 
+struct KillView
+{
+	void operator()(LLView* viewp) const
+	{
+		viewp->die();
+	}
+};
+
 void LLTextureView::draw()
 {
 	if (!mFreezeView)
@@ -665,12 +673,12 @@ void LLTextureView::draw()
 // 		LLViewerObject *objectp;
 // 		S32 te;
 
-		for_each(mTextureBars.begin(), mTextureBars.end(), DeletePointer());
+		for_each(mTextureBars.begin(), mTextureBars.end(), KillView());
 		mTextureBars.clear();
-	
-		delete mGLTexMemBar;
+			
+		delete mGLTexMemBar;		
 		mGLTexMemBar = 0;
-	
+
 		typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t;
 		display_list_t display_image_list;
 	
@@ -683,6 +691,10 @@ void LLTextureView::draw()
 			 iter != gTextureList.mImageList.end(); )
 		{
 			LLPointer<LLViewerFetchedTexture> imagep = *iter++;
+			if(!imagep->hasFetcher())
+			{
+				continue ;
+			}
 
 			S32 cur_discard = imagep->getDiscardLevel();
 			S32 desired_discard = imagep->mDesiredDiscardLevel;
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index 577b5952e5..22c7d670f8 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -91,7 +91,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
 	setMessage(msg);
 
 	// The dialog view is a root view
-	gFocusMgr.setTopCtrl( this );
+	gViewerWindow->addPopup(this);
 }
 
 void LLUploadDialog::setMessage( const std::string& msg)
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index bd4f172907..0051f46716 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -338,7 +338,12 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 	{
 		// make a tiny little viewport
 		// anything drawn into this viewport will be "selected"
-		GLint*		viewport = (GLint*) gGLViewport;
+
+		GLint viewport[4];
+		viewport[0] = gViewerWindow->getWorldViewRectRaw().mLeft;
+		viewport[1] = gViewerWindow->getWorldViewRectRaw().mBottom;
+		viewport[2] = gViewerWindow->getWorldViewRectRaw().getWidth();
+		viewport[3] = gViewerWindow->getWorldViewRectRaw().getHeight();
 		
 		proj_mat = gl_pick_matrix(x+width/2.f, y_from_bot+height/2.f, (GLfloat) width, (GLfloat) height, viewport);
 
@@ -405,6 +410,9 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 	
 	if (for_selection && (width > 1 || height > 1))
 	{
+		// NB: as of this writing, i believe the code below is broken (doesn't take into account the world view, assumes entire window)
+		// however, it is also unused (the GL matricies are used for selection, (see LLCamera::sphereInFrustum())) and so i'm not
+		// comfortable hacking on it.
 		calculateFrustumPlanesFromWindow((F32)(x - width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
 								(F32)(y_from_bot - height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f,
 								(F32)(x + width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 8370c98470..65e9d8971a 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -117,6 +117,7 @@
 #include "llmoveview.h"
 #include "llnearbychat.h"
 #include "llpanelblockedlist.h"
+#include "llpanelclassified.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
 #include "llpreviewnotecard.h"
@@ -219,6 +220,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview");
 	LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
 	LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>);
+	LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>);
 
 	LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>);
 	LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml",
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f02e854db6..80336e5c5a 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -48,6 +48,7 @@
 #include "llsidetray.h"
 
 #include "llinventorybridge.h"
+#include "llinventorypanel.h"
 #include "llfloaterinventory.h"
 
 #include "llviewerassettype.h"
@@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
 		// 2 = folders by date
 		// Need to mask off anything but the first bit.
 		// This comes from LLInventoryFilter from llfolderview.h
-		U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
+		U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
 
 		// *NOTE: For bug EXT-2879, originally commented out
 		// gAgent.getRegion()->getCapability in order to use the old
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 7e08464cd0..85efe2724e 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -701,9 +701,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 	impl_list::iterator iter = sViewerMediaImplList.begin();
 	impl_list::iterator end = sViewerMediaImplList.end();
 
-	for(; iter != end; iter++)
+	for(; iter != end;)
 	{
-		LLViewerMediaImpl* pimpl = *iter;
+		LLViewerMediaImpl* pimpl = *iter++;
 		pimpl->update();
 		pimpl->calculateInterest();
 	}
@@ -852,7 +852,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 			}
 		}
 		// update the audio stream here as well
-		if(!inworld_media_enabled || !inworld_audio_enabled)
+		if( !inworld_audio_enabled)
 		{
 			if(LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio())
 			{
@@ -1231,6 +1231,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string user_data_path = gDirUtilp->getOSUserAppDir();
 		user_data_path += gDirUtilp->getDirDelimiter();
 
+		// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
+		// If the linden username returned is blank, that can only mean we are
+		// at the login page displaying login Web page or Web browser test via Develop menu.
+		// In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
+		// is what we always used before this change)
+		std::string linden_user_dir = gDirUtilp->getLindenUserDir();
+		if ( ! linden_user_dir.empty() )
+		{
+			// gDirUtilp->getLindenUserDir() is whole path, not just Linden name
+			user_data_path = linden_user_dir;
+			user_data_path += gDirUtilp->getDirDelimiter();
+		};
+
 		// See if the plugin executable exists
 		llstat s;
 		if(LLFile::stat(launcher_name, &s))
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b36f58f8ff..361f4e2326 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -207,6 +207,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 		LLNotificationsUtil::add("FriendshipDeclinedByMe",
 				notification["substitutions"], payload);
 	}
+	// fall-through
 	case 2: // Send IM - decline and start IM session
 		{
 			// decline
@@ -3114,8 +3115,12 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 		{
 			// Chat the "back" SLURL. (DEV-4907)
 
+			LLSD substitution = LLSD().with("[T_SLURL]", gAgent.getTeleportSourceSLURL());
+			std::string completed_from = LLAgent::sTeleportProgressMessages["completed_from"];
+			LLStringUtil::format(completed_from, substitution);
+
 			LLSD args;
-			args["MESSAGE"] = "Teleport completed from " + gAgent.getTeleportSourceSLURL();
+			args["MESSAGE"] = completed_from;
 			LLNotificationsUtil::add("SystemMessageTip", args);
 
 			// Set the new position
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 84377198eb..6dc18085e0 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -455,6 +455,7 @@ public:
 	F32         getElapsedLastReferencedSavedRawImageTime() const ;
 	BOOL		isFullyLoaded() const;
 
+	BOOL        hasFetcher() const { return mHasFetcher;}
 protected:
 	/*virtual*/ void switchToCachedImage();
 	S32 getCurrentDiscardLevelForFetching() ;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f1ec489a20..d0a1a31ebd 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -131,6 +131,7 @@
 #include "llmorphview.h"
 #include "llmoveview.h"
 #include "llnavigationbar.h"
+#include "llpopupview.h"
 #include "llpreviewtexture.h"
 #include "llprogressview.h"
 #include "llresmgr.h"
@@ -690,30 +691,23 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 	}
 
 	// Topmost view gets a chance before the hierarchy
-	LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-	if (top_ctrl)
-	{
-		S32 local_x, local_y;
-		top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-		if (down)
-		{
-			if (top_ctrl->pointInView(local_x, local_y))
-			{
-				return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down)	;
-			}
-			else
-			{
-				gFocusMgr.setTopCtrl(NULL);
-			}
-		}
-		else
-		{
-			if (top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask))
-			{
-				return TRUE;
-			}
-		}
-	}
+	//LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+	//if (top_ctrl)
+	//{
+	//	S32 local_x, local_y;
+	//	top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
+	//		if (top_ctrl->pointInView(local_x, local_y))
+	//		{
+	//			return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down)	;
+	//		}
+	//		else
+	//		{
+	//		if (down)
+	//		{
+	//			gFocusMgr.setTopCtrl(NULL);
+	//		}
+	//	}
+	//}
 
 	// Give the UI views a chance to process the click
 	if( mRootView->handleAnyMouseClick(x, y, mask, clicktype, down) )
@@ -1559,11 +1553,13 @@ void LLViewerWindow::initBase()
 	mWorldViewPlaceholder = main_view->getChildView("world_view_rect")->getHandle();
 	mNonSideTrayView = main_view->getChildView("non_side_tray_view")->getHandle();
 	mFloaterViewHolder = main_view->getChildView("floater_view_holder")->getHandle();
+	mPopupView = main_view->getChild<LLPopupView>("popup_holder");
 
 	// Constrain floaters to inside the menu and status bar regions.
 	gFloaterView = main_view->getChild<LLFloaterView>("Floater View");
 	gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View");
 	
+
 	// Console
 	llassert( !gConsole );
 	LLConsole::Params cp;
@@ -2025,9 +2021,9 @@ void LLViewerWindow::drawDebugText()
 void LLViewerWindow::draw()
 {
 	
-#if LL_DEBUG
+//#if LL_DEBUG
 	LLView::sIsDrawing = TRUE;
-#endif
+//#endif
 	stop_glerror();
 	
 	LLUI::setLineWidth(1.f);
@@ -2139,9 +2135,9 @@ void LLViewerWindow::draw()
 	LLUI::popMatrix();
 	gGL.popMatrix();
 
-#if LL_DEBUG
+//#if LL_DEBUG
 	LLView::sIsDrawing = FALSE;
-#endif
+//#endif
 }
 
 // Takes a single keydown event, usually when UI is visible
@@ -2433,6 +2429,30 @@ void LLViewerWindow::handleScrollWheel(S32 clicks)
 	return;
 }
 
+void LLViewerWindow::addPopup(LLView* popup)
+{
+	if (mPopupView)
+	{
+		mPopupView->addPopup(popup);
+	}
+}
+
+void LLViewerWindow::removePopup(LLView* popup)
+{
+	if (mPopupView)
+	{
+		mPopupView->removePopup(popup);
+	}
+}
+
+void LLViewerWindow::clearPopups()
+{
+	if (mPopupView)
+	{
+		mPopupView->clearPopups();
+	}
+}
+
 void LLViewerWindow::moveCursorToCenter()
 {
 	if (! gSavedSettings.getBOOL("DisableMouseWarp"))
@@ -2561,6 +2581,33 @@ void LLViewerWindow::updateUI()
 	}
 
 	// aggregate visible views that contain mouse cursor in display order
+	LLPopupView::popup_list_t popups = mPopupView->getCurrentPopups();
+
+	for(LLPopupView::popup_list_t::iterator popup_it = popups.begin(); popup_it != popups.end(); ++popup_it)
+	{
+		LLView* popup = popup_it->get();
+		if (popup && popup->calcScreenBoundingRect().pointInRect(x, y))
+		{
+			// iterator over contents of top_ctrl, and throw into mouse_hover_set
+			for (LLView::tree_iterator_t it = popup->beginTreeDFS();
+				it != popup->endTreeDFS();
+				++it)
+			{
+				LLView* viewp = *it;
+				if (viewp->getVisible()
+					&& viewp->calcScreenBoundingRect().pointInRect(x, y))
+				{
+					// we have a view that contains the mouse, add it to the set
+					mouse_hover_set.insert(viewp->getHandle());
+				}
+				else
+				{
+					// skip this view and all of its children
+					it.skipDescendants();
+				}
+			}
+		}
+	}
 
 	// while the top_ctrl contains the mouse cursor, only it and its descendants will receive onMouseEnter events
 	if (top_ctrl && top_ctrl->calcScreenBoundingRect().pointInRect(x, y))
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index bfce65f2ba..410445d97f 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -69,6 +69,7 @@ class LLHUDIcon;
 class LLWindow;
 class LLRootView;
 class LLViewerWindowListener;
+class LLPopupView;
 
 #define PICK_HALF_WIDTH 5
 #define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
@@ -300,6 +301,11 @@ public:
 	BOOL			handleKey(KEY key, MASK mask);
 	void			handleScrollWheel	(S32 clicks);
 
+	// add and remove views from "popup" layer
+	void			addPopup(LLView* popup);
+	void			removePopup(LLView* popup);
+	void			clearPopups();
+
 	// Hide normal UI when a logon fails, re-show everything when logon is attempted again
 	void			setNormalControlsVisible( BOOL visible );
 	void			setMenuBackgroundColor(bool god_mode = false, bool dev_grid = false);
@@ -458,6 +464,7 @@ protected:
 	LLHandle<LLView> mWorldViewPlaceholder;	// widget that spans the portion of screen dedicated to rendering the 3d world
 	LLHandle<LLView> mNonSideTrayView;		// parent of world view + bottom bar, etc...everything but the side tray
 	LLHandle<LLView> mFloaterViewHolder;	// container for floater_view
+	LLPopupView*	mPopupView;			// container for transient popups
 	
 	class LLDebugText* mDebugText; // Internal class for debug text
 	
@@ -477,7 +484,7 @@ protected:
 private:
 	// Object temporarily hovered over while dragging
 	LLPointer<LLViewerObject>	mDragHoveredObject;
-};	
+};
 
 void toggle_flying(void*);
 void toggle_first_person();
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 131c6ac1a1..7dc8772753 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1292,19 +1292,23 @@ BOOL LLVOAvatarSelf::isTextureDefined(LLVOAvatarDefines::ETextureIndex type, U32
 }
 
 //-----------------------------------------------------------------------------
-// virtual
 // requestLayerSetUploads()
 //-----------------------------------------------------------------------------
 void LLVOAvatarSelf::requestLayerSetUploads()
 {
 	for (U32 i = 0; i < mBakedTextureDatas.size(); i++)
 	{
-		ETextureIndex tex_index = mBakedTextureDatas[i].mTextureIndex;
-		BOOL layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index));
-		if (!layer_baked && mBakedTextureDatas[i].mTexLayerSet)
-		{
-			mBakedTextureDatas[i].mTexLayerSet->requestUpload();
-		}
+		requestLayerSetUpload((EBakedTextureIndex)i);
+	}
+}
+
+void LLVOAvatarSelf::requestLayerSetUpload(LLVOAvatarDefines::EBakedTextureIndex i)
+{
+	ETextureIndex tex_index = mBakedTextureDatas[i].mTextureIndex;
+	bool  layer_baked = isTextureDefined(tex_index, gAgentWearables.getWearableCount(tex_index));
+	if (!layer_baked && mBakedTextureDatas[i].mTexLayerSet)
+	{
+		mBakedTextureDatas[i].mTexLayerSet->requestUpload();
 	}
 }
 
@@ -1723,7 +1727,7 @@ BOOL LLVOAvatarSelf::canGrabLocalTexture(ETextureIndex type, U32 index) const
 		return FALSE;
 	}
 
-	if (gAgent.isGodlike())
+	if (gAgent.isGodlikeWithoutAdminMenuFakery())
 		return TRUE;
 
 	// Check permissions of textures that show up in the
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index dc70996f0b..df3493c434 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -222,6 +222,7 @@ protected:
 	//--------------------------------------------------------------------
 public:
 	void 				requestLayerSetUploads();
+	void				requestLayerSetUpload(LLVOAvatarDefines::EBakedTextureIndex i);
 	void				requestLayerSetUpdate(LLVOAvatarDefines::ETextureIndex i);
 	LLTexLayerSet*		getLayerSet(LLVOAvatarDefines::ETextureIndex index) const;
 	
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index d6a9837b86..b2de31218b 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -235,8 +235,9 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type )
 	LLWearable *wearable = generateNewWearable();
 	wearable->setType( type );
 	
-	std::string name = "New ";
-	name.append( wearable->getTypeLabel() );
+	LLSD item_name = LLSD().with("[WEARABLE_ITEM]", wearable->getTypeLabel());
+	std::string name = LLTrans::getString("NewWearable");
+	LLStringUtil::format(name, item_name);
 	wearable->setName( name );
 
 	LLPermissions perm;
diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico
index c35a3fa3a3..87985b9285 100644
--- a/indra/newview/res/ll_icon.ico
+++ b/indra/newview/res/ll_icon.ico
diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
index ceb6036e0e..4560d4bb24 100644
--- a/indra/newview/secondlife.icns
+++ b/indra/newview/secondlife.icns
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c617dacec5..d45d6155dd 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -344,7 +344,7 @@
      value="0.92 0.92 1 0.78" />
     <color
      name="GridlineColor"
-     reference="Red" />
+     reference="White" />
     <color
      name="GridlineShadowColor"
      value="0 0 0 0.31" />
@@ -359,7 +359,7 @@
      reference="White"/>
     <color
      name="GroupNotifyDimmedTextColor"
-     reference="LtGray" />
+     reference="DkGray" />
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
index 605073d786..95913dd55b 100644
--- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
+++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4768cf14fb..b1594816b2 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -83,7 +83,7 @@ with the same filename but different name
   <texture name="BottomTray_Scroll_Left" file_name="navbar/Arrow_Left_Off.png" preload="false" />
 
   <texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
-  <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
+  <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
   <texture name="Cam_Avatar_Disabled" file_name="bottomtray/Cam_Avatar_Disabled.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index eb63b5c975..91db3c6b1c 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -8,7 +8,7 @@
 		Bygget med [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret på [HOSTNAME] ([HOSTIP])
+		Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
@@ -43,13 +43,9 @@ Vivox Version: [VIVOX_VERSION]
 		</panel>
 		<panel label="Tak til" name="credits_panel">
 			<text_editor name="credits_editor">
-				Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+				Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les og mange flere.
 
-Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-
-
-
-I get by with a little help from my friends. --Richard Starkey
+Tak til følgende beboere for at sikre at denne klient er den bedste version indtil nu: (under udarbejdelse)
 			</text_editor>
 		</panel>
 		<panel label="Licenser" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index b4af427538..9bda1397bc 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -81,6 +81,9 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 			<text name="Group:">
 				Gruppe:
 			</text>
+			<text name="GroupText">
+				Leyla Linden
+			</text>
 			<button label="Vælg..." label_selected="Vælg..." name="Set..."/>
 			<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen&apos;s jord tildeling."/>
 			<button label="Dedikér..." label_selected="Dedikér..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/>
@@ -124,6 +127,7 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 				0
 			</text>
 			<button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/>
+			<button label="Script Info" name="Scripts..."/>
 			<button label="Køb til gruppe..." label_selected="Køb til gruppe..." name="Buy For Group..."/>
 			<button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette område."/>
 			<button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/>
@@ -377,12 +381,9 @@ Kun større parceller kan vises i søgning.
 			</text>
 			<combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/>
 			<text left="4" name="at URL:">
-				Medie URL:
+				Hjemmeside:
 			</text>
 			<button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
-			<text name="CurrentURL:">
-				Nuværende side:
-			</text>
 			<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
 			<text left="4" name="Description:">
 				Beskrivelse:
@@ -393,8 +394,8 @@ Kun større parceller kan vises i søgning.
 			</text>
 			<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/>
 			<text name="replace_texture_help">
-				(Objekter der har denne tekstur vil vise filmen eller 
-web-siden, efter du klikker på play knappen.)
+				Objekter der har denne tekstur vil vise filmen eller web-siden, efter du klikker på play knappen. Vælg 
+				Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail for at vælge anden tekstur.
 			</text>
 			<check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/>
 			<text name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
@@ -411,8 +412,10 @@ web-siden, efter du klikker på play knappen.)
 			<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
 		</panel>
 		<panel label="LYD" name="land_audio_panel">
+			<check_box label="Skjul URL" name="hide_music_url" tool_tip="Ved at vælge her, vil musik URL skjules for alle ikke autoriserede brugere der læser denne parcels information."/>
 			<check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/>
 			<check_box label="Tillad stemmer (håndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_local"/>
 		</panel>
 		<panel label="ADGANG" name="land_access_panel">
 			<panel.string name="access_estate_defined">
@@ -428,8 +431,8 @@ web-siden, efter du klikker på play knappen.)
 			<text name="Only Allow">
 				Blokér adgang for::
 			</text>
-			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/>
-			<check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
+			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér for uidentificerede beboere."/>
+			<check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er alders-verificerede. Se [SUPPORT_SITE] for mere information."/>
 			<check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen &apos;generelt&apos;."/>
 			<check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index 47e02f0704..fdbfd737ba 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -106,6 +106,9 @@ Maksimal animations længde er [MAX_LENGTH] sekunder.
 	<floater.string name="E_ST_NO_XLT_EMOTE">
 		kan ikke læse &quot;emote&quot; navn.
 	</floater.string>
+	<floater.string name="E_ST_BAD_ROOT">
+		Incorrect root joint name, use &quot;hip&quot;.
+	</floater.string>
 	<text name="name_label">
 		Navn:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index 1111c5e18b..e405a1beb8 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -7,26 +7,37 @@
 		Blandede teksturer
 	</text>
 	<button label="Drop" label_selected="Dump" name="Dump"/>
-	<texture_picker label="HÃ¥r" name="hair_grain"/>
-	<texture_picker label="Alpha - hår" name="hair_alpha"/>
-	<texture_picker label="Makeup" name="head_bodypaint"/>
-	<texture_picker label="Alpha - hoved" name="head_alpha"/>
-	<texture_picker label="Tatovering hovede" name="head_tattoo"/>
-	<texture_picker label="Øje" name="eyes_iris"/>
-	<texture_picker label="Alpha - øjne" name="eyes_alpha"/>
-	<texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
-	<texture_picker label="Undertrøje" name="upper_undershirt"/>
-	<texture_picker label="Handsker" name="upper_gloves"/>
-	<texture_picker label="Trøje" name="upper_shirt"/>
-	<texture_picker label="Øvre jakke" name="upper_jacket"/>
-	<texture_picker label="Alpha - øvre" name="upper_alpha"/>
-	<texture_picker label="Øvre tatovering" name="upper_tattoo"/>
-	<texture_picker label="Bodypaint - underkrop" name="lower_bodypaint"/>
-	<texture_picker label="Undertøj" name="lower_underpants"/>
-	<texture_picker label="Strømper" name="lower_socks"/>
-	<texture_picker label="Sko" name="lower_shoes"/>
-	<texture_picker label="Bukser" name="lower_pants"/>
-	<texture_picker label="Jakke" name="lower_jacket"/>
-	<texture_picker label="Alpha - nedre" name="lower_alpha"/>
-	<texture_picker label="Nedre tatovering" name="lower_tattoo"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<texture_picker label="HÃ¥r" name="hair-baked"/>
+			<texture_picker label="HÃ¥r" name="hair_grain"/>
+			<texture_picker label="Alpha - hår" name="hair_alpha"/>
+			<texture_picker label="Hoved" name="head-baked"/>
+			<texture_picker label="Makeup" name="head_bodypaint"/>
+			<texture_picker label="Alpha - hoved" name="head_alpha"/>
+			<texture_picker label="Tatovering - hoved" name="head_tattoo"/>
+			<texture_picker label="Eyes" name="eyes-baked"/>
+			<texture_picker label="Øje" name="eyes_iris"/>
+			<texture_picker label="Alpha - øjne" name="eyes_alpha"/>
+			<texture_picker label="Overkrop" name="upper-baked"/>
+			<texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
+			<texture_picker label="Undertrøje" name="upper_undershirt"/>
+			<texture_picker label="Handsker" name="upper_gloves"/>
+			<texture_picker label="Trøje" name="upper_shirt"/>
+			<texture_picker label="Jakke - foroven" name="upper_jacket"/>
+			<texture_picker label="Alpha - øvre" name="upper_alpha"/>
+			<texture_picker label="Tatovering - øvre" name="upper_tattoo"/>
+			<texture_picker label="Ben" name="lower-baked"/>
+			<texture_picker label="Bodypaint - ben" name="lower_bodypaint"/>
+			<texture_picker label="Underbukser" name="lower_underpants"/>
+			<texture_picker label="Strømper" name="lower_socks"/>
+			<texture_picker label="Sko" name="lower_shoes"/>
+			<texture_picker label="Bukser" name="lower_pants"/>
+			<texture_picker label="Jakke" name="lower_jacket"/>
+			<texture_picker label="Alpha - nedre" name="lower_alpha"/>
+			<texture_picker label="Tatovering - nedre" name="lower_tattoo"/>
+			<texture_picker label="Nederdel" name="skirt-baked"/>
+			<texture_picker label="Nederdel" name="skirt"/>
+		</panel>
+	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index d67d859e7b..8049b072ce 100644
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -2,7 +2,7 @@
 <floater name="beacons" title="PEJLELYS">
 	<panel name="beacons_panel">
 		<text name="label_show">
-			Vis:
+			Vis :
 		</text>
 		<check_box label="Pejlelys" name="beacons"/>
 		<check_box label="Fremhævninger" name="highlights"/>
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
index 0dd1a4f6ba..58a1c1b73e 100644
--- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
@@ -49,6 +49,6 @@
 	<check_box label="Redigere" name="next_owner_modify"/>
 	<check_box label="Kopiére" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Overfør" name="next_owner_transfer" tool_tip="Næste ejer kan sælge eller forære dette objekt væk"/>
-	<button label="Ok" name="apply"/>
+	<button label="OK" name="apply"/>
 	<button label="Annullér" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index 18ee0e0597..49c2264956 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		L$ [AMT]
 	</text>
 	<text name="currency_links">
-		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+		[http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
 	</text>
 	<text name="exchange_rate_note">
 		Indtast beløbet for at se nyeste valutakurs.
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 987ad6585f..57bcc7ad9d 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -1,5 +1,134 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="KØB LAND">
+	<floater.string name="can_resell">
+		Kan videresælges.
+	</floater.string>
+	<floater.string name="can_not_resell">
+		Kan ikke videresælges.
+	</floater.string>
+	<floater.string name="can_change">
+		Kan samles eller opdeles.
+	</floater.string>
+	<floater.string name="can_not_change">
+		Kan ikke samles eller opdeles.
+	</floater.string>
+	<floater.string name="cant_buy_for_group">
+		Du har ikke tilladelse til at købe land for din aktive gruppe.
+	</floater.string>
+	<floater.string name="no_land_selected">
+		Intet land er valgt.
+	</floater.string>
+	<floater.string name="multiple_parcels_selected">
+		Flere forskellige parceller er valgt. 
+Prøv at vælge et mindre område.
+	</floater.string>
+	<floater.string name="no_permission">
+		Du har ikke tilladelse til at købe jord for din aktive gruppe.
+	</floater.string>
+	<floater.string name="parcel_not_for_sale">
+		Det udvalgte parcel er ikke til salg.
+	</floater.string>
+	<floater.string name="group_already_owns">
+		Gruppen ejer allerede parcellet.
+	</floater.string>
+	<floater.string name="you_already_own">
+		Du ejer allerede parcellet.
+	</floater.string>
+	<floater.string name="set_to_sell_to_other">
+		Det udvalgte parcel er sat til salg til en anden.
+	</floater.string>
+	<floater.string name="no_public_land">
+		Det valgte område har ingen offentlige arealer.
+	</floater.string>
+	<floater.string name="not_owned_by_you">
+		Jord, der ejes af en anden bruger er valgt. 
+Prøv at vælge et mindre område.
+	</floater.string>
+	<floater.string name="processing">
+		Forarbejder dit køb...
+ 
+(Dette kan tage et minut eller to.)
+	</floater.string>
+	<floater.string name="fetching_error">
+		Der er sket en fejl under hentning af jord købs oplysninger.
+	</floater.string>
+	<floater.string name="buying_will">
+		Køb af dette areal vil:
+	</floater.string>
+	<floater.string name="buying_for_group">
+		Køb af dette areal vil:
+	</floater.string>
+	<floater.string name="cannot_buy_now">
+		Kan ikke købe nu:
+	</floater.string>
+	<floater.string name="not_for_sale">
+		Ikke til salg:
+	</floater.string>
+	<floater.string name="none_needed">
+		ikke nødvendigt
+	</floater.string>
+	<floater.string name="must_upgrade">
+		Din konto skal være opgraderet for at eje jord.
+	</floater.string>
+	<floater.string name="cant_own_land">
+		Din konto kan eje jord.
+	</floater.string>
+	<floater.string name="land_holdings">
+		Du ejer [BUYER] m² land.
+	</floater.string>
+	<floater.string name="pay_to_for_land">
+		Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
+	</floater.string>
+	<floater.string name="buy_for_US">
+		Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT],
+	</floater.string>
+	<floater.string name="parcel_meters">
+		Denne parcel er på [AMOUNT] m²
+	</floater.string>
+	<floater.string name="premium_land">
+		Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
+	</floater.string>
+	<floater.string name="discounted_land">
+		Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m².
+	</floater.string>
+	<floater.string name="meters_supports_object">
+		[AMOUNT] m²
+kan indeholde [AMOUNT2] objekter
+	</floater.string>
+	<floater.string name="sold_with_objects">
+		solgt med objekter
+	</floater.string>
+	<floater.string name="sold_without_objects">
+		objekter ikke inkluderet
+	</floater.string>
+	<floater.string name="info_price_string">
+		L$ [PRICE]
+(L$ [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+	</floater.string>
+	<floater.string name="insufficient_land_credits">
+		Gruppen [GROUP] skal bruge nok tildelt jord brugs 
+kredit for at dække dette parcel før købet vil blive 
+gennemført.
+	</floater.string>
+	<floater.string name="have_enough_lindens">
+		Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
+	</floater.string>
+	<floater.string name="not_enough_lindens">
+		Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
+	</floater.string>
+	<floater.string name="balance_left">
+		Efter købet, vil du have L$ [AMOUNT] tilbage.
+	</floater.string>
+	<floater.string name="balance_needed">
+		Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
+	</floater.string>
+	<floater.string name="no_parcel_selected">
+		(intet parcel er valgt)
+	</floater.string>
+	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
+	<floater.string name="icon_M" value="Parcel_M_Dark"/>
+	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Region:
 	</text>
@@ -107,133 +236,4 @@ Denne parcel er på 512 m².
 	<check_box label="Fjern [AMOUNT] m² af bidrag fra gruppe." name="remove_contribution"/>
 	<button label="Køb" name="buy_btn"/>
 	<button label="Annullér" name="cancel_btn"/>
-	<string name="can_resell">
-		Kan videresælges.
-	</string>
-	<string name="can_not_resell">
-		Kan ikke videresælges.
-	</string>
-	<string name="can_change">
-		Kan samles eller opdeles.
-	</string>
-	<string name="can_not_change">
-		Kan ikke samles eller opdeles.
-	</string>
-	<string name="cant_buy_for_group">
-		Du har ikke tilladelse til at købe land for din aktive gruppe.
-	</string>
-	<string name="no_land_selected">
-		Intet land er valgt.
-	</string>
-	<string name="multiple_parcels_selected">
-		Flere forskellige parceller er valgt. 
-Prøv at vælge et mindre område.
-	</string>
-	<string name="no_permission">
-		Du har ikke tilladelse til at købe jord for din aktive gruppe.
-	</string>
-	<string name="parcel_not_for_sale">
-		Det udvalgte parcel er ikke til salg.
-	</string>
-	<string name="group_already_owns">
-		Gruppen ejer allerede parcellet.
-	</string>
-	<string name="you_already_own">
-		Du ejer allerede parcellet.
-	</string>
-	<string name="set_to_sell_to_other">
-		Det udvalgte parcel er sat til salg til en anden.
-	</string>
-	<string name="no_public_land">
-		Det valgte område har ingen offentlige arealer.
-	</string>
-	<string name="not_owned_by_you">
-		Jord, der ejes af en anden bruger er valgt. 
-Prøv at vælge et mindre område.
-	</string>
-	<string name="processing">
-		Forarbejder dit køb...
- 
-(Dette kan tage et minut eller to.)
-	</string>
-	<string name="fetching_error">
-		Der er sket en fejl under hentning af jord købs oplysninger.
-	</string>
-	<string name="buying_will">
-		Køb af dette areal vil:
-	</string>
-	<string name="buying_for_group">
-		Køb af dette areal vil:
-	</string>
-	<string name="cannot_buy_now">
-		Kan ikke købe nu:
-	</string>
-	<string name="not_for_sale">
-		Ikke til salg:
-	</string>
-	<string name="none_needed">
-		ikke nødvendigt
-	</string>
-	<string name="must_upgrade">
-		Din konto skal være opgraderet for at eje jord.
-	</string>
-	<string name="cant_own_land">
-		Din konto kan eje jord.
-	</string>
-	<string name="land_holdings">
-		Du ejer [BUYER] m² land.
-	</string>
-	<string name="pay_to_for_land">
-		Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
-	</string>
-	<string name="buy_for_US">
-		Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT],
-	</string>
-	<string name="parcel_meters">
-		Denne parcel er på [AMOUNT] m²
-	</string>
-	<string name="premium_land">
-		Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
-	</string>
-	<string name="discounted_land">
-		Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m².
-	</string>
-	<string name="meters_supports_object">
-		[AMOUNT] m²
-kan indeholde [AMOUNT2] objekter
-	</string>
-	<string name="sold_with_objects">
-		solgt med objekter
-	</string>
-	<string name="sold_without_objects">
-		objekter ikke inkluderet
-	</string>
-	<string name="info_price_string">
-		L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
-[SOLD_WITH_OBJECTS]
-	</string>
-	<string name="insufficient_land_credits">
-		Gruppen [GROUP] skal bruge nok tildelt jord brugs 
-kredit for at dække dette parcel før købet vil blive 
-gennemført.
-	</string>
-	<string name="have_enough_lindens">
-		Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
-	</string>
-	<string name="not_enough_lindens">
-		Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
-	</string>
-	<string name="balance_left">
-		Efter købet, vil du have L$ [AMOUNT] tilbage.
-	</string>
-	<string name="balance_needed">
-		Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
-	</string>
-	<string name="no_parcel_selected">
-		(intet parcel er valgt)
-	</string>
-	<string name="buy_currency">
-		Køb L$ [LINDENS] for omkring US$ [USD]
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index 514b2c4331..f744b06277 100644
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -21,7 +21,7 @@
 	<check_box label="Benyt nu" name="apply_immediate"/>
 	<button label="" label_selected="" name="color_pipette"/>
 	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
-	<button label="Ok" label_selected="Ok" name="select_btn"/>
+	<button label="OK" label_selected="OK" name="select_btn"/>
 	<text name="Current color:">
 		Nuværende Farve:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
index 379302ef6a..b8b4b03277 100644
--- a/indra/newview/skins/default/xui/da/floater_customize.xml
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater customize" title="UDSEENDE" width="509">
 	<tab_container name="customize tab container" width="507">
-		<placeholder label="Krops Dele" name="body_parts_placeholder"/>
+		<text label="Krops Dele" name="body_parts_placeholder">
+			Kropsdele
+		</text>
 		<panel label="Kropsbygning" name="Shape">
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 			<button label="Krop" label_selected="Krop" name="Body"/>
@@ -14,8 +16,8 @@
 			<button label="Overkrop" label_selected="Overkrop" name="Torso"/>
 			<button label="Ben" label_selected="Ben" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item label="Kvinde" name="radio"/>
-				<radio_item label="Mand" name="radio2"/>
+				<radio_item label="Kvinde" name="radio" value="0"/>
+				<radio_item label="Mand" name="radio2" value="1"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -33,9 +35,7 @@
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Vælg en ny krop ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en fra bunden 
-og bagefter &apos;tage den på&apos;.
+				Vælg en ny kropsbygning ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -68,9 +68,7 @@ og bagefter &apos;tage den på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag en ny hud på ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en hud fra bunden 
-og bagefter &apos;tage den på&apos;.
+				Vælg en ny hud ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -107,9 +105,7 @@ og bagefter &apos;tage den på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag et ny hår på ved at trække et fra din beholdning
-over på din avatar. Du kan også oprette et nyt hår fra bunden 
-og bagefter &apos;tage det på&apos;.
+				Vælg et nyt hår ved at trække et sådant fra din beholdning over på din avatar. Du kan også oprette et fra bunden og bagefter &apos;tage det på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -140,9 +136,7 @@ og bagefter &apos;tage det på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag et ny sæt øjne på ved at trække et sæt fra din beholdning
-over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden 
-og bagefter &apos;tage dem på&apos;.
+				Vælg et nyt sæt øjne ved at trække et sådant par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -156,12 +150,14 @@ og bagefter &apos;tage dem på&apos;.
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
-		<placeholder label="Tøje" name="clothes_placeholder"/>
+		<text label="Tøje" name="clothes_placeholder">
+			Tøj
+		</text>
 		<panel label="Trøje" name="Shirt">
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
@@ -181,8 +177,7 @@ og bagefter &apos;tage dem på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag en ny Tøje på ved at trække en fra din beholdning over på din avatar. 
-Du kan også oprette en ny Tøje fra bunden og bagefter &apos;tage den på&apos;.
+				Vælg en ny trøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -194,8 +189,8 @@ Du kan også oprette en ny Tøje fra bunden og bagefter &apos;tage den på&apos;
 		<panel label="Bukser" name="Pants">
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+			<button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
@@ -215,9 +210,7 @@ Du kan også oprette en ny Tøje fra bunden og bagefter &apos;tage den på&apos;
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag nyr bukser på ved at trække dem fra din beholdning over på
-din avatar. Du kan også oprette ny bukser fra bunden og bagefter
-&apos;tage dem på&apos;.
+				Vælg et nyt par bukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
@@ -243,10 +236,9 @@ din avatar. Du kan også oprette ny bukser fra bunden og bagefter
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag et ny par sko på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par sko fra bunden 
-og bagefter &apos;tage dem på&apos;.
+				Vælg et nyt par sko ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
+			<button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -255,7 +247,6 @@ og bagefter &apos;tage dem på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -278,10 +269,9 @@ og bagefter &apos;tage dem på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag et ny par Strømper på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par Strømper fra bunden 
-og bagefter &apos;tage dem på&apos;.
+				Vælg et nyt par sokker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
+			<button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -290,7 +280,6 @@ og bagefter &apos;tage dem på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -313,9 +302,9 @@ og bagefter &apos;tage dem på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag en ny jakke på ved at trække en fra din beholdning over på din avatar. 
-Du kan også oprette en ny jakke fra bunden og bagefter &apos;tage den på&apos;.
+				Vælg en ny jakke ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
+			<button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -325,7 +314,6 @@ Du kan også oprette en ny jakke fra bunden og bagefter &apos;tage den på&apos;
 			<texture_picker label="Stof øverst" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/>
 			<texture_picker label="Stof nederst" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -348,10 +336,9 @@ Du kan også oprette en ny jakke fra bunden og bagefter &apos;tage den på&apos;
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag nye handsker på ved at trække et par fra din beholdning over på
-din avatar. Du kan også oprette nye handsker fra bunden 
-og bagefter &apos;tage dem på&apos;.
+				Vælg et sæt nye handsker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
+			<button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -360,7 +347,6 @@ og bagefter &apos;tage dem på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -383,10 +369,9 @@ og bagefter &apos;tage dem på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag en ny undertrøje på ved at trække en fra din beholdning over på
-din avatar. Du kan også oprette en ny undertrøje fra bunden 
-og bagefter &apos;tage den på&apos;.
+				Vælg en ny undertrøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
+			<button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -395,7 +380,6 @@ og bagefter &apos;tage den på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -418,10 +402,9 @@ og bagefter &apos;tage den på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag nye underbukser på ved at trække dem fra din beholdning over på
-din avatar. Du kan også oprette en par nye underbukser fra bunden 
-og bagefter &apos;tage dem på&apos;.
+				Vælg et nyt par underbukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter &apos;tage dem på&apos;.
 			</text>
+			<button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -430,7 +413,6 @@ og bagefter &apos;tage dem på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -453,10 +435,9 @@ og bagefter &apos;tage dem på&apos;.
 				Fundet i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Tag en ny nederdel på ved at trække en fra din beholdning over på
-din avatar. Du kan også oprette en ny nederdel fra bunden 
-og bagefter &apos;tage den på&apos;.
+				Vælg en ny nederdel ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
+			<button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at redigere denne del.
 			</text>
@@ -465,13 +446,12 @@ og bagefter &apos;tage den på&apos;.
 			</text>
 			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
 			<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
-			<button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Annullér" label_selected="Annullér" name="Revert"/>
 		</panel>
-		<panel label="Alpha" name="Alpha">
+		<panel label="Tatovering" name="Tattoo">
 			<text name="title">
 				[DESC]
 			</text>
@@ -488,27 +468,24 @@ og bagefter &apos;tage den på&apos;.
 				Placeret i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Brug en ny &quot;alpha mask&quot; ved at trække en fra din beholding til din avatar.
-Alternativt kan du lave en fra bunden og bære denne.
+				Vælg en ny tatovering ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
+			<button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at ændre denne.
 			</text>
 			<text name="Item Action Label">
-				Alpha:
+				Tatovering:
 			</text>
-			<texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
-			<button label="Lav ny &quot;Alpha&quot;" label_selected="Lav ny &quot;Alpha&quot;" name="Create New"/>
+			<texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
 			<button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/>
 		</panel>
-		<panel label="Tatovering" name="Tattoo">
+		<panel label="Alpha" name="Alpha">
 			<text name="title">
 				[DESC]
 			</text>
@@ -525,19 +502,20 @@ Alternativt kan du lave en fra bunden og bære denne.
 				Placeret i [PATH]
 			</text>
 			<text name="not worn instructions">
-				Brug en ny tatovering ved at trække en fra din beholding til din avatar.
-Alternativt kan du lave en fra bunden og bære denne.
+				Vælg en ny &apos;alpha maske&apos; ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter &apos;tage den på&apos;.
 			</text>
+			<button label="Lav ny &quot;Alpha&quot;" label_selected="Lav ny &quot;Alpha&quot;" name="Create New"/>
 			<text name="no modify instructions">
 				Du har ikke rettigheder til at ændre denne.
 			</text>
 			<text name="Item Action Label">
-				Tatovering:
+				Alpha:
 			</text>
-			<texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
-			<texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
-			<button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/>
+			<texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
+			<texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
 			<button label="Tag af" label_selected="Tag af" name="Take Off"/>
 			<button label="Gem" label_selected="Gem" name="Save"/>
 			<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -545,6 +523,7 @@ Alternativt kan du lave en fra bunden og bære denne.
 		</panel>
 	</tab_container>
 	<scroll_container left="212" name="panel_container"/>
+	<button label="Script info" label_selected="Script info" name="script_info" tool_tip="Vis scripts vedhæftet på din avatar"/>
 	<button label="Lav sæt" label_selected="Lav sæt" name="make_outfit_btn"/>
 	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
new file mode 100644
index 0000000000..267a36b26c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_event.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Event" name="Event" title="EVENT DETALJER">
+	<floater.string name="none">
+		ingen
+	</floater.string>
+	<floater.string name="notify">
+		Meddel
+	</floater.string>
+	<floater.string name="dont_notify">
+		Meddel ikke
+	</floater.string>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<text name="event_name">
+				Event uden navn.
+			</text>
+			<text name="event_category">
+				(ingen kategori)
+			</text>
+			<text name="event_runby_label">
+				Afholdt af:
+			</text>
+			<text initial_value="(henter)" name="event_runby"/>
+			<text name="event_date">
+				10/10/2010
+			</text>
+			<text name="event_duration">
+				1 time
+			</text>
+			<text name="event_cover">
+				Gratis
+			</text>
+			<text name="event_location_label">
+				Lokation:
+			</text>
+			<text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<text name="rating_label" value="Rating:"/>
+			<text name="rating_value" value="ukendt"/>
+		</layout_panel>
+		<layout_panel name="button_panel">
+			<button name="create_event_btn" tool_tip="Opret event"/>
+			<button name="god_delete_event_btn" tool_tip="Slet event"/>
+			<button label="Giv besked" name="notify_btn"/>
+			<button label="Teleport" name="teleport_btn"/>
+			<button label="Kort" name="map_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml
new file mode 100644
index 0000000000..ea045538c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="GOD TOOLS">
+	<tab_container name="GodTools Tabs">
+		<panel label="Region" name="region">
+			<check_box label="Reset Home On Teleport" name="check reset home" tool_tip="Når beboere teleporterer væk, så sæt deres hjemmeadresse til deres destinations position."/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
index fc52796344..4eba4aee1f 100644
--- a/indra/newview/skins/default/xui/da/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_help_browser" title="HJÆLP">
+	<floater.string name="loading_text">
+		Henter...
+	</floater.string>
 	<layout_stack name="stack1">
-		<layout_panel name="external_controls">
-			<button label="Ã…ben i min web browser" name="open_browser"/>
-		</layout_panel>
+		<layout_panel name="external_controls"/>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml
index 519a70d1d9..2ef8a7ce36 100644
--- a/indra/newview/skins/default/xui/da/floater_im.xml
+++ b/indra/newview/skins/default/xui/da/floater_im.xml
@@ -10,7 +10,7 @@
 		Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
 	</string>
 	<string name="muted_message">
-		Du har blokeret denne beboer. Hvis du sender besked vil denne blokering fjernes.
+		Du har blokeret denne beboer. Hvis du sender en besked til beboeren vil dette automatisk medføre fjernelse af blokeringen
 	</string>
 	<string name="generic_request_error">
 		Kunne ikke etablere forbindelse, prøv igen senere
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
index da6f877f56..28b2f7f7eb 100644
--- a/indra/newview/skins/default/xui/da/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/da/floater_im_container.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="Personlige beskeder"/>
+<multi_floater name="floater_im_box" title="SAMTALER"/>
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
index 3a1ef2e47d..2349174db2 100644
--- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="incoming call" title="UKENDT PERSON KALDER OP">
+	<floater.string name="lifetime">
+		5
+	</floater.string>
 	<floater.string name="localchat">
 		Stemme chat nærved
 	</floater.string>
@@ -12,6 +15,9 @@
 	<floater.string name="VoiceInviteAdHoc">
 		har sluttet sig til stemme chat opkald med en konference chat.
 	</floater.string>
+	<floater.string name="VoiceInviteGroup">
+		deltager nu i Stemme chat opkald med denne gruppe [GROUP].
+	</floater.string>
 	<text name="question">
 		Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat?
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
index d80051fb84..3a4b0fbd6b 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="BEHOLDNING">
+<floater name="Inventory" title="MIN BEHOLDNING">
 	<floater.string name="Title">
-		Beholdning
+		MIN BEHOLDNING
 	</floater.string>
 	<floater.string name="TitleFetching">
-		Beholdning (henter [ITEM_COUNT] genstande...) [FILTER]
+		MIN BEHOLDNING (Henter [ITEM_COUNT] genstande...) [FILTER]
 	</floater.string>
 	<floater.string name="TitleCompleted">
-		Beholdning ([ITEM_COUNT] genstande) [FILTER]
+		MIN BEHOLDNING ([ITEM_COUNT] genstande) [FILTER]
 	</floater.string>
 	<floater.string name="Fetched">
 		Hentet
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
index 4079ff9f38..0cc13fd736 100644
--- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
 		Kører
 	</floater.string>
 	<floater.string name="Title">
-		Script: [NAME]
+		SCRIPT: [NAME]
 	</floater.string>
 	<button label="Nulstil" label_selected="Reset" name="Reset"/>
 	<check_box initial_value="true" label="Kører" name="running"/>
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index 2b008f133c..2594d6bb9d 100644
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL WIKI">
+<floater name="script ed float" title="LSL REFERENCE">
 	<check_box label="Følg markøreren" name="lock_check"/>
 	<combo_box label="LÃ¥s" left_delta="114" name="history_combo" width="70"/>
 	<button label="Tilbage" name="back_btn"/>
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index f618548908..82897d545a 100644
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
+<floater name="Map" title="Mini-kort">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
index 47667973ba..d3028c32f9 100644
--- a/indra/newview/skins/default/xui/da/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="MEDIE VÆLGER">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Tilbage" name="back" />
-			<button label="Frem" name="forward" />
-			<button label="Opdater" name="reload" />
-			<button label="GÃ¥ til" name="go" />
+			<button label="Tilbage" name="back"/>
+			<button label="Frem" name="forward"/>
+			<button label="Opdater" name="reload"/>
+			<button label="GÃ¥ til" name="go"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Send nuværende URL til parcel" name="assign" />
+			<button label="Send denne side til parcel" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="Ã…ben i min browser" name="open_browser" />
-			<check_box label="Ã…ben altid i min browser" name="open_always" />
-			<button label="Luk" name="close" />
+			<button label="Ã…ben i min browser" name="open_browser"/>
+			<check_box label="Ã…ben altid i min browser" name="open_always"/>
+			<button label="Luk" name="close"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
index b00dc6bf4d..258af489e7 100644
--- a/indra/newview/skins/default/xui/da/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
@@ -19,11 +19,10 @@
 		Flyv baglæns (Tryk på Ned piletast eller S)
 	</string>
 	<panel name="panel_actions">
-		<button label="" label_selected="" name="turn left btn" tool_tip="xxx
-				Drej til venstre (Tryk på venstre piletast eller A)"/>
+		<button label="" label_selected="" name="turn left btn" tool_tip="xxx     Drej til venstre (Tryk på venstre piletast eller A)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="Flyv op, Tryk på &quot;E&quot;"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, Tryk på &quot;C&quot;"/>
+		<button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/>
+		<button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/>
 		<joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/>
 		<joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml
new file mode 100644
index 0000000000..0bcb96b151
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title="Gem sæt">
+	<button label="Gem" label_selected="Gem" name="Save"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
+	<text name="Save item as:">
+		Gem hvad jeg har på som et nyt sæt:
+	</text>
+	<line_editor name="name ed">
+		[DESC] (ny)
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
index 5c98d9855f..ef4e22dd8f 100644
--- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outgoing call" title="KALDER">
+	<floater.string name="lifetime">
+		5
+	</floater.string>
 	<floater.string name="localchat">
 		Stemme chat nærved
 	</floater.string>
@@ -21,6 +24,15 @@
 	<text name="noanswer">
 		Intet svar.  Prøv igen senere.
 	</text>
+	<text name="nearby">
+		Du er blevet koblet af fra [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_other">
+		[VOICE_CHANNEL_NAME] har afsluttet opkaldet.  [RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_agent">
+		Du har afsluttet opkaldet.  [RECONNECT_NEARBY]
+	</text>
 	<text name="leaving">
 		Forlader [CURRENT_CHAT].
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
index f74e097da2..368d678681 100644
--- a/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -15,7 +15,7 @@
 	</text>
 	<icon name="icon_object" tool_tip="Objekter"/>
 	<text name="object_name_text">
-		...
+		Mit fantastiske objekt med et virkeligt langt navn
 	</text>
 	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
 	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
index f0fe3472d0..a53586eaaf 100644
--- a/indra/newview/skins/default/xui/da/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/da/floater_preferences.xml
@@ -6,7 +6,7 @@
 		<panel label="Generelt" name="general"/>
 		<panel label="Grafik" name="display"/>
 		<panel label="Privatliv" name="im"/>
-		<panel label="Sound" name="audio"/>
+		<panel label="Lyd &amp; medier" name="audio"/>
 		<panel label="Chat" name="chat"/>
 		<panel label="Beskeder" name="msgs"/>
 		<panel label="Opsætning" name="input"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index bfa3c150a9..f49fd8c99a 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -24,6 +24,9 @@
 	<floater.string name="Title">
 		Bevægelse: [NAME]
 	</floater.string>
+	<text name="name_text">
+		Navn:
+	</text>
 	<text name="desc_label">
 		Beskrivelse:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index 2ebec4462f..e600a774ec 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="NOTE:">
 	<floater.string name="no_object">
-		Kunne ikke finde objekt der indeholder denne note.
+		Kunne ikke finde objekt som indeholder denne note.
 	</floater.string>
 	<floater.string name="not_allowed">
 		Du har ikke rettigheder til at se denne note.
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
index ab7ddbcc72..48cf53f563 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
@@ -12,6 +12,9 @@
 	<text name="dimensions">
 		[WIDTH]px x [HEIGHT]px
 	</text>
+	<text name="aspect_ratio">
+		Vis aspekt forhold
+	</text>
 	<combo_box name="combo_aspect_ratio" tool_tip="Forhåndsvisning med et bestemt billedformat">
 		<combo_item name="Unconstrained">
 			Ikke låst
@@ -38,7 +41,7 @@
 			2:1
 		</combo_item>
 	</combo_box>
-	<button label="OK" name="keep"/>
-	<button label="Annullér" name="discard"/>
+	<button label="OK" name="Keep"/>
+	<button label="Kassér" name="Discard"/>
 	<button label="Gem som" name="save_tex_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 9ef17a3cbb..07978792b9 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -42,7 +42,7 @@
 		<combo_box.item label="Vælg kategori" name="Select_category"/>
 		<combo_box.item label="Alder &gt; Falsk alder" name="Age__Age_play"/>
 		<combo_box.item label="Alder &gt; Voksen beboer på Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
-		<combo_box.item label="Alder &gt; Mindreårig beboer udenfor Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="Alder &gt; Mindreårig beboer uden for Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
 		<combo_box.item label="Overfald &gt; Kamp sandkasse / Usikkert område" name="Assault__Combat_sandbox___unsafe_area"/>
 		<combo_box.item label="Overfald &gt; Sikkert område" name="Assault__Safe_area"/>
 		<combo_box.item label="Overfald &gt; Sandkasse til våbentest" name="Assault__Weapons_testing_sandbox"/>
diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml
new file mode 100644
index 0000000000..a7f86a782a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="scriptlimits" title="SCRIPT INFORMATION"/>
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
index 1e8d869716..1aacab6915 100644
--- a/indra/newview/skins/default/xui/da/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview lsl text" title="SCRIPT: ROTATIONS SCRIPT">
 	<floater.string name="Title">
-		Script: [NAME]
+		SCRIPT: [NAME]
 	</floater.string>
 	<text name="desc txt">
 		Beskrivelse:
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
index fe0d31c6c3..9f7aad5e03 100644
--- a/indra/newview/skins/default/xui/da/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/da/floater_select_key.xml
@@ -2,6 +2,6 @@
 <floater name="modal container" title="">
 	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 	<text name="Save item as:">
-		Tryk på en taste for at sætte din &quot;Tale&quot; knap udløser.
+		Tryk en taste for at angive trigger til at tale.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index 41cf100d94..016e5af378 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="DEBUG INDSTILLINGER">
-	<combo_box name="boolean_combo">
-		<combo_box.item label="SANDT" name="TRUE"/>
-		<combo_box.item label="FALSK" name="FALSE"/>
-	</combo_box>
+	<radio_group name="boolean_combo">
+		<radio_item label="SANDT" name="TRUE" value="sand"/>
+		<radio_item label="FALSK" name="FALSE" value=""/>
+	</radio_group>
 	<color_swatch label="Farve" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 5e8c64e21f..6140055d74 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -4,12 +4,12 @@
 		Hvor skal foto hen?
 	</text>
 	<radio_group label="Snapshot type" name="snapshot_type_radio">
-		<radio_item label="Send via e-mail" name="postcard"/>
-		<radio_item label="Gem i din beholdning (L$[AMOUNT])" name="texture"/>
-		<radio_item label="Gem på din computer" name="local"/>
+		<radio_item label="Email" name="postcard"/>
+		<radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/>
+		<radio_item label="Gem på min computer" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
-		Fil størrelse: [SIZE] KB
+		[SIZE] KB
 	</text>
 	<button label="Tag nyt foto" name="new_snapshot_btn"/>
 	<button label="Send" name="send_btn"/>
@@ -19,8 +19,8 @@
 		<flyout_button_item label="Gem som..." name="saveas_item"/>
 	</flyout_button>
 	<button label="Annullér" name="discard_btn"/>
-	<button label="Mere &gt;&gt;" name="more_btn" tool_tip="Avancerede muligheder"/>
-	<button label="&lt;&lt; Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
+	<button label="Mere" name="more_btn" tool_tip="Avancerede muligheder"/>
+	<button label="Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
 	<text name="type_label2">
 		Størrelse
 	</text>
@@ -59,7 +59,7 @@
 	<spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/>
 	<spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/>
 	<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
-	<slider label="Billed-kvalitet" name="image_quality_slider"/>
+	<slider label="Billedkvalitet" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Benyt:
 	</text>
@@ -68,10 +68,10 @@
 		<combo_box.item label="Dybde" name="Depth"/>
 		<combo_box.item label="Materinger" name="ObjectMattes"/>
 	</combo_box>
-	<check_box label="Vis brugerflade på foto" name="ui_check"/>
-	<check_box label="Vis HUD objekter på foto" name="hud_check"/>
+	<check_box label="Snitflade" name="ui_check"/>
+	<check_box label="HUDs" name="hud_check"/>
 	<check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/>
-	<check_box label="Frys billede og vis" name="freeze_frame_check"/>
+	<check_box label="Fastfrys (fuldt billede)" name="freeze_frame_check"/>
 	<check_box label="Auto-opdater" name="auto_snapshot_check"/>
 	<string name="unknown">
 		ukendt
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
index b5cecf93e9..f203c2504f 100644
--- a/indra/newview/skins/default/xui/da/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="BESKEDER">
 	<string name="title_im_well_window">
-		IM SESSIONER
+		SAMTALER
 	</string>
 	<string name="title_notification_well_window">
 		BESKEDER
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
index 00b49a9df9..fbc7fe2319 100644
--- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
@@ -17,7 +17,7 @@
 	<check_box label="Benyt ny" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
 	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
-	<button label="Ok" label_selected="Ok" name="Select"/>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<string name="pick title">
 		Vælg:
 	</string>
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
index 3f19350e30..86c24d2c19 100644
--- a/indra/newview/skins/default/xui/da/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml
@@ -1,15 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="Top objekter">
+	<floater.string name="top_scripts_title">
+		Mest krævende scripts
+	</floater.string>
+	<floater.string name="top_scripts_text">
+		[COUNT] scripts bruger ialt [TIME] ms
+	</floater.string>
+	<floater.string name="scripts_score_label">
+		Tid
+	</floater.string>
+	<floater.string name="scripts_mono_time_label">
+		Mono tid
+	</floater.string>
+	<floater.string name="top_colliders_title">
+		Mest kolliderende
+	</floater.string>
+	<floater.string name="top_colliders_text">
+		Top [COUNT] genstande der potentielt har mange kollisioner
+	</floater.string>
+	<floater.string name="colliders_score_label">
+		Point
+	</floater.string>
+	<floater.string name="none_descriptor">
+		Ingen fundet
+	</floater.string>
 	<text name="title_text">
 		Henter...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Point" name="score"/>
-		<column label="Navn" name="name"/>
-		<column label="Ejer" name="owner"/>
-		<column label="Lokation" name="location"/>
-		<column label="Tid" name="time"/>
-		<column label="Mono tid" name="mono_time"/>
+		<scroll_list.columns label="Point" name="score"/>
+		<scroll_list.columns label="Navn" name="name"/>
+		<scroll_list.columns label="Ejer" name="owner"/>
+		<scroll_list.columns label="Lokation" name="location"/>
+		<scroll_list.columns label="Tid" name="time"/>
+		<scroll_list.columns label="Mono tid" name="mono_time"/>
+		<scroll_list.columns label="URL&apos;er" name="URLs"/>
 	</scroll_list>
 	<text name="id_text">
 		Objekt ID:
@@ -23,33 +48,9 @@
 		Ejer:
 	</text>
 	<button label="Filter" name="filter_owner_btn"/>
+	<button label="Genopfrisk" name="refresh_btn"/>
 	<button label="Returnér valgte" name="return_selected_btn"/>
 	<button label="Returnér alle" name="return_all_btn"/>
 	<button label="Afbryd valgte" name="disable_selected_btn"/>
 	<button label="Afbryd alle" name="disable_all_btn"/>
-	<button label="Genopfrisk" name="refresh_btn"/>
-	<string name="top_scripts_title">
-		Mest krævende scripts
-	</string>
-	<string name="top_scripts_text">
-		[COUNT] scripts bruger ialt [TIME] ms
-	</string>
-	<string name="scripts_score_label">
-		Tid
-	</string>
-	<string name="scripts_mono_time_label">
-		Mono tid
-	</string>
-	<string name="top_colliders_title">
-		Mest kolliderende
-	</string>
-	<string name="top_colliders_text">
-		Top [COUNT] genstande der potentielt har mange kollisioner
-	</string>
-	<string name="colliders_score_label">
-		Point
-	</string>
-	<string name="none_descriptor">
-		Ingen fundet
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index 77906f0f46..6f61d9b310 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -4,7 +4,7 @@
 	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 	<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/>
 	<text name="tos_heading">
-		Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til [SECOND LIFE] skal du acceptere vilkårene.
+		Læs venligst følgende servicebetingelser grundigt. For at kunne logge på [SECOND_LIFE], skal du acceptere aftalen.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
index 8651851233..05e9eb6cdd 100644
--- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
@@ -13,13 +13,14 @@
 		Opkald med [NAME]
 	</string>
 	<string name="no_one_near">
-		Ingen nær
+		Ingen i nærheden har aktiveret stemmer
 	</string>
-	<panel name="control_panel">
-		<layout_stack>
-			<layout_panel name="leave_btn_panel">
-				<button label="Forlad opkald" name="leave_call_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
+	<layout_stack name="my_call_stack">
+		<layout_panel name="my_panel">
+			<text name="user_text" value="Min avatar:"/>
+		</layout_panel>
+		<layout_panel name="leave_call_btn_panel">
+			<button label="Forlad opkald" name="leave_call_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
index a70db6a6f1..17d5b9c205 100644
--- a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="">
-	<button label="Gem" label_selected="Gem" name="Save" />
-	<button label="Annullér" label_selected="Annullér" name="Cancel" />
+	<button label="Gem" label_selected="Gem" name="Save"/>
+	<button label="Annullér" label_selected="Annullér" name="Cancel"/>
 	<text name="Save item as:">
-		Gem ting som::
+		Gem genstand i min beholdning som:
 	</text>
 	<line_editor name="name ed">
 		Ny [DESC]
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
index d2f618579d..443e84b64a 100644
--- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry">
+<floater name="whitelist_entry" title="GODKENDTE SIDER">
 	<text name="media_label">
 		Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml
new file mode 100644
index 0000000000..db8ead21bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_window_size.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="window_size" title="VINDUE STØRRELSE">
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<text name="windowsize_text">
+		Sæt størrelse på vindue:
+	</text>
+	<combo_box name="window_size_combo" tool_tip="bredde x højde">
+		<combo_box.item label="1000 x 700 (standard)" name="item0"/>
+		<combo_box.item label="1024 x 768" name="item1"/>
+		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
+		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+	</combo_box>
+	<button label="Sæt" name="set_btn"/>
+	<button label="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 137e8509a4..7d4a81d655 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -6,64 +6,29 @@
 		</text>
 	</panel>
 	<panel>
-		<button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrér kort om min avatars position"/>
-		<text name="person_label">
+		<text name="me_label">
 			Mig
 		</text>
-		<check_box label="Beboer" name="people_chk"/>
-		<check_box label="Infohub" name="infohub_chk"/>
-		<text name="infohub_label">
-			Infohub
+		<text name="person_label">
+			Person
 		</text>
-		<check_box label="Land til salg" name="land_for_sale_chk"/>
-		<text name="land_sale_label">
-			Land til salg
+		<text name="by_owner_label">
+			efter ejer
 		</text>
 		<text name="auction_label">
-			af ejer
-		</text>
-		<button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleportér til min hjemmelokation"/>
-		<text name="Home_label">
-			Hjem
+			land auktion
 		</text>
-		<text name="events_label">
-			Events:
+		<text name="pg_label">
+			Generelt
 		</text>
-		<check_box label="PG" name="event_chk"/>
-		<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 		<text name="mature_label">
-			Mature
+			Moderat
 		</text>
-		<check_box label="Adult" name="event_adult_chk"/>
-	</panel>
-	<panel>
-		<text name="find_on_map_label">
-			Find på kort
-		</text>
-	</panel>
-	<panel>
-		<combo_box label="Venner online" name="friend combo" tool_tip="Vis venner på kort">
-			<combo_box.item label="Mine venner online" name="item1"/>
-		</combo_box>
-		<combo_box label="Mine landemærker" name="landmark combo" tool_tip="Landemærke der skal vises på kort">
-			<combo_box.item label="Mine landemærker" name="item1"/>
-		</combo_box>
-		<search_editor label="Regioner efter navn" name="location" tool_tip="Skriv navnet på en region"/>
-		<button label="Find" name="DoSearch" tool_tip="Søg efter en region"/>
-		<scroll_list name="search_results">
-			<scroll_list.columns label="" name="icon"/>
-			<scroll_list.columns label="" name="sim_name"/>
-		</scroll_list>
-		<button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleportér til den valgte lokation"/>
-		<button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer denne lokation som SLurl der kan bruges på web."/>
-		<button label="Vis selektion" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/>
-	</panel>
-	<panel>
-		<text name="zoom_label">
-			Zoom
+		<text name="adult_label">
+			Voksen
 		</text>
 	</panel>
 	<panel>
-		<slider label="Zoom" name="zoom slider"/>
+		<button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
index 1b85544303..d4bc0813e5 100644
--- a/indra/newview/skins/default/xui/da/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml
@@ -13,7 +13,7 @@
 	<slider name="volume_slider" tool_tip="Stemme lydstyrke" value="0.5"/>
 	<button label="Tilføj ven" name="add_friend_btn"/>
 	<button label="IM" name="im_btn"/>
-	<button label="Mere" name="view_profile_btn"/>
+	<button label="Profil" name="view_profile_btn"/>
 	<panel name="moderator_panel">
 		<button label="Slå stemme-chat fra" name="disable_voice"/>
 		<button label="Slå stemme-chat til" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
index 29620fca27..6a6831c2e3 100644
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
 	<menu_item_call label="Stå op" name="Stand Up"/>
-	<context_menu label="Tag af &gt;" name="Take Off &gt;">
-		<context_menu label="Tøj &gt;" name="Clothes &gt;">
+	<context_menu label="Tag af  â–¶" name="Take Off &gt;">
+		<context_menu label="Tøj  ▶" name="Clothes &gt;">
 			<menu_item_call label="Trøje" name="Shirt"/>
 			<menu_item_call label="Bukser" name="Pants"/>
 			<menu_item_call label="Nederdel" name="Skirt"/>
@@ -16,8 +16,8 @@
 			<menu_item_call label="Alpha" name="Self Alpha"/>
 			<menu_item_call label="Alt tøj" name="All Clothes"/>
 		</context_menu>
-		<context_menu label="HUD &gt;" name="Object Detach HUD"/>
-		<context_menu label="Tag af &gt;" name="Object Detach"/>
+		<context_menu label="HUD  â–¶" name="Object Detach HUD"/>
+		<context_menu label="Tag af  â–¶" name="Object Detach"/>
 		<menu_item_call label="Tag alt af" name="Detach All"/>
 	</context_menu>
 	<menu_item_call label="Udseende" name="Appearance..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
new file mode 100644
index 0000000000..4889230919
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="IM Well Button Context Menu">
+	<menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
index 5b8089bfe0..7434f2c3a2 100644
--- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
@@ -7,6 +7,7 @@
 	<menu_item_call label="Teleportér" name="teleport"/>
 	<menu_item_call label="Invitér til gruppe" name="invite_to_group"/>
 	<menu_item_call label="Blokér" name="block"/>
+	<menu_item_call label="Fjern blokering" name="unblock"/>
 	<menu_item_call label="Rapportér" name="report"/>
 	<menu_item_call label="Frys" name="freeze"/>
 	<menu_item_call label="Smid ud" name="eject"/>
@@ -14,4 +15,5 @@
 	<menu_item_call label="Find på kort" name="find_on_map"/>
 	<menu_item_call label="Zoom ind" name="zoom_in"/>
 	<menu_item_call label="Betal" name="pay"/>
+	<menu_item_call label="Del" name="share"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 376af507d0..cdfcad9b1c 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -46,9 +46,10 @@
 	<menu_item_call label="Teleport" name="Landmark Open"/>
 	<menu_item_call label="Ã¥ben" name="Animation Open"/>
 	<menu_item_call label="Ã¥ben" name="Sound Open"/>
+	<menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+	<menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
 	<menu_item_call label="Slet ting" name="Purge Item"/>
 	<menu_item_call label="Genskab ting" name="Restore Item"/>
-	<menu_item_call label="GÃ¥ til link" name="Goto Link"/>
 	<menu_item_call label="Ã¥ben" name="Open"/>
 	<menu_item_call label="Egenskaber" name="Properties"/>
 	<menu_item_call label="Omdøb" name="Rename"/>
@@ -57,13 +58,11 @@
 	<menu_item_call label="Indsæt" name="Paste"/>
 	<menu_item_call label="Sæt ind som link" name="Paste As Link"/>
 	<menu_item_call label="Slet" name="Delete"/>
-	<menu_item_call label="Tag ting af" name="Take Off Items"/>
-	<menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
-	<menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+	<menu_item_call label="Slet systemfolder" name="Delete System Folder"/>
 	<menu_item_call label="start konference chat" name="Conference Chat Folder"/>
 	<menu_item_call label="Afspil" name="Sound Play"/>
 	<menu_item_call label="Om landemærke" name="About Landmark"/>
-	<menu_item_call label="Afspil offentligt" name="Animation Play"/>
+	<menu_item_call label="Afspil i verden" name="Animation Play"/>
 	<menu_item_call label="Afspil lokalt" name="Animation Audition"/>
 	<menu_item_call label="Send privat besked (IM)" name="Send Instant Message"/>
 	<menu_item_call label="Tilbyd teleport..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index 0942f1b807..7fc7d43c20 100644
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -21,8 +21,8 @@
 		</menu>
 		<menu_item_call label="Vis debug opsætning" name="Debug Settings"/>
 		<menu_item_call label="UI/farve opsætning" name="UI/Color Settings"/>
-		<menu_item_call label="Vis sidebakke" name="Show Side Tray"/>
 		<menu label="UI tests" name="UI Tests"/>
+		<menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/>
 		<menu_item_call label="Vis betingelser" name="TOS"/>
 		<menu_item_call label="Vis vigtig besked" name="Critical"/>
 		<menu_item_call label="Test i web browser" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
new file mode 100644
index 0000000000..40b35b5fdd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
index 0714b67ec3..232f3f64e2 100644
--- a/indra/newview/skins/default/xui/da/menu_object.xml
+++ b/indra/newview/skins/default/xui/da/menu_object.xml
@@ -6,18 +6,20 @@
 	<menu_item_call label="Ã…ben" name="Open"/>
 	<menu_item_call label="Sid her" name="Object Sit"/>
 	<menu_item_call label="Objekt profil" name="Object Inspect"/>
-	<context_menu label="Sæt på &gt;" name="Put On">
+	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<context_menu label="Tag på  ▶" name="Put On">
 		<menu_item_call label="Tag på" name="Wear"/>
-		<context_menu label="Vedhæft &gt;" name="Object Attach"/>
-		<context_menu label="Vedhæft HUD &gt;" name="Object Attach HUD"/>
+		<context_menu label="Vedhæft  ▶" name="Object Attach"/>
+		<context_menu label="Vedhæft HUD  ▶" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Fjern &gt;" name="Remove">
-		<menu_item_call label="Tag" name="Pie Object Take"/>
+	<context_menu label="Fjern  â–¶" name="Remove">
 		<menu_item_call label="Rapportér misbrug" name="Report Abuse..."/>
 		<menu_item_call label="Blokér" name="Object Mute"/>
 		<menu_item_call label="Returnér" name="Return..."/>
 		<menu_item_call label="Slet" name="Delete"/>
 	</context_menu>
+	<menu_item_call label="Køb" name="Pie Object Bye"/>
+	<menu_item_call label="Tag" name="Pie Object Take"/>
 	<menu_item_call label="Tag kopi" name="Take Copy"/>
 	<menu_item_call label="Betal" name="Pay..."/>
 	<menu_item_call label="Køb" name="Buy..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
index 44a016026c..c2595dcb3d 100644
--- a/indra/newview/skins/default/xui/da/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
+	<menu_item_check label="Sortér efter navn" name="SortByName"/>
+	<menu_item_check label="Sortér efter nylige talere" name="SortByRecentSpeakers"/>
 	<menu_item_call label="Profil" name="View Profile"/>
 	<menu_item_call label="Tilføj ven" name="Add Friend"/>
 	<menu_item_call label="Send besked" name="IM"/>
 	<menu_item_call label="Opkald" name="Call"/>
 	<menu_item_call label="Del" name="Share"/>
 	<menu_item_call label="Betal" name="Pay"/>
-	<menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/>
-	<menu_item_check label="Sluk for tekst" name="MuteText"/>
-	<menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
-	<menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
-	<menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/>
-	<menu_item_call label="Ã…ben for denne deltager" name="ModerateVoiceUnMuteSelected"/>
-	<menu_item_call label="Ã…ben for alle andre" name="ModerateVoiceUnMuteOthers"/>
+	<menu_item_check label="Blokér stemme" name="Block/Unblock"/>
+	<menu_item_check label="Blokér tekst" name="MuteText"/>
+	<context_menu label="Moderator muligheder &gt;" name="Moderator Options">
+		<menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
+		<menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/>
+		<menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/>
+	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml
new file mode 100644
index 0000000000..841f58b619
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_call label="Se info" name="View Info"/>
+	<menu_item_call label="Chat" name="Chat"/>
+	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Aktivér" name="Activate"/>
+	<menu_item_call label="Forlad" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
index 224190149b..5470c32761 100644
--- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
@@ -2,9 +2,12 @@
 <context_menu name="Avatar Context Menu">
 	<menu_item_call label="Profil" name="View Profile"/>
 	<menu_item_call label="Tilføj ven" name="Add Friend"/>
+	<menu_item_call label="Fjern ven" name="Remove Friend"/>
 	<menu_item_call label="Besked" name="IM"/>
 	<menu_item_call label="Opkald" name="Call"/>
+	<menu_item_call label="Kort" name="Map"/>
 	<menu_item_call label="Del" name="Share"/>
 	<menu_item_call label="Betal" name="Pay"/>
 	<menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/>
+	<menu_item_call label="Tilbyd teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
index 92c6d2c960..08b7136b97 100644
--- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
 	<menu_item_call label="Tilføj venner" name="Add Friends"/>
+	<menu_item_call label="Fjern venner" name="Remove Friend"/>
 	<menu_item_call label="Besked" name="IM"/>
 	<menu_item_call label="Opkald" name="Call"/>
 	<menu_item_call label="Del" name="Share"/>
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
index 58fbc62643..9609b424a1 100644
--- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
@@ -2,4 +2,10 @@
 <toggleable_menu name="profile_overflow_menu">
 	<menu_item_call label="Betal" name="pay"/>
 	<menu_item_call label="Del" name="share"/>
+	<menu_item_call label="Blokér" name="block"/>
+	<menu_item_call label="Fjern blokering" name="unblock"/>
+	<menu_item_call label="Spark" name="kick"/>
+	<menu_item_call label="Frys" name="freeze"/>
+	<menu_item_call label="Fjern frys" name="unfreeze"/>
+	<menu_item_call label="Kundeservicemedarbejder (CSR)" name="csr"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index ec0631d54f..18ad7cfffa 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -7,8 +7,8 @@
 		<menu_item_call label="Profil" name="Profile"/>
 		<menu_item_call label="Udseende" name="Appearance"/>
 		<menu_item_check label="Beholdning" name="Inventory"/>
-		<menu_item_call label="Vis beholdning i sidebakke" name="ShowSidetrayInventory"/>
-		<menu_item_call label="Mine bevægelser" name="Gestures"/>
+		<menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
+		<menu_item_check label="Mine bevægelser" name="Gestures"/>
 		<menu label="Min status" name="Status">
 			<menu_item_call label="Væk" name="Set Away"/>
 			<menu_item_call label="Optaget" name="Set Busy"/>
@@ -22,35 +22,36 @@
 		<menu_item_call label="Grupper" name="My Groups"/>
 		<menu_item_check label="Chat i nærheden" name="Nearby Chat"/>
 		<menu_item_call label="Personer tæt på" name="Active Speakers"/>
-		<menu_item_check label="Media i nærheden" name="Nearby Media"/>
 	</menu>
 	<menu label="Verden" name="World">
-		<menu_item_check label="Flyt" name="Movement Controls"/>
-		<menu_item_check label="Vis" name="Camera Controls"/>
-		<menu_item_call label="Om land" name="About Land"/>
-		<menu_item_call label="Region/Estate" name="Region/Estate"/>
-		<menu_item_call label="Køb land" name="Buy Land"/>
+		<menu_item_check label="Mini-kort" name="Mini-Map"/>
+		<menu_item_check label="Verdenskort" name="World Map"/>
+		<menu_item_call label="Foto" name="Take Snapshot"/>
+		<menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/>
+		<menu label="Profil for sted" name="Land">
+			<menu_item_call label="Om land" name="About Land"/>
+			<menu_item_call label="Region/Estate" name="Region/Estate"/>
+		</menu>
+		<menu_item_call label="Køb dette land" name="Buy Land"/>
 		<menu_item_call label="Mit land" name="My Land"/>
-		<menu label="Vis" name="Land">
-			<menu_item_check label="Ban Lines" name="Ban Lines"/>
+		<menu label="Vis" name="LandShow">
+			<menu_item_check label="Bevægelses kontrol" name="Movement Controls"/>
+			<menu_item_check label="Vis kontroller" name="Camera Controls"/>
+			<menu_item_check label="&apos;Ingen adgang&apos; markering" name="Ban Lines"/>
 			<menu_item_check label="Pejlelys" name="beacons"/>
 			<menu_item_check label="Parcel skel" name="Property Lines"/>
-			<menu_item_check label="Land-ejere" name="Land Owners"/>
-		</menu>
-		<menu label="Landemærker" name="Landmarks">
-			<menu_item_call label="Opret landemærke her" name="Create Landmark Here"/>
-			<menu_item_call label="Sæt hjem til her" name="Set Home to Here"/>
+			<menu_item_check label="Grundejere" name="Land Owners"/>
+			<menu_item_check label="Koordinater" name="Coordinates"/>
+			<menu_item_check label="Parcel egenskaber" name="Parcel Properties"/>
 		</menu>
-		<menu_item_call label="Hjem" name="Teleport Home"/>
-		<menu_item_check label="Mini-kort" name="Mini-Map"/>
-		<menu_item_check label="Verdenskort" name="World Map"/>
-		<menu_item_call label="Foto" name="Take Snapshot"/>
+		<menu_item_call label="Teleport hjem" name="Teleport Home"/>
+		<menu_item_call label="Sæt dette sted som &apos;Hjem&apos;" name="Set Home to Here"/>
 		<menu label="Sol" name="Environment Settings">
 			<menu_item_call label="Solopgang" name="Sunrise"/>
 			<menu_item_call label="Middag" name="Noon"/>
 			<menu_item_call label="Solnedgang" name="Sunset"/>
 			<menu_item_call label="Midnat" name="Midnight"/>
-			<menu_item_call label="Benyt tid fra estate" name="Revert to Region Default"/>
+			<menu_item_call label="Estate tid" name="Revert to Region Default"/>
 			<menu_item_call label="Redigering af omgivelser" name="Environment Editor"/>
 		</menu>
 	</menu>
@@ -76,10 +77,12 @@
 		</menu>
 		<menu_item_call label="Sammenkæde" name="Link"/>
 		<menu_item_call label="Adskil" name="Unlink"/>
+		<menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/>
 		<menu_item_call label="Fokusér på valgte" name="Focus on Selection"/>
 		<menu_item_call label="Zoom til valgte" name="Zoom to Selection"/>
 		<menu label="Objekt" name="Object">
-			<menu_item_call label="Køb" name="Menu Object Take"/>
+			<menu_item_call label="Køb" name="Menu Object Buy"/>
+			<menu_item_call label="Tag" name="Menu Object Take"/>
 			<menu_item_call label="Tag kopi" name="Take Copy"/>
 			<menu_item_call label="Opdatér ændringer til beholdning" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Opdater ændringer i indhold til objekt" name="Save Object Back to Object Contents"/>
@@ -92,25 +95,18 @@
 			<menu_item_call label="Sæt scripts til &quot;Not Running&quot;" name="Set Scripts to Not Running"/>
 		</menu>
 		<menu label="Valg" name="Options">
-			<menu_item_check label="Redigér sammenlænkede dele" name="Edit Linked Parts"/>
 			<menu_item_call label="Sæt standard rettigheder" name="perm prefs"/>
 			<menu_item_check label="Vis avancerede rettigheder" name="DebugPermissions"/>
-			<menu label="Selektion" name="Selection">
-				<menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/>
-				<menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/>
-				<menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/>
-			</menu>
-			<menu label="Vis" name="Show">
-				<menu_item_check label="Vis skjult selektion" name="Show Hidden Selection"/>
-				<menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/>
-				<menu_item_check label="Vis udvælgelses stråle" name="Show Selection Beam"/>
-			</menu>
-			<menu label="Gitter" name="Grid">
-				<menu_item_check label="Ret ind til gitter" name="Snap to Grid"/>
-				<menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/>
-				<menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/>
-				<menu_item_call label="Gitter valg" name="Grid Options"/>
-			</menu>
+			<menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/>
+			<menu_item_check label="Vis kun flytbare objekter" name="Select Only Movable Objects"/>
+			<menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/>
+			<menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/>
+			<menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/>
+			<menu_item_check label="Vis pejlelys for valgte" name="Show Selection Beam"/>
+			<menu_item_check label="Ret ind til gitter" name="Snap to Grid"/>
+			<menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/>
+			<menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/>
+			<menu_item_call label="Gitter indstillinger" name="Grid Options"/>
 		</menu>
 		<menu label="Vis lænkede dele" name="Select Linked Parts">
 			<menu_item_call label="Vælg næste del" name="Select Next Part"/>
@@ -121,15 +117,14 @@
 	</menu>
 	<menu label="Hjælp" name="Help">
 		<menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/>
-		<menu_item_call label="Tutorial" name="Tutorial"/>
 		<menu_item_call label="Rapporter misbrug" name="Report Abuse"/>
 		<menu_item_call label="Rapportér fejl" name="Report Bug"/>
 	</menu>
 	<menu label="Avanceret" name="Advanced">
-		<menu_item_check label="Sæt til &quot;væk&quot; efter 30 minutter" name="Go Away/AFK When Idle"/>
 		<menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Gendan teksturer" name="Rebake Texture"/>
 		<menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/>
+		<menu_item_call label="Vælg vinduesstørrelse..." name="Set Window Size..."/>
 		<menu_item_check label="Begræns valg afstand" name="Limit Select Distance"/>
 		<menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/>
 		<menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/>
@@ -176,8 +171,8 @@
 		<menu_item_check label="Kør flere tråde" name="Run Multiple Threads"/>
 		<menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/>
 		<menu_item_check label="Muse udjævning" name="Mouse Smoothing"/>
-		<menu_item_check label="Vis IM&apos;s i lokal chat" name="IMInChat"/>
 		<menu label="Shortcuts" name="Shortcuts">
+			<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
 			<menu_item_check label="Søg" name="Search"/>
 			<menu_item_call label="Frigør taster" name="Release Keys"/>
 			<menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/>
@@ -217,6 +212,7 @@
 			<menu_item_call label="Vis Regionsinfo i debug-konsol" name="Region Info to Debug Console"/>
 			<menu_item_check label="Kamera" name="Camera"/>
 			<menu_item_check label="Vind" name="Wind"/>
+			<menu_item_check label="Badge" name="Badge"/>
 		</menu>
 		<menu label="Vis info" name="Display Info">
 			<menu_item_check label="Vis tid" name="Show Time"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 42eac1be7a..9193bd43e8 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -11,18 +11,29 @@
 	</global>
 	<template name="okbutton">
 		<form>
-			<button name="OK" text="$yestext"/>
+			<button name="OK_okbutton" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okignore">
+		<form>
+			<button name="OK_okignore" text="$yestext"/>
 		</form>
 	</template>
-	<template name="okignore"/>
 	<template name="okcancelbuttons">
 		<form>
-			<button name="Cancel" text="$notext"/>
+			<button name="OK_okcancelbuttons" text="$yestext"/>
+			<button name="Cancel_okcancelbuttons" text="$notext"/>
+		</form>
+	</template>
+	<template name="okcancelignore">
+		<form>
+			<button name="OK_okcancelignore" text="$yestext"/>
+			<button name="Cancel_okcancelignore" text="$notext"/>
 		</form>
 	</template>
-	<template name="okcancelignore"/>
 	<template name="okhelpbuttons">
 		<form>
+			<button name="OK_okhelpbuttons" text="$yestext"/>
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
@@ -30,6 +41,7 @@
 		<form>
 			<button name="Yes" text="$yestext"/>
 			<button name="No" text="$notext"/>
+			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
 		</form>
 	</template>
 	<notification functor="GenericAcknowledge" label="Ukendt notificeringsbesked" name="MissingAlert">
@@ -93,13 +105,17 @@ Vælg kun en genstand, og prøv igen.
 		Gem alle ændringer til tøj/krops dele?
 		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/>
 	</notification>
+	<notification name="FriendsAndGroupsOnly">
+		&apos;Ikke-venner&apos; vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM)
+		<usetemplate name="okbutton" yestext="Ja"/>
+	</notification>
 	<notification name="GrantModifyRights">
-		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]?
 		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
-		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+		At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse.
 Ønsker du at ændre rettigheder for de valgte beboere?
 		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
 	</notification>
@@ -142,8 +158,15 @@ Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet med
 Add this Ability to &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
 	</notification>
-	<notification name="ClickUnimplemented">
-		Beklager, ikke implementeret endnu.
+	<notification name="AttachmentDrop">
+		Du er ved at smide et vedhæng.
+    Er du sikker på at du vil fortsætte?
+		<usetemplate ignoretext="Bekræft før vedhæng smides" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="JoinGroupNoCost">
+		Du melder dig ind i gruppen [NAME].
+Ønsker du at fortsætte?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Bliv medlem"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
 		Tilmelding til denne gruppe koster L$[COST].
@@ -197,13 +220,9 @@ Jo mere du betaler, jo højere oppe på listen vises annoncen, og den vil også
 Er du sikker på at du vil fortsætte?
 		<usetemplate ignoretext="Bekræft før jeg slette media i et objekt" name="okcancelignore" notext="Nej" yestext="Ja"/>
 	</notification>
-	<notification name="ResetShowNextTimeDialogs">
-		Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
-		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
-	</notification>
-	<notification name="SkipShowNextTimeDialogs">
-		Vil du deaktivere alle popups som kan undværes?
-		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	<notification name="ClassifiedInsufficientFunds">
+		Ikke nok penge til at oprette annonce.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CacheWillClear">
 		Cache vil blive tømt ved næste genstart af [APP_NAME].
@@ -224,11 +243,14 @@ Indtast venligst navn på region i Start lokation feltet eller vælg &quot;Min s
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="UnsupportedHardware">
+		Bare så du ved det, din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan opleve dårlig hastighed. Desværre kan [SUPPORT_SITE] ikke give teknisk support til ikke-supporterede konfigurationer.
+MINSPECS
+Besøg [_URL] for mere information?
 		<usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/>
 	</notification>
 	<notification name="UnknownGPU">
-		Dit system har et grafikkort som er ukendt for [APP_NAME] lige nu.
-Dette er tilfældet med nyt hardware som endnu ikke er blevet testet med [APP_NAME].  [APP_NAME] vil sandsynligvis kunne køre normalt, men det kan være nødvendigt at justere opsætningen af grafik.
+		Dit system indeholder et grafikkort som [APP_NAME] ikke kan genkende.
+Dette skyldes ofte nyt hardware som endnu ikke er blevet testet med [APP_NAME].  Kortet vil sandsynligvis virke fint, med det kan være nødvendigt at justere grafik opsætningen.
 (Mig &gt; Indstillinger &gt; Grafik).
 		<form name="form">
 			<ignore name="ignore" text="Dit grafikkort kunne ikke identificeres"/>
@@ -260,9 +282,17 @@ Gå til [_URL] for information om køb af L$?
 	<notification name="LandmarkCreated">
 		Du har tilføjet &quot;[LANDMARK_NAME]&quot; til din [FOLDER_NAME] mappe.
 	</notification>
+	<notification name="LandmarkAlreadyExists">
+		Du har allerede et landemærke for denne lokation.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CannotOpenScriptObjectNoMod">
 		Ikke muligt at åbne script i objekt uden &apos;Redigére&apos; rettigheder.
 	</notification>
+	<notification name="CouldNotTeleportReason">
+		Teleport fejlede.
+[REASON]
+	</notification>
 	<notification name="invalid_tport">
 		Der opstod et problem ved din teleport. Det kan være nødvendigt at logge ind igen, før du kan teleporte.
 Hvis du bliver ved med at få denne fejl, check venligst [SUPPORT_SITE].
@@ -305,6 +335,10 @@ Prøv evt. igen om lidt.
 	<notification name="no_inventory_host">
 		Beholdningssystemet er ikke tilgængelig lige nu.
 	</notification>
+	<notification name="ForceOwnerAuctionWarning">
+		Denne parcel er sat på auktion. Gennemtving ejerskab vil annullere denne auktion og måske irritere nogen beboere hvis bud allerede er afgivet.
+Gennemtving ejerskab?
+	</notification>
 	<notification name="CannotBuyLandNoRegion">
 		Ikke i stand til at købe land:
 Kan ikke finde region som dette land er i.
@@ -316,13 +350,6 @@ Kan ikke finde region som dette land er i.
 		Land kunne ikke dedikeres:
 Kunne ikke finde den region land ligger i.
 	</notification>
-	<notification name="ParcelCanPlayMedia">
-		Dette sted kan afspille &apos;streaming media&apos;.
-&apos;Streaming media&apos; kræver en hurtig internet opkobling.
-
-Afspil altid &apos;streaming media&apos; når det er tilgængeligt?
-(Du kan ændre dette valg senere under Indstillinger &gt; Privatliv.)
-	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
 		Kunne ikke efterlade land:
 Kan ikke finde den region landet ligger i.
@@ -340,9 +367,8 @@ Kan ikke finde den region landet ligger i.
 Dette er typisk en midlertidig fejl. Venligst rediger og gem igen om et par minutter.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Du er blevet logget af [SECOND_LIFE]:
+		Du er blevet logget af [SECOND_LIFE]
             [MESSAGE]
-Du kan stadig se igangværende samtaler (IM) og chat ved at klikke på &apos;Se IM &amp; chat. Ellers klik på &apos;Afslut&apos; for at lukke [APP_NAME] med det samme.
 		<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB &amp; Chat"/>
 	</notification>
 	<notification label="Tilføj ven" name="AddFriend">
@@ -365,6 +391,9 @@ Tilbyd venskab til [NAME]?
 			<button name="Cancel" text="Annullér"/>
 		</form>
 	</notification>
+	<notification name="ErrorMessage">
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AvatarMovedDesired">
 		Den ønskede lokation er ikke tilgængelig lige nu.
 Du er blevet flyttet til en region in nærheden.
@@ -511,9 +540,12 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a
 		<usetemplate ignoretext="Jeg skrifter min status til &apos;optaget" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
-		Du har nået det maksimale antal grupper. Du skal forlade en anden gruppe for at kunne være med i denne - eller afvis tilbudet.
-[NAME] har inviteret dig til at være medlem af en gruppe.
-[INVITE]
+		Du er oppe på det maksimale antal grupper. Forlad venligst en anden gruppe inden du melder dig ind i denne, eller afvis tilbuddet.
+[NAME] har inviteret dig til en gruppe.
+	</notification>
+	<notification name="JoinedTooManyGroups">
+		Du er oppe på det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OfferTeleport">
 		<form name="form">
@@ -525,6 +557,7 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a
 		</form>
 	</notification>
 	<notification name="TeleportFromLandmark">
+		Er du sikker på at du vil teleportere til &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
 		<usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/>
 	</notification>
 	<notification name="TeleportToPick">
@@ -626,6 +659,12 @@ Du kan klikke på &apos;Ændre præference&apos; for at ændre din indholdsratin
 		Indeholder denne gruppe &apos;Mature&apos; indhold?
 		<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/>
 	</notification>
+	<notification label="Changed Region Maturity" name="RegionMaturityChange">
+		Ratingen for denne region er ændret.
+Det kan tage noget tid inden ændringen slår igennem på kortet.
+
+For at få adgang til voksen regioner, skal beboere være alders-checket, enten via aldersverifikation eller  betalingsverifikation.
+	</notification>
 	<notification label="Voice Version Mismatch" name="VoiceVersionMismatch">
 		Denne version af [APP_NAME] er ikke kompatibel med stemme chat funktionen i denne region. For at kunne få stemme chat til at fungere skal du opdatere [APP_NAME].
 	</notification>
@@ -649,9 +688,9 @@ Du kan klikke på &apos;Ændre præference&apos; for at ændre din indholdsratin
 		<usetemplate ignoretext="Bekræft før jeg afslutter" name="okcancelignore" notext="Afslut ikke" yestext="Quit"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Benyt dette værktøj til at rapportere Use this tool to report krænkelser af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards].
+		Benyt dette værktøj til at rapportere krænkninger af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards].
 
-Alle indrapporterede krænkelser er undersøgt og and afgjort. Du kan se løsning ved at læse [http://secondlife.com/support/incidentreport.php Incident Report].
+Alle rapporter om krænkninger vil blive undersøgt og behandlet.
 	</notification>
 	<notification name="HelpReportAbuseContainsCopyright">
 		Kære beboer,
@@ -792,8 +831,7 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati
 		Bevægelsen [NAME] mangler i databasen.
 	</notification>
 	<notification name="UnableToLoadGesture">
-		Ikke muligt at indlæse gestus [NAME].
-Prøv venligst igen.
+		Kunne ikke indlæse læse bevægelse [NAME].
 	</notification>
 	<notification name="LandmarkMissing">
 		Landmærke mangler i databasen.
@@ -885,10 +923,9 @@ Click on any landmark to select it, then click &apos;Teleport&apos; at the botto
 (You can also double-click on the landmark, or right-click it and choose &apos;Teleport&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Du kan kontakte beboere som f.eks. &apos;[NAME]&apos; ved at åbne &apos;Personer&apos; panelet til højre på skærmen.
-Vælg beboeren fra listen og klik så på &apos;IM&apos; i bunden af panelet.
-(Du kan også dobbelt-klikke på navnet i listen eller højreklikke og vælge &apos;IM&apos;)
-(You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
+		Du kan kontakte beboere som &apos;[NAME]&apos; ved at åbne Personer panelet til højre på skærmen.
+Vælg beboeren fra listen og klik så &apos;IM&apos; i bundet af panelet.
+(Du kan også dobbelt-klikke på navnet i listen, eller højre-klikke og vælge &apos;IM&apos;).
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Kan ikke vælge land på tværs af grænser.
@@ -959,7 +996,7 @@ Prøv venligst at geninstallere plugin eller kontakt leverandøren hvis probleme
 		Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
 	</notification>
 	<notification name="OtherObjectsReturned2">
-		Genstandene på det valgte stykke land der er ejet af beboeren &apos;[NAME]&apos; er blevet returneret til deres ejere.
+		Objekterne i den valgte parcel, ejet af beboeren &apos;[NAME]&apos;, er blevet returneret til deres ejer.
 	</notification>
 	<notification name="GroupObjectsReturned">
 		Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
@@ -971,7 +1008,7 @@ Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet sl
 	</notification>
 	<notification name="ServerObjectMessage">
 		Besked fra [NAME]:
-[MSG]
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
 	</notification>
 	<notification name="NotSafe">
 		Dette land er åbnet for &apos;skade&apos;.
@@ -1080,7 +1117,7 @@ Prøv igen om lidt.
 		No valid parcel could be found.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Et objekt med navnet [OBJECTFROMNAME], ejet af [NAME_SLURL], har givet dig [OBJECTTYPE]:
+		Et objekt med navnet [OBJECTFROMNAME] ejet af [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behold"/>
@@ -1089,7 +1126,7 @@ Prøv igen om lidt.
 		</form>
 	</notification>
 	<notification name="ObjectGiveItemUnknownUser">
-		Et objekt med navnet [OBJECTFROMNAME], ejet af en ukendt beboer, har givet dig [OBJECTTYPE]:
+		Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behold"/>
@@ -1098,12 +1135,12 @@ Prøv igen om lidt.
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME_SLURL] har givet dig [OBJECTTYPE]:
+		[NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
-			<button name="Keep" text="Behold"/>
 			<button name="Show" text="Vis"/>
 			<button name="Discard" text="Smid væk"/>
+			<button name="Mute" text="Blokér"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
@@ -1128,6 +1165,9 @@ Prøv igen om lidt.
 			<button name="Cancel" text="Annullér"/>
 		</form>
 	</notification>
+	<notification name="TeleportOfferSent">
+		Tilbud om teleport sendt til [TO_NAME]
+	</notification>
 	<notification name="GotoURL">
 		[MESSAGE]
 [URL]
@@ -1154,9 +1194,15 @@ Som standard vil du kunne se andres onlinestatus.
 	<notification name="FriendshipDeclined">
 		[NAME] afviste dit tilbud om venskab.
 	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		Tilbud om venskab accepteret.
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		Tilbud om venskab afvist.
+	</notification>
 	<notification name="OfferCallingCard">
-		[FIRST] [LAST] tilbyder vedkommendes visitkort.
-Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
+		[FIRST] [LAST] tilbyder dig et visitkort.
+Dette vil lave et bogmørke i din beholding, så du hurtigt kan sende en IM til denne beboer.
 		<form name="form">
 			<button name="Accept" text="Acceptér"/>
 			<button name="Decline" text="Afvis"/>
@@ -1235,14 +1281,6 @@ Tillad denne anmodning?
 			<button name="Block" text="Blokér"/>
 		</form>
 	</notification>
-	<notification name="FirstBalanceIncrease">
-		Du har netop modtaget [AMOUNT] L$.
-Din balance vises øverst til højre.
-	</notification>
-	<notification name="FirstBalanceDecrease">
-		Du har netop betalt [AMOUNT] L$.
-Din balance vises øverst til højre.
-	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		Tak for din betaling!
 
@@ -1250,58 +1288,17 @@ Din L$ balance vil blive opdateret når transaktionen er gennemført. Ved transa
 
 Status for din betaling kan ses i din &apos;Transaction History&apos; side på din [http://secondlife.com/account/ Dashboard]
 	</notification>
-	<notification name="FirstSit">
-		Du sidder ned.
-Benyt piletasterne (eller AWSD) til at se rundt.				
-Klik på &apos;Stå op&apos; tasten for at rejse dig.
-	</notification>
-	<notification name="FirstMap">
-		Klik og træk på kortet for at se rundt.
-Dobbelt-klik for at teleportere.
-Benyt kontrollerne til højre for at finde ting og se forskellige baggrunde.
-	</notification>
-	<notification name="FirstBuild">
-		Du har åbnet bygge værktøjer. Alle objekter du ser omkring dig er lavet via disse værktøjer.
-	</notification>
-	<notification name="FirstTeleport">
-		Du kan kun teleportere til bestemte områder i denne region. Pilen peger på din specifikke destination. Klik på pilen for at fjerne den.
-	</notification>
 	<notification name="FirstOverrideKeys">
 		Dine bevælgelsestaster bliver nu håndteret af et objekt.
 Brug piletasterne eller AWSD for at se, hvad de gør.
 Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem.
 Tryk på &apos;M&apos; for at gåre det.
 	</notification>
-	<notification name="FirstAppearance">
-		Du redigerer dit udseende.
-Benyt piletasterne til at se rundt.
-Når du er færdig, tryk på &apos;Gem alt&apos;.
-	</notification>
-	<notification name="FirstInventory">
-		Dette er din beholdning, som indeholder de genstande du ejer.
-
-* For at tage noget på, træk det over på dig selv.
-* For at &apos;rezze&apos; noget, træk det over på jorden.
-* For at læse en note, dobbelt-klik på den.
-	</notification>
 	<notification name="FirstSandbox">
 		Dette er et sandkasse område. Her kan beboere lære ast bygge.
 
 De ting du bygger vil blive slettet senere, så glem ikke at højre-klikke og vælge &quot;Tag&quot; for at tage en kopi af din kreation til din beholdning.
 	</notification>
-	<notification name="FirstFlexible">
-		Dette objekt er fleksibelt/blødt. Sådanne objekter skal være &apos;uden masse&apos; og ikke fysiske.
-	</notification>
-	<notification name="FirstDebugMenus">
-		Du har åbnet menuen &apos;Avanceret&apos;.
-
-For at slå denne menu fra og til,
-  Windows: Ctrl+Alt+D
-  Mac: &#8997;&#8984;D
-	</notification>
-	<notification name="FirstSculptedPrim">
-		Du redigerer en &apos;Sculpted prim&apos;. Sådanne objekter kræver en speciel tekstur for at definere faconen.
-	</notification>
 	<notification name="MaxListSelectMessage">
 		Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
 	</notification>
@@ -1408,6 +1405,10 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager.
 			<button name="respondbutton" text="Svar"/>
 		</form>
 	</notification>
+	<notification name="ConfirmCloseAll">
+		Er du sikker på at du vil lukke alle personlige samtaler (IM)?
+		<usetemplate name="okcancelignore" notext="Annullér" yestext="OK"/>
+	</notification>
 	<notification name="AttachmentSaved">
 		Vedhæng er blevet gemt.
 	</notification>
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
index ab2e7a6e31..1953fad31f 100644
--- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<panel name="panel_call_buttons">
-		<button label="Opkald" name="call_btn"/>
-		<button label="Forlad samtale" name="end_call_btn"/>
-		<button label="Stemmekontroller" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Forlad opkald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Stemmekontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
index a9d5ba73ac..56332c00e6 100644
--- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
@@ -22,4 +22,5 @@
 		[COUNT]Ã¥
 	</string>
 	<text name="avatar_name" value="Ukendt"/>
+	<button name="profile_btn" tool_tip="Vis profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
index 986a4131de..4f5041ad54 100644
--- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
 	<text name="title_text">
-		Blokérede avatarer
+		Blokerede
 	</text>
-	<scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/>
+	<scroll_list name="blocked" tool_tip="Liste med beboerer der p.t. er blokeret"/>
 	<button label="Blokér beboer..." label_selected="Blokér beboer..." name="Block resident..." tool_tip="Vælg en beboer der skal blokeres"/>
 	<button label="Blokér objekt via navn..." label_selected="Blokér objekt via navn..." name="Block object by name..."/>
-	<button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjern beboer fra liste med blokeringer"/>
+	<button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjerm en beboer fra blokeringslisten"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
index 2085840bb5..4a038e89ba 100644
--- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
@@ -7,8 +7,13 @@
 		Skjuler/viser stemme kontrol panel
 	</string>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<talk_button name="talk">
+				<speak_button label="Tal" label_selected="Tal" name="speak_btn"/>
+			</talk_button>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_box label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
+			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
 		</layout_panel>
 		<layout_panel name="movement_panel">
 			<button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/>
@@ -19,5 +24,15 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Tag foto"/>
 		</layout_panel>
+		<layout_panel name="im_well_panel">
+			<chiclet_im_well name="im_well">
+				<button name="Unread IM messages" tool_tip="Konversationer"/>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel name="notification_well_panel">
+			<chiclet_notification name="notification_well">
+				<button name="Unread" tool_tip="Notifikationer"/>
+			</chiclet_notification>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
new file mode 100644
index 0000000000..bd31253ca4
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray_lite">
+	<layout_stack name="toolbar_stack_lite">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Vis/skjul bevægelser"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml
index a9cce7bf45..6eba024981 100644
--- a/indra/newview/skins/default/xui/da/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
+	<panel.string name="l$_price">
+		L$[PRICE]
+	</panel.string>
 	<text name="title" value="Annonce info"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<text name="classified_name" value="[name]"/>
-			<text name="classified_location" value="[loading...]"/>
-			<text name="content_type" value="[content type]"/>
-			<text name="category" value="[category]"/>
+			<text_editor name="classified_name" value="[name]"/>
+			<text_editor name="classified_location" value="[loading...]"/>
+			<text_editor name="content_type" value="[content type]"/>
+			<text_editor name="category" value="[category]"/>
 			<check_box label="Forny automatisk hver uge" name="auto_renew"/>
-			<text name="price_for_listing" tool_tip="Pris for optagelse.">
-				L$[PRICE]
-			</text>
-			<text name="classified_desc" value="[description]"/>
+			<text_editor name="price_for_listing" tool_tip="Pris for optagelse."/>
+			<text_editor name="classified_desc" value="[description]"/>
 		</panel>
 	</scroll_container>
 	<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index d3cfdbba52..85461e23a7 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -35,9 +35,12 @@
 				</text>
 				<check_box label="Vis mig i søgeresultater" name="show_in_search_checkbox"/>
 				<text name="title_acc_status_text" value="Min konto:"/>
+				<text_editor name="acc_status_text" value="Beboer. Ingen betalingsinfo."/>
 				<text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
-				<text name="acc_status_text" value="Beboer. Ingen betalingsinfo."/>
 				<text name="title_partner_text" value="Min partner:"/>
+				<panel name="partner_data_panel">
+					<name_box initial_value="(henter)" name="partner_text"/>
+				</panel>
 				<text name="partner_edit_link" value="[[URL] Edit]"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml
index a41eaf20c1..a1a25bdc77 100644
--- a/indra/newview/skins/default/xui/da/panel_friends.xml
+++ b/indra/newview/skins/default/xui/da/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Teleport" name="offer_teleport_btn" tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position"/>
 	<button label="Betal" name="pay_btn" tool_tip="Giv Linden dollars (L$) til denne ven"/>
 	<button label="Fjern" name="remove_btn" tool_tip="Fjern denne beboer fra din venneliste"/>
-	<button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til denne beboer"/>
+	<button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til en beboer"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
index 1db2db45af..26fe4f6ebe 100644
--- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<button label="Group Profile" name="group_info_btn"/>
-	<panel name="panel_call_buttons">
-		<button label="Opkaldsgruppe" name="call_btn"/>
-		<button label="Forlad samtale" name="end_call_btn"/>
-		<button label="Kontroller for åben stemmechat" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="vertical_stack">
+		<layout_panel name="group_info_btn_panel">
+			<button label="Gruppe profil" name="group_info_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald gruppe" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Forlad opkald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Ã…ben stemmekontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index ec957e6094..becb5ab70a 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
@@ -9,20 +9,38 @@
 	<panel.string name="incomplete_member_data_str">
 		Henter medlemsinformationer
 	</panel.string>
+	<panel name="group_info_top">
+		<texture_picker label="" name="insignia" tool_tip="Klik for at vælge et billede"/>
+		<text name="prepend_founded_by">
+			Grundlagt af:
+		</text>
+		<name_box initial_value="(henter)" name="founder_name"/>
+		<text name="join_cost_text">
+			Gratis
+		</text>
+		<button label="TILMELD NU!" name="btn_join"/>
+	</panel>
 	<text_editor name="charter">
 		Gruppens formål
 	</text_editor>
 	<name_list name="visible_members">
 		<name_list.columns label="Medlem" name="name"/>
 		<name_list.columns label="Titel" name="title"/>
+		<name_list.columns label="Status" name="status"/>
 	</name_list>
+	<text name="my_group_settngs_label">
+		MeMig
+	</text>
 	<text name="active_title_label">
-		Min titel
+		Min titel:
 	</text>
 	<combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv"/>
 	<check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe. Fjern markeringen i boksen hvis gruppen spammer dig."/>
 	<check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/>
 	<panel name="preferences_container">
+		<text name="group_settngs_label">
+			Gruppe
+		</text>
 		<check_box label="Ã…ben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/>
 		<check_box label="Tilmeldingsgebyr" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen"/>
 		<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når &quot;Tilmeldingsgebyr&quot; er valgt." width="60"/>
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
index 9940ebbd4d..a7aa842439 100644
--- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Gruppe info" name="GroupInfo">
+<panel label="Gruppe profil" name="GroupInfo">
 	<panel.string name="default_needs_apply_text">
-		Der er ændringer på denne fane der ikke er gemt
+		Der er ændringer der ikke er gemt
 	</panel.string>
 	<panel.string name="want_apply_text">
 		Ønsker du at gemme disse ændringer?
@@ -12,25 +12,24 @@
 	<panel.string name="group_join_free">
 		Gratis
 	</panel.string>
-	<text name="group_name" value="(Henter...)"/>
-	<line_editor label="Indtast dit nye gruppenavn her" name="group_name_editor"/>
-	<texture_picker label="" name="insignia" tool_tip="Klik for at vælge bilede"/>
-	<text name="prepend_founded_by">
-		Grundlægger:
-	</text>
-	<name_box initial_value="(finder)" name="founder_name"/>
-	<text name="join_cost_text">
-		Gratis
-	</text>
-	<button label="MELD IND NU!" name="btn_join"/>
-	<accordion name="groups_accordion">
-		<accordion_tab name="group_general_tab" title="Generelt"/>
-		<accordion_tab name="group_roles_tab" title="Roller"/>
-		<accordion_tab name="group_notices_tab" title="Beskeder"/>
-		<accordion_tab name="group_land_tab" title="Land/Aktiver"/>
-	</accordion>
-	<panel name="button_row">
-		<button label="Lav" label_selected="Ny gruppe" name="btn_create"/>
-		<button label="Gem" label_selected="Gem" name="btn_apply"/>
+	<panel name="group_info_top">
+		<text name="group_name" value="(Henter...)"/>
+		<line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/>
 	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="group_accordions">
+			<accordion name="groups_accordion">
+				<accordion_tab name="group_general_tab" title="Generelt"/>
+				<accordion_tab name="group_roles_tab" title="Roller"/>
+				<accordion_tab name="group_notices_tab" title="Noter"/>
+				<accordion_tab name="group_land_tab" title="Land/Aktiver"/>
+			</accordion>
+		</layout_panel>
+		<layout_panel name="button_row">
+			<button label="Chat" name="btn_chat"/>
+			<button label="Gruppeopkald" name="btn_call" tool_tip="Opkald til denne gruppe"/>
+			<button label="Gem" label_selected="Save" name="btn_apply"/>
+			<button label="Opret gruppe" name="btn_create" tool_tip="Opret en ny gruppe"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 1e00642c29..49daf6c9f2 100644
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -7,17 +7,14 @@
 		(indlæser...)
 	</panel.string>
 	<panel.string name="already_in_group">
-		Nogen af avatarerne var allerede i gruppen og blev ikke inviteret
+		Nogle af de beboere du vælger er allerede i gruppen, så de får ikke tilsendt en invitation.
 	</panel.string>
 	<text name="help_text">
-		Du kan invitere flere beboere ad 
-gangen til at blive medlem af din 
-gruppe. Klik &apos;Åben personvælger&apos; for 
-at begynde.
+		Du kan invitere flere beboere ad gangen til at blive medlem af din gruppe. Klik &apos;Åben personvælger&apos; for at begynde.
 	</text>
 	<button bottom_delta="-30" label="Åben personvælger" name="add_button"/>
-	<name_list name="invitee_list" tool_tip="Hold Ctrl knappen nede og klik på beboer navne for at vælge flere"/>
-	<button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjern beboere valgt ovenfor fra invitationslisten"/>
+	<name_list name="invitee_list" tool_tip="Hold Ctrl-tasten nede og klik på beboere for at vælge flere."/>
+	<button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjerner beboere, der er valgt på ovenstående invitationsliste."/>
 	<text name="role_text">
 		Vælg hvilken rolle, du vil tildele dem:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index c73d7c807d..9b0267529c 100644
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
@@ -1,65 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Land &amp; L$" name="land_money_tab">
-	<string name="help_text">
+	<panel.string name="help_text">
 		En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag.
-	</string>
-	<button label="?" name="help_button"/>
-	<string name="cant_view_group_land_text">
+	</panel.string>
+	<panel.string name="cant_view_group_land_text">
 		Du har ikke tilladelse til at se gruppeejet land.
-	</string>
-	<string name="cant_view_group_accounting_text">
+	</panel.string>
+	<panel.string name="cant_view_group_accounting_text">
 		Du har ikke tilladelse til at se gruppens økonomiinformationer.
-	</string>
-	<string name="loading_txt">
+	</panel.string>
+	<panel.string name="loading_txt">
 		Indlæser...
-	</string>
-	<text name="group_land_heading">
-		Gruppeejet land
-	</text>
-	<scroll_list name="group_parcel_list">
-		<column label="Parcel" name="name"/>
-		<column label="Region" name="location"/>
-		<column label="Type" name="type"/>
-		<column label="Område" name="area"/>
-		<column label="" name="hidden"/>
-	</scroll_list>
-	<button label="Kort" label_selected="Kort" name="map_button"/>
-	<text name="total_contributed_land_label">
-		Totalt bidrag:
-	</text>
-	<text name="total_contributed_land_value">
-		[AREA] m²
-	</text>
-	<text name="total_land_in_use_label">
-		Totalt land i brug:
-	</text>
-	<text name="total_land_in_use_value">
-		[AREA] m²
-	</text>
-	<text name="land_available_label">
-		Ledigt land:
-	</text>
-	<text name="land_available_value">
-		[AREA] m²
-	</text>
-	<text name="your_contribution_label">
-		Dit bidrag:
-	</text>
-	<string name="land_contrib_error">
+	</panel.string>
+	<panel.string name="land_contrib_error">
 		Ikke muligt at lave dit bidrag til landet
-	</string>
-	<text name="your_contribution_units">
-		m²
-	</text>
-	<text name="your_contribution_max_value">
-		([AMOUNT] maks.)
-	</text>
-	<text name="group_over_limit_text">
-		Gruppemedlemmer må bidrag med mere, for at understøtte med det land der bliver brugt
-	</text>
-	<text name="group_money_heading">
-		Gruppe L$
-	</text>
+	</panel.string>
+	<panel name="layout_panel_landmoney">
+		<scroll_list name="group_parcel_list">
+			<scroll_list.columns label="Parcel" name="name"/>
+			<scroll_list.columns label="Region" name="location"/>
+			<scroll_list.columns label="Type" name="type"/>
+			<scroll_list.columns label="Areal" name="area"/>
+		</scroll_list>
+		<text name="total_contributed_land_label">
+			Totalt bidrag:
+		</text>
+		<text name="total_contributed_land_value">
+			[AREA] m²
+		</text>
+		<button label="Kort" label_selected="Kort" name="map_button"/>
+		<text name="total_land_in_use_label">
+			Totalt land i brug:
+		</text>
+		<text name="total_land_in_use_value">
+			[AREA] m²
+		</text>
+		<text name="land_available_label">
+			Land tilgængelgt:
+		</text>
+		<text name="land_available_value">
+			[AREA] m²
+		</text>
+		<text name="your_contribution_label">
+			Dit bidrag:
+		</text>
+		<text name="your_contribution_units">
+			m²
+		</text>
+		<text name="your_contribution_max_value">
+			([BELØB] maks.)
+		</text>
+		<text name="group_over_limit_text">
+			Der kræves flere penge for at supportere det land der er i brug
+		</text>
+		<text name="group_money_heading">
+			Gruppe L$
+		</text>
+	</panel>
 	<tab_container name="group_money_tab_container">
 		<panel label="PLANLÆGNING" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
index bfffdccc5e..e77e548340 100644
--- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Ukendt"/>
+	<button name="profile_btn" tool_tip="Se profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
index ec503c37dc..7046ac4d7c 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml
@@ -42,7 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag
 		<text name="string">
 			Træk og slip en gensand for at vedhæfte den:
 		</text>
-		<button label="Fjern" label_selected="Fjern bilag" name="remove_attachment"/>
+		<button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/>
 		<button label="Send" label_selected="Send" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/>
 	</panel>
@@ -59,6 +59,6 @@ Maksimum er 200 pr. gruppe pr. dag
 		<text name="lbl4">
 			Besked:
 		</text>
-		<button label="Ã…ben bilag" label_selected="Ã¥ben bilag" name="open_attachment"/>
+		<button label="Åben vedhæng" label_selected="åben bilag" name="open_attachment"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml
index 43a84298e2..8a684ca031 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml
@@ -4,5 +4,5 @@
 		<text name="title" value="Afsender navn / Gruppe navn"/>
 	</panel>
 	<text name="attachment" value="Bilag"/>
-	<button label="Ok" name="btn_ok"/>
+	<button label="OK" name="btn_ok"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index 74bea831fb..3ab3dd8bf8 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Medlemmer &amp; roller" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		Der er ændringer her, der ikke er gemt.
+		Der er ændringer som ikke er gemt
 	</panel.string>
 	<panel.string name="want_apply_text">
 		Vil du gemme disse ændringer?
@@ -58,7 +58,7 @@ ting i denne gruppe. Der er en bred vifte af rettigheder.
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
-			Medlemmer
+			Tildelte roller
 		</text>
 		<scroll_list name="member_assigned_roles">
 			<scroll_list.columns label="" name="checkbox"/>
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
index 0384652e5d..1ba6b8b97f 100644
--- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Ukendt"/>
-	<button label="Profil" name="view_profile_btn"/>
-	<button label="Tilføj ven" name="add_friend_btn"/>
-	<button label="Teleportér" name="teleport_btn"/>
-	<button label="Del" name="share_btn"/>
-	<panel name="panel_call_buttons">
-		<button label="Opkald" name="call_btn"/>
-		<button label="Læg på" name="end_call_btn"/>
-		<button label="Stemme opsætning" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="button_stack">
+		<layout_panel name="view_profile_btn_panel">
+			<button label="Profil" name="view_profile_btn"/>
+		</layout_panel>
+		<layout_panel name="add_friend_btn_panel">
+			<button label="Tilføj ven" name="add_friend_btn"/>
+		</layout_panel>
+		<layout_panel name="teleport_btn_panel">
+			<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/>
+		</layout_panel>
+		<layout_panel name="share_btn_panel">
+			<button label="Del" name="share_btn"/>
+		</layout_panel>
+		<layout_panel name="share_btn_panel">
+			<button label="Betal" name="pay_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Opkald" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Forlad opkald" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Stemme kontroller" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
index 202a4d4664..8503a41763 100644
--- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
@@ -18,6 +18,7 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
+	<button name="back_btn" tool_tip="Tilbage"/>
 	<text name="title" value="Sted profil"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml
index 47487832cb..8adce2c819 100644
--- a/indra/newview/skins/default/xui/da/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml
@@ -2,7 +2,7 @@
 <panel name="Landmarks">
 	<accordion name="landmarks_accordion">
 		<accordion_tab name="tab_favorites" title="Favorites bjælke"/>
-		<accordion_tab name="tab_landmarks" title="Landemærker"/>
+		<accordion_tab name="tab_landmarks" title="Mine landmærker"/>
 		<accordion_tab name="tab_inventory" title="Min beholdning"/>
 		<accordion_tab name="tab_library" title="Bibliotek"/>
 	</accordion>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index c8c275d84d..9276ff3a09 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -13,7 +13,7 @@
 			</text>
 			<line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
 			<line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
-			<check_box label="Husk" name="remember_check"/>
+			<check_box label="Husk password" name="remember_check"/>
 			<text name="start_location_text">
 				Start ved:
 			</text>
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
index 2cfd358d13..f98ced5f91 100644
--- a/indra/newview/skins/default/xui/da/panel_me.xml
+++ b/indra/newview/skins/default/xui/da/panel_me.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Min profil" name="panel_me">
 	<tab_container name="tabs">
-		<panel label="PROFIL" name="panel_profile"/>
-		<panel label="FAVORITTER" name="panel_picks"/>
+		<panel label="MIN PROFIL" name="panel_profile"/>
+		<panel label="MINE FAVORITTER" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
index 7f1581888d..48f08b9dfd 100644
--- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
@@ -4,16 +4,16 @@
 		Hjemmeside:
 	</text>
 	<text name="home_fails_whitelist_label">
-		(Denne side optræder ikke i godkendte sider)
+		(Siden er ikke på listen med godkendte sider)
 	</text>
-	<line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette media"/>
+	<line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette medie"/>
 	<text name="preview_label">
 		Vis
 	</text>
 	<text name="current_url_label">
 		Nuværende side:
 	</text>
-	<text name="current_url" tool_tip="Den nuværende hjemmeside for kilden til dette media" value=""/>
+	<text name="current_url" tool_tip="Nuværende side for kilden til dett medie" value=""/>
 	<button label="Nulstil" name="current_url_reset_btn"/>
 	<check_box initial_value="false" label="Gentag afspil" name="auto_loop"/>
 	<check_box initial_value="false" label="Første klik medfører interaktion" name="first_click_interact"/>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
index ee341f9142..278fe0eeea 100644
--- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sikkerhed" name="Media Settings Security">
-	<check_box initial_value="false" label="Tillad kun adgang til specifikke URL&apos;er (via &quot;prefix&quot;)" name="whitelist_enable"/>
+	<check_box initial_value="false" label="Tillad kun adgang til angivne URL mønstre" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
-		Opslag som hjemmesiden fejler ved er markeret:
+		Angivelser som hjemmesiden fejler imod er markeret:
 	</text>
 	<button label="Tilføj" name="whitelist_add"/>
 	<button label="Slet" name="whitelist_del"/>
 	<text name="home_url_fails_whitelist">
-		Advarsel: Hjemmesiden angive i &quot;Generelt&quot; fanen er ikke indeholdt i godkendte sider. Den er slået fra, indtil en gyldig værdi er tilføjet.
+		Advarsel: hjemmesiden specificeret i Generelt fanen opfylder ikke krav på listen med godkendte URL. Den er de-aktiveret indtil en gyldig hjemmeside er tilføjet.
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml
index 1dffc73239..7eb3c9f4e5 100644
--- a/indra/newview/skins/default/xui/da/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
 	<string name="no_partner_text" value="Ingen"/>
+	<string name="no_group_text" value="Ingen"/>
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<panel name="second_life_image_panel">
-				<icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
-			</panel>
-			<panel name="first_life_image_panel">
-				<icon label="" name="real_world_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
-				<text name="title_rw_descr_text" value="RL:"/>
-			</panel>
-			<text name="me_homepage_text">
-				Web:
-			</text>
-			<text name="title_member_text" value="Medlem siden:"/>
-			<text name="title_acc_status_text" value="Konto:"/>
-			<text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/>
-			<text name="title_partner_text" value="Partner:"/>
-			<text name="title_groups_text" value="Grupper:"/>
-		</panel>
-	</scroll_container>
-	<panel name="profile_buttons_panel">
-		<button label="Tilføj ven" name="add_friend"/>
-		<button label="IM" name="im"/>
-		<button label="Opkald" name="call"/>
-		<button label="Kort" name="show_on_map_btn"/>
-		<button label="Teleportér" name="teleport"/>
-	</panel>
-	<panel name="profile_me_buttons_panel">
-		<button label="Rediger profil" name="edit_profile_btn" tool_tip="Redigér personlig information"/>
-		<button label="Ændre udseende" name="edit_appearance_btn" tool_tip="Ændre dit udseende: fysiske data, tøj m.v."/>
-	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="scroll_content_panel">
+					<panel name="second_life_image_panel">
+						<icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/>
+						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+					</panel>
+					<panel name="first_life_image_panel">
+						<icon label="" name="real_world_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/>
+						<text name="title_rw_descr_text" value="Real World:"/>
+					</panel>
+					<text name="title_member_text" value="Beboer siden:"/>
+					<text name="title_acc_status_text" value="Konto status:"/>
+					<text name="title_partner_text" value="Partner:"/>
+					<panel name="partner_data_panel">
+						<name_box initial_value="(henter)" name="partner_text"/>
+					</panel>
+					<text name="title_groups_text" value="Grupper:"/>
+				</panel>
+			</scroll_container>
+		</layout_panel>
+		<layout_panel name="profile_me_buttons_panel">
+			<button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/>
+			<button label="Rediger udseende" name="edit_appearance_btn" tool_tip="Opret/tilret dit udseende: fysiske data, tøj m.v."/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
index 465bc75a1b..79f7e81b35 100644
--- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
 	<panel name="navigation_panel">
-		<button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/>
-		<button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/>
+		<pull_button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/>
+		<pull_button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/>
 		<button name="home_btn" tool_tip="Teleport til min hjemme lokation"/>
 		<location_input label="Lokation" name="location_combo"/>
 		<search_combo_box label="Søg" name="search_combo_box" tool_tip="Søg">
 			<combo_editor label="Søg [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
-	<favorites_bar name="favorite">
+	<favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+		<label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+			Favorit bar
+		</label>
 		<chevron_button name="&gt;&gt;" tool_tip="Søg mere af mine favoritter"/>
 	</favorites_bar>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
new file mode 100644
index 0000000000..32905a2deb
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_media">
+	<string name="empty_item_text">
+		&lt;tom&gt;
+	</string>
+	<string name="parcel_media_name">
+		Streaming Media dette sted
+	</string>
+	<string name="parcel_audio_name">
+		Streaming Audio dette sted
+	</string>
+	<string name="playing_suffix">
+		(afspilles)
+	</string>
+	<panel name="minimized_controls">
+		<button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/>
+		<button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/>
+		<button name="open_prefs_btn" tool_tip="Vis media preferencer"/>
+		<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="more_less_btn" tool_tip="Avanceret opsætning"/>
+	</panel>
+	<panel name="nearby_media_panel">
+		<combo_box name="show_combo">
+			<combo_box.item label="Overalt" name="All"/>
+			<combo_box.item label="PÃ¥ dette sted" name="WithinParcel"/>
+			<combo_box.item label="Udenfor dette sted" name="OutsideParcel"/>
+		</combo_box>
+		<scroll_list name="media_list">
+			<scroll_list.columns label="I nærheden" name="media_proximity"/>
+			<scroll_list.columns label="Synligt" name="media_visibility"/>
+			<scroll_list.columns label="Klasse" name="media_class"/>
+			<scroll_list.columns label="Navn" name="media_name"/>
+			<scroll_list.columns label="Debug" name="media_debug"/>
+		</scroll_list>
+		<panel>
+			<layout_stack name="media_controls">
+				<layout_panel name="stop">
+					<button name="stop_btn" tool_tip="Stop valgte medie"/>
+				</layout_panel>
+				<layout_panel name="play">
+					<button name="play_btn" tool_tip="Afspil valgte medie"/>
+				</layout_panel>
+				<layout_panel name="pause">
+					<button name="pause_btn" tool_tip="Pause valgte medie"/>
+				</layout_panel>
+				<layout_panel name="volume_slider_ctrl">
+					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/>
+				</layout_panel>
+				<layout_panel name="mute">
+					<button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/>
+				</layout_panel>
+				<layout_panel name="zoom">
+					<button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/>
+				</layout_panel>
+				<layout_panel name="unzoom">
+					<button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_notes.xml b/indra/newview/skins/default/xui/da/panel_notes.xml
index f8d911b9e5..5b3a2d0906 100644
--- a/indra/newview/skins/default/xui/da/panel_notes.xml
+++ b/indra/newview/skins/default/xui/da/panel_notes.xml
@@ -13,10 +13,10 @@
 			</scroll_container>
 		</panel>
 		<panel name="notes_buttons_panel">
-			<button label="Tilføj" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/>
+			<button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboer"/>
 			<button label="IM" name="im" tool_tip="Ã…ben session med personlig besked (IM)"/>
 			<button label="Kald" name="call" tool_tip="Opkald til denne beboer"/>
-			<button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/>
+			<button label="Kort" name="show_on_map_btn" tool_tip="Vis beboer på kort"/>
 			<button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/>
 		</panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/da/panel_online_status.xml b/indra/newview/skins/default/xui/da/panel_online_status.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_online_status.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
index 7d6401283e..df00cfb2eb 100644
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Outfits">
-	<accordion name="outfits_accordion">
-		<accordion_tab name="tab_cof" title="Nuværende sæt"/>
-		<accordion_tab name="tab_outfits" title="Mine sæt"/>
-	</accordion>
+<panel label="Ting" name="Outfits">
+	<tab_container name="appearance_tabs">
+		<inventory_panel label="MINE SÆT" name="outfitslist_tab"/>
+		<inventory_panel label="HAR PÃ…" name="cof_tab"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
+		<dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/>
+		<button label="Gem sæt" name="make_outfit_btn" tool_tip="Gem udseende som nyt sæt"/>
+		<button label="Tag på" name="wear_btn" tool_tip="Tag valgte sæt på"/>
+		<button label="M" name="look_edit_btn"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
index a6a796f612..7b6469023b 100644
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
@@ -4,6 +4,6 @@
 	<menu_item_call label="Tilføj til nuværende sæt" name="add"/>
 	<menu_item_call label="Fjern fra nuværende sæt" name="remove"/>
 	<menu_item_call label="Omdøb" name="rename"/>
-	<menu_item_call label="Fjern" name="remove_link"/>
-	<menu_item_call label="Slet" name="delete"/>
+	<menu_item_call label="Fjern link" name="remove_link"/>
+	<menu_item_call label="Slet sæt" name="delete"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 07b7f60810..ecfac67b1a 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -5,7 +5,6 @@
 	<string name="no_one_near" value="Ingen tæt på"/>
 	<string name="no_friends_online" value="Ingen venner online"/>
 	<string name="no_friends" value="Ingen venner"/>
-	<string name="no_groups" value="Ingen grupper"/>
 	<string name="people_filter_label" value="Filtrér personer"/>
 	<string name="groups_filter_label" value="Filtrér grupper"/>
 	<filter_editor label="Filtrér" name="filter_input"/>
@@ -13,21 +12,25 @@
 		<panel label="TÆT PÅ" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="nearby_view_sort_btn" tool_tip="Valg"/>
-				<button name="add_friend_btn" tool_tip="Tilføjer valgte beboere til din venneliste"/>
+				<button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
 			</panel>
 		</panel>
-		<panel label="VENNER" name="friends_panel">
+		<panel label="MINE VENNER" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="Valg"/>
-				<button name="add_btn" tool_tip="Tilbyd venskab til beboer"/>
+				<button name="add_btn" tool_tip="Tilbyd venskab til en beboer"/>
 				<button name="del_btn" tool_tip="Fjern valgte person fra din venneliste"/>
 			</panel>
+			<text name="no_friends_msg">
+				For at tilføje venner prøv [secondlife:///app/search/people global search] eller klik på en bruger for at tilføje dem som ven.
+Hvis du leder efter beboere at være sammen med, [secondlife:///app/worldmap prøv kortet].
+			</text>
 		</panel>
-		<panel label="GRUPPER" name="groups_panel">
+		<panel label="MINE GRUPPER" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="groups_viewsort_btn" tool_tip="Valg"/>
 				<button name="plus_btn" tool_tip="Bliv medlem af gruppe/Opret ny gruppe"/>
@@ -37,17 +40,18 @@
 		<panel label="NYLIGE" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="recent_viewsort_btn" tool_tip="Valg"/>
-				<button name="add_friend_btn" tool_tip="Tilføj valgte person til din venneliste"/>
+				<button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
 			</panel>
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
-		<button label="Profil" name="view_profile_btn" tool_tip="Vis billede, grupper og anden information om beboer"/>
+		<button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/>
 		<button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/>
 		<button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/>
 		<button label="Del" name="share_btn"/>
 		<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/>
 		<button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/>
 		<button label="Gruppe chat" name="chat_btn" tool_tip="Ã…ben chat session"/>
+		<button label="Gruppe opkald" name="group_call_btn" tool_tip="Opkald til denne gruppe"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
index 24316fea14..c1ed95f580 100644
--- a/indra/newview/skins/default/xui/da/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml
@@ -6,7 +6,7 @@
 	<string name="available" value="ledig"/>
 	<string name="allocated" value="fordelt"/>
 	<string name="title_place" value="Sted profil"/>
-	<string name="title_teleport_history" value="Teleport historik sted"/>
+	<string name="title_teleport_history" value="Teleport historik"/>
 	<string name="not_available" value="(N\A)"/>
 	<string name="unknown" value="(ukendt)"/>
 	<string name="public" value="(offentlig)"/>
@@ -41,62 +41,17 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
+	<button name="back_btn" tool_tip="Tilbage"/>
 	<text name="title" value="Sted profil"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
 			<text name="owner_label" value="Ejer:"/>
 			<text name="maturity_value" value="ukendt"/>
 			<accordion name="advanced_info_accordion">
-				<accordion_tab name="parcel_characteristics_tab" title="Parcel">
-					<panel>
-						<text name="rating_label" value="Rating:"/>
-						<text name="rating_value" value="ukendt"/>
-						<text name="voice_label" value="Stem:"/>
-						<text name="voice_value" value="Til"/>
-						<text name="fly_label" value="Flyve:"/>
-						<text name="fly_value" value="Til"/>
-						<text name="push_label" value="Skub:"/>
-						<text name="push_value" value="Fra"/>
-						<text name="build_label" value="Byg:"/>
-						<text name="build_value" value="Til"/>
-						<text name="scripts_label" value="Scripts:"/>
-						<text name="scripts_value" value="Til"/>
-						<text name="damage_label" value="Skade:"/>
-						<text name="damage_value" value="Fra"/>
-						<button label="Om land" name="about_land_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="region_information_tab" title="Region">
-					<panel>
-						<text name="region_name_label" value="Region:"/>
-						<text name="region_type_label" value="Type:"/>
-						<text name="region_rating_label" value="Rating:"/>
-						<text name="region_owner_label" value="Ejer:"/>
-						<text name="region_group_label" value="Gruppe:"/>
-						<button label="Region/Estate" name="region_info_btn"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="estate_information_tab" title="Estate">
-					<panel>
-						<text name="estate_name_label" value="Estate:"/>
-						<text name="estate_rating_label" value="Rating:"/>
-						<text name="estate_owner_label" value="Ejer:"/>
-						<text name="covenant_label" value="Regler:"/>
-					</panel>
-				</accordion_tab>
-				<accordion_tab name="sales_tab" title="Til salg">
-					<panel>
-						<text name="sales_price_label" value="Pris:"/>
-						<text name="area_label" value="Areal:"/>
-						<text name="traffic_label" value="Trafik:"/>
-						<text name="primitives_label" value="Prims:"/>
-						<text name="parcel_scripts_label" value="Scripts:"/>
-						<text name="terraform_limits_label" value="Terraform begrænsninger:"/>
-						<text name="subdivide_label" value="Mulighed for at Opdele/samle:"/>
-						<text name="resale_label" value="Mulighed for videresalg:"/>
-						<text name="sale_to_label" value="Til salg til:"/>
-					</panel>
-				</accordion_tab>
+				<accordion_tab name="parcel_characteristics_tab" title="Parcel"/>
+				<accordion_tab name="region_information_tab" title="Region"/>
+				<accordion_tab name="estate_information_tab" title="Estate"/>
+				<accordion_tab name="sales_tab" title="Til salg"/>
 			</accordion>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
index 052bf749cb..3ac4ebaae9 100644
--- a/indra/newview/skins/default/xui/da/panel_places.xml
+++ b/indra/newview/skins/default/xui/da/panel_places.xml
@@ -2,13 +2,14 @@
 <panel label="Steder" name="places panel">
 	<string name="landmarks_tab_title" value="MINE LANDEMÆRKER"/>
 	<string name="teleport_history_tab_title" value="TELEPORT HISTORIK"/>
-	<filter_editor label="Filtrér steder" name="Filter"/>
+	<filter_editor label="Filtrér mine steder" name="Filter"/>
 	<panel name="button_panel">
-		<button label="Teleportér" name="teleport_btn"/>
+		<button label="Teleportér" name="teleport_btn" tool_tip="Teleportér til det valgte område"/>
 		<button label="Kort" name="map_btn"/>
-		<button label="Redigér" name="edit_btn"/>
-		<button label="Luk" name="close_btn"/>
-		<button label="Annullér" name="cancel_btn"/>
+		<button label="Redigér" name="edit_btn" tool_tip="Redigér landemærke information"/>
+		<button label="â–¼" name="overflow_btn" tool_tip="Vise flere valgmuligheder"/>
 		<button label="Gem" name="save_btn"/>
+		<button label="Annullér" name="cancel_btn"/>
+		<button label="Luk" name="close_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index 87b749b4eb..30665dfa0e 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
-	<panel.string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</panel.string>
+<panel label="Avanceret" name="advanced">
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
-	<check_box label="Talebobler" name="bubble_text_chat"/>
-	<color_swatch name="background" tool_tip="Vælg farve for talebobler"/>
-	<slider label="Gennemsigtighed" name="bubble_chat_opacity"/>
-	<text name="AspectRatioLabel1" tool_tip="bredde / højde">
-		Format
-	</text>
-	<combo_box name="aspect_ratio" tool_tip="bredde/ højde">
-		<combo_box.item label="4:3 (Standard CRT)" name="item1"/>
-		<combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
-		<combo_box.item label="8:5 (Widescreen)" name="item3"/>
-		<combo_box.item label="16:9 (Widescreen)" name="item4"/>
-	</combo_box>
-	<check_box label="Registrér automatisk" name="aspect_auto_detect"/>
-	<text name="heading1">
-		Kamera:
-	</text>
 	<slider label="Synsvinkel" name="camera_fov"/>
 	<slider label="Distance" name="camera_offset_scale"/>
 	<text name="heading2">
@@ -29,20 +10,20 @@
 	</text>
 	<check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/>
 	<check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/>
-	<text name="heading3">
-		Avatarer:
-	</text>
 	<check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/>
 	<check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/>
 	<check_box label="Bevæg avatarlæber når der tales" name="enable_lip_sync"/>
-	<check_box label="Vis scriptfejl" name="show_script_errors"/>
+	<check_box label="Talebobler" name="bubble_text_chat"/>
+	<slider label="Gennemsigtighed" name="bubble_chat_opacity"/>
+	<color_swatch name="background" tool_tip="Vælg farve for talebobler"/>
+	<check_box label="Vis script fejl i:" name="show_script_errors"/>
 	<radio_group name="show_location">
-		<radio_item label="I chat" name="0"/>
-		<radio_item label="I et vindue" name="1"/>
+		<radio_item label="Chat" name="0"/>
+		<radio_item label="Separat vindue" name="1"/>
 	</radio_group>
-	<check_box label="Knap til aktivering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/>
+	<check_box label="Knap til aktiverering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/>
 	<line_editor label="Brug walkie-talkie modus" name="modifier_combo"/>
 	<button label="Angiv taste" name="set_voice_hotkey_button"/>
-	<button label="Midterste museknap" name="set_voice_middlemouse_button"/>
+	<button label="Midterste museknap" name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste musetaste"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index 4791033757..7caa17d514 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -4,11 +4,11 @@
 		Vis mig når:
 	</text>
 	<check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/>
-	<check_box label="Når mine venner logger af eller på" name="friends_online_notify_checkbox"/>
+	<check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
-		Vis altid disse beskeder:
+		Vis altid:
 	</text>
 	<text name="dont_show_label">
-		Vis aldrig disse beskeder:
+		Vis aldrig:
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 609512bc1b..3345bceff7 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Tekst chat" name="chat">
 	<radio_group name="chat_font_size">
-		<radio_item label="Lille" name="radio"/>
-		<radio_item label="Mellem" name="radio2"/>
-		<radio_item label="Stor" name="radio3"/>
+		<radio_item label="Lille" name="radio" value="0"/>
+		<radio_item label="Mellem" name="radio2" value="1"/>
+		<radio_item label="Stor" name="radio3" value="2"/>
 	</radio_group>
 	<color_swatch label="Dig" name="user"/>
 	<text name="text_box1">
@@ -39,8 +39,8 @@
 	</text>
 	<check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/>
 	<check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/>
-	<radio_group name="chat_window" tool_tip="Vis dine personlige beskeder i separate vinduer eller i ét vindue med mange faner (ændring kræver genstart)">
-		<radio_item label="Flere vinduer" name="radio"/>
-		<radio_item label="Et vindue" name="radio2"/>
+	<radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)">
+		<radio_item label="Separate vinduer" name="radio" value="0"/>
+		<radio_item label="Faner" name="radio2" value="1"/>
 	</radio_group>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index e17ccca4a1..f2c59f3d81 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -38,9 +38,9 @@
 		Navneskilte:
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="Skjul" name="radio"/>
-		<radio_item label="Vis" name="radio2"/>
-		<radio_item label="Vis et øjeblik" name="radio3"/>
+		<radio_item label="Skjul" name="radio" value="0"/>
+		<radio_item label="Vis" name="radio2" value="1"/>
+		<radio_item label="Vis et øjeblik" name="radio3" value="2"/>
 	</radio_group>
 	<check_box label="Vis mit navn" name="show_my_name_checkbox1"/>
 	<check_box initial_value="true" label="Små avatar navne" name="small_avatar_names_checkbox"/>
@@ -48,14 +48,17 @@
 	<text name="effects_color_textbox">
 		Farve til mine effekter:
 	</text>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
 	<text name="title_afk_text">
 		Tid inden &quot;væk&quot;:
 	</text>
-	<spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/>
-	<text name="seconds_textbox">
-		sekunder
-	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
+	<combo_box label="Timeout før &apos;væk&apos;:" name="afk">
+		<combo_box.item label="2 minutter" name="item0"/>
+		<combo_box.item label="5 minutter" name="item1"/>
+		<combo_box.item label="10 minutter" name="item2"/>
+		<combo_box.item label="30 minutter" name="item3"/>
+		<combo_box.item label="aldrig" name="item4"/>
+	</combo_box>
 	<text name="text_box3">
 		Optaget autosvar:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index bb1cacc773..07e3aec72a 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -88,8 +88,8 @@
 			Lys detaljer:
 		</text>
 		<radio_group name="LightingDetailRadio">
-			<radio_item label="Kun sol og måne" name="SunMoon"/>
-			<radio_item label="Lys i nærheden" name="LocalLights"/>
+			<radio_item label="Kun sol og måne" name="SunMoon" value="0"/>
+			<radio_item label="Lys i nærheden" name="LocalLights" value="1"/>
 		</radio_group>
 		<text name="TerrainDetailText">
 			Terræn detaljer:
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
index c382b222ea..cdb407dbad 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
 	<panel.string name="log_in_to_change">
 		log på for at ændre
 	</panel.string>
-	<button label="Nulstil historik" name="clear_cache"/>
+	<button label="Nulstil historik" name="clear_cache" tool_tip="Fjern login billede, sidste lokation, teleport historik, samt web og tekstur cache"/>
 	<text name="cache_size_label_l">
 		(Lokationer, billeder, web, søge historik)
 	</text>
@@ -11,7 +11,6 @@
 	<check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/>
 	<check_box label="Slå mikrofon fra når opkald slutter" name="auto_disengage_mic_check"/>
 	<check_box label="Acceptér cookies" name="cookies_enabled"/>
-	<check_box label="Tillad media autoplay" name="autoplay_enabled"/>
 	<text name="Logs:">
 		Logs:
 	</text>
@@ -19,7 +18,7 @@
 	<check_box label="Gem en log med private beskeder (IM) på min computer" name="log_instant_messages"/>
 	<check_box label="Tilføj tidsstempel" name="show_timestamps_check_im"/>
 	<text name="log_path_desc">
-		Placering af logfiler
+		Placering af logfiler:
 	</text>
 	<button label="Ændre sti" label_selected="Ændre sti" left="150" name="log_path_button"/>
 	<button label="Liste med blokeringer" name="block_list"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 2dd0b71d8f..279e288096 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Input og kamera" name="Input panel">
+<panel label="Opsætning" name="Input panel">
 	<button label="Andre enheder" name="joystick_setup_button"/>
 	<text name="Mouselook:">
 		Første person:
@@ -18,29 +18,29 @@
 		kbps
 	</text>
 	<check_box label="Speciel port" name="connection_port_enabled"/>
-	<spinner label="Port nummer:" name="web_proxy_port"/>
+	<spinner label="Port nummer:" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Cache størrelse
 	</text>
 	<text name="text_box5">
 		MB
 	</text>
-	<button label="Vælg" label_selected="Vælg" name="set_cache"/>
-	<button label="Nulstil" label_selected="Gem" name="reset_cache"/>
 	<text name="Cache location">
-		Cache lokation
+		Cache placering:
 	</text>
+	<button label="Vælg" label_selected="Vælg" name="set_cache"/>
+	<button label="Nulstil" label_selected="Nulstil" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]."/>
-		<radio_item label="Brug min normale browser (IE, Firefox)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm."/>
+		<radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value="0"/>
+		<radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/>
 	</radio_group>
-	<check_box initial_value="false" label="Web proxy" name="web_proxy_enabled"/>
-	<line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/>
-	<button label="Vælg" label_selected="Vælg" name="set_proxy"/>
+	<check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/>
 	<text name="Proxy location">
-		Proxy placering
+		Proxy placering:
 	</text>
+	<line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/>
+	<spinner label="Port nummer:" name="web_proxy_port"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index ce77018f72..856f978ebd 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Lyde" name="Preference Media panel">
 	<slider label="Generel" name="System Volume"/>
-	<check_box initial_value="true" label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized"/>
-	<slider label="Omgivelser" name="Wind Volume"/>
+	<check_box initial_value="true" label="Sluk lyd når minimeret" name="mute_when_minimized"/>
 	<slider label="Knapper" name="UI Volume"/>
-	<slider label="Media" name="Media Volume"/>
-	<slider label="Effekter" name="SFX Volume"/>
+	<slider label="Omgivelser" name="Wind Volume"/>
+	<slider label="Lyd effekter" name="SFX Volume"/>
 	<slider label="Musik" name="Music Volume"/>
-	<check_box label="Tale" name="enable_voice_check"/>
-	<slider label="Tale" name="Voice Volume"/>
+	<check_box label="Aktiveret" name="music_enabled"/>
+	<slider label="Media" name="Media Volume"/>
+	<check_box label="Aktiveret" name="enable_media"/>
+	<slider label="Stemme chat" name="Voice Volume"/>
+	<check_box label="Aktiveret" name="enable_voice_check"/>
+	<check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="sandt"/>
+	<check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="sandt"/>
+	<text name="voice_chat_settings">
+		Stemme chat opsætning
+	</text>
 	<text name="Listen from">
 		Hør stemmer fra:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
index 987ba2a3f8..d3b3c7e21e 100644
--- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
@@ -1,6 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="MediaControls">
+	<string name="min_width">
+		300
+	</string>
+	<string name="min_height">
+		75
+	</string>
+	<string name="zoom_medium_padding">
+		1.1
+	</string>
+	<string name="top_world_view_avoid_zone">
+		50
+	</string>
+	<layout_stack name="progress_indicator_area">
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="Medie hentes"/>
+		</panel>
+	</layout_stack>
 	<layout_stack name="media_controls">
+		<layout_panel name="back">
+			<button name="back_btn" tool_tip="Navigér tilbage"/>
+		</layout_panel>
+		<layout_panel name="fwd">
+			<button name="fwd_btn" tool_tip="Navigér frem"/>
+		</layout_panel>
+		<layout_panel name="home">
+			<button name="home_btn" tool_tip="Hjemmeside"/>
+		</layout_panel>
+		<layout_panel name="media_stop">
+			<button name="media_stop_btn" tool_tip="Stop medie"/>
+		</layout_panel>
+		<layout_panel name="reload">
+			<button name="reload_btn" tool_tip="Indlæs igen"/>
+		</layout_panel>
+		<layout_panel name="stop">
+			<button name="stop_btn" tool_tip="Stop indlæsning"/>
+		</layout_panel>
+		<layout_panel name="play">
+			<button name="play_btn" tool_tip="Afspil medie"/>
+		</layout_panel>
+		<layout_panel name="pause">
+			<button name="pause_btn" tool_tip="Pause medie"/>
+		</layout_panel>
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="Media URL"/>
 			<layout_stack name="media_address_url_icons">
@@ -15,14 +56,24 @@
 		<layout_panel name="media_play_position">
 			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Filmafspilning fremskridt"/>
 		</layout_panel>
+		<layout_panel name="skip_back">
+			<button name="skip_back_btn" tool_tip="GÃ¥ tilbage"/>
+		</layout_panel>
+		<layout_panel name="skip_forward">
+			<button name="skip_forward_btn" tool_tip="GÃ¥ frem"/>
+		</layout_panel>
 		<layout_panel name="media_volume">
 			<button name="media_mute_button" tool_tip="Sluk for dette media"/>
 			<slider name="volume_slider" tool_tip="Media lydstyrke"/>
 		</layout_panel>
-	</layout_stack>
-	<layout_stack>
-		<panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="Media hentes"/>
-		</panel>
+		<layout_panel name="zoom_frame">
+			<button name="zoom_frame_btn" tool_tip="Zoom til medie"/>
+		</layout_panel>
+		<layout_panel name="close">
+			<button name="close_btn" tool_tip="Zoom tilbage"/>
+		</layout_panel>
+		<layout_panel name="new_window">
+			<button name="new_window_btn" tool_tip="Ã…ben URL i browser"/>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_profile.xml b/indra/newview/skins/default/xui/da/panel_profile.xml
index ef7110ffcf..c5bfc3ae80 100644
--- a/indra/newview/skins/default/xui/da/panel_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_profile.xml
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Profil" name="panel_profile">
 	<string name="no_partner_text" value="Ingen"/>
+	<string name="no_group_text" value="Ingen"/>
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<panel name="second_life_image_panel">
-				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
-			</panel>
-			<panel name="first_life_image_panel">
-				<text name="title_rw_descr_text" value="Real world:"/>
-			</panel>
-			<text name="me_homepage_text">
-				Hjemmeside:
-			</text>
-			<text name="title_member_text" value="Medlem siden:"/>
-			<text name="title_acc_status_text" value="Konto status:"/>
-			<text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/>
-			<text name="title_partner_text" value="Partner:"/>
-			<text name="title_groups_text" value="Grupper:"/>
-		</panel>
-	</scroll_container>
-	<panel name="profile_buttons_panel">
-		<button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til denne beboer"/>
-		<button label="IM" name="im" tool_tip="Skriv en personlig besked (IM)"/>
-		<button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/>
-		<button label="Map" name="show_on_map_btn" tool_tip="Show the resident on the map"/>
-		<button label="Tilbyd teleport" name="teleport" tool_tip="Tilbyd en teleport til denne beboer"/>
-		<button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med denne beboer"/>
-	</panel>
-	<panel name="profile_me_buttons_panel">
-		<button label="Redigér profil" name="edit_profile_btn"/>
-		<button label="Redigér udseende" name="edit_appearance_btn"/>
-	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="profile_scroll_panel">
+					<panel name="second_life_image_panel">
+						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+					</panel>
+					<panel name="first_life_image_panel">
+						<text name="title_rw_descr_text" value="Real World:"/>
+					</panel>
+					<text name="title_member_text" value="Beboer siden:"/>
+					<text name="title_acc_status_text" value="Konto status:"/>
+					<text name="title_partner_text" value="Partner:"/>
+					<panel name="partner_data_panel">
+						<name_box initial_value="(henter)" name="partner_text"/>
+					</panel>
+					<text name="title_groups_text" value="Grupper:"/>
+				</panel>
+			</scroll_container>
+		</layout_panel>
+		<layout_panel name="profile_buttons_panel">
+			<button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/>
+			<button label="IM" name="im" tool_tip="Ã…ben session med personlige beskeder (IM)"/>
+			<button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/>
+			<button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/>
+			<button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/>
+			<button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med beboeren"/>
+		</layout_panel>
+		<layout_panel name="profile_me_buttons_panel">
+			<button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/>
+			<button label="Redigér udseende" name="edit_appearance_btn" tool_tip="Opret/redigér dit udseende: fysiske data, tøj m.v."/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
index 0e8ab7556f..564d8e6665 100644
--- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
@@ -27,7 +27,7 @@
 		Ændringer i regler vil blive vist i alle parceller til denne estate.
 	</text>
 	<text name="covenant_instructions">
-		Træk og slip en note for at ændre regler for denne estate.
+		Træk og slip et notecard her for at ændre regler for denne estate.
 	</text>
 	<text name="region_section_lbl">
 		Region
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
index d726fedfe9..c21fd9db37 100644
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estate" name="Estate">
 	<text name="estate_help_text">
-		Ændringer i dette afsnit vil påvirke alle
-regioner i dette estate.
+		Ændringer her vil påvirke alle regioner i dette estate.
 	</text>
 	<text name="estate_text">
 		Estate:
@@ -24,10 +23,10 @@ regioner i dette estate.
 	<check_box label="Tillad offentlig adgang" name="externally_visible_check"/>
 	<button label="?" name="externally_visible_help"/>
 	<text name="Only Allow">
-		Begræns adgang til:
+		Begræns adgang til konti bekræftet med:
 	</text>
-	<check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for brugere uden identifikation"/>
-	<check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se [SUPPORT_SITE] for mere information."/>
+	<check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for uidentificerede beboere"/>
+	<check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er blevet aldersverificeret. Se [SUPPORT_SITE] for mere information."/>
 	<check_box label="Tillad stemme chat" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Tillad direkte teleport" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml
new file mode 100644
index 0000000000..467684f712
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Region" name="General">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		ukendt
+	</text>
+	<text name="version_channel_text_lbl">
+		Version:
+	</text>
+	<text name="version_channel_text">
+		ukendt
+	</text>
+	<text name="region_type_lbl">
+		Type:
+	</text>
+	<text name="region_type">
+		ukendt
+	</text>
+	<check_box label="Blokér for redigering af terræn" name="block_terraform_check"/>
+	<check_box label="Blokér for flyvning" name="block_fly_check"/>
+	<check_box label="Tillad skader" name="allow_damage_check"/>
+	<check_box label="Begræns skubning" name="restrict_pushobject"/>
+	<check_box label="Tillad at sælge land" name="allow_land_resell_check"/>
+	<check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/>
+	<check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/>
+	<spinner label="Max besøgende" name="agent_limit_spin"/>
+	<spinner label="Objekt bonus" name="object_bonus_spin"/>
+	<text label="Rating" name="access_text">
+		Rating:
+	</text>
+	<combo_box label="Moderat" name="access_combo">
+		<combo_box.item label="Voksent" name="Adult"/>
+		<combo_box.item label="Moderat" name="Mature"/>
+		<combo_box.item label="Generel" name="PG"/>
+	</combo_box>
+	<button label="Gem" name="apply_btn"/>
+	<button label="Send en beboer hjem ..." name="kick_btn"/>
+	<button label="Send alle beboere hjem...&quot;" name="kick_all_btn"/>
+	<button label="Send besked til region..." name="im_btn"/>
+	<button label="Vedligehold telehub..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
index fc597eee15..8e324ab777 100644
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml
@@ -45,10 +45,10 @@
 	<spinner label="Høj" name="height_range_spin_2"/>
 	<spinner label="Høj" name="height_range_spin_3"/>
 	<text name="height_text_lbl10">
-		Disse værdier repræsenterer blandingsområder for teksturer ovenfor.
+		Disse værdier repræsenterer blandingsforhold for teksturer ovenfor.
 	</text>
 	<text name="height_text_lbl11">
-		Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1, og HØJ værdien er minimumshøjden for tekstur 4.
+		Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1 og HØJ værdien er MINIMUMSshøjden for tekstur 4.
 	</text>
 	<text name="height_text_lbl12">
 		og HØJ værdien er MIMIMUM højde for texture nummer 4.
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
new file mode 100644
index 0000000000..821c82ccda
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MIN AVATAR" name="script_limits_my_avatar_panel">
+	<text name="script_memory">
+		Avatar Script forbrug
+	</text>
+	<text name="loading_text">
+		Henter...
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="Størrelse (kb)" name="size"/>
+		<scroll_list.columns label="URL&apos;er" name="urls"/>
+		<scroll_list.columns label="Objekt navn" name="name"/>
+		<scroll_list.columns label="Lokation" name="location"/>
+	</scroll_list>
+	<button label="Gentegn liste" name="refresh_list_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
new file mode 100644
index 0000000000..91fc76dbb4
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="REGION MEMORY" name="script_limits_region_memory_panel">
+	<text name="script_memory">
+		Parcel script memory
+	</text>
+	<text name="loading_text">
+		Henter...
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="Størrelse (kb)" name="size"/>
+		<scroll_list.columns label="URL&apos;er" name="urls"/>
+		<scroll_list.columns label="Objekt navn" name="name"/>
+		<scroll_list.columns label="Objekt ejer" name="owner"/>
+		<scroll_list.columns label="Parcel" name="parcel"/>
+		<scroll_list.columns label="Lokation" name="location"/>
+	</scroll_list>
+	<button label="Gentegn liste" name="refresh_list_btn"/>
+	<button label="Fremhæv" name="highlight_btn"/>
+	<button label="Retur" name="return_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
index ab4a2a134e..ec430d6fd4 100644
--- a/indra/newview/skins/default/xui/da/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml
@@ -2,25 +2,28 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
-	<sidetray_tab description="Hjem." name="sidebar_home">
+	<sidetray_tab description="Ã…bn/luk sidebar" name="sidebar_openclose" tab_title="Ã…bn/luk sidebar"/>
+	<sidetray_tab description="Hjem." name="sidebar_home" tab_title="Home">
 		<panel label="hjem" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people">
+	<sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="My Profile">
 		<panel_container name="panel_container">
-			<panel label="Gruppe info" name="panel_group_info_sidetray"/>
+			<panel label="Mig" name="panel_me"/>
+		</panel_container>
+	</sidetray_tab>
+	<sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="People">
+		<panel_container name="panel_container">
+			<panel label="Gruppe profil" name="panel_group_info_sidetray"/>
 			<panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places">
+	<sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Places">
 		<panel label="Steder" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me">
-		<panel label="Mig" name="panel_me"/>
+	<sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="My Inventory">
+		<panel label="Redigér beholdning" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance">
+	<sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="My Appearance">
 		<panel label="Redigér fremtoning" name="sidepanel_appearance"/>
 	</sidetray_tab>
-	<sidetray_tab description="Browse din beholdning." name="sidebar_inventory">
-		<panel label="Redigér beholdning" name="sidepanel_inventory"/>
-	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 4e45b7e328..08ffafd5a6 100644
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -21,9 +21,11 @@
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="My Balance: Click to buy more L$"/>
+	<button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/>
+	<button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/>
 	<text name="TimeText" tool_tip="Nuværende tid (Pacific)">
-		12:00
+		24:00 PST
 	</text>
+	<button name="media_toggle_btn" tool_tip="Start/Stop Alle medier (musik, video, hjemmesider)"/>
 	<button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
index 64b5ecf5cf..a1859b64d8 100644
--- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
@@ -4,6 +4,7 @@
 		<accordion_tab name="today" title="I dag"/>
 		<accordion_tab name="yesterday" title="I går"/>
 		<accordion_tab name="2_days_ago" title="2 dage siden"/>
+		5
 		<accordion_tab name="3_days_ago" title="3 dage siden"/>
 		<accordion_tab name="4_days_ago" title="4 dage siden"/>
 		<accordion_tab name="5_days_ago" title="5 dage siden"/>
@@ -11,4 +12,7 @@
 		<accordion_tab name="1_month_and_older" title="1 måned eller ældre"/>
 		<accordion_tab name="6_months_and_older" title="6 måneder eller ældre"/>
 	</accordion>
+	<panel name="bottom_panel">
+		<button name="gear_btn" tool_tip="Vi flere valgmuligheder"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
new file mode 100644
index 0000000000..8148588c86
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+	<button name="profile_btn" tool_tip="Vis info om genstand"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index 27708f5c7a..43ddfdada7 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sæt" name="appearance panel">
 	<string name="No Outfit" value="Intet sæt"/>
-	<filter_editor label="Filtrér sæt" name="Filter"/>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
-		<button name="newlook_btn" tool_tip="Tilføj nyt sæt"/>
-		<dnd_button name="trash_btn" tool_tip="Fjern valgte del"/>
-		<button label="Bær" name="wear_btn"/>
+	<panel name="panel_currentlook">
+		<text name="currentlook_title">
+			(ikke gemt)
+		</text>
 	</panel>
+	<filter_editor label="Filtrér sæt" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index 685601b922..77db828c20 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Egenskaber for beholdningsgenstand">
+<panel name="item properties" title="Objekt profil">
 	<panel.string name="unknown">
 		(ukendt)
 	</panel.string>
@@ -15,7 +15,8 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
-	<text name="title" value="Egenskaber for genstand"/>
+	<text name="title" value="Objekt profil"/>
+	<text name="where" value="(Beholdning)"/>
 	<panel label="">
 		<text name="LabelItemNameTitle">
 			Navn:
@@ -37,34 +38,36 @@
 		<text name="LabelAcquiredDate">
 			Ons Maj 24 12:50:46 2006
 		</text>
-		<text name="OwnerLabel">
-			Dig:
-		</text>
-		<check_box label="Editér" name="CheckOwnerModify"/>
-		<check_box label="Kopiér" name="CheckOwnerCopy"/>
-		<check_box label="Sælg" name="CheckOwnerTransfer"/>
-		<text name="AnyoneLabel">
-			Enhver:
-		</text>
-		<check_box label="Kopiér" name="CheckEveryoneCopy"/>
-		<text name="GroupLabel">
-			Gruppe:
-		</text>
-		<check_box label="Del" name="CheckShareWithGroup"/>
-		<text name="NextOwnerLabel">
-			Næste ejer:
-		</text>
-		<check_box label="Editér" name="CheckNextOwnerModify"/>
-		<check_box label="Kopiér" name="CheckNextOwnerCopy"/>
-		<check_box label="Sælg" name="CheckNextOwnerTransfer"/>
+		<panel name="perms_inv">
+			<text name="perm_modify">
+				Du kan:
+			</text>
+			<check_box label="Redigér" name="CheckOwnerModify"/>
+			<check_box label="Kopi" name="CheckOwnerCopy"/>
+			<check_box label="Giv væk" name="CheckOwnerTransfer"/>
+			<text name="AnyoneLabel">
+				Enhver:
+			</text>
+			<check_box label="Kopi" name="CheckEveryoneCopy"/>
+			<text name="GroupLabel">
+				Gruppe:
+			</text>
+			<check_box label="Del" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine &apos;redigere&apos; rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/>
+			<text name="NextOwnerLabel">
+				Næste ejer:
+			</text>
+			<check_box label="Redigere" name="CheckNextOwnerModify"/>
+			<check_box label="Kopi" name="CheckNextOwnerCopy"/>
+			<check_box label="Giv væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/>
+		</panel>
 		<check_box label="Til salg" name="CheckPurchase"/>
 		<combo_box name="combobox sale copy">
 			<combo_box.item label="Kopiér" name="Copy"/>
 			<combo_box.item label="Original" name="Original"/>
 		</combo_box>
-		<spinner label="Pris:" name="Edit Cost"/>
-		<text name="CurrencySymbol">
-			L$
-		</text>
+		<spinner label="Pris: L$" name="Edit Cost"/>
+	</panel>
+	<panel name="button_panel">
+		<button label="Annullér" name="cancel_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
index 6ade03ce56..add2fa3c73 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Egenskaber for objekt">
+<panel name="object properties" title="Objekt profil">
 	<panel.string name="text deed continued">
 		Dedikér
 	</panel.string>
@@ -36,84 +36,61 @@
 	<panel.string name="Sale Mixed">
 		Blandet salg
 	</panel.string>
+	<text name="title" value="Objekt profil"/>
+	<text name="where" value="(verden)"/>
 	<panel label="">
-		<text name="Name:">
-			Navn:
+		<text name="CreatorNameLabel">
+			Skaber
 		</text>
-		<text name="Description:">
-			Beskrivelse:
+		<text name="Creator Name">
+			Erica Linden
 		</text>
-		<text name="Creator:">
-			Skaber:
-		</text>
-		<text name="Owner:">
-			Ejer:
-		</text>
-		<text name="Group:">
+		<text name="Group_label">
 			Gruppe:
 		</text>
-		<button name="button set group" tool_tip="Vælg en gruppe der skal dele dette objekts rettigheder"/>
-		<name_box initial_value="Henter..." name="Group Name Proxy"/>
-		<button label="Dedikér" label_selected="Dedikér" name="button deed" tool_tip="Dedikering giver denne genstand væk med næste ejers rettigheder. Gruppedelte genstande kan dedikeres af en gruppeadministrator."/>
-		<check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den angivne gruppe at videregive dine &quot;redigere&quot; rettigheder for dette objekt. Du må dedikere for at tillade rolle begrænsninger."/>
-		<text name="label click action">
-			Klik for at:
-		</text>
-		<combo_box name="clickaction">
-			<combo_box.item label="Røre  (standard)" name="Touch/grab(default)"/>
-			<combo_box.item label="Sidde på objekt" name="Sitonobject"/>
-			<combo_box.item label="Købe objekt" name="Buyobject"/>
-			<combo_box.item label="Betale til objekt" name="Payobject"/>
-			<combo_box.item label="Ã…bne" name="Open"/>
-		</combo_box>
-		<check_box label="Til salg:" name="checkbox for sale"/>
-		<combo_box name="sale type">
-			<combo_box.item label="Kopi" name="Copy"/>
-			<combo_box.item label="Indhold" name="Contents"/>
-			<combo_box.item label="Original" name="Original"/>
-		</combo_box>
-		<spinner label="Pris: L$" name="Edit Cost"/>
-		<check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Du kan redigere dette objekt
 			</text>
 			<text name="Anyone can:">
 				Enhver:
 			</text>
-			<check_box label="Flytte" name="checkbox allow everyone move"/>
-			<check_box label="Kopiere" name="checkbox allow everyone copy"/>
-			<text name="Next owner can:">
+			<check_box label="Kopi" name="checkbox allow everyone copy"/>
+			<check_box label="Flyt" name="checkbox allow everyone move"/>
+			<text name="GroupLabel">
+				Gruppe:
+			</text>
+			<check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine &apos;rediger&apos; rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/>
+			<text name="NextOwnerLabel">
 				Næste ejer:
 			</text>
 			<check_box label="Redigere" name="checkbox next owner can modify"/>
-			<check_box label="Kopiere" name="checkbox next owner can copy"/>
-			<check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan sælge eller give dette objekt væk"/>
-			<text name="B:">
-				B:
-			</text>
-			<text name="O:">
-				Ã…:
-			</text>
-			<text name="G:">
-				O:
-			</text>
-			<text name="E:">
-				R:
-			</text>
-			<text name="N:">
-				N:
-			</text>
-			<text name="F:">
-				F:
-			</text>
+			<check_box label="Kopi" name="checkbox next owner can copy"/>
+			<check_box label="Give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge objekt"/>
 		</panel>
+		<check_box label="Til salg" name="checkbox for sale"/>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Ã…ben" name="open_btn"/>
 		<button label="Betal" name="pay_btn"/>
 		<button label="Køb" name="buy_btn"/>
-		<button label="Annullér" name="cancel_btn"/>
-		<button label="Gem" name="save_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 493bb4cb20..412f946acc 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings
      that are returned from one component and may appear in many places-->
 <strings>
+	<string name="CAPITALIZED_APP_NAME">
+		SECOND LIFE
+	</string>
 	<string name="SUPPORT_SITE">
 		Second Life Support Portal
 	</string>
@@ -131,7 +134,7 @@
 		Klik for at se information om denne lokation
 	</string>
 	<string name="TooltipAgentUrl">
-		Klik for at denne beboers profil
+		Klik for at se beboers profil
 	</string>
 	<string name="TooltipGroupUrl">
 		Klik for at se denne gruppes beskrivelse
@@ -165,7 +168,7 @@
 		Vis kort for
 	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
-		Luk (&#8984;W)
+		Luk (⌘W)
 	</string>
 	<string name="BUTTON_CLOSE_WIN">
 		Luk (Ctrl+W)
@@ -182,9 +185,6 @@
 	<string name="BUTTON_DOCK">
 		Fastgør
 	</string>
-	<string name="BUTTON_UNDOCK">
-		Frigør
-	</string>
 	<string name="BUTTON_HELP">
 		Vis hjælp
 	</string>
@@ -209,9 +209,6 @@
 	<string name="AvatarNameWaiting">
 		(venter)
 	</string>
-	<string name="AvatarNameHippos">
-		(hippos)
-	</string>
 	<string name="GroupNameNone">
 		(ingen)
 	</string>
@@ -572,6 +569,9 @@
 	<string name="hang_up">
 		Stemme chat er afbrudt
 	</string>
+	<string name="reconnect_nearby">
+		Du vil nu blive dirigeret til lokal stemme chat
+	</string>
 	<string name="ScriptQuestionCautionChatGranted">
 		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS].
 	</string>
@@ -764,9 +764,6 @@
 	<string name="TeleportOffer">
 		Teleport tilbud
 	</string>
-	<string name="StartUpNotification">
-		%d nye besked modtaget mens du var væk...
-	</string>
 	<string name="StartUpNotifications">
 		%d nye beskeder modtaget mens du var væk......
 	</string>
@@ -804,11 +801,13 @@
 		Tryk ESC for at skift til normalt udsyn
 	</string>
 	<string name="InventoryNoMatchingItems">
-		No matching items found in inventory.
+		Ingen matchende genstande fundet i beholdning.  Prøv evt. [secondlife:///app/search/groups &quot;Search&quot;].
+	</string>
+	<string name="FavoritesNoMatchingItems">
+		Træk et landemærke hertil for at tilføje den som favorit.
 	</string>
 	<string name="InventoryNoTexture">
-		Du har ikke en kopi af denne
-tekstur i din beholdning.
+		Du har ikke en kopi af denne tekstur i din beholdning
 	</string>
 	<string name="no_transfer" value=" (ikke overdragbar)"/>
 	<string name="no_modify" value=" (ikke redigere)"/>
@@ -1266,11 +1265,164 @@ tekstur i din beholdning.
 		alle estates du administrerer for [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS])
+		Godkendte beboere: ([ALLOWEDAGENTS], maks. [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
 		Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS])
 	</string>
+	<string name="ScriptLimitsParcelScriptMemory">
+		Parcel script memory
+	</string>
+	<string name="ScriptLimitsParcelsOwned">
+		Parceller listet: [PARCELS]
+	</string>
+	<string name="ScriptLimitsMemoryUsed">
+		Memory brugt: [COUNT] kb ud af [MAX] kb; [AVAILABLE] kb tilgængeligt
+	</string>
+	<string name="ScriptLimitsMemoryUsedSimple">
+		Memory brugt: [COUNT] kb
+	</string>
+	<string name="ScriptLimitsParcelScriptURLs">
+		Parcel Script URL&apos;er
+	</string>
+	<string name="ScriptLimitsURLsUsed">
+		URL&apos;er brugt: [COUNT] ud af [MAX]; [AVAILABLE] tilgængelige
+	</string>
+	<string name="ScriptLimitsURLsUsedSimple">
+		URL&apos;er brugt: [COUNT]
+	</string>
+	<string name="ScriptLimitsRequestError">
+		Fejl ved anmodning om information
+	</string>
+	<string name="ScriptLimitsRequestNoParcelSelected">
+		Ingen parcel valgt
+	</string>
+	<string name="ScriptLimitsRequestWrongRegion">
+		Fejl: script information er kun tilgængelig i den nuværende region
+	</string>
+	<string name="ScriptLimitsRequestWaiting">
+		Henter information...
+	</string>
+	<string name="ScriptLimitsRequestDontOwnParcel">
+		Du har ikke rettigheder til at undersøge denne parcel
+	</string>
+	<string name="SITTING_ON">
+		Sidder på
+	</string>
+	<string name="ATTACH_CHEST">
+		Bryst
+	</string>
+	<string name="ATTACH_HEAD">
+		Hoved
+	</string>
+	<string name="ATTACH_LSHOULDER">
+		Venstre skulder
+	</string>
+	<string name="ATTACH_RSHOULDER">
+		Højre skulder
+	</string>
+	<string name="ATTACH_LHAND">
+		Venstre hånd
+	</string>
+	<string name="ATTACH_RHAND">
+		Højre hånd
+	</string>
+	<string name="ATTACH_LFOOT">
+		Venstre fod
+	</string>
+	<string name="ATTACH_RFOOT">
+		Højre fod
+	</string>
+	<string name="ATTACH_BACK">
+		Ryg
+	</string>
+	<string name="ATTACH_PELVIS">
+		Bækken
+	</string>
+	<string name="ATTACH_MOUTH">
+		Mund
+	</string>
+	<string name="ATTACH_CHIN">
+		Hage
+	</string>
+	<string name="ATTACH_LEAR">
+		Venstre øre
+	</string>
+	<string name="ATTACH_REAR">
+		Højre øre
+	</string>
+	<string name="ATTACH_LEYE">
+		Venstre øje
+	</string>
+	<string name="ATTACH_REYE">
+		Højre øje
+	</string>
+	<string name="ATTACH_NOSE">
+		Næse
+	</string>
+	<string name="ATTACH_RUARM">
+		Højre overarm
+	</string>
+	<string name="ATTACH_RLARM">
+		Højre underarm
+	</string>
+	<string name="ATTACH_LUARM">
+		Venstre overarm
+	</string>
+	<string name="ATTACH_LLARM">
+		Venstre underarm
+	</string>
+	<string name="ATTACH_RHIP">
+		Højre hofte
+	</string>
+	<string name="ATTACH_RULEG">
+		Højre lår
+	</string>
+	<string name="ATTACH_RLLEG">
+		Højre underben
+	</string>
+	<string name="ATTACH_LHIP">
+		Venstre hofte
+	</string>
+	<string name="ATTACH_LULEG">
+		Venste lår
+	</string>
+	<string name="ATTACH_LLLEG">
+		Venstre underben
+	</string>
+	<string name="ATTACH_BELLY">
+		Mave
+	</string>
+	<string name="ATTACH_RPEC">
+		Højre bryst
+	</string>
+	<string name="ATTACH_LPEC">
+		Venstre bryst
+	</string>
+	<string name="ATTACH_HUD_CENTER_2">
+		HUD Center 2
+	</string>
+	<string name="ATTACH_HUD_TOP_RIGHT">
+		HUD Øverst til højre
+	</string>
+	<string name="ATTACH_HUD_TOP_CENTER">
+		HUD Foroven midtpå
+	</string>
+	<string name="ATTACH_HUD_TOP_LEFT">
+		HUD Øverst til venstre
+	</string>
+	<string name="ATTACH_HUD_CENTER_1">
+		HUD Center 1
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_LEFT">
+		HUD Nederst til venstre
+	</string>
+	<string name="ATTACH_HUD_BOTTOM">
+		HUD For neden
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_RIGHT">
+		HUD Nederst til højre
+	</string>
 	<string name="CursorPos">
 		Linie [LINE], Kolonne [COLUMN]
 	</string>
@@ -1315,6 +1467,15 @@ tekstur i din beholdning.
 	<string name="ClassifiedUpdateAfterPublish">
 		(vil blive opdateret efter offentliggørelse)
 	</string>
+	<string name="NoPicksClassifiedsText">
+		Du har ikke oprettet nogen favoritter eller annoncer. Klik på plus knappen nedenfor for at oprette en favorit eller en annonce.
+	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		Bruger har ingen favoritter eller annoncer
+	</string>
+	<string name="PicksClassifiedsLoadingText">
+		Henter...
+	</string>
 	<string name="MultiPreviewTitle">
 		Vis først
 	</string>
@@ -1391,16 +1552,27 @@ tekstur i din beholdning.
 		Ukendt fil efternavn [.%s]
 Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
+	<string name="MuteObject2">
+		Blokér
+	</string>
 	<string name="AddLandmarkNavBarMenu">
 		Tilføj landemærke...
 	</string>
 	<string name="EditLandmarkNavBarMenu">
 		Redigér landemærke...
 	</string>
-	<string name="accel-mac-control">&#8963;</string>
-	<string name="accel-mac-command">&#8984;</string>
-	<string name="accel-mac-option">&#8997;</string>
-	<string name="accel-mac-shift">&#8679;</string>
+	<string name="accel-mac-control">
+		⌃
+	</string>
+	<string name="accel-mac-command">
+		⌘
+	</string>
+	<string name="accel-mac-option">
+		⌥
+	</string>
+	<string name="accel-mac-shift">
+		⇧
+	</string>
 	<string name="accel-win-control">
 		Ctrl+
 	</string>
@@ -1655,39 +1827,15 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Attached Earlobes">
 		Vedhæftede øreflipper
 	</string>
-	<string name="Back Bangs">
-		Nakkehår
-	</string>
-	<string name="Back Bangs Down">
-		Nakkehår langt
-	</string>
-	<string name="Back Bangs Up">
-		Nakkehår kort
-	</string>
 	<string name="Back Fringe">
 		Nakkehår
 	</string>
-	<string name="Back Hair">
-		Volumen
-	</string>
-	<string name="Back Hair Down">
-		Volumen nedad
-	</string>
-	<string name="Back Hair Up">
-		Volumen op
-	</string>
 	<string name="Baggy">
 		Posede
 	</string>
 	<string name="Bangs">
 		Pandehår
 	</string>
-	<string name="Bangs Down">
-		Pandehår ned
-	</string>
-	<string name="Bangs Up">
-		Pandehår op
-	</string>
 	<string name="Beady Eyes">
 		Stikkende øjne
 	</string>
@@ -1700,9 +1848,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Big Butt">
 		Stor bagdel
 	</string>
-	<string name="Big Eyeball">
-		Store øjenæbler
-	</string>
 	<string name="Big Hair Back">
 		Stort hår: Bag
 	</string>
@@ -1877,9 +2022,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Corner Down">
 		Nedadvendt
 	</string>
-	<string name="Corner Normal">
-		Normalt
-	</string>
 	<string name="Corner Up">
 		Opadvendt
 	</string>
@@ -1889,9 +2031,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Crooked Nose">
 		Skæv næse
 	</string>
-	<string name="Cropped Hair">
-		Kort hår
-	</string>
 	<string name="Cuff Flare">
 		Svaj
 	</string>
@@ -1910,15 +2049,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Default Heels">
 		Standard hæle
 	</string>
-	<string name="Default Toe">
-		Standard snude
-	</string>
 	<string name="Dense">
 		Tæt
 	</string>
-	<string name="Dense hair">
-		Tæt hår
-	</string>
 	<string name="Double Chin">
 		Dobbelthage
 	</string>
@@ -1964,9 +2097,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Eye Spacing">
 		Øjenafstand
 	</string>
-	<string name="Eyeball Size">
-		Størrelse øjenæble
-	</string>
 	<string name="Eyebrow Arc">
 		Bue på øjenbryn
 	</string>
@@ -1991,36 +2121,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Eyeliner Color">
 		Eyeliner farve
 	</string>
-	<string name="Eyes Back">
-		Dybtliggende øjne
-	</string>
 	<string name="Eyes Bugged">
 		Udstående øjne
 	</string>
-	<string name="Eyes Forward">
-		Øjne fremme
-	</string>
-	<string name="Eyes Long Head">
-		Eyes Long Head
-	</string>
-	<string name="Eyes Shear Left Up">
-		Eyes Shear Left Up
-	</string>
-	<string name="Eyes Shear Right Up">
-		Eyes Shear Right Up
-	</string>
-	<string name="Eyes Short Head">
-		Eyes Short Head
-	</string>
-	<string name="Eyes Spread">
-		Stor afstand
-	</string>
-	<string name="Eyes Sunken">
-		Indsunkne øjne
-	</string>
-	<string name="Eyes Together">
-		Tætsiddende
-	</string>
 	<string name="Face Shear">
 		Ansigts symmetri
 	</string>
@@ -2030,30 +2133,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Far Set Eyes">
 		Stor afstand mellem øjne
 	</string>
-	<string name="Fat">
-		Tyk
-	</string>
-	<string name="Fat Head">
-		Tykt hovede
-	</string>
 	<string name="Fat Lips">
 		Tykke læber
 	</string>
-	<string name="Fat Lower">
-		Tyk nedre
-	</string>
-	<string name="Fat Lower Lip">
-		Tyk underlæbe
-	</string>
-	<string name="Fat Torso">
-		Tyk overkrop
-	</string>
-	<string name="Fat Upper">
-		Tyk øvre
-	</string>
-	<string name="Fat Upper Lip">
-		Tyk overlæbe
-	</string>
 	<string name="Female">
 		Kvinde
 	</string>
@@ -2090,24 +2172,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Freckles">
 		Fregner
 	</string>
-	<string name="Front Bangs Down">
-		Pandehår - ned
-	</string>
-	<string name="Front Bangs Up">
-		Pandehår - op
-	</string>
 	<string name="Front Fringe">
 		Frynser foran
 	</string>
-	<string name="Front Hair">
-		HÃ¥r foran
-	</string>
-	<string name="Front Hair Down">
-		HÃ¥r foran - ned
-	</string>
-	<string name="Front Hair Up">
-		HÃ¥r foran - op
-	</string>
 	<string name="Full Back">
 		Langt ud bagtil
 	</string>
@@ -2381,9 +2448,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Long arms">
 		Lange arme
 	</string>
-	<string name="Longcuffs">
-		Longcuffs
-	</string>
 	<string name="Loose Pants">
 		Løse bukser
 	</string>
@@ -2546,9 +2610,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="No Eyeshadow">
 		Ingen øjenskygge
 	</string>
-	<string name="No Heels">
-		Ingen hæle
-	</string>
 	<string name="No Lipgloss">
 		Ingen lipgloss
 	</string>
@@ -2606,9 +2667,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Nostril Width">
 		Næsebor bredde
 	</string>
-	<string name="Old">
-		Gammel
-	</string>
 	<string name="Opaque">
 		Uigennemsigtig
 	</string>
@@ -2708,9 +2766,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Pointy Heels">
 		Spidse hæle
 	</string>
-	<string name="Pointy Toe">
-		Spids snude
-	</string>
 	<string name="Ponytail">
 		Hestehale
 	</string>
@@ -2735,15 +2790,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Red Hair">
 		Rødt hår
 	</string>
-	<string name="Red Skin">
-		Rød hud
-	</string>
 	<string name="Regular">
 		Almindelig
 	</string>
-	<string name="Regular Muscles">
-		Almindelige muskler
-	</string>
 	<string name="Right Part">
 		Højre skildning
 	</string>
@@ -2753,9 +2802,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Round">
 		Rund
 	</string>
-	<string name="Round Forehead">
-		Rund pande
-	</string>
 	<string name="Ruddiness">
 		Rødmossethed
 	</string>
@@ -2768,24 +2814,12 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Saddle Bags">
 		Ridebukselår
 	</string>
-	<string name="Saddlebags">
-		Ridebukselår
-	</string>
-	<string name="Scrawny">
-		Radmager
-	</string>
 	<string name="Scrawny Leg">
 		Magert ben
 	</string>
 	<string name="Separate">
 		Separat
 	</string>
-	<string name="Shading">
-		Skygger
-	</string>
-	<string name="Shadow hair">
-		Skygge hår
-	</string>
 	<string name="Shallow">
 		Lille
 	</string>
@@ -2798,15 +2832,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Shear Front">
 		&quot;MÃ¥ne&quot;
 	</string>
-	<string name="Shear Left">
-		Venstre
-	</string>
 	<string name="Shear Left Up">
 		Venstre op
 	</string>
-	<string name="Shear Right">
-		Højre
-	</string>
 	<string name="Shear Right Up">
 		Højre op
 	</string>
@@ -2867,15 +2895,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Shoulders">
 		Skuldre
 	</string>
-	<string name="Side Bangs">
-		Sidehår
-	</string>
-	<string name="Side Bangs Down">
-		Ned
-	</string>
-	<string name="Side Bangs Up">
-		Op
-	</string>
 	<string name="Side Fringe">
 		Side frynser
 	</string>
@@ -2891,9 +2910,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Sides Hair Up">
 		Op
 	</string>
-	<string name="Skinny">
-		Tynd
-	</string>
 	<string name="Skinny Neck">
 		Tynd hals
 	</string>
@@ -2942,9 +2958,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Socks Length">
 		Strømper - længde
 	</string>
-	<string name="Some">
-		Nogen
-	</string>
 	<string name="Soulpatch">
 		Soulpatch
 	</string>
@@ -2963,9 +2976,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Squash Head">
 		Bredt hovede
 	</string>
-	<string name="Squash/Stretch Head">
-		Sammentryk/stræk hovede
-	</string>
 	<string name="Stretch Head">
 		Stræk hovede
 	</string>
@@ -2984,18 +2994,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Sweep Forward">
 		Stryge fremad
 	</string>
-	<string name="Swept Back">
-		Tilbagestrøget
-	</string>
-	<string name="Swept Back Hair">
-		Tilbagestrøget hår
-	</string>
-	<string name="Swept Forward">
-		Fremadstrøget
-	</string>
-	<string name="Swept Forward Hair">
-		Fremadstrøget hår
-	</string>
 	<string name="Tall">
 		Høj
 	</string>
@@ -3014,9 +3012,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Thick Toe">
 		Bred snude
 	</string>
-	<string name="Thickness">
-		Tykkelse
-	</string>
 	<string name="Thin">
 		Tynd
 	</string>
@@ -3047,12 +3042,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Tight Sleeves">
 		Stramme ærmer
 	</string>
-	<string name="Tilt Left">
-		Hæld til venstre
-	</string>
-	<string name="Tilt Right">
-		Hæld til højre
-	</string>
 	<string name="Toe Shape">
 		Sko form
 	</string>
@@ -3194,6 +3183,21 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="IM_moderator_label">
 		(Moderator)
 	</string>
+	<string name="started_call">
+		Startet et stemme opkald
+	</string>
+	<string name="joined_call">
+		Tilsluttet stemme opkaldet
+	</string>
+	<string name="ringing-im">
+		Tilslutter stemme opkald...
+	</string>
+	<string name="connected-im">
+		Forbundet, klik på Forlad for at lægge på
+	</string>
+	<string name="hang_up-im">
+		Forladt stemme opkald
+	</string>
 	<string name="only_user_message">
 		Du er den eneste deltager i denne samtale
 	</string>
@@ -3204,7 +3208,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 		Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
 	</string>
 	<string name="muted_message">
-		Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet.
+		Du har blokeret denne beboer. Sendes en besked, vil beboeren fjernes fra blokeringslisten.
+	</string>
+	<string name="generic">
+		Fejl ved anmodning, prøv venligst igen senere
 	</string>
 	<string name="generic_request_error">
 		Kunne ikke etablere forbindelse, prøv igen senere
@@ -3224,19 +3231,37 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="not_a_mod_error">
 		Du er ikke moderator for denne samtale.
 	</string>
+	<string name="muted">
+		En gruppe moderator har deaktiveret din tekst chat.
+	</string>
 	<string name="muted_error">
 		Du er blevet &quot;blokeret&quot;.
 	</string>
 	<string name="add_session_event">
 		Ikke muligt at tilføge brugere til samtale med [RECIPIENT].
 	</string>
+	<string name="message">
+		Kunne ikke sende din besked til session med [RECIPIENT].
+	</string>
 	<string name="message_session_event">
 		Ikke muligt at sende din besked til samtalen med [RECIPIENT].
 	</string>
+	<string name="mute">
+		Fejl under moderation.
+	</string>
+	<string name="removed">
+		Du er blevet fjernet fra denne gruppe.
+	</string>
 	<string name="removed_from_group">
 		Du er blevet fjernet fra gruppen.
 	</string>
 	<string name="close_on_no_ability">
 		Du har ikke længere mulighed for at deltage i samtalen
 	</string>
+	<string name="unread_chat_single">
+		[SOURCES] har sagt noget nyt
+	</string>
+	<string name="unread_chat_multiple">
+		[SOURCES] har sagt noget nyt
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index cf1b809aa1..92c0c4a27a 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -16,7 +16,7 @@
 			<texture_picker label="Haare" name="hair_grain"/>
 			<texture_picker label="Alpha: Haare" name="hair_alpha"/>
 			<texture_picker label="Kopf" name="head-baked"/>
-			<texture_picker label="Make-Uup" name="head_bodypaint"/>
+			<texture_picker label="Make-Up" name="head_bodypaint"/>
 			<texture_picker label="Kopf: Alpha" name="head_alpha"/>
 			<texture_picker label="Kopftattoo" name="head_tattoo"/>
 			<texture_picker label="Augen" name="eyes-baked"/>
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index a434b3a2fa..d3f0d6d78f 100644
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="INHALTS-BERECHTIGUNGEN BEARBEITEN">
+<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN">
 	<floater.string name="nothing_to_modify_text">
 		Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 72959c7a0c..d0d3628448 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -18,13 +18,13 @@
 	<text name="balance_amount">
 		[AMT] L$
 	</text>
-	<text name="currency_action" width="90">
+	<text name="currency_action">
 		Ich möchte kaufen
 	</text>
 	<text name="currency_label">
 		L$
 	</text>
-	<line_editor label="L$" left_delta="55" name="currency_amt">
+	<line_editor label="L$" name="currency_amt">
 		1234
 	</line_editor>
 	<text name="buying_label">
@@ -52,7 +52,7 @@
 		Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen.
 	</text>
 	<text name="purchase_warning_repurchase">
-		Nach Bestätigung dieses Kaufs werden nur L$ gekauft, nicht das Objekt.
+		Achtung: Sie kaufen L$, nicht das Objekt.
 	</text>
 	<text name="purchase_warning_notenough">
 		Sie kaufen nicht genügend L$. Bitte erhöhen Sie den Betrag.
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index b8616ea128..87371b05e3 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -9,6 +9,18 @@
 	<floater.string name="move_tooltip">
 		Kamera nach oben, unten, links und rechts bewegen
 	</floater.string>
+	<floater.string name="orbit_mode_title">
+		Kreisen
+	</floater.string>
+	<floater.string name="pan_mode_title">
+		Schwenken
+	</floater.string>
+	<floater.string name="avatar_view_mode_title">
+		Voreinstellungen
+	</floater.string>
+	<floater.string name="free_mode_title">
+		Objekt ansehen
+	</floater.string>
 	<panel name="controls">
 		<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
 		<panel name="zoom" tool_tip="Kamera auf Fokus zoomen">
@@ -25,7 +37,7 @@
 	<panel name="buttons">
 		<button label="" name="orbit_btn" tool_tip="Kamera kreisen"/>
 		<button label="" name="pan_btn" tool_tip="Kamera schwenken"/>
-		<button label="" name="avatarview_btn" tool_tip="Avatarsicht"/>
+		<button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/>
 		<button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index b1e9ef6f19..f284d7cd6b 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -40,17 +40,17 @@
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
 			</text>
-			<text name="Item Action Label" right="100">
+			<text name="Item Action Label">
 				Form:
 			</text>
 			<button label="Neue Form/Gestalt" label_selected="Neue Form/Gestalt" name="Create New"/>
-			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
-			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
+			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" name="Save"/>
+			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
 		</panel>
 		<panel label="Haut" name="Skin">
 			<button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
 			<button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/>
-			<button label="Make-Uup" label_selected="Make-Uup" left="2" name="Makeup" width="92"/>
+			<button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/>
 			<button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/>
 			<text name="title">
 				[DESC]
@@ -105,7 +105,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch neues Haar erstellen und anlegen.
 			</text>
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -136,7 +136,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch neue Augen erstellen und diese anlegen.
 			</text>
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -177,7 +177,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Hemd erstellen und dieses anlegen.
 			</text>
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -210,7 +210,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
 			</text>
 			<text name="no modify instructions">
 				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -236,7 +236,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue Schuhe erstellen und diese anlegen.
 			</text>
 			<button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/>
 			<text name="no modify instructions">
@@ -269,7 +269,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie neue Strümpfe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie neue Socken aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
 			</text>
 			<button label="Neue Socken" label_selected="Neue Socken" name="Create New"/>
 			<text name="no modify instructions">
@@ -302,7 +302,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
 			</text>
 			<button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/>
 			<text name="no modify instructions">
@@ -311,8 +311,8 @@
 			<text name="Item Action Label" right="100">
 				Jacke:
 			</text>
-			<texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
-			<texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+			<texture_picker label="Stoff: oben" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+			<texture_picker label="Stoff: unten" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 			<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 			<button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
 			<button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -336,7 +336,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
 			</text>
 			<button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/>
 			<text name="no modify instructions">
@@ -369,7 +369,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Unterhemd erstellen und dieses anziehen.
 			</text>
 			<button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/>
 			<text name="no modify instructions">
@@ -402,7 +402,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
 			</text>
 			<button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/>
 			<text name="no modify instructions">
@@ -435,7 +435,7 @@
 				In [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+				Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch einen neuen Rock erstellen und diesen anziehen.
 			</text>
 			<button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/>
 			<text name="no modify instructions">
@@ -453,7 +453,7 @@
 		</panel>
 		<panel label="Tätowierung" name="Tattoo">
 			<text name="title">
-				[BESCHR]
+				Tätowierung
 			</text>
 			<text name="title_no_modify">
 				[BESCHR]: bearbeiten nicht möglich
@@ -487,7 +487,7 @@
 		</panel>
 		<panel label="Alpha" name="Alpha">
 			<text name="title">
-				[BESCHR]
+				Alpha
 			</text>
 			<text name="title_no_modify">
 				[BESCHR]: bearbeiten nicht möglich
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
index a41ac521a3..cf663e2e1b 100644
--- a/indra/newview/skins/default/xui/de/floater_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_event.xml
@@ -9,6 +9,18 @@
 	<floater.string name="dont_notify">
 		Nicht benachrichtigen
 	</floater.string>
+	<floater.string name="moderate">
+		Moderat
+	</floater.string>
+	<floater.string name="adult">
+		Adult
+	</floater.string>
+	<floater.string name="general">
+		Allgemein
+	</floater.string>
+	<floater.string name="unknown">
+		Unbekannt
+	</floater.string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<text name="event_name">
@@ -21,12 +33,21 @@
 				Ausgeführt von:
 			</text>
 			<text initial_value="(wird in Datenbank gesucht)" name="event_runby"/>
+			<text name="event_date_label">
+				Datum:
+			</text>
 			<text name="event_date">
 				10/10/2010
 			</text>
+			<text name="event_duration_label">
+				Dauer:
+			</text>
 			<text name="event_duration">
 				1 Stunde
 			</text>
+			<text name="event_covercharge_label">
+				Eintritt:
+			</text>
 			<text name="event_cover">
 				Kostenlos
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index 7bde3a3453..c69bb600ea 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -3,7 +3,7 @@
 	<layout_stack name="im_panels">
 		<layout_panel label="IM Steuerkonsole" name="panel_im_control_panel"/>
 		<layout_panel>
-			<line_editor label="Bis" name="chat_editor"/>
+			<line_editor label="An" name="chat_editor"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
index 03930c8ed6..b978322cef 100644
--- a/indra/newview/skins/default/xui/de/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/de/floater_moveview.xml
@@ -18,6 +18,15 @@
 	<string name="fly_back_tooltip">
 		Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken)
 	</string>
+	<string name="walk_title">
+		Gehen
+	</string>
+	<string name="run_title">
+		Rennen
+	</string>
+	<string name="fly_title">
+		Fliegen
+	</string>
 	<panel name="panel_actions">
 		<button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/>
@@ -30,6 +39,5 @@
 		<button label="" name="mode_walk_btn" tool_tip="Gehen"/>
 		<button label="" name="mode_run_btn" tool_tip="Rennen"/>
 		<button label="" name="mode_fly_btn" tool_tip="Fliegen"/>
-		<button label="Landen" name="stop_fly_btn" tool_tip="Landen"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index fb89eeb600..ec3c45dccf 100644
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -18,7 +18,7 @@
 	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
 	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<text name="amount text">
-		Oder Betrag auswählen:
+		oder Betrag auswählen:
 	</text>
 	<button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index ff85efad50..59494cc100 100644
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -22,7 +22,7 @@
 	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
 	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
 	<text name="amount text">
-		Oder Betrag auswählen:
+		oder Betrag auswählen:
 	</text>
 	<button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76"/>
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index d20ab8d1c3..8944c79c7d 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="AUSWÄHLEN: TEXTUR">
+<floater name="texture picker" title="TEXTUR AUSWÄHLEN">
 	<string name="choose_picture">
 		Zum Auswählen eines Bildes hier klicken
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 7646efccd4..4efe0dd7f3 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -196,7 +196,7 @@
 			</combo_box>
 			<check_box label="Zum Verkauf:" name="checkbox for sale"/>
 			<combo_box name="sale type">
-				<combo_box.item label="Kopieren" name="Copy"/>
+				<combo_box.item label="Kopie" name="Copy"/>
 				<combo_box.item label="Inhalt" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
index f978042cc2..aa582838a4 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
@@ -16,6 +16,9 @@
 		Es ist niemand in der Nähe, der Voice aktiviert hat.
 	</string>
 	<layout_stack name="my_call_stack">
+		<layout_panel name="my_panel">
+			<text name="user_text" value="Mein Avatar:"/>
+		</layout_panel>
 		<layout_panel name="leave_call_btn_panel">
 			<button label="Anruf beenden" name="leave_call_btn"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index ecd6d7ff3e..097a60a444 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -10,7 +10,7 @@
 	<button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/>
 	<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/>
 	<tab_container name="Water Tabs">
-		<panel label="Einstellungen" name="Settings">
+		<panel label="EINSTELLUNGEN" name="Settings">
 			<text name="BHText">
 				Wassertrübungsfarbe
 			</text>
@@ -44,7 +44,7 @@
 				Mischungsmultiplikator
 			</text>
 		</panel>
-		<panel label="Bild" name="Waves">
+		<panel label="BILD" name="Waves">
 			<text name="BHText">
 				Richtung große Welle
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
index 3e06d8f06b..5b59336f9d 100644
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
@@ -8,7 +8,7 @@
 	<button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/>
 	<button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
-		<panel label="Atmosphäre" name="Atmosphere">
+		<panel label="ATMOSPHÄRE" name="Atmosphere">
 			<text name="BHText">
 				Horizontfarbe
 			</text>
@@ -62,7 +62,7 @@
 			</text>
 			<button label=" ?" name="WLMaxAltitudeHelp"/>
 		</panel>
-		<panel label="Licht" name="Lighting">
+		<panel label="LICHT" name="Lighting">
 			<text name="SLCText">
 				Sonne/Mond-Farbe
 			</text>
@@ -118,7 +118,7 @@
 			</text>
 			<button label=" ?" name="WLStarBrightnessHelp"/>
 		</panel>
-		<panel label="Wolken" name="Clouds">
+		<panel label="WOLKEN" name="Clouds">
 			<text name="WLCloudColorText">
 				Wolkenfarbe
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index 7d8a634452..a80be2b594 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Legende
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position meines Avatars zentrieren"/>
 		<text name="me_label">
 			Ich
@@ -37,7 +38,7 @@
 		</text>
 		<check_box label="PG" name="event_chk"/>
 		<text name="pg_label">
-			Allgemein
+			Generell
 		</text>
 		<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 		<text name="mature_label">
@@ -48,12 +49,14 @@
 			Adult
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Auf Karte anzeigen
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freunde auf Karte anzeigen">
 			<combo_box.item label="Meine Freunde: Online" name="item1"/>
 		</combo_box>
@@ -71,12 +74,14 @@
 		<button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/>
 		<button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
index 448b1d80bf..531edc02f1 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
@@ -20,7 +20,7 @@
 		<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
 		<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
 		<menu_item_call label="Neue Unterhose" name="New Underpants"/>
-		<menu_item_call label="Alpha: Neu" name="New Alpha"/>
+		<menu_item_call label="Neues Alpha" name="New Alpha"/>
 		<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
 	</menu>
 	<menu label="Neue Körperteile" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 320f93c796..8bb7b66482 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="Bauen" name="Build"/>
 	<menu_item_call label="Öffnen" name="Open"/>
 	<menu_item_call label="Hier sitzen" name="Object Sit"/>
+	<menu_item_call label="Aufstehen" name="Object Stand Up"/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<context_menu label="Anziehen â–¶" name="Put On">
@@ -18,6 +19,7 @@
 		<menu_item_call label="Zurückgeben" name="Return..."/>
 		<menu_item_call label="Löschen" name="Delete"/>
 	</context_menu>
+	<menu_item_call label="Kaufen" name="Pie Object Bye"/>
 	<menu_item_call label="Nehmen" name="Pie Object Take"/>
 	<menu_item_call label="Kopie nehmen" name="Take Copy"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index a69ef3891a..1db964357f 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Karte" name="Map"/>
 	<menu_item_call label="Teilen" name="Share"/>
 	<menu_item_call label="Bezahlen" name="Pay"/>
 	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index a04532376c..c628cb4b61 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -43,6 +43,8 @@
 			<menu_item_check label="Strahlen" name="beacons"/>
 			<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
 			<menu_item_check label="Landeigentümer" name="Land Owners"/>
+			<menu_item_check label="Koordinaten" name="Coordinates"/>
+			<menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/>
 		</menu>
 		<menu_item_call label="Teleport nach Hause" name="Teleport Home"/>
 		<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
@@ -81,7 +83,8 @@
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
 		<menu label="Objekt" name="Object">
-			<menu_item_call label="Kaufen" name="Menu Object Take"/>
+			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
+			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
 			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
@@ -159,7 +162,7 @@
 			<menu_item_check label="Partikel" name="Particles"/>
 			<menu_item_check label="Unebenheiten" name="Bump"/>
 		</menu>
-		<menu label="Rederning-Eigenschaften" name="Rendering Features">
+		<menu label="Rendering-Eigenschaften" name="Rendering Features">
 			<menu_item_check label="UI" name="UI"/>
 			<menu_item_check label="Ausgewählt" name="Selected"/>
 			<menu_item_check label="Farblich hervorgehoben" name="Highlighted"/>
@@ -169,7 +172,7 @@
 			<menu_item_check label="FRInfo testen" name="Test FRInfo"/>
 			<menu_item_check label="Flexible Objekte" name="Flexible Objects"/>
 		</menu>
-		<menu_item_check label="Mehrer Threads ausführen" name="Run Multiple Threads"/>
+		<menu_item_check label="Mehrere Threads ausführen" name="Run Multiple Threads"/>
 		<menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/>
 		<menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/>
 		<menu label="Tastaturkürzel" name="Shortcuts">
@@ -405,7 +408,7 @@
 			<menu_item_call label="Offizielles Linden-Blog" name="Official Linden Blog"/>
 			<menu_item_call label="Scripting-Portal" name="Scripting Portal"/>
 			<menu label="Fehlermeldungen" name="Bug Reporting">
-				<menu_item_call label="Allgemeine Probleme-Tracker" name="Public Issue Tracker"/>
+				<menu_item_call label="Allgemeiner Probleme-Tracker" name="Public Issue Tracker"/>
 				<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker" name="Publc Issue Tracker Help"/>
 				<menu_item_call label="Fehlermeldungs-1x1" name="Bug Reporing 101"/>
 				<menu_item_call label="Sicherheitsfragen" name="Security Issues"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index da4a96962e..acfbee7f36 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -207,15 +207,15 @@ Bitte laden Sie innerhalb von 48 Stunden Mitglieder in Ihre Gruppe ein.
 Wählen Sie eine bestimmte Person aus, wenn Sie für 0 L$ verkaufen.
 	</notification>
 	<notification name="ConfirmLandSaleChange">
-		Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.
-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
+		Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben.
+Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
 		ACHTUNG: Wenn Sie auf An jeden verkaufen klicken, kann jeder in [SECOND_LIFE] Ihr Land kaufen, auch Einwohner in anderen Regionen.
 
 Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben.
-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
+Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
@@ -455,7 +455,6 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
 	<notification name="UnsupportedHardware">
 		Ihr Computer entspricht leider nicht den Mindestanforderungen von [APP_NAME]. Dies kann zur Folge haben, dass das Programm nicht sehr gut ausgeführt wird. Bei nicht unterstützten Systemkonfigurationen kann Ihnen unser [SUPPORT_SITE] leider nicht helfen.
 
-MINDESTANF.
 Weitere Informationen finden Sie auf [_URL].
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=de
@@ -1741,7 +1740,7 @@ Inventarobjekt(e) verschieben?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] and [http://secondlife.com/corporate/cs.php Community-Standards] melden.
+		Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] und [http://secondlife.com/corporate/cs.php Community-Standards] melden.
 
 Alle gemeldeten Verstöße werden bearbeitet.
 	</notification>
@@ -2062,9 +2061,9 @@ Wählen Sie ein einzelnes Objekt aus.
 		Ihre Visitenkarte wurde abgelehnt.
 	</notification>
 	<notification name="TeleportToLandmark">
-		Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Landmarken“ auswählen.
-Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf „Teleport“ unten in der Konsole.
-(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleport“ auswählen).
+		Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Meine Landmarken“ auswählen.
+Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf unten in der Registerkarte auf „Teleportieren“.
+(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleportieren“ auswählen).
 	</notification>
 	<notification name="TeleportToPerson">
 		Sie können Einwohner wie „[NAME]“ kontaktieren, wenn Sie die Tafel „Leute“ auf der rechten Seite Ihres Bildschirms öffnen.
@@ -2079,7 +2078,7 @@ Wählen Sie eine kleinere Landfläche.
 		Einige Begriffe in Ihrer Suchanfrage wurden ausgeschlossen, aufgrund von in den Community Standards definierten Inhaltsbeschränkungen.
 	</notification>
 	<notification name="NoContentToSearch">
-		Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Allgemein, Moderat oder Adult).
+		Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Generell, Moderat oder Adult).
 	</notification>
 	<notification name="GroupVote">
 		[NAME] hat eine Abstimmung vorgeschlagen über:
@@ -2353,6 +2352,12 @@ Versuchen Sie es in einigen Minuten erneut.
 	<notification name="FriendshipDeclined">
 		[NAME] hat Ihr Freundschaftsangebot abgelehnt.
 	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		Ihr Freundschaftsangebot wurde angeommen.
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		Ihr Freundschaftsangebot wurde abgelehnt.
+	</notification>
 	<notification name="OfferCallingCard">
 		[FIRST] [LAST] bietet Ihnen ihre/seine Visitenkarte an.
 Ihrem Inventar wird ein Lesezeichen erstellt, damit Sie diesem Einwohner einfach eine IM schicken können.
@@ -2562,7 +2567,7 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 	</notification>
 	<notification name="ConfirmCloseAll">
 		Möchten Sie wirklich alle IMs schließen?
-		<usetemplate name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+		<usetemplate ignoretext="Bestätigen, bevor ich alle IMs schließe." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		Der Anhang wurde gespeichert.
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
index d824eff338..2bbbaf2537 100644
--- a/indra/newview/skins/default/xui/de/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml
@@ -4,7 +4,7 @@
 		Moderat
 	</panel.string>
 	<panel.string name="type_pg">
-		Allgemeiner Inhalt
+		Genereller Inhalt
 	</panel.string>
 	<panel.string name="l$_price">
 		[PRICE] L$
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
index 3752faf48a..950c9023fe 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
-		<texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Stoff: oben" name="Upper Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Stoff: unten" name="Lower Fabric" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
 		<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 	</panel>
 	<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
index 46bd1d9f4d..90b06a29bc 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
@@ -8,7 +8,7 @@
 	<accordion name="wearable_accordion">
 		<accordion_tab name="skin_color_tab" title="Hautfarbe"/>
 		<accordion_tab name="skin_face_tab" title="Gesichtsdetails"/>
-		<accordion_tab name="skin_makeup_tab" title="Make-Uup"/>
+		<accordion_tab name="skin_makeup_tab" title="Make-Up"/>
 		<accordion_tab name="skin_body_tab" title="Körperdetails"/>
 	</accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 0d3c082a16..f300679e16 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -47,7 +47,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 		<check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/>
 		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
 		<combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält">
-			<combo_box.item label="Allgemeiner Inhalt" name="pg"/>
+			<combo_box.item label="Genereller Inhalt" name="pg"/>
 			<combo_box.item label="Moderater Inhalt" name="mature"/>
 		</combo_box>
 		<check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index fb357093bb..dfc1e26750 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -10,7 +10,7 @@
 		Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
 	</panel.string>
 	<text name="help_text" top="10">
-		Sie können mehrere Einwohner auswählen, um diese in Ihre Gruppe einzuladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
+		Sie können mehrere Einwohner Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
 	</text>
 	<button label="Einwohnerliste öffnen" name="add_button" tool_tip="" top_delta="62"/>
 	<name_list name="invitee_list" tool_tip="Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Namen."/>
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
index 0dca272633..abf8011d9d 100644
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Teilen" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Bezahlen" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index eed365a1bb..7d57a3b3f2 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -44,7 +44,7 @@
 				<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
 				<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
 				<menu_item_call label="Neue Unterhose" name="New Underpants"/>
-				<menu_item_call label="Alpha: Neu" name="New Alpha"/>
+				<menu_item_call label="Neues Alpha" name="New Alpha"/>
 				<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
 			</menu>
 			<menu label="Neue Körperteile" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
new file mode 100644
index 0000000000..7c7448c061
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Freunde_online_Status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index a119c86b47..cf61f0870d 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -21,7 +21,7 @@
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
 			<text name="no_friends_msg">
-				Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie auf einen Einwohner und fügen Sie diesen als Freund hinzu.
+				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">
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 fd4da94edc..3af4ee5a1e 100644
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="unbekannt"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parzelle">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Einstufung:"/>
 						<text name="rating_value" value="unbekannt"/>
 						<text name="voice_label" value="Voice:"/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Region">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Region:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="Typ:"/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Grundstück">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Grundstück:"/>
 						<text name="estate_rating_label" value="Einstufung:"/>
 						<text name="estate_owner_label" value="Eigentümer:"/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="Zum Verkauf">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Preis:"/>
 						<text name="area_label" value="Gebiet:"/>
 						<text name="traffic_label" value="Traffic:"/>
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 7359a4fda4..2215ea3988 100644
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -7,9 +7,9 @@
 		<button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/>
 		<button label="Karte" name="map_btn" width="60"/>
 		<button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/>
-		<button name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-		<button label="Schließen" name="close_btn"/>
-		<button label="Abbrechen" name="cancel_btn" width="66"/>
+		<button label="▼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		<button label="Speichern" name="save_btn" width="66"/>
+		<button label="Abbrechen" name="cancel_btn" width="66"/>
+		<button label="Schließen" name="close_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index f580691c0d..626e35dd0b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
+	<text name="font_size">
+		Schriftgröße:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Klein" name="radio" value="0"/>
 		<radio_item label="Mittel" name="radio2" value="1"/>
 		<radio_item label="Groß" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Schriftfarbe:
+	</text>
 	<color_swatch label="Sie" name="user"/>
 	<text name="text_box1">
 		Ich
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index bd9e10b641..b59a779853 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -20,13 +20,13 @@
 		(Erfordert Neustart)
 	</text>
 	<text name="maturity_desired_prompt" width="350">
-		Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen:
+		Ich möchte auf Inhalt mit folgender Einstufung zugreifen:
 	</text>
 	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="Allgemein, Moderat, Adult" name="Desired_Adult"/>
-		<combo_box.item label="Allgemein und Moderat" name="Desired_Mature"/>
-		<combo_box.item label="Allgemein" name="Desired_PG"/>
+		<combo_box.item label="Generell, Moderat, Adult" name="Desired_Adult"/>
+		<combo_box.item label="Generell und Moderat" name="Desired_Mature"/>
+		<combo_box.item label="Generell" name="Desired_PG"/>
 	</combo_box>
 	<text name="start_location_textbox">
 		Startstandort:
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index e7bb768925..16b4598486 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -55,7 +55,7 @@
 		<text name="AvatarRenderingText">
 			Avatar-Darstellung:
 		</text>
-		<check_box initial_value="true" label="Scheinavatare" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
 		<slider label="Sichtweite:" name="DrawDistance"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index b01db30c82..96a86ed85d 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
 	<check_box label="Aktiviert" name="enable_voice_check"/>
 	<check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="wahr"/>
 	<check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="wahr"/>
-	<text name="Listen from">
+	<text name="voice_chat_settings">
 		Voice-Chat-Einstellungen
 	</text>
+	<text name="Listen from">
+		Zuhören von:
+	</text>
 	<radio_group name="ear_location">
 		<radio_item label="Kameraposition" name="0"/>
 		<radio_item label="Avatarposition" name="1"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index b0c6dce8cf..59a4c148a8 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grundstück" name="Estate">
 	<text name="estate_help_text">
-		Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus.
+		Änderungen wirken sich auf alle Regionen des Grundstücks aus.
 	</text>
 	<text name="estate_text">
 		Grundstück:
@@ -16,7 +16,7 @@
 		(unbekannt)
 	</text>
 	<text name="Only Allow">
-		Zugang auf Einwohner beschränken, die überprüft wurden von:
+		Zugang nur dann, wenn überprüft mit:
 	</text>
 	<check_box label="Zahlungsinformation gespeichert" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen"/>
 	<check_box label="Altersüberprüfung" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
@@ -69,6 +69,6 @@
 	<button label="?" name="ban_resident_help"/>
 	<button label="Hinzufügen..." name="add_banned_avatar_btn"/>
 	<button label="Entfernen..." name="remove_banned_avatar_btn"/>
-	<button label="Nachricht an Grundstück senden..." name="message_estate_btn"/>
-	<button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn"/>
+	<button label="Nachricht an Grundstück" name="message_estate_btn"/>
+	<button label="Einwohner hinauswerfen" name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
index 978b701054..2885e5bd3a 100644
--- a/indra/newview/skins/default/xui/de/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_general.xml
@@ -36,7 +36,7 @@
 	<button label="?" name="agent_limit_help"/>
 	<spinner label="Objektbonus" name="object_bonus_spin"/>
 	<button label="?" name="object_bonus_help"/>
-	<text label="Alterseinstufung" name="access_text">
+	<text label="Inhaltseinstufung" name="access_text">
 		Einstufung:
 	</text>
 	<combo_box label="Moderat" name="access_combo">
diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
index 5b8137af4a..be21429007 100644
--- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
@@ -2,5 +2,5 @@
 <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
 <panel name="panel_stand_stop_flying">
 	<button label="Stehen" name="stand_btn" tool_tip="Klicken Sie hier, um aufzustehen."/>
-	<button label="Landen" name="stop_fly_btn" tool_tip="Landen"/>
+	<button label="Flug stoppen" name="stop_fly_btn" tool_tip="Flug stoppen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 283df990ae..0e182fa417 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -22,10 +22,10 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
-	<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+	<button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		24:00 H PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="Klicken, um Medien ein-/auszuschalten"/>
+	<button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/>
 	<button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 825acac79d..81f1ebdf91 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 label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Name:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c9307a5d7d..c4b540d08a 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -636,7 +636,7 @@
 		Nicht verbunden
 	</string>
 	<string name="SIM_ACCESS_PG">
-		Allgemein
+		Generell
 	</string>
 	<string name="SIM_ACCESS_MATURE">
 		Moderat
@@ -753,7 +753,7 @@
 		Alpha
 	</string>
 	<string name="tattoo">
-		Tätowierung
+		Taetowierung
 	</string>
 	<string name="invalid">
 		ungültig
@@ -828,7 +828,7 @@
 		Im Inventar wurden keine passenden Objekte gefunden.  Versuchen Sie es mit [secondlife:///app/search/groups „Suche&quot;].
 	</string>
 	<string name="FavoritesNoMatchingItems">
-		Hier eine Landmarke hin ziehen, um diese zu Ihrem Favoriten hinzuzufügen.
+		Landmarke hier hin ziehen, um diese hinzuzufügen.
 	</string>
 	<string name="InventoryNoTexture">
 		Sie haben keine Kopie dieser Textur in Ihrem Inventar.
@@ -979,7 +979,7 @@
 		Gummi
 	</string>
 	<string name="Light">
-		Licht
+		Hell
 	</string>
 	<string name="KBShift">
 		Umschalt-Taste
@@ -1506,6 +1506,9 @@
 	<string name="NoPicksClassifiedsText">
 		Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die „Plus&quot;-Schaltfläche, um eine Auswahl oder Anzeige zu erstellen.
 	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		Der Einwohner hat eine Auswahl oder Anzeigen im Profil.
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Wird geladen...
 	</string>
@@ -2056,7 +2059,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Kinn-Hals
 	</string>
 	<string name="Clear">
-		Löschen
+		Transparent
 	</string>
 	<string name="Cleft">
 		Spalte
@@ -2359,16 +2362,16 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Farbe Innenseite
 	</string>
 	<string name="In Shdw Opacity">
-		Deckkraft: innerer Lidschatten
+		Deckkraft: innen
 	</string>
 	<string name="Inner Eye Corner">
 		Ecke: Nasenseite
 	</string>
 	<string name="Inner Eye Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Inner Shadow">
-		Innerer Lidschatten
+		Innenlid
 	</string>
 	<string name="Jacket Length">
 		Jackenlänge
@@ -2761,10 +2764,10 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Aus
 	</string>
 	<string name="Out Shdw Color">
-		Farbe: Oberer Lidschatten
+		Farbe: Oben
 	</string>
 	<string name="Out Shdw Opacity">
-		Deckkraft: Oberer Lidschatten
+		Deckkraft: Oben
 	</string>
 	<string name="Outer Eye Corner">
 		Äußerer Augenwinkel
@@ -2935,7 +2938,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Schuhart
 	</string>
 	<string name="Short">
-		Sandale
+		Klein
 	</string>
 	<string name="Short Arms">
 		Kurze Arme
@@ -3064,7 +3067,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Nach vorne
 	</string>
 	<string name="Tall">
-		Stiefel
+		Groß
 	</string>
 	<string name="Taper Back">
 		Ansatzbreite hinten
@@ -3268,7 +3271,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Für Instant Message hier klicken.
 	</string>
 	<string name="IM_to_label">
-		Bis
+		An
 	</string>
 	<string name="IM_moderator_label">
 		(Moderator)
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 58ea7cec9c..2b0cb66f61 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -9,6 +9,18 @@
  title="ABOUT LAND"
  width="490">
     <floater.string
+      name="maturity_icon_general">
+      "Parcel_PG_Dark"
+    </floater.string>
+    <floater.string
+      name="maturity_icon_moderate">
+      "Parcel_M_Dark"
+    </floater.string>
+    <floater.string
+      name="maturity_icon_adult">
+      "Parcel_R_Dark"
+    </floater.string>
+    <floater.string
      name="Minutes">
         [MINUTES] minutes
     </floater.string>
@@ -46,7 +58,7 @@
          top="0">
             <panel.string
              name="new users only">
-                New users only
+                New Residents only
             </panel.string>
             <panel.string
              name="anyone">
@@ -395,7 +407,7 @@ Leyla Linden               </text>
              name="Cancel Land Sale"
              left_pad="5"
              top_pad="-25"
-             width="145" />
+             width="155" />
             <text
              type="string"
              length="1"
@@ -1504,7 +1516,7 @@ Only large parcels can be listed in search.
              name="Clear"
              tool_tip="Clear the landing point"
              right="-10"
-             width="50" />
+             width="55" />
             <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 98508e5113..125b080519 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -64,7 +64,7 @@ Try selecting a smaller area.
     </floater.string>
     <floater.string
      name="not_owned_by_you">
-        Land owned by another user is selected. 
+        Land owned by another Resident is selected. 
 Try selecting a smaller area.
     </floater.string>
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index b048eeceb6..6f2b0fc3ea 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -286,7 +286,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Shape:
             </text>
@@ -307,7 +307,7 @@
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="218"
+             right="186"
              top="477"
              width="82" />
             <button
@@ -319,7 +319,7 @@
              name="Save As"
              top="477"
              right="304"
-             width="82" />
+             width="115" />
         </panel>
         <panel
          border="false"
@@ -489,7 +489,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Skin:
             </text>
@@ -548,7 +548,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -561,7 +561,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -739,7 +739,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Hair:
             </text>
@@ -771,7 +771,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -784,7 +784,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -924,7 +924,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Eyes:
             </text>
@@ -955,7 +955,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -968,7 +968,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1069,7 +1069,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1082,7 +1082,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1193,7 +1193,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shirt:
             </text>
@@ -1272,7 +1272,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1285,7 +1285,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1396,7 +1396,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Pants:
             </text>
@@ -1538,7 +1538,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shoes:
             </text>
@@ -1579,7 +1579,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1592,7 +1592,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1741,7 +1741,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Socks:
             </text>
@@ -1782,7 +1782,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1795,7 +1795,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1944,7 +1944,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Jacket:
             </text>
@@ -1996,7 +1996,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2009,7 +2009,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2158,7 +2158,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Gloves:
             </text>
@@ -2199,7 +2199,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2212,7 +2212,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2361,7 +2361,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Undershirt:
             </text>
@@ -2402,7 +2402,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2415,7 +2415,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2564,7 +2564,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Underpants:
             </text>
@@ -2605,7 +2605,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2618,7 +2618,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2767,7 +2767,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Skirt:
             </text>
@@ -2808,7 +2808,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2821,7 +2821,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2970,7 +2970,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Tattoo:
             </text>
@@ -3024,7 +3024,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3037,7 +3037,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -3186,7 +3186,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Alpha:
             </text>
@@ -3305,7 +3305,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3318,7 +3318,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 0fac6cd5f1..36ef6beb59 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -31,8 +31,8 @@
             <button
              follows="left|top"
              height="20"
-             label="Kick all users"
-             label_selected="Kick all users"
+             label="Kick all Residents"
+             label_selected="Kick all Residents"
              layout="topleft"
              left="10"
              name="Kick all users"
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index a21242ffe1..55efe83820 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -14,7 +14,7 @@
  width="419">
     <multi_floater.string
      name="only_user_message">
-        You are the only user in this session.
+        You are the only Resident in this session.
     </multi_floater.string>
     <multi_floater.string
      name="offline_message">
@@ -54,7 +54,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="add_session_event">
-        Unable to add users to chat session with [RECIPIENT].
+        Unable to add Residents to chat session with [RECIPIENT].
     </multi_floater.string>
     <multi_floater.string
      name="message_session_event">
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 0f098bbb52..65a05f3ec5 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -22,7 +22,9 @@
      tab_width="64"
      tab_max_width = "134"
      tab_height="16"
-     halign="center"
+     use_custom_icon_ctrl="true"
+     tab_icon_ctrl_pad="2"
+     halign="left"
      use_ellipses="true"
      top="0"
      width="390" />
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d2e5473157..25016e0673 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,6 +2,7 @@
 <floater
  legacy_header_height="18"
  background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="350"
  layout="topleft"
@@ -18,12 +19,14 @@
  min_height="190">
   <layout_stack
    animate="false" 
+   default_tab_group="2"
   follows="all"
   height="320"
   width="360"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
+  tab_group="1"
   top="20"
   left="0">
     <layout_panel
@@ -35,7 +38,9 @@
       auto_resize="false"
       user_resize="true" />
     <layout_panel
+       default_tab_group="3"
        left="0"
+       tab_group="2"
        top="0"
        height="200"
 	     width="245"
@@ -75,6 +80,7 @@
          label="To"
          layout="bottomleft"
          name="chat_editor"
+         tab_group="3"
          width="240">
         </line_editor>
     </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 3f7642fafe..bea35e5fc1 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -16,7 +16,7 @@
         [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
     </floater.string>
     <scroll_list
-     bottom="270"
+     bottom="268"
      column_padding="0"
      draw_heading="true"
      follows="top|right|left|bottom"
@@ -47,23 +47,23 @@
     </scroll_list>
     <button
      follows="left|bottom"
-     height="20"
+     height="23"
      label="See Owner Profile..."
      layout="topleft"
-     left_delta="0"
+     left_delta="-1"
      name="button owner"
      tool_tip="See profile of the highlighted object&apos;s owner"
-     top_pad="5"
+     top_pad="4"
      width="150">
 		<button.commit_callback
 		function="Inspect.OwnerProfile" />
 	</button>
     <button
      follows="left|bottom"
-     height="20"
+     height="23"
      label="See Creator Profile..."
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="button creator"
      tool_tip="See profile of the highlighted object&apos;s original creator"
      top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 990be55847..1f192f9b28 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -45,9 +45,9 @@
      layout="topleft"
      name="Reset"
      left="10"
-     width="61" />
+     width="85" />
     <check_box
-    left_delta="71"
+    left_delta="90"
     top_delta="3"
      enabled="false"
      follows="left|bottom"
@@ -57,9 +57,9 @@
      label="Running"
      layout="topleft"
      name="running"
-     width="100" />
+     width="205" />
     <check_box
-    left_delta="75"
+    left_delta="140"
      enabled="true"
      follows="left|bottom"
      font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
new file mode 100644
index 0000000000..3225843d09
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="200"
+ layout="topleft"
+ name="publish_classified"
+ help_topic="price_for_listing"
+ title="Publishing Classified"
+ width="320">
+    <text
+     top="20"
+     follows="top|left"
+     font="SansSerif"
+     height="60"
+     layout="topleft"
+     left="15"
+     word_wrap="true"
+     name="explanation_text">
+     
+Your classified ad will run for one week from the date it is published.
+        
+Remember, Classified fees are non-refundable.
+
+    </text>
+    <spinner
+     decimal_digits="0"
+     follows="left|top"
+     halign="left"
+     height="23"
+     increment="1"
+     label_width="70"
+     label="Price for Ad: "
+     v_pad="10"
+     layout="topleft"
+     left="15"
+     value="50"
+     min_val="50"
+     max_val="99999"
+     name="price_for_listing"
+     top_pad="10"
+     tool_tip="Price for listing."
+     width="150" />
+    <text
+     follows="top|left"
+     font="SansSerif"
+     height="60"
+     layout="topleft"
+     left_pad="5"
+     top_delta="0"
+     word_wrap="true"
+     value="L$"
+     name="l$_text" />
+    <text
+     follows="top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="15"
+     name="more_info_text"
+     top_pad="-20"
+     width="300">
+More info (link to classified help)
+    </text>
+    <button
+     follows="top|left"
+     height="22"
+     label="Publish"
+     layout="topleft"
+     left="105"
+     name="publish_btn"
+     top="160"
+     width="100" />
+    <button
+     follows="top|left"
+     height="22"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 1ab3dda52c..dda14f02ff 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -45,7 +45,7 @@
     </radio_group>
   <ui_ctrl 
     height="90"
-    width="90"
+    width="125"
     layout="topleft"
     name="thumbnail_placeholder"
     top_pad="6"
@@ -105,9 +105,11 @@
      width="100">
         <flyout_button.item
          label="Save"
+         name="save_item"
          value="save" />
         <flyout_button.item
          label="Save As..."
+         name="saveas_item"
          value="save as" />
     </flyout_button>
         <button
@@ -147,7 +149,7 @@
      left="10"
      name="type_label2"
      top_pad="5"
-     width="120">
+     width="127">
         Size
     </text>
     <text
@@ -197,7 +199,7 @@
      left_delta="0"
      name="texture_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -226,7 +228,7 @@
      left_delta="0"
      name="local_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 4e59a9b1ca..affe74d148 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -581,7 +581,7 @@
          left="0"
          name="radio select land"
          top="-1"
-         width="114" />
+         width="134" />
         <radio_item
          height="19"
          label="Flatten"
@@ -639,7 +639,7 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="125"
+     left="150"
      name="Bulldozer:"
      top="57"
      width="100">
@@ -2816,7 +2816,7 @@ even though the user gets a free copy.
          left="20"
          name="label_parcel_info"
          top="24"
-         width="150">
+         width="240">
             Parcel Information
         </text>
         <text
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 86ac7c8e54..291f8f6f51 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -53,7 +53,8 @@
  follows="right|top"
   height="126"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_2">
 <button
      follows="right|top"
      height="22"
@@ -374,7 +375,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_3">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -396,7 +398,8 @@
      follows="right|top|bottom"
 	 height="310"
 	 top_pad="0"
-	 width="238">
+	 width="238"
+	 name="layout_panel_4">
 	 <icon
       color="0.5 0 0 1"
       follows="top|right"
@@ -638,7 +641,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_5">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -660,7 +664,8 @@
   height="30"
   min_height="30"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_6">
   <icon
      follows="left|bottom"
      height="16"
@@ -670,7 +675,7 @@
      mouse_opaque="true"
      name="zoom_icon"
      top_pad="7"
-     width="16" />
+     width="16" ></icon>
     <slider
      follows="left|bottom"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 7b6081d7be..85853f39bb 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -156,18 +156,19 @@
                    name="notify_container"
                    tab_group="-2"
                    width="1024"/>
-  <menu_holder top="0"
-               follows="all"
-               height="768"
-               mouse_opaque="false"
-               name="Menu Holder"
-               width="1024"/>
   <panel top="0"
          follows="all"
          height="768"
          mouse_opaque="false"
          name="popup_holder"
+         class="popup_holder"
          width="1024"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
   <snapshot_floater_view enabled="false"
                          follows="all"
                          height="768"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 936f4a3fab..a2540237c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -249,7 +249,7 @@ Save all changes to clothing/body parts?
     Non-friends won't know that you've choosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
-     yestext="Yes"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -2848,11 +2848,11 @@ Leave Group?
    icon="alert.tga"
    name="ConfirmKick"
    type="alert">
-Do you REALLY want to kick all users off the grid?
+Do you REALLY want to kick all Residents off the grid?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
-     yestext="Kick All Users"/>
+     yestext="Kick All Residents"/>
   </notification>
 
   <notification
@@ -2952,7 +2952,7 @@ You have reached your maximum number of groups. Please leave some group before j
    icon="alert.tga"
    name="KickUser"
    type="alert">
-Kick this user with what message?
+Kick this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 An administrator has logged you off.
@@ -2994,7 +2994,7 @@ An administrator has logged you off.
    icon="alert.tga"
    name="FreezeUser"
    type="alert">
-Freeze this user with what message?
+Freeze this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
@@ -3015,7 +3015,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you
    icon="alert.tga"
    name="UnFreezeUser"
    type="alert">
-Unfreeze this user with what message?
+Unfreeze this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 You are no longer frozen.
@@ -3057,7 +3057,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="OfferTeleportFromGod"
    type="alertmodal">
-God summon user to your location?
+God summon Resident to your location?
     <form name="form">
       <input name="message" type="text">
 Join me in [REGION]
@@ -3137,7 +3137,7 @@ Type a short announcement which will be sent to everyone currently in your estat
    type="alert">
 You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.).
 
-This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
+This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
 
 Proceed?
     <usetemplate
@@ -5383,7 +5383,7 @@ Grant this request?
    icon="notify.tga"
    name="ScriptToast"
    type="notify">
-    [FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting user input.
+    [FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting Resident input.
     <form name="form">
       <button
        index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 34c1923582..e3b331799c 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -22,6 +22,22 @@
   name="l$_price">
     L$[PRICE]
  </panel.string>
+ <panel.string
+  name="click_through_text_fmt">
+    [TELEPORT] teleport, [MAP] map, [PROFILE] profile
+ </panel.string>
+ <panel.string
+  name="date_fmt">
+    [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string
+  name="auto_renew_on">
+    Enabled
+ </panel.string>
+ <panel.string
+  name="auto_renew_off">
+    Disabled
+ </panel.string>
     <button
      follows="top|right"
      height="23"
@@ -51,11 +67,11 @@
      follows="all"
      height="502"
      layout="topleft"
-     left="9"
+     left="10"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
-     width="310">
+     width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -63,18 +79,28 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="500"
+     height="610"
      left="0"
      width="285">
+        <panel
+         name="snapshot_panel"
+         layout="topleft"
+         follows="left|top|right"
+         height="197"
+         left="10"
+         top="10"
+         width="275"
+        >
         <texture_picker
          enabled="false"
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="11"
+         left="0"
          name="classified_snapshot"
-         top="10"
-         width="286" />
+         top="0"
+         width="275" />
+        </panel>
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -93,20 +119,61 @@
          v_pad="0"
          value="[name]"
          use_ellipses="true" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="classified_location_label"
+         text_color="white"
+         top_pad="5"
+         value="Location:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
          follows="left|top"
          h_pad="0"
-         height="25"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
          read_only="true"
+         top_pad="5"
          width="290"
          word_wrap="true"
          v_pad="0"
          value="[loading...]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="content_type_label"
+         text_color="white"
+         top_pad="10"
+         value="Content Type:"
+         width="140" />
+        <icon
+         follows="top|left"
+         height="16"
+         image_name="Parcel_M_Light"
+         layout="topleft"
+         left_pad="0"
+         name="content_type_moderate"
+         top_pad="-11"
+         width="18" />
+        <icon
+         follows="top|left"
+         height="16"
+         image_name="Parcel_PG_Light"
+         layout="topleft"
+         left_delta="0"
+         name="content_type_general"
+         top_delta="0"
+         width="18" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -114,13 +181,24 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="2"
          name="content_type"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="130"
+         top_delta="1"
          v_pad="0"
          value="[content type]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="category_label"
+         text_color="white"
+         top_pad="0"
+         value="Category:"
+         width="140" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -129,23 +207,51 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="category"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[category]" />
-        <check_box
-         enabled="false"
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="creation_date_label"
+         text_color="white"
+         top_pad="0"
+         value="Creation date:"
+         width="140" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
          height="16"
-         label="Auto renew each week"
+         layout="topleft"
+         left_pad="0"
+         name="creation_date"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Creation date"
+         v_pad="0"
+         value="[date]"
+         width="150" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
          layout="topleft"
          left="10"
-         name="auto_renew"
+         name="price_for_listing_label"
+         text_color="white"
          top_pad="5"
-         v_pad="0"
-         width="290" />
+         value="Price for listing:"
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -154,29 +260,133 @@
          halign="left"
          height="16"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="price_for_listing"
          read_only="true"
-         top_pad="5"
+         top_pad="-10"
          tool_tip="Price for listing."
          v_pad="0"
+         value="[price]"
          width="105" />
+        <layout_stack
+         animate="false"
+         name="descr_stack"
+         layout="topleft"
+         follows="all"
+         orientation="vertical"
+         left="10"
+         top_pad="5"
+         width="290"
+         height="215">
+         <layout_panel
+          auto_resize="false"
+          name="clickthrough_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="16"
+          user_resize="false">
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="click_through_label"
+         text_color="white"
+         top_pad="0"
+         value="Clicks:"
+         width="140" />
         <text_editor
-         allow_html="true"
          allow_scroll="false"
          bg_visible="false"
-         follows="left|top|right"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left_pad="0"
+         name="click_through_text"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Click through data"
+         v_pad="0"
+         value="[clicks]"
+         width="150" />
+         </layout_panel>
+         <layout_panel
+          auto_resize="false"
+          name="price_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="16"
+          user_resize="false">
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="auto_renew_label"
+         text_color="white"
+         top="0"
+         value="Auto renew:"
+         width="140" />
+         <text
+         height="16"
+         layout="topleft"
+         follows="top|left"
+         left_pad="0"
+         name="auto_renew"
+         top_pad="-10"
+         value="Enabled" 
+         width="150" />
+         </layout_panel>
+         <layout_panel
+          name="descr_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="215"
+          user_resize="false">
+        <text
+         auto_resize="false"
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="classified_desc_label"
+         text_color="white"
+         top="0"
+         value="Description:"
+         width="250" />
+        <text_editor
+         allow_html="true"
+         allow_scroll="true"
+         bg_visible="false"
+         follows="all"
          h_pad="0"
          height="200"
          layout="topleft"
-         left="10"
+         left="0"
          max_length="1023"
          name="classified_desc"
          read_only="true"
-         width="290"
+         top_pad="7"
+         width="280"
          v_pad="0"
          value="[description]"
          word_wrap="true" />
+         </layout_panel>
+        </layout_stack>
     </panel>
     </scroll_container>
     <panel
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 1375eb87d9..996e28c575 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 66d5389d9b..74d63ab328 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -16,6 +16,12 @@
   name="location_notice">
     (will update after save)
  </panel.string>
+ <string name="publish_label">
+  Publish
+ </string>
+ <string name="save_label">
+  Save
+ </string>
   <button
      follows="top|right"
      height="23"
@@ -42,16 +48,16 @@
         Edit Classified
     </text>
    <scroll_container
-     color="DkGray2"
-     follows="all"
-     height="502"
-     layout="topleft"
-     left="8"
-     top_pad="10"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
-     width="312">
+    color="DkGray2"
+    follows="all"
+    height="502"
+    layout="topleft"
+    left="8"
+    top_pad="10"
+    name="profile_scroll"
+    reserve_scroll_corner="false"
+    opaque="true"
+    width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -59,27 +65,36 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="610"
+     height="690"
      left="0"
      width="285">
-    <texture_picker
-     follows="left|top|right"
-     height="197"
-     width="272"
-     layout="topleft"
-     top="10"
-     left="11"
-     name="classified_snapshot" />
-          <icon
+      <panel
+         name="snapshot_panel"
+         layout="topleft"
+         follows="left|top|right"
+         height="197"
+         left="10"
+         top="10"
+         width="272">
+      <texture_picker
+       follows="left|top|right"
+       height="197"
+       width="272"
+       layout="topleft"
+       top="0"
+       left="0"
+       name="classified_snapshot" />
+       <icon
            height="197"
            image_name="spacer24.tga"
            layout="topleft"
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="10"
-           left="11"
-           width="286" />
+           top="0"
+           left="0"
+           width="272" />
+       </panel>
         <text
          type="string"
          length="1"
@@ -153,7 +168,7 @@
          type="string"
          length="1"
          follows="left|top"
-         height="50"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
@@ -172,6 +187,17 @@
          top_pad="5"
          name="set_to_curr_location_btn"
          width="156" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="category_label"
+         text_color="white"
+         top_pad="15"
+         value="Category:"
+         width="250" />
         <combo_box
          follows="left|top" 
          height="23" 
@@ -180,25 +206,63 @@
          name="category" 
          top_pad="5"
          width="156" />
-        <combo_box 
-         allow_text_entry="false" 
-         follows="left|top" 
-         height="23" 
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
          left="10"
-         name="content_type" 
+         name="content_type_label"
+         text_color="white"
+         top_pad="15"
+         value="Content type:"
+         width="250" />
+        <icons_combo_box
+         follows="left|top"
+         height="23"
+         label="General Content"
+         layout="topleft"
+         left="10"
+         name="content_type"
          top_pad="5"
          width="156">
-         <combo_item 
-          name="mature_ci" 
-          value="Mature">
-           Moderate Content
-         </combo_item>
-         <combo_item 
-          name="pg_ci" 
-          value="PG">
-           General Content
-         </combo_item>
-        </combo_box>
+            <icons_combo_box.drop_down_button
+             image_overlay="Parcel_PG_Light"
+             image_overlay_alignment="left"
+             imgoverlay_label_space="3"
+             pad_left="3"/>
+            <icons_combo_box.item
+             label="Moderate Content"
+             name="mature_ci"
+             value="Mature">
+                <item.columns
+                 halign="center"
+                 type="icon"
+                 value="Parcel_M_Light"
+                 width="20"/>
+            </icons_combo_box.item>
+            <icons_combo_box.item
+             label="General Content"
+             name="pg_ci"
+             value="PG">
+                <item.columns
+                 halign="center"
+                 type="icon"
+                 value="Parcel_PG_Light"
+                 width="20"/>
+            </icons_combo_box.item>
+        </icons_combo_box>
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="price_for_listing_label"
+         text_color="white"
+         top_pad="15"
+         value="Price for listing:"
+         width="250" />
         <spinner
          decimal_digits="0"
          follows="left|top"
@@ -223,9 +287,9 @@
          layout="topleft"
          left="10"
          name="auto_renew"
-         top_pad="5"
+         top_pad="15"
          width="250" />
-    </panel>
+     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
@@ -239,7 +303,7 @@
         <button
          follows="bottom|left"
          height="23"
-         label="Save"
+         label="[LABEL]"
          layout="topleft"
          name="save_changes_btn"
          left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 4e57b428bd..701a14e1c5 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -44,11 +44,16 @@ background_visible="true"
      tab_stop="false"
      top="2"
      width="23" />
-    <text
+    <text_editor
+     allow_scroll="false"
+     bg_visible="false"
+     read_only = "true"
      layout="topleft"
      name="group_name"
+     v_pad="0"
      value="(Loading...)"
       font="SansSerifHugeBold"
+     h_pad="0"
       height="26"
       left_pad="10"
      text_color="LtGray"
@@ -100,17 +105,8 @@ background_visible="true"
             expanded="true"
             layout="topleft"
             name="group_general_tab"
-            title="General">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="604"
-                 width="304"
-                 top="0">
+            title="General"
+            fit_panel="false">
                    <panel
                       border="false"
                       class="panel_group_general"
@@ -121,24 +117,13 @@ background_visible="true"
                       help_topic="group_general_tab"
                       name="group_general_tab_panel"
                       top="0" />
-			   </scroll_container>
          </accordion_tab>
          <accordion_tab
             expanded="false"
             layout="topleft"
             name="group_roles_tab"
-            title="Roles">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="680"
-                 width="304"
-                 top="0">
-
+            title="Roles"
+            fit_panel="false">
                 <panel
                    border="false"
                    class="panel_group_roles"
@@ -148,24 +133,13 @@ background_visible="true"
                    left="0"
                    name="group_roles_tab_panel"
                    top="0" />
-                </scroll_container>
          </accordion_tab>
          <accordion_tab
             expanded="false"
             layout="topleft"
             name="group_notices_tab"
-            title="Notices">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="530"
-                 width="304"
-                 top="0">
-
+            title="Notices"
+            fit_panel="false">
                 <panel
                     border="false"
                     class="panel_group_notices"
@@ -176,24 +150,13 @@ background_visible="true"
                     help_topic="group_notices_tab"
                     name="group_notices_tab_panel"
                     top="0" />
-               </scroll_container>
          </accordion_tab>
          <accordion_tab
              expanded="false"
              layout="topleft"
              name="group_land_tab"
-             title="Land/Assets">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="500"
-                 width="304"
-                 top="0">
-
+             title="Land/Assets"
+             fit_panel="false">
                  <panel
 					 border="false"
                      class="panel_group_land_money"
@@ -203,7 +166,6 @@ background_visible="true"
                      left="0"
                      name="group_land_tab_panel"
                      top="0" />
-               </scroll_container>
          </accordion_tab>
          </accordion>
    </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 28c4adf67c..88566ea037 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -111,7 +111,7 @@
          layout="topleft"
          min_height="25"
          width="100"
-         name="share_btn_panel"
+         name="pay_btn_panel"
          user_resize="false">
            <button
              auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index e6f67078d1..50983d2976 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -415,6 +415,7 @@ halign="center"
          layout="topleft"
          left="0"
          name="All Items"
+         sort_order_setting="InventorySortOrder"
          top="16"
          width="290" />
         <inventory_panel
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 540e17e413..13791a6d32 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -28,6 +28,16 @@
     <string
      name="groups_filter_label"
      value="Filter Groups" />
+     <!--
+     *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
+     They are not defined as translatable in VLT. See EXT-5931
+     -->
+    <string
+     name="no_filtered_groups_msg"
+     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+    <string
+     name="no_groups_msg"
+     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
@@ -222,7 +232,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
@@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          name="groups_panel"
          top="0"
          width="313">
+    <!--
+     *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
+     Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
+    -->
             <group_list
              follows="all"
              height="345"
              layout="topleft"
              left="0"
              name="group_list"
-             no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
              no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 8b25fb5d2a..715dc5f23c 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 44b2508e56..1e7c51259c 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -325,6 +325,7 @@
              top_pad="10"
              width="313">
                 <accordion_tab
+                 height="170"
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
@@ -333,6 +334,7 @@
                      height="160"
                      layout="topleft"
                      left="0"
+                     name="parcel_characteristics_panel"
                      top="0"
                      width="275">
                         <icon
@@ -536,6 +538,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="150"
                  layout="topleft"
                  name="region_information_tab"
                  title="Region">
@@ -544,6 +547,7 @@
                      height="125"
                      layout="topleft"
                      left="0"
+                     name="region_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -662,6 +666,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="190"
                  layout="topleft"
                  name="estate_information_tab"
                  title="Estate">
@@ -670,6 +675,7 @@
                      height="189"
                      layout="topleft"
                      left="0"
+                     name="estate_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -750,6 +756,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="320"
                  layout="topleft"
                  name="sales_tab"
                  title="For Sale">
@@ -758,6 +765,7 @@
                      height="300"
                      layout="topleft"
                      left="0"
+                     name="sales_panel"
                      top="0"
                      width="290">
                         <text
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 05a3771edf..4be4d6b432 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -171,6 +171,7 @@ Automatic position for:
      height="50"
      layout="topleft"
      left_pad="10"
+     top="190"
      name="background"
      tool_tip="Choose color for bubble chat"
      width="38">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2e81139ef2..3d434361b9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -14,6 +14,7 @@
    layout="topleft"
    left="30"
    height="12"
+   name="font_size"
    width="120"
    top="10">
     Font size:
@@ -60,6 +61,7 @@
       layout="topleft"
       left="30"
       height="12"
+      name="font_colors" 
       top_pad="10" 
       width="120"
       >
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f20526b491..c74de043e9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -635,7 +635,7 @@
         left_delta="-230"
         name="LightingDetailText"
         top_pad="8"
-        width="128">
+        width="140">
            Lighting detail:
         </text>
         <radio_group
@@ -672,10 +672,10 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="360"
+        left="358"
         name="TerrainDetailText"
         top="465"
-        width="128">
+        width="155">
            Terrain detail:
         </text>
         <radio_group
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a7cdd241c5..e03ecd8f04 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -51,7 +51,7 @@
      name="mute_when_minimized"
 	   top_delta="3"
      left_pad="5"
-     width="215" />
+     width="235" />
 	<slider
 		control_name="AudioLevelUI"
 		disabled_control="MuteAudio"
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="80">
+     width="142">
         Listen from:
     </text>
 	<icon
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 3980eb86d3..3913b6d709 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -198,7 +198,7 @@
     <button
      follows="left|top"
      height="23"
-     label="Kick User from Estate..."
+     label="Kick Resident from Estate..."
      layout="topleft"
      left="50"
      name="kick_user_from_estate_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index c06e67a4bb..ca9579284b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,27 +171,51 @@
      width="100">
         Rating:
     </text>
-    <combo_box
+    <icons_combo_box
+     follows="left|top"
      height="20"
      label="Moderate"
      layout="topleft"
      left_delta="100"
      name="access_combo"
      top_delta="0"
-     width="85">
-        <combo_box.item
+     width="105">
+        <icons_combo_box.drop_down_button
+         image_overlay="Parcel_M_Light"
+         image_overlay_alignment="left"
+         imgoverlay_label_space="3"
+         pad_left="3"/>
+        <icons_combo_box.item
          label="Adult"
          name="Adult"
-         value="42" />
-        <combo_box.item
+         value="42">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_R_Light"
+             width="20"/>
+          </icons_combo_box.item>
+        <icons_combo_box.item
          label="Moderate"
          name="Mature"
-         value="21" />
-        <combo_box.item
+         value="21">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_M_Light"
+             width="20"/>
+        </icons_combo_box.item>
+        <icons_combo_box.item
          label="General"
          name="PG"
-         value="13" />
-    </combo_box>
+         value="13">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_PG_Light"
+             width="20"/>
+        </icons_combo_box.item>
+    </icons_combo_box>
     <button
      enabled="false"
      follows="left|top"
@@ -205,7 +229,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home One User..."
+     label="Teleport Home One Resident..."
      layout="topleft"
      left="10"
      name="kick_btn"
@@ -214,7 +238,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home All Users..."
+     label="Teleport Home All Residents..."
      layout="topleft"
      left_delta="0"
      name="kick_all_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
index 525c5aa8e7..ffa1a257d5 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -203,7 +203,7 @@
    <button
      follows="left|top"
      height="20"
-     label="Teleport Home One User..."
+     label="Teleport Home One Resident..."
      layout="topleft"
      left="10"
      name="kick_btn"
@@ -212,7 +212,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home All Users..."
+     label="Teleport Home All Residents..."
      layout="topleft"
      left_delta="0"
      name="kick_all_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 04dbf73be9..5d910ea659 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -148,103 +148,33 @@
      name="height_text_lbl6"
      top="185"
      width="100">
-        Southwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl7"
-     top_delta="0"
-     width="100">
         Northwest
     </text>
-   <spinner
-    follows="left|top"
-    height="20"
-    increment="0.5"
-    label="Low"
-    label_width="37"
-    layout="topleft"
-    left="10"
-    max_val="500"
-    min_val="-500"
-    name="height_start_spin_0"
-    top_delta="15"
-    width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="Low"
-   label_width="37"
-   layout="topleft"
-   left_pad="10"
-   max_val="500"
-   min_val="-500"
-   name="height_start_spin_1"
-   top_delta="0"
-   width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="High"
-   label_width="37"
-   layout="topleft"
-   left="10"
-   max_val="500"
-   min_val="-500"
-   name="height_range_spin_0"
-   top_delta="20"
-   width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="High"
-   label_width="37"
-   layout="topleft"
-   left_pad="10"
-   max_val="500"
-   min_val="-500"
-   name="height_range_spin_1"
-   top_delta="0"
-   width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl8"
-     top_pad="10"
-     width="100">
-        Southeast
-    </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
      left_pad="10"
-     name="height_text_lbl9"
+     name="height_text_lbl7"
      top_delta="0"
      width="100">
         Northeast
     </text>
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="Low"
-       label_width="37"
-       layout="topleft"
-       left="10"
-       max_val="500"
-       min_val="-500"
-       name="height_start_spin_2"
-       top_delta="15"
-       width="100" />
+<!--  northwest low-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="Low"
+      label_width="37"
+      layout="topleft"
+      left="10"
+      max_val="500"
+      min_val="-500"
+      name="height_start_spin_1"
+      top_delta="15"
+      width="100" />  
+<!--    northeast low-->
       <spinner
        follows="left|top"
        height="20"
@@ -258,20 +188,22 @@
        name="height_start_spin_3"
        top_delta="0"
        width="100" />
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_2"
-       top_delta="20"
-       width="100" />
-      <spinner
+<!--  northwest high-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="High"
+      label_width="37"
+      layout="topleft"
+      left="10"
+      max_val="500"
+      min_val="-500"
+      name="height_range_spin_1"
+      top_delta="20"
+      width="100" />
+<!--  northeast high-->
+    <spinner
        follows="left|top"
        height="20"
        increment="0.5"
@@ -284,18 +216,94 @@
        name="height_range_spin_3"
        top_delta="0"
        width="100" />
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="height_text_lbl10"
-       top_delta="30"
-       width="400"
-       word_wrap="true">
-        These values represent the blend range for the textures above.
-      </text>
-      <text
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl8"
+     top_pad="10"
+     width="100">
+        Southwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Southeast
+    </text>
+<!--  southwest low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_0"
+     top_delta="15"
+     width="100" />
+<!--  southeast low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_2"
+     top_delta="0"
+     width="100" />
+<!--southwest high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_0"
+     top_delta="20"
+     width="100" />
+<!--  southeast high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_2"
+     top_delta="0"
+     width="100" />
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10"
+     top_delta="30"
+     width="400"
+     word_wrap="true">
+      These values represent the blend range for the textures above.
+    </text>
+    <text
        follows="left|top"
        height="20"
        layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index d14355b9f4..d444420550 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -178,5 +178,5 @@
      top_pad="-35"
      right="487"
      name="Save_btn"
-     width="61" />
+     width="81" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c188c1bf8b..0c870e155b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
- chrome="true" 
+ chrome="true"
  follows="top|right"
  height="19"
  layout="topleft"
@@ -11,7 +11,7 @@
  mouse_opaque="false"
  name="status"
  top="19"
- tab_stop="false" 
+ tab_stop="false"
  width="1000">
     <panel.string
      name="StatBarDaysOfWeek">
@@ -51,12 +51,12 @@
      image_unselected="spacer35.tga"
      image_pressed="spacer35.tga"
      height="16"
-     right="-210"
+     right="-230"
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
      top="3"
-     width="110" />
+     width="120" />
     <button
      auto_resize="true"
      halign="right"
@@ -75,7 +75,7 @@
      pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="2"
-     width="45" />
+     width="55" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -88,7 +88,7 @@
      left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="80">
+     width="100">
         24:00 AM PST
     </text>
     <button
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index d2c9e56bc3..86739b24c8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -94,6 +94,7 @@
          layout="topleft"
          left="10"
          help_topic=""
+         name="properties_panel"
          top="45"
          width="313"
    background_visible="true"
@@ -549,5 +550,16 @@
 		     name="buy_btn"
 		     top="0"
 		     width="100" />
+        <button
+		     follows="bottom|left"
+		     height="23"
+		     label="Details"
+		     layout="topleft"
+		     left="5"
+		     name="details_btn"
+		     top="0"
+		     width="100"
+			 visible="false" />
+
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 455b4be264..59c54f0cad 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1769,6 +1769,9 @@ Clears (deletes) the media and all params from the given face.
 	<string name="tattoo">Tattoo</string>
 	<string name="invalid">invalid</string>
 
+  <!-- Wearable List-->
+  <string name="NewWearable">New [WEARABLE_ITEM]</string>
+  
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
 	<string name="next">Next</string>
@@ -2104,6 +2107,9 @@ Clears (deletes) the media and all params from the given face.
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
+  <!-- panel preferences general -->
+  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
 	<string name="MuteAgent">(Resident)</string>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index e8f6b1319a..bae821d3b5 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -61,6 +61,9 @@ Try again in a moment.
 		<message name="completing">
 			Completing teleport.
 		</message>
+		<message name="completed_from">
+			Teleport completed from [T_SLURL]
+		</message>
 		<message name="resolving">
 			Resolving destination.
 		</message>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 63f08a4250..413ca1d1ef 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -24,7 +24,7 @@
      follows="left|top|bottom"
      height="20"
      left="2"
-     mouse_opaque="true"
+     mouse_opaque="false"
      name="adhoc_icon"
      width="21" />
     <chiclet_im_adhoc.unread_notifications
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index a42f9a8e3e..cb1aa5eaa1 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -54,7 +54,7 @@ Gracias a los siguientes Residentes por ayudarnos a estar seguros de que, hoy po
 
 
 
-No es frecuente el pensamiento que puede hacer que lo que hasta ahora no existía de pronto salte a la vista. Sí es frecuente -y engañoso- gritar &apos;A mí se me podía haber ocurrido eso&apos;, pero el hecho es que no se hizo, un hecho muy significativo y revelador.
+No es frecuente la mente que puede hacer que lo que hasta ahora no existía de pronto salte a la vista. Sí es frecuente -y engañoso- gritar &apos;A mí se me podía haber ocurrido eso&apos;, pero el hecho es que no se hizo, un hecho muy significativo y revelador.
  -- Douglas Adams
 			</text_editor>
 		</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index bcb970c79d..46531c5e58 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -397,7 +397,7 @@ la textura:
 			</text>
 			<texture_picker label="" left="97" name="media texture" tool_tip="Pulse para elegir una imagen"/>
 			<text name="replace_texture_help" width="285">
-				Cuando pulses la flecha &apos;play&apos;, los objetos que usen esta textura mostrarán la película o la página web. Selecciona la miniatura para elegir una textura distinta.
+				Cuando pulses la flecha &apos;play&apos;, los objetos que usen esta textura mostrarán la película o la página web.  Selecciona la miniatura para elegir una textura distinta.
 			</text>
 			<check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/>
 			<text left="102" name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)." width="120">
@@ -415,7 +415,7 @@ los media:
 			<check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/>
 		</panel>
 		<panel label="SONIDO" name="land_audio_panel">
-			<check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Marcando esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/>
+			<check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Al marcar esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/>
 			<check_box label="Activar la voz" name="parcel_enable_voice_channel"/>
 			<check_box label="Autorizar la voz (establecido por el Estado)" name="parcel_enable_voice_channel_is_estate_disabled"/>
 			<check_box label="Limitar la voz a esta parcela" name="parcel_enable_voice_channel_local"/>
@@ -435,7 +435,7 @@ los media:
 				Restringir el acceso a residentes verificados con:
 			</text>
 			<check_box label="Información de pago aportada [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/>
-			<check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE]."/>
+			<check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/>
 			<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
 			<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index b53b9a3889..089ff3cd68 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
@@ -17,10 +17,10 @@
 			<texture_picker label="Alfa de la cabeza" name="head_alpha"/>
 			<texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/>
 			<texture_picker label="Ojos" name="eyes-baked"/>
-			<texture_picker label="Oho" name="eyes_iris"/>
+			<texture_picker label="Ojo" name="eyes_iris"/>
 			<texture_picker label="Alfa de los ojos" name="eyes_alpha"/>
 			<texture_picker label="Parte superior del cuerpo" name="upper-baked"/>
-			<texture_picker label="Parte superior del cuerpo: bodypaint" name="upper_bodypaint"/>
+			<texture_picker label="Pintura corporal: parte superior del cuerpo" name="upper_bodypaint"/>
 			<texture_picker label="Camiseta" name="upper_undershirt"/>
 			<texture_picker label="Guantes" name="upper_gloves"/>
 			<texture_picker label="Camisa" name="upper_shirt"/>
@@ -28,7 +28,7 @@
 			<texture_picker label="Alfa superior" name="upper_alpha"/>
 			<texture_picker label="Tatuaje superior" name="upper_tattoo"/>
 			<texture_picker label="Parte inferior del cuerpo" name="lower-baked"/>
-			<texture_picker label="Parte inferior del cuerpo: bodypaint" name="lower_bodypaint"/>
+			<texture_picker label="Pintura corporal: parte inferior del cuerpo" name="lower_bodypaint"/>
 			<texture_picker label="Ropa interior" name="lower_underpants"/>
 			<texture_picker label="Calcetines" name="lower_socks"/>
 			<texture_picker label="Zapatos" name="lower_shoes"/>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 0d280320e2..81c54cf600 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		[AMT] L$
 	</text>
 	<text name="currency_links">
-		[http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de pago]
+		[http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de cambio]
 	</text>
 	<text name="exchange_rate_note">
 		Vuelve a escribir la cantidad para ver el tipo de cambio más reciente.
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index 97191a1336..4b332cd9c3 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -35,7 +35,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una anatomía nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una anatomía nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -68,7 +68,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -105,7 +105,7 @@
 				Situado en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vístetelo.
+				Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien puedes crear uno nuevo partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -136,7 +136,7 @@
 				Situados en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos.
+				Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -177,7 +177,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -210,7 +210,7 @@
 				Situados en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos.
+				Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
 			</text>
 			<text name="no modify instructions">
 				No tiene permiso para modificar este ítem.
@@ -236,7 +236,7 @@
 				Situados en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos.
+				Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
 			</text>
 			<button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/>
 			<text name="no modify instructions">
@@ -269,7 +269,7 @@
 				Situados en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos.
+				Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
 			</text>
 			<button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/>
 			<text name="no modify instructions">
@@ -302,7 +302,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/>
 			<text name="no modify instructions">
@@ -336,7 +336,7 @@
 				Situados en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vístetelos.
+				Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
 			</text>
 			<button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/>
 			<text name="no modify instructions">
@@ -369,7 +369,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/>
 			<text name="no modify instructions">
@@ -402,7 +402,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/>
 			<text name="no modify instructions">
@@ -435,7 +435,7 @@
 				Situada en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
 			<text name="no modify instructions">
@@ -468,7 +468,7 @@
 				Situado en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte un tatuaje nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vístetelo.
+				Pon un tatuaje nuevo arrastrándolo desde tu inventario a tu avatar. O bien puedes crear uno nuevo partiendo de cero.
 			</text>
 			<button label="Crear un tatuaje nuevo" label_selected="Crear un tatuaje nuevo" name="Create New"/>
 			<text name="no modify instructions">
@@ -502,7 +502,7 @@
 				Situado en [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponte una capa Alfa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vístetela.
+				Pon una capa Alfa nueva arrastrándola desde tu inventario a tu avatar. O bien puedes crear una nueva partiendo de cero.
 			</text>
 			<button label="Crear una capa Alfa nueva" label_selected="Crear una capa Alfa nueva" name="Create New"/>
 			<text name="no modify instructions">
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
index f2ce40e994..81909e997c 100644
--- a/indra/newview/skins/default/xui/es/floater_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_event.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Event" name="Event" title="DETALLES DEL EVENTO">
+<floater label="Evento" name="Event" title="DETALLES DEL EVENTO">
 	<floater.string name="none">
-		Ninguno
+		ninguno
 	</floater.string>
 	<floater.string name="notify">
 		Notificar
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
index d87623c3df..e6b01a4946 100644
--- a/indra/newview/skins/default/xui/es/floater_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -10,7 +10,7 @@
 		Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
 	</string>
 	<string name="muted_message">
-		Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje.
+		Has ignorado a este Residente. Enviándole un mensaje, automáticamente dejarás de ignorarle.
 	</string>
 	<string name="generic_request_error">
 		Error al hacer lo solicitado; por favor, inténtelo más tarde.
diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
index 869babee44..9f9902a3a0 100644
--- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
@@ -3,7 +3,7 @@
 	<button label="Guardar" label_selected="Guardar" name="Save"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Guardar lo que estoy llevando
+		Guardar lo que llevo puesto
 como un vestuario nuevo:
 	</text>
 	<line_editor name="name ed">
diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
index 52c6593f75..e2a53693b5 100644
--- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
@@ -28,10 +28,10 @@
 		Has sido desconectado de [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_other">
-		[VOICE_CHANNEL_NAME] ha finalizado la llamada. [RECONNECT_NEARBY]
+		[VOICE_CHANNEL_NAME] ha colgado la llamada.  [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_agent">
-		Has finalizado la llamada. [RECONNECT_NEARBY]
+		Has finalizado la llamada.  [RECONNECT_NEARBY]
 	</text>
 	<text name="leaving">
 		Saliendo de [CURRENT_CHAT].
diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml
index 095112dbdc..410f7b5e36 100644
--- a/indra/newview/skins/default/xui/es/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="INFORMACIÓN DEl SCRIPT"/>
+<floater name="scriptlimits" title="INFORMACIÓN DEL SCRIPT"/>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index d597926d39..6503a3d5cb 100644
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -2,6 +2,6 @@
 <floater name="modal container" title="">
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Pulsa una tecla para configurarla como botón de Apretar para Hablar.
+		Pulsa una tecla para configurarla como tu botón para hablar.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 78d9b2a9c8..cbacce304c 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -4,7 +4,7 @@
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/>
 	<text name="tos_heading">
-		Por favor, lee cuidadosamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo.
+		Por favor, lee detenidamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index d5708483e5..a8dc05703c 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -6,77 +6,29 @@
 		</text>
 	</panel>
 	<panel>
-		<button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/>
 		<text name="me_label">
 			Yo
 		</text>
-		<check_box label="Residente" name="people_chk"/>
 		<text name="person_label">
 			Persona
 		</text>
-		<check_box label="Punto de Info" name="infohub_chk"/>
-		<text name="infohub_label">
-			Punto de Info
-		</text>
-		<check_box label="Terreno en venta" name="land_for_sale_chk"/>
-		<text name="land_sale_label">
-			Venta de terreno
-		</text>
 		<text name="by_owner_label">
 			por el propietario
 		</text>
 		<text name="auction_label">
 			subasta de terreno
 		</text>
-		<button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a mi Base"/>
-		<text name="Home_label">
-			Base
-		</text>
-		<text name="events_label">
-			Eventos:
-		</text>
-		<check_box label="&apos;PG&apos;" name="event_chk"/>
 		<text name="pg_label">
 			General
 		</text>
-		<check_box initial_value="true" label="&apos;Mature&apos;" name="event_mature_chk"/>
 		<text name="mature_label">
 			Moderado
 		</text>
-		<check_box label="&apos;Adult&apos;" name="event_adult_chk"/>
 		<text name="adult_label">
 			Adulto
 		</text>
 	</panel>
 	<panel>
-		<text name="find_on_map_label">
-			Encontrar en el mapa
-		</text>
-	</panel>
-	<panel>
-		<combo_box label="Amigos conectados" name="friend combo" tool_tip="Ver a los amigos en el mapa">
-			<combo_box.item label="Mis amigos conectados" name="item1"/>
-		</combo_box>
-		<combo_box label="Mis hitos" name="landmark combo" tool_tip="Hito a ver en el mapa">
-			<combo_box.item label="Mis hitos" name="item1"/>
-		</combo_box>
-		<search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escriba el nombre de una región"/>
-		<button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/>
 		<button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/>
-		<scroll_list name="search_results">
-			<scroll_list.columns label="" name="icon"/>
-			<scroll_list.columns label="" name="sim_name"/>
-		</scroll_list>
-		<button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/>
-		<button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/>
-		<button label="Ver lo elegido" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/>
-	</panel>
-	<panel>
-		<text name="zoom_label">
-			Zoom
-		</text>
-	</panel>
-	<panel>
-		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 1004471025..46b6d3ece6 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
 	<menu_item_call label="Levantarse" name="Stand Up"/>
-	<context_menu label="Quitarse  â–¶" name="Take Off &gt;">
+	<context_menu label="Quitarme  â–¶" name="Take Off &gt;">
 		<context_menu label="Ropas  â–¶" name="Clothes &gt;">
 			<menu_item_call label="Camisa" name="Shirt"/>
 			<menu_item_call label="Pantalón" name="Pants"/>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 1aa0a26ca8..602798b108 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -62,7 +62,7 @@
 	<menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
 	<menu_item_call label="Escuchar" name="Sound Play"/>
 	<menu_item_call label="Acerca del hito" name="About Landmark"/>
-	<menu_item_call label="Ejecutarla en el mundo" name="Animation Play"/>
+	<menu_item_call label="Escuchar en el mundo" name="Animation Play"/>
 	<menu_item_call label="Ejecutarla para usted" name="Animation Audition"/>
 	<menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/>
 	<menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 581ecd6698..18b6363bbb 100644
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -7,12 +7,12 @@
 	<menu_item_call label="Sentarse aquí" name="Object Sit"/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
-	<context_menu label="Ponerse  â–¶" name="Put On">
+	<context_menu label="Ponerme  â–¶" name="Put On">
 		<menu_item_call label="Ponerse" name="Wear"/>
 		<context_menu label="Anexar  â–¶" name="Object Attach"/>
 		<context_menu label="Anexar como HUD  â–¶" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Quitarse  â–¶" name="Remove">
+	<context_menu label="Quitarme  â–¶" name="Remove">
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse..."/>
 		<menu_item_call label="Ignorar" name="Object Mute"/>
 		<menu_item_call label="Devolver" name="Return..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
index f4e7671a92..60c92eec75 100644
--- a/indra/newview/skins/default/xui/es/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
-	<menu_item_check label="Ordenar según el nombre" name="SortByName"/>
-	<menu_item_check label="Ordenar según los intervinientes recientes" name="SortByRecentSpeakers"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="SortByName"/>
+	<menu_item_check label="Ordenar según las intervenciones recientes" name="SortByRecentSpeakers"/>
 	<menu_item_call label="Ver el perfil" name="View Profile"/>
 	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
 	<menu_item_call label="MI" name="IM"/>
@@ -11,10 +11,10 @@
 	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
 	<menu_item_check label="Ignorar el texto" name="MuteText"/>
 	<context_menu label="Opciones del moderador &gt;" name="Moderator Options">
-		<menu_item_check label="Autorizar el chat de texto" name="AllowTextChat"/>
-		<menu_item_call label="Silenciar a este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
 		<menu_item_call label="Silenciar a todos los demás" name="ModerateVoiceMuteOthers"/>
-		<menu_item_call label="Designorar a este participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Designorar a todos los demás" name="ModerateVoiceUnMuteOthers"/>
+		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Quitar el silencio a todos los demás" name="ModerateVoiceUnMuteOthers"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 8342497525..51bd2c7208 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 61cefd7b76..9c08fbb2c8 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -9,7 +9,7 @@
 		<menu_item_call label="Mi perfil" name="Profile"/>
 		<menu_item_call label="Mi apariencia" name="Appearance"/>
 		<menu_item_check label="Mi Inventario" name="Inventory"/>
-		<menu_item_check label="Mi inventario" name="ShowSidetrayInventory"/>
+		<menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Mis gestos" name="Gestures"/>
 		<menu label="Mi estatus" name="Status">
 			<menu_item_call label="Ausente" name="Set Away"/>
@@ -47,13 +47,13 @@
 			<menu_item_check label="Propiedades de la parcela" name="Parcel Properties"/>
 		</menu>
 		<menu_item_call label="Teleportar a la Base" name="Teleport Home"/>
-		<menu_item_call label="Fijar aquí mi Base" name="Set Home to Here"/>
+		<menu_item_call label="Fijar mi Base aquí" name="Set Home to Here"/>
 		<menu label="Sol" name="Environment Settings">
 			<menu_item_call label="Amanecer" name="Sunrise"/>
 			<menu_item_call label="Mediodía" name="Noon"/>
 			<menu_item_call label="Atardecer" name="Sunset"/>
 			<menu_item_call label="Medianoche" name="Midnight"/>
-			<menu_item_call label="Tiempo del Estado" name="Revert to Region Default"/>
+			<menu_item_call label="Hora del Estado" name="Revert to Region Default"/>
 			<menu_item_call label="Editor del entorno" name="Environment Editor"/>
 		</menu>
 	</menu>
@@ -100,7 +100,7 @@
 			<menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/>
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
 			<menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
-			<menu_item_check label="Sólo seleccionar los objetos movibles" name="Select Only Movable Objects"/>
+			<menu_item_check label="Seleccionar sólo los objetos movibles" name="Select Only Movable Objects"/>
 			<menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/>
 			<menu_item_check label="Al seleccionar, mostrar lo oculto" name="Show Hidden Selection"/>
 			<menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 0f64550725..26c5918db9 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -109,12 +109,12 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente.
 		<usetemplate name="okbutton" yestext="Sí"/>
 	</notification>
 	<notification name="GrantModifyRights">
-		Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso.
+		Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso.
 ¿Quieres conceder permisos de modificación a [FIRST_NAME] [LAST_NAME]?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
-		Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso.
+		Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso.
 ¿Quieres conceder permisos de modificación a los Residentes elegidos?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
@@ -164,7 +164,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sí mi
 	</notification>
 	<notification name="AttachmentDrop">
 		Vas a soltar tu anexado.
-    ¿Quieres seguir?
+    ¿Estás seguro de que quieres continuar?
 		<usetemplate ignoretext="Confirmar antes de soltar anexados" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
@@ -441,7 +441,7 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		No se ha podido escribir el archivo [[FILE]]
 	</notification>
 	<notification name="UnsupportedHardware">
-		Debes saber que tu ordenador no cumple los requirimientos mínimos para [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida.
+		Debes saber que tu ordenador no cumple los requisitos mínimos para la utilización de [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida.
 
 MINSPECS
 ¿Ir a [_URL] para más información?
@@ -452,7 +452,7 @@ MINSPECS
 	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
-Esto suele suceder con hardware nuevo que aun no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
+Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
 (Yo &gt; Preferencias &gt; Gráficos).
 		<form name="form">
 			<ignore name="ignore" text="No se ha podido identificar mi tarjeta gráfica"/>
@@ -734,7 +734,7 @@ no se ha seleccionado una parcela.
 		No se ha podido obtener la propiedad del terreno porque la selección se extiende por varias regiones. Por favor, seleccione un área más pequeña y reinténtelo.
 	</notification>
 	<notification name="ForceOwnerAuctionWarning">
-		Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ha empezado.
+		Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ya ha empezado.
 ¿Forzar la propiedad?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
@@ -904,7 +904,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela.
 Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el ítem de aquí a unos minutos.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Vaya, has sido desconectado de [SECOND_LIFE]
+		Vaya,   se te ha cerrado la sesión en [SECOND_LIFE]
             [MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
 	</notification>
@@ -1347,7 +1347,7 @@ Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respue
 		<usetemplate name="okcancelbuttons" notext="Rehusar" yestext="Entrar"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
-		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de crear uno nuevo o entrar en alguno.
+		Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="KickUser">
@@ -1615,7 +1615,7 @@ Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferen
 	</notification>
 	<notification label="Cambiada la calificación de la región" name="RegionMaturityChange">
 		Se ha actualizado el nivel de calificación de esta región.
-Llevará algún tiempo que el cambio se refleje en el mapa.
+Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa.
 
 Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago.
 	</notification>
@@ -1731,11 +1731,11 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
 	<notification name="ConfirmQuit">
-		¿Está seguro de que quiere salir?
+		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Usa esta herramienta para denunciar violaciones de las  [http://secondlife.com/corporate/tos.php Condiciones del Servicio] y las  [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
+		Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
 
 Se investigan y resuelven todas las infracciones denunciadas.
 	</notification>
@@ -2062,7 +2062,7 @@ Pulsa en un hito para seleccionarlo, y, luego, pulsa &apos;Teleportar&apos; en l
 	</notification>
 	<notification name="TeleportToPerson">
 		Puedes contactar con un Residente como &apos;[NAME]&apos; abriendo el panel Gente en el lado derecho de tu pantalla.
-Elige al Residente de la lista y pulsa &apos;MI&apos; en la parte superior del panel.
+Elige al Residente de la lista y pulsa &apos;MI&apos; en la parte inferior del panel.
 (También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir &apos;MI&apos;).
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index 7c11b3d193..cddbad1195 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -6,5 +6,5 @@
 	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
 	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
 	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
-	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quitar al Residente o al objeto de la lista de ignorados"/>
+	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml
index 0dc22c107b..e1cac7c2c3 100644
--- a/indra/newview/skins/default/xui/es/panel_friends.xml
+++ b/indra/newview/skins/default/xui/es/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Teleporte" name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/>
 	<button label="Pagar" name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/>
 	<button label="Quitar" name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/>
-	<button label="Añadir" name="add_btn" tool_tip="Ofrece amistad a un Residente"/>
+	<button label="Añadir" name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
index 82123016b1..b398293175 100644
--- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
@@ -5,7 +5,7 @@
 			<button label="Perfil del grupo" name="group_info_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-			<button label="Llamada de grupo" name="call_btn"/>
+			<button label="Llamar al grupo" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Colgar" name="end_call_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 2a64464fd9..0d877f78f2 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -14,7 +14,7 @@
 	</text>
 	<button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
 	<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Para seleccionar a varios residentes, ve pulsando sus nombres mientras mantienes apretada la tecla Ctrl"/>
-	<button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quita de la lista a los Residentes seleccionados arriba" width="214"/>
+	<button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quitar de la lista a los Residentes seleccionados arriba" width="214"/>
 	<text name="role_text">
 		Elegir qué rol asignarles:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 0e4288f772..b763e2e74d 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -54,7 +54,7 @@
 			Se necesitan más créditos de terreno para mantener el terreno en uso
 		</text>
 		<text name="group_money_heading">
-			L$ del grupp
+			L$ del grupo
 		</text>
 	</panel>
 	<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index f4a6839156..58e1919782 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -36,7 +36,7 @@ El máximo es de 200 por día y grupo.
 		<text name="string">
 			Arrastra y suelta aquí un ítem para adjuntarlo:
 		</text>
-		<button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quitar el adjunto de tu aviso"/>
+		<button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quita el adjunto de tu aviso"/>
 		<button label="Enviar" label_selected="Enviar" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta este cajetín. Para poder adjuntarlo, debes tener permiso para copiarlo y transferirlo."/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 384864cba4..5ef81162bc 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -6,22 +6,22 @@
 	<panel.string name="want_apply_text">
 		¿Quieres guardar estos cambios?
 	</panel.string>
-	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros">
+	<tab_container name="roles_tab_container">
+		<panel label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros">
 			<panel.string name="help_text">
 				Puede añadir o quitar los roles asignados a los miembros.
 Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
 			</panel.string>
 			<filter_editor label="Filtrar los miembros" name="filter_input"/>
-			<name_list bottom_delta="-105" height="104" name="member_list">
+			<name_list name="member_list">
 				<name_list.columns label="Miembro" name="name"/>
 				<name_list.columns label="Donaciones" name="donated"/>
 				<name_list.columns label="Estatus" name="online"/>
 			</name_list>
-			<button label="Invitar" name="member_invite" width="175"/>
+			<button label="Invitar" name="member_invite"/>
 			<button label="Expulsar" name="member_eject"/>
 		</panel>
-		<panel height="148" label="ROLES" name="roles_sub_tab">
+		<panel label="ROLES" name="roles_sub_tab">
 			<panel.string name="help_text">
 				Los roles tienen una etiqueta propia y unas capacidades que se
 permiten ejercer a sus miembros. Los miembros pueden
@@ -35,7 +35,7 @@ incluyendo el de Todos y el de Propietarios.
 				Inv_FolderClosed
 			</panel.string>
 			<filter_editor label="Filtrar los roles" name="filter_input"/>
-			<scroll_list bottom_delta="-104" height="104" name="role_list">
+			<scroll_list name="role_list">
 				<scroll_list.columns label="Rol" name="name"/>
 				<scroll_list.columns label="Etiqueta" name="title"/>
 				<scroll_list.columns label="#" name="members"/>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index 09969a796c..c3d5b017ad 100644
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
@@ -8,7 +8,7 @@
 			<button label="Añadir como amigo" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
+			<button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="Compartir" name="share_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 8313306cf9..c5494d8199 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -24,7 +24,7 @@
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
-				Registrarse
+				Registrarme
 			</text>
 			<text name="login_help">
 				¿Necesitas ayuda para conectarte?
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
index 8fe3144d05..46326d1e8b 100644
--- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
@@ -4,16 +4,16 @@
 		Página inicial:
 	</text>
 	<text name="home_fails_whitelist_label">
-		(Esta página no supera la lista blanca especificada)
+		(La Lista Blanca especificada no aprueba esta página)
 	</text>
-	<line_editor name="home_url" tool_tip="La página inicial para el origen de este media"/>
+	<line_editor name="home_url" tool_tip="Página inicial para el origen de este media"/>
 	<text name="preview_label">
 		Vista previa
 	</text>
 	<text name="current_url_label">
 		Página actual:
 	</text>
-	<text name="current_url" tool_tip="La página actual para el origen de este media" value=""/>
+	<text name="current_url" tool_tip="Página actual para el origen de este media" value=""/>
 	<button label="Definir" name="current_url_reset_btn"/>
 	<check_box initial_value="false" label="Media en bucle" name="auto_loop"/>
 	<check_box initial_value="false" label="A la primera pulsación" name="first_click_interact"/>
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
index 4b4fff5edb..c72f562a68 100644
--- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
@@ -2,11 +2,11 @@
 <panel label="Seguridad" name="Media Settings Security">
 	<check_box initial_value="false" label="Permitir el acceso sólo a los patrones de URL especificados" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
-		Las entradas contra las que falle la página inicial se marcan:
+		Están marcadas las entradas que la página web no admite:
 	</text>
 	<button label="Añadir" name="whitelist_add"/>
 	<button label="Borrar" name="whitelist_del"/>
 	<text name="home_url_fails_whitelist">
-		Atención: la página inicial especificada en la pestaña General no supera esta lista blanca. Se ha desactivado hasta que se añada una entrada válida.
+		Atención: la página web especificada en la pestaña General no se admite en esta lista blanca. Se ha desactivado hasta que se añada una entrada correcta.
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_my_profile.xml b/indra/newview/skins/default/xui/es/panel_my_profile.xml
index 6c00a05d12..5a6fd8b144 100644
--- a/indra/newview/skins/default/xui/es/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_my_profile.xml
@@ -28,8 +28,8 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="profile_me_buttons_panel">
-			<button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/>
-			<button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu físico, ropas, etc."/>
+			<button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/>
+			<button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu físico, ropas, etc."/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
index 6c6e4c7ee8..e8e95c3bac 100644
--- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
 			<combo_editor label="Buscar en [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
-	<favorites_bar name="favorite" tool_tip="Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí">
+	<favorites_bar name="favorite" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí!">
 		<label name="favorites_bar_label" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquí!">
 			Barra de Favoritos
 		</label>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
index cd8836f40f..885c780e00 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
@@ -13,9 +13,9 @@
 		(ejecutándose)
 	</string>
 	<panel name="minimized_controls">
-		<button label="Para todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/>
+		<button label="Parar todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/>
 		<button label="Iniciar todo" name="all_nearby_media_enable_btn" tool_tip="Encender todos los media cercanos"/>
-		<button name="open_prefs_btn" tool_tip="Abre las preferencias de los media"/>
+		<button name="open_prefs_btn" tool_tip="Abrir las preferencias de los media"/>
 		<button label="Más &gt;&gt;" label_selected="Menos &lt;&lt;" name="more_less_btn" tool_tip="Controles avanzados"/>
 	</panel>
 	<panel name="nearby_media_panel">
@@ -29,24 +29,24 @@
 			<scroll_list.columns label="Visibilidad" name="media_visibility"/>
 			<scroll_list.columns label="Clase" name="media_class"/>
 			<scroll_list.columns label="Nombre" name="media_name"/>
-			<scroll_list.columns label="Limpiar" name="media_debug"/>
+			<scroll_list.columns label="Depurar" name="media_debug"/>
 		</scroll_list>
 		<panel>
 			<layout_stack name="media_controls">
 				<layout_panel name="stop">
-					<button name="stop_btn" tool_tip="Para los media seleccionados"/>
+					<button name="stop_btn" tool_tip="Parar los media seleccionados"/>
 				</layout_panel>
 				<layout_panel name="play">
-					<button name="play_btn" tool_tip="Ejecuta los media seleccionados"/>
+					<button name="play_btn" tool_tip="Ejecutar los media seleccionados"/>
 				</layout_panel>
 				<layout_panel name="pause">
-					<button name="pause_btn" tool_tip="Pausa los media seleccionados"/>
+					<button name="pause_btn" tool_tip="Pausar los media seleccionados"/>
 				</layout_panel>
 				<layout_panel name="volume_slider_ctrl">
 					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen de los media seleccionados"/>
 				</layout_panel>
 				<layout_panel name="mute">
-					<button name="mute_btn" tool_tip="Silencia el audio de los media seleccionados"/>
+					<button name="mute_btn" tool_tip="Silenciar el audio de los media seleccionados"/>
 				</layout_panel>
 				<layout_panel name="zoom">
 					<button name="zoom_btn" tool_tip="Zoom en los media seleccionados"/>
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
index 11bbcd7695..2f60df7743 100644
--- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
@@ -6,9 +6,9 @@
 	</tab_container>
 	<panel name="bottom_panel">
 		<button name="options_gear_btn" tool_tip="Ver más opciones"/>
-		<dnd_button name="trash_btn" tool_tip="Quita el ítem seleccionado"/>
-		<button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guarda la apariencia como un vestuario"/>
-		<button label="Llevar" name="wear_btn" tool_tip="Viste el vestuario seleccionado"/>
+		<dnd_button name="trash_btn" tool_tip="Quitar el ítem seleccionado"/>
+		<button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guardar la apariencia como un vestuario"/>
+		<button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/>
 		<button label="M" name="look_edit_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 001446be21..03c449da93 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -12,7 +12,7 @@
 		<panel label="CERCAN�A" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="nearby_view_sort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
 		<panel label="MIS AMIGOS" name="friends_panel">
@@ -22,7 +22,7 @@
 			</accordion>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_btn" tool_tip="Ofrece amistad a un Residente"/>
+				<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
 				<button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
 			</panel>
 			<text name="no_friends_msg">
@@ -40,18 +40,18 @@ Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el
 		<panel label="RECIENTE" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="recent_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
-		<button label="Perfil" name="view_profile_btn" tool_tip="Muestra imágenes, grupos y otra información del Residente"/>
+		<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
 		<button label="MI" name="im_btn" tool_tip="Abrir un mensaje instantáneo"/>
 		<button label="Llamada" name="call_btn" tool_tip="Llamar a este Residente"/>
 		<button label="Compartir" name="share_btn"/>
 		<button label="Teleportarse" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 		<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
 		<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
-		<button label="Multiconferencia" name="group_call_btn" tool_tip="Llama a este grupo"/>
+		<button label="Multiconferencia" name="group_call_btn" tool_tip="Llamar a este grupo"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
index 9d4a958e16..2c873ef464 100644
--- a/indra/newview/skins/default/xui/es/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml
@@ -49,7 +49,7 @@
 			<text name="maturity_value" value="desconocido"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcela">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Calificación:"/>
 						<text name="rating_value" value="desconocida"/>
 						<text name="voice_label" value="Voz:"/>
@@ -68,7 +68,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Región">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Región:"/>
 						<text name="region_type_label" value="Tipo:"/>
 						<text name="region_rating_label" value="Calificación:"/>
@@ -78,7 +78,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Estado">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Estado:"/>
 						<text name="estate_rating_label" value="Calificación:"/>
 						<text name="estate_owner_label" value="Propietario:"/>
@@ -86,7 +86,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="En venta">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Precio:"/>
 						<text name="area_label" value="�rea:"/>
 						<text name="traffic_label" value="Tráfico:"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index b8010e0a35..17e3b45beb 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Disminuir" name="radio" value="0"/>
 		<radio_item label="Media" name="radio2" value="1"/>
 		<radio_item label="Aumentar" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="Usted" name="user"/>
 	<text name="text_box1">
 		Yo
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index ed24ccacd7..8993fa139f 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -20,7 +20,7 @@
 		(requiere reiniciar)
 	</text>
 	<text name="maturity_desired_prompt">
-		Quiero acceder a contenido calificado:
+		Quiero acceder a contenido:
 	</text>
 	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
@@ -62,6 +62,6 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta cuando estoy en el modo ocupado:
+		Respuesta cuando estoy en modo ocupado:
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index c5ecffc026..866390d8de 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -6,11 +6,11 @@
 	<text name="QualitySpeed">
 		Calidad y velocidad:
 	</text>
-	<text left="95" name="FasterText">
-		El más rápido
+	<text name="FasterText">
+		Más rápido
 	</text>
 	<text name="BetterText">
-		Mejor
+		Más calidad
 	</text>
 	<text name="ShadersPrefText">
 		Bajo
@@ -83,24 +83,23 @@
 		<text name="SkyMeshDetailText">
 			Bajo
 		</text>
-		<text name="LightingDetailText" width="135">
-			Detalles de la iluminación:
+		<text name="LightingDetailText">
+			Detalles de iluminación:
 		</text>
 		<radio_group name="LightingDetailRadio">
-			<radio_item label="Sólo el Sol y la Luna" name="SunMoon" value="0"/>
-			<radio_item label="Puntos de luz cercanos" name="LocalLights" value="1"/>
+			<radio_item label="Sólo el Sol y la Luna" name="SunMoon"/>
+			<radio_item label="Puntos de luz cercanos" name="LocalLights"/>
 		</radio_group>
 		<text name="TerrainDetailText">
-			Nivel de detalle del
- terreno:
+			Nivel de detalle del terreno:
 		</text>
-		<radio_group left_delta="60" name="TerrainDetailRadio">
+		<radio_group name="TerrainDetailRadio">
 			<radio_item label="Bajo" name="0"/>
 			<radio_item label="Alto" name="2"/>
 		</radio_group>
 	</panel>
 	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
-	<button label="Por defecto" left="110" name="Defaults" width="195"/>
+	<button label="Por defecto" name="Defaults"/>
 	<button label="Avanzado" name="Advanced"/>
 	<button label="Hardware" label_selected="Hardware" left="315" name="GraphicsHardwareButton"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
index a08e5194e8..3632ecca7b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
 	<panel.string name="log_in_to_change">
 		Conéctate para que cambie
 	</panel.string>
-	<button label="Limpiar el historial" name="clear_cache" tool_tip="Limpiar la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/>
+	<button label="Limpiar el historial" name="clear_cache" tool_tip="Limpia la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/>
 	<text name="cache_size_label_l">
 		(Localizaciones, imágenes, web, historial de búsqueda)
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 68ca63d85f..ebf2b1084b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -18,7 +18,7 @@
 		kbps
 	</text>
 	<check_box label="Personalizar el puerto" name="connection_port_enabled"/>
-	<spinner label="Número del puerto:" name="connection_port"/>
+	<spinner label="Número de puerto:" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Tamaño de la caché
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index 053fb00967..9e6cf49247 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -11,8 +11,8 @@
 	<check_box label="Activados" name="enable_media"/>
 	<slider label="Chat de voz" name="Voice Volume"/>
 	<check_box label="Activada" name="enable_voice_check"/>
-	<check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marca esto para permitir la ejecución automática de los media" value="Sí"/>
-	<check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Desmarcar esto esconderá los media anexados a otros avatares cercanos" value="Sí"/>
+	<check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="Sí"/>
+	<check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="Sí"/>
 	<text name="voice_chat_settings">
 		Configuración del chat de voz
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
index 037aae2e43..174922e28e 100644
--- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
@@ -14,7 +14,7 @@
 	</string>
 	<layout_stack name="progress_indicator_area">
 		<panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="El media se está cargando"/>
+			<progress_bar name="media_progress_bar" tool_tip="Los media se están cargando"/>
 		</panel>
 	</layout_stack>
 	<layout_stack name="media_controls">
@@ -28,7 +28,7 @@
 			<button name="home_btn" tool_tip="Página inicial"/>
 		</layout_panel>
 		<layout_panel name="media_stop">
-			<button name="media_stop_btn" tool_tip="Para los media"/>
+			<button name="media_stop_btn" tool_tip="Parar los media"/>
 		</layout_panel>
 		<layout_panel name="reload">
 			<button name="reload_btn" tool_tip="Recargar"/>
@@ -67,7 +67,7 @@
 			<slider name="volume_slider" tool_tip="Volumen de los media"/>
 		</layout_panel>
 		<layout_panel name="zoom_frame">
-			<button name="zoom_frame_btn" tool_tip="Zoom a la mitad"/>
+			<button name="zoom_frame_btn" tool_tip="Zoom hacia los media"/>
 		</layout_panel>
 		<layout_panel name="close">
 			<button name="close_btn" tool_tip="Alejar el zoom"/>
diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml
index 6347c0e047..d725bfe618 100644
--- a/indra/newview/skins/default/xui/es/panel_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_profile.xml
@@ -42,11 +42,11 @@
 			<button label="Llamar" name="call" tool_tip="Llamar a este Residente"/>
 			<button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/>
 			<button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/>
-			<button label="â–¼" name="overflow_btn" tool_tip="Pagar dinero o dar algo del inventario con el Residente"/>
+			<button label="▼" name="overflow_btn" tool_tip="Pagar dinero al Residente o compartir algo del inventario con él"/>
 		</layout_panel>
 		<layout_panel name="profile_me_buttons_panel">
-			<button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/>
-			<button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu físico, ropas, etc."/>
+			<button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/>
+			<button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu físico, ropas, etc."/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 1a230166fb..53d05cf2c9 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -25,8 +25,8 @@
 	<text name="Only Allow">
 		Restringir el acceso a cuentas verificadas por:
 	</text>
-	<check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsar a los Residentes no identificados."/>
-	<check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE].."/>
+	<check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/>
+	<check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/>
 	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
index 827898973a..89ad5549c8 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
@@ -4,13 +4,13 @@
 		Región:
 	</text>
 	<text name="region_text">
-		desconocido
+		desconocida
 	</text>
 	<text name="version_channel_text_lbl">
 		Versión:
 	</text>
 	<text name="version_channel_text">
-		desconocido
+		desconocida
 	</text>
 	<text name="region_type_lbl">
 		Tipo:
@@ -24,7 +24,7 @@
 	<check_box label="Impedir los &apos;empujones&apos;" name="restrict_pushobject"/>
 	<check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
 	<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
-	<check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/>
+	<check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permite que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/>
 	<spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
 	<spinner label="Plus de objetos" name="object_bonus_spin"/>
 	<text label="Calificación" name="access_text">
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index ecca21e672..83c22d20eb 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -48,7 +48,7 @@
 		Estos valores representan la gama de mezclas para las texturas superiores.
 	</text>
 	<text name="height_text_lbl11">
-		Midiendo en metros, el valor BAJO es la altura M�XIMA de la textura #1, y el valor ALTO es la altura M�NIMA de la textura #4.
+		Midiendo en metros, el valor BAJA es la altura M�XIMA de la textura #1, y el valor ALTA es la altura M�NIMA de la textura #4.
 	</text>
 	<text name="height_text_lbl12">
 		y el valor ALTA es la altura M�NIMA de la textura #4.
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 4226744ae9..d4404fd9b5 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -26,6 +26,6 @@
 	<text name="TimeText" tool_tip="Hora actual (Pacífico)">
 		24:00 AM PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="Inicia/Detiene todos los media (música, vídeo, páginas web)"/>
+	<button name="media_toggle_btn" tool_tip="Iniciar/Parar todos los media (música, vídeo, páginas web)"/>
 	<button name="volume_btn" tool_tip="Control general del volumen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
index 479af3f2bf..10b37b6880 100644
--- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
-	<button name="profile_btn" tool_tip="Muestra la información del ítem"/>
+	<button name="profile_btn" tool_tip="Mostrar la información del ítem"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
index ceb6e521cd..0d2eb0ac35 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
@@ -52,7 +52,7 @@
 			<text name="GroupLabel">
 				Grupo:
 			</text>
-			<check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles."/>
+			<check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
 			<text name="NextOwnerLabel">
 				Próximo propietario:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 6bfdbea2bc..0cd3b40ca6 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -39,37 +39,15 @@
 	<text name="title" value="Perfil del objeto"/>
 	<text name="where" value="(en el mundo)"/>
 	<panel label="">
-		<text name="Name:">
-			Nombre:
-		</text>
-		<text name="Description:">
-			Descripción:
-		</text>
 		<text name="CreatorNameLabel">
 			Creador:
 		</text>
 		<text name="Creator Name">
 			Erica Linden
 		</text>
-		<text name="Owner:">
-			Propietario:
-		</text>
 		<text name="Group_label">
 			Grupo:
 		</text>
-		<button name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
-		<name_box initial_value="Cargando..." name="Group Name Proxy"/>
-		<button label="Transfeir" label_selected="Transfeir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
-		<text name="label click action">
-			Al tocarlo:
-		</text>
-		<combo_box name="clickaction">
-			<combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/>
-			<combo_box.item label="Sentarme en el objeto" name="Sitonobject"/>
-			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
-			<combo_box.item label="Pagar al objeto" name="Payobject"/>
-			<combo_box.item label="Abrir" name="Open"/>
-		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
 				Puedes modificar este objeto
@@ -82,7 +60,7 @@
 			<text name="GroupLabel">
 				Grupo:
 			</text>
-			<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles"/>
+			<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
 			<text name="NextOwnerLabel">
 				Próximo propietario:
 			</text>
@@ -91,13 +69,6 @@
 			<check_box label="Transferirlo" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
 		</panel>
 		<check_box label="En venta" name="checkbox for sale"/>
-		<combo_box name="sale type">
-			<combo_box.item label="Copiarlo" name="Copy"/>
-			<combo_box.item label="Contenidos" name="Contents"/>
-			<combo_box.item label="Original" name="Original"/>
-		</combo_box>
-		<spinner label="Precio: L$" name="Edit Cost"/>
-		<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objetos en los resultados de la búsqueda"/>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 29486faa15..619094bbfa 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -804,7 +804,7 @@
 		Pulsa ESC para salir de la vista subjetiva
 	</string>
 	<string name="InventoryNoMatchingItems">
-		No se han encontrado ítems en el inventario. Intenta con [secondlife:///app/search/groups &quot;Buscar&quot;].
+		No se han encontrado tales ítems en el inventario.  Intenta con [secondlife:///app/search/groups &quot;Buscar&quot;].
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Arrastra aquí un hito para tenerlo en tus favoritos.
@@ -1268,13 +1268,13 @@
 		todos los estados que administras para [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Resientes autorizados: ([ALLOWEDAGENTS] de un máx. de [MAXACCESS])
+		Resientes autorizados: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
 		Grupos autorizados: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS])
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
-		Memoria de los script en la parcela
+		Memoria de los scripts de la parcela
 	</string>
 	<string name="ScriptLimitsParcelsOwned">
 		Parcelas listadas: [PARCELS]
@@ -1319,10 +1319,10 @@
 		Cabeza
 	</string>
 	<string name="ATTACH_LSHOULDER">
-		Hombro izq.
+		Hombro izquierdo
 	</string>
 	<string name="ATTACH_RSHOULDER">
-		Hombro der.
+		Hombro derecho
 	</string>
 	<string name="ATTACH_LHAND">
 		Mano izq.
@@ -1337,7 +1337,7 @@
 		Pie der.
 	</string>
 	<string name="ATTACH_BACK">
-		Espalda
+		Anterior
 	</string>
 	<string name="ATTACH_PELVIS">
 		Pelvis
@@ -1397,10 +1397,10 @@
 		Vientre
 	</string>
 	<string name="ATTACH_RPEC">
-		Pecho der.
+		Pecho derecho
 	</string>
 	<string name="ATTACH_LPEC">
-		Pecho izq.
+		Pecho izquierdo
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD: Centro 2
@@ -1471,7 +1471,7 @@
 		(se actualizará tras la publicación)
 	</string>
 	<string name="NoPicksClassifiedsText">
-		No has creado destacados o clasificados. Pulsa el botón Más para crear uno.
+		No has creado destacados ni clasificados. Pulsa el botón Más para crear uno.
 	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		El usuario no tiene clasificados ni destacados
@@ -3187,7 +3187,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		(Moderador)
 	</string>
 	<string name="started_call">
-		Iniciar una llamada de voz
+		Llamada de voz iniciada
 	</string>
 	<string name="joined_call">
 		Entrando a la llamada de voz
@@ -3199,7 +3199,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Conectado, pulsa Colgar para salir
 	</string>
 	<string name="hang_up-im">
-		Colgar la llamada de voz
+		Se colgó la llamada de voz
 	</string>
 	<string name="only_user_message">
 		Usted es el único usuario en esta sesión.
@@ -3211,7 +3211,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
 	</string>
 	<string name="muted_message">
-		Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje.
+		Has ignorado a este residente. Enviándole un mensaje, automáticamente dejarás de ignorarle.
 	</string>
 	<string name="generic">
 		Error en lo solicitado, por favor, inténtalo más tarde.
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index e7e2d8a0ee..d0e96583f0 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -109,7 +109,7 @@
 			<text name="Selling with no objects in parcel.">
 				Objets non inclus dans la vente
 			</text>
-			<button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" left="275" name="Cancel Land Sale" width="165"/>
+			<button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale"/>
 			<text name="Claimed:">
 				Acquis :
 			</text>
@@ -312,17 +312,17 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n&apos;importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
 			<check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n&apos;est pas cochée, ils ne pourront voler que lorsqu&apos;ils arrivent et passent au dessus de votre terrain."/>
-			<text left="152" name="allow_label2">
+			<text name="allow_label2">
 				Construire :
 			</text>
 			<check_box label="Tous" left="285" name="edit objects check"/>
 			<check_box label="Groupe" left="395" name="edit group objects check"/>
-			<text left="152" name="allow_label3" width="150">
+			<text name="allow_label3">
 				Laisser entrer des objets :
 			</text>
 			<check_box label="Tous" left="285" name="all object entry check"/>
 			<check_box label="Groupe" left="395" name="group object entry check"/>
-			<text left="152" name="allow_label4">
+			<text name="allow_label4">
 				Exécuter des scripts :
 			</text>
 			<check_box label="Tous" left="285" name="check other scripts"/>
@@ -367,11 +367,11 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				Photo :
 			</text>
 			<texture_picker bottom="-319" label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
-			<text bottom="-323" name="landing_point">
+			<text name="landing_point">
 				Lieu d&apos;arrivée : [LANDING]
 			</text>
-			<button bottom="-323" label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d&apos;arrivée des visiteurs. Définit l&apos;emplacement de votre avatar sur ce terrain."/>
-			<button bottom="-323" label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d&apos;arrivée"/>
+			<button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d&apos;arrivée des visiteurs. Définit l&apos;emplacement de votre avatar sur ce terrain."/>
+			<button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d&apos;arrivée"/>
 			<text bottom="-343" name="Teleport Routing: ">
 				Règles de téléportation :
 			</text>
@@ -380,7 +380,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				<combo_box.item label="Lieu d&apos;arrivée fixe" name="LandingPoint"/>
 				<combo_box.item label="Lieu d&apos;arrivée libre" name="Anywhere"/>
 			</combo_box>
-		</panel>
+		</panel>	
 		<panel label="MÉDIA" name="land_media_panel">
 			<text name="with media:" width="85">
 				Type :
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 309c93cf3b..558551b649 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -9,6 +9,18 @@
 	<floater.string name="move_tooltip">
 		Déplacer la caméra vers le haut et le bas, la gauche et la droite
 	</floater.string>
+	<floater.string name="orbit_mode_title">
+		Faire tourner
+	</floater.string>
+	<floater.string name="pan_mode_title">
+		Faire un panoramique
+	</floater.string>
+	<floater.string name="avatar_view_mode_title">
+		Préréglages
+	</floater.string>
+	<floater.string name="free_mode_title">
+		Voir l&apos;objet
+	</floater.string>
 	<panel name="controls">
 		<joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/>
 		<panel name="zoom" tool_tip="Zoomer en direction du point central">
@@ -25,7 +37,7 @@
 	<panel name="buttons">
 		<button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/>
 		<button label="" name="pan_btn" tool_tip="Faire un panoramique"/>
-		<button label="" name="avatarview_btn" tool_tip="Vue subjective"/>
+		<button label="" name="avatarview_btn" tool_tip="Préréglages"/>
 		<button label="" name="freecamera_btn" tool_tip="Voir l&apos;objet"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
index 02192c65ec..b005ce3b36 100644
--- a/indra/newview/skins/default/xui/fr/floater_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_event.xml
@@ -9,6 +9,18 @@
 	<floater.string name="dont_notify">
 		Ne pas prévenir
 	</floater.string>
+	<floater.string name="moderate">
+		Modéré
+	</floater.string>
+	<floater.string name="adult">
+		Adulte
+	</floater.string>
+	<floater.string name="general">
+		Général
+	</floater.string>
+	<floater.string name="unknown">
+		Inconnu
+	</floater.string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<text name="event_name">
@@ -21,12 +33,21 @@
 				Organisé par :
 			</text>
 			<text initial_value="(récupération en cours)" name="event_runby"/>
+			<text name="event_date_label">
+				Date :
+			</text>
 			<text name="event_date">
 				10/10/2010
 			</text>
+			<text name="event_duration_label">
+				Durée :
+			</text>
 			<text name="event_duration">
 				1 heure
 			</text>
+			<text name="event_covercharge_label">
+				Prix :
+			</text>
 			<text name="event_cover">
 				Gratuit
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index feb2fe1027..7647452e91 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -9,7 +9,7 @@
 	<floater.string name="Title">
 		SCRIPT : [NAME]
 	</floater.string>
-	<button label="Réinitialiser" label_selected="Réinitialiser" left="390" name="Reset" width="100"/>
-	<check_box initial_value="true" label="Exécution en cours" left="4" name="running"/>
-	<check_box initial_value="true" label="Mono" left_delta="160" name="mono"/>
+	<button label="Réinitialiser" label_selected="Réinitialiser" name="Reset"/>
+	<check_box initial_value="true" label="Exécution en cours" name="running"/>
+	<check_box initial_value="true" label="Mono" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 0e8887bb96..fac569557e 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -18,6 +18,15 @@
 	<string name="fly_back_tooltip">
 		Voler vers l&apos;arrière (appuyer sur la flèche vers le bas ou S)
 	</string>
+	<string name="walk_title">
+		Marcher
+	</string>
+	<string name="run_title">
+		Courir
+	</string>
+	<string name="fly_title">
+		Voler
+	</string>
 	<panel name="panel_actions">
 		<button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/>
@@ -30,6 +39,5 @@
 		<button label="" name="mode_walk_btn" tool_tip="Mode marche"/>
 		<button label="" name="mode_run_btn" tool_tip="Mode course"/>
 		<button label="" name="mode_fly_btn" tool_tip="Mode vol"/>
-		<button label="Atterrir" name="stop_fly_btn" tool_tip="Atterrir"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index dc40d31a79..433dc944cf 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -19,7 +19,7 @@
 		<combo_item name="Unconstrained">
 			Sans contraintes
 		</combo_item>
-		<combo_item name="1:1" tool_tip="Logo du groupe ou profil dans le monde physique">
+		<combo_item name="1:1" tool_tip="Logo du groupe ou profil dans la vie réelle">
 			1:1
 		</combo_item>
 		<combo_item name="4:3" tool_tip="Profil [SECOND_LIFE]">
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 74738b7e31..f01d865f29 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -62,8 +62,8 @@
 	<check_box label="Interface" name="ui_check"/>
 	<check_box label="HUD" name="hud_check"/>
 	<check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
-	<check_box label="Contraindre les proportions" name="keep_aspect_check"/>
-	<check_box label="Arrêt sur image (plein écran)" name="freeze_frame_check"/>
+	<check_box label="Conserver les proportions" name="keep_aspect_check"/>
+	<check_box label="Figer l'image (plein écran)" name="freeze_frame_check"/>
 	<button label="Rafraîchir" name="new_snapshot_btn"/>
 	<check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
 	<button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
index 54ba2ad3e5..1a7bc228fa 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
@@ -16,6 +16,9 @@
 		Il n&apos;y a personne près de vous avec le chat vocal activé
 	</string>
 	<layout_stack name="my_call_stack">
+		<layout_panel name="my_panel">
+			<text name="user_text" value="Mon avatar :"/>
+		</layout_panel>
 		<layout_panel name="leave_call_btn_panel">
 			<button label="Quitter l&apos;appel" name="leave_call_btn"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 1a74017330..6d697b40d3 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -10,7 +10,7 @@
 	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/>
 	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/>
 	<tab_container name="Water Tabs">
-		<panel label="Paramètres" name="Settings">
+		<panel label="PARAMÈTRES" name="Settings">
 			<text name="BHText">
 				Couleur du brouillard dans l&apos;eau
 			</text>
@@ -43,7 +43,7 @@
 				Multiplicateur de flou
 			</text>
 		</panel>
-		<panel label="Image" name="Waves">
+		<panel label="IMAGE" name="Waves">
 			<text name="BHText">
 				Direction grande vague
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index d92fadd048..9f93302b71 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -6,9 +6,9 @@
 	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
 	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
 	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/>
-	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_pad="20" left_delta="95" name="WLDayCycleMenuButton" width="150"/>
+	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/>
 	<tab_container name="WindLight Tabs" width="706">
-		<panel label="Atmosphère" name="Atmosphere">
+		<panel label="ATMOSPHÈRE" name="Atmosphere">
 			<text name="BHText">
 				Bleu de l&apos;horizon
 			</text>
@@ -62,7 +62,7 @@
 			</text>
 			<button label="?" name="WLMaxAltitudeHelp"/>
 		</panel>
-		<panel label="Éclairage" name="Lighting">
+		<panel label="LUMIÈRE" name="Lighting">
 			<text name="SLCText">
 				Couleur soleil/lune
 			</text>
@@ -118,7 +118,7 @@
 			</text>
 			<button label="?" name="WLStarBrightnessHelp"/>
 		</panel>
-		<panel label="Nuages" name="Clouds">
+		<panel label="NUAGES" name="Clouds">
 			<text name="WLCloudColorText">
 				Couleur des nuages
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 19ea764ae8..addbaf2199 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,57 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="CARTE DU MONDE">
-	<panel name="objects_mapview" width="542"/>
 	<panel name="layout_panel_1">
 		<text name="events_label">
 			Légende
 		</text>
 	</panel>
 	<panel>
-		<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de mon avatar" width="165"/>
+		<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de mon avatar"/>
 		<text name="me_label">
 			Moi
 		</text>
 		<check_box label="Résident" name="people_chk"/>
-		<icon left="-262" name="person"/>
 		<text name="person_label">
 			Résident
 		</text>
 		<check_box label="Infohub" name="infohub_chk"/>
-		<icon left="-266" name="infohub"/>
 		<text name="infohub_label">
 			Infohub
 		</text>
 		<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
-		<icon left="-266" name="landforsale"/>
 		<text name="land_sale_label">
 			Vente de terrains
 		</text>
-		<icon left="-270" name="square2"/>
 		<text name="by_owner_label">
 			par le propriétaire
 		</text>
 		<text name="auction_label">
 			enchères
 		</text>
-		<button label="Aller chez moi" label_selected="Aller chez moi" left="-120" name="Go Home" tool_tip="Me téléporter jusqu&apos;à mon domicile" width="108"/>
+		<button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Me téléporter jusqu&apos;à mon domicile"/>
 		<text name="Home_label">
 			Domicile
 		</text>
-		<text left="-144" name="events_label">
+		<text name="events_label">
 			Événements :
 		</text>
 		<check_box label="PG" name="event_chk"/>
-		<icon left="-132" name="event"/>
 		<text name="pg_label">
 			Général
 		</text>
 		<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
-		<icon left="-132" name="events_mature_icon"/>
 		<text name="mature_label">
 			Modéré
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
-		<icon left="-132" name="events_adult_icon"/>
 		<text name="adult_label">
 			Adulte
 		</text>
@@ -62,23 +54,22 @@
 		</text>
 	</panel>
 	<panel>
-		<combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte" width="232">
+		<combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte">
 			<combo_box.item label="Mes amis connectés" name="item1"/>
 		</combo_box>
-		<icon left="-270" name="landmark_icon"/>
-		<combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
+		<combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte">
 			<combo_box.item label="Mes repères" name="item1"/>
 		</combo_box>
-		<search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155"/>
-		<button label="Trouver" label_selected="&gt;" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
+		<search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d&apos;une région"/>
+		<button label="Trouver" label_selected="&gt;" name="DoSearch" tool_tip="Recherchez sur la carte"/>
 		<button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/>
-		<scroll_list left="-270" name="search_results" width="252">
+		<scroll_list 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" left="-270" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
-		<button label="Copier la SLurl" left="-270" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;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&apos;endroit sélectionné" width="165"/>
+		<button label="Téléporter" label_selected="Téléporter" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
+		<button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;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&apos;endroit sélectionné"/>
 	</panel>
 	<panel>
 		<text name="zoom_label">
@@ -86,6 +77,6 @@
 		</text>
 	</panel>
 	<panel>
-		<slider label="Zoom" left="-270" name="zoom slider"/>
+		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 1837be9c5d..6492a83e06 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="Construire" name="Build"/>
 	<menu_item_call label="Ouvrir" name="Open"/>
 	<menu_item_call label="M&apos;asseoir ici" name="Object Sit"/>
+	<menu_item_call label="Me lever" name="Object Stand Up"/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<context_menu label="Porter  â–¶" name="Put On">
@@ -18,6 +19,7 @@
 		<menu_item_call label="Retour" name="Return..."/>
 		<menu_item_call label="Supprimer" name="Delete"/>
 	</context_menu>
+	<menu_item_call label="Acheter" name="Pie Object Bye"/>
 	<menu_item_call label="Prendre" name="Pie Object Take"/>
 	<menu_item_call label="Prendre une copie" name="Take Copy"/>
 	<menu_item_call label="Payer" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 08a97ee403..26bd3978a9 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Carte" name="Map"/>
 	<menu_item_call label="Partager" name="Share"/>
 	<menu_item_call label="Payer" name="Pay"/>
 	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index c54a4341f1..5925d28565 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -43,6 +43,8 @@
 			<menu_item_check label="Balises" name="beacons"/>
 			<menu_item_check label="Limites du terrain" name="Property Lines"/>
 			<menu_item_check label="Propriétaires de terrains" name="Land Owners"/>
+			<menu_item_check label="Coordonnées" name="Coordinates"/>
+			<menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/>
 		</menu>
 		<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
 		<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
@@ -81,7 +83,8 @@
 		<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
 		<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
 		<menu label="Objet" name="Object">
-			<menu_item_call label="Acheter" name="Menu Object Take"/>
+			<menu_item_call label="Acheter" name="Menu Object Buy"/>
+			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
 			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
@@ -149,7 +152,6 @@
 			<menu_item_check label="Alpha" name="Alpha"/>
 			<menu_item_check label="Arbre" name="Tree"/>
 			<menu_item_check label="Avatars" name="Character"/>
-			<menu_item_check label="SurfacePath" name="Surface"/>
 			<menu_item_check label="Ciel" name="Sky"/>
 			<menu_item_check label="Eau" name="Water"/>
 			<menu_item_check label="Sol" name="Ground"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 28f9f9e52c..7d2a33509b 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -445,9 +445,8 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 		Impossible d&apos;écrire le fichier [[FILE]]
 	</notification>
 	<notification name="UnsupportedHardware">
-		Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d&apos;être médiocres. Malheureusement, la page [SUPPORT_SITE] n’offre aucune assistance pour les problèmes de configuration système.
+		Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d&apos;être médiocres. Malheureusement, la section [SUPPORT_SITE] n&apos;offre aucune aide pour les problèmes de configuration système.
 
-MINSPECS
 Consulter [_URL] pour en savoir plus ?
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=fr
@@ -2335,6 +2334,12 @@ Veuillez réessayer dans quelques minutes.
 	<notification name="FriendshipDeclined">
 		[NAME] a refusé votre amitié.
 	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		Amitié acceptée.
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		Amitié refusée.
+	</notification>
 	<notification name="OfferCallingCard">
 		[FIRST] [LAST] vous offre sa carte de visite.
 Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d&apos;envoyer rapidement un IM à ce résident.
@@ -2543,7 +2548,7 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
 	</notification>
 	<notification name="ConfirmCloseAll">
 		Êtes-vous certain de vouloir fermer tous les IM ?
-		<usetemplate name="okcancelignore" notext="Annuler" yestext="OK"/>
+		<usetemplate ignoretext="Confirmer avant de fermer tous les IM." name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		L&apos;élément joint a été sauvegardé.
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index d10a7f37e1..7c8365fdee 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -33,7 +33,7 @@
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
 				</panel>
 				<panel name="first_life_image_panel">
-					<text name="real_world_photo_title_text" value="Monde physique :"/>
+					<text name="real_world_photo_title_text" value="Vie réelle :"/>
 				</panel>
 				<icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
 				<text name="title_homepage_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index 10ec952aa3..ad9e3daf3d 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Téléporter" name="offer_teleport_btn" tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes"/>
 	<button label="Payer" name="pay_btn" tool_tip="Donnez des L$ à cet ami"/>
 	<button label="Supprimer" name="remove_btn" tool_tip="Supprimez ce résident de votre liste d&apos;amis"/>
-	<button label="Ajouter" name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+	<button label="Ajouter" name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 7fc10833ea..e1eeaa8601 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -15,10 +15,10 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 			<filter_editor label="Filtrer les membres" name="filter_input"/>
 			<name_list name="member_list">
 				<name_list.columns label="Membre" name="name"/>
-				<name_list.columns label="Donation" name="donated" width="116"/>
-				<name_list.columns label="Statut" name="online" width="136"/>
+				<name_list.columns label="Donation" name="donated"/>
+				<name_list.columns label="Statut" name="online"/>
 			</name_list>
-			<button label="Inviter" name="member_invite" width="165"/>
+			<button label="Inviter" name="member_invite"/>
 			<button label="Expulser" name="member_eject"/>
 		</panel>
 		<panel label="RÔLES" name="roles_sub_tab">
@@ -47,7 +47,7 @@ notamment les rôles Tous et Propriétaire.
 				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
 			<button label="Nouveau rôle" name="role_create"/>
-			<button label="Supprimer le rôle" name="role_delete" width="120"/>
+			<button label="Supprimer le rôle" name="role_delete"/>
 		</panel>
 		<panel height="148" label="POUVOIRS" name="actions_sub_tab" tool_tip="Vous pouvez afficher une description du pouvoir et voir quels membres et rôles peuvent s&apos;en servir.">
 			<panel.string name="help_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
index 115e25e487..1f2169e22c 100644
--- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Partager" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Payer" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_my_profile.xml b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
index 73affc3420..ce2e5f4c60 100644
--- a/indra/newview/skins/default/xui/fr/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
@@ -26,7 +26,7 @@
 					</panel>
 					<panel name="first_life_image_panel">
 						<icon label="" name="real_world_edit_icon" tool_tip="Cliquez sur le bouton Modifier le profil ci-dessous pour changer d&apos;image"/>
-						<text name="title_rw_descr_text" value="Monde physique :"/>
+						<text name="title_rw_descr_text" value="Vie réelle :"/>
 					</panel>
 					<text name="title_member_text" value="Résident depuis :"/>
 					<text name="title_acc_status_text" value="Statut du compte :"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml
index ba052a0e07..f4e4f8a4ab 100644
--- a/indra/newview/skins/default/xui/fr/panel_notes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notes.xml
@@ -13,7 +13,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="notes_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/>
 			<button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f129f56261..39885e1e12 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -21,12 +21,12 @@
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
 			<text name="no_friends_msg">
-				Pour ajouter des amis, essayez [secondlife:///app/search/people la recherche globale] ou cliquez sur un utilisateur pour l&apos;ajouter à vos amis.
-Si vous voulez rencontrer d&apos;autres résidents, ouvrez la [secondlife:///app/worldmap carte].
+				Pour ajouter des amis, utilisez la [secondlife:///app/search/people recherche]  ou cliquez sur un résident pour l&apos;ajouter à vos amis.
+Si vous souhaitez rencontrer d&apos;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 à ce résident de devenir votre ami"/>
+				<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 				<button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index d24570b0a1..2cd8744ae5 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="(inconnu)"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcelle">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Catégorie :"/>
 						<text name="rating_value" value="(inconnu)"/>
 						<text name="voice_label" value="Voix :"/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Région">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Région :"/>
 						<text name="region_name" value="Pays des orignaux"/>
 						<text name="region_type_label" value="Type :"/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Domaine">
-					<panel>
+					<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 :"/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="À vendre">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Prix :"/>
 						<text name="area_label" value="Surface :"/>
 						<text name="traffic_label" value="Trafic :"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
index f6a64f0c58..f740dcd326 100644
--- a/indra/newview/skins/default/xui/fr/panel_places.xml
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
@@ -7,9 +7,9 @@
 		<button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu&apos;à la zone sélectionnée"/>
 		<button label="Carte" name="map_btn"/>
 		<button label="Éditer" name="edit_btn" tool_tip="Modifier les informations du repère"/>
-		<button name="overflow_btn" tool_tip="Afficher d&apos;autres options"/>
-		<button label="Fermer" name="close_btn"/>
-		<button label="Annuler" name="cancel_btn"/>
+		<button label="â–¼" name="overflow_btn" tool_tip="Afficher d&apos;autres options"/>
 		<button label="Enregistrer" name="save_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+		<button label="Fermer" name="close_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 27242ec3de..71f7990073 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="Moins" name="radio" value="0"/>
 		<radio_item label="Moyenne" name="radio2" value="1"/>
 		<radio_item label="Plus" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="Vous" name="user"/>
 	<text name="text_box1">
 		Moi
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index aa004d2c84..450ad64ae4 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -17,7 +17,7 @@
 	<text name="QualitySpeed">
 		Qualité et vitesse :
 	</text>
-	<text left="35" name="FasterText">
+	<text name="FasterText">
 		Plus rapide
 	</text>
 	<text name="BetterText">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 3c789574a4..ecea368c54 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -17,8 +17,8 @@
 	<text name="text_box2">
 		kbps
 	</text>
-	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinner label="Numéro de port :" name="connection_port"/>
+	<check_box label="Port de connexion" name="connection_port_enabled"/>
+	<spinner label="Numéro :" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 27d2b2182b..4c055a2b8d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
 	<check_box label="Activé" name="enable_voice_check"/>
 	<check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="vrai"/>
 	<check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="vrai"/>
-	<text name="Listen from">
+	<text name="voice_chat_settings">
 		Paramètres du chat vocal
 	</text>
+	<text name="Listen from">
+		Écouter à partir de :
+	</text>
 	<radio_group name="ear_location">
 		<radio_item label="Position de la caméra" name="0"/>
 		<radio_item label="Position de l&apos;avatar" name="1"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index 364426fed1..8cb4641937 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -24,7 +24,7 @@
 						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
 					</panel>
 					<panel name="first_life_image_panel">
-						<text name="title_rw_descr_text" value="Monde physique :"/>
+						<text name="title_rw_descr_text" value="Vie réelle :"/>
 					</panel>
 					<text name="title_member_text" value="Résident depuis :"/>
 					<text name="title_acc_status_text" value="Statut du compte :"/>
@@ -41,7 +41,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="profile_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" tool_tip="Ouvrir une session IM" width="30"/>
 			<button label="Appeler" name="call" tool_tip="Appeler ce résident" width="60"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index f9262ea478..e1acbe3817 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -20,8 +20,8 @@ domaine.
 	<text name="Only Allow">
 		Limiter l&apos;accès aux comptes vérifiés par :
 	</text>
-	<check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/>
-	<check_box label="Vérification de mon âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n&apos;ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d&apos;informations."/>
+	<check_box label="Infos de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/>
+	<check_box label="Vérification de l'âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n&apos;ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d&apos;informations."/>
 	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index e58e806f99..657bf792cf 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -22,10 +22,10 @@
 		[AMT] L$
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/>
-	<button label="Acheter des L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
+	<button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
 	<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
 		00h00 PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="Cliquer pour activer/désactiver le média"/>
+	<button name="media_toggle_btn" tool_tip="Arrêter tous les médias (musique, vidéo, pages web)"/>
 	<button name="volume_btn" tool_tip="Contrôle du volume global"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index e617ae444d..def71d96b4 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="Profil de l&apos;objet"/>
 	<text name="where" value="(dans Second Life)"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nom :
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index c9a5b5917d..d78b78f7d0 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1506,6 +1506,9 @@
 	<string name="NoPicksClassifiedsText">
 		Vous n&apos;avez pas créé de favoris ni de petites annonces Cliquez sur le bouton Plus pour créer un favori ou une petite annonce.
 	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		L&apos;utilisateur n&apos;a ni favoris ni petites annonces
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		Chargement...
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
index a672df0d96..1b47dd7d7e 100644
--- a/indra/newview/skins/default/xui/it/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_world_map.xml
@@ -5,7 +5,8 @@
 			Legenda
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button font="SansSerifSmall" label="Mostra la mia posizione" label_selected="Mostra la mia posizione" left_delta="91" name="Show My Location" tool_tip="Centra la mappa sul luogo dove si trova il mio avatar" width="135"/>
 		<text name="person_label">
 			Io
@@ -37,12 +38,14 @@
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Trova sulla Mappa
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amici Online" name="friend combo" tool_tip="Mostra amici sulla mappa">
 			<combo_box.item label="Miei Amici Online" name="item1"/>
 		</combo_box>
@@ -59,12 +62,14 @@
 		<button font="SansSerifSmall" label="Copia SLurl" name="copy_slurl" tool_tip="Copia il luogo attuale come SLurl per essere usato nel web."/>
 		<button font="SansSerifSmall" label="Mostra Selezione" label_selected="Mostra destinazione" left_delta="91" name="Show Destination" tool_tip="Centra la mappa sul luogo prescelto" width="135"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
index 70e1577199..03716ba4c5 100644
--- a/indra/newview/skins/default/xui/it/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml
@@ -48,7 +48,7 @@
 			<text name="maturity_value" value="sconosciuto"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Parcel">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Valutazione:"/>
 						<text name="rating_value" value="sconosciuto"/>
 						<text name="voice_label" value="Voice:"/>
@@ -67,7 +67,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Regione">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Regione:"/>
 						<text name="region_type_label" value="Scrivi:"/>
 						<text name="region_rating_label" value="Valutazione:"/>
@@ -77,7 +77,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Proprietà immobiliare">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Proprietà immobiliare:"/>
 						<text name="estate_rating_label" value="Valutazione:"/>
 						<text name="estate_owner_label" value="Proprietà:"/>
@@ -85,7 +85,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="In vendita">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Prezzo:"/>
 						<text name="area_label" value="Area:"/>
 						<text name="traffic_label" value="Traffico:"/>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index e5f27795be..0eecdfb2a2 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -36,7 +36,7 @@
 	<panel.string name="Sale Mixed">
 		Vendita assortita
 	</panel.string>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			Nome:
 		</text>
@@ -74,7 +74,7 @@
 		</combo_box>
 		<spinner label="Prezzo: L$" name="Edit Cost"/>
 		<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Mostra questo oggetto nei risultati della ricerca"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Puoi modificare questo oggetto
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 9105c2613d..0eaad11cc7 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -43,7 +43,7 @@ Vivox �ージョン： [VIVOX_VERSION]
 		</panel>
 		<panel label="クレジット" name="credits_panel">
 			<text_editor name="credits_editor">
-				Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les�Michon�Jenelle�Geo�Siz�Shapiro�Pete�Calyle�Selene�Allen�Phoebe�Goldin�Kimmora�Dakota�Slaton�Lindquist�Zoey�Hari�Othello�Rohit�Sheldon�Petra�Viale�Gordon�Kaye�Pink�Ferny�Emerson�Davy�Bri�Chan�Juan�Robert�Terrence�Nathan�Carl����他多数�人��よ��作��れ���。
+				Second Life �� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les�Michon�Jenelle�Geo�Siz�Shapiro�Pete�Calyle�Selene�Allen�Phoebe�Goldin�Kimmora�Dakota�Slaton�Lindquist�Zoey�Hari�Othello�Rohit�Sheldon�Petra�Viale�Gordon�Kaye�Pink�Ferny�Emerson�Davy�Bri�Chan�Juan�Robert�Terrence�Nathan�Carl����他多数�人��よ��作��れ���。
 
   ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 3730bcd385..610d4183b3 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -9,6 +9,18 @@
 	<floater.string name="move_tooltip">
 		カメラを上下左��移動
 	</floater.string>
+	<floater.string name="orbit_mode_title">
+		旋回
+	</floater.string>
+	<floater.string name="pan_mode_title">
+		水平・垂直移動
+	</floater.string>
+	<floater.string name="avatar_view_mode_title">
+		固定
+	</floater.string>
+	<floater.string name="free_mode_title">
+		オブジェクトを見る
+	</floater.string>
 	<panel name="controls">
 		<joystick_track name="cam_track_stick" tool_tip="カメラを上下左��動����"/>
 		<panel name="zoom" tool_tip="����る方法�カメラをズーム">
@@ -25,7 +37,7 @@
 	<panel name="buttons">
 		<button label="" name="orbit_btn" tool_tip="カメラを回�"/>
 		<button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/>
-		<button label="" name="avatarview_btn" tool_tip="ア�ター視点"/>
+		<button label="" name="avatarview_btn" tool_tip="固定"/>
 		<button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 3bd5ed2837..2a7985fe58 100644
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="デイ・サイクル編集">
+<floater name="Day Cycle Floater" title="デイサイクル編集">
 	<tab_container name="Day Cycle Tabs">
-		<panel label="デイ・サイクル" name="Day Cycle">
+		<panel label="デイサイクル" name="Day Cycle">
 			<button label="?" name="WLDayCycleHelp" />
 			<text name="WL12am">
 				深夜 12時
@@ -63,7 +63,7 @@
 				キーフレーム�設定：
 			</text>
 			<text name="WLCurKeyTimeText">
-				キー・タイム：
+				キータイム：
 			</text>
 			<spinner label="時間" name="WLCurKeyHour" />
 			<spinner label="分" name="WLCurKeyMin" />
@@ -88,10 +88,10 @@
 			<button label="�止!" label_selected="�止" name="WLStopAnimSky" />
 			<button label="�動産�時刻を使用"
 			     label_selected="�動産�時刻�変更" name="WLUseLindenTime" width="140"/>
-			<button label="デイ・テストを�存"
-			     label_selected="デイ・テストを�存" name="WLSaveDayCycle" />
-			<button label="デイ・テストをロード"
-			     label_selected="デイ・テストをロード" name="WLLoadDayCycle" />
+			<button label="デイテストを�存"
+			     label_selected="デイテストを�存" name="WLSaveDayCycle" />
+			<button label="デイテストをロード"
+			     label_selected="デイテストをロード" name="WLLoadDayCycle" />
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index 306b262b70..671f9077d9 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -9,6 +9,18 @@
 	<floater.string name="dont_notify">
 		知ら���
 	</floater.string>
+	<floater.string name="moderate">
+		Moderate
+	</floater.string>
+	<floater.string name="adult">
+		Adult
+	</floater.string>
+	<floater.string name="general">
+		General
+	</floater.string>
+	<floater.string name="unknown">
+		�明
+	</floater.string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<text name="event_name">
@@ -21,12 +33,21 @@
 				主催者：
 			</text>
 			<text initial_value="（�得中）" name="event_runby"/>
+			<text name="event_date_label">
+				日付：
+			</text>
 			<text name="event_date">
 				10/10/2010
 			</text>
+			<text name="event_duration_label">
+				期間：
+			</text>
 			<text name="event_duration">
 				1 時間
 			</text>
+			<text name="event_covercharge_label">
+				カ�ー�ャージ：
+			</text>
 			<text name="event_cover">
 				ç„¡æ–™
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index 8ba297c7a0..20aec48541 100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
@@ -18,6 +18,15 @@
 	<string name="fly_back_tooltip">
 		後��飛�（下矢�� S を押�）
 	</string>
+	<string name="walk_title">
+		歩�
+	</string>
+	<string name="run_title">
+		èµ°ã‚‹
+	</string>
+	<string name="fly_title">
+		飛�
+	</string>
 	<panel name="panel_actions">
 		<button label="" label_selected="" name="turn left btn" tool_tip="左を��（左矢�� A を押�）"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="�を��（�矢�� D を押�）"/>
@@ -30,6 +39,5 @@
 		<button label="" name="mode_walk_btn" tool_tip="歩行モード"/>
 		<button label="" name="mode_run_btn" tool_tip="走行モード"/>
 		<button label="" name="mode_fly_btn" tool_tip="飛行モード"/>
-		<button label="飛行�止" name="stop_fly_btn" tool_tip="飛行�止"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index 606dda12bd..4fc59e16d3 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		説明：
 	</text>
-	<button label="インワールド��生�る" label_selected="�止" name="Anim play btn" tool_tip="他人�も見�るよ���生���"/>
+	<button label="インワールド��生" label_selected="�止" name="Anim play btn" tool_tip="他人�も見�るよ���生���"/>
 	<button label="ローカル�生" label_selected="�止" name="Anim audition btn" tool_tip="自分���見�るよ���生���"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 8a0aea717c..c437e8c02a 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -33,10 +33,10 @@
 	<text name="trigger_label">
 		トリガー:
 	</text>
-	<text name="replace_text" tool_tip="トリガー・ワードを�れら��語�置�����。 �����トリガー「hello�を「Howdy��置��る��「I wanted to say hello�����ャット文�「I wanted to say howdy��変�り�ジェス�ャー�も置���映�れ��。">
+	<text name="replace_text" tool_tip="トリガーワードを�れら��語�置�����。 �����トリガー「hello�を「Howdy��置��る��「I wanted to say hello�����ャット文�「I wanted to say howdy��変�り�ジェス�ャー�も置���映�れ��。">
 		置�：
 	</text>
-	<line_editor name="replace_editor" tool_tip="トリガー・ワードを�れら��語�置�����。 �����トリガー「hello�を「Howdy��置��る��「I wanted to say hello�����ャット文�「I wanted to say howdy��変�り�ジェス�ャー�も置���映�れ��。"/>
+	<line_editor name="replace_editor" tool_tip="トリガーワードを�れら��語�置�����。 �����トリガー「hello�を「Howdy��置��る��「I wanted to say hello�����ャット文�「I wanted to say howdy��変�り�ジェス�ャー�も置���映�れ��。"/>
 	<text name="key_label">
 		ショートカット：
 	</text>
@@ -62,7 +62,7 @@
 	<text name="help_label">
 		待機ステップを入れ���り������ステップ��時�起�り��。
 	</text>
-	<check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェス�ャー��トリガー・フレーズを使������ホット・キーを押����よ��トリガー����。  1��ショートカット・キー�2�以上�ジェス�ャー�割り当�られ�場����ジェス�ャー�両方�もアクティブ�����り��。"/>
+	<check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ�ジェス�ャー��トリガーフレーズを使���ホットキーを押��切り替�り��。  1��ショートカットキー�2�以上�ジェス�ャー�割り当�られ�場����ジェス�ャー�両方�もアクティブ�����り��。"/>
 	<button label="プレビュー" name="preview_btn"/>
 	<button label="�存" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index c8375389ce..5c0f05cec6 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		説明：
 	</text>
-	<button label="インワールド��生�る" label_selected="インワールド��生�る" name="Sound play btn" tool_tip="他人�も���るよ���生���"/>
+	<button label="インワールド��生" label_selected="インワールド��生" name="Sound play btn" tool_tip="他人�も���るよ���生���"/>
 	<button label="ローカル�生" label_selected="ローカル�生" name="Sound audition btn" tool_tip="自分������るよ���生���"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index e9de43189c..a8261a7493 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -69,7 +69,7 @@
 	</text>
 	<check_box label="両�を引伸��" left="116" name="checkbox uniform"/>
 	<check_box initial_value="true" label="テクス�ャを引伸��" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="グリッド�イント�スナップ" left_delta="27" name="checkbox snap to grid"/>
+	<check_box initial_value="true" label="グリッド�スナップ" left_delta="27" name="checkbox snap to grid"/>
 	<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクト��置�使�グリッドルーラを�択���" width="76">
 		<combo_box.item label="インワールドグリッド" name="World"/>
 		<combo_box.item label="ローカルグリッド" name="Local"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
index 5a0694e5c5..5af8f20690 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
@@ -16,6 +16,9 @@
 		近��ボイスを有効����る人����ん。
 	</string>
 	<layout_stack name="my_call_stack">
+		<layout_panel name="my_panel">
+			<text name="user_text" value="マイ ア�ター："/>
+		</layout_panel>
 		<layout_panel name="leave_call_btn_panel">
 			<button label="コール終了" name="leave_call_btn"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
index 52cd91a08a..fb64332e79 100644
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ b/indra/newview/skins/default/xui/ja/floater_water.xml
@@ -28,10 +28,10 @@
 			<slider label="2" name="WaterNormalScaleY"/>
 			<slider label="3" name="WaterNormalScaleZ"/>
 			<text name="HDText">
-				フレ�ル・スケール
+				フレ�ル�スケール
 			</text>
 			<text name="FresnelOffsetText">
-				フレ�ル・オフセット
+				フレ�ル�オフセット
 			</text>
 			<text name="DensMultText">
 				水��屈折スケール
@@ -63,7 +63,7 @@
 				Y
 			</text>
 			<text name="BHText3">
-				ノーマル・マップ
+				ノーマルマップ
 			</text>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index 42fedfc075..6b7e872ccd 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -5,7 +5,8 @@
 			表記・記�
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button label="�在地を表示" label_selected="�在地を表示" name="Show My Location" tool_tip="ア�ター��置を地図�中心�表示���"/>
 		<text name="me_label">
 			自分
@@ -48,19 +49,21 @@
 			Adult
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			地図上�探�
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="オンライン�フレンド" name="friend combo" tool_tip="フレンドを地図上�表示���">
 			<combo_box.item label="オンライン�フレンド" name="item1"/>
 		</combo_box>
 		<combo_box label="マイ ランドマーク" name="landmark combo" tool_tip="地図上�表示�るランドマーク">
 			<combo_box.item label="マイ ランドマーク" name="item1"/>
 		</combo_box>
-		<search_editor label="リージョン�" name="location" tool_tip="地域�を入力������。"/>
+		<search_editor label="リージョン�" name="location" tool_tip="リージョン�を入力������"/>
 		<button label="検索" name="DoSearch" tool_tip="地域検索"/>
 		<button name="Clear" tool_tip="追跡ラインをクリア��地図をリセット���"/>
 		<scroll_list name="search_results">
@@ -68,15 +71,17 @@
 			<scroll_list.columns label="" name="sim_name"/>
 		</scroll_list>
 		<button label="テレ�ート" label_selected="テレ�ート" name="Teleport" tool_tip="�択��場所�テレ�ート���"/>
-		<button label="SLurl をコピー" name="copy_slurl" tool_tip="�在地を SLurl �コピー�� Web �使用���。"/>
+		<button label="SLurl をコピー" name="copy_slurl" tool_tip="�在地を SLurl �コピー�� Web �使用���"/>
 		<button label="�択をを表示�る" label_selected="目的地を表示" name="Show Destination" tool_tip="�択��場所を地図�中心�表示���"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			ズーム
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="ズーム" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 1ff2dfec7b..e59a500534 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="制作" name="Build"/>
 	<menu_item_call label="開�" name="Open"/>
 	<menu_item_call label="���座る" name="Object Sit"/>
+	<menu_item_call label="立�上�る" name="Object Stand Up"/>
 	<menu_item_call label="オブジェクト�プロフィール" name="Object Inspect"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<context_menu label="装�  ▶" name="Put On">
@@ -18,6 +19,7 @@
 		<menu_item_call label="返�" name="Return..."/>
 		<menu_item_call label="削除" name="Delete"/>
 	</context_menu>
+	<menu_item_call label="買�" name="Pie Object Bye"/>
 	<menu_item_call label="�る" name="Pie Object Take"/>
 	<menu_item_call label="コピーを�る" name="Take Copy"/>
 	<menu_item_call label="支払�" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 4788803789..8d84b0e521 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -5,6 +5,7 @@
 	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="地図" name="Map"/>
 	<menu_item_call label="共有" name="Share"/>
 	<menu_item_call label="支払�" name="Pay"/>
 	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index a97e7f2f5d..bcad812457 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -6,12 +6,12 @@
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
 		</menu_item_call>
 		<menu_item_call label="L$ �購入" name="Buy and Sell L$"/>
-		<menu_item_call label="マイ プロフィール" name="Profile"/>
-		<menu_item_call label="マイ 容姿" name="Appearance"/>
-		<menu_item_check label="マイ ��物" name="Inventory"/>
+		<menu_item_call label="プロフィール" name="Profile"/>
+		<menu_item_call label="容姿" name="Appearance"/>
+		<menu_item_check label="��物" name="Inventory"/>
 		<menu_item_check label="��物" name="ShowSidetrayInventory"/>
-		<menu_item_check label="マイ ジェス�ャー" name="Gestures"/>
-		<menu label="マイ ログイン状態" name="Status">
+		<menu_item_check label="ジェス�ャー" name="Gestures"/>
+		<menu label="ログイン状態" name="Status">
 			<menu_item_call label="一時退席中" name="Set Away"/>
 			<menu_item_call label="�り込�中" name="Set Busy"/>
 		</menu>
@@ -43,6 +43,8 @@
 			<menu_item_check label="ビーコン（標識）" name="beacons"/>
 			<menu_item_check label="プロパティ境界線" name="Property Lines"/>
 			<menu_item_check label="土地所有者" name="Land Owners"/>
+			<menu_item_check label="座標" name="Coordinates"/>
+			<menu_item_check label="区画プロパティ" name="Parcel Properties"/>
 		</menu>
 		<menu_item_call label="ホーム�テレ�ート" name="Teleport Home"/>
 		<menu_item_call label="�在地をホーム�設定" name="Set Home to Here"/>
@@ -81,6 +83,7 @@
 		<menu_item_call label="�択��も��焦点を���る" name="Focus on Selection"/>
 		<menu_item_call label="�択��も�をズーム�る" name="Zoom to Selection"/>
 		<menu label="オブジェクト" name="Object">
+			<menu_item_call label="買�" name="Menu Object Buy"/>
 			<menu_item_call label="�る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを�る" name="Take Copy"/>
 			<menu_item_call label="「��物���存" name="Save Object Back to My Inventory"/>
@@ -238,7 +241,7 @@
 		<menu label="レンダーテスト" name="Render Tests">
 			<menu_item_check label="カメラオフセット" name="Camera Offset"/>
 			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
-			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
+			<menu_item_check label="定期的���フレームを挿入�る" name="Periodic Slow Frame"/>
 			<menu_item_check label="フレームテスト" name="Frame Test"/>
 		</menu>
 		<menu label="メタデータ�レンダー" name="Render Metadata">
@@ -341,7 +344,7 @@
 				<menu_item_call label="PG �トグル" name="Toggle PG"/>
 				<menu_item_check label="�択ア�ター許�" name="Allow Select Avatar"/>
 			</menu>
-			<menu_item_call label="Params をデフォルト�実行�る" name="Force Params to Default"/>
+			<menu_item_call label="パラメータを強制的�デフォルト��る" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
 			<menu_item_check label="スローモーション�アニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見��るも�を表示�る" name="Show Look At"/>
@@ -358,7 +361,7 @@
 		</menu>
 		<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
 		<menu_item_call label="圧縮画�" name="Compress Images"/>
-		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
+		<menu_item_check label="デ�ッグ用�ミニダンプを出力�る" name="Output Debug Minidump"/>
 		<menu_item_check label="次回�起動時�コンソールウィンドウを表示�る" name="Console Window"/>
 		<menu_item_check label="管�者メニューを表示�る" name="View Admin Options"/>
 		<menu_item_call label="管�者ステータス�呼�出�" name="Request Admin Options"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 2f877a6aba..4fc3f1d46f 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -339,10 +339,10 @@ L$ ã�Œä¸�足ã�—ã�¦ã�„ã‚‹ã�®ã�§ã�“ã�®ã‚°ãƒ«ãƒ¼ãƒ—ã�«å�‚加ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�
 		��読�込�れ���������アイテムを装�����ん。後�やり直������。
 	</notification>
 	<notification name="MustHaveAccountToLogIn">
-		���! 記入�れ��り��よ。
+		����記入�れ��り��よ。
 ア�ター�ファースト�ーム�ラスト�ーム�両方を入力�る必���り��。
 
-[SECOND_LIFE]�入る���アカウント�必���。 アカウントを作�����？
+[SECOND_LIFE] �入る���アカウント�必���。 アカウントを作�����？
 		<url name="url">
 			https://join.secondlife.com/index.php?lang=ja-JP
 		</url>
@@ -470,7 +470,6 @@ L$ ã�Œä¸�足ã�—ã�¦ã�„ã‚‹ã�®ã�§ã�“ã�®ã‚°ãƒ«ãƒ¼ãƒ—ã�«å�‚加ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�
 	<notification name="UnsupportedHardware">
 		�使��コンピューター� [APP_NAME] �必�最低��動作環境を満������ん。 パフォーマンス�低下を感�る�も�れ��ん。 �れ入り��� [SUPPORT_SITE] ��サ�ート対象外�システム�関�る技術的サ�ート�行���り��ん。
 
-最低動作環境
 [_URL] �移動��確�を����？
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=ja
@@ -586,7 +585,7 @@ L$ ã�Œä¸�足ã�—ã�¦ã�„ã‚‹ã�®ã�§ã�“ã�®ã‚°ãƒ«ãƒ¼ãƒ—ã�«å�‚加ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�
 ��ファイル�拡張��正������を確�������。
 	</notification>
 	<notification name="InvalidFileExtension">
-		[EXTENSION]�無効��。
+		[EXTENSION] �無効��。
 正��拡張�：[VALIDS]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -1345,7 +1344,7 @@ F1 キーを押������。
 	</notification>
 	<notification name="ConfirmKick">
 		����ユーザーをグリッド�外�キック�よ�������。�作を続行����？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="全��ユーザを追�出�"/>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="全��ユーザーを追�出�"/>
 	</notification>
 	<notification name="MuteLinden">
 		リンデンをブロック�る�������ん。
@@ -1447,15 +1446,15 @@ F1 キーを押������。
 	</notification>
 	<notification name="TeleportFromLandmark">
 		���� &lt;nolink&gt;[LOCATION]&lt;/nolink&gt; �テレ�ート����？
-		<usetemplate ignoretext="ランドマーク�テレ�ート�����確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
+		<usetemplate ignoretext="ランドマーク�テレ�ート��������確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
 	</notification>
 	<notification name="TeleportToPick">
 		[PICK] �テレ�ート����？
-		<usetemplate ignoretext="ピック�場所�テレ�ート�����確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
+		<usetemplate ignoretext="ピック�場所�テレ�ート��������確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
 	</notification>
 	<notification name="TeleportToClassified">
 		[CLASSIFIED] �テレ�ート����？
-		<usetemplate ignoretext="クラシファイド広告�場所�テレ�ート�����確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
+		<usetemplate ignoretext="クラシファイド広告�場所�テレ�ート��������確�" name="okcancelignore" notext="キャンセル" yestext="テレ�ート"/>
 	</notification>
 	<notification label="�����動産内�全員�メッセージを�信" name="MessageEstate">
 		今�����動産��る人全員��る�短�メッセージを入力������。
@@ -1931,7 +1930,7 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ForceCloseChatterBoxSession">
-		[NAME]���ャットセッションを閉���。
+		[NAME] ���ャットセッションを閉���。
 [REASON]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -1944,8 +1943,8 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
-		作��よ�����る衣類を自動的�装�����？
-		<usetemplate ignoretext="「マイ 容姿�を編集中��作��る衣類を装��る��" name="okcancelignore" notext="���" yestext="��"/>
+		作��る衣類を自動的�装�����？
+		<usetemplate ignoretext="「容姿�を編集中��作��る衣類を装��る��" name="okcancelignore" notext="���" yestext="��"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		年齢確�を済���������区画を訪れる�������ん。  [SECOND_LIFE] サイト�年齢�確�を行����？
@@ -2229,27 +2228,27 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		��リージョン�����公共�土地を�得�る�������ん。
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		����レーティング区分�より��リージョン（地域）��入る�������ん。 年齢確�を行���最新ビューワをインストール������。
+		����レーティング区分�より��リージョン��入る�������ん。 年齢確�を行���最新ビューワをインストール������。
 
 �在�レーティング区分�アクセス�能�エリア�関�る詳細�ナレッジベースを�照������。
 	</notification>
 	<notification name="URBannedFromRegion">
-		����リージョン（地域）��立入��止�れ����。
+		����リージョン��立入��止�れ����。
 	</notification>
 	<notification name="NoTeenGridAccess">
 		����アカウント��ティーングリッド�接続����ん。
 	</notification>
 	<notification name="ImproperPaymentStatus">
-		��リージョン（地域）�入る������支払�ステータス��り��ん。
+		��リージョン�入る������支払�ステータス��り��ん。
 	</notification>
 	<notification name="MustGetAgeRgion">
-		��リージョン（地域）�入る��年齢確�済���る必���り��。
+		��リージョン�入る�����年齢確�を済��る必���り��。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		��区画�入る��年齢確�済���る必���り��。
+		��区画�入る�����年齢確�を済��る必���り��。
 	</notification>
 	<notification name="NoDestRegion">
-		目的地�リージョン（地域）�見��り��ん���。
+		目的地�リージョン�見��り��ん���。
 	</notification>
 	<notification name="NotAllowedInDest">
 		目的地�入る許���り��ん。
@@ -2267,14 +2266,14 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		テレ�ート�キャンセル�れ���。
 	</notification>
 	<notification name="FullRegionTryAgain">
-		入������るリージョン（地域）��在満員��。
+		入������るリージョン��在満員��。
 ��ら����ら�度�試�����。
 	</notification>
 	<notification name="GeneralFailure">
 		よ��る失敗
 	</notification>
 	<notification name="RoutedWrongRegion">
-		異�るリージョン（地域）�迂回�れ���。 も�一度�試�����。
+		異�るリージョン�迂回�れ���。 も�一度�試�����。
 	</notification>
 	<notification name="NoValidAgentID">
 		エージェント ID �無効��。
@@ -2295,7 +2294,7 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		内部エラー�発生����。
 	</notification>
 	<notification name="NoGoodTPDestination">
-		��リージョン（地域）���切�テレ�ート目的地�見��り��ん���。
+		��リージョン����切�テレ�ート目的地�見��り��ん���。
 	</notification>
 	<notification name="InternalErrorRegionResolver">
 		内部エラー�発生����。
@@ -2382,7 +2381,7 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		[TO_NAME] �フレンド登録を申�出���。
 	</notification>
 	<notification name="OfferFriendshipNoMessage">
-		[NAME]��
+		[NAME] ��
 フレンド登録を申�込ん����。
 
 （デフォルト��互��オンライン状態を見る�����るよ���り��。）
@@ -2397,6 +2396,12 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 	<notification name="FriendshipDeclined">
 		[NAME]��フレンド登録を断り���。
 	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		フレンド�登録�頼�承��れ���。
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		フレンド�登録�頼�拒��れ���。
+	</notification>
 	<notification name="OfferCallingCard">
 		[FIRST] [LAST] �コーリングカードを渡��������。
 ����「��物��ブックマーク�追加�れ����人�素早� IM を�る�������。
@@ -2418,9 +2423,9 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 
 [MESSAGE]
 
-読�込�元�オブジェクト：[OBJECTNAME]�所有者：[NAME]？
+読�込�元�オブジェクト：[OBJECTNAME]�所有者：[NAME]
 		<form name="form">
-			<button name="Gotopage" text="移動"/>
+			<button name="Gotopage" text="ページ�移動"/>
 			<button name="Cancel" text="�り消�"/>
 		</form>
 	</notification>
@@ -2585,7 +2590,7 @@ M キーを押��変更���。
 		[VOICE_CHANNEL_NAME] �ボイス�ャット�接続中��エラー�発生����。後�も�一度�試�����。
 	</notification>
 	<notification name="ServerVersionChanged">
-		異�るサー�ー�ージョン�リージョン�����。パフォーマンス�影響�る����り��。 [[URL] リリースノートを確�]
+		サー�ー��ージョン�異�るリージョン�����。パフォーマンス�影響�る����り��。 [[URL] リリースノートを確�]
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
 		クリック�� SLurl �サ�ート�れ����ん。
@@ -2605,7 +2610,7 @@ M キーを押��変更���。
 	</notification>
 	<notification name="ConfirmCloseAll">
 		���� IM を閉����？
-		<usetemplate name="okcancelignore" notext="キャンセル" yestext="OK"/>
+		<usetemplate ignoretext="���� IM を閉�る��確�" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		アタッ�メント��存�れ���。
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
index be15e92aa1..f2429ac12a 100644
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="共有" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="支払�" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index bad4cdbc05..5097a352e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -21,7 +21,7 @@
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
 			<text name="no_friends_msg">
-				���を追加�る���[secondlife:///app/search/people グロー�ル検索] を�る��ユーザーをクリック��行������。
+				フレンドを追加�る���[secondlife:///app/search/people グロー�ル検索] を�る��ユーザーを�クリック������。
 誰�一緒�行動を�る人を�探��時��[secondlife:///app/worldmap 地図を�試����]。
 			</text>
 			<panel label="bottom_panel" name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 1f5031f3de..132fb95fe7 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -68,7 +68,7 @@
 			<text name="maturity_value" value="�明"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="区画">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="レーティング区分："/>
 						<text name="rating_value" value="�明"/>
 						<text name="voice_label" value="ボイス："/>
@@ -87,7 +87,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="リージョン（地域）     ">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="地域:"/>
 						<text name="region_name" value="Mooseland"/>
 						<text name="region_type_label" value="種類："/>
@@ -104,7 +104,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="エステート（�動産）">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="�動産："/>
 						<text name="estate_rating_label" value="レーティング区分："/>
 						<text name="estate_owner_label" value="所有者："/>
@@ -112,7 +112,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="販売中">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="価格："/>
 						<text name="area_label" value="��："/>
 						<text name="traffic_label" value="トラフィック："/>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index e2dba19c1d..a7fbc79884 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -7,9 +7,9 @@
 		<button label="テレ�ート" name="teleport_btn" tool_tip="該当�るエリア�テレ�ート���"/>
 		<button label="地図" name="map_btn"/>
 		<button label="編集" name="edit_btn" tool_tip="ランドマーク�情報を編集���"/>
-		<button name="overflow_btn" tool_tip="��他�オプションを表示"/>
-		<button label="閉�る" name="close_btn"/>
-		<button label="キャンセル" name="cancel_btn"/>
+		<button label="▼" name="overflow_btn" tool_tip="��他�オプションを表示"/>
 		<button label="�存" name="save_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+		<button label="閉�る" name="close_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index d6fe54fbd1..b0572804cb 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="�ャット" name="chat">
+	<text name="font_size">
+		Font size:
+	</text>
 	<radio_group name="chat_font_size">
 		<radio_item label="å°�" name="radio" value="0"/>
 		<radio_item label="中" name="radio2" value="1"/>
 		<radio_item label="大" name="radio3" value="2"/>
 	</radio_group>
+	<text name="font_colors">
+		Font colors:
+	</text>
 	<color_swatch label="自分" name="user"/>
 	<text name="text_box1">
 		自分
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index af64a217f6..fe830d864f 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
 	<check_box label="有効" name="enable_voice_check"/>
 	<check_box label="メディアを自動�生�る" name="media_auto_play_btn" tool_tip="����ェックを入れ�メディア�自動�生を許����" value="true"/>
 	<check_box label="他�ア�ター��り付�られ�メディアを�生���" name="media_show_on_others_btn" tool_tip="���ェックを外���近���る他�ア�ター��り付�られ�メディアを�表示����。" value="true"/>
-	<text name="Listen from">
+	<text name="voice_chat_settings">
 		ボイス�ャット�設定
 	</text>
+	<text name="Listen from">
+		方�：
+	</text>
 	<radio_group name="ear_location">
 		<radio_item label="カメラ��置�ら��" name="0"/>
 		<radio_item label="ア�ター��置�ら��" name="1"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 9a517d79e9..5214f79141 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -30,7 +30,7 @@
 		約款�変更��動産全区画��用��り��。
 	</text>
 	<text name="covenant_instructions" width="390">
-		���動産約款�変更を�る際��ノートカードをドラッグ＆ドロップ������。
+		���動産約款を変更�る際��ノートカードをドラッグ＆ドロップ������。
 	</text>
 	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
 		地域
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
index 5364b8726f..3fd14ece06 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
@@ -20,10 +20,10 @@
 	<sidetray_tab description="行���場所�行������る場所を探������。" label="場所" name="sidebar_places" tab_title="場所">
 		<panel label="場所" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="������物を眺������。" name="sidebar_inventory" tab_title="マイ ��物">
+	<sidetray_tab description="������物を眺������。" name="sidebar_inventory" tab_title="��物">
 		<panel label="��物を編集" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="����容姿や�在�見�目を変更������。" name="sidebar_appearance" tab_title="マイ 容姿">
+	<sidetray_tab description="����容姿や�在�見�目を変更������。" name="sidebar_appearance" tab_title="容姿">
 		<panel label="容姿�編集" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index aef1f90298..ea17cd6526 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -22,13 +22,13 @@
 				</text>
 			</panel>
 			<panel name="sidebar_appearance">
-				<text name="tab_name" value="マイ 容姿"/>
+				<text name="tab_name" value="容姿"/>
 				<text name="tab_description">
 					����容姿や�在�見�目を変更���。
 				</text>
 			</panel>
 			<panel name="sidebar_inventory">
-				<text name="tab_name" value="マイ ��物"/>
+				<text name="tab_name" value="��物"/>
 				<text name="tab_description">
 					������物を眺���。
 				</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index a9e13cfd9f..923455abba 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -22,10 +22,10 @@
 		L$ [AMT]
 	</panel.string>
 	<button label="" label_selected="" name="buycurrency" tool_tip="所�金"/>
-	<button label="L$ �購入" name="buyL" tool_tip="クリック�� L$ を購入���"/>
+	<button label="購入" name="buyL" tool_tip="クリック�� L$ を購入���"/>
 	<text name="TimeText" tool_tip="�在時刻（太平洋）">
 		24:00 AM PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="クリック��メディアを切り替���"/>
+	<button name="media_toggle_btn" tool_tip="����メディアを開始・�止（音楽�ビデオ�Web ページ）"/>
 	<button name="volume_btn" tool_tip="グロー�ル音�設定"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 2264ae965b..c1bf81f7e7 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -12,6 +12,6 @@
 		<accordion_tab name="6_months_and_older" title="�年以上�"/>
 	</accordion>
 	<panel label="bottom_panel" name="bottom_panel">
-		<button name="gear_btn" tool_tip="��他�オプションを表示"/>
+		<button name="gear_btn" tool_tip="オプションを表示���"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index ab00953f1a..439891bab1 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
 	</panel.string>
 	<text name="title" value="オブジェクト�プロフィール"/>
 	<text name="where" value="（インワールド）"/>
-	<panel label="">
+	<panel name="properties_panel" label="">
 		<text name="Name:">
 			��：
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 3e9be493ff..13c8c991d6 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -955,7 +955,7 @@
 		買�
 	</string>
 	<string name="BuyforL$">
-		Buy for L$
+		L$ �購入
 	</string>
 	<string name="Stone">
 		石
@@ -1506,6 +1506,9 @@
 	<string name="NoPicksClassifiedsText">
 		ピックやクラシファイド広告を作������ん。 作��る���下��る「プラス�ボタンをクリック���。
 	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		ピック����クラシファイド広告��り��ん
+	</string>
 	<string name="PicksClassifiedsLoadingText">
 		ローディング...
 	</string>
@@ -1900,7 +1903,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		後�髪�毛先
 	</string>
 	<string name="Baggy">
-		�るん��る
+		�るん�下���
 	</string>
 	<string name="Bangs">
 		�髪
@@ -1990,7 +1993,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		広
 	</string>
 	<string name="Brow Size">
-		眉毛�大��
+		眉毛上�隆起
 	</string>
 	<string name="Bug Eyes">
 		Bug Eyes
@@ -2023,7 +2026,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		膨ら�大
 	</string>
 	<string name="Chaplin">
-		Chaplin
+		�ャップリン
 	</string>
 	<string name="Cheek Bones">
 		��骨
@@ -2044,7 +2047,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		���長�
 	</string>
 	<string name="Chin Heavy">
-		����点
+		��を強調
 	</string>
 	<string name="Chin In">
 		�����
@@ -2236,7 +2239,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		����角度
 	</string>
 	<string name="Forehead Heavy">
-		�����点
+		���を強調
 	</string>
 	<string name="Freckles">
 		��・����
@@ -2386,7 +2389,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		���形
 	</string>
 	<string name="Join">
-		寄��
+		寄��胸
 	</string>
 	<string name="Jowls">
 		�ら
@@ -2491,7 +2494,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		�紅�色
 	</string>
 	<string name="Long">
-		é•·
+		ロング
 	</string>
 	<string name="Long Head">
 		�後幅�広�頭
@@ -2887,7 +2890,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		骨張��脚
 	</string>
 	<string name="Separate">
-		離れ�
+		離れ�胸
 	</string>
 	<string name="Shallow">
 		��ら�
@@ -2935,7 +2938,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		��長�
 	</string>
 	<string name="Short">
-		短
+		ショート
 	</string>
 	<string name="Short Arms">
 		短
@@ -3049,7 +3052,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		縦長
 	</string>
 	<string name="Sunken">
-		���
+		�����
 	</string>
 	<string name="Sunken Chest">
 		å°�
@@ -3064,7 +3067,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		��
 	</string>
 	<string name="Tall">
-		高
+		トール
 	</string>
 	<string name="Taper Back">
 		後��先細
@@ -3160,7 +3163,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		ウエスト�高�
 	</string>
 	<string name="Well-Fed">
-		����
+		������
 	</string>
 	<string name="White Hair">
 		白髪
@@ -3181,7 +3184,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		ワイルド
 	</string>
 	<string name="Wrinkles">
-		���り
+		��
 	</string>
 	<string name="LocationCtrlAddLandmarkTooltip">
 		マイ ランドマーク�追加
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
index 37e35ed1e9..815c36606c 100644
--- a/indra/newview/skins/default/xui/pl/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pl/floater_auction.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAŻ POSIAD�OŚCI">
-	<check_box label="Zawierając żółte ogrodzenie" name="fence_check" />
-	<button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn" />
-	<button label="OK" label_selected="OK" name="ok_btn" />
-	<string name="already for sale">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAŻ POSIAD�OŚCI LINDENÓW">
+	<floater.string name="already for sale">
 		Nie możesz umieścić posiadłości na aukcji, jeżeli już została wystawiona na sprzedaż.
-	</string>
+	</floater.string>
+	<check_box initial_value="true" label="Zawierając żółte ogrodzenie" name="fence_check"/>
+	<button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn"/>
+	<button label="Sprzedaj Każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/>
+	<button label="Wyczyść Ustawienia" label_selected="Wyczyść Ustawienia" name="reset_parcel_btn"/>
+	<button label="Rozpocznij AukcjÄ™" label_selected="Rozpocznij AukcjÄ™" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
index 5957018144..95d82a3f9c 100644
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="camera_floater" title="">
 	<floater.string name="rotate_tooltip">
 		Obracaj kamerę wokół obiektu
@@ -10,7 +10,22 @@
 		Poruszaj kamerą w dół/górę oraz w prawo/lewo
 	</floater.string>
 	<panel name="controls">
-		<joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w dół/górę oraz w prawo/lewo"/>
-		<joystick_zoom name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"/>
+		<joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo"/>
+		<panel name="zoom" tool_tip="Najedź kamerą w kierunku obiektu">
+			<slider_bar name="zoom_slider" tool_tip="Przybliż kamerę do ogniskowej"/>
+		</panel>
+		<joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerę wokoł osi"/>
+		<panel name="camera_presets">
+			<button name="rear_view" tool_tip="Widok z Tyłu"/>
+			<button name="group_view" tool_tip="PodglÄ…d Grupy"/>
+			<button name="front_view" tool_tip="Widok z Przodu"/>
+			<button name="mouselook_view" tool_tip="Widok Panoramiczny"/>
+		</panel>
+	</panel>
+	<panel name="buttons">
+		<button label="" name="orbit_btn" tool_tip="Obracaj KamerÄ™"/>
+		<button label="" name="pan_btn" tool_tip="Kamera Horyzontalna"/>
+		<button label="" name="avatarview_btn" tool_tip="Widok Awatara"/>
+		<button label="" name="freecamera_btn" tool_tip="PodglÄ…d Obiektu"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index 904a2cc270..7bbdc35f94 100644
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="WYBÓR KOLORU">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="WYBIERZ KOLOR">
 	<text name="r_val_text">
 		Czerwony:
 	</text>
@@ -18,14 +18,14 @@
 	<text name="l_val_text">
 		Luminacja:
 	</text>
-	<check_box label="Zastosuj od razu" name="apply_immediate" />
-	<button label="" label_selected="" name="color_pipette" />
-	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
-	<button label="Wybierz" label_selected="Wybierz" name="select_btn" />
+	<check_box label="Zastosuj teraz" name="apply_immediate"/>
+	<button label="" label_selected="" name="color_pipette"/>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+	<button label="Ok" label_selected="Ok" name="select_btn"/>
 	<text name="Current color:">
 		Obecny Kolor:
 	</text>
 	<text name="(Drag below to save.)">
-		(PrzeciÄ…gnij tutaj)
+		(Przeciągnij tutaj by zapisać)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
index ff2d702132..a5d85aca4e 100644
--- a/indra/newview/skins/default/xui/pl/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="SAMOUCZEK" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="SAMOUCZEK"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
new file mode 100644
index 0000000000..f4dd7d00e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="panel_im">
+	<layout_stack name="im_panels">
+		<layout_panel label="Panel Kontroli Wiadomości Prywatnej (IM)" name="panel_im_control_panel"/>
+		<layout_panel>
+			<line_editor label="Do" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
index 8120ff8c77..e03c5faaeb 100644
--- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="SKRYPT: NOWY SKRYPT">
-	<button label="Zresetuj" label_selected="Zresetuj" name="Reset" />
-	<check_box label="WÅ‚Ä…cz" name="running" />
-	<check_box label="Mono" name="mono" />
-	<string name="not_allowed">
-		Nie masz praw by widzieć zawartość tego skryptu.
-	</string>
-	<string name="script_running">
+	<floater.string name="not_allowed">
+		Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to &quot;brak kopiowania&quot;. Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+	</floater.string>
+	<floater.string name="script_running">
 		WÅ‚Ä…cz
-	</string>
+	</floater.string>
+	<floater.string name="Title">
+		SKRYPT: [NAME]
+	</floater.string>
+	<button label="Zresetuj" label_selected="Zresetuj" name="Reset"/>
+	<check_box initial_value="true" label="WÅ‚Ä…cz" name="running"/>
+	<check_box initial_value="true" label="Mono" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
index 88a878af72..87d74f6c15 100644
--- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="SYMULACJA PRZECIEKÓW ALOKACJI PAMIĘCI">
-	<spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed" />
-	<spinner label="Max Przecieki (MB):" name="max_leak" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI">
+	<spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed"/>
+	<spinner label="Max Przecieki (MB):" name="max_leak"/>
 	<text name="total_leaked_label">
 		Przeciekło: [SIZE] KB
 	</text>
@@ -11,8 +11,8 @@
 	<text name="note_label_2">
 		[NOTE2]
 	</text>
-	<button label="Start" name="start_btn" />
-	<button label="Stop" name="stop_btn" />
-	<button label="Uwolnij" name="release_btn" />
-	<button label="Zamknij" name="close_btn" />
+	<button label="Start" name="start_btn"/>
+	<button label="Stop" name="stop_btn"/>
+	<button label="Uwolnij" name="release_btn"/>
+	<button label="Zamknij" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
index 0bcf6ba4d5..847c93f891 100644
--- a/indra/newview/skins/default/xui/pl/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_my_friends" title="KONTAKTY">
 	<tab_container name="friends_and_groups">
-		<panel label="Znajomi" name="friends_panel" />
-		<panel label="Grupy" name="groups_panel" />
+		<panel label="Znajomi" name="friends_panel"/>
+		<panel label="Grupy" name="groups_panel"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
index 834552e2b0..1b0dd6113e 100644
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PRAWA DOMYÅšLNE">
+<floater name="perm prefs" title="USTAWIENIA DOMYŚLNE �ADOWANIA">
 	<panel label="Prawa" name="permissions">
 		<button label="?" label_selected="?" name="help"/>
 		<check_box label="Udostępnij grupie" name="share_with_group"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
index 7139c470a4..2a49864e93 100644
--- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
+	<floater.string name="Title">
+		Animacja: [NAME]
+	</floater.string>
 	<text name="desc txt">
 		Opis:
 	</text>
-	<button label="Używaj w Świecie" label_selected="Stop" name="Anim play btn"
-	     tool_tip="Animacja będzie widoczna dla wszystkich."  width="131" left="20"/>
-	<button label="Używaj lokalnie" label_selected="Stop" name="Anim audition btn"
-	     tool_tip="Animacja będzie widoczna tylko dla Ciebie." width="125" left="162"/>
+	<button label="Używaj w Świecie" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom tę animację by widzieli ją pozostali Rezydenci" width="131"/>
+	<button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom tę animację widoczną tylko przez Ciebie" width="125"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
index eae9ba2690..d3d6588397 100644
--- a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
@@ -1,2 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="REKLAMA" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="classified_preview" title="INFO O REKLAMIE">
+	<floater.string name="Title">
+		Reklama: [NAME]
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
index 194a6da1bd..cf0abb2c23 100644
--- a/indra/newview/skins/default/xui/pl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title="">
-	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 	<text name="Save item as:">
-		By wybrać wciśnij klawisz
+		Naciśnij by uruchomić przycisk mówienia.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
index 0826508fd6..c66ac0a98f 100644
--- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Sound Preview" title="DŹWIĘK.WAV">
 	<text name="name_label">
 		Opis:
@@ -6,6 +6,6 @@
 	<text name="description_label">
 		Opis:
 	</text>
-	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
-	<button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn" />
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+	<button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
index 48366e2b64..011dc8ee7c 100644
--- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="WYBÓR TEKSTURY">
+<floater name="texture picker" title="ULUBIONE: TEKSTURA">
 	<string name="choose_picture">
 		Kliknij by wybrać obraz
 	</string>
 	<text name="Multiple">
-		Wiele
+		Wiele Tekstur
 	</text>
 	<text name="unknown">
-		Wymiary: [DIMENSIONS]
+		Rozmiar: [DIMENSIONS]
 	</text>
 	<button label="Domyślna" label_selected="Domyślna" name="Default"/>
 	<button label="Żadna" label_selected="Żadna" name="None"/>
 	<button label="Pusta" label_selected="Pusta" name="Blank"/>
 	<check_box label="Pokaż Foldery" name="show_folders_check"/>
-	<search_editor label="Wpisz nazwę tutaj by wyszukać" name="inventory search editor"/>
-	<check_box label="Zastosuj od razu" name="apply_immediate_check"/>
+	<search_editor label="Filtruj Tektury" name="inventory search editor"/>
+	<check_box label="Zastosuj teraz" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
-	<button label="Wybierz" label_selected="Wybierz" name="Select"/>
+	<button label="Ok" label_selected="Ok" name="Select"/>
 	<string name="pick title">
 		Wybór:
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
new file mode 100644
index 0000000000..4ba36de6fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_avatar">
+	<string name="Subtitle">
+		[AGE]
+	</string>
+	<string name="Details">
+		[SL_PROFILE]
+	</string>
+	<slider name="volume_slider" tool_tip="Posiom Głośności" value="0.5"/>
+	<button label="Dodaj Znajomość" name="add_friend_btn"/>
+	<button label="IM" name="im_btn"/>
+	<button label="Więcej" name="view_profile_btn"/>
+	<panel name="moderator_panel">
+		<button label="Wyłącz Komunikację Głosową" name="disable_voice"/>
+		<button label="WÅ‚Ä…cz KomunikacjÄ™ GÅ‚osowÄ…" name="enable_voice"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml
new file mode 100644
index 0000000000..d434443794
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_group.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_group">
+	<string name="PrivateGroup">
+		Grupa Prywatna
+	</string>
+	<string name="FreeToJoin">
+		Wstęp Wolny
+	</string>
+	<string name="CostToJoin">
+		L$[AMOUNT] by dołączyć
+	</string>
+	<string name="YouAreMember">
+		Jesteś członkiem
+	</string>
+	<button label="Dołącz" name="join_btn"/>
+	<button label="Opuść" name="leave_btn"/>
+	<button label="Zobacz Profil" name="view_profile_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
new file mode 100644
index 0000000000..0d570940c1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_remote_object">
+	<text name="object_owner_label">
+		Właściciel:
+	</text>
+	<button label="Mapa" name="map_btn"/>
+	<button label="Zablokuj" name="block_btn"/>
+	<button label="Zamknij" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
new file mode 100644
index 0000000000..bd39ff7ac3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+	<widgetset name="web">
+		<label name="web_label">
+			Zawartość Przeglądarki Internetowej
+		</label>
+		<tooltip name="web_tooltip">
+			To miejsce posiada zawartość internetową
+		</tooltip>
+		<playtip name="web_playtip">
+			Pokaż Zawartość Przeglądarki Internetowej
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Film
+		</label>
+		<tooltip name="movie_tooltip">
+			To miejsce posiada zawartość filmową
+		</tooltip>
+		<playtip name="movie_playtip">
+			OglÄ…daj Film
+		</playtip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Obraz
+		</label>
+		<tooltip name="image_tooltip">
+			To miejsce posiada zwartość graficzną
+		</tooltip>
+		<playtip name="image_playtip">
+			Zobacz zdjęcie miejsca
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<tooltip name="audio_tooltip">
+			To miejsce posiada zwartość audio
+		</tooltip>
+		<playtip name="audio_playtip">
+			Rozpocznij odtwarzanie audio
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Synchroniczne Strumienie Medialne
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- Żadne -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- Żadne -
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Obraz
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Film (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Skrypt Java
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			Dokument PDF
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Dokument Postscript
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Dokument RTF
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Język Integracyjnej Synchronizacji Multimedialnej (SMIL)
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Strona Internetowa (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			Obraz (BMP)
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			Obraz (GIF)
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			Obraz (JPEG)
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			Obraz (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Obraz (SVG)
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			Obraz (TIFF)
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Strona Internetowa
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			Tekst
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			Film (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Film (MP4)
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			Film (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Film (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Film (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Film (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
new file mode 100644
index 0000000000..5c362ab772
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_list_item">
+	<string name="FormatSeconds">
+		[COUNT]s
+	</string>
+	<string name="FormatMinutes">
+		[COUNT]m
+	</string>
+	<string name="FormatHours">
+		[COUNT]h
+	</string>
+	<string name="FormatDays">
+		[COUNT]d
+	</string>
+	<string name="FormatWeeks">
+		[COUNT]tyg
+	</string>
+	<string name="FormatMonths">
+		[COUNT]mc
+	</string>
+	<string name="FormatYears">
+		[COUNT]lat
+	</string>
+	<text name="avatar_name" value="Nieznane"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
new file mode 100644
index 0000000000..27d8981e80
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shirt_panel">
+	<panel name="avatar_shirt_color_panel">
+		<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać grafikę"/>
+		<color_swatch label="Kolor/Odcień" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shirt_main_tab" title="Spódnica"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
new file mode 100644
index 0000000000..5efa402698
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_tattoo_panel">
+	<panel name="avatar_tattoo_color_panel">
+		<texture_picker label="Tatuaż Głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+		<texture_picker label="Tatuaż Górnej Części Ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+		<texture_picker label="Tatuaż Dolnej Części Ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
new file mode 100644
index 0000000000..e8e819e7ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+	<text name="group_name" value="Nieznana"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
index dd46b4aeaa..6a0cbbd23a 100644
--- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
@@ -16,7 +16,7 @@ Możesz wybrać wielu Członków naciskając Ctrl i klikając na ich imionach.
 			<name_list name="member_list">
 				<name_list.columns label="Członek" name="name"/>
 				<name_list.columns label="Dotacje" name="donated"/>
-				<name_list.columns label="Ostatnio w SL" name="online"/>
+				<name_list.columns label="Status" name="online"/>
 			</name_list>
 			<button label="ZaproÅ› do Grupy" name="member_invite"/>
 			<button label="Usuń z Grupy" name="member_eject"/>
@@ -29,7 +29,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
 łącznie z funkcją Każdy i Właściciel.
 			</panel.string>
 			<panel.string name="cant_delete_role">
-				Specjalne Funkcje Każdy i Właściciel nie mogą zostać usunięte.
+				Funkcje &quot;Wszyscy&quot; oraz &quot;Właściciele&quot; są domyślnie oraz nie mogą zostać usunięte.
 			</panel.string>
 			<panel.string name="power_folder_icon">
 				Inv_FolderClosed
@@ -38,7 +38,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
 			<scroll_list name="role_list">
 				<scroll_list.columns label="Funkcja" name="name"/>
 				<scroll_list.columns label="Tytuł" name="title"/>
-				<scroll_list.columns label="Liczba" name="members"/>
+				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
 			<button label="Stwórz Nową Funkcję" name="role_create"/>
 			<button label="Usuń Funkcję" name="role_delete"/>
@@ -57,7 +57,7 @@ Istnieje wiele Przywilei.
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
-			Funkcje
+			Przypisani Członkowie
 		</text>
 		<scroll_list name="member_assigned_roles">
 			<scroll_list.columns label="" name="checkbox"/>
@@ -73,13 +73,13 @@ Istnieje wiele Przywilei.
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
-			Nazwa
+			Nazwa Funkcji
 		</text>
 		<line_editor name="role_name">
 			Liczba
 		</line_editor>
 		<text name="static3">
-			Tytuł
+			Nazwa Funkcji
 		</text>
 		<line_editor name="role_title">
 			(proszę czekać)
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
new file mode 100644
index 0000000000..dc73d08680
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="landmark_info">
+	<string name="title_create_landmark" value="Zapamiętaj Miejsce"/>
+	<string name="title_edit_landmark" value="Edytuj Zapamiętane Miejsce"/>
+	<string name="title_landmark" value="Zapamiętane Miejsce (LM)"/>
+	<string name="not_available" value="(N\A)"/>
+	<string name="unknown" value="(nieznane)"/>
+	<string name="public" value="(publiczne)"/>
+	<string name="server_update_text">
+		Informacje o miejscu nie są dostępne bez aktualizacji serwera.
+	</string>
+	<string name="server_error_text">
+		Informacje o miejscu nie są dostępne w tej chwili. Prosimy sprobować później.
+	</string>
+	<string name="server_forbidden_text">
+		Informacje o miejscu są niedostępne z powodu braku dostępu. Prosimy sprawdzić swoje prawa z właścicielem posiadłości.
+	</string>
+	<string name="acquired_date">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</string>
+	<text name="title" value="Profil Miejsca"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="maturity_value" value="nieznany"/>
+			<panel name="landmark_info_panel">
+				<text name="owner_label" value="Właściciel:"/>
+				<text name="creator_label" value="Twórca:"/>
+				<text name="created_label" value="Stworzone:"/>
+			</panel>
+			<panel name="landmark_edit_panel">
+				<text name="title_label" value="Tytuł:"/>
+				<text name="notes_label" value="Moje notatki:"/>
+				<text name="folder_label" value="Lokalizacja zapisanego miejsca:"/>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index cec7e34da5..42088eae28 100644
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -6,33 +6,29 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
-	<panel name="login_widgets">
-		<text name="first_name_text">
-			ImiÄ™:
-		</text>
-		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] ImiÄ™"/>
-		<text name="last_name_text">
-			Nazwisko
-		</text>
-		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nazwisko"/>
-		<text name="password_text">
-			Hasło:
-		</text>
-		<button label="Zaloguj" label_selected="Zaloguj" name="connect_btn"/>
-		<text name="start_location_text">
-			Miejsce Startu:
-		</text>
-		<combo_box name="start_location_combo">
-			<combo_box.item label="Moje Ostatnie Miejsce" name="MyLastLocation"/>
-			<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
-			<combo_box.item label="&lt;Wpisz nazwÄ™ regionu&gt;" name="Typeregionname"/>
-		</combo_box>
-		<check_box label="Zapamiętaj Hasło" name="remember_check"/>
-		<text name="create_new_account_text">
-			Załóż Nowe Konto
-		</text>
-		<text name="forgot_password_text">
-			Nie pamiętasz swojego imienia lub hasła?
-		</text>
-	</panel>
+	<layout_stack name="login_widgets">
+		<layout_panel name="login">
+			<text name="first_name_text">
+				ImiÄ™:
+			</text>
+			<line_editor label="ImiÄ™" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
+			<line_editor label="Nazwisko" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
+			<check_box label="Zapamiętaj hasło" name="remember_check"/>
+			<text name="start_location_text">
+				Rozpocznij w:
+			</text>
+			<combo_box name="start_location_combo">
+				<combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
+			</combo_box>
+			<button label="Połącz" name="connect_btn"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_new_account_text">
+				Utwórz nowe konto
+			</text>
+			<text name="login_help">
+				Potrzebujesz pomocy z logowaniem siÄ™?
+			</text>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
new file mode 100644
index 0000000000..4d91c3cdc8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Dopasuj" name="Media settings for controls">
+	<text name="controls_label">
+		Ustawienia:
+	</text>
+	<combo_box name="controls">
+		<combo_item name="Standard">
+			Standardowe
+		</combo_item>
+		<combo_item name="Mini">
+			Mini
+		</combo_item>
+	</combo_box>
+	<check_box initial_value="false" label="Pozwól na Nawigację &amp; Interaktywność" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_owner_control"/>
+	<check_box initial_value="false" label="Pozwól na Nawigację &amp; Interaktywność" name="perms_group_interact"/>
+	<check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_group_control"/>
+	<check_box initial_value="false" label="Pozwól na Nawigację &amp; Interaktywność" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..162df37e52
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<accordion_tab name="tab_cof" title="Aktualne Ubranie"/>
+		<accordion_tab name="tab_outfits" title="Moje Ubrania"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
new file mode 100644
index 0000000000..ff65cd2abb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="Ludzie" name="people_panel">
+	<string name="no_people" value="Brak ludzi"/>
+	<string name="no_one_near" value="Nikogo w pobliżu"/>
+	<string name="no_friends_online" value="Brak dostępnych przyjaciół"/>
+	<string name="no_friends" value="Brak przyjaciół"/>
+	<string name="no_groups" value="Brak grup"/>
+	<string name="people_filter_label" value="Filtruj Ludzi"/>
+	<string name="groups_filter_label" value="Filtruj Grupy"/>
+	<filter_editor label="Filtr" name="filter_input"/>
+	<tab_container name="tabs">
+		<panel label="W POBLIŻU" name="nearby_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="nearby_view_sort_btn" tool_tip="Opcje"/>
+				<button name="add_friend_btn" tool_tip="Dodaj wybranych Rezydentów do swojej listy znajomych"/>
+			</panel>
+		</panel>
+		<panel label="ZNAJOMI" name="friends_panel">
+			<accordion name="friends_accordion">
+				<accordion_tab name="tab_online" title="Dostępni"/>
+				<accordion_tab name="tab_all" title="Wszyscy"/>
+			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="friends_viewsort_btn" tool_tip="Opcje"/>
+				<button name="add_btn" tool_tip="Zaproponuj znajomość"/>
+				<button name="del_btn" tool_tip="Usuń wybraną osobę ze swojej listy znajomych"/>
+			</panel>
+		</panel>
+		<panel label="GRUPY" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="groups_viewsort_btn" tool_tip="Opcje"/>
+				<button name="plus_btn" tool_tip="Dołącz do grupy/Stwórz nową grupę"/>
+				<button name="activate_btn" tool_tip="Aktywuj wybranÄ… grupÄ™"/>
+			</panel>
+		</panel>
+		<panel label="OSTATNIE" name="recent_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="recent_viewsort_btn" tool_tip="Opcje"/>
+				<button name="add_friend_btn" tool_tip="Zaproponuj znajomość"/>
+			</panel>
+		</panel>
+	</tab_container>
+	<panel name="button_bar">
+		<button label="Profil" name="view_profile_btn" tool_tip="Pokaż grafiki, grupy oraz inne informacje dostępne o Rezydentach"/>
+		<button label="IM" name="im_btn" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ… (IM)"/>
+		<button label="Zadzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
+		<button label="Podziel siÄ™" name="share_btn"/>
+		<button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportacjÄ™"/>
+		<button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/>
+		<button label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencÄ™"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
new file mode 100644
index 0000000000..5d69c25ff3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_picks.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ulubione" name="panel_picks">
+	<string name="no_picks" value="Brak Ulubionych"/>
+	<string name="no_classifieds" value="Brak Reklam"/>
+	<text name="empty_picks_panel_text">
+		Brak ulubionych/reklam w tym miejscu
+	</text>
+	<accordion name="accordion">
+		<accordion_tab name="tab_picks" title="Ulubione"/>
+		<accordion_tab name="tab_classifieds" title="Reklamy"/>
+	</accordion>
+	<panel label="bottom_panel" name="edit_panel">
+		<button name="new_btn" tool_tip="Stwórz w obecnym miejscu nową zakładkę w ulubionych lub reklamę"/>
+	</panel>
+	<panel name="buttons_cucks">
+		<button label="Info" name="info_btn" tool_tip="Pokaż info o ulubionych"/>
+		<button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadajÄ…cego miejsca"/>
+		<button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż odpowiadające miejsce w Mapie Świata"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
index e3cdaae840..d72f13fabd 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -1,33 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Komunikacja" name="im">
-	<text name="text_box">
-		Mój Status Online:
+	<panel.string name="log_in_to_change">
+		Zaloguj się ponownie, aby zmienić
+	</panel.string>
+	<button label="Wyczyść Historię" name="clear_cache"/>
+	<text name="cache_size_label_l">
+		(Miejsca, obrazy, przeglÄ…darka internetowa, wyszukiwarka historii)
 	</text>
-	<check_box label="Mój status online jest dostepny tylko dla Znajomych i Grup"
-	     name="online_visibility" />
-	<text name="text_box2">
-		Ustawienia IM:
+	<check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/>
+	<check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check"/>
+	<check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/>
+	<check_box label="Akceptuj Ciasteczka" name="cookies_enabled"/>
+	<check_box label="Zezwól na Automatyczne Uruchomianie Mediów Strumieniowych" name="autoplay_enabled"/>
+	<text name="Logs:">
+		Logi:
 	</text>
-	<string name="log_in_to_change">
-		zaloguj się żeby zmienić
-	</string>
-	<check_box label="Wysyłaj IMy na email ([EMAIL])" name="send_im_to_email" />
-	<check_box label="Dołącz IMy do Konsola Czatu" name="include_im_in_chat_console" />
-	<check_box label="Pokazuj czas w IM" name="show_timestamps_check" />
-	<check_box label="Powiadamiaj o zalogowanych znajomych"
-	     name="friends_online_notify_checkbox" />
-	<text name="text_box3">
-		Pracuś Mówi:
+	<check_box label="Zapisz logi rozmów ogólnych na moim komputerze" name="log_nearby_chat"/>
+	<check_box label="Zapisuj logi wiadomości prywatnych (IM) na moim komputerze" name="log_instant_messages"/>
+	<check_box label="Pokazuj czas" name="show_timestamps_check_im"/>
+	<text name="log_path_desc">
+		Pokazuj miejsce logu
 	</text>
-	<text name="text_box4">
-		Ustawienia Zapisu:
-	</text>
-	<check_box label="Zapisuj IMy" name="log_instant_messages" />
-	<check_box label="Pokazuj czas w zapisie IM" name="log_instant_messages_timestamp" />
-	<check_box label="Pokazuj koniec ostatniego dialogu IM" name="log_show_history" />
-	<check_box label="Zapisuj czat" name="log_chat" />
-	<check_box label="Pokazuj czas w zapisie czatu" name="log_chat_timestamp" />
-	<check_box label="Pokazuj nowe IMy w zapisie czatu" name="log_chat_IM" />
-	<check_box label="Pokazuj czas Å‚Ä…cznie z datÄ…" name="log_date_timestamp" />
-	<button label="Lokacja" label_selected="Lokacja" name="log_path_button" />
+	<button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="log_path_button"/>
+	<button label="Lista Zablokowanych" name="block_list"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_profile.xml b/indra/newview/skins/default/xui/pl/panel_profile.xml
new file mode 100644
index 0000000000..1ff115e0b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_profile.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="no_partner_text" value="Brak"/>
+	<string name="RegisterDateFormat">
+		[REG_DATE] ([AGE])
+	</string>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<panel name="second_life_image_panel">
+				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+			</panel>
+			<panel name="first_life_image_panel">
+				<text name="title_rw_descr_text" value=":"/>
+			</panel>
+			<text name="me_homepage_text">
+				Strona Domowa:
+			</text>
+			<text name="title_member_text" value="Członek od:"/>
+			<text name="title_acc_status_text" value="Status Konta:"/>
+			<text name="acc_status_text" value="Rezydent. Brak Danych Konta"/>
+			<text name="title_partner_text" value="Partner:"/>
+			<text name="title_groups_text" value="Groupy:"/>
+		</panel>
+	</scroll_container>
+	<panel name="profile_buttons_panel">
+		<button label="Dodaj Znajomość" name="add_friend" tool_tip="Dodaj tego Rezydenta do znajomych"/>
+		<button label="IM" name="im" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ…"/>
+		<button label="Zadzwoń" name="call" tool_tip="Zadzwoń do tego Rezydenta"/>
+		<button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż tego Rezydenta na mapie"/>
+		<button label="Teleportuj" name="teleport" tool_tip="Zaoferuj TeleportacjÄ™"/>
+		<button label="▼" name="overflow_btn" tool_tip="Zapłać lub wyślij obiekt temu Rezydentowi"/>
+	</panel>
+	<panel name="profile_me_buttons_panel">
+		<button label="Edytuj Profil" name="edit_profile_btn"/>
+		<button label="Edytuj WyglÄ…d" name="edit_appearance_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
index f20387dd25..31b410c931 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Umowa" name="Covenant">
 	<text name="estate_section_lbl">
-		MajÄ…tek:
+		MajÄ…tek
 	</text>
 	<text name="estate_name_lbl">
 		Nazwa:
@@ -26,44 +26,44 @@
 		Brak umowy dla tego majÄ…tku.
 	</text_editor>
 	<button label="Wyresetuj" name="reset_covenant"/>
-	<text name="covenant_help_text" bottom_delta="-6">
+	<text bottom_delta="-6" name="covenant_help_text">
 		Zmiany w umowie zostaną wyświetlone we
 wszystkich posiadłościach majątku.
 	</text>
-	<text name="covenant_instructions" bottom_delta="-36">
-		Przeciągnij oraz wrzuć notę by zmienić umowę dla tego majątku.
+	<text bottom_delta="-36" name="covenant_instructions">
+		Przeciągnij oraz wrzuć notkę by zmienić umowę dla tego majątku.
 	</text>
 	<text name="region_section_lbl">
-		Region:
+		Region
 	</text>
 	<text name="region_name_lbl">
 		Nazwa:
 	</text>
-	<text name="region_name_text" left="115">
+	<text left="115" name="region_name_text">
 		leyla
 	</text>
 	<text name="region_landtype_lbl">
 		Typ:
 	</text>
-	<text name="region_landtype_text" left="115">
+	<text left="115" name="region_landtype_text">
 		Region Główny / Ziemia
 	</text>
 	<text name="region_maturity_lbl">
 		Rodzaj:
 	</text>
-	<text name="region_maturity_text" left="115">
+	<text left="115" name="region_maturity_text">
 		&apos;Adult&apos;
 	</text>
 	<text name="resellable_lbl">
 		Odsprzedaj:
 	</text>
-	<text name="resellable_clause" left="115" width="350">
+	<text left="115" name="resellable_clause" width="350">
 		Posiadłość zakupiona w tym regionie nie może być odsprzedana.
 	</text>
 	<text name="changeable_lbl">
 		Podziel:
 	</text>
-	<text name="changeable_clause" left="115" width="350">
+	<text left="115" name="changeable_clause" width="350">
 		Posiadłość zakupiona w tym regionie nie może być
 Å‚Ä…czona/dzielona.
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
new file mode 100644
index 0000000000..09c3d8ad04
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="script panel">
+	<panel.string name="loading">
+		�adowanie...
+	</panel.string>
+	<panel.string name="can_not_view">
+		Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to &quot;brak kopiowania&quot;. Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+	</panel.string>
+	<panel.string name="public_objects_can_not_run">
+		Publiczne obiekty nie mogą uruchamiać skryptów
+	</panel.string>
+	<panel.string name="script_running">
+		Uruchomione
+	</panel.string>
+	<panel.string name="Title">
+		Skrypt: [NAME]
+	</panel.string>
+	<text_editor name="Script Editor">
+		�adowanie...
+	</text_editor>
+	<button label="Zapisz" label_selected="Zapisz" name="Save_btn"/>
+	<combo_box label="Wklej..." name="Insert..."/>
+	<menu_bar name="script_menu">
+		<menu label="Plik" name="File">
+			<menu_item_call label="Zapisz" name="Save"/>
+			<menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes"/>
+		</menu>
+		<menu label="Edytuj" name="Edit">
+			<menu_item_call label="Cofnij" name="Undo"/>
+			<menu_item_call label="Do Przodu" name="Redo"/>
+			<menu_item_call label="Wytnij" name="Cut"/>
+			<menu_item_call label="Kopiuj" name="Copy"/>
+			<menu_item_call label="Wklej" name="Paste"/>
+			<menu_item_call label="Wybierz Wszystko" name="Select All"/>
+			<menu_item_call label="Odznacz" name="Deselect"/>
+			<menu_item_call label="Znajdź / Zamień..." name="Search / Replace..."/>
+		</menu>
+		<menu label="Pomoc" name="Help">
+			<menu_item_call label="Pomoc..." name="Help..."/>
+			<menu_item_call label="Pomoc..." name="Keyword Help..."/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
new file mode 100644
index 0000000000..369097cd0b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray cannot show background because it is always
+	partially on screen to hold tab buttons. -->
+<side_tray name="sidebar">
+	<sidetray_tab description="Miejsce Startu." name="sidebar_home" tab_title="Home">
+		<panel label="miejsce startu" name="panel_home"/>
+	</sidetray_tab>
+	<sidetray_tab description="Znajdź swoich znajomych, kontakty oraz Rezydentów w pobliżu Ciebie." name="sidebar_people" tab_title="People">
+		<panel_container name="panel_container">
+			<panel label="Info o Grupie" name="panel_group_info_sidetray"/>
+			<panel label="Zablokowani Rezydenci &amp; Obiekty" name="panel_block_list_sidetray"/>
+		</panel_container>
+	</sidetray_tab>
+	<sidetray_tab description="Znajdź i odwiedź miejsca, w których byłeś wcześniej." label="Miejsca" name="sidebar_places" tab_title="Places">
+		<panel label="Miejsca" name="panel_places"/>
+	</sidetray_tab>
+	<sidetray_tab description="Edytuj swój publiczny profil oraz ulubione zakładki." name="sidebar_me" tab_title="My Profile">
+		<panel label="Ja" name="panel_me"/>
+	</sidetray_tab>
+	<sidetray_tab description="Zmień swój obecny wygląd i ubranie." name="sidebar_appearance" tab_title="My Appearance">
+		<panel label="Edytuj WyglÄ…d" name="sidepanel_appearance"/>
+	</sidetray_tab>
+	<sidetray_tab description="PrzeglÄ…daj SzafÄ™." name="sidebar_inventory" tab_title="My Inventory">
+		<panel label="Edytuj SzafÄ™" name="sidepanel_inventory"/>
+	</sidetray_tab>
+</side_tray>
diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
new file mode 100644
index 0000000000..e47a15b67a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<panel name="panel_stand_stop_flying">
+	<button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj by wstać."/>
+	<button label="Zatrzymaj Latanie" name="stop_fly_btn" tool_tip="Zatrzymaj Latanie"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
new file mode 100644
index 0000000000..d88d98f104
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Teleport History">
+	<accordion name="history_accordion">
+		<accordion_tab name="today" title="Dzisiaj"/>
+		<accordion_tab name="yesterday" title="Wczoraj"/>
+		<accordion_tab name="2_days_ago" title="2 dni temu"/>
+		<accordion_tab name="3_days_ago" title="3 dni temu"/>
+		<accordion_tab name="4_days_ago" title="4 dni temu"/>
+		<accordion_tab name="5_days_ago" title="5 dni temu"/>
+		<accordion_tab name="6_days_and_older" title="6 dni i więcej"/>
+		<accordion_tab name="1_month_and_older" title="1 miesiąc i więcej"/>
+		<accordion_tab name="6_months_and_older" title="6 miesięcy i więcej"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
new file mode 100644
index 0000000000..b70c76f652
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="Właściwości Obiektu w Szafie">
+	<panel.string name="unknown">
+		(nieznany)
+	</panel.string>
+	<panel.string name="public">
+		(publiczny)
+	</panel.string>
+	<panel.string name="you_can">
+		Ty możesz:
+	</panel.string>
+	<panel.string name="owner_can">
+		Właściciel może:
+	</panel.string>
+	<panel.string name="acquiredDate">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</panel.string>
+	<text name="title" value="Właściwości Obiektu"/>
+	<panel label="">
+		<text name="LabelItemNameTitle">
+			Nazwa:
+		</text>
+		<text name="LabelItemDescTitle">
+			Opis:
+		</text>
+		<text name="LabelCreatorTitle">
+			Twórca:
+		</text>
+		<button label="Profil..." name="BtnCreator"/>
+		<text name="LabelOwnerTitle">
+			Właściciel:
+		</text>
+		<button label="Profil..." name="BtnOwner"/>
+		<text name="LabelAcquiredTitle">
+			Nabyte:
+		</text>
+		<text name="LabelAcquiredDate">
+			Wed May 24 12:50:46 2006
+		</text>
+		<text name="OwnerLabel">
+			Ty:
+		</text>
+		<check_box label="Edytuj" name="CheckOwnerModify"/>
+		<check_box label="Kopiuj" name="CheckOwnerCopy"/>
+		<check_box label="Oddawaj" name="CheckOwnerTransfer"/>
+		<text name="AnyoneLabel">
+			Każdemu:
+		</text>
+		<check_box label="Kopiuj" name="CheckEveryoneCopy"/>
+		<text name="GroupLabel">
+			Groupa:
+		</text>
+		<check_box label="Podziel siÄ™" name="CheckShareWithGroup"/>
+		<text name="NextOwnerLabel">
+			Następny właściciel:
+		</text>
+		<check_box label="Edytuje" name="CheckNextOwnerModify"/>
+		<check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
+		<check_box label="Oddaje" name="CheckNextOwnerTransfer"/>
+		<check_box label="Na Sprzedaż" name="CheckPurchase"/>
+		<combo_box name="combobox sale copy">
+			<combo_box.item label="Kopia" name="Copy"/>
+			<combo_box.item label="Originał" name="Original"/>
+		</combo_box>
+		<spinner label="Cena:" name="Edit Cost"/>
+		<text name="CurrencySymbol">
+			L$
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index d6e1c925b0..39548dc497 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="SOBRE O [CAPITALIZED_APP_NAME]">
+<floater name="floater_about" title="SOBRE [CAPITALIZED_APP_NAME]">
 	<floater.string name="AboutHeader">
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
@@ -7,7 +7,7 @@
 		Construído com [COMPILER] versão [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME] ([HOSTIP])
+		Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]&lt;/nolink&gt;([HOSTIP])
 [SERVER_VERSION]
 [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
@@ -42,12 +42,19 @@ Versão Vivox: [VIVOX_VERSION]
 		</panel>
 		<panel label="Créditos" name="credits_panel">
 			<text_editor name="credits_editor">
-				Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl e muitos outros.
+				O Second Life é o resultado do trabalho de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos mais.
 
-  Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+Agradecemos também aos seguintes residentes por sua colaboração na mais nova versão do Second Life: (in progress)
 
 
-  Para ter sucesso nos negócios, seja ousado, seja o primeiro, seja diferente. --Henry Marchant
+
+
+
+
+
+
+Raras são as mentes capazes de tornar óbvio o até então inexistente. Dizer &apos;eu poderia ter pensado a mesma coisa&apos; é comum, revelador e nem sempre a verdade; porque de fato não pensaram.
+ -- Douglas Adams
 			</text_editor>
 		</panel>
 		<panel label="Licenças" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index bf6faf50cc..ebb9bfc32d 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -81,6 +81,9 @@ Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro lote para mostrar se
 			<text name="Group:">
 				Grupo:
 			</text>
+			<text name="GroupText">
+				Leyla Linden
+			</text>
 			<button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
 			<check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
 			<button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
@@ -124,6 +127,7 @@ Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro lote para mostrar se
 				0
 			</text>
 			<button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/>
+			<button label="Dados do script" name="Scripts..."/>
 			<button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
 			<button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/>
 			<button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
@@ -253,7 +257,7 @@ ou sub-dividida.
 				[COUNT]
 			</text>
 			<text left="4" name="Autoreturn" width="412">
-				Auto-retornar objetos dos outros residentes (minutos, 0 para desligado):
+				Devolver objetos de outros residentes automaticamente (digite 0 para desligar)
 			</text>
 			<line_editor name="clean other time" right="-10"/>
 			<text name="Object Owners:">
@@ -301,7 +305,7 @@ Apenas lotes maiores podem ser listados na busca.
 				Sem Empurrar (Imposição na Região)
 			</panel.string>
 			<text name="allow_label">
-				Permitir outros residentes a:
+				Autorizar outros residentes a:
 			</text>
 			<check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
 			<check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
@@ -384,9 +388,6 @@ Apenas lotes maiores podem ser listados na busca.
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
-			<text name="CurrentURL:">
-				Página atual:
-			</text>
 			<check_box label="Esconder a URL da Mídia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponível para tipos HTML."/>
 			<text name="Description:">
 				Descrição:
@@ -398,9 +399,7 @@ Textura:
 			</text>
 			<texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/>
 			<text name="replace_texture_help">
-				(Objetos usando esta textura, mostrarão o filme ou
-a página web depois que você clicar na seta de
-reproduzir.)
+				Objetos com esta textura vão aparecer no filme ou página da web depois de clicar em Tocar.   Selecione outras texturas clicando nas miniaturas.
 			</text>
 			<check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mídia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/>
 			<text left="102" name="media_size" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." width="115">
@@ -418,8 +417,10 @@ Mídia:
 			<check_box label="Mídia em Repetição" name="media_loop" tool_tip="Executar a mídia repetidamente. Quando a mídia terminar a execução, ela reiniciará do começo."/>
 		</panel>
 		<panel label="SOM" name="land_audio_panel">
+			<check_box label="Ocultar URL" name="hide_music_url" tool_tip="Selecionar esta opção oculta o URL de música a visitantes não autorizados aos dados do terreno."/>
 			<check_box label="Ativar voz" name="parcel_enable_voice_channel"/>
 			<check_box label="Ativar voz (definições do terreno)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box label="Limitar bate-papo de voz a este lote" name="parcel_enable_voice_channel_local"/>
 		</panel>
 		<panel label="ACESSO" name="land_access_panel">
 			<panel.string name="access_estate_defined">
@@ -435,7 +436,7 @@ Mídia:
 			<text name="Only Allow">
 				Restringir acesso a contas confirmardas por:
 			</text>
-			<check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+			<check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes sem identificação."/>
 			<check_box label="Idade confirmada: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/>
 			<check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
 			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index 020cfbc811..78bcde251a 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -106,6 +106,9 @@ A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
 	<floater.string name="E_ST_NO_XLT_EMOTE">
 		Impossível ler nome do emote.
 	</floater.string>
+	<floater.string name="E_ST_BAD_ROOT">
+		Nome da junta incorreto, use &quot;quadril&quot;.
+	</floater.string>
 	<text name="name_label">
 		Nome:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 0d52fec23b..5fb64f64b3 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -7,26 +7,37 @@
 		Texturas compostas
 	</text>
 	<button label="Tombar" label_selected="Tombar" name="Dump"/>
-	<texture_picker label="Cabelo" name="hair_grain"/>
-	<texture_picker label="Cabelo alpha" name="hair_alpha"/>
-	<texture_picker label="Maquilagem" name="head_bodypaint"/>
-	<texture_picker label="Cabeça Alpha" name="head_alpha"/>
-	<texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
-	<texture_picker label="Olho" name="eyes_iris"/>
-	<texture_picker label="Olhos Alpha" name="eyes_alpha"/>
-	<texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
-	<texture_picker label="Camiseta" name="upper_undershirt"/>
-	<texture_picker label="Luvas" name="upper_gloves"/>
-	<texture_picker label="Camisa" name="upper_shirt"/>
-	<texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
-	<texture_picker label="Alpha de cima" name="upper_alpha"/>
-	<texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
-	<texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/>
-	<texture_picker label="Roupa de baixo" name="lower_underpants"/>
-	<texture_picker label="Meias" name="lower_socks"/>
-	<texture_picker label="Sapatos" name="lower_shoes"/>
-	<texture_picker label="Calças" name="lower_pants"/>
-	<texture_picker label="Jaqueta" name="lower_jacket"/>
-	<texture_picker label="Alpha inferior" name="lower_alpha"/>
-	<texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<texture_picker label="Cabelo" name="hair-baked"/>
+			<texture_picker label="Cabelo" name="hair_grain"/>
+			<texture_picker label="Cabelo alpha" name="hair_alpha"/>
+			<texture_picker label="Cabeça" name="head-baked"/>
+			<texture_picker label="Maquilagem" name="head_bodypaint"/>
+			<texture_picker label="Cabeça Alpha" name="head_alpha"/>
+			<texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
+			<texture_picker label="Olhos" name="eyes-baked"/>
+			<texture_picker label="Olho" name="eyes_iris"/>
+			<texture_picker label="Olhos Alpha" name="eyes_alpha"/>
+			<texture_picker label="Cintura acima" name="upper-baked"/>
+			<texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
+			<texture_picker label="Camiseta" name="upper_undershirt"/>
+			<texture_picker label="Luvas" name="upper_gloves"/>
+			<texture_picker label="Camisa" name="upper_shirt"/>
+			<texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
+			<texture_picker label="Alpha de cima" name="upper_alpha"/>
+			<texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
+			<texture_picker label="Cintura para baixo" name="lower-baked"/>
+			<texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/>
+			<texture_picker label="Roupa de baixo" name="lower_underpants"/>
+			<texture_picker label="Meias" name="lower_socks"/>
+			<texture_picker label="Sapatos" name="lower_shoes"/>
+			<texture_picker label="Calças" name="lower_pants"/>
+			<texture_picker label="Jaqueta" name="lower_jacket"/>
+			<texture_picker label="Alpha inferior" name="lower_alpha"/>
+			<texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
+			<texture_picker label="Saia" name="skirt-baked"/>
+			<texture_picker label="Saia" name="skirt"/>
+		</panel>
+	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index b3cce2d78f..1d0b3c4cd9 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		L$ [AMT]
 	</text>
 	<text name="currency_links">
-		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+		[http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
 	</text>
 	<text name="exchange_rate_note">
 		Digite o valor novamente para ver o câmbio atual.
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index f0e5808df3..9500ba94e5 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,5 +1,131 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="COMPRAR TERRENO">
+	<floater.string name="can_resell">
+		Pode ser revendida.
+	</floater.string>
+	<floater.string name="can_not_resell">
+		Não pode ser revendida.
+	</floater.string>
+	<floater.string name="can_change">
+		Pode ser unida ou subdivida.
+	</floater.string>
+	<floater.string name="can_not_change">
+		Não pode ser unida ou subdividida.
+	</floater.string>
+	<floater.string name="cant_buy_for_group">
+		Você não tem permissão para comprar terra para seu grupo ativo.
+	</floater.string>
+	<floater.string name="no_land_selected">
+		Nenhuma terra selecionada.
+	</floater.string>
+	<floater.string name="multiple_parcels_selected">
+		Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
+	</floater.string>
+	<floater.string name="no_permission">
+		Você não tem permissão para comprar uma terra para seu grupo ativo.
+	</floater.string>
+	<floater.string name="parcel_not_for_sale">
+		O lote selecionado não está a venda.
+	</floater.string>
+	<floater.string name="group_already_owns">
+		O grupo já possui o lote.
+	</floater.string>
+	<floater.string name="you_already_own">
+		Você já possui o lote.
+	</floater.string>
+	<floater.string name="set_to_sell_to_other">
+		O lote selecionado está configurado para ser vendido para outro grupo.
+	</floater.string>
+	<floater.string name="no_public_land">
+		A área selecionada não tem terras públicas.
+	</floater.string>
+	<floater.string name="not_owned_by_you">
+		Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+	</floater.string>
+	<floater.string name="processing">
+		Processando sua compra...
+ 
+(Isso pode levar um minuto.)
+	</floater.string>
+	<floater.string name="fetching_error">
+		Houve um erro ao buscar informações sobre compra de terras.
+	</floater.string>
+	<floater.string name="buying_will">
+		Comprar esta terra irá:
+	</floater.string>
+	<floater.string name="buying_for_group">
+		Ao comprar terra para o grupo:
+	</floater.string>
+	<floater.string name="cannot_buy_now">
+		Não foi possível comprar agora:
+	</floater.string>
+	<floater.string name="not_for_sale">
+		Não disponível para venda:
+	</floater.string>
+	<floater.string name="none_needed">
+		nada necessário
+	</floater.string>
+	<floater.string name="must_upgrade">
+		Sua conta deve ser evoluída para adquirir um lote.
+	</floater.string>
+	<floater.string name="cant_own_land">
+		Sua conta pode possuir uma terra.
+	</floater.string>
+	<floater.string name="land_holdings">
+		Você tem [BUYER] m².
+	</floater.string>
+	<floater.string name="pay_to_for_land">
+		Pagar L$ [AMOUNT] para [SELLER] por esta terra
+	</floater.string>
+	<floater.string name="buy_for_US">
+		Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT],
+	</floater.string>
+	<floater.string name="parcel_meters">
+		Este lote tem [AMOUNT] m²
+	</floater.string>
+	<floater.string name="premium_land">
+		Esse é um terreno premium e custa o equivalente a [AMOUNT] m².
+	</floater.string>
+	<floater.string name="discounted_land">
+		Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m².
+	</floater.string>
+	<floater.string name="meters_supports_object">
+		[AMOUNT] m²
+suporta [AMOUNT2] objetos
+	</floater.string>
+	<floater.string name="sold_with_objects">
+		vendido com objetos
+	</floater.string>
+	<floater.string name="sold_without_objects">
+		objetos não incluídos
+	</floater.string>
+	<floater.string name="info_price_string">
+		L$ [PRICE]
+(L$ [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+	</floater.string>
+	<floater.string name="insufficient_land_credits">
+		O grupo [GROUP] precisará de fundos suficientes de terras
+contribuídas para cobrir este lote antes da aquisição se completar.
+	</floater.string>
+	<floater.string name="have_enough_lindens">
+		Você tem L$ [AMOUNT], suficiente para comprar este lote.
+	</floater.string>
+	<floater.string name="not_enough_lindens">
+		Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
+	</floater.string>
+	<floater.string name="balance_left">
+		Após a compra, restará L$ [AMOUNT].
+	</floater.string>
+	<floater.string name="balance_needed">
+		Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
+	</floater.string>
+	<floater.string name="no_parcel_selected">
+		(nenhum lote selecionado)
+	</floater.string>
+	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
+	<floater.string name="icon_M" value="Parcel_M_Dark"/>
+	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Região:
 	</text>
@@ -106,130 +232,4 @@ Este lote mede 512 m².
 	<check_box label="Subtrair [AMOUNT] m² da minha contribuição." name="remove_contribution"/>
 	<button label="Adquirir" name="buy_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
-	<string name="can_resell">
-		Pode ser revendida.
-	</string>
-	<string name="can_not_resell">
-		Não pode ser revendida.
-	</string>
-	<string name="can_change">
-		Pode ser unida ou subdivida.
-	</string>
-	<string name="can_not_change">
-		Não pode ser unida ou subdividida.
-	</string>
-	<string name="cant_buy_for_group">
-		Você não tem permissão para comprar terra para seu grupo ativo.
-	</string>
-	<string name="no_land_selected">
-		Nenhuma terra selecionada.
-	</string>
-	<string name="multiple_parcels_selected">
-		Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
-	</string>
-	<string name="no_permission">
-		Você não tem permissão para comprar uma terra para seu grupo ativo.
-	</string>
-	<string name="parcel_not_for_sale">
-		O lote selecionado não está a venda.
-	</string>
-	<string name="group_already_owns">
-		O grupo já possui o lote.
-	</string>
-	<string name="you_already_own">
-		Você já possui o lote.
-	</string>
-	<string name="set_to_sell_to_other">
-		O lote selecionado está configurado para ser vendido para outro grupo.
-	</string>
-	<string name="no_public_land">
-		A área selecionada não tem terras públicas.
-	</string>
-	<string name="not_owned_by_you">
-		Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
-	</string>
-	<string name="processing">
-		Processando sua compra...
- 
-(Isso pode levar um minuto.)
-	</string>
-	<string name="fetching_error">
-		Houve um erro ao buscar informações sobre compra de terras.
-	</string>
-	<string name="buying_will">
-		Comprar esta terra irá:
-	</string>
-	<string name="buying_for_group">
-		Ao comprar terra para o grupo:
-	</string>
-	<string name="cannot_buy_now">
-		Não foi possível comprar agora:
-	</string>
-	<string name="not_for_sale">
-		Não disponível para venda:
-	</string>
-	<string name="none_needed">
-		nada necessário
-	</string>
-	<string name="must_upgrade">
-		Sua conta deve ser evoluída para adquirir um lote.
-	</string>
-	<string name="cant_own_land">
-		Sua conta pode possuir uma terra.
-	</string>
-	<string name="land_holdings">
-		Você tem [BUYER] m².
-	</string>
-	<string name="pay_to_for_land">
-		Pagar L$ [AMOUNT] para [SELLER] por esta terra
-	</string>
-	<string name="buy_for_US">
-		Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT],
-	</string>
-	<string name="parcel_meters">
-		Este lote tem [AMOUNT] m²
-	</string>
-	<string name="premium_land">
-		Esse é um terreno premium e custa o equivalente a [AMOUNT] m².
-	</string>
-	<string name="discounted_land">
-		Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m².
-	</string>
-	<string name="meters_supports_object">
-		[AMOUNT] m²
-suporta [AMOUNT2] objetos
-	</string>
-	<string name="sold_with_objects">
-		vendido com objetos
-	</string>
-	<string name="sold_without_objects">
-		objetos não incluídos
-	</string>
-	<string name="info_price_string">
-		L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
-[SOLD_WITH_OBJECTS]
-	</string>
-	<string name="insufficient_land_credits">
-		O grupo [GROUP] precisará de fundos suficientes de terras
-contribuídas para cobrir este lote antes da aquisição se completar.
-	</string>
-	<string name="have_enough_lindens">
-		Você tem L$ [AMOUNT], suficiente para comprar este lote.
-	</string>
-	<string name="not_enough_lindens">
-		Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
-	</string>
-	<string name="balance_left">
-		Após a compra, restará L$ [AMOUNT].
-	</string>
-	<string name="balance_needed">
-		Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
-	</string>
-	<string name="no_parcel_selected">
-		(nenhum lote selecionado)
-	</string>
-	<string name="buy_currency">
-		Comprar L$ [LINDENS] por aproxim. US$ [USD]
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index d60a815f30..4ea014335f 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -21,7 +21,7 @@
 	<check_box label="inscrever-se agora" name="apply_immediate"/>
 	<button left_delta="150" name="color_pipette"/>
 	<button label="Cancelar" label_selected="Cancelar" left_delta="55" name="cancel_btn"/>
-	<button label="Ok" label_selected="Ok" name="select_btn"/>
+	<button label="OK" label_selected="OK" name="select_btn"/>
 	<text name="Current color:">
 		Cor atual:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
index 447ca8c543..318c73e52d 100644
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater customize" title="APARÊNCIA" width="546">
 	<tab_container name="customize tab container" tab_min_width="115" width="544">
-		<placeholder label="Partes de corpo" name="body_parts_placeholder"/>
+		<text label="Partes de corpo" name="body_parts_placeholder">
+			Partes do corpo
+		</text>
 		<panel label="Forma" name="Shape">
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 			<button label="Corpo" label_selected="Corpo" name="Body"/>
@@ -14,8 +16,8 @@
 			<button label="Tórax" label_selected="Tórax" name="Torso"/>
 			<button label="Pernas" label_selected="Pernas" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item label="Feminino" name="radio"/>
-				<radio_item label="Masculino" name="radio2"/>
+				<radio_item label="Feminino" name="radio" value="0"/>
+				<radio_item label="Masculino" name="radio2" value="1"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -33,8 +35,7 @@
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Coloque uma nova forma arrastando uma do seu inventário para seu avatar.
-Alternativamente, você pode criar uma nova de um esboço e usá-la.
+				Para obter um físico novo, arraste um do inventário para o seu avatar. Ou crie um novo.
 			</text>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
@@ -67,9 +68,7 @@ Alternativamente, você pode criar uma nova de um esboço e usá-la.
 				Localizada em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
-Alternativamente, você pode criar uma nova forma a partir de um esboço
-e usá-la.
+				Para obter uma pele nova, arraste uma do inventário para o seu avatar. Ou crie uma pele nova.
 			</text>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
@@ -106,9 +105,7 @@ e usá-la.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
-Alternativamente, você pode criar um novo modelo a partir de um esboço
-e usá-lo.
+				Para obter um cabelo novo, arraste um tipo de cabelo do inventário para o seu avatar. Ou crie um cabelo novo.
 			</text>
 			<text name="no modify instructions">
 				Você não ter permissão para modificar essa vestimenta.
@@ -139,8 +136,7 @@ e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para colocar novos olhos, arraste um do seu inventário para seu avatar.
-Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
+				Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
 			</text>
 			<text name="no modify instructions">
 				Você não tem permissão para alterar esta vestimenta.
@@ -154,12 +150,14 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
-		<placeholder label="Roupas" name="clothes_placeholder"/>
+		<text label="Roupas" name="clothes_placeholder">
+			Roupa
+		</text>
 		<panel label="Camisa" name="Shirt">
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
@@ -179,9 +177,7 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma nova camisa em seu avatar, arraste uma do seu inventário para
-seu avatar. Alternativamente, você pode criar um novo modelo a partir de
-um esboço e usá-lo.
+				Para obter uma camisa nova, arraste uma do inventário para o seu avatar. Ou crie uma camisa nova.
 			</text>
 			<text name="no modify instructions">
 				Você não ter permissão para modificar esta vestimenta.
@@ -193,8 +189,8 @@ um esboço e usá-lo.
 		<panel label="Calças" name="Pants">
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
@@ -214,9 +210,7 @@ um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
+				Para obter calças novas, arraste uma do inventário para o seu avatar. Ou crie calças novas.
 			</text>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
@@ -242,10 +236,9 @@ de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por novos sapatos em seu avatar, basta arrastar um novo do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
+				Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
 			</text>
+			<button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
@@ -254,7 +247,6 @@ de um esboço e usá-lo.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -277,10 +269,9 @@ de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por novas meias em seu avatar, basta arrastar uma nova do seu
-inventário. Alternativamente, você pode criar novas meias a partir de
-um esboço e usá-las.
+				Para obter meias novas, arraste um par do inventário para o seu avatar. Ou crie meias novas.
 			</text>
+			<button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
@@ -289,7 +280,6 @@ um esboço e usá-las.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -312,10 +302,9 @@ um esboço e usá-las.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+				Para por uma jaqueta nova, arraste uma do inventário para o seu avatar. Ou crie uma jaqueta nova.
 			</text>
+			<button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
@@ -325,7 +314,6 @@ partir de um esboço e usá-lo.
 			<texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
 			<texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -348,10 +336,9 @@ partir de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar uma novo modelo a
-partir de um esboço e usá-lo.
+				Para obter luvas novas, arraste um par do inventário para o seu avatar. Ou crie luvas novas.
 			</text>
+			<button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
@@ -360,7 +347,6 @@ partir de um esboço e usá-lo.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -383,10 +369,9 @@ partir de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo
-de seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+				Para obter uma camiseta nova, arraste uma do inventário para o seu avatar. Ou crie uma camiseta nova.
 			</text>
+			<button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/>
 			<text name="no modify instructions">
 				Você não ter permissão para modificar essa vestimenta.
 			</text>
@@ -395,7 +380,6 @@ partir de um esboço e usá-lo.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -418,10 +402,9 @@ partir de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por novas roupas de baixo em seu avatar, basta arrastar um novo
-modelo do seu inventário. Alternativamente, você pode criar um novo
-modelo a partir de um esboço e usá-lo.
+				Para obter roupa de baixo nova, arraste um modelo do inventário para o seu avatar. Ou crie uma roupa de baixo nova.
 			</text>
+			<button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
@@ -430,7 +413,6 @@ modelo a partir de um esboço e usá-lo.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -453,10 +435,9 @@ modelo a partir de um esboço e usá-lo.
 				Localizado em [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma nova saia em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+				Para obter um saia nova, arraste uma saia do inventário para o seu avatar. Ou crie uma saia nova.
 			</text>
+			<button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
 			<text name="no modify instructions">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
@@ -465,13 +446,12 @@ partir de um esboço e usá-lo.
 			</text>
 			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
 			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
-			<button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
 			<button label="Remover" label_selected="Remover" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
-		<panel label="Alpha" name="Alpha">
+		<panel label="Tatuagem" name="Tattoo">
 			<text name="title">
 				[DESC]:
 			</text>
@@ -488,27 +468,24 @@ partir de um esboço e usá-lo.
 				Localização: [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar. 
-Ou crie uma máscara nova e coloque-a.
+				Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar. Ou crie uma tatuagem nova.
 			</text>
+			<button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/>
 			<text name="no modify instructions">
 				Você não está autorizado a modificar este acessório.
 			</text>
 			<text name="Item Action Label">
-				Alpha:
+				Tatuagem:
 			</text>
-			<texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/>
-			<button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/>
+			<texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/>
 			<button label="Tirar" label_selected="Tirar" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
 			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
-		<panel label="Tatuagem" name="Tattoo">
+		<panel label="Alpha" name="Alpha">
 			<text name="title">
 				[DESC]:
 			</text>
@@ -525,19 +502,20 @@ Ou crie uma máscara nova e coloque-a.
 				Localização: [PATH]
 			</text>
 			<text name="not worn instructions">
-				Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar. 
-Ou crie uma tatuagem nova.
+				Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar. Ou crie uma máscara nova.
 			</text>
+			<button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/>
 			<text name="no modify instructions">
 				Você não está autorizado a modificar este acessório.
 			</text>
 			<text name="Item Action Label">
-				Tatuagem:
+				Alpha:
 			</text>
-			<texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/>
-			<texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/>
-			<button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/>
+			<texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/>
+			<texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/>
 			<button label="Tirar" label_selected="Tirar" name="Take Off"/>
 			<button label="Salvar" label_selected="Salvar" name="Save"/>
 			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -545,6 +523,7 @@ Ou crie uma tatuagem nova.
 		</panel>
 	</tab_container>
 	<scroll_container left="249" name="panel_container"/>
+	<button label="Dados do script" label_selected="Dados do script" name="script_info" tool_tip="Mostrar scripts anexados ao seu avatar"/>
 	<button label="Criar look" label_selected="Criar look" name="make_outfit_btn"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
new file mode 100644
index 0000000000..4b2489654a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_event.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Evento" name="Event" title="DETALHES DO EVENTO">
+	<floater.string name="none">
+		nenhum
+	</floater.string>
+	<floater.string name="notify">
+		Avisar
+	</floater.string>
+	<floater.string name="dont_notify">
+		Não avisar
+	</floater.string>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<text name="event_name">
+				Evento sem nome... Terror! Terror Aterrorizante.
+			</text>
+			<text name="event_category">
+				(não categorizado)
+			</text>
+			<text name="event_runby_label">
+				Organização:
+			</text>
+			<text initial_value="(pesquisando)" name="event_runby"/>
+			<text name="event_date">
+				10/10/2010
+			</text>
+			<text name="event_duration">
+				1 hora
+			</text>
+			<text name="event_cover">
+				Grátis
+			</text>
+			<text name="event_location_label">
+				Localização:
+			</text>
+			<text name="event_location" value="LoteExemplo, Nome extenso (145, 228, 26)"/>
+			<text name="rating_label" value="Classificação:"/>
+			<text name="rating_value" value="(Desconhecido)"/>
+		</layout_panel>
+		<layout_panel name="button_panel">
+			<button name="create_event_btn" tool_tip="Criar evento"/>
+			<button name="god_delete_event_btn" tool_tip="Excluir evento"/>
+			<button label="Avise-me" name="notify_btn"/>
+			<button label="Teletransportar" name="teleport_btn"/>
+			<button label="Mapa" name="map_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 4b7b2eb34e..93b2f3e90d 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -11,7 +11,7 @@
 			</text>
 			<check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/>
 			<check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) &gt; Terreno."/>
-			<check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/>
+			<check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente sair, definir o destino com sua posição inicial."/>
 			<check_box label="Visível" name="check visible" tool_tip="Ajustar para fazer essa região visível para os não-deuses"/>
 			<check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/>
 			<check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/>
@@ -73,17 +73,17 @@
 				Destino:
 			</text>
 			<combo_box name="destination">
-				<combo_box.item name="item1" label="Seleção" />
-				<combo_box.item name="item2" label="Região do Agente" />
+				<combo_box.item label="Seleção" name="item1"/>
+				<combo_box.item label="Região do Agente" name="item2"/>
 			</combo_box>
 			<text name="Request:">
 				Requisição:
 			</text>
 			<combo_box name="request">
-				<combo_box.item name="item1" label="Passos de Colisão" />
-				<combo_box.item name="item2" label="Contagem de scripts, padrão opcional" />
-				<combo_box.item name="item3" label="Padrão de Objetos" />
-				<combo_box.item name="item4" label="rez &lt;asset_id&gt;" />
+				<combo_box.item label="Passos de Colisão" name="item1"/>
+				<combo_box.item label="Contagem de scripts, padrão opcional" name="item2"/>
+				<combo_box.item label="Padrão de Objetos" name="item3"/>
+				<combo_box.item label="rez &lt;asset_id&gt;" name="item4"/>
 			</combo_box>
 			<text name="Parameter:">
 				Parametro:
diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
index 281bdbd183..9cc8a0a6b2 100644
--- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_help_browser" title="NAVEGADOR DA AJUDA">
+	<floater.string name="loading_text">
+		Carregando...
+	</floater.string>
 	<layout_stack name="stack1">
-		<layout_panel name="external_controls">
-			<button label="Abrir no navegador" name="open_browser"/>
-		</layout_panel>
+		<layout_panel name="external_controls"/>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index a21d4a6f1e..0fbb826a96 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="Mensagens instantâneas"/>
+<multi_floater name="floater_im_box" title="CONVERSAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 79124966d1..cdebe533bd 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="incoming call" title="LIGAÇÃO DE DESCONHECIDO">
+	<floater.string name="lifetime">
+		5
+	</floater.string>
 	<floater.string name="localchat">
 		Bate-papo local
 	</floater.string>
@@ -12,6 +15,9 @@
 	<floater.string name="VoiceInviteAdHoc">
 		entrou numa ligação de voz via conferência.
 	</floater.string>
+	<floater.string name="VoiceInviteGroup">
+		entrou numa ligação de bate-papo de voz com o grupo [GROUP].
+	</floater.string>
 	<text name="question">
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
index 409261a136..ae3312eab0 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="INVENT�RIO">
+<floater name="Inventory" title="MEU INVENT�RIO">
 	<floater.string name="Title">
-		Inventário
+		MEU INVENT�RIO
 	</floater.string>
 	<floater.string name="TitleFetching">
-		Inventário ([ITEM_COUNT] Items) [FILTER] [FILTER]
+		MEU INVENT�RIO (Pegando [ITEM_COUNT] items...) [FILTER]
 	</floater.string>
 	<floater.string name="TitleCompleted">
-		Inventário ([ITEM_COUNT] Items) [FILTER]
+		MEU INVENT�RIO ([ITEM_COUNT] items) [FILTER]
 	</floater.string>
 	<floater.string name="Fetched">
 		Obtido
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 1717088eae..5ad116ac8a 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
 		Executando
 	</floater.string>
 	<floater.string name="Title">
-		Script: [NAME]
+		SCRIPT: [NAME]
 	</floater.string>
 	<button label="Resetar" label_selected="Resetar" name="Reset"/>
 	<check_box initial_value="true" label="Correndo" name="running"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index f9a5e08e97..73f187f0e4 100644
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL WIKI">
+<floater name="script ed float" title="LSL REFERENCE">
 	<check_box label="Seguir o Cursor" name="lock_check"/>
 	<combo_box label="Bloquear" left_delta="120" name="history_combo" width="70"/>
 	<button label="Anterior" left_delta="75" name="back_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
index ff60f77c4b..3a04528228 100644
--- a/indra/newview/skins/default/xui/pt/floater_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
+<floater name="Map" title="Mini Mapa">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index 1cd6d5662c..7491218067 100644
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -15,7 +15,7 @@
 			<button label="Ir" left_delta="505" name="go" width="35"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Enviar a URL atual para o terreno" name="assign"/>
+			<button label="Enviar esta página para lote" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
 			<button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index 7c4436537d..f67a16bb46 100644
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
@@ -21,7 +21,7 @@
 	<panel name="panel_actions">
 		<button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="Voar para o alto (tecla E)"/>
+		<button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/>
 		<button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/>
 		<joystick_turn name="forward btn" tool_tip="Andar para frente (flecha para cima ou W)"/>
 		<joystick_turn name="backward btn" tool_tip="Andar para trás (flecha para baixo ou S)"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
new file mode 100644
index 0000000000..dec8a7676a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title="Salvar este look">
+	<button label="Salvar" label_selected="Salvar" name="Save"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<text name="Save item as:">
+		Veja o meu novo visual:
+	</text>
+	<line_editor name="name ed">
+		[DESC] (new)
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
index 2078185315..8a536b90db 100644
--- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="outgoing call" title="LIGANDO">
+	<floater.string name="lifetime">
+		5
+	</floater.string>
 	<floater.string name="localchat">
 		Bate-papo local
 	</floater.string>
@@ -21,6 +24,15 @@
 	<text name="noanswer">
 		Não há resposta. Tente novamente mais tarde.
 	</text>
+	<text name="nearby">
+		Você saiu da ligação com [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_other">
+		[VOICE_CHANNEL_NAME] encerrou a ligação.  [RECONNECT_NEARBY]
+	</text>
+	<text name="nearby_P2P_by_agent">
+		Você encerrou a ligação.   [RECONNECT_NEARBY]
+	</text>
 	<text name="leaving">
 		Saindo de [CURRENT_CHAT].
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index 161c7c6d4b..464afd7f18 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -15,7 +15,7 @@
 	</text>
 	<icon name="icon_object" tool_tip="Objects"/>
 	<text left="105" name="object_name_text">
-		...
+		Meu objeto maravilho, fantástico e com nome comprido e imaginativo
 	</text>
 	<button label="L$1" label_selected="L$1" left="125" name="fastpay 1" width="70"/>
 	<button label="L$5" label_selected="L$5" left="200" name="fastpay 5" width="70"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index dc29bcf6b1..803f2f87b8 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
@@ -6,7 +6,7 @@
 		<panel label="Público geral" name="general"/>
 		<panel label="Vídeo" name="display"/>
 		<panel label="Privacidade" name="im"/>
-		<panel label="Som" name="audio"/>
+		<panel label="Som e mídia" name="audio"/>
 		<panel label="Bate-papo" name="chat"/>
 		<panel label="Notificações" name="msgs"/>
 		<panel label="Configurações" name="input"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index c7d3affd73..b66159354f 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		Descrição:
 	</text>
-	<button label="Executar in World" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/>
+	<button label="Tocar inworld" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/>
 	<button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Tocar essa animação de forma que apenas você possa ver" width="125"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index af4dceaa89..48f27f1968 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -24,6 +24,9 @@
 	<floater.string name="Title">
 		Gesto: [NAME]
 	</floater.string>
+	<text name="name_text">
+		Nome:
+	</text>
 	<text name="desc_label">
 		Descrição:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index 6194bfffd6..e648a7d873 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="NOTA:">
+<floater name="preview notecard" title="Anotação:">
 	<floater.string name="no_object">
-		Não foi possível encontrar o objeto que contém esta nota.
+		O objeto com esta anotação não foi encontrado.
 	</floater.string>
 	<floater.string name="not_allowed">
 		Você não está autorizado a ler esta nota.
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index 8691542d95..7c5a1538f2 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		Descrição:
 	</text>
-	<button label="Executar in-World" label_selected="Executar in-World" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/>
+	<button label="Tocar inworld" label_selected="Tocar inworld" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/>
 	<button label="Executar Localmente" label_selected="Executar Localmente" left="152" name="Sound audition btn" tool_tip="Tocar som de forma que apenas você possa ouvir" width="135"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 066cf05163..6f39635240 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
@@ -12,6 +12,9 @@
 	<text name="dimensions">
 		[WIDTH]px x [HEIGHT]px
 	</text>
+	<text name="aspect_ratio">
+		Visualizar relação de aspecto
+	</text>
 	<combo_box name="combo_aspect_ratio" tool_tip="Visualizar com proporção de aspecto fixa">
 		<combo_item name="Unconstrained">
 			Sem limites
@@ -38,7 +41,7 @@
 			2:1
 		</combo_item>
 	</combo_box>
-	<button label="OK" name="keep"/>
-	<button label="Cancelar" name="discard"/>
+	<button label="OK" name="Keep"/>
+	<button label="Descartar" name="Discard"/>
 	<button label="Salvar como" name="save_tex_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 7988056a3b..08413a9231 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -41,8 +41,8 @@
 	<combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
 		<combo_box.item label="Selecionar categoria" name="Select_category"/>
 		<combo_box.item label="Idade &gt; Idade no jogo" name="Age__Age_play"/>
-		<combo_box.item label="Idade &gt; Residente adulto no Second Life Jovem" name="Age__Adult_resident_on_Teen_Second_Life"/>
-		<combo_box.item label="Idade &gt; Residente menor de idade fora do Second Life Teen" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="Idade &gt; Residente adulto ou adolescente" name="Age__Adult_resident_on_Teen_Second_Life"/>
+		<combo_box.item label="Idade &gt; Residente menor de idade, fora do Second Life teen" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
 		<combo_box.item label="Assalto &gt; Sandbox de combate / área não segura" name="Assault__Combat_sandbox___unsafe_area"/>
 		<combo_box.item label="Assalto &gt; �rea segura" name="Assault__Safe_area"/>
 		<combo_box.item label="Assalto &gt; Testando armas em sandbox" name="Assault__Weapons_testing_sandbox"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
new file mode 100644
index 0000000000..64a8a49c85
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="scriptlimits" title="DADOS DO SCRIPT"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
index 5fafb0d1b8..5be866d052 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
 	<floater.string name="Title">
-		Script: [NAME]
+		SCRIPT: [NAME]
 	</floater.string>
 	<text name="desc txt">
 		Descrição:
diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml
index 15772da434..7264a5a713 100644
--- a/indra/newview/skins/default/xui/pt/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml
@@ -2,6 +2,6 @@
 <floater name="modal container" title="">
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Pressione uma tecla para definir o botão disparador do Falar.
+		Pressione uma tecla para definir o seu botão Falar.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index dfffb89f30..c6694d13b2 100644
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="DEBUG SETTINGS">
-	<combo_box name="boolean_combo">
-		<combo_box.item label="TRUE" name="TRUE"/>
-		<combo_box.item label="FALSE" name="FALSE"/>
-	</combo_box>
+	<radio_group name="boolean_combo">
+		<radio_item label="TRUE" name="TRUE" value="verdadeiro"/>
+		<radio_item label="FALSE" name="FALSE" value=""/>
+	</radio_group>
 	<color_swatch label="Cor" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index b5d070c9d5..a3934a6667 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -4,12 +4,12 @@
 		Destino da foto
 	</text>
 	<radio_group label="Tipo de Foto" name="snapshot_type_radio">
-		<radio_item label="Enviar por email" name="postcard"/>
-		<radio_item label="Salvar no seu inventário (L$[AMOUNT])" name="texture"/>
-		<radio_item label="Salvar no seu disco rígido" name="local"/>
+		<radio_item label="Email" name="postcard"/>
+		<radio_item label="Meu inventário (L$[AMOUNT])" name="texture"/>
+		<radio_item label="Salvar no meu PC" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
-		Tamanho do arquivo: [SIZE] KB
+		[SIZE] KB
 	</text>
 	<button label="Atualizar a foto" name="new_snapshot_btn"/>
 	<button label="Enviar" name="send_btn"/>
@@ -19,8 +19,8 @@
 		<flyout_button.item label="Salvar como..." name="saveas_item"/>
 	</flyout_button>
 	<button label="Cancelar" name="discard_btn"/>
-	<button label="Mais &gt;" name="more_btn" tool_tip="Opções avançadas"/>
-	<button label="&lt; Menos" name="less_btn" tool_tip="Opções avançadas"/>
+	<button label="Mais" name="more_btn" tool_tip="Opções avançadas"/>
+	<button label="Menos" name="less_btn" tool_tip="Opções avançadas"/>
 	<text name="type_label2">
 		Tamanho
 	</text>
@@ -58,8 +58,8 @@
 	</combo_box>
 	<spinner label="Largura" label_width="41" name="snapshot_width" width="101"/>
 	<spinner label="Altura" label_width="31" left="119" name="snapshot_height" width="91"/>
-	<check_box label="Restringir proporções" name="keep_aspect_check"/>
-	<slider label="Qualidade da Imagem" name="image_quality_slider"/>
+	<check_box label="Limitar proproções" name="keep_aspect_check"/>
+	<slider label="Qualidade da imagem" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capturar:
 	</text>
@@ -68,10 +68,10 @@
 		<combo_box.item label="Formato" name="Depth"/>
 		<combo_box.item label="Decoração do Objeto" name="ObjectMattes"/>
 	</combo_box>
-	<check_box label="Mostrar interface na Foto" name="ui_check"/>
-	<check_box bottom_delta="-17" label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+	<check_box label="Interface" name="ui_check"/>
+	<check_box bottom_delta="-17" label="HUDs" name="hud_check"/>
 	<check_box bottom_delta="-17" label="Manter aberto após salvar" name="keep_open_check"/>
-	<check_box bottom_delta="-17" label="Quadro Congelado  (prévia da tela inteira)" name="freeze_frame_check"/>
+	<check_box bottom_delta="-17" label="Gerar quadro (tela inteira)" name="freeze_frame_check"/>
 	<check_box bottom_delta="-29" label="Auto-atualizar" name="auto_snapshot_check"/>
 	<string name="unknown">
 		desconhecido
diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
index b4760835b0..38beec022c 100644
--- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="AVISOS">
 	<string name="title_im_well_window">
-		MIs
+		CONVERSAS
 	</string>
 	<string name="title_notification_well_window">
 		AVISOS
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 69ea67699c..144bc0340e 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -16,7 +16,7 @@
 	<search_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box label="Applicar agora" name="apply_immediate_check"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	<button label="Ok" label_selected="Ok" name="Select"/>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<string name="pick title">
 		Pegar:
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index c6a62c9118..dc3bf73818 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,58 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="Principais objetos:">
+	<floater.string name="top_scripts_title">
+		Principais Scripts
+	</floater.string>
+	<floater.string name="top_scripts_text">
+		[COUNT] scripts tomando um total de [TIME] ms
+	</floater.string>
+	<floater.string name="scripts_score_label">
+		Tempo
+	</floater.string>
+	<floater.string name="scripts_mono_time_label">
+		Hora Mono
+	</floater.string>
+	<floater.string name="top_colliders_title">
+		Principais Colidentes
+	</floater.string>
+	<floater.string name="top_colliders_text">
+		[COUNT] objetos principais experimentando muitas potenciais colisões
+	</floater.string>
+	<floater.string name="colliders_score_label">
+		Placar
+	</floater.string>
+	<floater.string name="none_descriptor">
+		Nenhum encontrado.
+	</floater.string>
 	<text name="title_text">
 		Carregando...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Placar" name="score"/>
-		<column label="Nome" name="name"/>
-		<column label="Proprietário" name="owner"/>
-		<column label="Local" name="location"/>
-		<column label="Tempo" name="time"/>
-		<column label="Hora Mono" name="mono_time"/>
+		<scroll_list.columns label="Placar" name="score"/>
+		<scroll_list.columns label="Nome" name="name"/>
+		<scroll_list.columns label="Proprietário" name="owner"/>
+		<scroll_list.columns label="Local" name="location"/>
+		<scroll_list.columns label="Tempo" name="time"/>
+		<scroll_list.columns label="Hora Mono" name="mono_time"/>
+		<scroll_list.columns label="URLs" name="URLs"/>
 	</scroll_list>
 	<text name="id_text">
 		ID do Objeto:
 	</text>
+	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
 	<button label="Mostrar Avisos" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Nome do objeto:
 	</text>
+	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
 	<button label="Filtro" name="filter_object_btn"/>
 	<text name="owner_name_text" width="130">
 		Proprietário:
 	</text>
-	<line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
-	<line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
 	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn"/>
+	<button label="Atualizar" name="refresh_btn"/>
 	<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
 	<button label="Retornar Tudo" left="190" name="return_all_btn"/>
 	<button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/>
 	<button label="Desabilitar Tudo" left="190" name="disable_all_btn"/>
-	<button label="Atualizar" name="refresh_btn"/>
-	<string name="top_scripts_title">
-		Principais Scripts
-	</string>
-	<string name="top_scripts_text">
-		[COUNT] scripts tomando um total de [TIME] ms
-	</string>
-	<string name="scripts_score_label">
-		Tempo
-	</string>
-	<string name="scripts_mono_time_label">
-		Hora Mono
-	</string>
-	<string name="top_colliders_title">
-		Principais Colidentes
-	</string>
-	<string name="top_colliders_text">
-		[COUNT] objetos principais experimentando muitas potenciais colisões
-	</string>
-	<string name="colliders_score_label">
-		Placar
-	</string>
-	<string name="none_descriptor">
-		Nenhum encontrado.
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 9a9666f9db..2fbbbde9e4 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -4,7 +4,7 @@
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
 	<text name="tos_heading">
-		Leia com atenção os Termos do Serviço.  Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato.
+		Leia com atenção os Termos do Serviço. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
index 8348b375b1..6ab10db96f 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
@@ -13,13 +13,14 @@
 		Ligação para [NAME]
 	</string>
 	<string name="no_one_near">
-		Ninguém por perto
+		Ninguém por perto ativou a voz
 	</string>
-	<panel name="control_panel">
-		<layout_stack>
-			<layout_panel name="leave_btn_panel">
-				<button label="Desligar" name="leave_call_btn"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
+	<layout_stack name="my_call_stack">
+		<layout_panel name="my_panel">
+			<text name="user_text" value="Mya Avatar:"/>
+		</layout_panel>
+		<layout_panel name="leave_call_btn_panel">
+			<button label="Desligar" name="leave_call_btn"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
index 2b2c669a18..282bf0e268 100644
--- a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
@@ -3,7 +3,7 @@
 	<button label="Salvar" label_selected="Salvar" name="Save"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<text name="Save item as:">
-		Salvar item como:
+		Salvar item no inventário como:
 	</text>
 	<line_editor name="name ed">
 		Novo [DESC]
diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
index 8f616396ca..865d939d24 100644
--- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry">
+<floater name="whitelist_entry" title="LISTA BRANCA">
 	<text name="media_label">
 		Digite um URL ou série de URLs para a lista de domínios permitidos
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
new file mode 100644
index 0000000000..6a8ccbd002
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="window_size" title="TAMANHO DA JANELA">
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<text name="windowsize_text">
+		Definir tamanho da janela:
+	</text>
+	<combo_box name="window_size_combo" tool_tip="largura x altura">
+		<combo_box.item label="1000 x 700 (padrão)" name="item0"/>
+		<combo_box.item label="1024 x 768" name="item1"/>
+		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
+		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+	</combo_box>
+	<button label="Definir" name="set_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 81f8ce7846..95bb899071 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -5,12 +5,16 @@
 			Legenda
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_2">
 		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/>
-		<text name="person_label">
+		<text name="me_label">
 			Eu
 		</text>
 		<check_box label="Residente" name="people_chk"/>
+		<text name="person_label">
+			Pessoa
+		</text>
 		<check_box label="Infohub" name="infohub_chk"/>
 		<text name="infohub_label">
 			Infohub
@@ -19,9 +23,12 @@
 		<text name="land_sale_label">
 			Venda de terreno
 		</text>
-		<text name="auction_label">
+		<text name="by_owner_label">
 			pelo dono
 		</text>
+		<text name="auction_label">
+			leilão de terrenos
+		</text>
 		<button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para minha casa"/>
 		<text name="Home_label">
 			Casa
@@ -30,18 +37,26 @@
 			Eventos:
 		</text>
 		<check_box label="PG" name="event_chk"/>
+		<text name="pg_label">
+			Geral
+		</text>
 		<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 		<text name="mature_label">
 			Moderado
 		</text>
 		<check_box label="Adult" name="event_adult_chk"/>
+		<text name="adult_label">
+			Público adulto
+		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_3">
 		<text name="find_on_map_label">
 			Localizar no mapa
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_4">
 		<combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos no mapa">
 			<combo_box.item label="Amigos conectados" name="item1"/>
 		</combo_box>
@@ -50,16 +65,19 @@
 		</combo_box>
 		<search_editor label="Regiões por nome" name="location" tool_tip="Digite o nome de uma Região"/>
 		<button label="Buscar" name="DoSearch" tool_tip="Procurar por região"/>
+		<button name="Clear" tool_tip="Limpara linhas e redefinir mapa"/>
 		<button font="SansSerifSmall" label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/>
 		<button font="SansSerifSmall" label="Copiar SLurl" name="copy_slurl" tool_tip="Copia a localização atual como um SLurl para usar na web."/>
 		<button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada" width="135"/>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_5">
 		<text name="zoom_label">
 			Zoom
 		</text>
 	</panel>
-	<panel>
+	<panel
+	name="layout_panel_6">
 		<slider label="Zoom" name="zoom slider"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
index 8f35acf19e..a74ea15be0 100644
--- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
@@ -13,7 +13,7 @@
 	<slider name="volume_slider" tool_tip="Volume de Voz" value="0.5"/>
 	<button label="Adicionar amigo" name="add_friend_btn"/>
 	<button label="MI" name="im_btn"/>
-	<button label="Mais" name="view_profile_btn"/>
+	<button label="Perfil" name="view_profile_btn"/>
 	<panel name="moderator_panel">
 		<button label="Disabilitar Voz" name="disable_voice"/>
 		<button label="Habilitar Voz" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index 99d5ae9bec..abbf2e7032 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
 	<menu_item_call label="Ficar de pé" name="Stand Up"/>
-	<context_menu label="Tirar &gt;" name="Take Off &gt;">
-		<context_menu label="Roupa &gt;" name="Clothes &gt;">
+	<context_menu label="Tirar â–¶" name="Take Off &gt;">
+		<context_menu label="Roupa â–¶" name="Clothes &gt;">
 			<menu_item_call label="Camisa" name="Shirt"/>
 			<menu_item_call label="Calças" name="Pants"/>
 			<menu_item_call label="Saia" name="Skirt"/>
@@ -16,8 +16,8 @@
 			<menu_item_call label="Alpha" name="Self Alpha"/>
 			<menu_item_call label="Todas as roupas" name="All Clothes"/>
 		</context_menu>
-		<context_menu label="HUD &gt;" name="Object Detach HUD"/>
-		<context_menu label="Tirar &gt;" name="Object Detach"/>
+		<context_menu label="HUD  â–¶" name="Object Detach HUD"/>
+		<context_menu label="Tirar  â–¶" name="Object Detach"/>
 		<menu_item_call label="Tirar tudo" name="Detach All"/>
 	</context_menu>
 	<menu_item_call label="Minha aparência" name="Appearance..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
new file mode 100644
index 0000000000..2d37cefd6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="IM Well Button Context Menu">
+	<menu_item_call label="Fechar tudo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
index 46c536e64b..cdd8959cd4 100644
--- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
@@ -7,6 +7,7 @@
 	<menu_item_call label="Teletransportar" name="teleport"/>
 	<menu_item_call label="Convidar para entrar no grupo" name="invite_to_group"/>
 	<menu_item_call label="Bloquear" name="block"/>
+	<menu_item_call label="Desbloquear" name="unblock"/>
 	<menu_item_call label="Denunciar" name="report"/>
 	<menu_item_call label="Congelar" name="freeze"/>
 	<menu_item_call label="Ejetar" name="eject"/>
@@ -14,4 +15,5 @@
 	<menu_item_call label="Localizar no mapa" name="find_on_map"/>
 	<menu_item_call label="Mais zoom" name="zoom_in"/>
 	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Compartilhar" name="share"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index de33849d0c..8b565b9645 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -10,7 +10,7 @@
 	<menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/>
 	<menu_item_call label="Nova Pasta" name="New Folder"/>
 	<menu_item_call label="Novo Script" name="New Script"/>
-	<menu_item_call label="Nova Nota" name="New Note"/>
+	<menu_item_call label="Nova anotação" name="New Note"/>
 	<menu_item_call label="Novo Gesto" name="New Gesture"/>
 	<menu label="Novas roupas" name="New Clothes">
 		<menu_item_call label="Nova Camisa" name="New Shirt"/>
@@ -46,9 +46,10 @@
 	<menu_item_call label="Teletransporte" name="Landmark Open"/>
 	<menu_item_call label="Abrir" name="Animation Open"/>
 	<menu_item_call label="Abrir" name="Sound Open"/>
+	<menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
+	<menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
 	<menu_item_call label="Remover item" name="Purge Item"/>
 	<menu_item_call label="Restaurar item" name="Restore Item"/>
-	<menu_item_call label="Ir para o link" name="Goto Link"/>
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Propriedades" name="Properties"/>
 	<menu_item_call label="Renomear" name="Rename"/>
@@ -57,13 +58,11 @@
 	<menu_item_call label="Colar" name="Paste"/>
 	<menu_item_call label="Colar como link" name="Paste As Link"/>
 	<menu_item_call label="Apagar" name="Delete"/>
-	<menu_item_call label="Remover os itens" name="Take Off Items"/>
-	<menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
-	<menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
+	<menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
 	<menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/>
 	<menu_item_call label="Executar" name="Sound Play"/>
 	<menu_item_call label="Sobre o marco" name="About Landmark"/>
-	<menu_item_call label="Executar in World" name="Animation Play"/>
+	<menu_item_call label="Tocar inworld" name="Animation Play"/>
 	<menu_item_call label="Executar localmente" name="Animation Audition"/>
 	<menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/>
 	<menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
index d1bdcd3a8a..81898c63bf 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
@@ -8,7 +8,7 @@
 	</menu>
 	<menu_item_call label="Nova pasta" name="New Folder"/>
 	<menu_item_call label="Novo script" name="New Script"/>
-	<menu_item_call label="Nova nota" name="New Note"/>
+	<menu_item_call label="Nova anotação" name="New Note"/>
 	<menu_item_call label="Novo gesto" name="New Gesture"/>
 	<menu label="Novas roupas" name="New Clothes">
 		<menu_item_call label="Nova camisa" name="New Shirt"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3dd5d2c152..6cc83d11d0 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -21,8 +21,8 @@
 		</menu>
 		<menu_item_call label="Mostrar configurações" name="Debug Settings"/>
 		<menu_item_call label="Configurações da interface e cor" name="UI/Color Settings"/>
-		<menu_item_call label="Mostrar bandeja lateral" name="Show Side Tray"/>
 		<menu label="Testes de UI" name="UI Tests"/>
+		<menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/>
 		<menu_item_call label="Mostrar TOS" name="TOS"/>
 		<menu_item_call label="Mostrar mensagem crítica" name="Critical"/>
 		<menu_item_call label="Teste de navegador web" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
new file mode 100644
index 0000000000..43ad4134ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+	<menu_item_call label="Fechar tudo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index 658f44d692..5121c9d048 100644
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -6,18 +6,20 @@
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Sentar aqui" name="Object Sit"/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<context_menu label="Colocar no(a)" name="Put On">
 		<menu_item_call label="Vestir" name="Wear"/>
 		<context_menu label="Anexar &gt;" name="Object Attach"/>
 		<context_menu label="Anexar o HUD &gt;" name="Object Attach HUD"/>
 	</context_menu>
 	<context_menu label="Tirar &gt;" name="Remove">
-		<menu_item_call label="Pegar" name="Pie Object Take"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse..."/>
 		<menu_item_call label="Bloquear" name="Object Mute"/>
 		<menu_item_call label="Devolver" name="Return..."/>
 		<menu_item_call label="Excluir" name="Delete"/>
 	</context_menu>
+	<menu_item_call label="Comprar" name="Pie Object Bye"/>
+	<menu_item_call label="Pegar" name="Pie Object Take"/>
 	<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Comprar" name="Buy..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
index 6db1fe7105..849dec3108 100644
--- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
+	<menu_item_check label="Ordenar por nome" name="SortByName"/>
+	<menu_item_check label="Ordenar por conversas mais recentes" name="SortByRecentSpeakers"/>
 	<menu_item_call label="Ver perfil" name="View Profile"/>
 	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
 	<menu_item_call label="MI" name="IM"/>
 	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Compartilhar" name="Share"/>
 	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_check label="Silenciar texto" name="MuteText"/>
-	<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
-	<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
-	<menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/>
-	<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
-	<menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/>
+	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
+		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/>
+		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/>
+	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
new file mode 100644
index 0000000000..9a924ad7b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_call label="Ver dados" name="View Info"/>
+	<menu_item_call label="Bate-papo" name="Chat"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Ativar" name="Activate"/>
+	<menu_item_call label="Sair" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index eb47f51ed0..7c720f262b 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -2,9 +2,12 @@
 <context_menu name="Avatar Context Menu">
 	<menu_item_call label="Ver perfil" name="View Profile"/>
 	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
 	<menu_item_call label="MI" name="IM"/>
 	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
 	<menu_item_call label="Compartilhar" name="Share"/>
 	<menu_item_call label="Pagar" name="Pay"/>
 	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 855e7c9920..fc08b3accb 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
 	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
 	<menu_item_call label="MI" name="IM"/>
 	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Compartilhar" name="Share"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
index b3e09bc695..2635182290 100644
--- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
@@ -2,4 +2,10 @@
 <toggleable_menu name="profile_overflow_menu">
 	<menu_item_call label="Pagar" name="pay"/>
 	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Bloquear" name="block"/>
+	<menu_item_call label="Desbloquear" name="unblock"/>
+	<menu_item_call label="Chutar" name="kick"/>
+	<menu_item_call label="Congelar" name="freeze"/>
+	<menu_item_call label="Descongelar" name="unfreeze"/>
+	<menu_item_call label="CSR" name="csr"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index acadc952ca..2b83386cad 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -9,8 +9,8 @@
 		<menu_item_call label="Meu perfil" name="Profile"/>
 		<menu_item_call label="Minha aparência" name="Appearance"/>
 		<menu_item_check label="Meu inventário" name="Inventory"/>
-		<menu_item_call label="Mostrar inventário na bandeja lateral" name="ShowSidetrayInventory"/>
-		<menu_item_call label="Meus gestos" name="Gestures"/>
+		<menu_item_check label="Meu inventário" name="ShowSidetrayInventory"/>
+		<menu_item_check label="Meus gestos" name="Gestures"/>
 		<menu label="Meu status" name="Status">
 			<menu_item_call label="Ausente" name="Set Away"/>
 			<menu_item_call label="Ocupado" name="Set Busy"/>
@@ -24,35 +24,36 @@
 		<menu_item_call label="Meus grupos" name="My Groups"/>
 		<menu_item_check label="Bate-papo local" name="Nearby Chat"/>
 		<menu_item_call label="Pessoas por perto" name="Active Speakers"/>
-		<menu_item_check label="Mídia por perto" name="Nearby Media"/>
 	</menu>
 	<menu label="Mundo" name="World">
-		<menu_item_check label="Movimentar" name="Movement Controls"/>
-		<menu_item_check label="Exibir" name="Camera Controls"/>
-		<menu_item_call label="Sobre terrenos" name="About Land"/>
-		<menu_item_call label="Região/Propriedade" name="Region/Estate"/>
-		<menu_item_call label="Comprar terreno" name="Buy Land"/>
+		<menu_item_check label="Mini Mapa" name="Mini-Map"/>
+		<menu_item_check label="Mapa-múndi" name="World Map"/>
+		<menu_item_call label="Foto" name="Take Snapshot"/>
+		<menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
+		<menu label="Perfil da região" name="Land">
+			<menu_item_call label="Sobre terrenos" name="About Land"/>
+			<menu_item_call label="Região/Propriedade" name="Region/Estate"/>
+		</menu>
+		<menu_item_call label="Comprar este terreno" name="Buy Land"/>
 		<menu_item_call label="Meus terrenos" name="My Land"/>
-		<menu label="Mostrar" name="Land">
+		<menu label="Mostrar" name="LandShow">
+			<menu_item_check label="Controles de movimento" name="Movement Controls"/>
+			<menu_item_check label="Ver controles" name="Camera Controls"/>
 			<menu_item_check label="Limites" name="Ban Lines"/>
 			<menu_item_check label="Balizas" name="beacons"/>
 			<menu_item_check label="Limites do imóvel" name="Property Lines"/>
 			<menu_item_check label="Proprietários" name="Land Owners"/>
+			<menu_item_check label="Coordenadas" name="Coordinates"/>
+			<menu_item_check label="Propriedades do lote" name="Parcel Properties"/>
 		</menu>
-		<menu label="Marcos" name="Landmarks">
-			<menu_item_call label="Colocar marco aqui" name="Create Landmark Here"/>
-			<menu_item_call label="Definir como casa" name="Set Home to Here"/>
-		</menu>
-		<menu_item_call label="Início" name="Teleport Home"/>
-		<menu_item_check label="Mini Mapa" name="Mini-Map"/>
-		<menu_item_check label="Mapa-múndi" name="World Map"/>
-		<menu_item_call label="Foto" name="Take Snapshot"/>
+		<menu_item_call label="Teletransportar para início" name="Teleport Home"/>
+		<menu_item_call label="Definir como casa" name="Set Home to Here"/>
 		<menu label="Sol" name="Environment Settings">
 			<menu_item_call label="Amanhecer" name="Sunrise"/>
 			<menu_item_call label="Meio-dia" name="Noon"/>
 			<menu_item_call label="Pôr-do-Sol" name="Sunset"/>
 			<menu_item_call label="Meia-noite" name="Midnight"/>
-			<menu_item_call label="Usar o horário deste lugar" name="Revert to Region Default"/>
+			<menu_item_call label="Horário da propriedade" name="Revert to Region Default"/>
 			<menu_item_call label="Editor de ambiente" name="Environment Editor"/>
 		</menu>
 	</menu>
@@ -78,10 +79,12 @@
 		</menu>
 		<menu_item_call label="Link" name="Link"/>
 		<menu_item_call label="Desconectar links" name="Unlink"/>
+		<menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/>
 		<menu_item_call label="Focus on Selection" name="Focus on Selection"/>
 		<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
 		<menu label="Objeto:" name="Object">
-			<menu_item_call label="Comprar" name="Menu Object Take"/>
+			<menu_item_call label="Comprar" name="Menu Object Buy"/>
+			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
 			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/>
@@ -94,25 +97,18 @@
 			<menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/>
 		</menu>
 		<menu label="Opções" name="Options">
-			<menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/>
 			<menu_item_call label="Set Default Upload Permissions" name="perm prefs"/>
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
-			<menu label="Seleção" name="Selection">
-				<menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
-				<menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/>
-				<menu_item_check label="Selecionar contornando" name="Select By Surrounding"/>
-			</menu>
-			<menu label="Mostrar" name="Show">
-				<menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/>
-				<menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
-				<menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
-			</menu>
-			<menu label="Grade" name="Grid">
-				<menu_item_check label="Mostrar na grade" name="Snap to Grid"/>
-				<menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
-				<menu_item_call label="Use Selection for Grid" name="Use Selection for Grid"/>
-				<menu_item_call label="Opções de grade" name="Grid Options"/>
-			</menu>
+			<menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
+			<menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/>
+			<menu_item_check label="Selecionar contornando" name="Select By Surrounding"/>
+			<menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/>
+			<menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
+			<menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
+			<menu_item_check label="Mostrar na grade" name="Snap to Grid"/>
+			<menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
+			<menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/>
+			<menu_item_call label="Opções de grade" name="Grid Options"/>
 		</menu>
 		<menu label="Selecionar partes conectadas" name="Select Linked Parts">
 			<menu_item_call label="Select Next Part" name="Select Next Part"/>
@@ -123,15 +119,14 @@
 	</menu>
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
-		<menu_item_call label="Tutorial" name="Tutorial"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 	</menu>
 	<menu label="Avançado" name="Advanced">
-		<menu_item_check label="Status &apos;ausente&apos; em 30 minutos" name="Go Away/AFK When Idle"/>
 		<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Recarregar texturas" name="Rebake Texture"/>
 		<menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/>
+		<menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/>
 		<menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
@@ -178,8 +173,8 @@
 		<menu_item_check label="Executar diversas instâncias" name="Run Multiple Threads"/>
 		<menu_item_call label="Limpar cache de grupo" name="ClearGroupCache"/>
 		<menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/>
-		<menu_item_check label="Mostrar MIs no bate-papo" name="IMInChat"/>
 		<menu label="Atalhos" name="Shortcuts">
+			<menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/>
 			<menu_item_check label="Busca" name="Search"/>
 			<menu_item_call label="Soltar objeto" name="Release Keys"/>
 			<menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/>
@@ -219,6 +214,7 @@
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Câmera:" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
+			<menu_item_check label="Crachá" name="Badge"/>
 		</menu>
 		<menu label="Show Info" name="Display Info">
 			<menu_item_check label="Mostrar hora" name="Show Time"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 57130fb5cd..60113bcf0b 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -11,18 +11,29 @@
 	</global>
 	<template name="okbutton">
 		<form>
-			<button name="OK" text="$yestext"/>
+			<button name="OK_okbutton" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okignore">
+		<form>
+			<button name="OK_okignore" text="$yestext"/>
 		</form>
 	</template>
-	<template name="okignore"/>
 	<template name="okcancelbuttons">
 		<form>
-			<button name="Cancel" text="$notext"/>
+			<button name="OK_okcancelbuttons" text="$yestext"/>
+			<button name="Cancel_okcancelbuttons" text="$notext"/>
+		</form>
+	</template>
+	<template name="okcancelignore">
+		<form>
+			<button name="OK_okcancelignore" text="$yestext"/>
+			<button name="Cancel_okcancelignore" text="$notext"/>
 		</form>
 	</template>
-	<template name="okcancelignore"/>
 	<template name="okhelpbuttons">
 		<form>
+			<button name="OK_okhelpbuttons" text="$yestext"/>
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
@@ -30,6 +41,7 @@
 		<form>
 			<button name="Yes" text="$yestext"/>
 			<button name="No" text="$notext"/>
+			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
 		</form>
 	</template>
 	<notification functor="GenericAcknowledge" label="Notificação desconhecida" name="MissingAlert">
@@ -92,15 +104,18 @@ Por favor, selecione apenas um objeto e tente novamente.
 		Salvar todas as mudanças de roupas/ partes do corpo?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar tudo"/>
 	</notification>
+	<notification name="FriendsAndGroupsOnly">
+		Residentes que não são amigos não veem que você decidiu ignorar ligações e MIs deles.
+		<usetemplate name="okbutton" yestext="Sim"/>
+	</notification>
 	<notification name="GrantModifyRights">
-		Conceder direitos de modificar a outros residentes lhes permite trocar, deletar ou pegar QUAISQUER objetos que você possa ter no mundo.
-Seja MUITO cuidadoso(a) quando passar esta permissão.
-Você deseja conceder direitos de modificar para [FIRST_NAME] [LAST_NAME]?
+		Conceder direitos de modificação a outros residentes vai autorizá-los a mudar, apagar ou pegar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização. 
+Deseja modificar os direitos de modificação de [FIRST_NAME] [LAST_NAME]?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
-		Conceder direitos para modificar seus objetos a outro residente permite ele mudar QUAISQUER objetos que você possa ter no mundo. Tenha muito cuidado quando conceder essa permissão.
-Você deseja permitir que os residentes selecionados tenham direito de edição?
+		Conceder direitos de modificação a outros residentes vai autorizá-los a mudar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização. 
+Deseja conceder direitos de modificação para os residentes selecionados?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="RevokeModifyRights">
@@ -150,14 +165,21 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sí mesmo --
 Adicionar esta habilidade a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="ClickUnimplemented">
-		Infelizmente isso ainda não foi implementado.
+	<notification name="AttachmentDrop">
+		Você está prestes a largar seu anexo. 
+    Tem certeza de que quer prosseguir?
+		<usetemplate ignoretext="Confirmar antes de largar anexos" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
 		Unir-se a esse grupo custa L$[COST].
 Deseja prosseguir?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unir-se"/>
 	</notification>
+	<notification name="JoinGroupNoCost">
+		Você está prestes a entrar no grupo [NAME].
+Deseja continuar?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/>
+	</notification>
 	<notification name="JoinGroupCannotAfford">
 		Associar-se a este grupo custa L$[COST].
 Você não tem L$ suficientes para associar-se a este grupo.
@@ -322,6 +344,10 @@ Tem certeza de que quer prosseguir?
 		Salvar as mudanças no classificado [NAME]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar"/>
 	</notification>
+	<notification name="ClassifiedInsufficientFunds">
+		Fundos insuficientes para pagar o anúncio.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeleteAvatarPick">
 		Apagar pegar [PICK]?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Delete"/>
@@ -339,14 +365,6 @@ Tem certeza de que quer prosseguir?
 	<notification name="SelectHistoryItemToView">
 		Por favor, selecione um item do histórico para exibí-lo.
 	</notification>
-	<notification name="ResetShowNextTimeDialogs">
-		Você gostaria de reabilitar todas estas pop ups que você indicou previamente como &apos;Não me mostrar novamente&apos;?
-		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="SkipShowNextTimeDialogs">
-		Você gostaria de desabilitar todas as popups que podem ser puladas?
-		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-	</notification>
 	<notification name="CacheWillClear">
 		O cache será limpo quando o [APP_NAME] for iniciado.
 	</notification>
@@ -422,18 +440,18 @@ O objeto pode estar fora de alcance ou ter sido deletado.
 		Não foi possível escrever o arquivo [[FILE]]
 	</notification>
 	<notification name="UnsupportedHardware">
-		Aviso: Seu sistema não é compatível com os requisitos mínimos exigidos pelo [APP_NAME]. Se você continuar usando o [APP_NAME] pode experimentar uma performance ruim. Infelizmente não podemos oferecer suporte técnico para configurações de sistema não suportado.
+		Sabe de uma coisa? Seu computador não tem os requisitos mínimos do [APP_NAME].  Talvez o desempenho seja um pouco sofrível.  O suporte não pode atender pedidos de assistência técnicas em sistemas não suportados. 
 
 MINSPECS
-Você deseja visitar [_URL] para maiores informações?
+Consultar [_URL] para mais informações?
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=pt
 		</url>
 		<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="UnknownGPU">
-		O [APP_NAME] não consegue reconhecer a placa de vídeo do seu computador. 
-Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  O [APP_NAME] provavelmente vai funcionar com sua placa de vídeo, mas talvez seja necessário checar as configurações de vídeo. 
+		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
+Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
 ( Eu &gt; Preferências &gt; Vídeo)
 		<form name="form">
 			<ignore name="ignore" text="Minha placa de vídeo não foi reconhecida."/>
@@ -605,6 +623,10 @@ Por favor tente novamente mais tarde.
 	<notification name="LandmarkCreated">
 		Você adicionou &quot;[LANDMARK_NAME]&quot; a sua pasta [FOLDER_NAME].
 	</notification>
+	<notification name="LandmarkAlreadyExists">
+		Você já tem um marco deste lugar.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CannotCreateLandmarkNotOwner">
 		Você não pode criar um ponto de referência porque o proprietário do terreno não permite. Tente novamente a alguns metros de distância.
 	</notification>
@@ -652,7 +674,7 @@ Pesquisava por: [FINALQUERY]
 		Os termos de sua pesquisa eram muito curtos então nenhuma pesquisa foi feita.
 	</notification>
 	<notification name="CouldNotTeleportReason">
-		Não é possível teletransportar-se.
+		O teletransporte falhou.
 [REASON]
 	</notification>
 	<notification name="invalid_tport">
@@ -701,7 +723,8 @@ Nenhum lote selecionado.
 		Não é possível exigir a posse do terreno porque a seleção alcançou múltiplas regiões. Por favor, selecione uma área menor e tente novamente.
 	</notification>
 	<notification name="ForceOwnerAuctionWarning">
-		Este lote está oferecido em leilão. Exigir a posse do terreno irá cancelar o leilão e possivelmente deixará alguns residentes infelizes, se os lances já começaram. Exigir posse?
+		Este lote vai a leilão. Forçar a mudança do dono cancela o leilão, podendo deixar residentes que já deram lances insatisfeitos. 
+Deseja forçar mudança de dono?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Retomar"/>
 	</notification>
 	<notification name="CannotContentifyNothingSelected">
@@ -749,14 +772,6 @@ Selecionados vários lotes.
 
 Tente selecionar um único lote.
 	</notification>
-	<notification name="ParcelCanPlayMedia">
-		Há mídia em stream disponível aqui. 
-O streaming requer uma conexão rápida. 
-
-Executar as mídias em stream detectadas? 
-(Esta opção pode ser modificada sob Preferências &gt; Privacidade.)
-		<usetemplate name="okcancelbuttons" notext="Desabilitar" yestext="Exibir Mídia"/>
-	</notification>
 	<notification name="CannotDeedLandWaitingForServer">
 		Impossibilitado de passar a propriedade da terra:
 Esperando pelo servidor informar de quem é a propriedade.
@@ -878,9 +893,8 @@ Unir a terra?
 Em geral, essa é uma falha técnica temporária.  Personalize e volte a salvar o item novamente dentro de alguns minutos.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Você saiu do [SECOND_LIFE]:
+		Ah não!  O [SECOND_LIFE] teve de fechar. 
             [MESSAGE]
-Ainda é possível ler suas MIs e o bate-papo. Para isso, clique &apos;Ver MIs e bate-papo&apos;. Ou clique em &apos;Sair&apos; para sair do [APP_NAME] completamente.
 		<usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM &amp; bate-papo"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1031,6 +1045,7 @@ Transferir propriedade destes [AREA] m² de terreno para o grupo &apos;[GROUP_NA
 	</notification>
 	<notification name="ErrorMessage">
 		[ERROR_MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AvatarMovedDesired">
 		Esse destino não está disponível no momento. 
@@ -1304,11 +1319,14 @@ O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua
 		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
-		Você atingiu o limite máximo de grupos.  Saia de outro grupo para poder entrar nesse ou recuse o convite. 
-[NAME] está te convidando para ser membro do grupo. 
-[INVITE]
+		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
+[NAME] está te convidando para entrar em um grupo.
 		<usetemplate name="okcancelbuttons" notext="Recusar" yestext="Entrar"/>
 	</notification>
+	<notification name="JoinedTooManyGroups">
+		Você atingiu o limite máximo de grupos. Sai de um grupo para entrar ou criar outro.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="KickUser">
 		Expulsar este usuário com qual mensagem?
 		<form name="form">
@@ -1370,7 +1388,7 @@ O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua
 		</form>
 	</notification>
 	<notification name="TeleportFromLandmark">
-		Você tem certeza que quer se teletransportar?
+		Tem certeza de quer ser teletransportado para &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
 		<usetemplate ignoretext="Confirmar se eu quero ser teletransportado para marcos" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/>
 	</notification>
 	<notification name="TeleportToPick">
@@ -1573,8 +1591,10 @@ Publicar este classificado agora por L$ [AMOUNT]?
 		</form>
 	</notification>
 	<notification label="Modificar a maturidade da Região" name="RegionMaturityChange">
-		A classificação de maturidade para esta região foi atualizada.
-Pode levar algum tempo para que a mudança seja refletida no mapa.
+		O conteúdo desta região foi reclassificado. 
+Talvez leve algum tempo para a mudança ser refletida no mapa. 
+
+Para ir a regiões de conteúdo Adulto, é preciso ter uma conta verificada, seja comprovando a idade ou com dados de pagamento.
 	</notification>
 	<notification label="Discordância de Versão de Voz" name="VoiceVersionMismatch">
 		Esta versão do [APP_NAME] não é compatível com o recurso &apos;Bate-papo de voz&apos; desta região.  Para o bate-papo de voz funcionar, atualize o [APP_NAME].
@@ -1694,7 +1714,7 @@ Mover para o inventário o(s) item(s)?
 	<notification name="HelpReportAbuseEmailLL">
 		Use esta ferramenta para denunciar infrações dos [http://secondlife.com/corporate/tos.php Termos do Serviço] e das [http://secondlife.com/corporate/cs.php Normas da Comunidade].
 
-Todas as denúncias de abuso são investigadas e resolvidas.  Para saber o que foi feito, consulte o [http://secondlife.com/support/incidentreport.php relatório de ocorrências].
+Todas as denúncias de abuso são investigadas e resolvidas.
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Por favor, selecione uma categoria para a reportagem deste abuso.
@@ -1929,8 +1949,7 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		O gesto [NAME] não está no banco de dados.
 	</notification>
 	<notification name="UnableToLoadGesture">
-		Impossível de carregar o gesto [NAME].
-Por favor, tente novamente.
+		Falhar ao carregar o gesto [NAME].
 	</notification>
 	<notification name="LandmarkMissing">
 		O landmark foi perdido na base de dados
@@ -2020,8 +2039,8 @@ Basta clicar em qualquer marco e depois clicar em &apos;Teletransportar&apos; na
 (Também é possível clicar duas vezes no marco, ou clicar no marco com o botão direito e selecionar &apos;Teletransportar&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Para entrar em contato com residentes como &apos;&apos;[NAME]&apos;,  abra o painel &apos;Pessoas&apos; à direita da tela. 
-Selecione o residente da lista e clique em &apos;MI&apos; na parte de baixo do painel. 
+		Para entrar em contato com residentes como &apos;&apos;[NAME]&apos;,  abra o painel &apos;Pessoas&apos; à direita da tela.
+Selecione o residente da lista e clique em &apos;MI&apos; na parte de baixo do painel.
 (Também é possível clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar &apos;MI&apos;.)
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
@@ -2091,7 +2110,7 @@ Instale o plugin novamente ou contate o fabricante se o problema persistir.
 		Os objetos no lote selecionado de terra que pertence a [FIRST] [LAST], voltaram ao seu inventário.
 	</notification>
 	<notification name="OtherObjectsReturned2">
-		Os objetos no lote de terra selecionado que pertence ao residente &apos;[NAME]&apos;, voltaram aos seus donos.
+		Os objetos no lote selecionado, do residente [NAME], foram devolidos ao proprietãrio.
 	</notification>
 	<notification name="GroupObjectsReturned">
 		Os objetos no lote selecionado de terreno compartilhado pelo grupo [GROUPNAME], voltaram para os inventários de seus donos.
@@ -2103,7 +2122,7 @@ Objetos não transferíveis dados ao grupo foram deletados.
 	</notification>
 	<notification name="ServerObjectMessage">
 		Mensagem de [NAME]:
-[MSG]
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
 	</notification>
 	<notification name="NotSafe">
 		A opção &apos;danos&apos; desta região está ativada. 
@@ -2233,9 +2252,9 @@ Por favor, tente novamente em alguns instantes.
 		[NAME_SLURL] lhe deu [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
-			<button name="Keep" text="Mantenha"/>
 			<button name="Show" text="Mostrar"/>
 			<button name="Discard" text="Descarte"/>
+			<button name="Mute" text="Bloquear"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
@@ -2260,6 +2279,9 @@ Por favor, tente novamente em alguns instantes.
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TeleportOfferSent">
+		Oferta de teletransporte enviada para [TO_NAME]
+	</notification>
 	<notification name="GotoURL">
 		[MESSAGE]
 [URL]
@@ -2297,9 +2319,15 @@ Por favor, tente novamente em alguns instantes.
 	<notification name="FriendshipDeclined">
 		[NAME] recusou seu convite de amizade
 	</notification>
+	<notification name="FriendshipAcceptedByMe">
+		Oferta de amizada aceita.
+	</notification>
+	<notification name="FriendshipDeclinedByMe">
+		Oferta de amizada aceita.
+	</notification>
 	<notification name="OfferCallingCard">
-		[FIRST] [LAST] está oferecendo seu cartão de visita.
-Isto adicionará uma anotação em seu inventário, de modo que você possa mandar rapidamente uma IM para este residente.
+		[FIRST] [LAST] estão te oferecendo um cartão de visita.
+Ele colocará um item de inventário, para você possa contatá-lo facilmente.
 		<form name="form">
 			<button name="Accept" text="Aceitar"/>
 			<button name="Decline" text="Recusar"/>
@@ -2379,14 +2407,6 @@ Deixar?
 			<button name="Block" text="Bloquear"/>
 		</form>
 	</notification>
-	<notification name="FirstBalanceIncrease">
-		Você acaba de ganhar L$[AMOUNT].
-Seu saldo em L$ está no canto direito superior.
-	</notification>
-	<notification name="FirstBalanceDecrease">
-		Você acaba de pagar L$[AMOUNT].
-Seu saldo em L$ está no canto direito superior.
-	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		Obrigado e volte sempre! 
 
@@ -2394,58 +2414,17 @@ Seu saldo L$ será atualizado findo o processamento da transação.  Se o proces
 
 Para checar o status do pagamento, consulte seu Histórico de transações no [http://secondlife.com/account/ Painel]
 	</notification>
-	<notification name="FirstSit">
-		Você está sentado(a). 
-Use as teclas de seta (ou AWSD) para olhar à sua volta.
-Clique o botão &apos;Ficar de pé&apos; para ficar de pé.
-	</notification>
-	<notification name="FirstMap">
-		Clique a arraste o mapa para olhar à sua volta.
-Clique duas vezes para se teletransportar. 
-Use os controles à direita para achar coisas e exibir outros planos de fundo.
-	</notification>
-	<notification name="FirstBuild">
-		Você abriu as Ferramentas de construção.  Todos os objetos à sua volta foram criados com essas ferrametnas.
-	</notification>
-	<notification name="FirstTeleport">
-		Você só pode se teletransportar para certas áreas nesta região.  A seta aponta o seu destino específico.  Clique na seta para ignorá-la.
-	</notification>
 	<notification name="FirstOverrideKeys">
 		Suas chaves do movimento estão sendo seguras agora por um objeto.
 Tente as teclas de setas ou AWSD para ver o que elas fazem.
 Alguns objetos (como armas) requerem que você passe para mouselook para usá-los.
 Pressione &apos;M&apos; para fazer isto.
 	</notification>
-	<notification name="FirstAppearance">
-		Você está editando sua aparência. 
-Use as teclas de seta para olhar à sua volta. 
-Quando terminar, clique em &apos;Salvar tudo&apos;.
-	</notification>
-	<notification name="FirstInventory">
-		Este é seu inventário, onde ficam todos os seus pertences. 
-
-* Para vestir uma peça, arraste-a para o seu corpo. 
-* Para fazer rez de um objeto, arraste-o para o chão. 
-* Para ler uma anotação, clique duas vezes nela.
-	</notification>
 	<notification name="FirstSandbox">
 		Este é um sandbox, uma área onde residentes podem aprender a construir. 
 
 Qualquer objeto deixado aqui será apagado quando você sair. Não se esqueça de clicar duas vezes e selecionar &apos;Pegar&apos; para levar seu projeto para o seu inventário.
 	</notification>
-	<notification name="FirstFlexible">
-		Este objeto é flexível.  Flexis devem ser phantom, não físicos.
-	</notification>
-	<notification name="FirstDebugMenus">
-		Você abriu o menu Avançado. 
-
-Para alternar este menu, 
-  Windows Ctrl+Alt+D
-  Mac:  ⌥⌘D
-	</notification>
-	<notification name="FirstSculptedPrim">
-		Você está editando um prim esculpido.  Prims esculpidos requerem uma textura especial para definir o formato.
-	</notification>
 	<notification name="MaxListSelectMessage">
 		Você pode selecionar até [MAX_SELECT] itens desta lista.
 	</notification>
@@ -2552,6 +2531,10 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
 			<button name="respondbutton" text="Responder"/>
 		</form>
 	</notification>
+	<notification name="ConfirmCloseAll">
+		Tem certeza de que quer fechar todas as MIs?
+		<usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<notification name="AttachmentSaved">
 		Anexo salvo.
 	</notification>
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
index aa8fd0b2d2..bd50d4953d 100644
--- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<panel name="panel_call_buttons">
-		<button label="Ligar" name="call_btn"/>
-		<button label="Desligar" name="end_call_btn"/>
-		<button label="Controles de voz" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Ligar" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Desligar" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Controles de voz" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index ecaf062e41..06d8823a74 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -22,4 +22,5 @@
 		[COUNT]anos
 	</string>
 	<text name="avatar_name" value="Desconhecido"/>
+	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
index 2a66620800..092135bd42 100644
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
@@ -7,8 +7,13 @@
 		Mostra/oculta os controles de voz
 	</string>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<talk_button name="talk">
+				<speak_button label="Falar" label_selected="Falar" name="speak_btn"/>
+			</talk_button>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_box label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
+			<gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
 		</layout_panel>
 		<layout_panel name="movement_panel">
 			<button label="Movimentar" name="movement_btn" tool_tip="Mostra/oculta os controles de movimento"/>
@@ -19,5 +24,15 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Tirar foto"/>
 		</layout_panel>
+		<layout_panel name="im_well_panel">
+			<chiclet_im_well name="im_well">
+				<button name="Unread IM messages" tool_tip="Conversas"/>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel name="notification_well_panel">
+			<chiclet_notification name="notification_well">
+				<button name="Unread" tool_tip="Notificações"/>
+			</chiclet_notification>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
new file mode 100644
index 0000000000..78d9826099
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray_lite">
+	<layout_stack name="toolbar_stack_lite">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
index 6f48a36182..8441cd9913 100644
--- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
+	<panel.string name="l$_price">
+		L$ [PRICE]
+	</panel.string>
 	<text name="title" value="Dados do anúncio"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<text name="classified_name" value="[nome]"/>
-			<text name="classified_location" value="[carregando...]"/>
-			<text name="content_type" value="[content type]"/>
-			<text name="category" value="[category]"/>
+			<text_editor name="classified_name" value="[nome]"/>
+			<text_editor name="classified_location" value="[carregando...]"/>
+			<text_editor name="content_type" value="[content type]"/>
+			<text_editor name="category" value="[category]"/>
 			<check_box label="Renovar automaticamente todas as semanas" name="auto_renew"/>
-			<text name="price_for_listing" tool_tip="Preço do anúncio.">
-				L$ [PRICE]
-			</text>
-			<text name="classified_desc" value="[descrição]"/>
+			<text_editor name="price_for_listing" tool_tip="Preço do anúncio."/>
+			<text_editor name="classified_desc" value="[descrição]"/>
 		</panel>
 	</scroll_container>
 	<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index d7e7d30a73..c9e5513424 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
@@ -34,9 +34,12 @@
 				</text>
 				<check_box label="Mostrar nos resultados de busca" name="show_in_search_checkbox"/>
 				<text name="title_acc_status_text" value="Minha conta:"/>
+				<text_editor name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
 				<text name="my_account_link" value="[[URL] Abrir meu painel]"/>
-				<text name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
 				<text name="title_partner_text" value="Parceiro(a):"/>
+				<panel name="partner_data_panel">
+					<name_box initial_value="(pesquisando)" name="partner_text"/>
+				</panel>
 				<text name="partner_edit_link" value="[[URL] Editar]"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
index 1bf7986825..34073f9ce1 100644
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Teletransportar" name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual" width="86"/>
 	<button label="Pagar" name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo" width="86"/>
 	<button label="Tirar" name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos" width="86"/>
-	<button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade a um residente" width="86"/>
+	<button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade para um residente" width="86"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
index 9dc53d54eb..502dae8d67 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<button label="Perfil do grupo" name="group_info_btn"/>
-	<panel name="panel_call_buttons">
-		<button label="Ligar para o grupo" name="call_btn"/>
-		<button label="Desligar" name="end_call_btn"/>
-		<button label="Abrir controles de voz" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="vertical_stack">
+		<layout_panel name="group_info_btn_panel">
+			<button label="Perfil do grupo" name="group_info_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Ligar para o grupo" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Desligar" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Abrir controles de voz" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 6ff4f82ba7..85488f43af 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -11,13 +11,28 @@ Para obter mais ajuda, passe o mouse sobre as opções.
 	<panel.string name="incomplete_member_data_str">
 		Recuperando dados do membro
 	</panel.string>
+	<panel name="group_info_top">
+		<texture_picker label="" name="insignia" tool_tip="Selecionar imagem"/>
+		<text name="prepend_founded_by">
+			Fundador:
+		</text>
+		<name_box initial_value="(pesquisando)" name="founder_name"/>
+		<text name="join_cost_text">
+			Grátis
+		</text>
+		<button label="ENTRAR AGORA!" name="btn_join"/>
+	</panel>
 	<text_editor name="charter">
 		Declaração do grupo
 	</text_editor>
 	<name_list name="visible_members">
 		<name_list.columns label="Membro" name="name"/>
 		<name_list.columns label="Título" name="title"/>
+		<name_list.columns label="Status" name="status"/>
 	</name_list>
+	<text name="my_group_settngs_label">
+		Eu
+	</text>
 	<text name="active_title_label">
 		Meu cargo
 	</text>
@@ -25,8 +40,11 @@ Para obter mais ajuda, passe o mouse sobre as opções.
 	<check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Define o seu recebimento de avisos deste grupo.  Desmarque esta opção se o grupo envia spam."/>
 	<check_box label="Mostrar no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja incluir este grupo no seu perfil."/>
 	<panel name="preferences_container">
-		<check_box label="Adesão aberta" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
-		<check_box label="Taxa de associação" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
+		<text name="group_settngs_label">
+			Grupo
+		</text>
+		<check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
+		<check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
 		<spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção &apos;Taxa de associação&apos; estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/>
 		<combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature." width="170">
 			<combo_box.item label="Conteúdo PG" name="pg"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
index c547e4c646..29d757346c 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Sobre o grupo" name="GroupInfo">
+<panel label="Perfil do grupo" name="GroupInfo">
 	<panel.string name="default_needs_apply_text">
-		As mudanças feitas nesta guia ainda não foram salvas
+		Algumas modificações não foram salvas
 	</panel.string>
 	<panel.string name="want_apply_text">
 		Deseja salvar essas mudanças?
@@ -12,25 +12,24 @@
 	<panel.string name="group_join_free">
 		Grátis
 	</panel.string>
-	<text name="group_name" value="Carregando..."/>
-	<line_editor label="Digite o nome do grupo aqui" name="group_name_editor"/>
-	<texture_picker label="" name="insignia" tool_tip="Selecionar imagem"/>
-	<text name="prepend_founded_by">
-		Fundador:
-	</text>
-	<name_box initial_value="(pesquisando)" name="founder_name"/>
-	<text name="join_cost_text">
-		Grátis
-	</text>
-	<button label="ENTRAR AGORA!" name="btn_join"/>
-	<accordion name="groups_accordion">
-		<accordion_tab name="group_general_tab" title="Público geral"/>
-		<accordion_tab name="group_roles_tab" title="Cargos"/>
-		<accordion_tab name="group_notices_tab" title="Avisos"/>
-		<accordion_tab name="group_land_tab" title="Terrenos/Bens"/>
-	</accordion>
-	<panel name="button_row">
-		<button label="Crie" label_selected="Novo grupo" name="btn_create"/>
-		<button label="Salvar" label_selected="Salvar" name="btn_apply"/>
+	<panel name="group_info_top">
+		<text name="group_name" value="Carregando..."/>
+		<line_editor label="Digite o nome do grupo novo aqui" name="group_name_editor"/>
 	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="group_accordions">
+			<accordion name="groups_accordion">
+				<accordion_tab name="group_general_tab" title="Geral"/>
+				<accordion_tab name="group_roles_tab" title="Cargos"/>
+				<accordion_tab name="group_notices_tab" title="Avisos"/>
+				<accordion_tab name="group_land_tab" title="Terrenos/Bens"/>
+			</accordion>
+		</layout_panel>
+		<layout_panel name="button_row">
+			<button label="Bate-papo" name="btn_chat"/>
+			<button label="Ligar para o grupo" name="btn_call" tool_tip="Ligar para este grupo"/>
+			<button label="Salvar" label_selected="Salvar" name="btn_apply"/>
+			<button label="Criar grupo" name="btn_create" tool_tip="Criar um grupo novo"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 4ed1b950a4..c7def0ed96 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -7,12 +7,10 @@
 		(carregando...)
 	</panel.string>
 	<panel.string name="already_in_group">
-		Alguns avatares já estão nesse grupo e portanto não foram convidados.
+		Alguns dos residentes selecionados já estão no grupo, portanto não receberam convite.
 	</panel.string>
 	<text name="help_text" width="214">
-		Voce pode selecionar vários residentes
-para convidar ao seu grupo. Clique
-&apos;Abrir Seletor de Residente&apos; para iniciar.
+		Selecione um ou mais residentes para convidar.  Clique em &apos;Abrir seletor de residentes&apos; para começar.
 	</text>
 	<button label="Abrir Seletor de Residente" name="add_button" tool_tip=""/>
 	<name_list name="invitee_list" tool_tip="Pressione Ctrl enquanto clica nos nomes dos residentes"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index aa7c7de75f..6f21b78b10 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,64 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terra &amp; L$" name="land_money_tab">
-	<string name="help_text">
+	<panel.string name="help_text">
 		Será exibido um aviso até o Total de terrenos usados for igual ou inferior à contribuição total.
-	</string>
-	<button label="?" name="help_button"/>
-	<string name="cant_view_group_land_text">
+	</panel.string>
+	<panel.string name="cant_view_group_land_text">
 		Você não está autorizado a acessar terrenos de grupos
-	</string>
-	<string name="cant_view_group_accounting_text">
+	</panel.string>
+	<panel.string name="cant_view_group_accounting_text">
 		Você não está autorizado a acessar os dados de contabilidade do grupo.
-	</string>
-	<string name="loading_txt">
+	</panel.string>
+	<panel.string name="loading_txt">
 		Carregando...
-	</string>
-	<text name="group_land_heading" width="250">
-		Terra percentente ao grupo
-	</text>
-	<scroll_list name="group_parcel_list">
-		<column label="Lote" name="name"/>
-		<column label="Região" name="location"/>
-		<column label="Tipo" name="type"/>
-		<column label="�rea" name="area"/>
-	</scroll_list>
-	<button label="Mapa" label_selected="Mapa" left="282" name="map_button" width="130"/>
-	<text name="total_contributed_land_label">
-		Total contribuído:
-	</text>
-	<text name="total_contributed_land_value">
-		[AREA] m²
-	</text>
-	<text name="total_land_in_use_label">
-		Total em uso:
-	</text>
-	<text name="total_land_in_use_value">
-		[AREA] m²
-	</text>
-	<text name="land_available_label">
-		Disponíveis:
-	</text>
-	<text name="land_available_value">
-		[AREA] m²
-	</text>
-	<text name="your_contribution_label">
-		Sua contribuição:
-	</text>
-	<string name="land_contrib_error">
+	</panel.string>
+	<panel.string name="land_contrib_error">
 		Não foi possível definir sua contribuição
-	</string>
-	<text name="your_contribution_units">
-		m²
-	</text>
-	<text name="your_contribution_max_value">
-		([AMOUNT] max)
-	</text>
-	<text name="group_over_limit_text">
-		O terreno em uso requer mais créditos
-	</text>
-	<text name="group_money_heading">
-		Grupo L$
-	</text>
+	</panel.string>
+	<panel name="layout_panel_landmoney">
+		<scroll_list name="group_parcel_list">
+			<scroll_list.columns label="Lote" name="name"/>
+			<scroll_list.columns label="Região" name="location"/>
+			<scroll_list.columns label="Tipo" name="type"/>
+			<scroll_list.columns label="�rea:" name="area"/>
+		</scroll_list>
+		<text name="total_contributed_land_label">
+			Total contribuído:
+		</text>
+		<text name="total_contributed_land_value">
+			[AREA] m²
+		</text>
+		<button label="Mapa" label_selected="Mapa" name="map_button"/>
+		<text name="total_land_in_use_label">
+			Total em uso:
+		</text>
+		<text name="total_land_in_use_value">
+			[AREA] m²
+		</text>
+		<text name="land_available_label">
+			Disponíveis:
+		</text>
+		<text name="land_available_value">
+			[AREA] m²
+		</text>
+		<text name="your_contribution_label">
+			Sua contribuição:
+		</text>
+		<text name="your_contribution_units">
+			m²
+		</text>
+		<text name="your_contribution_max_value">
+			([AMOUNT] max)
+		</text>
+		<text name="group_over_limit_text">
+			O terreno em uso requer mais créditos
+		</text>
+		<text name="group_money_heading">
+			L$ do grupo
+		</text>
+	</panel>
 	<tab_container name="group_money_tab_container">
 		<panel label="PLANEJAMENTO" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index c9fd7cdfe3..19c34d2f10 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
+	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 66252a0473..2abc8bc7c8 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -39,7 +39,7 @@ Cada grupo pode enviar no máximo 200 avisos/dia
 		<text name="string">
 			Arrastar e soltar o item aqui para anexá-lo:
 		</text>
-		<button label="Tirar" label_selected="Remover o anexo" name="remove_attachment"/>
+		<button label="Tirar" label_selected="Remover o anexo" name="remove_attachment" tool_tip="Remover anexo da notificação."/>
 		<button label="Enviar" label_selected="Enviar" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Arrastar um item do inventário para a caixa para enviá-lo com o aviso. É preciso ter autorização de cópia e transferência do item para anexá-lo ao aviso."/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index cf9e9f2b8d..9c3792ec43 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membros e Funções" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		As mudanças feitas nesta guia ainda não foram salvas
+		Algumas modificações não foram salvas
 	</panel.string>
 	<panel.string name="want_apply_text">
 		Deseja salvar essas mudanças?
@@ -52,7 +52,7 @@ Há uma grande variedade de habilidades.
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
-			Membros atribuídos
+			Cargos desempenhados
 		</text>
 		<text name="static2">
 			Habilidades permitidas
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
index f7102f2fb2..11e1ba0039 100644
--- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Desconhecido"/>
-	<button label="Perfil" name="view_profile_btn"/>
-	<button label="Adicionar amigo" name="add_friend_btn"/>
-	<button label="Teletransportar" name="teleport_btn"/>
-	<button label="Compartilhar" name="share_btn"/>
-	<panel name="panel_call_buttons">
-		<button label="Ligar" name="call_btn"/>
-		<button label="Desligar" name="end_call_btn"/>
-		<button label="Controles de voz" name="voice_ctrls_btn"/>
-	</panel>
+	<layout_stack name="button_stack">
+		<layout_panel name="view_profile_btn_panel">
+			<button label="Perfil" name="view_profile_btn"/>
+		</layout_panel>
+		<layout_panel name="add_friend_btn_panel">
+			<button label="Adicionar amigo" name="add_friend_btn"/>
+		</layout_panel>
+		<layout_panel name="teleport_btn_panel">
+			<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
+		</layout_panel>
+		<layout_panel name="share_btn_panel">
+			<button label="Compartilhar" name="share_btn"/>
+		</layout_panel>
+		<layout_panel name="share_btn_panel">
+			<button label="Pagar" name="pay_btn"/>
+		</layout_panel>
+		<layout_panel name="call_btn_panel">
+			<button label="Ligar" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Desligar" name="end_call_btn"/>
+		</layout_panel>
+		<layout_panel name="voice_ctrls_btn_panel">
+			<button label="Controles de voz" name="voice_ctrls_btn"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
index 97e7f51beb..6196c06d09 100644
--- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
@@ -18,6 +18,7 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
+	<button name="back_btn" tool_tip="Atrás"/>
 	<text name="title" value="Perfil do Lugar"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
index 693905e04c..3f357bcefe 100644
--- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
@@ -2,7 +2,7 @@
 <panel name="Landmarks">
 	<accordion name="landmarks_accordion">
 		<accordion_tab name="tab_favorites" title="Barra &apos;Destaques&apos;"/>
-		<accordion_tab name="tab_landmarks" title="Marcos"/>
+		<accordion_tab name="tab_landmarks" title="Meus marcos"/>
 		<accordion_tab name="tab_inventory" title="Meu inventário"/>
 		<accordion_tab name="tab_library" title="Biblioteca"/>
 	</accordion>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 3540a338ea..415451b49f 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -13,7 +13,7 @@
 			</text>
 			<line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
 			<line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
-			<check_box label="Lembrar" name="remember_check"/>
+			<check_box label="Lembrar senha" name="remember_check"/>
 			<text name="start_location_text">
 				Começar em:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 1bc080886d..f64b9f319f 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -32,7 +32,7 @@
 		<menu label="Crie" name="Create">
 			<menu_item_call label="Nova pasta" name="New Folder"/>
 			<menu_item_call label="Novo script" name="New Script"/>
-			<menu_item_call label="Nova nota" name="New Note"/>
+			<menu_item_call label="Nova anotação" name="New Note"/>
 			<menu_item_call label="Novo gesto" name="New Gesture"/>
 			<menu label="Novas roupas" name="New Clothes">
 				<menu_item_call label="Nova camisa" name="New Shirt"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
index c3fda2e886..412f75ca78 100644
--- a/indra/newview/skins/default/xui/pt/panel_me.xml
+++ b/indra/newview/skins/default/xui/pt/panel_me.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Meu perfil" name="panel_me">
 	<tab_container name="tabs">
-		<panel label="PERFIL" name="panel_profile"/>
-		<panel label="DESTAQUES" name="panel_picks"/>
+		<panel label="MEU PERFIL" name="panel_profile"/>
+		<panel label="MEUS DESTAQUES" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
index adc93cc2f0..646969946c 100644
--- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Segurança" name="Media Settings Security">
-	<check_box initial_value="false" label="Acesso restrito a URLs especificados (pelo prefixo)" name="whitelist_enable"/>
+	<check_box initial_value="false" label="Acesso permitido a URLs com padrão específico" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
 		URLs com falha de acesso na página inicial são indicados com um:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_my_profile.xml b/indra/newview/skins/default/xui/pt/panel_my_profile.xml
index 8fd30873a7..b1ca318add 100644
--- a/indra/newview/skins/default/xui/pt/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_my_profile.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Perfil" name="panel_profile">
 	<string name="no_partner_text" value="Nenhum"/>
+	<string name="no_group_text" value="Nenhum"/>
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<panel name="second_life_image_panel">
-				<icon label="" name="2nd_life_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
-			</panel>
-			<panel name="first_life_image_panel">
-				<icon label="" name="real_world_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
-				<text name="title_rw_descr_text" value="Mundo real:"/>
-			</panel>
-			<text name="me_homepage_text">
-				Página web:
-			</text>
-			<text name="title_member_text" value="Membro desde:"/>
-			<text name="title_acc_status_text" value="Conta:"/>
-			<text name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
-			<text name="title_partner_text" value="Parceiro(a):"/>
-			<text name="title_groups_text" value="Grupos:"/>
-		</panel>
-	</scroll_container>
-	<panel name="profile_buttons_panel">
-		<button label="Adicionar amigo" name="add_friend"/>
-		<button label="MI" name="im"/>
-		<button label="Ligar" name="call"/>
-		<button label="Mapa" name="show_on_map_btn"/>
-		<button label="Teletransportar" name="teleport"/>
-	</panel>
-	<panel name="profile_me_buttons_panel">
-		<button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
-		<button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: corpo, roupa, etc."/>
-	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="scroll_content_panel">
+					<panel name="second_life_image_panel">
+						<icon label="" name="2nd_life_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
+						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+					</panel>
+					<panel name="first_life_image_panel">
+						<icon label="" name="real_world_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
+						<text name="title_rw_descr_text" value="Mundo real:"/>
+					</panel>
+					<text name="title_member_text" value="Residente desde:"/>
+					<text name="title_acc_status_text" value="Conta:"/>
+					<text name="title_partner_text" value="Parceiro(a):"/>
+					<panel name="partner_data_panel">
+						<name_box initial_value="(pesquisando)" name="partner_text"/>
+					</panel>
+					<text name="title_groups_text" value="Grupos:"/>
+				</panel>
+			</scroll_container>
+		</layout_panel>
+		<layout_panel name="profile_me_buttons_panel">
+			<button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
+			<button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: físico, roupas, etc."/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
index 49e1d916c7..511c4426bb 100644
--- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
 	<panel name="navigation_panel">
-		<button name="back_btn" tool_tip="Voltar para região anterior"/>
-		<button name="forward_btn" tool_tip="Avançar uma região"/>
+		<pull_button name="back_btn" tool_tip="Voltar para região anterior"/>
+		<pull_button name="forward_btn" tool_tip="Avançar uma região"/>
 		<button name="home_btn" tool_tip="Teletransportar para minha casa"/>
 		<location_input label="Onde" name="location_combo"/>
 		<search_combo_box label="Busca" name="search_combo_box" tool_tip="Busca">
 			<combo_editor label="Buscar no [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
-	<favorites_bar name="favorite">
+	<favorites_bar name="favorite" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!">
+		<label name="favorites_bar_label" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!">
+			Barra Destaques
+		</label>
 		<chevron_button name="&gt;&gt;" tool_tip="Mostrar mais favoritos"/>
 	</favorites_bar>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
new file mode 100644
index 0000000000..a81d3e19f8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_media">
+	<string name="empty_item_text">
+		&lt;vazio&gt;
+	</string>
+	<string name="parcel_media_name">
+		Mídia em stream deste lote
+	</string>
+	<string name="parcel_audio_name">
+		�udio em stream do lote
+	</string>
+	<string name="playing_suffix">
+		(em execução)
+	</string>
+	<panel name="minimized_controls">
+		<button label="Parar tudo" name="all_nearby_media_disable_btn" tool_tip="Desligar mídias por perto"/>
+		<button label="Executar tudo" name="all_nearby_media_enable_btn" tool_tip="Ligar mídias por perto"/>
+		<button name="open_prefs_btn" tool_tip="Preferências de mídia"/>
+		<button label="Mais &gt;&gt;" label_selected="Menos &lt;&lt;" name="more_less_btn" tool_tip="Controles avançados"/>
+	</panel>
+	<panel name="nearby_media_panel">
+		<combo_box name="show_combo">
+			<combo_box.item label="Tudo" name="All"/>
+			<combo_box.item label="Neste lote" name="WithinParcel"/>
+			<combo_box.item label="Fora deste lote" name="OutsideParcel"/>
+		</combo_box>
+		<scroll_list name="media_list">
+			<scroll_list.columns label="Proximidade" name="media_proximity"/>
+			<scroll_list.columns label="Visíveis" name="media_visibility"/>
+			<scroll_list.columns label="Classe" name="media_class"/>
+			<scroll_list.columns label="Nome" name="media_name"/>
+			<scroll_list.columns label="Depurar" name="media_debug"/>
+		</scroll_list>
+		<panel>
+			<layout_stack name="media_controls">
+				<layout_panel name="stop">
+					<button name="stop_btn" tool_tip="Para mídia selecionada"/>
+				</layout_panel>
+				<layout_panel name="play">
+					<button name="play_btn" tool_tip="Tocar mídia selecionada"/>
+				</layout_panel>
+				<layout_panel name="pause">
+					<button name="pause_btn" tool_tip="Pausar mídia selecionada"/>
+				</layout_panel>
+				<layout_panel name="volume_slider_ctrl">
+					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume da mídia selecionada"/>
+				</layout_panel>
+				<layout_panel name="mute">
+					<button name="mute_btn" tool_tip="Silenciar mídia selecionada"/>
+				</layout_panel>
+				<layout_panel name="zoom">
+					<button name="zoom_btn" tool_tip="Enfocar mídia"/>
+				</layout_panel>
+				<layout_panel name="unzoom">
+					<button name="unzoom_btn" tool_tip="Desenfocar mídia selecionada"/>
+				</layout_panel>
+			</layout_stack>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_notes.xml b/indra/newview/skins/default/xui/pt/panel_notes.xml
index a5b2542e77..9aa842d9a5 100644
--- a/indra/newview/skins/default/xui/pt/panel_notes.xml
+++ b/indra/newview/skins/default/xui/pt/panel_notes.xml
@@ -13,7 +13,7 @@
 			</scroll_container>
 		</panel>
 		<panel name="notes_buttons_panel">
-			<button label="Adicionar" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
+			<button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
 			<button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/>
 			<button label="Ligar" name="call" tool_tip="Ligar para este residente"/>
 			<button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status.xml b/indra/newview/skins/default/xui/pt/panel_online_status.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_online_status.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
new file mode 100644
index 0000000000..fdc489f375
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
index 98a9be29c8..8d648a98fa 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Outfits">
-	<accordion name="outfits_accordion">
-		<accordion_tab name="tab_cof" title="Vestimenta atual"/>
-		<accordion_tab name="tab_outfits" title="Minhas vestimentas"/>
-	</accordion>
+<panel label="Coisas" name="Outfits">
+	<tab_container name="appearance_tabs">
+		<inventory_panel label="MEUS LOOKS" name="outfitslist_tab"/>
+		<inventory_panel label="EM USO" name="cof_tab"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+		<dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
+		<button label="Salvar este look" name="make_outfit_btn" tool_tip="Salvar aparência como um look"/>
+		<button label="Vestir" name="wear_btn" tool_tip="Vestir look selecionado"/>
+		<button label="M" name="look_edit_btn"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
index 5ef6edf9ec..736b8f1fdd 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
@@ -4,6 +4,6 @@
 	<menu_item_call label="Adicionar ao look atual" name="add"/>
 	<menu_item_call label="Tirar do look atual" name="remove"/>
 	<menu_item_call label="Renomear" name="rename"/>
-	<menu_item_call label="Tirar" name="remove_link"/>
-	<menu_item_call label="Excluir" name="delete"/>
+	<menu_item_call label="Remover link" name="remove_link"/>
+	<menu_item_call label="Excluir visual" name="delete"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 9d71c37c55..5061788757 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -5,7 +5,6 @@
 	<string name="no_one_near" value="Ninguém por perto"/>
 	<string name="no_friends_online" value="Nenhum amigo online"/>
 	<string name="no_friends" value="Nenhum amigo"/>
-	<string name="no_groups" value="Nenhum grupo"/>
 	<string name="people_filter_label" value="Filtro de pessoas"/>
 	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<filter_editor label="Filtro" name="filter_input"/>
@@ -16,18 +15,22 @@
 				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="AMIGOS" name="friends_panel">
+		<panel label="MEUS AMIGOS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="Opções"/>
-				<button name="add_btn" tool_tip="Oferecer amizade para o residente"/>
+				<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
 				<button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
 			</panel>
+			<text name="no_friends_msg">
+				Para adicionar amigos, use a [secondlife:///app/search/people busca de pessoas] ou clique em um usuário para adicioná-lo.
+Para conhecer mais gente, use [secondlife:///app/worldmap o Mapa].
+			</text>
 		</panel>
-		<panel label="GRUPOS" name="groups_panel">
+		<panel label="MEUS GRUPOS" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="groups_viewsort_btn" tool_tip="Opções"/>
 				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
@@ -44,10 +47,11 @@
 	<panel name="button_bar">
 		<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
 		<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
-		<button label="Chamada" name="call_btn" tool_tip="Chamar este residente"/>
+		<button label="Chamada" name="call_btn" tool_tip="Ligar para este residente"/>
 		<button label="Compartilhar" name="share_btn"/>
 		<button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
 		<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir informação de grupo"/>
 		<button label="Bate- papo de grupo" name="chat_btn" tool_tip="abrir sessão de bate- papo"/>
+		<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
index 371f7bdb1f..453c56d280 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
@@ -6,7 +6,7 @@
 	<string name="available" value="disponível"/>
 	<string name="allocated" value="alocados"/>
 	<string name="title_place" value="Perfil da região"/>
-	<string name="title_teleport_history" value="Localização do histórico de teletransportes"/>
+	<string name="title_teleport_history" value="Histórico de teletransportes"/>
 	<string name="not_available" value="(N\A)"/>
 	<string name="unknown" value="(Desconhecido)"/>
 	<string name="public" value="(público)"/>
@@ -41,6 +41,7 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
+	<button name="back_btn" tool_tip="Atrás"/>
 	<text name="title" value="Perfil da região"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
@@ -48,7 +49,7 @@
 			<text name="maturity_value" value="(Desconhecido)"/>
 			<accordion name="advanced_info_accordion">
 				<accordion_tab name="parcel_characteristics_tab" title="Lote">
-					<panel>
+					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Classificação:"/>
 						<text name="rating_value" value="(Desconhecido)"/>
 						<text name="voice_label" value="Voz:"/>
@@ -67,7 +68,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="Região">
-					<panel>
+					<panel name="region_information_panel">
 						<text name="region_name_label" value="Região:"/>
 						<text name="region_type_label" value="Tipo:"/>
 						<text name="region_rating_label" value="Classificação:"/>
@@ -77,7 +78,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="Propriedade">
-					<panel>
+					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="Propriedade:"/>
 						<text name="estate_rating_label" value="Classificação:"/>
 						<text name="estate_owner_label" value="Proprietário:"/>
@@ -85,7 +86,7 @@
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="sales_tab" title="À venda">
-					<panel>
+					<panel name="sales_panel">
 						<text name="sales_price_label" value="Preço:"/>
 						<text name="area_label" value="�rea:"/>
 						<text name="traffic_label" value="Trânsito:"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
index 5c0f3cd11d..d9045e1a37 100644
--- a/indra/newview/skins/default/xui/pt/panel_places.xml
+++ b/indra/newview/skins/default/xui/pt/panel_places.xml
@@ -2,13 +2,14 @@
 <panel label="Lugares" name="places panel">
 	<string name="landmarks_tab_title" value="MEUS MARCOS"/>
 	<string name="teleport_history_tab_title" value="HISTÓRICO DE TELETRANSPORTES"/>
-	<filter_editor label="Filtrar lugares" name="Filter"/>
+	<filter_editor label="Filtrar meus lugares" name="Filter"/>
 	<panel name="button_panel">
-		<button label="Teletransportar" name="teleport_btn"/>
+		<button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/>
 		<button label="Mapa" name="map_btn"/>
-		<button label="Editar" name="edit_btn"/>
-		<button label="Fechar" name="close_btn"/>
-		<button label="Cancelar" name="cancel_btn"/>
+		<button label="Editar" name="edit_btn" tool_tip="Editar dados do marco"/>
+		<button label="▼" name="overflow_btn" tool_tip="Mostrar opções adicionais"/>
 		<button label="Salvar" name="save_btn"/>
+		<button label="Cancelar" name="cancel_btn"/>
+		<button label="Fechar" name="close_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index 431f3ca8e1..7ed64404e6 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
-	<panel.string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</panel.string>
+<panel label="Avançado" name="advanced">
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
-	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	<color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/>
-	<slider label="Opacidade" name="bubble_chat_opacity"/>
-	<text name="AspectRatioLabel1" tool_tip="largura / altura">
-		Relação de aspecto
-	</text>
-	<combo_box name="aspect_ratio" tool_tip="largura / altura">
-		<combo_box.item label="4:3 (CRT Padrão)" name="item1"/>
-		<combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
-		<combo_box.item label="8:5 (tela ampla)" name="item3"/>
-		<combo_box.item label="16:9 (tela ampla)" name="item4"/>
-	</combo_box>
-	<check_box label="Auto-detectar" name="aspect_auto_detect"/>
-	<text name="heading1">
-		Câmera:
-	</text>
 	<slider label="Ângulo de visão" name="camera_fov"/>
 	<slider label="Distância" name="camera_offset_scale"/>
 	<text name="heading2">
@@ -29,20 +10,20 @@
 	</text>
 	<check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/>
 	<check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/>
-	<text name="heading3">
-		Avatares:
-	</text>
 	<check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/>
 	<check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/>
 	<check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/>
+	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	<slider label="Opacidade" name="bubble_chat_opacity"/>
+	<color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/>
 	<check_box label="Mostrar erros de script" name="show_script_errors"/>
 	<radio_group name="show_location">
-		<radio_item label="No bate papo" name="0"/>
-		<radio_item label="Em uma janela" name="1"/>
+		<radio_item label="Bate-papo local" name="0"/>
+		<radio_item label="Janelas separadas" name="1"/>
 	</radio_group>
-	<check_box label="Alternar para o modo microfone quando eu pressionar a tecla de falar:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/>
+	<check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/>
 	<line_editor label="Botao apertar e falar" name="modifier_combo"/>
 	<button label="Definir chave" name="set_voice_hotkey_button"/>
-	<button label="Botão do meio do mouse" name="set_voice_middlemouse_button"/>
+	<button label="Botão do meio do mouse" name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
index 4cb823d432..2ffe720ccf 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
@@ -6,9 +6,9 @@
 	<check_box label="Quando eu gasto ou recebo L$" name="notify_money_change_checkbox"/>
 	<check_box label="Quando meus amigos entram e saem" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
-		Sempre mostrar esses alertas:
+		Mostrar sempre:
 	</text>
 	<text name="dont_show_label">
-		Nunca mostrar esses alertas:
+		Nunca mostrar:
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d6d8be7dc7..d9b18724e2 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
 	<radio_group name="chat_font_size">
-		<radio_item label="Pequeno" name="radio"/>
-		<radio_item label="Média" name="radio2"/>
-		<radio_item label="Grande" name="radio3"/>
+		<radio_item label="Pequeno" name="radio" value="0"/>
+		<radio_item label="Média" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
 	</radio_group>
 	<color_swatch label="Você" name="user"/>
 	<text name="text_box1">
@@ -39,8 +39,8 @@
 	</text>
 	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
 	<check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
-	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela ou em uma única janela com uma aba para cada pessoa (requer reinício)">
-		<radio_item label="Janelas diferentes" name="radio"/>
-		<radio_item label="Uma janela" name="radio2"/>
+	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada, ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
+		<radio_item label="Janelas separadas" name="radio" value="0"/>
+		<radio_item label="Guias" name="radio2" value="1"/>
 	</radio_group>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 17f43943c1..7a3e69c988 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -40,9 +40,9 @@
 		Mostrar nomes:
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="Desligar" name="radio"/>
-		<radio_item label="Ligar" name="radio2"/>
-		<radio_item label="Brevemente" name="radio3"/>
+		<radio_item label="Desligar" name="radio" value="0"/>
+		<radio_item label="Ligar" name="radio2" value="1"/>
+		<radio_item label="Brevemente" name="radio3" value="2"/>
 	</radio_group>
 	<check_box label="Mostrar meu nome" name="show_my_name_checkbox1"/>
 	<check_box initial_value="true" label="Nomes pequenos" name="small_avatar_names_checkbox"/>
@@ -50,14 +50,17 @@
 	<text name="effects_color_textbox">
 		Meus efeitos:
 	</text>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
 	<text name="title_afk_text">
 		Entrar no modo ausente em:
 	</text>
-	<spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
-	<text name="seconds_textbox">
-		segundos
-	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
+	<combo_box label="Entrar no modo ausente em:" name="afk">
+		<combo_box.item label="2 minutos" name="item0"/>
+		<combo_box.item label="5 minutos" name="item1"/>
+		<combo_box.item label="10 minutos" name="item2"/>
+		<combo_box.item label="30 minutos" name="item3"/>
+		<combo_box.item label="(nunca)" name="item4"/>
+	</combo_box>
 	<text name="text_box3">
 		Mensagem do modo ocupado:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 252415ae2d..121272bf6c 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -88,8 +88,8 @@ rápido
 			Detalhes de Iluminação:
 		</text>
 		<radio_group name="LightingDetailRadio">
-			<radio_item label="Sol e Lua apenas" name="SunMoon"/>
-			<radio_item label="Luzes locais nas proximidades" name="LocalLights"/>
+			<radio_item label="Sol e Lua apenas" name="SunMoon" value="0"/>
+			<radio_item label="Luzes locais nas proximidades" name="LocalLights" value="1"/>
 		</radio_group>
 		<text name="TerrainDetailText">
 			Detalhe do Terreno:
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
index fc83a0e97a..0cf2b7a4af 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
 	<panel.string name="log_in_to_change">
 		autentique-se para mudar
 	</panel.string>
-	<button label="Limpar histórico" name="clear_cache"/>
+	<button label="Limpar histórico" name="clear_cache" tool_tip="Apagar imagem do login, última localização, histórico de teletransporte, cache de texturas e web"/>
 	<text name="cache_size_label_l">
 		(Locações, imagens, web, histórico de busca)
 	</text>
@@ -11,17 +11,16 @@
 	<check_box label="Apenas amigos e grupos podem me chamar ou enviar MI" name="voice_call_friends_only_check"/>
 	<check_box label="Desligar o microfone quando terminar chamadas" name="auto_disengage_mic_check"/>
 	<check_box label="Aceitar  cookies" name="cookies_enabled"/>
-	<check_box label="Permitir toque automático da mídia" name="autoplay_enabled"/>
 	<text name="Logs:">
 		Logs:
 	</text>
 	<check_box label="Salvar logs de bate- papo das proximidades no meu computador" name="log_nearby_chat"/>
 	<check_box label="Salvar logs de MI no meu computador" name="log_instant_messages"/>
 	<check_box label="Adicionar timestamp" name="show_timestamps_check_im"/>
-	<line_editor left="278" name="log_path_string" right="-20"/>
 	<text name="log_path_desc">
-		Localização dos logs
+		Localização dos logs:
 	</text>
+	<line_editor left="278" name="log_path_string" right="-20"/>
 	<button label="Navegar" label_selected="Navegar" name="log_path_button" width="120"/>
 	<button label="Lista dos bloqueados" name="block_list"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 002b3fa8a7..f220bb156f 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Entrada e câmera" name="Input panel">
+<panel label="Configurações" name="Input panel">
 	<button bottom_delta="-40" label="Outros dispositivos" name="joystick_setup_button" width="165"/>
 	<text name="Mouselook:">
 		Visão subjetiva:
@@ -18,29 +18,29 @@
 		kbps
 	</text>
 	<check_box label="Personalizar porta" name="connection_port_enabled"/>
-	<spinner label="Número da porta:" name="web_proxy_port"/>
+	<spinner label="Número da porta:" name="connection_port"/>
 	<text name="cache_size_label_l">
 		Tamanho do cache
 	</text>
 	<text name="text_box5">
 		MB
 	</text>
-	<button label="Navegar" label_selected="Navegar" name="set_cache"/>
-	<button label="Redefinir" label_selected="Definir" name="reset_cache"/>
 	<text name="Cache location">
-		Localização do cache
+		Localização do cache:
 	</text>
+	<button label="Navegar" label_selected="Navegar" name="set_cache"/>
+	<button label="Redefinir" label_selected="Redefinir" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]."/>
-		<radio_item label="Usar meu navegador (IE, Firefox)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado."/>
+		<radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]." value="0"/>
+		<radio_item label="Usar meu navegador (IE, Firefox, Safari)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado." value="1"/>
 	</radio_group>
-	<check_box initial_value="false" label="Proxy web" name="web_proxy_enabled"/>
-	<line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/>
-	<button label="Navegar" label_selected="Navegar" name="set_proxy"/>
+	<check_box initial_value="false" label="Ativar web proxy" name="web_proxy_enabled"/>
 	<text name="Proxy location">
-		Localização do proxy
+		Localização do proxy:
 	</text>
+	<line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/>
+	<spinner label="Número da porta:" name="web_proxy_port"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
index 37855672c9..5dbd3d4904 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -2,13 +2,20 @@
 <panel label="Sons" name="Preference Media panel">
 	<slider label="Volume principal" name="System Volume"/>
 	<check_box initial_value="true" label="Silenciar ao minimizar" name="mute_when_minimized"/>
-	<slider label="Ambiente" name="Wind Volume"/>
 	<slider label="Botões" name="UI Volume"/>
-	<slider label="Mídia" name="Media Volume"/>
+	<slider label="Ambiente" name="Wind Volume"/>
 	<slider label="Efeitos sonoros" name="SFX Volume"/>
 	<slider label="Streaming de música" name="Music Volume"/>
-	<check_box label="Voz" name="enable_voice_check"/>
-	<slider label="Voz" name="Voice Volume"/>
+	<check_box label="Ativado" name="music_enabled"/>
+	<slider label="Mídia" name="Media Volume"/>
+	<check_box label="Ativado" name="enable_media"/>
+	<slider label="Bate-papo de voz" name="Voice Volume"/>
+	<check_box label="Ativado" name="enable_voice_check"/>
+	<check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="verdadeiro"/>
+	<check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="verdadeiro"/>
+	<text name="voice_chat_settings">
+		Configuração de bate-papo de voz
+	</text>
 	<text name="Listen from">
 		Ouvir a partir de:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
index d8013c974f..a1254b4da0 100644
--- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
@@ -1,6 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="MediaControls">
+	<string name="min_width">
+		300
+	</string>
+	<string name="min_height">
+		75
+	</string>
+	<string name="zoom_medium_padding">
+		1.1
+	</string>
+	<string name="top_world_view_avoid_zone">
+		50
+	</string>
+	<layout_stack name="progress_indicator_area">
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="Carregando mídia"/>
+		</panel>
+	</layout_stack>
 	<layout_stack name="media_controls">
+		<layout_panel name="back">
+			<button name="back_btn" tool_tip="Navegar para trás"/>
+		</layout_panel>
+		<layout_panel name="fwd">
+			<button name="fwd_btn" tool_tip="Navegar para frente"/>
+		</layout_panel>
+		<layout_panel name="home">
+			<button name="home_btn" tool_tip="Página web:"/>
+		</layout_panel>
+		<layout_panel name="media_stop">
+			<button name="media_stop_btn" tool_tip="Parar mídia"/>
+		</layout_panel>
+		<layout_panel name="reload">
+			<button name="reload_btn" tool_tip="Recarregar"/>
+		</layout_panel>
+		<layout_panel name="stop">
+			<button name="stop_btn" tool_tip="Parar de carregar"/>
+		</layout_panel>
+		<layout_panel name="play">
+			<button name="play_btn" tool_tip="Tocar mídia"/>
+		</layout_panel>
+		<layout_panel name="pause">
+			<button name="pause_btn" tool_tip="Pausar mídia"/>
+		</layout_panel>
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="URL da mídia"/>
 			<layout_stack name="media_address_url_icons">
@@ -15,14 +56,24 @@
 		<layout_panel name="media_play_position">
 			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Andamento do vídeo"/>
 		</layout_panel>
+		<layout_panel name="skip_back">
+			<button name="skip_back_btn" tool_tip="Passo para trás"/>
+		</layout_panel>
+		<layout_panel name="skip_forward">
+			<button name="skip_forward_btn" tool_tip="Passo para frente"/>
+		</layout_panel>
 		<layout_panel name="media_volume">
 			<button name="media_mute_button" tool_tip="Silenciar esta mídia"/>
 			<slider name="volume_slider" tool_tip="Volume"/>
 		</layout_panel>
-	</layout_stack>
-	<layout_stack>
-		<panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="Carregando mídia"/>
-		</panel>
+		<layout_panel name="zoom_frame">
+			<button name="zoom_frame_btn" tool_tip="Enfocar mídia"/>
+		</layout_panel>
+		<layout_panel name="close">
+			<button name="close_btn" tool_tip="Menos zoom"/>
+		</layout_panel>
+		<layout_panel name="new_window">
+			<button name="new_window_btn" tool_tip="Abrir URL em navegador"/>
+		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile.xml b/indra/newview/skins/default/xui/pt/panel_profile.xml
index a9a5116d3c..805e3aaebd 100644
--- a/indra/newview/skins/default/xui/pt/panel_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_profile.xml
@@ -12,37 +12,41 @@
 	</string>
 	<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=pt-BR"/>
 	<string name="no_partner_text" value="Ninguém"/>
+	<string name="no_group_text" value="Nenhum"/>
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
-	<scroll_container name="profile_scroll">
-		<panel name="scroll_content_panel">
-			<panel name="second_life_image_panel">
-				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
-			</panel>
-			<panel name="first_life_image_panel">
-				<text name="title_rw_descr_text" value="Mundo real:"/>
-			</panel>
-			<text name="me_homepage_text">
-				Homepage:
-			</text>
-			<text name="title_member_text" value="Membro desde:"/>
-			<text name="title_acc_status_text" value="Status da conta:"/>
-			<text name="acc_status_text" value="Residente. Nenhuma info de pagamento no arquivo."/>
-			<text name="title_partner_text" value="Parceiro:"/>
-			<text name="title_groups_text" value="Grupos:"/>
-		</panel>
-	</scroll_container>
-	<panel name="profile_buttons_panel">
-		<button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade para o residente"/>
-		<button label="MI" name="im" tool_tip="Abrir sessão de Mensagem instantânea"/>
-		<button label="Chamada" name="call" tool_tip="Chamar este residente"/>
-		<button label="Mapa" name="show_on_map_btn" tool_tip="exibir o residente no mapa"/>
-		<button label="Teletransporte" name="teleport" tool_tip="Oferecer teletransporte"/>
-		<button label="▼" name="overflow_btn" tool_tip="Pagar dinheiro ou compartilhar inventário com o residente"/>
-	</panel>
-	<panel name="profile_me_buttons_panel">
-		<button label="Editar perfil" name="edit_profile_btn"/>
-		<button label="Editar aparência" name="edit_appearance_btn"/>
-	</panel>
+	<layout_stack name="layout">
+		<layout_panel name="profile_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="profile_scroll_panel">
+					<panel name="second_life_image_panel">
+						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+					</panel>
+					<panel name="first_life_image_panel">
+						<text name="title_rw_descr_text" value="Mundo real:"/>
+					</panel>
+					<text name="title_member_text" value="Residente desde:"/>
+					<text name="title_acc_status_text" value="Conta:"/>
+					<text name="title_partner_text" value="Parceiro(a):"/>
+					<panel name="partner_data_panel">
+						<name_box initial_value="(pesquisando)" name="partner_text"/>
+					</panel>
+					<text name="title_groups_text" value="Grupos:"/>
+				</panel>
+			</scroll_container>
+		</layout_panel>
+		<layout_panel name="profile_buttons_panel">
+			<button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
+			<button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/>
+			<button label="Ligar" name="call" tool_tip="Ligar para este residente"/>
+			<button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/>
+			<button label="Teletransportar" name="teleport" tool_tip="Oferecer teletransporte"/>
+			<button label="▼" name="overflow_btn" tool_tip="Pagar ou compartilhar inventário com o residente"/>
+		</layout_panel>
+		<layout_panel name="profile_me_buttons_panel">
+			<button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
+			<button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: físico, roupas, etc."/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 122cae940c..65ac89baf8 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -31,7 +31,7 @@
       da propriedade.
 	</text>
 	<text bottom_delta="-36" name="covenant_instructions">
-		Arrastar e soltar um notecard para alterar o Covenant para esta propriedade.
+		Arrastar e soltar uma anotação para alterar o contrato em vigor nesta propriedade.
 	</text>
 	<text bottom_delta="-36" name="region_section_lbl">
 		Região
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index c893472de1..0f173ab21a 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Propriedade" name="Estate">
 	<text name="estate_help_text">
-		Mudanças nas definições nesta guia irão afetar
-todas as regiões desta propriedade.
+		Mudar as opções desta guia afeta todas as regiões desta propriedade.
 	</text>
 	<text name="estate_text">
 		Propriedade:
@@ -26,7 +25,7 @@ todas as regiões desta propriedade.
 	<text name="Only Allow">
 		Restringir acesso a contas confirmardas por:
 	</text>
-	<check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação"/>
+	<check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação."/>
 	<check_box label="Verificação de idade" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
new file mode 100644
index 0000000000..89fcb05658
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Região" name="General">
+	<text name="region_text_lbl">
+		Região:
+	</text>
+	<text name="region_text">
+		(Desconhecido)
+	</text>
+	<text name="version_channel_text_lbl">
+		Versão:
+	</text>
+	<text name="version_channel_text">
+		(Desconhecido)
+	</text>
+	<text name="region_type_lbl">
+		Tipo:
+	</text>
+	<text name="region_type">
+		(Desconhecido)
+	</text>
+	<check_box label="Bloquear terraplanagem" name="block_terraform_check"/>
+	<check_box label="Bloquear voos" name="block_fly_check"/>
+	<check_box label="Permitir danos" name="allow_damage_check"/>
+	<check_box label="Limitar empurrões" name="restrict_pushobject"/>
+	<check_box label="Permitir revenda de terrenos" name="allow_land_resell_check"/>
+	<check_box label="Permitir junção e divisão de terrenos" name="allow_parcel_changes_check"/>
+	<check_box label="Não mostrar nos resultados de pesquisa" name="block_parcel_search_check" tool_tip="Mostrar esta região e lotes nos resultados de pesquisa"/>
+	<spinner label="Limite do agente" name="agent_limit_spin"/>
+	<spinner label="Bônus do objeto" name="object_bonus_spin"/>
+	<text label="Nível de maturidade" name="access_text">
+		Classificação:
+	</text>
+	<combo_box label="Moderado" name="access_combo">
+		<combo_box.item label="Público adulto" name="Adult"/>
+		<combo_box.item label="Moderado" name="Mature"/>
+		<combo_box.item label="Geral" name="PG"/>
+	</combo_box>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Teletransportar para início..." name="kick_btn"/>
+	<button label="Teletransportar todos para início..." name="kick_all_btn"/>
+	<button label="Enviar mensagem para região..." name="im_btn"/>
+	<button label="Gerenciar telehub..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
new file mode 100644
index 0000000000..daf87c4dc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MEU AVATAR" name="script_limits_my_avatar_panel">
+	<text name="script_memory">
+		Uso de scripts
+	</text>
+	<text name="loading_text">
+		Carregando...
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="Tamanho (kb)" name="size"/>
+		<scroll_list.columns label="URLs" name="urls"/>
+		<scroll_list.columns label="Nome do objeto" name="name"/>
+		<scroll_list.columns label="Localização" name="location"/>
+	</scroll_list>
+	<button label="Atualizar lista" name="refresh_list_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
new file mode 100644
index 0000000000..94274b2cfe
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MEMÓRIA DA REGIÃO" name="script_limits_region_memory_panel">
+	<text name="script_memory">
+		Memória de scripts no lote
+	</text>
+	<text name="loading_text">
+		Carregando...
+	</text>
+	<scroll_list name="scripts_list">
+		<scroll_list.columns label="Tamanho (kb)" name="size"/>
+		<scroll_list.columns label="URLs" name="urls"/>
+		<scroll_list.columns label="Nome do objeto" name="name"/>
+		<scroll_list.columns label="Dono do objeto" name="owner"/>
+		<scroll_list.columns label="Lote" name="parcel"/>
+		<scroll_list.columns label="Localização" name="location"/>
+	</scroll_list>
+	<button label="Atualizar lista" name="refresh_list_btn"/>
+	<button label="Destaque" name="highlight_btn"/>
+	<button label="Devolver" name="return_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray.xml b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
index 7892fc9e0c..09ac074b5a 100644
--- a/indra/newview/skins/default/xui/pt/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
@@ -2,25 +2,28 @@
 <!-- Side tray cannot show background because it is always
 	partially on screen to hold tab buttons. -->
 <side_tray name="sidebar">
+	<sidetray_tab description="Exibir ou não barra lateral" name="sidebar_openclose" tab_title="Exibir ou não barra lateral"/>
 	<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
 		<panel label="casa" name="panel_home"/>
 	</sidetray_tab>
+	<sidetray_tab description="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile">
+		<panel_container name="panel_container">
+			<panel label="Eu" name="panel_me"/>
+		</panel_container>
+	</sidetray_tab>
 	<sidetray_tab description="Encontre seus amigos, contatos e pessoas nas proximidades." name="sidebar_people" tab_title="People">
 		<panel_container name="panel_container">
-			<panel label="Info de grupo" name="panel_group_info_sidetray"/>
+			<panel label="Perfil do grupo" name="panel_group_info_sidetray"/>
 			<panel label="Residentes&amp; Objetos bloqueados" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
 	<sidetray_tab description="Encontre lugares para ir e lugares que você ja visitou." label="Lugares" name="sidebar_places" tab_title="Places">
 		<panel label="Lugares" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile">
-		<panel label="Eu" name="panel_me"/>
+	<sidetray_tab description="Busca no seu inventário." name="sidebar_inventory" tab_title="My Inventory">
+		<panel label="Editar inventário" name="sidepanel_inventory"/>
 	</sidetray_tab>
 	<sidetray_tab description="Muda sua aparência e visual atual." name="sidebar_appearance" tab_title="My Appearance">
 		<panel label="Editar aparência" name="sidepanel_appearance"/>
 	</sidetray_tab>
-	<sidetray_tab description="Busca no seu inventário." name="sidebar_inventory" tab_title="My Inventory">
-		<panel label="Editar inventário" name="sidepanel_inventory"/>
-	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 9485915263..a320d9d56d 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -21,9 +21,11 @@
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo:  Comprar mais L$"/>
+	<button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/>
+	<button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
 	<text name="TimeText" tool_tip="Hora atual (Pacífico)">
-		12:00 AM
+		24:00 AM PST
 	</text>
+	<button name="media_toggle_btn" tool_tip="Tocar/Pausar todas mídias (música, vídeo, páginas web)"/>
 	<button name="volume_btn" tool_tip="Volume geral"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
index 9dc5aed91e..ba83fee7ba 100644
--- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
@@ -4,6 +4,7 @@
 		<accordion_tab name="today" title="Hoje"/>
 		<accordion_tab name="yesterday" title="Ontem"/>
 		<accordion_tab name="2_days_ago" title="2 dias atrás"/>
+		5
 		<accordion_tab name="3_days_ago" title="3 dias atrás"/>
 		<accordion_tab name="4_days_ago" title="4 dias atrás"/>
 		<accordion_tab name="5_days_ago" title="5 dias atrás"/>
@@ -11,4 +12,7 @@
 		<accordion_tab name="1_month_and_older" title="1 mês e mais velhos"/>
 		<accordion_tab name="6_months_and_older" title="6 meses e mais velhos"/>
 	</accordion>
+	<panel name="bottom_panel">
+		<button name="gear_btn" tool_tip="Mostrar opções adicionais"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
new file mode 100644
index 0000000000..65f80fddd2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+	<button name="profile_btn" tool_tip="Mostrar dados do item"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
index 73ec6fb068..b8bbb4051a 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Looks" name="appearance panel">
 	<string name="No Outfit" value="Nenhum"/>
-	<filter_editor label="Filtrar looks" name="Filter"/>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
-		<button name="newlook_btn" tool_tip="Novo look"/>
-		<dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
-		<button label="Vestir" name="wear_btn"/>
+	<panel name="panel_currentlook">
+		<text name="currentlook_title">
+			(não salvo)
+		</text>
 	</panel>
+	<filter_editor label="Filtrar looks" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
index 556c631bf7..4fc50bac67 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Propriedaded do item de inventário">
+<panel name="item properties" title="Perfil do objeto">
 	<panel.string name="unknown">
 		(desconhecido)
 	</panel.string>
@@ -15,7 +15,8 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
-	<text name="title" value="Propriedade do item"/>
+	<text name="title" value="Perfil do objeto"/>
+	<text name="where" value="(Inventário)"/>
 	<panel label="">
 		<text name="LabelItemNameTitle">
 			Nome:
@@ -37,34 +38,36 @@
 		<text name="LabelAcquiredDate">
 			Quarta 24 de Maio 12:50:46 2006
 		</text>
-		<text name="OwnerLabel">
-			Você:
-		</text>
-		<check_box label="Editar" name="CheckOwnerModify"/>
-		<check_box label="Copiar" name="CheckOwnerCopy"/>
-		<check_box label="Revender" name="CheckOwnerTransfer"/>
-		<text name="AnyoneLabel">
-			Qualquer um:
-		</text>
-		<check_box label="Copiar" name="CheckEveryoneCopy"/>
-		<text name="GroupLabel">
-			Grupo:
-		</text>
-		<check_box label="Compartilhar" name="CheckShareWithGroup"/>
-		<text name="NextOwnerLabel">
-			Próximo proprietário:
-		</text>
-		<check_box label="Editar" name="CheckNextOwnerModify"/>
-		<check_box label="Copiar" name="CheckNextOwnerCopy"/>
-		<check_box label="Revender" name="CheckNextOwnerTransfer"/>
+		<panel name="perms_inv">
+			<text name="perm_modify">
+				Você pode:
+			</text>
+			<check_box label="Modificar" name="CheckOwnerModify"/>
+			<check_box label="Copiar" name="CheckOwnerCopy"/>
+			<check_box label="Transferir" name="CheckOwnerTransfer"/>
+			<text name="AnyoneLabel">
+				Todos:
+			</text>
+			<check_box label="Copiar" name="CheckEveryoneCopy"/>
+			<text name="GroupLabel">
+				Grupo:
+			</text>
+			<check_box label="Compartilhar" name="CheckShareWithGroup" tool_tip="Permitir que todos os membros do grupo tenham o seu nível de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
+			<text name="NextOwnerLabel">
+				Próximo proprietário:
+			</text>
+			<check_box label="Modificar" name="CheckNextOwnerModify"/>
+			<check_box label="Copiar" name="CheckNextOwnerCopy"/>
+			<check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
+		</panel>
 		<check_box label="À venda" name="CheckPurchase"/>
 		<combo_box name="combobox sale copy">
 			<combo_box.item label="Copiar" name="Copy"/>
 			<combo_box.item label="Original" name="Original"/>
 		</combo_box>
-		<spinner label="Preço:" name="Edit Cost"/>
-		<text name="CurrencySymbol">
-			L$
-		</text>
+		<spinner label="Preço: L$" name="Edit Cost"/>
+	</panel>
+	<panel name="button_panel">
+		<button label="Cancelar" name="cancel_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 3ae728e69d..7981cd106f 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Propriedades do objeto">
+<panel name="object properties" title="Perfil do objeto">
 	<panel.string name="text deed continued">
 		Doar
 	</panel.string>
@@ -36,6 +36,8 @@
 	<panel.string name="Sale Mixed">
 		Venda mista
 	</panel.string>
+	<text name="title" value="Perfil do objeto"/>
+	<text name="where" value="(inworld)"/>
 	<panel label="">
 		<text name="Name:">
 			Nome:
@@ -43,19 +45,21 @@
 		<text name="Description:">
 			Descrição:
 		</text>
-		<text name="Creator:">
+		<text name="CreatorNameLabel">
 			Criador:
 		</text>
+		<text name="Creator Name">
+			Erica Linden
+		</text>
 		<text name="Owner:">
 			Proprietário:
 		</text>
-		<text name="Group:">
+		<text name="Group_label">
 			Grupo:
 		</text>
 		<button name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/>
 		<name_box initial_value="Carregando..." name="Group Name Proxy"/>
 		<button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono.  Objetos de grupos podem ser doados por um oficial do grupo."/>
-		<check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenhas suas permissões de modificação para este objeto.  Faça uma doação para ativar restrições de função."/>
 		<text name="label click action">
 			Clique para:
 		</text>
@@ -66,54 +70,56 @@
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
 		</combo_box>
-		<check_box label="À venda" name="checkbox for sale"/>
-		<combo_box name="sale type">
-			<combo_box.item label="Copiar" name="Copy"/>
-			<combo_box.item label="Conteúdo" name="Contents"/>
-			<combo_box.item label="Original" name="Original"/>
-		</combo_box>
-		<spinner label="Preço: L$" name="Edit Cost"/>
-		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
-		<panel name="perms_build">
+		<panel name="perms_inv">
 			<text name="perm_modify">
 				Você pode modificar este objeto
 			</text>
 			<text name="Anyone can:">
 				Todos:
 			</text>
-			<check_box label="Movimentar" name="checkbox allow everyone move"/>
 			<check_box label="Copiar" name="checkbox allow everyone copy"/>
-			<text name="Next owner can:">
+			<check_box label="Movimentar" name="checkbox allow everyone move"/>
+			<text name="GroupLabel">
+				Grupo:
+			</text>
+			<check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenham o seu nível de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
+			<text name="NextOwnerLabel">
 				Próximo proprietário:
 			</text>
 			<check_box label="Modificar" name="checkbox next owner can modify"/>
 			<check_box label="Copiar" name="checkbox next owner can copy"/>
 			<check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
-			<text name="B:">
-				B:
-			</text>
-			<text name="O:">
-				O:
-			</text>
-			<text name="G:">
-				G:
-			</text>
-			<text name="E:">
-				E:
-			</text>
-			<text name="N:">
-				N:
-			</text>
-			<text name="F:">
-				F:
-			</text>
 		</panel>
+		<check_box label="À venda" name="checkbox for sale"/>
+		<combo_box name="sale type">
+			<combo_box.item label="Copiar" name="Copy"/>
+			<combo_box.item label="Conteúdo" name="Contents"/>
+			<combo_box.item label="Original" name="Original"/>
+		</combo_box>
+		<spinner label="Preço: L$" name="Edit Cost"/>
+		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Abrir" name="open_btn"/>
 		<button label="Pagar" name="pay_btn"/>
 		<button label="Comprar" name="buy_btn"/>
-		<button label="Cancelar" name="cancel_btn"/>
-		<button label="Salvar" name="save_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 0e2a8a88f1..195345abc0 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings
      that are returned from one component and may appear in many places-->
 <strings>
+	<string name="CAPITALIZED_APP_NAME">
+		SECOND LIFE
+	</string>
 	<string name="SUPPORT_SITE">
 		Portal de Apoio do Second Life
 	</string>
@@ -185,9 +188,6 @@
 	<string name="BUTTON_DOCK">
 		conectar-se à barra
 	</string>
-	<string name="BUTTON_UNDOCK">
-		desconectar-se da barra
-	</string>
 	<string name="BUTTON_HELP">
 		Mostrar ajuda
 	</string>
@@ -212,9 +212,6 @@
 	<string name="AvatarNameWaiting">
 		(aguardando)
 	</string>
-	<string name="AvatarNameHippos">
-		(hippos)
-	</string>
 	<string name="GroupNameNone">
 		(nenhum)
 	</string>
@@ -575,6 +572,9 @@
 	<string name="hang_up">
 		Desconectado da conversa de Voz no mundo
 	</string>
+	<string name="reconnect_nearby">
+		Agora você será reconectado ao bate-papo local.
+	</string>
 	<string name="ScriptQuestionCautionChatGranted">
 		&apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
 	</string>
@@ -767,9 +767,6 @@
 	<string name="TeleportOffer">
 		Oferta de teletransporte
 	</string>
-	<string name="StartUpNotification">
-		[%d] nova notificação chegou enquanto você estava fora...
-	</string>
 	<string name="StartUpNotifications">
 		[%d] Novas notificações chegaram enquanto você estava fora...
 	</string>
@@ -807,7 +804,10 @@
 		Pressione ESC para retornar para visão do mundo
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Nenhum item correspondente encontrado no inventário.
+		Nenhum item correspondente foi encontrado no inventário.  Tente fazer uma [secondlife:///app/search/groups &quot;Busca&quot;].
+	</string>
+	<string name="FavoritesNoMatchingItems">
+		Arraste um marco para adicioná-lo aos seus favoritos.
 	</string>
 	<string name="InventoryNoTexture">
 		Você não possui uma cópia desta textura no seu inventário
@@ -1268,11 +1268,164 @@
 		todas as propriedades que você gerencia para [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Residentes permitidos : ([ALLOWEDAGENTS], max [MAXACCESS])
+		Residentes autorizados: ([ALLOWEDAGENTS], max [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
 		Grupos permitidos: ([ALLOWEDGROUPS], max [MAXACCESS])
 	</string>
+	<string name="ScriptLimitsParcelScriptMemory">
+		Memória de scripts no lote
+	</string>
+	<string name="ScriptLimitsParcelsOwned">
+		Lotes listados: [PARCELS]
+	</string>
+	<string name="ScriptLimitsMemoryUsed">
+		Memória usada: [COUNT] kb de [MAX] kb; [AVAILABLE] kb disponíveis
+	</string>
+	<string name="ScriptLimitsMemoryUsedSimple">
+		Memória usada: [COUNT] kb
+	</string>
+	<string name="ScriptLimitsParcelScriptURLs">
+		URL dos scripts do lote
+	</string>
+	<string name="ScriptLimitsURLsUsed">
+		URLs usados: [COUNT] de [MAX]; [AVAILABLE] disponíveis
+	</string>
+	<string name="ScriptLimitsURLsUsedSimple">
+		URLs usados: [COUNT]
+	</string>
+	<string name="ScriptLimitsRequestError">
+		Erro ao solicitar dados
+	</string>
+	<string name="ScriptLimitsRequestNoParcelSelected">
+		Nenhum lote foi selecionado
+	</string>
+	<string name="ScriptLimitsRequestWrongRegion">
+		Erro: dados de script só disponíveis na região da posição atual
+	</string>
+	<string name="ScriptLimitsRequestWaiting">
+		Obtendo dados...
+	</string>
+	<string name="ScriptLimitsRequestDontOwnParcel">
+		Você não está autorizado a examinar este lote.
+	</string>
+	<string name="SITTING_ON">
+		Sentado em
+	</string>
+	<string name="ATTACH_CHEST">
+		Peito
+	</string>
+	<string name="ATTACH_HEAD">
+		Cabeça
+	</string>
+	<string name="ATTACH_LSHOULDER">
+		Ombro esquerdo
+	</string>
+	<string name="ATTACH_RSHOULDER">
+		Ombro direito
+	</string>
+	<string name="ATTACH_LHAND">
+		Mão esquerda
+	</string>
+	<string name="ATTACH_RHAND">
+		Mão direita
+	</string>
+	<string name="ATTACH_LFOOT">
+		Pé esquerdo
+	</string>
+	<string name="ATTACH_RFOOT">
+		Pé direito
+	</string>
+	<string name="ATTACH_BACK">
+		Atrás
+	</string>
+	<string name="ATTACH_PELVIS">
+		Pélvis
+	</string>
+	<string name="ATTACH_MOUTH">
+		Boca
+	</string>
+	<string name="ATTACH_CHIN">
+		Queixo
+	</string>
+	<string name="ATTACH_LEAR">
+		Orelha esquerda
+	</string>
+	<string name="ATTACH_REAR">
+		Orelha direita
+	</string>
+	<string name="ATTACH_LEYE">
+		Olho esquerdo
+	</string>
+	<string name="ATTACH_REYE">
+		Olho direito
+	</string>
+	<string name="ATTACH_NOSE">
+		Nariz
+	</string>
+	<string name="ATTACH_RUARM">
+		Braço direito
+	</string>
+	<string name="ATTACH_RLARM">
+		Antebraço direito
+	</string>
+	<string name="ATTACH_LUARM">
+		Braço esquerdo
+	</string>
+	<string name="ATTACH_LLARM">
+		Antebraço esquerdo
+	</string>
+	<string name="ATTACH_RHIP">
+		Quadril direito
+	</string>
+	<string name="ATTACH_RULEG">
+		Coxa direita
+	</string>
+	<string name="ATTACH_RLLEG">
+		Perna direita
+	</string>
+	<string name="ATTACH_LHIP">
+		Quadril esquerdo
+	</string>
+	<string name="ATTACH_LULEG">
+		Coxa esquerda
+	</string>
+	<string name="ATTACH_LLLEG">
+		Perna esquerda
+	</string>
+	<string name="ATTACH_BELLY">
+		Barriga
+	</string>
+	<string name="ATTACH_RPEC">
+		Peitorais D
+	</string>
+	<string name="ATTACH_LPEC">
+		Peitorais E
+	</string>
+	<string name="ATTACH_HUD_CENTER_2">
+		HUD Central 2
+	</string>
+	<string name="ATTACH_HUD_TOP_RIGHT">
+		HUD	superior direito
+	</string>
+	<string name="ATTACH_HUD_TOP_CENTER">
+		HUD centro superior
+	</string>
+	<string name="ATTACH_HUD_TOP_LEFT">
+		HUD superior esquerdo
+	</string>
+	<string name="ATTACH_HUD_CENTER_1">
+		HUD Central 1
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_LEFT">
+		HUD esquerda inferior
+	</string>
+	<string name="ATTACH_HUD_BOTTOM">
+		HUD inferior
+	</string>
+	<string name="ATTACH_HUD_BOTTOM_RIGHT">
+		HUD direito inferior
+	</string>
 	<string name="CursorPos">
 		Linha [LINE], Coluna [COLUMN]
 	</string>
@@ -1317,6 +1470,15 @@
 	<string name="ClassifiedUpdateAfterPublish">
 		(vai atualizar depois de publicado)
 	</string>
+	<string name="NoPicksClassifiedsText">
+		Você não criou nenhum Destaque ou Anúncio.  Clique no botão &quot;+&quot; para criar um Destaque ou Anúncio.
+	</string>
+	<string name="NoAvatarPicksClassifiedsText">
+		O usuário não tem nenhum destaque ou anúncio
+	</string>
+	<string name="PicksClassifiedsLoadingText">
+		Carregando...
+	</string>
 	<string name="MultiPreviewTitle">
 		Preview
 	</string>
@@ -1393,6 +1555,9 @@
 		Extensão de arquivo desconhecida [.%s]
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
+	<string name="MuteObject2">
+		Bloquear
+	</string>
 	<string name="AddLandmarkNavBarMenu">
 		Adicionar Landmark...
 	</string>
@@ -1664,39 +1829,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Attached Earlobes">
 		Lóbulos da orelha anexados
 	</string>
-	<string name="Back Bangs">
-		Franja traseira
-	</string>
-	<string name="Back Bangs Down">
-		franja traseira longa
-	</string>
-	<string name="Back Bangs Up">
-		franja traseira arrepiada
-	</string>
 	<string name="Back Fringe">
 		corte traseiro
 	</string>
-	<string name="Back Hair">
-		cabelo traseiro
-	</string>
-	<string name="Back Hair Down">
-		cabelo de trás longo
-	</string>
-	<string name="Back Hair Up">
-		cabelo de trás arrepiado
-	</string>
 	<string name="Baggy">
 		folgado
 	</string>
 	<string name="Bangs">
 		Franja
 	</string>
-	<string name="Bangs Down">
-		franja longa
-	</string>
-	<string name="Bangs Up">
-		franja arrepiada
-	</string>
 	<string name="Beady Eyes">
 		Olhos malévolos
 	</string>
@@ -1709,9 +1850,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Big Butt">
 		Traseiro Grande
 	</string>
-	<string name="Big Eyeball">
-		Globo ocular grande
-	</string>
 	<string name="Big Hair Back">
 		Cabelo volumoso: Trás
 	</string>
@@ -1886,9 +2024,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Corner Down">
 		Canto para baixo
 	</string>
-	<string name="Corner Normal">
-		Canto normal
-	</string>
 	<string name="Corner Up">
 		Canto para cima
 	</string>
@@ -1898,9 +2033,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Crooked Nose">
 		Nariz torto
 	</string>
-	<string name="Cropped Hair">
-		Cabelo curto rente
-	</string>
 	<string name="Cuff Flare">
 		bainha larga
 	</string>
@@ -1919,15 +2051,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Default Heels">
 		Salto Padrão
 	</string>
-	<string name="Default Toe">
-		Dedo do pé padrão
-	</string>
 	<string name="Dense">
 		Densidade
 	</string>
-	<string name="Dense hair">
-		Cabelo Denso
-	</string>
 	<string name="Double Chin">
 		Queixo duplo
 	</string>
@@ -1973,9 +2099,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Eye Spacing">
 		Espaçamento dos olhos
 	</string>
-	<string name="Eyeball Size">
-		Tamanho do globo ocular
-	</string>
 	<string name="Eyebrow Arc">
 		Arco da sobrancelha
 	</string>
@@ -2000,36 +2123,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Eyeliner Color">
 		Cor do delineador
 	</string>
-	<string name="Eyes Back">
-		Eyes Back
-	</string>
 	<string name="Eyes Bugged">
 		Olhos esbugalhados
 	</string>
-	<string name="Eyes Forward">
-		Eyes Forward
-	</string>
-	<string name="Eyes Long Head">
-		Eyes Long Head
-	</string>
-	<string name="Eyes Shear Left Up">
-		Ponta esquerda dos olhos para cima
-	</string>
-	<string name="Eyes Shear Right Up">
-		Ponta direita dos olhos para cima
-	</string>
-	<string name="Eyes Short Head">
-		Eyes Short Head
-	</string>
-	<string name="Eyes Spread">
-		Extensão dos Olhos
-	</string>
-	<string name="Eyes Sunken">
-		Olhos afundados
-	</string>
-	<string name="Eyes Together">
-		Olhos juntos
-	</string>
 	<string name="Face Shear">
 		Face raspada
 	</string>
@@ -2039,30 +2135,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Far Set Eyes">
 		Distância entre os olhos
 	</string>
-	<string name="Fat">
-		Gordo
-	</string>
-	<string name="Fat Head">
-		Cabeça gorda
-	</string>
 	<string name="Fat Lips">
 		Lábios carnudos
 	</string>
-	<string name="Fat Lower">
-		Inferior carnudo
-	</string>
-	<string name="Fat Lower Lip">
-		Lábio superior carnudo
-	</string>
-	<string name="Fat Torso">
-		Tronco corpulento
-	</string>
-	<string name="Fat Upper">
-		Superior carnudo
-	</string>
-	<string name="Fat Upper Lip">
-		lábio superior carnudo
-	</string>
 	<string name="Female">
 		Feminino
 	</string>
@@ -2099,24 +2174,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Freckles">
 		Sardas
 	</string>
-	<string name="Front Bangs Down">
-		Franja da frente longa
-	</string>
-	<string name="Front Bangs Up">
-		Franja da frene arrepiada
-	</string>
 	<string name="Front Fringe">
 		Franja
 	</string>
-	<string name="Front Hair">
-		Cabelo da frente
-	</string>
-	<string name="Front Hair Down">
-		Cabelo da frente baixo
-	</string>
-	<string name="Front Hair Up">
-		cabelo da frente arrepiado
-	</string>
 	<string name="Full Back">
 		Trás cheia
 	</string>
@@ -2390,9 +2450,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Long arms">
 		Braços longos
 	</string>
-	<string name="Longcuffs">
-		Punho longo
-	</string>
 	<string name="Loose Pants">
 		Pantalonas
 	</string>
@@ -2555,9 +2612,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="No Eyeshadow">
 		Sem Sombra dos olhos
 	</string>
-	<string name="No Heels">
-		Sem salto
-	</string>
 	<string name="No Lipgloss">
 		Sem brilho labial
 	</string>
@@ -2615,9 +2669,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Nostril Width">
 		Largura das narinas
 	</string>
-	<string name="Old">
-		Velho
-	</string>
 	<string name="Opaque">
 		Opaco
 	</string>
@@ -2717,9 +2768,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Pointy Heels">
 		Salto agulha
 	</string>
-	<string name="Pointy Toe">
-		Dedo dos pés pontudo
-	</string>
 	<string name="Ponytail">
 		Rabo de cavalo
 	</string>
@@ -2744,15 +2792,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Red Hair">
 		Cabelo ruivo
 	</string>
-	<string name="Red Skin">
-		Pele vermelha
-	</string>
 	<string name="Regular">
 		Normal
 	</string>
-	<string name="Regular Muscles">
-		Músculos normais
-	</string>
 	<string name="Right Part">
 		Parte direita
 	</string>
@@ -2762,9 +2804,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Round">
 		Arredondado
 	</string>
-	<string name="Round Forehead">
-		Testa arredonda
-	</string>
 	<string name="Ruddiness">
 		Rubor
 	</string>
@@ -2777,24 +2816,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Saddle Bags">
 		Saddle Bags
 	</string>
-	<string name="Saddlebags">
-		Saddlebags
-	</string>
-	<string name="Scrawny">
-		Magricela
-	</string>
 	<string name="Scrawny Leg">
 		Pernas magricelas
 	</string>
 	<string name="Separate">
 		Separar
 	</string>
-	<string name="Shading">
-		Sombreamento
-	</string>
-	<string name="Shadow hair">
-		Sombra do cabelo
-	</string>
 	<string name="Shallow">
 		raso
 	</string>
@@ -2807,15 +2834,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Shear Front">
 		Frente rente
 	</string>
-	<string name="Shear Left">
-		Rente esquerda
-	</string>
 	<string name="Shear Left Up">
 		Esquerda rente para cima
 	</string>
-	<string name="Shear Right">
-		Direita rente
-	</string>
 	<string name="Shear Right Up">
 		Trás rente para cima
 	</string>
@@ -2876,15 +2897,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Shoulders">
 		Ombros
 	</string>
-	<string name="Side Bangs">
-		Franja lateral
-	</string>
-	<string name="Side Bangs Down">
-		Franja lateral longa
-	</string>
-	<string name="Side Bangs Up">
-		Franja lateral arrepiada
-	</string>
 	<string name="Side Fringe">
 		pontas laterais
 	</string>
@@ -2900,9 +2912,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Sides Hair Up">
 		Cabelo lateral superior
 	</string>
-	<string name="Skinny">
-		Magro
-	</string>
 	<string name="Skinny Neck">
 		Pescoço fino
 	</string>
@@ -2951,9 +2960,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Socks Length">
 		Comprimento das meias
 	</string>
-	<string name="Some">
-		Alguns
-	</string>
 	<string name="Soulpatch">
 		Cavanhaque
 	</string>
@@ -2972,9 +2978,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Squash Head">
 		Cabeça de Pera
 	</string>
-	<string name="Squash/Stretch Head">
-		Cabeça esticada/forma de pera
-	</string>
 	<string name="Stretch Head">
 		Cabeça  esticada
 	</string>
@@ -2993,18 +2996,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Sweep Forward">
 		Pentear para frente
 	</string>
-	<string name="Swept Back">
-		Pentear para trás
-	</string>
-	<string name="Swept Back Hair">
-		Cabelo penteado para trás
-	</string>
-	<string name="Swept Forward">
-		Penteado para frente
-	</string>
-	<string name="Swept Forward Hair">
-		Cabelo penteado para frente
-	</string>
 	<string name="Tall">
 		Alto
 	</string>
@@ -3023,9 +3014,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Thick Toe">
 		Dedo grosso
 	</string>
-	<string name="Thickness">
-		Espessura
-	</string>
 	<string name="Thin">
 		Fino
 	</string>
@@ -3056,12 +3044,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Tight Sleeves">
 		Tight Sleeves
 	</string>
-	<string name="Tilt Left">
-		Inclinado à esquerda
-	</string>
-	<string name="Tilt Right">
-		Inclinado à direita
-	</string>
 	<string name="Toe Shape">
 		Formato dos dedos
 	</string>
@@ -3203,6 +3185,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_moderator_label">
 		(Moderador)
 	</string>
+	<string name="started_call">
+		Iniciou uma ligação de voz
+	</string>
+	<string name="joined_call">
+		Entrou na ligação
+	</string>
+	<string name="ringing-im">
+		Entrando em ligação de voz...
+	</string>
+	<string name="connected-im">
+		Conectado. Para sair, clique em Desligar
+	</string>
+	<string name="hang_up-im">
+		Saiu da ligação de voz
+	</string>
 	<string name="only_user_message">
 		Você é o único usuário desta sessão.
 	</string>
@@ -3212,6 +3209,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="invite_message">
 		Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
 	</string>
+	<string name="muted_message">
+		Você bloqueou este residente.  Se quiser retirar o bloqueio, basta enviar uma mensagem.
+	</string>
+	<string name="generic">
+		Erro de solicitação, tente novamente mais tarde.
+	</string>
 	<string name="generic_request_error">
 		Erro na requisição, por favor, tente novamente.
 	</string>
@@ -3230,19 +3233,37 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="not_a_mod_error">
 		Você não é um moderador de sessão.
 	</string>
+	<string name="muted">
+		Bate-papo de texto desativado por um moderador.
+	</string>
 	<string name="muted_error">
 		Um moderador do grupo desabilitou seu bate-papo em texto.
 	</string>
 	<string name="add_session_event">
 		Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
 	</string>
+	<string name="message">
+		Não foi possível enviar sua mensagem para o bate-papo com [RECIPIENT].
+	</string>
 	<string name="message_session_event">
 		Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
 	</string>
+	<string name="mute">
+		Erro durante a moderação.
+	</string>
+	<string name="removed">
+		Você foi tirado do grupo.
+	</string>
 	<string name="removed_from_group">
 		Você foi removido do grupo.
 	</string>
 	<string name="close_on_no_ability">
 		Você não possui mais a habilidade de estar na sessão de bate-papo.
 	</string>
+	<string name="unread_chat_single">
+		[SOURCES] disse alguma coisa
+	</string>
+	<string name="unread_chat_multiple">
+		[SOURCES] disseram alguma coisa
+	</string>
 </strings>
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 4eadc64b5a..d5795ef4a0 100644
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -61,7 +61,7 @@ namespace tut
 			uuid2 == LLUUID::null && uuid3 == LLUUID::null));
 		ensure("LLPermission Get Functions failed", (permissions.getMaskBase() == PERM_ALL && permissions.getMaskOwner() == PERM_ALL && 
 			permissions.getMaskGroup() == PERM_ALL && permissions.getMaskEveryone() == PERM_ALL && permissions.getMaskNextOwner() == PERM_ALL));
-		ensure("Ownership functions failed", (permissions.isGroupOwned() == FALSE && permissions.isOwned() == FALSE));
+		ensure("Ownership functions failed", ((! permissions.isGroupOwned()) && (! permissions.isOwned())));
 	}
 
 	template<> template<>
@@ -204,7 +204,7 @@ namespace tut
 		LLPermissions perm1;
 		LLUUID uuid;
 		BOOL is_group_owned = FALSE;
-		ensure("1:getOwnership:failed ", (FALSE == perm1.getOwnership(uuid,is_group_owned)));
+		ensure("1:getOwnership:failed ", ! perm1.getOwnership(uuid,is_group_owned));
 		
 		LLPermissions perm;
 		LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");	
@@ -213,11 +213,11 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
 		perm.getOwnership(uuid,is_group_owned);
-		ensure("2:getOwnership:failed ", ((uuid == owner) && (FALSE == is_group_owned))); 
+		ensure("2:getOwnership:failed ", ((uuid == owner) && (! is_group_owned))); 
 
 		perm.init(creator,LLUUID::null,lastOwner,group);
 		perm.getOwnership(uuid,is_group_owned);
-		ensure("3:getOwnership:failed ", ((uuid == group) && (TRUE == is_group_owned))); 
+		ensure("3:getOwnership:failed ", ((uuid == group) && is_group_owned));
 	}
 
 	template<> template<>
@@ -240,17 +240,17 @@ namespace tut
 		LLUUID agent("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");	
 		LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); 
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");
-		bool is_atomic = TRUE;
-		ensure("setOwnerAndGroup():failed ", (TRUE == perm.setOwnerAndGroup(agent,owner,group,is_atomic)));
+		bool is_atomic = true;
+		ensure("setOwnerAndGroup():failed ", perm.setOwnerAndGroup(agent,owner,group,is_atomic));
 		
 		LLUUID owner2("68edcf47-ccd7-45b8-9f90-1649d7f12807"); 
 		LLUUID group2("9c8eca51-53d5-42a7-bb58-cef070395db9");
 		
 		// cant change - agent need to be current owner
-		ensure("setOwnerAndGroup():failed ", (FALSE == perm.setOwnerAndGroup(agent,owner2,group2,is_atomic)));
+		ensure("setOwnerAndGroup():failed ", ! perm.setOwnerAndGroup(agent,owner2,group2,is_atomic));
 		
 		// should be able to change - agent and owner same as current owner
-		ensure("setOwnerAndGroup():failed ", (TRUE == perm.setOwnerAndGroup(owner,owner,group2,is_atomic)));
+		ensure("setOwnerAndGroup():failed ", perm.setOwnerAndGroup(owner,owner,group2,is_atomic));
 	}
 
 	template<> template<>
@@ -259,7 +259,7 @@ namespace tut
 		LLPermissions perm;
 		LLUUID agent;
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");
-		ensure("deedToGroup():failed ", (TRUE == perm.deedToGroup(agent,group)));
+		ensure("deedToGroup():failed ", perm.deedToGroup(agent,group));
 	}
 	template<> template<>
 	void permission_object_t::test<11>()
@@ -268,12 +268,12 @@ namespace tut
 		LLUUID agent;
 		BOOL set = 1;
 		U32 bits = PERM_TRANSFER | PERM_MODIFY;
-		ensure("setBaseBits():failed ", (TRUE == perm.setBaseBits(agent, set, bits)));
-		ensure("setOwnerBits():failed ", (TRUE == perm.setOwnerBits(agent, set, bits)));
+		ensure("setBaseBits():failed ", perm.setBaseBits(agent, set, bits));
+		ensure("setOwnerBits():failed ", perm.setOwnerBits(agent, set, bits));
 
 		LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8");
-		ensure("setBaseBits():failed ", (FALSE == perm.setBaseBits(agent1, set, bits)));
-		ensure("setOwnerBits():failed ", (FALSE == perm.setOwnerBits(agent1, set, bits)));
+		ensure("setBaseBits():failed ", ! perm.setBaseBits(agent1, set, bits));
+		ensure("setOwnerBits():failed ", ! perm.setOwnerBits(agent1, set, bits));
 	}
 
 	template<> template<>
@@ -284,14 +284,14 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		BOOL set = 1;
 		U32 bits = 10;
-		ensure("setGroupBits():failed ", (TRUE == perm.setGroupBits(agent,group, set, bits)));
-		ensure("setEveryoneBits():failed ", (TRUE == perm.setEveryoneBits(agent,group, set, bits)));
-		ensure("setNextOwnerBits():failed ", (TRUE == perm.setNextOwnerBits(agent,group, set, bits)));
-
-		LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");	
-		ensure("setGroupBits():failed ", (FALSE == perm.setGroupBits(agent1,group, set, bits)));
-		ensure("setEveryoneBits():failed ", (FALSE == perm.setEveryoneBits(agent1,group, set, bits)));
-		ensure("setNextOwnerBits():failed ", (FALSE == perm.setNextOwnerBits(agent1,group, set, bits)));
+		ensure("setGroupBits():failed ", perm.setGroupBits(agent,group, set, bits));
+		ensure("setEveryoneBits():failed ", perm.setEveryoneBits(agent,group, set, bits));
+		ensure("setNextOwnerBits():failed ", perm.setNextOwnerBits(agent,group, set, bits));
+
+		LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");
+		ensure("setGroupBits():failed ", ! perm.setGroupBits(agent1,group, set, bits));
+		ensure("setEveryoneBits():failed ", ! perm.setEveryoneBits(agent1,group, set, bits));
+		ensure("setNextOwnerBits():failed ", ! perm.setNextOwnerBits(agent1,group, set, bits));
 	}
 
 	template<> template<>
@@ -301,14 +301,14 @@ namespace tut
 		LLUUID agent;
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		U32 bits = 10;
-		ensure("allowOperationBy():failed ", (TRUE == perm.allowOperationBy(bits,agent,group)));
+		ensure("allowOperationBy():failed ", perm.allowOperationBy(bits,agent,group));
 
 		LLUUID agent1("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");
 		LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");	
 		LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); 
 		LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); 
 		perm.init(creator,owner,lastOwner,group);
-		ensure("allowOperationBy():failed ", (TRUE == perm.allowOperationBy(bits,agent1,group)));
+		ensure("allowOperationBy():failed ", perm.allowOperationBy(bits,agent1,group));
 	}
 
 	template<> template<>
@@ -321,15 +321,12 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
 		LLUUID agent;
-		ensure("1:allowModifyBy():failed ", (TRUE == perm.allowModifyBy(agent)));
-		ensure("2:allowModifyBy():failed ", (TRUE == perm.allowModifyBy(agent,group)));
+		ensure("1:allowModifyBy():failed ", perm.allowModifyBy(agent));
+		ensure("2:allowModifyBy():failed ", perm.allowModifyBy(agent,group));
 				
-		U32 val1 = 0x7FFFFFFF;
-		S32 sVal = 1 << 14;
-		sVal = val1 & sVal;
 		LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); 
-		ensure("3:allowModifyBy():failed ", (sVal == perm.allowModifyBy(agent1)));
-		ensure("4:allowModifyBy():failed ", (sVal == perm.allowModifyBy(agent1,group)));
+		ensure("3:allowModifyBy():failed ", perm.allowModifyBy(agent1));
+		ensure("4:allowModifyBy():failed ", perm.allowModifyBy(agent1,group));
 	}
 	
 	template<> template<>
@@ -342,15 +339,12 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
 		LLUUID agent;
-		ensure("1:allowCopyBy():failed ", (TRUE == perm.allowModifyBy(agent)));
-		ensure("2:allowCopyBy():failed ", (TRUE == perm.allowModifyBy(agent,group)));
+		ensure("1:allowCopyBy():failed ", perm.allowModifyBy(agent));
+		ensure("2:allowCopyBy():failed ", perm.allowModifyBy(agent,group));
 				
-		U32 val1 = 0x7FFFFFFF;
-		S32 sVal = 1 << 15;
-		sVal = val1 & sVal;
 		LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); 
-		ensure("3:allowCopyBy():failed ", (sVal == perm.allowCopyBy(agent1)));
-		ensure("4:allowCopyBy():failed ", (sVal == perm.allowCopyBy(agent1,group)));
+		ensure("3:allowCopyBy():failed ", perm.allowCopyBy(agent1));
+		ensure("4:allowCopyBy():failed ", perm.allowCopyBy(agent1,group));
 	}
 
 	template<> template<>
@@ -363,15 +357,12 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
 		LLUUID agent;
-		ensure("1:allowMoveBy():failed ", (TRUE == perm.allowMoveBy(agent)));
-		ensure("2:allowMoveBy():failed ", (TRUE == perm.allowMoveBy(agent,group)));
+		ensure("1:allowMoveBy():failed ", perm.allowMoveBy(agent));
+		ensure("2:allowMoveBy():failed ", perm.allowMoveBy(agent,group));
 
-		U32 val1 = 0x7FFFFFFF;
-		S32 sVal = 1 << 19;
-		sVal = val1 & sVal;
 		LLUUID agent1("9c8eca51-53d5-42a7-bb58-cef070395db8"); 
-		ensure("3:allowMoveBy():failed ", (sVal == perm.allowMoveBy(agent1)));
-		ensure("4:allowMoveBy():failed ", (sVal == perm.allowMoveBy(agent1,group)));
+		ensure("3:allowMoveBy():failed ", perm.allowMoveBy(agent1));
+		ensure("4:allowMoveBy():failed ", perm.allowMoveBy(agent1,group));
 	}
 
 	template<> template<>
@@ -383,20 +374,17 @@ namespace tut
 		LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); 
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		LLUUID agent;
-		ensure("1:allowMoveBy():failed ", (TRUE == perm.allowTransferTo(agent)));
+		ensure("1:allowMoveBy():failed ", perm.allowTransferTo(agent));
 		
 		perm.init(creator,owner,lastOwner,group);
-		U32 val1 = 0x7FFFFFFF;
-		S32 sVal = 1 << 13;
-		sVal = val1 & sVal;
-		ensure("2:allowMoveBy():failed ", (sVal == perm.allowTransferTo(agent)));
+		ensure("2:allowMoveBy():failed ", perm.allowTransferTo(agent));
 	}
 
 	template<> template<>
 	void permission_object_t::test<18>()
 	{
 		LLPermissions perm,perm1;
-		ensure("1:Operator==:failed ", perm == perm1);
+		ensure_equals("1:Operator==:failed ", perm, perm1);
 		
 		LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");	
 		LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806"); 
@@ -404,7 +392,7 @@ namespace tut
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
 		perm = perm1;
-		ensure("2:Operator==:failed ", perm == perm1);
+		ensure_equals("2:Operator==:failed ", perm, perm1);
 	}
 
 	template<> template<>
@@ -416,7 +404,7 @@ namespace tut
 		LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); 
 		LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");		
 		perm.init(creator,owner,lastOwner,group);
-		ensure("2:Operator==:failed ", perm != perm1);
+		ensure_not_equals("2:Operator==:failed ", perm, perm1);
 	}
 
 	template<> template<>
@@ -453,7 +441,7 @@ namespace tut
 		}
 		perm1.importFile(fp);
 		fclose(fp);
-		ensure("exportFile()/importFile():failed to export and import the data ", perm1 == perm);	
+		ensure_equals("exportFile()/importFile():failed to export and import the data ", perm1, perm);	
 }
 
 	template<> template<>
@@ -479,7 +467,7 @@ namespace tut
 		std::istringstream istream(ostream.str());
 		perm1.importLegacyStream(istream);
 
-		ensure("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1 == perm);	
+		ensure_equals("exportLegacyStream()/importLegacyStream():failed to export and import the data ", perm1, perm);
 	}
 
 	template<> template<>
@@ -502,7 +490,7 @@ namespace tut
 		stream1 << perm;
 		perm1.init(creator,owner,lastOwner,group);
 		stream2 << perm1;
-		ensure("1:operator << failed",(stream1.str() == stream2.str()));	
+		ensure_equals("1:operator << failed", stream1.str(), stream2.str());
 	}
 
 	template<> template<>
@@ -533,19 +521,19 @@ namespace tut
 	{
 		LLAggregatePermissions AggrPermission;	
 		LLAggregatePermissions AggrPermission1;	
-		ensure("getU8() function failed", (AggrPermission.getU8() == 0));
-		ensure("isEmpty() function failed", (AggrPermission.isEmpty() == TRUE));
+		ensure_equals("getU8() function failed", AggrPermission.getU8(), 0);
+		ensure("isEmpty() function failed", AggrPermission.isEmpty());
 		AggrPermission.getValue(PERM_TRANSFER);
 		ensure_equals("getValue() function failed", AggrPermission.getValue(PERM_TRANSFER), 0x00);
 
 		AggrPermission.aggregate(PERM_ITEM_UNRESTRICTED);
-		ensure("aggregate() function failed", (AggrPermission.isEmpty() == FALSE));
+		ensure("aggregate() function failed", ! AggrPermission.isEmpty());
 
 		AggrPermission1.aggregate(AggrPermission);
-		ensure("aggregate() function failed", (AggrPermission1.isEmpty() == FALSE));
+		ensure("aggregate() function failed", ! AggrPermission1.isEmpty());
 
 		std::ostringstream stream1;
 		stream1 << AggrPermission;
-		ensure("operator<< failed", (stream1.str() == "{PI_COPY=All, PI_MODIFY=All, PI_TRANSFER=All}"));
+		ensure_equals("operator<< failed", stream1.str(), "{PI_COPY=All, PI_MODIFY=All, PI_TRANSFER=All}");
 	}
 }
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index 0ff53f3e00..e5a846f15a 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -66,11 +66,11 @@ static void gluiCallbackWrapper( int control_id );
 static bool isTexture( GLuint texture )
 {
 	bool result = false;
-	
+
 	// glIsTexture will sometimes return false for real textures... do this instead.
 	if(texture != 0)
 		result = true;
-	
+
 	return result;
 }
 
@@ -95,24 +95,24 @@ mediaPanel::~mediaPanel()
 		glDeleteTextures( 1, &mPickTextureHandle );
 		mPickTextureHandle = 0;
 	}
-	
+
 	if ( isTexture( mMediaTextureHandle ) )
 	{
 		std::cerr << "remMediaPanel: deleting media texture " << mMediaTextureHandle << std::endl;
 		glDeleteTextures( 1, &mMediaTextureHandle );
 		mMediaTextureHandle = 0;
 	}
-	
+
 	if(mPickTexturePixels)
 	{
 		delete mPickTexturePixels;
 	}
-	
+
 	if(mMediaSource)
 	{
 		delete mMediaSource;
 	}
-	
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -128,6 +128,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
 	mCurMouseY( 0 ),
 	mFuzzyMedia( true ),
 	mSelectedPanel( 0 ),
+	mDistanceCameraToSelectedGeometry( 0.0f ),
 	mMediaBrowserControlEnableCookies( 0 ),
 	mMediaBrowserControlBackButton( 0 ),
 	mMediaBrowserControlForwardButton( 0 ),
@@ -151,7 +152,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
 	//mBookmarks.push_back( std::pair< std::string, std::string >( "description", "url" ) );
 
 	// read bookmarks from file.
-	// note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory 
+	// note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory
 	//       to app directory (WITHOUT build configuration dir) (this is cwd in Windows within MSVC)
 	//		 For example, test_apps\llplugintest and not test_apps\llplugintest\Release
 	//		 This may need to be changed for Mac/Linux builds.
@@ -193,7 +194,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
 	// initialize linden lab APR module
 	ll_init_apr();
 
-	// Set up llerror logging 
+	// Set up llerror logging
 	{
 		LLError::initForApplication(".");
 		LLError::setDefaultLevel(LLError::LEVEL_INFO);
@@ -273,7 +274,7 @@ void LLMediaPluginTest::reshape( int width, int height )
 void LLMediaPluginTest::bindTexture(GLuint texture, GLint row_length, GLint alignment)
 {
 	glEnable( GL_TEXTURE_2D );
-	
+
 	glBindTexture( GL_TEXTURE_2D, texture );
 	glPixelStorei( GL_UNPACK_ROW_LENGTH, row_length );
 	glPixelStorei( GL_UNPACK_ALIGNMENT, alignment );
@@ -285,27 +286,57 @@ bool LLMediaPluginTest::checkGLError(const char *name)
 {
 	bool result = false;
 	GLenum error = glGetError();
-	
+
 	if(error != GL_NO_ERROR)
 	{
 		// For some reason, glGenTextures is returning GL_INVALID_VALUE...
 		std::cout << name << " ERROR 0x" << std::hex << error << std::dec << std::endl;
 		result = true;
 	}
-	
+
 	return result;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLMediaPluginTest::drawGeometry( int panel )
+GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z )
+{
+	GLdouble camera_pos_x = 0.0f;
+	GLdouble camera_pos_y = 0.0f;
+	GLdouble camera_pos_z = 0.0f;
+
+	GLdouble modelMatrix[16];
+	GLdouble projMatrix[16];
+	GLint viewport[4];
+
+	glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix);
+	glGetDoublev(GL_PROJECTION_MATRIX, projMatrix);
+	glGetIntegerv(GL_VIEWPORT, viewport);
+
+	gluUnProject(
+		(viewport[2]-viewport[0])/2 , (viewport[3]-viewport[1])/2,
+		0.0,
+		modelMatrix, projMatrix, viewport,
+		&camera_pos_x, &camera_pos_y, &camera_pos_z );
+
+	GLfloat distance =
+		sqrt( ( camera_pos_x - point_x ) * ( camera_pos_x - point_x ) +
+			  ( camera_pos_y - point_y ) * ( camera_pos_y - point_y ) +
+			  ( camera_pos_z - point_z ) * ( camera_pos_z - point_z ) );
+
+	return distance;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaPluginTest::drawGeometry( int panel, bool selected )
 {
 	// texture coordinates for each panel
 	GLfloat non_opengl_texture_coords[ 8 ] = { 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f };
 	GLfloat opengl_texture_coords[ 8 ] =     { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
-	
+
 	GLfloat *texture_coords = mMediaPanels[ panel ]->mAppTextureCoordsOpenGL?opengl_texture_coords:non_opengl_texture_coords;
-	
+
 	// base coordinates for each panel
 	GLfloat base_vertex_pos[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
 
@@ -316,31 +347,35 @@ void LLMediaPluginTest::drawGeometry( int panel )
 	const int panel_x = ( panel / num_rows );
 	const int panel_y = ( panel % num_rows );
 
-	const float spacing = 0.1f;
+	// default spacing is small - make it larger if checkbox set - for testing positional audio
+	float spacing = 0.1f;
+	if ( mLargePanelSpacing )
+		spacing = 2.0f;
+
 	const GLfloat offset_x = num_cols * ( 1.0 + spacing ) / 2;
 	const GLfloat offset_y = num_rows * ( 1.0 + spacing ) / 2;
-	
+
 	// Adjust for media aspect ratios
-	{		
+	{
 		float aspect = 1.0f;
 
 		if(mMediaPanels[ panel ]->mMediaHeight != 0)
 		{
 			aspect = (float)mMediaPanels[ panel ]->mMediaWidth / (float)mMediaPanels[ panel ]->mMediaHeight;
 		}
-		
+
 		if(aspect > 1.0f)
 		{
 			// media is wider than it is high -- adjust the top and bottom in
 			for( int corner = 0; corner < 4; ++corner )
 			{
 				float temp = base_vertex_pos[corner * 2 + 1];
-				
+
 				if(temp < 0.5f)
 					temp += 0.5 - (0.5f / aspect);
 				else
 					temp -= 0.5 - (0.5f / aspect);
-				
+
 				base_vertex_pos[corner * 2 + 1] = temp;
 			}
 		}
@@ -350,7 +385,7 @@ void LLMediaPluginTest::drawGeometry( int panel )
 			for( int corner = 0; corner < 4; ++corner )
 			{
 				float temp = base_vertex_pos[corner * 2];
-				
+
 				if(temp < 0.5f)
 					temp += 0.5f - (0.5f * aspect);
 				else
@@ -371,6 +406,15 @@ void LLMediaPluginTest::drawGeometry( int panel )
 		glVertex3f( x, y, 0.0f );
 	};
 	glEnd();
+
+	// calculate distance to this panel if it's selected
+	if ( selected )
+	{
+		GLfloat point_x = base_vertex_pos[ 0 ] + panel_x * ( 1.0 + spacing ) - offset_x + spacing / 2.0f;
+		GLfloat point_y = base_vertex_pos[ 0 + 1 ] + panel_y * ( 1.0 + spacing ) - offset_y + spacing / 2.0f;
+		GLfloat point_z = 0.0f;
+		mDistanceCameraToSelectedGeometry = distanceToCamera( point_x, point_y, point_z );
+	};
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -403,7 +447,7 @@ void LLMediaPluginTest::draw( int draw_type )
 		if ( draw_type == DrawTypePickTexture )
 		{
 			// only bother with pick if we have something to render
-			// Actually, we need to pick even if we're not ready to render.  
+			// Actually, we need to pick even if we're not ready to render.
 			// Otherwise you can't select and remove a panel which has gone bad.
 			//if ( mMediaPanels[ panel ]->mReadyToRender )
 			{
@@ -420,7 +464,7 @@ void LLMediaPluginTest::draw( int draw_type )
 				glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
 
 				// draw geometry using pick texture
-				drawGeometry( panel );
+				drawGeometry( panel, false );
 
 				glMatrixMode( GL_TEXTURE );
 				glPopMatrix();
@@ -431,13 +475,13 @@ void LLMediaPluginTest::draw( int draw_type )
 		{
 			bool texture_valid = false;
 			bool plugin_exited = false;
-			
+
 			if(mMediaPanels[ panel ]->mMediaSource)
 			{
 				texture_valid = mMediaPanels[ panel ]->mMediaSource->textureValid();
 				plugin_exited = mMediaPanels[ panel ]->mMediaSource->isPluginExited();
 			}
-			
+
 			// save texture matrix (changes for each panel)
 			glMatrixMode( GL_TEXTURE );
 			glPushMatrix();
@@ -465,14 +509,14 @@ void LLMediaPluginTest::draw( int draw_type )
 							mMediaPanels[ panel ]->mTextureScaleY,
 								1.0f );
 			};
-			
+
 			float intensity = plugin_exited?0.25f:1.0f;
-			
+
 			// highlight the selected panel
 			if ( mSelectedPanel && ( mMediaPanels[ panel ]->mId == mSelectedPanel->mId ) )
 			{
 				startPanelHighlight( intensity, intensity, 0.0f, 5.0f );
-				drawGeometry( panel );
+				drawGeometry( panel, true );
 				endPanelHighlight();
 			}
 			else
@@ -481,21 +525,21 @@ void LLMediaPluginTest::draw( int draw_type )
 			if ( !mMediaPanels[ panel ]->mReadyToRender )
 			{
 				startPanelHighlight( intensity, 0.0f, 0.0f, 2.0f );
-				drawGeometry( panel );
+				drawGeometry( panel, false );
 				endPanelHighlight();
 			}
 			else
-			// just display a border around the media 
+			// just display a border around the media
 			{
 				startPanelHighlight( 0.0f, intensity, 0.0f, 2.0f );
-				drawGeometry( panel );
+				drawGeometry( panel, false );
 				endPanelHighlight();
 			};
-			
+
 			if ( mMediaPanels[ panel ]->mReadyToRender && texture_valid )
 			{
 				// draw visual geometry
-				drawGeometry( panel );
+				drawGeometry( panel, false );
 			}
 
 			// restore texture matrix (changes for each panel)
@@ -551,7 +595,7 @@ void LLMediaPluginTest::idle()
 	// GLUI requires this
 	if ( glutGetWindow() != mAppWindow )
 		glutSetWindow( mAppWindow );
-	
+
 	// random creation/destruction of panels enabled?
 	const time_t panel_timeout_time = 5;
 	if ( mRandomPanelCount )
@@ -704,7 +748,7 @@ void LLMediaPluginTest::idle()
 	for( int panel_index = 0; panel_index < (int)mMediaPanels.size(); ++panel_index )
 	{
 		mediaPanel *panel = mMediaPanels[ panel_index ];
-		
+
 		// call plugins idle function so it can potentially update itself
 		panel->mMediaSource->idle();
 
@@ -717,7 +761,7 @@ void LLMediaPluginTest::idle()
 			//std::cout << "texture invalid, skipping update..." << std::endl;
 		}
 		else
-		if ( panel && 
+		if ( panel &&
 			 ( panel->mMediaWidth != panel->mMediaSource->getWidth() ||
 			   panel->mMediaHeight != panel->mMediaSource->getHeight() ) )
 		{
@@ -733,7 +777,7 @@ void LLMediaPluginTest::idle()
 				int y_offset = dirty_rect.mBottom;
 				int width = dirty_rect.mRight - dirty_rect.mLeft;
 				int height = dirty_rect.mTop - dirty_rect.mBottom;
-				
+
 				if((dirty_rect.mRight <= panel->mTextureWidth) && (dirty_rect.mTop <= panel->mTextureHeight))
 				{
 					// Offset the pixels pointer properly
@@ -752,23 +796,23 @@ void LLMediaPluginTest::idle()
 						glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
 						glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
 					};
-					
+
 					checkGLError("glTexParameteri");
-					
+
 					if(panel->mMediaSource->getTextureFormatSwapBytes())
 					{
 						glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
 						checkGLError("glPixelStorei");
 					}
-					
+
 					// draw portion that changes into texture
-					glTexSubImage2D( GL_TEXTURE_2D, 0, 
-						x_offset, 
+					glTexSubImage2D( GL_TEXTURE_2D, 0,
+						x_offset,
 						y_offset,
-						width, 
+						width,
 						height,
-						panel->mMediaSource->getTextureFormatPrimary(), 
-						panel->mMediaSource->getTextureFormatType(), 
+						panel->mMediaSource->getTextureFormatPrimary(),
+						panel->mMediaSource->getTextureFormatType(),
 						pixels );
 
 					if(checkGLError("glTexSubImage2D"))
@@ -788,9 +832,9 @@ void LLMediaPluginTest::idle()
 						glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
 						checkGLError("glPixelStorei");
 					}
-					
+
 					panel->mMediaSource->resetDirty();
-					
+
 					panel->mReadyToRender = true;
 				}
 				else
@@ -811,8 +855,8 @@ void LLMediaPluginTest::idle()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y, 
-											   int& media_x, int& media_y, 
+void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y,
+											   int& media_x, int& media_y,
 											   int& id )
 {
 	if ( ! mSelectedPanel )
@@ -828,7 +872,7 @@ void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y,
 	// OpenGL app == coordinate system this way
 	// NOTE: unrelated to settings in plugin - this
 	// is just for this app
-	mCurMouseY = mWindowHeight - window_y;  
+	mCurMouseY = mWindowHeight - window_y;
 
 	// extract x (0..1023, y (0..1023) and id (0..15) from RGB components
 	unsigned long pixel_read_color_bits = ( mPixelReadColor[ 0 ] << 16 ) | ( mPixelReadColor[ 1 ] << 8 ) | mPixelReadColor[ 2 ];
@@ -880,14 +924,14 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel )
 		mSelectedPanel->mMediaSource->setVolume( 0.0f );
 		mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_LOW );
 	};
-		
+
 	mSelectedPanel = panel;
 
 	if( mSelectedPanel && mSelectedPanel->mMediaSource )
 	{
 		mSelectedPanel->mMediaSource->setVolume( (float)mMediaTimeControlVolume / 100.0f );
 		mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_NORMAL );
-		
+
 		if(!mSelectedPanel->mStartUrl.empty())
 		{
 			mUrlEdit->set_text(const_cast<char*>(mSelectedPanel->mStartUrl.c_str()) );
@@ -900,7 +944,7 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel )
 mediaPanel*  LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source )
 {
 	mediaPanel *result = NULL;
-	
+
 	for( int panel = 0; panel < (int)mMediaPanels.size(); ++panel )
 	{
 		if ( mMediaPanels[ panel ]->mMediaSource == source )
@@ -908,7 +952,7 @@ mediaPanel*  LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source )
 			result = mMediaPanels[ panel ];
 		}
 	}
-	
+
 	return result;
 }
 
@@ -1066,7 +1110,7 @@ void LLMediaPluginTest::gluiCallback( int control_id )
 	{
 		if ( mSelectedPanel )
 		{
-			// get value from spinner	
+			// get value from spinner
 			float seconds_to_seek = mMediaTimeControlSeekSeconds;
 			mSelectedPanel->mMediaSource->seek( seconds_to_seek );
 			mSelectedPanel->mMediaSource->start();
@@ -1194,7 +1238,7 @@ void LLMediaPluginTest::mouseButton( int button, int state, int x, int y )
 			windowPosToTexturePos( x, y, media_x, media_y, id );
 
 			// only select a panel if we're on a panel
-			// (HACK: strictly speaking this rules out clicking on 
+			// (HACK: strictly speaking this rules out clicking on
 			// the origin of a panel but that's very unlikely)
 			if ( media_x > 0 && media_y > 0 )
 			{
@@ -1327,18 +1371,18 @@ void LLMediaPluginTest::makeChrome()
 	mGluiMediaTimeControlWindow->add_column( false );
 	mIdMediaTimeControlVolume = start_id++;
 	GLUI_Spinner* spinner = mGluiMediaTimeControlWindow->add_spinner( "Volume", 2, &mMediaTimeControlVolume, mIdMediaTimeControlVolume, gluiCallbackWrapper);
-	spinner->set_float_limits( 0, 100 );		
+	spinner->set_float_limits( 0, 100 );
 	mGluiMediaTimeControlWindow->add_column( true );
 	mIdMediaTimeControlSeekSeconds = start_id++;
 	spinner = mGluiMediaTimeControlWindow->add_spinner( "", 2, &mMediaTimeControlSeekSeconds, mIdMediaTimeControlSeekSeconds, gluiCallbackWrapper);
-	spinner->set_float_limits( 0, 200 );		
+	spinner->set_float_limits( 0, 200 );
 	spinner->set_w( 32 );
 	spinner->set_speed( 0.025f );
 	mGluiMediaTimeControlWindow->add_column( false );
 	mIdMediaTimeControlSeek = start_id++;
 	mGluiMediaTimeControlWindow->add_button( "SEEK", mIdMediaTimeControlSeek, gluiCallbackWrapper );
 	mGluiMediaTimeControlWindow->add_column( false );
-	
+
 
 	// top window - media controls for "browser" media types (e.g. web browser)
 	mGluiMediaBrowserControlWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_TOP );
@@ -1385,6 +1429,13 @@ void LLMediaPluginTest::makeChrome()
 	mDisableTimeout = 0;
 	glui_window_misc_control->add_checkbox( "Disable plugin timeout", &mDisableTimeout, mIdDisableTimeout, gluiCallbackWrapper );
 	glui_window_misc_control->set_main_gfx_window( mAppWindow );
+	glui_window_misc_control->add_column( true );
+
+	mIdLargePanelSpacing = start_id++;
+	mLargePanelSpacing = 0;
+	glui_window_misc_control->add_checkbox( "Large Panel Spacing", &mLargePanelSpacing, mIdLargePanelSpacing, gluiCallbackWrapper );
+	glui_window_misc_control->set_main_gfx_window( mAppWindow );
+	glui_window_misc_control->add_column( true );
 
 	// bottom window - status
 	mBottomGLUIWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_BOTTOM );
@@ -1449,7 +1500,7 @@ void LLMediaPluginTest::makePickTexture( int id, GLuint* texture_handle, unsigne
 //
 std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url )
 {
-	// default to web 
+	// default to web
 	std::string mime_type = "text/html";
 
 	// we may need a more advanced MIME type accessor later :-)
@@ -1479,7 +1530,7 @@ std::string LLMediaPluginTest::pluginNameFromMimeType( std::string& mime_type )
 	else
 	if ( mime_type == "text/html" )
 		plugin_name = "media_plugin_webkit.dylib";
-	
+
 #elif LL_WINDOWS
 	std::string plugin_name( "media_plugin_null.dll" );
 
@@ -1523,7 +1574,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
 	// tell the plugin what size we asked for
 	media_source->setSize( media_width, media_height );
 
-	// Use the launcher start and initialize the plugin 
+	// Use the launcher start and initialize the plugin
 #if LL_DARWIN || LL_LINUX
 	std::string launcher_name( "SLPlugin" );
 #elif LL_WINDOWS
@@ -1580,7 +1631,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
 		// id wasn't found so we can use it
 		if ( ! id_exists )
 		{
-			panel->mId = nid; 
+			panel->mId = nid;
 			break;
 		};
 	};
@@ -1592,7 +1643,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
 	}
 	else
 	{
-		// now we have the ID we can use it to make the 
+		// now we have the ID we can use it to make the
 		// pick texture (id is baked into texture pixels)
 		makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels );
 
@@ -1615,17 +1666,17 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
 void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 {
 //	checkGLError("LLMediaPluginTest::updateMediaPanel");
-	
-	if ( ! panel ) 
+
+	if ( ! panel )
 		return;
-	
+
 	if(!panel->mMediaSource || !panel->mMediaSource->textureValid())
 	{
 		panel->mReadyToRender = false;
 		return;
 	}
-		
-	// take a reference copy of the plugin values since they 
+
+	// take a reference copy of the plugin values since they
 	// might change during this lifetime of this function
 	int plugin_media_width = panel->mMediaSource->getWidth();
 	int plugin_media_height = panel->mMediaSource->getHeight();
@@ -1633,18 +1684,18 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 	int plugin_texture_height = panel->mMediaSource->getBitsHeight();
 
 	// If the texture isn't created or the media or texture dimensions changed AND
-	// the sizes are valid then we need to delete the old media texture (if necessary) 
+	// the sizes are valid then we need to delete the old media texture (if necessary)
 	// then make a new one.
 	if ((panel->mMediaTextureHandle == 0 ||
 		 panel->mMediaWidth != plugin_media_width ||
-		 panel->mMediaHeight != plugin_media_height ||		 
+		 panel->mMediaHeight != plugin_media_height ||
 		 panel->mTextureWidth != plugin_texture_width ||
 		 panel->mTextureHeight != plugin_texture_height) &&
-		( plugin_media_width > 0 && plugin_media_height > 0 && 
+		( plugin_media_width > 0 && plugin_media_height > 0 &&
 		  plugin_texture_width > 0 && plugin_texture_height > 0 ) )
 	{
-		std::cout << "Valid media size (" <<  plugin_media_width << " x " << plugin_media_height 
-				<< ") and texture size (" <<  plugin_texture_width << " x " << plugin_texture_height 
+		std::cout << "Valid media size (" <<  plugin_media_width << " x " << plugin_media_height
+				<< ") and texture size (" <<  plugin_texture_width << " x " << plugin_texture_height
 				<< ") for panel with ID=" << panel->mId << " - making texture" << std::endl;
 
 		// delete old GL texture
@@ -1654,13 +1705,13 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 			glDeleteTextures( 1, &panel->mMediaTextureHandle );
 			panel->mMediaTextureHandle = 0;
 		}
-		
+
 		std::cerr << "before: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl;
-		
+
 		// make a GL texture based on the dimensions the plugin told us
 		GLuint new_texture = 0;
 		glGenTextures( 1, &new_texture );
-		
+
 		checkGLError("glGenTextures");
 
 		std::cout << "glGenTextures returned " << new_texture << std::endl;
@@ -1679,7 +1730,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 
 		std::cerr << "after: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl;
 	};
-	
+
 	// update our record of the media and texture dimensions
 	// NOTE: do this after we we check for sizes changes
 	panel->mMediaWidth = plugin_media_width;
@@ -1699,7 +1750,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 	panel->mAppTextureCoordsOpenGL = panel->mMediaSource->getTextureCoordsOpenGL();
 
 	// Check to see if we have enough to render this panel.
-	// If we do, set a flag that the display functions use so 
+	// If we do, set a flag that the display functions use so
 	// they only render a panel with media if it's ready.
 	if ( panel->mMediaWidth < 0 ||
 		 panel->mMediaHeight < 0 ||
@@ -1716,26 +1767,26 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
 void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
 {
 	// no media panels so we can't change anything - have to add
-	if ( mMediaPanels.size() == 0 ) 
+	if ( mMediaPanels.size() == 0 )
 		return;
 
 	// sanity check
-	if ( ! panel ) 
+	if ( ! panel )
 		return;
-	
+
 	int index;
 	for(index = 0; index < (int)mMediaPanels.size(); index++)
 	{
 		if(mMediaPanels[index] == panel)
 			break;
 	}
-	
+
 	if(index >= (int)mMediaPanels.size())
 	{
 		// panel isn't in mMediaPanels
 		return;
 	}
-			
+
 	std::cout << "Replacing media panel with index " << panel->mId << std::endl;
 
 	int panel_id = panel->mId;
@@ -1760,7 +1811,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
 	// tell the plugin what size we asked for
 	media_source->setSize( media_width, media_height );
 
-	// Use the launcher start and initialize the plugin 
+	// Use the launcher start and initialize the plugin
 #if LL_DARWIN || LL_LINUX
 	std::string launcher_name( "SLPlugin" );
 #elif LL_WINDOWS
@@ -1799,12 +1850,12 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
 	panel->mAppTextureCoordsOpenGL = false;	// really need an 'undefined' state here too
 	panel->mReadyToRender = false;
 
-	panel->mId = panel_id; 
-	
+	panel->mId = panel_id;
+
 	// Replace the entry in the panels array
 	mMediaPanels[index] = panel;
 
-	// now we have the ID we can use it to make the 
+	// now we have the ID we can use it to make the
 	// pick texture (id is baked into texture pixels)
 	makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels );
 
@@ -1820,7 +1871,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
 //
 void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string mime_type )
 {
-	// Make a new media source with a random size which we'll either 
+	// Make a new media source with a random size which we'll either
 	// directly or the media plugin will tell us what it wants later.
 	// Use a random size so we can test support for weird media sizes.
 	// (Almost everything else will get filled in later once the
@@ -1829,8 +1880,8 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string
 	width = ( ( rand() % 170 ) + 30 ) * 4;
 	height = ( ( rand() % 170 ) + 30 ) * 4;
 
-	// adjust this random size if it's a browser so we get 
-	// a more useful size for testing.. 
+	// adjust this random size if it's a browser so we get
+	// a more useful size for testing..
 	if ( mime_type == "text/html" || mime_type == "example/example"  )
 	{
 		width = ( ( rand() % 100 ) + 100 ) * 4;
@@ -1843,11 +1894,11 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string
 void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
 {
 	// always leave one panel
-	if ( mMediaPanels.size() == 1 ) 
+	if ( mMediaPanels.size() == 1 )
 		return;
 
 	// sanity check - don't think this can happen but see above for a case where it might...
-	if ( ! panel ) 
+	if ( ! panel )
 		return;
 
 	std::cout << "Removing media panel with index " << panel->mId << " - total panels = " << mMediaPanels.size() - 1 << std::endl;
@@ -1855,7 +1906,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
 	if(mSelectedPanel == panel)
 		mSelectedPanel = NULL;
 
-	delete panel;	
+	delete panel;
 
 	// remove from storage list
 	for( int i = 0; i < (int)mMediaPanels.size(); ++i )
@@ -1867,7 +1918,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
 		};
 	};
 
-	// select the first panel 
+	// select the first panel
 	selectPanel( mMediaPanels[ 0 ] );
 }
 
@@ -1887,18 +1938,20 @@ void LLMediaPluginTest::updateStatusBar()
 	static bool cached_supports_browser_media = true;
 	static bool cached_supports_time_media = false;
 	static int cached_movie_time = -1;
+	static GLfloat cached_distance = -1.0f;
 
 	static std::string cached_plugin_version = "";
-	if ( 
+	if (
 		 cached_id == mSelectedPanel->mId &&
 		 cached_media_width == mSelectedPanel->mMediaWidth &&
 		 cached_media_height  == mSelectedPanel->mMediaHeight &&
 		 cached_texture_width == mSelectedPanel->mTextureWidth &&
 		 cached_texture_height == mSelectedPanel->mTextureHeight &&
-		 cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() && 
+		 cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() &&
 		 cached_supports_time_media == mSelectedPanel->mMediaSource->pluginSupportsMediaTime() &&
 		 cached_plugin_version == mSelectedPanel->mMediaSource->getPluginVersion() &&
-		 cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime()
+		 cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() &&
+		 cached_distance == mDistanceCameraToSelectedGeometry
 	   )
 	{
 		// nothing changed so don't spend time in this shitty function
@@ -1906,7 +1959,7 @@ void LLMediaPluginTest::updateStatusBar()
 	};
 
 	std::ostringstream stream( "" );
-	
+
 	stream.str( "" );
 	stream.clear();
 
@@ -1927,7 +1980,15 @@ void LLMediaPluginTest::updateStatusBar()
 	stream << " x ";
 	stream << std::setw( 4 ) << std::setfill( '0' );
 	stream << mSelectedPanel->mTextureHeight;
+
 	stream << " | ";
+	stream << "Distance: ";
+	stream << std::setw( 6 );
+	stream << std::setprecision( 3 );
+	stream << std::setprecision( 3 );
+	stream << mDistanceCameraToSelectedGeometry;
+	stream << " | ";
+
 	if ( mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() )
 		stream << "BROWSER";
 	else
@@ -2005,7 +2066,7 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e
 {
 	// Uncomment this to make things much, much quieter.
 //	return;
-	
+
 	switch(event)
 	{
 		case MEDIA_EVENT_CONTENT_UPDATED:
@@ -2065,11 +2126,11 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e
 		case MEDIA_EVENT_CLICK_LINK_HREF:
 			std::cerr <<  "Media event:  MEDIA_EVENT_CLICK_LINK_HREF, uri is " << self->getClickURL() << std::endl;
 		break;
-		
+
 		case MEDIA_EVENT_CLICK_LINK_NOFOLLOW:
 			std::cerr <<  "Media event:  MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << std::endl;
 		break;
-		
+
 		case MEDIA_EVENT_PLUGIN_FAILED:
 			std::cerr <<  "Media event:  MEDIA_EVENT_PLUGIN_FAILED" << std::endl;
 		break;
@@ -2195,13 +2256,13 @@ int main( int argc, char* argv[] )
 	glutSetWindow( app_window_handle );
 
 	gApplication = new LLMediaPluginTest( app_window_handle, app_window_width, app_window_height );
-	
+
 	// update at approximately 60hz
 	int update_ms = 1000 / 60;
-	
+
 	GLUI_Master.set_glutTimerFunc( update_ms, glutIdle, update_ms);
 
 	glutMainLoop();
-	
+
 	delete gApplication;
 }
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h
index c2b2baba95..e7c7699343 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.h
+++ b/indra/test_apps/llplugintest/llmediaplugintest.h
@@ -89,7 +89,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
 
 		void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1);
 		bool checkGLError(const char *name = "OpenGL");
-		void drawGeometry( int panel );
+		void drawGeometry( int panel, bool selected );
 		void startPanelHighlight( float red, float green, float blue, float line_width );
 		void endPanelHighlight();
 		enum { DrawTypePickTexture, DrawTypeMediaTexture };
@@ -113,6 +113,9 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
 		void dumpPanelInfo();
 		void updateStatusBar();
 
+		GLfloat distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z );
+		
+
 	// Inherited from LLPluginClassMediaOwner
 	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
 
@@ -142,6 +145,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
 		float mViewPos[ 3 ];
 		float mViewRotation[ 16 ];
 
+		float mDistanceCameraToSelectedGeometry;
+
 		int mIdControlAddPanel;
 		int mIdControlRemPanel;
 
@@ -159,6 +164,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
 		int mRandomBookmarks;
 		int mIdDisableTimeout;
 		int mDisableTimeout;
+		int mIdLargePanelSpacing;
+		int mLargePanelSpacing;
 		int mIdControlCrashPlugin;
 		int mIdControlHangPlugin;
 		int mIdControlExitApp;
diff --git a/install.xml b/install.xml
index 17091d65a6..3cd40d8893 100644
--- a/install.xml
+++ b/install.xml
@@ -974,9 +974,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>4c75b2f1e8524c7844ee3ea1cd59a3db</string>
+            <string>4b1913c509ea8bec78523960700d7005</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>