merge

888 files changed, 22596 insertions, 12545 deletions

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
new file mode 100644
index 0000000000..b5e870228a
--- /dev/null
+++ b/indra/llui/llaccordionctrl.cpp
@@ -0,0 +1,578 @@
+/** 
+ * @file llaccordionctrl.cpp
+ * @brief Accordion panel  implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llaccordionctrl.h"
+#include "llaccordionctrltab.h"
+
+#include "lluictrlfactory.h" // builds floaters from XML
+
+#include "llwindow.h"
+#include "llfocusmgr.h"
+#include "lllocalcliprect.h"
+
+#include "boost/bind.hpp"
+
+static const S32 DRAGGER_BAR_MARGIN = 4;
+static const S32 DRAGGER_BAR_HEIGHT = 5;
+static const S32 BORDER_MARGIN = 2;
+static const S32 PARENT_BORDER_MARGIN = 5;
+
+static const S32 panel_delta = DRAGGER_BAR_MARGIN;  // Distanse between two panels 
+
+static const S32 HORIZONTAL_MULTIPLE = 8;
+static const S32 VERTICAL_MULTIPLE = 16;
+static const F32 MIN_AUTO_SCROLL_RATE = 120.f;
+static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
+static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
+
+
+// LLAccordionCtrl =================================================================|
+
+static LLDefaultChildRegistry::Register<LLAccordionCtrl>	t2("accordion");
+
+
+LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
+ , mFitParent(params.fit_parent)
+{
+  mSingleExpansion = params.single_expansion;
+	if(mFitParent && !mSingleExpansion)
+	{
+		llinfos << "fit_parent works best when combined with single_expansion" << llendl;
+	}
+}
+
+LLAccordionCtrl::LLAccordionCtrl() : LLPanel()
+{
+	mSingleExpansion = false;
+	mFitParent = false;
+	LLUICtrlFactory::getInstance()->buildPanel(this, "accordion_parent.xml");	
+}
+
+//---------------------------------------------------------------------------------
+void LLAccordionCtrl::draw()
+{
+	LLRect local_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+	
+	LLLocalClipRect clip(local_rect);
+	
+	LLPanel::draw();
+}
+
+
+//---------------------------------------------------------------------------------
+BOOL LLAccordionCtrl::postBuild()
+{
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	LLRect scroll_rect;
+	scroll_rect.setOriginAndSize( 
+		getRect().getWidth() - scrollbar_size,
+		1,
+		scrollbar_size,
+		getRect().getHeight() - 1);
+	
+
+	LLScrollbar::Params sbparams;
+	sbparams.name("scrollable vertical");
+	sbparams.rect(scroll_rect);
+	sbparams.orientation(LLScrollbar::VERTICAL);
+	sbparams.doc_size(mInnerRect.getHeight());
+	sbparams.doc_pos(0);
+	sbparams.page_size(mInnerRect.getHeight());
+	sbparams.step_size(VERTICAL_MULTIPLE);
+	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+	sbparams.change_callback(boost::bind(&LLAccordionCtrl::onScrollPosChangeCallback, this, _1, _2));
+	
+	mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
+	LLView::addChild( mScrollbar );
+	mScrollbar->setVisible( false );
+	mScrollbar->setFollowsRight();
+	mScrollbar->setFollowsTop();
+	mScrollbar->setFollowsBottom();
+
+	//if it was created from xml...
+	std::vector<LLUICtrl*> accordion_tabs;
+	for(child_list_const_iter_t it = getChildList()->begin(); 
+		getChildList()->end() != it; ++it)
+	{
+		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*it);
+		if(accordion_tab == NULL)
+			continue;
+		if(std::find(mAccordionTabs.begin(),mAccordionTabs.end(),accordion_tab) == mAccordionTabs.end())
+		{
+			accordion_tabs.push_back(accordion_tab);
+		}
+	}
+
+	for(std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();it!=accordion_tabs.rend();++it)
+		addCollapsibleCtrl(*it);
+
+	arrange	();
+
+	if(mSingleExpansion)
+	{
+		if(!mAccordionTabs[0]->getDisplayChildren())
+			mAccordionTabs[0]->setDisplayChildren(true);
+		for(size_t i=1;i<mAccordionTabs.size();++i)
+		{
+			if(mAccordionTabs[i]->getDisplayChildren())
+				mAccordionTabs[i]->setDisplayChildren(false);
+		}
+	}
+
+	return TRUE;
+}
+
+
+//---------------------------------------------------------------------------------
+LLAccordionCtrl::~LLAccordionCtrl()
+{
+  mAccordionTabs.clear();
+}
+
+//---------------------------------------------------------------------------------
+
+void LLAccordionCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+	// adjust our rectangle
+	LLRect rcLocal = getRect();
+	rcLocal.mRight = rcLocal.mLeft + width;
+	rcLocal.mTop = rcLocal.mBottom + height;
+
+	setRect(rcLocal);
+
+	arrange();
+}
+
+//---------------------------------------------------------------------------------
+BOOL LLAccordionCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	return LLPanel::handleRightMouseDown(x, y, mask);
+}
+
+//---------------------------------------------------------------------------------
+void LLAccordionCtrl::shiftAccordionTabs(S16 panel_num, S32 delta)
+{
+	for(size_t i = panel_num; i < mAccordionTabs.size(); i++ )
+	{
+		ctrlShiftVertical(mAccordionTabs[i],delta);
+	}	
+}
+
+
+//---------------------------------------------------------------------------------
+void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num) 
+{
+	if(mSingleExpansion)
+	{
+		for(size_t i=0;i<mAccordionTabs.size();++i)
+		{
+			if(i==panel_num)
+				continue;
+			if(mAccordionTabs[i]->getDisplayChildren())
+				mAccordionTabs[i]->setDisplayChildren(false);
+		}
+
+	}
+	arrange();
+}
+
+void LLAccordionCtrl::show_hide_scrollbar(S32 width, S32 height)
+{
+	calcRecuiredHeight();
+	if(getRecuiredHeight() > height )
+		showScrollbar(width,height);
+	else
+		hideScrollbar(width,height);
+}
+
+void	LLAccordionCtrl::showScrollbar(S32 width, S32 height)
+{
+	bool was_visible = mScrollbar->getVisible();
+
+	mScrollbar->setVisible(true);
+	
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	ctrlSetLeftTopAndSize(mScrollbar
+		,width-scrollbar_size - PARENT_BORDER_MARGIN/2
+		,height-PARENT_BORDER_MARGIN
+		,scrollbar_size
+		,height-2*PARENT_BORDER_MARGIN);
+	
+	mScrollbar->setPageSize(height);
+	mScrollbar->setDocParams(mInnerRect.getHeight(),mScrollbar->getDocPos());
+
+	if(was_visible)
+	{
+		S32 scroll_pos = llmin(mScrollbar->getDocPos(), getRecuiredHeight() - height - 1);
+		mScrollbar->setDocPos(scroll_pos);
+	}
+}
+
+void	LLAccordionCtrl::hideScrollbar( S32 width, S32 height )
+{
+	if(mScrollbar->getVisible() == false)
+		return;
+	mScrollbar->setVisible(false);
+
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
+	S32 panel_width = width - 2*BORDER_MARGIN;
+
+	//reshape all accordeons and shift all draggers
+	for(size_t i=0;i<mAccordionTabs.size();++i)
+	{
+		LLRect panel_rect = mAccordionTabs[i]->getRect();
+		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_rect.mTop,panel_width,panel_rect.getHeight());
+	}
+
+	mScrollbar->setDocPos(0);
+
+	if(mAccordionTabs.size()>0)
+	{
+		S32 panel_top = height - BORDER_MARGIN;		  // Top coordinate of the first panel
+		S32 diff = panel_top - mAccordionTabs[0]->getRect().mTop;
+		shiftAccordionTabs(0,diff);
+	}
+}
+
+
+//---------------------------------------------------------------------------------
+S32 LLAccordionCtrl::calcRecuiredHeight()
+{
+	S32 rec_height = 0;
+	
+	std::vector<LLAccordionCtrlTab*>::iterator panel;
+	for(panel=mAccordionTabs.begin(); panel!=mAccordionTabs.end(); ++panel)
+	{
+		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*panel);
+		if(accordion_tab && accordion_tab->getVisible())
+		{
+			rec_height += accordion_tab->getRect().getHeight();
+		}
+	}
+
+	mInnerRect.setLeftTopAndSize(0,rec_height + BORDER_MARGIN*2,getRect().getWidth(),rec_height + BORDER_MARGIN);
+
+	return mInnerRect.getHeight();
+}
+
+//---------------------------------------------------------------------------------
+void LLAccordionCtrl::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);
+}
+
+void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
+{
+	if(!panel)
+		return;
+	panel->translate(0,delta);
+}
+
+//---------------------------------------------------------------------------------
+
+void LLAccordionCtrl::addCollapsibleCtrl(LLView* view)
+{
+	LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(view);
+	if(!accordion_tab)
+		return;
+	if(std::find(getChildList()->begin(),getChildList()->end(),accordion_tab) == getChildList()->end())
+		addChild(accordion_tab);
+	mAccordionTabs.push_back(accordion_tab);
+	
+	accordion_tab->setDropDownStateChangedCallback( boost::bind(&LLAccordionCtrl::onCollapseCtrlCloseOpen, this, mAccordionTabs.size() - 1) );
+
+}
+
+
+void LLAccordionCtrl::arrange()
+{
+	if( mAccordionTabs.size() == 0)
+	{
+		//We do not arrange if we do not have what should be arranged
+		return;
+	}
+
+	//Calculate params	
+	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+
+	
+	if(mAccordionTabs.size() == 1)
+	{
+		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]);
+		
+		LLRect panel_rect = accordion_tab->getRect();
+		
+		S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN;
+
+		ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height);
+		
+		show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+		return;
+
+	}
+
+	for(size_t i = 0; i < mAccordionTabs.size(); i++ )
+	{
+		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+		
+		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+			continue;
+		
+		if(!accordion_tab->isExpanded() )
+		{
+			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, accordion_tab->getRect().getHeight());
+			panel_top-=mAccordionTabs[i]->getRect().getHeight();
+		}
+		else
+		{
+			S32 panel_height = accordion_tab->getRect().getHeight();
+			
+			if(mFitParent)
+			{
+				// all expanded tabs will have equal height
+				panel_height = calcExpandedTabHeight(i, panel_top);
+				ctrlSetLeftTopAndSize(accordion_tab, panel_left, panel_top, panel_width, panel_height);
+
+				// try to make accordion tab fit accordion view height.
+				// Accordion View should implement getRequiredRect() and provide valid height
+				S32 optimal_height = accordion_tab->getAccordionView()->getRequiredRect().getHeight();
+				optimal_height += accordion_tab->getHeaderHeight() + 2 * BORDER_MARGIN;
+				if(optimal_height < panel_height)
+				{
+					panel_height = optimal_height;
+				}
+
+				// minimum tab height is equal to header height
+				if(mAccordionTabs[i]->getHeaderHeight() > panel_height)
+				{
+					panel_height = mAccordionTabs[i]->getHeaderHeight();
+				}
+			}
+			
+			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
+			panel_top-=panel_height;
+			
+		}
+	}	
+
+	show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+
+	updateLayout(getRect().getWidth(),getRect().getHeight());
+
+}
+
+//---------------------------------------------------------------------------------
+
+BOOL LLAccordionCtrl::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+{
+	if(LLPanel::handleScrollWheel(x,y,clicks))
+		return TRUE;
+	if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+		return TRUE;
+	return false;
+
+}
+
+BOOL LLAccordionCtrl::handleKeyHere			(KEY key, MASK mask)
+{
+	if( mScrollbar->getVisible() && mScrollbar->handleKeyHere( key,mask ) )
+		return TRUE;
+	return LLPanel::handleKeyHere(key,mask);
+}
+
+void	LLAccordionCtrl::updateLayout	(S32 width, S32 height)
+{
+	S32 panel_top = height - BORDER_MARGIN ;
+	if(mScrollbar->getVisible())
+		panel_top+=mScrollbar->getDocPos();
+
+	S32 panel_width = width - 2*BORDER_MARGIN;
+
+	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	if(mScrollbar->getVisible())
+		panel_width-=scrollbar_size;
+
+	//set sizes for first panels and dragbars
+	for(size_t i=0;i<mAccordionTabs.size();++i)
+	{
+		if(!mAccordionTabs[i]->getVisible())
+			continue;
+		LLRect panel_rect = mAccordionTabs[i]->getRect();
+		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
+		panel_top-=panel_rect.getHeight();
+	}
+}
+
+void	LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
+{
+	updateLayout(getRect().getWidth(),getRect().getHeight());
+}
+void	LLAccordionCtrl::onOpen		(const LLSD& key)
+{
+	for(size_t i=0;i<mAccordionTabs.size();++i)
+	{
+		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+		LLPanel* panel = dynamic_cast<LLPanel*>(accordion_tab->getAccordionView());
+		if(panel!=NULL)
+		{
+			panel->onOpen(key);
+		}
+	}
+}
+S32	LLAccordionCtrl::notifyParent(const LLSD& info)
+{
+	if(info.has("action"))
+	{
+		std::string str_action = info["action"];
+		if(str_action == "size_changes")
+		{
+			//
+			arrange();
+			return 1;
+		}
+		else if(str_action == "select_next")
+		{
+			for(size_t i=0;i<mAccordionTabs.size();++i)
+			{
+				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+				if(accordion_tab->hasFocus())
+				{
+					while(++i<mAccordionTabs.size())
+					{
+						if(mAccordionTabs[i]->getVisible())
+							break;
+					}
+					if(i<mAccordionTabs.size())
+					{
+						accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+						accordion_tab->notify(LLSD().with("action","select_first"));
+						return 1;
+					}
+					break;
+				}
+			}
+			return 0;
+		}
+		else if(str_action == "select_prev")
+		{
+			for(size_t i=0;i<mAccordionTabs.size();++i)
+			{
+				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+				if(accordion_tab->hasFocus() && i>0)
+				{
+					while(i>0)
+					{
+						if(mAccordionTabs[--i]->getVisible())
+							break;
+					}
+					
+					accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
+					accordion_tab->notify(LLSD().with("action","select_last"));
+					return 1;
+				}
+			}
+			return 0;
+		}
+	}
+	else if (info.has("scrollToShowRect"))
+	{
+		LLRect screen_rc, local_rc;
+		screen_rc.setValue(info["scrollToShowRect"]);
+		screenRectToLocal(screen_rc, &local_rc);
+
+		// Translate to parent coordinatess to check if we are in visible rectangle
+		local_rc.translate( getRect().mLeft, getRect().mBottom );
+
+		if ( !getRect().contains (local_rc) )
+		{
+			// Back to local coords and calculate position for scroller
+			S32 bottom = mScrollbar->getDocPos() - local_rc.mBottom + getRect().mBottom;
+			S32 top = mScrollbar->getDocPos() - local_rc.mTop + getRect().mTop;
+
+			S32 scroll_pos = llclamp(mScrollbar->getDocPos(),
+									 bottom, // min vertical scroll
+									 top); // max vertical scroll 
+
+			mScrollbar->setDocPos( scroll_pos );
+		}
+		return 1;
+	}
+	return LLPanel::notifyParent(info);
+}
+void	LLAccordionCtrl::reset		()
+{
+	if(mScrollbar)
+		mScrollbar->setDocPos(0);
+}
+
+S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 available_height /* = 0 */)
+{
+	if(tab_index < 0)
+	{
+		return available_height;
+	}
+
+	S32 collapsed_tabs_height = 0;
+	S32 num_expanded = 0;
+
+	for(size_t n = tab_index; n < mAccordionTabs.size(); ++n)
+	{
+		if(!mAccordionTabs[n]->isExpanded())
+		{
+			collapsed_tabs_height += mAccordionTabs[n]->getHeaderHeight();
+		}
+		else
+		{
+			++num_expanded;
+		}
+	}
+
+	if(0 == num_expanded)
+	{
+		return available_height;
+	}
+
+	S32 expanded_tab_height = available_height - collapsed_tabs_height - BORDER_MARGIN; // top BORDER_MARGIN is added in arrange(), here we add bottom BORDER_MARGIN
+	expanded_tab_height /= num_expanded;
+	return expanded_tab_height;
+}
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
new file mode 100644
index 0000000000..4cb0f38281
--- /dev/null
+++ b/indra/llui/llaccordionctrl.h
@@ -0,0 +1,123 @@
+/** 
+ * @file LLAccordionCtrl.h
+ * @brief Accordion Panel implementation
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-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_ACCORDIONCTRL_H
+#define LL_ACCORDIONCTRL_H
+
+#include "llpanel.h"
+#include "llscrollbar.h"
+
+#include <vector>
+#include <algorithm>
+#include <string>
+
+class LLAccordionCtrlTab;
+
+class LLAccordionCtrl: public LLPanel
+{
+private:
+
+	std::vector<LLAccordionCtrlTab*> mAccordionTabs;
+
+	void ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height);
+	void ctrlShiftVertical(LLView* panel,S32 delta);
+	
+	void onCollapseCtrlCloseOpen(S16 panel_num); 
+	void shiftAccordionTabs(S16 panel_num, S32 delta);
+
+
+public:
+	struct Params 
+		: public LLInitParam::Block<Params, LLPanel::Params>
+	{
+		Optional<bool>			single_expansion,
+								fit_parent; /* Accordion will fit its parent size, controls that are placed into 
+								accordion tabs are responsible for scrolling their content.
+								*NOTE fit_parent works best when combined with single_expansion.
+								Accordion view should implement getRequiredRect() and provide valid height*/
+
+		Params()
+			: single_expansion("single_expansion",false)
+			, fit_parent("fit_parent", false)
+		{};
+	};
+
+	LLAccordionCtrl(const Params& params);
+
+    LLAccordionCtrl();
+    virtual ~LLAccordionCtrl();
+
+	virtual BOOL postBuild();
+	
+	virtual BOOL handleRightMouseDown	( S32 x, S32 y, MASK mask); 
+	virtual BOOL handleScrollWheel		( S32 x, S32 y, S32 clicks );
+	virtual BOOL handleKeyHere			(KEY key, MASK mask);
+	//
+
+	// Call reshape after changing splitter's size
+	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
+	void addCollapsibleCtrl(LLView* view);
+	void arrange();
+
+
+	void	draw();
+	
+	void	onScrollPosChangeCallback(S32, LLScrollbar*);
+
+	void	onOpen		(const LLSD& key);
+	S32		notifyParent(const LLSD& info);
+
+	void	reset		();
+
+private:
+	// Calc Splitter's height that is necessary to display all child content
+	S32		calcRecuiredHeight();
+	S32		getRecuiredHeight() const { return mInnerRect.getHeight(); }
+	S32		calcExpandedTabHeight(S32 tab_index = 0, S32 available_height = 0);
+
+	void	updateLayout			(S32 width, S32 height);
+
+	void	show_hide_scrollbar		(S32 width, S32 height);
+
+	void	showScrollbar			(S32 width, S32 height);
+	void	hideScrollbar			(S32 width, S32 height);
+
+private:
+	LLRect			mInnerRect;
+	LLScrollbar*	mScrollbar;
+	bool			mSingleExpansion;
+	bool			mFitParent;
+};
+
+
+#endif // LL_LLSPLITTER_H
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
new file mode 100644
index 0000000000..4bfe44135a
--- /dev/null
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -0,0 +1,600 @@
+/** 
+ * @file LLAccordionCtrlTab.cpp
+ * @brief Collapsible control implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "lluictrl.h"
+
+#include "llaccordionctrltab.h"
+
+#include "lltextbox.h"
+
+static const std::string DD_BUTTON_NAME = "dd_button";
+static const std::string DD_TEXTBOX_NAME = "dd_textbox";
+static const std::string DD_HEADER_NAME = "dd_header";
+
+static const S32 HEADER_HEIGHT = 20;
+static const S32 HEADER_IMAGE_LEFT_OFFSET = 5;
+static const S32 HEADER_TEXT_LEFT_OFFSET = 30;
+
+static LLDefaultChildRegistry::Register<LLAccordionCtrlTab> t1("accordion_tab");
+
+class LLAccordionCtrlTab::LLAccordionCtrlTabHeader : public LLUICtrl
+{
+public:
+	friend class LLUICtrlFactory;
+
+	struct Params : public LLInitParam::Block<Params, LLAccordionCtrlTab::Params>
+	{
+		Params();
+	};
+
+	LLAccordionCtrlTabHeader(const LLAccordionCtrlTabHeader::Params& p);
+	
+	virtual ~LLAccordionCtrlTabHeader();
+
+	virtual void draw();
+
+	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
+	virtual BOOL postBuild();
+
+	void	setTitle(const std::string& title);
+
+	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
+	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
+	virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+private:
+
+	LLTextBox* mHeaderTextbox;
+
+	// Overlay images (arrows)
+	LLPointer<LLUIImage> mImageCollapsed;
+	LLPointer<LLUIImage> mImageExpanded;
+	LLPointer<LLUIImage> mImageCollapsedPressed;
+	LLPointer<LLUIImage> mImageExpandedPressed;
+
+	// Background images
+	LLPointer<LLUIImage> mImageHeader;
+	LLPointer<LLUIImage> mImageHeaderOver;
+	LLPointer<LLUIImage> mImageHeaderPressed;
+	LLPointer<LLUIImage> mImageHeaderFocused;
+
+	LLUIColor mHeaderBGColor;
+
+	bool mNeedsHighlight;
+};
+
+LLAccordionCtrlTab::LLAccordionCtrlTabHeader::Params::Params()
+{
+}
+
+LLAccordionCtrlTab::LLAccordionCtrlTabHeader::LLAccordionCtrlTabHeader(
+	const LLAccordionCtrlTabHeader::Params& p)
+: LLUICtrl(p)
+, mHeaderBGColor(p.header_bg_color())
+,mNeedsHighlight(false),
+	mImageCollapsed(p.header_collapse_img),
+	mImageCollapsedPressed(p.header_collapse_img_pressed),
+	mImageExpanded(p.header_expand_img),
+	mImageExpandedPressed(p.header_expand_img_pressed),
+	mImageHeader(p.header_image),
+	mImageHeaderOver(p.header_image_over),
+	mImageHeaderPressed(p.header_image_pressed),
+	mImageHeaderFocused(p.header_image_focused)
+{
+	LLTextBox::Params textboxParams;
+	textboxParams.name(DD_TEXTBOX_NAME);
+	textboxParams.initial_value(p.title());
+	textboxParams.text_color(p.header_text_color());
+	textboxParams.follows.flags(FOLLOWS_NONE);
+	textboxParams.font( p.font() );
+	textboxParams.font_shadow(LLFontGL::NO_SHADOW);
+	textboxParams.use_ellipses = true;
+	textboxParams.bg_visible = false;
+	textboxParams.mouse_opaque = false;
+	mHeaderTextbox = LLUICtrlFactory::create<LLTextBox>(textboxParams);
+	addChild(mHeaderTextbox);
+}
+
+LLAccordionCtrlTab::LLAccordionCtrlTabHeader::~LLAccordionCtrlTabHeader()
+{
+}
+
+BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::postBuild()
+{
+	return TRUE;
+}
+
+void	LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitle(const std::string& title)
+{
+	if(mHeaderTextbox)
+		mHeaderTextbox->setText(title);
+}
+
+void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
+{
+	S32 width = getRect().getWidth();
+	S32 height = getRect().getHeight();
+
+	gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get(),true);
+
+	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
+	bool collapsible = (parent && parent->getCollapsible());
+	bool expanded = (parent && parent->getDisplayChildren());
+
+	// Handle overlay images, if needed
+	// Only show green "focus" background image if the accordion is open,
+	// because the user's mental model of focus is that it goes away after
+	// the accordion is closed.
+	if (getParent()->hasFocus()
+		/*&& !(collapsible && !expanded)*/ // WHY??
+		)
+	{
+		mImageHeaderFocused->draw(0,0,width,height);
+	}
+	else
+	{
+		mImageHeader->draw(0,0,width,height);
+	}
+
+	if(mNeedsHighlight)
+	{
+		mImageHeaderOver->draw(0,0,width,height);
+	}
+	
+
+	if(collapsible)
+	{
+		LLPointer<LLUIImage> overlay_image;
+		if(expanded)
+		{
+			overlay_image = mImageExpanded;
+		}
+		else
+		{
+			overlay_image = mImageCollapsed;
+		}
+		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET,
+							(height - overlay_image->getHeight()) / 2);
+	}
+	
+	LLUICtrl::draw();
+}
+
+void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
+{
+	S32 header_height = mHeaderTextbox->getTextPixelHeight();
+
+	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
+	mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
+	mHeaderTextbox->setRect(textboxRect);
+}
+
+void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	LLUICtrl::onMouseEnter(x, y, mask);
+	mNeedsHighlight = true;
+}
+void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	LLUICtrl::onMouseLeave(x, y, mask);
+	mNeedsHighlight = false;
+}
+BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+	if ( ( key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
+	{
+		return getParent()->handleKey(key, mask, called_from_parent);
+	}
+	return LLUICtrl::handleKey(key, mask, called_from_parent);
+}
+
+
+LLAccordionCtrlTab::Params::Params()
+	: title("title")
+	,display_children("expanded", true)
+	,header_height("header_height", HEADER_HEIGHT),
+	min_width("min_width", 0),
+	min_height("min_height", 0)
+	,collapsible("collapsible", true)
+	,header_bg_color("header_bg_color")
+	,dropdown_bg_color("dropdown_bg_color")
+	,header_visible("header_visible",true)
+	,padding_left("padding_left",2)
+	,padding_right("padding_right",2)
+	,padding_top("padding_top",2)
+	,padding_bottom("padding_bottom",2)
+	,header_expand_img("header_expand_img")
+	,header_expand_img_pressed("header_expand_img_pressed")
+	,header_collapse_img("header_collapse_img")
+	,header_collapse_img_pressed("header_collapse_img_pressed")
+	,header_image("header_image")
+	,header_image_over("header_image_over")
+	,header_image_pressed("header_image_pressed")
+	,header_image_focused("header_image_focused")
+	,header_text_color("header_text_color")
+{
+	mouse_opaque(false);
+}
+
+LLAccordionCtrlTab::LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&p)
+	: LLUICtrl(p)
+	,mDisplayChildren(p.display_children)
+	,mCollapsible(p.collapsible)
+	,mExpandedHeight(0)
+	,mDropdownBGColor(p.dropdown_bg_color())
+	,mHeaderVisible(p.header_visible)
+	,mPaddingLeft(p.padding_left)
+	,mPaddingRight(p.padding_right)
+	,mPaddingTop(p.padding_top)
+	,mPaddingBottom(p.padding_bottom)
+	,mCanOpenClose(true)
+{
+	mStoredOpenCloseState = false;
+	mWasStateStored = false;
+	
+	mDropdownBGColor = LLColor4::white;
+	LLAccordionCtrlTabHeader::Params headerParams;
+	headerParams.name(DD_HEADER_NAME);
+	headerParams.title(p.title);
+	mHeader = LLUICtrlFactory::create<LLAccordionCtrlTabHeader>(headerParams);
+	addChild(mHeader, 1);
+
+	reshape(100, 200,FALSE);
+}
+
+LLAccordionCtrlTab::~LLAccordionCtrlTab()
+{
+}
+
+
+void LLAccordionCtrlTab::setDisplayChildren(bool display)
+{
+	mDisplayChildren = display;
+	LLRect rect = getRect();
+
+	rect.mBottom = rect.mTop - (getDisplayChildren() ? 
+		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;
+
+		child->setVisible(getDisplayChildren());
+	}
+}
+
+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();
+
+		child->reshape(childWidth,childHeight);
+		
+		childRect.setLeftTopAndSize(
+			getPaddingLeft(),
+			childHeight + getPaddingBottom(),
+			childWidth, 
+			childHeight);
+
+		child->setRect(childRect);
+		
+		break;//suppose that there is only one panel
+	}
+
+}
+
+void LLAccordionCtrlTab::changeOpenClose(bool is_open)
+{
+	if(is_open)
+		mExpandedHeight = getRect().getHeight();
+
+	setDisplayChildren(!is_open);
+	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
+	if (mCommitSignal)
+	{
+		(*mCommitSignal)(this, getDisplayChildren());
+	}
+}
+
+BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if(mCollapsible && mHeaderVisible && mCanOpenClose)
+	{
+		if(y >= (getRect().getHeight() - HEADER_HEIGHT) )
+		{
+			LLAccordionCtrlTabHeader* header = getChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);
+			header->setFocus(true);
+			changeOpenClose(getDisplayChildren());
+
+			//reset stored state
+			mWasStateStored = false;
+			return TRUE;
+		}
+	}
+	return LLUICtrl::handleMouseDown(x,y,mask);
+}
+
+BOOL LLAccordionCtrlTab::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	return LLUICtrl::handleMouseUp(x,y,mask);
+}
+
+boost::signals2::connection LLAccordionCtrlTab::setDropDownStateChangedCallback(commit_callback_t cb)
+{
+	return setCommitCallback(cb);
+}
+
+bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
+{
+	if(DD_HEADER_NAME != child->getName())
+	{
+		reshape(child->getRect().getWidth() , child->getRect().getHeight() + HEADER_HEIGHT );
+		mExpandedHeight = getRect().getHeight();
+	}
+
+	bool res = LLUICtrl::addChild(child, tab_group);
+
+	if(DD_HEADER_NAME != child->getName())
+	{
+		if(!mCollapsible)
+			setDisplayChildren(true);
+		else
+			setDisplayChildren(getDisplayChildren());	
+	}
+
+	return res;
+}
+
+void LLAccordionCtrlTab::setAccordionView(LLView* panel)
+{
+	addChild(panel,0);
+}
+
+
+LLView*	LLAccordionCtrlTab::getAccordionView()
+{
+	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;
+		return child;
+	}
+	return NULL;
+}
+
+
+S32 LLAccordionCtrlTab::getHeaderHeight()
+{
+	return mHeaderVisible?HEADER_HEIGHT:0; 
+}
+
+void LLAccordionCtrlTab::setHeaderVisible(bool value) 
+{
+	if(mHeaderVisible == value)
+		return;
+	mHeaderVisible = value;
+	if(mHeader)
+		mHeader->setVisible(value);
+	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
+};
+
+//vurtual
+BOOL LLAccordionCtrlTab::postBuild()
+{
+	mHeader->setVisible(mHeaderVisible);
+	return LLUICtrl::postBuild();
+}
+bool	LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
+{
+	if(info.has("action"))
+	{
+		std::string str_action = info["action"];
+		if(str_action == "store_state")
+		{
+			storeOpenCloseState();
+			return true;
+		}
+		if(str_action == "restore_state")
+		{
+			restoreOpenCloseState();
+			return true;
+		}
+	}	
+	return LLUICtrl::notifyChildren(info);
+}
+
+S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
+{
+	if(info.has("action"))
+	{
+		std::string str_action = info["action"];
+		if(str_action == "size_changes")
+		{
+			//
+			S32 height = info["height"];
+			height = llmax(height,10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
+			
+			mExpandedHeight = height;
+			
+			if(isExpanded())
+			{
+				LLRect panel_rect = getRect();
+				panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
+				reshape(getRect().getWidth(),height);
+				setRect(panel_rect);
+			}
+			
+			//LLAccordionCtrl should rearrange accodion tab if one of accordion change its size
+			getParent()->notifyParent(info);
+			return 1;
+		}
+		else if(str_action == "select_prev") 
+		{
+			showAndFocusHeader();
+			return 1;
+		}
+	}
+	return LLUICtrl::notifyParent(info);
+}
+
+S32 LLAccordionCtrlTab::notify(const LLSD& info)
+{
+	if(info.has("action"))
+	{
+		std::string str_action = info["action"];
+		if(str_action == "select_first")
+		{
+			showAndFocusHeader();
+			return 1;
+		}
+		else if( str_action == "select_last" )
+		{
+			if(getDisplayChildren() == false)
+			{
+				showAndFocusHeader();
+			}
+			else
+			{
+				LLView* view = getAccordionView();
+				if(view)
+					view->notify(LLSD().with("action","select_last"));
+			}
+		}
+	}
+	return 0;
+}
+
+BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+	LLAccordionCtrlTabHeader* header = getChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);	
+	if( !header->hasFocus() )
+		return LLUICtrl::handleKey(key, mask, called_from_parent);
+
+	if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
+	{
+		if(getDisplayChildren() == false)
+		{
+			changeOpenClose(getDisplayChildren());
+			return TRUE;
+		}
+	}
+	if ( (key == KEY_SUBTRACT || key == KEY_LEFT)&& mask == MASK_NONE)
+	{
+		if(getDisplayChildren() == true)
+		{
+			changeOpenClose(getDisplayChildren());
+			return TRUE;
+		}
+	}
+
+	if ( key == KEY_DOWN && mask == MASK_NONE)
+	{
+		//if collapsed go to the next accordion
+		if(getDisplayChildren() == false)
+			//we processing notifyParent so let call parent directly
+			getParent()->notifyParent(LLSD().with("action","select_next"));
+		else
+		{
+			getAccordionView()->notify(LLSD().with("action","select_first"));
+		}
+		return TRUE;
+	}
+
+	if ( key == KEY_UP && mask == MASK_NONE)
+	{
+		//go to the previous accordion
+
+		//we processing notifyParent so let call parent directly
+		getParent()->notifyParent(LLSD().with("action","select_prev"));
+		return TRUE;
+	}
+
+	return LLUICtrl::handleKey(key, mask, called_from_parent);
+}
+
+void LLAccordionCtrlTab::showAndFocusHeader()
+{
+	LLAccordionCtrlTabHeader* header = getChild<LLAccordionCtrlTabHeader>(DD_HEADER_NAME);	
+	header->setFocus(true);
+
+	LLRect screen_rc;
+	LLRect selected_rc = header->getRect();
+	localRectToScreen(selected_rc, &screen_rc);
+	notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
+
+}
+void    LLAccordionCtrlTab::storeOpenCloseState()
+{
+	if(mWasStateStored)
+		return;
+	mStoredOpenCloseState = getDisplayChildren();
+	mWasStateStored = true;
+}
+void   LLAccordionCtrlTab::restoreOpenCloseState()
+{
+	if(!mWasStateStored)
+		return;
+	if(getDisplayChildren() != mStoredOpenCloseState)
+	{
+		changeOpenClose(getDisplayChildren());
+	}
+	mWasStateStored = false;
+}
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
new file mode 100644
index 0000000000..b200d43438
--- /dev/null
+++ b/indra/llui/llaccordionctrltab.h
@@ -0,0 +1,191 @@
+/** 
+ * @file LLAccordionCtrlTab.h
+ * @brief Collapsible box control implementation
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-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_ACCORDIONCTRLTAB_H_
+#define LL_ACCORDIONCTRLTAB_H_
+
+#include <string>
+#include "llrect.h"
+
+class LLUICtrl;
+class LLUICtrlFactory;
+class LLUIImage;
+class LLButton;
+class LLTextBox;
+
+
+
+// LLAccordionCtrlTab is a container for other controls. 
+// It has a Header, by clicking on which hosted controls are shown or hidden.
+// When hosted controls are show - LLAccordionCtrlTab is expanded.
+// When hosted controls are hidden - LLAccordionCtrlTab is collapsed.
+
+class LLAccordionCtrlTab : public LLUICtrl
+{
+// Interface
+public:
+
+	struct Params 
+	 : public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+		Optional<bool>			display_children, //expanded or collapsed after initialization
+								collapsible;
+
+		Optional<std::string>	title;
+
+		Optional<S32>			header_height,
+								min_width,
+								min_height;
+
+		// Overlay images (arrows on the left)
+		Mandatory<LLUIImage*>	header_expand_img,
+								header_expand_img_pressed,
+								header_collapse_img,
+								header_collapse_img_pressed;
+
+		// Background images for the accordion tabs
+		Mandatory<LLUIImage*>	header_image,
+								header_image_over,
+								header_image_pressed,
+								header_image_focused;
+
+		Optional<LLUIColor>		header_bg_color,
+								header_text_color,
+								dropdown_bg_color;
+
+		Optional<bool>			header_visible;
+
+		Optional<S32>			padding_left;
+		Optional<S32>			padding_right;
+		Optional<S32>			padding_top;
+		Optional<S32>			padding_bottom;
+
+		Params();
+	};
+
+	typedef LLDefaultChildRegistry child_registry_t;
+
+	virtual ~LLAccordionCtrlTab();
+	
+	// Registers callback for expand/collapse events.
+	boost::signals2::connection setDropDownStateChangedCallback(commit_callback_t cb);
+
+	// Changes expand/collapse state
+	virtual void setDisplayChildren(bool display);
+
+	// Returns expand/collapse state
+	virtual bool getDisplayChildren() const {return mDisplayChildren;};
+
+	//set LLAccordionCtrlTab panel
+	void		setAccordionView(LLView* panel);
+	LLView*		getAccordionView();
+
+	bool getCollapsible() {return mCollapsible;};
+
+	void setCollapsible(bool collapsible) {mCollapsible = collapsible;};
+	void changeOpenClose(bool is_open);
+
+	void canOpenClose(bool can_open_close) { mCanOpenClose = can_open_close;};
+
+	virtual BOOL postBuild();
+
+	S32	notifyParent(const LLSD& info);
+	S32 notify(const LLSD& info);
+	bool notifyChildren(const LLSD& info);
+
+	void    storeOpenCloseState		();
+	void    restoreOpenCloseState	();
+
+protected:
+	LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&);
+	friend class LLUICtrlFactory;
+
+// Overrides
+public:
+
+	// Call reshape after changing size
+	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
+	// Changes expand/collapse state and triggers expand/collapse callbacks
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
+	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+	virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+
+	virtual bool addChild(LLView* child, S32 tab_group);
+
+	bool isExpanded() { return mDisplayChildren; }
+
+	S32 getHeaderHeight();
+
+	// Min size functions
+
+	void setHeaderVisible(bool value);
+
+	bool getHeaderVisible() { return mHeaderVisible;}
+
+	S32 mExpandedHeight; // Height of expanded ctrl.
+						 // Used to restore height after expand.
+
+	S32	getPaddingLeft() const { return mPaddingLeft;}
+	S32	getPaddingRight() const { return mPaddingRight;}
+	S32	getPaddingTop() const { return mPaddingTop;}
+	S32	getPaddingBottom() const { return mPaddingBottom;}
+
+	void showAndFocusHeader();
+
+private:
+
+	
+
+	class LLAccordionCtrlTabHeader;
+	LLAccordionCtrlTabHeader* mHeader; //Header
+
+	bool mDisplayChildren; //Expanded/collapsed
+	bool mCollapsible;
+	bool mHeaderVisible;
+
+	bool mCanOpenClose;
+
+	S32	mPaddingLeft;
+	S32	mPaddingRight;
+	S32	mPaddingTop;
+	S32	mPaddingBottom;
+
+	bool mStoredOpenCloseState;
+	bool mWasStateStored;
+
+
+	LLUIColor mDropdownBGColor;
+};
+
+#endif
diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh
new file mode 100644
index 0000000000..a0b72a89f2
--- /dev/null
+++ b/indra/newview/installers/darwin/fix_application_icon_position.sh
@@ -0,0 +1,14 @@
+# just run this script each time after you change the installer's name to fix the icon misalignment 
+#!/bin/bash
+cp -r ./../../../build-darwin-i386/newview/*.dmg ~/Desktop/TempBuild.dmg
+hdid ~/Desktop/TempBuild.dmg
+open -a finder /Volumes/Second\ Life\ Installer
+osascript dmg-cleanup.applescript
+cp /Volumes/Second\ Life\ Installer/.DS_Store ~/Desktop/_DS_Store
+chflags nohidden ~/Desktop/_DS_Store
+cp ~/Desktop/_DS_Store ./firstlook-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./publicnightly-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./release-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./releasecandidate-dmg/_DS_Store
+umount /Volumes/Second\ Life\ Installer/
+rm ~/Desktop/_DS_Store ~/Desktop/TempBuild.dmg
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
new file mode 100644
index 0000000000..3ca8fa2f56
--- /dev/null
+++ b/indra/newview/llinspecttoast.cpp
@@ -0,0 +1,122 @@
+/** 
+ * @file llinspecttoast.cpp
+ * @brief Toast inspector implementation.
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h" // must be first include
+
+#include "llinspecttoast.h"
+#include "llinspect.h"
+#include "llfloaterreg.h"
+#include "llscreenchannel.h"
+#include "llchannelmanager.h"
+#include "lltransientfloatermgr.h"
+
+using namespace LLNotificationsUI;
+
+/**
+ * Represents inspectable toast .
+ */
+class LLInspectToast: public LLInspect
+{
+public:
+
+	LLInspectToast(const LLSD& notification_idl);
+	virtual ~LLInspectToast();
+
+	/*virtual*/ void onOpen(const LLSD& notification_id);
+private:
+	void onToastDestroy(LLToast * toast);
+
+private:
+	LLPanel* mPanel;
+	LLScreenChannel* mScreenChannel;
+};
+
+LLInspectToast::LLInspectToast(const LLSD& notification_id) :
+	LLInspect(LLSD()), mPanel(NULL)
+{
+	LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
+																LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+	mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);
+	if(NULL == mScreenChannel)
+	{
+		llwarns << "Could not get requested screen channel." << llendl;
+		return;
+	}
+
+	LLTransientFloaterMgr::getInstance()->addControlView(this);
+}
+LLInspectToast::~LLInspectToast()
+{
+	LLTransientFloaterMgr::getInstance()->removeControlView(this);
+}
+
+void LLInspectToast::onOpen(const LLSD& notification_id)
+{
+	LLInspect::onOpen(notification_id);
+	LLToast* toast = mScreenChannel->getToastByNotificationID(notification_id);
+	if (toast == NULL)
+	{
+		llwarns << "Could not get requested toast  from screen channel." << llendl;
+		return;
+	}
+	toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1));
+
+	LLPanel * panel = toast->getPanel();
+	panel->setVisible(TRUE);
+	panel->setMouseOpaque(FALSE);
+	if(mPanel != NULL && mPanel->getParent() == this)
+	{
+		removeChild(mPanel);
+	}
+	addChild(panel);
+	panel->setFocus(TRUE);
+	mPanel = panel;
+
+
+	LLRect panel_rect;
+	panel_rect = panel->getRect();
+	reshape(panel_rect.getWidth(), panel_rect.getHeight());
+
+	LLUI::positionViewNearMouse(this);
+}
+
+void LLInspectToast::onToastDestroy(LLToast * toast)
+{
+	closeFloater(false);
+}
+
+void LLNotificationsUI::registerFloater()
+{
+	LLFloaterReg::add("inspect_toast", "inspect_toast.xml",
+			&LLFloaterReg::build<LLInspectToast>);
+}
+
diff --git a/indra/newview/llinspecttoast.h b/indra/newview/llinspecttoast.h
new file mode 100644
index 0000000000..ff547154b8
--- /dev/null
+++ b/indra/newview/llinspecttoast.h
@@ -0,0 +1,40 @@
+/** 
+ * @file llinspecttoast.h
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-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_LLINSPECTTOAST_H
+#define LL_LLINSPECTTOAST_H
+
+namespace LLNotificationsUI
+{
+void registerFloater();
+}
+
+#endif
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
new file mode 100644
index 0000000000..74e37efe4e
--- /dev/null
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -0,0 +1,154 @@
+/** 
+ * @file llpanelvolumepulldown.cpp
+ * @author Tofu Linden
+ * @brief A floater showing the master volume pull-down
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelvolumepulldown.h"
+
+// Viewer libs
+#include "llviewercontrol.h"
+#include "llstatusbar.h"
+
+// Linden libs
+#include "llbutton.h"
+#include "lltabcontainer.h"
+#include "llfloaterreg.h"
+#include "llfloaterpreference.h"
+#include "llslider.h"
+
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseFadeStartTimeSec = 4.0f;
+/* static */ const F32 LLPanelVolumePulldown::sAutoCloseTotalTimeSec = 5.0f;
+
+///----------------------------------------------------------------------------
+/// Class LLPanelVolumePulldown
+///----------------------------------------------------------------------------
+
+// Default constructor
+LLPanelVolumePulldown::LLPanelVolumePulldown()
+{
+    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");
+}
+
+BOOL LLPanelVolumePulldown::postBuild()
+{
+	// set the initial volume-slider's position to reflect reality
+	LLSlider* volslider =  getChild<LLSlider>( "mastervolume" );
+	volslider->setValue(gSavedSettings.getF32("AudioLevelMaster"));
+
+	return LLPanel::postBuild();
+}
+
+/*virtual*/
+void LLPanelVolumePulldown::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	mHoverTimer.stop();
+	LLPanel::onMouseEnter(x,y,mask);
+}
+
+
+/*virtual*/
+void LLPanelVolumePulldown::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	mHoverTimer.start();
+	LLPanel::onMouseLeave(x,y,mask);
+}
+
+/*virtual*/ 
+void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility )
+{
+	if (new_visibility)	
+	{
+		mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
+		gFocusMgr.setTopCtrl(this);
+	}
+	else
+	{
+		mHoverTimer.stop();
+		gFocusMgr.setTopCtrl(NULL);
+	}
+}
+
+/*virtual*/ 
+void LLPanelVolumePulldown::onTopLost()
+{
+	setVisible(FALSE);
+}
+
+void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data)
+{
+	// close the global volume minicontrol, we're bringing up the big one
+	setVisible(FALSE);
+
+	// bring up the prefs floater
+	LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>
+		(LLFloaterReg::showInstance("preferences"));
+	if (prefsfloater)
+	{
+		// grab the 'audio' panel from the preferences floater and
+		// bring it the front!
+		LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
+		LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio");
+		if (tabcontainer && audiopanel)
+		{
+			tabcontainer->selectTabPanel(audiopanel);
+		}
+	}
+}
+
+void LLPanelVolumePulldown::setControlFalse(const LLSD& user_data)
+{
+	std::string control_name = user_data.asString();
+	LLControlVariable* control = findControl(control_name);
+	
+	if (control)
+		control->set(LLSD(FALSE));
+}
+
+//virtual
+void LLPanelVolumePulldown::draw()
+{
+	F32 alpha = mHoverTimer.getStarted() 
+		? clamp_rescale(mHoverTimer.getElapsedTimeF32(), sAutoCloseFadeStartTimeSec, sAutoCloseTotalTimeSec, 1.f, 0.f)
+		: 1.0f;
+	LLViewDrawContext context(alpha);
+
+	LLPanel::draw();
+
+	if (alpha == 0.f)
+	{
+		setVisible(FALSE);
+	}
+}
+
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h
new file mode 100644
index 0000000000..9f20caa1a8
--- /dev/null
+++ b/indra/newview/llpanelvolumepulldown.h
@@ -0,0 +1,64 @@
+/** 
+ * @file llpanelvolumepulldown.h
+ * @author Tofu Linden
+ * @brief A panel showing the master volume pull-down
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-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_LLPANELVOLUMEPULLDOWN_H
+#define LL_LLPANELVOLUMEPULLDOWN_H
+
+#include "linden_common.h"
+
+#include "llpanel.h"
+
+class LLFrameTimer;
+
+class LLPanelVolumePulldown : public LLPanel
+{
+ public:
+	LLPanelVolumePulldown();
+	/*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*/ BOOL postBuild();
+	
+ private:
+	void setControlFalse(const LLSD& user_data);
+	void onAdvancedButtonClick(const LLSD& user_data);
+
+	LLFrameTimer mHoverTimer;
+	static const F32 sAutoCloseFadeStartTimeSec;
+	static const F32 sAutoCloseTotalTimeSec;
+};
+
+
+#endif // LL_LLPANELVOLUMEPULLDOWN_H
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index a857e30d4f..028807a6bd 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -380,138 +380,53 @@ void LLPreviewTexture::updateDimensions()
 	
 	mUpdateDimensions = FALSE;
 	
-	S32 image_height = llmax(1, mImage->getFullHeight());
-	S32 image_width = llmax(1, mImage->getFullWidth());
-	// Attempt to make the image 1:1 on screen.
-	// If that fails, cut width by half.
-	S32 client_width = image_width;
-	S32 client_height = image_height;
-	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
-	S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH;	
-	S32 max_client_width = gViewerWindow->getWindowWidthScaled() - horiz_pad;
-	S32 max_client_height = gViewerWindow->getWindowHeightScaled() - vert_pad;
-
-	if (mAspectRatio > 0.f)
-	{
-		client_height = llceil((F32)client_width / mAspectRatio);
-	}
-
-	while ((client_width > max_client_width) ||
-	       (client_height > max_client_height ))
-	{
-		client_width /= 2;
-		client_height /= 2;
-	}
-	
-	S32 view_width = client_width + horiz_pad;
-	S32 view_height = client_height + vert_pad;
-	
 	// set text on dimensions display (should be moved out of here and into a callback of some sort)
 	childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->getFullWidth()));
 	childSetTextArg("dimensions", "[HEIGHT]", llformat("%d", mImage->getFullHeight()));
-	
+
+	LLRect dim_rect;
+	childGetRect("dimensions", dim_rect);
+
+	S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
+
 	// add space for dimensions and aspect ratio
-	S32 info_height = 0;
-	LLRect aspect_rect;
-	childGetRect("combo_aspect_ratio", aspect_rect);
-	S32 aspect_height = aspect_rect.getHeight();
-	info_height += aspect_height + CLIENT_RECT_VPAD;
-	view_height += info_height;
-	
-	S32 button_height = 0;
-	
-	// add space for buttons
-	view_height += 	(BTN_HEIGHT + CLIENT_RECT_VPAD) * 3;
-	button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3;
+	S32 info_height = dim_rect.mTop + CLIENT_RECT_VPAD;
 
-	view_width = llmax(view_width, getMinWidth());
-	view_height = llmax(view_height, getMinHeight());
-	
-	if (view_height != mLastHeight || view_width != mLastWidth)
-	{
-		if (getHost())
-		{
-			getHost()->growToFit(view_width, view_height);
-			reshape( view_width, view_height );
-			setOrigin( 0, getHost()->getRect().getHeight() - (view_height + PREVIEW_HEADER_SIZE) );
-		}
-		else
-		{
-			S32 old_top = getRect().mTop;
-			S32 old_left = getRect().mLeft;
-			reshape( view_width, view_height );
-			S32 new_bottom = old_top - getRect().getHeight();
-			setOrigin( old_left, new_bottom );
-		}
-		
-		// Try to keep whole view onscreen, don't allow partial offscreen.
-		if (getHost())
-			gFloaterView->adjustToFitScreen(getHost(), FALSE);
-		else
-			gFloaterView->adjustToFitScreen(this, FALSE);
-		
-		if (image_height > 1 && image_width > 1)
-		{
-			// Resize until we know the image's height
-			mLastWidth = view_width;
-			mLastHeight = view_height;
-		}
-	}
-	
-	if (!mUserResized)
-	{
-		// clamp texture size to fit within actual size of floater after attempting resize
-		client_width = llmin(client_width, getRect().getWidth() - horiz_pad);
-		client_height = llmin(client_height, getRect().getHeight() - PREVIEW_HEADER_SIZE 
-						- (2 * CLIENT_RECT_VPAD) - LLPANEL_BORDER_WIDTH - info_height);
+	LLRect client_rect(horiz_pad, getRect().getHeight(), getRect().getWidth() - horiz_pad, 0);
+	client_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
+	client_rect.mBottom += PREVIEW_BORDER + CLIENT_RECT_VPAD + info_height ;
 
-		
-	}
-	else
+	S32 client_width = client_rect.getWidth();
+	S32 client_height = client_rect.getHeight();
+
+	if (mAspectRatio > 0.f)
 	{
-		client_width = getRect().getWidth() - horiz_pad;
-		if (mAspectRatio > 0)
+		if(mAspectRatio > 1.f)
 		{
-			client_height = llround(client_width / mAspectRatio);
+			client_height = llceil((F32)client_width / mAspectRatio);
+			if(client_height > client_rect.getHeight())
+			{
+				client_height = client_rect.getHeight();
+				client_width = llceil((F32)client_height * mAspectRatio);
+			}
 		}
 		else
 		{
-			client_height = getRect().getHeight() - vert_pad;
-		}
-	}
-
-	S32 max_height = getRect().getHeight() - PREVIEW_BORDER - button_height 
-		- CLIENT_RECT_VPAD - info_height - CLIENT_RECT_VPAD - PREVIEW_HEADER_SIZE;
-
-	if (mAspectRatio > 0.f)
-	{
-		max_height = llmax(max_height, 1);
-
-		if (client_height > max_height)
-		{
-			client_height = max_height;
-			client_width = llround(client_height * mAspectRatio);
+			client_width = llceil((F32)client_height * mAspectRatio);
+			if(client_width > client_rect.getWidth())
+			{
+				client_width = client_rect.getWidth();
+				client_height = llceil((F32)client_width / mAspectRatio);
+			}
 		}
 	}
-	else
-	{
-		S32 max_width = getRect().getWidth() - horiz_pad;
 
-		client_height = llclamp(client_height, 1, max_height);
-		client_width = llclamp(client_width, 1, max_width);
-	}
-	
-	LLRect window_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-	window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
-	window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
+	mClientRect.setLeftTopAndSize(client_rect.getCenterX() - (client_width / 2), client_rect.getCenterY() +  (client_height / 2), client_width, client_height);	
 
-	mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);	
-	
 	// Hide the aspect ratio label if the window is too narrow
 	// Assumes the label should be to the right of the dimensions
-	LLRect dim_rect, aspect_label_rect;
+	LLRect aspect_label_rect;
 	childGetRect("aspect_ratio", aspect_label_rect);
-	childGetRect("dimensions", dim_rect);
 	childSetVisible("aspect_ratio", dim_rect.mRight < aspect_label_rect.mLeft);
 }
 
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index da3f1543dd..a00b6a9288 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -47,6 +47,7 @@
 #include "llsyswellwindow.h"
 #include "llimfloater.h"
 #include "llscriptfloater.h"
+#include "llfontgl.h"
 
 #include <algorithm>
 
@@ -59,17 +60,14 @@ bool LLScreenChannel::mWasStartUpToastShown = false;
 // LLScreenChannelBase
 //////////////////////
 LLScreenChannelBase::LLScreenChannelBase(const LLUUID& id) :
-												mOverflowToastPanel(NULL) 
-												,mToastAlignment(NA_BOTTOM)
+												mToastAlignment(NA_BOTTOM)
 												,mCanStoreToasts(true)
 												,mHiddenToastsNum(0)
-												,mOverflowToastHidden(false)
 												,mHoveredToast(NULL)
 												,mControlHovering(false)
 												,mShowToasts(true)
 {	
 	mID = id;
-	mOverflowFormatString = LLTrans::getString("OverflowInfoChannelString");
 	mWorldViewRectConnection = gViewerWindow->setOnWorldViewRectUpdated(boost::bind(&LLScreenChannelBase::updatePositionAndSize, this, _1, _2));
 	setMouseOpaque( false );
 	setVisible(FALSE);
@@ -217,11 +215,6 @@ void LLScreenChannel::addToast(const LLToast::Params& p)
 
 	ToastElem new_toast_elem(p);
 
-	// reset HIDDEN flags for the Overflow Toast
-	mOverflowToastHidden = false;
-	if(mOverflowToastPanel)
-		mOverflowToastPanel->setIsHidden(false);
-	
 	new_toast_elem.toast->setOnFadeCallback(boost::bind(&LLScreenChannel::onToastFade, this, _1));
 	new_toast_elem.toast->setOnToastDestroyedCallback(boost::bind(&LLScreenChannel::onToastDestroyed, this, _1));
 	if(mControlHovering)
@@ -258,6 +251,13 @@ void LLScreenChannel::onToastDestroyed(LLToast* toast)
 	{
 		mToastList.erase(it);
 	}
+
+	it = find(mStoredToastList.begin(), mStoredToastList.end(), static_cast<LLPanel*>(toast));
+
+	if(it != mStoredToastList.end())
+	{
+		mStoredToastList.erase(it);
+	}
 }
 
 
@@ -287,6 +287,11 @@ void LLScreenChannel::onToastFade(LLToast* toast)
 //--------------------------------------------------------------------------
 void LLScreenChannel::deleteToast(LLToast* toast)
 {
+	if (toast->isDead())
+	{
+		return;
+	}
+
 	// send signal to observers about destroying of a toast
 	toast->mOnDeleteToastSignal(toast);
 	
@@ -322,8 +327,6 @@ void LLScreenChannel::loadStoredToastsToChannel()
 
 	if(mStoredToastList.size() == 0)
 		return;
-	
-	mOverflowToastHidden = false;
 
 	for(it = mStoredToastList.begin(); it != mStoredToastList.end(); ++it)
 	{
@@ -344,8 +347,6 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
 	if( it == mStoredToastList.end() )
 		return;
 
-	mOverflowToastHidden = false;
-
 	LLToast* toast = (*it).toast;
 
 	if(toast->getVisible())
@@ -357,7 +358,6 @@ void LLScreenChannel::loadStoredToastByNotificationIDToChannel(LLUUID id)
 	toast->setIsHidden(false);
 	toast->resetTimer();
 	mToastList.push_back((*it));
-	mStoredToastList.erase(it);
 
 	redrawToasts();
 }
@@ -491,7 +491,7 @@ void LLScreenChannel::showToastsBottom()
 		if(floater && floater->overlapsScreenChannel())
 		{
 			LLRect world_rect = gViewerWindow->getWorldViewRectScaled();
-			if(toast_rect.mTop + getOverflowToastHeight() + toast_margin > world_rect.mTop)
+			if(toast_rect.mTop > world_rect.mTop)
 			{
 				break;
 			}
@@ -527,7 +527,7 @@ void LLScreenChannel::showToastsBottom()
 		}		
 	}
 
-	if(it != mToastList.rend() && !mOverflowToastHidden)
+	if(it != mToastList.rend())
 	{
 		mHiddenToastsNum = 0;
 		for(; it != mToastList.rend(); it++)
@@ -536,7 +536,6 @@ void LLScreenChannel::showToastsBottom()
 			(*it).toast->setVisible(FALSE);
 			mHiddenToastsNum++;
 		}
-		createOverflowToast(bottom, gSavedSettings.getS32("NotificationTipToastLifeTime"));
 	}
 	else
 	{
@@ -567,97 +566,10 @@ void LLScreenChannel::showToastsTop()
 }
 
 //--------------------------------------------------------------------------
-void LLScreenChannel::createOverflowToast(S32 bottom, F32 timer)
-{
-	LLRect toast_rect;
-	LLToast::Params p;
-	p.lifetime_secs = timer;
-
-	if(!mOverflowToastPanel)
-		mOverflowToastPanel = new LLToast(p);
-
-	if(!mOverflowToastPanel)
-		return;
-
-	mOverflowToastPanel->startFading();
-	mOverflowToastPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onOverflowToastHide, this));
-
-	LLTextBox* text_box = mOverflowToastPanel->getChild<LLTextBox>("toast_text");
-	std::string	text = llformat(mOverflowFormatString.c_str(),mHiddenToastsNum);
-	if(mHiddenToastsNum == 1)
-	{
-		text += ".";
-	}
-	else
-	{
-		text += "s.";
-	}
-
-	toast_rect = mOverflowToastPanel->getRect();
-	mOverflowToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
-	toast_rect.setLeftTopAndSize(getRect().mLeft, bottom + toast_rect.getHeight()+gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_rect.getHeight());	
-	mOverflowToastPanel->setRect(toast_rect);
-
-	// don't show overflow toast if there is not enough space for it.
-	LLDockableFloater* floater = dynamic_cast<LLDockableFloater*>(LLDockableFloater::getInstanceHandle().get());
-	if(floater && floater->overlapsScreenChannel())
-	{
-		LLRect world_rect = gViewerWindow->getWorldViewRectScaled();
-		if(toast_rect.mTop > world_rect.mTop)
-		{
-			closeOverflowToastPanel();
-			return;
-		}
-	}
-
-	text_box->setValue(text);
-	text_box->setVisible(TRUE);
-
-	mOverflowToastPanel->setVisible(TRUE);
-}
-
-//--------------------------------------------------------------------------
-void LLScreenChannel::onOverflowToastHide()
-{
-	mOverflowToastHidden = true;
-
-	// remove all hidden toasts from channel and save interactive notifications
-	for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end();)
-	{
-		if(!(*it).toast->getVisible())
-		{
-			if((*it).toast->getCanBeStored())
-			{
-				storeToast((*it));
-			}
-			else
-			{
-				deleteToast((*it).toast);
-			}
-
-			it = mToastList.erase(it);
-		}
-		else
-		{
-			++it;
-		}
-	}
-}
-
-//--------------------------------------------------------------------------
-void LLScreenChannel::closeOverflowToastPanel()
-{
-	if(mOverflowToastPanel != NULL)
-	{
-		mOverflowToastPanel->setVisible(FALSE);
-		mOverflowToastPanel->stopFading();
-	}
-}
-
-//--------------------------------------------------------------------------
 void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
 {
 	LLRect toast_rect;
+	LLRect tbox_rect;
 	LLToast::Params p;
 	p.lifetime_secs = timer;
 	p.enable_hide_btn = false;
@@ -672,9 +584,26 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
 
 	std::string	text = LLTrans::getString("StartUpNotifications");
 
+	tbox_rect   = text_box->getRect();
+	S32 tbox_width  = tbox_rect.getWidth();
+	S32 tbox_vpad   = text_box->getVPad();
+	S32 text_width  = text_box->getDefaultFont()->getWidth(text);
+	S32 text_height = text_box->getTextPixelHeight();
+
+	// EXT - 3703 (Startup toast message doesn't fit toast width)
+	// Calculating TextBox HEIGHT needed to include the whole string according to the given WIDTH of the TextBox.
+	S32 new_tbox_height = (text_width/tbox_width + 1) * text_height;
+	// Calculating TOP position of TextBox
+	S32 new_tbox_top = new_tbox_height + tbox_vpad + gSavedSettings.getS32("ToastGap");
+	// Calculating toast HEIGHT according to the new TextBox size
+	S32 toast_height = new_tbox_height + tbox_vpad * 2;
+
+	tbox_rect.setLeftTopAndSize(tbox_rect.mLeft, new_tbox_top, tbox_rect.getWidth(), new_tbox_height);
+	text_box->setRect(tbox_rect);
+
 	toast_rect = mStartUpToastPanel->getRect();
 	mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true);
-	toast_rect.setLeftTopAndSize(0, toast_rect.getHeight()+gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_rect.getHeight());	
+	toast_rect.setLeftTopAndSize(0, toast_height + gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_height);
 	mStartUpToastPanel->setRect(toast_rect);
 
 	text_box->setValue(text);
@@ -699,24 +628,6 @@ F32 LLScreenChannel::getHeightRatio()
 	return ratio;
 }
 
-S32 LLScreenChannel::getOverflowToastHeight()
-{
-	if(mOverflowToastPanel)
-	{
-		return mOverflowToastPanel->getRect().getHeight();
-	}
-
-	static S32 height = 0;
-	if(0 == height)
-	{
-		LLToast::Params p;
-		LLToast* toast = new LLToast(p);
-		height = toast->getRect().getHeight();
-		delete toast;
-	}
-	return height;
-}
-
 //--------------------------------------------------------------------------
 void LLScreenChannel::updateStartUpString(S32 num)
 {
@@ -779,6 +690,19 @@ void LLScreenChannel::hideToastsFromScreen()
 }
 
 //--------------------------------------------------------------------------
+void LLScreenChannel::hideToast(const LLUUID& notification_id)
+{
+	std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), notification_id);
+	if(mToastList.end() != it)
+	{
+		ToastElem te = *it;
+		te.toast->setVisible(FALSE);
+		te.toast->stopTimer();
+		mToastList.erase(it);
+	}
+}
+
+//--------------------------------------------------------------------------
 void LLScreenChannel::removeToastsFromChannel()
 {
 	hideToastsFromScreen();
@@ -896,3 +820,13 @@ void LLScreenChannel::updateShowToastsState()
 
 //--------------------------------------------------------------------------
 
+LLToast* LLScreenChannel::getToastByNotificationID(LLUUID id)
+{
+	std::vector<ToastElem>::iterator it = find(mStoredToastList.begin(),
+			mStoredToastList.end(), id);
+
+	if (it == mStoredToastList.end())
+		return NULL;
+
+	return it->toast;
+}
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 38f27f756b..88053d87d9 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -72,8 +72,7 @@ public:
 	virtual void		setToastAlignment(EToastAlignment align) {mToastAlignment = align;}
 	
 	virtual void		setChannelAlignment(EChannelAlignment align) {mChannelAlignment = align;}
-	virtual void		setOverflowFormatString ( const std::string& str)  { mOverflowFormatString = str; }
-	
+
 	// kill or modify a toast by its ID
 	virtual void		killToastByNotificationID(LLUUID id) {};
 	virtual void		modifyToastNotificationByID(LLUUID id, LLSD data) {};
@@ -121,17 +120,13 @@ protected:
 	LLToast*		mHoveredToast;
 	bool		mCanStoreToasts;
 	bool		mDisplayToastsAlways;
-	bool		mOverflowToastHidden;
 	// controls whether a channel shows toasts or not
 	bool		mShowToasts;
 	// 
 	EToastAlignment		mToastAlignment;
 	EChannelAlignment	mChannelAlignment;
 
-	// attributes for the Overflow Toast
 	S32			mHiddenToastsNum;
-	LLToast*	mOverflowToastPanel;	
-	std::string mOverflowFormatString;
 
 	// channel's ID
 	LLUUID	mID;
@@ -176,6 +171,8 @@ public:
 	void		modifyToastByNotificationID(LLUUID id, LLPanel* panel);
 	// hide all toasts from screen, but not remove them from a channel
 	void		hideToastsFromScreen();
+	// hide toast by notification id
+	void		hideToast(const LLUUID& notification_id);
 	// removes all toasts from a channel
 	void		removeToastsFromChannel();
 	// show all toasts in a channel
@@ -190,8 +187,6 @@ public:
 	void		removeToastsBySessionID(LLUUID id);
 	// remove all storable toasts from screen and store them
 	void		removeAndStoreAllStorableToasts();
-	// close the Overflow Toast
-	void 		closeOverflowToastPanel();
 	// close the StartUp Toast
 	void		closeStartUpToast();
 
@@ -214,6 +209,8 @@ public:
 	// update number of notifications in the StartUp Toast
 	void	updateStartUpString(S32 num);
 
+	LLToast* getToastByNotificationID(LLUUID id);
+
 	// Channel's signals
 	// signal on storing of faded toasts event
 	typedef boost::function<void (LLPanel* info_panel, const LLUUID id)> store_tost_callback_t;
@@ -257,7 +254,6 @@ private:
 	void	onToastHover(LLToast* toast, bool mouse_enter);
 	void	onToastFade(LLToast* toast);
 	void	onToastDestroyed(LLToast* toast);
-	void	onOverflowToastHide();
 	void	onStartUpToastHide();
 
 	//
@@ -270,9 +266,6 @@ private:
 	void	showToastsCentre();
 	void	showToastsTop();
 	
-	// create the Overflow Toast
-	void	createOverflowToast(S32 bottom, F32 timer);
-
 	// create the StartUp Toast
 	void	createStartUpToast(S32 notif_num, F32 timer);
 
@@ -281,8 +274,6 @@ private:
 	 */
 	static F32 getHeightRatio();
 
-	S32 getOverflowToastHeight();
-
 	// Channel's flags
 	static bool	mWasStartUpToastShown;
 
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index cf62d47362..0d9cf06bc3 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -72,6 +72,9 @@ LLScriptFloater::LLScriptFloater(const LLSD& key)
 
 bool LLScriptFloater::toggle(const LLUUID& object_id)
 {
+	// Force chiclet toggle on here because first onFocusReceived() will not toggle it on.
+	LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(object_id, true);
+
 	LLUUID notification_id = LLScriptFloaterManager::getInstance()->findNotificationId(object_id);
 	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", notification_id);
 
@@ -180,6 +183,15 @@ void LLScriptFloater::setVisible(BOOL visible)
 	LLDockableFloater::setVisible(visible);
 
 	hideToastsIfNeeded();
+
+	if(!visible)
+	{
+		LLIMChiclet* chiclet = LLBottomTray::getInstance()->getChicletPanel()->findChiclet<LLIMChiclet>(getObjectId());
+		if(chiclet)
+		{
+			chiclet->setToggleState(false);
+		}
+	}
 }
 
 void LLScriptFloater::onMouseDown()
@@ -199,6 +211,20 @@ void LLScriptFloater::onMouseDown()
 	}
 }
 
+void LLScriptFloater::onFocusLost()
+{
+	LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(getObjectId(), false);
+}
+
+void LLScriptFloater::onFocusReceived()
+{
+	// first focus will be received before setObjectId() call - don't toggle chiclet
+	if(getObjectId().notNull())
+	{
+		LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(getObjectId(), true);
+	}
+}
+
 void LLScriptFloater::hideToastsIfNeeded()
 {
 	using namespace LLNotificationsUI;
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index ed10dc5fe9..f86605c5d1 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -174,6 +174,10 @@ protected:
 	 */
 	void onMouseDown();
 
+	/*virtual*/ void onFocusLost();
+	
+	/*virtual*/ void onFocusReceived();
+
 private:
 	LLToastNotifyPanel* mScriptForm;
 	LLUUID mObjectId;
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 30b0075c4b..43215f86bd 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -62,6 +62,7 @@ public:
 	{
 		mPanel->inventoryFetched();
 		gInventory.removeObserver(this);
+		delete this;
 	}
 private:
 	LLSidepanelAppearance *mPanel;
@@ -86,7 +87,7 @@ void LLWatchForOutfitRenameObserver::changed(U32 mask)
 		mPanel->refreshCurrentOutfitName();
 	}
 }
-	
+
 LLSidepanelAppearance::LLSidepanelAppearance() :
 	LLPanel(),
 	mFilterSubString(LLStringUtil::null),
@@ -94,14 +95,12 @@ LLSidepanelAppearance::LLSidepanelAppearance() :
 	mLookInfo(NULL),
 	mCurrOutfitPanel(NULL)
 {
-	//LLUICtrlFactory::getInstance()->buildPanel(this, "panel_appearance.xml"); // Called from LLRegisterPanelClass::defaultPanelClassBuilder()
-	mFetchWorn = new LLCurrentlyWornFetchObserver(this);
-	
-	mOutfitRenameWatcher = new LLWatchForOutfitRenameObserver(this);
 }
 
 LLSidepanelAppearance::~LLSidepanelAppearance()
 {
+	gInventory.removeObserver(mOutfitRenameWatcher);
+	delete mOutfitRenameWatcher;
 }
 
 // virtual
@@ -151,9 +150,12 @@ BOOL LLSidepanelAppearance::postBuild()
 	}
 
 	mCurrentLookName = getChild<LLTextBox>("currentlook_name");
+
+	mOutfitDirtyTag = getChild<LLTextBox>("currentlook_title");
 	
 	mCurrOutfitPanel = getChild<LLPanel>("panel_currentlook");
 
+	mOutfitRenameWatcher = new LLWatchForOutfitRenameObserver(this);
 	gInventory.addObserver(mOutfitRenameWatcher);
 
 	return TRUE;
@@ -166,6 +168,11 @@ void LLSidepanelAppearance::onOpen(const LLSD& key)
 	refreshCurrentOutfitName();
 	updateVerbs();
 
+	if (mPanelOutfitsInventory)
+	{
+		mPanelOutfitsInventory->onOpen(key);
+	}
+
 	if(key.size() == 0)
 		return;
 
@@ -198,7 +205,7 @@ void LLSidepanelAppearance::onFilterEdit(const std::string& search_string)
 
 void LLSidepanelAppearance::onOpenOutfitButtonClicked()
 {
-	const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getCurrentOutfitLink();
+	const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getBaseOutfitLink();
 	if (!outfit_link)
 		return;
 	if (!outfit_link->getIsLinkType())
@@ -208,7 +215,7 @@ void LLSidepanelAppearance::onOpenOutfitButtonClicked()
 	if (tab_outfits)
 	{
 		tab_outfits->changeOpenClose(FALSE);
-		LLInventoryPanel *inventory_panel = tab_outfits->findChild<LLInventoryPanel>("outfitslist_accordionpanel");
+		LLInventoryPanel *inventory_panel = tab_outfits->findChild<LLInventoryPanel>("outfitslist_tab");
 		if (inventory_panel)
 		{
 			LLFolderView *folder = inventory_panel->getRootFolder();
@@ -248,7 +255,7 @@ void LLSidepanelAppearance::onNewOutfitButtonClicked()
 {
 	if (!mLookInfo->getVisible())
 	{
-		mPanelOutfitsInventory->onNew();
+		mPanelOutfitsInventory->onSave();
 	}
 }
 
@@ -311,17 +318,14 @@ void LLSidepanelAppearance::updateVerbs()
 
 void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name)
 {
+	mOutfitDirtyTag->setVisible(LLAppearanceManager::getInstance()->isOutfitDirty());
 	if (name == "")
 	{
-		const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getCurrentOutfitLink();
-		if (outfit_link)
+		std::string outfit_name;
+		if (LLAppearanceManager::getInstance()->getBaseOutfitName(outfit_name))
 		{
-			const LLViewerInventoryCategory *cat = outfit_link->getLinkedCategory();
-			if (cat && cat->getPreferredType() == LLFolderType::FT_OUTFIT)
-			{
-				mCurrentLookName->setText(cat->getName());
+				mCurrentLookName->setText(outfit_name);
 				return;
-			}
 		}
 		mCurrentLookName->setText(getString("No Outfit"));
 		mOpenOutfitBtn->setEnabled(FALSE);
@@ -381,16 +385,17 @@ void LLSidepanelAppearance::fetchInventory()
 		}
 	}
 
-	mFetchWorn->fetchItems(ids);
+	LLCurrentlyWornFetchObserver *fetch_worn = new LLCurrentlyWornFetchObserver(this);
+	fetch_worn->fetchItems(ids);
 	// If no items to be fetched, done will never be triggered.
 	// TODO: Change LLInventoryFetchObserver::fetchItems to trigger done() on this condition.
-	if (mFetchWorn->isEverythingComplete())
+	if (fetch_worn->isEverythingComplete())
 	{
-		mFetchWorn->done();
+		fetch_worn->done();
 	}
 	else
 	{
-		gInventory.addObserver(mFetchWorn);
+		gInventory.addObserver(fetch_worn);
 	}
 }
 
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 8ef2088eda..aa2e67fd16 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -61,6 +61,7 @@ public:
 	void fetchInventory();
 	void inventoryFetched();
 	void updateVerbs();
+	void onNewOutfitButtonClicked();
 
 private:
 	void onFilterEdit(const std::string& search_string);
@@ -68,7 +69,6 @@ private:
 	void onOpenOutfitButtonClicked();
 	void onEditAppearanceButtonClicked();
 	void onEditButtonClicked();
-	void onNewOutfitButtonClicked();
 	void onBackButtonClicked();
 	void onEditWearBackClicked();
 	void toggleLookInfoPanel(BOOL visible);
@@ -86,6 +86,7 @@ private:
 	LLPanel*					mCurrOutfitPanel;
 
 	LLTextBox*					mCurrentLookName;
+	LLTextBox*					mOutfitDirtyTag;
 
 	// Used to make sure the user's inventory is in memory.
 	LLCurrentlyWornFetchObserver* mFetchWorn;
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 814508daa9..94fe95d215 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -157,11 +157,12 @@ void LLSidepanelItemInfo::reset()
 
 void LLSidepanelItemInfo::refresh()
 {
-	LLInventoryItem* item = findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(item)
 	{
 		refreshFromItem(item);
 		updateVerbs();
+		return;
 	}
 	else
 	{
@@ -170,11 +171,8 @@ void LLSidepanelItemInfo::refresh()
 			setIsEditing(FALSE);
 		}
 	}
-	
-	const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-	bool is_editable = item && (item->getUUID() != trash_id) && !gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
 
-	if (!getIsEditing() || !is_editable)
+	if (!getIsEditing())
 	{
 		const std::string no_item_names[]={
 			"LabelItemName",
@@ -212,7 +210,7 @@ void LLSidepanelItemInfo::refresh()
 		}
 	}
 
-	if (!is_editable)
+	if (!item)
 	{
 		const std::string no_edit_mode_names[]={
 			"BtnCreator",
@@ -227,24 +225,26 @@ void LLSidepanelItemInfo::refresh()
 	updateVerbs();
 }
 
-void LLSidepanelItemInfo::refreshFromItem(LLInventoryItem* item)
+void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
 {
 	////////////////////////
 	// PERMISSIONS LOOKUP //
 	////////////////////////
 
 	// do not enable the UI for incomplete items.
-	LLViewerInventoryItem* i = (LLViewerInventoryItem*)item;
-	BOOL is_complete = i->isComplete();
-	const BOOL cannot_restrict_permissions = LLInventoryType::cannotRestrictPermissions(i->getInventoryType());
-	const BOOL is_calling_card = (i->getInventoryType() == LLInventoryType::IT_CALLINGCARD);
+	BOOL is_complete = item->isComplete();
+	const BOOL cannot_restrict_permissions = LLInventoryType::cannotRestrictPermissions(item->getInventoryType());
+	const BOOL is_calling_card = (item->getInventoryType() == LLInventoryType::IT_CALLINGCARD);
 	const LLPermissions& perm = item->getPermissions();
 	const BOOL can_agent_manipulate = gAgent.allowOperation(PERM_OWNER, perm, 
 															GP_OBJECT_MANIPULATE);
 	const BOOL can_agent_sell = gAgent.allowOperation(PERM_OWNER, perm, 
 													  GP_OBJECT_SET_SALE) &&
 		!cannot_restrict_permissions;
-	const BOOL is_link = i->getIsLinkType();
+	const BOOL is_link = item->getIsLinkType();
+	
+	const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+	bool not_in_trash = item && (item->getUUID() != trash_id) && !gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
 
 	// You need permission to modify the object to modify an inventory
 	// item in it.
@@ -261,7 +261,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLInventoryItem* item)
 	//////////////////////
 	BOOL is_modifiable = gAgent.allowOperation(PERM_MODIFY, perm,
 											   GP_OBJECT_MANIPULATE)
-		&& is_obj_modify && is_complete;
+		&& is_obj_modify && is_complete && not_in_trash;
 
 	childSetEnabled("LabelItemNameTitle",TRUE);
 	childSetEnabled("LabelItemName",is_modifiable && !is_calling_card); // for now, don't allow rename of calling cards
@@ -338,6 +338,64 @@ void LLSidepanelItemInfo::refreshFromItem(LLInventoryItem* item)
 		LLStringUtil::format (timeStr, substitution);
 		childSetText ("LabelAcquiredDate", timeStr);
 	}
+	
+	/////////////////////////////////////
+	// PERMISSIONS AND SALE ITEM HIDING
+	/////////////////////////////////////
+	
+	const std::string perm_and_sale_items[]={
+		"perms_inv",
+		"OwnerLabel",
+		"perm_modify",
+		"CheckOwnerModify",
+		"CheckOwnerCopy",
+		"CheckOwnerTransfer",
+		"GroupLabel",
+		"CheckShareWithGroup",
+		"AnyoneLabel",
+		"CheckEveryoneCopy",
+		"NextOwnerLabel",
+		"CheckNextOwnerModify",
+		"CheckNextOwnerCopy",
+		"CheckNextOwnerTransfer",
+		"CheckPurchase",
+		"SaleLabel",
+		"RadioSaleType",
+		"combobox sale copy",
+		"Edit Cost",
+		"TextPrice"
+	};
+	
+	const std::string debug_items[]={
+		"BaseMaskDebug",
+		"OwnerMaskDebug",
+		"GroupMaskDebug",
+		"EveryoneMaskDebug",
+		"NextMaskDebug"
+	};
+	
+	// Hide permissions checkboxes and labels and for sale info if in the trash
+	// or ui elements don't apply to these objects and return from function
+	if (!not_in_trash || cannot_restrict_permissions)
+	{
+		for(size_t t=0; t<LL_ARRAY_SIZE(perm_and_sale_items); ++t)
+		{
+			childSetVisible(perm_and_sale_items[t],false);
+		}
+		
+		for(size_t t=0; t<LL_ARRAY_SIZE(debug_items); ++t)
+		{
+			childSetVisible(debug_items[t],false);
+		}
+		return;
+	}
+	else // Make sure perms and sale ui elements are visible
+	{
+		for(size_t t=0; t<LL_ARRAY_SIZE(perm_and_sale_items); ++t)
+		{
+			childSetVisible(perm_and_sale_items[t],true);
+		}
+	}
 
 	///////////////////////
 	// OWNER PERMISSIONS //
@@ -541,7 +599,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLInventoryItem* item)
 
 void LLSidepanelItemInfo::onClickCreator()
 {
-	LLInventoryItem* item = findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 	if(!item->getCreatorUUID().isNull())
 	{
@@ -552,7 +610,7 @@ void LLSidepanelItemInfo::onClickCreator()
 // static
 void LLSidepanelItemInfo::onClickOwner()
 {
-	LLInventoryItem* item = findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 	if(item->getPermissions().isGroupOwned())
 	{
@@ -568,7 +626,7 @@ void LLSidepanelItemInfo::onClickOwner()
 void LLSidepanelItemInfo::onCommitName()
 {
 	//llinfos << "LLSidepanelItemInfo::onCommitName()" << llendl;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item)
 	{
 		return;
@@ -604,7 +662,7 @@ void LLSidepanelItemInfo::onCommitName()
 void LLSidepanelItemInfo::onCommitDescription()
 {
 	//llinfos << "LLSidepanelItemInfo::onCommitDescription()" << llendl;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 
 	LLLineEditor* labelItemDesc = getChild<LLLineEditor>("LabelItemDesc");
@@ -642,7 +700,7 @@ void LLSidepanelItemInfo::onCommitDescription()
 void LLSidepanelItemInfo::onCommitPermissions()
 {
 	//llinfos << "LLSidepanelItemInfo::onCommitPermissions()" << llendl;
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 	LLPermissions perm(item->getPermissions());
 
@@ -751,7 +809,7 @@ void LLSidepanelItemInfo::onCommitSaleType()
 
 void LLSidepanelItemInfo::updateSaleInfo()
 {
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)findItem();
+	LLViewerInventoryItem* item = findItem();
 	if(!item) return;
 	LLSaleInfo sale_info(item->getSaleInfo());
 	if(!gAgent.allowOperation(PERM_TRANSFER, item->getPermissions(), GP_OBJECT_SET_SALE))
@@ -851,9 +909,9 @@ void LLSidepanelItemInfo::updateSaleInfo()
 	}
 }
 
-LLInventoryItem* LLSidepanelItemInfo::findItem() const
+LLViewerInventoryItem* LLSidepanelItemInfo::findItem() const
 {
-	LLInventoryItem* item = NULL;
+	LLViewerInventoryItem* item = NULL;
 	if(mObjectID.isNull())
 	{
 		// it is in agent inventory
@@ -864,7 +922,7 @@ LLInventoryItem* LLSidepanelItemInfo::findItem() const
 		LLViewerObject* object = gObjectList.findObject(mObjectID);
 		if(object)
 		{
-			item = (LLInventoryItem*)object->getInventoryObject(mItemID);
+			item = static_cast<LLViewerInventoryItem*>(object->getInventoryObject(mItemID));
 		}
 	}
 	return item;
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 21002327bc..e6dbf400ee 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -41,7 +41,7 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 class LLButton;
-class LLInventoryItem;
+class LLViewerInventoryItem;
 class LLItemPropertiesObserver;
 class LLViewerObject;
 class LLPermissions;
@@ -63,10 +63,10 @@ protected:
 	/*virtual*/ void refresh();
 	/*virtual*/ void save();
 
-	LLInventoryItem* findItem() const;
+	LLViewerInventoryItem* findItem() const;
 	LLViewerObject*  findObject() const;
 	
-	void refreshFromItem(LLInventoryItem* item);
+	void refreshFromItem(LLViewerInventoryItem* item);
 
 private:
 	LLUUID mItemID; 	// inventory UUID for the inventory item.
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 50cec3184d..0b8f66c5f3 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -215,6 +215,10 @@ void LLSidepanelTaskInfo::disableAll()
 	childSetVisible("E:",								FALSE);
 	childSetVisible("N:",								FALSE);
 	childSetVisible("F:",								FALSE);
+	
+	mOpenBtn->setEnabled(FALSE);
+	mPayBtn->setEnabled(FALSE);
+	mBuyBtn->setEnabled(FALSE);
 }
 
 void LLSidepanelTaskInfo::refresh()
@@ -1119,6 +1123,8 @@ void LLSidepanelTaskInfo::updateVerbs()
 	*/
 
 	mOpenBtn->setEnabled(enable_object_open());
+	mPayBtn->setEnabled(enable_pay_object());
+	mBuyBtn->setEnabled(enable_buy_object());
 }
 
 void LLSidepanelTaskInfo::onOpenButtonClicked()
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 608165022f..50c47e293e 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -46,7 +46,7 @@
 #include "llaccordionctrltab.h"
 
 #include "llfloater.h" //for gFloaterView
-#include "lliconctrl.h"//for Home tab icon
+#include "lliconctrl.h"//for OpenClose tab icon
 #include "llsidetraypanelcontainer.h"
 #include "llwindow.h"//for SetCursor
 #include "lltransientfloatermgr.h"
@@ -214,7 +214,7 @@ LLPanel*	LLSideTrayTab::getPanel()
 LLSideTrayTab*  LLSideTrayTab::createInstance	()
 {
 	LLSideTrayTab::Params tab_params; 
-	tab_params.tab_title("Home");
+	tab_params.tab_title("openclose");
 
 	LLSideTrayTab* tab = LLUICtrlFactory::create<LLSideTrayTab>(tab_params);
 	return tab;
@@ -389,9 +389,8 @@ void	LLSideTray::createButtons	()
 
 		std::string name = sidebar_tab->getName();
 		
-		// The "home" button will open/close the whole panel, this will need to
-		// change if the home screen becomes its own tab.
-		if (name == "sidebar_home")
+		// The "OpenClose" button will open/close the whole panel
+		if (name == "sidebar_openclose")
 		{
 			mCollapseButton = createButton("",sidebar_tab->mImage,sidebar_tab->getTabTitle(),
 				boost::bind(&LLSideTray::onToggleCollapse, this));
@@ -427,7 +426,6 @@ void		LLSideTray::processTriState ()
 void		LLSideTray::onTabButtonClick(string name)
 {
 	LLSideTrayTab* side_bar = getTab(name);
-
 	if(side_bar == mActiveTab)
 	{
 		processTriState ();
@@ -443,7 +441,7 @@ void		LLSideTray::onToggleCollapse()
 	if(mCollapsed)
 	{
 		expandSideBar();
-		selectTabByName("sidebar_home");
+		//selectTabByName("sidebar_openclose");
 	}
 	else
 		collapseSideBar();
@@ -534,11 +532,11 @@ void LLSideTray::collapseSideBar()
 		}
 	}
 		
-	// Home tab doesn't put its button in mTabButtons
-	LLSideTrayTab* home_tab = getTab("sidebar_home");
-	if (home_tab)
+	// OpenClose tab doesn't put its button in mTabButtons
+	LLSideTrayTab* openclose_tab = getTab("sidebar_openclose");
+	if (openclose_tab)
 	{
-		mCollapseButton->setImageOverlay( home_tab->mImage );
+		mCollapseButton->setImageOverlay( openclose_tab->mImage );
 	}
 	//mActiveTab->setVisible(FALSE);
 	reflectCollapseChange();
@@ -549,10 +547,10 @@ void LLSideTray::collapseSideBar()
 void LLSideTray::expandSideBar()
 {
 	mCollapsed = false;
-	LLSideTrayTab* home_tab = getTab("sidebar_home");
-	if (home_tab)
+	LLSideTrayTab* openclose_tab = getTab("sidebar_openclose");
+	if (openclose_tab)
 	{
-		mCollapseButton->setImageOverlay( home_tab->mImageSelected );
+		mCollapseButton->setImageOverlay( openclose_tab->mImageSelected );
 	}
 	LLSD key;//empty
 	mActiveTab->onOpen(key);
@@ -641,24 +639,66 @@ LLPanel*	LLSideTray::showPanel		(const std::string& panel_name, const LLSD& para
 	return NULL;
 }
 
-LLPanel*	LLSideTray::getPanel		(const std::string& panel_name)
+void LLSideTray::togglePanel(LLPanel* &sub_panel, const std::string& panel_name, const LLSD& params)
 {
-	child_vector_const_iter_t child_it;
-	for ( child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
+	if(!sub_panel)
+		return;
+
+	if (sub_panel->isInVisibleChain())
 	{
-		LLView* view = (*child_it)->findChildView(panel_name,true);
-		if(view)
+		LLSideTray::getInstance()->collapseSideBar();
+	}
+	else
+	{
+		LLSideTray::getInstance()->showPanel(panel_name, params);
+	}
+}
+
+// This is just LLView::findChildView specialized to restrict the search to LLPanels.
+// Optimization for EXT-4068 to avoid searching down to the individual item level
+// when inventories are large.
+LLPanel *findChildPanel(LLPanel *panel, const std::string& name, bool recurse)
+{
+	for (LLView::child_list_const_iter_t child_it = panel->beginChild();
+		 child_it != panel->endChild(); ++child_it)
+	{
+		LLPanel *child_panel = dynamic_cast<LLPanel*>(*child_it);
+		if (!child_panel)
+			continue;
+		if (child_panel->getName() == name)
+			return child_panel;
+	}
+	if (recurse)
+	{
+		for (LLView::child_list_const_iter_t child_it = panel->beginChild();
+			 child_it != panel->endChild(); ++child_it)
 		{
-			LLPanel* panel = dynamic_cast<LLPanel*>(view);
-			if(panel)
+			LLPanel *child_panel = dynamic_cast<LLPanel*>(*child_it);
+			if (!child_panel)
+				continue;
+			LLPanel *found_panel = findChildPanel(child_panel,name,recurse);
+			if (found_panel)
 			{
-				return panel;
+				return found_panel;
 			}
 		}
 	}
 	return NULL;
 }
 
+LLPanel* LLSideTray::getPanel(const std::string& panel_name)
+{
+	for ( child_vector_const_iter_t child_it = mTabs.begin(); child_it != mTabs.end(); ++child_it)
+	{
+		LLPanel *panel = findChildPanel(*child_it,panel_name,true);
+		if(panel)
+		{
+			return panel;
+		}
+	}
+	return NULL;
+}
+
 LLPanel*	LLSideTray::getActivePanel()
 {
 	if (mActiveTab && !mCollapsed)
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index de2cfe9711..b1c8675793 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -94,7 +94,15 @@ public:
 	 * if no such tab - return NULL, otherwise a pointer to the panel
 	 * Pass params as array, or they may be overwritten(example - params["name"]="nearby")
 	 */
-    LLPanel*	showPanel		(const std::string& panel_name, const LLSD& params);
+	LLPanel*	showPanel		(const std::string& panel_name, const LLSD& params);
+
+	/**
+	 * Toggling Side Tray tab which contains "sub_panel" child of "panel_name" panel.
+	 * If "sub_panel" is not visible Side Tray is opened to display it,
+	 * otherwise Side Tray is collapsed.
+	 * params are passed to "panel_name" panel onOpen().
+	 */
+	void		togglePanel		(LLPanel* &sub_panel, const std::string& panel_name, const LLSD& params);
 
 	/*
 	 * get the panel (don't show it or do anything else with it)
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 6ca6734598..514d8facb4 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -2460,7 +2460,6 @@ void renderOctree(LLSpatialGroup* group)
 	gGL.color4fv(col.mV);
 	drawBox(group->mObjectBounds[0], group->mObjectBounds[1]*1.01f+LLVector3(0.001f, 0.001f, 0.001f));
 	
-	glDepthMask(GL_TRUE);
 	gGL.setSceneBlendType(LLRender::BT_ALPHA);
 
 	if (group->mBuilt <= 0.f)
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 010dfd1b33..0dd9203c6d 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -88,6 +88,11 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
 	mDisplayName = first + " " + last;
 }
 
+bool LLSpeaker::isInVoiceChannel()
+{
+	return mStatus == LLSpeaker::STATUS_VOICE_ACTIVE || mStatus == LLSpeaker::STATUS_MUTED;
+}
+
 LLSpeakerUpdateModeratorEvent::LLSpeakerUpdateModeratorEvent(LLSpeaker* source)
 : LLEvent(source, "Speaker add moderator event"),
   mSpeakerID (source->mID),
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index 1a8c23f56a..da8dfdf548 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -67,6 +67,8 @@ public:
 
 	void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
 
+	bool isInVoiceChannel();
+
 	ESpeakerStatus	mStatus;			// current activity status in speech group
 	F32				mLastSpokeTime;		// timestamp when this speaker last spoke
 	F32				mSpeechVolume;		// current speech amplitude (timea average rms amplitude?)
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
new file mode 100644
index 0000000000..5e1d408e8d
--- /dev/null
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -0,0 +1,249 @@
+/** 
+ * @file llspeakingindicatormanager.cpp
+ * @author Mike Antipov
+ * @brief Implementation of SpeackerIndicatorManager class to process registered LLSpeackerIndicator
+ * depend on avatars are in the same voice channel.
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ * 
+ * Copyright (c) 2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://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 "llspeakingindicatormanager.h"
+
+
+#include "llvoicechannel.h"
+#include "llvoiceclient.h"
+
+/**
+ * This class intended to control visibility of avatar speaking indicators depend on whether avatars
+ * are in the same voice channel.
+ *
+ * Speaking indicator should be visible for avatars in the same voice channel. See EXT-3976.
+ *
+ * It stores passed instances of LLOutputMonitorCtrl in a multimap by avatar LLUUID.
+ * It observes changing of voice channel and changing of participant list in voice channel.
+ * When voice channel or voice participant list is changed it updates visibility of an appropriate 
+ * speaking indicator.
+ *
+ * Several indicators can be registered for the same avatar.
+ */
+class SpeakingIndicatorManager : public LLSingleton<SpeakingIndicatorManager>, LLVoiceClientParticipantObserver
+{
+	LOG_CLASS(SpeakingIndicatorManager);
+public:
+
+	/**
+	 * Stores passed speaking indicator to control its visibility.
+	 *
+	 * Registered indicator is set visible if an appropriate avatar is in the same voice channel with Agent.
+	 * It ignores instances of Agent's indicator.
+	 *
+	 * @param speaker_id LLUUID of an avatar whose speaking indicator is registered.
+	 * @param speaking_indicator instance of the speaking indicator to be registered.
+	 */
+	void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator);
+
+	/**
+	 * Removes passed speaking indicator from observing.
+	 *
+	 * @param speaker_id LLUUID of an avatar whose speaking indicator should be unregistered.
+	 * @param speaking_indicator instance of the speaking indicator to be unregistered.
+	 */
+	void unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator);
+
+private:
+	typedef std::set<LLUUID> speaker_ids_t;
+	typedef std::multimap<LLUUID, LLSpeakingIndicator*> speaking_indicators_mmap_t;
+	typedef speaking_indicators_mmap_t::value_type speaking_indicator_value_t;
+	typedef speaking_indicators_mmap_t::const_iterator indicator_const_iterator;
+	typedef std::pair<indicator_const_iterator, indicator_const_iterator> indicator_range_t;
+
+	friend class LLSingleton<SpeakingIndicatorManager>;
+	SpeakingIndicatorManager();
+	~SpeakingIndicatorManager();
+
+	/**
+	 * Callback to determine when voice channel is changed.
+	 *
+	 * It switches all registered speaking indicators off.
+	 * To reduce overheads only switched on indicators are processed.
+	 */
+	void sOnCurrentChannelChanged(const LLUUID& session_id);
+
+	/**
+	 * Callback of changing voice participant list (from LLVoiceClientParticipantObserver).
+	 *
+	 * Switches off indicators had been switched on and switches on indicators of current participants list.
+	 * There is only a few indicators in lists should be switched off/on.
+	 * So, method does not calculate difference between these list it only switches off already 
+	 * switched on indicators and switches on indicators of voice channel participants
+	 */
+	void onChange();
+
+	/**
+	 * Changes state of indicators specified by LLUUIDs
+	 *
+	 * @param speakers_uuids - avatars' LLUUIDs whose speaking indicators should be switched
+	 * @param switch_on - if TRUE specified indicator will be switched on, off otherwise.
+	 */
+	void switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on);
+
+	/**
+	 * Multimap with all registered speaking indicators
+	 */
+	speaking_indicators_mmap_t mSpeakingIndicators;
+
+	/**
+	 * LUUIDs of avatar for which we have speaking indicators switched on.
+	 *
+	 * Is used to switch off all previously ON indicators when voice participant list is changed.
+	 *
+	 * @see onChange()
+	 */
+	speaker_ids_t mSwitchedIndicatorsOn;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// PUBLIC SECTION
+//////////////////////////////////////////////////////////////////////////
+void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator)
+{
+	// do not exclude agent's indicators. They should be processed in the same way as others. See EXT-3889.
+
+	LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << LL_ENDL;
+	speaking_indicator_value_t value_type(speaker_id, speaking_indicator);
+	mSpeakingIndicators.insert(value_type);
+
+	speaker_ids_t speakers_uuids;
+	BOOL is_in_same_voice = LLVoiceClient::getInstance()->findParticipantByID(speaker_id) != NULL;
+
+	speakers_uuids.insert(speaker_id);
+	switchSpeakerIndicators(speakers_uuids, is_in_same_voice);
+}
+
+void SpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator)
+{
+	speaking_indicators_mmap_t::iterator it;
+	it = mSpeakingIndicators.find(speaker_id);
+	for (;it != mSpeakingIndicators.end(); ++it)
+	{
+		if (it->second == speaking_indicator)
+		{
+			mSpeakingIndicators.erase(it);
+			break;
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+// PRIVATE SECTION
+//////////////////////////////////////////////////////////////////////////
+SpeakingIndicatorManager::SpeakingIndicatorManager()
+{
+	LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1));
+	LLVoiceClient::getInstance()->addObserver(this);
+}
+
+SpeakingIndicatorManager::~SpeakingIndicatorManager()
+{
+	// Don't use LLVoiceClient::getInstance() here without check
+	// singleton MAY have already been destroyed.
+	if(LLVoiceClient::instanceExists())
+	{
+		LLVoiceClient::getInstance()->removeObserver(this);
+	}
+}
+
+void SpeakingIndicatorManager::sOnCurrentChannelChanged(const LLUUID& /*session_id*/)
+{
+	switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
+	mSwitchedIndicatorsOn.clear();
+}
+
+void SpeakingIndicatorManager::onChange()
+{
+	LL_DEBUGS("SpeakingIndicator") << "Voice participant list was changed, updating indicators" << LL_ENDL;
+
+	speaker_ids_t speakers_uuids;
+	LLVoiceClient::getInstance()->getParticipantsUUIDSet(speakers_uuids);
+
+	LL_DEBUGS("SpeakingIndicator") << "Switching all OFF, count: " << mSwitchedIndicatorsOn.size() << LL_ENDL;
+	// switch all indicators off
+	switchSpeakerIndicators(mSwitchedIndicatorsOn, FALSE);
+	mSwitchedIndicatorsOn.clear();
+
+	LL_DEBUGS("SpeakingIndicator") << "Switching all ON, count: " << speakers_uuids.size() << LL_ENDL;
+	// then switch current voice participants indicators on
+	switchSpeakerIndicators(speakers_uuids, TRUE);
+}
+
+void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& speakers_uuids, BOOL switch_on)
+{
+	speaker_ids_t::const_iterator it_uuid = speakers_uuids.begin(); 
+	for (; it_uuid != speakers_uuids.end(); ++it_uuid)
+	{
+		LL_DEBUGS("SpeakingIndicator") << "Looking for indicator: " << *it_uuid << LL_ENDL;
+		indicator_range_t it_range = mSpeakingIndicators.equal_range(*it_uuid);
+		indicator_const_iterator it_indicator = it_range.first;
+		bool was_found = false;
+		for (; it_indicator != it_range.second; ++it_indicator)
+		{
+			was_found = true;
+			LLSpeakingIndicator* indicator = (*it_indicator).second;
+			indicator->switchIndicator(switch_on);
+		}
+
+		if (was_found)
+		{
+			LL_DEBUGS("SpeakingIndicator") << mSpeakingIndicators.count(*it_uuid) << " indicators where found" << LL_ENDL;
+
+			if (switch_on)
+			{
+				// store switched on indicator to be able switch it off
+				mSwitchedIndicatorsOn.insert(*it_uuid);
+			}
+		}
+	}
+}
+
+/************************************************************************/
+/*         LLSpeakingIndicatorManager namespace implementation          */
+/************************************************************************/
+
+void LLSpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator)
+{
+	SpeakingIndicatorManager::instance().registerSpeakingIndicator(speaker_id, speaking_indicator);
+}
+
+void LLSpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator)
+{
+	SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator);
+}
+
+// EOF
+
diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h
new file mode 100644
index 0000000000..ce0158f7d8
--- /dev/null
+++ b/indra/newview/llspeakingindicatormanager.h
@@ -0,0 +1,67 @@
+/** 
+ * @file llspeakingindicatormanager.h
+ * @author Mike Antipov
+ * @brief Interfeace of LLSpeackerIndicator class to be processed depend on avatars are in the same voice channel.
+ * Also register/unregister methods for this class are declared
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ * 
+ * Copyright (c) 2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://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_LLSPEAKINGINDICATORMANAGER_H
+#define LL_LLSPEAKINGINDICATORMANAGER_H
+
+class LLSpeakingIndicator
+{
+public:
+	virtual void switchIndicator(bool switch_on) = 0;
+};
+
+// See EXT-3976.
+namespace LLSpeakingIndicatorManager
+{
+	/**
+	 * Stores passed speaking indicator to control its visibility.
+	 *
+	 * Registered indicator is set visible if an appropriate avatar is in the same voice channel with Agent.
+	 * It ignores instances of Agent's indicator.
+	 *
+	 * @param speaker_id LLUUID of an avatar whose speaker indicator is registered.
+	 * @param speaking_indicator instance of the speaker indicator to be registered.
+	 */
+	void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator);
+
+	/**
+	 * Removes passed speaking indicator from observing.
+	 *
+	 * @param speaker_id LLUUID of an avatar whose speaker indicator should be unregistered.
+	 * @param speaking_indicator instance of the speaker indicator to be unregistered.
+	 */
+	void unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator);
+}
+
+#endif // LL_LLSPEAKINGINDICATORMANAGER_H
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index eb2275bff0..6b816f8786 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -100,8 +100,7 @@
 #include "lleventnotifier.h"
 #include "llface.h"
 #include "llfeaturemanager.h"
-#include "llfirstuse.h"
-#include "llfloaterchat.h"
+//#include "llfirstuse.h"
 #include "llfloaterhud.h"
 #include "llfloaterland.h"
 #include "llfloaterpreference.h"
@@ -308,59 +307,6 @@ void update_texture_fetch()
 	gTextureList.updateImages(0.10f);
 }
 
-//Copies landmarks from the "Library" to "My Favorites"
-void populate_favorites_bar()
-{
-	//*TODO consider extending LLInventoryModel::findCategoryUUIDForType(...) to support both root's
-	LLInventoryModel::cat_array_t* lib_cats = NULL;
-	LLInventoryModel::item_array_t* lib_items = NULL;
-	gInventory.getDirectDescendentsOf(gInventory.getLibraryRootFolderID(), lib_cats, lib_items);
-	if (!lib_cats) return;
-
-	LLUUID lib_landmarks(LLUUID::null);
-	S32 count = lib_cats->count();
-	for(S32 i = 0; i < count; ++i)
-	{
-		if(lib_cats->get(i)->getPreferredType() == LLFolderType::FT_LANDMARK)
-		{
-			lib_landmarks = lib_cats->get(i)->getUUID();
-			break;
-		}
-	}
-	if (lib_landmarks.isNull())
-	{
-		llerror("Library inventory is missing Landmarks", 0);
-		return;
-	}
-
-	LLInventoryModel::cat_array_t* lm_cats = NULL;
-	LLInventoryModel::item_array_t* lm_items = NULL;
-	gInventory.getDirectDescendentsOf(lib_landmarks, lm_cats, lm_items);
-	if (!lm_items) return;
-
-	const LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
-	if (favorites_id.isNull())
-	{
-		llerror("My Inventory is missing My Favorites", 0);
-		return;
-	}
-
-	S32 lm_count = lm_items->count();
-	for (S32 i = 0; i < lm_count; ++i)
-	{
-		LLInventoryItem* item = lm_items->get(i);
-		if (item->getUUID().isNull()) continue;
-
-		copy_inventory_item(gAgent.getID(),
-			item->getPermissions().getOwner(),
-			item->getUUID(),
-			favorites_id,
-			std::string(),
-			LLPointer<LLInventoryCallback>(NULL));
-	}
-}
-
-
 // Returns false to skip other idle processing. Should only return
 // true when all initialization done.
 bool idle_startup()
@@ -920,9 +866,9 @@ bool idle_startup()
 		// create necessary directories
 		// *FIX: these mkdir's should error check
 		gDirUtilp->setLindenUserDir(gFirstname, gLastname);
-    	LLFile::mkdir(gDirUtilp->getLindenUserDir());
-
-        // Set PerAccountSettingsFile to the default value.
+		LLFile::mkdir(gDirUtilp->getLindenUserDir());
+		
+		// Set PerAccountSettingsFile to the default value.
 		gSavedSettings.setString("PerAccountSettingsFile",
 			gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 
 				LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")));
@@ -958,13 +904,6 @@ bool idle_startup()
 		LLFile::mkdir(gDirUtilp->getChatLogsDir());
 		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
 
-		// chat history must be loaded AFTER chat directories are defined.
-		if (!gNoRender && gSavedPerAccountSettings.getBOOL("LogShowHistory"))
-		{
-			LLFloaterChat::loadHistory();
-		}
-		
-		
 		//good as place as any to create user windlight directories
 		std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
 		LLFile::mkdir(user_windlight_path_name.c_str());		
@@ -1309,6 +1248,7 @@ bool idle_startup()
 			// Move the progress view in front of the UI
 			gViewerWindow->moveProgressViewToFront();
 
+			// direct logging to the debug console's line buffer
 			LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
 			
 			// set initial visibility of debug console
@@ -1712,12 +1652,6 @@ bool idle_startup()
 		llinfos << "Creating Inventory Views" << llendl;
 		LLFloaterReg::getInstance("inventory");
 
-		//default initial content for Favorites Bar 
-		if (gAgent.isFirstLogin())
-		{
-			populate_favorites_bar();
-		}
-
 		LLStartUp::setStartupState( STATE_MISC );
 		return FALSE;
 	}
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 5ce3bbb9f6..8a36475510 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -40,9 +40,8 @@
 #include "llcommandhandler.h"
 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
-#include "llfloaterchat.h"
 #include "llfloaterlagmeter.h"
-#include "llfloatervolumepulldown.h"
+#include "llpanelvolumepulldown.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
 #include "llhudicon.h"
@@ -107,7 +106,6 @@ const F32 ICON_TIMER_EXPIRY		= 3.f; // How long the balance and health icons sho
 const F32 ICON_FLASH_FREQUENCY	= 2.f;
 const S32 TEXT_HEIGHT = 18;
 
-static void onClickBuyCurrency(void*);
 static void onClickHealth(void*);
 static void onClickScriptDebug(void*);
 static void onClickVolume(void*);
@@ -122,7 +120,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mTextTime(NULL),
 	mSGBandwidth(NULL),
 	mSGPacketLoss(NULL),
-	mBtnBuyCurrency(NULL),
 	mBtnVolume(NULL),
 	mBalance(0),
 	mHealth(100),
@@ -153,8 +150,10 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mTextHealth = getChild<LLTextBox>("HealthText" );
 	mTextTime = getChild<LLTextBox>("TimeText" );
 	
-	mBtnBuyCurrency = getChild<LLButton>( "buycurrency" );
-	mBtnBuyCurrency->setClickedCallback( onClickBuyCurrency, this );
+	getChild<LLUICtrl>("buycurrency")->setCommitCallback( 
+		boost::bind(&LLStatusBar::onClickBuyCurrency, this));
+	getChild<LLUICtrl>("buyL")->setCommitCallback(
+		boost::bind(&LLStatusBar::onClickBuyCurrency, this));
 
 	mBtnVolume = getChild<LLButton>( "volume_btn" );
 	mBtnVolume->setClickedCallback( onClickVolume, this );
@@ -204,6 +203,21 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	addChild(mSGPacketLoss);
 
 	childSetActionTextbox("stat_btn", onClickStatGraph);
+
+	mPanelVolumePulldown = new LLPanelVolumePulldown();
+	addChild(mPanelVolumePulldown);
+
+	LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
+	LLButton* volbtn =  getChild<LLButton>( "volume_btn" );
+	volume_pulldown_rect.setLeftTopAndSize(volbtn->getRect().mLeft -
+	     (volume_pulldown_rect.getWidth() - volbtn->getRect().getWidth())/2,
+			       volbtn->calcScreenRect().mBottom,
+			       volume_pulldown_rect.getWidth(),
+			       volume_pulldown_rect.getHeight());
+
+	mPanelVolumePulldown->setShape(volume_pulldown_rect);
+	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+	mPanelVolumePulldown->setVisible(FALSE);
 }
 
 LLStatusBar::~LLStatusBar()
@@ -347,7 +361,8 @@ void LLStatusBar::refresh()
 void LLStatusBar::setVisibleForMouselook(bool visible)
 {
 	mTextTime->setVisible(visible);
-	mBtnBuyCurrency->setVisible(visible);
+	getChild<LLUICtrl>("buycurrency")->setVisible(visible);
+	getChild<LLUICtrl>("buyL")->setVisible(visible);
 	mSGBandwidth->setVisible(visible);
 	mSGPacketLoss->setVisible(visible);
 	setBackgroundVisible(visible);
@@ -367,17 +382,18 @@ void LLStatusBar::setBalance(S32 balance)
 {
 	std::string money_str = LLResMgr::getInstance()->getMonetaryString( balance );
 
+	LLButton* btn_buy_currency = getChild<LLButton>("buycurrency");
 	LLStringUtil::format_map_t string_args;
 	string_args["[AMT]"] = llformat("%s", money_str.c_str());
 	std::string labe_str = getString("buycurrencylabel", string_args);
-	mBtnBuyCurrency->setLabel(labe_str);
+	btn_buy_currency->setLabel(labe_str);
 
 	// Resize the balance button so that the label fits it, and the button expands to the left.
 	// *TODO: LLButton should have an option where to expand.
 	{
-		S32 saved_right = mBtnBuyCurrency->getRect().mRight;
-		mBtnBuyCurrency->autoResize();
-		mBtnBuyCurrency->translate(saved_right - mBtnBuyCurrency->getRect().mRight, 0);
+		S32 saved_right = btn_buy_currency->getRect().mRight;
+		btn_buy_currency->autoResize();
+		btn_buy_currency->translate(saved_right - btn_buy_currency->getRect().mRight, 0);
 	}
 
 	if (mBalance && (fabs((F32)(mBalance - balance)) > gSavedSettings.getF32("UISndMoneyChangeThreshold")))
@@ -482,7 +498,7 @@ S32 LLStatusBar::getSquareMetersLeft() const
 	return mSquareMetersCredit - mSquareMetersCommitted;
 }
 
-static void onClickBuyCurrency(void* data)
+void LLStatusBar::onClickBuyCurrency()
 {
 	LLFloaterBuyCurrency::buyCurrency();
 }
@@ -501,7 +517,7 @@ static void onClickScriptDebug(void*)
 void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl)
 {
 	// show the master volume pull-down
-	LLFloaterReg::showInstance("volume_pulldown");
+	gStatusBar->mPanelVolumePulldown->setVisible(TRUE);
 }
 
 static void onClickVolume(void* data)
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index f77cc1acb8..21a98dd753 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -91,6 +91,7 @@ private:
 	// simple method to setup the part that holds the date
 	void setupDate();
 
+	void onClickBuyCurrency();
 	void onVolumeChanged(const LLSD& newvalue);
 
 	static void onMouseEnterVolume(LLUICtrl* ctrl);
@@ -103,7 +104,6 @@ private:
 	LLStatGraph *mSGBandwidth;
 	LLStatGraph *mSGPacketLoss;
 
-	LLButton	*mBtnBuyCurrency;
 	LLButton	*mBtnVolume;
 
 	S32				mBalance;
@@ -112,7 +112,7 @@ private:
 	S32				mSquareMetersCommitted;
 	LLFrameTimer*	mBalanceTimer;
 	LLFrameTimer*	mHealthTimer;
-		
+	LLPanelVolumePulldown* mPanelVolumePulldown;
 	static std::vector<std::string> sDays;
 	static std::vector<std::string> sMonths;
 	static const U32 MAX_DATE_STRING_LENGTH;
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index eef8435006..0cfcfdc634 100644
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -77,10 +77,11 @@ void LLSysWellItem::onClickCloseBtn()
 //---------------------------------------------------------------------------------
 BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+	BOOL res = LLPanel::handleMouseDown(x, y, mask);
 	if(!mCloseBtn->getRect().pointInRect(x, y))
 		mOnItemClick(this);
 
-	return LLPanel::handleMouseDown(x, y, mask);
+	return res;
 }
 
 //---------------------------------------------------------------------------------
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index a46ca1f8ac..ba15053381 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -349,7 +349,6 @@ LLIMWellWindow::RowPanel::RowPanel(const LLSysWellWindow* parent, const LLUUID&
 	}
 
 	// Initialize chiclet.
-	mChiclet->setRect(LLRect(5, 28, 30, 3)); // *HACK: workaround for (EXT-3599)
 	mChiclet->setChicletSizeChangedCallback(boost::bind(&LLIMWellWindow::RowPanel::onChicletSizeChanged, this, mChiclet, _2));
 	mChiclet->enableCounterControl(true);
 	mChiclet->setCounter(chicletCounter);
@@ -410,6 +409,11 @@ BOOL LLIMWellWindow::RowPanel::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLPanel::handleMouseDown(x, y, mask);
 }
 
+// virtual
+BOOL LLIMWellWindow::RowPanel::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	return mChiclet->handleRightMouseDown(x, y, mask);
+}
 /************************************************************************/
 /*         ObjectRowPanel implementation                                */
 /************************************************************************/
@@ -553,6 +557,12 @@ BOOL LLIMWellWindow::ObjectRowPanel::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLPanel::handleMouseDown(x, y, mask);
 }
 
+// virtual
+BOOL LLIMWellWindow::ObjectRowPanel::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	return mChiclet->handleRightMouseDown(x, y, mask);
+}
+
 /************************************************************************/
 /*         LLNotificationWellWindow implementation                      */
 /************************************************************************/
@@ -690,8 +700,7 @@ void LLNotificationWellWindow::connectListUpdaterToSignal(std::string notificati
 void LLNotificationWellWindow::onItemClick(LLSysWellItem* item)
 {
 	LLUUID id = item->getID();
-	if(mChannel)
-		mChannel->loadStoredToastByNotificationIDToChannel(id);
+	LLFloaterReg::showInstance("inspect_toast", id);
 }
 
 void LLNotificationWellWindow::onItemClose(LLSysWellItem* item)
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index 833e4dd504..0c81d1f369 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -162,6 +162,9 @@ private:
 	void onItemClick(LLSysWellItem* item);
 	void onItemClose(LLSysWellItem* item);
 
+	// ID of a toast loaded by user (by clicking notification well item)
+	LLUUID mLoadedToastId;
+
 };
 
 /**
@@ -217,6 +220,8 @@ private:
 		void onMouseEnter(S32 x, S32 y, MASK mask);
 		void onMouseLeave(S32 x, S32 y, MASK mask);
 		BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+		BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+
 	private:
 		static const S32 CHICLET_HPAD = 10;
 		void onChicletSizeChanged(LLChiclet* ctrl, const LLSD& param);
@@ -245,6 +250,8 @@ private:
 		/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
 		/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
 		/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+		/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+
 	private:
 		void onClosePanel();
 		static EObjectType getObjectType(const LLNotificationPtr& notification);
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index d3bbda1c72..c635f91423 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -246,13 +246,6 @@ void LLTeleportHistoryStorage::goToItem(S32 idx)
 		dump();
 		return;
 	}
-	
-	if (idx == (S32)mItems.size() - 1)
-	{
-		llwarns << "Will not teleport to the same location." << llendl;
-		dump();
-		return;
-	}
 
 	// Attempt to teleport to the requested item.
 	gAgent.teleportViaLocation(mItems[idx].mGlobalPos);
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 72ef383be9..4a7d784c3e 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1139,7 +1139,7 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
 
 BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable  ) // This sets mInfo and calls initialization functions
 {
-	llassert(mInfo == NULL);
+	//llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating
 	mInfo = info;
 	//mID = info->mID; // No ID
 
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 25e5e23e6f..9c4825763b 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -878,6 +878,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
 {
 	setAllowNoTexture(p.allow_no_texture);
 	setCanApplyImmediately(p.can_apply_immediately);
+	mCommitOnSelection = !p.no_commit_on_selection;
 
 	LLTextBox::Params params(p.caption_text);
 	params.name(p.label);
@@ -1122,7 +1123,11 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op)
 			}
 			else
 			{
-				onCommit();
+				// If the "no_commit_on_selection" parameter is set
+				// we commit only when user presses OK in the picker
+				// (i.e. op == TEXTURE_SELECT) or changes texture via DnD.
+				if (mCommitOnSelection || op == TEXTURE_SELECT)
+					onCommit();
 			}
 		}
 	}
@@ -1190,8 +1195,12 @@ void LLTextureCtrl::draw()
 	}
 	else if (!mImageAssetID.isNull())
 	{
-		mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, MIPMAP_YES);
-		mTexturep->setBoostLevel(LLViewerTexture::BOOST_PREVIEW);
+		LLPointer<LLViewerFetchedTexture> texture = LLViewerTextureManager::getFetchedTexture(mImageAssetID, MIPMAP_YES,LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+		
+		texture->setBoostLevel(LLViewerTexture::BOOST_PREVIEW);
+		texture->forceToSaveRawImage(0) ;
+
+		mTexturep = texture;
 	}
 	else if (!mFallbackImageName.empty())
 	{
@@ -1242,11 +1251,11 @@ void LLTextureCtrl::draw()
 		 (mTexturep->getDiscardLevel() != 1) &&
 		 (mTexturep->getDiscardLevel() != 0))
 	{
-		LLFontGL* font = LLFontGL::getFontSansSerifBig();
+		LLFontGL* font = LLFontGL::getFontSansSerif();
 		font->renderUTF8(
 			mLoadingPlaceholderString, 0,
-			llfloor(interior.mLeft+10), 
-			llfloor(interior.mTop-20),
+			llfloor(interior.mLeft+3), 
+			llfloor(interior.mTop-25),
 			LLColor4::white,
 			LLFontGL::LEFT,
 			LLFontGL::BASELINE,
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index fb1d591e32..023329a9b2 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -74,6 +74,7 @@ public:
 		Optional<std::string>	default_image_name;
 		Optional<bool>			allow_no_texture;
 		Optional<bool>			can_apply_immediately;
+		Optional<bool>			no_commit_on_selection; // don't commit unless it's DnD or OK button press
 		Optional<S32>			label_width;
 		Optional<LLUIColor>		border_color;
 		
@@ -88,6 +89,7 @@ public:
 			default_image_name("default_image_name"),
 			allow_no_texture("allow_no_texture"),
 			can_apply_immediately("can_apply_immediately"),
+			no_commit_on_selection("no_commit_on_selection", false),
 		    label_width("label_width", -1),
 			border_color("border_color"),
 			multiselect_text("multiselect_text"),
@@ -204,6 +206,7 @@ private:
 	PermissionMask			 mImmediateFilterPermMask;
 	PermissionMask			 mNonImmediateFilterPermMask;
 	BOOL					 mCanApplyImmediately;
+	BOOL					 mCommitOnSelection;
 	BOOL					 mNeedsRawImageData;
 	LLViewBorder*			 mBorder;
 	BOOL					 mValid;
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index eeedf38543..5ce6884239 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -495,8 +495,8 @@ void LLTextureFetchWorker::setupPacketData()
 U32 LLTextureFetchWorker::calcWorkPriority()
 {
 // 	llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerTexture::maxDecodePriority());
-	F32 priority_scale = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority();
-	mWorkPriority = (U32)(mImagePriority * priority_scale);
+	static F32 PRIORITY_SCALE = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerFetchedTexture::maxDecodePriority();
+	mWorkPriority = (U32)(mImagePriority * PRIORITY_SCALE);
 	return mWorkPriority;
 }
 
@@ -574,7 +574,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 {
 	LLMutexLock lock(&mWorkMutex);
 
-	if ((mFetcher->isQuitting() || getFlags(LLWorkerClass::WCF_DELETE_REQUESTED)))
+	if ((mFetcher->isQuitting() || mImagePriority < 1.0f || getFlags(LLWorkerClass::WCF_DELETE_REQUESTED)))
 	{
 		if (mState < WRITE_TO_CACHE)
 		{
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 96d1624cd4..110d158e2d 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -266,6 +266,8 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 {
 	mOnToastHoverSignal(this, MOUSE_ENTER);
 
+	setBackgroundOpaque(TRUE);
+
 	//toasts fading is management by Screen Channel
 	
 	sendChildToFront(mHideBtn);
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 766cf83a01..94acb2ae8c 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -45,7 +45,7 @@
 #include "lltrans.h"
 
 const S32 BOTTOM_PAD = VPAD * 3;
-const S32 BUTTON_WIDTH = 90;
+S32 BUTTON_WIDTH = 90;
 
 //static
 const LLFontGL* LLToastNotifyPanel::sFont = NULL;
@@ -63,7 +63,7 @@ mAddedDefaultBtn(false)
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notification.xml");
 	mInfoPanel = getChild<LLPanel>("info_panel");
 	mControlPanel = getChild<LLPanel>("control_panel");
-
+	BUTTON_WIDTH = gSavedSettings.getS32("ToastButtonWidth");
 	// customize panel's attributes
 	// is it intended for displaying a tip
 	mIsTip = notification->getType() == "notifytip";
@@ -96,7 +96,8 @@ mAddedDefaultBtn(false)
 
 	// customize panel's outfit
 	// preliminary adjust panel's layout
-	mIsTip ? adjustPanelForTipNotice() : adjustPanelForScriptNotice(form);
+	//move to the end 
+	//mIsTip ? adjustPanelForTipNotice() : adjustPanelForScriptNotice(form);
 
 	// adjust text options according to the notification type
 	// add a caution textbox at the top of a caution notification
@@ -117,8 +118,14 @@ mAddedDefaultBtn(false)
 	mTextBox->setValue(notification->getMessage());
 
 	// add buttons for a script notification
-	if (!mIsTip)
+	if (mIsTip)
+	{
+		adjustPanelForTipNotice();
+	}
+	else
 	{
+		std::vector<index_button_pair_t> buttons;
+		buttons.reserve(mNumOptions);
 		for (S32 i = 0; i < mNumOptions; i++)
 		{
 			LLSD form_element = form->getElement(i);
@@ -126,63 +133,155 @@ mAddedDefaultBtn(false)
 			{
 				continue;
 			}
-
-			addButton(form_element["name"].asString(), form_element["text"].asString(), TRUE, form_element["default"].asBoolean());
 		}
-
-		if (mNumButtons == 0)
+		S32 buttons_width = 0;
+		// create all buttons and accumulate they total width to reshape mControlPanel
+		for (S32 i = 0; i < mNumOptions; i++)
 		{
-			addButton("OK", LLTrans::getString("ok"), FALSE, TRUE);
-			mAddedDefaultBtn = true;
+			LLSD form_element = form->getElement(i);
+			if (form_element["type"].asString() != "button")
+			{
+				continue;
+			}
+			LLButton* new_button = createButton(form_element, TRUE);
+			buttons_width += new_button->getRect().getWidth();
+			S32 index = form_element["index"].asInteger();
+			buttons.push_back(index_button_pair_t(index,new_button));
+		}
+		if (buttons.empty())
+		{
+			addDefaultButton();
+		}
+		else
+		{
+			//try get an average left_pad to spread out buttons
+			S32 left_pad = (getRect().getWidth() - buttons_width) / (S32(buttons.size() + 1));
+			// left_pad can be < 2*HPAD if we have a lot of buttons. 
+			if(left_pad < 2*HPAD)
+			{
+				//Probably it is  a scriptdialog toast, set default left_pad
+				left_pad = 2*HPAD;
+			}
+			//how many rows we need to fit all buttons with current width of the panel
+			S32 button_rows = (buttons_width + left_pad * S32(buttons.size() + 1)) / getRect().getWidth() + 1;
+			//calculate required panel height 
+			S32 button_panel_height = button_rows *( BTN_HEIGHT + VPAD) + BOTTOM_PAD;
+
+			adjustPanelForScriptNotice(getRect().getWidth(), button_panel_height);
+			//we begin from lefttop angle and go to rightbottom.
+			updateButtonsLayout(buttons, left_pad, button_panel_height);
 		}
 	}
-
 	// adjust panel's height to the text size
 	mInfoPanel->setFollowsAll();
 	snapToMessageHeight(mTextBox, MAX_LENGTH);
 }
-
-LLToastNotifyPanel::~LLToastNotifyPanel() 
+void LLToastNotifyPanel::addDefaultButton()
 {
-	std::for_each(mBtnCallbackData.begin(), mBtnCallbackData.end(), DeletePointer());
+	LLSD form_element;
+	form_element.with("name", "OK").with("text", LLTrans::getString("ok")).with("default", true);
+	LLButton* ok_btn = createButton(form_element, FALSE);
+	LLRect new_btn_rect(ok_btn->getRect());
+
+	new_btn_rect.setOriginAndSize(llabs(getRect().getWidth() - BUTTON_WIDTH)/ 2, BOTTOM_PAD,
+			//auto_size for ok button makes it very small, so let's make it wider
+			BUTTON_WIDTH, new_btn_rect.getHeight());
+	ok_btn->setRect(new_btn_rect);
+	addChild(ok_btn, -1);
+	mNumButtons = 1;
+	mAddedDefaultBtn = true;
 }
+LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_option)
+{
 
+	InstanceAndS32* userdata = new InstanceAndS32;
+	userdata->mSelf = this;
+	userdata->mButtonName = is_option ? form_element["name"].asString() : "";
 
-void LLToastNotifyPanel::adjustPanelForScriptNotice(const LLNotificationFormPtr form)
-{
-	F32 buttons_num = 0;
-	S32 button_rows = 0;
+	mBtnCallbackData.push_back(userdata);
 
-	// calculate number of buttons
-	for (S32 i = 0; i < mNumOptions; i++)
+	LLButton::Params p;
+	const LLFontGL* font = form_element["index"].asInteger() == -1 ? sFontSmall: sFont; // for ignore button in script dialog
+	p.name(form_element["name"].asString());
+	p.label(form_element["text"].asString());
+	p.font(font);
+	p.rect.height = BTN_HEIGHT;
+	p.click_callback.function(boost::bind(&LLToastNotifyPanel::onClickButton, userdata));
+	p.rect.width = BUTTON_WIDTH;
+	p.auto_resize = false;
+	p.follows.flags(FOLLOWS_RIGHT | FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+	if (mIsCaution)
 	{
-		if (form->getElement(i)["type"].asString() == "button")
-		{
-			buttons_num++;
-		}
+		p.image_color(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
+		p.image_color_disabled(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
 	}
-
-	// calculate necessary height for the button panel
-	// if notification form contains no buttons - reserve a place for OK button
-	// script notifications have extra line for an IGNORE button
-	if(mIsScriptDialog)
+	if (!mIsScriptDialog && font->getWidth(form_element["text"].asString()) > BUTTON_WIDTH)
 	{
-		button_rows = llceil((buttons_num - 1) / 3.0f) + 1;
+		p.rect.width = 1;
+		p.auto_resize = true;
 	}
-	else
+	
+	LLButton* btn = LLUICtrlFactory::create<LLButton>(p);
+	mNumButtons++;
+	btn->autoResize();
+	if (form_element["default"].asBoolean())
 	{
-		button_rows = llmax( 1, llceil(buttons_num / 3.0f));
+		setDefaultBtn(btn);
 	}
 
-	S32 button_panel_height = button_rows * BTN_HEIGHT + (button_rows + 1) * VPAD + BOTTOM_PAD;
+	return btn;
+}
+
+LLToastNotifyPanel::~LLToastNotifyPanel() 
+{
+	std::for_each(mBtnCallbackData.begin(), mBtnCallbackData.end(), DeletePointer());
+}
+void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 left_pad, S32 top)
+{
+	S32 left = left_pad;
+	LLButton* ignore_btn = NULL;
+	for (std::vector<index_button_pair_t>::const_iterator it = buttons.begin(); it != buttons.end(); it++)
+	{
+		if(left + it->second->getRect().getWidth() + 2*HPAD > getRect().getWidth())
+		{
+			// looks like we need to add button to the next row
+			left = left_pad;
+			top-= (BTN_HEIGHT + VPAD);
+		}
+		LLRect btn_rect(it->second->getRect());
+		if(mIsScriptDialog && it->first == -1)
+		{
+			//this is ignore button ( index == -1) we need to add it into new extra row at the end
+			ignore_btn = it->second;
+			continue;
+		}
+		btn_rect.setLeftTopAndSize(left, top, btn_rect.getWidth(), btn_rect.getHeight());
+		it->second->setRect(btn_rect);					
+		left = btn_rect.mLeft + btn_rect.getWidth() + left_pad;
+		addChild(it->second, -1);
+	}
+	if(ignore_btn)
+	{
+		LLRect btn_rect(ignore_btn->getRect());
+		btn_rect.setOriginAndSize(getRect().getWidth() - btn_rect.getWidth() - left_pad,
+				BOTTOM_PAD,// move button at the bottom edge
+				btn_rect.getWidth(), btn_rect.getHeight());
+		ignore_btn->setRect(btn_rect);
+		addChild(ignore_btn, -1);
+	}
+}
 
+void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 button_panel_height)
+{
 	//adjust layout
+	// we need to keep min width and max height to make visible all buttons, because width of the toast can not be changed
 	LLRect button_rect = mControlPanel->getRect();
-	reshape(getRect().getWidth(), mInfoPanel->getRect().getHeight() + button_panel_height);
+	reshape(getRect().getWidth(), mInfoPanel->getRect().getHeight() + button_panel_height + VPAD);
+	button_rect.set(0, button_rect.mBottom + button_panel_height, button_rect.getWidth(), button_rect.mBottom);
 	mControlPanel->reshape(button_rect.getWidth(), button_panel_height);
+	mControlPanel->setRect(button_rect);
 }
 
-// static
 void LLToastNotifyPanel::adjustPanelForTipNotice()
 {
 	LLRect info_rect = mInfoPanel->getRect();
@@ -206,64 +305,3 @@ void LLToastNotifyPanel::onClickButton(void* data)
 	}
 	self->mNotification->respond(response);
 }
-
-// virtual
-LLButton* LLToastNotifyPanel::addButton(const std::string& name, const std::string& label, BOOL is_option, BOOL is_default)
-{
-	LLRect btn_rect;
-	LLButton* btn;
-	S32 btn_height= BTN_HEIGHT;
-	const LLFontGL* font = sFont;
-	S32 ignore_pad = 0;
-	S32 button_index = mNumButtons;
-	S32 index = button_index;
-	S32 x = (HPAD * 4) + 32;
-
-	if (mIsScriptDialog)
-	{
-		// Add two "blank" option spaces, before the "Ignore" button
-		index = button_index + 2;
-		if (button_index == 0)
-		{
-			// Ignore button is smaller, less wide
-			btn_height = BTN_HEIGHT_SMALL;
-			font = sFontSmall;
-			ignore_pad = 10;
-		}
-	}
-
-	btn_rect.setOriginAndSize(x + (index % 3) * (BUTTON_WIDTH+HPAD+HPAD) + ignore_pad,
-		BOTTOM_PAD + (index / 3) * (BTN_HEIGHT+VPAD),
-		BUTTON_WIDTH - 2*ignore_pad,
-		btn_height);
-
-	InstanceAndS32* userdata = new InstanceAndS32;
-	userdata->mSelf = this;
-	userdata->mButtonName = is_option ? name : "";
-
-	mBtnCallbackData.push_back(userdata);
-
-	LLButton::Params p;
-	p.name(name);
-	p.label(label);
-	p.rect(btn_rect);
-	p.click_callback.function(boost::bind(&LLToastNotifyPanel::onClickButton, userdata));
-	p.font(font);
-	if (mIsCaution)
-	{
-		p.image_color(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
-		p.image_color_disabled(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
-	}
-	btn = LLUICtrlFactory::create<LLButton>(p);
-
-
-	mControlPanel->addChild(btn, -1);
-
-	if (is_default)
-	{
-		setDefaultBtn(btn);
-	}
-
-	mNumButtons++;
-	return btn;
-}
diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h
index 04525387b3..1f50c21f6f 100644
--- a/indra/newview/lltoastnotifypanel.h
+++ b/indra/newview/lltoastnotifypanel.h
@@ -57,7 +57,7 @@ public:
 	virtual ~LLToastNotifyPanel();
 
 protected:
-	LLButton* addButton(std::string const &name, const std::string& label, BOOL is_option, BOOL is_default);
+	LLButton* createButton(const LLSD& form_element, BOOL is_option);
 
 	// Used for callbacks
 	struct InstanceAndS32
@@ -69,8 +69,11 @@ protected:
 
 private:
 
-	void adjustPanelForScriptNotice(const boost::shared_ptr<LLNotificationForm> form);
+	typedef std::pair<int,LLButton*> index_button_pair_t; 
+	void adjustPanelForScriptNotice(S32 max_width, S32 max_height);
 	void adjustPanelForTipNotice();
+	void addDefaultButton();
+	void updateButtonsLayout(const std::vector<index_button_pair_t>& buttons, S32 left_pad, S32 top);
 
 	// panel elements
 	LLTextBase*		mTextBox;
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index bf6d715c31..edbaa0d45a 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -60,7 +60,7 @@
 #include "lltoolmgr.h"
 #include "llui.h"
 #include "llviewermenu.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llpanelblockedlist.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
@@ -70,7 +70,6 @@
 #include "llviewerwindow.h"
 #include "lltoolgrab.h"
 #include "llcombobox.h"
-#include "llfloaterchat.h"
 #include "llimpanel.h"
 #include "lllayoutstack.h"
 
@@ -281,21 +280,6 @@ void LLToolBar::updateCommunicateList()
 	}
 	itemp = communicate_button->addElement(contact_sd, ADD_TOP);
 
-	LLSD communicate_sd;
-	communicate_sd["value"] = "local chat";
-	communicate_sd["columns"][0]["value"] = LLFloaterChat::getInstance()->getShortTitle();
-
-	if (LLFloaterChat::getInstance() == frontmost_floater)
-	{
-		communicate_sd["columns"][0]["font"]["name"] = "SANSSERIF_SMALL";
-		communicate_sd["columns"][0]["font"]["style"] = "BOLD";
-		if (selected.isUndefined())
-		{
-			selected = "local chat";
-		}
-	}
-	itemp = communicate_button->addElement(communicate_sd, ADD_TOP);
-
 	communicate_button->addSeparator(ADD_TOP);
 	communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP);
 	communicate_button->addSeparator(ADD_TOP);
@@ -357,8 +341,7 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, const LLSD& user_data)
 		if(chatterbox_instance)
 		{
 			chatterbox_instance->addFloater(LLFloaterMyFriends::getInstance(), FALSE);
-		    chatterbox_instance->addFloater(LLFloaterChat::getInstance(), FALSE);
-		
+			
 			LLUUID session_to_show;
 		
 			std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index aa35f22930..4420b046d8 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -41,7 +41,7 @@
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
 #include "lldictionary.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloaterreg.h"
 #include "llfloatertools.h"
 #include "llgesturemgr.h"
@@ -1199,11 +1199,11 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
 	locateInventory(item, cat);
 	if(!item || !item->isComplete()) return;
 	
-	if (regionp
-		&& (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX))
-	{
-		LLFirstUse::useSandbox();
-	}
+	//if (regionp
+	//	&& (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX))
+	//{
+	//	LLFirstUse::useSandbox();
+	//}
 	// check if it cannot be copied, and mark as remove if it is -
 	// this will remove the object from inventory after rez. Only
 	// bother with this check if we would not normally remove from
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 26b3bdb82e..fd12163fd3 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -38,7 +38,7 @@
 #include "llmenugl.h"
 #include "llfloaterreg.h"
 
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 // tools and manipulators
 #include "lltool.h"
 #include "llmanipscale.h"
@@ -301,7 +301,7 @@ void LLToolMgr::toggleBuildMode()
 		getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
 
 		// Could be first use
-		LLFirstUse::useBuild();
+		//LLFirstUse::useBuild();
 
 		gAgent.resetView(false);
 
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index b1d09eccba..da68af1597 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -41,7 +41,7 @@
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llfocusmgr.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloaterland.h"
 #include "llfloaterreg.h"
 #include "llfloaterscriptdebug.h"
@@ -68,6 +68,7 @@
 #include "llviewermedia.h"
 #include "llvoavatarself.h"
 #include "llviewermediafocus.h"
+#include "llvovolume.h"
 #include "llworld.h"
 #include "llui.h"
 #include "llweb.h"
@@ -101,16 +102,13 @@ BOOL LLToolPie::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktyp
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	//left mouse down always picks transparent
-	gViewerWindow->pickAsync(x, y, mask, leftMouseCallback, TRUE);
+	mPick = gViewerWindow->pickImmediate(x, y, TRUE);
+	mPick.mKeyMask = mask;
 	mGrabMouseButtonDown = TRUE;
-	return TRUE;
-}
+	
+	pickLeftMouseDownCallback();
 
-// static
-void LLToolPie::leftMouseCallback(const LLPickInfo& pick_info)
-{
-	LLToolPie::getInstance()->mPick = pick_info;
-	LLToolPie::getInstance()->pickLeftMouseDownCallback();
+	return TRUE;
 }
 
 // Spawn context menus on right mouse down so you can drag over and select
@@ -118,8 +116,13 @@ void LLToolPie::leftMouseCallback(const LLPickInfo& pick_info)
 BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
 	// don't pick transparent so users can't "pay" transparent objects
-	gViewerWindow->pickAsync(x, y, mask, rightMouseCallback, FALSE);
+	mPick = gViewerWindow->pickImmediate(x, y, FALSE);
+	mPick.mKeyMask = mask;
+
 	// claim not handled so UI focus stays same
+	
+	pickRightMouseDownCallback();
+	
 	return FALSE;
 }
 
@@ -134,13 +137,6 @@ BOOL LLToolPie::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
 }
 
-// static
-void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
-{
-	LLToolPie::getInstance()->mPick = pick_info;
-	LLToolPie::getInstance()->pickRightMouseDownCallback();
-}
-
 // True if you selected an object.
 BOOL LLToolPie::pickLeftMouseDownCallback()
 {
@@ -634,12 +630,14 @@ static bool needs_tooltip(LLSelectNode* nodep)
 		return false;
 
 	LLViewerObject* object = nodep->getObject();
+	LLVOVolume* vovolume = dynamic_cast<LLVOVolume*>(object);
 	LLViewerObject *parent = (LLViewerObject *)object->getParent();
 	if (object->flagHandleTouch()
 		|| (parent && parent->flagHandleTouch())
 		|| object->flagTakesMoney()
 		|| (parent && parent->flagTakesMoney())
 		|| object->flagAllowInventoryAdd()
+		|| (vovolume && vovolume->hasMedia())
 		)
 	{
 		return true;
@@ -733,10 +731,11 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
 				LLInspector::Params p;
 				p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
 				p.message(avatar_name);
-				p.image(LLUI::getUIImage("Info"));
+				p.image.name("Inspector_I");
 				p.click_callback(boost::bind(showAvatarInspector, hover_object->getID()));
 				p.visible_time_near(6.f);
 				p.visible_time_far(3.f);
+				p.delay_time(0.35f);
 				p.wrap(false);
 				
 				LLToolTipMgr::instance().show(p);
@@ -823,7 +822,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
 					LLInspector::Params p;
 					p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
 					p.message(tooltip_msg);
-					p.image(LLUI::getUIImage("Info_Off"));
+					p.image.name("Inspector_I");
 					p.click_callback(boost::bind(showObjectInspector, hover_object->getID(), mHoverPick.mObjectFace));
 					p.time_based_media(is_time_based_media);
 					p.web_based_media(is_web_based_media);
@@ -832,6 +831,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
 					p.click_homepage_callback(boost::bind(VisitHomePage, mHoverPick));
 					p.visible_time_near(6.f);
 					p.visible_time_far(3.f);
+					p.delay_time(0.35f);
 					p.wrap(false);
 					
 					LLToolTipMgr::instance().show(p);
@@ -1515,7 +1515,7 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 			}
 			else
 			{
-				mute_msg = LLTrans::getString("MuteObject");
+				mute_msg = LLTrans::getString("MuteObject2");
 			}
 			
 			gMenuHolder->childSetText("Object Mute", mute_msg);
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 3660c68552..5f0e28fa95 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -71,9 +71,6 @@ public:
 	LLObjectSelection*	getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; }
 	void 				resetSelection();
 	
-	static void			leftMouseCallback(const LLPickInfo& pick_info);
-	static void			rightMouseCallback(const LLPickInfo& pick_info);
-
 	static void			selectionPropertiesReceived();
 
 	static void			showAvatarInspector(const LLUUID& avatar_id);
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index a7f4cb558e..612bcc03bd 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -38,7 +38,7 @@
 // viewer headers
 #include "llbutton.h"
 #include "llviewercontrol.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloatertools.h"
 #include "llselectmgr.h"
 #include "llstatusbar.h"
@@ -188,7 +188,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 
 	if (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX)
 	{
-		LLFirstUse::useSandbox();
+		//LLFirstUse::useSandbox();
 	}
 
 	// Set params for new object based on its PCode.
@@ -491,7 +491,7 @@ BOOL LLToolPlacer::addDuplicate(S32 x, S32 y)
 	if (regionp
 		&& (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX))
 	{
-		LLFirstUse::useSandbox();
+		//LLFirstUse::useSandbox();
 	}
 
 	return TRUE;
diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp
index e8b5aa7c74..08dd82ab86 100644
--- a/indra/newview/llurlhistory.cpp
+++ b/indra/newview/llurlhistory.cpp
@@ -77,7 +77,7 @@ bool LLURLHistory::saveFile(const std::string& filename)
 	std::string temp_str = gDirUtilp->getLindenUserDir();
 	if( temp_str.empty() )
 	{
-		llwarns << "Can't save. No user directory set." << llendl;
+		llinfos << "Can't save URL history - no user directory set yet." << llendl;
 		return false;
 	}
 
diff --git a/indra/newview/llurlwhitelist.cpp b/indra/newview/llurlwhitelist.cpp
index da69039cf9..46bc9276c1 100644
--- a/indra/newview/llurlwhitelist.cpp
+++ b/indra/newview/llurlwhitelist.cpp
@@ -121,6 +121,12 @@ bool LLUrlWhiteList::save ()
 	// build filename for each user
 	std::string resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename );
 
+	if (resolvedFilename.empty())
+	{
+		llinfos << "No per-user dir for saving URL whitelist - presumably not logged in yet.  Skipping." << llendl;
+		return false;
+	}
+
 	// open a file for writing
 	llofstream file ( resolvedFilename );
 	if ( file.is_open () )
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 3dac0ee452..ba256d70e8 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -45,7 +45,7 @@
 #include "lldynamictexture.h"
 #include "lldrawpoolalpha.h"
 #include "llfeaturemanager.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llhudmanager.h"
 #include "llimagebmp.h"
 #include "llmemory.h"
@@ -404,7 +404,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				if( arrival_fraction > 1.f )
 				{
 					arrival_fraction = 1.f;
-					LLFirstUse::useTeleport();
+					//LLFirstUse::useTeleport();
 					gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 				}
 				gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
@@ -483,7 +483,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	{
 		LLAppViewer::instance()->pingMainloopTimeout("Display:Disconnected");
 		render_ui();
-		render_disconnected_background();
 	}
 	
 	//////////////////////////
@@ -1011,7 +1010,7 @@ void render_hud_attachments()
 
 LLRect get_whole_screen_region()
 {
-	LLRect whole_screen = gViewerWindow->getWindowRectScaled();
+	LLRect whole_screen = gViewerWindow->getWorldViewRectScaled();
 	
 	// apply camera zoom transform (for high res screenshots)
 	F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
@@ -1019,13 +1018,13 @@ LLRect get_whole_screen_region()
 	if (zoom_factor > 1.f)
 	{
 		S32 num_horizontal_tiles = llceil(zoom_factor);
-		S32 tile_width = llround((F32)gViewerWindow->getWindowWidthScaled() / zoom_factor);
-		S32 tile_height = llround((F32)gViewerWindow->getWindowHeightScaled() / zoom_factor);
+		S32 tile_width = llround((F32)gViewerWindow->getWorldViewWidthScaled() / zoom_factor);
+		S32 tile_height = llround((F32)gViewerWindow->getWorldViewHeightScaled() / zoom_factor);
 		int tile_y = sub_region / num_horizontal_tiles;
 		int tile_x = sub_region - (tile_y * num_horizontal_tiles);
 		glh::matrix4f mat;
 		
-		whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWindowHeightScaled() - (tile_y * tile_height), tile_width, tile_height);
+		whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWorldViewHeightScaled() - (tile_y * tile_height), tile_width, tile_height);
 	}
 	return whole_screen;
 }
@@ -1045,12 +1044,12 @@ bool get_hud_matrices(const LLRect& screen_region, glh::matrix4f &proj, glh::mat
 		F32 aspect_ratio = LLViewerCamera::getInstance()->getAspect();
 		
 		glh::matrix4f mat;
-		F32 scale_x = (F32)gViewerWindow->getWindowWidthScaled() / (F32)screen_region.getWidth();
-		F32 scale_y = (F32)gViewerWindow->getWindowHeightScaled() / (F32)screen_region.getHeight();
+		F32 scale_x = (F32)gViewerWindow->getWorldViewWidthScaled() / (F32)screen_region.getWidth();
+		F32 scale_y = (F32)gViewerWindow->getWorldViewHeightScaled() / (F32)screen_region.getHeight();
 		mat.set_scale(glh::vec3f(scale_x, scale_y, 1.f));
 		mat.set_translate(
-			glh::vec3f(clamp_rescale((F32)screen_region.getCenterX(), 0.f, (F32)gViewerWindow->getWindowWidthScaled(), 0.5f * scale_x * aspect_ratio, -0.5f * scale_x * aspect_ratio),
-					   clamp_rescale((F32)screen_region.getCenterY(), 0.f, (F32)gViewerWindow->getWindowHeightScaled(), 0.5f * scale_y, -0.5f * scale_y),
+			glh::vec3f(clamp_rescale((F32)screen_region.getCenterX(), 0.f, (F32)gViewerWindow->getWorldViewWidthScaled(), 0.5f * scale_x * aspect_ratio, -0.5f * scale_x * aspect_ratio),
+					   clamp_rescale((F32)screen_region.getCenterY(), 0.f, (F32)gViewerWindow->getWorldViewHeightScaled(), 0.5f * scale_y, -0.5f * scale_y),
 					   0.f));
 		proj *= mat;
 		
@@ -1141,6 +1140,10 @@ void render_ui(F32 zoom_factor, int subfield)
 				render_ui_3d();
 				LLGLState::checkStates();
 			}
+			else
+			{
+				render_disconnected_background();
+			}
 
 			render_ui_2d();
 			LLGLState::checkStates();
@@ -1300,8 +1303,8 @@ void render_ui_2d()
 	if (gAgent.getAvatarObject() && gAgent.mHUDCurZoom < 0.98f)
 	{
 		glPushMatrix();
-		S32 half_width = (gViewerWindow->getWindowWidthScaled() / 2);
-		S32 half_height = (gViewerWindow->getWindowHeightScaled() / 2);
+		S32 half_width = (gViewerWindow->getWorldViewWidthScaled() / 2);
+		S32 half_height = (gViewerWindow->getWorldViewHeightScaled() / 2);
 		glScalef(LLUI::sGLScaleFactor.mV[0], LLUI::sGLScaleFactor.mV[1], 1.f);
 		glTranslatef((F32)half_width, (F32)half_height, 0.f);
 		F32 zoom = gAgent.mHUDCurZoom;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 23bdbc7381..3a834e7532 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -54,7 +54,6 @@
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
 #include "llfloatercamera.h"
-#include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterdaycycle.h"
 #include "llfloatersearch.h"
@@ -106,7 +105,6 @@
 #include "llfloateruipreview.h"
 #include "llfloaterurldisplay.h"
 #include "llfloatervoicedevicesettings.h"
-#include "llfloatervolumepulldown.h"
 #include "llfloaterwater.h"
 #include "llfloaterwhitelistentry.h"
 #include "llfloaterwindlight.h"
@@ -117,6 +115,7 @@
 #include "llinspectgroup.h"
 #include "llinspectobject.h"
 #include "llinspectremoteobject.h"
+#include "llinspecttoast.h"
 #include "llmediaremotectrl.h"
 #include "llmoveview.h"
 #include "llnearbychat.h"
@@ -154,7 +153,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>);
 
 	LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
-	LLFloaterReg::add("chat", "floater_chat_history.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChat>);
+	//LLFloaterReg::add("chat", "floater_chat_history.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChat>);
 	LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
 	LLFloaterReg::add("communicate", "floater_chatterbox.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChatterBox>);
 	LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
@@ -185,6 +184,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLInspectGroupUtil::registerFloater();
 	LLInspectObjectUtil::registerFloater();
 	LLInspectRemoteObjectUtil::registerFloater();
+	LLNotificationsUI::registerFloater();
 	
 	LLFloaterReg::add("lagmeter", "floater_lagmeter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLagMeter>);
 	LLFloaterReg::add("land_holdings", "floater_land_holdings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLandHoldings>);
@@ -256,7 +256,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("upload_image", "floater_image_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterImagePreview>, "upload");
 	LLFloaterReg::add("upload_sound", "floater_sound_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSoundPreview>, "upload");
 	
-	LLFloaterReg::add("volume_pulldown", "floater_volume_pulldown.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVolumePulldown>);
 	LLFloaterReg::add("voice_controls", "floater_voice_controls.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallFloater>);
 	
 	LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWhiteListEntry>);	
diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp
index 5ba4fc834c..967a2925e3 100644
--- a/indra/newview/llviewerhelputil.cpp
+++ b/indra/newview/llviewerhelputil.cpp
@@ -34,6 +34,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llviewerhelputil.h"
 
+#include "llagent.h"
 #include "llsd.h"
 #include "llstring.h"
 #include "lluri.h"
@@ -63,6 +64,7 @@ std::string LLViewerHelpUtil::buildHelpURL( const std::string &topic)
 {
 	LLSD substitution;
 	substitution["TOPIC"] = helpURLEncode(topic);
+	substitution["DEBUG_MODE"] = gAgent.isGodlike() ? "/debug" : "";
 	
 	// get the help URL and expand all of the substitutions
 	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp
index 6299b4fabd..8fdbe0a4ae 100644
--- a/indra/newview/llviewerhome.cpp
+++ b/indra/newview/llviewerhome.cpp
@@ -50,9 +50,18 @@ std::string LLViewerHome::getHomeURL()
 	LLSD substitution;
 	substitution["AUTH_TOKEN"] = LLURI::escape(getAuthKey());
 
-	// get the home URL and expand all of the substitutions
-	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
+	// get the home URL from the settings.xml file
 	std::string homeURL = gSavedSettings.getString("HomeSidePanelURL");
+
+	// support a grid-level override of the URL from login.cgi
+	LLSD grid_url = LLLoginInstance::getInstance()->getResponse("home_sidetray_url");
+	if (! grid_url.asString().empty())
+	{
+		homeURL = grid_url.asString();
+	}	
+
+	// expand all substitution strings in the URL and return it
+	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
 	return LLWeb::expandURLSubstitutions(homeURL, substitution);
 }
 
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 5605f425e0..b330c1ba83 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -44,6 +44,7 @@
 #include "llconsole.h"
 #include "llinventorymodel.h"
 #include "llgesturemgr.h"
+#include "llsidetray.h"
 
 #include "llinventorybridge.h"
 #include "llfloaterinventory.h"
@@ -72,7 +73,23 @@ public:
 	bool handle(const LLSD& params, const LLSD& query_map,
 				LLMediaCtrl* web)
 	{
-		if (params.size() < 2) return false;
+		if (params.size() < 1)
+		{
+			return false;
+		}
+
+		// support secondlife:///app/inventory/show
+		if (params[0].asString() == "show")
+		{
+			LLSideTray::getInstance()->showPanel("sidepanel_inventory", LLSD());
+			return true;
+		}
+
+		// otherwise, we need a UUID and a verb...
+		if (params.size() < 2) 
+		{
+			return false;
+		}
 		LLUUID inventory_id;
 		if (!inventory_id.set(params[0], FALSE))
 		{
@@ -823,6 +840,13 @@ void CreateGestureCallback::fire(const LLUUID& inv_item)
 	gFloaterView->adjustToFitScreen(preview, FALSE);
 }
 
+void AddFavoriteLandmarkCallback::fire(const LLUUID& inv_item_id)
+{
+	if (mTargetLandmarkId.isNull()) return;
+
+	gInventory.rearrangeFavoriteLandmarks(inv_item_id, mTargetLandmarkId);
+}
+
 LLInventoryCallbackManager gInventoryCallbacks;
 
 void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
@@ -1158,6 +1182,15 @@ const std::string& LLViewerInventoryItem::getDisplayName() const
 	return mDisplayName = hasSortField ? result : LLInventoryItem::getName();
 }
 
+// static
+std::string LLViewerInventoryItem::getDisplayName(const std::string& name)
+{
+	std::string result;
+	BOOL hasSortField = extractSortFieldAndDisplayName(name, 0, &result);
+
+	return hasSortField ? result : name;
+}
+
 S32 LLViewerInventoryItem::getSortField() const
 {
 	S32 result;
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 412a2c66e6..917b8747ea 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -66,6 +66,7 @@ public:
 	virtual const LLUUID& getAssetUUID() const;
 	virtual const std::string& getName() const;
 	virtual const std::string& getDisplayName() const;
+	static std::string getDisplayName(const std::string& name);
 	virtual S32 getSortField() const;
 	virtual void setSortField(S32 sortField);
 	virtual void rename(const std::string& new_name);
@@ -279,6 +280,18 @@ public:
 	void fire(const LLUUID& inv_item);
 };
 
+class AddFavoriteLandmarkCallback : public LLInventoryCallback
+{
+public:
+	AddFavoriteLandmarkCallback() : mTargetLandmarkId(LLUUID::null) {}
+	void setTargetLandmarkId(const LLUUID& target_uuid) { mTargetLandmarkId = target_uuid; }
+
+private:
+	void fire(const LLUUID& inv_item);
+
+	LLUUID mTargetLandmarkId;
+};
+
 // misc functions
 //void inventory_reliable_callback(void**, S32 status);
 
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index bf96472e7e..04d67fe750 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -48,12 +48,15 @@
 #include "llviewerwindow.h"
 #include "llfocusmgr.h"
 #include "llcallbacklist.h"
+#include "llparcel.h"
+#include "llaudioengine.h"  // for gAudiop
 
 #include "llevent.h"		// LLSimpleListener
 #include "llnotificationsutil.h"
 #include "lluuid.h"
 #include "llkeyboard.h"
 #include "llmutelist.h"
+//#include "llfirstuse.h"
 
 #include <boost/bind.hpp>	// for SkinFolder listener
 #include <boost/signals2.hpp>
@@ -170,12 +173,15 @@ public:
 		//     accept this and go past it in the MIME type probe
 		// 302 means the resource can be found temporarily in a different place - added this for join.secondlife.com
 		// 499 is a code specifc to join.secondlife.com (????) apparently safe to ignore
-		if(	((status >= 200) && (status < 300))	||
-			((status >= 400) && (status < 499))	|| 
-			(status == 500) ||
-			(status == 302) ||
-			(status == 499) 
-			)
+//		if(	((status >= 200) && (status < 300))	||
+//			((status >= 400) && (status < 499))	|| 
+//			(status == 500) ||
+//			(status == 302) ||
+//			(status == 499) 
+//			)
+		// We now no longer check the error code returned from the probe.
+		// If we have a mime type, use it.  If not, default to the web plugin and let it handle error reporting.
+		if(1)
 		{
 			// The probe was successful.
 			if(mime_type.empty())
@@ -705,6 +711,8 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 	
 	std::vector<LLViewerMediaImpl*> proximity_order;
 	
+	bool inworld_media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia");
+	bool needs_first_run = LLViewerMedia::needsMediaFirstRun();
 	U32 max_instances = gSavedSettings.getU32("PluginInstancesTotal");
 	U32 max_normal = gSavedSettings.getU32("PluginInstancesNormal");
 	U32 max_low = gSavedSettings.getU32("PluginInstancesLow");
@@ -819,6 +827,21 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 			new_priority = LLPluginClassMedia::PRIORITY_LOW;
 		}
 		
+		if(!inworld_media_enabled)
+		{
+			// If inworld media is locked out, force all inworld media to stay unloaded.
+			if(!pimpl->getUsedInUI())
+			{
+				new_priority = LLPluginClassMedia::PRIORITY_UNLOADED;
+				if(needs_first_run)
+				{
+					// Don't do this more than once in this loop.
+					needs_first_run = false;
+					LLViewerMedia::displayMediaFirstRun();
+				}
+			}
+		}
+		
 		pimpl->setPriority(new_priority);
 		
 		if(pimpl->getUsedInUI())
@@ -885,6 +908,61 @@ void LLViewerMedia::cleanupClass()
 	gIdleCallbacks.deleteFunction(LLViewerMedia::updateMedia, NULL);
 }
 
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::needsMediaFirstRun()
+{
+	return gWarningSettings.getBOOL("FirstStreamingMedia");
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::displayMediaFirstRun()
+{
+	gWarningSettings.setBOOL("FirstStreamingMedia", FALSE);
+
+	LLNotificationsUtil::add("ParcelCanPlayMedia", LLSD(), LLSD(),
+		boost::bind(firstRunCallback, _1, _2));
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::firstRunCallback(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if (option == 0)
+	{
+		// user has elected to automatically play media.
+		gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, TRUE);
+		gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
+		gSavedSettings.setBOOL("AudioStreamingMusic", TRUE);
+		gSavedSettings.setBOOL("AudioStreamingMedia", TRUE);
+
+		LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+				
+		if (parcel)
+		{
+			// play media right now, if available
+			LLViewerParcelMedia::play(parcel);
+		
+			// play music right now, if available
+			std::string music_url = parcel->getMusicURL();
+			if (gAudiop && !music_url.empty())
+				gAudiop->startInternetStream(music_url);
+		}
+	}
+	else
+	{
+		gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, FALSE);
+		gSavedSettings.setBOOL("AudioStreamingMedia", FALSE);
+		gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
+		gSavedSettings.setBOOL("AudioStreamingMusic", FALSE);
+	}
+	return false;
+}
+
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLViewerMediaImpl
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -927,6 +1005,9 @@ LLViewerMediaImpl::LLViewerMediaImpl(	  const LLUUID& texture_id,
 	mMediaAutoPlay(false),
 	mInNearbyMediaList(false),
 	mClearCache(false),
+	mBackgroundColor(LLColor4::white),
+	mNavigateSuspended(false),
+	mNavigateSuspendedDeferred(false),
 	mIsUpdated(false)
 { 
 
@@ -987,7 +1068,7 @@ void LLViewerMediaImpl::emitEvent(LLPluginClassMedia* plugin, LLViewerMediaObser
 bool LLViewerMediaImpl::initializeMedia(const std::string& mime_type)
 {
 	bool mimeTypeChanged = (mMimeType != mime_type);
-	bool pluginChanged = (LLMIMETypes::implType(mMimeType) != LLMIMETypes::implType(mime_type));
+	bool pluginChanged = (LLMIMETypes::implType(mCurrentMimeType) != LLMIMETypes::implType(mime_type));
 	
 	if(!mMediaSource || pluginChanged)
 	{
@@ -1127,6 +1208,9 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
 	// If we got here, we want to ignore previous init failures.
 	mMediaSourceFailed = false;
 
+	// Save the MIME type that really caused the plugin to load
+	mCurrentMimeType = mMimeType;
+
 	LLPluginClassMedia* media_source = newSourceFromMediaType(mMimeType, this, mMediaWidth, mMediaHeight);
 	
 	if (media_source)
@@ -1136,6 +1220,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
 		media_source->setAutoScale(mMediaAutoScale);
 		media_source->setBrowserUserAgent(LLViewerMedia::getCurrentUserAgent());
 		media_source->focus(mHasFocus);
+		media_source->setBackgroundColor(mBackgroundColor);
 		
 		if(mClearCache)
 		{
@@ -1161,7 +1246,24 @@ void LLViewerMediaImpl::loadURI()
 {
 	if(mMediaSource)
 	{
-		mMediaSource->loadURI( mMediaURL );
+		// *HACK: we don't know if the URI coming in is properly escaped
+		// (the contract doesn't specify whether it is escaped or not.
+		// but LLQtWebKit expects it to be, so we do our best to encode
+		// special characters)
+		// The strings below were taken right from http://www.ietf.org/rfc/rfc1738.txt
+		// Note especially that '%' and '/' are there.
+		std::string uri = LLURI::escape(mMediaURL,
+										"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+										"0123456789"
+										"$-_.+"
+										"!*'(),"
+										"{}|\\^~[]`"
+										"<>#%"
+										";/?:@&=",
+										false);
+		llinfos << "Asking media source to load URI: " << uri << llendl;
+		
+		mMediaSource->loadURI( uri );
 
 		if(mPreviousMediaState == MEDIA_PLAYING)
 		{
@@ -1563,6 +1665,7 @@ void LLViewerMediaImpl::unload()
 	mMediaURL.clear();
 	mMimeType.clear();
 	mCurrentMediaURL.clear();
+	mCurrentMimeType.clear();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -1612,6 +1715,13 @@ void LLViewerMediaImpl::navigateInternal()
 	// Helpful to have media urls in log file. Shouldn't be spammy.
 	llinfos << "media id= " << mTextureId << " url=" << mMediaURL << " mime_type=" << mMimeType << llendl;
 
+	if(mNavigateSuspended)
+	{
+		llwarns << "Deferring navigate." << llendl;
+		mNavigateSuspendedDeferred = true;
+		return;
+	}
+	
 	if(mMimeTypeProbe != NULL)
 	{
 		llwarns << "MIME type probe already in progress -- bailing out." << llendl;
@@ -1818,7 +1928,17 @@ void LLViewerMediaImpl::update()
 		return;
 	}
 	
+	// Make sure a navigate doesn't happen during the idle -- it can cause mMediaSource to get destroyed, which can cause a crash.
+	setNavigateSuspended(true);
+	
 	mMediaSource->idle();
+
+	setNavigateSuspended(false);
+
+	if(mMediaSource == NULL)
+	{
+		return;
+	}
 	
 	if(mMediaSource->isPluginExited())
 	{
@@ -1901,8 +2021,8 @@ LLViewerMediaTexture* LLViewerMediaImpl::updatePlaceholderImage()
 		|| placeholder_image->getUseMipMaps()
 		|| (placeholder_image->getWidth() != mMediaSource->getTextureWidth())
 		|| (placeholder_image->getHeight() != mMediaSource->getTextureHeight())
-		|| (mTextureUsedWidth > mMediaSource->getWidth())
-		|| (mTextureUsedHeight > mMediaSource->getHeight())
+		|| (mTextureUsedWidth != mMediaSource->getWidth())
+		|| (mTextureUsedHeight != mMediaSource->getHeight())
 		)
 	{
 		LL_DEBUGS("Media") << "initializing media placeholder" << LL_ENDL;
@@ -1920,7 +2040,9 @@ LLViewerMediaTexture* LLViewerMediaImpl::updatePlaceholderImage()
 		// MEDIAOPT: seems insane that we actually have to make an imageraw then
 		// immediately discard it
 		LLPointer<LLImageRaw> raw = new LLImageRaw(texture_width, texture_height, texture_depth);
-		raw->clear(0x00, 0x00, 0x00, 0xff);
+		// Clear the texture to the background color, ignoring alpha.
+		// convert background color channels from [0.0, 1.0] to [0, 255];
+		raw->clear(int(mBackgroundColor.mV[VX] * 255.0f), int(mBackgroundColor.mV[VY] * 255.0f), int(mBackgroundColor.mV[VZ] * 255.0f), 0xff);
 		int discard_level = 0;
 
 		// ask media source for correct GL image format constants
@@ -2123,7 +2245,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
 			
 			// TODO: may want a different message for this case?
 			LLSD args;
-			args["PLUGIN"] = LLMIMETypes::implType(mMimeType);
+			args["PLUGIN"] = LLMIMETypes::implType(mCurrentMimeType);
 			LLNotificationsUtil::add("MediaPluginFailed", args);
 		}
 		break;
@@ -2137,7 +2259,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
 			resetPreviousMediaState();
 
 			LLSD args;
-			args["PLUGIN"] = LLMIMETypes::implType(mMimeType);
+			args["PLUGIN"] = LLMIMETypes::implType(mCurrentMimeType);
 			// SJB: This is getting called every frame if the plugin fails to load, continuously respawining the alert!
 			//LLNotificationsUtil::add("MediaPluginFailed", args);
 		}
@@ -2391,6 +2513,16 @@ void LLViewerMediaImpl::setUsedInUI(bool used_in_ui)
 	}
 };
 
+void LLViewerMediaImpl::setBackgroundColor(LLColor4 color)
+{
+	mBackgroundColor = color; 
+
+	if(mMediaSource)
+	{
+		mMediaSource->setBackgroundColor(mBackgroundColor);
+	}
+};
+
 F64 LLViewerMediaImpl::getCPUUsage() const
 {
 	F64 result = 0.0f;
@@ -2463,6 +2595,23 @@ void LLViewerMediaImpl::setNavState(EMediaNavState state)
 	}
 }
 
+void LLViewerMediaImpl::setNavigateSuspended(bool suspend)
+{
+	if(mNavigateSuspended != suspend)
+	{
+		mNavigateSuspended = suspend;
+		if(!suspend)
+		{
+			// We're coming out of suspend.  If someone tried to do a navigate while suspended, do one now instead.
+			if(mNavigateSuspendedDeferred)
+			{
+				mNavigateSuspendedDeferred = false;
+				navigateInternal();
+			}
+		}
+	}
+}
+
 void LLViewerMediaImpl::cancelMimeTypeProbe()
 {
 	if(mMimeTypeProbe != NULL)
@@ -2537,76 +2686,3 @@ void LLViewerMediaImpl::setTextureID(LLUUID id)
 	}
 }
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-//static
-void LLViewerMedia::toggleMusicPlay(void*)
-{
-// FIXME: This probably doesn't belong here
-#if 0
-	if (mMusicState != PLAYING)
-	{
-		mMusicState = PLAYING; // desired state
-		if (gAudiop)
-		{
-			LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-			if ( parcel )
-			{
-				gAudiop->startInternetStream(parcel->getMusicURL());
-			}
-		}
-	}
-	else
-	{
-		mMusicState = STOPPED; // desired state
-		if (gAudiop)
-		{
-			gAudiop->stopInternetStream();
-		}
-	}
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-//static
-void LLViewerMedia::toggleMediaPlay(void*)
-{
-// FIXME: This probably doesn't belong here
-#if 0
-	if (LLViewerMedia::isMediaPaused())
-	{
-		LLViewerParcelMedia::start();
-	}
-	else if(LLViewerMedia::isMediaPlaying())
-	{
-		LLViewerParcelMedia::pause();
-	}
-	else
-	{
-		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-		if (parcel)
-		{
-			LLViewerParcelMedia::play(parcel);
-		}
-	}
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-//static
-void LLViewerMedia::mediaStop(void*)
-{
-// FIXME: This probably doesn't belong here
-#if 0
-	LLViewerParcelMedia::stop();
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-//static 
-bool LLViewerMedia::isMusicPlaying()
-{	
-// FIXME: This probably doesn't belong here
-// FIXME: make this work
-	return false;	
-}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 28fb379960..ff18ed605a 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -42,6 +42,7 @@
 #include "llviewermediaobserver.h"
 
 #include "llpluginclassmedia.h"
+#include "v4color.h"
 
 class LLViewerMediaImpl;
 class LLUUID;
@@ -99,14 +100,10 @@ class LLViewerMedia
 		static void setVolume(F32 volume);
 
 		static void updateMedia(void* dummy_arg = NULL);
-		static bool isMusicPlaying();
 
 		static void initClass();
 		static void cleanupClass();
 
-		static void toggleMusicPlay(void*);
-		static void toggleMediaPlay(void*);
-		static void mediaStop(void*);
 		static F32 getVolume();	
 		static void muteListChanged();
 		static void setInWorldMediaDisabled(bool disabled);
@@ -119,6 +116,12 @@ class LLViewerMedia
 		
 		// This is the comparitor used to sort the list.
 		static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
+		
+		// For displaying the media first-run dialog.
+		static bool needsMediaFirstRun();
+		static void displayMediaFirstRun();
+		static bool firstRunCallback(const LLSD& notification, const LLSD& response);
+
 };
 
 // Implementation functions not exported into header file
@@ -127,7 +130,10 @@ class LLViewerMediaImpl
 {
 	LOG_CLASS(LLViewerMediaImpl);
 public:
-
+	
+	friend class LLViewerMedia;
+	friend class LLMimeDiscoveryResponder;
+	
 	LLViewerMediaImpl(
 		const LLUUID& texture_id,
 		S32 media_width, 
@@ -187,6 +193,7 @@ public:
 	std::string getMediaURL() const { return mMediaURL; }
 	std::string getCurrentMediaURL();
 	std::string getHomeURL() { return mHomeURL; }
+	std::string getMediaEntryURL() { return mMediaEntryURL; }
     void setHomeURL(const std::string& home_url) { mHomeURL = home_url; };
 	void clearCache();
 	std::string getMimeType() { return mMimeType; }
@@ -205,11 +212,15 @@ public:
 	bool isMediaPaused();
 	bool hasMedia() const;
 	bool isMediaFailed() const { return mMediaSourceFailed; };
+	void setMediaFailed(bool val) { mMediaSourceFailed = val; }
 	void resetPreviousMediaState();
 	
 	void setDisabled(bool disabled);
 	bool isMediaDisabled() const { return mIsDisabled; };
-
+	
+	void setInNearbyMediaList(bool in_list) { mInNearbyMediaList = in_list; }
+	bool getInNearbyMediaList() { return mInNearbyMediaList; }
+	
 	// returns true if this instance should not be loaded (disabled, muted object, crashed, etc.)
 	bool isForcedUnloaded() const;
 	
@@ -285,6 +296,8 @@ public:
 	// This will be used as part of the interest sorting algorithm.
 	void setUsedInUI(bool used_in_ui);
 	bool getUsedInUI() const { return mUsedInUI; };
+
+	void setBackgroundColor(LLColor4 color);
 	
 	F64 getCPUUsage() const;
 	
@@ -313,8 +326,12 @@ public:
 	EMediaNavState getNavState() { return mMediaNavState; }
 	void setNavState(EMediaNavState state);
 	
+	void setNavigateSuspended(bool suspend);
+	bool isNavigateSuspended() { return mNavigateSuspended; };
+	
 	void cancelMimeTypeProbe();
-public:
+	
+private:
 	// a single media url with some data and an impl.
 	LLPluginClassMedia* mMediaSource;
 	LLUUID mTextureId;
@@ -323,6 +340,7 @@ public:
 	std::string mHomeURL;
 	std::string mMimeType;
 	std::string mCurrentMediaURL;	// The most current media url from the plugin (via the "location changed" or "navigate complete" events).
+	std::string mCurrentMimeType;	// The MIME type that caused the currently loaded plugin to be loaded.
 	S32 mLastMouseX;	// save the last mouse coord we get, so when we lose capture we can simulate a mouseup at that point.
 	S32 mLastMouseY;
 	S32 mMediaWidth;
@@ -357,6 +375,9 @@ public:
 	std::string mMediaEntryURL;
 	bool mInNearbyMediaList;	// used by LLFloaterNearbyMedia::refreshList() for performance reasons
 	bool mClearCache;
+	LLColor4 mBackgroundColor;
+	bool mNavigateSuspended;
+	bool mNavigateSuspendedDeferred;
 	
 private:
 	BOOL mIsUpdated ;
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
index e9293ac5a4..67b051e536 100644
--- a/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/indra/newview/llviewermedia_streamingaudio.cpp
@@ -62,7 +62,7 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
 	if (!mMediaPlugin) // lazy-init the underlying media plugin
 	{
 		mMediaPlugin = initializeMedia("audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
-		llinfos << "steaming audio mMediaPlugin is now " << mMediaPlugin << llendl;
+		llinfos << "streaming audio mMediaPlugin is now " << mMediaPlugin << llendl;
 	}
 
 	if(!mMediaPlugin)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 15855f154d..3f556e5608 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -48,11 +48,10 @@
 #include "llconsole.h"
 #include "lldebugview.h"
 #include "llfilepicker.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
 #include "llfloaterbuycurrency.h"
-#include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterchatterbox.h"
 #include "llfloatergodtools.h"
@@ -62,6 +61,7 @@
 #include "llfloaterreporter.h"
 #include "llfloatersearch.h"
 #include "llfloaterscriptdebug.h"
+#include "llfloatersnapshot.h"
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 #include "llavataractions.h"
@@ -436,17 +436,7 @@ void init_menus()
 	gMenuBarView->setBackgroundColor( color );
 
 	gMenuHolder->addChild(gMenuBarView);
-	
-	// menu holder appears on top of menu bar so you can see the menu title
-	// flash when an item is triggered (the flash occurs in the holder)
-	gViewerWindow->getRootView()->addChild(gMenuHolder);
-
-	// This removes tool tip view from main view and adds it
-	// to root view in front of menu holder.
-	// Otherwise tool tips for menu items would be overlapped by menu, since
-	// main view is behind of menu holder now.
-	gViewerWindow->getRootView()->addChild(gToolTipView);
-   
+  
     gViewerWindow->setMenuBackgroundColor(false, 
         LLViewerLogin::getInstance()->isInProductionGrid());
 
@@ -2466,7 +2456,7 @@ class LLViewJoystickFlycam : public view_listener_t
 class LLViewCheckJoystickFlycam : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
-		{
+	{
 		bool new_value = LLViewerJoystick::getInstance()->getOverrideCamera();
 		return new_value;
 	}
@@ -2500,7 +2490,7 @@ class LLObjectBuild : public view_listener_t
 		LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
 
 		// Could be first use
-		LLFirstUse::useBuild();
+		//LLFirstUse::useBuild();
 		return true;
 	}
 };
@@ -2545,7 +2535,7 @@ void handle_object_edit()
 	LLViewerJoystick::getInstance()->setNeedsReset(true);
 	
 	// Could be first use
-	LLFirstUse::useBuild();
+	//LLFirstUse::useBuild();
 	return;
 }
 
@@ -2596,7 +2586,7 @@ class LLLandBuild : public view_listener_t
 		LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
 
 		// Could be first use
-		LLFirstUse::useBuild();
+		//LLFirstUse::useBuild();
 		return true;
 	}
 };
@@ -2833,7 +2823,7 @@ bool handle_go_to()
 	}
 
 	// Could be first use
-	LLFirstUse::useGoTo();
+	//LLFirstUse::useGoTo();
 	return true;
 }
 
@@ -3374,14 +3364,49 @@ void handle_show_side_tray()
 	root->addChild(side_tray);
 }
 
-class LLShowPanelPeopleTab : public view_listener_t
+// Toggle one of "People" panel tabs in side tray.
+class LLTogglePanelPeopleTab : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		// Open tab of the "People" panel in side tray.
+		std::string panel_name = userdata.asString();
+
 		LLSD param;
-		param["people_panel_tab_name"] = userdata.asString();
-		LLSideTray::getInstance()->showPanel("panel_people", param);
+		param["people_panel_tab_name"] = panel_name;
+
+		static LLPanel* friends_panel = NULL;
+		static LLPanel* groups_panel = NULL;
+		static LLPanel* nearby_panel = NULL;
+
+		if (panel_name == "friends_panel")
+		{
+			return togglePeoplePanel(friends_panel, panel_name, param);
+		}
+		else if (panel_name == "groups_panel")
+		{
+			return togglePeoplePanel(groups_panel, panel_name, param);
+		}
+		else if (panel_name == "nearby_panel")
+		{
+			return togglePeoplePanel(nearby_panel, panel_name, param);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	static bool togglePeoplePanel(LLPanel* &panel, const std::string& panel_name, const LLSD& param)
+	{
+		if(!panel)
+		{
+			panel = LLSideTray::getInstance()->getPanel(panel_name);
+			if(!panel)
+				return false;
+		}
+
+		LLSideTray::getInstance()->togglePanel(panel, "panel_people", param);
+
 		return true;
 	}
 };
@@ -3635,7 +3660,7 @@ void near_sit_down_point(BOOL success, void *)
 		gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 
 		// Might be first sit
-		LLFirstUse::useSit();
+		//LLFirstUse::useSit();
 	}
 }
 
@@ -3704,6 +3729,7 @@ void reset_view_final( BOOL proceed )
 	}
 
 	gAgent.resetView(TRUE, TRUE);
+	gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
 }
 
 class LLViewLookAtLastChatter : public view_listener_t
@@ -5152,7 +5178,7 @@ void toggle_debug_menus(void*)
 	gSavedSettings.setBOOL("UseDebugMenus", visible);
 	if(visible)
 	{
-		LLFirstUse::useDebugMenus();
+		//LLFirstUse::useDebugMenus();
 	}
 	show_debug_menus();
 }
@@ -5856,8 +5882,12 @@ void confirm_replace_attachment(S32 option, void* user_data)
 	}
 }
 
-bool callback_attachment_drop(const LLSD& notification, const LLSD& response)
+void callback_attachment_drop(const LLSD& notification, const LLSD& response)
 {
+	// Ensure user confirmed the drop
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if (option != 0) return;
+
 	// Called when the user clicked on an object attached to them
 	// and selected "Drop".
 	LLUUID object_id = notification["payload"]["object_id"].asUUID();
@@ -5866,7 +5896,7 @@ bool callback_attachment_drop(const LLSD& notification, const LLSD& response)
 	if (!object)
 	{
 		llwarns << "handle_drop_attachment() - no object to drop" << llendl;
-		return true;
+		return;
 	}
 
 	LLViewerObject *parent = (LLViewerObject*)object->getParent();
@@ -5883,13 +5913,13 @@ bool callback_attachment_drop(const LLSD& notification, const LLSD& response)
 	if (!object)
 	{
 		llwarns << "handle_detach() - no object to detach" << llendl;
-		return true;
+		return;
 	}
 
 	if (object->isAvatar())
 	{
 		llwarns << "Trying to detach avatar from avatar." << llendl;
-		return true;
+		return;
 	}
 	
 	// reselect the object
@@ -5897,7 +5927,7 @@ bool callback_attachment_drop(const LLSD& notification, const LLSD& response)
 
 	LLSelectMgr::getInstance()->sendDropAttachment();
 
-	return true;
+	return;
 }
 
 class LLAttachmentDrop : public view_listener_t
@@ -6344,49 +6374,55 @@ class LLToolsSelectedScriptAction : public view_listener_t
 void handle_selected_texture_info(void*)
 {
 	for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
-		 iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
+   		iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
 	{
 		LLSelectNode* node = *iter;
-		
-		std::string msg;
-		msg.assign("Texture info for: ");
-		msg.append(node->mName);
-		LLChat chat(msg);
-		LLFloaterChat::addChat(chat);
-
-		U8 te_count = node->getObject()->getNumTEs();
-		// map from texture ID to list of faces using it
-		typedef std::map< LLUUID, std::vector<U8> > map_t;
-		map_t faces_per_texture;
-		for (U8 i = 0; i < te_count; i++)
-		{
-			if (!node->isTESelected(i)) continue;
-
-			LLViewerTexture* img = node->getObject()->getTEImage(i);
-			LLUUID image_id = img->getID();
-			faces_per_texture[image_id].push_back(i);
-		}
-		// Per-texture, dump which faces are using it.
-		map_t::iterator it;
-		for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
-		{
-			LLUUID image_id = it->first;
-			U8 te = it->second[0];
-			LLViewerTexture* img = node->getObject()->getTEImage(te);
-			S32 height = img->getHeight();
-			S32 width = img->getWidth();
-			S32 components = img->getComponents();
-			msg = llformat("%dx%d %s on face ",
-								width,
-								height,
-								(components == 4 ? "alpha" : "opaque"));
-			for (U8 i = 0; i < it->second.size(); ++i)
-			{
-				msg.append( llformat("%d ", (S32)(it->second[i])));
-			}
-			LLChat chat(msg);
-			LLFloaterChat::addChat(chat);
-		}
+	   	
+   		std::string msg;
+   		msg.assign("Texture info for: ");
+   		msg.append(node->mName);
+
+		//TODO* CHAT: how to show this?
+		//LLSD args;
+		//args["MESSAGE"] = msg;
+		//LLNotificationsUtil::add("SystemMessage", args);
+	   
+   		U8 te_count = node->getObject()->getNumTEs();
+   		// map from texture ID to list of faces using it
+   		typedef std::map< LLUUID, std::vector<U8> > map_t;
+   		map_t faces_per_texture;
+   		for (U8 i = 0; i < te_count; i++)
+   		{
+   			if (!node->isTESelected(i)) continue;
+	   
+   			LLViewerTexture* img = node->getObject()->getTEImage(i);
+   			LLUUID image_id = img->getID();
+   			faces_per_texture[image_id].push_back(i);
+   		}
+   		// Per-texture, dump which faces are using it.
+   		map_t::iterator it;
+   		for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
+   		{
+   			LLUUID image_id = it->first;
+   			U8 te = it->second[0];
+   			LLViewerTexture* img = node->getObject()->getTEImage(te);
+   			S32 height = img->getHeight();
+   			S32 width = img->getWidth();
+   			S32 components = img->getComponents();
+   			msg = llformat("%dx%d %s on face ",
+   								width,
+   								height,
+   								(components == 4 ? "alpha" : "opaque"));
+   			for (U8 i = 0; i < it->second.size(); ++i)
+   			{
+   				msg.append( llformat("%d ", (S32)(it->second[i])));
+   			}
+
+			//TODO* CHAT: how to show this?
+			//LLSD args;
+			//args["MESSAGE"] = msg;
+			//LLNotificationsUtil::add("SystemMessage", args);
+   		}
 	}
 }
 
@@ -7902,7 +7938,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
 
 	// we don't use boost::bind directly to delay side tray construction
-	view_listener_t::addMenu( new LLShowPanelPeopleTab(), "SideTray.PanelPeopleTab");
+	view_listener_t::addMenu( new LLTogglePanelPeopleTab(), "SideTray.PanelPeopleTab");
 
 	 // Avatar pie menu
 	view_listener_t::addMenu(new LLObjectMute(), "Avatar.Mute");
@@ -7953,8 +7989,8 @@ void initialize_menus()
 
 	enable.add("Avatar.EnableMute", boost::bind(&enable_object_mute));
 	enable.add("Object.EnableMute", boost::bind(&enable_object_mute));
-
 	enable.add("Object.EnableBuy", boost::bind(&enable_buy_object));
+	commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom"));
 
 	// Attachment pie menu
 	enable.add("Attachment.Label", boost::bind(&onEnableAttachmentLabel, _1, _2));
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6f9e551649..7487fa9997 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -51,10 +51,9 @@
 
 #include "llagent.h"
 #include "llcallingcard.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterbuyland.h"
-#include "llfloaterchat.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
@@ -79,6 +78,7 @@
 #include "llstatenums.h"
 #include "llstatusbar.h"
 #include "llimview.h"
+#include "llspeakers.h"
 #include "lltrans.h"
 #include "llviewerfoldertype.h"
 #include "lluri.h"
@@ -711,6 +711,18 @@ protected:
 	}
  };
 
+class LLOpenTaskGroupOffer : public LLInventoryAddedObserver
+{
+protected:
+	/*virtual*/ void done()
+	{
+		open_inventory_offer(mAdded, "group_offer");
+		mAdded.clear();
+		gInventory.removeObserver(this);
+		delete this;
+	}
+};
+
 //one global instance to bind them
 LLOpenTaskOffer* gNewInventoryObserver=NULL;
 
@@ -726,6 +738,7 @@ void start_new_inventory_observer()
 
 class LLDiscardAgentOffer : public LLInventoryFetchComboObserver
 {
+	LOG_CLASS(LLDiscardAgentOffer);
 public:
 	LLDiscardAgentOffer(const LLUUID& folder_id, const LLUUID& object_id) :
 		mFolderID(folder_id),
@@ -822,9 +835,13 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 				}
 				message << ", automatic preview disabled for "
 					<< OFFER_THROTTLE_TIME << " seconds.";
-				chat.mText = message.str();
+				
 				//this is kinda important, so actually put it on screen
-				LLFloaterChat::addChat(chat, FALSE, FALSE);
+				std::string log_msg = message.str();
+				LLSD args;
+				args["MESSAGE"] = log_msg;
+				LLNotificationsUtil::add("SystemMessage", args);
+
 				throttle_logged=true;
 			}
 			return false;
@@ -892,6 +909,14 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
 						LLSideTray::getInstance()->showPanel("panel_places", 
 								LLSD().with("type", "landmark").with("id", item->getUUID()));
 					}
+					else if("group_offer" == from_name)
+					{
+						// do not open inventory when we open group notice attachment because 
+						// we already opened landmark info panel
+						// "group_offer" is passed by LLOpenTaskGroupOffer
+
+						continue;
+					}
 					else if(from_name.empty())
 					{
 						// we receive a message from LLOpenTaskOffer, it mean that new landmark has been added.
@@ -904,7 +929,19 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
 						LLPanelPlaces *places_panel = dynamic_cast<LLPanelPlaces*>(LLSideTray::getInstance()->showPanel("panel_places", LLSD()));
 						if (places_panel)
 						{
-							places_panel->setItem(item);
+							// we are creating a landmark
+							if("create_landmark" == places_panel->getPlaceInfoType() && !places_panel->getItem())
+							{
+								places_panel->setItem(item);
+							}
+							// we are opening a group notice attachment
+							else
+							{
+								LLSD args;
+								args["type"] = "landmark";
+								args["id"] = item_id;
+								LLSideTray::getInstance()->showPanel("panel_places", args);
+							}
 						}
 					}
 				}
@@ -917,9 +954,6 @@ void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& f
 			  case LLAssetType::AT_ANIMATION:
 				  LLFloaterReg::showInstance("preview_anim", LLSD(item_id), take_focus);
 				  break;
-			  case LLAssetType::AT_GESTURE:
-				  LLFloaterReg::showInstance("preview_gesture", LLSD(item_id), take_focus);
-				  break;
 			  case LLAssetType::AT_SCRIPT:
 				  LLFloaterReg::showInstance("preview_script", LLSD(item_id), take_focus);
 				  break;
@@ -1093,33 +1127,11 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	// * callback may be called immediately,
 	// * adding the mute sends a message,
 	// * we can't build two messages at once.
-	if (2 == button)
+	if (2 == button) // Block
 	{
 		gCacheName->get(mFromID, mFromGroup, boost::bind(&inventory_offer_mute_callback,_1,_2,_3,_4,this));
 	}
 
-	// *NOTE dzaporozhan
-	// Restored from viewer-1-23 to fix EXT-3520
-	// Saves Group Notice Attachments to inventory.
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_ImprovedInstantMessage);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->nextBlockFast(_PREHASH_MessageBlock);
-	msg->addBOOLFast(_PREHASH_FromGroup, FALSE);
-	msg->addUUIDFast(_PREHASH_ToAgentID, mFromID);
-	msg->addU8Fast(_PREHASH_Offline, IM_ONLINE);
-	msg->addUUIDFast(_PREHASH_ID, mTransactionID);
-	msg->addU32Fast(_PREHASH_Timestamp, NO_TIMESTAMP); // no timestamp necessary
-	std::string name;
-	LLAgentUI::buildFullname(name);
-	msg->addStringFast(_PREHASH_FromAgentName, name);
-	msg->addStringFast(_PREHASH_Message, ""); 
-	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
-	msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
-	msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
-
 	std::string from_string; // Used in the pop-up.
 	std::string chatHistory_string;  // Used in chat history.
 	
@@ -1155,8 +1167,11 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				}
 			}
 			break;
-		case IM_TASK_INVENTORY_OFFERED:
 		case IM_GROUP_NOTICE:
+			opener = new LLOpenTaskGroupOffer;
+			send_auto_receive_response();
+			break;
+		case IM_TASK_INVENTORY_OFFERED:
 		case IM_GROUP_NOTICE_REQUESTED:
 			// This is an offer from a task or group.
 			// We don't use a new instance of an opener
@@ -1171,16 +1186,13 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		// end switch (mIM)
 			
 	case IOR_ACCEPT:
-		msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1));
-		msg->addBinaryDataFast(_PREHASH_BinaryBucket, &(mFolderID.mData), sizeof(mFolderID.mData));
-		msg->sendReliable(mHost);
-
 		//don't spam them if they are getting flooded
 		if (check_offer_throttle(mFromName, true))
 		{
 			log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
-			chat.mText = log_message;
-			LLFloaterChat::addChatHistory(chat);
+			LLSD args;
+			args["MESSAGE"] = log_message;
+			LLNotificationsUtil::add("SystemMessage", args);
 		}
 		break;
 
@@ -1197,7 +1209,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			{
 				chat.mMuted = TRUE;
 			}
-			LLFloaterChat::addChatHistory(chat);
+
+			// *NOTE dzaporozhan
+			// Disabled logging to old chat floater to fix crash in group notices - EXT-4149
+			// LLFloaterChat::addChatHistory(chat);
 			
 			LLInventoryFetchComboObserver::folder_ref_t folders;
 			LLInventoryFetchComboObserver::item_ref_t items;
@@ -1350,8 +1365,10 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
 			if (check_offer_throttle(mFromName, true))
 			{
 				log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
-				chat.mText = log_message;
-				LLFloaterChat::addChatHistory(chat);
+				//TODO* CHAT: how to show this?
+				//LLSD args;
+				//args["MESSAGE"] = log_message;
+				//LLNotificationsUtil::add("SystemMessage", args);
 			}
 			
 			// we will want to open this item when it comes back.
@@ -1393,13 +1410,11 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
 			// send the message
 			msg->sendReliable(mHost);
 			
-			log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +".";
-			chat.mText = log_message;
-			if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) )  // muting for SL-42269
-			{
-				chat.mMuted = TRUE;
-			}
-			LLFloaterChat::addChatHistory(chat);
+			//TODO* CHAT: how to show this?
+			//log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +".";
+			//LLSD args;
+			//args["MESSAGE"] = log_message;
+			//LLNotificationsUtil::add("SystemMessage", args);
 			
 			if (busy &&	(!mFromGroup && !mFromObject))
 			{
@@ -1761,17 +1776,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				region_id,
 				position,
 				true);
-
-			// pretend this is chat generated by self, so it does not show up on screen
-			chat.mText = std::string("IM: ") + name + separator_string + message;
-			LLFloaterChat::addChat( chat, TRUE, TRUE );
 		}
 		else if (from_id.isNull())
 		{
-			// Messages from "Second Life" ID don't go to IM history
-			// messages which should be routed to IM window come from a user ID with name=SYSTEM_NAME
-			chat.mText = name + ": " + message;
-			LLFloaterChat::addChat(chat, FALSE, FALSE);
+			LLSD args;
+			args["MESSAGE"] = message;
+			LLNotificationsUtil::add("SystemMessage", args);
 		}
 		else if (to_id.isNull())
 		{
@@ -1821,19 +1831,18 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					region_id,
 					position,
 					true);
-				chat.mText = std::string("IM: ") + name + separator_string + saved + message;
-
-				BOOL local_agent = FALSE;
-				LLFloaterChat::addChat( chat, TRUE, local_agent );
 			}
 			else
 			{
 				// muted user, so don't start an IM session, just record line in chat
 				// history.  Pretend the chat is from a local agent,
 				// so it will go into the history but not be shown on screen.
-				chat.mText = buffer;
-				BOOL local_agent = TRUE;
-				LLFloaterChat::addChat( chat, TRUE, local_agent );
+
+				//TODO* CHAT: how to show this?
+				//and this is not system message...
+				//LLSD args;
+				//args["MESSAGE"] = buffer;
+				//LLNotificationsUtil::add("SystemMessage", args);
 			}
 		}
 		break;
@@ -2000,7 +2009,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		// Someone has offered us some inventory.
 		{
 			LLOfferInfo* info = new LLOfferInfo;
-			bool mute_im = false;
 			if (IM_INVENTORY_OFFERED == dialog)
 			{
 				struct offer_agent_bucket_t
@@ -2017,11 +2025,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				bucketp = (struct offer_agent_bucket_t*) &binary_bucket[0];
 				info->mType = (LLAssetType::EType) bucketp->asset_type;
 				info->mObjectID = bucketp->object_id;
-				
-				if(accept_im_from_only_friend&&!is_friend)
-				{
-					mute_im = true;
-				}
 			}
 			else
 			{
@@ -2052,8 +2055,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			info->mDesc = message;
 			info->mHost = msg->getSender();
 			//if (((is_busy && !is_owned_by_me) || is_muted))
-			if ( is_muted || mute_im)
+			if (is_muted)
 			{
+				// Prefetch the offered item so that it can be discarded by the appropriate observer. (EXT-4331)
+				LLInventoryFetchObserver::item_ref_t items;
+				items.push_back(info->mObjectID);
+				LLInventoryFetchObserver* fetch_item = new LLInventoryFetchObserver();
+				fetch_item->fetchItems(items);
+				delete fetch_item;
+
 				// Same as closing window
 				info->forceResponse(IOR_DECLINE);
 			}
@@ -2130,9 +2140,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			region_id,
 			position,
 			true);
-
-		chat.mText = std::string("IM: ") + name + separator_string +  saved + message;
-		LLFloaterChat::addChat(chat, TRUE, is_this_agent);
 	}
 	break;
 
@@ -2146,6 +2153,48 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// Build a link to open the object IM info window.
 			std::string location = ll_safe_string((char*)binary_bucket, binary_bucket_size-1);
 
+			if (session_id.notNull())
+			{
+				chat.mFromID = session_id;
+			}
+			else
+			{
+				// This message originated on a region without the updated code for task id and slurl information.
+				// We just need a unique ID for this object that isn't the owner ID.
+				// If it is the owner ID it will overwrite the style that contains the link to that owner's profile.
+				// This isn't ideal - it will make 1 style for all objects owned by the the same person/group.
+				// This works because the only thing we can really do in this case is show the owner name and link to their profile.
+				chat.mFromID = from_id ^ gAgent.getSessionID();
+			}
+
+			LLSD query_string;
+			query_string["owner"] = from_id;
+			query_string["slurl"] = location;
+			query_string["name"] = name;
+			if (from_group)
+			{
+				query_string["groupowned"] = "true";
+			}	
+
+			std::ostringstream link;
+			link << "secondlife:///app/objectim/" << session_id << LLURI::mapToQueryString(query_string);
+
+			chat.mURL = link.str();
+			chat.mText = message;
+			chat.mSourceType = CHAT_SOURCE_OBJECT;
+
+			// Note: lie to Nearby Chat, pretending that this is NOT an IM, because
+			// IMs from obejcts don't open IM sessions.
+			LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+			if(nearby_chat)
+			{
+				nearby_chat->addMessage(chat);
+			}
+
+
+			//Object IMs send with from name: 'Second Life' need to be displayed also in notification toasts (EXT-1590)
+			if (SYSTEM_FROM != name) break;
+			
 			LLSD substitutions;
 			substitutions["NAME"] = name;
 			substitutions["MSG"] = message;
@@ -2637,25 +2686,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 		chat.mMuted = is_muted && !is_linden;
 
-		if (!visible_in_chat_bubble 
-			&& (is_linden || !is_busy || is_owned_by_me))
-		{
-			// show on screen and add to history
-			LLNotificationsUI::LLNotificationManager::instance().onChat(
-					chat, LLNotificationsUI::NT_NEARBYCHAT);
-
-            // adding temporarily so that communications window chat bar 
-            // works until the new chat window is ready
-			chat.mText = from_name + ": " + chat.mText;
-			LLFloaterChat::addChat(chat, FALSE, FALSE);
-		}
-		else
-		{
-			LLNotificationsUI::LLNotificationManager::instance().onChat(
+		LLNotificationsUI::LLNotificationManager::instance().onChat(
 					chat, LLNotificationsUI::NT_NEARBYCHAT);
-			// adding temporarily
-			LLFloaterChat::addChatHistory(chat);
-		}
 	}
 }
 
@@ -3040,9 +3072,11 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 		if (avatarp)
 		{
 			// Chat the "back" SLURL. (DEV-4907)
-			LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
-			chat.mSourceType = CHAT_SOURCE_SYSTEM;
- 		    LLFloaterChat::addChatHistory(chat);
+
+			//TODO* CHAT: how to show this?
+			//LLSD args;
+			//args["MESSAGE"] = message;
+			//LLNotificationsUtil::add("SystemMessage", args);
 
 			// Set the new position
 			avatarp->setPositionAgent(agent_pos);
@@ -4348,10 +4382,10 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 
 	if (gStatusBar)
 	{
-		S32 old_balance = gStatusBar->getBalance();
+	//	S32 old_balance = gStatusBar->getBalance();
 
 		// This is an update, not the first transmission of balance
-		if (old_balance != 0)
+	/*	if (old_balance != 0)
 		{
 			// this is actually an update
 			if (balance > old_balance)
@@ -4363,7 +4397,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 				LLFirstUse::useBalanceDecrease(balance - old_balance);
 			}
 		}
-
+	 */
 		gStatusBar->setBalance(balance);
 		gStatusBar->setLandCredit(credit);
 		gStatusBar->setLandCommitted(committed);
@@ -5373,8 +5407,24 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response)
 			it != notification["payload"]["ids"].endArray();
 			++it)
 		{
+			LLUUID target_id = it->asUUID();
+
 			msg->nextBlockFast(_PREHASH_TargetData);
-			msg->addUUIDFast(_PREHASH_TargetID, it->asUUID());
+			msg->addUUIDFast(_PREHASH_TargetID, target_id);
+
+			// Record the offer.
+			{
+				std::string target_name;
+				gCacheName->getFullName(target_id, target_name);
+				LLSD args;
+				args["TO_NAME"] = target_name;
+	
+				LLSD payload;
+				payload["from_id"] = target_id;
+				payload["SESSION_NAME"] = target_name;
+				payload["SUPPRESS_TOAST"] = true;
+				LLNotificationsUtil::add("TeleportOfferSent", args, payload);
+			}
 		}
 		gAgent.sendReliableMessage();
 	}
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 90a7ee98b9..e8b435fc8f 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -34,6 +34,7 @@
 #include "llviewerparcelmedia.h"
 
 #include "llagent.h"
+#include "llaudioengine.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"
 #include "llviewerregion.h"
@@ -44,7 +45,7 @@
 #include "llviewermediafocus.h"
 #include "llviewerparcelmediaautoplay.h"
 #include "llnotificationsutil.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llpluginclassmedia.h"
 #include "llviewertexture.h"
 
@@ -55,10 +56,6 @@ LLUUID LLViewerParcelMedia::sMediaRegionID;
 viewer_media_t LLViewerParcelMedia::sMediaImpl;
 
 
-// Local functions
-bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
-
-
 // static
 void LLViewerParcelMedia::initClass()
 {
@@ -109,12 +106,12 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 			std::string mediaCurrentUrl = std::string( parcel->getMediaCurrentURL());
 
 			// First use warning
-			if(	! mediaUrl.empty() && gWarningSettings.getBOOL("FirstStreamingVideo") )
+			if( (!mediaUrl.empty() ||
+			     !parcel->getMusicURL().empty())
+			    && LLViewerMedia::needsMediaFirstRun())
 			{
-				LLNotificationsUtil::add("ParcelCanPlayMedia", LLSD(), LLSD(),
-					boost::bind(callback_play_media, _1, _2, parcel));
+				LLViewerMedia::displayMediaFirstRun();
 				return;
-
 			}
 
 			// if we have a current (link sharing) url, use it instead
@@ -182,7 +179,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 
 	if (!parcel) return;
 
-	if (!gSavedSettings.getBOOL("AudioSteamingMedia") || !gSavedSettings.getBOOL("AudioStreamingVideo"))
+	if (!gSavedSettings.getBOOL("AudioStreamingMedia") || !gSavedSettings.getBOOL("AudioStreamingVideo"))
 		return;
 
 	std::string media_url = parcel->getMediaURL();
@@ -245,7 +242,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 		sMediaImpl->navigateTo(media_url, mime_type, true);
 	}
 
-	LLFirstUse::useMedia();
+	//LLFirstUse::useMedia();
 
 	LLViewerParcelMediaAutoPlay::playStarted();
 }
@@ -284,7 +281,7 @@ void LLViewerParcelMedia::start()
 	}
 	sMediaImpl->start();
 
-	LLFirstUse::useMedia();
+	//LLFirstUse::useMedia();
 
 	LLViewerParcelMediaAutoPlay::playStarted();
 }
@@ -588,24 +585,6 @@ void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 	};
 }
 
-bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	if (option == 0)
-	{
-		gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
-		if(!gSavedSettings.getBOOL("AudioSteamingMedia")) 
-			gSavedSettings.setBOOL("AudioSteamingMedia", TRUE);
-		LLViewerParcelMedia::play(parcel);
-	}
-	else
-	{
-		gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
-	}
-	gWarningSettings.setBOOL("FirstStreamingVideo", FALSE);
-	return false;
-}
-
 // TODO: observer
 /*
 void LLViewerParcelMediaNavigationObserver::onNavigateComplete( const EventType& event_in )
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp
index 1b79b47905..ad2723b66b 100644
--- a/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -35,6 +35,7 @@
 #include "llviewerparcelmedia.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"
+#include "llviewerregion.h"
 #include "llparcel.h"
 #include "llviewerparcelmgr.h"
 #include "lluuid.h"
@@ -48,6 +49,8 @@ const F32 AUTOPLAY_SPEED = 0.1f;        // how slow should the agent be moving t
 
 LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() :
 	LLEventTimer(1),
+	
+	mLastParcelID(-1),
 	mPlayed(FALSE),
 	mTimeInParcel(0)
 {
@@ -81,9 +84,18 @@ void LLViewerParcelMediaAutoPlay::playStarted()
 BOOL LLViewerParcelMediaAutoPlay::tick()
 {
 	LLParcel *this_parcel = NULL;
+	LLViewerRegion *this_region = NULL;
 	std::string this_media_url;
 	LLUUID this_media_texture_id;
 	S32 this_parcel_id = 0;
+	LLUUID this_region_id;
+
+	this_region = gAgent.getRegion();
+	
+	if (this_region)
+	{
+		this_region_id = this_region->getRegionID();
+	}
 
 	this_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
@@ -96,12 +108,14 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
 		this_parcel_id = this_parcel->getLocalID();
 	}
 
-	if (this_parcel_id != mLastParcelID)
+	if (this_parcel_id != mLastParcelID ||
+	    this_region_id != mLastRegionID)
 	{
 		// we've entered a new parcel
 		mPlayed    = FALSE;                   // we haven't autoplayed yet
 		mTimeInParcel = 0;                    // reset our timer
 		mLastParcelID = this_parcel_id;
+		mLastRegionID = this_region_id;
 	}
 
 	mTimeInParcel += mPeriod;                 // increase mTimeInParcel by the amount of time between ticks
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
index 16279e7f1f..1d80b4756c 100644
--- a/indra/newview/llviewerparcelmediaautoplay.h
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -34,6 +34,7 @@
 #define LLVIEWERPARCELMEDIAAUTOPLAY_H
 
 #include "lltimer.h"
+#include "lluuid.h"
 
 // timer to automatically play media
 class LLViewerParcelMediaAutoPlay : LLEventTimer
@@ -47,6 +48,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer
 
  private:
 	S32 mLastParcelID;
+	LLUUID mLastRegionID;
 	BOOL mPlayed;
 	F32 mTimeInParcel;
 };
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index be68a2ef42..10a95443f1 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -44,14 +44,16 @@
 #include "llparcel.h"
 #include "llsecondlifeurls.h"
 #include "message.h"
+#include "llfloaterreg.h"
 
 // Viewer includes
 #include "llagent.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llfloaterbuyland.h"
 #include "llfloatergroups.h"
+#include "llfloaternearbymedia.h"
 #include "llfloatersellland.h"
 #include "llfloatertools.h"
 #include "llparcelselection.h"
@@ -1318,14 +1320,37 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
 
 void LLViewerParcelMgr::setHoverParcel(const LLVector3d& pos)
 {
-	//FIXME: only request parcel info when tooltip is shown
-	return;
-	/*LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos );
+	static U32 last_west, last_south;
+
+
+	// only request parcel info when tooltip is shown
+	if (!gSavedSettings.getBOOL("ShowLandHoverTip"))
+	{
+		return;
+	}
+
+	// only request parcel info if position has changed outside of the
+	// last parcel grid step
+	U32 west_parcel_step = (U32) floor( pos.mdV[VX] / PARCEL_GRID_STEP_METERS );
+	U32 south_parcel_step = (U32) floor( pos.mdV[VY] / PARCEL_GRID_STEP_METERS );
+	
+	if ((west_parcel_step == last_west) && (south_parcel_step == last_south))
+	{
+		return;
+	}
+	else 
+	{
+		last_west = west_parcel_step;
+		last_south = south_parcel_step;
+	}
+
+	LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos );
 	if (!region)
 	{
 		return;
 	}
 
+
 	// Send a rectangle around the point.
 	// This means the parcel sent back is at least a rectangle around the point,
 	// which is more efficient for public land.  Fewer requests are sent.  JC
@@ -1352,7 +1377,7 @@ void LLViewerParcelMgr::setHoverParcel(const LLVector3d& pos)
 	msg->addBOOL("SnapSelection",			FALSE );
 	msg->sendReliable( region->getHost() );
 
-	mHoverRequestResult = PARCEL_RESULT_NO_DATA;*/
+	mHoverRequestResult = PARCEL_RESULT_NO_DATA;
 }
 
 
@@ -1735,7 +1760,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 					}
 					else if (!gAudiop->getInternetStreamURL().empty())
 					{
-						llinfos << "Stopping parcel music" << llendl;
+						llinfos << "Stopping parcel music (parcel stream URL is empty)" << llendl;
 						gAudiop->startInternetStream(LLStringUtil::null);
 					}
 				}
@@ -1754,15 +1779,19 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 
 void optionally_start_music(const std::string& music_url)
 {
-	if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioSteamingMedia"))
-	{
-		// Make the user click the start button on the overlay bar. JC
-		//		llinfos << "Starting parcel music " << music_url << llendl;
-
-		// now only play music when you enter a new parcel if the control is in PLAY state
-		// changed as part of SL-4878
-		if ( gOverlayBar && gOverlayBar->musicPlaying())
+	if (gSavedSettings.getBOOL("AudioStreamingMusic") &&
+	    gSavedSettings.getBOOL("AudioStreamingMedia"))
+	{
+		// only play music when you enter a new parcel if the UI control for this
+		// was not *explicitly* stopped by the user. (part of SL-4878)
+		LLFloaterNearbyMedia *nearby_media_floater = LLFloaterReg::findTypedInstance<LLFloaterNearbyMedia>("nearby_media");
+		if ((nearby_media_floater &&
+		     nearby_media_floater->getParcelAudioAutoStart()) ||
+		    // or they have expressed no opinion in the UI, but have autoplay on...
+		    (!nearby_media_floater &&
+		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)))
 		{
+			llinfos << "Starting parcel music " << music_url << llendl;
 			gAudiop->startInternetStream(music_url);
 		}
 	}
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 300aea1620..2e92512b31 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -37,7 +37,6 @@
 #include "llagent.h"
 #include "llaudioengine.h"
 #include "llavataractions.h"
-#include "llfloaterchat.h"
 #include "llfloaterreg.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index b1ad01f54f..ad993bc056 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1513,16 +1513,20 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
 		{
 			desired_discard -= 2;
 		}
-		else if (!isJustBound() && mCachedRawImageReady && !mBoostLevel)
+		else if (!isJustBound() && mCachedRawImageReady)
 		{
-			// We haven't rendered this in the last half second, and we have a cached raw image, leave the desired discard as-is
-			desired_discard = cur_discard;
-		}
-		else if (mGLTexturep.notNull() && !mGLTexturep->getBoundRecently() && mBoostLevel == LLViewerTexture::BOOST_NONE)
-		{
-			// We haven't rendered this in a while, de-prioritize it
-			desired_discard += 2;
+			if(mBoostLevel < BOOST_HIGH)
+			{
+				// We haven't rendered this in a while, de-prioritize it
+				desired_discard += 2;
+			}
+			//else
+			//{
+			//	// We haven't rendered this in the last half second, and we have a cached raw image, leave the desired discard as-is
+			//	desired_discard = cur_discard;
+			//}
 		}
+
 		S32 ddiscard = cur_discard - desired_discard;
 		ddiscard = llclamp(ddiscard, 0, 4);
 		priority = (ddiscard+1)*100000.f;
@@ -1629,7 +1633,7 @@ bool LLViewerFetchedTexture::updateFetch()
 	S32 desired_discard = getDesiredDiscardLevel();
 	F32 decode_priority = getDecodePriority();
 	decode_priority = llmax(decode_priority, 0.0f);
-	
+
 	if (mIsFetching)
 	{
 		// Sets mRawDiscardLevel, mRawImage, mAuxRawImage
@@ -1772,10 +1776,10 @@ bool LLViewerFetchedTexture::updateFetch()
 	{
 		make_request = false;
 	}
-	else if (!isJustBound() && mCachedRawImageReady)
-	{
-		make_request = false;
-	}
+	//else if (!isJustBound() && mCachedRawImageReady)
+	//{
+	//	make_request = false;
+	//}
 	else
 	{
 		if (mIsFetching)
@@ -1847,12 +1851,12 @@ BOOL LLViewerFetchedTexture::forceFetch()
 	{
 		return false ;
 	}
-	if(mDesiredSavedRawDiscardLevel < getDiscardLevel())
+	//if(mDesiredSavedRawDiscardLevel < getDiscardLevel())
 	{
 		//no need to force fetching. normal fetching flow will do the work.
 		//return false ;
 	}
-	if (mNeedsCreateTexture)
+	//if (mNeedsCreateTexture)
 	{
 		// We may be fetching still (e.g. waiting on write)
 		// but don't check until we've processed the raw data we have
@@ -1888,7 +1892,8 @@ BOOL LLViewerFetchedTexture::forceFetch()
 		h = getHeight(0);
 		c = getComponents();
 	}
-	fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), maxDecodePriority(),
+	setDecodePriority(maxDecodePriority()) ;
+	fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), getDecodePriority(),
 																		  w, h, c, desired_discard, needsAux());
 
 	if (fetch_request_created)
@@ -2767,7 +2772,7 @@ void LLViewerMediaTexture::updateClass()
 
 #if 0
 	//force to play media.
-	gSavedSettings.setBOOL("AudioSteamingMedia", true) ;
+	gSavedSettings.setBOOL("AudioStreamingMedia", true) ;
 	gSavedSettings.setBOOL("AudioStreamingVideo", true) ;
 #endif
 
@@ -3007,7 +3012,7 @@ void LLViewerMediaTexture::addFace(LLFace* facep)
 	LLViewerTexture::addFace(facep) ;
 
 	const LLTextureEntry* te = facep->getTextureEntry() ;
-	if(te)
+	if(te && te->getID().notNull())
 	{
 		LLViewerTexture* tex = gTextureList.findImage(te->getID()) ;
 		if(tex)
@@ -3024,7 +3029,10 @@ void LLViewerMediaTexture::addFace(LLFace* facep)
 		return ;
 	}
 	
-	llerrs << "The face does not have a valid texture before media texture." << llendl ;
+	if(te && te->getID().notNull()) //should have a texture
+	{
+		llerrs << "The face does not have a valid texture before media texture." << llendl ;
+	}
 }
 
 //virtual 
@@ -3033,7 +3041,7 @@ void LLViewerMediaTexture::removeFace(LLFace* facep)
 	LLViewerTexture::removeFace(facep) ;
 
 	const LLTextureEntry* te = facep->getTextureEntry() ;
-	if(te)
+	if(te && te->getID().notNull())
 	{
 		LLViewerTexture* tex = gTextureList.findImage(te->getID()) ;
 		if(tex)
@@ -3094,7 +3102,10 @@ void LLViewerMediaTexture::removeFace(LLFace* facep)
 		}
 	}
 
-	llerrs << "mTextureList texture reference number is corrupted." << llendl ;
+	if(te && te->getID().notNull()) //should have a texture
+	{
+		llerrs << "mTextureList texture reference number is corrupted." << llendl ;
+	}
 }
 
 void LLViewerMediaTexture::stopPlaying()
@@ -3130,11 +3141,15 @@ void LLViewerMediaTexture::switchTexture(LLFace* facep)
 			const LLTextureEntry* te = facep->getTextureEntry() ;
 			if(te)
 			{
-				LLViewerTexture* tex = gTextureList.findImage(te->getID()) ;
+				LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID()) : NULL ;
 				if(!tex && te->getID() != mID)//try parcel media.
 				{
 					tex = gTextureList.findImage(mID) ;
 				}
+				if(!tex)
+				{
+					tex = LLViewerFetchedTexture::sDefaultImagep ;
+				}
 				facep->switchTexture(tex) ;
 			}
 		}
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 6aaaa4021b..79d9c4e7bb 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -384,8 +384,6 @@ public:
 	
 	void updateVirtualSize() ;
 
-	// setDesiredDiscardLevel is only used by LLViewerTextureList
-	void setDesiredDiscardLevel(S32 discard) { mDesiredDiscardLevel = discard; }
 	S32  getDesiredDiscardLevel()			 { return mDesiredDiscardLevel; }
 	void setMinDiscardLevel(S32 discard) 	{ mMinDesiredDiscardLevel = llmin(mMinDesiredDiscardLevel,(S8)discard); }
 
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 8252b7df00..6bb547373c 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -178,7 +178,7 @@ static std::string get_texture_list_name()
 
 void LLViewerTextureList::doPrefetchImages()
 {
-    if (LLAppViewer::instance()->getPurgeCache())
+	if (LLAppViewer::instance()->getPurgeCache())
 	{
 		// cache was purged, no point
 		return;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 1400253176..c1817496b1 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -101,7 +101,6 @@
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbuyland.h"
 #include "llfloatercamera.h"
-#include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloatercustomize.h"
 #include "llfloaterland.h"
@@ -604,7 +603,6 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 {
 	const char* buttonname = "";
 	const char* buttonstatestr = "";
-	BOOL handled = FALSE;	
 	S32 x = pos.mX;
 	S32 y = pos.mY;
 	x = llround((F32)x / mDisplayScale.mV[VX]);
@@ -699,7 +697,10 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		}
 		else
 		{
-			handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask);
+			if (top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask))
+			{
+				return TRUE;
+			}
 		}
 	}
 
@@ -717,34 +718,12 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		llinfos << buttonname << " Mouse " << buttonstatestr << " not handled by view" << llendl;
 	}
 
-	if (down)
+	// Do not allow tool manager to handle mouseclicks if we have disconnected	
+	if(!gDisconnected && LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
 	{
-		if (gDisconnected)
-		{
-			return FALSE;
-		}
-	
-		if(LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
-		{
-			return TRUE;
-		}
+		return TRUE;
 	}
-	else
-	{
-		if( !handled )
-		{
-			handled = mRootView->handleAnyMouseClick(x, y, mask, clicktype, down);
-		}
 	
-		if( !handled )
-		{
-			LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-			if (tool)
-			{
-				handled = tool->handleAnyMouseClick(x, y, mask, clicktype, down);
-			}
-		}
-	}
 
 	// If we got this far on a down-click, it wasn't handled.
 	// Up-clicks, though, are always handled as far as the OS is concerned.
@@ -1658,7 +1637,7 @@ void LLViewerWindow::shutdownGL()
 	LLViewerTextureManager::cleanup() ;
 	LLImageGL::cleanupClass() ;
 
-	llinfos << "All texturs and llimagegl images are destroyed!" << llendl ;
+	llinfos << "All textures and llimagegl images are destroyed!" << llendl ;
 
 	llinfos << "Cleaning up select manager" << llendl;
 	LLSelectMgr::getInstance()->cleanup();
@@ -1897,7 +1876,7 @@ void LLViewerWindow::draw()
 
 	if (!gSavedSettings.getBOOL("RenderUIBuffer"))
 	{
-		LLUI::sDirtyRect = this->getWindowRectRaw();
+		LLUI::sDirtyRect = getWindowRectScaled();
 	}
 
 	// HACK for timecode debugging
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 6e93bf1bf2..4235f97eab 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -56,7 +56,7 @@
 #include "lldriverparam.h"
 #include "lleditingmotion.h"
 #include "llemote.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
 #include "llheadrotmotion.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
@@ -2535,6 +2535,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 		if (isFullyLoaded())
 		{
 			deleteParticleSource();
+			updateLOD();
 		}
 		else
 		{
@@ -5603,7 +5604,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 	if (isSelf())
 	{
 		// Might be first sit
-		LLFirstUse::useSit();
+		//LLFirstUse::useSit();
 
 		gAgent.setFlying(FALSE);
 		gAgent.setThirdPersonHeadOffset(LLVector3::zero);
@@ -6822,7 +6823,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id )
 				 local_tex_iter != baked_dict->mLocalTextures.end();
 				 ++local_tex_iter)
 			{
-				setBakedReady(*local_tex_iter, TRUE);
+				if (isSelf()) setBakedReady(*local_tex_iter, TRUE);
 			}
 
 			// ! BACKWARDS COMPATIBILITY !
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 18cdd23ed9..917d69fe16 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -278,10 +278,14 @@ void LLVoiceChannel::deactivate()
 	if (callStarted())
 	{
 		setState(STATE_HUNG_UP);
-		// mute the microphone if required when returning to the proximal channel
-		if (gSavedSettings.getBOOL("AutoDisengageMic") && sCurrentVoiceChannel == this)
+		
+		//Default mic is OFF when leaving voice calls
+		if (gSavedSettings.getBOOL("AutoDisengageMic") && 
+			sCurrentVoiceChannel == this &&
+			gVoiceClient->getUserPTTState())
 		{
 			gSavedSettings.setBOOL("PTTCurrentlyEnabled", true);
+			gVoiceClient->inputUserControlState(true);
 		}
 	}
 
@@ -498,6 +502,13 @@ void LLVoiceChannelGroup::activate()
 				LLRecentPeople::instance().add(buddy_id);
 		}
 #endif
+
+		//Mic default state is OFF on initiating/joining Ad-Hoc/Group calls
+		if (gVoiceClient->getUserPTTState() && gVoiceClient->getPTTIsToggle())
+		{
+			gVoiceClient->inputUserControlState(true);
+		}
+		
 	}
 }
 
@@ -811,6 +822,12 @@ void LLVoiceChannelP2P::activate()
 
 		// Add the party to the list of people with which we've recently interacted.
 		LLRecentPeople::instance().add(mOtherUserID);
+
+		//Default mic is ON on initiating/joining P2P calls
+		if (!gVoiceClient->getUserPTTState() && gVoiceClient->getPTTIsToggle())
+		{
+			gVoiceClient->inputUserControlState(true);
+		}
 	}
 }
 
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index c2d26a1971..c84afa5af1 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -62,7 +62,8 @@
 #include "llimview.h" // for LLIMMgr
 #include "llparcel.h"
 #include "llviewerparcelmgr.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
+#include "llspeakers.h"
 #include "lltrans.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
@@ -70,7 +71,6 @@
 #include "llvoicechannel.h"
 
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
-#include "llfloaterchat.h"		// for LLFloaterChat::addChat()
 
 // for base64 decoding
 #include "apr_base64.h"
@@ -4445,7 +4445,7 @@ void LLVoiceClient::participantUpdatedEvent(
 			participant->mVolume = volume;
 
 			
-			// *HACH: mantipov: added while working on EXT-3544
+			// *HACK: mantipov: added while working on EXT-3544
 			/*
 			Sometimes LLVoiceClient::participantUpdatedEvent callback is called BEFORE 
 			LLViewerChatterBoxSessionAgentListUpdates::post() sometimes AFTER.
@@ -4462,7 +4462,9 @@ void LLVoiceClient::participantUpdatedEvent(
 			in LLCallFloater::draw()
 			*/
 			LLVoiceChannel* voice_cnl = LLVoiceChannel::getCurrentVoiceChannel();
-			if (voice_cnl)
+
+			// ignore session ID of local chat
+			if (voice_cnl && voice_cnl->getSessionID().notNull())
 			{
 				LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(voice_cnl->getSessionID());
 				if (speaker_manager)
@@ -4707,10 +4709,6 @@ void LLVoiceClient::messageEvent(
 						LLUUID::null,			// default arg
 						LLVector3::zero,		// default arg
 						true);					// prepend name and make it a link to the user's profile
-
-				chat.mText = std::string("IM: ") + session->mName + std::string(": ") + message;
-				// If the chat should come in quietly (i.e. we're in busy mode), pretend it's from a local agent.
-				LLFloaterChat::addChat( chat, TRUE, quiet_chat );
 			}
 		}		
 	}
@@ -5002,6 +5000,17 @@ LLVoiceClient::participantMap *LLVoiceClient::getParticipantList(void)
 	return result;
 }
 
+void LLVoiceClient::getParticipantsUUIDSet(std::set<LLUUID>& participant_uuids)
+{
+	if (NULL == mAudioSession) return;
+
+	participantUUIDMap::const_iterator it = mAudioSession->mParticipantsByUUID.begin(),
+		it_end = mAudioSession->mParticipantsByUUID.end();
+	for (; it != it_end; ++it)
+	{
+		participant_uuids.insert((*(*it).first));
+	}
+}
 
 LLVoiceClient::participantState *LLVoiceClient::sessionState::findParticipant(const std::string &uri)
 {
@@ -5883,6 +5892,10 @@ void LLVoiceClient::setPTTIsToggle(bool PTTIsToggle)
 	mPTTIsToggle = PTTIsToggle;
 }
 
+bool LLVoiceClient::getPTTIsToggle()
+{
+	return mPTTIsToggle;
+}
 
 void LLVoiceClient::setPTTKey(std::string &key)
 {
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 347fae6156..6231c6ba29 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -193,6 +193,7 @@ static	void updatePosition(void);
 		static bool voiceEnabled();
 		void setUsePTT(bool usePTT);
 		void setPTTIsToggle(bool PTTIsToggle);
+		bool getPTTIsToggle();
 		void setPTTKey(std::string &key);
 		void setEarLocation(S32 loc);
 		void setVoiceVolume(F32 volume);
@@ -353,6 +354,7 @@ static	void updatePosition(void);
 
 		participantState *findParticipantByID(const LLUUID& id);
 		participantMap *getParticipantList(void);
+		void getParticipantsUUIDSet(std::set<LLUUID>& participant_uuids);
 		
 		typedef std::map<const std::string*, sessionState*, stringMapComparitor> sessionMap;
 		typedef std::set<sessionState*> sessionSet;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 70bfc67523..295c0c8010 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1852,12 +1852,32 @@ void LLVOVolume::mediaNavigateBounceBack(U8 texture_index)
 	if (mep && impl)
 	{
         std::string url = mep->getCurrentURL();
-        if (url.empty())
+		// Look for a ":", if not there, assume "http://"
+		if (!url.empty() && std::string::npos == url.find(':')) 
+		{
+			url = "http://" + url;
+		}
+		// If the url we're trying to "bounce back" to is either empty or not
+		// allowed by the whitelist, try the home url.  If *that* doesn't work,
+		// set the media as failed and unload it
+        if (url.empty() || !mep->checkCandidateUrl(url))
         {
             url = mep->getHomeURL();
+			// Look for a ":", if not there, assume "http://"
+			if (!url.empty() && std::string::npos == url.find(':')) 
+			{
+				url = "http://" + url;
+			}
         }
-        if (! url.empty())
-        {
+        if (url.empty() || !mep->checkCandidateUrl(url))
+		{
+			// The url to navigate back to is not good, and we have nowhere else
+			// to go.
+			LL_WARNS("MediaOnAPrim") << "FAILED to bounce back URL \"" << url << "\" -- unloading impl" << LL_ENDL;
+			impl->setMediaFailed(true);
+		}
+		else {
+			// Okay, navigate now
             LL_INFOS("MediaOnAPrim") << "bouncing back to URL: " << url << LL_ENDL;
             impl->navigateTo(url, "", false, true);
         }
@@ -2106,11 +2126,19 @@ viewer_media_t LLVOVolume::getMediaImpl(U8 face_id) const
 
 F64 LLVOVolume::getTotalMediaInterest() const
 {
+	// If this object is currently focused, this object has "high" interest
 	if (LLViewerMediaFocus::getInstance()->getFocusedObjectID() == getID())
 		return F64_MAX;
 	
 	F64 interest = (F64)-1.0;  // means not interested;
-    int i = 0;
+    
+	// If this object is selected, this object has "high" interest, but since 
+	// there can be more than one, we still add in calculated impl interest
+	// XXX Sadly, 'contains()' doesn't take a const :(
+	if (LLSelectMgr::getInstance()->getSelection()->contains(const_cast<LLVOVolume*>(this)))
+		interest = F64_MAX / 2.0;
+	
+	int i = 0;
 	const int end = getNumTEs();
 	for ( ; i < end; ++i)
 	{
@@ -2689,13 +2717,16 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const
 		const LLTextureEntry* te = face->getTextureEntry();
 		const LLViewerTexture* img = face->getTexture();
 
-		textures.insert(img->getID());
+		if (img)
+		{
+			textures.insert(img->getID());
+		}
 
 		if (face->getPoolType() == LLDrawPool::POOL_ALPHA)
 		{
 			alpha++;
 		}
-		else if (img->getPrimaryFormat() == GL_ALPHA)
+		else if (img && img->getPrimaryFormat() == GL_ALPHA)
 		{
 			invisi = 1;
 		}
diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp
index d3238f16a8..0272a2ab34 100644
--- a/indra/newview/llvowlsky.cpp
+++ b/indra/newview/llvowlsky.cpp
@@ -491,7 +491,7 @@ void LLVOWLSky::drawStars(void)
 	if (mStarsVerts.notNull())
 	{
 		mStarsVerts->setBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK);
-		mStarsVerts->draw(LLRender::POINTS, getStarsNumIndices(), 0);
+		mStarsVerts->drawArrays(LLRender::QUADS, 0, getStarsNumVerts()*4);
 	}
 }
 
@@ -546,6 +546,7 @@ void LLVOWLSky::initStars()
 	std::vector<F32>::iterator v_i = mStarIntensities.begin();
 
 	U32 i;
+
 	for (i = 0; i < getStarsNumVerts(); ++i)
 	{
 		v_p->mV[VX] = ll_frand() - 0.5f;
@@ -771,17 +772,17 @@ BOOL LLVOWLSky::updateStarGeometry(LLDrawable *drawable)
 {
 	LLStrider<LLVector3> verticesp;
 	LLStrider<LLColor4U> colorsp;
-	LLStrider<U16> indicesp;
+	LLStrider<LLVector2> texcoordsp;
 
 	if (mStarsVerts.isNull())
 	{
 		mStarsVerts = new LLVertexBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK, GL_DYNAMIC_DRAW);
-		mStarsVerts->allocateBuffer(getStarsNumVerts(), getStarsNumIndices(), TRUE);
+		mStarsVerts->allocateBuffer(getStarsNumVerts()*4, 0, TRUE);
 	}
-
+ 
 	BOOL success = mStarsVerts->getVertexStrider(verticesp)
-		&& mStarsVerts->getIndexStrider(indicesp)
-		&& mStarsVerts->getColorStrider(colorsp);
+		&& mStarsVerts->getColorStrider(colorsp)
+		&& mStarsVerts->getTexCoord0Strider(texcoordsp);
 
 	if(!success)
 	{
@@ -791,11 +792,37 @@ BOOL LLVOWLSky::updateStarGeometry(LLDrawable *drawable)
 	// *TODO: fix LLStrider with a real prefix increment operator so it can be
 	// used as a model of OutputIterator. -Brad
 	// std::copy(mStarVertices.begin(), mStarVertices.end(), verticesp);
+
+	if (mStarVertices.size() < getStarsNumVerts())
+	{
+		llerrs << "Star reference geometry insufficient." << llendl;
+	}
+
 	for (U32 vtx = 0; vtx < getStarsNumVerts(); ++vtx)
 	{
+		LLVector3 at = mStarVertices[vtx];
+		at.normVec();
+		LLVector3 left = at%LLVector3(0,0,1);
+		LLVector3 up = at%left;
+
+		F32 sc = 0.5f+ll_frand()*1.25f;
+		left *= sc;
+		up *= sc;
+
 		*(verticesp++)  = mStarVertices[vtx];
+		*(verticesp++) = mStarVertices[vtx]+left;
+		*(verticesp++) = mStarVertices[vtx]+left+up;
+		*(verticesp++) = mStarVertices[vtx]+up;
+
+		*(texcoordsp++) = LLVector2(0,0);
+		*(texcoordsp++) = LLVector2(0,1);
+		*(texcoordsp++) = LLVector2(1,1);
+		*(texcoordsp++) = LLVector2(1,0);
+
+		*(colorsp++)    = LLColor4U(mStarColors[vtx]);
+		*(colorsp++)    = LLColor4U(mStarColors[vtx]);
+		*(colorsp++)    = LLColor4U(mStarColors[vtx]);
 		*(colorsp++)    = LLColor4U(mStarColors[vtx]);
-		*(indicesp++)   = vtx;
 	}
 
 	mStarsVerts->setBuffer(0);
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 70859e8ea5..c19be37e75 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -252,9 +252,8 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 //	mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
 	mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
-    	BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");
-	mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, vefifySSLCert);
-	mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, vefifySSLCert ? 2 : 0);
+	mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, LLCurl::getSSLVerify());
+	mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, LLCurl::getSSLVerify() ? 2 : 0);
 	// Be a little impatient about establishing connections.
 	mCurlRequest->setopt(CURLOPT_CONNECTTIMEOUT, 40L);
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index cb511c2f0b..e248047930 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -57,30 +57,36 @@
 	 name="Black_50"
 	 value="0 0 0 0.5" />
 	<color
+	name="FrogGreen"
+	value="0.26 0.345 0.263 1" />
+	<color
 	 name="Red"
-	 value="1 0 0 1" />
+	 value="0.729 0 0.121 1" />
 	<color
 	 name="Blue"
 	 value="0 0 1 1" />
 	<color
 	 name="Yellow"
-	 value="0.114 0.65 0.1" />
+	 value="1 1 0 1" />
 	<color
 	 name="Green"
-	 value="0 .39 .10 1" />
+	 value="0 1 0 1" />
 	<color
 	 name="Transparent"
 	 value="0 0 0 0" />
-  <!-- Make potentially unused colors show up bright purple.
+	<color
+	name="Purple"
+	value="1 0 1 1" />
+  <!-- This color name makes potentially unused colors show up bright purple.
   Leave this here until all Unused? are removed below, otherwise
   the viewer generates many warnings on startup. -->
   <color
 	 name="Unused?"
-	 value="1 0 1 1" />
+	 value=".831 1 0 1" />
 
   <!-- UI Definitions -->
 
-	<color
+    <color
      name="AgentChatColor"
      reference="White" />
     <color
@@ -168,11 +174,14 @@
      name="ChatHistoryTextColor"
      reference="LtGray" />
     <color
+     name="ChicletFlashColor"
+     value="0.114 0.65 0.1" />
+    <color
      name="ColorDropShadow"
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     value="0 0 0 1" />
+     reference="Black" />
     <color
      name="ColorPaletteEntry02"
      value="0.5 0.5 0.5 1" />
@@ -214,34 +223,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry16"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry17"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry18"
-     value="0.75 0.75 0.75 1" />
+     reference="LtGray" />
     <color
      name="ColorPaletteEntry19"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="ColorPaletteEntry20"
-     reference="Unused?" />
+     reference=".5 .5 1 0" />
     <color
      name="ColorPaletteEntry21"
-     value="0 1 0 1" />
+     reference="Green" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     value="0 0 1 1" />
+     reference="Blue" />
     <color
      name="ColorPaletteEntry24"
-     value="1 0 1 1" />
+     reference="Purple" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -262,10 +271,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ColorPaletteEntry32"
-     value="1 1 1 1" />
+     reference="White" />
     <color
      name="ConsoleBackground"
      reference="Black" />
@@ -289,7 +298,7 @@
      reference="White" />
      <color
      name="FilterBackgroundColor"
-     reference="MouseGray" />
+     reference="Black" />
     <color
      name="FilterTextColor"
      value="0.38 0.69 0.57 1" />
@@ -322,7 +331,7 @@
      value="0.92 0.92 1 0.78" />
     <color
      name="GridlineColor"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="GridlineShadowColor"
      value="0 0 0 0.31" />
@@ -334,10 +343,10 @@
      value="0.3344 0.5456 0.5159 1" />
     <color
      name="GroupNotifyTextColor"
-	 reference="White"/>
+     reference="White"/>
     <color
      name="GroupNotifyDimmedTextColor"
-	 reference="DkGray"/>
+     reference="DkGray" />
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
@@ -367,7 +376,7 @@
      reference="Unused?" />
     <color
      name="HighlightChildColor"
-     reference="Unused?" />
+     reference="Yellow" />
     <color
      name="HighlightInspectColor"
      value="1 0.5 0 1" />
@@ -391,7 +400,10 @@
      reference="White" />
     <color
      name="InventoryBackgroundColor"
-     reference="Unused?" />
+     reference="DkGray2" />
+    <color
+     name="InventoryFocusOutlineColor"
+     reference="White_25" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -454,7 +466,7 @@
      reference="DkGray" />
     <color
      name="MenuBarGodBgColor"
-     reference="Green" />
+     reference="FrogGreen" />
     <color
      name="MenuDefaultBgColor"
      reference="DkGray2" />
@@ -475,7 +487,7 @@
      reference="Black" />
     <color
      name="MenuNonProductionGodBgColor"
-     value="0 0.5 0 1" />
+     value="0.263 0.325 0.345 1" />
     <color
      name="MenuPopupBgColor"
 	  reference="DkGray2" />
@@ -502,7 +514,7 @@
      value="0 0 0 0.3" />
     <color
      name="NetMapGroupOwnAboveWater"
-     value="1 0 1 1" />
+     reference="Purple" />
     <color
      name="NetMapGroupOwnBelowWater"
      value="0.78 0 0.78 1" />
@@ -535,7 +547,7 @@
      reference="EmphasisColor" />
     <color
      name="OverdrivenColor"
-     value="1 0 0 1" />
+     reference="Red" />
     <color
      name="PanelDefaultBackgroundColor"
      reference="DkGray" />
@@ -619,7 +631,7 @@
      value="0.13 0.42 0.77 1" />
     <color
      name="SilhouetteParentColor"
-     reference="Unused?" />
+     reference="Yellow" />
     <color
      name="SliderDisabledThumbColor"
      reference="White_25" />
@@ -634,10 +646,10 @@
      reference="Unused?" />
     <color
      name="SpeakingColor"
-     value="0 1 0 1" />
+     reference="FrogGreen" />
     <color
      name="SystemChatColor"
-	 reference="White" />
+     reference="White" />
     <color
      name="TextBgFocusColor"
      reference="White" />
@@ -652,7 +664,7 @@
      reference="Black" />
     <color
      name="TextDefaultColor"
-     value="Black" />
+     reference="Black" />
     <color
      name="TextEmbeddedItemColor"
      value="0 0 0.5 1" />
@@ -703,7 +715,7 @@
     <color
      name="SysWellItemSelected"
      value="0.3 0.3 0.3 1.0" />
-	<color
+    <color
      name="ChatToastAgentNameColor"
      reference="EmphasisColor" />
   <color
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
new file mode 100644
index 0000000000..6343ddf035
--- /dev/null
+++ b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index dd9133bcc4..661d1c5611 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 0080e71f41..f927fd3989 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
index f8ce765c50..76df984596 100644
--- a/indra/newview/skins/default/textures/icons/Inv_Landmark.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
index 1df61751a8..38eea783e6 100644
--- a/indra/newview/skins/default/textures/navbar/NavBar_BG.png
+++ b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
index ada28e01da..f5a5f7a846 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
index 0f8d5619ec..8e0fb9661e 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cc87d5c105..60c1470b89 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -71,7 +71,7 @@ with the same filename but different name
   <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
 
   <texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
-  
+
   <texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
   <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
@@ -167,6 +167,7 @@ with the same filename but different name
 
   <texture name="Flag" file_name="navbar/Flag.png" preload="false" />
 
+  <texture name="Folder_Arrow" file_name="folder_arrow.tga" preload="false" />
   <texture name="ForSale_Badge" file_name="icons/ForSale_Badge.png" preload="false" />
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
@@ -222,6 +223,7 @@ with the same filename but different name
   <texture name="Inspector_Background" file_name="windows/Inspector_Background.png" preload="false"
            scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
   <texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
+  <texture name="Inspector_I" file_name="windows/Inspector_I.png" preload="false" />
 
   <texture name="Inv_Acessories" file_name="icons/Inv_Accessories.png" preload="false" />
   <texture name="Inv_Alpha" file_name="icons/Inv_Alpha.png" preload="false" />
@@ -305,8 +307,8 @@ with the same filename but different name
   <texture name="Movement_Up_Off" file_name="bottomtray/Movement_Up_Off.png" preload="false" />
   <texture name="Movement_Up_On" file_name="bottomtray/Movement_Up_On.png" preload="false" />
 
-  <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="false" />
-  <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="false" />
+  <texture name="NavBar_BG_NoFav" file_name="navbar/NavBar_BG_NoFav.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
+  <texture name="NavBar_BG" file_name="navbar/NavBar_BG.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
 
   <texture name="NearbyVoice_Lvl1" file_name="bottomtray/NearbyVoice_Lvl1.png" preload="false" />
   <texture name="NearbyVoice_Lvl2" file_name="bottomtray/NearbyVoice_Lvl2.png" preload="false" />
@@ -351,7 +353,7 @@ with the same filename but different name
 
  <texture name="Parcel_Build_Dark" file_name="icons/Parcel_Build_Dark.png" preload="false" />
  <texture name="Parcel_BuildNo_Dark" file_name="icons/Parcel_BuildNo_Dark.png" preload="false" />
- <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Damage_Dark.png" preload="false" />
+ <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Health_Dark.png" preload="false" />
  <texture name="Parcel_DamageNo_Dark" file_name="icons/Parcel_DamageNo_Dark.png" preload="false" />
  <texture name="Parcel_Evry_Dark" file_name="icons/Parcel_Evry_Dark.png" preload="false" />
  <texture name="Parcel_Exp_Dark" file_name="icons/Parcel_Exp_Dark.png" preload="false" />
@@ -438,6 +440,7 @@ with the same filename but different name
 
   <texture name="Resize_Corner" file_name="windows/Resize_Corner.png" preload="true" />
 
+  <texture name="Rounded_Square"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
   <texture name="Row_Selection" file_name="navbar/Row_Selection.png" preload="false" />
 
   <texture name="ScrollArrow_Down" file_name="widgets/ScrollArrow_Down.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
@@ -523,13 +526,14 @@ with the same filename but different name
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
   <texture name="TabIcon_Close_Over" file_name="taskpanel/TabIcon_Close_Over.png" preload="false" />
-  <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
-  <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" />
-  <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
   <texture name="TabIcon_Inventory_Large" file_name="taskpanel/TabIcon_Inventory_Large.png" preload="false" />
   <texture name="TabIcon_Inventory_Off" file_name="taskpanel/TabIcon_Inventory_Off.png" preload="false" />
   <texture name="TabIcon_Inventory_Over" file_name="taskpanel/TabIcon_Inventory_Over.png" preload="false" />
   <texture name="TabIcon_Inventory_Selected" file_name="taskpanel/TabIcon_Inventory_Selected.png" preload="false" />
+  <texture name="TabIcon_Home_Large" file_name="taskpanel/TabIcon_Home_Large.png" preload="false" />
+  <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
+  <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" />
+  <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
   <texture name="TabIcon_Me_Large" file_name="taskpanel/TabIcon_Me_Large.png" preload="false" />
   <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
   <texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false" />
@@ -552,9 +556,9 @@ with the same filename but different name
   <texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" />
   <texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" />
   <texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="false" />
-  <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" />
+  <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="false" />
-  <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" />
+  <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false"  scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
   <texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
   <texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
   <texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
@@ -574,7 +578,6 @@ with the same filename but different name
 
   <texture name="TimeBasedMediaBackground" file_name="windows/TimeBasedMediaBackground.png" preload="false" />
 
-
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
            scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
@@ -588,15 +591,15 @@ with the same filename but different name
   <texture name="Tool_Zoom" file_name="build/Tool_Zoom.png" preload="false" />
 
   <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" />
-  <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" />
-  <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" />
-  <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" />
-  <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" />
-  <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" />
-  <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" />
-  <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" />
-  <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" />
-  <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" />
+  <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" />
+  <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
+  <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
+  <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" />
 
   <texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="16" scale.right="100" scale.bottom="3" />
 
@@ -604,8 +607,9 @@ with the same filename but different name
   <texture name="TrashItem_Off" file_name="icons/TrashItem_Off.png" preload="false" />
   <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="false" />
 
-  <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
+  <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
   <texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="false" />
+  <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
 
   <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png"  preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
@@ -645,6 +649,12 @@ with the same filename but different name
   <texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
   <texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
 
+  <texture name="pixiesmall.j2c" use_mips="true" />
+  <texture name="script_error.j2c" use_mips="true" />
+  <texture name="silhouette.j2c" use_mips="true" />
+  <texture name="foot_shadow.j2c" use_mips="true" />
+  <texture name="cloud-particle.j2c" use_mips="true" />
+
   <!--WARNING OLD ART BELOW *do not use*-->
   <texture name="icn_chatbar.tga" />
   <texture name="icn_media_web.tga" preload="true" />
@@ -655,10 +665,15 @@ with the same filename but different name
   <texture name="icn_voice-groupfocus.tga" />
   <texture name="icn_voice-pvtfocus.tga" />
 
-  <texture name="jump_left_out.tga" />
-  <texture name="jump_left_in.tga" />
-  <texture name="jump_right_out.tga" />
-  <texture name="jump_right_in.tga" />
+  <texture name="jump_left_out.tga" file_name="widgets/jump_left_out.png" />
+  <texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" />
+  <texture name="jump_right_out.tga" file_name="widgets/jump_right_out.png" />
+  <texture name="jump_right_in.tga" file_name="widgets/jump_right_in.png" />
+
+  <texture name="scrollbutton_left_out_blue.tga" file_name="widgets/ScrollArrow_Left_Opaque.png" />
+  <texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" />
+  <texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" />
+  <texture name="scrollbutton_right_in_blue.tga" file_name="widgets/ScrollArrow_Right_Over_Opaque.png" />
 
   <texture name="up_arrow.tga" file_name="up_arrow.png" />
   <texture name="down_arrow.tga" file_name="down_arrow.png" />
@@ -673,9 +688,6 @@ with the same filename but different name
 
   <texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
   <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
-
-  <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
-  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
@@ -683,7 +695,7 @@ with the same filename but different name
   <texture name="button_anim_play.tga" />
   <texture name="button_anim_play_selected.tga" />
   <texture name="crosshairs.tga" />
-  <texture name="direction_arrow.tga" />
+  <texture name="direction_arrow.tga" file_name="world/BeaconArrow.png" />
 
   <texture name="icon_auction.tga" />
   <texture name="icon_avatar_offline.tga" />
@@ -694,7 +706,6 @@ with the same filename but different name
   <texture name="icon_event_mature.tga" />
   <texture name="icon_for_sale.tga" />
   <texture name="icon_place_for_sale.tga" />
-  <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
   <texture name="lag_status_critical.tga" />
@@ -713,27 +724,10 @@ with the same filename but different name
   <texture name="map_telehub.tga" />
   <texture name="map_track_16.tga" />
 
-  <texture name="media_icon.tga" file_name="icn_label_media.tga" />
-  <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-
-  <texture name="notify_tip_icon.tga" />
   <texture name="notify_caution_icon.tga" />
   <texture name="notify_next.png" preload="true" />
   <texture name="notify_box_icon.tga" />
 
-  <texture name="pixiesmall.j2c" use_mips="true" />
-  <texture name="script_error.j2c" use_mips="true" />
-  <texture name="silhouette.j2c" use_mips="true" />
-  <texture name="foot_shadow.j2c" use_mips="true" />
-  <texture name="cloud-particle.j2c" use_mips="true" />
-
-  <texture name="status_no_build.tga" />
-  <texture name="status_voice.tga" />
-  <texture name="status_no_fly.tga" />
-  <texture name="status_health.tga" />
-  <texture name="status_no_push.tga" />
-  <texture name="status_no_scripts.tga" />
-
   <texture name="icn_active-speakers-dot-lvl0.tga" />
   <texture name="icn_active-speakers-dot-lvl1.tga" />
   <texture name="icn_active-speakers-dot-lvl2.tga" />
diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
index a1d602f6f0..61f9b076ce 100644
--- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
+++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
new file mode 100644
index 0000000000..549b3980f6
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
new file mode 100644
index 0000000000..a74abd5d8a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
new file mode 100644
index 0000000000..36056d0ad9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
new file mode 100644
index 0000000000..0c1fd6956b
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png
new file mode 100644
index 0000000000..a1425ccfa0
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_left_in.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png
new file mode 100644
index 0000000000..38edf47d19
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_left_out.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png
new file mode 100644
index 0000000000..39359ab2e2
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_right_in.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png
new file mode 100644
index 0000000000..3f76bbffac
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_right_out.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png
new file mode 100644
index 0000000000..b4875fd638
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/Inspector_I.png
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
new file mode 100644
index 0000000000..12dc246d51
--- /dev/null
+++ b/indra/newview/skins/default/textures/world/BeaconArrow.png
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index cdf1915d5e..faa24b5877 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="floater_about" title="OM [APP_NAME]">

-	<floater.string name="AboutHeader">

-		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])

-[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]

-	</floater.string>

-	<floater.string name="AboutCompiler">

-		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])

-[SERVER_VERSION]

-[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]

-	</floater.string>

-	<floater.string name="AboutSystem">

-		CPU: [CPU]

-Memory: [MEMORY_MB] MB

-OS Version: [OS_VERSION]

-Grafik kort mærke: [GRAPHICS_CARD_VENDOR]

-Grafik kort: [GRAPHICS_CARD]

-	</floater.string>

-	<floater.string name="AboutDriver">

-		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]

-	</floater.string>

-	<floater.string name="AboutLibs">

-		OpenGL Version: [OPENGL_VERSION]

-

-libcurl Version: [LIBCURL_VERSION]

-J2C Decoder Version: [J2C_VERSION]

-Audio Driver Version: [AUDIO_DRIVER_VERSION]

-Qt Webkit Version: [QT_WEBKIT_VERSION]

-Vivox Version: [VIVOX_VERSION]

-	</floater.string>

-	<floater.string name="none">

-		(ingen)

-	</floater.string>

-	<floater.string name="AboutTraffic">

-		Pakker tabt: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)

-	</floater.string>

-	<tab_container name="about_tab">

-		<panel label="Info" name="support_panel">

-			<button label="Kopiér til udklipsholder" name="copy_btn"/>

-		</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.

-

-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

-			</text_editor>

-		</panel>

-		<panel label="Licenser" name="licenses_panel">

-			<text_editor name="credits_editor">

-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

-  google-perftools Copyright (c) 2005, Google Inc.

-

-Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.

-

-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

-			</text_editor>

-		</panel>

-	</tab_container>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="OM [APP_NAME]">
+	<floater.string name="AboutHeader">
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutCompiler">
+		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])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU: [CPU]
+Memory: [MEMORY_MB] MB
+OS Version: [OS_VERSION]
+Grafik kort mærke: [GRAPHICS_CARD_VENDOR]
+Grafik kort: [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<floater.string name="AboutLibs">
+		OpenGL Version: [OPENGL_VERSION]
+
+libcurl Version: [LIBCURL_VERSION]
+J2C Decoder Version: [J2C_VERSION]
+Audio Driver Version: [AUDIO_DRIVER_VERSION]
+Qt Webkit Version: [QT_WEBKIT_VERSION]
+Vivox Version: [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		(ingen)
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		Pakker tabt: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+	</floater.string>
+	<tab_container name="about_tab">
+		<panel label="Info" name="support_panel">
+			<button label="Kopiér til udklipsholder" name="copy_btn"/>
+		</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.
+
+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
+			</text_editor>
+		</panel>
+		<panel label="Licenser" name="licenses_panel">
+			<text_editor name="credits_editor">
+				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+  APR Copyright (C) 2000-2004 The Apache Software Foundation
+  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+  GL Copyright (C) 1999-2004 Brian Paul.
+  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+  ogg/vorbis Copyright (C) 2001, Xiphophorus
+  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  google-perftools Copyright (c) 2005, Google Inc.
+
+Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+			</text_editor>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
index edda8b44e9..3b3f670792 100644
--- a/indra/newview/skins/default/xui/da/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="mute by name" title="BLOKÉR OBJEKT VIA NAVN">

-	<text name="message">

-		Blokér et objekt:

-	</text>

-	<line_editor name="object_name">

-		Objekt navn

-	</line_editor>

-	<text name="note">

-		* Blokérer kun tekst fra objekt, ikke lyde

-	</text>

-	<button label="OK" name="OK"/>

-	<button label="Annullér" name="Cancel"/>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="BLOKÉR OBJEKT VIA NAVN">
+	<text name="message">
+		Blokér et objekt:
+	</text>
+	<line_editor name="object_name">
+		Objekt navn
+	</line_editor>
+	<text name="note">
+		* Blokérer kun tekst fra objekt, ikke lyde
+	</text>
+	<button label="OK" name="OK"/>
+	<button label="Annullér" name="Cancel"/>
+</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 b249fc5654..9ef17a3cbb 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="floater_report_abuse" title="RAPPORTÉR MISBRUG">

-	<floater.string name="Screenshot">

-		Screenshot

-	</floater.string>

-	<check_box label="Inkludér billede" name="screen_check"/>

-	<text name="reporter_title">

-		Anmelder:

-	</text>

-	<text name="reporter_field">

-		Loremipsum Dolorsitamut Longnamez

-	</text>

-	<text name="sim_title">

-		Region:

-	</text>

-	<text name="sim_field">

-		Region navn

-	</text>

-	<text name="pos_title">

-		Position:

-	</text>

-	<text name="pos_field">

-		{128.1, 128.1, 15.4}

-	</text>

-	<text name="select_object_label">

-		Klik på knappen derefter objektet:

-	</text>

-	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler"/>

-	<text name="object_name_label">

-		Navn:

-	</text>

-	<text left_delta="64" name="object_name" width="140">

-		Consetetur Sadipscing

-	</text>

-	<text name="owner_name_label">

-		Ejer:

-	</text>

-	<text left_delta="64" name="owner_name">

-		Hendrerit Vulputate Kamawashi Longname

-	</text>

-	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">

-		<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="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"/>

-		<combo_box.item label="Handel &gt; Vare eller ydelse ikke leveret" name="Commerce__Failure_to_deliver_product_or_service"/>

-		<combo_box.item label="Offentliggørelse &gt; Om oplysninger i den virkelige verden" name="Disclosure__Real_world_information"/>

-		<combo_box.item label="Offentliggørelse &gt; Fjernaflytning af chat" name="Disclosure__Remotely_monitoring chat"/>

-		<combo_box.item label="Offentliggørelse &gt; Information/chat/IM fra Second Life" name="Disclosure__Second_Life_information_chat_IMs"/>

-		<combo_box.item label="Forstyrrelse af fred &gt; Unfair brug af region ressourcer" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>

-		<combo_box.item label="Forstyrrelse af fred &gt; Overdreven brug af objekter med script" name="Disturbing_the_peace__Excessive_scripted_objects"/>

-		<combo_box.item label="Forstyrrelse af fred &gt; Object affald" name="Disturbing_the_peace__Object_littering"/>

-		<combo_box.item label="Forstyrring af fred &gt; Gentagen spam" name="Disturbing_the_peace__Repetitive_spam"/>

-		<combo_box.item label="Forstyrrelse af fred &gt; Uønsket reklame spam" name="Disturbing_the_peace__Unwanted_advert_spam"/>

-		<combo_box.item label="Bedrageri &gt; L$" name="Fraud__L$"/>

-		<combo_box.item label="Bedrageri &gt; Land" name="Fraud__Land"/>

-		<combo_box.item label="Bedrageri &gt; Pyramide spil eller kædebreve" name="Fraud__Pyramid_scheme_or_chain_letter"/>

-		<combo_box.item label="Bedrageri &gt; US$" name="Fraud__US$"/>

-		<combo_box.item label="Chikane &gt; reklame farm / billedeligt spam" name="Harassment__Advert_farms___visual_spam"/>

-		<combo_box.item label="Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper" name="Harassment__Defaming_individuals_or_groups"/>

-		<combo_box.item label="Chikane &gt; Hindre bevægelse" name="Harassment__Impeding_movement"/>

-		<combo_box.item label="Chikane &gt; Sex chikane" name="Harassment__Sexual_harassment"/>

-		<combo_box.item label="Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>

-		<combo_box.item label="Chikane &gt; Verbalt chikane" name="Harassment__Verbal_abuse"/>

-		<combo_box.item label="Uanstændighed &gt; Meget stødende indhold eller adfærd" name="Indecency__Broadly_offensive_content_or_conduct"/>

-		<combo_box.item label="Uanstændighed &gt; Upassende avatar navn" name="Indecency__Inappropriate_avatar_name"/>

-		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;PG&apos; region" name="Indecency__Mature_content_in_PG_region"/>

-		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;Mature&apos; region" name="Indecency__Inappropriate_content_in_Mature_region"/>

-		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse" name="Intellectual_property_infringement_Content_Removal"/>

-		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>

-		<combo_box.item label="Intolerance" name="Intolerance"/>

-		<combo_box.item label="Land &gt; Misbrug af sandkasse resourcer" name="Land__Abuse_of_sandbox_resources"/>

-		<combo_box.item label="Land &gt; Overgreb &gt; Objekter/teksturer" name="Land__Encroachment__Objects_textures"/>

-		<combo_box.item label="Land &gt; Overgreb &gt; Partikler" name="Land__Encroachment__Particles"/>

-		<combo_box.item label="Land &gt; Overgreb &gt; Træer/planter" name="Land__Encroachment__Trees_plants"/>

-		<combo_box.item label="Væddemål/gambling" name="Wagering_gambling"/>

-		<combo_box.item label="Andet" name="Other"/>

-	</combo_box>

-	<text name="abuser_name_title">

-		Udøvers navn:

-	</text>

-	<button label="Vælg beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>

-	<text name="abuser_name_title2">

-		Sted for misbrug/overgreb:

-	</text>

-	<text name="sum_title">

-		Opsummering:

-	</text>

-	<text name="dscr_title">

-		Detaljer:

-	</text>

-	<text name="bug_aviso">

-		Vær venligst så præcis som muligt

-	</text>

-	<text name="incomplete_title">

-		* Note: Ufuldstændige rapporter vil ikke blive undersøgt.

-	</text>

-	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn"/>

-	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="RAPPORTÉR MISBRUG">
+	<floater.string name="Screenshot">
+		Screenshot
+	</floater.string>
+	<check_box label="Inkludér billede" name="screen_check"/>
+	<text name="reporter_title">
+		Anmelder:
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut Longnamez
+	</text>
+	<text name="sim_title">
+		Region:
+	</text>
+	<text name="sim_field">
+		Region navn
+	</text>
+	<text name="pos_title">
+		Position:
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		Klik på knappen derefter objektet:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler"/>
+	<text name="object_name_label">
+		Navn:
+	</text>
+	<text left_delta="64" name="object_name" width="140">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		Ejer:
+	</text>
+	<text left_delta="64" name="owner_name">
+		Hendrerit Vulputate Kamawashi Longname
+	</text>
+	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
+		<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="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"/>
+		<combo_box.item label="Handel &gt; Vare eller ydelse ikke leveret" name="Commerce__Failure_to_deliver_product_or_service"/>
+		<combo_box.item label="Offentliggørelse &gt; Om oplysninger i den virkelige verden" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="Offentliggørelse &gt; Fjernaflytning af chat" name="Disclosure__Remotely_monitoring chat"/>
+		<combo_box.item label="Offentliggørelse &gt; Information/chat/IM fra Second Life" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Unfair brug af region ressourcer" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Overdreven brug af objekter med script" name="Disturbing_the_peace__Excessive_scripted_objects"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Object affald" name="Disturbing_the_peace__Object_littering"/>
+		<combo_box.item label="Forstyrring af fred &gt; Gentagen spam" name="Disturbing_the_peace__Repetitive_spam"/>
+		<combo_box.item label="Forstyrrelse af fred &gt; Uønsket reklame spam" name="Disturbing_the_peace__Unwanted_advert_spam"/>
+		<combo_box.item label="Bedrageri &gt; L$" name="Fraud__L$"/>
+		<combo_box.item label="Bedrageri &gt; Land" name="Fraud__Land"/>
+		<combo_box.item label="Bedrageri &gt; Pyramide spil eller kædebreve" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="Bedrageri &gt; US$" name="Fraud__US$"/>
+		<combo_box.item label="Chikane &gt; reklame farm / billedeligt spam" name="Harassment__Advert_farms___visual_spam"/>
+		<combo_box.item label="Chikane &gt; Injurier/bagvask enkeltpersoner eller grupper" name="Harassment__Defaming_individuals_or_groups"/>
+		<combo_box.item label="Chikane &gt; Hindre bevægelse" name="Harassment__Impeding_movement"/>
+		<combo_box.item label="Chikane &gt; Sex chikane" name="Harassment__Sexual_harassment"/>
+		<combo_box.item label="Chikane &gt; Opfordrer/kræver at andre overtræder licensbetingelser" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
+		<combo_box.item label="Chikane &gt; Verbalt chikane" name="Harassment__Verbal_abuse"/>
+		<combo_box.item label="Uanstændighed &gt; Meget stødende indhold eller adfærd" name="Indecency__Broadly_offensive_content_or_conduct"/>
+		<combo_box.item label="Uanstændighed &gt; Upassende avatar navn" name="Indecency__Inappropriate_avatar_name"/>
+		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;PG&apos; region" name="Indecency__Mature_content_in_PG_region"/>
+		<combo_box.item label="Usømmelighed &gt; Upassende inhold eller opførsel i en &apos;Mature&apos; region" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse" name="Intellectual_property_infringement_Content_Removal"/>
+		<combo_box.item label="Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot eller omgåelse af rettighedsbeskyttelse" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
+		<combo_box.item label="Intolerance" name="Intolerance"/>
+		<combo_box.item label="Land &gt; Misbrug af sandkasse resourcer" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Objekter/teksturer" name="Land__Encroachment__Objects_textures"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Partikler" name="Land__Encroachment__Particles"/>
+		<combo_box.item label="Land &gt; Overgreb &gt; Træer/planter" name="Land__Encroachment__Trees_plants"/>
+		<combo_box.item label="Væddemål/gambling" name="Wagering_gambling"/>
+		<combo_box.item label="Andet" name="Other"/>
+	</combo_box>
+	<text name="abuser_name_title">
+		Udøvers navn:
+	</text>
+	<button label="Vælg beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>
+	<text name="abuser_name_title2">
+		Sted for misbrug/overgreb:
+	</text>
+	<text name="sum_title">
+		Opsummering:
+	</text>
+	<text name="dscr_title">
+		Detaljer:
+	</text>
+	<text name="bug_aviso">
+		Vær venligst så præcis som muligt
+	</text>
+	<text name="incomplete_title">
+		* Note: Ufuldstændige rapporter vil ikke blive undersøgt.
+	</text>
+	<button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn"/>
+	<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
index 06b795c3b9..fe3fa9626e 100644
--- a/indra/newview/skins/default/xui/da/floater_stats.xml
+++ b/indra/newview/skins/default/xui/da/floater_stats.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="Statistics" title="STATISTIK">

-	<scroll_container name="statistics_scroll">

-		<container_view name="statistics_view">

-			<stat_view label="Grundlæggende" name="basic">

-				<stat_bar label="FPS" name="fps"/>

-				<stat_bar label="Båndbredde" name="bandwidth"/>

-				<stat_bar label="Pakketab" name="packet_loss"/>

-				<stat_bar label="Ping Sim" name="ping"/>

-			</stat_view>

-			<stat_view label="Avanceret" name="advanced">

-				<stat_view label="Render" name="render">

-					<stat_bar label="KTris tegnet" name="ktrisframe"/>

-					<stat_bar label="KTris tegnet" name="ktrissec"/>

-					<stat_bar label="Total antal objekter" name="objs"/>

-					<stat_bar label="Nye objekter" name="newobjs"/>

-				</stat_view>

-				<stat_view label="Texture" name="texture">

-					<stat_bar label="Count" name="numimagesstat"/>

-					<stat_bar label="Raw Count" name="numrawimagesstat"/>

-					<stat_bar label="GL Mem" name="gltexmemstat"/>

-					<stat_bar label="Formatted Mem" name="formattedmemstat"/>

-					<stat_bar label="Raw Mem" name="rawmemstat"/>

-					<stat_bar label="Bound Mem" name="glboundmemstat"/>

-				</stat_view>

-				<stat_view label="Netværk" name="network">

-					<stat_bar label="Packets In" name="packetsinstat"/>

-					<stat_bar label="Packets Out" name="packetsoutstat"/>

-					<stat_bar label="Objekter" name="objectkbitstat"/>

-					<stat_bar label="Texture" name="texturekbitstat"/>

-					<stat_bar label="Asset" name="assetkbitstat"/>

-					<stat_bar label="Layers" name="layerskbitstat"/>

-					<stat_bar label="Actual In" name="actualinkbitstat"/>

-					<stat_bar label="Actual Out" name="actualoutkbitstat"/>

-					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>

-				</stat_view>

-			</stat_view>

-			<stat_view label="Simulator" name="sim">

-				<stat_bar label="Time Dilation" name="simtimedilation"/>

-				<stat_bar label="Sim FPS" name="simfps"/>

-				<stat_bar label="Physics FPS" name="simphysicsfps"/>

-				<stat_view label="Physics Details" name="physicsdetail">

-					<stat_bar label="Pinned Objects" name="physicspinnedtasks"/>

-					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>

-					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>

-					<stat_bar label="Agent Updates/Sec" name="simagentups"/>

-					<stat_bar label="Main Agents" name="simmainagents"/>

-					<stat_bar label="Child Agents" name="simchildagents"/>

-					<stat_bar label="Objects" name="simobjects"/>

-					<stat_bar label="Active Objects" name="simactiveobjects"/>

-					<stat_bar label="Active Scripts" name="simactivescripts"/>

-					<stat_bar label="Script Events" name="simscripteps"/>

-					<stat_bar label="Packets In" name="siminpps"/>

-					<stat_bar label="Packets Out" name="simoutpps"/>

-					<stat_bar label="Pending Downloads" name="simpendingdownloads"/>

-					<stat_bar label="Pending Uploads" name="simpendinguploads"/>

-					<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>

-				</stat_view>

-				<stat_view label="Time (ms)" name="simperf">

-					<stat_bar label="Total Frame Time" name="simframemsec"/>

-					<stat_bar label="Net Time" name="simnetmsec"/>

-					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>

-					<stat_bar label="Simulation Time" name="simsimothermsec"/>

-					<stat_bar label="Agent Time" name="simagentmsec"/>

-					<stat_bar label="Images Time" name="simimagesmsec"/>

-					<stat_bar label="Script Time" name="simscriptmsec"/>

-				</stat_view>

-			</stat_view>

-		</container_view>

-	</scroll_container>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Statistics" title="STATISTIK">
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view label="Grundlæggende" name="basic">
+				<stat_bar label="FPS" name="fps"/>
+				<stat_bar label="Båndbredde" name="bandwidth"/>
+				<stat_bar label="Pakketab" name="packet_loss"/>
+				<stat_bar label="Ping Sim" name="ping"/>
+			</stat_view>
+			<stat_view label="Avanceret" name="advanced">
+				<stat_view label="Render" name="render">
+					<stat_bar label="KTris tegnet" name="ktrisframe"/>
+					<stat_bar label="KTris tegnet" name="ktrissec"/>
+					<stat_bar label="Total antal objekter" name="objs"/>
+					<stat_bar label="Nye objekter" name="newobjs"/>
+				</stat_view>
+				<stat_view label="Texture" name="texture">
+					<stat_bar label="Count" name="numimagesstat"/>
+					<stat_bar label="Raw Count" name="numrawimagesstat"/>
+					<stat_bar label="GL Mem" name="gltexmemstat"/>
+					<stat_bar label="Formatted Mem" name="formattedmemstat"/>
+					<stat_bar label="Raw Mem" name="rawmemstat"/>
+					<stat_bar label="Bound Mem" name="glboundmemstat"/>
+				</stat_view>
+				<stat_view label="Netværk" name="network">
+					<stat_bar label="Packets In" name="packetsinstat"/>
+					<stat_bar label="Packets Out" name="packetsoutstat"/>
+					<stat_bar label="Objekter" name="objectkbitstat"/>
+					<stat_bar label="Texture" name="texturekbitstat"/>
+					<stat_bar label="Asset" name="assetkbitstat"/>
+					<stat_bar label="Layers" name="layerskbitstat"/>
+					<stat_bar label="Actual In" name="actualinkbitstat"/>
+					<stat_bar label="Actual Out" name="actualoutkbitstat"/>
+					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
+				</stat_view>
+			</stat_view>
+			<stat_view label="Simulator" name="sim">
+				<stat_bar label="Time Dilation" name="simtimedilation"/>
+				<stat_bar label="Sim FPS" name="simfps"/>
+				<stat_bar label="Physics FPS" name="simphysicsfps"/>
+				<stat_view label="Physics Details" name="physicsdetail">
+					<stat_bar label="Pinned Objects" name="physicspinnedtasks"/>
+					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
+					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>
+					<stat_bar label="Agent Updates/Sec" name="simagentups"/>
+					<stat_bar label="Main Agents" name="simmainagents"/>
+					<stat_bar label="Child Agents" name="simchildagents"/>
+					<stat_bar label="Objects" name="simobjects"/>
+					<stat_bar label="Active Objects" name="simactiveobjects"/>
+					<stat_bar label="Active Scripts" name="simactivescripts"/>
+					<stat_bar label="Script Events" name="simscripteps"/>
+					<stat_bar label="Packets In" name="siminpps"/>
+					<stat_bar label="Packets Out" name="simoutpps"/>
+					<stat_bar label="Pending Downloads" name="simpendingdownloads"/>
+					<stat_bar label="Pending Uploads" name="simpendinguploads"/>
+					<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
+				</stat_view>
+				<stat_view label="Time (ms)" name="simperf">
+					<stat_bar label="Total Frame Time" name="simframemsec"/>
+					<stat_bar label="Net Time" name="simnetmsec"/>
+					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>
+					<stat_bar label="Simulation Time" name="simsimothermsec"/>
+					<stat_bar label="Agent Time" name="simagentmsec"/>
+					<stat_bar label="Images Time" name="simimagesmsec"/>
+					<stat_bar label="Script Time" name="simscriptmsec"/>
+				</stat_view>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index b24fd80607..376af507d0 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<menu name="Popup">

-	<menu_item_call label="Køb" name="Task Buy"/>

-	<menu_item_call label="åben" name="Task Open"/>

-	<menu_item_call label="Afspil" name="Task Play"/>

-	<menu_item_call label="Egenskaber" name="Task Properties"/>

-	<menu_item_call label="Omdøb" name="Task Rename"/>

-	<menu_item_call label="Slet" name="Task Remove"/>

-	<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>

-	<menu_item_call label="Tøm &apos;Lost and found&apos;" name="Empty Lost And Found"/>

-	<menu_item_call label="Ny mappe" name="New Folder"/>

-	<menu_item_call label="Nyt script" name="New Script"/>

-	<menu_item_call label="Ny note" name="New Note"/>

-	<menu_item_call label="Ny bevægelse" name="New Gesture"/>

-	<menu label="Nyt tøj" name="New Clothes">

-		<menu_item_call label="Ny trøje" name="New Shirt"/>

-		<menu_item_call label="Nye bukser" name="New Pants"/>

-		<menu_item_call label="Nye sko" name="New Shoes"/>

-		<menu_item_call label="Nye strømper" name="New Socks"/>

-		<menu_item_call label="Ny jakke" name="New Jacket"/>

-		<menu_item_call label="Ny nederdel" name="New Skirt"/>

-		<menu_item_call label="Nye handsker" name="New Gloves"/>

-		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>

-		<menu_item_call label="Nye underbukser" name="New Underpants"/>

-		<menu_item_call label="Nyt alpha lag" name="New Alpha Mask"/>

-		<menu_item_call label="Ny tatovering" name="New Tattoo"/>

-	</menu>

-	<menu label="Nye kropsdele" name="New Body Parts">

-		<menu_item_call label="Ny figur" name="New Shape"/>

-		<menu_item_call label="Nyt hud" name="New Skin"/>

-		<menu_item_call label="Nyt hår" name="New Hair"/>

-		<menu_item_call label="Nye øjne" name="New Eyes"/>

-	</menu>

-	<menu label="Ændre type" name="Change Type">

-		<menu_item_call label="Standard" name="Default"/>

-		<menu_item_call label="Handsker" name="Gloves"/>

-		<menu_item_call label="Jakke" name="Jacket"/>

-		<menu_item_call label="Bukser" name="Pants"/>

-		<menu_item_call label="Kropsbygning" name="Shape"/>

-		<menu_item_call label="Sko" name="Shoes"/>

-		<menu_item_call label="Trøje" name="Shirt"/>

-		<menu_item_call label="Nederdel" name="Skirt"/>

-		<menu_item_call label="Underbukser" name="Underpants"/>

-		<menu_item_call label="Undertrøje" name="Undershirt"/>

-	</menu>

-	<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="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"/>

-	<menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/>

-	<menu_item_call label="Kopiér" name="Copy"/>

-	<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="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 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..."/>

-	<menu_item_call label="start konference Chat" name="Conference Chat"/>

-	<menu_item_call label="Aktivér" name="Activate"/>

-	<menu_item_call label="Deaktivér" name="Deactivate"/>

-	<menu_item_call label="Gem som" name="Save As"/>

-	<menu_item_call label="Tag af dig selv" name="Detach From Yourself"/>

-	<menu_item_call label="Tag på" name="Object Wear"/>

-	<menu label="Vedhæft" name="Attach To"/>

-	<menu label="Vedhæft til HUD" name="Attach To HUD"/>

-	<menu_item_call label="Redigér" name="Wearable Edit"/>

-	<menu_item_call label="Tag på" name="Wearable Wear"/>

-	<menu_item_call label="Tag af" name="Take Off"/>

-	<menu_item_call label="--ingen valg--" name="--no options--"/>

-</menu>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+	<menu_item_call label="Køb" name="Task Buy"/>
+	<menu_item_call label="åben" name="Task Open"/>
+	<menu_item_call label="Afspil" name="Task Play"/>
+	<menu_item_call label="Egenskaber" name="Task Properties"/>
+	<menu_item_call label="Omdøb" name="Task Rename"/>
+	<menu_item_call label="Slet" name="Task Remove"/>
+	<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>
+	<menu_item_call label="Tøm &apos;Lost and found&apos;" name="Empty Lost And Found"/>
+	<menu_item_call label="Ny mappe" name="New Folder"/>
+	<menu_item_call label="Nyt script" name="New Script"/>
+	<menu_item_call label="Ny note" name="New Note"/>
+	<menu_item_call label="Ny bevægelse" name="New Gesture"/>
+	<menu label="Nyt tøj" name="New Clothes">
+		<menu_item_call label="Ny trøje" name="New Shirt"/>
+		<menu_item_call label="Nye bukser" name="New Pants"/>
+		<menu_item_call label="Nye sko" name="New Shoes"/>
+		<menu_item_call label="Nye strømper" name="New Socks"/>
+		<menu_item_call label="Ny jakke" name="New Jacket"/>
+		<menu_item_call label="Ny nederdel" name="New Skirt"/>
+		<menu_item_call label="Nye handsker" name="New Gloves"/>
+		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+		<menu_item_call label="Nye underbukser" name="New Underpants"/>
+		<menu_item_call label="Nyt alpha lag" name="New Alpha Mask"/>
+		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+	</menu>
+	<menu label="Nye kropsdele" name="New Body Parts">
+		<menu_item_call label="Ny figur" name="New Shape"/>
+		<menu_item_call label="Nyt hud" name="New Skin"/>
+		<menu_item_call label="Nyt hår" name="New Hair"/>
+		<menu_item_call label="Nye øjne" name="New Eyes"/>
+	</menu>
+	<menu label="Ændre type" name="Change Type">
+		<menu_item_call label="Standard" name="Default"/>
+		<menu_item_call label="Handsker" name="Gloves"/>
+		<menu_item_call label="Jakke" name="Jacket"/>
+		<menu_item_call label="Bukser" name="Pants"/>
+		<menu_item_call label="Kropsbygning" name="Shape"/>
+		<menu_item_call label="Sko" name="Shoes"/>
+		<menu_item_call label="Trøje" name="Shirt"/>
+		<menu_item_call label="Nederdel" name="Skirt"/>
+		<menu_item_call label="Underbukser" name="Underpants"/>
+		<menu_item_call label="Undertrøje" name="Undershirt"/>
+	</menu>
+	<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="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"/>
+	<menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/>
+	<menu_item_call label="Kopiér" name="Copy"/>
+	<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="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 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..."/>
+	<menu_item_call label="start konference Chat" name="Conference Chat"/>
+	<menu_item_call label="Aktivér" name="Activate"/>
+	<menu_item_call label="Deaktivér" name="Deactivate"/>
+	<menu_item_call label="Gem som" name="Save As"/>
+	<menu_item_call label="Tag af dig selv" name="Detach From Yourself"/>
+	<menu_item_call label="Tag på" name="Object Wear"/>
+	<menu label="Vedhæft" name="Attach To"/>
+	<menu label="Vedhæft til HUD" name="Attach To HUD"/>
+	<menu_item_call label="Redigér" name="Wearable Edit"/>
+	<menu_item_call label="Tag på" name="Wearable Wear"/>
+	<menu_item_call label="Tag af" name="Take Off"/>
+	<menu_item_call label="--ingen valg--" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
index b2a144c9f0..dc79e4109e 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<menu name="menu_inventory_add">

-	<menu label="Hent" name="upload">

-		<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>

-		<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>

-		<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>

-		<menu_item_call label="Hent mange (L$[COST] pr. fil)..." name="Bulk Upload"/>

-	</menu>

-	<menu_item_call label="Ny mappe" name="New Folder"/>

-	<menu_item_call label="Nyt script" name="New Script"/>

-	<menu_item_call label="Ny note" name="New Note"/>

-	<menu_item_call label="Ny bevægelse" name="New Gesture"/>

-	<menu label="Nyt tøj" name="New Clothes">

-		<menu_item_call label="Ny trøje" name="New Shirt"/>

-		<menu_item_call label="Nye bukser" name="New Pants"/>

-		<menu_item_call label="Nye sko" name="New Shoes"/>

-		<menu_item_call label="Nye strømper" name="New Socks"/>

-		<menu_item_call label="Ny jakke" name="New Jacket"/>

-		<menu_item_call label="Ny nederdel" name="New Skirt"/>

-		<menu_item_call label="Nye handsker" name="New Gloves"/>

-		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>

-		<menu_item_call label="Nye underbukser" name="New Underpants"/>

-		<menu_item_call label="Nyt alpha lag" name="New Alpha"/>

-		<menu_item_call label="Ny tatovering" name="New Tattoo"/>

-	</menu>

-	<menu label="Nye kropsdele" name="New Body Parts">

-		<menu_item_call label="Ny kropsbygning" name="New Shape"/>

-		<menu_item_call label="Ny hud" name="New Skin"/>

-		<menu_item_call label="Nyt hår" name="New Hair"/>

-		<menu_item_call label="Nye øjne" name="New Eyes"/>

-	</menu>

-</menu>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="Hent" name="upload">
+		<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Hent mange (L$[COST] pr. fil)..." name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="Ny mappe" name="New Folder"/>
+	<menu_item_call label="Nyt script" name="New Script"/>
+	<menu_item_call label="Ny note" name="New Note"/>
+	<menu_item_call label="Ny bevægelse" name="New Gesture"/>
+	<menu label="Nyt tøj" name="New Clothes">
+		<menu_item_call label="Ny trøje" name="New Shirt"/>
+		<menu_item_call label="Nye bukser" name="New Pants"/>
+		<menu_item_call label="Nye sko" name="New Shoes"/>
+		<menu_item_call label="Nye strømper" name="New Socks"/>
+		<menu_item_call label="Ny jakke" name="New Jacket"/>
+		<menu_item_call label="Ny nederdel" name="New Skirt"/>
+		<menu_item_call label="Nye handsker" name="New Gloves"/>
+		<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+		<menu_item_call label="Nye underbukser" name="New Underpants"/>
+		<menu_item_call label="Nyt alpha lag" name="New Alpha"/>
+		<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+	</menu>
+	<menu label="Nye kropsdele" name="New Body Parts">
+		<menu_item_call label="Ny kropsbygning" name="New Shape"/>
+		<menu_item_call label="Ny hud" name="New Skin"/>
+		<menu_item_call label="Nyt hår" name="New Hair"/>
+		<menu_item_call label="Nye øjne" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml
index a47ef49ca0..81ee900773 100644
--- a/indra/newview/skins/default/xui/da/menu_picks.xml
+++ b/indra/newview/skins/default/xui/da/menu_picks.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<context_menu name="Picks">

-	<menu_item_call label="Info" name="pick_info"/>

-	<menu_item_call label="Redigér" name="pick_edit"/>

-	<menu_item_call label="Teleportér" name="pick_teleport"/>

-	<menu_item_call label="Vis på kort" name="pick_map"/>

-	<menu_item_call label="Slet" name="pick_delete"/>

-</context_menu>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Picks">
+	<menu_item_call label="Info" name="pick_info"/>
+	<menu_item_call label="Redigér" name="pick_edit"/>
+	<menu_item_call label="Teleportér" name="pick_teleport"/>
+	<menu_item_call label="Vis på kort" name="pick_map"/>
+	<menu_item_call label="Slet" name="pick_delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
index ed00c91508..21f425c49d 100644
--- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<menu name="menu_ladmark_gear">

-	<menu_item_call label="Teleportér" name="teleport"/>

-	<menu_item_call label="Mere information" name="more_info"/>

-	<menu_item_call label="Vis på kort" name="show_on_map"/>

-	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>

-	<menu_item_call label="Tilføj mappe" name="add_folder"/>

-	<menu_item_call label="Klip" name="cut"/>

-	<menu_item_call label="Kopiér landemærke" name="copy_landmark"/>

-	<menu_item_call label="Kopiér SLurl" name="copy_slurl"/>

-	<menu_item_call label="Sæt ind" name="paste"/>

-	<menu_item_call label="Omdøb" name="rename"/>

-	<menu_item_call label="Slet" name="delete"/>

-	<menu_item_call label="Åben alle mapper" name="expand_all"/>

-	<menu_item_call label="Luk alle mapper" name="collapse_all"/>

-	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>

-	<menu_item_call label="Opret favorit" name="create_pick"/>

-</menu>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_ladmark_gear">
+	<menu_item_call label="Teleportér" name="teleport"/>
+	<menu_item_call label="Mere information" name="more_info"/>
+	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
+	<menu_item_call label="Tilføj mappe" name="add_folder"/>
+	<menu_item_call label="Klip" name="cut"/>
+	<menu_item_call label="Kopiér landemærke" name="copy_landmark"/>
+	<menu_item_call label="Kopiér SLurl" name="copy_slurl"/>
+	<menu_item_call label="Sæt ind" name="paste"/>
+	<menu_item_call label="Omdøb" name="rename"/>
+	<menu_item_call label="Slet" name="delete"/>
+	<menu_item_call label="Åben alle mapper" name="expand_all"/>
+	<menu_item_call label="Luk alle mapper" name="collapse_all"/>
+	<menu_item_check label="Sortér efter dato" name="sort_by_date"/>
+	<menu_item_call label="Opret favorit" name="create_pick"/>
+</menu>
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 d16f7535fc..986a4131de 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

-	</text>

-	<scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/>

-	<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"/>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="block_list_panel">
+	<text name="title_text">
+		Blokérede avatarer
+	</text>
+	<scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/>
+	<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"/>
+</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 99f5bac89d..2cb57b4e87 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -1,121 +1,121 @@
-<?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.

-	</panel.string>

-	<panel.string name="want_apply_text">

-		Vil du gemme disse ændringer?

-	</panel.string>

-	<tab_container name="roles_tab_container">

-		<panel label="MEDLEMMER" name="members_sub_tab" tool_tip="Medlemmer">

-			<panel.string name="help_text">

-				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.

-Vælg flere medlemmer ved at holde Ctrl-tasten nede og

-klik på deres navne.

-			</panel.string>

-			<filter_editor label="Filtrér medlemmer" name="filter_input"/>

-			<name_list name="member_list">

-				<name_list.columns label="Medlemsnavn" name="name"/>

-				<name_list.columns label="Doneret leje" name="donated"/>

-				<name_list.columns label="Sidst på den" name="online"/>

-			</name_list>

-			<button label="Invitér nyt medlem" name="member_invite"/>

-			<button label="Udmeld" name="member_eject"/>

-		</panel>

-		<panel label="ROLLER" name="roles_sub_tab">

-			<panel.string name="help_text">

-				Roller har en titel og en tilladelsesliste med rettigheder,

-som medlemmerne kan bruge. Medlemmer kan høre til 

-en eller flere roller. En gruppe kan have op til 10 roller,

-inkluderet alle- og ejerroller.

-			</panel.string>

-			<panel.string name="cant_delete_role">

-				&apos;Alle-&apos; og &apos;Ejerroller&apos; er specielle og kan ikke slettes.

-			</panel.string>

-			<panel.string name="power_folder_icon">

-				Inv_FolderClosed

-			</panel.string>

-			<filter_editor label="Filtrér roller" name="filter_input"/>

-			<scroll_list name="role_list">

-				<scroll_list.columns label="Rollenavn" name="name"/>

-				<scroll_list.columns label="Titel" name="title"/>

-				<scroll_list.columns label="Medlemmer" name="members"/>

-			</scroll_list>

-			<button label="Opret ny rolle" name="role_create"/>

-			<button label="Slet rolle" name="role_delete"/>

-		</panel>

-		<panel label="RETTIGHEDER" name="actions_sub_tab" tool_tip="Du kan se beskrivelse af rettighed og hvilke roller og medlemmer der har denne rettighed.">

-			<panel.string name="help_text">

-				Rettigheder giver medlemmer i roller mulighed for at gøre specifikke

-ting i denne gruppe. Der er en bred vifte af rettigheder.

-			</panel.string>

-			<filter_editor label="Filtrér rettigheder" name="filter_input"/>

-			<scroll_list name="action_list" tool_tip="Vælg en rettighed for at se flere detaljer">

-				<scroll_list.columns label="" name="icon"/>

-				<scroll_list.columns label="" name="action"/>

-			</scroll_list>

-		</panel>

-	</tab_container>

-	<panel name="members_footer">

-		<text name="static">

-			Tildelte roller

-		</text>

-		<scroll_list name="member_assigned_roles">

-			<scroll_list.columns label="" name="checkbox"/>

-			<scroll_list.columns label="" name="role"/>

-		</scroll_list>

-		<text name="static2">

-			Tilladte rettigheder

-		</text>

-		<scroll_list name="member_allowed_actions" tool_tip="For detaljer om hver tilladte rettighed, se rettighedsfanebladet.">

-			<scroll_list.columns label="" name="icon"/>

-			<scroll_list.columns label="" name="action"/>

-		</scroll_list>

-	</panel>

-	<panel name="roles_footer">

-		<text name="static">

-			Navn

-		</text>

-		<line_editor name="role_name">

-			Ansatte

-		</line_editor>

-		<text name="static3">

-			Titel

-		</text>

-		<line_editor name="role_title">

-			(venter)

-		</line_editor>

-		<text name="static2">

-			Beskrivelse

-		</text>

-		<text_editor name="role_description">

-			(venter)

-		</text_editor>

-		<text name="static4">

-			Tildelte roller

-		</text>

-		<check_box label="Medlemmer er synlige" name="role_visible_in_list" tool_tip="Angiver om medlemmer med denne rolle er synlige i fanen &apos;Generelt&apos; for avatarer uden for gruppen."/>

-		<text name="static5" tool_tip="A list of Abilities the currently selected role can perform.">

-			Tilladte rettigheder

-		</text>

-		<scroll_list name="role_allowed_actions" tool_tip="For detaljer om hver rettighed se under rettigheder fanebladet.">

-			<scroll_list.columns label="" name="icon"/>

-			<scroll_list.columns label="" name="checkbox"/>

-			<scroll_list.columns label="" name="action"/>

-		</scroll_list>

-	</panel>

-	<panel name="actions_footer">

-		<text name="static">

-			Beskrivelse

-		</text>

-		<text_editor name="action_description">

-			Denne rettigheder &apos;Udmeld medlemmer fra denne gruppe&apos;. Kun en ejer kan udmelde en anden ejer.

-		</text_editor>

-		<text name="static2">

-			Roller med rettighed

-		</text>

-		<text name="static3">

-			Medlemmer med rettighed

-		</text>

-	</panel>

-</panel>

+<?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.
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Vil du gemme disse ændringer?
+	</panel.string>
+	<tab_container name="roles_tab_container">
+		<panel label="MEDLEMMER" name="members_sub_tab" tool_tip="Medlemmer">
+			<panel.string name="help_text">
+				Du kan tilføje eller fjerne roller, der er tildelt medlemmerne.
+Vælg flere medlemmer ved at holde Ctrl-tasten nede og
+klik på deres navne.
+			</panel.string>
+			<filter_editor label="Filtrér medlemmer" name="filter_input"/>
+			<name_list name="member_list">
+				<name_list.columns label="Medlemsnavn" name="name"/>
+				<name_list.columns label="Doneret leje" name="donated"/>
+				<name_list.columns label="Sidst på den" name="online"/>
+			</name_list>
+			<button label="Invitér nyt medlem" name="member_invite"/>
+			<button label="Udmeld" name="member_eject"/>
+		</panel>
+		<panel label="ROLLER" name="roles_sub_tab">
+			<panel.string name="help_text">
+				Roller har en titel og en tilladelsesliste med rettigheder,
+som medlemmerne kan bruge. Medlemmer kan høre til 
+en eller flere roller. En gruppe kan have op til 10 roller,
+inkluderet alle- og ejerroller.
+			</panel.string>
+			<panel.string name="cant_delete_role">
+				&apos;Alle-&apos; og &apos;Ejerroller&apos; er specielle og kan ikke slettes.
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<filter_editor label="Filtrér roller" name="filter_input"/>
+			<scroll_list name="role_list">
+				<scroll_list.columns label="Rollenavn" name="name"/>
+				<scroll_list.columns label="Titel" name="title"/>
+				<scroll_list.columns label="Medlemmer" name="members"/>
+			</scroll_list>
+			<button label="Opret ny rolle" name="role_create"/>
+			<button label="Slet rolle" name="role_delete"/>
+		</panel>
+		<panel label="RETTIGHEDER" name="actions_sub_tab" tool_tip="Du kan se beskrivelse af rettighed og hvilke roller og medlemmer der har denne rettighed.">
+			<panel.string name="help_text">
+				Rettigheder giver medlemmer i roller mulighed for at gøre specifikke
+ting i denne gruppe. Der er en bred vifte af rettigheder.
+			</panel.string>
+			<filter_editor label="Filtrér rettigheder" name="filter_input"/>
+			<scroll_list name="action_list" tool_tip="Vælg en rettighed for at se flere detaljer">
+				<scroll_list.columns label="" name="icon"/>
+				<scroll_list.columns label="" name="action"/>
+			</scroll_list>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			Tildelte roller
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="role"/>
+		</scroll_list>
+		<text name="static2">
+			Tilladte rettigheder
+		</text>
+		<scroll_list name="member_allowed_actions" tool_tip="For detaljer om hver tilladte rettighed, se rettighedsfanebladet.">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Navn
+		</text>
+		<line_editor name="role_name">
+			Ansatte
+		</line_editor>
+		<text name="static3">
+			Titel
+		</text>
+		<line_editor name="role_title">
+			(venter)
+		</line_editor>
+		<text name="static2">
+			Beskrivelse
+		</text>
+		<text_editor name="role_description">
+			(venter)
+		</text_editor>
+		<text name="static4">
+			Tildelte roller
+		</text>
+		<check_box label="Medlemmer er synlige" name="role_visible_in_list" tool_tip="Angiver om medlemmer med denne rolle er synlige i fanen &apos;Generelt&apos; for avatarer uden for gruppen."/>
+		<text name="static5" tool_tip="A list of Abilities the currently selected role can perform.">
+			Tilladte rettigheder
+		</text>
+		<scroll_list name="role_allowed_actions" tool_tip="For detaljer om hver rettighed se under rettigheder fanebladet.">
+			<scroll_list.columns label="" name="icon"/>
+			<scroll_list.columns label="" name="checkbox"/>
+			<scroll_list.columns label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Beskrivelse
+		</text>
+		<text_editor name="action_description">
+			Denne rettigheder &apos;Udmeld medlemmer fra denne gruppe&apos;. Kun en ejer kan udmelde en anden ejer.
+		</text_editor>
+		<text name="static2">
+			Roller med rettighed
+		</text>
+		<text name="static3">
+			Medlemmer med rettighed
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index fbef93de69..3b1b717c46 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel name="panel_login">

-	<panel.string name="real_url">

-		http://secondlife.com/app/login/

-	</panel.string>

-	<panel.string name="forgot_password_url">

-		http://secondlife.com/account/request.php

-	</panel.string>

-	<panel name="login_widgets">

-		<text name="first_name_text">

-			Fornavn:

-		</text>

-		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Fornavn"/>

-		<text name="last_name_text">

-			Efternavn:

-		</text>

-		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Efternavn"/>

-		<text name="password_text">

-			Password:

-		</text>

-		<button label="Log Ind" label_selected="Log Ind" name="connect_btn"/>

-		<text name="start_location_text">

-			Start lokation:

-		</text>

-		<combo_box name="start_location_combo">

-			<combo_box.item label="Min sidste lokation" name="MyLastLocation"/>

-			<combo_box.item label="Hjem" name="MyHome"/>

-			<combo_box.item label="&lt;Skriv navn på region&gt;" name="Typeregionname"/>

-		</combo_box>

-		<check_box label="Husk password" name="remember_check"/>

-		<text name="create_new_account_text">

-			Opret bruger

-		</text>

-		<text name="forgot_password_text">

-			Glemt navn eller password?

-		</text>

-	</panel>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+	<panel.string name="real_url">
+		http://secondlife.com/app/login/
+	</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<panel name="login_widgets">
+		<text name="first_name_text">
+			Fornavn:
+		</text>
+		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Fornavn"/>
+		<text name="last_name_text">
+			Efternavn:
+		</text>
+		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Efternavn"/>
+		<text name="password_text">
+			Password:
+		</text>
+		<button label="Log Ind" label_selected="Log Ind" name="connect_btn"/>
+		<text name="start_location_text">
+			Start lokation:
+		</text>
+		<combo_box name="start_location_combo">
+			<combo_box.item label="Min sidste lokation" name="MyLastLocation"/>
+			<combo_box.item label="Hjem" name="MyHome"/>
+			<combo_box.item label="&lt;Skriv navn på region&gt;" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="Husk password" name="remember_check"/>
+		<text name="create_new_account_text">
+			Opret bruger
+		</text>
+		<text name="forgot_password_text">
+			Glemt navn eller password?
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
index e0f99bee93..ac3a2844db 100644
--- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel label="Ting" name="main inventory panel">

-	<panel.string name="Title">

-		Ting

-	</panel.string>

-	<filter_editor label="Filter" name="inventory search editor"/>

-	<tab_container name="inventory filter tabs">

-		<inventory_panel label="Alle ting" name="All Items"/>

-		<inventory_panel label="Nye ting" name="Recent Items"/>

-	</tab_container>

-	<panel name="bottom_panel">

-		<button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>

-		<button name="add_btn" tool_tip="Opret ny genstand"/>

-		<dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>

-	</panel>

-	<menu_bar name="Inventory Menu">

-		<menu label="Filer" name="File">

-			<menu_item_call label="Åben" name="Open"/>

-			<menu label="Send fil" name="upload">

-				<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>

-				<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>

-				<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>

-				<menu_item_call label="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/>

-			</menu>

-			<menu_item_call label="Nyt vindue" name="New Window"/>

-			<menu_item_call label="Vis filtre" name="Show Filters"/>

-			<menu_item_call label="Nulstil filtre" name="Reset Current"/>

-			<menu_item_call label="Luk alle mapper" name="Close All Folders"/>

-			<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>

-			<menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/>

-		</menu>

-		<menu label="Opret" name="Create">

-			<menu_item_call label="Ny mappe" name="New Folder"/>

-			<menu_item_call label="Nyt script" name="New Script"/>

-			<menu_item_call label="Ny note" name="New Note"/>

-			<menu_item_call label="Ny bevægelse" name="New Gesture"/>

-			<menu label="Nyt tøj" name="New Clothes">

-				<menu_item_call label="Ny trøje" name="New Shirt"/>

-				<menu_item_call label="Nye bukser" name="New Pants"/>

-				<menu_item_call label="Nye sko" name="New Shoes"/>

-				<menu_item_call label="Nye strømper" name="New Socks"/>

-				<menu_item_call label="Ny jakke" name="New Jacket"/>

-				<menu_item_call label="Ny nederdel" name="New Skirt"/>

-				<menu_item_call label="Nye handsker" name="New Gloves"/>

-				<menu_item_call label="Ny undertrøje" name="New Undershirt"/>

-				<menu_item_call label="Nye underbukser" name="New Underpants"/>

-				<menu_item_call label="Nyt alpha lag" name="New Alpha"/>

-				<menu_item_call label="Ny tatovering" name="New Tattoo"/>

-			</menu>

-			<menu label="Nye kropsdele" name="New Body Parts">

-				<menu_item_call label="Ny kropsbygning" name="New Shape"/>

-				<menu_item_call label="Ny hud" name="New Skin"/>

-				<menu_item_call label="Nyt hår" name="New Hair"/>

-				<menu_item_call label="Nye øjne" name="New Eyes"/>

-			</menu>

-		</menu>

-		<menu label="Sortér" name="Sort">

-			<menu_item_check label="Efter navn" name="By Name"/>

-			<menu_item_check label="Efter dato" name="By Date"/>

-			<menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/>

-			<menu_item_check label="System-mapper i toppen" name="System Folders To Top"/>

-		</menu>

-	</menu_bar>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ting" name="main inventory panel">
+	<panel.string name="Title">
+		Ting
+	</panel.string>
+	<filter_editor label="Filter" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Alle ting" name="All Items"/>
+		<inventory_panel label="Nye ting" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>
+		<button name="add_btn" tool_tip="Opret ny genstand"/>
+		<dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="Filer" name="File">
+			<menu_item_call label="Åben" name="Open"/>
+			<menu label="Send fil" name="upload">
+				<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
+				<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
+				<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
+				<menu_item_call label="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="Nyt vindue" name="New Window"/>
+			<menu_item_call label="Vis filtre" name="Show Filters"/>
+			<menu_item_call label="Nulstil filtre" name="Reset Current"/>
+			<menu_item_call label="Luk alle mapper" name="Close All Folders"/>
+			<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>
+			<menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="Opret" name="Create">
+			<menu_item_call label="Ny mappe" name="New Folder"/>
+			<menu_item_call label="Nyt script" name="New Script"/>
+			<menu_item_call label="Ny note" name="New Note"/>
+			<menu_item_call label="Ny bevægelse" name="New Gesture"/>
+			<menu label="Nyt tøj" name="New Clothes">
+				<menu_item_call label="Ny trøje" name="New Shirt"/>
+				<menu_item_call label="Nye bukser" name="New Pants"/>
+				<menu_item_call label="Nye sko" name="New Shoes"/>
+				<menu_item_call label="Nye strømper" name="New Socks"/>
+				<menu_item_call label="Ny jakke" name="New Jacket"/>
+				<menu_item_call label="Ny nederdel" name="New Skirt"/>
+				<menu_item_call label="Nye handsker" name="New Gloves"/>
+				<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
+				<menu_item_call label="Nye underbukser" name="New Underpants"/>
+				<menu_item_call label="Nyt alpha lag" name="New Alpha"/>
+				<menu_item_call label="Ny tatovering" name="New Tattoo"/>
+			</menu>
+			<menu label="Nye kropsdele" name="New Body Parts">
+				<menu_item_call label="Ny kropsbygning" name="New Shape"/>
+				<menu_item_call label="Ny hud" name="New Skin"/>
+				<menu_item_call label="Nyt hår" name="New Hair"/>
+				<menu_item_call label="Nye øjne" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Sortér" name="Sort">
+			<menu_item_check label="Efter navn" name="By Name"/>
+			<menu_item_check label="Efter dato" name="By Date"/>
+			<menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/>
+			<menu_item_check label="System-mapper i toppen" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</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 e8f30c185d..87b749b4eb 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>

-<panel name="advanced">

-	<panel.string name="resolution_format">

-		[RES_X] x [RES_Y]

-	</panel.string>

-	<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">

-		Automatisk positionering for:

-	</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"/>

-	<radio_group name="show_location">

-		<radio_item label="I chat" name="0"/>

-		<radio_item label="I et 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."/>

-	<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"/>

-</panel>

+<?xml version="1.0" encoding="utf-8"?>
+<panel name="advanced">
+	<panel.string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</panel.string>
+	<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">
+		Automatisk positionering for:
+	</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"/>
+	<radio_group name="show_location">
+		<radio_item label="I chat" name="0"/>
+		<radio_item label="I et 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."/>
+	<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"/>
+</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 cc3972238e..4791033757 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel label="Popups" name="popups" title="Popups">

-	<text name="tell_me_label">

-		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"/>

-	<text name="show_label">

-		Vis altid disse beskeder:

-	</text>

-	<text name="dont_show_label">

-		Vis aldrig disse beskeder:

-	</text>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Popups" name="popups" title="Popups">
+	<text name="tell_me_label">
+		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"/>
+	<text name="show_label">
+		Vis altid disse beskeder:
+	</text>
+	<text name="dont_show_label">
+		Vis aldrig disse beskeder:
+	</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 b141998451..c8602d3119 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,42 +1,42 @@
-<?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_group>

-	<color_swatch label="Dig" name="user"/>

-	<text name="text_box1">

-		Dig

-	</text>

-	<color_swatch label="Andre" name="agent"/>

-	<text name="text_box2">

-		Andre

-	</text>

-	<color_swatch label="IM" name="im"/>

-	<text name="text_box3">

-		IM

-	</text>

-	<color_swatch label="System" name="system"/>

-	<text name="text_box4">

-		System

-	</text>

-	<color_swatch label="Fejl" name="script_error"/>

-	<text name="text_box5">

-		Fejl

-	</text>

-	<color_swatch label="Objekter" name="objects"/>

-	<text name="text_box6">

-		Objekter

-	</text>

-	<color_swatch label="Ejer" name="owner"/>

-	<text name="text_box7">

-		Ejer

-	</text>

-	<color_swatch label="URL&apos;er" name="links"/>

-	<text name="text_box9">

-		URL&apos;er

-	</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"/>

-</panel>

+<?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_group>
+	<color_swatch label="Dig" name="user"/>
+	<text name="text_box1">
+		Dig
+	</text>
+	<color_swatch label="Andre" name="agent"/>
+	<text name="text_box2">
+		Andre
+	</text>
+	<color_swatch label="IM" name="im"/>
+	<text name="text_box3">
+		IM
+	</text>
+	<color_swatch label="System" name="system"/>
+	<text name="text_box4">
+		System
+	</text>
+	<color_swatch label="Fejl" name="script_error"/>
+	<text name="text_box5">
+		Fejl
+	</text>
+	<color_swatch label="Objekter" name="objects"/>
+	<text name="text_box6">
+		Objekter
+	</text>
+	<color_swatch label="Ejer" name="owner"/>
+	<text name="text_box7">
+		Ejer
+	</text>
+	<color_swatch label="URL&apos;er" name="links"/>
+	<text name="text_box9">
+		URL&apos;er
+	</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"/>
+</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 c032e414c1..ce77018f72 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -1,38 +1,38 @@
-<?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"/>

-	<slider label="Knapper" name="UI Volume"/>

-	<slider label="Media" name="Media Volume"/>

-	<slider label="Effekter" name="SFX Volume"/>

-	<slider label="Musik" name="Music Volume"/>

-	<check_box label="Tale" name="enable_voice_check"/>

-	<slider label="Tale" name="Voice Volume"/>

-	<text name="Listen from">

-		Hør stemmer fra:

-	</text>

-	<radio_group name="ear_location">

-		<radio_item label="Kamera position" name="0"/>

-		<radio_item label="Avatar position" name="1"/>

-	</radio_group>

-	<button label="Input/Output enheder" name="device_settings_btn"/>

-	<panel label="Enhedsopsætning" name="device_settings_panel">

-		<panel.string name="default_text">

-			Standard

-		</panel.string>

-		<text name="Input">

-			Input

-		</text>

-		<text name="My volume label">

-			Min lydstyrke:

-		</text>

-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ændre lydstyrke med denne skyder"/>

-		<text name="wait_text">

-			Vent venligst

-		</text>

-		<text name="Output">

-			Output

-		</text>

-	</panel>

-</panel>

+<?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"/>
+	<slider label="Knapper" name="UI Volume"/>
+	<slider label="Media" name="Media Volume"/>
+	<slider label="Effekter" name="SFX Volume"/>
+	<slider label="Musik" name="Music Volume"/>
+	<check_box label="Tale" name="enable_voice_check"/>
+	<slider label="Tale" name="Voice Volume"/>
+	<text name="Listen from">
+		Hør stemmer fra:
+	</text>
+	<radio_group name="ear_location">
+		<radio_item label="Kamera position" name="0"/>
+		<radio_item label="Avatar position" name="1"/>
+	</radio_group>
+	<button label="Input/Output enheder" name="device_settings_btn"/>
+	<panel label="Enhedsopsætning" name="device_settings_panel">
+		<panel.string name="default_text">
+			Standard
+		</panel.string>
+		<text name="Input">
+			Input
+		</text>
+		<text name="My volume label">
+			Min lydstyrke:
+		</text>
+		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ændre lydstyrke med denne skyder"/>
+		<text name="wait_text">
+			Vent venligst
+		</text>
+		<text name="Output">
+			Output
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml
index f8bdaa9953..bea5ea6b36 100644
--- a/indra/newview/skins/default/xui/da/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/da/panel_world_map.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel name="world_map">

-	<panel.string name="Loading">

-		Henter...

-	</panel.string>

-	<panel.string name="InvalidLocation">

-		Ugyldig lokation

-	</panel.string>

-	<panel.string name="world_map_north">

-		N

-	</panel.string>

-	<panel.string name="world_map_east">

-		Ø

-	</panel.string>

-	<panel.string name="world_map_west">

-		V

-	</panel.string>

-	<panel.string name="world_map_south">

-		S

-	</panel.string>

-	<panel.string name="world_map_southeast">

-		SØ

-	</panel.string>

-	<panel.string name="world_map_northeast">

-		NØ

-	</panel.string>

-	<panel.string name="world_map_southwest">

-		SV

-	</panel.string>

-	<panel.string name="world_map_northwest">

-		NV

-	</panel.string>

-	<text label="N" name="floater_map_north" text="N">

-		N

-	</text>

-	<text label="Ø" name="floater_map_east" text="Ø">

-		Ø

-	</text>

-	<text label="V" name="floater_map_west" text="V">

-		V

-	</text>

-	<text label="S" name="floater_map_south" text="S">

-		S

-	</text>

-	<text label="SØ" name="floater_map_southeast" text="SØ">

-		SØ

-	</text>

-	<text label="NØ" name="floater_map_northeast" text="NØ">

-		NØ

-	</text>

-	<text label="SV" name="floater_map_southwest" text="SV">

-		SV

-	</text>

-	<text label="NV" name="floater_map_northwest" text="NV">

-		NV

-	</text>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="world_map">
+	<panel.string name="Loading">
+		Henter...
+	</panel.string>
+	<panel.string name="InvalidLocation">
+		Ugyldig lokation
+	</panel.string>
+	<panel.string name="world_map_north">
+		N
+	</panel.string>
+	<panel.string name="world_map_east">
+		Ø
+	</panel.string>
+	<panel.string name="world_map_west">
+		V
+	</panel.string>
+	<panel.string name="world_map_south">
+		S
+	</panel.string>
+	<panel.string name="world_map_southeast">
+		SØ
+	</panel.string>
+	<panel.string name="world_map_northeast">
+		NØ
+	</panel.string>
+	<panel.string name="world_map_southwest">
+		SV
+	</panel.string>
+	<panel.string name="world_map_northwest">
+		NV
+	</panel.string>
+	<text label="N" name="floater_map_north" text="N">
+		N
+	</text>
+	<text label="Ø" name="floater_map_east" text="Ø">
+		Ø
+	</text>
+	<text label="V" name="floater_map_west" text="V">
+		V
+	</text>
+	<text label="S" name="floater_map_south" text="S">
+		S
+	</text>
+	<text label="SØ" name="floater_map_southeast" text="SØ">
+		SØ
+	</text>
+	<text label="NØ" name="floater_map_northeast" text="NØ">
+		NØ
+	</text>
+	<text label="SV" name="floater_map_southwest" text="SV">
+		SV
+	</text>
+	<text label="NV" name="floater_map_northwest" text="NV">
+		NV
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 155714363e..fda01d2f59 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,3242 +1,3242 @@
-<?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 

-     that are returned from one component and may appear in many places-->

-<strings>

-	<string name="SUPPORT_SITE">

-		Second Life Support Portal

-	</string>

-	<string name="StartupDetectingHardware">

-		Detekterer hardware...

-	</string>

-	<string name="StartupLoading">

-		Indlæser

-	</string>

-	<string name="LoginInProgress">

-		Logger p. [APP_NAME] kan virke laast.  Vent venligst.

-	</string>

-	<string name="LoginInProgressNoFrozen">

-		Logger på...

-	</string>

-	<string name="LoginAuthenticating">

-		Validerer adgang

-	</string>

-	<string name="LoginMaintenance">

-		Udfører konto vedligeholdelse...

-	</string>

-	<string name="LoginAttempt">

-		Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]

-	</string>

-	<string name="LoginPrecaching">

-		verden...

-	</string>

-	<string name="LoginInitializingBrowser">

-		Klargør indbyggede web browser...

-	</string>

-	<string name="LoginInitializingMultimedia">

-		Klargør multimedia...

-	</string>

-	<string name="LoginInitializingFonts">

-		Indlæser fonts...

-	</string>

-	<string name="LoginVerifyingCache">

-		Checker cache filer (kan tage 60-90 sekunder)...

-	</string>

-	<string name="LoginProcessingResponse">

-		Behandler svar ...

-	</string>

-	<string name="LoginInitializingWorld">

-		Initialiserer verden...

-	</string>

-	<string name="LoginDecodingImages">

-		Behandler billeder...

-	</string>

-	<string name="LoginInitializingQuicktime">

-		Initialiserer QuickTime...

-	</string>

-	<string name="LoginQuicktimeNotFound">

-		QuickTime ikke fundet- kunne derfor ikke initialisere.

-	</string>

-	<string name="LoginQuicktimeOK">

-		QuickTime initialiseret.

-	</string>

-	<string name="LoginWaitingForRegionHandshake">

-		Venter på svar fra region...

-	</string>

-	<string name="LoginConnectingToRegion">

-		Tilslutter til region...

-	</string>

-	<string name="LoginDownloadingClothing">

-		Henter tøj...

-	</string>

-	<string name="LoginFailedNoNetwork">

-		Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse.

-	</string>

-	<string name="Quit">

-		Afslut

-	</string>

-	<string name="AgentLostConnection">

-		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.

-	</string>

-	<string name="TooltipPerson">

-		Person

-	</string>

-	<string name="TooltipNoName">

-		(intet navn)

-	</string>

-	<string name="TooltipOwner">

-		Ejer:

-	</string>

-	<string name="TooltipPublic">

-		Offentlig

-	</string>

-	<string name="TooltipIsGroup">

-		(Gruppe)

-	</string>

-	<string name="TooltipForSaleL$">

-		Til salg: L$[AMOUNT]

-	</string>

-	<string name="TooltipFlagGroupBuild">

-		Gruppe byg

-	</string>

-	<string name="TooltipFlagNoBuild">

-		Må ikke bygge

-	</string>

-	<string name="TooltipFlagNoEdit">

-		Gruppe byg

-	</string>

-	<string name="TooltipFlagNotSafe">

-		Ikke sikker område

-	</string>

-	<string name="TooltipFlagNoFly">

-		Ingen flyvning

-	</string>

-	<string name="TooltipFlagGroupScripts">

-		Gruppe scripts

-	</string>

-	<string name="TooltipFlagNoScripts">

-		Ingen Scripts

-	</string>

-	<string name="TooltipLand">

-		Land:

-	</string>

-	<string name="TooltipMustSingleDrop">

-		Kun et enkelt element kan trækkes ind her

-	</string>

-	<string name="TooltipHttpUrl">

-		Klik for at se denne hjemmeside

-	</string>

-	<string name="TooltipSLURL">

-		Klik for at se information om denne lokation

-	</string>

-	<string name="TooltipAgentUrl">

-		Klik for at denne beboers profil

-	</string>

-	<string name="TooltipGroupUrl">

-		Klik for at se denne gruppes beskrivelse

-	</string>

-	<string name="TooltipEventUrl">

-		Klik for at se beskrivelse af denne event

-	</string>

-	<string name="TooltipClassifiedUrl">

-		Klik for at se denne annonce

-	</string>

-	<string name="TooltipParcelUrl">

-		Klik for at se beskrivelse for denne parcel

-	</string>

-	<string name="TooltipTeleportUrl">

-		Klik for at teleportere til denne lokation

-	</string>

-	<string name="TooltipObjectIMUrl">

-		Klik for at se beskrivelse for dette objekt

-	</string>

-	<string name="TooltipMapUrl">

-		Klik for at se denne lokation på kortet

-	</string>

-	<string name="TooltipSLAPP">

-		Klik for at starte secondlife:// kommando

-	</string>

-	<string name="CurrentURL" value=" Nuværende URL: [CurrentURL]"/>

-	<string name="SLurlLabelTeleport">

-		Teleportér til

-	</string>

-	<string name="SLurlLabelShowOnMap">

-		Vis kort for

-	</string>

-	<string name="BUTTON_CLOSE_DARWIN">

-		Luk (&#8984;W)

-	</string>

-	<string name="BUTTON_CLOSE_WIN">

-		Luk (Ctrl+W)

-	</string>

-	<string name="BUTTON_RESTORE">

-		Gendan

-	</string>

-	<string name="BUTTON_MINIMIZE">

-		Minimér

-	</string>

-	<string name="BUTTON_TEAR_OFF">

-		Løsriv

-	</string>

-	<string name="BUTTON_DOCK">

-		Fastgør

-	</string>

-	<string name="BUTTON_UNDOCK">

-		Frigør

-	</string>

-	<string name="BUTTON_HELP">

-		Vis hjælp

-	</string>

-	<string name="Searching">

-		Søger...

-	</string>

-	<string name="NoneFound">

-		Intet fundet.

-	</string>

-	<string name="RetrievingData">

-		Henter...

-	</string>

-	<string name="ReleaseNotes">

-		Noter om version

-	</string>

-	<string name="LoadingData">

-		Henter...

-	</string>

-	<string name="AvatarNameNobody">

-		(ingen)

-	</string>

-	<string name="AvatarNameWaiting">

-		(venter)

-	</string>

-	<string name="AvatarNameHippos">

-		(hippos)

-	</string>

-	<string name="GroupNameNone">

-		(ingen)

-	</string>

-	<string name="AssetErrorNone">

-		Ingen fejl

-	</string>

-	<string name="AssetErrorRequestFailed">

-		Element forespørgsel: fejlede

-	</string>

-	<string name="AssetErrorNonexistentFile">

-		Element forespørgsel: fil findes ikke

-	</string>

-	<string name="AssetErrorNotInDatabase">

-		Element forespørgsel: element ikke fundet i database

-	</string>

-	<string name="AssetErrorEOF">

-		Slutning af fil

-	</string>

-	<string name="AssetErrorCannotOpenFile">

-		Kan ikke åbne fil

-	</string>

-	<string name="AssetErrorFileNotFound">

-		Fil ikke fundet

-	</string>

-	<string name="AssetErrorTCPTimeout">

-		Tidsgrænse overskredet ved filhentning

-	</string>

-	<string name="AssetErrorCircuitGone">

-		Forbindelsen mistet

-	</string>

-	<string name="AssetErrorPriceMismatch">

-		[APP_NAME] klient og server er uenige om prisen

-	</string>

-	<string name="AssetErrorUnknownStatus">

-		Ukendt status

-	</string>

-	<string name="texture">

-		tekstur

-	</string>

-	<string name="sound">

-		lyd

-	</string>

-	<string name="calling card">

-		visitkort

-	</string>

-	<string name="landmark">

-		landemærke

-	</string>

-	<string name="legacy script">

-		ældre script

-	</string>

-	<string name="clothing">

-		tøj

-	</string>

-	<string name="object">

-		objekt

-	</string>

-	<string name="note card">

-		note

-	</string>

-	<string name="folder">

-		mappe

-	</string>

-	<string name="root">

-		rod

-	</string>

-	<string name="lsl2 script">

-		LSL2 script

-	</string>

-	<string name="lsl bytecode">

-		LSL bytecode

-	</string>

-	<string name="tga texture">

-		tga texture

-	</string>

-	<string name="body part">

-		kropsdel

-	</string>

-	<string name="snapshot">

-		foto

-	</string>

-	<string name="lost and found">

-		Fundne genstande

-	</string>

-	<string name="targa image">

-		targa billede

-	</string>

-	<string name="trash">

-		Papirkurv

-	</string>

-	<string name="jpeg image">

-		jpeg billede

-	</string>

-	<string name="animation">

-		animation

-	</string>

-	<string name="gesture">

-		bevægelse

-	</string>

-	<string name="simstate">

-		simstate

-	</string>

-	<string name="favorite">

-		favorit

-	</string>

-	<string name="symbolic link">

-		link

-	</string>

-	<string name="AvatarAway">

-		Væk

-	</string>

-	<string name="AvatarBusy">

-		Optaget

-	</string>

-	<string name="AvatarMuted">

-		Blokeret

-	</string>

-	<string name="anim_express_afraid">

-		Bange

-	</string>

-	<string name="anim_express_anger">

-		Vred

-	</string>

-	<string name="anim_away">

-		Væk

-	</string>

-	<string name="anim_backflip">

-		Baglæns salto

-	</string>

-	<string name="anim_express_laugh">

-		Hjertelig latter

-	</string>

-	<string name="anim_express_toothsmile">

-		Stort smil

-	</string>

-	<string name="anim_blowkiss">

-		Sende kys

-	</string>

-	<string name="anim_express_bored">

-		Keder sig

-	</string>

-	<string name="anim_bow">

-		Buk

-	</string>

-	<string name="anim_clap">

-		Klap

-	</string>

-	<string name="anim_courtbow">

-		Højtideligt buk

-	</string>

-	<string name="anim_express_cry">

-		Græd

-	</string>

-	<string name="anim_dance1">

-		Dans 1

-	</string>

-	<string name="anim_dance2">

-		Dans 2

-	</string>

-	<string name="anim_dance3">

-		Dans 3

-	</string>

-	<string name="anim_dance4">

-		Dans 4

-	</string>

-	<string name="anim_dance5">

-		Dans 5

-	</string>

-	<string name="anim_dance6">

-		Dans 6

-	</string>

-	<string name="anim_dance7">

-		Dans 7

-	</string>

-	<string name="anim_dance8">

-		Dans 8

-	</string>

-	<string name="anim_express_disdain">

-		Foragt

-	</string>

-	<string name="anim_drink">

-		Drik

-	</string>

-	<string name="anim_express_embarrased">

-		Flov

-	</string>

-	<string name="anim_angry_fingerwag">

-		Løftet finger

-	</string>

-	<string name="anim_fist_pump">

-		Knytnæve

-	</string>

-	<string name="anim_yoga_float">

-		Svævende yoga

-	</string>

-	<string name="anim_express_frown">

-		Mistroisk

-	</string>

-	<string name="anim_impatient">

-		Utålmodig

-	</string>

-	<string name="anim_jumpforjoy">

-		Glædeshop

-	</string>

-	<string name="anim_kissmybutt">

-		Kys min r..

-	</string>

-	<string name="anim_express_kiss">

-		Kys

-	</string>

-	<string name="anim_laugh_short">

-		Grin

-	</string>

-	<string name="anim_musclebeach">

-		Bodybuilder

-	</string>

-	<string name="anim_no_unhappy">

-		Nej (sur)

-	</string>

-	<string name="anim_no_head">

-		Nej

-	</string>

-	<string name="anim_nyanya">

-		Æv-bæv

-	</string>

-	<string name="anim_punch_onetwo">

-		Et-to slag

-	</string>

-	<string name="anim_express_open_mouth">

-		Åben mund

-	</string>

-	<string name="anim_peace">

-		Peace

-	</string>

-	<string name="anim_point_you">

-		Peg på andre

-	</string>

-	<string name="anim_point_me">

-		Peg på dig selv

-	</string>

-	<string name="anim_punch_l">

-		Slå venstre

-	</string>

-	<string name="anim_punch_r">

-		Slå højre

-	</string>

-	<string name="anim_rps_countdown">

-		SSP - Tæl

-	</string>

-	<string name="anim_rps_paper">

-		SSP - Papir

-	</string>

-	<string name="anim_rps_rock">

-		SSP - Sten

-	</string>

-	<string name="anim_rps_scissors">

-		SSP - Saks

-	</string>

-	<string name="anim_express_repulsed">

-		Misfornøjet

-	</string>

-	<string name="anim_kick_roundhouse_r">

-		Karatepark

-	</string>

-	<string name="anim_express_sad">

-		Ked af det

-	</string>

-	<string name="anim_salute">

-		Honnør

-	</string>

-	<string name="anim_shout">

-		Råb

-	</string>

-	<string name="anim_express_shrug">

-		Skuldertræk

-	</string>

-	<string name="anim_express_smile">

-		Smil

-	</string>

-	<string name="anim_smoke_idle">

-		Ryg

-	</string>

-	<string name="anim_smoke_inhale">

-		Indhalér

-	</string>

-	<string name="anim_smoke_throw_down">

-		Smid cigaret

-	</string>

-	<string name="anim_express_surprise">

-		Overrasket

-	</string>

-	<string name="anim_sword_strike_r">

-		Sværdslag

-	</string>

-	<string name="anim_angry_tantrum">

-		Ekstatisk

-	</string>

-	<string name="anim_express_tongue_out">

-		Tunge ud

-	</string>

-	<string name="anim_hello">

-		Vink

-	</string>

-	<string name="anim_whisper">

-		Knib øje i

-	</string>

-	<string name="anim_whistle">

-		Pift

-	</string>

-	<string name="anim_express_wink">

-		Blink

-	</string>

-	<string name="anim_wink_hollywood">

-		Blink (Hollywood)

-	</string>

-	<string name="anim_express_worry">

-		Bekymret

-	</string>

-	<string name="anim_yes_happy">

-		Ja (glad)

-	</string>

-	<string name="anim_yes_head">

-		Ja

-	</string>

-	<string name="texture_loading">

-		Indlæser...

-	</string>

-	<string name="worldmap_offline">

-		Offline

-	</string>

-	<string name="worldmap_results_none_found">

-		Ingen fundet.

-	</string>

-	<string name="Ok">

-		OK

-	</string>

-	<string name="Premature end of file">

-		Fil slutter for tidligt

-	</string>

-	<string name="ST_NO_JOINT">

-		Kan ikke funde ROOT eller JOINT.

-	</string>

-	<string name="whisper">

-		hvisker:

-	</string>

-	<string name="shout">

-		råber:

-	</string>

-	<string name="ringing">

-		Forbinder til stemmechat...

-	</string>

-	<string name="connected">

-		Forbundet

-	</string>

-	<string name="unavailable">

-		Stemmechat er ikke tilladt hvor du befinder dig

-	</string>

-	<string name="hang_up">

-		Stemme chat er afbrudt

-	</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>

-	<string name="ScriptQuestionCautionChatDenied">

-		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], er afvist tilladelse til: [PERMISSIONS].

-	</string>

-	<string name="ScriptTakeMoney">

-		Tag Linden dollars (L$) fra dig

-	</string>

-	<string name="ActOnControlInputs">

-		Reagér på dine kontrol-taster

-	</string>

-	<string name="RemapControlInputs">

-		Ændre dine kontrol-taster

-	</string>

-	<string name="AnimateYourAvatar">

-		Animér din avatar

-	</string>

-	<string name="AttachToYourAvatar">

-		Sæt på din avatar

-	</string>

-	<string name="ReleaseOwnership">

-		Fjern ejerskabet og sæt til offentlig

-	</string>

-	<string name="LinkAndDelink">

-		Sammenkæd og adskil andre genstande

-	</string>

-	<string name="AddAndRemoveJoints">

-		Tilføj og fjern sammenkødninger med andre genstande

-	</string>

-	<string name="ChangePermissions">

-		Ændre dens tilladelser

-	</string>

-	<string name="TrackYourCamera">

-		Spor dit kamera

-	</string>

-	<string name="ControlYourCamera">

-		Kontrollér dit kamera

-	</string>

-	<string name="SIM_ACCESS_PG">

-		PG

-	</string>

-	<string name="SIM_ACCESS_MATURE">

-		Mature

-	</string>

-	<string name="SIM_ACCESS_ADULT">

-		Adult

-	</string>

-	<string name="SIM_ACCESS_DOWN">

-		logget af

-	</string>

-	<string name="SIM_ACCESS_MIN">

-		Ukendt

-	</string>

-	<string name="land_type_unknown">

-		(ukendt)

-	</string>

-	<string name="all_files">

-		Alle filer

-	</string>

-	<string name="sound_files">

-		Lyde

-	</string>

-	<string name="animation_files">

-		Animationer

-	</string>

-	<string name="image_files">

-		Billeder

-	</string>

-	<string name="save_file_verb">

-		Gem

-	</string>

-	<string name="load_file_verb">

-		Hent

-	</string>

-	<string name="targa_image_files">

-		Targa billeder

-	</string>

-	<string name="bitmap_image_files">

-		Bitmap billeder

-	</string>

-	<string name="avi_movie_file">

-		AVI film fil

-	</string>

-	<string name="xaf_animation_file">

-		XAF Anim Fil

-	</string>

-	<string name="xml_file">

-		XML Fil

-	</string>

-	<string name="dot_raw_file">

-		RAW Fil

-	</string>

-	<string name="compressed_image_files">

-		Komprimerede billeder

-	</string>

-	<string name="load_files">

-		Hent filer

-	</string>

-	<string name="choose_the_directory">

-		Vælg bibliotek

-	</string>

-	<string name="AvatarSetNotAway">

-		Sæt &quot;til stede&quot;

-	</string>

-	<string name="AvatarSetAway">

-		Sæt &quot;væk&quot;

-	</string>

-	<string name="AvatarSetNotBusy">

-		Sæt &quot;ledig&quot;

-	</string>

-	<string name="AvatarSetBusy">

-		Sæt &quot;optaget&quot;

-	</string>

-	<string name="shape">

-		Form

-	</string>

-	<string name="skin">

-		Hud

-	</string>

-	<string name="hair">

-		Hår

-	</string>

-	<string name="eyes">

-		Øjne

-	</string>

-	<string name="shirt">

-		Trøje

-	</string>

-	<string name="pants">

-		Bukser

-	</string>

-	<string name="shoes">

-		Sko

-	</string>

-	<string name="socks">

-		Strømper

-	</string>

-	<string name="jacket">

-		Jakke

-	</string>

-	<string name="gloves">

-		Handsker

-	</string>

-	<string name="undershirt">

-		Undertrøje

-	</string>

-	<string name="underpants">

-		Underbukser

-	</string>

-	<string name="skirt">

-		Nederdel

-	</string>

-	<string name="alpha">

-		Alpha

-	</string>

-	<string name="tattoo">

-		Tatovering

-	</string>

-	<string name="invalid">

-		ugyldig

-	</string>

-	<string name="next">

-		Næste

-	</string>

-	<string name="ok">

-		OK

-	</string>

-	<string name="GroupNotifyGroupNotice">

-		Gruppe besked

-	</string>

-	<string name="GroupNotifyGroupNotices">

-		Gruppe besked

-	</string>

-	<string name="GroupNotifySentBy">

-		Sendt af

-	</string>

-	<string name="GroupNotifyAttached">

-		Vedhæftet:

-	</string>

-	<string name="GroupNotifyViewPastNotices">

-		Se tidligere beskeder eller slå modtagelse af beskeder fra her.

-	</string>

-	<string name="GroupNotifyOpenAttachment">

-		Åben vedhæng

-	</string>

-	<string name="GroupNotifySaveAttachment">

-		Gem vedhæng

-	</string>

-	<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>

-	<string name="OverflowInfoChannelString">

-		Du har %d mere besked(er)

-	</string>

-	<string name="BodyPartsRightArm">

-		Højre arm

-	</string>

-	<string name="BodyPartsHead">

-		Hoved

-	</string>

-	<string name="BodyPartsLeftArm">

-		Venstre arm

-	</string>

-	<string name="BodyPartsLeftLeg">

-		Venstre ben

-	</string>

-	<string name="BodyPartsTorso">

-		Overkrop

-	</string>

-	<string name="BodyPartsRightLeg">

-		Højre ben

-	</string>

-	<string name="GraphicsQualityLow">

-		Lav

-	</string>

-	<string name="GraphicsQualityMid">

-		Middel

-	</string>

-	<string name="GraphicsQualityHigh">

-		Høj

-	</string>

-	<string name="LeaveMouselook">

-		Tryk ESC for at skift til normalt udsyn

-	</string>

-	<string name="InventoryNoMatchingItems">

-		No matching items found in inventory.

-	</string>

-	<string name="InventoryNoTexture">

-		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)"/>

-	<string name="no_copy" value=" (ikke kopiere)"/>

-	<string name="worn" value=" (båret)"/>

-	<string name="link" value=" (sammenkæde)"/>

-	<string name="broken_link" value=" (brudt_kæde)&quot;"/>

-	<string name="LoadingContents">

-		Henter indhold...

-	</string>

-	<string name="NoContents">

-		Intet indhold

-	</string>

-	<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>

-	<string name="Chat" value=" Chat : "/>

-	<string name="Sound" value=" Lyd : "/>

-	<string name="Wait" value=" --- Vent : "/>

-	<string name="AnimFlagStop" value=" Stop Animation :   "/>

-	<string name="AnimFlagStart" value=" Start Animation :   "/>

-	<string name="Wave" value=" Vink "/>

-	<string name="HelloAvatar" value=" Hej, avatar! "/>

-	<string name="ViewAllGestures" value=" Se alle &gt;&gt;"/>

-	<string name="Animations" value=" Animationer,"/>

-	<string name="Calling Cards" value=" Visitkort,"/>

-	<string name="Clothing" value=" Tøj,"/>

-	<string name="Gestures" value=" Bevægelser,"/>

-	<string name="Landmarks" value=" Landemærker,"/>

-	<string name="Notecards" value=" Note,"/>

-	<string name="Objects" value=" Objekter,"/>

-	<string name="Scripts" value=" Scripts,"/>

-	<string name="Sounds" value=" Lyde,"/>

-	<string name="Textures" value=" Teksturer,"/>

-	<string name="Snapshots" value=" Fotos,"/>

-	<string name="No Filters" value="Nej "/>

-	<string name="Since Logoff" value=" - Siden log ud"/>

-	<string name="InvFolder My Inventory">

-		Min beholdning

-	</string>

-	<string name="InvFolder My Favorites">

-		Mine favoritter

-	</string>

-	<string name="InvFolder Library">

-		Bibliotek

-	</string>

-	<string name="InvFolder Textures">

-		Teksturer

-	</string>

-	<string name="InvFolder Sounds">

-		Lyde

-	</string>

-	<string name="InvFolder Calling Cards">

-		Visitkort

-	</string>

-	<string name="InvFolder Landmarks">

-		Landemærker

-	</string>

-	<string name="InvFolder Scripts">

-		Scripts

-	</string>

-	<string name="InvFolder Clothing">

-		Tøj

-	</string>

-	<string name="InvFolder Objects">

-		Objekter

-	</string>

-	<string name="InvFolder Notecards">

-		Noter

-	</string>

-	<string name="InvFolder New Folder">

-		Ny mappe

-	</string>

-	<string name="InvFolder Inventory">

-		Beholdning

-	</string>

-	<string name="InvFolder Uncompressed Images">

-		Ukomprimerede billeder

-	</string>

-	<string name="InvFolder Body Parts">

-		Kropsdele

-	</string>

-	<string name="InvFolder Trash">

-		Papirkurv

-	</string>

-	<string name="InvFolder Photo Album">

-		Fotoalbum

-	</string>

-	<string name="InvFolder Lost And Found">

-		Fundne genstande

-	</string>

-	<string name="InvFolder Uncompressed Sounds">

-		Ukomprimerede lyde

-	</string>

-	<string name="InvFolder Animations">

-		Animationer

-	</string>

-	<string name="InvFolder Gestures">

-		Bevægelser

-	</string>

-	<string name="InvFolder favorite">

-		Favoritter

-	</string>

-	<string name="InvFolder Current Outfit">

-		Nuværende sæt

-	</string>

-	<string name="InvFolder My Outfits">

-		Mine sæt

-	</string>

-	<string name="InvFolder Friends">

-		Venner

-	</string>

-	<string name="InvFolder All">

-		Alle

-	</string>

-	<string name="Buy">

-		Køb

-	</string>

-	<string name="BuyforL$">

-		Køb for L$

-	</string>

-	<string name="Stone">

-		Sten

-	</string>

-	<string name="Metal">

-		Metal

-	</string>

-	<string name="Glass">

-		Glas

-	</string>

-	<string name="Wood">

-		Træ

-	</string>

-	<string name="Flesh">

-		Kød

-	</string>

-	<string name="Plastic">

-		Plastik

-	</string>

-	<string name="Rubber">

-		Gummi

-	</string>

-	<string name="Light">

-		Lys

-	</string>

-	<string name="KBShift">

-		Shift

-	</string>

-	<string name="KBCtrl">

-		Ctrl

-	</string>

-	<string name="Chest">

-		Bryst

-	</string>

-	<string name="Skull">

-		Hovedskal

-	</string>

-	<string name="Left Shoulder">

-		Venstre skulder

-	</string>

-	<string name="Right Shoulder">

-		Højre skulder

-	</string>

-	<string name="Left Hand">

-		Venstre hånd

-	</string>

-	<string name="Right Hand">

-		Højre hånd

-	</string>

-	<string name="Left Foot">

-		Venstre fod

-	</string>

-	<string name="Right Foot">

-		Højre fod

-	</string>

-	<string name="Spine">

-		Rygsøjle

-	</string>

-	<string name="Pelvis">

-		Bækken

-	</string>

-	<string name="Mouth">

-		Mund

-	</string>

-	<string name="Chin">

-		Hage

-	</string>

-	<string name="Left Ear">

-		Venstre øre

-	</string>

-	<string name="Right Ear">

-		Højre øre

-	</string>

-	<string name="Left Eyeball">

-		Venstre øje

-	</string>

-	<string name="Right Eyeball">

-		Højre øje

-	</string>

-	<string name="Nose">

-		Næse

-	</string>

-	<string name="R Upper Arm">

-		H overarm

-	</string>

-	<string name="R Forearm">

-		H underarm

-	</string>

-	<string name="L Upper Arm">

-		V overarm

-	</string>

-	<string name="L Forearm">

-		V underarm

-	</string>

-	<string name="Right Hip">

-		Højre hofte

-	</string>

-	<string name="R Upper Leg">

-		Højre lår

-	</string>

-	<string name="R Lower Leg">

-		H underben

-	</string>

-	<string name="Left Hip">

-		Venstre hofte

-	</string>

-	<string name="L Upper Leg">

-		Venstre lår

-	</string>

-	<string name="L Lower Leg">

-		V underben

-	</string>

-	<string name="Stomach">

-		Mave

-	</string>

-	<string name="Left Pec">

-		Venstre bryst

-	</string>

-	<string name="Right Pec">

-		Højre bryst

-	</string>

-	<string name="YearsMonthsOld">

-		[AGEYEARS] [AGEMONTHS] gammel

-	</string>

-	<string name="YearsOld">

-		[AGEYEARS] gammel

-	</string>

-	<string name="MonthsOld">

-		[AGEMONTHS] gammel

-	</string>

-	<string name="WeeksOld">

-		[AGEWEEKS] gammel

-	</string>

-	<string name="DaysOld">

-		[AGEDAYS] gammel

-	</string>

-	<string name="TodayOld">

-		Med fra i dag

-	</string>

-	<string name="AgeYearsA">

-		[COUNT] år

-	</string>

-	<string name="AgeYearsB">

-		[COUNT] år

-	</string>

-	<string name="AgeYearsC">

-		[COUNT] år

-	</string>

-	<string name="AgeMonthsA">

-		[COUNT] måned

-	</string>

-	<string name="AgeMonthsB">

-		[COUNT] måneder

-	</string>

-	<string name="AgeMonthsC">

-		[COUNT] måneder

-	</string>

-	<string name="AgeWeeksA">

-		[COUNT] uge

-	</string>

-	<string name="AgeWeeksB">

-		[COUNT] uger

-	</string>

-	<string name="AgeWeeksC">

-		[COUNT] uger

-	</string>

-	<string name="AgeDaysA">

-		[COUNT] dag

-	</string>

-	<string name="AgeDaysB">

-		[COUNT] dage

-	</string>

-	<string name="AgeDaysC">

-		[COUNT] dage

-	</string>

-	<string name="GroupMembersA">

-		[COUNT] medlem

-	</string>

-	<string name="GroupMembersB">

-		[COUNT] medlemmer

-	</string>

-	<string name="GroupMembersC">

-		[COUNT] medlemmer

-	</string>

-	<string name="AcctTypeResident">

-		Beboer

-	</string>

-	<string name="AcctTypeTrial">

-		På prøve

-	</string>

-	<string name="AcctTypeCharterMember">

-		Æresmedlemmer

-	</string>

-	<string name="AcctTypeEmployee">

-		Linden Lab medarbejder

-	</string>

-	<string name="PaymentInfoUsed">

-		Betalende medlem

-	</string>

-	<string name="PaymentInfoOnFile">

-		Betalingsinfo registreret

-	</string>

-	<string name="NoPaymentInfoOnFile">

-		Ingen betalingsinfo

-	</string>

-	<string name="AgeVerified">

-		Alders-checket

-	</string>

-	<string name="NotAgeVerified">

-		Ikke alders-checket

-	</string>

-	<string name="Center 2">

-		Center 2

-	</string>

-	<string name="Top Right">

-		Øverst højre

-	</string>

-	<string name="Top">

-		Top

-	</string>

-	<string name="Top Left">

-		Øverst venstre

-	</string>

-	<string name="Center">

-		Centrum

-	</string>

-	<string name="Bottom Left">

-		Nederst venstre

-	</string>

-	<string name="Bottom">

-		Nederst midt

-	</string>

-	<string name="Bottom Right">

-		nederst højre

-	</string>

-	<string name="CompileQueueDownloadedCompiling">

-		Hentet, kompilerer nu

-	</string>

-	<string name="CompileQueueScriptNotFound">

-		Script ikke fundet på server.

-	</string>

-	<string name="CompileQueueProblemDownloading">

-		Problem ved download

-	</string>

-	<string name="CompileQueueInsufficientPermDownload">

-		Ikke rettigheder til at downloade script.

-	</string>

-	<string name="CompileQueueInsufficientPermFor">

-		Ikke nok rettigheder til at

-	</string>

-	<string name="CompileQueueUnknownFailure">

-		Ukendt fejl ved download

-	</string>

-	<string name="CompileQueueTitle">

-		Rekompilering fremskridt

-	</string>

-	<string name="CompileQueueStart">

-		Rekompilér

-	</string>

-	<string name="ResetQueueTitle">

-		Nulstil fremskridt

-	</string>

-	<string name="ResetQueueStart">

-		nulstil

-	</string>

-	<string name="RunQueueTitle">

-		Sæt &quot;running&quot; fremskridt

-	</string>

-	<string name="RunQueueStart">

-		sæt til &quot;running&quot;

-	</string>

-	<string name="NotRunQueueTitle">

-		Sæt &quot;Not Running&quot; fremskridt

-	</string>

-	<string name="NotRunQueueStart">

-		sæt til &quot;not running&quot;

-	</string>

-	<string name="CompileSuccessful">

-		Kompleret uden fejl!

-	</string>

-	<string name="CompileSuccessfulSaving">

-		Kompileret uden fejl, gemmer...

-	</string>

-	<string name="SaveComplete">

-		Gemt.

-	</string>

-	<string name="ObjectOutOfRange">

-		Script (&quot;object out of range&quot;)

-	</string>

-	<string name="GodToolsObjectOwnedBy">

-		Objekt [OBJECT] ejet af [OWNER]

-	</string>

-	<string name="GroupsNone">

-		ingen

-	</string>

-	<string name="Group" value=" (gruppe)"/>

-	<string name="Unknown">

-		(ukendt)

-	</string>

-	<string name="SummaryForTheWeek" value="Opsummering for denne uge, begyndende med "/>

-	<string name="NextStipendDay" value="Næste stipendie dag er "/>

-	<string name="GroupIndividualShare" value="                      Gruppe     Individuel Delt"/>

-	<string name="Balance">

-		Balance

-	</string>

-	<string name="Credits">

-		Kredit

-	</string>

-	<string name="Debits">

-		Debet

-	</string>

-	<string name="Total">

-		Total

-	</string>

-	<string name="NoGroupDataFound">

-		Ingen gruppedata fundet for gruppe

-	</string>

-	<string name="IMParentEstate">

-		overordnet estate

-	</string>

-	<string name="IMMainland">

-		mainland

-	</string>

-	<string name="IMTeen">

-		teen

-	</string>

-	<string name="RegionInfoError">

-		fejl

-	</string>

-	<string name="RegionInfoAllEstatesOwnedBy">

-		alle estates ejet af [OWNER]

-	</string>

-	<string name="RegionInfoAllEstatesYouOwn">

-		alle estates du ejer

-	</string>

-	<string name="RegionInfoAllEstatesYouManage">

-		alle estates du administrerer for [OWNER]

-	</string>

-	<string name="RegionInfoAllowedResidents">

-		Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS])

-	</string>

-	<string name="RegionInfoAllowedGroups">

-		Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS])

-	</string>

-	<string name="CursorPos">

-		Linie [LINE], Kolonne [COLUMN]

-	</string>

-	<string name="PanelDirCountFound">

-		[COUNT] fundet

-	</string>

-	<string name="PanelContentsNewScript">

-		Nyt script

-	</string>

-	<string name="MuteByName">

-		(efter navn)

-	</string>

-	<string name="MuteAgent">

-		(beboer)

-	</string>

-	<string name="MuteObject">

-		(objekt)

-	</string>

-	<string name="MuteGroup">

-		(gruppe)

-	</string>

-	<string name="RegionNoCovenant">

-		Der er ingen regler for dette estate.

-	</string>

-	<string name="RegionNoCovenantOtherOwner">

-		Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab.  Kontakt venligst estate ejeren for detaljer om salg.

-	</string>

-	<string name="covenant_last_modified">

-		Sidst ændret:

-	</string>

-	<string name="none_text" value=" (ingen) "/>

-	<string name="never_text" value=" (aldrig) "/>

-	<string name="GroupOwned">

-		Gruppe ejet

-	</string>

-	<string name="Public">

-		Offentlig

-	</string>

-	<string name="ClassifiedClicksTxt">

-		Klik: [TELEPORT] teleport, [MAP] kort, [PROFILE] profil

-	</string>

-	<string name="ClassifiedUpdateAfterPublish">

-		(vil blive opdateret efter offentliggørelse)

-	</string>

-	<string name="MultiPreviewTitle">

-		Vis først

-	</string>

-	<string name="MultiPropertiesTitle">

-		Egenskaber

-	</string>

-	<string name="InvOfferAnObjectNamed">

-		Et objekt med navnet

-	</string>

-	<string name="InvOfferOwnedByGroup">

-		ejet af gruppen

-	</string>

-	<string name="InvOfferOwnedByUnknownGroup">

-		ejet af en ukendt gruppe

-	</string>

-	<string name="InvOfferOwnedBy">

-		ejet af

-	</string>

-	<string name="InvOfferOwnedByUnknownUser">

-		ejet af en ukendt bruger

-	</string>

-	<string name="InvOfferGaveYou">

-		gav dig

-	</string>

-	<string name="InvOfferYouDecline">

-		Du afslår

-	</string>

-	<string name="InvOfferFrom">

-		fra

-	</string>

-	<string name="GroupMoneyTotal">

-		Total

-	</string>

-	<string name="GroupMoneyBought">

-		købt

-	</string>

-	<string name="GroupMoneyPaidYou">

-		betalte dig

-	</string>

-	<string name="GroupMoneyPaidInto">

-		betalt til

-	</string>

-	<string name="GroupMoneyBoughtPassTo">

-		købte adgang til

-	</string>

-	<string name="GroupMoneyPaidFeeForEvent">

-		betalte gebyr for event

-	</string>

-	<string name="GroupMoneyPaidPrizeForEvent">

-		betalte prisen for event

-	</string>

-	<string name="GroupMoneyBalance">

-		Balance

-	</string>

-	<string name="GroupMoneyCredits">

-		Kredit

-	</string>

-	<string name="GroupMoneyDebits">

-		Debet

-	</string>

-	<string name="ViewerObjectContents">

-		Indhold

-	</string>

-	<string name="AcquiredItems">

-		Anskaffede genstande

-	</string>

-	<string name="Cancel">

-		Annullér

-	</string>

-	<string name="UploadingCosts">

-		Uploader [%s] omkostninger

-	</string>

-	<string name="UnknownFileExtension">

-		Ukendt fil efternavn [.%s]

-Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh

-	</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-win-control">

-		Ctrl+

-	</string>

-	<string name="accel-win-alt">

-		Alt+

-	</string>

-	<string name="accel-win-shift">

-		Shift+

-	</string>

-	<string name="FileSaved">

-		Fil gemt

-	</string>

-	<string name="Receiving">

-		Modtager

-	</string>

-	<string name="AM">

-		AM

-	</string>

-	<string name="PM">

-		PM

-	</string>

-	<string name="PST">

-		PST

-	</string>

-	<string name="PDT">

-		PDT

-	</string>

-	<string name="Forward">

-		Fremad

-	</string>

-	<string name="Left">

-		Venstre

-	</string>

-	<string name="Right">

-		Højre

-	</string>

-	<string name="Back">

-		Bagud

-	</string>

-	<string name="North">

-		Nord

-	</string>

-	<string name="South">

-		Syd

-	</string>

-	<string name="West">

-		Vest

-	</string>

-	<string name="East">

-		Øst

-	</string>

-	<string name="Up">

-		Op

-	</string>

-	<string name="Down">

-		Ned

-	</string>

-	<string name="Any Category">

-		Enhver kategori

-	</string>

-	<string name="Shopping">

-		Shopping

-	</string>

-	<string name="Land Rental">

-		Land til leje

-	</string>

-	<string name="Property Rental">

-		Grunde til leje

-	</string>

-	<string name="Special Attraction">

-		Speciel attraktion

-	</string>

-	<string name="New Products">

-		Nye produkter

-	</string>

-	<string name="Employment">

-		Jobs

-	</string>

-	<string name="Wanted">

-		Søges

-	</string>

-	<string name="Service">

-		Service

-	</string>

-	<string name="Personal">

-		Personlig

-	</string>

-	<string name="None">

-		Ingen

-	</string>

-	<string name="Linden Location">

-		Linden sted

-	</string>

-	<string name="Adult">

-		Adult

-	</string>

-	<string name="Arts&amp;Culture">

-		Kunst &amp; kultur

-	</string>

-	<string name="Business">

-		Business

-	</string>

-	<string name="Educational">

-		Uddannelse

-	</string>

-	<string name="Gaming">

-		Spil

-	</string>

-	<string name="Hangout">

-		Afslapning

-	</string>

-	<string name="Newcomer Friendly">

-		Nybegynder venligt

-	</string>

-	<string name="Parks&amp;Nature">

-		Parker &amp; natur

-	</string>

-	<string name="Residential">

-		Beboelse

-	</string>

-	<string name="Stage">

-		Fase

-	</string>

-	<string name="Other">

-		Andet

-	</string>

-	<string name="Any">

-		Enhver

-	</string>

-	<string name="You">

-		Dig

-	</string>

-	<string name="Multiple Media">

-		Flere medietyper

-	</string>

-	<string name="Play Media">

-		Afspil/Pause medie

-	</string>

-	<string name="MBCmdLineError">

-		Der opstod en fejl ved afvikling af kommandolinie.

-Se venligst: http://wiki.secondlife.com/wiki/Client_parameters

-Fejl:

-	</string>

-	<string name="MBCmdLineUsg">

-		[APP_NAME] Kommando linie brug:

-	</string>

-	<string name="MBUnableToAccessFile">

-		[APP_NAME] kan ikke få adgang til fil den/det skal bruge.

-

-Dette kan skyldes at du har flere kopier kørende eller operativsystemet tror at filen allerede er åben.

-Hvis fejlen bliver ved, genstart computer og prøv igen.

-Hvis fejlen stadig bliver ved, kan det være nødvendigt at afinstallere [APP_NAME] og installere igen.

-	</string>

-	<string name="MBFatalError">

-		Fatal fejl

-	</string>

-	<string name="MBRequiresAltiVec">

-		[APP_NAME] kræver en processor med AltiVec (G4 eller nyere).

-	</string>

-	<string name="MBAlreadyRunning">

-		[APP_NAME] kører allerede.

-Undersøg din &quot;task bar&quot; for at se efter minimeret version af programmet.

-Hvis fejlen fortsætter, prøv at genstarte din computer.

-	</string>

-	<string name="MBFrozenCrashed">

-		[APP_NAME] ser ud til at være &quot;frosset&quot; eller gået ned tidligere.

-Ønsker du at sende en fejlrapport?

-	</string>

-	<string name="MBAlert">

-		Besked

-	</string>

-	<string name="MBNoDirectX">

-		[APP_NAME] kan ikke detektere DirectX 9.0b eller nyere.

-[APP_NAME] benytte DirectX til at detektere hardware og/eller forældede drivere der kan give problemer med stabilitet, dårlig hastighed eller nedbrud.  Selvom du kan køre [APP_NAME] uden det, anbefaler vi meget at køre med DirectX 9.0b.

-

-Ønsker du at fortsætte?

-	</string>

-	<string name="MBWarning">

-		Advarsel

-	</string>

-	<string name="MBNoAutoUpdate">

-		Automatisk opdatering er endnu ikke implementeret på Linux.

-Hent venligst den nyeste version på www.secondlife.com.

-	</string>

-	<string name="MBRegClassFailed">

-		RegisterClass fejlede

-	</string>

-	<string name="MBError">

-		Fejl

-	</string>

-	<string name="MBFullScreenErr">

-		Ikke muligt at køre i fuldskærm med [WIDTH] x [HEIGHT].

-Afvikler i vindue.

-	</string>

-	<string name="MBDestroyWinFailed">

-		Nedlukningsfejl ved lukning af vindue (DestroyWindow() fejlede)

-	</string>

-	<string name="MBShutdownErr">

-		Fejl ved nedlukning

-	</string>

-	<string name="MBDevContextErr">

-		Kan ikke oprette &quot;GL device context&quot;

-	</string>

-	<string name="MBPixelFmtErr">

-		Kan ikke finde passende &quot;pixel format&quot;

-	</string>

-	<string name="MBPixelFmtDescErr">

-		Kan ikke finde &quot;pixel format&quot; beskrivelse

-	</string>

-	<string name="MBTrueColorWindow">

-		[APP_NAME] kræver &quot;True Color (32-bit)&quot; for at kunne køre.

-Gå venligst til din computers skærmopsætning og sæt &quot;color mode&quot; til 32-bit.

-	</string>

-	<string name="MBAlpha">

-		[APP_NAME] kan ikke køre, da den ikke kan finde en &quot;8 bit alpha channel&quot;.  Normalt skyldes dette et problem med en video driver.

-Venligst undersøg om du har de nyeste drivere til dit videokort installeret.

-Din skærm skal også være sat op til at køre &quot;True Color (32-bit)&quot;  i din displayopsætning.

-Hvis du bliver ved med at modtage denne besked, kontakt [SUPPORT_SITE].

-	</string>

-	<string name="MBPixelFmtSetErr">

-		Kan ikke sætte &quot;pixel format&quot;

-	</string>

-	<string name="MBGLContextErr">

-		Kan ikke oprette &quot;GL rendering context&quot;

-	</string>

-	<string name="MBGLContextActErr">

-		Kan ikke aktivere &quot;GL rendering context&quot;

-	</string>

-	<string name="MBVideoDrvErr">

-		[APP_NAME] kan ikke afvikles da driverne til dit videokort ikke blev installeret korrekt, er forældede, eller du benytter hardware der ikke er supporteret. Undersøg venligst om du har installeret de nyeste drivere til dit grafikkort, og selv om du har de nyeste, prøv at geninstallere dem.

-

-Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].

-	</string>

-	<string name="5 O&apos;Clock Shadow">

-		Skægstubbe

-	</string>

-	<string name="All White">

-		Helt hvidt

-	</string>

-	<string name="Anime Eyes">

-		Store øjne

-	</string>

-	<string name="Arced">

-		Spidst

-	</string>

-	<string name="Arm Length">

-		Armængde

-	</string>

-	<string name="Attached">

-		Vedhæftet

-	</string>

-	<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>

-	<string name="Belly Size">

-		Mave størrelse

-	</string>

-	<string name="Big">

-		Stor

-	</string>

-	<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>

-	<string name="Big Hair Front">

-		Stort hår: Foran

-	</string>

-	<string name="Big Hair Top">

-		Stort hår: Top

-	</string>

-	<string name="Big Head">

-		Stort hovede

-	</string>

-	<string name="Big Pectorals">

-		Store brystmuskler

-	</string>

-	<string name="Big Spikes">

-		Store spikes

-	</string>

-	<string name="Black">

-		Sort

-	</string>

-	<string name="Blonde">

-		Blond

-	</string>

-	<string name="Blonde Hair">

-		Blondt hår

-	</string>

-	<string name="Blush">

-		Rødmen

-	</string>

-	<string name="Blush Color">

-		Rødme farve

-	</string>

-	<string name="Blush Opacity">

-		Rødme gennemsigtighed

-	</string>

-	<string name="Body Definition">

-		Kropskontur

-	</string>

-	<string name="Body Fat">

-		Kropsfedt

-	</string>

-	<string name="Body Freckles">

-		Fregner på kroppen

-	</string>

-	<string name="Body Thick">

-		Tyk krop

-	</string>

-	<string name="Body Thickness">

-		Kropstykkelse

-	</string>

-	<string name="Body Thin">

-		Tynd krop

-	</string>

-	<string name="Bow Legged">

-		Hjulbenet

-	</string>

-	<string name="Breast Buoyancy">

-		Bryst tyngdepåvirkning

-	</string>

-	<string name="Breast Cleavage">

-		Kavalergang

-	</string>

-	<string name="Breast Size">

-		Bryststørrelse

-	</string>

-	<string name="Bridge Width">

-		Bredde næseryg

-	</string>

-	<string name="Broad">

-		Bred

-	</string>

-	<string name="Brow Size">

-		Størrelse øjenbryn

-	</string>

-	<string name="Bug Eyes">

-		Udstående øjne

-	</string>

-	<string name="Bugged Eyes">

-		Udstående øjne

-	</string>

-	<string name="Bulbous">

-		Kartoffelnæse

-	</string>

-	<string name="Bulbous Nose">

-		Kartoffelnæse

-	</string>

-	<string name="Bushy Eyebrows">

-		Buskede øjenbryn

-	</string>

-	<string name="Bushy Hair">

-		Busket hår

-	</string>

-	<string name="Butt Size">

-		Størrelse bagdel

-	</string>

-	<string name="bustle skirt">

-		Tournure

-	</string>

-	<string name="no bustle">

-		Ingen tournure

-	</string>

-	<string name="more bustle">

-		Mere tournure

-	</string>

-	<string name="Chaplin">

-		Chaplin

-	</string>

-	<string name="Cheek Bones">

-		Kindben

-	</string>

-	<string name="Chest Size">

-		Bryst størrelse

-	</string>

-	<string name="Chin Angle">

-		Hage form

-	</string>

-	<string name="Chin Cleft">

-		Hagekløft

-	</string>

-	<string name="Chin Curtains">

-		Hageskæg

-	</string>

-	<string name="Chin Depth">

-		Hage dybde

-	</string>

-	<string name="Chin Heavy">

-		Stort forneden

-	</string>

-	<string name="Chin In">

-		Vigende hage

-	</string>

-	<string name="Chin Out">

-		Hage frem

-	</string>

-	<string name="Chin-Neck">

-		Hals under hage

-	</string>

-	<string name="Clear">

-		Slet

-	</string>

-	<string name="Cleft">

-		Kløft

-	</string>

-	<string name="Close Set Eyes">

-		Tætsiddende øjne

-	</string>

-	<string name="Closed">

-		Lukket

-	</string>

-	<string name="Closed Back">

-		Lukket bagtil

-	</string>

-	<string name="Closed Front">

-		Lukket foran

-	</string>

-	<string name="Closed Left">

-		Lukket til venstre

-	</string>

-	<string name="Closed Right">

-		Lukket til højre

-	</string>

-	<string name="Coin Purse">

-		Lille

-	</string>

-	<string name="Collar Back">

-		Krave bagtil

-	</string>

-	<string name="Collar Front">

-		Krave foran

-	</string>

-	<string name="Corner Down">

-		Nedadvendt

-	</string>

-	<string name="Corner Normal">

-		Normalt

-	</string>

-	<string name="Corner Up">

-		Opadvendt

-	</string>

-	<string name="Creased">

-		Rynket

-	</string>

-	<string name="Crooked Nose">

-		Skæv næse

-	</string>

-	<string name="Cropped Hair">

-		Kort hår

-	</string>

-	<string name="Cuff Flare">

-		Svaj

-	</string>

-	<string name="Dark">

-		Mørk

-	</string>

-	<string name="Dark Green">

-		Mørkegrøn

-	</string>

-	<string name="Darker">

-		Mørkere

-	</string>

-	<string name="Deep">

-		Dyb

-	</string>

-	<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>

-	<string name="Downturned">

-		Peger nedad

-	</string>

-	<string name="Duffle Bag">

-		Stort

-	</string>

-	<string name="Ear Angle">

-		Øre vinkel

-	</string>

-	<string name="Ear Size">

-		Øre størrelse

-	</string>

-	<string name="Ear Tips">

-		Ørespidser

-	</string>

-	<string name="Egg Head">

-		Ovalt hovede

-	</string>

-	<string name="Eye Bags">

-		Poser under øjne

-	</string>

-	<string name="Eye Color">

-		Øjenfarve

-	</string>

-	<string name="Eye Depth">

-		Øjendybde

-	</string>

-	<string name="Eye Lightness">

-		Øjennuance

-	</string>

-	<string name="Eye Opening">

-		Øjenåbning

-	</string>

-	<string name="Eye Pop">

-		Øjensymmetri

-	</string>

-	<string name="Eye Size">

-		Øjenstørrelse

-	</string>

-	<string name="Eye Spacing">

-		Øjenafstand

-	</string>

-	<string name="Eyeball Size">

-		Størrelse øjenæble

-	</string>

-	<string name="Eyebrow Arc">

-		Bue på øjenbryn

-	</string>

-	<string name="Eyebrow Density">

-		Tæthed øjenbryn

-	</string>

-	<string name="Eyebrow Height">

-		Højde på øjenbryn

-	</string>

-	<string name="Eyebrow Points">

-		Løftede øjenbryn

-	</string>

-	<string name="Eyebrow Size">

-		Størrelse øjenbryn

-	</string>

-	<string name="Eyelash Length">

-		Længde øjenvipper

-	</string>

-	<string name="Eyeliner">

-		Eyeliner

-	</string>

-	<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>

-	<string name="Facial Definition">

-		Ansigtskonturer

-	</string>

-	<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>

-	<string name="Fingerless">

-		Fingerløse

-	</string>

-	<string name="Fingers">

-		Fingre

-	</string>

-	<string name="Flared Cuffs">

-		Stor vidde

-	</string>

-	<string name="Flat">

-		Flad

-	</string>

-	<string name="Flat Butt">

-		Flad bagdel

-	</string>

-	<string name="Flat Head">

-		Fladt hovede

-	</string>

-	<string name="Flat Toe">

-		Flad snude

-	</string>

-	<string name="Foot Size">

-		Størrelse fod

-	</string>

-	<string name="Forehead Angle">

-		Pande vinkel

-	</string>

-	<string name="Forehead Heavy">

-		Stort foroven

-	</string>

-	<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>

-	<string name="Full Eyeliner">

-		Meget eyeliner

-	</string>

-	<string name="Full Front">

-		Langt frem fortil

-	</string>

-	<string name="Full Hair Sides">

-		Hår i siderne

-	</string>

-	<string name="Full Sides">

-		Meget hår

-	</string>

-	<string name="Glossy">

-		Skinnende

-	</string>

-	<string name="Glove Fingers">

-		Fingre i handsker

-	</string>

-	<string name="Glove Length">

-		Handskelængde

-	</string>

-	<string name="Hair">

-		Hår

-	</string>

-	<string name="Hair Back">

-		Hår: Bagtil

-	</string>

-	<string name="Hair Front">

-		Hår: Foran

-	</string>

-	<string name="Hair Sides">

-		Hår: Siderne

-	</string>

-	<string name="Hair Sweep">

-		Strøget hår

-	</string>

-	<string name="Hair Thickess">

-		Hår tykkelse

-	</string>

-	<string name="Hair Thickness">

-		Hår tykkelse

-	</string>

-	<string name="Hair Tilt">

-		Hældning

-	</string>

-	<string name="Hair Tilted Left">

-		mest hår venstre

-	</string>

-	<string name="Hair Tilted Right">

-		Mest hår højre

-	</string>

-	<string name="Hair Volume">

-		Hår: Volumen

-	</string>

-	<string name="Hand Size">

-		Størrelse hånd

-	</string>

-	<string name="Handlebars">

-		Cykelstyr

-	</string>

-	<string name="Head Length">

-		Længde på hovede

-	</string>

-	<string name="Head Shape">

-		Hovedform

-	</string>

-	<string name="Head Size">

-		Hovedstørrelse

-	</string>

-	<string name="Head Stretch">

-		Hovedhøjde

-	</string>

-	<string name="Heel Height">

-		Hælhøjde

-	</string>

-	<string name="Heel Shape">

-		Hælform

-	</string>

-	<string name="Height">

-		Højde

-	</string>

-	<string name="High">

-		Høj

-	</string>

-	<string name="High Heels">

-		Hæje hæle

-	</string>

-	<string name="High Jaw">

-		Høj kæbe

-	</string>

-	<string name="High Platforms">

-		Høje såle

-	</string>

-	<string name="High and Tight">

-		Høj og tæt

-	</string>

-	<string name="Higher">

-		Højere

-	</string>

-	<string name="Hip Length">

-		Hoftelængde

-	</string>

-	<string name="Hip Width">

-		Hoftebredde

-	</string>

-	<string name="In">

-		Inde

-	</string>

-	<string name="In Shdw Color">

-		Indre skygge farve

-	</string>

-	<string name="In Shdw Opacity">

-		Indre skygge gennemsigtighed

-	</string>

-	<string name="Inner Eye Corner">

-		Inderste del af øje

-	</string>

-	<string name="Inner Eye Shadow">

-		Inderste øjenskygge

-	</string>

-	<string name="Inner Shadow">

-		Indre skygge

-	</string>

-	<string name="Jacket Length">

-		Jakkelængde

-	</string>

-	<string name="Jacket Wrinkles">

-		Jakkerynker

-	</string>

-	<string name="Jaw Angle">

-		Kæbevinkel

-	</string>

-	<string name="Jaw Jut">

-		Kæbefremspring

-	</string>

-	<string name="Jaw Shape">

-		Kæbeform

-	</string>

-	<string name="Join">

-		Saml

-	</string>

-	<string name="Jowls">

-		Kindehud

-	</string>

-	<string name="Knee Angle">

-		Knævinkel

-	</string>

-	<string name="Knock Kneed">

-		Kalveknæet

-	</string>

-	<string name="Large">

-		Stor

-	</string>

-	<string name="Large Hands">

-		Store hænder

-	</string>

-	<string name="Left Part">

-		Venstre side

-	</string>

-	<string name="Leg Length">

-		Benlængde

-	</string>

-	<string name="Leg Muscles">

-		Benmuskler

-	</string>

-	<string name="Less">

-		Mindre

-	</string>

-	<string name="Less Body Fat">

-		Mindre kropsfedt

-	</string>

-	<string name="Less Curtains">

-		Mindre

-	</string>

-	<string name="Less Freckles">

-		Færre fregner

-	</string>

-	<string name="Less Full">

-		Mindre

-	</string>

-	<string name="Less Gravity">

-		Mindre

-	</string>

-	<string name="Less Love">

-		Mindre bildæk

-	</string>

-	<string name="Less Muscles">

-		Færre muskler

-	</string>

-	<string name="Less Muscular">

-		Mindre muskuløs

-	</string>

-	<string name="Less Rosy">

-		Mindre rosa

-	</string>

-	<string name="Less Round">

-		Mindre rund

-	</string>

-	<string name="Less Saddle">

-		Mindre

-	</string>

-	<string name="Less Square">

-		Mindre

-	</string>

-	<string name="Less Volume">

-		Mindre

-	</string>

-	<string name="Less soul">

-		Mindre

-	</string>

-	<string name="Lighter">

-		Lettere

-	</string>

-	<string name="Lip Cleft">

-		Læbekløft

-	</string>

-	<string name="Lip Cleft Depth">

-		Dybde læbekløft

-	</string>

-	<string name="Lip Fullness">

-		Fyldige læber

-	</string>

-	<string name="Lip Pinkness">

-		Lyserøde læber

-	</string>

-	<string name="Lip Ratio">

-		Læbeproportioner

-	</string>

-	<string name="Lip Thickness">

-		Læbetykkelse

-	</string>

-	<string name="Lip Width">

-		Læbebredde

-	</string>

-	<string name="Lipgloss">

-		Lipgloss

-	</string>

-	<string name="Lipstick">

-		Læbestift

-	</string>

-	<string name="Lipstick Color">

-		Læbestift farve

-	</string>

-	<string name="Long">

-		Lang

-	</string>

-	<string name="Long Head">

-		Langt hovede

-	</string>

-	<string name="Long Hips">

-		Lange hofter

-	</string>

-	<string name="Long Legs">

-		Bange ben

-	</string>

-	<string name="Long Neck">

-		Lang hals

-	</string>

-	<string name="Long Pigtails">

-		Lange rottehaler

-	</string>

-	<string name="Long Ponytail">

-		Lang hestehale

-	</string>

-	<string name="Long Torso">

-		Lang overkrop

-	</string>

-	<string name="Long arms">

-		Lange arme

-	</string>

-	<string name="Longcuffs">

-		Longcuffs

-	</string>

-	<string name="Loose Pants">

-		Løse bukser

-	</string>

-	<string name="Loose Shirt">

-		Løs trøje

-	</string>

-	<string name="Loose Sleeves">

-		Løse ærmer

-	</string>

-	<string name="Love Handles">

-		Bildæk

-	</string>

-	<string name="Low">

-		Lav

-	</string>

-	<string name="Low Heels">

-		Flade hæle

-	</string>

-	<string name="Low Jaw">

-		Lav kæbe

-	</string>

-	<string name="Low Platforms">

-		Flade såler

-	</string>

-	<string name="Low and Loose">

-		Lav og løs

-	</string>

-	<string name="Lower">

-		Nedre

-	</string>

-	<string name="Lower Bridge">

-		Nedre næseryg

-	</string>

-	<string name="Lower Cheeks">

-		Nedre kinder

-	</string>

-	<string name="Male">

-		Mand

-	</string>

-	<string name="Middle Part">

-		Midterste del

-	</string>

-	<string name="More">

-		Mere

-	</string>

-	<string name="More Blush">

-		Mere rødmen

-	</string>

-	<string name="More Body Fat">

-		Mere kropsfedt

-	</string>

-	<string name="More Curtains">

-		Mere

-	</string>

-	<string name="More Eyeshadow">

-		Mere øjenskygge

-	</string>

-	<string name="More Freckles">

-		Flere fregner

-	</string>

-	<string name="More Full">

-		Mere

-	</string>

-	<string name="More Gravity">

-		More

-	</string>

-	<string name="More Lipstick">

-		Mere læbestift

-	</string>

-	<string name="More Love">

-		Mere bildæk

-	</string>

-	<string name="More Lower Lip">

-		Mere underlæbe

-	</string>

-	<string name="More Muscles">

-		Flere muskler

-	</string>

-	<string name="More Muscular">

-		Mere muskuløs

-	</string>

-	<string name="More Rosy">

-		Mere rosa

-	</string>

-	<string name="More Round">

-		Mere rund

-	</string>

-	<string name="More Saddle">

-		Mere

-	</string>

-	<string name="More Sloped">

-		Mere skrå

-	</string>

-	<string name="More Square">

-		Mere firkantet

-	</string>

-	<string name="More Upper Lip">

-		Mere overlæbe

-	</string>

-	<string name="More Vertical">

-		Mere lodret

-	</string>

-	<string name="More Volume">

-		Mere

-	</string>

-	<string name="More soul">

-		Mere

-	</string>

-	<string name="Moustache">

-		Overskæg

-	</string>

-	<string name="Mouth Corner">

-		Mundvige

-	</string>

-	<string name="Mouth Position">

-		Position mund

-	</string>

-	<string name="Mowhawk">

-		Intet hår

-	</string>

-	<string name="Muscular">

-		Muskuløs

-	</string>

-	<string name="Mutton Chops">

-		Lange

-	</string>

-	<string name="Nail Polish">

-		Neglelak

-	</string>

-	<string name="Nail Polish Color">

-		Neglelak farve

-	</string>

-	<string name="Narrow">

-		Smal

-	</string>

-	<string name="Narrow Back">

-		Smal bagtil

-	</string>

-	<string name="Narrow Front">

-		Smal fortil

-	</string>

-	<string name="Narrow Lips">

-		Smalle læber

-	</string>

-	<string name="Natural">

-		Naturlig

-	</string>

-	<string name="Neck Length">

-		Halslængde

-	</string>

-	<string name="Neck Thickness">

-		Halstykkelse

-	</string>

-	<string name="No Blush">

-		Ingen rødmen

-	</string>

-	<string name="No Eyeliner">

-		Ingen eyeliner

-	</string>

-	<string name="No Eyeshadow">

-		Ingen øjenskygge

-	</string>

-	<string name="No Heels">

-		Ingen hæle

-	</string>

-	<string name="No Lipgloss">

-		Ingen lipgloss

-	</string>

-	<string name="No Lipstick">

-		Ingen læbestift

-	</string>

-	<string name="No Part">

-		Ingen dele

-	</string>

-	<string name="No Polish">

-		Ingen lak

-	</string>

-	<string name="No Red">

-		Ingen rød

-	</string>

-	<string name="No Spikes">

-		Ingen spikes

-	</string>

-	<string name="No White">

-		Ingen hvid

-	</string>

-	<string name="No Wrinkles">

-		Ingen rynker

-	</string>

-	<string name="Normal Lower">

-		Normal nedre

-	</string>

-	<string name="Normal Upper">

-		Normal øvre

-	</string>

-	<string name="Nose Left">

-		Højre

-	</string>

-	<string name="Nose Right">

-		Venstre

-	</string>

-	<string name="Nose Size">

-		Næse størrelse

-	</string>

-	<string name="Nose Thickness">

-		Næse tykkelse

-	</string>

-	<string name="Nose Tip Angle">

-		Næsetip vinkel

-	</string>

-	<string name="Nose Tip Shape">

-		Næsetip form

-	</string>

-	<string name="Nose Width">

-		Næse bredde

-	</string>

-	<string name="Nostril Division">

-		Næsebor adskillelse

-	</string>

-	<string name="Nostril Width">

-		Næsebor bredde

-	</string>

-	<string name="Old">

-		Gammel

-	</string>

-	<string name="Opaque">

-		Uigennemsigtig

-	</string>

-	<string name="Open">

-		Åben

-	</string>

-	<string name="Open Back">

-		Åben bagtil

-	</string>

-	<string name="Open Front">

-		Åben foran

-	</string>

-	<string name="Open Left">

-		Åben til venstre

-	</string>

-	<string name="Open Right">

-		Åben til højre

-	</string>

-	<string name="Orange">

-		Orange

-	</string>

-	<string name="Out">

-		Ud

-	</string>

-	<string name="Out Shdw Color">

-		Ydre skygge farve

-	</string>

-	<string name="Out Shdw Opacity">

-		Ydre skygge uigennemsigtighed

-	</string>

-	<string name="Outer Eye Corner">

-		Yderste del af øje

-	</string>

-	<string name="Outer Eye Shadow">

-		Ydre øjenskygge

-	</string>

-	<string name="Outer Shadow">

-		Ydre skygge

-	</string>

-	<string name="Overbite">

-		Overbid

-	</string>

-	<string name="Package">

-		Skridt

-	</string>

-	<string name="Painted Nails">

-		Malede negle

-	</string>

-	<string name="Pale">

-		Bleg

-	</string>

-	<string name="Pants Crotch">

-		Bukser skridt

-	</string>

-	<string name="Pants Fit">

-		Pasform bukser

-	</string>

-	<string name="Pants Length">

-		Bukser - længde

-	</string>

-	<string name="Pants Waist">

-		Bukser - vidde

-	</string>

-	<string name="Pants Wrinkles">

-		Bukser - rynker

-	</string>

-	<string name="Part">

-		Skilning

-	</string>

-	<string name="Part Bangs">

-		Skilning

-	</string>

-	<string name="Pectorals">

-		Brystmuskler

-	</string>

-	<string name="Pigment">

-		Pigmentering

-	</string>

-	<string name="Pigtails">

-		Rottehaler

-	</string>

-	<string name="Pink">

-		Pink

-	</string>

-	<string name="Pinker">

-		Mere pink

-	</string>

-	<string name="Platform Height">

-		Højde sål

-	</string>

-	<string name="Platform Width">

-		Bredde sål

-	</string>

-	<string name="Pointy">

-		Spids

-	</string>

-	<string name="Pointy Heels">

-		Spidse hæle

-	</string>

-	<string name="Pointy Toe">

-		Spids snude

-	</string>

-	<string name="Ponytail">

-		Hestehale

-	</string>

-	<string name="Poofy Skirt">

-		Strutskørt

-	</string>

-	<string name="Pop Left Eye">

-		Forstør venstre øje

-	</string>

-	<string name="Pop Right Eye">

-		Forstør højre øje

-	</string>

-	<string name="Puffy">

-		Posede

-	</string>

-	<string name="Puffy Eyelids">

-		Posede øjenlåg

-	</string>

-	<string name="Rainbow Color">

-		Regnbue farver

-	</string>

-	<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>

-	<string name="Rosy Complexion">

-		Rosa teint

-	</string>

-	<string name="Round">

-		Rund

-	</string>

-	<string name="Round Forehead">

-		Rund pande

-	</string>

-	<string name="Ruddiness">

-		Rødmossethed

-	</string>

-	<string name="Ruddy">

-		Rødmosset

-	</string>

-	<string name="Rumpled Hair">

-		Krøllet hår

-	</string>

-	<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>

-	<string name="Shear Back">

-		Afklippet bagi

-	</string>

-	<string name="Shear Face">

-		Skævt ansigt

-	</string>

-	<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>

-	<string name="Sheared Back">

-		Afklippet bagtil

-	</string>

-	<string name="Sheared Front">

-		Måne

-	</string>

-	<string name="Shift Left">

-		Mod venstre

-	</string>

-	<string name="Shift Mouth">

-		Flyt mund

-	</string>

-	<string name="Shift Right">

-		Mod højre

-	</string>

-	<string name="Shirt Bottom">

-		Trøje - bund

-	</string>

-	<string name="Shirt Fit">

-		Trøje - pasform

-	</string>

-	<string name="Shirt Wrinkles">

-		Trøje - rynker

-	</string>

-	<string name="Shoe Height">

-		Sko højde

-	</string>

-	<string name="Short">

-		Kort

-	</string>

-	<string name="Short Arms">

-		Korte arme

-	</string>

-	<string name="Short Legs">

-		Korte ben

-	</string>

-	<string name="Short Neck">

-		Kort hals

-	</string>

-	<string name="Short Pigtails">

-		Korte rottehaler

-	</string>

-	<string name="Short Ponytail">

-		Kort hestehale

-	</string>

-	<string name="Short Sideburns">

-		Korte

-	</string>

-	<string name="Short Torso">

-		Kort overkrop

-	</string>

-	<string name="Short hips">

-		Korte hofter

-	</string>

-	<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>

-	<string name="Sideburns">

-		Bakkenbarter

-	</string>

-	<string name="Sides Hair">

-		Sidehår

-	</string>

-	<string name="Sides Hair Down">

-		Ned

-	</string>

-	<string name="Sides Hair Up">

-		Op

-	</string>

-	<string name="Skinny">

-		Tynd

-	</string>

-	<string name="Skinny Neck">

-		Tynd hals

-	</string>

-	<string name="Skirt Fit">

-		Omfang

-	</string>

-	<string name="Skirt Length">

-		Længde nederdel

-	</string>

-	<string name="Slanted Forehead">

-		Skrånende pande

-	</string>

-	<string name="Sleeve Length">

-		Ærmelængde

-	</string>

-	<string name="Sleeve Looseness">

-		Ærmer - stramhed

-	</string>

-	<string name="Slit Back">

-		Slids: Bag

-	</string>

-	<string name="Slit Front">

-		Slids: Foran

-	</string>

-	<string name="Slit Left">

-		Slids: Venstre

-	</string>

-	<string name="Slit Right">

-		Slids: Højre

-	</string>

-	<string name="Small">

-		Lille

-	</string>

-	<string name="Small Hands">

-		Små hænder

-	</string>

-	<string name="Small Head">

-		Lille hovede

-	</string>

-	<string name="Smooth">

-		Glat

-	</string>

-	<string name="Smooth Hair">

-		Glat hår

-	</string>

-	<string name="Socks Length">

-		Strømper - længde

-	</string>

-	<string name="Some">

-		Nogen

-	</string>

-	<string name="Soulpatch">

-		Soulpatch

-	</string>

-	<string name="Sparse">

-		Sparsomt

-	</string>

-	<string name="Spiked Hair">

-		Hår med &quot;spikes&quot;

-	</string>

-	<string name="Square">

-		Firkantet

-	</string>

-	<string name="Square Toe">

-		Firkantet snude

-	</string>

-	<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>

-	<string name="Sunken">

-		Indsunket

-	</string>

-	<string name="Sunken Chest">

-		Indsunket bryst

-	</string>

-	<string name="Sunken Eyes">

-		Dybtliggende øjne

-	</string>

-	<string name="Sweep Back">

-		Stryge tilbage

-	</string>

-	<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>

-	<string name="Taper Back">

-		Indsnævring bag

-	</string>

-	<string name="Taper Front">

-		Indsnævring foran

-	</string>

-	<string name="Thick Heels">

-		Brede hæle

-	</string>

-	<string name="Thick Neck">

-		Bred nakke

-	</string>

-	<string name="Thick Toe">

-		Bred snude

-	</string>

-	<string name="Thickness">

-		Tykkelse

-	</string>

-	<string name="Thin">

-		Tynd

-	</string>

-	<string name="Thin Eyebrows">

-		Tynde øjenbryn

-	</string>

-	<string name="Thin Lips">

-		Tynde læber

-	</string>

-	<string name="Thin Nose">

-		Tynd næse

-	</string>

-	<string name="Tight Chin">

-		Stram hage

-	</string>

-	<string name="Tight Cuffs">

-		Smalle bukseben

-	</string>

-	<string name="Tight Pants">

-		Stramme bukser

-	</string>

-	<string name="Tight Shirt">

-		Stram trøje

-	</string>

-	<string name="Tight Skirt">

-		Stram nederdel

-	</string>

-	<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>

-	<string name="Toe Thickness">

-		Tykkelse af snud

-	</string>

-	<string name="Torso Length">

-		Overkrop - længde

-	</string>

-	<string name="Torso Muscles">

-		Overkrop - muskler

-	</string>

-	<string name="Torso Scrawny">

-		Overkrop - mager

-	</string>

-	<string name="Unattached">

-		Ikke vedhæftet

-	</string>

-	<string name="Uncreased">

-		Glat

-	</string>

-	<string name="Underbite">

-		Underbid

-	</string>

-	<string name="Unnatural">

-		Unaturlig

-	</string>

-	<string name="Upper Bridge">

-		Øverste næseryg

-	</string>

-	<string name="Upper Cheeks">

-		Øvre kinder

-	</string>

-	<string name="Upper Chin Cleft">

-		Øvre hagekløft

-	</string>

-	<string name="Upper Eyelid Fold">

-		Øvre øjenlåg

-	</string>

-	<string name="Upturned">

-		Opadvendt

-	</string>

-	<string name="Very Red">

-		Meget rød

-	</string>

-	<string name="Waist Height">

-		Talje højde

-	</string>

-	<string name="Well-Fed">

-		Velnæret

-	</string>

-	<string name="White Hair">

-		Hvidt hår

-	</string>

-	<string name="Wide">

-		Bred

-	</string>

-	<string name="Wide Back">

-		Bredt

-	</string>

-	<string name="Wide Front">

-		Bredt

-	</string>

-	<string name="Wide Lips">

-		Brede læber

-	</string>

-	<string name="Wild">

-		Vildt

-	</string>

-	<string name="Wrinkles">

-		Rynker

-	</string>

-	<string name="LocationCtrlAddLandmarkTooltip">

-		Tilføj til mine landemærker

-	</string>

-	<string name="LocationCtrlEditLandmarkTooltip">

-		Rediger mit landemærke

-	</string>

-	<string name="LocationCtrlInfoBtnTooltip">

-		Se yderligere information om nuværende lokation

-	</string>

-	<string name="LocationCtrlComboBtnTooltip">

-		Min lokationshistorik

-	</string>

-	<string name="UpdaterWindowTitle">

-		[APP_NAME] Opdatér

-	</string>

-	<string name="UpdaterNowUpdating">

-		Opdaterer nu [APP_NAME]...

-	</string>

-	<string name="UpdaterNowInstalling">

-		Installerer [APP_NAME]...

-	</string>

-	<string name="UpdaterUpdatingDescriptive">

-		Din [APP_NAME] klient bliver opdateret til nyeste version.  Dette kan tage noget tid, så venligst vær tålmodig.

-	</string>

-	<string name="UpdaterProgressBarTextWithEllipses">

-		Download færdig...

-	</string>

-	<string name="UpdaterProgressBarText">

-		Downloader opdatering

-	</string>

-	<string name="UpdaterFailDownloadTitle">

-		Download af opdatering fejlede

-	</string>

-	<string name="UpdaterFailUpdateDescriptive">

-		Der opstod en fejl ved opdatering af  [APP_NAME]. Hent venligst den nyeste version fra www.secondlife.com.

-	</string>

-	<string name="UpdaterFailInstallTitle">

-		Installation af opdatering fejlede

-	</string>

-	<string name="UpdaterFailStartTitle">

-		Opstart af klient fejlede

-	</string>

-	<string name="IM_logging_string">

-		-- Logning af IM aktiveret --

-	</string>

-	<string name="IM_typing_start_string">

-		[NAME] skriver...

-	</string>

-	<string name="Unnamed">

-		(Uden navn)

-	</string>

-	<string name="IM_moderated_chat_label">

-		(Modereret: Stemmer deaktiveret)

-	</string>

-	<string name="IM_unavailable_text_label">

-		Tekst chat er ikke tilgængelig i denne samtale.

-	</string>

-	<string name="IM_muted_text_label">

-		Din tekst chat er blevet deaktiveret af en gruppe moderator.

-	</string>

-	<string name="IM_default_text_label">

-		Klik her for privat besked (IM).

-	</string>

-	<string name="IM_to_label">

-		Til

-	</string>

-	<string name="IM_moderator_label">

-		(Moderator)

-	</string>

-	<string name="only_user_message">

-		Du er den eneste deltager i denne samtale

-	</string>

-	<string name="offline_message">

-		[FIRST] [LAST] er ikke logget på.

-	</string>

-	<string name="invite_message">

-		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.

-	</string>

-	<string name="generic_request_error">

-		Kunne ikke etablere forbindelse, prøv igen senere

-	</string>

-	<string name="insufficient_perms_error">

-		Du har ikke de fornødne rettigheder.

-	</string>

-	<string name="session_does_not_exist_error">

-		Denne samtale er lukket ned

-	</string>

-	<string name="no_ability_error">

-		Du har ikke den mulighed.

-	</string>

-	<string name="no_ability">

-		Du har ikke den mulighed.

-	</string>

-	<string name="not_a_mod_error">

-		Du er ikke moderator for denne samtale.

-	</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_session_event">

-		Ikke muligt at sende din besked til samtalen med [RECIPIENT].

-	</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>

-</strings>

+<?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 
+     that are returned from one component and may appear in many places-->
+<strings>
+	<string name="SUPPORT_SITE">
+		Second Life Support Portal
+	</string>
+	<string name="StartupDetectingHardware">
+		Detekterer hardware...
+	</string>
+	<string name="StartupLoading">
+		Indlæser
+	</string>
+	<string name="LoginInProgress">
+		Logger p. [APP_NAME] kan virke laast.  Vent venligst.
+	</string>
+	<string name="LoginInProgressNoFrozen">
+		Logger på...
+	</string>
+	<string name="LoginAuthenticating">
+		Validerer adgang
+	</string>
+	<string name="LoginMaintenance">
+		Udfører konto vedligeholdelse...
+	</string>
+	<string name="LoginAttempt">
+		Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]
+	</string>
+	<string name="LoginPrecaching">
+		verden...
+	</string>
+	<string name="LoginInitializingBrowser">
+		Klargør indbyggede web browser...
+	</string>
+	<string name="LoginInitializingMultimedia">
+		Klargør multimedia...
+	</string>
+	<string name="LoginInitializingFonts">
+		Indlæser fonts...
+	</string>
+	<string name="LoginVerifyingCache">
+		Checker cache filer (kan tage 60-90 sekunder)...
+	</string>
+	<string name="LoginProcessingResponse">
+		Behandler svar ...
+	</string>
+	<string name="LoginInitializingWorld">
+		Initialiserer verden...
+	</string>
+	<string name="LoginDecodingImages">
+		Behandler billeder...
+	</string>
+	<string name="LoginInitializingQuicktime">
+		Initialiserer QuickTime...
+	</string>
+	<string name="LoginQuicktimeNotFound">
+		QuickTime ikke fundet- kunne derfor ikke initialisere.
+	</string>
+	<string name="LoginQuicktimeOK">
+		QuickTime initialiseret.
+	</string>
+	<string name="LoginWaitingForRegionHandshake">
+		Venter på svar fra region...
+	</string>
+	<string name="LoginConnectingToRegion">
+		Tilslutter til region...
+	</string>
+	<string name="LoginDownloadingClothing">
+		Henter tøj...
+	</string>
+	<string name="LoginFailedNoNetwork">
+		Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse.
+	</string>
+	<string name="Quit">
+		Afslut
+	</string>
+	<string name="AgentLostConnection">
+		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
+	</string>
+	<string name="TooltipPerson">
+		Person
+	</string>
+	<string name="TooltipNoName">
+		(intet navn)
+	</string>
+	<string name="TooltipOwner">
+		Ejer:
+	</string>
+	<string name="TooltipPublic">
+		Offentlig
+	</string>
+	<string name="TooltipIsGroup">
+		(Gruppe)
+	</string>
+	<string name="TooltipForSaleL$">
+		Til salg: L$[AMOUNT]
+	</string>
+	<string name="TooltipFlagGroupBuild">
+		Gruppe byg
+	</string>
+	<string name="TooltipFlagNoBuild">
+		Må ikke bygge
+	</string>
+	<string name="TooltipFlagNoEdit">
+		Gruppe byg
+	</string>
+	<string name="TooltipFlagNotSafe">
+		Ikke sikker område
+	</string>
+	<string name="TooltipFlagNoFly">
+		Ingen flyvning
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		Gruppe scripts
+	</string>
+	<string name="TooltipFlagNoScripts">
+		Ingen Scripts
+	</string>
+	<string name="TooltipLand">
+		Land:
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Kun et enkelt element kan trækkes ind her
+	</string>
+	<string name="TooltipHttpUrl">
+		Klik for at se denne hjemmeside
+	</string>
+	<string name="TooltipSLURL">
+		Klik for at se information om denne lokation
+	</string>
+	<string name="TooltipAgentUrl">
+		Klik for at denne beboers profil
+	</string>
+	<string name="TooltipGroupUrl">
+		Klik for at se denne gruppes beskrivelse
+	</string>
+	<string name="TooltipEventUrl">
+		Klik for at se beskrivelse af denne event
+	</string>
+	<string name="TooltipClassifiedUrl">
+		Klik for at se denne annonce
+	</string>
+	<string name="TooltipParcelUrl">
+		Klik for at se beskrivelse for denne parcel
+	</string>
+	<string name="TooltipTeleportUrl">
+		Klik for at teleportere til denne lokation
+	</string>
+	<string name="TooltipObjectIMUrl">
+		Klik for at se beskrivelse for dette objekt
+	</string>
+	<string name="TooltipMapUrl">
+		Klik for at se denne lokation på kortet
+	</string>
+	<string name="TooltipSLAPP">
+		Klik for at starte secondlife:// kommando
+	</string>
+	<string name="CurrentURL" value=" Nuværende URL: [CurrentURL]"/>
+	<string name="SLurlLabelTeleport">
+		Teleportér til
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		Vis kort for
+	</string>
+	<string name="BUTTON_CLOSE_DARWIN">
+		Luk (&#8984;W)
+	</string>
+	<string name="BUTTON_CLOSE_WIN">
+		Luk (Ctrl+W)
+	</string>
+	<string name="BUTTON_RESTORE">
+		Gendan
+	</string>
+	<string name="BUTTON_MINIMIZE">
+		Minimér
+	</string>
+	<string name="BUTTON_TEAR_OFF">
+		Løsriv
+	</string>
+	<string name="BUTTON_DOCK">
+		Fastgør
+	</string>
+	<string name="BUTTON_UNDOCK">
+		Frigør
+	</string>
+	<string name="BUTTON_HELP">
+		Vis hjælp
+	</string>
+	<string name="Searching">
+		Søger...
+	</string>
+	<string name="NoneFound">
+		Intet fundet.
+	</string>
+	<string name="RetrievingData">
+		Henter...
+	</string>
+	<string name="ReleaseNotes">
+		Noter om version
+	</string>
+	<string name="LoadingData">
+		Henter...
+	</string>
+	<string name="AvatarNameNobody">
+		(ingen)
+	</string>
+	<string name="AvatarNameWaiting">
+		(venter)
+	</string>
+	<string name="AvatarNameHippos">
+		(hippos)
+	</string>
+	<string name="GroupNameNone">
+		(ingen)
+	</string>
+	<string name="AssetErrorNone">
+		Ingen fejl
+	</string>
+	<string name="AssetErrorRequestFailed">
+		Element forespørgsel: fejlede
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		Element forespørgsel: fil findes ikke
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		Element forespørgsel: element ikke fundet i database
+	</string>
+	<string name="AssetErrorEOF">
+		Slutning af fil
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		Kan ikke åbne fil
+	</string>
+	<string name="AssetErrorFileNotFound">
+		Fil ikke fundet
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		Tidsgrænse overskredet ved filhentning
+	</string>
+	<string name="AssetErrorCircuitGone">
+		Forbindelsen mistet
+	</string>
+	<string name="AssetErrorPriceMismatch">
+		[APP_NAME] klient og server er uenige om prisen
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		Ukendt status
+	</string>
+	<string name="texture">
+		tekstur
+	</string>
+	<string name="sound">
+		lyd
+	</string>
+	<string name="calling card">
+		visitkort
+	</string>
+	<string name="landmark">
+		landemærke
+	</string>
+	<string name="legacy script">
+		ældre script
+	</string>
+	<string name="clothing">
+		tøj
+	</string>
+	<string name="object">
+		objekt
+	</string>
+	<string name="note card">
+		note
+	</string>
+	<string name="folder">
+		mappe
+	</string>
+	<string name="root">
+		rod
+	</string>
+	<string name="lsl2 script">
+		LSL2 script
+	</string>
+	<string name="lsl bytecode">
+		LSL bytecode
+	</string>
+	<string name="tga texture">
+		tga texture
+	</string>
+	<string name="body part">
+		kropsdel
+	</string>
+	<string name="snapshot">
+		foto
+	</string>
+	<string name="lost and found">
+		Fundne genstande
+	</string>
+	<string name="targa image">
+		targa billede
+	</string>
+	<string name="trash">
+		Papirkurv
+	</string>
+	<string name="jpeg image">
+		jpeg billede
+	</string>
+	<string name="animation">
+		animation
+	</string>
+	<string name="gesture">
+		bevægelse
+	</string>
+	<string name="simstate">
+		simstate
+	</string>
+	<string name="favorite">
+		favorit
+	</string>
+	<string name="symbolic link">
+		link
+	</string>
+	<string name="AvatarAway">
+		Væk
+	</string>
+	<string name="AvatarBusy">
+		Optaget
+	</string>
+	<string name="AvatarMuted">
+		Blokeret
+	</string>
+	<string name="anim_express_afraid">
+		Bange
+	</string>
+	<string name="anim_express_anger">
+		Vred
+	</string>
+	<string name="anim_away">
+		Væk
+	</string>
+	<string name="anim_backflip">
+		Baglæns salto
+	</string>
+	<string name="anim_express_laugh">
+		Hjertelig latter
+	</string>
+	<string name="anim_express_toothsmile">
+		Stort smil
+	</string>
+	<string name="anim_blowkiss">
+		Sende kys
+	</string>
+	<string name="anim_express_bored">
+		Keder sig
+	</string>
+	<string name="anim_bow">
+		Buk
+	</string>
+	<string name="anim_clap">
+		Klap
+	</string>
+	<string name="anim_courtbow">
+		Højtideligt buk
+	</string>
+	<string name="anim_express_cry">
+		Græd
+	</string>
+	<string name="anim_dance1">
+		Dans 1
+	</string>
+	<string name="anim_dance2">
+		Dans 2
+	</string>
+	<string name="anim_dance3">
+		Dans 3
+	</string>
+	<string name="anim_dance4">
+		Dans 4
+	</string>
+	<string name="anim_dance5">
+		Dans 5
+	</string>
+	<string name="anim_dance6">
+		Dans 6
+	</string>
+	<string name="anim_dance7">
+		Dans 7
+	</string>
+	<string name="anim_dance8">
+		Dans 8
+	</string>
+	<string name="anim_express_disdain">
+		Foragt
+	</string>
+	<string name="anim_drink">
+		Drik
+	</string>
+	<string name="anim_express_embarrased">
+		Flov
+	</string>
+	<string name="anim_angry_fingerwag">
+		Løftet finger
+	</string>
+	<string name="anim_fist_pump">
+		Knytnæve
+	</string>
+	<string name="anim_yoga_float">
+		Svævende yoga
+	</string>
+	<string name="anim_express_frown">
+		Mistroisk
+	</string>
+	<string name="anim_impatient">
+		Utålmodig
+	</string>
+	<string name="anim_jumpforjoy">
+		Glædeshop
+	</string>
+	<string name="anim_kissmybutt">
+		Kys min r..
+	</string>
+	<string name="anim_express_kiss">
+		Kys
+	</string>
+	<string name="anim_laugh_short">
+		Grin
+	</string>
+	<string name="anim_musclebeach">
+		Bodybuilder
+	</string>
+	<string name="anim_no_unhappy">
+		Nej (sur)
+	</string>
+	<string name="anim_no_head">
+		Nej
+	</string>
+	<string name="anim_nyanya">
+		Æv-bæv
+	</string>
+	<string name="anim_punch_onetwo">
+		Et-to slag
+	</string>
+	<string name="anim_express_open_mouth">
+		Åben mund
+	</string>
+	<string name="anim_peace">
+		Peace
+	</string>
+	<string name="anim_point_you">
+		Peg på andre
+	</string>
+	<string name="anim_point_me">
+		Peg på dig selv
+	</string>
+	<string name="anim_punch_l">
+		Slå venstre
+	</string>
+	<string name="anim_punch_r">
+		Slå højre
+	</string>
+	<string name="anim_rps_countdown">
+		SSP - Tæl
+	</string>
+	<string name="anim_rps_paper">
+		SSP - Papir
+	</string>
+	<string name="anim_rps_rock">
+		SSP - Sten
+	</string>
+	<string name="anim_rps_scissors">
+		SSP - Saks
+	</string>
+	<string name="anim_express_repulsed">
+		Misfornøjet
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		Karatepark
+	</string>
+	<string name="anim_express_sad">
+		Ked af det
+	</string>
+	<string name="anim_salute">
+		Honnør
+	</string>
+	<string name="anim_shout">
+		Råb
+	</string>
+	<string name="anim_express_shrug">
+		Skuldertræk
+	</string>
+	<string name="anim_express_smile">
+		Smil
+	</string>
+	<string name="anim_smoke_idle">
+		Ryg
+	</string>
+	<string name="anim_smoke_inhale">
+		Indhalér
+	</string>
+	<string name="anim_smoke_throw_down">
+		Smid cigaret
+	</string>
+	<string name="anim_express_surprise">
+		Overrasket
+	</string>
+	<string name="anim_sword_strike_r">
+		Sværdslag
+	</string>
+	<string name="anim_angry_tantrum">
+		Ekstatisk
+	</string>
+	<string name="anim_express_tongue_out">
+		Tunge ud
+	</string>
+	<string name="anim_hello">
+		Vink
+	</string>
+	<string name="anim_whisper">
+		Knib øje i
+	</string>
+	<string name="anim_whistle">
+		Pift
+	</string>
+	<string name="anim_express_wink">
+		Blink
+	</string>
+	<string name="anim_wink_hollywood">
+		Blink (Hollywood)
+	</string>
+	<string name="anim_express_worry">
+		Bekymret
+	</string>
+	<string name="anim_yes_happy">
+		Ja (glad)
+	</string>
+	<string name="anim_yes_head">
+		Ja
+	</string>
+	<string name="texture_loading">
+		Indlæser...
+	</string>
+	<string name="worldmap_offline">
+		Offline
+	</string>
+	<string name="worldmap_results_none_found">
+		Ingen fundet.
+	</string>
+	<string name="Ok">
+		OK
+	</string>
+	<string name="Premature end of file">
+		Fil slutter for tidligt
+	</string>
+	<string name="ST_NO_JOINT">
+		Kan ikke funde ROOT eller JOINT.
+	</string>
+	<string name="whisper">
+		hvisker:
+	</string>
+	<string name="shout">
+		råber:
+	</string>
+	<string name="ringing">
+		Forbinder til stemmechat...
+	</string>
+	<string name="connected">
+		Forbundet
+	</string>
+	<string name="unavailable">
+		Stemmechat er ikke tilladt hvor du befinder dig
+	</string>
+	<string name="hang_up">
+		Stemme chat er afbrudt
+	</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>
+	<string name="ScriptQuestionCautionChatDenied">
+		&apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], er afvist tilladelse til: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Tag Linden dollars (L$) fra dig
+	</string>
+	<string name="ActOnControlInputs">
+		Reagér på dine kontrol-taster
+	</string>
+	<string name="RemapControlInputs">
+		Ændre dine kontrol-taster
+	</string>
+	<string name="AnimateYourAvatar">
+		Animér din avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Sæt på din avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Fjern ejerskabet og sæt til offentlig
+	</string>
+	<string name="LinkAndDelink">
+		Sammenkæd og adskil andre genstande
+	</string>
+	<string name="AddAndRemoveJoints">
+		Tilføj og fjern sammenkødninger med andre genstande
+	</string>
+	<string name="ChangePermissions">
+		Ændre dens tilladelser
+	</string>
+	<string name="TrackYourCamera">
+		Spor dit kamera
+	</string>
+	<string name="ControlYourCamera">
+		Kontrollér dit kamera
+	</string>
+	<string name="SIM_ACCESS_PG">
+		PG
+	</string>
+	<string name="SIM_ACCESS_MATURE">
+		Mature
+	</string>
+	<string name="SIM_ACCESS_ADULT">
+		Adult
+	</string>
+	<string name="SIM_ACCESS_DOWN">
+		logget af
+	</string>
+	<string name="SIM_ACCESS_MIN">
+		Ukendt
+	</string>
+	<string name="land_type_unknown">
+		(ukendt)
+	</string>
+	<string name="all_files">
+		Alle filer
+	</string>
+	<string name="sound_files">
+		Lyde
+	</string>
+	<string name="animation_files">
+		Animationer
+	</string>
+	<string name="image_files">
+		Billeder
+	</string>
+	<string name="save_file_verb">
+		Gem
+	</string>
+	<string name="load_file_verb">
+		Hent
+	</string>
+	<string name="targa_image_files">
+		Targa billeder
+	</string>
+	<string name="bitmap_image_files">
+		Bitmap billeder
+	</string>
+	<string name="avi_movie_file">
+		AVI film fil
+	</string>
+	<string name="xaf_animation_file">
+		XAF Anim Fil
+	</string>
+	<string name="xml_file">
+		XML Fil
+	</string>
+	<string name="dot_raw_file">
+		RAW Fil
+	</string>
+	<string name="compressed_image_files">
+		Komprimerede billeder
+	</string>
+	<string name="load_files">
+		Hent filer
+	</string>
+	<string name="choose_the_directory">
+		Vælg bibliotek
+	</string>
+	<string name="AvatarSetNotAway">
+		Sæt &quot;til stede&quot;
+	</string>
+	<string name="AvatarSetAway">
+		Sæt &quot;væk&quot;
+	</string>
+	<string name="AvatarSetNotBusy">
+		Sæt &quot;ledig&quot;
+	</string>
+	<string name="AvatarSetBusy">
+		Sæt &quot;optaget&quot;
+	</string>
+	<string name="shape">
+		Form
+	</string>
+	<string name="skin">
+		Hud
+	</string>
+	<string name="hair">
+		Hår
+	</string>
+	<string name="eyes">
+		Øjne
+	</string>
+	<string name="shirt">
+		Trøje
+	</string>
+	<string name="pants">
+		Bukser
+	</string>
+	<string name="shoes">
+		Sko
+	</string>
+	<string name="socks">
+		Strømper
+	</string>
+	<string name="jacket">
+		Jakke
+	</string>
+	<string name="gloves">
+		Handsker
+	</string>
+	<string name="undershirt">
+		Undertrøje
+	</string>
+	<string name="underpants">
+		Underbukser
+	</string>
+	<string name="skirt">
+		Nederdel
+	</string>
+	<string name="alpha">
+		Alpha
+	</string>
+	<string name="tattoo">
+		Tatovering
+	</string>
+	<string name="invalid">
+		ugyldig
+	</string>
+	<string name="next">
+		Næste
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		Gruppe besked
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		Gruppe besked
+	</string>
+	<string name="GroupNotifySentBy">
+		Sendt af
+	</string>
+	<string name="GroupNotifyAttached">
+		Vedhæftet:
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		Se tidligere beskeder eller slå modtagelse af beskeder fra her.
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		Åben vedhæng
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		Gem vedhæng
+	</string>
+	<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>
+	<string name="OverflowInfoChannelString">
+		Du har %d mere besked(er)
+	</string>
+	<string name="BodyPartsRightArm">
+		Højre arm
+	</string>
+	<string name="BodyPartsHead">
+		Hoved
+	</string>
+	<string name="BodyPartsLeftArm">
+		Venstre arm
+	</string>
+	<string name="BodyPartsLeftLeg">
+		Venstre ben
+	</string>
+	<string name="BodyPartsTorso">
+		Overkrop
+	</string>
+	<string name="BodyPartsRightLeg">
+		Højre ben
+	</string>
+	<string name="GraphicsQualityLow">
+		Lav
+	</string>
+	<string name="GraphicsQualityMid">
+		Middel
+	</string>
+	<string name="GraphicsQualityHigh">
+		Høj
+	</string>
+	<string name="LeaveMouselook">
+		Tryk ESC for at skift til normalt udsyn
+	</string>
+	<string name="InventoryNoMatchingItems">
+		No matching items found in inventory.
+	</string>
+	<string name="InventoryNoTexture">
+		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)"/>
+	<string name="no_copy" value=" (ikke kopiere)"/>
+	<string name="worn" value=" (båret)"/>
+	<string name="link" value=" (sammenkæde)"/>
+	<string name="broken_link" value=" (brudt_kæde)&quot;"/>
+	<string name="LoadingContents">
+		Henter indhold...
+	</string>
+	<string name="NoContents">
+		Intet indhold
+	</string>
+	<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>
+	<string name="Chat" value=" Chat : "/>
+	<string name="Sound" value=" Lyd : "/>
+	<string name="Wait" value=" --- Vent : "/>
+	<string name="AnimFlagStop" value=" Stop Animation :   "/>
+	<string name="AnimFlagStart" value=" Start Animation :   "/>
+	<string name="Wave" value=" Vink "/>
+	<string name="HelloAvatar" value=" Hej, avatar! "/>
+	<string name="ViewAllGestures" value=" Se alle &gt;&gt;"/>
+	<string name="Animations" value=" Animationer,"/>
+	<string name="Calling Cards" value=" Visitkort,"/>
+	<string name="Clothing" value=" Tøj,"/>
+	<string name="Gestures" value=" Bevægelser,"/>
+	<string name="Landmarks" value=" Landemærker,"/>
+	<string name="Notecards" value=" Note,"/>
+	<string name="Objects" value=" Objekter,"/>
+	<string name="Scripts" value=" Scripts,"/>
+	<string name="Sounds" value=" Lyde,"/>
+	<string name="Textures" value=" Teksturer,"/>
+	<string name="Snapshots" value=" Fotos,"/>
+	<string name="No Filters" value="Nej "/>
+	<string name="Since Logoff" value=" - Siden log ud"/>
+	<string name="InvFolder My Inventory">
+		Min beholdning
+	</string>
+	<string name="InvFolder My Favorites">
+		Mine favoritter
+	</string>
+	<string name="InvFolder Library">
+		Bibliotek
+	</string>
+	<string name="InvFolder Textures">
+		Teksturer
+	</string>
+	<string name="InvFolder Sounds">
+		Lyde
+	</string>
+	<string name="InvFolder Calling Cards">
+		Visitkort
+	</string>
+	<string name="InvFolder Landmarks">
+		Landemærker
+	</string>
+	<string name="InvFolder Scripts">
+		Scripts
+	</string>
+	<string name="InvFolder Clothing">
+		Tøj
+	</string>
+	<string name="InvFolder Objects">
+		Objekter
+	</string>
+	<string name="InvFolder Notecards">
+		Noter
+	</string>
+	<string name="InvFolder New Folder">
+		Ny mappe
+	</string>
+	<string name="InvFolder Inventory">
+		Beholdning
+	</string>
+	<string name="InvFolder Uncompressed Images">
+		Ukomprimerede billeder
+	</string>
+	<string name="InvFolder Body Parts">
+		Kropsdele
+	</string>
+	<string name="InvFolder Trash">
+		Papirkurv
+	</string>
+	<string name="InvFolder Photo Album">
+		Fotoalbum
+	</string>
+	<string name="InvFolder Lost And Found">
+		Fundne genstande
+	</string>
+	<string name="InvFolder Uncompressed Sounds">
+		Ukomprimerede lyde
+	</string>
+	<string name="InvFolder Animations">
+		Animationer
+	</string>
+	<string name="InvFolder Gestures">
+		Bevægelser
+	</string>
+	<string name="InvFolder favorite">
+		Favoritter
+	</string>
+	<string name="InvFolder Current Outfit">
+		Nuværende sæt
+	</string>
+	<string name="InvFolder My Outfits">
+		Mine sæt
+	</string>
+	<string name="InvFolder Friends">
+		Venner
+	</string>
+	<string name="InvFolder All">
+		Alle
+	</string>
+	<string name="Buy">
+		Køb
+	</string>
+	<string name="BuyforL$">
+		Køb for L$
+	</string>
+	<string name="Stone">
+		Sten
+	</string>
+	<string name="Metal">
+		Metal
+	</string>
+	<string name="Glass">
+		Glas
+	</string>
+	<string name="Wood">
+		Træ
+	</string>
+	<string name="Flesh">
+		Kød
+	</string>
+	<string name="Plastic">
+		Plastik
+	</string>
+	<string name="Rubber">
+		Gummi
+	</string>
+	<string name="Light">
+		Lys
+	</string>
+	<string name="KBShift">
+		Shift
+	</string>
+	<string name="KBCtrl">
+		Ctrl
+	</string>
+	<string name="Chest">
+		Bryst
+	</string>
+	<string name="Skull">
+		Hovedskal
+	</string>
+	<string name="Left Shoulder">
+		Venstre skulder
+	</string>
+	<string name="Right Shoulder">
+		Højre skulder
+	</string>
+	<string name="Left Hand">
+		Venstre hånd
+	</string>
+	<string name="Right Hand">
+		Højre hånd
+	</string>
+	<string name="Left Foot">
+		Venstre fod
+	</string>
+	<string name="Right Foot">
+		Højre fod
+	</string>
+	<string name="Spine">
+		Rygsøjle
+	</string>
+	<string name="Pelvis">
+		Bækken
+	</string>
+	<string name="Mouth">
+		Mund
+	</string>
+	<string name="Chin">
+		Hage
+	</string>
+	<string name="Left Ear">
+		Venstre øre
+	</string>
+	<string name="Right Ear">
+		Højre øre
+	</string>
+	<string name="Left Eyeball">
+		Venstre øje
+	</string>
+	<string name="Right Eyeball">
+		Højre øje
+	</string>
+	<string name="Nose">
+		Næse
+	</string>
+	<string name="R Upper Arm">
+		H overarm
+	</string>
+	<string name="R Forearm">
+		H underarm
+	</string>
+	<string name="L Upper Arm">
+		V overarm
+	</string>
+	<string name="L Forearm">
+		V underarm
+	</string>
+	<string name="Right Hip">
+		Højre hofte
+	</string>
+	<string name="R Upper Leg">
+		Højre lår
+	</string>
+	<string name="R Lower Leg">
+		H underben
+	</string>
+	<string name="Left Hip">
+		Venstre hofte
+	</string>
+	<string name="L Upper Leg">
+		Venstre lår
+	</string>
+	<string name="L Lower Leg">
+		V underben
+	</string>
+	<string name="Stomach">
+		Mave
+	</string>
+	<string name="Left Pec">
+		Venstre bryst
+	</string>
+	<string name="Right Pec">
+		Højre bryst
+	</string>
+	<string name="YearsMonthsOld">
+		[AGEYEARS] [AGEMONTHS] gammel
+	</string>
+	<string name="YearsOld">
+		[AGEYEARS] gammel
+	</string>
+	<string name="MonthsOld">
+		[AGEMONTHS] gammel
+	</string>
+	<string name="WeeksOld">
+		[AGEWEEKS] gammel
+	</string>
+	<string name="DaysOld">
+		[AGEDAYS] gammel
+	</string>
+	<string name="TodayOld">
+		Med fra i dag
+	</string>
+	<string name="AgeYearsA">
+		[COUNT] år
+	</string>
+	<string name="AgeYearsB">
+		[COUNT] år
+	</string>
+	<string name="AgeYearsC">
+		[COUNT] år
+	</string>
+	<string name="AgeMonthsA">
+		[COUNT] måned
+	</string>
+	<string name="AgeMonthsB">
+		[COUNT] måneder
+	</string>
+	<string name="AgeMonthsC">
+		[COUNT] måneder
+	</string>
+	<string name="AgeWeeksA">
+		[COUNT] uge
+	</string>
+	<string name="AgeWeeksB">
+		[COUNT] uger
+	</string>
+	<string name="AgeWeeksC">
+		[COUNT] uger
+	</string>
+	<string name="AgeDaysA">
+		[COUNT] dag
+	</string>
+	<string name="AgeDaysB">
+		[COUNT] dage
+	</string>
+	<string name="AgeDaysC">
+		[COUNT] dage
+	</string>
+	<string name="GroupMembersA">
+		[COUNT] medlem
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] medlemmer
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] medlemmer
+	</string>
+	<string name="AcctTypeResident">
+		Beboer
+	</string>
+	<string name="AcctTypeTrial">
+		På prøve
+	</string>
+	<string name="AcctTypeCharterMember">
+		Æresmedlemmer
+	</string>
+	<string name="AcctTypeEmployee">
+		Linden Lab medarbejder
+	</string>
+	<string name="PaymentInfoUsed">
+		Betalende medlem
+	</string>
+	<string name="PaymentInfoOnFile">
+		Betalingsinfo registreret
+	</string>
+	<string name="NoPaymentInfoOnFile">
+		Ingen betalingsinfo
+	</string>
+	<string name="AgeVerified">
+		Alders-checket
+	</string>
+	<string name="NotAgeVerified">
+		Ikke alders-checket
+	</string>
+	<string name="Center 2">
+		Center 2
+	</string>
+	<string name="Top Right">
+		Øverst højre
+	</string>
+	<string name="Top">
+		Top
+	</string>
+	<string name="Top Left">
+		Øverst venstre
+	</string>
+	<string name="Center">
+		Centrum
+	</string>
+	<string name="Bottom Left">
+		Nederst venstre
+	</string>
+	<string name="Bottom">
+		Nederst midt
+	</string>
+	<string name="Bottom Right">
+		nederst højre
+	</string>
+	<string name="CompileQueueDownloadedCompiling">
+		Hentet, kompilerer nu
+	</string>
+	<string name="CompileQueueScriptNotFound">
+		Script ikke fundet på server.
+	</string>
+	<string name="CompileQueueProblemDownloading">
+		Problem ved download
+	</string>
+	<string name="CompileQueueInsufficientPermDownload">
+		Ikke rettigheder til at downloade script.
+	</string>
+	<string name="CompileQueueInsufficientPermFor">
+		Ikke nok rettigheder til at
+	</string>
+	<string name="CompileQueueUnknownFailure">
+		Ukendt fejl ved download
+	</string>
+	<string name="CompileQueueTitle">
+		Rekompilering fremskridt
+	</string>
+	<string name="CompileQueueStart">
+		Rekompilér
+	</string>
+	<string name="ResetQueueTitle">
+		Nulstil fremskridt
+	</string>
+	<string name="ResetQueueStart">
+		nulstil
+	</string>
+	<string name="RunQueueTitle">
+		Sæt &quot;running&quot; fremskridt
+	</string>
+	<string name="RunQueueStart">
+		sæt til &quot;running&quot;
+	</string>
+	<string name="NotRunQueueTitle">
+		Sæt &quot;Not Running&quot; fremskridt
+	</string>
+	<string name="NotRunQueueStart">
+		sæt til &quot;not running&quot;
+	</string>
+	<string name="CompileSuccessful">
+		Kompleret uden fejl!
+	</string>
+	<string name="CompileSuccessfulSaving">
+		Kompileret uden fejl, gemmer...
+	</string>
+	<string name="SaveComplete">
+		Gemt.
+	</string>
+	<string name="ObjectOutOfRange">
+		Script (&quot;object out of range&quot;)
+	</string>
+	<string name="GodToolsObjectOwnedBy">
+		Objekt [OBJECT] ejet af [OWNER]
+	</string>
+	<string name="GroupsNone">
+		ingen
+	</string>
+	<string name="Group" value=" (gruppe)"/>
+	<string name="Unknown">
+		(ukendt)
+	</string>
+	<string name="SummaryForTheWeek" value="Opsummering for denne uge, begyndende med "/>
+	<string name="NextStipendDay" value="Næste stipendie dag er "/>
+	<string name="GroupIndividualShare" value="                      Gruppe     Individuel Delt"/>
+	<string name="Balance">
+		Balance
+	</string>
+	<string name="Credits">
+		Kredit
+	</string>
+	<string name="Debits">
+		Debet
+	</string>
+	<string name="Total">
+		Total
+	</string>
+	<string name="NoGroupDataFound">
+		Ingen gruppedata fundet for gruppe
+	</string>
+	<string name="IMParentEstate">
+		overordnet estate
+	</string>
+	<string name="IMMainland">
+		mainland
+	</string>
+	<string name="IMTeen">
+		teen
+	</string>
+	<string name="RegionInfoError">
+		fejl
+	</string>
+	<string name="RegionInfoAllEstatesOwnedBy">
+		alle estates ejet af [OWNER]
+	</string>
+	<string name="RegionInfoAllEstatesYouOwn">
+		alle estates du ejer
+	</string>
+	<string name="RegionInfoAllEstatesYouManage">
+		alle estates du administrerer for [OWNER]
+	</string>
+	<string name="RegionInfoAllowedResidents">
+		Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS])
+	</string>
+	<string name="RegionInfoAllowedGroups">
+		Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS])
+	</string>
+	<string name="CursorPos">
+		Linie [LINE], Kolonne [COLUMN]
+	</string>
+	<string name="PanelDirCountFound">
+		[COUNT] fundet
+	</string>
+	<string name="PanelContentsNewScript">
+		Nyt script
+	</string>
+	<string name="MuteByName">
+		(efter navn)
+	</string>
+	<string name="MuteAgent">
+		(beboer)
+	</string>
+	<string name="MuteObject">
+		(objekt)
+	</string>
+	<string name="MuteGroup">
+		(gruppe)
+	</string>
+	<string name="RegionNoCovenant">
+		Der er ingen regler for dette estate.
+	</string>
+	<string name="RegionNoCovenantOtherOwner">
+		Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab.  Kontakt venligst estate ejeren for detaljer om salg.
+	</string>
+	<string name="covenant_last_modified">
+		Sidst ændret:
+	</string>
+	<string name="none_text" value=" (ingen) "/>
+	<string name="never_text" value=" (aldrig) "/>
+	<string name="GroupOwned">
+		Gruppe ejet
+	</string>
+	<string name="Public">
+		Offentlig
+	</string>
+	<string name="ClassifiedClicksTxt">
+		Klik: [TELEPORT] teleport, [MAP] kort, [PROFILE] profil
+	</string>
+	<string name="ClassifiedUpdateAfterPublish">
+		(vil blive opdateret efter offentliggørelse)
+	</string>
+	<string name="MultiPreviewTitle">
+		Vis først
+	</string>
+	<string name="MultiPropertiesTitle">
+		Egenskaber
+	</string>
+	<string name="InvOfferAnObjectNamed">
+		Et objekt med navnet
+	</string>
+	<string name="InvOfferOwnedByGroup">
+		ejet af gruppen
+	</string>
+	<string name="InvOfferOwnedByUnknownGroup">
+		ejet af en ukendt gruppe
+	</string>
+	<string name="InvOfferOwnedBy">
+		ejet af
+	</string>
+	<string name="InvOfferOwnedByUnknownUser">
+		ejet af en ukendt bruger
+	</string>
+	<string name="InvOfferGaveYou">
+		gav dig
+	</string>
+	<string name="InvOfferYouDecline">
+		Du afslår
+	</string>
+	<string name="InvOfferFrom">
+		fra
+	</string>
+	<string name="GroupMoneyTotal">
+		Total
+	</string>
+	<string name="GroupMoneyBought">
+		købt
+	</string>
+	<string name="GroupMoneyPaidYou">
+		betalte dig
+	</string>
+	<string name="GroupMoneyPaidInto">
+		betalt til
+	</string>
+	<string name="GroupMoneyBoughtPassTo">
+		købte adgang til
+	</string>
+	<string name="GroupMoneyPaidFeeForEvent">
+		betalte gebyr for event
+	</string>
+	<string name="GroupMoneyPaidPrizeForEvent">
+		betalte prisen for event
+	</string>
+	<string name="GroupMoneyBalance">
+		Balance
+	</string>
+	<string name="GroupMoneyCredits">
+		Kredit
+	</string>
+	<string name="GroupMoneyDebits">
+		Debet
+	</string>
+	<string name="ViewerObjectContents">
+		Indhold
+	</string>
+	<string name="AcquiredItems">
+		Anskaffede genstande
+	</string>
+	<string name="Cancel">
+		Annullér
+	</string>
+	<string name="UploadingCosts">
+		Uploader [%s] omkostninger
+	</string>
+	<string name="UnknownFileExtension">
+		Ukendt fil efternavn [.%s]
+Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+	</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-win-control">
+		Ctrl+
+	</string>
+	<string name="accel-win-alt">
+		Alt+
+	</string>
+	<string name="accel-win-shift">
+		Shift+
+	</string>
+	<string name="FileSaved">
+		Fil gemt
+	</string>
+	<string name="Receiving">
+		Modtager
+	</string>
+	<string name="AM">
+		AM
+	</string>
+	<string name="PM">
+		PM
+	</string>
+	<string name="PST">
+		PST
+	</string>
+	<string name="PDT">
+		PDT
+	</string>
+	<string name="Forward">
+		Fremad
+	</string>
+	<string name="Left">
+		Venstre
+	</string>
+	<string name="Right">
+		Højre
+	</string>
+	<string name="Back">
+		Bagud
+	</string>
+	<string name="North">
+		Nord
+	</string>
+	<string name="South">
+		Syd
+	</string>
+	<string name="West">
+		Vest
+	</string>
+	<string name="East">
+		Øst
+	</string>
+	<string name="Up">
+		Op
+	</string>
+	<string name="Down">
+		Ned
+	</string>
+	<string name="Any Category">
+		Enhver kategori
+	</string>
+	<string name="Shopping">
+		Shopping
+	</string>
+	<string name="Land Rental">
+		Land til leje
+	</string>
+	<string name="Property Rental">
+		Grunde til leje
+	</string>
+	<string name="Special Attraction">
+		Speciel attraktion
+	</string>
+	<string name="New Products">
+		Nye produkter
+	</string>
+	<string name="Employment">
+		Jobs
+	</string>
+	<string name="Wanted">
+		Søges
+	</string>
+	<string name="Service">
+		Service
+	</string>
+	<string name="Personal">
+		Personlig
+	</string>
+	<string name="None">
+		Ingen
+	</string>
+	<string name="Linden Location">
+		Linden sted
+	</string>
+	<string name="Adult">
+		Adult
+	</string>
+	<string name="Arts&amp;Culture">
+		Kunst &amp; kultur
+	</string>
+	<string name="Business">
+		Business
+	</string>
+	<string name="Educational">
+		Uddannelse
+	</string>
+	<string name="Gaming">
+		Spil
+	</string>
+	<string name="Hangout">
+		Afslapning
+	</string>
+	<string name="Newcomer Friendly">
+		Nybegynder venligt
+	</string>
+	<string name="Parks&amp;Nature">
+		Parker &amp; natur
+	</string>
+	<string name="Residential">
+		Beboelse
+	</string>
+	<string name="Stage">
+		Fase
+	</string>
+	<string name="Other">
+		Andet
+	</string>
+	<string name="Any">
+		Enhver
+	</string>
+	<string name="You">
+		Dig
+	</string>
+	<string name="Multiple Media">
+		Flere medietyper
+	</string>
+	<string name="Play Media">
+		Afspil/Pause medie
+	</string>
+	<string name="MBCmdLineError">
+		Der opstod en fejl ved afvikling af kommandolinie.
+Se venligst: http://wiki.secondlife.com/wiki/Client_parameters
+Fejl:
+	</string>
+	<string name="MBCmdLineUsg">
+		[APP_NAME] Kommando linie brug:
+	</string>
+	<string name="MBUnableToAccessFile">
+		[APP_NAME] kan ikke få adgang til fil den/det skal bruge.
+
+Dette kan skyldes at du har flere kopier kørende eller operativsystemet tror at filen allerede er åben.
+Hvis fejlen bliver ved, genstart computer og prøv igen.
+Hvis fejlen stadig bliver ved, kan det være nødvendigt at afinstallere [APP_NAME] og installere igen.
+	</string>
+	<string name="MBFatalError">
+		Fatal fejl
+	</string>
+	<string name="MBRequiresAltiVec">
+		[APP_NAME] kræver en processor med AltiVec (G4 eller nyere).
+	</string>
+	<string name="MBAlreadyRunning">
+		[APP_NAME] kører allerede.
+Undersøg din &quot;task bar&quot; for at se efter minimeret version af programmet.
+Hvis fejlen fortsætter, prøv at genstarte din computer.
+	</string>
+	<string name="MBFrozenCrashed">
+		[APP_NAME] ser ud til at være &quot;frosset&quot; eller gået ned tidligere.
+Ønsker du at sende en fejlrapport?
+	</string>
+	<string name="MBAlert">
+		Besked
+	</string>
+	<string name="MBNoDirectX">
+		[APP_NAME] kan ikke detektere DirectX 9.0b eller nyere.
+[APP_NAME] benytte DirectX til at detektere hardware og/eller forældede drivere der kan give problemer med stabilitet, dårlig hastighed eller nedbrud.  Selvom du kan køre [APP_NAME] uden det, anbefaler vi meget at køre med DirectX 9.0b.
+
+Ønsker du at fortsætte?
+	</string>
+	<string name="MBWarning">
+		Advarsel
+	</string>
+	<string name="MBNoAutoUpdate">
+		Automatisk opdatering er endnu ikke implementeret på Linux.
+Hent venligst den nyeste version på www.secondlife.com.
+	</string>
+	<string name="MBRegClassFailed">
+		RegisterClass fejlede
+	</string>
+	<string name="MBError">
+		Fejl
+	</string>
+	<string name="MBFullScreenErr">
+		Ikke muligt at køre i fuldskærm med [WIDTH] x [HEIGHT].
+Afvikler i vindue.
+	</string>
+	<string name="MBDestroyWinFailed">
+		Nedlukningsfejl ved lukning af vindue (DestroyWindow() fejlede)
+	</string>
+	<string name="MBShutdownErr">
+		Fejl ved nedlukning
+	</string>
+	<string name="MBDevContextErr">
+		Kan ikke oprette &quot;GL device context&quot;
+	</string>
+	<string name="MBPixelFmtErr">
+		Kan ikke finde passende &quot;pixel format&quot;
+	</string>
+	<string name="MBPixelFmtDescErr">
+		Kan ikke finde &quot;pixel format&quot; beskrivelse
+	</string>
+	<string name="MBTrueColorWindow">
+		[APP_NAME] kræver &quot;True Color (32-bit)&quot; for at kunne køre.
+Gå venligst til din computers skærmopsætning og sæt &quot;color mode&quot; til 32-bit.
+	</string>
+	<string name="MBAlpha">
+		[APP_NAME] kan ikke køre, da den ikke kan finde en &quot;8 bit alpha channel&quot;.  Normalt skyldes dette et problem med en video driver.
+Venligst undersøg om du har de nyeste drivere til dit videokort installeret.
+Din skærm skal også være sat op til at køre &quot;True Color (32-bit)&quot;  i din displayopsætning.
+Hvis du bliver ved med at modtage denne besked, kontakt [SUPPORT_SITE].
+	</string>
+	<string name="MBPixelFmtSetErr">
+		Kan ikke sætte &quot;pixel format&quot;
+	</string>
+	<string name="MBGLContextErr">
+		Kan ikke oprette &quot;GL rendering context&quot;
+	</string>
+	<string name="MBGLContextActErr">
+		Kan ikke aktivere &quot;GL rendering context&quot;
+	</string>
+	<string name="MBVideoDrvErr">
+		[APP_NAME] kan ikke afvikles da driverne til dit videokort ikke blev installeret korrekt, er forældede, eller du benytter hardware der ikke er supporteret. Undersøg venligst om du har installeret de nyeste drivere til dit grafikkort, og selv om du har de nyeste, prøv at geninstallere dem.
+
+Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
+	</string>
+	<string name="5 O&apos;Clock Shadow">
+		Skægstubbe
+	</string>
+	<string name="All White">
+		Helt hvidt
+	</string>
+	<string name="Anime Eyes">
+		Store øjne
+	</string>
+	<string name="Arced">
+		Spidst
+	</string>
+	<string name="Arm Length">
+		Armængde
+	</string>
+	<string name="Attached">
+		Vedhæftet
+	</string>
+	<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>
+	<string name="Belly Size">
+		Mave størrelse
+	</string>
+	<string name="Big">
+		Stor
+	</string>
+	<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>
+	<string name="Big Hair Front">
+		Stort hår: Foran
+	</string>
+	<string name="Big Hair Top">
+		Stort hår: Top
+	</string>
+	<string name="Big Head">
+		Stort hovede
+	</string>
+	<string name="Big Pectorals">
+		Store brystmuskler
+	</string>
+	<string name="Big Spikes">
+		Store spikes
+	</string>
+	<string name="Black">
+		Sort
+	</string>
+	<string name="Blonde">
+		Blond
+	</string>
+	<string name="Blonde Hair">
+		Blondt hår
+	</string>
+	<string name="Blush">
+		Rødmen
+	</string>
+	<string name="Blush Color">
+		Rødme farve
+	</string>
+	<string name="Blush Opacity">
+		Rødme gennemsigtighed
+	</string>
+	<string name="Body Definition">
+		Kropskontur
+	</string>
+	<string name="Body Fat">
+		Kropsfedt
+	</string>
+	<string name="Body Freckles">
+		Fregner på kroppen
+	</string>
+	<string name="Body Thick">
+		Tyk krop
+	</string>
+	<string name="Body Thickness">
+		Kropstykkelse
+	</string>
+	<string name="Body Thin">
+		Tynd krop
+	</string>
+	<string name="Bow Legged">
+		Hjulbenet
+	</string>
+	<string name="Breast Buoyancy">
+		Bryst tyngdepåvirkning
+	</string>
+	<string name="Breast Cleavage">
+		Kavalergang
+	</string>
+	<string name="Breast Size">
+		Bryststørrelse
+	</string>
+	<string name="Bridge Width">
+		Bredde næseryg
+	</string>
+	<string name="Broad">
+		Bred
+	</string>
+	<string name="Brow Size">
+		Størrelse øjenbryn
+	</string>
+	<string name="Bug Eyes">
+		Udstående øjne
+	</string>
+	<string name="Bugged Eyes">
+		Udstående øjne
+	</string>
+	<string name="Bulbous">
+		Kartoffelnæse
+	</string>
+	<string name="Bulbous Nose">
+		Kartoffelnæse
+	</string>
+	<string name="Bushy Eyebrows">
+		Buskede øjenbryn
+	</string>
+	<string name="Bushy Hair">
+		Busket hår
+	</string>
+	<string name="Butt Size">
+		Størrelse bagdel
+	</string>
+	<string name="bustle skirt">
+		Tournure
+	</string>
+	<string name="no bustle">
+		Ingen tournure
+	</string>
+	<string name="more bustle">
+		Mere tournure
+	</string>
+	<string name="Chaplin">
+		Chaplin
+	</string>
+	<string name="Cheek Bones">
+		Kindben
+	</string>
+	<string name="Chest Size">
+		Bryst størrelse
+	</string>
+	<string name="Chin Angle">
+		Hage form
+	</string>
+	<string name="Chin Cleft">
+		Hagekløft
+	</string>
+	<string name="Chin Curtains">
+		Hageskæg
+	</string>
+	<string name="Chin Depth">
+		Hage dybde
+	</string>
+	<string name="Chin Heavy">
+		Stort forneden
+	</string>
+	<string name="Chin In">
+		Vigende hage
+	</string>
+	<string name="Chin Out">
+		Hage frem
+	</string>
+	<string name="Chin-Neck">
+		Hals under hage
+	</string>
+	<string name="Clear">
+		Slet
+	</string>
+	<string name="Cleft">
+		Kløft
+	</string>
+	<string name="Close Set Eyes">
+		Tætsiddende øjne
+	</string>
+	<string name="Closed">
+		Lukket
+	</string>
+	<string name="Closed Back">
+		Lukket bagtil
+	</string>
+	<string name="Closed Front">
+		Lukket foran
+	</string>
+	<string name="Closed Left">
+		Lukket til venstre
+	</string>
+	<string name="Closed Right">
+		Lukket til højre
+	</string>
+	<string name="Coin Purse">
+		Lille
+	</string>
+	<string name="Collar Back">
+		Krave bagtil
+	</string>
+	<string name="Collar Front">
+		Krave foran
+	</string>
+	<string name="Corner Down">
+		Nedadvendt
+	</string>
+	<string name="Corner Normal">
+		Normalt
+	</string>
+	<string name="Corner Up">
+		Opadvendt
+	</string>
+	<string name="Creased">
+		Rynket
+	</string>
+	<string name="Crooked Nose">
+		Skæv næse
+	</string>
+	<string name="Cropped Hair">
+		Kort hår
+	</string>
+	<string name="Cuff Flare">
+		Svaj
+	</string>
+	<string name="Dark">
+		Mørk
+	</string>
+	<string name="Dark Green">
+		Mørkegrøn
+	</string>
+	<string name="Darker">
+		Mørkere
+	</string>
+	<string name="Deep">
+		Dyb
+	</string>
+	<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>
+	<string name="Downturned">
+		Peger nedad
+	</string>
+	<string name="Duffle Bag">
+		Stort
+	</string>
+	<string name="Ear Angle">
+		Øre vinkel
+	</string>
+	<string name="Ear Size">
+		Øre størrelse
+	</string>
+	<string name="Ear Tips">
+		Ørespidser
+	</string>
+	<string name="Egg Head">
+		Ovalt hovede
+	</string>
+	<string name="Eye Bags">
+		Poser under øjne
+	</string>
+	<string name="Eye Color">
+		Øjenfarve
+	</string>
+	<string name="Eye Depth">
+		Øjendybde
+	</string>
+	<string name="Eye Lightness">
+		Øjennuance
+	</string>
+	<string name="Eye Opening">
+		Øjenåbning
+	</string>
+	<string name="Eye Pop">
+		Øjensymmetri
+	</string>
+	<string name="Eye Size">
+		Øjenstørrelse
+	</string>
+	<string name="Eye Spacing">
+		Øjenafstand
+	</string>
+	<string name="Eyeball Size">
+		Størrelse øjenæble
+	</string>
+	<string name="Eyebrow Arc">
+		Bue på øjenbryn
+	</string>
+	<string name="Eyebrow Density">
+		Tæthed øjenbryn
+	</string>
+	<string name="Eyebrow Height">
+		Højde på øjenbryn
+	</string>
+	<string name="Eyebrow Points">
+		Løftede øjenbryn
+	</string>
+	<string name="Eyebrow Size">
+		Størrelse øjenbryn
+	</string>
+	<string name="Eyelash Length">
+		Længde øjenvipper
+	</string>
+	<string name="Eyeliner">
+		Eyeliner
+	</string>
+	<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>
+	<string name="Facial Definition">
+		Ansigtskonturer
+	</string>
+	<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>
+	<string name="Fingerless">
+		Fingerløse
+	</string>
+	<string name="Fingers">
+		Fingre
+	</string>
+	<string name="Flared Cuffs">
+		Stor vidde
+	</string>
+	<string name="Flat">
+		Flad
+	</string>
+	<string name="Flat Butt">
+		Flad bagdel
+	</string>
+	<string name="Flat Head">
+		Fladt hovede
+	</string>
+	<string name="Flat Toe">
+		Flad snude
+	</string>
+	<string name="Foot Size">
+		Størrelse fod
+	</string>
+	<string name="Forehead Angle">
+		Pande vinkel
+	</string>
+	<string name="Forehead Heavy">
+		Stort foroven
+	</string>
+	<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>
+	<string name="Full Eyeliner">
+		Meget eyeliner
+	</string>
+	<string name="Full Front">
+		Langt frem fortil
+	</string>
+	<string name="Full Hair Sides">
+		Hår i siderne
+	</string>
+	<string name="Full Sides">
+		Meget hår
+	</string>
+	<string name="Glossy">
+		Skinnende
+	</string>
+	<string name="Glove Fingers">
+		Fingre i handsker
+	</string>
+	<string name="Glove Length">
+		Handskelængde
+	</string>
+	<string name="Hair">
+		Hår
+	</string>
+	<string name="Hair Back">
+		Hår: Bagtil
+	</string>
+	<string name="Hair Front">
+		Hår: Foran
+	</string>
+	<string name="Hair Sides">
+		Hår: Siderne
+	</string>
+	<string name="Hair Sweep">
+		Strøget hår
+	</string>
+	<string name="Hair Thickess">
+		Hår tykkelse
+	</string>
+	<string name="Hair Thickness">
+		Hår tykkelse
+	</string>
+	<string name="Hair Tilt">
+		Hældning
+	</string>
+	<string name="Hair Tilted Left">
+		mest hår venstre
+	</string>
+	<string name="Hair Tilted Right">
+		Mest hår højre
+	</string>
+	<string name="Hair Volume">
+		Hår: Volumen
+	</string>
+	<string name="Hand Size">
+		Størrelse hånd
+	</string>
+	<string name="Handlebars">
+		Cykelstyr
+	</string>
+	<string name="Head Length">
+		Længde på hovede
+	</string>
+	<string name="Head Shape">
+		Hovedform
+	</string>
+	<string name="Head Size">
+		Hovedstørrelse
+	</string>
+	<string name="Head Stretch">
+		Hovedhøjde
+	</string>
+	<string name="Heel Height">
+		Hælhøjde
+	</string>
+	<string name="Heel Shape">
+		Hælform
+	</string>
+	<string name="Height">
+		Højde
+	</string>
+	<string name="High">
+		Høj
+	</string>
+	<string name="High Heels">
+		Hæje hæle
+	</string>
+	<string name="High Jaw">
+		Høj kæbe
+	</string>
+	<string name="High Platforms">
+		Høje såle
+	</string>
+	<string name="High and Tight">
+		Høj og tæt
+	</string>
+	<string name="Higher">
+		Højere
+	</string>
+	<string name="Hip Length">
+		Hoftelængde
+	</string>
+	<string name="Hip Width">
+		Hoftebredde
+	</string>
+	<string name="In">
+		Inde
+	</string>
+	<string name="In Shdw Color">
+		Indre skygge farve
+	</string>
+	<string name="In Shdw Opacity">
+		Indre skygge gennemsigtighed
+	</string>
+	<string name="Inner Eye Corner">
+		Inderste del af øje
+	</string>
+	<string name="Inner Eye Shadow">
+		Inderste øjenskygge
+	</string>
+	<string name="Inner Shadow">
+		Indre skygge
+	</string>
+	<string name="Jacket Length">
+		Jakkelængde
+	</string>
+	<string name="Jacket Wrinkles">
+		Jakkerynker
+	</string>
+	<string name="Jaw Angle">
+		Kæbevinkel
+	</string>
+	<string name="Jaw Jut">
+		Kæbefremspring
+	</string>
+	<string name="Jaw Shape">
+		Kæbeform
+	</string>
+	<string name="Join">
+		Saml
+	</string>
+	<string name="Jowls">
+		Kindehud
+	</string>
+	<string name="Knee Angle">
+		Knævinkel
+	</string>
+	<string name="Knock Kneed">
+		Kalveknæet
+	</string>
+	<string name="Large">
+		Stor
+	</string>
+	<string name="Large Hands">
+		Store hænder
+	</string>
+	<string name="Left Part">
+		Venstre side
+	</string>
+	<string name="Leg Length">
+		Benlængde
+	</string>
+	<string name="Leg Muscles">
+		Benmuskler
+	</string>
+	<string name="Less">
+		Mindre
+	</string>
+	<string name="Less Body Fat">
+		Mindre kropsfedt
+	</string>
+	<string name="Less Curtains">
+		Mindre
+	</string>
+	<string name="Less Freckles">
+		Færre fregner
+	</string>
+	<string name="Less Full">
+		Mindre
+	</string>
+	<string name="Less Gravity">
+		Mindre
+	</string>
+	<string name="Less Love">
+		Mindre bildæk
+	</string>
+	<string name="Less Muscles">
+		Færre muskler
+	</string>
+	<string name="Less Muscular">
+		Mindre muskuløs
+	</string>
+	<string name="Less Rosy">
+		Mindre rosa
+	</string>
+	<string name="Less Round">
+		Mindre rund
+	</string>
+	<string name="Less Saddle">
+		Mindre
+	</string>
+	<string name="Less Square">
+		Mindre
+	</string>
+	<string name="Less Volume">
+		Mindre
+	</string>
+	<string name="Less soul">
+		Mindre
+	</string>
+	<string name="Lighter">
+		Lettere
+	</string>
+	<string name="Lip Cleft">
+		Læbekløft
+	</string>
+	<string name="Lip Cleft Depth">
+		Dybde læbekløft
+	</string>
+	<string name="Lip Fullness">
+		Fyldige læber
+	</string>
+	<string name="Lip Pinkness">
+		Lyserøde læber
+	</string>
+	<string name="Lip Ratio">
+		Læbeproportioner
+	</string>
+	<string name="Lip Thickness">
+		Læbetykkelse
+	</string>
+	<string name="Lip Width">
+		Læbebredde
+	</string>
+	<string name="Lipgloss">
+		Lipgloss
+	</string>
+	<string name="Lipstick">
+		Læbestift
+	</string>
+	<string name="Lipstick Color">
+		Læbestift farve
+	</string>
+	<string name="Long">
+		Lang
+	</string>
+	<string name="Long Head">
+		Langt hovede
+	</string>
+	<string name="Long Hips">
+		Lange hofter
+	</string>
+	<string name="Long Legs">
+		Bange ben
+	</string>
+	<string name="Long Neck">
+		Lang hals
+	</string>
+	<string name="Long Pigtails">
+		Lange rottehaler
+	</string>
+	<string name="Long Ponytail">
+		Lang hestehale
+	</string>
+	<string name="Long Torso">
+		Lang overkrop
+	</string>
+	<string name="Long arms">
+		Lange arme
+	</string>
+	<string name="Longcuffs">
+		Longcuffs
+	</string>
+	<string name="Loose Pants">
+		Løse bukser
+	</string>
+	<string name="Loose Shirt">
+		Løs trøje
+	</string>
+	<string name="Loose Sleeves">
+		Løse ærmer
+	</string>
+	<string name="Love Handles">
+		Bildæk
+	</string>
+	<string name="Low">
+		Lav
+	</string>
+	<string name="Low Heels">
+		Flade hæle
+	</string>
+	<string name="Low Jaw">
+		Lav kæbe
+	</string>
+	<string name="Low Platforms">
+		Flade såler
+	</string>
+	<string name="Low and Loose">
+		Lav og løs
+	</string>
+	<string name="Lower">
+		Nedre
+	</string>
+	<string name="Lower Bridge">
+		Nedre næseryg
+	</string>
+	<string name="Lower Cheeks">
+		Nedre kinder
+	</string>
+	<string name="Male">
+		Mand
+	</string>
+	<string name="Middle Part">
+		Midterste del
+	</string>
+	<string name="More">
+		Mere
+	</string>
+	<string name="More Blush">
+		Mere rødmen
+	</string>
+	<string name="More Body Fat">
+		Mere kropsfedt
+	</string>
+	<string name="More Curtains">
+		Mere
+	</string>
+	<string name="More Eyeshadow">
+		Mere øjenskygge
+	</string>
+	<string name="More Freckles">
+		Flere fregner
+	</string>
+	<string name="More Full">
+		Mere
+	</string>
+	<string name="More Gravity">
+		More
+	</string>
+	<string name="More Lipstick">
+		Mere læbestift
+	</string>
+	<string name="More Love">
+		Mere bildæk
+	</string>
+	<string name="More Lower Lip">
+		Mere underlæbe
+	</string>
+	<string name="More Muscles">
+		Flere muskler
+	</string>
+	<string name="More Muscular">
+		Mere muskuløs
+	</string>
+	<string name="More Rosy">
+		Mere rosa
+	</string>
+	<string name="More Round">
+		Mere rund
+	</string>
+	<string name="More Saddle">
+		Mere
+	</string>
+	<string name="More Sloped">
+		Mere skrå
+	</string>
+	<string name="More Square">
+		Mere firkantet
+	</string>
+	<string name="More Upper Lip">
+		Mere overlæbe
+	</string>
+	<string name="More Vertical">
+		Mere lodret
+	</string>
+	<string name="More Volume">
+		Mere
+	</string>
+	<string name="More soul">
+		Mere
+	</string>
+	<string name="Moustache">
+		Overskæg
+	</string>
+	<string name="Mouth Corner">
+		Mundvige
+	</string>
+	<string name="Mouth Position">
+		Position mund
+	</string>
+	<string name="Mowhawk">
+		Intet hår
+	</string>
+	<string name="Muscular">
+		Muskuløs
+	</string>
+	<string name="Mutton Chops">
+		Lange
+	</string>
+	<string name="Nail Polish">
+		Neglelak
+	</string>
+	<string name="Nail Polish Color">
+		Neglelak farve
+	</string>
+	<string name="Narrow">
+		Smal
+	</string>
+	<string name="Narrow Back">
+		Smal bagtil
+	</string>
+	<string name="Narrow Front">
+		Smal fortil
+	</string>
+	<string name="Narrow Lips">
+		Smalle læber
+	</string>
+	<string name="Natural">
+		Naturlig
+	</string>
+	<string name="Neck Length">
+		Halslængde
+	</string>
+	<string name="Neck Thickness">
+		Halstykkelse
+	</string>
+	<string name="No Blush">
+		Ingen rødmen
+	</string>
+	<string name="No Eyeliner">
+		Ingen eyeliner
+	</string>
+	<string name="No Eyeshadow">
+		Ingen øjenskygge
+	</string>
+	<string name="No Heels">
+		Ingen hæle
+	</string>
+	<string name="No Lipgloss">
+		Ingen lipgloss
+	</string>
+	<string name="No Lipstick">
+		Ingen læbestift
+	</string>
+	<string name="No Part">
+		Ingen dele
+	</string>
+	<string name="No Polish">
+		Ingen lak
+	</string>
+	<string name="No Red">
+		Ingen rød
+	</string>
+	<string name="No Spikes">
+		Ingen spikes
+	</string>
+	<string name="No White">
+		Ingen hvid
+	</string>
+	<string name="No Wrinkles">
+		Ingen rynker
+	</string>
+	<string name="Normal Lower">
+		Normal nedre
+	</string>
+	<string name="Normal Upper">
+		Normal øvre
+	</string>
+	<string name="Nose Left">
+		Højre
+	</string>
+	<string name="Nose Right">
+		Venstre
+	</string>
+	<string name="Nose Size">
+		Næse størrelse
+	</string>
+	<string name="Nose Thickness">
+		Næse tykkelse
+	</string>
+	<string name="Nose Tip Angle">
+		Næsetip vinkel
+	</string>
+	<string name="Nose Tip Shape">
+		Næsetip form
+	</string>
+	<string name="Nose Width">
+		Næse bredde
+	</string>
+	<string name="Nostril Division">
+		Næsebor adskillelse
+	</string>
+	<string name="Nostril Width">
+		Næsebor bredde
+	</string>
+	<string name="Old">
+		Gammel
+	</string>
+	<string name="Opaque">
+		Uigennemsigtig
+	</string>
+	<string name="Open">
+		Åben
+	</string>
+	<string name="Open Back">
+		Åben bagtil
+	</string>
+	<string name="Open Front">
+		Åben foran
+	</string>
+	<string name="Open Left">
+		Åben til venstre
+	</string>
+	<string name="Open Right">
+		Åben til højre
+	</string>
+	<string name="Orange">
+		Orange
+	</string>
+	<string name="Out">
+		Ud
+	</string>
+	<string name="Out Shdw Color">
+		Ydre skygge farve
+	</string>
+	<string name="Out Shdw Opacity">
+		Ydre skygge uigennemsigtighed
+	</string>
+	<string name="Outer Eye Corner">
+		Yderste del af øje
+	</string>
+	<string name="Outer Eye Shadow">
+		Ydre øjenskygge
+	</string>
+	<string name="Outer Shadow">
+		Ydre skygge
+	</string>
+	<string name="Overbite">
+		Overbid
+	</string>
+	<string name="Package">
+		Skridt
+	</string>
+	<string name="Painted Nails">
+		Malede negle
+	</string>
+	<string name="Pale">
+		Bleg
+	</string>
+	<string name="Pants Crotch">
+		Bukser skridt
+	</string>
+	<string name="Pants Fit">
+		Pasform bukser
+	</string>
+	<string name="Pants Length">
+		Bukser - længde
+	</string>
+	<string name="Pants Waist">
+		Bukser - vidde
+	</string>
+	<string name="Pants Wrinkles">
+		Bukser - rynker
+	</string>
+	<string name="Part">
+		Skilning
+	</string>
+	<string name="Part Bangs">
+		Skilning
+	</string>
+	<string name="Pectorals">
+		Brystmuskler
+	</string>
+	<string name="Pigment">
+		Pigmentering
+	</string>
+	<string name="Pigtails">
+		Rottehaler
+	</string>
+	<string name="Pink">
+		Pink
+	</string>
+	<string name="Pinker">
+		Mere pink
+	</string>
+	<string name="Platform Height">
+		Højde sål
+	</string>
+	<string name="Platform Width">
+		Bredde sål
+	</string>
+	<string name="Pointy">
+		Spids
+	</string>
+	<string name="Pointy Heels">
+		Spidse hæle
+	</string>
+	<string name="Pointy Toe">
+		Spids snude
+	</string>
+	<string name="Ponytail">
+		Hestehale
+	</string>
+	<string name="Poofy Skirt">
+		Strutskørt
+	</string>
+	<string name="Pop Left Eye">
+		Forstør venstre øje
+	</string>
+	<string name="Pop Right Eye">
+		Forstør højre øje
+	</string>
+	<string name="Puffy">
+		Posede
+	</string>
+	<string name="Puffy Eyelids">
+		Posede øjenlåg
+	</string>
+	<string name="Rainbow Color">
+		Regnbue farver
+	</string>
+	<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>
+	<string name="Rosy Complexion">
+		Rosa teint
+	</string>
+	<string name="Round">
+		Rund
+	</string>
+	<string name="Round Forehead">
+		Rund pande
+	</string>
+	<string name="Ruddiness">
+		Rødmossethed
+	</string>
+	<string name="Ruddy">
+		Rødmosset
+	</string>
+	<string name="Rumpled Hair">
+		Krøllet hår
+	</string>
+	<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>
+	<string name="Shear Back">
+		Afklippet bagi
+	</string>
+	<string name="Shear Face">
+		Skævt ansigt
+	</string>
+	<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>
+	<string name="Sheared Back">
+		Afklippet bagtil
+	</string>
+	<string name="Sheared Front">
+		Måne
+	</string>
+	<string name="Shift Left">
+		Mod venstre
+	</string>
+	<string name="Shift Mouth">
+		Flyt mund
+	</string>
+	<string name="Shift Right">
+		Mod højre
+	</string>
+	<string name="Shirt Bottom">
+		Trøje - bund
+	</string>
+	<string name="Shirt Fit">
+		Trøje - pasform
+	</string>
+	<string name="Shirt Wrinkles">
+		Trøje - rynker
+	</string>
+	<string name="Shoe Height">
+		Sko højde
+	</string>
+	<string name="Short">
+		Kort
+	</string>
+	<string name="Short Arms">
+		Korte arme
+	</string>
+	<string name="Short Legs">
+		Korte ben
+	</string>
+	<string name="Short Neck">
+		Kort hals
+	</string>
+	<string name="Short Pigtails">
+		Korte rottehaler
+	</string>
+	<string name="Short Ponytail">
+		Kort hestehale
+	</string>
+	<string name="Short Sideburns">
+		Korte
+	</string>
+	<string name="Short Torso">
+		Kort overkrop
+	</string>
+	<string name="Short hips">
+		Korte hofter
+	</string>
+	<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>
+	<string name="Sideburns">
+		Bakkenbarter
+	</string>
+	<string name="Sides Hair">
+		Sidehår
+	</string>
+	<string name="Sides Hair Down">
+		Ned
+	</string>
+	<string name="Sides Hair Up">
+		Op
+	</string>
+	<string name="Skinny">
+		Tynd
+	</string>
+	<string name="Skinny Neck">
+		Tynd hals
+	</string>
+	<string name="Skirt Fit">
+		Omfang
+	</string>
+	<string name="Skirt Length">
+		Længde nederdel
+	</string>
+	<string name="Slanted Forehead">
+		Skrånende pande
+	</string>
+	<string name="Sleeve Length">
+		Ærmelængde
+	</string>
+	<string name="Sleeve Looseness">
+		Ærmer - stramhed
+	</string>
+	<string name="Slit Back">
+		Slids: Bag
+	</string>
+	<string name="Slit Front">
+		Slids: Foran
+	</string>
+	<string name="Slit Left">
+		Slids: Venstre
+	</string>
+	<string name="Slit Right">
+		Slids: Højre
+	</string>
+	<string name="Small">
+		Lille
+	</string>
+	<string name="Small Hands">
+		Små hænder
+	</string>
+	<string name="Small Head">
+		Lille hovede
+	</string>
+	<string name="Smooth">
+		Glat
+	</string>
+	<string name="Smooth Hair">
+		Glat hår
+	</string>
+	<string name="Socks Length">
+		Strømper - længde
+	</string>
+	<string name="Some">
+		Nogen
+	</string>
+	<string name="Soulpatch">
+		Soulpatch
+	</string>
+	<string name="Sparse">
+		Sparsomt
+	</string>
+	<string name="Spiked Hair">
+		Hår med &quot;spikes&quot;
+	</string>
+	<string name="Square">
+		Firkantet
+	</string>
+	<string name="Square Toe">
+		Firkantet snude
+	</string>
+	<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>
+	<string name="Sunken">
+		Indsunket
+	</string>
+	<string name="Sunken Chest">
+		Indsunket bryst
+	</string>
+	<string name="Sunken Eyes">
+		Dybtliggende øjne
+	</string>
+	<string name="Sweep Back">
+		Stryge tilbage
+	</string>
+	<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>
+	<string name="Taper Back">
+		Indsnævring bag
+	</string>
+	<string name="Taper Front">
+		Indsnævring foran
+	</string>
+	<string name="Thick Heels">
+		Brede hæle
+	</string>
+	<string name="Thick Neck">
+		Bred nakke
+	</string>
+	<string name="Thick Toe">
+		Bred snude
+	</string>
+	<string name="Thickness">
+		Tykkelse
+	</string>
+	<string name="Thin">
+		Tynd
+	</string>
+	<string name="Thin Eyebrows">
+		Tynde øjenbryn
+	</string>
+	<string name="Thin Lips">
+		Tynde læber
+	</string>
+	<string name="Thin Nose">
+		Tynd næse
+	</string>
+	<string name="Tight Chin">
+		Stram hage
+	</string>
+	<string name="Tight Cuffs">
+		Smalle bukseben
+	</string>
+	<string name="Tight Pants">
+		Stramme bukser
+	</string>
+	<string name="Tight Shirt">
+		Stram trøje
+	</string>
+	<string name="Tight Skirt">
+		Stram nederdel
+	</string>
+	<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>
+	<string name="Toe Thickness">
+		Tykkelse af snud
+	</string>
+	<string name="Torso Length">
+		Overkrop - længde
+	</string>
+	<string name="Torso Muscles">
+		Overkrop - muskler
+	</string>
+	<string name="Torso Scrawny">
+		Overkrop - mager
+	</string>
+	<string name="Unattached">
+		Ikke vedhæftet
+	</string>
+	<string name="Uncreased">
+		Glat
+	</string>
+	<string name="Underbite">
+		Underbid
+	</string>
+	<string name="Unnatural">
+		Unaturlig
+	</string>
+	<string name="Upper Bridge">
+		Øverste næseryg
+	</string>
+	<string name="Upper Cheeks">
+		Øvre kinder
+	</string>
+	<string name="Upper Chin Cleft">
+		Øvre hagekløft
+	</string>
+	<string name="Upper Eyelid Fold">
+		Øvre øjenlåg
+	</string>
+	<string name="Upturned">
+		Opadvendt
+	</string>
+	<string name="Very Red">
+		Meget rød
+	</string>
+	<string name="Waist Height">
+		Talje højde
+	</string>
+	<string name="Well-Fed">
+		Velnæret
+	</string>
+	<string name="White Hair">
+		Hvidt hår
+	</string>
+	<string name="Wide">
+		Bred
+	</string>
+	<string name="Wide Back">
+		Bredt
+	</string>
+	<string name="Wide Front">
+		Bredt
+	</string>
+	<string name="Wide Lips">
+		Brede læber
+	</string>
+	<string name="Wild">
+		Vildt
+	</string>
+	<string name="Wrinkles">
+		Rynker
+	</string>
+	<string name="LocationCtrlAddLandmarkTooltip">
+		Tilføj til mine landemærker
+	</string>
+	<string name="LocationCtrlEditLandmarkTooltip">
+		Rediger mit landemærke
+	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		Se yderligere information om nuværende lokation
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		Min lokationshistorik
+	</string>
+	<string name="UpdaterWindowTitle">
+		[APP_NAME] Opdatér
+	</string>
+	<string name="UpdaterNowUpdating">
+		Opdaterer nu [APP_NAME]...
+	</string>
+	<string name="UpdaterNowInstalling">
+		Installerer [APP_NAME]...
+	</string>
+	<string name="UpdaterUpdatingDescriptive">
+		Din [APP_NAME] klient bliver opdateret til nyeste version.  Dette kan tage noget tid, så venligst vær tålmodig.
+	</string>
+	<string name="UpdaterProgressBarTextWithEllipses">
+		Download færdig...
+	</string>
+	<string name="UpdaterProgressBarText">
+		Downloader opdatering
+	</string>
+	<string name="UpdaterFailDownloadTitle">
+		Download af opdatering fejlede
+	</string>
+	<string name="UpdaterFailUpdateDescriptive">
+		Der opstod en fejl ved opdatering af  [APP_NAME]. Hent venligst den nyeste version fra www.secondlife.com.
+	</string>
+	<string name="UpdaterFailInstallTitle">
+		Installation af opdatering fejlede
+	</string>
+	<string name="UpdaterFailStartTitle">
+		Opstart af klient fejlede
+	</string>
+	<string name="IM_logging_string">
+		-- Logning af IM aktiveret --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] skriver...
+	</string>
+	<string name="Unnamed">
+		(Uden navn)
+	</string>
+	<string name="IM_moderated_chat_label">
+		(Modereret: Stemmer deaktiveret)
+	</string>
+	<string name="IM_unavailable_text_label">
+		Tekst chat er ikke tilgængelig i denne samtale.
+	</string>
+	<string name="IM_muted_text_label">
+		Din tekst chat er blevet deaktiveret af en gruppe moderator.
+	</string>
+	<string name="IM_default_text_label">
+		Klik her for privat besked (IM).
+	</string>
+	<string name="IM_to_label">
+		Til
+	</string>
+	<string name="IM_moderator_label">
+		(Moderator)
+	</string>
+	<string name="only_user_message">
+		Du er den eneste deltager i denne samtale
+	</string>
+	<string name="offline_message">
+		[FIRST] [LAST] er ikke logget på.
+	</string>
+	<string name="invite_message">
+		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.
+	</string>
+	<string name="generic_request_error">
+		Kunne ikke etablere forbindelse, prøv igen senere
+	</string>
+	<string name="insufficient_perms_error">
+		Du har ikke de fornødne rettigheder.
+	</string>
+	<string name="session_does_not_exist_error">
+		Denne samtale er lukket ned
+	</string>
+	<string name="no_ability_error">
+		Du har ikke den mulighed.
+	</string>
+	<string name="no_ability">
+		Du har ikke den mulighed.
+	</string>
+	<string name="not_a_mod_error">
+		Du er ikke moderator for denne samtale.
+	</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_session_event">
+		Ikke muligt at sende din besked til samtalen med [RECIPIENT].
+	</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>
+</strings>
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 680806c8ac..43f8e5144d 100644
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<teleport_messages>

-	<message_set name="errors">

-		<message name="invalid_tport">

-			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.

-Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].

-		</message>

-		<message name="invalid_region_handoff">

-			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.

-Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].

-		</message>

-		<message name="blocked_tport">

-			Beklager, teleport er blokeret lige nu. Prøv igen senere.

-Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.

-		</message>

-		<message name="nolandmark_tport">

-			Beklager, systemet kunne ikke finde landmærke destinationen.

-		</message>

-		<message name="timeout_tport">

-			Beklager, systemet kunne ikke fuldføre teleport forbindelse.

-Prøv igen om lidt.

-		</message>

-		<message name="noaccess_tport">

-			Beklager, du har ikke adgang til denne teleport destination.

-		</message>

-		<message name="missing_attach_tport">

-			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.

-		</message>

-		<message name="too_many_uploads_tport">

-			Tekniske problemer hindrer at din teleport kan gennemføres.

-Prøv venligst igen om lidt eller vælg et mindre travlt område.

-		</message>

-		<message name="expired_tport">

-			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.

-		</message>

-		<message name="expired_region_handoff">

-			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.

-		</message>

-		<message name="no_host">

-			Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 

-Prøv evt. igen om lidt.

-		</message>

-		<message name="no_inventory_host">

-			Beholdningssystemet er ikke tilgængelig lige nu.

-		</message>

-	</message_set>

-	<message_set name="progress">

-		<message name="sending_dest">

-			Sender til destination.

-		</message>

-		<message name="redirecting">

-			Omdirigerer til en anden lokation.

-		</message>

-		<message name="relaying">

-			Overfører til destination.

-		</message>

-		<message name="sending_home">

-			Sender forespørgsel på hjem-position.

-		</message>

-		<message name="sending_landmark">

-			Semder anmodning om landmærke.

-		</message>

-		<message name="completing">

-			Fuldfører teleport.

-		</message>

-		<message name="resolving">

-			Finder destination.

-		</message>

-		<message name="contacting">

-			Kontakter ny region.

-		</message>

-		<message name="arriving">

-			Ankommer...

-		</message>

-		<message name="requesting">

-			Anmoder om teleport...

-		</message>

-	</message_set>

-</teleport_messages>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<teleport_messages>
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Der er problemer med at håndtere din teleport. Det kan være nødvendigt at logge ud og ind for at kunne skifte teleportere.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].
+		</message>
+		<message name="invalid_region_handoff">
+			Problem registreret i forbindelse med skift til ny region. Det kan være nødvendigt at logge ud og ind for at kunne skifte regioner.
+Hvis du bliver ved med at have problemet kan du checke teknisk support på: [SUPPORT_SITE].
+		</message>
+		<message name="blocked_tport">
+			Beklager, teleport er blokeret lige nu. Prøv igen senere.
+Hvis du stadig ikke kan teleporte, prøv venligst at logge ud og ligge ind for at løse dette problem.
+		</message>
+		<message name="nolandmark_tport">
+			Beklager, systemet kunne ikke finde landmærke destinationen.
+		</message>
+		<message name="timeout_tport">
+			Beklager, systemet kunne ikke fuldføre teleport forbindelse.
+Prøv igen om lidt.
+		</message>
+		<message name="noaccess_tport">
+			Beklager, du har ikke adgang til denne teleport destination.
+		</message>
+		<message name="missing_attach_tport">
+			Dine vedhæng er ikke ankommet endnu. Prøv at vente lidt endnu eller log ud og ind igen før du prøver at teleporte igen.
+		</message>
+		<message name="too_many_uploads_tport">
+			Tekniske problemer hindrer at din teleport kan gennemføres.
+Prøv venligst igen om lidt eller vælg et mindre travlt område.
+		</message>
+		<message name="expired_tport">
+			Beklager, men systemet kunne ikke fuldføre din teleport i rimelig tid. Prøv venligst igen om lidt.
+		</message>
+		<message name="expired_region_handoff">
+			Beklager, men systemet kunne ikke fuldføre skift til anden region i rimelig tid. Prøv venligst igen om lidt.
+		</message>
+		<message name="no_host">
+			Ikke muligt at fine teleport destination. Destinationen kan være midlertidig utilgængelig eller findes ikke mere. 
+Prøv evt. igen om lidt.
+		</message>
+		<message name="no_inventory_host">
+			Beholdningssystemet er ikke tilgængelig lige nu.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Sender til destination.
+		</message>
+		<message name="redirecting">
+			Omdirigerer til en anden lokation.
+		</message>
+		<message name="relaying">
+			Overfører til destination.
+		</message>
+		<message name="sending_home">
+			Sender forespørgsel på hjem-position.
+		</message>
+		<message name="sending_landmark">
+			Semder anmodning om landmærke.
+		</message>
+		<message name="completing">
+			Fuldfører teleport.
+		</message>
+		<message name="resolving">
+			Finder destination.
+		</message>
+		<message name="contacting">
+			Kontakter ny region.
+		</message>
+		<message name="arriving">
+			Ankommer...
+		</message>
+		<message name="requesting">
+			Anmoder om teleport...
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index ea5c33b3c8..664c6e3072 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="ÜBER [APP_NAME]">
+<floater name="floater_about" title="INFO ÜBER [APP_NAME]">
+	<floater.string name="AboutHeader">
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutCompiler">
+		Kompiliert mit [COMPILER] version [COMPILER_VERSION]
+	</floater.string>
+	<floater.string name="AboutPosition">
+		Sie befinden sich in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] auf [HOSTNAME] ([HOSTIP])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU: [CPU]
+Speicher: [MEMORY_MB] MB
+Betriebssystem, Version: [OS_VERSION]
+Grafikkarten-Hersteller: [GRAPHICS_CARD_VENDOR]
+Grafikkarten: [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Windows Grafiktreiber-Version: [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<floater.string name="AboutLibs">
+		OpenGL Version: [OPENGL_VERSION]
+
+libcurl-Version: [LIBCURL_VERSION]
+J2C-Decoderversion: [J2C_VERSION]
+Audio-Treiberversion: [AUDIO_DRIVER_VERSION]
+Qt Webkit Version: [QT_WEBKIT_VERSION]
+Vivox-Version: [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		(keiner)
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		Paketverlust: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+	</floater.string>
 	<tab_container name="about_tab">
+		<panel label="Info" name="support_panel">
+			<button label="In Zwischenablage kopieren" name="copy_btn"/>
+		</panel>
 		<panel label="Danksagung" name="credits_panel">
 			<text_editor name="credits_editor">
 				Second Life wird Ihnen präsentiert von 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 und vielen anderen.
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index d6d7434d58..af489d39d2 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -9,6 +9,9 @@
 	<floater.string name="Seconds">
 		[SECONDS] Sekunden
 	</floater.string>
+	<floater.string name="Remaining">
+		Restzeit
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="Allgemein" name="land_general_panel">
 			<panel.string name="new users only">
@@ -21,7 +24,7 @@
 				Gebiet:
 			</panel.string>
 			<panel.string name="area_size_text">
-				[AREA] qm.
+				[AREA] m².
 			</panel.string>
 			<panel.string name="auction_id_text">
 				Auktions-ID: [ID]
@@ -90,7 +93,7 @@
 				Nicht zu verkaufen.
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
-				Preis: [PRICE] L$ ([PRICE_PER_SQM] L$/qm.).
+				Preis: [PRICE] L$ ([PRICE_PER_SQM]L$/m²).
 			</text>
 			<text name="SalePending"/>
 			<button bottom="-222" label="Land verkaufen..." label_selected="Land verkaufen..." name="Sell Land..."/>
@@ -114,7 +117,7 @@
 				Gebiet:
 			</text>
 			<text name="PriceText">
-				4048 qm.
+				4.048 m²
 			</text>
 			<text name="Traffic:">
 				Traffic:
@@ -279,7 +282,7 @@ werden.
 				Diese Parzelle in Suchergebnissen anzeigen.
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
-				Diese Option ist nicht aktiviert, da diese Parzelle nicht größer als 128 qm ist.
+				Diese Option ist nicht aktiviert, weil die Parzelle 128 m² oder kleiner ist.
 Nur große Parzellen können in der Suche aufgeführt werden.
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
@@ -370,11 +373,11 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Landepunkt: [LANDING]
 			</text>
 			<button label="Festlegen" label_selected="Festlegen" left="234" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
-			<button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen." width="70"/>
+			<button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen" width="70"/>
 			<text name="Teleport Routing: ">
 				Teleport-Route:
 			</text>
-			<combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen.">
+			<combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen">
 				<combo_box.item label="Blockiert" name="Blocked"/>
 				<combo_box.item label="Landepunkt" name="LandingPoint"/>
 				<combo_box.item label="Überall" name="Anywhere"/>
diff --git a/indra/newview/skins/default/xui/de/floater_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml
new file mode 100644
index 0000000000..416e31b2d6
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_activeim.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_activeim" title="AKTIVE IM"/>
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 33ce72855b..4b4067f186 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -113,14 +113,14 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 	<text name="description_label">
 		Beschreibung:
 	</text>
-	<spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können."/>
-	<check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife."/>
-	<spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen."/>
-	<spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen."/>
+	<spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können"/>
+	<check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife"/>
+	<spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen"/>
+	<spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen"/>
 	<text name="hand_label">
 		Handhaltung
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
+	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände">
 		<combo_box.item label="Dehnen" name="Spread"/>
 		<combo_box.item label="Entspannt" name="Relaxed"/>
 		<combo_box.item label="Beide zeigen" name="PointBoth"/>
@@ -138,8 +138,8 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 	<text name="emote_label">
 		Ausdruck
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
-		<combo_box.item label="Keine]" name="[None]"/>
+	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation">
+		<combo_box.item label="(Keiner)" name="[None]"/>
 		<combo_box.item label="Aaaaah" name="Aaaaah"/>
 		<combo_box.item label="Ängstlich" name="Afraid"/>
 		<combo_box.item label="Verärgert" name="Angry"/>
@@ -152,7 +152,7 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 		<combo_box.item label="Küssen" name="Kiss"/>
 		<combo_box.item label="Lachen" name="Laugh"/>
 		<combo_box.item label="Bäääh" name="Plllppt"/>
-		<combo_box.item label="Zurückgestoßen" name="Repulsed"/>
+		<combo_box.item label="Angewidert" name="Repulsed"/>
 		<combo_box.item label="Traurig" name="Sad"/>
 		<combo_box.item label="Schulterzucken" name="Shrug"/>
 		<combo_box.item label="Lächeln" name="Smile"/>
@@ -167,11 +167,11 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 		<combo_box.item label="Stehend" name="Standing"/>
 		<combo_box.item label="Geht" name="Walking"/>
 		<combo_box.item label="Sitzt" name="Sitting"/>
-		<combo_box.item label="Fliegend" name="Flying"/>
+		<combo_box.item label="Fliegen" name="Flying"/>
 	</combo_box>
-	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
-	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
-	<button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben."/>
+	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)" width="175"/>
+	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendegeschwindigkeit von Animationen (in Sekunden)" width="175"/>
+	<button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben"/>
 	<button label="" name="stop_btn" tool_tip="Animation anhalten"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml
index 9d0db766c9..8ededff319 100644
--- a/indra/newview/skins/default/xui/de/floater_auction.xml
+++ b/indra/newview/skins/default/xui/de/floater_auction.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="LINDEN-LANDVERKAUF STARTEN">
-	<check_box label="Gelben Auswahlrahmen einschließen" name="fence_check" />
-	<button label="Foto" label_selected="Foto" name="snapshot_btn" />
-	<button label="OK" label_selected="OK" name="ok_btn" />
-	<text name="already for sale">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="LINDEN LAND VERKAUF STARTEN">
+	<floater.string name="already for sale">
 		Parzellen, die bereits zum Verkauf stehen, können nicht auktioniert werden.
-	</text>
+	</floater.string>
+	<check_box initial_value="true" label="Gelben Auswahlrahmen einschließen" name="fence_check"/>
+	<button label="Foto" label_selected="Foto" name="snapshot_btn"/>
+	<button label="An jeden verkaufen" label_selected="An jeden verkaufen" name="sell_to_anyone_btn"/>
+	<button label="Einstellungen löschen" label_selected="Einstellungen löschen" name="reset_parcel_btn"/>
+	<button label="Auktion beginnen" label_selected="Auktion beginnen" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index a188a9fd9e..ed8de62b69 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="EINWOHNER AUSWÄHLEN">
+	<floater.string name="not_found">
+		„[TEXT]“ nicht gefunden
+	</floater.string>
+	<floater.string name="no_one_near">
+		Keiner in der Nähe
+	</floater.string>
+	<floater.string name="no_results">
+		Keine Ergebnisse
+	</floater.string>
+	<floater.string name="searching">
+		Suchen...
+	</floater.string>
+	<string label="OK" label_selected="OK" name="Select">
+		Auswählen
+	</string>
+	<string name="Close">
+		Schließen
+	</string>
 	<tab_container name="ResidentChooserTabs">
 		<panel label="Suchen" name="SearchPanel">
 			<text name="InstructSearchResidentName">
@@ -9,35 +27,23 @@
 			<button label="Los" label_selected="Los" name="Find"/>
 			<scroll_list bottom_delta="-79" height="74" name="SearchResults"/>
 		</panel>
-		<panel label="Visitenkarten" name="CallingCardsPanel">
-			<text name="InstructSelectCallingCard">
-				Wählen Sie eine Visitenkarte:
+		<panel label="Freunde" name="FriendsPanel">
+			<text name="InstructSelectFriend">
+				Wählen Sie eine Person aus:
 			</text>
 		</panel>
 		<panel label="In meiner Nähe" name="NearMePanel">
 			<text name="InstructSelectResident">
 				Wählen Sie eine Person aus, die sich in der Nähe befindet:
 			</text>
-			<button font="SansSerifSmall" label="Liste aktualisieren" label_selected="Liste aktualisieren" left_delta="10" name="Refresh" width="105"/>
 			<slider bottom_delta="-36" label="Bereich" name="near_me_range"/>
 			<text name="meters">
 				Meter
 			</text>
+			<button font="SansSerifSmall" label="Liste aktualisieren" label_selected="Liste aktualisieren" left_delta="10" name="Refresh" width="105"/>
 			<scroll_list bottom_delta="-169" height="159" name="NearMe"/>
 		</panel>
 	</tab_container>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-	<string name="not_found">
-		„[TEXT]“ nicht gefunden
-	</string>
-	<string name="no_one_near">
-		Niemand in der Nähe
-	</string>
-	<string name="no_results">
-		Keine Ergebnisse
-	</string>
-	<string name="searching">
-		Suchen...
-	</string>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
 </floater>
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 3072735c66..6f5fe23d4c 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="AVATAR-TEXTUREN">
+	<floater.string name="InvalidAvatar">
+		UNGÜLTIGER AVATAR
+	</floater.string>
 	<text name="label">
 		Gebackene Texturen
 	</text>
@@ -8,24 +11,32 @@
 	</text>
 	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
 	<texture_picker label="Haare" name="hair-baked"/>
-	<texture_picker label="Haar" name="hair"/>
+	<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-Uup" 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"/>
-	<texture_picker label="Auge" name="iris"/>
+	<texture_picker label="Auge" name="eyes_iris"/>
+	<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
 	<texture_picker label="Oberkörper" name="upper-baked"/>
-	<texture_picker label="Oberkörpertattoo" name="upper bodypaint"/>
-	<texture_picker label="Unterhemd" name="undershirt"/>
-	<texture_picker label="Handschuhe" name="gloves"/>
-	<texture_picker label="Hemd" name="shirt"/>
-	<texture_picker label="Oberjacke" name="upper jacket"/>
+	<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint"/>
+	<texture_picker label="Unterhemd" name="upper_undershirt"/>
+	<texture_picker label="Handschuhe" name="upper_gloves"/>
+	<texture_picker label="Hemd" name="upper_shirt"/>
+	<texture_picker label="Oberjacke" name="upper_jacket"/>
+	<texture_picker label="Alpha: Oben" name="upper_alpha"/>
+	<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
 	<texture_picker label="Unterkörper" name="lower-baked"/>
-	<texture_picker label="Unterkörper-Tätowierung" name="lower bodypaint"/>
-	<texture_picker label="Unterhose" name="underpants"/>
-	<texture_picker label="Socken" name="socks"/>
-	<texture_picker label="Schuhe" name="shoes"/>
-	<texture_picker label="Hose" name="pants"/>
-	<texture_picker label="Jacke" name="lower jacket"/>
+	<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint"/>
+	<texture_picker label="Unterhose" name="lower_underpants"/>
+	<texture_picker label="Socken" name="lower_socks"/>
+	<texture_picker label="Schuhe" name="lower_shoes"/>
+	<texture_picker label="Hose" name="lower_pants"/>
+	<texture_picker label="Jacke" name="lower_jacket"/>
+	<texture_picker label="Alpha: Unten" name="lower_alpha"/>
+	<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
 	<texture_picker label="Rock" name="skirt-baked"/>
 	<texture_picker label="Rock" name="skirt"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml
index f407ba6122..50a4555ae0 100644
--- a/indra/newview/skins/default/xui/de/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/de/floater_beacons.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="BEACONS">
+<floater name="beacons" title="STRAHLEN">
 	<panel name="beacons_panel">
 		<text name="label_show">
 			Anzeigen:
 		</text>
-		<check_box label="Beacons" name="beacons"/>
+		<check_box label="Strahlen" name="beacons"/>
 		<check_box label="Glanzlichter" name="highlights"/>
-		<text name="beacon_width_label" tool_tip="Beacon-Breite">
+		<text name="beacon_width_label" tool_tip="Strahlbreite">
 			Breite:
 		</text>
 		<text name="label_objects">
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
index 932ea160a9..b70c859490 100644
--- a/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_build_options.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="build options floater" title="RASTEROPTIONEN">
-	<spinner label="Rastereinheit (Meter)" name="GridResolution"/>
+<floater name="build options floater" title="RASTER-OPTIONEN">
+	<spinner label="Raster-Einheiten (Meter)" name="GridResolution"/>
 	<spinner label="Rastergröße (Meter)" name="GridDrawSize"/>
-	<check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/>
-	<check_box label="Querschnitte anzeigen" name="GridCrossSection"/>
-	<text name="grid_opacity_label" tool_tip="Rasterdeckkraft">
+	<check_box label="Einrasten von Untereinheiten aktivieren" name="GridSubUnit"/>
+	<check_box label="Überschneidungen anzeigen" name="GridCrossSection"/>
+	<text name="grid_opacity_label" tool_tip="Raster-Deckkraft">
 		Deckkraft:
 	</text>
 	<slider label="Rasterdeckkraft" name="GridOpacity"/>
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 6c0574dee4..218c66d298 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="Inhalt-Berechtigungen bearbeiten">
+<floater name="floaterbulkperms" title="INHALTS-BERECHTIGUNGEN BEARBEITEN">
 	<floater.string name="nothing_to_modify_text">
 		Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
 	</floater.string>
@@ -29,6 +29,7 @@
 	<check_box label="Sounds" name="check_sound"/>
 	<icon name="icon_sound" tool_tip="Sounds"/>
 	<check_box label="Texturen" name="check_texture"/>
+	<icon name="icon_texture" tool_tip="Texturen"/>
 	<button label="√ Alle" label_selected="Alle" name="check_all"/>
 	<button label="Löschen" label_selected="Keine" name="check_none"/>
 	<text name="newperms">
@@ -37,7 +38,7 @@
 	<text name="GroupLabel">
 		Gruppe:
 	</text>
-	<check_box label="Freigeben" name="share_with_group"/>
+	<check_box label="Teilen" name="share_with_group"/>
 	<text name="AnyoneLabel">
 		Jeder:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml
index b7909bf02d..dafca44fa3 100644
--- a/indra/newview/skins/default/xui/de/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/de/floater_bumps.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="REMPLER, STÖßE UND SCHLÄGE">
-	<text name="none_detected">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="REMPLER, STÖSSE &amp; SCHLÄGE">
+	<floater.string name="none_detected">
 		Nicht erkannt
-	</text>
-	<text name="bump">
+	</floater.string>
+	<floater.string name="bump">
 		[TIME]  [FIRST] [LAST] hat Sie gestoßen
-	</text>
-	<text name="llpushobject">
+	</floater.string>
+	<floater.string name="llpushobject">
 		[TIME]  [FIRST] [LAST] hat Sie mit einem Skript gestoßen
-	</text>
-	<text name="selected_object_collide">
+	</floater.string>
+	<floater.string name="selected_object_collide">
 		[TIME]  [FIRST] [LAST] hat Sie mit einem Objekt getroffen
-	</text>
-	<text name="scripted_object_collide">
+	</floater.string>
+	<floater.string name="scripted_object_collide">
 		[TIME]  [FIRST] [LAST] hat Sie mit einem Skript-Objekt getroffen
-	</text>
-	<text name="physical_object_collide">
+	</floater.string>
+	<floater.string name="physical_object_collide">
 		[TIME]  [FIRST] [LAST] hat Sie mit einem physischen Objekt getroffen
-	</text>
+	</floater.string>
+	<floater.string name="timeStr">
+		[[hour,datetime,slt]:[min,datetime,slt]]
+	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index 47ea6a1bd4..ccafa11cf4 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="INHALTE KAUFEN" min_width="300">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="300" name="floater_buy_contents" title="INHALT KAUFEN">
 	<text name="contains_text">
 		[NAME] enthält:
 	</text>
 	<text name="buy_text">
 		[AMOUNT] L$ von [NAME] kaufen?
 	</text>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
-	<button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
-	<check_box label="Kleidung jetzt anziehen" name="wear_check" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73"/>
+	<button label="Kaufen" label_selected="Kaufen" name="buy_btn"/>
+	<check_box label="Kleidung jetzt anziehen" name="wear_check"/>
 	<text name="no_copy_text">
 		(kein Kopieren)
 	</text>
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 56b7868c33..287b16273a 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -1,68 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="GELD KAUFEN">
-	<text name="info_buying">
-		Kaufe Geld:
-	</text>
-	<text name="info_cannot_buy">
-		Kaufen jetzt nicht möglich:
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="L$ kaufen">
+	<floater.string name="buy_currency">
+		[LINDENS] L$ für ca. [LOCALAMOUNT] kaufen
+	</floater.string>
 	<text name="info_need_more">
-		Sie brauchen mehr Geld:
-	</text>
-	<text name="error_message">
-		Irgendetwas stimmt nicht.
+		Sie brauchen mehr Geld
 	</text>
-	<button label="Gehe zu Website" name="error_web" />
 	<text name="contacting">
 		LindeX wird kontaktiert...
 	</text>
-	<text name="buy_action_unknown">
-		L$ an der LindeX kaufen
+	<text name="info_buying">
+		L$ kaufen
+	</text>
+	<text name="balance_label">
+		Ich habe
 	</text>
-	<text name="buy_action">
-		[NAME] L$ [PRICE]
+	<text name="balance_amount">
+		[AMT] L$
 	</text>
 	<text name="currency_action" width="90">
-		L$ kaufen
+		Ich möchte kaufen
+	</text>
+	<text name="currency_label">
+		L$
 	</text>
-	<line_editor left_delta="55" name="currency_amt">
+	<line_editor label="L$" left_delta="55" name="currency_amt">
 		1234
 	</line_editor>
+	<text name="buying_label">
+		Zum Preis von
+	</text>
 	<text name="currency_est">
-		für ca. [LOCALAMOUNT]
+		ca. [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
-		Daten werden geladen...
-	</text>
-	<text name="balance_label">
-		Sie haben zurzeit
-	</text>
-	<text name="balance_amount">
-		[AMT] L$
-	</text>
-	<text name="buying_label">
-		Sie kaufen
+		Schätzung erfolgt...
 	</text>
-	<text name="buying_amount">
-		[AMT] L$
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
 	</text>
 	<text name="total_label">
-		Ihr neuer Kontostand:
+		Mein neuer Kontostand wird sein
 	</text>
 	<text name="total_amount">
 		[AMT] L$
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=de-DE payment method] | [http://www.secondlife.com/my/account/currency.php?lang=de-DE currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=de-DE exchange rate]
+	</text>
+	<text name="exchange_rate_note">
+		Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen.
+	</text>
 	<text name="purchase_warning_repurchase">
-		Dieser Einkauf betrifft ausschließlich Geld.
-Wiederholen Sie den Vorgang.
+		Nach Bestätigung dieses Kaufs werden nur L$ gekauft, nicht das Objekt.
 	</text>
 	<text name="purchase_warning_notenough">
-		Sie kaufen nicht genügend Geld.
-Kaufen Sie mehr.
+		Sie kaufen nicht genügend L$. Bitte erhöhen Sie den Betrag.
 	</text>
-	<button label="Kaufen" name="buy_btn" />
-	<button label="Abbrechen" name="cancel_btn" />
-	<text name="buy_currency">
-		[LINDENS] L$ für ca. [LOCALAMOUNT] kaufen
+	<button label="Jetzt kaufen" name="buy_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+	<text name="info_cannot_buy">
+		Kauf nicht möglich
 	</text>
+	<button label="Weiter zum Internet" name="error_web"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 72a35db78c..4c59f1e8e6 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -51,14 +51,14 @@
 		Größe:
 	</text>
 	<text name="info_size">
-		1024 qm.
+		1.024 m²
 	</text>
 	<text name="info_price_label">
 		Preis:
 	</text>
 	<text name="info_price">
 		1500 L$
-(L$ 1,1 L$/qm)
+(1,1 L$/m²)
 Objekte im Verkauf eingeschlossen
 	</text>
 	<text name="info_action">
@@ -75,16 +75,16 @@ Objekte im Verkauf eingeschlossen
 		Landbesitz ist Premium-Mitgliedern vorbehalten.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly" label="9,95 US$/Monat, monatliche Abrechnung" />
-		<combo_box.item name="US$7.50/month,billedquarterly" label="7,50 US$/Monat, vierteljährliche Abrechnung" />
-		<combo_box.item name="US$6.00/month,billedannually" label="6,00 US$/Monat, jährliche Abrechnung" />
+		<combo_box.item label="9,95 US$/Monat, monatliche Abrechnung" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="7,50 US$/Monat, vierteljährliche Abrechnung" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="6,00 US$/Monat, jährliche Abrechnung" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
 		Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month.
 	</text>
 	<text name="land_use_reason">
-		Sie besitzen 1309 qm Land. 
-Diese Parzelle ist 512 qm groß.
+		Sie besitzen 1309 m² Land.
+Diese Parzelle ist 512 m² gross.
 	</text>
 	<text name="purchase_action">
 		Joe Resident 4000 L$ für das Land bezahlen
@@ -99,12 +99,12 @@ Diese Parzelle ist 512 qm groß.
 		1000
 	</line_editor>
 	<text name="currency_est">
-		für ca. [AMOUNT2] US$
+		für ca. [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
 		Sie haben 2.100 L$.
 	</text>
-	<check_box label="[AMOUNT] Quadratmeter des Beitrags von Gruppe nehmen." name="remove_contribution"/>
+	<check_box label="[AMOUNT] m² Beitrag von der Gruppe entfernen." name="remove_contribution"/>
 	<button label="Kaufen" name="buy_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 	<string name="can_resell">
@@ -181,25 +181,25 @@ Verkleinern Sie Ihre Auswahl.
 		Mit Ihrem Konto können Sie Land kaufen.
 	</string>
 	<string name="land_holdings">
-		Sie besitzen [BUYER] qm Land.
+		Sie besitzen [BUYER] m² Land.
 	</string>
 	<string name="pay_to_for_land">
 		[SELLER] [AMOUNT] L$ für das Land bezahlen
 	</string>
 	<string name="buy_for_US">
-		[AMOUNT] L$ für circa [AMOUNT2] US$ kaufen,
+		Kaufen Sie [AMOUNT] L$ für ca. [LOCAL_AMOUNT],
 	</string>
 	<string name="parcel_meters">
-		Diese Parzelle ist [AMOUNT] qm groß.
+		Diese Parzelle ist [AMOUNT] m².
 	</string>
 	<string name="premium_land">
-		Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] qm angesetzt.
+		Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] m² angesetzt.
 	</string>
 	<string name="discounted_land">
-		Dieses Land ist im Angebot. Es wird mit [AMOUNT] qm angesetzt.
+		Dieses Land ist im Angebot. Es wird mit [AMOUNT] m² angesetzt.
 	</string>
 	<string name="meters_supports_object">
-		[AMOUNT] qm.
+		[AMOUNT] m²
 unterstützt [AMOUNT2] Objekte
 	</string>
 	<string name="sold_with_objects">
@@ -210,7 +210,7 @@ unterstützt [AMOUNT2] Objekte
 	</string>
 	<string name="info_price_string">
 		[PRICE] L$
-([PRICE_PER_SQM] L$/qm)
+([PRICE_PER_SQM] L$/m²)
 [SOLD_WITH_OBJECTS]
 	</string>
 	<string name="insufficient_land_credits">
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
index e35212915f..b23163b4a3 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="OBJEKTKOPIE KAUFEN">
+<floater name="contents" title="KOPIE DES OBJEKTES KAUFEN">
 	<text name="contents_text">
 		Inhalt:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index 131f077815..b8616ea128 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -11,8 +11,16 @@
 	</floater.string>
 	<panel name="controls">
 		<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
-		<joystick_zoom name="zoom" tool_tip="Kamera auf Fokus zoomen"/>
-		<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus herum kreisen"/>
+		<panel name="zoom" tool_tip="Kamera auf Fokus zoomen">
+			<slider_bar name="zoom_slider" tool_tip="Kamera auf Fokus zoomen"/>
+		</panel>
+		<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/>
+		<panel name="camera_presets">
+			<button name="rear_view" tool_tip="Hinteransicht"/>
+			<button name="group_view" tool_tip="Gruppen-Ansicht"/>
+			<button name="front_view" tool_tip="Vorderansicht"/>
+			<button name="mouselook_view" tool_tip="Mouselook"/>
+		</panel>
 	</panel>
 	<panel name="buttons">
 		<button label="" name="orbit_btn" tool_tip="Kamera kreisen"/>
diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml
index 398645347b..3d76b645fe 100644
--- a/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/de/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="GRUPPEN">
 	<text name="groupdesc">
 		Gruppe wählen:
 	</text>
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index 9221d1bcf7..552bd2e2bf 100644
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -21,12 +21,11 @@
 	<check_box label="Jetzt übernehmen" name="apply_immediate"/>
 	<button label="" label_selected="" name="color_pipette"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
-	<button label="OK" label_selected="Auswählen" name="select_btn"/>
+	<button label="OK" label_selected="OK" name="select_btn"/>
 	<text name="Current color:">
 		Aktuelle Farbe:
 	</text>
 	<text name="(Drag below to save.)">
-		(Nach unten ziehen,
- um zu speichern)
+		(Zum Speichern nach unten ziehen.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index f1ecd21c01..34aa17bbe0 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -14,8 +14,8 @@
 			<button label="Oberkörper" label_selected="Oberkörper" name="Torso"/>
 			<button label="Beine" label_selected="Beine" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item name="radio" label="Weiblich"/>
-				<radio_item name="radio2" label="Männlich"/>
+				<radio_item label="Weiblich" name="radio"/>
+				<radio_item label="Männlich" name="radio2"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -156,7 +156,7 @@ und diese anziehen.
 			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
 			<button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
 		</panel>
-		<panel label="Kleidung" name="clothes_placeholder"/>
+		<placeholder label="Kleidung" name="clothes_placeholder"/>
 		<panel label="Hemd" name="Shirt">
 			<texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 			<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
@@ -473,8 +473,80 @@ und diesen anziehen.
 			<button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
 			<button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
 		</panel>
+		<panel label="Alpha" name="Alpha">
+			<text name="title">
+				[BESCHR]
+			</text>
+			<text name="title_no_modify">
+				[BESCHR]: bearbeiten nicht möglich
+			</text>
+			<text name="title_loading">
+				[BESCHR]: wird geladen...
+			</text>
+			<text name="title_not_worn">
+				[BESCHR]: nicht getragen
+			</text>
+			<text name="path">
+				Befindet sich in [PATH]
+			</text>
+			<text name="not worn instructions">
+				Sie können eine neue Alpha-Maske anlegen, indem Sie eine von Ihrem Inventar auf Ihren Avatar ziehen.
+Sie können aber auch eine neue erstellen und diese anlegen.
+			</text>
+			<text name="no modify instructions">
+				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
+			</text>
+			<text name="Item Action Label">
+				Alpha:
+			</text>
+			<texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<button label="Neue Alpha erstellen" label_selected="Neue Alpha erstellen" name="Create New"/>
+			<button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
+			<button label="Speichern" label_selected="Speichern" name="Save"/>
+			<button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
+			<button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
+		</panel>
+		<panel label="Tätowierung" name="Tattoo">
+			<text name="title">
+				[BESCHR]
+			</text>
+			<text name="title_no_modify">
+				[BESCHR]: bearbeiten nicht möglich
+			</text>
+			<text name="title_loading">
+				[BESCHR]: wird geladen...
+			</text>
+			<text name="title_not_worn">
+				[BESCHR]: nicht getragen
+			</text>
+			<text name="path">
+				Befindet sich in [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ziehen Sie eine neue Tätowierung aus dem Inventar auf Ihren Avatar, um diese anzulegen.
+Sie können aber auch eine neue erstellen und diese anlegen.
+			</text>
+			<text name="no modify instructions">
+				Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
+			</text>
+			<text name="Item Action Label">
+				Tätowierung:
+			</text>
+			<texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+			<button label="Neue Tätowierung erstellen" label_selected="Neue Tätowierung erstellen" name="Create New"/>
+			<button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
+			<button label="Speichern" label_selected="Speichern" name="Save"/>
+			<button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
+			<button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
+		</panel>
 	</tab_container>
+	<button label="Outfit erstellen" label_selected="Outfit erstellen" name="make_outfit_btn"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="Outfit erstellen..." label_selected="Outfit erstellen..." name="Make Outfit" width="115"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_device_settings.xml b/indra/newview/skins/default/xui/de/floater_device_settings.xml
index 9108f3c2e5..3d7e9c96c1 100644
--- a/indra/newview/skins/default/xui/de/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="GERÄTE-EINSTELLUNGEN FÜR VOICE-CHAT" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_device_settings" title="EINSTELLUNGEN FÜR VOICE-CHAT"/>
diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml
index c9afcc8471..0f2370771f 100644
--- a/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="UMWELT-EDITOR">
+	<floater.string name="timeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</floater.string>
 	<text name="EnvTimeText">
 		Tageszeit
 	</text>
@@ -12,13 +15,12 @@
 	<text name="EnvWaterColorText">
 		Wasserfarbe
 	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+	<color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 	<text name="EnvWaterFogText">
 		Wasser-
 trübung
 	</text>
-	<button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />
-	<button label="Himmel (erweitert)" name="EnvAdvancedSkyButton" />
-	<button label="Wasser (erweitert)" name="EnvAdvancedWaterButton" />
-	<button label=" ?" name="EnvSettingsHelpButton" />
+	<button label="Grundstückszeit verw." name="EnvUseEstateTimeButton"/>
+	<button label="Himmel (erweitert)" name="EnvAdvancedSkyButton"/>
+	<button label="Wasser (erweitert)" name="EnvAdvancedWaterButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_first_time_tip.xml b/indra/newview/skins/default/xui/de/floater_first_time_tip.xml
new file mode 100644
index 0000000000..9546cc2c42
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_first_time_tip.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="set_name_in_the_cladd">
+	<check_box label="Turn off Quick Tips" name="DontShowFirstTimeTip_checkbox"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml
index 522d966431..29357b8ee0 100644
--- a/indra/newview/skins/default/xui/de/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/de/floater_font_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="SCHRIFTART-TEST">
+<floater name="contents" title="TEST DER SCHRIFTART">
 	<text name="linea">
 		OverrideTest, sollte hier als Times angezeigt werden. (Aus default/xui/en-us)
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
index aff0a9b92d..0b27b362c3 100644
--- a/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_gesture.xml
@@ -1,17 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="AKTIVE GESTEN">
-	<text name="help_label">
-		Doppelklicken Sie auf eine Geste, um Animationen und Sound &#10;abzuspielen.
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Orte" name="gestures" title="GESTEN">
+	<floater.string name="loading">
+		Wird geladen...
+	</floater.string>
+	<floater.string name="playing">
+		(Wird abgespielt)
+	</floater.string>
+	<floater.string name="copy_name">
+		Kopie von [COPY_NAME]
+	</floater.string>
 	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
-		<column label="Trigger" name="trigger" />
-		<column label="Key" name="shortcut" />
-		<column label="" name="key" />
-		<column label="Name" name="name" />
+		<scroll_list.columns label="Name" name="name"/>
+		<scroll_list.columns label="Chat" name="trigger"/>
+		<scroll_list.columns label="" name="key"/>
+		<scroll_list.columns label="Key" name="shortcut"/>
 	</scroll_list>
-	<button label="Neu" name="new_gesture_btn" />
-	<button label="Inventar" name="inventory_btn" />
-	<button label="Bearbeiten" name="edit_btn" />
-	<button label="Abspielen" name="play_btn" />
-	<button label="Stopp" name="stop_btn" />
+	<panel label="bottom_panel" name="bottom_panel">
+		<menu_button name="gear_btn" tool_tip="Mehr Möglichkeiten"/>
+		<button name="new_gesture_btn" tool_tip="Neue Geste erstellen"/>
+		<button name="activate_btn" tool_tip="Ausgewählte Geste aktivieren/deaktivieren"/>
+		<button name="del_btn" tool_tip="Diese Geste löschen"/>
+	</panel>
+	<button label="Bearbeiten" name="edit_btn"/>
+	<button label="Abspielen" name="play_btn"/>
+	<button label="Stopp" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index 2936688254..d01ea145f1 100644
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
@@ -21,8 +21,8 @@
 	<text name="Enable VBO:">
 		VBO aktivieren:
 	</text>
-	<check_box label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
-	<slider label="Texturspeicher (MB):" name="GrapicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
+	<check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
+	<slider label="Texturspeicher (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
 	<spinner label="Nebeldistanzverhältnis:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
new file mode 100644
index 0000000000..bfefa57731
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_help_browser" title="HILFE-BROWSER">
+	<floater.string name="home_page_url">
+		http://de.secondlife.com
+	</floater.string>
+	<floater.string name="support_page_url">
+		http://de.secondlife.com/support
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls">
+			<button label="In meinem Browser öffnen" name="open_browser"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml
index 18584e57ca..8a10eccabe 100644
--- a/indra/newview/skins/default/xui/de/floater_hud.xml
+++ b/indra/newview/skins/default/xui/de/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="TUTORIAL" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="ANLEITUNG"/>
diff --git a/indra/newview/skins/default/xui/de/floater_im.xml b/indra/newview/skins/default/xui/de/floater_im.xml
index 9b9bbd0c64..6aa35f2900 100644
--- a/indra/newview/skins/default/xui/de/floater_im.xml
+++ b/indra/newview/skins/default/xui/de/floater_im.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="Instant Message">
 	<string name="only_user_message">
 		Sie sind der einzige Benutzer in dieser Sitzung.
@@ -10,7 +10,7 @@
 		Klicken Sie auf [BUTTON NAME], um eine Verbindung zu diesem Voice-Chat herzustellen.
 	</string>
 	<string name="muted_message">
-		Sie haben diesen Einwohner stummgeschaltet.Wenn Sie ihm eine Nachricht senden, wird die Stummschaltung automatisch aufgehoben.
+		Sie haben diesen Einwohner ignoriert. Wenn Sie eine Nachricht senden, wird dieser freigeschaltet.
 	</string>
 	<string name="generic_request_error">
 		Fehler bei Anfrage, bitte versuchen Sie es später.
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
new file mode 100644
index 0000000000..62578c00d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_im_box" title="Sofortnachrichten"/>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
new file mode 100644
index 0000000000..7bde3a3453
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="IM Steuerkonsole" name="panel_im_control_panel"/>
+		<layout_panel>
+			<line_editor label="Bis" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
new file mode 100644
index 0000000000..e40d57976f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="incoming call" title="ANRUF VON UNBEKANNT">
+	<floater.string name="localchat">
+		Voice-Chat in der Nähe
+	</floater.string>
+	<floater.string name="anonymous">
+		Anonym
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		ruft an.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		ist einem Voice-Konferenz-Chat beigetreten.
+	</floater.string>
+	<text name="question">
+		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
+	</text>
+	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
+	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
+	<button label="IM starten" name="Start IM"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index f9421788bd..939aa964c0 100644
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="OBJEKT PRÜFEN" min_width="450" >
-	<scroll_list name="object_list"
-	     tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
-		<column label="Objektname" name="object_name" />
-		<column label="Besitzer" name="owner_name"  />
-		<column label="Ersteller" name="creator_name" />
-		<column label="Erstellungsdatum" name="creation_date" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="450" name="inspect" title="OBJEKTE UNTERSUCHEN">
+	<floater.string name="timeStamp">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
+	<scroll_list name="object_list" tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
+		<scroll_list.columns label="Objektname" name="object_name"/>
+		<scroll_list.columns label="Besitzer" name="owner_name"/>
+		<scroll_list.columns label="Ersteller" name="creator_name"/>
+		<scroll_list.columns label="Erstellungsdatum" name="creation_date"/>
 	</scroll_list>
-	<button label="Besitzerprofil einsehen..." name="button owner"
-	     tool_tip="Profil des Besitzers des markierten Objekts einsehen" width="155" />
-	<button label="Erstellerprofil einsehen..." name="button creator"
-	     tool_tip="Profil des ursprünglichen Erstellers des markierten Objekts einsehen" width="155" left="175"/>
+	<button label="Besitzerprofil einsehen..." name="button owner" tool_tip="Profil des Besitzers des markierten Objekts einsehen" width="155"/>
+	<button label="Erstellerprofil einsehen..." left="175" name="button creator" tool_tip="Profil des ursprünglichen Erstellers des markierten Objekts einsehen" width="155"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory.xml b/indra/newview/skins/default/xui/de/floater_inventory.xml
index 6444e87882..d9014fc0ef 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory.xml
@@ -1,47 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="INVENTAR">
-	<search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="Alle Objekte" name="All Items" />
-		<inventory_panel label="Letzte Objekte" name="Recent Items" />
-	</tab_container>
-	<menu_bar name="Inventory Menu">
-		<menu label="Datei" name="File">
-			<menu_item_call label="Öffnen" name="Open" />
-			<menu_item_call label="Neues Fenster" name="New Window" />
-			<menu_item_call label="Filter anzeigen" name="Show Filters" />
-			<menu_item_call label="Filter zurücksetzen" name="Reset Current" />
-			<menu_item_call label="Alle Ordner schließen" name="Close All Folders" />
-			<menu_item_call label="Papierkorb ausleeren" name="Empty Trash" />
-		</menu>
-		<menu label="Erstellen" name="Create">
-			<menu_item_call label="Neuer Ordner" name="New Folder" />
-			<menu_item_call label="Neues Skript" name="New Script" />
-			<menu_item_call label="Neue Notiz" name="New Note" />
-			<menu_item_call label="Neue Geste" name="New Gesture" />
-			<menu name="New Clothes">
-				<menu_item_call label="Neues Hemd" name="New Shirt" />
-				<menu_item_call label="Neue Hose" name="New Pants" />
-				<menu_item_call label="Neue Schuhe" name="New Shoes" />
-				<menu_item_call label="Neue Socken" name="New Socks" />
-				<menu_item_call label="Neue Jacke" name="New Jacket" />
-				<menu_item_call label="Neuer Rock" name="New Skirt" />
-				<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>
-			<menu name="New Body Parts">
-				<menu_item_call label="Neue Form/Gestalt" name="New Shape" />
-				<menu_item_call label="Neue Haut" name="New Skin" />
-				<menu_item_call label="Neues Haar" name="New Hair" />
-				<menu_item_call label="Neue Augen" name="New Eyes" />
-			</menu>
-		</menu>
-		<menu label="Sortieren" name="Sort">
-			<menu_item_check label="Nach Name" name="By Name" />
-			<menu_item_check label="Nach Datum" name="By Date" />
-			<menu_item_check label="Ordner immer nach Name" name="Folders Always By Name" />
-			<menu_item_check label="Systemordner nach oben" name="System Folders To Top" />
-		</menu>
-	</menu_bar>
+	<floater.string name="Title">
+		Inventar
+	</floater.string>
+	<floater.string name="TitleFetching">
+		Inventar ([ITEM_COUNT] Artikel werden abgerufen...) [FILTER]
+	</floater.string>
+	<floater.string name="TitleCompleted">
+		Inventar ([ITEM_COUNT] Artikel) [FILTER]
+	</floater.string>
+	<floater.string name="Fetched">
+		Abgerufen
+	</floater.string>
+	<panel label="Inventar" name="Inventory Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 89771a5289..e894f666c9 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="INVENTAROBJEKT-EIGENSCHAFTEN">
+<floater name="item properties" title="EIGENSCHAFTEN: INVENTAROBJEKT">
 	<floater.string name="unknown">
 		(unbekannt)
 	</floater.string>
@@ -12,6 +12,9 @@
 	<floater.string name="owner_can">
 		Eigentümer kann:
 	</floater.string>
+	<floater.string name="acquiredDate">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
 	<text name="LabelItemNameTitle">
 		Name:
 	</text>
@@ -63,5 +66,8 @@
 		<combo_box.item label="Kopieren" name="Copy"/>
 		<combo_box.item label="Original" name="Original"/>
 	</combo_box>
-	<spinner label="Preis: L$" name="Edit Cost"/>
+	<spinner label="Preis:" name="Edit Cost"/>
+	<text name="CurrencySymbol">
+		L$
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index 8dfffe06d1..9cc5b92daf 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory Finder" title="INVENTAR_LETZTE_OBJEKTE">
-	<check_box label="Animation" name="check_animation" />
-	<check_box label="Visitenkarten" name="check_calling_card" />
-	<check_box label="Kleidung" name="check_clothing" />
-	<check_box label="Gesten" name="check_gesture" />
-	<check_box label="Landmarken" name="check_landmark" />
-	<check_box label="Notizkarten" name="check_notecard" />
-	<check_box label="Objekte" name="check_object" />
-	<check_box label="Skripts" name="check_script" />
-	<check_box label="Sounds" name="check_sound" />
-	<check_box label="Texturen" name="check_texture" />
-	<check_box label="Fotos" name="check_snapshot" />
-	<button label="Alle" label_selected="Alle" name="All" />
-	<button label="Keine" label_selected="Keine" name="None" />
-	<check_box label="Ordner immer anzeigen" name="check_show_empty" />
-	<check_box label="Seit Abmeldung" name="check_since_logoff" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="INVENTORY_RECENT_ITEMS">
+	<check_box label="Animation" name="check_animation"/>
+	<check_box label="Visitenkarten" name="check_calling_card"/>
+	<check_box label="Kleidung" name="check_clothing"/>
+	<check_box label="Gesten" name="check_gesture"/>
+	<check_box label="Landmarken" name="check_landmark"/>
+	<check_box label="Notizkarten" name="check_notecard"/>
+	<check_box label="Objekte" name="check_object"/>
+	<check_box label="Skripts" name="check_script"/>
+	<check_box label="Sounds" name="check_sound"/>
+	<check_box label="Texturen" name="check_texture"/>
+	<check_box label="Fotos" name="check_snapshot"/>
+	<button label="Alle" label_selected="Alle" name="All"/>
+	<button label="Keine" label_selected="Keine" name="None"/>
+	<check_box label="Ordner immer anzeigen" name="check_show_empty"/>
+	<check_box label="Seit Abmeldung" name="check_since_logoff"/>
 	<text name="- OR -">
 		- ODER -
 	</text>
-	<spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago" />
-	<spinner label="Tage zuvor" name="spin_days_ago" />
-	<button label="Schließen" label_selected="Schließen" name="Close" />
+	<spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago"/>
+	<spinner label="Tage zuvor" name="spin_days_ago"/>
+	<button label="Schließen" label_selected="Schließen" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml
index 9507d063d1..2efc11df29 100644
--- a/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/de/floater_joystick.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="JOYSTICK-KONFIGURATION">
-	<check_box name="enable_joystick" width="80" label="Joystick aktivieren:"/>
+	<check_box label="Joystick aktivieren:" name="enable_joystick" width="80"/>
 	<text left="140" name="joystick_type" width="360"/>
 	<spinner label="X-Achse" name="JoystickAxis1"/>
 	<spinner label="Y-Achse" name="JoystickAxis2"/>
@@ -15,9 +15,9 @@
 	<text name="Control Modes:">
 		Steuermodi:
 	</text>
-	<check_box name="JoystickAvatarEnabled" label="Avatar"/>
-	<check_box name="JoystickBuildEnabled" label="Bauen"/>
-	<check_box name="JoystickFlycamEnabled" label="Flycam"/>
+	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
+	<check_box label="Bauen" name="JoystickBuildEnabled"/>
+	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		X-Skala
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 9468557fc4..45ff37c147 100644
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -1,152 +1,151 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="LAG-ANZEIGE">
-	<button name="client_lagmeter" tool_tip="Client-Lag-Status" />
-	<text name="client">
-		Client:
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button name="network_lagmeter" tool_tip="Netzwerk-Lag-Status" />
-	<text name="network">
-		Netzwerk:
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button name="server_lagmeter" tool_tip="Server-Lag-Status" />
-	<text name="server">
-		Server:
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="?" name="server_help" />
-	<button label="&gt;&gt; " name="minimize" />
-	<text name="max_title_msg">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="LAG METER">
+	<floater.string name="max_title_msg">
 		Lag-Anzeige
-	</text>
-	<text name="max_width_px">
+	</floater.string>
+	<floater.string name="max_width_px">
 		350
-	</text>
-	<text name="min_title_msg">
+	</floater.string>
+	<floater.string name="min_title_msg">
 		Lag
-	</text>
-	<text name="min_width_px">
+	</floater.string>
+	<floater.string name="min_width_px">
 		90
-	</text>
-	<text name="client_text_msg">
+	</floater.string>
+	<floater.string name="client_text_msg">
 		Client
-	</text>
-	<text name="client_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_critical_fps">
 		10
-	</text>
-	<text name="client_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_warning_fps">
 		15
-	</text>
-	<text name="client_frame_time_window_bg_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_window_bg_msg">
 		Normal, Fenster im Hintergrund
-	</text>
-	<text name="client_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_critical_msg">
 		Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
-	</text>
-	<text name="client_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_warning_msg">
 		Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
-	</text>
-	<text name="client_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_normal_msg">
 		Normal
-	</text>
-	<text name="client_draw_distance_cause_msg">
+	</floater.string>
+	<floater.string name="client_draw_distance_cause_msg">
 		Mögliche Ursache: Sichtweite zu groß
-	</text>
-	<text name="client_texture_loading_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_loading_cause_msg">
 		Mögliche Ursache: Bilder werden geladen
-	</text>
-	<text name="client_texture_memory_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_memory_cause_msg">
 		Mögliche Ursache: Zu viele Bilder im Speicher
-	</text>
-	<text name="client_complex_objects_cause_msg">
+	</floater.string>
+	<floater.string name="client_complex_objects_cause_msg">
 		Mögliche Ursache: Zu viele komplexe Objekte in der Szene
-	</text>
-	<text name="network_text_msg">
+	</floater.string>
+	<floater.string name="network_text_msg">
 		Netzwerk
-	</text>
-	<text name="network_packet_loss_critical_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_pct">
 		10
-	</text>
-	<text name="network_packet_loss_warning_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_pct">
 		5
-	</text>
-	<text name="network_packet_loss_critical_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_msg">
 		Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL]%
-	</text>
-	<text name="network_packet_loss_warning_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_msg">
 		Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
-	</text>
-	<text name="network_performance_normal_msg">
+	</floater.string>
+	<floater.string name="network_performance_normal_msg">
 		Normal
-	</text>
-	<text name="network_ping_critical_ms">
+	</floater.string>
+	<floater.string name="network_ping_critical_ms">
 		600
-	</text>
-	<text name="network_ping_warning_ms">
+	</floater.string>
+	<floater.string name="network_ping_warning_ms">
 		300
-	</text>
-	<text name="network_ping_critical_msg">
+	</floater.string>
+	<floater.string name="network_ping_critical_msg">
 		Ping-Zeit der Verbindung übersteigt [NETWORK_PING_CRITICAL] ms
-	</text>
-	<text name="network_ping_warning_msg">
+	</floater.string>
+	<floater.string name="network_ping_warning_msg">
 		Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	</text>
-	<text name="network_packet_loss_cause_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_cause_msg">
 		Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
-	</text>
-	<text name="network_ping_cause_msg">
+	</floater.string>
+	<floater.string name="network_ping_cause_msg">
 		Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
-	</text>
-	<text name="server_text_msg">
+	</floater.string>
+	<floater.string name="server_text_msg">
 		Server
-	</text>
-	<text name="server_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_critical_fps">
 		20
-	</text>
-	<text name="server_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_warning_fps">
 		30
-	</text>
-	<text name="server_single_process_max_time_ms">
+	</floater.string>
+	<floater.string name="server_single_process_max_time_ms">
 		20
-	</text>
-	<text name="server_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_critical_msg">
 		Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
-	</text>
-	<text name="server_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_warning_msg">
 		Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
-	</text>
-	<text name="server_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_normal_msg">
 		Normal
-	</text>
-	<text name="server_physics_cause_msg">
+	</floater.string>
+	<floater.string name="server_physics_cause_msg">
 		Mögliche Ursache: Zu viele physische Objekte
-	</text>
-	<text name="server_scripts_cause_msg">
+	</floater.string>
+	<floater.string name="server_scripts_cause_msg">
 		Mögliche Ursache: Zu viele geskriptete Objekte
-	</text>
-	<text name="server_net_cause_msg">
+	</floater.string>
+	<floater.string name="server_net_cause_msg">
 		Mögliche Ursache: Zu viel Netzwerktraffic
-	</text>
-	<text name="server_agent_cause_msg">
+	</floater.string>
+	<floater.string name="server_agent_cause_msg">
 		Mögliche Ursache: Zu viele Personen in Bewegung in der Region
-	</text>
-	<text name="server_images_cause_msg">
+	</floater.string>
+	<floater.string name="server_images_cause_msg">
 		Mögliche Ursache: Zu viele Bildberechnungen
-	</text>
-	<text name="server_generic_cause_msg">
+	</floater.string>
+	<floater.string name="server_generic_cause_msg">
 		Mögliche Ursache: Zu hohe Simulator-Last
+	</floater.string>
+	<floater.string name="smaller_label">
+		&gt;&gt;
+	</floater.string>
+	<floater.string name="bigger_label">
+		&lt;&lt;
+	</floater.string>
+	<button name="client_lagmeter" tool_tip="Client-Lag-Status"/>
+	<text name="client">
+		Client
 	</text>
-	<text name="smaller_label">
-		&gt;&gt; 
+	<text name="client_text">
+		Normal
+	</text>
+	<button name="network_lagmeter" tool_tip="Netzwerk-Lag-Status"/>
+	<text name="network">
+		Netzwerk
 	</text>
-	<text name="bigger_label">
-		&lt;&lt; 
+	<text name="network_text">
+		Normal
+	</text>
+	<button name="server_lagmeter" tool_tip="Server-Lag-Status"/>
+	<text name="server">
+		Server
+	</text>
+	<text name="server_text">
+		Normal
 	</text>
+	<button label="&gt;&gt; " name="minimize" tool_tip="Fenstergröße ändern"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
index c612f21a5b..73559407a9 100644
--- a/indra/newview/skins/default/xui/de/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
@@ -20,21 +20,21 @@
 		Zulässiger Landbesitz bei aktuellem Zahlungsplan:
 	</text>
 	<text name="allowed_text">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<text name="current_label">
 		Aktueller Landbesitz:
 	</text>
 	<text name="current_text">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<text name="available_label">
 		Für Landkäufe verfügbar:
 	</text>
 	<text name="available_text">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<string name="area_string">
-		[AREA] qm
+		[AREA] m².
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
index 52e6dccaba..248460af82 100644
--- a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="SKRIPT: NEUES SKRIPT">
 	<floater.string name="not_allowed">
-		Dieses Skript kann nicht angezeigt oder bearbeitet werden, da als Berechtigung &quot;kein kopieren&quot; festgelegt wurde. Um ein Skript innerhalb eines Objektes anzuzeigen oder zu bearbeiten, benötigen Sie die vollständige Berechtigung.
+		Dieses Skript kann nicht angezeigt oder bearbeitet werden, da als Berechtigung „kein kopieren&quot; festgelegt wurde. Um ein Skript innerhalb eines Objektes anzuzeigen oder zu bearbeiten, benötigen Sie die vollständige Berechtigung.
 	</floater.string>
 	<floater.string name="script_running">
 		Läuft
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index dd6d559c40..5e90076487 100644
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.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="script ed float" title="LSL-WIKI">
-	<check_box label="Cursor folgen" name="lock_check" />
-	<combo_box label="Sperren" name="history_combo" />
-	<button label="Zurück" name="back_btn" />
-	<button label="Weiter" name="fwd_btn" />
+	<check_box label="Cursor folgen" name="lock_check"/>
+	<combo_box label="Sperren" name="history_combo"/>
+	<button label="Zurück" name="back_btn"/>
+	<button label="Weiter" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 89cce0f6dc..62a047b8fe 100644
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="MEDIENBROWSER">
+<floater name="floater_about" title="MEDIEN-BROWSER">
 	<floater.string name="home_page_url">
 		http://de.secondlife.com
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml
new file mode 100644
index 0000000000..1b98ed7973
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_media_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="media_settings" title="MEDIEN-EINSTELLUNGEN">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<button label="Übernehmen" label_selected="Übernehmen" name="Apply"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
index bb40d0b85c..b730146aa6 100644
--- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="Speicherverlust simulieren">
+<floater name="MemLeak" title="SPEICHERVERLUST SIMULIEREN">
 	<spinner label="Verlustgeschwindigkeit (Bytes pro Frame):" name="leak_speed"/>
 	<spinner label="Max. Speicherverlust (MB):" name="max_leak"/>
 	<text name="total_leaked_label">
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 8cc8a56523..3f1af3dc63 100644
--- a/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="OBJEKT NACH NAME STUMMSCHALTEN">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="OBJEKT NACH NAMEN IGNORIEREN">
 	<text name="message">
-		Stummschalten nach Name betrifft nur Chat und IM, keine
-Sounds. Sie müssen den Objektnamen exakt angeben.
+		Objekt ignorieren:
 	</text>
 	<line_editor name="object_name">
 		Objektname
 	</line_editor>
-	<button label="OK" name="OK" />
-	<button label="Abbrechen" name="Cancel" />
+	<text name="note">
+		* Ignoriert nur Objekttext, nicht die Geräusche
+	</text>
+	<button label="OK" name="OK"/>
+	<button label="Abbrechen" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_my_friends.xml b/indra/newview/skins/default/xui/de/floater_my_friends.xml
index 30614b7578..61cb0d5c14 100644
--- a/indra/newview/skins/default/xui/de/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/de/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="KONTAKTE">
 	<tab_container name="friends_and_groups">
-		<panel label="Freunde" name="friends_panel" />
-		<panel label="Gruppen" name="groups_panel" />
+		<panel label="Freunde" name="friends_panel"/>
+		<panel label="Gruppen" name="groups_panel"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
new file mode 100644
index 0000000000..e362273396
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="nearby_chat" title="CHAT IN DER NÄHE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml
index 48a26a0e98..c0806ef50c 100644
--- a/indra/newview/skins/default/xui/de/floater_notification.xml
+++ b/indra/newview/skins/default/xui/de/floater_notification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notification" title="KONSOLE: MELDUNGEN">
+<floater name="notification" title="BENACHRICHTIGUNGEN">
 	<text_editor name="payload">
 		Wird geladen...
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
index 0c075dd63a..e271cdace2 100644
--- a/indra/newview/skins/default/xui/de/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notifications_console" title="KONSOLE: MELDUNGEN">
-	<combo_box label="Meldungsart auswählen" name="notification_types" width="412" />
-	<button label="Hinzufügen" name="add_notification" left="417" width="78" />
+<floater name="notifications_console" title="BENACHRICHTIGUNGEN">
+	<combo_box label="Meldungsart auswählen" name="notification_types" width="412"/>
+	<button label="Hinzufügen" left="417" name="add_notification" width="78"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
index d7575876e1..f0b6aa498b 100644
--- a/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/de/floater_openobject.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="OBJEKTINHALTE">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="objectcontents" title="INHALT DES OBJEKTS">
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="In Inventar kopieren" label_selected="In Inventar kopieren"
-	     name="copy_to_inventory_button" width="132" />
-	<button label="Kopieren und anziehen" label_selected="Kopieren und anziehen"
-	     name="copy_and_wear_button" width="132" left="150" />
+	<button label="In Inventar kopieren" label_selected="In Inventar kopieren" name="copy_to_inventory_button" width="132"/>
+	<button label="Kopieren und anziehen" label_selected="Kopieren und anziehen" left="150" name="copy_and_wear_button" width="132"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
new file mode 100644
index 0000000000..65f2fe10e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outgoing call" title="ANRUF">
+	<floater.string name="localchat">
+		Voice-Chat in der Nähe
+	</floater.string>
+	<floater.string name="anonymous">
+		Anonym
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		ruft an.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		ist einem Voice-Konferenz-Chat beigetreten.
+	</floater.string>
+	<text name="connecting">
+		Verbindung mit [CALLEE_NAME] wird hergestellt.
+	</text>
+	<text name="calling">
+		[CALLEE_NAME] wird angerufen
+	</text>
+	<text name="noanswer">
+		Der Anruf wurde nicht entgegengenommen.   Bitte versuchen Sie es später erneut.
+	</text>
+	<text name="leaving">
+		[CURRENT_CHAT] wird verlassen.
+	</text>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index ad7f4a94ab..6eb1d9472d 100644
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
+	<string name="payee_group">
+		Gruppe bezahlen
+	</string>
+	<string name="payee_resident">
+		Einwohner bezahlen
+	</string>
 	<text name="payee_label" width="130">
 		Zahlen:
 	</text>
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 1bc721aabf..92f5ea415e 100644
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
 	<string name="payee_group" width="105">
-		Gruppe bezahlen:
+		Gruppe bezahlen
 	</string>
 	<string name="payee_resident" width="118">
-		Einwohner bezahlen:
+		Einwohner bezahlen
 	</string>
 	<icon name="icon_person" tool_tip="Person"/>
 	<text left="128" name="payee_name" width="168">
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
index 3641f41b8c..fd65987aa9 100644
--- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="HOCHLADE-BERECHTIGUNGEN (STANDARD)">
+<floater name="perm prefs" title="STANDARD-BERECHTIGUNGEN FÜR HOCHLADEN">
 	<panel label="Berechtigungen" name="permissions">
 		<button label="?" label_selected="?" name="help"/>
 		<check_box label="Mit Gruppe teilen" name="share_with_group"/>
@@ -9,7 +9,7 @@
 		</text>
 		<check_box label="Bearbeiten" name="next_owner_modify"/>
 		<check_box label="Kopieren" name="next_owner_copy"/>
-		<check_box label="Verkaufen/Weggeben" name="next_owner_transfer" left_delta="80"/>
+		<check_box label="Verkaufen/Weggeben" left_delta="80" name="next_owner_transfer"/>
 	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml
index fc552339d3..37a0a0ad1d 100644
--- a/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/de/floater_postcard.xml
@@ -1,39 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="FOTO PER E-MAIL SENDEN">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="FOTO EMAILEN">
 	<text name="to_label">
 		E-Mail des Empfängers:
 	</text>
-	<line_editor left="145" name="to_form" width="125" />
+	<line_editor left="145" name="to_form" width="125"/>
 	<text name="from_label">
 		Ihre E-Mail:
 	</text>
-	<line_editor left="145" name="from_form" width="125" />
+	<line_editor left="145" name="from_form" width="125"/>
 	<text name="name_label">
 		Ihr Name:
 	</text>
-	<line_editor left="145" name="name_form" width="125" />
+	<line_editor left="145" name="name_form" width="125"/>
 	<text name="subject_label">
 		Betreff:
 	</text>
-	<line_editor label="Betreff hier eingeben." left="145" name="subject_form" width="125" />
+	<line_editor label="Betreff hier eingeben." left="145" name="subject_form" width="125"/>
 	<text name="msg_label">
 		Nachricht:
 	</text>
 	<text_editor name="msg_form">
 		Nachricht hier eingeben.
 	</text_editor>
-	<check_box label="Im Web veröffentlichen" name="allow_publish_check"
-	     tool_tip="Veröffentlicht diese Postkarte im Web." />
-	<check_box label="Ab-18-Inhalt" name="mature_check"
-	     tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte." />
-	<button label="?" name="publish_help_btn" />
+	<check_box label="Im Web veröffentlichen" name="allow_publish_check" tool_tip="Veröffentlicht diese Postkarte im Web."/>
+	<check_box label="Ab-18-Inhalt" name="mature_check" tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte."/>
+	<button label="?" name="publish_help_btn"/>
 	<text name="fine_print">
 		Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
 	</text>
-	<button label="Abbrechen" name="cancel_btn" />
-	<button label="Senden" name="send_btn" />
+	<button label="Abbrechen" name="cancel_btn"/>
+	<button label="Senden" name="send_btn"/>
 	<text name="default_subject">
-		Postkarte aus [SECOND_LIFE]
+		Postkarte aus [SECOND_LIFE].
 	</text>
 	<text name="default_message">
 		Sehen Sie hier!
diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 02aa440be7..106fd6dfd3 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Preferences" title="EINSTELLUNGEN">
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-	<button label="Übernehmen" label_selected="Übernehmen" name="Apply" />
-	<button label="Info" label_selected="Info" name="About..." />
-	<button label="Hilfe" label_selected="Hilfe" name="Help" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<tab_container name="pref core">
+		<panel label="Allgemein" name="general"/>
+		<panel label="Grafik" name="display"/>
+		<panel label="Privatsphäre" name="im"/>
+		<panel label="Sound" name="audio"/>
+		<panel label="Chat" name="chat"/>
+		<panel label="Benachrichtigungen" name="msgs"/>
+		<panel label="Setup" name="input"/>
+		<panel label="Erweitert" name="advanced1"/>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index ea2e643601..e98faeb1f4 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
@@ -7,6 +7,6 @@
 		Beschreibung:
 	</text>
 	<line_editor left="98" name="desc" width="189"/>
-	<button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Gibt diese Animation so wieder, dass andere sie sehen können." width="116"/>
-	<button label="Lokal wiedergeben" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Gibt diese Animation so wieder, dass nur Sie sie sehen." width="116"/>
+	<button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn" tool_tip="Diese Animation so wiedergeben, dass andere sie sehen können." width="116"/>
+	<button label="Lokal wiedergeben" label_selected="Stopp" left="171" name="Anim audition btn" tool_tip="Diese Animation so wiedergeben, dass nur Sie sie sehen." width="116"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_classified.xml b/indra/newview/skins/default/xui/de/floater_preview_classified.xml
index 10f78207eb..401758769d 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_classified.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="VERTRAULICHE INFORMATIONEN">
+<floater name="classified_preview" title="INFORMATIONEN ÜBER ANZEIGE">
 	<floater.string name="Title">
 		Anzeige: [NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_event.xml b/indra/newview/skins/default/xui/de/floater_preview_event.xml
index 44bccc8a06..7e46bbab54 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_event.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="EVENT-INFORMATIONEN">
+<floater name="event_preview" title="EVENT-INFORMATION">
 	<floater.string name="Title">
 		Veranstaltung: [NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index d72dceec90..16e2fc18cb 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -1,14 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<string name="stop_txt">
+	<floater.string name="step_anim">
+		Animation abspielen:
+	</floater.string>
+	<floater.string name="step_sound">
+		Sound abspielen:
+	</floater.string>
+	<floater.string name="step_chat">
+		Chat sprechen:
+	</floater.string>
+	<floater.string name="step_wait">
+		Warten:
+	</floater.string>
+	<floater.string name="stop_txt">
 		Stopp
-	</string>
-	<string name="preview_txt">
+	</floater.string>
+	<floater.string name="preview_txt">
 		Vorschau
-	</string>
-	<string name="none_text">
+	</floater.string>
+	<floater.string name="none_text">
 		– Keine –
-	</string>
+	</floater.string>
+	<floater.string name="Title">
+		Gesten: [NAME]
+	</floater.string>
 	<text name="desc_label">
 		Beschreibung:
 	</text>
@@ -27,30 +42,23 @@
 	<text name="library_label">
 		Bibliothek:
 	</text>
+	<scroll_list name="library_list"/>
+	<button label="Hinzufügen &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
 		Schritte:
 	</text>
-	<scroll_list name="library_list">
-		Animation
-Ton
-Chat
-Warten
-	</scroll_list>
-	<button label="Hinzufügen &gt;&gt;" name="add_btn"/>
 	<button label="Nach oben" name="up_btn"/>
 	<button label="Nach unten" name="down_btn"/>
 	<button label="Entfernen" name="delete_btn"/>
-	<text name="help_label">
-		Alle Schritte erfolgen zur selben
-Zeit, außer Sie fügen Warteschritte
-ein.
-	</text>
 	<radio_group name="animation_trigger_type">
-		<radio_item name="start" label="Start" />
-		<radio_item name="stop" label="Stopp" />
+		<radio_item label="Start" name="start"/>
+		<radio_item label="Stopp" name="stop"/>
 	</radio_group>
 	<check_box label="bis alle Animationen beendet sind" name="wait_anim_check"/>
 	<check_box label="Zeit in Sekunden" name="wait_time_check"/>
+	<text name="help_label">
+		Alle Schritte werden gleichzeitig ausgeführt, wenn keine Pausen hinzugefügt wurden.
+	</text>
 	<check_box label="Aktiv" name="active_check" tool_tip="Aktive Gesten werden durch Chat-Eingabe ihrer Auslösephrasen oder Drücken von Tastenkürzeln ausgelöst.  Bei doppelten Tastenzuweisungen funktionieren Gesten in der Regel nicht."/>
 	<button label="Vorschau" name="preview_btn"/>
 	<button label="Speichern" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture_info.xml
index 3b86f4b3de..0d0d28f96f 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture_info.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Gesture" title="Gesten-Tastaturbefehl"/>
+<floater name="Gesture" title="GESTE - SCHNELLTASTE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture_shortcut.xml
new file mode 100644
index 0000000000..0b5df13395
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture_shortcut.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="GESTE - SCHNELLTASTE">
+	<text name="trigger_label">
+		Chat:
+	</text>
+	<text name="key_label">
+		Tastatur:
+	</text>
+	<combo_box label="Keiner" name="modifier_combo"/>
+	<combo_box label="Keiner" name="key_combo"/>
+	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
+		Ersetzen:
+	</text>
+	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture_steps.xml
index 3b86f4b3de..0d0d28f96f 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture_steps.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture_steps.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Gesture" title="Gesten-Tastaturbefehl"/>
+<floater name="Gesture" title="GESTE - SCHNELLTASTE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
index 9aa00e7172..95d1db1877 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
@@ -9,9 +9,38 @@
 	<text name="desc txt">
 		Beschreibung:
 	</text>
-	<button label="Speichern" name="Keep"/>
-	<button label="Löschen" name="Discard"/>
+	<button label="OK" name="Keep"/>
+	<button label="Abbrechen" name="Discard"/>
 	<text name="dimensions">
 		[WIDTH]px x [HEIGHT]px
 	</text>
+	<text name="aspect_ratio">
+		Seitenverhältnis anzeigen
+	</text>
+	<combo_box name="combo_aspect_ratio" tool_tip="Mit einem vordefinierten Seitenverhältnis anzeigen">
+		<combo_item name="Unconstrained">
+			keines
+		</combo_item>
+		<combo_item name="1:1" tool_tip="Gruppeninsignien oder Beschreibung">
+			1:1
+		</combo_item>
+		<combo_item name="4:3" tool_tip="[SECOND_LIFE]-Profil">
+			4:3
+		</combo_item>
+		<combo_item name="10:7" tool_tip="Anzeigen und Suchergebnisse, Landmarken">
+			10:7
+		</combo_item>
+		<combo_item name="3:2" tool_tip="Über Land">
+			3:2
+		</combo_item>
+		<combo_item name="16:10">
+			16:10
+		</combo_item>
+		<combo_item name="16:9" tool_tip="Profilauswahl">
+			16:9
+		</combo_item>
+		<combo_item name="2:1">
+			2:1
+		</combo_item>
+	</combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml
index e7dd09d4da..354cdaa272 100644
--- a/indra/newview/skins/default/xui/de/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/de/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="REGION/GRUNDSTÜCK" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="REGION/GRUNDSTÜCK"/>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 84b80e2f6d..3e4cf86a75 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -8,7 +8,7 @@
 		Melder:
 	</text>
 	<text name="reporter_field">
-		Loremipsum Dolorsitamut
+		Loremipsum Dolorsitamut Longnamez
 	</text>
 	<text name="sim_title">
 		Region:
@@ -36,7 +36,7 @@
 		Eigentümer:
 	</text>
 	<text name="owner_name">
-		Hendrerit Vulputate
+		Hendrerit Vulputate Kamawashi Longname
 	</text>
 	<combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
 		<combo_box.item label="Kategorie auswählen" name="Select_category"/>
@@ -93,11 +93,11 @@
 		Details:
 	</text>
 	<text name="bug_aviso">
-		Bitte beschreiben Sie so genau wie möglich.
+		Bitte beschreiben Sie alles so genau wie möglich.
 	</text>
 	<text_editor bottom_delta="-136" height="130" name="details_edit"/>
 	<text bottom_delta="-20" name="incomplete_title">
-		Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
+		* Unvollständige Berichte werden nicht bearbeitet
 	</text>
 	<button label="Missbrauch melden" label_selected="Missbrauch melden" name="send_btn"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
index ef021ce713..e70a30fa24 100644
--- a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[All scripts]" title="[All scripts]"/>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml
index a895a32e14..27c40aff07 100644
--- a/indra/newview/skins/default/xui/de/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="SKRIPT: ROTATIONSSKRIPT">
+<floater name="preview lsl text" title="SKRIPT: ROTATIONS-SKRIPT">
 	<floater.string name="Title">
 		Skript: [NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
index 4c82aabd47..f267fe4b7c 100644
--- a/indra/newview/skins/default/xui/de/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="RÜCKGÄNGIG">
+<floater name="queue" title="ZURÜCKSETZEN">
 	<floater.string name="Starting">
 		[START] von [COUNT] Artikeln.
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml
index aae302e230..de959cbb28 100644
--- a/indra/newview/skins/default/xui/de/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_search.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="SKRIPTSUCHE">
-	<check_box label="Groß-/Kleinschreibung irrelevant" name="case_text" />
-	<button label="Suchen" label_selected="Suchen" name="search_btn" />
-	<button label="Ersetzen" label_selected="Ersetzen" name="replace_btn" />
-	<button label="Alle ersetzen" label_selected="Alle ersetzen" name="replace_all_btn" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script search" title="SKRIPT-SUCHE">
+	<check_box label="Groß-/Kleinschreibung irrelevant" name="case_text"/>
+	<button label="Suchen" label_selected="Suchen" name="search_btn"/>
+	<button label="Ersetzen" label_selected="Ersetzen" name="replace_btn"/>
+	<button label="Alle ersetzen" label_selected="Alle ersetzen" name="replace_all_btn"/>
 	<text name="txt">
 		Suchen
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
new file mode 100644
index 0000000000..3401db1a39
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_search.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_search" title="SUCHEN">
+	<floater.string name="loading_text">
+		Wird geladen...
+	</floater.string>
+	<floater.string name="done_text">
+		Fertig
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
index 6a5f03c661..c9e21a6c4f 100644
--- a/indra/newview/skins/default/xui/de/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml
@@ -12,15 +12,13 @@
 				Größe:
 			</text>
 			<text bottom_delta="-21" height="32" name="info_size">
-				[AREA] qm
+				[AREA] m².
 			</text>
 			<text bottom_delta="-57" height="28" name="info_action">
-				Zum Verkauf
-dieser Parzelle:
+				Zum Verkauf dieser Parzelle:
 			</text>
-			<icon bottom_delta="-80" name="step_price"/>
 			<text name="price_label">
-				Preis festlegen:
+				1. Preis festlegen:
 			</text>
 			<text name="price_text">
 				Einen angemessenen Preis auswählen.
@@ -28,29 +26,29 @@ dieser Parzelle:
 			<text name="price_ld">
 				L$
 			</text>
+			<line_editor name="price">
+				0
+			</line_editor>
 			<text name="price_per_m">
-				([PER_METER] L$ pro Quadratmeter)
+				([PER_METER] L$ pro m²)
 			</text>
-			<icon height="64" left="0" name="step_sell_to" width="64"/>
 			<text bottom_delta="38" left="72" name="sell_to_label" right="-20">
-				Land verkaufen an:
+				2. Land verkaufen an:
 			</text>
 			<text bottom_delta="-16" height="16" left="72" name="sell_to_text" right="-10">
-				Wählen Sie, ob der Verkauf offen oder auf eine bestimmte Person
-beschränkt ist.
+				Wählen Sie, ob der Verkauf offen oder auf eine bestimmte Person beschränkt ist.
 			</text>
 			<combo_box bottom_delta="-32" height="16" left="72" name="sell_to" width="140">
-				<combo_box.item label="select one --" name="--selectone--"/>
+				<combo_box.item label="-- Wählen --" name="--selectone--"/>
 				<combo_box.item label="Jeder" name="Anyone"/>
 				<combo_box.item label="Bestimmte Person:" name="Specificuser:"/>
 			</combo_box>
-			<button label="Auswählen..." name="sell_to_select_agent"/>
+			<button label="Auswählen" name="sell_to_select_agent"/>
 			<text name="sell_objects_label">
-				Die Objekte mit dem Land verkaufen?
+				3. Die Objekte mit dem Land verkaufen?
 			</text>
 			<text name="sell_objects_text">
-				Die transferierbaren Landeigentümer-Objekte auf der Parzelle
-wechseln den Eigentümer.
+				Die transferierbaren Landeigentümer-Objekte auf der Parzelle wechseln den Eigentümer.
 			</text>
 			<radio_group bottom_delta="-58" name="sell_objects">
 				<radio_item label="Nein, Objekte behalten" name="no"/>
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 64db511aa9..8aa1ef5497 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="FOTO-VORSCHAU">
+<floater name="Snapshot" title="FOTO-ANZEIGE">
 	<text name="type_label">
 		Zweck des Fotos
 	</text>
 	<radio_group label="Fototyp" name="snapshot_type_radio">
-		<radio_item name="postcard" label="Per E-Mail senden"/>
-		<radio_item name="texture" label="Im Inventar speichern ([AMOUNT] L$)"/>
-		<radio_item name="local" label="Auf Festplatte speichern"/>
+		<radio_item label="Per E-Mail senden" name="postcard"/>
+		<radio_item label="Im Inventar speichern ([AMOUNT] L$)" name="texture"/>
+		<radio_item label="Auf Festplatte speichern" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
 		Dateigröße: [SIZE] KB
@@ -15,8 +15,8 @@
 	<button label="Senden" name="send_btn"/>
 	<button label="Speichern ([AMOUNT] L$)" name="upload_btn"/>
 	<flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern">
-		<flyout_button_item name="save_item" label="Speichern"/>
-		<flyout_button_item name="saveas_item" label="Speichern unter..."/>
+		<flyout_button_item label="Speichern" name="save_item"/>
+		<flyout_button_item label="Speichern unter..." name="saveas_item"/>
 	</flyout_button>
 	<button label="Abbrechen" name="discard_btn"/>
 	<button label="Mehr &gt;&gt;" name="more_btn" tool_tip="Erweiterte Optionen"/>
@@ -28,54 +28,33 @@
 		Format
 	</text>
 	<combo_box label="Auflösung" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster"
-		/>
-		<combo_box.item name="640x480" label="640x480"
-		/>
-		<combo_box.item name="800x600" label="800x600"
-		/>
-		<combo_box.item name="1024x768" label="1024x768"
-		/>
-		<combo_box.item name="Custom" label="Benutzerdefiniert"
-		/>
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<combo_box label="Auflösung" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster"
-		/>
-		<combo_box.item name="Small(128x128)" label="Klein (128x128)"
-		/>
-		<combo_box.item name="Medium(256x256)" label="Mittel (256x256)"
-		/>
-		<combo_box.item name="Large(512x512)" label="Groß (512x512)"
-		/>
-		<combo_box.item name="Custom" label="Benutzerdefiniert"
-		/>
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
+		<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
+		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<combo_box label="Auflösung" name="local_size_combo">
-		<combo_box.item name="CurrentWindow" label="Aktuelles Fenster"
-		/>
-		<combo_box.item name="320x240" label="320x240"
-		/>
-		<combo_box.item name="640x480" label="640x480"
-		/>
-		<combo_box.item name="800x600" label="800x600"
-		/>
-		<combo_box.item name="1024x768" label="1024x768"
-		/>
-		<combo_box.item name="1280x1024" label="1280x1024"
-		/>
-		<combo_box.item name="1600x1200" label="1600x1200"
-		/>
-		<combo_box.item name="Custom" label="Benutzerdefiniert"
-		/>
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<combo_box label="Format" name="local_format_combo">
-		<combo_box.item name="PNG" label="PNG"
-		/>
-		<combo_box.item name="JPEG" label="JPEG"
-		/>
-		<combo_box.item name="BMP" label="BMP"
-		/>
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
 	</combo_box>
 	<spinner label="Breite" name="snapshot_width"/>
 	<spinner label="Höhe" name="snapshot_height"/>
@@ -84,13 +63,10 @@
 	<text name="layer_type_label" width="63">
 		Aufnehmen:
 	</text>
-	<combo_box label="Bildlayer" name="layer_types" width="132" left="73">
-		<combo_box.item name="Colors" label="Farben"
-		/>
-		<combo_box.item name="Depth" label="Tiefe"
-		/>
-		<combo_box.item name="ObjectMattes" label="Objektmasken"
-		/>
+	<combo_box label="Bildlayer" left="73" name="layer_types" width="132">
+		<combo_box.item label="Farben" name="Colors"/>
+		<combo_box.item label="Tiefe" name="Depth"/>
+		<combo_box.item label="Objektmasken" name="ObjectMattes"/>
 	</combo_box>
 	<check_box label="Interface auf Foto anzeigen" name="ui_check"/>
 	<check_box label="HUD-Objekte auf Foto anzeigen" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml
index 14126b6a44..1070c93405 100644
--- a/indra/newview/skins/default/xui/de/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/de/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="SOUND.WAV">
 	<text name="name_label">
 		Name:
@@ -6,15 +6,15 @@
 	<text name="description_label">
 		Beschreibung:
 	</text>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
-	<button label="Hochladen ([AMOUNT] L$)" label_selected="Hochladen ([AMOUNT] L$)" name="ok_btn" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
+	<button label="Hochladen ([AMOUNT] L$)" label_selected="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
 	<text name="text">
 		Bitrate (kbit/s):
 	</text>
 	<radio_group name="bitrate">
-		<radio_item name="32" label="32" />
-		<radio_item name="64" label="64" />
-		<radio_item name="96" label="96" />
-		<radio_item name="128" label="128" />
+		<radio_item label="32" name="32"/>
+		<radio_item label="64" name="64"/>
+		<radio_item label="96" name="96"/>
+		<radio_item label="128" name="128"/>
 	</radio_group>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_statistics.xml b/indra/newview/skins/default/xui/de/floater_statistics.xml
index 506c18bd98..72a87a9566 100644
--- a/indra/newview/skins/default/xui/de/floater_statistics.xml
+++ b/indra/newview/skins/default/xui/de/floater_statistics.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="stats floater" title="STATISTIKLEISTE"/>
+<floater name="stats floater" title="STATISTIKEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index 9aa0c028af..dcea484e13 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="Statistik">
+<floater name="Statistics" title="STATISTIKEN">
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
 			<stat_view label="Basic" name="basic">
@@ -43,19 +43,19 @@
 					<stat_bar label="Eingerastete Objekte" name="physicspinnedtasks"/>
 					<stat_bar label="Niedrig LOD-Objekte" name="physicslodtasks"/>
 					<stat_bar label="Zugeordneter Speicher" name="physicsmemoryallocated"/>
-					<stat_bar label="Agent Updates/Sek" name="simagentups"/>
-					<stat_bar label="Haupt-Agenten" name="simmainagents"/>
-					<stat_bar label="Child-Agenten" name="simchildagents"/>
-					<stat_bar label="Objekte" name="simobjects"/>
-					<stat_bar label="Aktive Objekte" name="simactiveobjects"/>
-					<stat_bar label="Aktive Skripts" name="simactivescripts"/>
-					<stat_bar label="Skript-Events" name="simscripteps"/>
-					<stat_bar label="Paketeingang" name="siminpps"/>
-					<stat_bar label="Paketausgang" name="simoutpps"/>
-					<stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/>
-					<stat_bar label="Ausstehende Uploads" name="simpendinguploads"/>
-					<stat_bar label="Gesamtanzahl „Unacked&quot; Bytes" name="simtotalunackedbytes"/>
 				</stat_view>
+				<stat_bar label="Agent-Aktualisierungen/Sek" name="simagentups"/>
+				<stat_bar label="Haupt-Agenten" name="simmainagents"/>
+				<stat_bar label="Child-Agenten" name="simchildagents"/>
+				<stat_bar label="Objekte" name="simobjects"/>
+				<stat_bar label="Aktive Objekte" name="simactiveobjects"/>
+				<stat_bar label="Aktive Skripts" name="simactivescripts"/>
+				<stat_bar label="Skript-Events" name="simscripteps"/>
+				<stat_bar label="Paketeingang" name="siminpps"/>
+				<stat_bar label="Paketausgang" name="simoutpps"/>
+				<stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/>
+				<stat_bar label="Ausstehende Uploads" name="simpendinguploads"/>
+				<stat_bar label="Gesamtanzahl „Unacked&quot; Bytes" name="simtotalunackedbytes"/>
 				<stat_view label="Zeit (ms)" name="simperf">
 					<stat_bar label="Gesamtzeit Frame" name="simframemsec"/>
 					<stat_bar label="Netto-Zeit" name="simnetmsec"/>
diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml
new file mode 100644
index 0000000000..bcf0cbd419
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notification_chiclet" title="BENACHRICHTIGUNGEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
index 2ba4e575a8..f348371e4d 100644
--- a/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="TELEHUB" min_height="310" height="310"  >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater height="310" min_height="310" name="telehub" title="TELEHUB">
 	<text name="status_text_connected">
 		Telehub verbunden mit Objekt [OBJECT]
 	</text>
@@ -9,17 +9,17 @@
 	<text name="help_text_connected">
 		Klicken Sie zum Entfernen auf „Trennen“.
 	</text>
-	<text name="help_text_not_connected" height="38" bottom_delta="-18" >
+	<text bottom_delta="-18" height="38" name="help_text_not_connected">
 		Wählen Sie ein Objekt und klicken Sie auf
 „Mit Telehub verbinden“.
 	</text>
-	<button label="Mit Telehub verbinden" name="connect_btn" width="122" />
-	<button label="Trennen" name="disconnect_btn" left="142" width="98" />
+	<button label="Mit Telehub verbinden" name="connect_btn" width="122"/>
+	<button label="Trennen" left="142" name="disconnect_btn" width="98"/>
 	<text name="spawn_points_text" width="230">
 		Spawn-Punkte (Positionen, nicht Objekte):
 	</text>
-	<button label="Spawn hinzufügen" name="add_spawn_point_btn" />
-	<button label="Spawn entfernen" name="remove_spawn_point_btn" />
+	<button label="Spawn hinzufügen" name="add_spawn_point_btn"/>
+	<button label="Spawn entfernen" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
 		Wählen Sie ein Objekt und klicken zur
 Positionsangabe auf „Hinzufügen“. Anschließend
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 7e2fc26fdf..4e2d8a9274 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="AUSWÄHLEN: TEXTUR">
 	<string name="choose_picture">
 		Zum Auswählen eines Bildes hier klicken
 	</string>
 	<text name="Multiple">
-		Mehrfach
+		Mehrer Texturen
 	</text>
 	<text name="unknown">
-		Maße: [DIMENSIONS]
+		Größe: [DIMENSIONS]
 	</text>
-	<button label="Standard" label_selected="Standard" name="Default" />
-	<button label="Keine" label_selected="Keine" name="None" />
-	<button label="Leer" label_selected="Leer" name="Blank" />
-	<check_box label="Ordner anzeigen" name="show_folders_check" />
-	<search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
-	<check_box label="Sofort übernehmen" name="apply_immediate_check" />
-	<button label="" label_selected="" name="Pipette" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-	<button label="Auswählen" label_selected="Auswählen" name="Select" />
+	<button label="Standard" label_selected="Standard" name="Default"/>
+	<button label="Keine" label_selected="Keine" name="None"/>
+	<button label="Leer" label_selected="Leer" name="Blank"/>
+	<check_box label="Ordner anzeigen" name="show_folders_check"/>
+	<search_editor label="Texturen filtern" name="inventory search editor"/>
+	<check_box label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<text name="pick title">
 		Auswählen:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index f4d1bb4d54..48887191e0 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="Bau-Werkzeuge" title="">
+<floater name="toolbox floater" short_title="BAU-WERKZEUGE" title="">
 	<floater.string name="status_rotate">
 		An den farbigen Bändern ziehen, um das Objekt zu drehen
 	</floater.string>
@@ -16,7 +16,7 @@
 		Klicken und ziehen, um Kamera zu bewegen
 	</floater.string>
 	<floater.string name="status_grab">
-		Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg-Umschalt zum Drehen
+		Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg + Umschalt zum Drehen
 	</floater.string>
 	<floater.string name="status_place">
 		Inworld klicken, um zu bauen.
@@ -50,29 +50,32 @@
 	<radio_group name="focus_radio_group">
 		<radio_item label="Zoom" name="radio zoom"/>
 		<radio_item label="Orbit (Strg)" name="radio orbit"/>
-		<radio_item label="Schwenken (Strg-Umschalt)" name="radio pan"/>
+		<radio_item label="Schwenken (Strg+Umschalt)" name="radio pan"/>
 	</radio_group>
 	<radio_group name="move_radio_group">
 		<radio_item label="Verschieben" name="radio move"/>
 		<radio_item label="Heben (Strg)" name="radio lift"/>
-		<radio_item label="Rotieren (Strg-Umschalt)" name="radio spin"/>
+		<radio_item label="Drehen (Strg+Umschalt)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
 		<radio_item label="Bewegen" name="radio position"/>
 		<radio_item label="Drehen (Strg)" name="radio rotate"/>
-		<radio_item label="Dehnen (Strg-Umschalt)" name="radio stretch"/>
-		<radio_item label="Textur auswählen" name="radio select face"/>
+		<radio_item label="Dehnen (Strg+Umschalt)" name="radio stretch"/>
+		<radio_item label="Fläche auswählen" name="radio select face"/>
 	</radio_group>
 	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
+	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für diesen Objekt">
+		þ: [COUNT]
+	</text>
 	<check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode">
-		<combo_box.item label="Welt-Lineal" name="World"/>
-		<combo_box.item label="Lokal-Lineal" name="Local"/>
-		<combo_box.item label="Referenz-Lineal" name="Reference"/>
+	<combo_box name="combobox grid mode" tool_tip="Wählen Sie das Rasterlineal aus, um das Objekt zu positionieren.">
+		<combo_box.item label="Globales Raster" name="World"/>
+		<combo_box.item label="Lokales Raster" name="Local"/>
+		<combo_box.item label="Referenzraster" name="Reference"/>
 	</combo_box>
-	<button label="Optionen..." label_selected="Optionen..." name="Options..." tool_tip="Grid-Optionen einstellen"/>
+	<button label="Optionen..." label_selected="Optionen..." name="Options..." tool_tip="Mehr Raster-Optionen anzeigen"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
@@ -110,7 +113,7 @@
 	<text name="Strength:">
 		Stärke
 	</text>
-	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land ändern"/>
+	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land bearbeiten"/>
 	<text name="obj_count">
 		Objekte: [COUNT]
 	</text>
@@ -126,16 +129,16 @@
 				Übertragung
 			</panel.string>
 			<panel.string name="text modify info 1">
-				Sie können dieses Objekt ändern
+				Sie können dieses Objekt bearbeiten.
 			</panel.string>
 			<panel.string name="text modify info 2">
-				Sie können diese Objekte ändern
+				Sie können diese Objekte bearbeiten.
 			</panel.string>
 			<panel.string name="text modify info 3">
-				Sie können dieses Objekt nicht ändern
+				Sie können dieses Objekt nicht bearbeiten.
 			</panel.string>
 			<panel.string name="text modify info 4">
-				Sie können diese Objekte nicht ändern
+				Sie können diese Objekte nicht bearbeiten.
 			</panel.string>
 			<panel.string name="text modify warning">
 				Gesamtes Objekt wählen, um Berechtigungen festzulegen.
@@ -165,13 +168,13 @@
 				Ersteller:
 			</text>
 			<text name="Creator Name">
-				Thrax Linden
+				Esbee Linden
 			</text>
 			<text name="Owner:">
 				Eigentümer:
 			</text>
 			<text name="Owner Name">
-				Thrax Linden
+				Erica Linden
 			</text>
 			<text name="Group:">
 				Gruppe:
@@ -189,6 +192,7 @@
 				<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 				<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 				<combo_box.item label="Öffnen" name="Open"/>
+				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="Zum Verkauf:" name="checkbox for sale"/>
 			<combo_box name="sale type">
@@ -205,6 +209,7 @@
 				<text name="Anyone can:">
 					Jeder:
 				</text>
+				<check_box label="Bewegen" name="checkbox allow everyone move"/>
 				<check_box label="Kopieren" name="checkbox allow everyone copy"/>
 				<text name="Next owner can:">
 					Nächster Eigentümer:
@@ -235,7 +240,7 @@
 		<panel label="Objekt" name="Object">
 			<check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
 			<check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
-			<check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass Objekt 1 Minute nach Erstellung gelöscht wird."/>
+			<check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Bewirkt, dass das Objekt 1 Minute nach seiner Erstellung gelöscht wird."/>
 			<check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/>
 			<text name="label position">
 				Position (Meter)
@@ -358,7 +363,7 @@
 			<text name="edit_object">
 				Objekteigenschaften bearbeiten:
 			</text>
-			<check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Gestattet, dass Objekt um die Z-Achse gebogen wird. (nur Client-Seite)"/>
+			<check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Bewirkt, dass sich das Objekt um die Z-Achse biegen kann. (Nur Client-Seite)"/>
 			<spinner label="Weichheit" name="FlexNumSections"/>
 			<spinner label="Schwerkraft" name="FlexGravity"/>
 			<spinner label="Ziehen" name="FlexFriction"/>
@@ -368,10 +373,14 @@
 			<spinner label="Erzwingen Y" name="FlexForceY"/>
 			<spinner label="Erzwingen Z" name="FlexForceZ"/>
 			<check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/>
-			<color_swatch label="" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+			<texture_picker label="" name="light texture control" tool_tip="Klicken, um eine Bild auszuwählen (dieser Effekt funktioniert nur, wenn zeitversetzte Wiedergabe aktiviert ist)"/>
 			<spinner label="Intensität" name="Light Intensity"/>
+			<spinner label="FOV" name="Light FOV"/>
 			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="Fokus" name="Light Focus"/>
 			<spinner label="Abnehmend" name="Light Falloff"/>
+			<spinner label="Ambiente" name="Light Ambiance"/>
 		</panel>
 		<panel label="Textur" name="Texture">
 			<panel.string name="string repeats per meter">
@@ -381,7 +390,7 @@
 				Wiederholungen pro Fläche
 			</panel.string>
 			<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
-			<color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
+			<color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 			<text name="color trans">
 				Transparenz %
 			</text>
@@ -429,18 +438,29 @@
 				<combo_box.item label="gewoben" name="weave"/>
 			</combo_box>
 			<text name="tex scale">
-				Wiederholungen
+				Wiederholungen / Fläche
 			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Umkehren" name="checkbox flip s"/>
 			<spinner label="Vertikal (V)" name="TexScaleV"/>
 			<check_box label="Umkehren" name="checkbox flip t"/>
+			<spinner label="Rotation˚" name="TexRot"/>
+			<spinner label="Wiederholungen / Meter" name="rptctrl"/>
 			<button label="Übernehmen" label_selected="Übernehmen" name="button apply"/>
 			<text name="tex offset">
 				Texture-Versatz
 			</text>
 			<spinner label="Horizontal (U)" name="TexOffsetU"/>
 			<spinner label="Vertikal (V)" name="TexOffsetV"/>
+			<panel name="Add_Media">
+				<text name="media_tex">
+					Medien-URL
+				</text>
+				<button name="add_media" tool_tip="Medien hinzufügen"/>
+				<button name="delete_media" tool_tip="Diese Medien-Textur löschen"/>
+				<button name="edit_media" tool_tip="Diese Medien bearbeiten"/>
+				<button label="Ausrichten" label_selected="Medien angleichen" name="button align"/>
+			</panel>
 		</panel>
 		<panel label="Inhalt" name="Contents">
 			<button label="Neues Skript" label_selected="Neues Skript" name="button new script"/>
@@ -452,13 +472,13 @@
 			Parzelleninformation
 		</text>
 		<text name="label_area_price">
-			Preis: L$ [PRICE] für [AREA] m²
+			Preis: [PRICE] L$ für [AREA] m²
 		</text>
 		<text name="label_area">
-			Fläche: [AREA] m²
+			Gebiet: [AREA] m².
 		</text>
-		<button label="Info zu Land..." label_selected="Info zu Land..." name="button about land"/>
-		<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen: 
+		<button label="Über Land" label_selected="Über Land" name="button about land"/>
+		<check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Die Parzellen farblich nach Eigentümtertyp anzeigen 
 
 Grün = Ihr Land 
 Blau = Das Land Ihrer Gruppe 
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index 082eb8894d..579e5cbe7e 100644
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="WIRD GELADEN...">
+<floater name="top_objects" title="WIRD GELDADEN...">
 	<text name="title_text">
 		Wird geladen...
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml
index e2ad5ef2f6..e11b453b41 100644
--- a/indra/newview/skins/default/xui/de/floater_tos.xml
+++ b/indra/newview/skins/default/xui/de/floater_tos.xml
@@ -1,18 +1,17 @@
-<?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="Weiter" label_selected="Weiter" name="Continue" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+	<button label="Weiter" label_selected="Weiter" name="Continue"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
 	<radio_group name="tos_agreement">
-		<radio_item name="radio_disagree" label="Ich stimme den Nutzungsbedingungen nicht zu" />
-		<radio_item name="radio_agree" label="Ich stimme den Nutzungsbedingungen zu" />
+		<radio_item label="Ich stimme den Nutzungsbedingungen nicht zu" name="radio_disagree"/>
+		<radio_item label="Ich stimme den Nutzungsbedingungen zu" name="radio_agree"/>
 	</radio_group>
 	<text name="tos_title">
 		Nutzungsvereinbarung
 	</text>
-	<check_box label="Ich stimme den Nutzungsbedingungen zu" name="agree_chk" />
+	<check_box label="Ich stimme den Nutzungsbedingungen zu" name="agree_chk"/>
 	<text name="tos_heading">
-		Lesen Sie die folgenden Nutzungsbedingungen sorgfältig durch. Sie müssen dieser Vereinbarung
-zustimmen, um [SECOND_LIFE] benutzen zu können.
+		Lesen Sie die folgenden Servicebedingungen sorgfältig durch. Sie müssen den Servicebedinungen zustimmen, um [SECOND_LIFE] weiterhin verwenden zu können.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
new file mode 100644
index 0000000000..39675beb45
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_controls" title="Voice-Steuerung">
+	<panel name="control_panel">
+		<panel name="my_panel">
+			<text name="user_text" value="Mein Avatar:"/>
+		</panel>
+		<layout_stack>
+			<layout_panel>
+				<slider_bar name="volume_slider_bar" tool_tip="Master-Lautstärke"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index 0880470c58..ed18dfdfff 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -1,66 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="ERWEITERTER WASSER-EDITOR">
+	<floater.string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</floater.string>
 	<text name="KeyFramePresetsText">
 		Voreinstellungen:
 	</text>
-	<button label="Neu" label_selected="Neu" name="WaterNewPreset" />
-	<button label="Speichern" label_selected="Speichern" name="WaterSavePreset" />
-	<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset" />
+	<button label="Neu" label_selected="Neu" name="WaterNewPreset"/>
+	<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">
 			<text name="BHText">
 				Wassertrübungsfarbe
 			</text>
-			<button label=" ?" name="WaterFogColorHelp" left="175" />
-			<color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+			<color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 			<text name="WaterFogDensText">
 				Wassertrübungsdichte
 			</text>
-			<button label=" ?" name="WaterFogDensityHelp" left="175" />
 			<text name="WaterUnderWaterFogModText">
 				Wassertrübungs-Modifikator
 			</text>
-			<button label=" ?" name="WaterUnderWaterFogModHelp" left="175" />
-			<slider bottom_delta="-34" name="WaterUnderWaterFogMod" />
+			<slider bottom_delta="-34" name="WaterUnderWaterFogMod"/>
 			<text name="BDensText">
 				Reflexionswellengröße
 			</text>
-			<button label=" ?" name="WaterNormalScaleHelp" />
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
+			<slider label="1" name="WaterNormalScaleX"/>
+			<slider label="2" name="WaterNormalScaleY"/>
+			<slider label="3" name="WaterNormalScaleZ"/>
 			<text name="HDText">
 				Fresnel-Skalierung
 			</text>
-			<button label=" ?" name="WaterFresnelScaleHelp" />
 			<text name="FresnelOffsetText">
 				Fresnel-Versatz
 			</text>
-			<button label=" ?" name="WaterFresnelOffsetHelp" />
 			<text name="DensMultText">
 				Brechungsstärke oben
 			</text>
-			<button label=" ?" name="WaterScaleAboveHelp" />
 			<text name="WaterScaleBelowText">
 				Brechungsstärke unten
 			</text>
-			<button label=" ?" name="WaterScaleBelowHelp" />
 			<text name="MaxAltText">
 				Mischungsmultiplikator
 			</text>
-			<button label=" ?" name="WaterBlurMultiplierHelp" />
 		</panel>
 		<panel label="Bild" name="Waves">
 			<text name="BHText">
 				Richtung große Welle
 			</text>
-			<button label=" ?" name="WaterWave1Help" />
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -70,7 +57,6 @@
 			<text name="BHText2">
 				Richtung kleine Welle
 			</text>
-			<button label=" ?" name="WaterWave2Help" />
 			<text name="WaterWave2DirXText">
 				X
 			</text>
@@ -80,10 +66,6 @@
 			<text name="BHText3">
 				Normal-Map
 			</text>
-			<button label=" ?" name="WaterNormalMapHelp" />
 		</panel>
 	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
new file mode 100644
index 0000000000..a0bfc57e42
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="whitelist_entry">
+	<text name="media_label">
+		Eine URL oder URL
+	</text>
+	<line_editor name="whitelist_entry" tool_tip="Eine URL oder URL-Patten in die Whitelist eingeben"/>
+	<button label="OK" name="ok_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
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 df0b513a85..3e06d8f06b 100644
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="ERWEITERTER HIMMEL-EDITOR">
 	<text name="KeyFramePresetsText">
 		Voreinstellungen:
 	</text>
-	<button label="Neu" label_selected="Neu" name="WLNewPreset" />
-	<button label="Speichern" label_selected="Speichern" name="WLSavePreset" />
-	<button label="Löschen" label_selected="Löschen" name="WLDeletePreset" />
-	<button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor"
-	     name="WLDayCycleMenuButton" />
+	<button label="Neu" label_selected="Neu" name="WLNewPreset"/>
+	<button label="Speichern" label_selected="Speichern" name="WLSavePreset"/>
+	<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">
 			<text name="BHText">
 				Horizontfarbe
 			</text>
-			<button label=" ?" name="WLBlueHorizonHelp" />
+			<button label=" ?" name="WLBlueHorizonHelp"/>
 			<text name="BHText2">
 				R
 			</text>
@@ -29,11 +28,11 @@
 			<text name="BDensText">
 				Horizonttrübung
 			</text>
-			<button label=" ?" name="WLHazeHorizonHelp" />
+			<button label=" ?" name="WLHazeHorizonHelp"/>
 			<text name="BDensText2">
 				Farbintensität
 			</text>
-			<button label=" ?" name="WLBlueDensityHelp" />
+			<button label=" ?" name="WLBlueDensityHelp"/>
 			<text name="BHText6">
 				R
 			</text>
@@ -49,25 +48,25 @@
 			<text name="HDText">
 				Trübungsintensität
 			</text>
-			<button label=" ?" name="WLHazeDensityHelp" />
+			<button label=" ?" name="WLHazeDensityHelp"/>
 			<text name="DensMultText">
 				Dichtemultiplikator
 			</text>
-			<button label=" ?" name="WLDensityMultHelp" />
+			<button label=" ?" name="WLDensityMultHelp"/>
 			<text name="WLDistanceMultText">
 				Entfernungsmultiplikator
 			</text>
-			<button label=" ?" name="WLDistanceMultHelp" />
+			<button label=" ?" name="WLDistanceMultHelp"/>
 			<text name="MaxAltText">
 				Max. Höhe
 			</text>
-			<button label=" ?" name="WLMaxAltitudeHelp" />
+			<button label=" ?" name="WLMaxAltitudeHelp"/>
 		</panel>
 		<panel label="Licht" name="Lighting">
 			<text name="SLCText">
 				Sonne/Mond-Farbe
 			</text>
-			<button label=" ?" name="WLSunlightColorHelp" />
+			<button label=" ?" name="WLSunlightColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -83,11 +82,11 @@
 			<text name="TODText">
 				Sonne/Mond-Stand
 			</text>
-			<button label=" ?" name="WLTimeOfDayHelp" />
+			<button label=" ?" name="WLTimeOfDayHelp"/>
 			<text name="WLAmbientText">
 				Umgebung
 			</text>
-			<button label=" ?" name="WLAmbientHelp" />
+			<button label=" ?" name="WLAmbientHelp"/>
 			<text name="BHText5">
 				R
 			</text>
@@ -103,27 +102,27 @@
 			<text name="WLEastAngleText">
 				Ostausrichtung
 			</text>
-			<button label=" ?" name="WLEastAngleHelp" />
+			<button label=" ?" name="WLEastAngleHelp"/>
 			<text name="SunGlowText">
 				Sonnenleuchtkraft
 			</text>
-			<button label=" ?" name="WLSunGlowHelp" />
-			<slider label="Fokus " name="WLGlowB" />
-			<slider label="Größe    " name="WLGlowR" />
+			<button label=" ?" name="WLSunGlowHelp"/>
+			<slider label="Fokus " name="WLGlowB"/>
+			<slider label="Größe    " name="WLGlowR"/>
 			<text name="SceneGammaText">
 				Gamma in Szene
 			</text>
-			<button label=" ?" name="WLSceneGammaHelp" />
+			<button label=" ?" name="WLSceneGammaHelp"/>
 			<text name="WLStarText">
 				Sternenleuchtkraft
 			</text>
-			<button label=" ?" name="WLStarBrightnessHelp" />
+			<button label=" ?" name="WLStarBrightnessHelp"/>
 		</panel>
 		<panel label="Wolken" name="Clouds">
 			<text name="WLCloudColorText">
 				Wolkenfarbe
 			</text>
-			<button label=" ?" name="WLCloudColorHelp" />
+			<button label=" ?" name="WLCloudColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -139,7 +138,7 @@
 			<text name="WLCloudColorText2">
 				Wolken-XY/Dichte
 			</text>
-			<button label=" ?" name="WLCloudDensityHelp" />
+			<button label=" ?" name="WLCloudDensityHelp"/>
 			<text name="BHText5">
 				X
 			</text>
@@ -152,15 +151,15 @@
 			<text name="WLCloudCoverageText">
 				Wolkendichte
 			</text>
-			<button label=" ?" name="WLCloudCoverageHelp" />
+			<button label=" ?" name="WLCloudCoverageHelp"/>
 			<text name="WLCloudScaleText">
 				Wolkenskalierung
 			</text>
-			<button label=" ?" name="WLCloudScaleHelp" />
+			<button label=" ?" name="WLCloudScaleHelp"/>
 			<text name="WLCloudDetailText">
 				Wolkendetails (XY/Dichte)
 			</text>
-			<button label=" ?" name="WLCloudDetailHelp" />
+			<button label=" ?" name="WLCloudDetailHelp"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -173,15 +172,15 @@
 			<text name="WLCloudScrollXText">
 				Wolkenbewegung X
 			</text>
-			<button label=" ?" name="WLCloudScrollXHelp" />
-			<check_box label="Fest" name="WLCloudLockX" />
+			<button label=" ?" name="WLCloudScrollXHelp"/>
+			<check_box label="Fest" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
 				Wolkenbewegung Y
 			</text>
-			<button label=" ?" name="WLCloudScrollYHelp" />
-			<check_box label="Fest" name="WLCloudLockY" />
-			<check_box label="Klassische Wolken" name="DrawClassicClouds" />
-			<button label=" ?" name="WLClassicCloudsHelp" />
+			<button label=" ?" name="WLCloudScrollYHelp"/>
+			<check_box label="Fest" name="WLCloudLockY"/>
+			<check_box label="Klassische Wolken" name="DrawClassicClouds"/>
+			<button label=" ?" name="WLClassicCloudsHelp"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
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 665eafe5b8..dd13623f91 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="WELTKARTE">
-	<tab_container name="maptab">
-		<panel label="Objekte" name="objects_mapview"/>
-		<panel label="Terrain" name="terrain_mapview"/>
-	</tab_container>
+<floater name="worldmap" title="KARTE">
 	<text name="you_label">
 		Sie
 	</text>
@@ -19,19 +15,19 @@
 	<button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/>
 	<check_box label="Einwohner" name="people_chk"/>
 	<check_box label="Infohub" name="infohub_chk"/>
-	<check_box label="Telehub" name="telehubchk"/>
+	<check_box label="Telehub" name="telehub_chk"/>
 	<check_box label="Land zu verkaufen" name="land_for_sale_chk"/>
 	<text name="events_label">
 		Events:
 	</text>
 	<check_box label="PG" name="event_chk"/>
-	<check_box label="Mature" name="event_mature_chk"/>
+	<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 	<check_box label="Adult" name="event_adult_chk"/>
 	<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
-		<combo_box.item name="item1" label="Online-Freunde" />
+		<combo_box.item label="Online-Freunde" name="item1"/>
 	</combo_box>
 	<combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
-		<combo_box.item name="item1" label="Landmarken" />
+		<combo_box.item label="Landmarken" name="item1"/>
 	</combo_box>
 	<line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
 	<button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
@@ -39,8 +35,8 @@
 		Suchergebnisse:
 	</text>
 	<scroll_list name="search_results">
-		<column label="" name="icon"/>
-		<column label="" name="sim_name"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="" name="sim_name"/>
 	</scroll_list>
 	<text name="location_label">
 		Standort:
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
index 58e0498b05..91b7650376 100644
--- a/indra/newview/skins/default/xui/de/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml
@@ -8,9 +8,21 @@
 		[AGE]
 	</string>
 	<string name="Details">
-		[ACCTTYPE], [PAYMENTINFO]
-Profil: [SL_PROFILE]
+		[SL_PROFILE]
 	</string>
+	<string name="Partner">
+		Partner: [PARTNER]
+	</string>
+	<text name="user_name" value="Grumpity ProductEngine"/>
+	<text name="user_subtitle" value="11 Monate und 3 Tage alt"/>
+	<text name="user_details">
+		Dies ist meine Beschreibung und ich finde sie wirklich gut!
+	</text>
+	<text name="user_partner">
+		Erica Linden
+	</text>
 	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
 	<button label="Freund hinzufügen" name="add_friend_btn"/>
+	<button label="IM" name="im_btn"/>
+	<button label="Mehr" name="view_profile_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
new file mode 100644
index 0000000000..fa9764e420
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/inspect_group.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_group">
+	<string name="PrivateGroup">
+		Private Gruppe
+	</string>
+	<string name="FreeToJoin">
+		Mitgliedschaft kostenlos
+	</string>
+	<string name="CostToJoin">
+		Mitgliedschaft: [AMOUNT] L$
+	</string>
+	<string name="YouAreMember">
+		Sie sind Mitglied
+	</string>
+	<text name="group_name">
+		Grumpitys schlecht gelaunte Elche
+	</text>
+	<text name="group_subtitle">
+		123 Mitglieder
+	</text>
+	<text name="group_details">
+		Eine Gruppe für Leute, die sich gerne mit Elchen unterhält.
+Hoch solln sie leben!  Elche forever!  Und auch Mungos!
+	</text>
+	<text name="group_cost">
+		Mitgliedschaft: 123 L$
+	</text>
+	<button label="Zusammen" name="join_btn"/>
+	<button label="Verlassen" name="leave_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
new file mode 100644
index 0000000000..61f2cc8dc9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/inspect_object.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_object">
+	<string name="Creator">
+		Von [CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		von [CREATOR]
+Besitzer [OWNER]
+	</string>
+	<string name="Price">
+		[AMOUNT] L$
+	</string>
+	<string name="PriceFree">
+		Kostenlos!
+	</string>
+	<string name="Touch">
+		Berühren
+	</string>
+	<string name="Sit">
+		Sitzen
+	</string>
+	<text name="object_name" value="Wirklich langen Objektnamen als Test eingeben"/>
+	<text name="object_creator">
+		von secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+Besitzer secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+	</text>
+	<text name="price_text">
+		300.000 L$
+	</text>
+	<text name="object_description">
+		Dies ist eine wirklich lange Beschreibung für ein Objekt, mindestens 80 Zeichen lang oder jetzt schon 120 Zeichen. Niemand weiß es genau.
+	</text>
+	<text name="object_media_url">
+		http://www.superdupertest.com
+	</text>
+	<button label="Kaufen" name="buy_btn"/>
+	<button label="Zahlen" name="pay_btn"/>
+	<button label="Kopie nehmen" name="take_free_copy_btn"/>
+	<button label="Berühren" name="touch_btn"/>
+	<button label="Sitzen" name="sit_btn"/>
+	<button label="Öffnen" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="Sicheres Browsen"/>
+	<button label="Mehr" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
new file mode 100644
index 0000000000..9fe05455eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
@@ -0,0 +1,25 @@
+<?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_name">
+		Wirklich langen Objektnamen als Test eingeben
+	</text>
+	<text name="object_owner_label">
+		Eigentümer:
+	</text>
+	<text name="object_owner">
+		Langeravatarname Schmidtmeyermülllermuster
+	</text>
+	<text name="object_slurl_label">
+		Standort:
+	</text>
+	<text name="object_slurl">
+		http://slurl.com/Ahern/50/50/50
+	</text>
+	<button label="Karte" name="map_btn"/>
+	<button label="Ignorieren" name="block_btn"/>
+	<button label="Schließen" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
new file mode 100644
index 0000000000..246275bee1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="Schaltfläche Gesten" name="ShowGestureButton"/>
+	<menu_item_check label="Schaltfläche Bewegungssteuerung" name="ShowMoveButton"/>
+	<menu_item_check label="Schaltfläche Ansicht" name="ShowCameraButton"/>
+	<menu_item_check label="Schaltfläche Foto" name="ShowSnapshotButton"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
new file mode 100644
index 0000000000..953c0eeed5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gesture_gear">
+	<menu_item_call label="Zu Favoriten hinzufügen/daraus entfernen" name="activate"/>
+	<menu_item_call label="Kopieren" name="copy_gesture"/>
+	<menu_item_call label="Einfügen" name="paste"/>
+	<menu_item_call label="UUID kopieren" name="copy_uuid"/>
+	<menu_item_call label="Aktuelles Outfit speichern" name="save_to_outfit"/>
+	<menu_item_call label="Bearbeiten" name="edit_gesture"/>
+	<menu_item_call label="Untersuchen" name="inspect"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
new file mode 100644
index 0000000000..32a6823b35
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_navbar_menu">
+	<menu_item_check label="Navigationsleiste anzeigen" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="Favoritenleiste anzeigen" name="ShowNavbarFavoritesPanel"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..81ef3b6569
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet Group Menu">
+	<menu_item_call label="Gruppeninfo" name="Show Profile"/>
+	<menu_item_call label="Sitzung anzeigen" name="Chat"/>
+	<menu_item_call label="Sitzung beenden" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..d123238246
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet P2P Menu">
+	<menu_item_call label="Profil anzeigen" name="Show Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Sitzung anzeigen" name="Send IM"/>
+	<menu_item_call label="Sitzung beenden" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..128bcdb86a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
+	<menu_item_call label="Teleportieren" name="teleport"/>
+	<menu_item_call label="In Gruppe einladen" name="invite_to_group"/>
+	<menu_item_call label="Ignorieren" name="block"/>
+	<menu_item_call label="Melden" name="report"/>
+	<menu_item_call label="Einfrieren" name="freeze"/>
+	<menu_item_call label="Hinauswerfen" name="eject"/>
+	<menu_item_call label="Debug" name="debug"/>
+	<menu_item_call label="Auf Karte anzeigen" name="find_on_map"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Zahlen" name="pay"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..5efee8617b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Berühren" name="touch"/>
+	<menu_item_call label="Sitzen" name="sit"/>
+	<menu_item_call label="Zahlen" name="pay"/>
+	<menu_item_call label="Kaufen" name="buy"/>
+	<menu_item_call label="Nehmen" name="take"/>
+	<menu_item_call label="Kopie nehmen" name="take_copy"/>
+	<menu_item_call label="Öffnen" name="open"/>
+	<menu_item_call label="Bearbeiten" name="edit"/>
+	<menu_item_call label="Anziehen" name="wear"/>
+	<menu_item_call label="Melden" name="report"/>
+	<menu_item_call label="Ignorieren" name="block"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Entfernen" name="remove"/>
+	<menu_item_call label="Weitere Infos" name="more_info"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
new file mode 100644
index 0000000000..383ee7831e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Aufstehen" name="stand_up"/>
+	<menu_item_call label="Mein Aussehen" name="my_appearance"/>
+	<menu_item_call label="Mein Profil" name="my_profile"/>
+	<menu_item_call label="Meine Freunde" name="my_friends"/>
+	<menu_item_call label="Meine Gruppen" name="my_groups"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index 7b4335a430..fcdfc8b9e0 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -22,6 +22,8 @@
 		<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="Neue Alpha-Maske" name="New Alpha Mask"/>
+		<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
 	</menu>
 	<menu label="Neue Körperteile" name="New Body Parts">
 		<menu_item_call label="Neue Form/Gestalt" name="New Shape"/>
@@ -46,18 +48,21 @@
 	<menu_item_call label="Öffnen" name="Sound Open"/>
 	<menu_item_call label="Objekt löschen" name="Purge Item"/>
 	<menu_item_call label="Objekt wiederherstellen" name="Restore Item"/>
+	<menu_item_call label="Original suchen" name="Find Original"/>
 	<menu_item_call label="Öffnen" name="Open"/>
 	<menu_item_call label="Eigenschaften" name="Properties"/>
 	<menu_item_call label="Umbenennen" name="Rename"/>
 	<menu_item_call label="Asset-UUID kopieren" name="Copy Asset UUID"/>
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
+	<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
 	<menu_item_call label="Löschen" name="Delete"/>
-	<menu_item_call label="Objekte abnehmen" name="Take Off Items"/>
+	<menu_item_call label="Von Outfit entfernen" name="Remove From Outfit"/>
 	<menu_item_call label="Zum Outfit hinzufügen" name="Add To Outfit"/>
 	<menu_item_call label="Outfit ersetzen" name="Replace Outfit"/>
 	<menu_item_call label="Konferenz-Chat starten" name="Conference Chat Folder"/>
 	<menu_item_call label="Wiedergeben/Abspielen" name="Sound Play"/>
+	<menu_item_call label="Landmarken-Info" name="About Landmark"/>
 	<menu_item_call label="In Welt abspielen" name="Animation Play"/>
 	<menu_item_call label="Lokal wiedergeben" name="Animation Audition"/>
 	<menu_item_call label="Instant Message senden" name="Send Instant Message"/>
@@ -65,6 +70,7 @@
 	<menu_item_call label="Konferenz-Chat starten" name="Conference Chat"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Deaktivieren" name="Deactivate"/>
+	<menu_item_call label="Speichern unter" name="Save As"/>
 	<menu_item_call label="Von Körper abnehmen" name="Detach From Yourself"/>
 	<menu_item_call label="Anziehen" name="Object Wear"/>
 	<menu label="Anhängen an" name="Attach To"/>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
new file mode 100644
index 0000000000..f6b7e51325
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="Hochladen" name="upload">
+		<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
+		<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
+		<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="Neuer Ordner" name="New Folder"/>
+	<menu_item_call label="Neues Skript" name="New Script"/>
+	<menu_item_call label="Neue Notiz" name="New Note"/>
+	<menu_item_call label="Neue Geste" name="New Gesture"/>
+	<menu label="Neue Kleider" name="New Clothes">
+		<menu_item_call label="Neues Hemd" name="New Shirt"/>
+		<menu_item_call label="Neue Hose" name="New Pants"/>
+		<menu_item_call label="Neue Schuhe" name="New Shoes"/>
+		<menu_item_call label="Neue Socken" name="New Socks"/>
+		<menu_item_call label="Neue Jacke" name="New Jacket"/>
+		<menu_item_call label="Neuer Rock" name="New Skirt"/>
+		<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="Neue Tätowierung" name="New Tattoo"/>
+	</menu>
+	<menu label="Neue Körperteile" name="New Body Parts">
+		<menu_item_call label="Neue Form/Gestalt" name="New Shape"/>
+		<menu_item_call label="Neue Haut" name="New Skin"/>
+		<menu_item_call label="Neues Haar" name="New Hair"/>
+		<menu_item_call label="Neue Augen" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..69f9b86d75
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="Fenster: Neues Inventar" name="new_window"/>
+	<menu_item_call label="Nach Name sortieren" name="sort_by_name"/>
+	<menu_item_call label="Nach aktuellesten Objekten sortieren" name="sort_by_recent"/>
+	<menu_item_call label="Filter anzeigen" name="show_filters"/>
+	<menu_item_call label="Filter zurücksetzen" name="reset_filters"/>
+	<menu_item_call label="Alle Ordner schließen" name="close_folders"/>
+	<menu_item_call label="Papierkorb ausleeren" name="empty_trash"/>
+	<menu_item_call label="Fundbüro ausleeren" name="empty_lostnfound"/>
+	<menu_item_call label="Textur speichern als" name="Save Texture As"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml
index b100ee11d7..2aff0eec95 100644
--- a/indra/newview/skins/default/xui/de/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/de/menu_landmark.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="SLurl kopieren" name="copy"/>
 	<menu_item_call label="Löschen" name="delete"/>
 	<menu_item_call label="Auswahl erstellen" name="pick"/>
+	<menu_item_call label="Zu Favoritenleiste hinzufügen" name="add_to_favbar"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 887d8d1b84..26c2a4c2f4 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -1,13 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="Datei" name="File">
-		<menu_item_call label="Beenden" name="Quit" />
-	</menu>
-	<menu label="Bearbeiten" name="Edit">
-		<menu_item_call label="Einstellungen..." name="Preferences..." />
+	<menu label="Ich" name="File">
+		<menu_item_call label="Einstellungen" name="Preferences..."/>
+		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Hilfe" name="Help">
-		<menu_item_call label="Hilfe zu [SECOND_LIFE]" name="Second Life Help" />
-		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..." />
+		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
+		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
+	</menu>
+	<menu label="Debug" name="Debug">
+		<menu label="Bearbeiten" name="Edit">
+			<menu_item_call label="Rückgängig" name="Undo"/>
+			<menu_item_call label="Wiederherstellen" name="Redo"/>
+			<menu_item_call label="Ausschneiden" name="Cut"/>
+			<menu_item_call label="Kopieren" name="Copy"/>
+			<menu_item_call label="Einfügen" name="Paste"/>
+			<menu_item_call label="Löschen" name="Delete"/>
+			<menu_item_call label="Duplizieren" name="Duplicate"/>
+			<menu_item_call label="Alle auswählen" name="Select All"/>
+			<menu_item_call label="Auswahl aufheben" name="Deselect"/>
+		</menu>
+		<menu_item_call label="Debug-Einstellungen anzeigen" name="Debug Settings"/>
+		<menu_item_call label="UI/Farb-Einstellungen" name="UI/Color Settings"/>
+		<menu_item_call label="XUI-Editor" name="UI Preview Tool"/>
+		<menu_item_call label="Seitenleiste anzeigen" name="Show Side Tray"/>
+		<menu_item_call label="Widget testen" name="Widget Test"/>
+		<menu_item_call label="Inspektor-Test" name="Inspectors Test"/>
+		<menu_item_check label="Reg In Client Test (Neustart)" name="Reg In Client Test (restart)"/>
+		<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
+		<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
+		<menu_item_call label="Web-Browser-Test" name="Web Browser Test"/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
index a3179b42f8..a3ebfb3b10 100644
--- a/indra/newview/skins/default/xui/de/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Zoom Nah" name="Zoom Close"/>
 	<menu_item_call label="Zoom Mittel" name="Zoom Medium"/>
 	<menu_item_call label="Zoom Weit" name="Zoom Far"/>
+	<menu_item_check label="Karte drehen" name="Rotate Map"/>
 	<menu_item_call label="Verfolgung abschalten" name="Stop Tracking"/>
 	<menu_item_call label="Weltkarte" name="World Map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml
index 6af01ddcc5..5175f34b41 100644
--- a/indra/newview/skins/default/xui/de/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_navbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
 	<menu_item_check label="Koordinaten anzeigen" name="Show Coordinates"/>
+	<menu_item_check label="Parzelleneigenschaften anzeigen" name="Show Parcel Properties"/>
 	<menu_item_call label="Landmarke" name="Landmark"/>
 	<menu_item_call label="Ausschneiden" name="Cut"/>
 	<menu_item_call label="Kopieren" name="Copy"/>
diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
new file mode 100644
index 0000000000..99d6428c3f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="NearBy Chat Menu">
+	<menu_item_call label="Leute in der Nähe anzeigen..." name="nearby_people"/>
+	<menu_item_check label="Ignorierten Text anzeigen" name="muted_text"/>
+	<menu_item_check label="Bilder von Freunden anzeigen" name="show_buddy_icons"/>
+	<menu_item_check label="Namen anzeigen" name="show_names"/>
+	<menu_item_check label="Namen und Symbole anzeigen" name="show_icons_and_names"/>
+	<menu_item_call label="Schriftgröße" name="font_size"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
new file mode 100644
index 0000000000..8b6c558416
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Object Icon Menu">
+	<menu_item_call label="Objektprofil..." name="Object Profile"/>
+	<menu_item_call label="Ignorieren..." name="Block"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml
new file mode 100644
index 0000000000..042123cde4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Participant List Context Menu">
+	<menu_item_check label="Text stummschalten" name="MuteText"/>
+	<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
new file mode 100644
index 0000000000..9d50a42ed4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
new file mode 100644
index 0000000000..b68597d8aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
+	<menu_item_call label="Ausgewählte Gruppe verlassen" name="Leave Selected Group"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
new file mode 100644
index 0000000000..ef58b4136e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Avatar Context Menu">
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Zahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
new file mode 100644
index 0000000000..d572a8ca1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Multi-Selected People Context Menu">
+	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Zahlen" name="Pay"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
new file mode 100644
index 0000000000..d0881ddd05
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/>
+	<menu_item_check label="Profilbilder anzeigen" name="view_icons"/>
+	<menu_item_call label="Zeige geblockte Einwohner &amp; Objekte" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
new file mode 100644
index 0000000000..837983b716
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Nach aktuellesten Objekten sortieren" name="sort_most"/>
+	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
new file mode 100644
index 0000000000..385ff25b95
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="picks_plus_menu">
+	<menu_item_call label="Neue Auswahl" name="create_pick"/>
+	<menu_item_call label="Neue Anzeige" name="create_classified"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
new file mode 100644
index 0000000000..7c0ff4a46a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="Ordner hinzufügen" name="add_folder"/>
+	<menu_item_call label="Landmarke hinzufügen" name="add_landmark"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
new file mode 100644
index 0000000000..132d3f6466
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="Landmarke hinzufügen" name="add_landmark"/>
+	<menu_item_call label="Ordner hinzufügen" name="add_folder"/>
+	<menu_item_call label="Ausschneiden" name="cut"/>
+	<menu_item_call label="Kopieren" name="copy_folder"/>
+	<menu_item_call label="Einfügen" name="paste"/>
+	<menu_item_call label="Umbenennen" name="rename"/>
+	<menu_item_call label="Löschen" name="delete"/>
+	<menu_item_call label="Erweitern Sie sich" name="expand"/>
+	<menu_item_call label="Zuklappen" name="collapse"/>
+	<menu_item_call label="Alle Ordner aufklappen" name="expand_all"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse_all"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..6af4d644af
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_ladmark_gear">
+	<menu_item_call label="Teleportieren" name="teleport"/>
+	<menu_item_call label="Weitere Informationen" name="more_info"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
+	<menu_item_call label="Landmarke hinzufügen" name="add_landmark"/>
+	<menu_item_call label="Ordner hinzufügen" name="add_folder"/>
+	<menu_item_call label="Ausschneiden" name="cut"/>
+	<menu_item_call label="Landmarke kopieren" name="copy_landmark"/>
+	<menu_item_call label="SLurl kopieren" name="copy_slurl"/>
+	<menu_item_call label="Einfügen" name="paste"/>
+	<menu_item_call label="Umbenennen" name="rename"/>
+	<menu_item_call label="Löschen" name="delete"/>
+	<menu_item_call label="Alle Ordner aufklappen" name="expand_all"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse_all"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+	<menu_item_call label="Auswahl erstellen" name="create_pick"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
new file mode 100644
index 0000000000..89b56d1571
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="profile_overflow_menu">
+	<menu_item_call label="Zahlen" name="pay"/>
+	<menu_item_call label="Teilen" name="share"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..2bfdadf22a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Teleport History Gear Context Menu">
+	<menu_item_call label="Alle Ordner aufklappen" name="Expand all folders"/>
+	<menu_item_call label="Alle Ordner schließen" name="Collapse all folders"/>
+	<menu_item_call label="Teleport-Verlauf löschen" name="Clear Teleport History"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
new file mode 100644
index 0000000000..ff8fb0b181
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Teleportieren" name="Teleport"/>
+	<menu_item_call label="Weitere Informationen" name="More Information"/>
+	<menu_item_call label="In Zwischenablage kopieren" name="CopyToClipboard"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
new file mode 100644
index 0000000000..194dd16fd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Öffnen" name="TabOpen"/>
+	<menu_item_call label="Schließen" name="TabClose"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml
new file mode 100644
index 0000000000..c00186c13e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_text_editor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Text editor context menu">
+	<menu_item_call label="Ausschneiden" name="Cut"/>
+	<menu_item_call label="Kopieren" name="Copy"/>
+	<menu_item_call label="Einfügen" name="Paste"/>
+	<menu_item_call label="Löschen" name="Delete"/>
+	<menu_item_call label="Alle auswählen" name="Select All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
new file mode 100644
index 0000000000..dc069df02b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Inventarobjekte anzeigen" name="show_item"/>
+	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
+	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml
new file mode 100644
index 0000000000..2f6ffcd450
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_map.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
+	<menu_item_call label="Zu Position teleportieren" name="teleport_to_location"/>
+	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 11f242b540..90d3763d9c 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
index 707079f8cc..9169bca24f 100644
--- a/indra/newview/skins/default/xui/de/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Parzelleninformationen anzeigen" name="show_parcel"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
new file mode 100644
index 0000000000..72e916b902
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Diesen Befehl ausführen" name="run_slapp"/>
+	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
index 9b6417456c..5d48230ebf 100644
--- a/indra/newview/skins/default/xui/de/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Ortsinformationen anzeigen" name="show_place"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Position teleportieren" name="teleport_to_location"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
index 306977574c..4cc1ecc70e 100644
--- a/indra/newview/skins/default/xui/de/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="An diesen Standort teleportieren" name="teleport"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 317b525062..ee2f1ee7c9 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -1,225 +1,426 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
-	<menu name="Me">
+	<menu label="Ich" name="Me">
 		<menu_item_call label="Einstellungen" name="Preferences"/>
-		<menu_item_call name="Manage My Account">
-			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de" />
+		<menu_item_call label="Meine Startseite" name="Manage My Account">
+			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de"/>
 		</menu_item_call>
-	</menu>
-	<menu label="Datei" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu label="Hochladen" name="upload">
-			<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
-			<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
-			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
-			<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_call label="Standard-Berechtigungen einstellen..." name="perm prefs"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Fenster schließen" name="Close Window"/>
-		<menu_item_call label="Alle Fenster schließen" name="Close All Windows"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Textur speichern unter..." name="Save Texture As..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Foto machen" name="Take Snapshot"/>
-		<menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Beenden" name="Quit"/>
-	</menu>
-	<menu label="Bearbeiten" name="Edit">
-		<menu_item_call label="Rückgängig" name="Undo"/>
-		<menu_item_call label="Wiederherstellen" name="Redo"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Ausschneiden" name="Cut"/>
-		<menu_item_call label="Kopieren" name="Copy"/>
-		<menu_item_call label="Einfügen" name="Paste"/>
-		<menu_item_call label="Löschen" name="Delete"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Suchen..." name="Search..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Alle auswählen" name="Select All"/>
-		<menu_item_call label="Auswahl aufheben" name="Deselect"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Duplizieren" name="Duplicate"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu label="Objekt anhängen" name="Attach Object"/>
-		<menu label="Objekt abnehmen" name="Detach Object"/>
-		<menu label="Kleider ausziehen" name="Take Off Clothing">
-			<menu_item_call label="Hemd" name="Shirt"/>
-			<menu_item_call label="Hose" name="Pants"/>
-			<menu_item_call label="Schuhe" name="Shoes"/>
-			<menu_item_call label="Socken" name="Socks"/>
-			<menu_item_call label="Jacke" name="Jacket"/>
-			<menu_item_call label="Handschuhe" name="Gloves"/>
-			<menu_item_call label="Unterhemd" name="Menu Undershirt"/>
-			<menu_item_call label="Unterhose" name="Menu Underpants"/>
-			<menu_item_call label="Rock" name="Skirt"/>
-			<menu_item_call label="Alle Kleider" name="All Clothes"/>
+		<menu_item_call label="L$ kaufen" name="Buy and Sell L$"/>
+		<menu_item_call label="Mein Profil" name="Profile"/>
+		<menu_item_call label="Mein Aussehen" name="Appearance"/>
+		<menu_item_check label="Mein Inventar" name="Inventory"/>
+		<menu_item_call label="Inventar in Seitenleiste anzeigen" name="ShowSidetrayInventory"/>
+		<menu_item_call label="Meine Gesten" name="Gestures"/>
+		<menu label="Mein Status" name="Status">
+			<menu_item_call label="Abwesend" name="Set Away"/>
+			<menu_item_call label="Beschäftigt" name="Set Busy"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Gesten..." name="Gestures..."/>
-		<menu_item_call label="Profil..." name="Profile..."/>
-		<menu_item_call label="Aussehen..." name="Appearance..."/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu_item_check label="Freunde..." name="Friends..."/>
-		<menu_item_call label="Gruppen..." name="Groups..."/>
-		<menu_item_separator label="-----------" name="separator8"/>
-		<menu_item_call label="Einstellungen..." name="Preferences..."/>
+		<menu_item_call label="Admin-Status anfordern" name="Request Admin Options"/>
+		<menu_item_call label="Admin-Status verlassen" name="Leave Admin Options"/>
+		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
-	<menu label="Ansicht" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu_item_call label="Mouselook" name="Mouselook"/>
-		<menu_item_check label="Bauen" name="Build"/>
-		<menu_item_check label="Joystick-Flycam" name="Joystick Flycam"/>
-		<menu_item_call label="Ansicht zurücksetzen" name="Reset View"/>
-		<menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="Symbolleiste" name="Toolbar"/>
-		<menu_item_check label="Lokaler Chat" name="Chat History"/>
-		<menu_item_check label="Unterhalten" name="Instant Message"/>
-		<menu_item_check label="Inventar" name="Inventory"/>
-		<menu_item_check label="Aktive Sprecher" name="Active Speakers"/>
-		<menu_item_check label="Stummschalten-Liste" name="Mute List"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
-		<menu_item_check label="Bewegungssteuerung" name="Movement Controls"/>
-		<menu_item_check label="Weltkarte" name="World Map"/>
-		<menu_item_check label="Minikarte" name="Mini-Map"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
-		<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
-		<menu_item_check label="Absperrungen" name="Banlines"/>
-		<menu_item_check label="Landeigentümer" name="Land Owners"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu label="Schwebe-Tipps" name="Hover Tips">
-			<menu_item_check label="Tipps anzeigen" name="Show Tips"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_check label="Landtipps" name="Land Tips"/>
-			<menu_item_check label="Tipps zu allen Objekten" name="Tips On All Objects"/>
-		</menu>
-		<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
-		<menu_item_check label="Beacons" name="beacons"/>
-		<menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
-		<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="Hinein zoomen" name="Zoom In"/>
-		<menu_item_call label="Zoom-Standard" name="Zoom Default"/>
-		<menu_item_call label="Wegzoomen" name="Zoom Out"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Vollbild" name="Toggle Fullscreen"/>
-		<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
+	<menu label="Unterhalten" name="Communicate">
+		<menu_item_call label="Meine Freunde" name="My Friends"/>
+		<menu_item_call label="Meine Gruppen" name="My Groups"/>
+		<menu_item_check label="Lokaler Chat" name="Nearby Chat"/>
+		<menu_item_call label="Leute in dern Nähe" name="Active Speakers"/>
+		<menu_item_check label="Medien in der Nähe" name="Nearby Media"/>
+		<menu_item_check label="(Legacy) Kommunikation" name="Instant Message"/>
+		<menu_item_call label="(Temp) Mediensteuerung" name="Preferences"/>
 	</menu>
 	<menu label="Welt" name="World">
-		<menu_item_call label="Chat" name="Chat"/>
-		<menu_item_check label="Immer rennen" name="Always Run"/>
-		<menu_item_check label="Fliegen" name="Fly"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Landmarke hier setzen" name="Create Landmark Here"/>
-		<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Teleport nach Hause" name="Teleport Home"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Als abwesend anzeigen" name="Set Away"/>
-		<menu_item_call label="Als beschäftigt anzeigen" name="Set Busy"/>
-		<menu_item_call label="Avatar nicht mehr animieren" name="Stop Animating My Avatar"/>
-		<menu_item_call label="Tasten freigeben" name="Release Keys"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Kontostatistik..." name="Account History...">
-			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=de"/>
-		</menu_item_call>
-		<menu_item_call label="Mein Konto verwalten..." name="Manage My Account...">
-			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de"/>
-		</menu_item_call>
-		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$..."/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="Mein Land..." name="My Land..."/>
-		<menu_item_call label="Land-Info..." name="About Land..."/>
-		<menu_item_call label="Land kaufen..." name="Buy Land..."/>
-		<menu_item_call label="Region/Grundstück..." name="Region/Estate..."/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu label="Umwelt-Einstellungen" name="Environment Settings">
+		<menu_item_check label="Bewegen" name="Movement Controls"/>
+		<menu_item_check label="Ansicht" name="Camera Controls"/>
+		<menu_item_call label="Über Land" name="About Land"/>
+		<menu_item_call label="Region/Grundstück" name="Region/Estate"/>
+		<menu_item_call label="Land kaufen" name="Buy Land"/>
+		<menu_item_call label="Mein Land" name="My Land"/>
+		<menu label="Anzeigen" name="Land">
+			<menu_item_check label="Bannlinien" name="Ban Lines"/>
+			<menu_item_check label="Strahlen" name="beacons"/>
+			<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
+			<menu_item_check label="Landeigentümer" name="Land Owners"/>
+		</menu>
+		<menu label="Landmarken" name="Landmarks">
+			<menu_item_call label="Landmarke hier setzen" name="Create Landmark Here"/>
+			<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
+		</menu>
+		<menu_item_call label="Startseite" name="Teleport Home"/>
+		<menu_item_check label="Minikarte" name="Mini-Map"/>
+		<menu_item_check label="Weltkarte" name="World Map"/>
+		<menu_item_call label="Foto" name="Take Snapshot"/>
+		<menu label="Sonne" name="Environment Settings">
 			<menu_item_call label="Sonnenaufgang" name="Sunrise"/>
 			<menu_item_call label="Mittag" name="Noon"/>
 			<menu_item_call label="Sonnenuntergang" name="Sunset"/>
 			<menu_item_call label="Mitternacht" name="Midnight"/>
-			<menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default"/>
-			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Grundstückszeit verwenden" name="Revert to Region Default"/>
 			<menu_item_call label="Umwelt-Editor" name="Environment Editor"/>
 		</menu>
 	</menu>
-	<menu label="Werkzeug" name="Tools">
-		<menu label="Fehlermeldungen" name="Select Tool">
-			<menu_item_call label="Fokus" name="Focus"/>
-			<menu_item_call label="Verschieben" name="Move"/>
+	<menu label="Bauen" name="BuildTools">
+		<menu_item_check label="Bauen" name="Show Build Tools"/>
+		<menu label="Bauwerkzeug auswählen" name="Select Tool">
+			<menu_item_call label="Fokus-Werkzeug" name="Focus"/>
+			<menu_item_call label="Werkzeug „Bewegen“" name="Move"/>
 			<menu_item_call label="Bearbeiten" name="Edit"/>
-			<menu_item_call label="Erstellen" name="Create"/>
-			<menu_item_call label="Land" name="Land"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
-		<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
-		<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
-		<menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/>
-		<menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/>
-		<menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="An Raster ausrichten" name="Snap to Grid"/>
-		<menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/>
-		<menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/>
-		<menu_item_call label="Rasteroptionen..." name="Grid Options..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
+			<menu_item_call label="Werkzeug „Erstellen&quot;" name="Create"/>
+			<menu_item_call label="Land-Werkzeug" name="Land"/>
+		</menu>
+		<menu label="Bearbeiten" name="Edit">
+			<menu_item_call label="Rückgängig" name="Undo"/>
+			<menu_item_call label="Wiederherstellen" name="Redo"/>
+			<menu_item_call label="Ausschneiden" name="Cut"/>
+			<menu_item_call label="Kopieren" name="Copy"/>
+			<menu_item_call label="Einfügen" name="Paste"/>
+			<menu_item_call label="Löschen" name="Delete"/>
+			<menu_item_call label="Duplizieren" name="Duplicate"/>
+			<menu_item_call label="Alle auswählen" name="Select All"/>
+			<menu_item_call label="Auswahl aufheben" name="Deselect"/>
+		</menu>
 		<menu_item_call label="Verknüpfung" name="Link"/>
-		<menu_item_call label="Verknüpfung aufheben" name="Unlink"/>
-		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Verknüpfung auflösen" name="Unlink"/>
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
-		<menu_item_call label="Objekt kaufen" name="Menu Object Take">
-			<on_enable userdata="Kaufen,Nehmen" name="EnableBuyOrTake"/>
-		</menu_item_call>
-		<menu_item_call label="Kopie nehmen/machen" name="Take Copy"/>
-		<menu_item_call label="Objekt wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Skriptwarnung/Fehlerfenster anzeigen" name="Show Script Warning/Error Window"/>
-		<menu label="Skripte in Auswahl neu kompilieren" name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono"/>
-			<menu_item_call label="LSL" name="LSL"/>
-		</menu>
-		<menu_item_call label="Skripte in Auswahl zurücksetzen" name="Reset Scripts in Selection"/>
-		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie ausgeführt werden" name="Set Scripts to Running in Selection"/>
-		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie nicht ausgeführt werden" name="Set Scripts to Not Running in Selection"/>
+		<menu label="Objekt" name="Object">
+			<menu_item_call label="Kaufen" 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"/>
+		</menu>
+		<menu label="Skripts" name="Scripts">
+			<menu_item_call label="Skripts rekompilieren (Mono)" name="Mono"/>
+			<menu_item_call label="Skripts rekompilieren (LSL)" name="LSL"/>
+			<menu_item_call label="Skripts zurücksetzen" name="Reset Scripts"/>
+			<menu_item_call label="Skripts auf ausführen einstellen" name="Set Scripts to Running"/>
+			<menu_item_call label="Skripts auf nicht ausführen einstellen" name="Set Scripts to Not Running"/>
+		</menu>
+		<menu label="Optionen" name="Options">
+			<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
+			<menu_item_call label="Hochlade-Berechtigungen (Standard) festlegen" name="perm prefs"/>
+			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
+			<menu label="Auswahl" name="Selection">
+				<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
+				<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
+				<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
+			</menu>
+			<menu label="Anzeigen" name="Show">
+				<menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/>
+				<menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/>
+				<menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/>
+			</menu>
+			<menu label="Raster" name="Grid">
+				<menu_item_check label="An Raster ausrichten" name="Snap to Grid"/>
+				<menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/>
+				<menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/>
+				<menu_item_call label="Rasteroptionen" name="Grid Options"/>
+			</menu>
+		</menu>
+		<menu label="Verknüpfte Teile auswählen" name="Select Linked Parts">
+			<menu_item_call label="Nächstes Teil auswählen" name="Select Next Part"/>
+			<menu_item_call label="Vorheriges Teil auswählen" name="Select Previous Part"/>
+			<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
+			<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
+		</menu>
 	</menu>
 	<menu label="Hilfe" name="Help">
-		<menu_item_call label="Hilfe zu [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
 		<menu_item_call label="Tutorial" name="Tutorial"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Offizielles Linden-Blog..." name="Official Linden Blog..."/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Scripting-Portal..." name="Scripting Portal...">
-			<on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/de" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Missbrauch melden..." name="Report Abuse..."/>
-		<menu_item_call label="Rempler, Stöße und Schläge..." name="Bumps, Pushes &amp;amp; Hits..."/>
-		<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu label="Fehlermeldungen" name="Bug Reporting">
-			<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...">
-				<on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/de" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator7"/>
-			<menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101...">
-				<on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/de"/>
-			</menu_item_call>
-			<menu_item_call label="Sicherheitsfragen..." name="Security Issues...">
-				<on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/de"/>
-			</menu_item_call>
-			<menu_item_call label="QA-Wiki..." name="QA Wiki..."/>
-			<menu_item_separator label="-----------" name="separator9"/>
-			<menu_item_call label="Fehler melden..." name="Report Bug..."/>
-		</menu>
-		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
+		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
+		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
+	</menu>
+	<menu label="Erweitert" name="Advanced">
+		<menu_item_check label="Nach 30 Min auf Abwesend stellen" name="Go Away/AFK When Idle"/>
+		<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
+		<menu_item_call label="Textur neu laden" name="Rebake Texture"/>
+		<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
+		<menu_item_check label="Auswahldistanz einschränken" name="Limit Select Distance"/>
+		<menu_item_check label="Kamerabeschränkungen deaktivieren" name="Disable Camera Distance"/>
+		<menu_item_check label="Foto (hohe Auflösung)" name="HighResSnapshot"/>
+		<menu_item_check label="Fotos auf Festplatte leise speichern" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="Fotos auf Festplatte komprimieren" name="CompressSnapshotsToDisk"/>
+		<menu_item_call label="Textur speichern als" name="Save Texture As"/>
+		<menu label="Performance Tools" name="Performance Tools">
+			<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
+			<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
+			<menu_item_check label="Avatar-Darstellungskosten anzeigen" name="Avatar Rendering Cost"/>
+		</menu>
+		<menu label="Hervorhebung und Sichtbarkeit" name="Highlighting and Visibility">
+			<menu_item_check label="Pulsierender Strahl" name="Cheesy Beacon"/>
+			<menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
+			<menu_item_check label="Auswahl ausblenden" name="Hide Selected"/>
+			<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
+			<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
+			<menu_item_check label="Fadenkreuz für Mouselook anzeigen" name="ShowCrosshairs"/>
+			<menu_item_check label="Land-Kurzinfos anzeigen" name="Land Tips"/>
+		</menu>
+		<menu label="Darstellungstypen" name="Rendering Types">
+			<menu_item_check label="Einfach" name="Simple"/>
+			<menu_item_check label="Alpha" name="Alpha"/>
+			<menu_item_check label="Baum" name="Tree"/>
+			<menu_item_check label="Avatare" name="Character"/>
+			<menu_item_check label="SurfacePath" name="SurfacePath"/>
+			<menu_item_check label="Himmel" name="Sky"/>
+			<menu_item_check label="Wasser" name="Water"/>
+			<menu_item_check label="Boden" name="Ground"/>
+			<menu_item_check label="Volumen" name="Volume"/>
+			<menu_item_check label="Gras" name="Grass"/>
+			<menu_item_check label="Wolken" name="Clouds"/>
+			<menu_item_check label="Partikel" name="Particles"/>
+			<menu_item_check label="Unebenheiten" name="Bump"/>
+		</menu>
+		<menu label="Rederning-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"/>
+			<menu_item_check label="Dynamische Texturen" name="Dynamic Textures"/>
+			<menu_item_check label="Fußschatten" name="Foot Shadows"/>
+			<menu_item_check label="Nebel" name="Fog"/>
+			<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_call label="Gruppen-Cache löschen" name="ClearGroupCache"/>
+		<menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/>
+		<menu_item_check label="IMs in lokalem Chat anzeigen" name="IMInChat"/>
+		<menu label="Tastaturkürzel" name="Shortcuts">
+			<menu_item_check label="Suchen" name="Search"/>
+			<menu_item_call label="Tasten freigeben" name="Release Keys"/>
+			<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
+			<menu_item_check label="Immer rennen" name="Always Run"/>
+			<menu_item_check label="Fliegen" name="Fly"/>
+			<menu_item_call label="Fenster schließen" name="Close Window"/>
+			<menu_item_call label="Alle Fenster schließen" name="Close All Windows"/>
+			<menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk"/>
+			<menu_item_call label="Mouselook" name="Mouselook"/>
+			<menu_item_check label="Joystick-Flycam" name="Joystick Flycam"/>
+			<menu_item_call label="Ansicht zurücksetzen" name="Reset View"/>
+			<menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter"/>
+			<menu label="Bauwerkzeug auswählen" name="Select Tool">
+				<menu_item_call label="Fokus-Werkzeug" name="Focus"/>
+				<menu_item_call label="Werkzeug „Bewegen“" name="Move"/>
+				<menu_item_call label="Bearbeiten" name="Edit"/>
+				<menu_item_call label="Werkzeug „Erstellen&quot;" name="Create"/>
+				<menu_item_call label="Land-Werkzeug" name="Land"/>
+			</menu>
+			<menu_item_call label="Hineinzoomen" name="Zoom In"/>
+			<menu_item_call label="Zoom-Standard" name="Zoom Default"/>
+			<menu_item_call label="Wegzoomen" name="Zoom Out"/>
+			<menu_item_call label="Vollbild" name="Toggle Fullscreen"/>
+		</menu>
+		<menu_item_call label="Debug-Einstellungen anzeigen" name="Debug Settings"/>
+		<menu_item_check label="Menü „Entwickler“ anzeigen" name="Debug Mode"/>
+	</menu>
+	<menu label="Entwickler" name="Develop">
+		<menu label="Konsolen" name="Consoles">
+			<menu_item_check label="Textur" name="Texture Console"/>
+			<menu_item_check label="Fehler beseitigen" name="Debug Console"/>
+			<menu_item_call label="Konsole: Meldungen" name="Notifications"/>
+			<menu_item_check label="Texturgröße" name="Texture Size"/>
+			<menu_item_check label="Texture-Kategorie" name="Texture Category"/>
+			<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
+			<menu_item_check label="Speicher" name="Memory"/>
+			<menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/>
+			<menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/>
+			<menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/>
+			<menu_item_check label="Kamera" name="Camera"/>
+			<menu_item_check label="Wind" name="Wind"/>
+			<menu_item_check label="FOV" name="FOV"/>
+		</menu>
+		<menu label="Info anzeigen" name="Display Info">
+			<menu_item_check label="Zeit anzeigen" name="Show Time"/>
+			<menu_item_check label="Render-Info anzeigen" name="Show Render Info"/>
+			<menu_item_check label="Matrizen anzeigen" name="Show Matrices"/>
+			<menu_item_check label="Farbe unter Cursor anzeigen" name="Show Color Under Cursor"/>
+			<menu_item_check label="Akutalisierungen an Objekten anzeigen" name="Show Updates"/>
+		</menu>
+		<menu label="Fehler erzwingen" name="Force Errors">
+			<menu_item_call label="Haltepunkt erzwingen" name="Force Breakpoint"/>
+			<menu_item_call label="LLError erzwingen und abstürzen" name="Force LLError And Crash"/>
+			<menu_item_call label="Erzwinge fehlerhaften Speicherzugriff" name="Force Bad Memory Access"/>
+			<menu_item_call label="Endlosschleife erzwingen" name="Force Infinite Loop"/>
+			<menu_item_call label="Treiber-Crash erzwingen" name="Force Driver Carsh"/>
+			<menu_item_call label="Softwareausnahme erzwingen" name="Force Software Exception"/>
+			<menu_item_call label="Verbindungsabbruch erzwingen" name="Force Disconnect Viewer"/>
+			<menu_item_call label="Speicherverlust simulieren" name="Memory Leaking Simulation"/>
+		</menu>
+		<menu label="Render-Tests" name="Render Tests">
+			<menu_item_check label="Kamera-Versatz" name="Camera Offset"/>
+			<menu_item_check label="Framerate randomisieren" name="Randomize Framerate"/>
+			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
+			<menu_item_check label="Frame-Test" name="Frame Test"/>
+		</menu>
+		<menu label="Metadaten darstellen" name="Render Metadata">
+			<menu_item_check label="Bonding Boxes" name="Bounding Boxes"/>
+			<menu_item_check label="Octree" name="Octree"/>
+			<menu_item_check label="Shadow Frusta" name="Shadow Frusta"/>
+			<menu_item_check label="Okklusion" name="Occlusion"/>
+			<menu_item_check label="Bündel rendern" name="Render Batches"/>
+			<menu_item_check label="Texture-Anim" name="Texture Anim"/>
+			<menu_item_check label="Textur-Priorität" name="Texture Priority"/>
+			<menu_item_check label="Texturbereich" name="Texture Area"/>
+			<menu_item_check label="Oberflächenbereich" name="Face Area"/>
+			<menu_item_check label="Lichter" name="Lights"/>
+			<menu_item_check label="Gelenkpunkte" name="Collision Skeleton"/>
+			<menu_item_check label="Raycast" name="Raycast"/>
+		</menu>
+		<menu label="Rendering" name="Rendering">
+			<menu_item_check label="Achsen" name="Axes"/>
+			<menu_item_check label="Tangentenbasis" name="Tangent Basis"/>
+			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
+			<menu_item_check label="Wireframe" name="Wireframe"/>
+			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
+			<menu_item_check label="Framebuffer-Objekte" name="Framebuffer Objects"/>
+			<menu_item_check label="Deferred Rendering" name="Deferred Rendering"/>
+			<menu_item_check label="Globale Beleuchtung" name="Global Illumination"/>
+			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
+			<menu_item_check label="Fehler in Pipeline beseitigen" name="Debug Pipeline"/>
+			<menu_item_check label="Schnelles Alpha" name="Fast Alpha"/>
+			<menu_item_check label="Animationstexturen" name="Animation Textures"/>
+			<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
+			<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
+			<menu_item_check label="Texturen prüfen" name="Audit Textures"/>
+			<menu_item_check label="Textur-Atlas" name="Texture Atlas"/>
+			<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
+			<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>
+			<menu_item_check label="Leucht-Objekte schweben lassen" name="Hover Glow Objects"/>
+		</menu>
+		<menu label="Netzwerk" name="Network">
+			<menu_item_check label="Agent pausieren" name="AgentPause"/>
+			<menu_item_call label="Meldungsprotokoll aktivieren" name="Enable Message Log"/>
+			<menu_item_call label="Meldungs-Protokoll deaktivieren" name="Disable Message Log"/>
+			<menu_item_check label="Objektposition laut Geschwindigkeit interpolieren" name="Velocity Interpolate Objects"/>
+			<menu_item_check label="Positionen der interpolierten Objekte anfragen" name="Ping Interpolate Object Positions"/>
+			<menu_item_call label="Ein Paket fallenlassen" name="Drop a Packet"/>
+		</menu>
+		<menu_item_call label="Geskriptete Kamera ausgeben" name="Dump Scripted Camera"/>
+		<menu_item_call label="Rempler, Stöße &amp; Schläge" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu label="Rekorder" name="Recorder">
+			<menu_item_call label="Wiedergabe starten" name="Start Playback"/>
+			<menu_item_call label="Wiedergabe stoppen" name="Stop Playback"/>
+			<menu_item_check label="Wiedergabeschleife" name="Loop Playback"/>
+			<menu_item_call label="Aufnahme starten" name="Start Record"/>
+			<menu_item_call label="Aufnahme stoppen" name="Stop Record"/>
+		</menu>
+		<menu label="Welt" name="World">
+			<menu_item_check label="Sonnen-Override für Sim" name="Sim Sun Override"/>
+			<menu_item_check label="Pulsierender Strahl" name="Cheesy Beacon"/>
+			<menu_item_check label="Festgelegtes Wetter" name="Fixed Weather"/>
+			<menu_item_call label="Regionsobjekt-Cache ausgeben" name="Dump Region Object Cache"/>
+		</menu>
+		<menu label="UI" name="UI">
+			<menu_item_call label="Web-Browser-Test" name="Web Browser Test"/>
+			<menu_item_call label="SelectMgr ausgeben" name="Dump SelectMgr"/>
+			<menu_item_call label="Inventarinfo ausgeben" name="Dump Inventory"/>
+			<menu_item_call label="Timer ausgeben" name="Dump Timers"/>
+			<menu_item_call label="Fokus ausgeben" name="Dump Focus Holder"/>
+			<menu_item_call label="Ausgewählte Objektinfo drucken" name="Print Selected Object Info"/>
+			<menu_item_call label="Agent-Info drucken" name="Print Agent Info"/>
+			<menu_item_call label="Speicher-Stats" name="Memory Stats"/>
+			<menu_item_check label="Double-ClickAuto-Pilot" name="Double-ClickAuto-Pilot"/>
+			<menu_item_check label="Fehler in SelectMgr beseitigen" name="Debug SelectMgr"/>
+			<menu_item_check label="Fehler in Klicks beseitigen" name="Debug Clicks"/>
+			<menu_item_check label="Debug-Ansichten" name="Debug Views"/>
+			<menu_item_check label="Kurzinfos: Debug-Namen" name="Debug Name Tooltips"/>
+			<menu_item_check label="Fehler in Maus-Events beseitigen" name="Debug Mouse Events"/>
+			<menu_item_check label="Fehler in Keys beseitigen" name="Debug Keys"/>
+			<menu_item_check label="Fehler in WindowProc beseitigen" name="Debug WindowProc"/>
+		</menu>
+		<menu label="XUI" name="XUI">
+			<menu_item_call label="Farbeinstellungen neu laden" name="Reload Color Settings"/>
+			<menu_item_call label="Schriftarttest anzeigen" name="Show Font Test"/>
+			<menu_item_call label="Von XML laden" name="Load from XML"/>
+			<menu_item_call label="Als XML speichern" name="Save to XML"/>
+			<menu_item_check label="XUI-Namen anzeigen" name="Show XUI Names"/>
+			<menu_item_call label="Test-IMs senden" name="Send Test IMs"/>
+			<menu_item_call label="Inspektoren testen" name="Test Inspectors"/>
+		</menu>
+		<menu label="Avatar" name="Character">
+			<menu label="Geladene Textur nehmen" name="Grab Baked Texture">
+				<menu_item_call label="Iris" name="Iris"/>
+				<menu_item_call label="Kopf" name="Head"/>
+				<menu_item_call label="Oberkörper" name="Upper Body"/>
+				<menu_item_call label="Unterkörper" name="Lower Body"/>
+				<menu_item_call label="Rock" name="Skirt"/>
+			</menu>
+			<menu label="Avatar-Tests" name="Character Tests">
+				<menu_item_call label="Aussehen als XML speichern" name="Appearance To XML"/>
+				<menu_item_call label="Avatargeometry ein-/ausschalten" name="Toggle Character Geometry"/>
+				<menu_item_call label="Männlich testen" name="Test Male"/>
+				<menu_item_call label="Weiblich testen" name="Test Female"/>
+				<menu_item_call label="PG ein-/ausschalten" name="Toggle PG"/>
+				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
+			</menu>
+			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
+			<menu_item_check label="Animations-Info" name="Animation Info"/>
+			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
+			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
+			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
+			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
+			<menu_item_check label="LOD deaktiveren" name="Disable LOD"/>
+			<menu_item_check label="Fehler für sichtbare Agenten beseitigen" name="Debug Character Vis"/>
+			<menu_item_check label="Gelenkpunkte anzeigen" name="Show Collision Skeleton"/>
+			<menu_item_check label="Agent-Ziel anzeigen" name="Display Agent Target"/>
+			--&gt;
+			<menu_item_call label="Anhänge ausgeben" name="Dump Attachments"/>
+			<menu_item_call label="Fehler in Avatar-Texturen beseitigen" name="Debug Avatar Textures"/>
+			<menu_item_call label="Lokale Texturen ausgeben" name="Dump Local Textures"/>
+		</menu>
+		<menu_item_call label="Bilder komprimieren" name="Compress Images"/>
+		<menu_item_check label="Ausgabe Fehlerbeseitigung ausgeben" name="Output Debug Minidump"/>
+		<menu_item_check label="Bei nächster Ausführung Fenster öffnen" name="Console Window"/>
+		<menu_item_check label="Admin-Menü anzeigen" name="View Admin Options"/>
+		<menu_item_call label="Admin-Status anfordern" name="Request Admin Options"/>
+		<menu_item_call label="Admin-Status verlassen" name="Leave Admin Options"/>
+	</menu>
+	<menu label="Admin" name="Admin">
+		<menu label="Object">
+			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+			<menu_item_call label="Besitzer zu mir zwingen" name="Force Owner To Me"/>
+			<menu_item_call label="Erlaubnis des Besitzers erzwingen" name="Force Owner Permissive"/>
+			<menu_item_call label="Löschen" name="Delete"/>
+			<menu_item_call label="Fest" name="Lock"/>
+			<menu_item_call label="Asset-ID zulassen" name="Get Assets IDs"/>
+		</menu>
+		<menu label="Parzelle" name="Parcel">
+			<menu_item_call label="Besitzer zu mir" name="Owner To Me"/>
+			<menu_item_call label="Auf Linden-Inhalt festlegen" name="Set to Linden Content"/>
+			<menu_item_call label="Öffentiches Land in Besitz nehmen" name="Claim Public Land"/>
+		</menu>
+		<menu label="Region" name="Region">
+			<menu_item_call label="Temp-Asset-Daten ausgeben" name="Dump Temp Asset Data"/>
+			<menu_item_call label="Regions-Status speichern" name="Save Region State"/>
+		</menu>
+		<menu_item_call label="Gott-Tools" name="God Tools"/>
+	</menu>
+	<menu label="Admin" name="Deprecated">
+		<menu label="Objekt anhängen" name="Attach Object"/>
+		<menu label="Objekt abnehmen" name="Detach Object"/>
+		<menu label="Kleider ausziehen" name="Take Off Clothing">
+			<menu_item_call label="Hemd" name="Shirt"/>
+			<menu_item_call label="Hose" name="Pants"/>
+			<menu_item_call label="Schuhe" name="Shoes"/>
+			<menu_item_call label="Socken" name="Socks"/>
+			<menu_item_call label="Jacke" name="Jacket"/>
+			<menu_item_call label="Handschuhe" name="Gloves"/>
+			<menu_item_call label="Unterhemd" name="Menu Undershirt"/>
+			<menu_item_call label="Unterhose" name="Menu Underpants"/>
+			<menu_item_call label="Rock" name="Skirt"/>
+			<menu_item_call label="Alpha" name="Alpha"/>
+			<menu_item_call label="Tätowierung" name="Tattoo"/>
+			<menu_item_call label="Alle Kleider" name="All Clothes"/>
+		</menu>
+		<menu_item_check label="Werkzeugleiste anzeigen" name="Show Toolbar"/>
+		<menu label="Hilfe" name="Help">
+			<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="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"/>
+				<menu_item_call label="QA-Wiki" name="QA Wiki"/>
+			</menu>
+		</menu>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 8b8a0afa89..7f5a561f74 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -56,12 +56,12 @@ Fehlerdetails: Der Warnhinweis &apos;[_NAME]&apos; wurde in notifications.xml ni
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
 	</notification>
 	<notification name="BadInstallation">
-		Beim Aktualisieren von [APP_NAME] ist ein Fehler aufgetreten.  Bitte laden Sie die aktuellste Version des Viewers herunter. http://get.secondlife.com
+		Beim Aktualisieren von [APP_NAME] ist ein Fehler aufgetreten.  Bitte [http://get.secondlife.com laden Sie die aktuellste Version des Viewers herunter].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
 		Eine Verbindung zum [SECOND_LIFE_GRID] konnte nicht hergestellt werden.
- &apos;[DIAGNOSTIC]&apos;
+&apos;[DIAGNOSTIC]&apos;
 Bitte vergewissern Sie sich, dass Ihre Internetverbindung funktioniert.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -156,6 +156,9 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="ClickUnimplemented">
+		Leider ist diese Funktion noch nicht implementiert.
+	</notification>
 	<notification name="JoinGroupCanAfford">
 		Der Beitritt zu dieser Gruppe kostet [COST] L$.
 Fortfahren?
@@ -186,9 +189,9 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
 		<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.
+		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] qm Land werden zum Verkauf freigegeben.
+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.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
@@ -249,6 +252,16 @@ Objekte: [N]
 Für die gesamte Region ist Schaden aktiviert.
 Damit Waffen funktionieren, müssen Skripts erlaubt sein.
 	</notification>
+	<notification name="MultipleFacesSelected">
+		Momentan sind mehrere Seiten ausgewählt. Wenn Sie fortfahren, werden einzelne Medien auf mehreren Seiten des Objektes dargestellt. Um die Medien auf einer einzigen Seite darzustellen, wählen Sie Textur auswählen und klicken Sie auf die gewünschte Seite. Danach klicken Sie Hinzufügen.
+		<usetemplate ignoretext="Die Medien werden auf mehrere ausgewählte Seiten übertragen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="WhiteListInvalidatesHomeUrl">
+		Wenn Sie diesen Eintrag zur Whitelist hinzufügen, dann wird die URL, 
+die Sie für diese Medien-Instanz festgelegt haben, ungültig. Dies ist nicht zulässig.
+Der Eintrag kann nicht zur Whitelist hinzugefügt werden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="MustBeInParcel">
 		Sie müssen auf einer Landparzelle stehen, um ihren Landepunkt festzulegen.
 	</notification>
@@ -284,6 +297,10 @@ Der Outfit-Ordner enthält keine Kleidung, Körperteile oder Anhänge.
 	<notification name="CannotWearTrash">
 		Kleider oder Körperteile im Papierkorb können nicht getragen werden
 	</notification>
+	<notification name="MaxAttachmentsOnOutfit">
+		Objekt konnte nicht angehängt werden.
+Überschreitet die maximale Anzahl an Objekten [MAX_ATTACHMENTS], die angehängt werden können. Bitte nehmen Sie zunächst ein anderes Objekt ab.
+	</notification>
 	<notification name="CannotWearInfoNotComplete">
 		Sie können das Objekt nicht anziehen, weil es noch nicht geladen wurde. Warten Sie kurz und versuchen Sie es dann noch einmal.
 	</notification>
@@ -298,7 +315,10 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
 		<usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/>
 	</notification>
 	<notification name="AddClassified">
-		Anzeigen erscheinen für eine Woche unter „Anzeigen“ im Suchverzeichnis. Füllen Sie Ihre Anzeige aus und klicken Sie auf „Veröffentlichen...“, um sie zum Verzeichnis hinzuzufügen. Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf „Veröffentlichen“ klicken. Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht, erscheint Ihre Anzeige weiter oben in der Liste.
+		Anzeigen werden im Suchverzeichnis im Abschnitt „Anzeigen&quot; und auf [http://secondlife.com/community/classifieds secondlife.com] für eine Woche angezeigt.
+Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum Verzeichnis hinzuzufügen.
+Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.
+Wenn Sie mehr bezahlen, erscheint Ihre Anzeige weiter oben in der Liste, ebenso wenn ein Benutzer nach Ihren Suchbegriffen sucht.
 		<usetemplate ignoretext="So wird eine neue Anzeige erstellt" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="DeleteClassified">
@@ -306,6 +326,11 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
 Gebühren werden nicht rückerstattet.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="DeleteMedia">
+		Sie haben sich entschieden, die Medien auf dieser Seite zu löschen.
+Sind Sie sicher, dass Sie fortfahren wollen?
+		<usetemplate ignoretext="Bestätigen, bevor ich Medien von einem Objekt entferne." name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="ClassifiedSave">
 		Änderung an Anzeige [NAME] speichern?
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Speichern"/>
@@ -346,7 +371,7 @@ Hinweis: Der Cache wird dabei gelöscht/geleert.
 		Die Port-Einstellungen werden nach einem Neustart von [APP_NAME] wirksam.
 	</notification>
 	<notification name="ChangeSkin">
-		Die neue Benutzeroberfläche wird nach einem Neustart von [APP_NAME] angewendet.
+		Die neue Benutzeroberfläche wird nach einem Neustart von [APP_NAME] angezeigt.
 	</notification>
 	<notification name="GoToAuctionPage">
 		Zur [SECOND_LIFE]-Webseite, um Auktionen anzuzeigen oder ein Gebot abzugeben?
@@ -398,7 +423,7 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
 		Ein kompiliertes Skript konnte aus folgendem Grund nicht gespeichert werden: [REASON].  Speichern Sie das Skript bitte später.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Sie haben keine Start-Region festgelegt. 
+		Sie haben keine Start-Region festgelegt.
 Bitte geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Heimatort“ als Startposition aus.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -425,17 +450,16 @@ Die Seite [_URL] für weitere Informationen öffnen?
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine uns zurzeit unbekannte Grafikkarte.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  [APP_NAME] wird wahrscheinlich korrekt ausgeführt werden, jedoch sollten Sie Ihre Grafikeinstellungen anpassen, um eine bessere Darstellung zu erzielen.
-(Einstellungen &gt; Grafik).
+(Ich &gt; Einstellungen &gt; Grafik).
 		<form name="form">
 			<ignore name="ignore" text="Meine Grafikkarte konnte nicht identifiziert werden."/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
 		[APP_NAME] ist bei der Initialisierung der Grafiktreiber abgestürzt.
-Die Grafikqualität wird auf eine niedrige Stufe zurückgesetzt, um einige typische Treiberfehler zu vermeiden.
-Einige Grafikfunktionen werden ausgeschaltet.
+Die Grafikqualität wird auf Niedrig gesetzt, um einige typische Treiberfehler zu vermeiden. Einige Grafikfunktionen werden ausgeschaltet.
 Wir empfehlen die Aktualisierung Ihrer Grafikkartentreiber.
-Sie können die Grafikqualität unter „Einstellungen“ &gt; „Grafik“ wieder erhöhen.
+Sie können die Grafikqualität unter Einstellungen &gt; Grafik wieder erhöhen.
 	</notification>
 	<notification name="RegionNoTerraforming">
 		Die Region [REGION] erlaubt kein Terraforming.
@@ -486,6 +510,9 @@ Der Avatar wird außer Gefecht gesetzt und kann sich nicht mehr bewegen, chatten
 		[AVATAR_NAME] aus Ihrem Land werfen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Hinauswerfen"/>
 	</notification>
+	<notification name="EjectAvatarFromGroup">
+		Sie haben [AVATAR_NAME] aus der Gruppe [GROUP_NAME] geworfen.
+	</notification>
 	<notification name="AcquireErrorTooManyObjects">
 		FEHLER: Zu viele Objekte ausgewählt.
 	</notification>
@@ -616,6 +643,9 @@ Wählen Sie Objekte mit Skripts.
 
 Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
 	</notification>
+	<notification name="CannotOpenScriptObjectNoMod">
+		Das Skript im Objekt kann nicht geöffnet werden, da keine Änderungs-Berechtigungen vorliegen.
+	</notification>
 	<notification name="CannotSetRunningSelectObjectsNoScripts">
 		„Ausführen“ von Skripts nicht möglich.
 
@@ -648,7 +678,7 @@ Es wurde keine Suche durchgeführt.
 Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_SITE].
 	</notification>
 	<notification name="invalid_region_handoff">
-		Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen sich zum Wechsel der Region eventuell neu anmelden.
+		Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen eventuell neu anmelden, um die Region wechseln zu können.
 Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_SITE].
 	</notification>
 	<notification name="blocked_tport">
@@ -720,7 +750,7 @@ Keine Parzelle ausgewählt.
 Kann die Region nicht finden, in der sich dieses Land befindet.
 	</notification>
 	<notification name="CannotCloseFloaterBuyLand">
-		Das Fenster „Land kaufen“ kann erst geschlossen werden, nachdem [APP_NAME] den Transaktionspreis geschätzt hat.
+		Das Fenster Land kaufen kann nicht geschlossen werden, bevor [APP_NAME] den Preis für diese Transaktion eingeschätzt hat.
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
 		Land kann nicht übertragen werden:
@@ -872,7 +902,7 @@ Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen
 	<notification name="YouHaveBeenLoggedOut">
 		Sie wurden von [SECOND_LIFE] abgemeldet:
             [MESSAGE]
-Klicken Sie auf „IM &amp; Chat anzeigen“, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Klicken Sie andernfalls auf „Beenden“, um [APP_NAME] sofort zu beenden.
+Klicken Sie auf „IM &amp; Chat anzeigen“, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Um [APP_NAME] zu schließen, auf „Beenden“ klicken.
 		<usetemplate name="okcancelbuttons" notext="Beenden" yestext="IM &amp; Chat anzeigen"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1052,10 +1082,10 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
 		</form>
 	</notification>
 	<notification name="FirstRun">
-		Die Installation von [APP_NAME] ist abgeschlossen.
+		Installation von [APP_NAME] vollständig abgeschlossen.
 
-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen, bevor Sie sich anmelden können.
-Möchten Sie auf [https://join.secondlife.com/index.php?lang=de-DE secondlife.com] ein Konto erstellen?
+Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto erstellen, bevor Sie sich anmelden können.
+Zurück zu [http://join.secondlife.com secondlife.com], um ein neues Konto zu erstellen?
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
@@ -1084,10 +1114,10 @@ Sie können sich später noch umentscheiden.
 		[NAME] [PRICE] L$  Sie haben nicht genügend L$, um diese Aktion auszuführen.
 	</notification>
 	<notification name="GrantedModifyRights">
-		[FIRST_NAME] [LAST_NAME] hat Ihnen die Erlaubnis erteilt, ihre/seine Objekte zu bearbeiten.
+		[NAME] hat Ihnen die Erlaubnis erteilt, ihre/seine Objekte zu bearbeiten.
 	</notification>
 	<notification name="RevokedModifyRights">
-		Ihnen wurden die Änderungsrechte für die Objekte von [FIRST_NAME] [LAST_NAME] entzogen.
+		Ihnen wurden die Änderungsrechte für die Objekte von [NAME] entzogen.
 	</notification>
 	<notification name="FlushMapVisibilityCaches">
 		Der Kartencache dieser Region wird geleert.
@@ -1165,19 +1195,19 @@ Geben Sie das Objekt zum Verkauf frei und versuchen Sie es erneut.
 [DOWNLOAD_PATH].
 	</notification>
 	<notification name="DownloadWindowsMandatory">
-		Eine neue Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [SUPPORT_SITE] ist verfügbar.
 [MESSAGE]
 Sie müssen das Update herunterladen, um [APP_NAME] weiter verwenden zu können.
 		<usetemplate name="okcancelbuttons" notext="Beenden" yestext="Herunterladen"/>
 	</notification>
 	<notification name="DownloadWindows">
-		Eine aktualisierte Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [APP_NAME] ist verfügbar.
 [MESSAGE]
 Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Herunterladen"/>
 	</notification>
 	<notification name="DownloadWindowsReleaseForDownload">
-		Eine aktualisierte Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [APP_NAME] ist verfügbar.
 [MESSAGE]
 Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Herunterladen"/>
@@ -1201,7 +1231,7 @@ Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität soll
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Herunterladen"/>
 	</notification>
 	<notification name="DownloadMacMandatory">
-		Eine neue Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [SUPPORT_SITE] ist verfügbar.
 [MESSAGE]
 Sie müssen das Update herunterladen, um [APP_NAME] weiter verwenden zu können.
 
@@ -1209,7 +1239,7 @@ In Ihren Anwendungsordner herunterladen?
 		<usetemplate name="okcancelbuttons" notext="Beenden" yestext="Herunterladen"/>
 	</notification>
 	<notification name="DownloadMac">
-		Eine aktualisierte Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [APP_NAME] ist verfügbar.
 [MESSAGE]
 Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.
 
@@ -1217,7 +1247,7 @@ In Ihren Anwendungsordner herunterladen?
 		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Herunterladen"/>
 	</notification>
 	<notification name="DownloadMacReleaseForDownload">
-		Eine aktualisierte Version von [APP_NAME] ist verfügbar.
+		Eine neue Version von [APP_NAME] ist verfügbar.
 [MESSAGE]
 Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.
 
@@ -1234,7 +1264,7 @@ In Ihren Anwendungsordner herunterladen?
 		<usetemplate ignoretext="Meinen Browser starten, um eine Webseite anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
-		de.secondlife.com öffnen, um Ihr Konto zu verwalten?
+		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihr Konto zu verwalten?
 		<usetemplate ignoretext="Meinen Browser starten, um mein Konto zu verwalten" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
@@ -1277,14 +1307,14 @@ Diese Gruppe verlassen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
 	</notification>
 	<notification name="MuteLinden">
-		Lindens können nicht stummgeschaltet werden.
+		Lindens können nicht ignoriert werden.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CannotStartAuctionAlreadyForSale">
 		Eine Parzelle, die bereits zum Verkauf freigegeben ist, kann nicht versteigert werden.  Deaktivieren Sie den Landverkauf, wenn Sie das Land zur Versteigerung freigeben möchten.
 	</notification>
-	<notification label="Objekt nach Name stummschalten fehlgeschlagen" name="MuteByNameFailed">
-		Dieser Name ist bereits stummgeschaltet.
+	<notification label="Objekt nach Name ignorieren ist fehlgeschlagen" name="MuteByNameFailed">
+		Dieser Name wird bereits ignoriert.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveItemWarn">
@@ -1378,6 +1408,10 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht
 		Nach [PICK] teleportieren?
 		<usetemplate ignoretext="Bestätigen, dass ich zu einer Position in Auswahl teleportieren möchte" name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/>
 	</notification>
+	<notification name="TeleportToClassified">
+		Zu [CLASSIFIED] teleportieren?
+		<usetemplate ignoretext="Bestätigen, dass ich zu einer Position in Anzeigen teleportieren möchte." name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/>
+	</notification>
 	<notification label="Nachricht an alle auf diesem Grundstück" name="MessageEstate">
 		Geben Sie eine kurze Nachricht ein, die an jede Person auf Ihrem Grundstück gesendet wird.
 		<form name="form">
@@ -1462,7 +1496,7 @@ Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Alterein
 	<notification name="RegionEntryAccessBlocked_Change">
 		Sie dürfen diese Region aufgrund der Einstellung Ihrer Alterseinstufung nicht betreten.
 
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen... &gt; Allgemein.
+Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
 		<form name="form">
 			<button name="OK" text="Einstellung ändern"/>
 			<button name="Cancel" text="Schließen"/>
@@ -1490,7 +1524,7 @@ Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Alterein
 	<notification name="LandClaimAccessBlocked_Change">
 		Sie haben aufgrund der Einstellung Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
 
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen... &gt; Allgemein.
+Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
 		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich auf Land Anspruch erhebe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
@@ -1514,11 +1548,11 @@ Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Alterein
 	<notification name="LandBuyAccessBlocked_Change">
 		Sie können aufgrund Ihrer Einstellung für Alterseinstufung dieses Land nicht kaufen.
 
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen... &gt; Allgemein.
+Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
 		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich Land kaufe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
 	</notification>
 	<notification name="TooManyPrimsSelected">
-		&quot;Zu viele Prims wurden ausgewählt.  Bitte wählen Sie höchstens [MAX_PRIM_COUNT] Prims aus und versuchen Sie es erneut.&quot;
+		Zu viele Prims wurden ausgewählt.  Bitte wählen Sie höchstens [MAX_PRIM_COUNT] Prims aus und versuchen Sie es erneut.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ProblemImportingEstateCovenant">
@@ -1574,7 +1608,7 @@ Anzeige für [AMOUNT] L$ veröffentlichen?
 Es kann eine Weile dauern, bis sich die Änderung auf die Karte auswirkt.
 	</notification>
 	<notification label="Falsche Voice-Version" name="VoiceVersionMismatch">
-		Diese Version von [APP_NAME] mit dem Voice-Chat-Feature in dieser Region nicht kompatibel. Damit Voice-Chat funktioniert, müssen Sie [APP_NAME] aktualisieren.
+		Diese Version von [APP_NAME] ist mit der Voice-Chat-Funktion in dieser Region nicht kompatibel. Damit Voice-Chat funktioniert, müssen Sie [APP_NAME] aktualisieren.
 	</notification>
 	<notification label="Objekte können nicht gekauft werden" name="BuyObjectOneOwner">
 		Objekte können nicht von mehreren Eigentümern gleichzeitig gekauft werden.
@@ -1682,7 +1716,7 @@ Inventarobjekt(e) verschieben?
 		Sie haben keine Berechtigung zum Kopieren von Elementen in diesem Objekt.
 	</notification>
 	<notification name="WebLaunchAccountHistory">
-		de.secondlife.com öffnen, um Ihre Konto-Statistik anzuzeigen?
+		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
 	<notification name="ConfirmQuit">
@@ -1690,19 +1724,19 @@ Inventarobjekt(e) verschieben?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Verwenden Sie dieses Tool, um Verletzungen der [http://secondlife.com/corporate/tos.php?lang=de-DE Servicebedingungen] und [http://secondlife.com/corporate/cs.php?lang=de-DE Community-Standards] zu melden.
-
-Alle gemeldeten Verletzungen der Servicebedingungen und Community-Standards werden geprüft und geklärt Sie können den Prozess im Incident Report (Vorfallsbericht) verfolgen:
+		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.
 
-http://secondlife.com/support/incidentreport.php
+Alle gemeldeten Verstöße werden bearbeitet. Sie können auf der Seite [http://secondlife.com/support/incidentreport.php Verstoßmeldungen] nachverfolgen, welche Verstoßmeldungen bearbeitet wurden.
 	</notification>
 	<notification name="HelpReportAbuseEmailEO">
 		WICHTIG: Diese Meldung wird an den Eigentümer der Region gesendet, in der Sie sich gerade befinden, nicht an Linden Lab.
--
-Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet. Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind.
-(Den Vertrag können Sie unter „Welt“ &gt; „Land-Info“ einsehen.)
--
-Das Resultat, das sich aus dieser Meldung ergibt, betrifft nur diese Region; der Einwohnerzugang zu anderen Bereichen von [SECOND_LIFE] ist davon nicht betroffen. Nur Linden Lab kann den Zugang zu [SECOND_LIFE] beschränken.
+
+Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet.
+
+Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind.
+(Den Vertrag können Sie unter  &apos;Welt &apos;  &gt;  &apos;Land-Info &apos; einsehen.)
+
+Die Klärung des gemeldeten Verstoßes bezieht sich nur auf diese Region. Der Zugang für Einwohner zu anderen Bereichen von [SECOND_LIFE] wird durch das Resultat dieser Meldung nicht beeinträchtigt. Nur Linden Lab kann den Zugang zu [SECOND_LIFE] beschränken.
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Wählen Sie eine Missbrauchskategorie aus.
@@ -1729,9 +1763,9 @@ Eine möglichst genaue Beschreibung mit Namen und Einzelheiten hilft uns, Fälle
 
 Sie melden eine Urheberrechtsverletzung. Sind Sie wirklich sicher, dass Sie eine Verletzung des Urheberrechts melden möchten?
 
-1. Missbrauch melden. Wenn Sie der Meinung sind, ein Einwohner nutzt das Berechtigungssystem von [SECOND_LIFE] auf unerlaubte Weise zu seinem Vorteil aus, indem er zum Beispiel einen CopyBot oder ähnliche Kopiertools verwendet und damit eine Urheberrechtsverletzung begeht, können Sie diesen Missbrauch melden. Das Missbrauchsteam untersucht etwaige Verstöße gegen die [SECOND_LIFE] Community Standards oder die Nutzungsbedingungen und verhängt entsprechende Strafen. Das Missbrauchsteam ist jedoch nicht dafür zuständig, Inhalte aus der [SECOND_LIFE]-Welt zu entfernen und reagiert auch nicht auf entsprechende Anfragen.
+1. Missbrauch melden. Wenn Sie der Meinung sind, ein Einwohner nutzt das Berechtigungssystem von [SECOND_LIFE] auf unerlaubte Weise zu seinem Vorteil aus, indem er zum Beispiel einen CopyBot oder ähnliche Kopiertools verwendet und damit eine Urheberrechtsverletzung begeht, können Sie diesen Missbrauch melden. Das Missbrauchsteam untersucht gemeldete Verstöße gegen die  [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Servicebedingungen] oder [http://secondlife.com/corporate/cs.php Community-Standards] und verhängt entsprechende Maßnahmen. Das Missbrauchsteam ist jedoch nicht dafür zuständig, Inhalte aus der  [SECOND_LIFE]-Welt zu entfernen und reagiert auch nicht auf entsprechende Anfragen.
 
-2. Der DMCA oder das Entfernen von Inhalten. Sie können das Entfernen von Inhalten aus [SECOND_LIFE] beantragen. Dazu MÜSSEN Sie eine Urheberrechtsverletzung gemäß den in unserer DMCA-Richtlinie unter http://secondlife.com/corporate/dmca.php dargelegten Anweisungen einreichen.
+2. Der DMCA oder das Entfernen von Inhalten. Sie können das Entfernen von Inhalten aus  [SECOND_LIFE] beantragen. Dazu MÜSSEN Sie eine Urheberrechtsverletzung gemäß den in unserer DMCA-Richtlinie unter  [http://secondlife.com/corporate/dmca.php] dargelegten Anweisungen einreichen.
 
 Wenn Sie mit der Missbrauchmeldung jetzt fortfahren möchten, schließen Sie bitte dieses Fenster und senden Sie Ihren Bericht ein.  Möglicherweise müssen Sie Kategorie „CopyBot oder Berechtigungs-Exploit“ auswählen.
 
@@ -1762,13 +1796,17 @@ Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschl
 			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">
+		Der Ordner „[FOLDERNAME]“ ist ein Systemordner. Das Löschen von Systemordnern kann zu instabiler Leistung führen.  Möchten Sie fortfahren?
+		<usetemplate ignoretext="Bestätigen, bevor ich einen Systemordner lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmEmptyTrash">
 		Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs löschen möchten?
 		<usetemplate ignoretext="Bestätigen, bevor der Ordner Papierkorb im Inventar geleert wird" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Sind Sie sicher, dass Sie Ihren Reise-, Internet- und Suchverlauf löschen möchten?
-		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
 		Sind Sie sicher, dass Sie Ihre Cookies löschen möchten?
@@ -1929,7 +1967,7 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		Terrain.raw heruntergeladen
 	</notification>
 	<notification name="GestureMissing">
-		Geste [NAME] fehlt in Datenbank.
+		Hmm. Geste [NAME] fehlt in Datenbank.
 	</notification>
 	<notification name="UnableToLoadGesture">
 		Geste [NAME] konnte nicht geladen werden.
@@ -2003,7 +2041,7 @@ Wählen Sie ein einzelnes Objekt aus.
 		Ihnen fehlt die Berechtigung zum Kopieren.
 	</notification>
 	<notification name="InventoryAccepted">
-		[NAME] hat Ihr Inventarangebot akzeptiert.
+		[NAME] hat Ihr Inventarangebot erhalten.
 	</notification>
 	<notification name="InventoryDeclined">
 		[NAME] hat Ihr Inventarangebot abgelehnt.
@@ -2018,12 +2056,14 @@ Wählen Sie ein einzelnes Objekt aus.
 		Ihre Visitenkarte wurde abgelehnt.
 	</notification>
 	<notification name="TeleportToLandmark">
-		Jetzt, nachdem Sie das Mainland erreicht haben, können Sie sich an Positionen wie „[NAME]“ teleportieren, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Landmarken“ auswählen.
-Klicken Sie eine Landmarke doppelt an und wählen Sie „Teleportieren“, um an diesen Ort zu gelangen.
+		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).
 	</notification>
 	<notification name="TeleportToPerson">
-		Jetzt, nachdem Sie das Mainland erreicht haben, können Sie mit Einwohnern wie „[NAME]“ Kontakt aufnehmen, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Visitenkarten“ auswählen.
-Klicken Sie die Karte doppelt an, wählen Sie „Instant Message“ und geben Sie eine Nachricht ein.
+		Sie können Einwohner wie „[NAME]“ kontaktieren, wenn Sie die Tafel „Leute“ auf der rechten Seite Ihres Bildschirms öffnen.
+Wählen Sie den Einwohner aus der Liste aus und klicken Sie unten auf „IM“.
+(Sie können auch auf den Namen doppelt klicken oder mit rechts auf den Namen klicken und dann „IM“ auswählen).
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Land kann nicht über Servergrenzen hinweg ausgewählt werden.
@@ -2070,8 +2110,8 @@ Wählen Sie eine kleinere Landfläche.
 [NAMES]
 	</notification>
 	<notification name="NoQuickTime">
-		Apple QuickTime ist auf Ihrem System anscheinend nicht installiert.
-Laden Sie QuickTime von der QuickTime-Webseite (http://www.apple.com/de/quicktime) herunter, um auf Parzellen, die diese Funktion unterstützen, Streaming-Inhalte wiederzugeben.
+		AppleQuickTime ist auf Ihrem System anscheinend nicht installiert.
+Laden Sie QuickTime von der [http://www.apple.com/quicktime QuickTime-Webseite]  herunter, um auf Parzellen, die diese Funktion unterstützen, Streaming-Inhalte wiederzugeben.
 	</notification>
 	<notification name="NoPlugin">
 		Es wurde kein Medien-Plugin gefunden, das &quot;[MIME_TYPE]&quot; ausführen kann.  Medien dieses Dateityps sind nicht verfügbar.
@@ -2103,6 +2143,11 @@ Nicht transferierbare an die Gruppe übertragene Objekte wurden gelöscht.
 	<notification name="UnOwnedObjectsReturned">
 		Alle Objekte auf der ausgewählten Parzelle, die NICHT Ihnen gehören, wurden ihren Eigentümern zurückgegeben.
 	</notification>
+	<notification name="ServerObjectMessage">
+		Nachricht von [NAME]:
+[MSG]
+		<usetemplate name="okcancelbuttons" notext="OK" yestext="Untersuchen"/>
+	</notification>
 	<notification name="NotSafe">
 		Auf diesem Land ist Schaden aktiviert.
 Verletzungen sind möglich. Wenn Sie sterben, werden Sie zu Ihrem Heimatstandort teleportiert.
@@ -2112,8 +2157,7 @@ Verletzungen sind möglich. Wenn Sie sterben, werden Sie zu Ihrem Heimatstandort
 Fliegen ist hier nicht möglich.
 	</notification>
 	<notification name="PushRestricted">
-		In diesem Bereich ist Stoßen nicht erlaubt.
-Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
+		In diesem Bereich ist Stoßen nicht erlaubt. Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
 	</notification>
 	<notification name="NoVoice">
 		In diesem Bereich ist Voice deaktiviert. Sie werden niemanden sprechen hören.
@@ -2149,6 +2193,9 @@ Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regione
 	<notification name="ImproperPaymentStatus">
 		Die für den Zutritt zu dieser Region erforderlichen Zahlungsinformationen liegen nicht vor.
 	</notification>
+	<notification name="MustGetAgeRgion">
+		Sie müssen alterüberprüft sein, um diese Region betreten zu können.
+	</notification>
 	<notification name="MustGetAgeParcel">
 		Sie müssen alterüberprüft sein, um diese Parzelle betreten zu können.
 	</notification>
@@ -2211,30 +2258,35 @@ Versuchen Sie es in einigen Minuten erneut.
 		Es konnte keine gültige Parzelle gefunden werden.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Das Objekt [OBJECTFROMNAME] von [FIRST] [LAST] hat Ihnen Folgendes übergeben: [OBJECTTYPE] ([OBJECTNAME]).
+		Ein Objekt namens [OBJECTFROMNAME] von [NAME_SLURL] hat Ihnen folgendes übergeben [OBJECTTYPE]:
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
 			<button name="Discard" text="Verwerfen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="ObjectGiveItemUnknownUser">
-		Das Objekt [OBJECTFROMNAME] von (unbekannt) hat Ihnen Folgendes übergeben: [OBJECTTYPE] ([OBJECTNAME]).
+		Ein Objekt namens [OBJECTFROMNAME] von (einem unbekannten Einwohner) hat Ihnen folgendes übergeben [OBJECTTYPE]:
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
 			<button name="Discard" text="Verwerfen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME] hat Ihnen ein [OBJECTTYPE] namens „[OBJECTNAME]“ gegeben.
+		[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE]:
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
+			<button name="Show" text="Anzeigen"/>
 			<button name="Discard" text="Verwerfen"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
 		[NAME]
+
 [MESSAGE]
 	</notification>
 	<notification name="JoinGroup">
@@ -2246,7 +2298,7 @@ Versuchen Sie es in einigen Minuten erneut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME] hat angeboten, Sie zu ihrem/seinem Standort zu teleportieren:
+		[NAME] hat Ihnen einen Teleport an seine/ihre Position angeboten:
 
 [MESSAGE]
 		<form name="form">
@@ -2297,7 +2349,7 @@ Dies erstellt ein Lesezeichen in Ihrem Inventar, damit Sie diesen Einwohner jede
 		</form>
 	</notification>
 	<notification name="RegionRestartMinutes">
-		Region wird in [MINUTES] Minuten neu gestartet.
+		Diese Region wird in [Minuten] neu gestartet.
 Wenn Sie in dieser Region bleiben, werden Sie abgemeldet.
 	</notification>
 	<notification name="RegionRestartSeconds">
@@ -2322,7 +2374,7 @@ Von Objekt: [OBJECTNAME], Eigentümer: [NAME]?
 		[TYPE] namens [DESC] nicht in Datenbank.
 	</notification>
 	<notification name="InvalidWearable">
-		Dieser Artikel verwendet eine Funktion, die Ihr Viewer nicht unterstützt. Bitte aktualisieren Sie Ihre Version von [APP_NAME], um diesen Artikel anziehen zu können.
+		Dieser Artikel verwendet eine Funktion, die Ihr Viewer nicht unterstützt. Bitte aktualisieren Sie Ihre Version von [APP_NAME], um dieses Objekt anziehen zu können.
 	</notification>
 	<notification name="ScriptQuestion">
 		Das Objekt „[OBJECTNAME]“, Eigentum von „[NAME]“, möchte:
@@ -2332,7 +2384,7 @@ Ist das OK?
 		<form name="form">
 			<button name="Yes" text="Ja"/>
 			<button name="No" text="Nein"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
@@ -2362,6 +2414,14 @@ Anfrage gestatten?
 			<button name="Ignore" text="Ignorieren"/>
 		</form>
 	</notification>
+	<notification name="ScriptToast">
+		[FIRST] [LAST]s &apos;[TITLE]&apos; fordert Eingaben vom Benutzer an.
+		<form name="form">
+			<button name="Open" text="Dialog öffnen"/>
+			<button name="Ignore" text="Ignorieren"/>
+			<button name="Block" text="Ignorieren"/>
+		</form>
+	</notification>
 	<notification name="FirstBalanceIncrease">
 		Sie haben gerade [AMOUNT] L$ erhalten.
 Ihr Kontostand wird oben rechts angezeigt.
@@ -2370,6 +2430,13 @@ Ihr Kontostand wird oben rechts angezeigt.
 		Sie haben gerade [AMOUNT] L$ bezahlt.
 Ihr Kontostand wird oben rechts angezeigt.
 	</notification>
+	<notification name="BuyLindenDollarSuccess">
+		Vielen Dank für Ihre Zahlung.
+
+Ihr L$-Kontostand wird aktualisiert, sobald die Bearbeitung abgeschlossen ist. Falls die Bearbeitung länger als 20 min dauert, ist es möglich, dass Ihre Transaktion abgebrochen wird. In diesem Fall wird der Kaufbetrag in US$ auf Ihrem Konto gutgeschrieben.
+
+Der Zahlungsstatus kann auf Ihrer [http://secondlife.com/account/ Startseite] unter Transaktionsübersicht überprüft werden.
+	</notification>
 	<notification name="FirstSit">
 		Sie sitzen.
 Verwenden Sie die Pfeiltasten (oder AWSD-Tasten), um sich umzusehen.
@@ -2377,7 +2444,7 @@ Um aufzustehen, klicken Sie auf die Schaltfläche „Aufstehen“.
 	</notification>
 	<notification name="FirstMap">
 		Klicken Sie auf die Karte und bewegen Sie die Maus, um sich auf der Karte umzusehen.
-Mit Doppelklick können Sie teleportieren.
+Zum Teleportieren doppelklicken.
 Nutzen Sie die Optionen rechts, um Objekte, Einwohner oder Events anzuzeigen und einen anderen Hintergrund auszuwählen.
 	</notification>
 	<notification name="FirstBuild">
@@ -2416,8 +2483,8 @@ Objekte, die Sie hier bauen, werden gelöscht, nachdem Sie den Sandkasten verlas
 		Sie haben das Menü „Erweitert“ geöffnet.
 
 Um dieses Menü zu aktivieren bzw. deaktivieren:
-  Windows Strg-Alt-D
-  Mac ⌘-Opt-D
+  Windows Strg+Alt+D
+  Mac &#8997;&#8984;D
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Sie bearbeiten ein geformtes Primitiv. Geformte Primitive benötigen eine spezielle Textur, die ihre Form definiert.
@@ -2428,47 +2495,47 @@ von der Liste auswählen.
 	</notification>
 	<notification name="VoiceInviteP2P">
 		[NAME] lädt Sie zu einem Voice-Chat ein.
-Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
+Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Gespräch beizutreten, oder auf  &apos;Ablehnen &apos;, um die Einladung auszuschlagen. Klicken Sie auf Ignorieren, um diesen Anrufer zu ignorieren.
 		<form name="form">
 			<button name="Accept" text="Akzeptieren"/>
 			<button name="Decline" text="Ablehnen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="AutoUnmuteByIM">
-		[FIRST] [LAST] hat eine Instant Message erhalten; die Stummschaltung wurde aufgehoben.
+		[FIRST] [LAST] hat eine Benachrichtigung erhalten und wird nicht länger ignoriert.
 	</notification>
 	<notification name="AutoUnmuteByMoney">
-		[FIRST] [LAST] hat Geld erhalten; die Stummschaltung wurde aufgehoben.
+		[FIRST] [LAST] wurde bezahlt und wird nicht länger ignoriert.
 	</notification>
 	<notification name="AutoUnmuteByInventory">
-		[FIRST] [LAST] wurde ein Inventarobjekt angeboten; die Stummschaltung wurde aufgehoben.
+		[FIRST] [LAST] wurde Inventar angeboten und wird nicht länger ignoriert.
 	</notification>
 	<notification name="VoiceInviteGroup">
 		[NAME] ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten.
-Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
+Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Gespräch beizutreten, oder auf  &apos;Ablehnen &apos;, um die Einladung auszuschlagen. Klicken Sie auf Ignorieren, um diesen Anrufer zu ignorieren.
 		<form name="form">
 			<button name="Accept" text="Akzeptieren"/>
 			<button name="Decline" text="Ablehnen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="VoiceInviteAdHoc">
-		[NAME] ist einem Voice-Konferenz-Chat beigetreten.
-Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
+		[NAME] ist einem Voice-Chat mit Konferenzschaltung beigetreten.
+Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Gespräch beizutreten, oder auf  &apos;Ablehnen &apos;, um die Einladung auszuschlagen. Klicken Sie auf Ignorieren, um diesen Anrufer zu ignorieren.
 		<form name="form">
 			<button name="Accept" text="Akzeptieren"/>
 			<button name="Decline" text="Ablehnen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="InviteAdHoc">
 		[NAME] lädt Sie zu einem Konferenz-Chat ein.
-Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
+Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Chat beizutreten, oder auf  &apos;Ablehnen &apos;, um die Einladung auszuschlagen. Klicken Sie auf Ignorieren, um diesen Anrufer zu ignorieren.
 		<form name="form">
 			<button name="Accept" text="Akzeptieren"/>
 			<button name="Decline" text="Ablehnen"/>
-			<button name="Mute" text="Stummschalten"/>
+			<button name="Mute" text="Ignorieren"/>
 		</form>
 	</notification>
 	<notification name="VoiceChannelFull">
@@ -2478,19 +2545,19 @@ Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen
 		Es tut uns Leid.  Dieses Gebiet hat seine maximale Kapazität für Voice-Gespräche erreicht.  Bitte versuchen Sie es in einem anderen Gebiet.
 	</notification>
 	<notification name="VoiceChannelDisconnected">
-		Sie haben [VOICE_CHANNEL_NAME] verlassen.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+		Die Verbindung zu [VOICE_CHANNEL_NAME] wurde abgebrochen.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME] hat das Gespräch beendet.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+		[VOICE_CHANNEL_NAME] hat den Anruf beendet.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME] hat Ihren Anruf abgelehnt.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+		[VOICE_CHANNEL_NAME] hat ihren Anruf abgelehnt.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME] ist zurzeit nicht erreichbar.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+		[VOICE_CHANNEL_NAME] kann Ihren Anruf nicht entgegennehmen.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="VoiceChannelJoinFailed">
-		Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später.  Sie werden nun wieder mit dem Umgebungs-Voice-Chat verbunden.
+		Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="VoiceLoginRetry">
 		Wir erstellen einen Voice-Kanal für Sie. Bitte warten Sie einen Moment.
@@ -2511,12 +2578,13 @@ Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen
 		Fehler beim Versuch, eine Voice-Chat-Verbindung zu [VOICE_CHANNEL_NAME] herzustellen.  Bitte versuchen Sie es erneut.
 	</notification>
 	<notification name="ServerVersionChanged">
-		Sie haben eine Region betreten, die eine andere Server-Version verwendet. Dies kann sich auf die Leistung auswirken. Klicken Sie hier, um die Versionshinweise anzuzeigen.
+		Sie haben eine Region betreten, die eine andere Server-Version verwendet. Dies kann sich auf die Leistung auswirken. [[URL] Versionshinweise anzeigen.]
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
 		Die SLurl, auf die Sie geklickt haben, wird nicht unterstützt.
 	</notification>
 	<notification name="IMToast">
+		[MESSAGE]
 		<form name="form">
 			<button name="respondbutton" text="Antworten"/>
 		</form>
@@ -2527,6 +2595,19 @@ Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen
 	<notification name="UnableToFindHelpTopic">
 		Hilfethema für dieses Element wurde nicht gefunden.
 	</notification>
+	<notification name="ObjectMediaFailure">
+		Serverfehler: Medienaktualisierung oder Fehler
+&apos;[ERROR]&apos;
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearTeleportHistory">
+		Möchten Sie Ihren Teleport-Verlauf löschen?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="BottomTrayButtonCanNotBeShown">
+		Die ausgewählte Schaltfläche kann zur Zeit nicht angezeigt werden.
+Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
+	</notification>
 	<global name="UnsupportedCPU">
 		- Ihre CPU-Geschwindigkeit entspricht nicht den Mindestanforderungen.
 	</global>
@@ -2547,14 +2628,8 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter [SUPPORT
 	<global name="UnsupportedRAM">
 		- Ihr Arbeitsspeicher entspricht nicht den Mindestanforderungen.
 	</global>
-	<global name="PermYes">
-		Ja
-	</global>
-	<global name="PermNo">
-		Nein
-	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
-		Wenn Sie ein Stück Land besitzen, können Sie dies als Ihren Heimatort festlegen. 
+		Wenn Sie ein Stück Land besitzen, können Sie dies als Ihren Heimatort festlegen.
 Ansonsten können Sie auf der Karte nachsehen und dort Ort suchen, die als „Infohub“ gekennzeichnet sind.
 	</global>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_activeim_row.xml b/indra/newview/skins/default/xui/de/panel_activeim_row.xml
new file mode 100644
index 0000000000..84272752cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_activeim_row.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_activeim_row">
+	<text name="contact_name">
+		Grumpity ProductEngine
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..6109d8b0ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="Anrufen" name="call_btn"/>
+		<button label="Anruf beenden" name="end_call_btn"/>
+		<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
new file mode 100644
index 0000000000..ae5c1ec424
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_list_item">
+	<string name="FormatSeconds">
+		[COUNT]s
+	</string>
+	<string name="FormatMinutes">
+		[COUNT]min
+	</string>
+	<string name="FormatHours">
+		[COUNT]h
+	</string>
+	<string name="FormatDays">
+		[COUNT]d
+	</string>
+	<string name="FormatWeeks">
+		[COUNT]W
+	</string>
+	<string name="FormatMonths">
+		[COUNT]M
+	</string>
+	<string name="FormatYears">
+		[COUNT]J
+	</string>
+	<text name="avatar_name" value="Unbekannt"/>
+	<text name="last_interaction" value="0s"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
new file mode 100644
index 0000000000..09f930ec01
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_tag_notification">
+	<panel name="msg_caption">
+		<text name="sender_tag_name">
+			Angela Tester
+		</text>
+		<text name="tag_time" value="23:30"/>
+	</panel>
+	<text_editor name="msg_text">
+		Zwölf große Boxkämpfer jagen Viktor quer über den großen Sylter Deich.
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..462009746b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="block_list_panel">
+	<text name="title_text">
+		Liste der ignorierten Einwohner
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner"/>
+	<button label="Einwohner ignorieren..." label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
+	<button label="Objekt nach Name ignorieren..." label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
+	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
new file mode 100644
index 0000000000..11dd99a1d4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray">
+	<string name="SpeakBtnToolTip">
+		Schaltet Mikrofon ein/aus
+	</string>
+	<string name="VoiceControlBtnToolTip">
+		Voice-Chat-Steuerung anzeigen/ausblenden
+	</string>
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_box label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="movement_panel">
+			<button label="Bewegen" name="movement_btn" tool_tip="Bewegungssteuerung anzeigen/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="cam_panel">
+			<button label="Ansicht" name="camera_btn" tool_tip="Kamerasteuerung anzeigen/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="snapshot_panel">
+			<button label="" name="snapshots" tool_tip="Foto machen"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml
new file mode 100644
index 0000000000..babbff3132
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_chat_header.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_header" name="im_header">
+	<text_editor name="user_name" value="Ericag Vader"/>
+	<text name="time_box" value="23:30"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
new file mode 100644
index 0000000000..d45e28f0c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_classified_info">
+	<panel.string name="type_mature">
+		Moderat
+	</panel.string>
+	<panel.string name="type_pg">
+		Allgemeiner Inhalt
+	</panel.string>
+	<text name="title" value="Informationen über Anzeige"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="classified_name" value="[name]"/>
+			<text name="classified_location" value="[wird geladen...]"/>
+			<text name="content_type" value="[Inhalts-Art]"/>
+			<text name="category" value="[Kategorie]"/>
+			<check_box label="Jede Woche automatisch erneuern" name="auto_renew"/>
+			<text name="price_for_listing" tool_tip="Preis für Anzeige.">
+				[PRICE] L$
+			</text>
+			<text name="classified_desc" value="[description]"/>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<button label="Teleportieren" name="teleport_btn"/>
+		<button label="Karte" name="show_on_map_btn"/>
+		<button label="Bearbeiten" name="edit_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
new file mode 100644
index 0000000000..4b48950341
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_alpha_panel">
+	<panel name="avatar_alpha_color_panel">
+		<texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
new file mode 100644
index 0000000000..ca357abda3
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Anzeige bearbeiten" name="panel_edit_classified">
+	<panel.string name="location_notice">
+		(wird nach Speichern aktualisiert)
+	</panel.string>
+	<text name="title">
+		Anzeige bearbeiten
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
+			<text name="Name:">
+				Titel:
+			</text>
+			<text name="description_label">
+				Beschreibung:
+			</text>
+			<text name="location_label">
+				Standort:
+			</text>
+			<text name="classified_location">
+				wird geladen...
+			</text>
+			<button label="Auf aktuelle Position einstellen" name="set_to_curr_location_btn"/>
+			<combo_box name="content_type">
+				<combo_item name="mature_ci">
+					Mature-Inhalt
+				</combo_item>
+				<combo_item name="pg_ci">
+					PG-Inhalt
+				</combo_item>
+			</combo_box>
+			<spinner label="L$" name="price_for_listing" tool_tip="Preis für Anzeige." value="50"/>
+			<check_box label="Jede Woche automatisch erneuern" name="auto_renew"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="Speichern" name="save_changes_btn"/>
+		<button label="Abbrechen" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
new file mode 100644
index 0000000000..31251ed48f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_eyes_panel">
+	<panel name="avatar_eye_color_panel">
+		<texture_picker label="Iris" name="Iris" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="eyes_main_tab" title="Augen"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
new file mode 100644
index 0000000000..2d11befbfd
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_gloves_panel">
+	<panel name="avatar_gloves_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="gloves_main_tab" title="Handschuhe"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
new file mode 100644
index 0000000000..d255b1c16c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_hair_panel">
+	<panel name="avatar_hair_color_panel">
+		<texture_picker label="Textur" name="Texture" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="hair_color_tab" title="Farbe"/>
+		<accordion_tab name="hair_style_tab" title="Stil"/>
+		<accordion_tab name="hair_eyebrows_tab" title="Augenbrauen"/>
+		<accordion_tab name="hair_facial_tab" title="Gesicht"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
new file mode 100644
index 0000000000..3752faf48a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_jacket_panel">
+	<panel name="avatar_jacket_color_panel">
+		<texture_picker label="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"/>
+		<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="jacket_main_tab" title="Jacke"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
new file mode 100644
index 0000000000..1ff439dc26
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_pants_panel">
+	<panel name="avatar_pants_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="pants_main_tab" title="Hose"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
new file mode 100644
index 0000000000..bd05a4151e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Auswahl bearbeiten" name="panel_edit_pick">
+	<text name="title">
+		Auswahl bearbeiten
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
+			<text name="Name:">
+				Titel:
+			</text>
+			<text name="description_label">
+				Beschreibung:
+			</text>
+			<text name="location_label">
+				Standort:
+			</text>
+			<text name="pick_location">
+				wird geladen...
+			</text>
+			<button label="Auf aktuelle Position einstellen" name="set_to_curr_location_btn"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="[WHAT] speichern" name="save_changes_btn"/>
+		<button label="Abbrechen" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
index 9ddc31aca5..1c53ca64dd 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile Edit" name="edit_profile_panel">
+<panel label="Profil bearbeiten" name="edit_profile_panel">
 	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="RegisterDateFormat">
+		[REG_DATE] ([AGE])
 	</string>
 	<string name="AcctTypeResident" value="Einwohner"/>
 	<string name="AcctTypeTrial" value="Test"/>
@@ -20,14 +24,28 @@
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
 				<panel name="lifes_images_panel">
+					<panel name="second_life_image_panel">
+						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
+					</panel>
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
 				</panel>
+				<panel name="first_life_image_panel">
+					<text name="real_world_photo_title_text" value="Echtes Leben:"/>
+				</panel>
 				<icon label="" name="real_world_edit_icon" tool_tip="Klicken, um ein Bild auszuwählen"/>
 				<text name="title_homepage_text">
 					Webseite:
 				</text>
+				<line_editor name="homepage_edit" value="http://"/>
 				<check_box label="In Suchergebnissen anzeigen" name="show_in_search_checkbox"/>
-				<text name="title_acc_status_text" value="Kontostatus:"/>
+				<text name="title_acc_status_text" value="Mein Konto:"/>
+				<text name="my_account_link" value="Meine Startseite aufrufen"/>
+				<text name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/>
+				<text name="title_partner_text" value="Mein Partner:"/>
+				<text name="partner_edit_link" value="[[URL] bearbeiten]"/>
+				<panel name="partner_data_panel">
+					<text name="partner_text" value="[FIRST] [LAST]"/>
+				</panel>
 			</panel>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
new file mode 100644
index 0000000000..37be3c1d90
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shape_panel">
+	<panel name="avatar_sex_panel">
+		<text name="gender_text">
+			Geschlecht:
+		</text>
+		<radio_group name="sex_radio">
+			<radio_item label="weiblich" name="radio"/>
+			<radio_item label="Männlich" name="radio2"/>
+		</radio_group>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shape_body_tab" title="Körper"/>
+		<accordion_tab name="shape_head_tab" title="Kopf"/>
+		<accordion_tab name="shape_eyes_tab" title="Augen"/>
+		<accordion_tab name="shape_ears_tab" title="Ohren"/>
+		<accordion_tab name="shape_nose_tab" title="Nase"/>
+		<accordion_tab name="shape_mouth_tab" title="Mund"/>
+		<accordion_tab name="shape_chin_tab" title="Kinn"/>
+		<accordion_tab name="shape_torso_tab" title="Oberkörper"/>
+		<accordion_tab name="shape_legs_tab" title="Beine"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
new file mode 100644
index 0000000000..6025606777
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Stoff" name="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">
+		<accordion_tab name="shirt_main_tab" title="Hemd"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
new file mode 100644
index 0000000000..15e8a21dd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shoes_panel">
+	<panel name="avatar_shoes_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="shoes_main_tab" title="Schuhe"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
new file mode 100644
index 0000000000..46bd1d9f4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skin_panel">
+	<panel name="avatar_skin_color_panel">
+		<texture_picker label="Kopftattoo" name="Head Tattoos" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Obere Tattoos" name="Upper Tattoos" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Untere Tattoos" name="Lower Tattoos" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+	</panel>
+	<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_body_tab" title="Körperdetails"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
new file mode 100644
index 0000000000..4fa9126c37
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skirt_panel">
+	<panel name="avatar_skirt_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="skirt_main_tab" title="Rock"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
new file mode 100644
index 0000000000..c2ecad8642
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_socks_panel">
+	<panel name="avatar_socks_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="socks_main_tab" title="Socken"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
new file mode 100644
index 0000000000..c05a3a6645
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+		<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
new file mode 100644
index 0000000000..4484068c1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_underpants_panel">
+	<panel name="avatar_underpants_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="underpants_main_tab" title="Unterhose"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
new file mode 100644
index 0000000000..847f806fce
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_undershirt_panel">
+	<panel name="avatar_undershirt_color_panel">
+		<texture_picker label="Stoff" name="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">
+		<accordion_tab name="undershirt_main_tab" title="Unterhemd"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
new file mode 100644
index 0000000000..c3ffb2f353
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Tragbar" name="panel_edit_wearable">
+	<string name="edit_shape_title">
+		Form bearbeiten
+	</string>
+	<string name="edit_skin_title">
+		Skin (Haut) bearbeiten
+	</string>
+	<string name="edit_hair_title">
+		Haare bearbeiten
+	</string>
+	<string name="edit_eyes_title">
+		Augen bearbeiten
+	</string>
+	<string name="edit_shirt_title">
+		Hemd bearbeiten
+	</string>
+	<string name="edit_pants_title">
+		Hosen bearbeiten
+	</string>
+	<string name="edit_shoes_title">
+		Schuhe bearbeiten
+	</string>
+	<string name="edit_socks_title">
+		Strümpfe bearbeiten
+	</string>
+	<string name="edit_jacket_title">
+		Jacke bearbeiten
+	</string>
+	<string name="edit_skirt_title">
+		Rock bearbeiten
+	</string>
+	<string name="edit_gloves_title">
+		Handschuhe bearbeiten
+	</string>
+	<string name="edit_undershirt_title">
+		Unterhemd bearbeiten
+	</string>
+	<string name="edit_underpants_title">
+		Unterhose bearbeiten
+	</string>
+	<string name="edit_alpha_title">
+		Alpha-Maske bearbeiten
+	</string>
+	<string name="edit_tattoo_title">
+		Tätowierung bearbeiten
+	</string>
+	<string name="shape_desc_text">
+		Form:
+	</string>
+	<string name="skin_desc_text">
+		Haut:
+	</string>
+	<string name="hair_desc_text">
+		Haare:
+	</string>
+	<string name="eyes_desc_text">
+		Augen:
+	</string>
+	<string name="shirt_desc_text">
+		Hemd:
+	</string>
+	<string name="pants_desc_text">
+		Hose:
+	</string>
+	<string name="shoes_desc_text">
+		Schuhe:
+	</string>
+	<string name="socks_desc_text">
+		Socken:
+	</string>
+	<string name="jacket_desc_text">
+		Jacke:
+	</string>
+	<string name="skirt_skirt_desc_text">
+		Rock:
+	</string>
+	<string name="gloves_desc_text">
+		Handschuhe:
+	</string>
+	<string name="undershirt_desc_text">
+		Unterhemd:
+	</string>
+	<string name="underpants_desc_text">
+		Unterhose:
+	</string>
+	<string name="alpha_desc_text">
+		Alpha-Maske:
+	</string>
+	<string name="tattoo_desc_text">
+		Tätowierung:
+	</string>
+	<text name="edit_wearable_title" value="Form bearbeiten"/>
+	<panel label="Hemd" name="wearable_type_panel">
+		<text name="description_text" value="Form:"/>
+	</panel>
+	<panel name="button_panel">
+		<button label="Speichern unter" name="save_as_button"/>
+		<button label="Zurücksetzen" name="revert_button"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
new file mode 100644
index 0000000000..6a7546457f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<button label="Gruppeninfo" name="group_info_btn"/>
+	<panel name="panel_call_buttons">
+		<button label="Gruppe anrufen" name="call_btn"/>
+		<button label="Anruf beenden" name="end_call_btn"/>
+		<button label="Voice-Steuerung öffnen" name="voice_ctrls_btn"/>
+	</panel>
+</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 2acc9e0649..e6abd4349d 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -1,72 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_tab">
-	<string name="help_text">
-		Die Registerkarte „Allgemein“ enthält Informationen über diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, allgemeine Gruppeneinstellungen und Mitgliederoptionen.
+	<panel.string name="help_text">
+		Die Registerkarte Allgemein enthält allgemeine Informationen über diese Gruppe, eine Liste der Mitglieder, allgemeine Gruppeneinstellungen und Mitgliederoptionen.
 
 Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
-	</string>
-	<string name="group_info_unchanged">
+	</panel.string>
+	<panel.string name="group_info_unchanged">
 		Die allgemeine Gruppeninfo wurde geändert.
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>
-	<text name="group_name">
-		Neuen Gruppennamen hier eingeben
-	</text>
-	<text name="prepend_founded_by">
-		Gegründet von
-	</text>
-	<text left_delta="79" name="founder_name">
-		(wartet)
-	</text>
-	<text name="group_charter_label">
-		Gruppencharta
-	</text>
-	<texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+	</panel.string>
+	<panel.string name="incomplete_member_data_str">
+		Mitgliedsdaten werden abgerufen
+	</panel.string>
 	<text_editor name="charter">
 		Gruppencharta
 	</text_editor>
-	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
-	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
-	<text name="text_owners_and_visible_members">
-		Eigentümer und sichtbare Mitglieder
-	</text>
-	<text name="text_owners_are_shown_in_bold">
-		(Eigentümer werden fettgedruckt angezeigt)
-	</text>
 	<name_list name="visible_members">
-		<name_list.columns label="Mitgliedsname" name="name" relwidth="0.40"/>
+		<name_list.columns label="Mitglied" name="name" relwidth="0.40"/>
 		<name_list.columns label="Titel" name="title" relwidth="0.25"/>
-		<name_list.columns label="Letzte Anmeldung" name="online" relwidth="0.35"/>
 	</name_list>
-	<text name="text_group_preferences">
-		Gruppeneinstellungen
+	<text name="active_title_label">
+		Mein Titel
 	</text>
+	<combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
+	<check_box label="Notizen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/>
+	<check_box label="In meinem Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
 	<panel name="preferences_container">
-		<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
 		<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
-		<check_box label="Beitrittsgebühr:" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."/>
-		<spinner 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="Festlegen, ob die Informationen Ihrer Gruppe „Mature“ sind.">
-			<combo_box.item name="select_mature" label="- Mature wählen -"/>
-			<combo_box.item name="mature" label="Mature-Inhalt"/>
-			<combo_box.item name="pg" label="PG-Inhalt"/>
+		<check_box label="Beitrittsgebühr" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/>
+		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+		<check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/>
+		<combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe „Moderat“ sind">
+			<combo_box.item label="PG-Inhalt" name="pg"/>
+			<combo_box.item label="Mature-Inhalt" name="mature"/>
 		</combo_box>
-		<panel name="title_container">
-			<text name="active_title_label">
-				Mein aktiver Titel
-			</text>
-			<combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
-		</panel>
-		<check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."/>
-		<check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
 	</panel>
-	<string name="incomplete_member_data_str">
-		Mitgliedsdaten werden abgerufen
-	</string>
-	<string name="confirm_group_create_str">
-		Die Gründung dieser Gruppe kostet 100 L$. 
-Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
-Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
-	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..71a0adcdfb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Gruppeninfo" name="GroupInfo">
+	<panel.string name="default_needs_apply_text">
+		In der aktuellen Registerkarte befinden sich ungesicherte Änderungen
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Möchten Sie diese Änderungen speichern?
+	</panel.string>
+	<panel.string name="group_join_btn">
+		Beitreten ([AMOUNT]L$)
+	</panel.string>
+	<panel.string name="group_join_free">
+		Kostenlos
+	</panel.string>
+	<text name="group_name" value="(Lädt...)"/>
+	<line_editor label="Geben Sie Ihren neuen Gruppennamen hier ein" name="group_name_editor"/>
+	<texture_picker label="" name="insignia" tool_tip="Klicken Sie, um ein Bild auszuwählen"/>
+	<text name="prepend_founded_by">
+		Gründer:
+	</text>
+	<name_box initial_value="(empfange)" name="founder_name"/>
+	<text name="join_cost_text">
+		Kostenlos
+	</text>
+	<button label="JETZT BEITRETEN!" name="btn_join"/>
+	<accordion name="groups_accordion">
+		<accordion_tab name="group_general_tab" title="Allgemein"/>
+		<accordion_tab name="group_roles_tab" title="Rollen"/>
+		<accordion_tab name="group_notices_tab" title="Mitteilungen"/>
+		<accordion_tab name="group_land_tab" title="Land/Kapital"/>
+	</accordion>
+	<panel name="button_row">
+		<button label="Erstellen" label_selected="Neue Gruppe" name="btn_create"/>
+		<button label="Speichern" label_selected="Speichern" name="btn_apply"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index 2dd9bf8d5f..e9743c5d5d 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Land und L$" name="land_money_tab">
 	<string name="help_text">
-		Parzellen in Gruppenbesitz werden zusammen mit Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
+		Ein Warnhinweis wird angezeigt, solange der Wert für das insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag.
 	</string>
 	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
@@ -28,19 +28,19 @@
 		Gesamtbeitrag:
 	</text>
 	<text name="total_contributed_land_value">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<text name="total_land_in_use_label">
 		Insgesamt verwendetes Land:
 	</text>
 	<text name="total_land_in_use_value">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<text name="land_available_label">
 		Land verfügbar:
 	</text>
 	<text name="land_available_value">
-		[AREA] qm
+		[AREA] m².
 	</text>
 	<text name="your_contribution_label">
 		Ihr Beitrag:
@@ -49,36 +49,36 @@
 		Ihr Landbeitrag kann nicht festgelegt werden.
 	</string>
 	<text name="your_contribution_units">
-		( qm )
+		m²
 	</text>
 	<text name="your_contribution_max_value">
-		(max. [AMOUNT])
+		([AMOUNT] max.)
 	</text>
 	<text name="group_over_limit_text">
-		Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann.
+		Um das benutzte Land zu unterstützen, sind weitere Landnutzungsrechte erforderlich.
 	</text>
 	<text name="group_money_heading">
 		Gruppen-L$
 	</text>
 	<tab_container name="group_money_tab_container">
-		<panel label="Planung" name="group_money_planning_tab">
+		<panel label="PLANUNG" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
-				Wird berechnet...
+				Wird geladen...
 			</text_editor>
 		</panel>
-		<panel label="Details" name="group_money_details_tab">
+		<panel label="DETAILS" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
-				Wird berechnet...
+				Wird geladen...
 			</text_editor>
-			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_details_button" tool_tip="Zurück in der Zeit"/>
-			<button label="Später &gt;" label_selected="Später &gt;" name="later_details_button" tool_tip="Weiter in der Zeit"/>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_details_button" tool_tip="Hinten"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_details_button" tool_tip="Weiter"/>
 		</panel>
-		<panel label="Verkäufe" name="group_money_sales_tab">
+		<panel label="VERKAUF" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
-				Wird berechnet...
+				Wird geladen...
 			</text_editor>
-			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_sales_button" tool_tip="Zurück in der Zeit"/>
-			<button label="Später &gt;" label_selected="Später &gt;" name="later_sales_button" tool_tip="Weiter in der Zeit"/>
+			<button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_sales_button" tool_tip="Hinten"/>
+			<button label="Später &gt;" label_selected="Später &gt;" name="later_sales_button" tool_tip="Weiter"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
new file mode 100644
index 0000000000..1b37c35ea5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Unbekannt"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 27a2caf9f0..6d0fd9eefb 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Mitteilungen" name="notices_tab">
-	<text name="help_text">
-		Mitteilungen sind eine schnelle Möglichkeit, 
-Mitglieder auf dem Laufenden zu halten und 
-Objekte im Anhang zu versenden. Mitteilungen werden
-nur an Mitglieder mit einer entsprechenden Rolle 
-gesendet. Mitteilungen können unter 
-„Allgemein“ ausgeschaltet werden.
-	</text>
-	<text name="no_notices_text">
+	<panel.string name="help_text">
+		Mit Mitteilungen können Sie eine Nachricht und
+Objekte im Anhang versenden. Mitteilungen werden
+nur an Mitglieder mit einer entsprechenden Rolle
+gesendet. Mitteilungen können unter
+ &apos;Allgemein &apos; ausgeschaltet werden.
+	</panel.string>
+	<panel.string name="no_notices_text">
 		Keine älteren Mitteilungen.
-	</text>
-	<button label="?" label_selected="?" name="help_button"/>
-	<text name="lbl">
-		Gruppenmitteilungsarchiv
-	</text>
+	</panel.string>
 	<text name="lbl2">
-		Mitteilungen werden 14 Tage lang aufbewahrt. Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
+		Mitteilungen werden 14 Tage lang aufbewahrt.
+Maximal 200 pro Gruppe täglich
 	</text>
 	<scroll_list name="notice_list">
-		<column label="" name="icon"/>
-		<column label="Thema" name="subject"/>
-		<column label="Von" name="from"/>
-		<column label="Datum" name="date"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="Thema" name="subject"/>
+		<scroll_list.columns label="Von" name="from"/>
+		<scroll_list.columns label="Datum" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
 		Nicht gefunden.
 	</text>
-	<button label="Neue Mitteilung" label_selected="Neue Mitteilung" name="create_new_notice"/>
+	<button label="Neue Mitteilung erstellen" label_selected="Neue Mitteilung" name="create_new_notice" tool_tip="Neue Mitteilung erstellen"/>
 	<button label="Aktualisieren" label_selected="Liste aktualisieren" name="refresh_notices"/>
 	<panel label="Neue Mitteilung" name="panel_create_new_notice">
 		<text name="lbl">
 			Mitteilung schreiben
 		</text>
-		<text name="lbl2">
-			Sie können ein Objekt zu einer Mitteilung hinzufügen, wenn Sie es aus Ihrem Inventar auf dieses Feld ziehen. Die angehängten Objekte müssen kopier- und übertragbar sein. Ordner können nicht verschickt werden.
-		</text>
 		<text name="lbl3">
 			Betreff:
 		</text>
@@ -45,94 +38,19 @@ gesendet. Mitteilungen können unter
 		<text name="lbl5">
 			Anhängen:
 		</text>
-		<button label="Anhang entfernen" label_selected="Anhang entfernen" name="remove_attachment"/>
-		<button label="Senden" label_selected="Senden" name="send_notice"/>
-		<panel name="drop_target" tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."/>
-	</panel>
-	<panel label="Ältere Notiz anzeigen" name="panel_view_past_notice">
-		<text name="lbl">
-			Archivierte Mitteilung
-		</text>
-		<text name="lbl2">
-			Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
-		</text>
-		<text name="lbl3">
-			Betreff:
-		</text>
-		<text name="lbl4">
-			Nachricht:
-		</text>
-		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment"/>
-	</panel>
-</panel>
-<!-- original file
-
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Mitteilungen" name="notices_tab">
-	<text name="help_text">
-		Mitteilungen sind eine schnelle Möglichkeit, 
-Mitglieder auf dem Laufenden zu halten und 
-Objekte im Anhang zu versenden. Mitteilungen werden
-nur an Mitglieder mit einer entsprechenden Rolle 
-gesendet. Mitteilungen können unter 
-„Allgemein“ ausgeschaltet werden.
-	</text>
-	<text name="no_notices_text">
-		Keine älteren Mitteilungen.
-	</text>
-	<button label="?" label_selected="?" name="help_button" />
-	<text name="lbl">
-		Gruppenmitteilungsarchiv
-	</text>
-	<text name="lbl2">
-		Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung,
-um sie anzuzeigen. Klicken Sie „Aktualisieren“, um neue Mitteilungen zu suchen.
-Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
-	</text>
-	<scroll_list name="notice_list">
-		<column label="" name="icon" />
-		<column label="Thema" name="subject" />
-		<column label="Von" name="from" />
-		<column label="Datum" name="date" />
-	</scroll_list>
-	<text name="notice_list_none_found">
-		Nicht gefunden.
-	</text>
-	<button label="Neue Mitteilung" label_selected="Neue Mitteilung"
-	     name="create_new_notice" />
-	<button label="Aktualisieren" label_selected="Liste aktualisieren"
-	     name="refresh_notices" />
-	<panel label="Neue Mitteilung" name="panel_create_new_notice">
-		<text name="lbl">
-			Mitteilung schreiben
-		</text>
-		<text name="lbl2">
-			Geben Sie einen Betreff für die Mitteilung ein. Sie können der
-Mitteilung ein Objekt anfügen, indem Sie es aus dem Inventar
-in dieses Feld ziehen. Angehängte Objekte müssen kopier-
-und transferierbar sein. Ordner können nicht gesendet werden.
-		</text>
-		<text name="lbl3">
-			Betreff:
-		</text>
-		<text name="lbl4">
-			Nachricht:
-		</text>
-		<text name="lbl5">
-			Anhängen:
+		<text name="string">
+			Hierhin ziehen, um etwas anzuhängen -- &gt;
 		</text>
-		<button label="Anhang entfernen" label_selected="Anhang entfernen"
-		     name="remove_attachment" />
-		<button label="Mitteilung senden" label_selected="Mitteilung senden" name="send_notice" />
-		<panel name="drop_target"
-		     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+		<button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment"/>
+		<button label="Senden" label_selected="Senden" name="send_notice"/>
+		<group_drop_target name="drop_target" tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice."/>
 	</panel>
 	<panel label="Ältere Notiz anzeigen" name="panel_view_past_notice">
 		<text name="lbl">
 			Archivierte Mitteilung
 		</text>
 		<text name="lbl2">
-			Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
+			Um eine neue Mitteilung zu senden, klicken Sie die Schaltfläche +
 		</text>
 		<text name="lbl3">
 			Betreff:
@@ -140,8 +58,6 @@ und transferierbar sein. Ordner können nicht gesendet werden.
 		<text name="lbl4">
 			Nachricht:
 		</text>
-		<button label="Anlage öffnen" label_selected="Anlage öffnen" name="open_attachment" />
+		<button label="Anhang öffnen" label_selected="Anlage öffnen" name="open_attachment"/>
 	</panel>
 </panel>
-
--->
diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml
new file mode 100644
index 0000000000..cb4c6cdb39
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="instant_message" name="panel_group_notify">
+	<string name="message_max_lines_count" value="7"/>
+	<string name="subject_font" value="SANSSERIF_BIG"/>
+	<string name="date_font" value="SANSSERIF"/>
+	<panel label="Überschrift" name="header">
+		<text name="title" value="Name des Absenders / Gruppenname"/>
+	</panel>
+	<text_editor name="message" value="Nachricht"/>
+	<text name="attachment" value="Anhang"/>
+	<button label="OK" name="btn_ok"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 4095deb16b..3103fd65b1 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Mitglieder und Rollen" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		Das Unterregister enthält nicht übernommene Änderungen.
+		Die Registerkarte enthält nicht gespeicherte Änderungen.
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Diese Änderungen übernehmen?
+		Möchten Sie Ihre Änderungen speichern?
 	</panel.string>
 	<tab_container name="roles_tab_container">
-		<panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder">
+		<panel label="MITGLIEDER" name="members_sub_tab" tool_tip="Mitglieder">
 			<panel.string name="help_text">
 				Sie können Mitgliedern Rollen zuweisen und entziehen.
 Drücken Sie die Strg-Taste und klicken Sie auf Namen,
@@ -16,39 +16,47 @@ um mehrere Mitglieder auszuwählen.
 			<filter_editor label="Mitglieder filtern" name="filter_input"/>
 			<name_list name="member_list">
 				<name_list.columns label="Mitglied" name="name"/>
-				<name_list.columns label="Übereignungen" name="donated"/>
-				<name_list.columns label="Online" name="online"/>
+				<name_list.columns label="Übereignung" name="donated"/>
+				<name_list.columns label="Status" name="online"/>
 			</name_list>
 			<button label="Einladen" name="member_invite"/>
 			<button label="Hinauswerfen" name="member_eject"/>
 		</panel>
-		<panel label="Rollen" name="roles_sub_tab">
+		<panel label="ROLLEN" name="roles_sub_tab">
 			<panel.string name="help_text">
 				Rollen haben einen Titel und umfassen bestimmte
-Fähigkeiten. Mitglieder können mehrere 
+Fähigkeiten. Mitglieder können mehrere
 Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
-definieren, darunter „Jeder“ und „Eigentümer“.
+definieren, darunter  &apos;Jeder &apos; und  &apos;Eigentümer &apos;.
 			</panel.string>
 			<panel.string name="cant_delete_role">
-				Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
+				Die Rollen „Jeder&quot; und „Eigentuemer&quot; sind besondere Rollen und können nicht gelöscht werden.
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<panel.string name="power_all_have_icon">
+				Checkbox_On
+			</panel.string>
+			<panel.string name="power_partial_icon">
+				Checkbox_Off
 			</panel.string>
 			<filter_editor label="Rollen filtern" name="filter_input"/>
 			<scroll_list name="role_list">
 				<scroll_list.columns label="Rolle" name="name"/>
 				<scroll_list.columns label="Titel" name="title"/>
-				<scroll_list.columns label="Mitglieder" name="members"/>
+				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
-			<button label="Rolle hinzufügen" name="role_create"/>
+			<button label="Neue Rolle" name="role_create"/>
 			<button label="Rolle löschen" name="role_delete"/>
 		</panel>
-		<panel label="Fähigkeiten" name="actions_sub_tab" tool_tip="Sie können Fähigkeiten-Beschreibungen anzeigen und welche Rollen bzw. Mitglieder über diese Fähigkeit verfügen.">
+		<panel label="FÄHIGKEITEN" name="actions_sub_tab" tool_tip="Sie können eine Beschreibung der Fähigkeit anzeigen und welche Rollen bzw. Mitglieder über diese Fähigkeit verfügen.">
 			<panel.string name="help_text">
 				Fähigkeiten verleihen Mitgliedern in Rollen bestimmte
 Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 			</panel.string>
 			<filter_editor label="Fähigkeiten filtern" name="filter_input"/>
-			<scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
-				<scroll_list.columns label="" name="icon"/>
+			<scroll_list name="action_list" tool_tip="Eine Fähigkeit auswählen, um mehr Details anzuzeigen.">
 				<scroll_list.columns label="" name="action"/>
 			</scroll_list>
 		</panel>
@@ -64,55 +72,44 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 		<text name="static2">
 			Zulässige Fähigkeiten
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu den Fähigkeiten anzuzeigen, siehe Registerkarte Fähigkeiten.">
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
-			Name
+			Rolle:
 		</text>
-		<line_editor name="role_name">
-			Angestellte
-		</line_editor>
+		<line_editor name="role_name"/>
 		<text name="static3">
-			Titel
+			Rollentitel
 		</text>
-		<line_editor name="role_title">
-			(wartet)
-		</line_editor>
+		<line_editor name="role_title"/>
 		<text name="static2">
 			Beschreibung
 		</text>
-		<text_editor name="role_description">
-			(wartet)
-		</text_editor>
+		<text_editor name="role_description"/>
 		<text name="static4">
 			Mitglieder in Rolle
 		</text>
-		<check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+		<check_box label="Mitglieder anzeigen" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte  &apos;Allgemein &apos; für Personen außerhalb der Gruppe sichtbar sind."/>
 		<text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
 			Zulässige Fähigkeiten
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu den Fähigkeiten anzuzeigen, siehe Registerkarte Fähigkeiten.">
 			<scroll_list.columns label="" name="checkbox"/>
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
-		<text name="static">
-			Beschreibung
-		</text>
 		<text_editor name="action_description">
 			Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
 		</text_editor>
 		<text name="static2">
-			Rollen mit Fähigkeit
+			Rollen mit Fähigkeiten
 		</text>
 		<text name="static3">
-			Mitglieder mit Fähigkeit
+			Rollen mit dieser Fähigkeit
 		</text>
 	</panel>
 </panel>
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 f84bd24413..d91c7c0dcf 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
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<button label="Profil anzeigen" name="view_profile_btn"/>
+	<text name="avatar_name" value="Unbekannt"/>
+	<button label="Profil" name="view_profile_btn"/>
 	<button label="Freund hinzufügen" name="add_friend_btn"/>
-	<button label="Freigeben" name="share_btn"/>
+	<button label="Teleportieren" name="teleport_btn"/>
+	<button label="Teilen" name="share_btn"/>
 	<panel name="panel_call_buttons">
 		<button label="Anrufen" name="call_btn"/>
+		<button label="Anruf beenden" name="end_call_btn"/>
+		<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml
new file mode 100644
index 0000000000..1433552c15
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_instant_message.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_panel" name="im_panel">
+	<string name="message_max_lines_count">
+		6
+	</string>
+	<panel label="im_header" name="im_header">
+		<text name="user_name" value="Erica Vader"/>
+		<text name="time_box" value="23:30"/>
+	</panel>
+	<button label="Antworten" name="reply"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
new file mode 100644
index 0000000000..1a68c9b351
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="landmark_info">
+	<string name="title_create_landmark" value="Landmarken erstellen"/>
+	<string name="title_edit_landmark" value="Landmarke bearbeiten"/>
+	<string name="title_landmark" value="Landmarke"/>
+	<string name="not_available" value="k.A."/>
+	<string name="unknown" value="(unbekannt)"/>
+	<string name="public" value="(öffentlich)"/>
+	<string name="server_update_text">
+		Ohne Serverupdate sind keine Ortsinformationen verfügbar.
+	</string>
+	<string name="server_error_text">
+		Zur Zeit gibt es keine Informationen zu diesem Standort. Bitte versuchen Sie es später.
+	</string>
+	<string name="server_forbidden_text">
+		Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
+	</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>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<text name="title" value="Ortsprofil"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="maturity_value" value="unbekannt"/>
+			<panel name="landmark_info_panel">
+				<text name="owner_label" value="Eigentümer:"/>
+				<text name="creator_label" value="Ersteller:"/>
+				<text name="created_label" value="Erstellt:"/>
+			</panel>
+			<panel name="landmark_edit_panel">
+				<text name="title_label" value="Titel:"/>
+				<text name="notes_label" value="Meine Notizen:"/>
+				<text name="folder_label" value="Landmarken-Position:"/>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml
new file mode 100644
index 0000000000..3336232782
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_landmarks.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Landmarks">
+	<accordion name="landmarks_accordion">
+		<accordion_tab name="tab_favorites" title="Favoritenleiste"/>
+		<accordion_tab name="tab_landmarks" title="Landmarken"/>
+		<accordion_tab name="tab_inventory" title="Mein Inventar"/>
+		<accordion_tab name="tab_library" title="Bibliothek"/>
+	</accordion>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+		<button name="add_btn" tool_tip="Neue Landmarke hinzufügen"/>
+		<dnd_button name="trash_btn" tool_tip="Ausgewählte Landmarke hinzufügen"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 534bcfc82b..62973be4cb 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -7,13 +7,35 @@
 		http://secondlife.com/account/request.php?lang=de
 	</panel.string>
 	<panel name="login_widgets">
+		<text name="first_name_text">
+			Vorname:
+		</text>
 		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/>
+		<text name="last_name_text">
+			Nachname:
+		</text>
 		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nachname"/>
+		<text name="password_text">
+			Kennwort:
+		</text>
+		<button label="Login" label_selected="Login" name="connect_btn"/>
 		<text name="start_location_text">
 			Startposition:
 		</text>
+		<combo_box name="start_location_combo">
+			<combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
+			<combo_box.item label="Mein Zuhause" name="MyHome"/>
+			<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="Kennwort merken" name="remember_check"/>
 		<text name="create_new_account_text">
 			Neues Konto erstellen
 		</text>
+		<text name="forgot_password_text">
+			Namen oder Kennwort vergessen?
+		</text>
+		<text name="channel_text">
+			[VERSION]
+		</text>
 	</panel>
 </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
new file mode 100644
index 0000000000..3d1b89ff40
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sonstiges" name="main inventory panel">
+	<panel.string name="Title">
+		Sonstiges
+	</panel.string>
+	<filter_editor label="Filter" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Alle Objekte" name="All Items"/>
+		<inventory_panel label="Letzte Objekte" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+		<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
+		<dnd_button name="trash_btn" tool_tip="Auswahl löschen"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="Datei" name="File">
+			<menu_item_call label="Öffnen" name="Open"/>
+			<menu label="Hochladen" name="upload">
+				<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
+				<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
+				<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+				<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="Neues Fenster" name="New Window"/>
+			<menu_item_call label="Filter anzeigen" name="Show Filters"/>
+			<menu_item_call label="Filter zurücksetzen" name="Reset Current"/>
+			<menu_item_call label="Alle Ordner schließen" name="Close All Folders"/>
+			<menu_item_call label="Papierkorb ausleeren" name="Empty Trash"/>
+			<menu_item_call label="Fundstücke ausleeren" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="Bauen" name="Create">
+			<menu_item_call label="Neuer Ordner" name="New Folder"/>
+			<menu_item_call label="Neues Skript" name="New Script"/>
+			<menu_item_call label="Neue Notiz" name="New Note"/>
+			<menu_item_call label="Neue Geste" name="New Gesture"/>
+			<menu label="Neue Kleider" name="New Clothes">
+				<menu_item_call label="Neues Hemd" name="New Shirt"/>
+				<menu_item_call label="Neue Hose" name="New Pants"/>
+				<menu_item_call label="Neue Schuhe" name="New Shoes"/>
+				<menu_item_call label="Neue Socken" name="New Socks"/>
+				<menu_item_call label="Neue Jacke" name="New Jacket"/>
+				<menu_item_call label="Neuer Rock" name="New Skirt"/>
+				<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="Neue Tätowierung" name="New Tattoo"/>
+			</menu>
+			<menu label="Neue Körperteile" name="New Body Parts">
+				<menu_item_call label="Neue Form/Gestalt" name="New Shape"/>
+				<menu_item_call label="Neue Haut" name="New Skin"/>
+				<menu_item_call label="Neues Haar" name="New Hair"/>
+				<menu_item_call label="Neue Augen" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Sortieren" name="Sort">
+			<menu_item_check label="Nach Name" name="By Name"/>
+			<menu_item_check label="Nach Datum" name="By Date"/>
+			<menu_item_check label="Ordner immer nach Name" name="Folders Always By Name"/>
+			<menu_item_check label="Systemordner nach oben" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml
index a685a430f0..c61fc26f4c 100644
--- a/indra/newview/skins/default/xui/de/panel_me.xml
+++ b/indra/newview/skins/default/xui/de/panel_me.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ich" name="panel_me">
+<panel label="Mein Profil" name="panel_me">
 	<tab_container name="tabs">
-		<panel label="Mein Profil" name="panel_profile"/>
-		<panel label="Auswahl" name="panel_picks"/>
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="AUSWAHL" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
new file mode 100644
index 0000000000..b657333439
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Allgemein" name="Media Settings General">
+	<text name="home_label">
+		Home-URL:
+	</text>
+	<text name="home_fails_whitelist_label">
+		(Diese URL befindet sich nicht auf der festgelegten Whitelist)
+	</text>
+	<line_editor name="home_url" tool_tip="Die Home-URL für diese Medienquelle"/>
+	<text name="preview_label">
+		Vorschau
+	</text>
+	<text name="current_url_label">
+		Derzeitige URL:
+	</text>
+	<text name="current_url" tool_tip="Die derzeitige URL für diese Medienquelle" value=""/>
+	<button label="Zurücksetzen" name="current_url_reset_btn"/>
+	<check_box initial_value="false" label="Automatisch wiederholen" name="auto_loop"/>
+	<check_box initial_value="false" label="Interaktion beim ersten Anklicken" name="first_click_interact"/>
+	<check_box initial_value="false" label="Automatisch zoomen" name="auto_zoom"/>
+	<check_box initial_value="false" label="Medien automatisch abspielen" name="auto_play"/>
+	<text name="media_setting_note">
+		Hinweis: Einwohner können diese Einstellung überschreiben
+	</text>
+	<check_box initial_value="false" label="Medien automatisch auf Objektflächen skalieren" name="auto_scale"/>
+	<text name="size_label">
+		Größe:
+	</text>
+	<text name="X_label">
+		X
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
new file mode 100644
index 0000000000..603fb67fd2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Steuerung" name="Media settings for controls">
+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_owner_control"/>
+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_group_interact"/>
+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_group_control"/>
+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
new file mode 100644
index 0000000000..d94d8b9375
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sicherheit" name="Media Settings Security">
+	<check_box initial_value="false" label="Zugang nur für bestimmte URLs ermöglichen (mittels Präfix)" name="whitelist_enable"/>
+	<text name="home_url_fails_some_items_in_whitelist">
+		Einträge, die auf ungültige Home-URLs hinweisen, sind markiert:
+	</text>
+	<button label="Hinzufügen" name="whitelist_add"/>
+	<button label="Löschen" name="whitelist_del"/>
+	<text name="home_url_fails_whitelist">
+		Warnung: Die Home-URL, die in der Registerkarte &quot;Allgemein&quot; angegeben wurde, entspricht nicht den Einträgen auf der Whitelist. Sie wurde deaktiviert, bis ein gültiger Eintrag angegeben wird.
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_my_profile.xml b/indra/newview/skins/default/xui/de/panel_my_profile.xml
new file mode 100644
index 0000000000..8357e4318d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_my_profile.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="no_partner_text" value="Keiner"/>
+	<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="Klicken Sie unten auf die Schaltfläche Profil bearbeiten, um das Bild zu ändern."/>
+				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</panel>
+			<panel name="first_life_image_panel">
+				<icon label="" name="real_world_edit_icon" tool_tip="Klicken Sie unten auf die Schaltfläche Profil bearbeiten, um das Bild zu ändern."/>
+				<text name="title_rw_descr_text" value="Echtes Leben:"/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</panel>
+			<text name="me_homepage_text">
+				Webseite:
+			</text>
+			<text name="title_member_text" value="Mitglied seit:"/>
+			<text name="register_date" value="05/31/1976"/>
+			<text name="title_acc_status_text" value="Kontostatus:"/>
+			<text name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/>
+			<text name="title_partner_text" value="Partner:"/>
+			<panel name="partner_data_panel">
+				<text name="partner_text" value="[FIRST] [LAST]"/>
+			</panel>
+			<text name="title_groups_text" value="Gruppen:"/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
+		</panel>
+	</scroll_container>
+	<panel name="profile_buttons_panel">
+		<button label="Freund hinzufügen" name="add_friend"/>
+		<button label="IM" name="im"/>
+		<button label="Anrufen" name="call"/>
+		<button label="Karte" name="show_on_map_btn"/>
+		<button label="Teleportieren" name="teleport"/>
+	</panel>
+	<panel name="profile_me_buttons_panel">
+		<button label="Profil bearbeiten" name="edit_profile_btn"/>
+		<button label="Aussehen bearbeiten" name="edit_appearance_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
new file mode 100644
index 0000000000..5bf78be3d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="navigation_bar">
+	<panel name="navigation_panel">
+		<button name="back_btn" tool_tip="Zurück zum vorherigen Standort gehen"/>
+		<button name="forward_btn" tool_tip="Um einen Standort weiter gehen"/>
+		<button name="home_btn" tool_tip="Zu meinem Heimatort teleportieren"/>
+		<location_input label="Standort" name="location_combo"/>
+		<search_combo_box label="Suche" name="search_combo_box" tool_tip="Suche">
+			<combo_editor label="[SECOND_LIFE] durchsuchen" name="search_combo_editor"/>
+		</search_combo_box>
+	</panel>
+	<favorites_bar name="favorite">
+		<chevron_button name="&gt;&gt;" tool_tip="Zeige weitere meiner Favoriten an"/>
+	</favorites_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
new file mode 100644
index 0000000000..699bddc6eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="nearby_chat">
+	<panel name="chat_caption">
+		<text name="sender_name">
+			CHAT IN DER NÄHE
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
index 6e5b35b002..5e6e460c65 100644
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
 	<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/>
+	<button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_notes.xml b/indra/newview/skins/default/xui/de/panel_notes.xml
new file mode 100644
index 0000000000..994c02935c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_notes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notizen &amp; Privatsphäre" name="panel_notes">
+	<layout_stack name="layout">
+		<panel name="notes_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="profile_scroll_panel">
+					<text name="status_message" value="Meine Notizen:"/>
+					<text name="status_message2" value="Diese Person kann:"/>
+					<check_box label="meinen Online-Status sehen." name="status_check"/>
+					<check_box label="mich auf der Karte sehen." name="map_check"/>
+					<check_box label="meine Objekte bearbeiten, löschen oder nehmen." name="objects_check"/>
+				</panel>
+			</scroll_container>
+		</panel>
+		<panel name="notes_buttons_panel">
+			<button label="Hinzufügen" name="add_friend"/>
+			<button label="IM" name="im"/>
+			<button label="Anrufen" name="call"/>
+			<button label="Karte" name="show_on_map_btn"/>
+			<button label="Teleportieren" name="teleport"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..da871cad47
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<accordion_tab name="tab_outfits" title="Outfit-Leiste"/>
+		<accordion_tab name="tab_cof" title="Aktuelles Outfit"/>
+	</accordion>
+	<button label="&gt;" name="selector" tool_tip="Outfit-Eigenschaften anzeigen"/>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+		<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
+		<dnd_button name="trash_btn" tool_tip="Auswahl löschen"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
new file mode 100644
index 0000000000..ec4d109acd
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="Neues Outfit" name="new"/>
+	<menu_item_call label="Outfit anziehen" name="wear"/>
+	<menu_item_call label="Outfit löschen" name="delete"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
new file mode 100644
index 0000000000..3e99272833
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="Leute" name="people_panel">
+	<string name="no_people" value="Keine Leute"/>
+	<string name="no_one_near" value="Keiner in der Nähe"/>
+	<string name="no_friends_online" value="Keine Freunde online"/>
+	<string name="no_friends" value="Keine Freunde"/>
+	<string name="no_groups" value="Keine Gruppen"/>
+	<string name="people_filter_label" value="Nach Leuten filtern"/>
+	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
+	<filter_editor label="Filter" name="filter_input"/>
+	<tab_container name="tabs">
+		<panel label="IN DER NÄHE" name="nearby_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="nearby_view_sort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			</panel>
+		</panel>
+		<panel label="FREUNDE" 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="Optionen"/>
+				<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
+				<button name="del_btn" tool_tip="Ausgewählte Person von Ihrer Freundesliste entfernen"/>
+			</panel>
+		</panel>
+		<panel label="GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="groups_viewsort_btn" tool_tip="Optionen"/>
+				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
+			</panel>
+		</panel>
+		<panel label="AKTUELL" name="recent_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="recent_viewsort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			</panel>
+		</panel>
+	</tab_container>
+	<panel name="button_bar">
+		<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
+		<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
+		<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
+		<button label="Teilen" name="share_btn"/>
+		<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
+		<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
+		<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
index e0bc3da88e..a1588e5930 100644
--- a/indra/newview/skins/default/xui/de/panel_picks.xml
+++ b/indra/newview/skins/default/xui/de/panel_picks.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Auswahl" name="panel_picks">
+	<string name="no_picks" value="Keine Auswahl"/>
+	<string name="no_classifieds" value="Keine Anzeigen"/>
+	<text name="empty_picks_panel_text">
+		Es wurde keine Auswahl getroffen/keine Anzeigen ausgewählt
+	</text>
+	<accordion name="accordion">
+		<accordion_tab name="tab_picks" title="Auswahl"/>
+		<accordion_tab name="tab_classifieds" title="Anzeigen"/>
+	</accordion>
 	<panel label="bottom_panel" name="edit_panel">
 		<button name="new_btn" tool_tip="Aktuellen Standort zur Auswahl hinzufügen"/>
 	</panel>
 	<panel name="buttons_cucks">
+		<button label="Info" name="info_btn"/>
+		<button label="Teleportieren" name="teleport_btn"/>
 		<button label="Karte" name="show_on_map_btn"/>
+		<button label="▼" name="overflow_btn"/>
 	</panel>
 </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
new file mode 100644
index 0000000000..e012acac8d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="place_profile">
+	<string name="on" value="Ein"/>
+	<string name="off" value="Aus"/>
+	<string name="anyone" value="Jeder"/>
+	<string name="available" value="verfügbar"/>
+	<string name="allocated" value="vergeben"/>
+	<string name="title_place" value="Ortsprofil"/>
+	<string name="title_teleport_history" value="Teleport-Verlauf"/>
+	<string name="not_available" value="k.A."/>
+	<string name="unknown" value="(unbekannt)"/>
+	<string name="public" value="(öffentlich)"/>
+	<string name="none_text" value="(keiner)"/>
+	<string name="sale_pending_text" value="(Wird verkauft)"/>
+	<string name="group_owned_text" value="(In Gruppenbesitz)"/>
+	<string name="price_text" value="L$"/>
+	<string name="area_text" value="m²"/>
+	<string name="all_residents_text" value="Alle Einwohner"/>
+	<string name="group_text" value="Gruppe"/>
+	<string name="can_resell">
+		Gekauftes Land in dieser Region kann wiederverkauft werden.
+	</string>
+	<string name="can_not_resell">
+		Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
+	</string>
+	<string name="can_change">
+		Gekauftes Land in dieser Region kann zusammengelegt und geteilt werden.
+	</string>
+	<string name="can_not_change">
+		Gekauftes Land in dieser Region kann nicht zusammengelegt und geteilt werden.
+	</string>
+	<string name="server_update_text">
+		Ohne Serverupdate sind keine Ortsinformationen verfügbar.
+	</string>
+	<string name="server_error_text">
+		Zur Zeit gibt es keine Informationen zu diesem Standort. Bitte versuchen Sie es später.
+	</string>
+	<string name="server_forbidden_text">
+		Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
+	</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>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<string name="icon_Voice" value="parcel_drk_Voice"/>
+	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
+	<string name="icon_Fly" value="parcel_drk_Fly"/>
+	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
+	<string name="icon_Push" value="parcel_drk_Push"/>
+	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
+	<string name="icon_Build" value="parcel_drk_Build"/>
+	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
+	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
+	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
+	<string name="icon_Damage" value="parcel_drk_Damage"/>
+	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
+	<text name="title" value="Ortsprofil"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="owner_label" value="Eigentümer:"/>
+			<text name="owner_value" value="Alex Superduperlongenamenton"/>
+			<text name="maturity_value" value="unbekannt"/>
+			<accordion name="advanced_info_accordion">
+				<accordion_tab name="parcel_characteristics_tab" title="Parzelle">
+					<panel>
+						<text name="rating_label" value="Einstufung:"/>
+						<text name="rating_value" value="unbekannt"/>
+						<text name="voice_label" value="Voice:"/>
+						<text name="voice_value" value="Ein"/>
+						<text name="fly_label" value="Fliegen:"/>
+						<text name="fly_value" value="Ein"/>
+						<text name="push_label" value="Stoßen:"/>
+						<text name="push_value" value="Aus"/>
+						<text name="build_label" value="Bauen:"/>
+						<text name="build_value" value="Ein"/>
+						<text name="scripts_label" value="Skripts:"/>
+						<text name="scripts_value" value="Ein"/>
+						<text name="damage_label" value="Schaden:"/>
+						<text name="damage_value" value="Aus"/>
+						<button label="Über Land" name="about_land_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="region_information_tab" title="Region">
+					<panel>
+						<text name="region_name_label" value="Region:"/>
+						<text name="region_name" value="Mooseland"/>
+						<text name="region_type_label" value="Typ:"/>
+						<text name="region_type" value="Moose"/>
+						<text name="region_rating_label" value="Einstufung:"/>
+						<text name="region_rating" value="Adult"/>
+						<text name="region_owner_label" value="Eigentümer:"/>
+						<text name="region_owner" value="moose Van Moose"/>
+						<text name="region_group_label" value="Gruppe:"/>
+						<text name="region_group">
+							The Mighty Moose of mooseville soundvillemoose
+						</text>
+						<button label="Region/Grundstück" name="region_info_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="estate_information_tab" title="Grundstück">
+					<panel>
+						<text name="estate_name_label" value="Grundstück:"/>
+						<text name="estate_rating_label" value="Einstufung:"/>
+						<text name="estate_owner_label" value="Eigentümer:"/>
+						<text name="covenant_label" value="Vertrag:"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="sales_tab" title="Zum Verkauf">
+					<panel>
+						<text name="sales_price_label" value="Preis:"/>
+						<text name="area_label" value="Gebiet:"/>
+						<text name="traffic_label" value="Traffic:"/>
+						<text name="primitives_label" value="Primitive:"/>
+						<text name="parcel_scripts_label" value="Skripts:"/>
+						<text name="terraform_limits_label" value="Terraform-Begrenzungen:"/>
+						<text name="subdivide_label" value="Teilen/Zusammenlegen:"/>
+						<text name="resale_label" value="Wiederverkaufen:"/>
+						<text name="sale_to_label" value="Zum Verkauf an:"/>
+					</panel>
+				</accordion_tab>
+			</accordion>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
new file mode 100644
index 0000000000..a2f98bf199
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Orte" name="places panel">
+	<string name="landmarks_tab_title" value="MEINE LANDMARKEN"/>
+	<string name="teleport_history_tab_title" value="TELEPORT-VERLAUF"/>
+	<filter_editor label="Filter" name="Filter"/>
+	<panel name="button_panel">
+		<button label="Teleportieren" name="teleport_btn"/>
+		<button label="Karte" name="map_btn"/>
+		<button label="Bearbeiten" name="edit_btn"/>
+		<button label="Schließen" name="close_btn"/>
+		<button label="Abbrechen" name="cancel_btn"/>
+		<button label="Speichern" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
index c7833f6936..14d4e01586 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="advanced">
+	<panel.string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</panel.string>
+	<panel.string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</panel.string>
+	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	<color_swatch name="background" tool_tip="Farbe für Blasen-Chat auswählen"/>
+	<slider label="Deckkraft" name="bubble_chat_opacity"/>
 	<text name="AspectRatioLabel1" tool_tip="Breite/Höhe">
-		Aspektverhältnis:
+		Seitenverhältnis
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="Breite/Höhe">
 		<combo_box.item label="4:3 (Standard-CRT)" name="item1"/>
@@ -9,4 +18,31 @@
 		<combo_box.item label="8:5 (Widescreen)" name="item3"/>
 		<combo_box.item label="16:9 (Widescreen)" name="item4"/>
 	</combo_box>
+	<check_box label="Automatisch erkennen" name="aspect_auto_detect"/>
+	<text name="heading1">
+		Kamera:
+	</text>
+	<slider label="Sichtwinkel" name="camera_fov"/>
+	<slider label="Abstand" name="camera_offset_scale"/>
+	<text name="heading2">
+		Automatische Positionierung:
+	</text>
+	<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
+	<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
+	<text name="heading3">
+		Avatare:
+	</text>
+	<check_box label="Mich im Mouselook anzeigen" name="first_person_avatar_visible"/>
+	<check_box label="Mit Pfeiltasten bewegen" name="arrow_keys_move_avatar_check"/>
+	<check_box label="2-mal-drücken-halten, um zu rennen" name="tap_tap_hold_to_run"/>
+	<check_box label="Avatarlippen beim Sprechen bewegen" name="enable_lip_sync"/>
+	<check_box label="Skript-Fehler anzeigen" name="show_script_errors"/>
+	<radio_group name="show_location">
+		<radio_item label="In Chat" name="0"/>
+		<radio_item label="In einem Fenster" name="1"/>
+	</radio_group>
+	<check_box label="Umschaltmodus für Mikrofon, wenn die Auslöste-Taste zum Sprechen gedrückt wird:" name="push_to_talk_toggle_check" tool_tip="Wenn der Umschaltmodus aktiviert ist, drücken Sie die Auslöse-Taste EINMAL, um Ihr Mikrofon an oder aus zu stellen. Wenn der Umschaltmodus nicht motiviert ist, ist das Mikro nur dann eingeschaltet, wenn Sie die Auslösetaste gedrückt halten."/>
+	<line_editor label="Auslöser für Zum-Sprechen-drücken:" name="modifier_combo"/>
+	<button label="Taste festlegen" name="set_voice_hotkey_button"/>
+	<button label="Mittlere Maustaste" name="set_voice_middlemouse_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index 0ad6291537..3e00c39289 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -1,24 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Popups" name="popups" title="Popups">
-	<text>
-		Popups nicht anzeigen:
-	</text>
-	<text name="dont_show_label">
-		Diese Popups nicht anzeigen:
-	</text>
-	<button label="Dieses Popup aktivieren" name="enable_popup"/>
-	<text>
-		Popups anzeigen:
+	<text name="tell_me_label">
+		Anzeigen:
 	</text>
+	<check_box label="Wenn ich Geld ausgebe oder L$ erhalte" name="notify_money_change_checkbox"/>
+	<check_box label="Wenn meinen Freund sich an- oder abmelden" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
-		Diese Popups anzeigen:
+		Diese Warnhinweise immer anzeigen:
 	</text>
-	<text name="text_box2">
-		Anbieten von Notizkarten, Texturen und Landmarken:
+	<text name="dont_show_label">
+		Diese Warnhinweise immer anzeigen:
 	</text>
-	<check_box label="Automatisch annehmen" name="accept_new_inventory"/>
-	<check_box label="Nach Annahme automatisch anzeigen" name="show_new_inventory"/>
-	<button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen aktivieren."/>
-	<button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen deaktivieren."/>
-	<check_box label="Neue Objekte im Inventar automatisch anzeigen" name="show_in_inventory"/>
 </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 3fa06b17f7..d51675e150 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -39,4 +39,5 @@
 	</text>
 	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
 	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+	<check_box label="Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 8d9ebe423b..5bbd579ff6 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -1,90 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_panel">
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden." label="Mein Heimatort"/>
-		<combo_box.item name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden." label="Mein letzter Standort"/>
-	</combo_box>
-	<check_box label="Startposition auf Anmeldebildschirm anzeigen" name="show_location_checkbox"/>
-	<combo_box name="fade_out_combobox">
-		<combo_box.item name="Never" label="Nie"/>
-		<combo_box.item name="Show Temporarily" label="Temporär anzeigen"/>
-		<combo_box.item name="Always" label="Immer"/>
-	</combo_box>
-	<check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>
-	<check_box label="Meinen Namen auf meinem Bildschirm ausblenden" name="show_my_name_checkbox"/>
-	<text name="group_titles_textbox">
-		Gruppentitel:
-	</text>
-	<check_box label="Alle Gruppentitel ausblenden" name="show_all_title_checkbox"/>
-	<check_box label="Meinen Gruppentitel ausblenden" name="show_my_title_checkbox"/>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
-	<text name="UI Size:">
-		UI-Größe:
+	<text name="language_textbox">
+		Sprache:
 	</text>
-	<check_box label="Auflösungsunabhängigen Maßstab verwenden" name="ui_auto_scale"/>
-	<spinner label="Timeout für Abwesenheit:" name="afk_timeout_spinner"/>
-	<check_box label="L$ Eingänge und Ausgaben melden" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
-		Einstufung:
+	<combo_box name="language_combobox">
+		<combo_box.item label="Systemvorgabe" name="System Default Language"/>
+		<combo_box.item label="English (Englisch)" name="English"/>
+		<combo_box.item label="Danks (Dänisch) - Beta" name="Danish"/>
+		<combo_box.item label="Deutsch - Beta" name="Deutsch(German)"/>
+		<combo_box.item label="Español (Spanisch) - Beta" name="Spanish"/>
+		<combo_box.item label="Français (Französisch) - Beta" name="French"/>
+		<combo_box.item label="Italiano (Italienisch) - Beta" name="Italian"/>
+		<combo_box.item label="Nederlands (Niederländisch) - Beta" name="Dutch"/>
+		<combo_box.item label="Polski (Polnisch) - Beta" name="Polish"/>
+		<combo_box.item label="Português (Portugiesisch) - Beta" name="Portugese"/>
+		<combo_box.item label="日本語 (Japanisch) - Beta" name="(Japanese)"/>
+		<combo_box.item label="Testsprache" name="TestLanguage"/>
+	</combo_box>
+	<text name="language_textbox2">
+		(Erfordert Neustart)
 	</text>
 	<text name="maturity_desired_prompt">
 		Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen:
 	</text>
+	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item name="Desired_Adult" label="PG, Mature und Adult"/>
-		<combo_box.item name="Desired_Mature" label="PG und Mature"/>
-		<combo_box.item name="Desired_PG" label="PG"/>
+		<combo_box.item label="PG, Mature und Adult" name="Desired_Adult"/>
+		<combo_box.item label="PG und Mature" name="Desired_Mature"/>
+		<combo_box.item label="Allgemein" name="Desired_PG"/>
 	</combo_box>
-	<text name="maturity_desired_textbox">
-		PG
-	</text>
 	<text name="start_location_textbox">
-		Startposition:
+		Startstandort:
 	</text>
-	<text name="show_names_textbox">
-		Namen anzeigen:
+	<combo_box name="start_location_combo">
+		<combo_box.item label="Mein letzter Standort" name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden."/>
+		<combo_box.item label="Mein Heimatort" name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden."/>
+	</combo_box>
+	<check_box initial_value="true" label="Beim Anmelden anzeigen" name="show_location_checkbox"/>
+	<text name="name_tags_textbox">
+		Avatarnamen:
 	</text>
+	<radio_group name="Name_Tag_Preference">
+		<radio_item label="Aus" name="radio"/>
+		<radio_item label="An" name="radio2"/>
+		<radio_item label="Vorübergehend anzeigen" name="radio3"/>
+	</radio_group>
+	<check_box label="Meinen Namen anzeigen" name="show_my_name_checkbox1"/>
+	<check_box initial_value="true" label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>
+	<check_box label="Gruppentitel anzeigen" name="show_all_title_checkbox1"/>
 	<text name="effects_color_textbox">
-		Farbe für meine Effekte:
+		Meine Effekte:
+	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="title_afk_text">
+		Zeit bis zur Abwesenheit:
 	</text>
+	<spinner label="" name="afk_timeout_spinner"/>
 	<text name="seconds_textbox">
 		Sekunden
 	</text>
-	<text name="crash_report_textbox">
-		Crash-Berichte:
-	</text>
-	<text name="language_textbox">
-		Sprache:
-	</text>
-	<text name="language_textbox2">
-		(Erfordert Neustart)
+	<text name="text_box3">
+		Antwort, wenn im „Beschäftigt“-Modus:
 	</text>
-	<string name="region_name_prompt">
-		&lt;Region eingeben&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox">
-		<combo_box.item name="Askbeforesending" label="Vor dem Senden fragen"/>
-		<combo_box.item name="Alwayssend" label="Immer senden"/>
-		<combo_box.item name="Neversend" label="Nie senden"/>
-	</combo_box>
-	<combo_box name="language_combobox">
-		<combo_box.item name="System Default Language" label="Betriebssystem-Einstellung"/>
-		<combo_box.item name="English" label="English (Englisch)"/>
-		<combo_box.item name="Danish" label="Danks (Dänisch) - Beta"/>
-		<combo_box.item name="Deutsch(German)" label="Deutsch - Beta"/>
-		<combo_box.item name="Spanish" label="Español (Spanisch) - Beta"/>
-		<combo_box.item name="French" label="Français (Französisch) - Beta"/>
-		<combo_box.item name="Italian" label="Italiano (Italienisch) - Beta"/>
-		<combo_box.item name="Hungarian" label="Magyar (Ungarisch) - Beta"/>
-		<combo_box.item name="Dutch" label="Nederlands (Niederländisch) - Beta"/>
-		<combo_box.item name="Polish" label="Polski (Polnisch) - Beta"/>
-		<combo_box.item name="Portugese" label="Português (Portugiesisch) - Beta"/>
-		<combo_box.item name="Russian" label="Русский (Russian) - Beta"/>
-		<combo_box.item name="Turkish" label="Türkçe (Türkisch) - Beta"/>
-		<combo_box.item name="Ukrainian" label="Українська (Ukrainisch) - Beta"/>
-		<combo_box.item name="Chinese" label="中文 (简体) (Chinesisch) - Beta"/>
-		<combo_box.item name="(Japanese)" label="日本語 (Japanisch) - Beta"/>
-		<combo_box.item name="(Korean)" label="한국어 (Koreanisch) - Beta"/>
-	</combo_box>
-	<check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
+	<text_editor name="busy_response">
+		log_in_to_change
+	</text_editor>
 </panel>
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 ce26e3782b..e7bb768925 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -40,7 +40,7 @@
 			Shader:
 		</text>
 		<check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
-		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht."/>
+		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
 		<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
 		<check_box initial_value="true" label="Wasserreflexionen" name="Reflections"/>
 		<text name="ReflectionDetailText">
@@ -55,7 +55,7 @@
 		<text name="AvatarRenderingText">
 			Avatar-Darstellung:
 		</text>
-		<check_box initial_value="true" label="Ersatzavatare" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="Scheinavatare" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
 		<slider label="Sichtweite:" name="DrawDistance"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index 30083deea8..fe0dca78d1 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Kommunikation" name="im">
 	<panel.string name="log_in_to_change">
-		Zum Ändern anmelden
+		Anmelden, um Änderungen vorzunehmen
 	</panel.string>
-	<button label="Cache löschen" name="clear_cache"/>
+	<button label="Verlauf leeren" name="clear_cache"/>
 	<text name="cache_size_label_l">
-		(Positionen, Bilder, Internet, Suchverlauf)
+		(Standorte, Bilder, Web, Suchverlauf)
 	</text>
-	<check_box label="Nur Freunden und Gruppen meinen Online-Status mitteilen" name="online_visibility"/>
-	<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
-	<check_box label="Nach Beendigung von Anrufen Mikrofon abschalten." name="auto_disengage_mic_check"/>
+	<check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/>
+	<check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/>
+	<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>
 	<check_box label="Cookies annehmen" name="cookies_enabled"/>
-	<check_box label="Protokoll auf meinem Computer speichern" name="log_instant_messages"/>
-	<radio_group name="ChatIMLogs">
-		<radio_item label="Chat" name="radio1"/>
-		<radio_item label="IM" name="radio2"/>
-	</radio_group>
+	<check_box label="Automatisches Abspielen von Medien erlauben" name="autoplay_enabled"/>
+	<check_box label="Medien auf Parzellen automatisch abspielen" name="parcel_autoplay_enabled"/>
+	<text name="Logs:">
+		Protokolle:
+	</text>
+	<check_box label="Protokolle von Gesprächen in der Nähe auf meinem Computer speichern" name="log_nearby_chat"/>
+	<check_box label="IM Protokolle auf meinem Computer speichern" name="log_instant_messages"/>
+	<check_box label="Zeitstempel hinzufügen" name="show_timestamps_check_im"/>
+	<text name="log_path_desc">
+		Speicherort der Protokolldateien
+	</text>
 	<button label="Durchsuchen" label_selected="Durchsuchen" name="log_path_button"/>
+	<button label="Ignorierte Einwohner/Objekte" name="block_list"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index ef28bf4cfe..f1d4a853e8 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -15,32 +15,32 @@
 		Maximale Bandbreite
 	</text>
 	<text name="text_box2">
-		kbps
+		kbit/s
 	</text>
-	<check_box label="Benutzerdefinierter Port" name="connection_port_enabled"/>
-	<spinner label="Port-Nummer:" name="web_proxy_port"/>
+	<check_box label="Eigener Port" name="connection_port_enabled"/>
+	<spinner label="Portnummer:" name="web_proxy_port"/>
 	<text name="cache_size_label_l">
-		Cache
+		Cachegröße
 	</text>
 	<text name="text_box5">
 		MB
 	</text>
 	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/>
-	<button label="Zurücksetzen" label_selected="Festlegen" name="reset_cache"/>
+	<button label="Zurücksetzen" label_selected="Set" name="reset_cache"/>
 	<text name="Cache location">
-		Cache-Ordner
+		Speicherort des Caches
 	</text>
 	<text name="Web:">
-		Internet:
+		Web:
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Den integrierten Browser für Hilfe, Internetlinks, usw. verwenden. Der Browser wird als eigenständiges Fenster in [APP_NAME] geöffnet."/>
-		<radio_item label="Meinen Browser verwenden (IE, Firefox)" name="external" tool_tip="Standard-Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen."/>
+		<radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/>
+		<radio_item label="Meinen Browser verwenden (IE, Firefox)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen."/>
 	</radio_group>
-	<check_box initial_value="false" label="Web-Proxy:" name="web_proxy_enabled"/>
-	<line_editor name="web_proxy_editor" tool_tip="Name oder IP-Adresse des Proxys"/>
+	<check_box initial_value="false" label="Web Proxy" name="web_proxy_enabled"/>
+	<line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/>
 	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_proxy"/>
 	<text name="Proxy location">
-		Proxy-Standort
+		Proxyadresse
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index 3c4d8203fb..94c215b80b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -1,73 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Audio und Video" name="Preference Media panel">
-	<slider label="Master" name="System Volume"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sounds" name="Preference Media panel">
+	<slider label="Master-Lautstärke" name="System Volume"/>
+	<check_box initial_value="true" label="Stummschalten, wenn verkleinert" name="mute_when_minimized"/>
 	<slider label="Umgebung" name="Wind Volume"/>
-	<slider label="Sounds" name="SFX Volume"/>
+	<slider label="Schaltflächen" name="UI Volume"/>
 	<slider label="Medien" name="Media Volume"/>
-	<slider label="UI" name="UI Volume"/>
-	<slider label="Musik" name="Music Volume"/>
+	<slider label="Soundeffekte" name="SFX Volume"/>
+	<slider label="Musik wird gestreamt" name="Music Volume"/>
+	<check_box label="Sprache" name="enable_voice_check"/>
 	<slider label="Sprache" name="Voice Volume"/>
-	<text_editor name="voice_unavailable">
-		Voice-Chat ist nicht verfügbar
-	</text_editor>
-	<check_box label="Voice-Chat aktivieren" name="enable_voice_check"/>
-	<radio_group name="ear_location">
-		<radio_item name="0" label="Voice-Chat von Kameraposition aus hören" />
-		<radio_item name="1" label="Voice-Chat von Avatarposition aus hören" />
-	</radio_group>
-	<button label="Geräte-Einstellungen" name="device_settings_btn"/>
-	<text name="muting_text">
-		Lautstärke:
-	</text>
-	<check_box label="Audio stummschalten" name="disable audio" />
-	<text name="streaming_prefs_text">
-		Streaming-Einstellungen:
-	</text>
-	<text name="audio_prefs_text">
-		Audio-Einstellungen:
-	</text>
-	<panel label="Lautstärke" name="Volume Panel" />
-	<check_box label="Medien automatisch wiedergeben" name="auto_streaming_video" />
-	<check_box label="Audio stummschalten, wenn Fenster minimiert ist"
-	     name="mute_when_minimized" />
-	<text name="streaming_text">
-		Streaming:
-	</text>
-	<check_box label="Streaming-Musik abspielen" name="streaming_music" />
-	<check_box label="Streaming-Media abspielen" name="streaming_video" />
-	<text name="system_volume_text">
-		Soundeffekte:
-	</text>
-	<text name="wind_volume_text">
-		Windlautstärke:
+	<text name="Listen from">
+		Hören von:
 	</text>
-	<text name="footsteps_volume_text">
-		Schrittlautstärke:
-	</text>
-	<text name="ui_volume_text">
-		UI-Volumen:
-	</text>
-	<slider label="Dopplereffekt" name="Doppler Effect" />
-	<slider label="Distanzfaktor" name="Distance Factor" />
-	<slider label="Rolloff-Faktor" name="Rolloff Factor" />
-	<spinner label="L$ Änderungs-Grenzwert" name="L$ Change Threshold" />
-	<spinner label="Gesundheitsschwellwert" name="Health Change Threshold" />
-	<text name="doppler_effect_text">
-		Audio-Einstellungen:
-	</text>
-	<text name="distance_factor_text">
-		Distanzfaktor:
-	</text>
-	<text name="rolloff_factor_text">
-		Rolloff-Faktor:
-	</text>
-	<text name="default_upload_bitrate_text">
-		Standard-Upload-Bitrate:
-	</text>
-	<radio_group name="bitrate">
-		<radio_item name="32kbps" label="32 kbit/s" />
-		<radio_item name="64kbps" label="64 kbit/s" />
-		<radio_item name="96kbps" label="96 kbit/s" />
-		<radio_item name="128kbps" label="128 kbit/s" />
+	<radio_group name="ear_location">
+		<radio_item label="Kameraposition" name="0"/>
+		<radio_item label="Avatarposition" name="1"/>
 	</radio_group>
+	<button label="Eingabe-/Ausgabegeräte" name="device_settings_btn"/>
+	<panel label="Geräte-Einstellungen" name="device_settings_panel">
+		<panel.string name="default_text">
+			Standard
+		</panel.string>
+		<text name="Input">
+			Eingabe
+		</text>
+		<text name="My volume label">
+			Meine Lautstärke:
+		</text>
+		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler"/>
+		<text name="wait_text">
+			Bitte warten
+		</text>
+		<text name="Output">
+			Ausgabe
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..ed5daa60ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="MediaControls">
+	<string name="control_background_image_name">
+		Inspector_Background
+	</string>
+	<string name="skip_step">
+		0.2
+	</string>
+	<layout_stack name="media_controls">
+		<layout_panel name="media_address">
+			<line_editor name="media_address_url" tool_tip="Medien URL"/>
+			<layout_stack name="media_address_url_icons">
+				<layout_panel>
+					<icon name="media_whitelist_flag" tool_tip="Whitelist aktiviert"/>
+				</layout_panel>
+				<layout_panel>
+					<icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="media_play_position">
+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Fortschritt der Filmwiedergabe"/>
+		</layout_panel>
+		<layout_panel name="media_volume">
+			<button name="media_volume_button" tool_tip="Dieses Medium stummschalten"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack>
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="Medien werden geladen"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml
index c3274acaae..c67d7f7fbc 100644
--- a/indra/newview/skins/default/xui/de/panel_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile.xml
@@ -12,31 +12,47 @@
 	</string>
 	<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=de-DE"/>
 	<string name="no_partner_text" value="Keiner"/>
+	<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]:"/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<panel name="first_life_image_panel">
 				<text name="title_rw_descr_text" value="Echtes Leben:"/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<text name="me_homepage_text">
 				Webseite:
 			</text>
 			<text name="title_member_text" value="Mitglied seit:"/>
+			<text name="register_date" value="05/31/1976"/>
 			<text name="title_acc_status_text" value="Kontostatus:"/>
+			<text name="acc_status_text" value="Einwohner. Keine Zahlungsinfo archiviert."/>
 			<text name="title_partner_text" value="Partner:"/>
 			<panel name="partner_data_panel">
 				<text name="partner_text" value="[FIRST] [LAST]"/>
 			</panel>
 			<text name="title_groups_text" value="Gruppen:"/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
 		</panel>
 	</scroll_container>
 	<panel name="profile_buttons_panel">
 		<button label="Freund hinzufügen" name="add_friend"/>
 		<button label="IM" name="im"/>
 		<button label="Anrufen" name="call"/>
+		<button label="Karte" name="show_on_map_btn"/>
 		<button label="Teleportieren" name="teleport"/>
+		<button label="▼" name="overflow_btn"/>
 	</panel>
 	<panel name="profile_me_buttons_panel">
 		<button label="Profil bearbeiten" name="edit_profile_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_profile_view.xml b/indra/newview/skins/default/xui/de/panel_profile_view.xml
index 84e1a20bf7..4d59c16e98 100644
--- a/indra/newview/skins/default/xui/de/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile_view.xml
@@ -6,10 +6,11 @@
 	<string name="status_offline">
 		Offline
 	</string>
-	<text name="user_name" value="(wird geladen...)"/>
+	<text_editor name="user_name" value="(wird geladen...)"/>
 	<text name="status" value="Online"/>
 	<tab_container name="tabs">
-		<panel label="Profil" name="panel_profile"/>
-		<panel label="Auswahl" name="panel_picks"/>
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="AUSWAHL" name="panel_picks"/>
+		<panel label="NOTIZEN &amp; PRIVATSPHÄRE" name="panel_notes"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
index a72f0e4240..14be8def7e 100644
--- a/indra/newview/skins/default/xui/de/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Vertrag" name="Covenant">
 	<text name="estate_section_lbl">
-		Grundstück:
+		Grundstück
 	</text>
 	<text name="estate_name_lbl">
 		Name:
@@ -31,17 +31,16 @@
       Grundstück übernommen.
 	</text>
 	<text bottom_delta="-36" name="covenant_instructions">
-		Ziehen Sie eine Notizkarte an diese Stelle, um den Vertrag für dieses
-      Grundstück zu ändern.
+		Ziehen Sie eine Notizkarte an diese Stelle, um den Vertrag für dieses Grundstück zu ändern.
 	</text>
 	<text bottom_delta="-36" name="region_section_lbl">
-		Region:
+		Region
 	</text>
 	<text name="region_name_lbl">
 		Name:
 	</text>
 	<text name="region_name_text">
-		leyla
+		Erica
 	</text>
 	<text name="region_landtype_lbl">
 		Typ:
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
index 9e03ebeda3..40befab4dd 100644
--- a/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -22,13 +22,13 @@
 	<line_editor name="target_avatar_name">
 		(keiner)
 	</line_editor>
-	<button label="Auswählen..." name="choose_avatar_btn"/>
+	<button label="Auswählen" name="choose_avatar_btn"/>
 	<text name="options_text_lbl">
 		Optionen:
 	</text>
-	<check_box label="Nur Objekte mit Skripten zurückgeben" name="return_scripts" tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen."/>
-	<check_box label="Nur Objekte auf dem Land eines anderen Einwohners zurückgeben" name="return_other_land" tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden"/>
-	<check_box label="Objekte in jeder Region dieses Grundstücks zurückgeben" name="return_estate_wide" tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben"/>
+	<check_box label="Mit Skripten" name="return_scripts" tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen."/>
+	<check_box label="Auf dem Land von jemand anderem" name="return_other_land" tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden"/>
+	<check_box label="In jeder Region auf diesem Grundstück" name="return_estate_wide" tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben"/>
 	<button label="Zurückgeben" name="return_btn" width="90"/>
 	<button label="Top-Kollisionsobjekte..." name="top_colliders_btn" tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen"/>
 	<button label="?" name="top_colliders_help"/>
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 ddc5941da6..e0008d2a39 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grundstück" name="Estate">
 	<text name="estate_help_text">
 		Änderungen auf dieser Registerkarte wirken sich
@@ -11,7 +11,7 @@ auf alle Regionen auf dem Grundstück aus.
 		(unbekannt)
 	</text>
 	<text name="owner_text">
-		Eigentümer:
+		Grundstückseigentümer:
 	</text>
 	<text name="estate_owner">
 		(unbekannt)
@@ -19,59 +19,57 @@ auf alle Regionen auf dem Grundstück aus.
 	<text name="Only Allow">
 		Zugang beschränken auf:
 	</text>
-	<check_box label="Einwohner mit Zahlungsinformationen" name="limit_payment"
-	     tool_tip="Nicht identifizierte Einwohner verbannen." />
-	<check_box label="Altersgeprüfte Erwachsene" name="limit_age_verified"
-	     tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com." />
-	<check_box label="Voice-Chat erlauben" name="voice_chat_check" />
-	<button label="?" name="voice_chat_help" />
+	<check_box label="Einwohner mit Zahlungsinformationen" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen"/>
+	<check_box label="Altersgeprüfte Erwachsene" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+	<check_box label="Voice-Chat erlauben" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text" width="222">
 		E-Mail-Adresse für Missbrauchsmeldungen:
 	</text>
 	<string name="email_unsupported">
 		Funktion nicht unterstützt
 	</string>
-	<button label=" ?" name="abuse_email_address_help" />
-	<button label="?" name="estate_manager_help" />
-	<button label="Hinzufügen..." name="add_estate_manager_btn" />
-	<button label="Entfernen..." name="remove_estate_manager_btn" />
-	<check_box label="Globale Zeit verwenden" name="use_global_time_check" />
-	<button label="?" name="use_global_time_help" />
-	<check_box label="Sonne fest" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Phase" name="sun_hour_slider" />
-	<check_box label="Freien Zugang erlauben" name="externally_visible_check" />
-	<button label="?" name="externally_visible_help" />
-	<check_box label="Direktteleport zulassen" name="allow_direct_teleport" />
-	<button label="?" name="allow_direct_teleport_help" />
+	<button label=" ?" name="abuse_email_address_help"/>
+	<button label="?" name="estate_manager_help"/>
+	<button label="Hinzufügen..." name="add_estate_manager_btn"/>
+	<button label="Entfernen..." name="remove_estate_manager_btn"/>
+	<check_box label="Globale Zeit verwenden" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Sonne fest" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Phase" name="sun_hour_slider"/>
+	<check_box label="Freien Zugang erlauben" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<check_box label="Direktteleport zulassen" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="region_text_lbl">
 		Zugang nach Zahlungsstatus verweigern:
 	</text>
-	<check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous" />
-	<check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified" />
-	<check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted" />
-	<button label="Übernehmen" name="apply_btn" />
+	<check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous"/>
+	<check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified"/>
+	<check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted"/>
+	<button label="Übernehmen" name="apply_btn"/>
 	<text name="estate_manager_label">
 		Grundstücksverwalter:
 	</text>
 	<text name="allow_resident_label">
 		Zulässige Einwohner:
 	</text>
-	<button label="?" name="allow_resident_help" />
-	<button label="Hinzufügen..." name="add_allowed_avatar_btn" />
-	<button label="Entfernen..." name="remove_allowed_avatar_btn" />
+	<button label="?" name="allow_resident_help"/>
+	<button label="Hinzufügen..." name="add_allowed_avatar_btn"/>
+	<button label="Entfernen..." name="remove_allowed_avatar_btn"/>
 	<text name="allow_group_label">
 		Zulässige Gruppen:
 	</text>
-	<button label="?" name="allow_group_help" />
-	<button label="Hinzufügen..." name="add_allowed_group_btn" />
-	<button label="Entfernen..." name="remove_allowed_group_btn" />
+	<button label="?" name="allow_group_help"/>
+	<button label="Hinzufügen..." name="add_allowed_group_btn"/>
+	<button label="Entfernen..." name="remove_allowed_group_btn"/>
 	<text name="ban_resident_label">
 		Verbannte Einwohner:
 	</text>
-	<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="?" 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"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml
index df936ff643..4361b39def 100644
--- a/indra/newview/skins/default/xui/de/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Bodentexturen" name="Textures">
 	<text name="region_text_lbl">
 		Region:
@@ -36,22 +36,23 @@
 	<text name="height_text_lbl9">
 		Nordost
 	</text>
-	<spinner label="Niedrig" name="height_start_spin_0" />
-	<spinner label="Niedrig" name="height_start_spin_1" />
-	<spinner label="Niedrig" name="height_start_spin_2" />
-	<spinner label="Niedrig" name="height_start_spin_3" />
-	<spinner label="Hoch" name="height_range_spin_0" />
-	<spinner label="Hoch" name="height_range_spin_1" />
-	<spinner label="Hoch" name="height_range_spin_2" />
-	<spinner label="Hoch" name="height_range_spin_3" />
+	<spinner label="Niedrig" name="height_start_spin_0"/>
+	<spinner label="Niedrig" name="height_start_spin_1"/>
+	<spinner label="Niedrig" name="height_start_spin_2"/>
+	<spinner label="Niedrig" name="height_start_spin_3"/>
+	<spinner label="Hoch" name="height_range_spin_0"/>
+	<spinner label="Hoch" name="height_range_spin_1"/>
+	<spinner label="Hoch" name="height_range_spin_2"/>
+	<spinner label="Hoch" name="height_range_spin_3"/>
 	<text name="height_text_lbl10">
 		Diese Werte geben den Mischungsgrad für die obigen Texturen an.
 	</text>
 	<text name="height_text_lbl11">
 		Der UNTERE Wert gibt die MAXIMALE Höhe von Textur Nr. 1 an
+und der OBERE WERT die MINIMALE Höhe von Textur 4.
 	</text>
 	<text name="height_text_lbl12">
 		und der OBERE WERT die MINIMALE Höhe von Textur 4.
 	</text>
-	<button label="Übernehmen" name="apply_btn" />
+	<button label="Übernehmen" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml
new file mode 100644
index 0000000000..d5baacd357
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Startseite." name="sidebar_home">
+		<panel label="Startseite" name="panel_home"/>
+	</sidetray_tab>
+	<sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people">
+		<panel_container name="panel_container">
+			<panel label="Gruppeninfo" name="panel_group_info_sidetray"/>
+			<panel label="Ignorierte Einwohner &amp; Objekte" name="panel_block_list_sidetray"/>
+		</panel_container>
+	</sidetray_tab>
+	<sidetray_tab description="Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben." label="Orte" name="sidebar_places">
+		<panel label="Orte" name="panel_places"/>
+	</sidetray_tab>
+	<sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me">
+		<panel label="Ich" name="panel_me"/>
+	</sidetray_tab>
+	<sidetray_tab description="Ändern Sie Ihr Aussehen und Ihren aktuellen Look." name="sidebar_appearance">
+		<panel label="Aussehen bearbeiten" name="sidepanel_appearance"/>
+	</sidetray_tab>
+	<sidetray_tab description="Inventar durchsuchen." name="sidebar_inventory">
+		<panel label="Inventar bearbeiten" name="sidepanel_inventory"/>
+	</sidetray_tab>
+</side_tray>
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..93fff56f84
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="sidetray_tab_panel">
+	<text name="sidetray_tab_title" value="Klappmenü??"/>
+	<button name="show_help" tool_tip="Hilfe anzeigen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
new file mode 100644
index 0000000000..cf3080a4f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Part of side tray, see that XML file for panel config -->
+<panel label="home_tab" name="home_tab">
+	<scroll_container name="profile_scroll">
+		<panel name="profile_scroll_panel">
+			<panel name="sidebar_people">
+				<text name="tab_name" value="Leute"/>
+				<text name="tab_description">
+					Freunde, Gruppen, Kontakte und Leute in Ihrer Nähe finden.
+				</text>
+			</panel>
+			<panel name="sidebar_places">
+				<text name="tab_name" value="Orte"/>
+				<text name="tab_description">
+					Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben.
+				</text>
+			</panel>
+			<panel name="sidebar_me">
+				<text name="tab_name" value="Mein Profil"/>
+				<text name="tab_description">
+					Öffentliches Profil bearbeiten.
+				</text>
+			</panel>
+			<panel name="sidebar_appearance">
+				<text name="tab_name" value="Mein Aussehen"/>
+				<text name="tab_description">
+					Ändern Sie Ihr Aussehen und Ihren aktuellen Look.
+				</text>
+			</panel>
+			<panel name="sidebar_inventory">
+				<text name="tab_name" value="Mein Inventar"/>
+				<text name="tab_description">
+					Inventar durchsuchen.
+				</text>
+			</panel>
+		</panel>
+	</scroll_container>
+</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 4ba867e118..253207fe73 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -12,6 +12,12 @@
 	<panel.string name="bandwidth_tooltip">
 		Bandbreite
 	</panel.string>
+	<panel.string name="time">
+		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+	</panel.string>
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
@@ -19,4 +25,5 @@
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		12:00
 	</text>
+	<button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
new file mode 100644
index 0000000000..504f1727e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="sys_well_item" title="sys_well_item">
+	<text name="title">
+		Achtung Forelle! ACHTUNG! DIE! FORELLE!
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
new file mode 100644
index 0000000000..3149ddf19e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Teleport History">
+	<accordion name="history_accordion">
+		<accordion_tab name="today" title="Heute"/>
+		<accordion_tab name="yesterday" title="Gestern"/>
+		<accordion_tab name="2_days_ago" title="Vor 2 Tagen"/>
+		<accordion_tab name="3_days_ago" title="Vor 3 Tagen"/>
+		<accordion_tab name="4_days_ago" title="Vor 4 Tagen"/>
+		<accordion_tab name="5_days_ago" title="Vor 5 Tagen"/>
+		<accordion_tab name="6_days_and_older" title="6 Tage und älter"/>
+		<accordion_tab name="1_month_and_older" title="1 Monat und älter"/>
+		<accordion_tab name="6_months_and_older" title="6 Monate und älter"/>
+	</accordion>
+	<panel label="bottom_panel" name="bottom_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
new file mode 100644
index 0000000000..9d18c52442
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+	<text name="region" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
new file mode 100644
index 0000000000..07d35f30e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Aussehen" name="appearance panel">
+	<string name="No Outfit" value="Kein Outfit"/>
+	<panel name="panel_currentlook">
+		<button label="Bearbeiten" name="editappearance_btn"/>
+		<text name="currentlook_title">
+			Aktuelles Outfit:
+		</text>
+		<text name="currentlook_name">
+			Mein Outfit
+		</text>
+	</panel>
+	<filter_editor label="Filter" name="Filter"/>
+	<button label="Anziehen" name="wear_btn"/>
+	<button label="Neues Outfit" name="newlook_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
new file mode 100644
index 0000000000..d40e2f3398
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sonstiges" name="objects panel">
+	<panel label="" name="sidepanel__inventory_panel">
+		<panel name="button_panel">
+			<button label="Info" name="info_btn"/>
+			<button label="Anziehen" name="wear_btn"/>
+			<button label="Wiedergeben" name="play_btn"/>
+			<button label="Teleportieren" name="teleport_btn"/>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
new file mode 100644
index 0000000000..947ffbf186
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="Inventarobjekt-Eigenschaften">
+	<panel.string name="unknown">
+		(unbekannt)
+	</panel.string>
+	<panel.string name="public">
+		(öffentlich)
+	</panel.string>
+	<panel.string name="you_can">
+		Sie können:
+	</panel.string>
+	<panel.string name="owner_can">
+		Eigentümer kann:
+	</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>
+	<panel label="">
+		<text name="LabelItemNameTitle">
+			Name:
+		</text>
+		<text name="LabelItemDescTitle">
+			Beschreibung:
+		</text>
+		<text name="LabelCreatorTitle">
+			Ersteller:
+		</text>
+		<text name="LabelCreatorName">
+			Nicole Linden
+		</text>
+		<button label="Profil..." name="BtnCreator"/>
+		<text name="LabelOwnerTitle">
+			Eigentümer:
+		</text>
+		<text name="LabelOwnerName">
+			Thrax Linden
+		</text>
+		<button label="Profil..." name="BtnOwner"/>
+		<text name="LabelAcquiredTitle">
+			Erworben:
+		</text>
+		<text name="LabelAcquiredDate">
+			Mittwoch, 24. Mai 2006, 12:50:46
+		</text>
+		<text name="OwnerLabel">
+			Sie:
+		</text>
+		<check_box label="Bearbeiten" name="CheckOwnerModify"/>
+		<check_box label="Kopieren" name="CheckOwnerCopy"/>
+		<check_box label="Wiederverkaufen" name="CheckOwnerTransfer"/>
+		<text name="AnyoneLabel">
+			Jeder:
+		</text>
+		<check_box label="Kopieren" name="CheckEveryoneCopy"/>
+		<text name="GroupLabel">
+			Gruppe:
+		</text>
+		<check_box label="Teilen" name="CheckShareWithGroup"/>
+		<text name="NextOwnerLabel">
+			Nächster Eigentümer:
+		</text>
+		<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
+		<check_box label="Kopieren" name="CheckNextOwnerCopy"/>
+		<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
+		<check_box label="Zum Verkauf" name="CheckPurchase"/>
+		<combo_box name="combobox sale copy">
+			<combo_box.item label="Kopieren" name="Copy"/>
+			<combo_box.item label="Original" name="Original"/>
+		</combo_box>
+		<spinner label="Preis:" name="Edit Cost"/>
+		<text name="CurrencySymbol">
+			L$
+		</text>
+	</panel>
+	<panel name="button_panel">
+		<button label="Bearbeiten" name="edit_btn"/>
+		<button label="Abbrechen" name="cancel_btn"/>
+		<button label="Speichern" name="save_btn"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..b0ce47e3ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="object properties" title="Objekteigenschaften">
+	<panel.string name="text deed continued">
+		Übertragung
+	</panel.string>
+	<panel.string name="text deed">
+		Übertragung
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Sie können dieses Objekt bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Sie können diese Objekte bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Sie können dieses Objekt nicht bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Sie können diese Objekte nicht bearbeiten.
+	</panel.string>
+	<panel.string name="text modify warning">
+		Diese Objekt verfügt über verknüpfte Teile
+	</panel.string>
+	<panel.string name="Cost Default">
+		Preis: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Summe: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Stückpreis: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Mischpreis
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Mischverkauf
+	</panel.string>
+	<panel label="">
+		<text name="Name:">
+			Name:
+		</text>
+		<text name="Description:">
+			Beschreibung:
+		</text>
+		<text name="Creator:">
+			Ersteller:
+		</text>
+		<text name="Creator Name">
+			Esbee Linden
+		</text>
+		<text name="Owner:">
+			Eigentümer:
+		</text>
+		<text name="Owner Name">
+			Erica Linden
+		</text>
+		<text name="Group:">
+			Gruppe:
+		</text>
+		<button name="button set group" tool_tip="Eine Gruppe auswählen, um die Berechtigungen des Objekts zu teilen."/>
+		<name_box initial_value="Wird geladen..." name="Group Name Proxy"/>
+		<button label="Übertragung" label_selected="Übertragung" name="button deed" tool_tip="Eine Übertragung bedeutet, dass das Objekt mit den Berechtigungen „Nächster Eigentümer“ weitergegeben wird. Mit der Gruppe geteilte Objekte können von einem Gruppen-Officer übertragen werden."/>
+		<check_box label="Teilen" name="checkbox share with group" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern teilen. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
+		<text name="label click action">
+			Bei Linksklick:
+		</text>
+		<combo_box name="clickaction">
+			<combo_box.item label="Berühren (Standard)" name="Touch/grab(default)"/>
+			<combo_box.item label="Auf Objekt setzen" name="Sitonobject"/>
+			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
+			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
+			<combo_box.item label="Öffnen" name="Open"/>
+		</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="Inhalte" name="Contents"/>
+			<combo_box.item label="Original" name="Original"/>
+		</combo_box>
+		<spinner label="Preis: L$" name="Edit Cost"/>
+		<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
+		<panel name="perms_build">
+			<text name="perm_modify">
+				Sie können dieses Objekt bearbeiten.
+			</text>
+			<text name="Anyone can:">
+				Jeder:
+			</text>
+			<check_box label="Bewegen" name="checkbox allow everyone move"/>
+			<check_box label="Kopieren" name="checkbox allow everyone copy"/>
+			<text name="Next owner can:">
+				Nächster Eigentümer:
+			</text>
+			<check_box label="Bearbeiten" name="checkbox next owner can modify"/>
+			<check_box label="Kopieren" name="checkbox next owner can copy"/>
+			<check_box label="Transferieren" name="checkbox next owner can transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
+			<text name="B:">
+				B:
+			</text>
+			<text name="O:">
+				O:
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+		</panel>
+	</panel>
+	<panel name="button_panel">
+		<button label="Bearbeiten" name="edit_btn"/>
+		<button label="Öffnen" name="open_btn"/>
+		<button label="Zahlen" name="pay_btn"/>
+		<button label="Kaufen" name="buy_btn"/>
+		<button label="Abbrechen" name="cancel_btn"/>
+		<button label="Speichern" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 86eb8b1479..1488f615a3 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings
      that are returned from one component and may appear in many places-->
 <strings>
-	<string name="create_account_url">http://join.secondlife.com/index.php?lang=de-DE</string>
 	<string name="SECOND_LIFE">
 		Second Life
 	</string>
@@ -80,8 +79,14 @@
 	<string name="LoginDownloadingClothing">
 		Kleidung wird geladen...
 	</string>
+	<string name="Quit">
+		Beenden
+	</string>
+	<string name="create_account_url">
+		http://join.secondlife.com/index.php?lang=de-DE
+	</string>
 	<string name="AgentLostConnection">
-		In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung.
+		In dieser Region kann es zu Problemen kommen.  Bitte überprüfen Sie Ihre Internetverbindung.
 	</string>
 	<string name="TooltipPerson">
 		Person
@@ -155,9 +160,19 @@
 	<string name="TooltipObjectIMUrl">
 		Anklicken, um Beschreibung des Objekts anzuzeigen
 	</string>
+	<string name="TooltipMapUrl">
+		Klicken, um diese Position auf der Karte anzuzeigen
+	</string>
 	<string name="TooltipSLAPP">
 		Anklicken, um Befehl secondlife:// auszuführen
 	</string>
+	<string name="CurrentURL" value=" CurrentURL: [CurrentURL]"/>
+	<string name="SLurlLabelTeleport">
+		Teleportieren nach
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		Karte anzeigen für
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Schließen (&#8984;W)
 	</string>
@@ -182,6 +197,12 @@
 	<string name="BUTTON_HELP">
 		Hilfe anzeigen
 	</string>
+	<string name="Searching">
+		Suchen...
+	</string>
+	<string name="NoneFound">
+		Nicht gefunden.
+	</string>
 	<string name="RetrievingData">
 		Laden...
 	</string>
@@ -197,6 +218,9 @@
 	<string name="AvatarNameWaiting">
 		(wartet)
 	</string>
+	<string name="AvatarNameMultiple">
+		(mehrere)
+	</string>
 	<string name="AvatarNameHippos">
 		(hippos)
 	</string>
@@ -308,6 +332,9 @@
 	<string name="symbolic link">
 		Link
 	</string>
+	<string name="AvatarEditingAppearance">
+		(Aussehen wird bearbeitet)
+	</string>
 	<string name="AvatarAway">
 		Abwesend
 	</string>
@@ -315,7 +342,7 @@
 		Beschäftigt
 	</string>
 	<string name="AvatarMuted">
-		Stummgeschaltet
+		Ignoriert
 	</string>
 	<string name="anim_express_afraid">
 		Ängstlich
@@ -530,6 +557,9 @@
 	<string name="worldmap_offline">
 		Offline
 	</string>
+	<string name="worldmap_results_none_found">
+		Nicht gefunden.
+	</string>
 	<string name="Ok">
 		OK
 	</string>
@@ -660,16 +690,16 @@
 		Verzeichnis auswählen
 	</string>
 	<string name="AvatarSetNotAway">
-		Als anwesend anzeigen
+		Nicht abwesend
 	</string>
 	<string name="AvatarSetAway">
-		Als abwesend anzeigen
+		Abwesend
 	</string>
 	<string name="AvatarSetNotBusy">
-		Als nicht beschäftigt anzeigen
+		Nicht beschäftigt
 	</string>
 	<string name="AvatarSetBusy">
-		Als beschäftigt anzeigen
+		Beschäftigt
 	</string>
 	<string name="shape">
 		Form
@@ -710,9 +740,51 @@
 	<string name="skirt">
 		Rock
 	</string>
+	<string name="alpha">
+		Alpha
+	</string>
+	<string name="tattoo">
+		Tätowierung
+	</string>
 	<string name="invalid">
 		ungültig
 	</string>
+	<string name="next">
+		Weiter
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		Gruppenmitteilung
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		Gruppenmitteilungen
+	</string>
+	<string name="GroupNotifySentBy">
+		Gesendet von
+	</string>
+	<string name="GroupNotifyAttached">
+		Im Anhang:
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		Alte Mitteilungen anzeigen oder hier Auswahl treffen, um keine Mitteilungen mehr zu erhalten.
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		Anlage öffnen
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		Siehe Anhang
+	</string>
+	<string name="TeleportOffer">
+		Teleport-Angebot
+	</string>
+	<string name="StartUpNotifications">
+		Sie haben neue Benachrichtigungen erhalten, während Sie abwesend waren.
+	</string>
+	<string name="OverflowInfoChannelString">
+		Sie haben noch %d weitere Benachrichtigungen
+	</string>
 	<string name="BodyPartsRightArm">
 		Rechter Arm
 	</string>
@@ -749,12 +821,46 @@
 	<string name="InventoryNoTexture">
 		Sie haben keine Kopie dieser Textur in Ihrem Inventar.
 	</string>
+	<string name="no_transfer" value=" (kein Transferieren)"/>
+	<string name="no_modify" value=" (kein Bearbeiten)"/>
+	<string name="no_copy" value=" (kein Kopieren)"/>
+	<string name="worn" value=" (getragen)"/>
+	<string name="link" value=" (Link)"/>
+	<string name="broken_link" value=" (unvollständiger_Link)"/>
 	<string name="LoadingContents">
 		Inhalte werden geladen...
 	</string>
 	<string name="NoContents">
 		Keine Inhalte
 	</string>
+	<string name="WornOnAttachmentPoint" value=" (getragen am [ATTACHMENT_POINT])"/>
+	<string name="PermYes">
+		Ja
+	</string>
+	<string name="PermNo">
+		Nein
+	</string>
+	<string name="Chat" value=" Chat:"/>
+	<string name="Sound" value=" Sound:"/>
+	<string name="Wait" value=" --- Warten:"/>
+	<string name="AnimFlagStop" value=" Animation stoppen:"/>
+	<string name="AnimFlagStart" value=" Animation starten:"/>
+	<string name="Wave" value=" Winken"/>
+	<string name="HelloAvatar" value=" Hallo Avatar!"/>
+	<string name="ViewAllGestures" value="  Alle anzeigen &gt;&gt;"/>
+	<string name="Animations" value=" Animationen,"/>
+	<string name="Calling Cards" value=" Visitenkarten,"/>
+	<string name="Clothing" value=" Kleidung,"/>
+	<string name="Gestures" value=" Gesten,"/>
+	<string name="Landmarks" value=" Landmarken,"/>
+	<string name="Notecards" value=" Notizkarten,"/>
+	<string name="Objects" value=" Objekte,"/>
+	<string name="Scripts" value=" Skripts,"/>
+	<string name="Sounds" value=" Sounds,"/>
+	<string name="Textures" value=" Texturen,"/>
+	<string name="Snapshots" value=" Fotos,"/>
+	<string name="No Filters" value="Nein "/>
+	<string name="Since Logoff" value=" - Seit Abmeldung"/>
 	<string name="InvFolder My Inventory">
 		Mein Inventar
 	</string>
@@ -1013,6 +1119,15 @@
 	<string name="AgeDaysC">
 		[COUNT] Tage
 	</string>
+	<string name="GroupMembersA">
+		[COUNT] Mitglied
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] Mitglieder
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] Mitglieder
+	</string>
 	<string name="AcctTypeResident">
 		Einwohner
 	</string>
@@ -1124,9 +1239,13 @@
 	<string name="GroupsNone">
 		keine
 	</string>
+	<string name="Group" value=" (Gruppe)"/>
 	<string name="Unknown">
 		(unbekannt)
 	</string>
+	<string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am "/>
+	<string name="NextStipendDay" value="Der nächste Stipendium-Tag ist "/>
+	<string name="GroupIndividualShare" value="                      Gruppenanteil       Einzelanteil"/>
 	<string name="Balance">
 		Kontostand
 	</string>
@@ -1158,10 +1277,10 @@
 		alle Grundstücke gehören [OWNER]
 	</string>
 	<string name="RegionInfoAllEstatesYouOwn">
-		alle Grundstücke, die Ihnen gehört haben
+		alle Grundstücke, die Sie besitzen
 	</string>
 	<string name="RegionInfoAllEstatesYouManage">
-		alle Grundstücke, die Sie für [OWNER] verwaltet haben
+		alle Grundstücke, die Sie für [OWNER] verwalten
 	</string>
 	<string name="RegionInfoAllowedResidents">
 		Zulässige Einwohner: ([ALLOWEDAGENTS], max [MAXACCESS])
@@ -1175,6 +1294,12 @@
 	<string name="PanelDirCountFound">
 		[COUNT] gefunden
 	</string>
+	<string name="PanelDirTimeStr">
+		[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]
+	</string>
+	<string name="PanelDirEventsDateText">
+		[mthnum,datetime,slt]/[day,datetime,slt]
+	</string>
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
@@ -1199,6 +1324,8 @@
 	<string name="covenant_last_modified">
 		Zuletzt geändert:
 	</string>
+	<string name="none_text" value=" (keiner)"/>
+	<string name="never_text" value=" (nie)"/>
 	<string name="GroupOwned">
 		In Gruppenbesitz
 	</string>
@@ -1211,24 +1338,6 @@
 	<string name="ClassifiedUpdateAfterPublish">
 		(wird nach Veröffentlichung aktualisiert)
 	</string>
-	<string name="GroupVoteYes">
-		Ja
-	</string>
-	<string name="GroupVoteNo">
-		Nein
-	</string>
-	<string name="GroupVoteNoActiveProposals">
-		Zurzeit sind keine Umfragen aktiv
-	</string>
-	<string name="GroupVoteNoArchivedProposals">
-		Zurzeit sind keine Umfragen aktiv
-	</string>
-	<string name="GroupVoteRetrievingArchivedProposals">
-		Archivierte Umfragen werden geladen
-	</string>
-	<string name="GroupVoteRetrievingActiveProposals">
-		Aktive Umfragen werden geladen
-	</string>
 	<string name="MultiPreviewTitle">
 		Vorschau
 	</string>
@@ -1360,7 +1469,7 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
 		Rechts
 	</string>
 	<string name="Back">
-		Zurück
+		Hinten
 	</string>
 	<string name="North">
 		Norden
@@ -1408,7 +1517,7 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
 		Dienstleistungen
 	</string>
 	<string name="Personal">
-		Verschiedenes
+		Sonstiges
 	</string>
 	<string name="None">
 		Keiner
@@ -1423,7 +1532,7 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
 		Kunst &amp; Kultur
 	</string>
 	<string name="Business">
-		Business
+		Firmen
 	</string>
 	<string name="Educational">
 		Bildung
@@ -1482,6 +1591,12 @@ Gültige Formate: .wav, .tga, .bmp, .jpg, .jpeg oder .bvh
 	<string name="---">
 		---
 	</string>
+	<string name="Multiple Media">
+		Mehrere Medien
+	</string>
+	<string name="Play Media">
+		Medien Abspielen/Pausieren
+	</string>
 	<string name="MBCmdLineError">
 		Beim Parsen der Befehlszeile wurde ein Fehler festgestellt.
 Weitere Informationen: http://wiki.secondlife.com/wiki/Client_parameters (EN)
@@ -1501,7 +1616,7 @@ Falls der Fehler dann weiterhin auftritt, müssen Sie [APP_NAME] von Ihrem Syste
 		Unbehebbarer Fehler
 	</string>
 	<string name="MBRequiresAltiVec">
-		[APP_NAME] erfordert einen Prozessor mit AltiVec (G4 oder später).
+		 [APP_NAME] erfordert einen Prozessor mit AltiVec (G4 oder später).
 	</string>
 	<string name="MBAlreadyRunning">
 		[APP_NAME] läuft bereits.
@@ -1554,9 +1669,8 @@ Ausführung erfolgt in Fenster.
 		Beschreibung für Pixelformat nicht verfügbar
 	</string>
 	<string name="MBTrueColorWindow">
-		Um [APP_NAME] in einem Fenster auszuführen, ist True Color (32-bit) erforderlich.
-Klicken Sie auf Systemsteuerung &gt; Anzeige &gt; Einstellungen und stellen Sie den Bildschirm auf 32-bit Farbe ein.
-Wenn Sie die Anwendung im Modus Vollbildschirm ausführen möchten, dann wird [APP_NAME] den Bildschirm automatisch während der Ausführung anpassen.
+		Um [APP_NAME] auszuführen, ist True Color (32-bit) erforderlich.
+Klicken Sie öffnen Sie auf Ihrem Computer die Einstellungen für die Anzeige und stellen Sie den Bildschirm auf 32-bit Farbe ein.
 	</string>
 	<string name="MBAlpha">
 		[APP_NAME] kann nicht ausgeführt werden, da kein 8-Bit-Alpha-Kanal verfügbar ist.  Dies geschieht normalerweise bei Problemen mit dem Treiber der Video-Karte.
@@ -1599,39 +1713,15 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Attached Earlobes">
 		Angewachsene Ohrläppchen
 	</string>
-	<string name="Back Bangs">
-		Nackenhaar
-	</string>
-	<string name="Back Bangs Down">
-		Lang
-	</string>
-	<string name="Back Bangs Up">
-		Kurz
-	</string>
 	<string name="Back Fringe">
 		Nackenfransen
 	</string>
-	<string name="Back Hair">
-		Hinterkopfhaar
-	</string>
-	<string name="Back Hair Down">
-		lang
-	</string>
-	<string name="Back Hair Up">
-		kurz
-	</string>
 	<string name="Baggy">
 		Tränensäcke
 	</string>
 	<string name="Bangs">
 		Pony
 	</string>
-	<string name="Bangs Down">
-		Pony lang
-	</string>
-	<string name="Bangs Up">
-		Pony kurz
-	</string>
 	<string name="Beady Eyes">
 		Knopfaugen
 	</string>
@@ -1644,9 +1734,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Big Butt">
 		Großer Hintern
 	</string>
-	<string name="Big Eyeball">
-		Großer Augapfel
-	</string>
 	<string name="Big Hair Back">
 		Volumen: Hinten
 	</string>
@@ -1821,9 +1908,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Corner Down">
 		Nach unten
 	</string>
-	<string name="Corner Normal">
-		Normal
-	</string>
 	<string name="Corner Up">
 		Nach oben
 	</string>
@@ -1833,9 +1917,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Crooked Nose">
 		Krumme Nase
 	</string>
-	<string name="Cropped Hair">
-		Kurze Haare
-	</string>
 	<string name="Cuff Flare">
 		Hosenaufschlag
 	</string>
@@ -1854,15 +1935,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Default Heels">
 		Standardabsätze
 	</string>
-	<string name="Default Toe">
-		Standardspitze
-	</string>
 	<string name="Dense">
 		Dicht
 	</string>
-	<string name="Dense hair">
-		Dichtes Haar
-	</string>
 	<string name="Double Chin">
 		Doppelkinn
 	</string>
@@ -1908,9 +1983,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Eye Spacing">
 		Augenstand
 	</string>
-	<string name="Eyeball Size">
-		Größe des Augapfels
-	</string>
 	<string name="Eyebrow Arc">
 		Brauenbogen
 	</string>
@@ -1935,36 +2007,15 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Eyeliner Color">
 		Farbe des Eyeliners
 	</string>
-	<string name="Eyes Back">
-		Augen zurück
-	</string>
 	<string name="Eyes Bugged">
 		Glubschaugen
 	</string>
-	<string name="Eyes Forward">
-		Augen nach vorne
-	</string>
-	<string name="Eyes Long Head">
-		Augen langer Kopf
-	</string>
 	<string name="Eyes Shear Left Up">
 		Augen Verzerrung links hoch
 	</string>
 	<string name="Eyes Shear Right Up">
 		Augen Verzerrung rechts hoch
 	</string>
-	<string name="Eyes Short Head">
-		Augen kurzer Kopf
-	</string>
-	<string name="Eyes Spread">
-		Augen auseinander
-	</string>
-	<string name="Eyes Sunken">
-		eingesunkene Augen
-	</string>
-	<string name="Eyes Together">
-		Augen zusammen
-	</string>
 	<string name="Face Shear">
 		Gesichtsverzerrung
 	</string>
@@ -1974,30 +2025,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Far Set Eyes">
 		Weit auseinander
 	</string>
-	<string name="Fat">
-		Dick
-	</string>
-	<string name="Fat Head">
-		Dicker Kopf
-	</string>
 	<string name="Fat Lips">
 		Volle Lippen
 	</string>
-	<string name="Fat Lower">
-		Volle Unterlippe
-	</string>
-	<string name="Fat Lower Lip">
-		Volle Unterlippe
-	</string>
-	<string name="Fat Torso">
-		Dicker Körper
-	</string>
-	<string name="Fat Upper">
-		Volle Oberlippe
-	</string>
-	<string name="Fat Upper Lip">
-		Volle Oberlippe
-	</string>
 	<string name="Female">
 		weiblich
 	</string>
@@ -2034,24 +2064,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Freckles">
 		Sommersprossen
 	</string>
-	<string name="Front Bangs Down">
-		Langer Pony
-	</string>
-	<string name="Front Bangs Up">
-		Kurzer Pony
-	</string>
 	<string name="Front Fringe">
 		Fransen, vorne
 	</string>
-	<string name="Front Hair">
-		Vorderhaar
-	</string>
-	<string name="Front Hair Down">
-		langes Vorderhaar
-	</string>
-	<string name="Front Hair Up">
-		Kurzes Vorderhaar
-	</string>
 	<string name="Full Back">
 		Hinten volles Haar
 	</string>
@@ -2325,9 +2340,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Long arms">
 		Lange Arme
 	</string>
-	<string name="Longcuffs">
-		Manschetten
-	</string>
 	<string name="Loose Pants">
 		Weite Hosen
 	</string>
@@ -2490,9 +2502,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="No Eyeshadow">
 		Kein Lidschatten
 	</string>
-	<string name="No Heels">
-		Keine Absätze
-	</string>
 	<string name="No Lipgloss">
 		Kein Lipgloss
 	</string>
@@ -2550,9 +2559,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Nostril Width">
 		Größe
 	</string>
-	<string name="Old">
-		Alt
-	</string>
 	<string name="Opaque">
 		Deckend
 	</string>
@@ -2652,9 +2658,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Pointy Heels">
 		Pfennigabsätze
 	</string>
-	<string name="Pointy Toe">
-		Spitz
-	</string>
 	<string name="Ponytail">
 		Pferdeschwanz
 	</string>
@@ -2679,15 +2682,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Red Hair">
 		Rote Haare
 	</string>
-	<string name="Red Skin">
-		Rote Haut
-	</string>
 	<string name="Regular">
 		Normal
 	</string>
-	<string name="Regular Muscles">
-		Normal muskulös
-	</string>
 	<string name="Right Part">
 		Scheitel rechts
 	</string>
@@ -2697,9 +2694,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Round">
 		Rund
 	</string>
-	<string name="Round Forehead">
-		Runde Stirn
-	</string>
 	<string name="Ruddiness">
 		Röte
 	</string>
@@ -2712,24 +2706,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Saddle Bags">
 		Hüftspeck
 	</string>
-	<string name="Saddlebags">
-		Hüftspeck
-	</string>
-	<string name="Scrawny">
-		Dürr
-	</string>
 	<string name="Scrawny Leg">
 		Dürres Bein
 	</string>
 	<string name="Separate">
 		Auseinander
 	</string>
-	<string name="Shading">
-		Schattierung
-	</string>
-	<string name="Shadow hair">
-		Schattenhaar
-	</string>
 	<string name="Shallow">
 		Flach
 	</string>
@@ -2742,15 +2724,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Shear Front">
 		Vorne rasiert
 	</string>
-	<string name="Shear Left">
-		Links
-	</string>
 	<string name="Shear Left Up">
 		Links
 	</string>
-	<string name="Shear Right">
-		Rechts
-	</string>
 	<string name="Shear Right Up">
 		Rechts
 	</string>
@@ -2811,15 +2787,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Shoulders">
 		Schultern
 	</string>
-	<string name="Side Bangs">
-		Seitlicher Pony
-	</string>
-	<string name="Side Bangs Down">
-		Lang
-	</string>
-	<string name="Side Bangs Up">
-		Kurz
-	</string>
 	<string name="Side Fringe">
 		Seitliche Fransen
 	</string>
@@ -2835,9 +2802,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Sides Hair Up">
 		Kurz
 	</string>
-	<string name="Skinny">
-		Dünn
-	</string>
 	<string name="Skinny Neck">
 		Dünner Hals
 	</string>
@@ -2886,9 +2850,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Socks Length">
 		Strumpflänge
 	</string>
-	<string name="Some">
-		Etwas
-	</string>
 	<string name="Soulpatch">
 		Unterlippenbart
 	</string>
@@ -2907,9 +2868,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Squash Head">
 		Gestaucht
 	</string>
-	<string name="Squash/Stretch Head">
-		Gestretcht/Gestaucht
-	</string>
 	<string name="Stretch Head">
 		Gestreckt
 	</string>
@@ -2928,18 +2886,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Sweep Forward">
 		Nach vorne
 	</string>
-	<string name="Swept Back">
-		Nach hinten
-	</string>
-	<string name="Swept Back Hair">
-		Haar nach hinten
-	</string>
-	<string name="Swept Forward">
-		Haare nach vorne
-	</string>
-	<string name="Swept Forward Hair">
-		Haare nach vorne
-	</string>
 	<string name="Tall">
 		Groß
 	</string>
@@ -2958,9 +2904,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Thick Toe">
 		Dick
 	</string>
-	<string name="Thickness">
-		Dicke
-	</string>
 	<string name="Thin">
 		Dünn
 	</string>
@@ -2991,12 +2934,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Tight Sleeves">
 		Enge Ärmel
 	</string>
-	<string name="Tilt Left">
-		Nach links
-	</string>
-	<string name="Tilt Right">
-		Nach rechts
-	</string>
 	<string name="Toe Shape">
 		Spitze
 	</string>
@@ -3075,6 +3012,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="LocationCtrlEditLandmarkTooltip">
 		Meine Landmarken bearbeiten
 	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		Weitere Informationen über die aktuelle Position
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		Mein Reiseverlauf
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Aktualisierung
 	</string>
@@ -3105,6 +3048,33 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="UpdaterFailStartTitle">
 		Viewer konnte nicht gestartet werden
 	</string>
+	<string name="IM_logging_string">
+		-- Instant-Message-Protokoll aktiviert --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] tippt...
+	</string>
+	<string name="Unnamed">
+		(Nicht benannt)
+	</string>
+	<string name="IM_moderated_chat_label">
+		(Moderiert: Stimmen in der Standardeinstellung stummgeschaltet)
+	</string>
+	<string name="IM_unavailable_text_label">
+		Für diese Verbindung ist kein Text-Chat verfügbar.
+	</string>
+	<string name="IM_muted_text_label">
+		Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
+	</string>
+	<string name="IM_default_text_label">
+		Für Instant Message hier klicken.
+	</string>
+	<string name="IM_to_label">
+		Bis
+	</string>
+	<string name="IM_moderator_label">
+		(Moderator)
+	</string>
 	<string name="only_user_message">
 		Sie sind der einzige Benutzer in dieser Sitzung.
 	</string>
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
index 48c67a3770..632564d793 100644
--- a/indra/newview/skins/default/xui/en/alert_button.xml
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <button
+  name="Alert Button"
   label_shadow="true"
   auto_resize="false"
   image_overlay_alignment="center"
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 90105f92fd..6adf2a5950 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -3,28 +3,23 @@
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
  follows="left|bottom"
- font_halign="center"
  halign="center"
  height="15"
  image_disabled="transparent.j2c"
  image_disabled_selected="transparent.j2c"
  image_selected="transparent.j2c"
  image_unselected="transparent.j2c"
- image_hover_selected="Favorite_Link_Over"
- image_hover_unselected="Favorite_Link_Over"
  image_pressed="Favorite_Link_Over"
- image_pressed_selected="Favorite_Link_Over"
  hover_glow_amount="0.15"
  label_shadow="false"
  layout="topleft"
  left="0"
  name="favorites_bar_btn"
- pad_bottom="-1"
+ pad_bottom="1"
  pad_left="11"
- pad_right="7"
+ pad_right="9"
+ scale_image="true"
  tab_stop="false"
- pad_right="10"
- pad_left="10" 
  top="0"
  use_ellipses="true"
  width="140" />
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index cb4cbd229a..0b48ba9321 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -18,7 +18,7 @@
  single_instance="true" 
  width="320">
   <string name="nudge_parabuild">Nudge 1</string>
-  <string name="test_the_vlt">This string is extracted.</string>
+  <string name="test_the_vlt">This string CHANGE is extracted.</string>
   <chat_history
    allow_html="true"
    bg_readonly_color="ChatHistoryBgColor"
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 2ff99dcf5a..b6443c4c21 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -6,7 +6,7 @@
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
- title="ABOUT [APP_NAME]"
+ title="ABOUT [CAPITALIZED_APP_NAME]"
  width="470">
   <floater.string
      name="AboutHeader">
@@ -112,7 +112,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
        word_wrap="true">
 Second Life is brought to you by 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 and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: (in progress)
+Thank you to the following Residents for helping to ensure that this is the best version yet: (in progress)
 
 
 
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 cc955369e2..61ca783d14 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -110,7 +110,7 @@
             </text>
             <line_editor
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left_pad="2"
              max_length="63"
@@ -145,7 +145,7 @@
              layout="topleft"
              left="10"
              name="LandType"
-             top="84"
+             top_pad="5"
              width="100">
                 Type:
             </text>
@@ -192,7 +192,7 @@
              layout="topleft"
              left="10"
              name="Owner:"
-             top="124"
+             top_pad="5"
              width="100">
                 Owner:
             </text>
@@ -202,14 +202,14 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="5"
+             left_pad="2"
              name="OwnerText"
              width="240">
                 Leyla Linden
             </text>
              <button
      follows="right"
-     height="16"
+     height="23"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
@@ -218,7 +218,7 @@
      width="16" />
           <!--  <button
              follows="left|top"
-             height="16"
+             height="23"
              label="Profile"
              layout="topleft"
              left_pad="4"
@@ -232,6 +232,7 @@
              layout="topleft"
              left="10"
              name="Group:"
+             top_pad="7"
              width="100">
                 Group:
             </text>
@@ -240,13 +241,14 @@
              enabled="false"
              follows="left|top"
              height="16"
-             left_pad="5"
+             left_pad="2"
              layout="topleft"
              name="GroupText"
-             width="240" />
+             width="240">
+Leyla Linden               </text>
                  <button
      follows="right"
-     height="16"
+     height="23"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
@@ -261,16 +263,17 @@
              left_pad="4"
              right="-10"
              name="Set..."
-             width="50" />
+             width="50"
+             top_delta="-2"/>
             <check_box
              enabled="false"
-             height="23"
+             height="16"
              label="Allow Deed to Group"
              layout="topleft"
-             left="96"
+             left="108"
              name="check deed"
              tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."
-             top="164"
+             top_pad="3"
              width="146" />
             <button
              enabled="false"
@@ -282,17 +285,18 @@
              right="-10"
              name="Deed..."
              tool_tip="You may only deed land if you are an officer in the selected group."
-             top_delta="0"
+             top_delta="-2"
              width="90" />
             <check_box
              enabled="false"
              height="16"
              label="Owner Makes Contribution With Deed"
              layout="topleft"
-             left="96"
+             left="108"
              name="check contrib"
              tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-             width="199" />
+             width="199"
+             top_pad="0"/>
             <text
              type="string"
              length="1"
@@ -333,7 +337,7 @@
              layout="topleft"
              left_delta="0"
              name="SalePending"
-             top_pad="6"
+             top_pad="5"
              width="324" />
             <button
              follows="left|top"
@@ -343,7 +347,8 @@
              left_pad="5"
              right="-10"
              name="Sell Land..."
-             width="145" />
+             width="145"
+             top_delta="-25"/>
             <text
              type="string"
              length="1"
@@ -352,7 +357,7 @@
              layout="topleft"
              left_delta="-199"
              name="For sale to"
-             top_delta="6"
+             top_delta="20"
              width="186">
                 For sale to: [BUYER]
             </text>
@@ -364,7 +369,7 @@
              layout="topleft"
              left_delta="0"
              name="Sell with landowners objects in parcel."
-             top_pad="8"
+             top_pad="-3"
              width="186">
                 Objects included in sale
             </text>
@@ -389,6 +394,7 @@
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
+             top_pad="-25"
              width="145" />
             <text
              type="string"
@@ -422,7 +428,7 @@
              layout="topleft"
              left="10"
              name="PriceLabel"
-             top="288"
+             top_pad="5"
              width="100">
                 Area:
             </text>
@@ -470,7 +476,7 @@
              layout="topleft"
              left_delta="82"
              name="Buy Land..."
-             top="328"
+             top_pad="7"
              width="100" />
             <button
              enabled="true"
@@ -480,7 +486,7 @@
              layout="topleft"
              left="10"
              name="Scripts..."
-             top="352"
+             top_pad="1"
              width="100" />
             <button
              enabled="false"
@@ -490,7 +496,7 @@
              layout="topleft"
              right="-10"
              name="Buy For Group..."
-             top="352"
+             top_delta="0"
              width="180" />
             <button
              enabled="false"
@@ -510,7 +516,7 @@
              layout="topleft"
              right="-10"
              name="Abandon Land..."
-             top="328"
+             top_pad="-47"
              width="180" />
             <button
              follows="left|top"
@@ -519,7 +525,7 @@
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-50"
+             top_delta="-61"
              width="180" />
             <button
              enabled="false"
@@ -530,7 +536,7 @@
              left_delta="0"
              name="Linden Sale..."
              tool_tip="Land must be owned, set content, and not already for auction."
-             top_pad="4"
+             top_pad="2"
              width="180" />
         </panel>
         <panel
@@ -807,7 +813,7 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="152"
+             left_delta="190"
              name="objects_available"
              top_delta="0"
              width="260">
@@ -831,7 +837,7 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="200"
+             left_delta="190"
              name="object_contrib_text"
              top_delta="0"
              width="212">
@@ -855,7 +861,7 @@
              follows="left|top"
              height="16"
              layout="topleft"
-             left_delta="200"
+             left_delta="190"
              name="total_objects_text"
              top_delta="0"
              width="48">
@@ -865,7 +871,7 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Owned by parcel owner:"
@@ -877,9 +883,9 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="owner_objects_text"
              top_delta="0"
              width="48">
@@ -889,33 +895,35 @@
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Show"
              label_selected="Show"
              layout="topleft"
              name="ShowOwner"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="100"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnOwner..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Set to group:"
-             top="104"
+             top_pad="5"
              width="176">
                 Set to group:
             </text>
@@ -923,9 +931,9 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="group_objects_text"
              top_delta="0"
              width="48">
@@ -936,32 +944,34 @@
              enabled="false"
              follows="left|top"
              label="Show"
-             height="20"
+             height="23"
              label_selected="Show"
              layout="topleft"
              name="ShowGroup"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="120"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnGroup..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Owned by others:"
-             top="124"
+             top_pad="5"
              width="176">
                 Owned by others:
             </text>
@@ -969,9 +979,9 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="other_objects_text"
              top_delta="0"
              width="48">
@@ -981,33 +991,35 @@
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Show"
              label_selected="Show"
              layout="topleft"
              name="ShowOther"
              right="-140"
-             width="60" />
+             width="60"
+             top_delta="-6"/>
             <button
              bottom="140"
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return"
              layout="topleft"
              name="ReturnOther..."
              right="-10"
              tool_tip="Return objects to their owners."
-             width="119" />
+             width="119"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="28"
              name="Selected / sat upon:"
-             top="144"
+             top_pad="5"
              width="176">
                 Selected / sat upon:
             </text>
@@ -1015,9 +1027,9 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
-             left_delta="176"
+             left_delta="172"
              name="selected_objects_text"
              top_delta="0"
              width="48">
@@ -1027,51 +1039,53 @@
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Autoreturn"
-             top="164"
+             top_pad="0"
              width="294">
-                Autoreturn other residents&apos; objects (minutes, 0 for off):
+                Auto return other Residents&apos; objects (minutes, 0 for off):
             </text>
             <line_editor
              border_style="line"
              border_thickness="1"
              bottom="180"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              max_length="6"
              name="clean other time"
-             right="-50"
-             width="56" />
+             right="-72"
+             width="56"
+             top_delta="-6"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Object Owners:"
-             top="184"
+             top_pad="10"
              width="104">
                 Object Owners:
             </text>
              <button
      follows="top|right"
-     height="20"
+     height="23"
      image_overlay="Refresh_Off"
      layout="topleft"
      name="Refresh List"
      left_pad="5"
      right="-183"
      tool_tip="Refresh Object List"
-     width="20" />
+     width="20"
+  top_delta="-6"/>
             <button
              enabled="false"
              follows="left|top"
-             height="20"
+             height="23"
              label="Return Objects"
              layout="topleft"
              left_pad="6"
@@ -1083,7 +1097,7 @@
              column_padding="0"
              draw_heading="true"
              follows="all"
-             height="190"
+             height="180"
              layout="topleft"
              left="10"
              name="owner list"
@@ -1172,7 +1186,7 @@ Only large parcels can be listed in search.
              name="allow_label"
              top="10"
              width="278">
-                Allow other residents to:
+                Allow other Residents to:
             </text>
             <check_box
              height="16"
@@ -1310,7 +1324,7 @@ Only large parcels can be listed in search.
              width="430" />
             <combo_box
              enabled="false"
-             height="20"
+             height="23"
              layout="topleft"
              left="30"
              name="land category with adult"
@@ -1371,7 +1385,7 @@ Only large parcels can be listed in search.
             </combo_box>
             <combo_box
              enabled="false"
-             height="20"
+             height="23"
              layout="topleft"
              left="30"
              name="land category"
@@ -1460,7 +1474,7 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
-             height="30"
+             height="16"
              layout="topleft"
              left="220"
              top="180"
@@ -1550,12 +1564,13 @@ Only large parcels can be listed in search.
                 Type:
             </text>
             <combo_box
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="0"
              name="media type"
              tool_tip="Specify if the URL is a movie, web page, or other media"
-             width="120" />
+             width="120"
+             top_delta="0"/>
             <text
              follows="left|top"
              height="16"
@@ -1571,27 +1586,29 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="at URL:"
-             width="100">
+             width="100"
+             top_pad="10">
                 Home Page:
             </text>
             <line_editor
              follows="left|top"
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="0"
              max_length="255"
              name="media_url"
              select_on_focus="true"
-             width="300" />
+             width="300"
+             top_delta="0"/>
             <button
              follows="right|top"
-             height="22"
+             height="23"
              label="Set"
              layout="topleft"
              left_pad="5"
-             right="-10"
              name="set_media_url"
-             width="50" />
+             width="50"
+             top_delta="0"/>
             <text
              type="string"
              length="1"
@@ -1600,18 +1617,20 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="CurrentURL:"
-             width="100">
+             width="100"
+             top_pad="10">
                 Current Page:
             </text>
-             <button
-     follows="top|right"
-     height="20"
-     image_overlay="Refresh_Off"
-     layout="topleft"
+            <button
+             follows="top|right"
+             height="23"
+             image_overlay="Refresh_Off"
+             layout="topleft"
              name="reset_media_url"
-     left_pad="0"
-     tool_tip="Refresh URL"
-     width="20" />
+             left_pad="0"
+             tool_tip="Refresh URL"
+             width="23"
+             top_delta="0"/>
             <text
              follows="left|top"
              height="16"
@@ -1620,22 +1639,25 @@ Only large parcels can be listed in search.
              name="current_url"
              width="300" />
             <check_box
+             follows="top|left"
              height="16"
              label="Hide URL"
              layout="topleft"
-             left="110"
+             left_delta="-36"
              name="hide_media_url"
              tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-             width="200" />
+             width="50"
+             top_pad="5"/>
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="16"
+             height="23"
              layout="topleft"
              left="10"
              name="Description:"
-             width="364">
+             width="364"
+             top_pad="10">
                 Description:
             </text>
             <line_editor
@@ -1647,7 +1669,7 @@ Only large parcels can be listed in search.
              name="url_description"
              select_on_focus="true"
              tool_tip="Text displayed next to play/load button"
-             top_delta="10"
+             top_delta="0"
              width="300" />
             <text
              type="string"
@@ -1671,7 +1693,7 @@ Only large parcels can be listed in search.
              left="110"
              name="media texture"
              tool_tip="Click to choose a picture"
-             top_delta="10"
+             top_delta="0"
              width="64" />
             <text
              type="string"
@@ -1682,16 +1704,17 @@ Only large parcels can be listed in search.
              left_pad="8"
              name="replace_texture_help"
              width="300"
-             word_wrap="true">
+             word_wrap="true"
+             top_delta="0">
              Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
             </text>
             <check_box
              height="16"
              label="Auto scale"
              layout="topleft"
-             left="110"
+             left="107"
              name="media_auto_scale"
-             top_pad="0"
+             top_pad="-10"
              tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
              width="200" />
             <text
@@ -1703,7 +1726,8 @@ Only large parcels can be listed in search.
              left="10"
              name="media_size"
              tool_tip="Size to render Web media, leave 0 for default."
-             width="100">
+             width="100"
+             top_pad="10">
                 Size:
             </text>
             <spinner
@@ -1711,7 +1735,7 @@ Only large parcels can be listed in search.
              enabled="false"
              follows="left|top"
              halign="right"
-             height="20"
+             height="23"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -1726,7 +1750,7 @@ Only large parcels can be listed in search.
              enabled="false"
              follows="left|top"
              halign="right"
-             height="20"
+             height="23"
              increment="1"
              initial_value="0"
              layout="topleft"
@@ -1756,7 +1780,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="Options:"
-             top_pad="8"
+             top_pad="10"
              width="100">
                 Options:
             </text>
@@ -1764,10 +1788,10 @@ Only large parcels can be listed in search.
              height="16"
              label="Loop"
              layout="topleft"
-             left_pad="0"
+             left_pad="-3"
              name="media_loop"
              tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-             top_delta="0"
+             top_delta="-1"
              width="200" />
         </panel>
         <panel
@@ -1793,12 +1817,12 @@ Only large parcels can be listed in search.
             </text>
             <line_editor
              follows="left|top"
-             height="20"
+             height="23"
              layout="topleft"
              left="100"
              max_length="255"
              name="music_url"
-             top_pad="0"
+             top_delta="0"
              right="-15"
              select_on_focus="true" />
             <text
@@ -1847,13 +1871,14 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="110"
              name="parcel_enable_voice_channel_is_estate_disabled"
+             top_delta="0"
              width="300" />
             <check_box
              height="16"
              label="Restrict Voice to this parcel"
              layout="topleft"
              left="110"
-             name="parcel_enable_voice_channel_parcel"
+             name="parcel_enable_voice_channel_local"
              width="300" />
         </panel>
         <panel
@@ -1914,7 +1939,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_payment"
-             tool_tip="Ban unidentified residents."
+             tool_tip="Ban unidentified Residents."
              top_pad="4"
              width="278" />
             <check_box
@@ -1924,7 +1949,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-             tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+             tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
              top_pad="4"
              width="278" />
             <check_box
@@ -1938,7 +1963,7 @@ Only large parcels can be listed in search.
              width="278" />
             <check_box
              enabled="false"
-             height="22"
+             height="16"
              label="Sell passes to:"
              layout="topleft"
              left_delta="0"
@@ -1947,7 +1972,7 @@ Only large parcels can be listed in search.
              top_pad="4"
              width="120" />
             <combo_box
-             height="20"
+             height="23"
              layout="topleft"
              left_pad="22"
              name="pass_combo"
@@ -1965,7 +1990,7 @@ Only large parcels can be listed in search.
             <spinner
              enabled="false"
              follows="left|top"
-             height="22"
+             height="23"
              increment="1"
              initial_value="10"
              label="Price in L$:"
@@ -1980,7 +2005,7 @@ Only large parcels can be listed in search.
             <spinner
              enabled="false"
              follows="left|top"
-             height="22"
+             height="23"
              increment="0.25"
              initial_value="1"
              label="Hours of access:"
@@ -2022,7 +2047,7 @@ Only large parcels can be listed in search.
              multi_select="true"
              name="AccessList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="240" />
+             width="230" />
             <button
              follows="bottom"
              height="23"
@@ -2047,7 +2072,7 @@ Only large parcels can be listed in search.
             follows="top|right"
             height="170"
             width="240"
-            left_pad="8">
+            left_pad="2">
             <text
              type="string"
              length="1"
@@ -2071,7 +2096,7 @@ Only large parcels can be listed in search.
              multi_select="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="240" />
+             width="230" />
             <button
              follows="bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 953bd08dd4..f59badfcb4 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -47,7 +47,7 @@
          label="Search"
          layout="topleft"
          left="6"
-         help_topic="avatarpicker_search_tab"
+         help_topic="avatarpicker"
          name="SearchPanel"
          top="150"
          width="132">
@@ -98,7 +98,7 @@
          label="Friends"
          layout="topleft"
          left="6"
-         help_topic="avatarpicker_friends_tab"
+         help_topic="avatarpicker"
          name="FriendsPanel"
          top="150"
          width="132">
@@ -144,7 +144,7 @@
          label="Near Me"
          layout="topleft"
          left="6"
-         help_topic="avatarpicker_near_me_tab"
+         help_topic="avatarpicker"
          name="NearMePanel"
          top="150"
          width="132">
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 53ae24fe3f..d007ceff98 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -287,7 +287,7 @@
     <button
      follows="left|top"
      height="23"
-     label="Ok"
+     label="OK"
      layout="topleft"
      left="65"
      name="apply"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 26b003cafe..8f67f564a2 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -107,7 +107,7 @@
      height="16"
      layout="topleft"
      top_delta="0"
-     left="242"
+     left="217"
      name="currency_label"
      width="15">
       L$
@@ -123,7 +123,7 @@
      label="L$"
      left_pad="3"
      name="currency_amt"
-     width="60">
+     width="85">
         1234
     </line_editor>
     <text
@@ -222,7 +222,7 @@
      width="300"
      height="30"
      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
      type="string"
@@ -304,7 +304,7 @@ Re-enter amount to see the latest exchange rate.
     </text>
      <text
       type="string"
-      width="175"
+      width="176"
       height="125"
       top="60"
       left="165"
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index 4380ff8f4b..fbecebc363 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -186,8 +186,8 @@
     <button
      follows="right|bottom"
      height="20"
-     label="Ok"
-     label_selected="Ok"
+     label="OK"
+     label_selected="OK"
      layout="topleft"
      right="-120"
      top_delta="9"
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 94686f0bb0..ddc0d9af72 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -12,16 +12,6 @@
  title="APPEARANCE"
  top_delta="-185"
  width="524">
- <check_box
-             enabled="true"
-             height="23"
-             label="Show Attachments in Previews"
-             layout="topleft"
-             left="110"
-             name="show attachments"
-             tool_tip="Display attachments on your avatar in the preview panels below."
-             top="20"
-             width="146" />
     <tab_container
      height="517"
      layout="topleft"
@@ -270,10 +260,9 @@
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new shape by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -284,6 +273,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -310,7 +300,7 @@ scratch and wear it.
              left="10"
              name="Create New"
              top="104"
-             width="140" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -473,10 +463,9 @@ scratch and wear it.
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new skin by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -487,6 +476,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -552,7 +542,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-249"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -723,10 +713,9 @@ scratch and wear it.
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new hair by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -737,6 +726,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -775,7 +765,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-89"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -908,10 +898,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new eyes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -922,6 +911,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -960,7 +950,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="39"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -1066,7 +1056,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1180,10 +1170,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new shirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1194,6 +1183,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1272,7 +1262,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1386,10 +1376,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new pants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1400,6 +1389,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1519,10 +1509,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new shoes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1533,6 +1522,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1582,7 +1572,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1725,10 +1715,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new socks by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1739,6 +1728,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1788,7 +1778,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1931,10 +1921,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new jacket by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1945,6 +1934,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2006,7 +1996,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="140" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2149,10 +2139,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new gloves by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2163,6 +2152,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2212,7 +2202,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="130" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2355,10 +2345,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new undershirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2369,6 +2358,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2561,10 +2551,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new underpants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2575,6 +2564,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2767,10 +2757,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new skirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2781,6 +2770,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2830,7 +2820,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2972,11 +2962,10 @@ scratch and wear it.
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_delta="2"
+             top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new alpha mask by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2987,6 +2976,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3118,7 +3108,7 @@ scratch and wear it.
              left="8"
              name="Create New"
              top="104"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -3260,11 +3250,10 @@ scratch and wear it.
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_delta="2"
+             top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new tattoo by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -3275,6 +3264,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3337,7 +3327,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              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 b01c0edc8b..0fac6cd5f1 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -123,7 +123,7 @@
              layout="topleft"
              left_delta="0"
              name="check reset home"
-             tool_tip="When resident teleports out, reset their home to the destination position."
+             tool_tip="When Resident teleports out, reset their home to the destination position."
              top_pad="4"
              width="180">
 			       <check_box.commit_callback
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 55a6179afb..e83bc1555c 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="480"
  layout="topleft"
  min_height="140"
  min_width="467"
@@ -21,7 +21,7 @@
         http://support.secondlife.com
     </floater.string>
     <layout_stack
-     bottom="400"
+     bottom="480"
      follows="left|right|top|bottom"
      layout="topleft"
      left="10"
@@ -29,42 +29,21 @@
      top="20"
      width="600">
         <layout_panel
-         height="20"
+         height="1"
          layout="topleft"
          left_delta="0"
          name="external_controls"
          top_delta="0"
          user_resize="false"
-         width="570">
+         width="590">
             <web_browser
-             bottom="-10"
+             bottom="-4"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
              name="browser"
              top="0"
-             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
-             width="570" />
-            <button
-             follows="bottom|left"
-             height="20"
-             label="Open in My Web Browser"
-             layout="topleft"
-             left_delta="0"
-             name="open_browser"
-             top_pad="5"
-             width="185" />
-<!--
-            <button
-             follows="bottom|right"
-             height="20"
-             label="Close"
-             layout="topleft"
-             left_pad="290"
-             name="close"
-             top_delta="0"
-             width="70" />
--->
+             width="590" />
         </layout_panel>
     </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index 92a6111759..a21242ffe1 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -26,7 +26,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="muted_message">
-        You have blocked this resident. Sending a message will automatically unblock them.
+        You have blocked this Resident. Sending a message will automatically unblock them.
     </multi_floater.string>
     <multi_floater.string
      name="generic_request_error">
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 cd297af99d..1d51d19a4a 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,35 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<multi_floater

- can_minimize="false"

- can_resize="true"

- height="390"

- layout="topleft"

- name="floater_im_box"

- help_topic="floater_im_box"

- save_rect="true"

- save_visibility="true"

- single_instance="true"

- title="Instant Messages"

- width="392">

-    <tab_container

-     follows="left|right|top|bottom"

-     height="390"

-     layout="topleft"

-     left="1"

-     name="im_box_tab_container"

-     tab_position="bottom"

-     tab_width="80"

-     top="0"

-     width="390" />

-    <icon

-     color="DefaultShadowLight"

-     enabled="false"

-     follows="left|right|bottom"

-     height="17"

-     image_name="tabarea.tga"

-     layout="bottomleft"

-     left="1"

-     name="im_box_tab_container_icon"

-     bottom="10"

-     width="390" />

-</multi_floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_minimize="false"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="392">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="bottom"
+     tab_width="80"
+     tab_height="16"
+     top="0"
+     width="390" />
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="17"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="390" />
+</multi_floater>
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 57e92cdeec..613530b7aa 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,9 +14,10 @@
  visible="true"
  width="360"
  can_resize="true"
- min_width="360"
- min_height="350">
+ min_width="250"
+ min_height="190">
   <layout_stack
+   animate="false" 
   follows="all"
   height="320"
   width="360"
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
index a5b477313c..c9d87f158f 100644
--- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
@@ -8,9 +8,9 @@
  min_height="271"
  min_width="350"
  name="script ed float"
- help_topic="script_ed_float"
+ help_topic="lsl_reference"
  save_rect="true"
- title="LSL WIKI"
+ title="LSL REFERENCE"
  width="370">
     <check_box
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 7b4c5f38a1..3a5ceed5fb 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
+ can_minimize="false" 
  can_resize="true"
  follows="top|right"
  height="225"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 4b280ac59f..70dac7e41c 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -80,7 +80,7 @@
              height="20"
              layout="topleft"
              left_pad="5"
-             max_chars="255"
+             max_chars="1024"
              name="address"
              top_delta="0"
              width="540">
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 454b1c43b2..22b0a1783f 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -47,7 +47,7 @@
     <button
      follows="bottom|left"
      height="23"
-     label="Ok"
+     label="OK"
      layout="topleft"
      left="155"
      name="OK"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 920f0c909a..ae686d9ab7 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -4,8 +4,8 @@
  border_drop_shadow_visible="false"
  drop_shadow_visible="false"
  border="false"
- bg_opaque_image="Inspector_Background"
- bg_alpha_image="Toast_Background"
+ bg_opaque_image="Window_Foreground" 
+ bg_alpha_image="Window_Background" 
  bg_alpha_color="0 0 0 0"
  legacy_header_height="18"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
new file mode 100644
index 0000000000..16079b30cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="false"
+ can_minimize="false"
+ height="100"
+ layout="topleft"
+ name="modal container"
+ width="240">
+    <button
+     height="23"
+     label="Save"
+     label_selected="Save"
+     layout="topleft"
+     left="20"
+     name="Save"
+     top="70"
+     width="82" />
+    <button
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="36"
+     name="Cancel"
+     top_delta="0"
+     width="82" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="30"
+     layout="topleft"
+     left="20"
+     word_wrap="true"
+     name="Save item as:"
+     top="10"
+     width="200">
+        Save what I'm wearing
+as a new Outfit:
+    </text>
+    <line_editor
+     type="string"
+     length="1"
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     handle_edit_keys_directly="true"
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     show_text_as_tentative="false"
+     top_pad="0"
+     max_length="63"
+     name="name ed"
+     width="200">
+        [DESC] (new)
+    </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index 1946920a9c..455018f467 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -30,25 +30,25 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
      height="16"
      layout="topleft"
      left_pad="7"
+     top_delta="3"
      name="payee_name"
-     width="210">
-        [FIRST] [LAST]
+     width="184">
+      Ericacita Moostopolison
     </text>
     <text
      type="string"
      length="1"
      follows="left|top"
      halign="left"
-     height="16"
+     height="14"
      layout="topleft"
-     left="30"
+     left="34"
      name="object_name_label"
      top_pad="0"
-     width="150">
+     width="180">
         Via object:
     </text>
    <icon
@@ -59,20 +59,21 @@
      name="icon_object"
      tool_tip="Objects"
      top_pad="0"
-     left="30"
+     left="10"
      />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="18"
+     height="16"
      layout="topleft"
-     left_pad="5"
+     left_pad="7"
      name="object_name_text"
-     top_delta="0"
-     width="210">
-        ...
+     top_delta="3"
+     use_ellipses="true"
+     word_wrap="false"
+     width="188">
+        My awesome object with a really damn long name
     </text>
    <button
      height="23"
@@ -112,7 +113,7 @@
      type="string"
      length="1"
      follows="left|top"
-     height="18"
+     height="14"
      layout="topleft"
      left="25"
      name="amount text"
@@ -123,7 +124,7 @@
     <line_editor
      border_style="line"
      follows="left|top|right"
-     height="19"
+     height="21"
      top_pad="0"
      layout="topleft"
      left="120"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 06dbdc9539..ead5b8c8f2 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -11,15 +11,15 @@
  min_width="234"
  name="preview notecard"
  help_topic="preview_notecard"
- title="NOTE:"
+ title="NOTECARD:"
  width="400">
     <floater.string
      name="no_object">
-        Unable to find object containing this note.
+        Unable to find object containing this notecard.
     </floater.string>
     <floater.string
      name="not_allowed">
-        You do not have permission to view this note.
+        You do not have permission to view this notecard.
     </floater.string>
     <floater.string
      name="Title">
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index f1a75bfcb4..aa219b9615 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -201,11 +201,11 @@
          name="Age__Age_play"
          value="31" />
         <combo_box.item
-         label="Age &gt; Adult resident on Teen Second Life"
+         label="Age &gt; Adult Resident on Teen Second Life"
          name="Age__Adult_resident_on_Teen_Second_Life"
          value="32" />
         <combo_box.item
-         label="Age &gt; Underage resident outside of Teen Second Life"
+         label="Age &gt; Underage Resident outside of Teen Second Life"
          name="Age__Underage_resident_outside_of_Teen_Second_Life"
          value="33" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index f44ba6d873..c3e974d978 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -7,7 +7,6 @@
  layout="topleft"
  left="0"
  name="script_floater"
- help_topic="script_floater"
  top="0"
  can_dock="true"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 5a9e2ebe6e..b0bb282abd 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -42,7 +42,6 @@
              left="0"
              name="browser"
              top="0"
-             start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22%3E%3C/body%3E%3C/html%3E"
              height="600"
              width="650" />
             <text
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 93aa1f0e31..4e89df5a73 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,13 +15,12 @@
      follows="left|top"
      height="30"
      layout="topleft"
-     left="10"
+     left="30"
      name="Save item as:"
      top="25"
      word_wrap="true"
-     width="220">
-        Press a key to set your
-Speak button trigger.
+     width="180">
+        Press a key to set your Speak button trigger.
     </text>
     <button
      height="23"
@@ -30,5 +29,6 @@ Speak button trigger.
      layout="topleft"
      right="-10"
      name="Cancel"
+     top_pad="8"
      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 a36a1b591b..60c9810e95 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -43,6 +43,12 @@
          layout="topleft"
          name="local" />
     </radio_group>
+  <ui_ctrl 
+    height="90"
+    width="90"
+    name="thumbnail_placeholder"
+    top_pad="6"
+    />
     <text
      type="string"
      font="SansSerifSmall"
@@ -54,7 +60,7 @@
      left_delta="0"
      halign="right"
      name="file_size_label"
-     top_pad="106"
+     top_pad="10"
      width="195">
         [SIZE] KB
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 84adabe4fa..2f88c234cc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -123,6 +123,12 @@
    layout="topleft"
    tool_tip="checkbox"
    name="test_checkbox" />
+  <check_box
+   top_pad="5"
+   enabled="false" 
+   label="Checkbox Disabled"
+   tool_tip="checkbox disabled"
+   name="test_checkbox_disabled" />
   <!-- "combo_box" is a pop-menu of items.  Optionally the box itself can
        contain a general purpose line input editor, allowing the user to
        provide input that is not a list item. -->
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 695021f755..cad7d72ed7 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -131,8 +131,8 @@
          <button
      follows="right|bottom"
      height="20"
-     label="Ok"
-     label_selected="Ok"
+     label="OK"
+     label_selected="OK"
      layout="topleft"
      right="-120"
      name="Select"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e55453f772..a1e190fc5e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2675,7 +2675,7 @@ even though the user gets a free copy.
 			 height="18"
 			 layout="topleft"
 			 left="10"
-       use_ellipsis="true" 
+                         use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
 			 width="180" />
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 68bb500c78..b06c6dc215 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -9,7 +9,7 @@
  name="top_objects"
  help_topic="top_objects"
  title="Top Objects"
- width="550">
+ width="800">
     <floater.string
      name="top_scripts_title">
         Top Scripts
@@ -64,7 +64,7 @@
      multi_select="true"
      name="objects_list"
      top_delta="17"
-     width="530">
+     width="780">
         <scroll_list.columns
          label="Score"
          name="score"
@@ -84,11 +84,15 @@
         <scroll_list.columns
          label="Time"
          name="time"
-         width="100" />
+         width="150" />
         <scroll_list.columns
          label="Mono Time"
          name="mono_time"
-         width="55" />
+         width="100" />
+          <scroll_list.columns
+          	label="URLs"
+          	name="URLs"
+          	width="100" />
 		<scroll_list.commit_callback
           function="TopObjects.CommitObjectsList" />
     </scroll_list>
@@ -112,7 +116,7 @@
      left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
@@ -144,7 +148,7 @@
      left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
@@ -176,7 +180,7 @@
      left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
@@ -190,7 +194,7 @@
           function="TopObjects.GetByOwnerName" />
     </button>
     <button
-     follows="top|left"
+     follows="bottom|right"
      height="22"
      image_overlay="Refresh_Off"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 1adb824e2a..5e168fe4aa 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,9 +49,9 @@
      left_delta="0"
      name="tos_heading"
      top_delta="-399"
+     word_wrap="true"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
-you must accept the agreement.
+        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
     <web_browser
      follows="left|top"
@@ -60,6 +60,6 @@ you must accept the agreement.
      left_delta="0"
      name="tos_html"
      start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-     top_delta="0"
+     top_delta="40"
      width="568" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 1fa613468f..f473a51ff6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,11 +3,12 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="270"
+ height="202"
  layout="topleft"
- min_height="122"
+ min_height="124"
  min_width="190"
  name="floater_voice_controls"
+ help_topic="floater_voice_controls"
  title="Voice Controls"
  save_visibility="true"
  single_instance="true"
@@ -30,29 +31,25 @@
     </string>
     <string
      name="no_one_near">
-        No one near
+        No one near has voice enabled
     </string>
-    <string
-     name="max_visible_items">
-        5
-    </string>
-    <panel
-     bevel_style="out"
-     border="true"
-     follows="left|right|top"
-     height="62"
-     layout="topleft"
-     left="0"
-     name="control_panel"
-     top="0"
-     width="282">
-        <panel
-         height="18"
-         follows="top|left|right"
+      <layout_stack
+         clip="false"
+         follows="all"
+         height="189"
          layout="topleft"
          left="10"
-         name="my_panel"
+         mouse_opaque="false"
+         name="my_call_stack"
+         orientation="vertical"
          width="263">
+        <layout_panel
+         follows="top|left|right"
+          user_resize="false" 
+         auto_resize="false" 
+         layout="topleft"
+         height="26"
+         name="my_panel">
             <avatar_icon
              enabled="false"
              follows="left|top"
@@ -78,92 +75,57 @@
             <output_monitor
              auto_update="true"
              draw_border="false"
-             follows="right"
+             follows="top|right"
              height="16"
              layout="topleft"
              name="speaking_indicator"
-             right="-1"
-             top="2"
+             left_pad="5"
              visible="true"
              width="20" />
-        </panel>
-        <layout_stack
-         border_size="0"
-         clip="false"
-         follows="all"
-         height="28"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="leave_call_stack"
-         orientation="horizontal"
-         top_pad="5"
-         width="263">
-         <layout_panel
-          auto_resize="true"
-          follows="left|right"
-          height="26"
-          layout="topleft"
-          min_height="23"
-          min_width="5"
-          mouse_opaque="false"
-          name="left_anchor"
-          width="80"/>
+        </layout_panel>
          <layout_panel
           auto_resize="false"
-          follows="left|right"
+          user_resize="false" 
+          follows="top|left"
           height="26"
+          visible="true"
           layout="topleft"
-          mouse_opaque="false"
-          min_height="24"
-          min_width="100"
           name="leave_call_btn_panel"
           width="100">
            <button
-            follows="left|right"
-            height="24"
+          follows="right|top"
+            height="23"
+            top_pad="0"
             label="Leave Call"
-            left="0"
             name="leave_call_btn"
-            top="0"
             width="100" />
          </layout_panel>
-         <layout_panel
-         auto_resize="true"
-         follows="left|right"
-         height="26"
+      <layout_panel
+          follows="all"
+          layout="topleft"
+          left="2"
+          top_pad="0"
+          height="132" 
+          name="callers_panel"
+          user_resize="false" 
+          width="280">
+        <avatar_list
+         follows="all"
+         height="132"
+         ignore_online_status="true"
          layout="topleft"
-         mouse_opaque="false"
-         min_height="24"
-         min_width="5"
-         name="right_anchor"
-         width="80"/>
-        </layout_stack>
-    </panel>
-    <avatar_list
-     follows="all"
-     height="197"
-     ignore_online_status="true"
-     layout="topleft"
-     left="0"
-     multi_select="true"
-     name="speakers_list"
-     width="282" />
-    <panel
-     filename="panel_avatar_list_item.xml"
-     follows="left|right|top"
-     height="24"
-     layout="topleft"
-     left="0"
-     name="non_avatar_caller"
-     top="70"
-     width="282" />
-    <view_border
-     bevel_style="out"
-     follows="left|top|right|bottom"
-     height="206"
-     layout="topleft"
-     left="0"
-     top="63"
-     width="282" />
+         multi_select="true"
+         name="speakers_list"
+         width="280" />
+        <panel
+         filename="panel_avatar_list_item.xml"
+         follows="left|right|top"
+         height="24"
+         layout="topleft"
+         left="0"
+         name="non_avatar_caller"
+         top="10"
+         width="276" />
+      </layout_panel>
+    </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
index 9a95e3dfef..b4b57f2dbc 100644
--- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- border="true"
+ legacy_header_height="0"
  can_close="false"
  can_minimize="false"
  height="100"
@@ -9,7 +8,7 @@
  name="modal container"
  width="240">
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
@@ -18,7 +17,7 @@
      top="70"
      width="82" />
     <button
-     height="20"
+     height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
@@ -30,14 +29,14 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="16"
+     height="30"
      layout="topleft"
+     word_wrap="true"
      left="20"
      name="Save item as:"
      top="10"
      width="200">
-        Save item as:
+        Save item to my inventory as:
     </text>
     <line_editor
      type="string"
@@ -45,14 +44,13 @@
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left_delta="0"
      max_length="63"
      name="name ed"
-     top_pad="4"
+     top_pad="0"
      width="200">
         New [DESC]
     </line_editor>
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 4ece0fa3ba..897d959b98 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
@@ -5,6 +5,9 @@
  height="108"
  layout="topleft"
  name="whitelist_entry"
+ single_instance="true"
+ help_topic="whitelist_entry"
+ title="WHITELIST ENTRY"
  width="390">
 
   <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"
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 8904d4f49c..65c9c2a8fa 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -77,7 +77,7 @@
      top_delta="6"
      left_pad="5"
      layout="topleft"
-     name="person_label"
+     name="me_label"
      width="90">
         Me
     </text>
@@ -196,7 +196,7 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="auction_label"
+     name="by_owner_label"
      top_delta="3"
      width="100">
        by owner
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2f2964c42b..9796f7b5b6 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -58,14 +58,16 @@
      height="35"
      left="8"
      name="user_details"
+     right="-10"
      word_wrap="true"
      top_pad="6"
+     use_ellipses="true"
      width="220">This is my second life description and I really think it is great.
     </text>
     <slider
      follows="top|left"
      height="23"
-     increment="0.05"
+     increment="0.01"
      left="1"
      max_val="0.95"
      min_val="0.05"
diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
new file mode 100644
index 0000000000..0221397a8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_toast.xml
@@ -0,0 +1,19 @@
+<?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
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="148"
+ layout="topleft"
+ name="inspect_toast"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
index 4642e82c0b..d96f3c5494 100644
--- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -17,7 +17,7 @@
      layout="topleft"
      name="copy_gesture">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="copy_gesture" />
         <on_enable
          function="Gesture.EnableAction"
@@ -28,7 +28,7 @@
      layout="topleft"
      name="paste">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="paste" />
         <on_enable
          function="Gesture.EnableAction"
@@ -39,7 +39,7 @@
      layout="topleft"
      name="copy_uuid">
         <on_click
-         function="Gesture.Action.CopyPast"
+         function="Gesture.Action.CopyPaste"
          parameter="copy_uuid" />
         <on_enable
          function="Gesture.EnableAction"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 01df208850..dde92f23b6 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -30,6 +30,8 @@
    label="Call"
    enabled="true"
    name="call">
+    <menu_item_call.on_click
+     function="InspectAvatar.Call"/>
   </menu_item_call>
   <menu_item_call
    label="Teleport"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index d29dfa7034..1e10467148 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -85,7 +85,7 @@
          parameter="lsl" />
     </menu_item_call>
     <menu_item_call
-     label="New Note"
+     label="New Notecard"
      layout="topleft"
      name="New Note">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index b07a8bb512..5ad099e2d9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -71,7 +71,7 @@
                  parameter="lsl" />
             </menu_item_call>
             <menu_item_call
-             label="New Note"
+             label="New Notecard"
              layout="topleft"
              name="New Note">
                 <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 690167bc33..a0dec346a4 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -223,6 +223,7 @@
            parameter="test_inspectors" />
         </menu_item_call>
       </menu>
+<!--
       <menu_item_check
          label="Reg In Client Test (restart)"
          name="Reg In Client Test (restart)">
@@ -232,6 +233,7 @@
                function="ToggleControl"
                parameter="RegInClient" />
       </menu_item_check>
+-->
       <menu_item_separator />
       <menu_item_call
        label="Set Window Size..."
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 62500c5116..35518cd13b 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -57,6 +57,12 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+  <menu_item_call
+       label="Zoom In"
+       name="Zoom In">
+    <menu_item_call.on_click
+     function="Object.ZoomIn" />
+  </menu_item_call>
 <menu_item_separator layout="topleft" />
    <context_menu
          label="Put On &gt;"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 31263fbea8..805ffbae66 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -47,6 +47,9 @@
      name="IM">
         <menu_item_call.on_click
          function="Avatar.IM" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_im" />
     </menu_item_call>
     <menu_item_call
      label="Call"
@@ -65,6 +68,9 @@
      name="Share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      label="Pay"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 5f2e6e0f6c..c4da1df017 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -63,4 +63,10 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
index 3065239615..f3b207e36c 100644
--- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
@@ -11,6 +11,9 @@
         <menu_item_call.on_click 
          function="Picks.Plus.Action" 
          userdata="new_pick" />
+        <menu_item_call.on_enable
+         function="Picks.Plus.Enable"
+         userdata="new_pick" />
         </menu_item_call>
     <menu_item_call 
      name="create_classified" 
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4e495bab3f..a98a049c17 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,40 +198,6 @@
              function="Floater.Toggle"
              parameter="nearby_media" />
         </menu_item_check>
-        <!--menu_item_check
-         label="Block List"
-         layout="topleft"
-         name="Mute List">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="mute" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="mute" />
-        </menu_item_check-->
-        <menu_item_separator
-         layout="topleft" />
-        <menu_item_check
-         label="(Legacy) Communicate"
-         layout="topleft"
-         name="Instant Message"
-         shortcut="control|T">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="communicate" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="communicate" />
-        </menu_item_check>
-        <menu_item_call
-         label="(Temp) Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|alt|M">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
-        </menu_item_call>
     </menu>
     <menu
      label="World"
@@ -283,7 +249,7 @@
             </menu_item_call>
       <menu
            create_jump_keys="true"
-           label="About This Place"
+           label="Place Profile"
            layout="topleft"
            name="Land"
            tear_off="true">
@@ -307,7 +273,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-             label="Buy Land"
+             label="Buy This Land"
              layout="topleft"
              name="Buy Land">
                 <menu_item_call.on_click
@@ -327,7 +293,7 @@
            create_jump_keys="true"
            label="Show"
            layout="topleft"
-           name="Land"
+           name="LandShow"
            tear_off="true">
          <menu_item_check
          label="Move Controls"
@@ -1637,17 +1603,6 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
-        <menu_item_check
-         label="Show IMs in Nearby Chat"
-         layout="topleft"
-         name="IMInChat">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="IMInChat" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="IMInChat" />
-        </menu_item_check>
         <menu_item_separator
          layout="topleft" />
         <menu
@@ -2816,8 +2771,7 @@
             <menu_item_call
              label="Dump Focus Holder"
              layout="topleft"
-             name="Dump Focus Holder"
-             shortcut="control|alt|F">
+             name="Dump Focus Holder">
                 <menu_item_call.on_click
                  function="Advanced.DumpFocusHolder" />
             </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 95a7374e7b..dddd178aea 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -157,7 +157,7 @@ No tutorial is currently available.
  An error occurred while updating [APP_NAME].  Please [http://get.secondlife.com download the latest version] of the Viewer.
     <usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -169,7 +169,7 @@ Could not connect to the [SECOND_LIFE_GRID].
 Make sure your Internet connection is working properly.
 	<usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -179,7 +179,7 @@ Make sure your Internet connection is working properly.
 Message Template [PATH] not found.
 	<usetemplate
      name="okbutton"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -246,7 +246,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="GrantModifyRights"
    type="alertmodal">
-Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
     <usetemplate
      name="okcancelbuttons"
@@ -258,7 +258,7 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
    icon="alertmodal.tga"
    name="GrantModifyRightsMultiple"
    type="alertmodal">
-Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for the selected Residents?
     <usetemplate
      name="okcancelbuttons"
@@ -770,6 +770,16 @@ Save changes to classified [NAME]?
      notext="Don&apos;t Save"
      yestext="Save"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ClassifiedInsufficientFunds"
+   type="alertmodal">
+Insufficient funds to create classified.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -811,6 +821,7 @@ Please select a proposal to view.
 Please select a history item to view.
   </notification>
 
+<!--   
   <notification
    icon="alertmodal.tga"
    name="ResetShowNextTimeDialogs"
@@ -832,6 +843,7 @@ Would you like to disable all popups which can be skipped?
      notext="Cancel"
      yestext="OK"/>
   </notification>
+-->
 
   <notification
    icon="alertmodal.tga"
@@ -1400,6 +1412,16 @@ You have added "[LANDMARK_NAME]" to your [FOLDER_NAME] folder.
   </notification>
 
   <notification
+   icon="alert.tga"
+   name="LandmarkAlreadyExists"
+   type="alert">
+You already have a landmark for this location.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="CannotCreateLandmarkNotOwner"
    type="alertmodal">
@@ -1597,7 +1619,8 @@ Unable to force land ownership because selection spans multiple regions. Please
    icon="alertmodal.tga"
    name="ForceOwnerAuctionWarning"
    type="alertmodal">
-This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
+This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
+Force ownership?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -2917,6 +2940,16 @@ You have reached your maximum number of groups. Please leave another group befor
 
   <notification
    icon="alert.tga"
+   name="JoinedTooManyGroups"
+   type="alert">
+You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
    name="KickUser"
    type="alert">
 Kick this user with what message?
@@ -3553,7 +3586,7 @@ Type a short announcement which will be sent to everyone in this region.
 The maturity rating for this region has been updated.
 It may take some time for the change to be reflected on the map.
 
-To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification.
+To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification.
   </notification>
 
   <notification
@@ -4543,8 +4576,8 @@ Click on any landmark to select it, then click &apos;Teleport&apos; at the botto
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-You can contact residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
-Select the resident from the list, then click &apos;IM&apos; at the bottom of the panel.
+You can contact Residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
+Select the Resident from the list, then click &apos;IM&apos; at the bottom of the panel.
 (You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
   </notification>
 
@@ -4693,7 +4726,7 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have
    icon="notify.tga"
    name="OtherObjectsReturned2"
    type="notify">
-The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
+The objects on the selected parcel of land owned by the Resident &apos;[NAME]&apos; have been returned to their owner.
   </notification>
 
   <notification
@@ -4974,7 +5007,7 @@ No valid parcel could be found.
    icon="notify.tga"
    name="ObjectGiveItem"
    type="offer">
-An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE]:
+An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
       <button
@@ -4996,7 +5029,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE
    icon="notify.tga"
    name="ObjectGiveItemUnknownUser"
    type="offer">
-An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [OBJECTTYPE]:
+An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
       <button
@@ -5018,7 +5051,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
    icon="notify.tga"
    name="UserGiveItem"
    type="offer">
-[NAME_SLURL] has given you [OBJECTTYPE]:
+[NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
       <button
@@ -5087,6 +5120,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
 
   <notification
    icon="notify.tga"
+   name="TeleportOfferSent"
+   type="offer">
+	Teleport offer sent to [TO_NAME]
+  </notification>
+
+
+  <notification
+   icon="notify.tga"
    name="GotoURL"
    type="notify">
 [MESSAGE]
@@ -5173,7 +5214,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
    name="OfferCallingCard"
    type="notify">
 [FIRST] [LAST] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this resident.
+This will add a bookmark in your inventory so you can quickly IM this Resident.
     <form name="form">
       <button
        index="0"
@@ -5349,6 +5390,7 @@ Grant this request?
     </form>
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstBalanceIncrease"
@@ -5364,6 +5406,7 @@ Your L$ balance is shown in the upper-right.
 You just paid L$[AMOUNT].
 Your L$ balance is shown in the upper-right.
   </notification>
+-->
 
   <notification
    icon="notify.tga"
@@ -5375,6 +5418,8 @@ Your L$ balance will be updated when processing completes. If processing takes m
 
 The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard]
   </notification>
+  
+<!-- 
   <notification
    icon="notify.tga"
    name="FirstSit"
@@ -5399,8 +5444,9 @@ Use the controls on the right to find things and display different backgrounds.
    type="notify">
 You have opened the Build Tools. Every object you see around you was created using these tools.
   </notification>
+-->
 
-<!--
+<!--  
   <notification
    icon="notify.tga"
    name="FirstLeftClickNoHit"
@@ -5409,7 +5455,7 @@ You have opened the Build Tools. Every object you see around you was created usi
     If the mouse pointer changes to a hand, you can interact with the object.
     Right-click always shows a menu of things you can do.
   </notification>
--->
+
   <notification
    icon="notify.tga"
    name="FirstTeleport"
@@ -5417,6 +5463,8 @@ You have opened the Build Tools. Every object you see around you was created usi
 You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it.
   </notification>
 
+-->
+
   <notification
    icon="notify.tga"
    name="FirstOverrideKeys"
@@ -5427,6 +5475,7 @@ Some objects (like guns) require you to go into mouselook  to use them.
 Press &apos;M&apos; to do this.
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstAppearance"
@@ -5446,6 +5495,7 @@ This is your Inventory, which contains items you own.
 * To rez something inworld, drag it onto the ground.
 * To read a notecard, double-click it.
   </notification>
+-->
 
   <notification
    icon="notify.tga"
@@ -5456,6 +5506,7 @@ This is a sandbox area, and is meant to help Residents learn how to build.
 Things you build here will be deleted after you leave, so don&apos;t forget to right-click and choose &apos;Take&apos; to move your creation to your Inventory.
   </notification>
 
+<!--
   <notification
    icon="notify.tga"
    name="FirstFlexible"
@@ -5481,13 +5532,16 @@ To toggle this menu,
    type="notify">
 You are editing a Sculpted prim. Sculpties require a special texture to define their shape.
   </notification>
+-->  
 
-  <!--notification
+  <!--
+  <notification
    icon="notify.tga"
    name="FirstMedia"
    type="notify">
     You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
-  </notification-->
+  </notification>
+  -->
 
   <notification
    icon="notifytip.tga"
@@ -5785,7 +5839,7 @@ Are you sure you want to close all IMs?
     <usetemplate
      name="okcancelignore"
      notext="Cancel"
-     yestext="Ok"/>
+     yestext="OK"/>
   </notification>
 
   <notification icon="notifytip.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index f3a2297151..28a6995186 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,57 +4,96 @@
  follows="all"
  height="215"
  name="panel_im_control_panel"
- width="180">
-    <avatar_list
-     color="DkGray2"
+ width="150">
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
      follows="all"
-     height="130"
-     ignore_online_status="true"
+     height="215"
      layout="topleft"
      left="3"
-     name="speakers_list"
-     opaque="false"
-     show_info_btn="false"
-     show_profile_btn="false"
-     show_speaking_indicator="false"
-     top="10"
-     width="180" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     bottom="1"
-     follows="left|right|bottom"
-     height="70"
-     left="0"
-     left_pad="0"
-     name="panel_call_buttons"
-     top_pad="0"
-     width="180">
-        <button
-         bottom="10"
-         follows="all"
-         height="20"
-         label="Call"
-         left_delta="10"
-         name="call_btn"
-         width="160" />
-        <button
-         bottom="40"
-         follows="all"
-         height="20"
-         label="Leave Call"
-         name="end_call_btn"
-         visible="false"
-          />
-        <button
-         follows="all"
-         bottom="10"
-         height="20"
-         label="Voice Controls"
-         name="voice_ctrls_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-    </panel>
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="147">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="130"
+         layout="topleft"
+         left="0"
+         min_height="0"
+         mouse_opaque="false"
+         width="147"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="130"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="false"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="147" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="130"
+         name="call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Call"
+             name="call_btn"
+             width="130"
+             top="5" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="130"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Leave Call"
+             name="end_call_btn"
+             top="5"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="130"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="20"
+             label="Voice Controls"
+             name="voice_ctrls_btn"
+             top="5"
+             use_ellipses="true" />
+        </layout_panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 45f9d9c7b6..615ade99a2 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -58,13 +58,13 @@
      top="6"
      use_ellipses="true"
      value="Unknown"
-     width="182" />
+     width="180" />
     <text
      follows="right"
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left_pad="8"
+     left_pad="5"
      name="last_interaction"
      text_color="LtGray_50"
      value="0s"
@@ -75,7 +75,7 @@
      draw_border="false"
      height="16"
      layout="topleft"
-     left_pad="0"
+     left_pad="5"
      mouse_opaque="true"
      name="speaking_indicator"
      visible="true"
@@ -98,6 +98,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tool_tip="View profile"
      top_delta="-2"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 970a2e6a8a..39170b90ca 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -5,6 +5,7 @@
  height="305"
  layout="topleft"
  name="block_list_panel"
+ help_topic="blocked_list"
  min_height="350"
  min_width="240"
  width="280">
@@ -36,7 +37,7 @@
      layout="topleft"
      left="5"
      name="blocked"
-     tool_tip="List of currently blocked residents"
+     tool_tip="List of currently blocked Residents"
      top="30"
      width="270" />
     <button
@@ -46,7 +47,7 @@
      layout="topleft"
      left_delta="0"
      name="Block resident..."
-     tool_tip="Pick a resident to block"
+     tool_tip="Pick a Resident to block"
      top_pad="4"
      width="210">
         <button.commit_callback
@@ -73,7 +74,7 @@
      layout="topleft"
      left_delta="0"
      name="Unblock"
-     tool_tip="Remove resident or object from blocked list"
+     tool_tip="Remove Resident or object from blocked list"
      top_pad="4"
      width="210" >
         <button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index b92aa10ffc..de3de45718 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -33,10 +33,10 @@
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
-         min_width="4"
+         min_width="2"
          left="0"
          top="0"
-         width="4" />
+         width="2" />
         <layout_panel
  	mouse_opaque="false"
          auto_resize="false"
@@ -71,7 +71,7 @@
            layout="topleft"
            left="0"
            name="talk"
-           top="4"
+           top="5"
           width="100">
               <show_button>
                   <show_button.init_callback
@@ -103,20 +103,20 @@
          min_width="52"
          name="gesture_panel"
          user_resize="false">
-         <gesture_combo_box
+         <gesture_combo_list
           follows="left|right"
           height="23"
           label="Gesture"
           layout="topleft"
           name="Gesture"
           left="0"
-          top="4"
+          top="5"
           width="82"
           tool_tip="Shows/hides gestures">
-             <gesture_combo_box.drop_down_button
+             <gesture_combo_list.combo_button
               pad_right="10"
               use_ellipses="true" />
-         </gesture_combo_box>
+         </gesture_combo_list>
         </layout_panel>
 		 <icon
          auto_resize="false"
@@ -153,7 +153,7 @@
              layout="topleft"
              name="movement_btn"
              tool_tip="Shows/hides movement controls"
-             top="4"
+             top="5"
              width="80">
                 <button.init_callback
                  function="Button.SetDockableFloaterToggle"
@@ -195,7 +195,7 @@
              layout="topleft"
              left="0"
              tool_tip="Shows/hides camera controls"
-             top="4"
+             top="5"
              name="camera_btn"
              width="80">
                 <button.init_callback
@@ -235,7 +235,7 @@
              layout="topleft"
              name="snapshots"
              width="36"
-             top="4"
+             top="5"
              is_toggle="true"
              image_overlay="Snapshot_Off"
              tool_tip="Take snapshot">
@@ -338,7 +338,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              layout="topleft"
              left="0"
              name="im_well"
-             top="4"
+             top="5"
              width="35">
              <!--
 Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
@@ -350,7 +350,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              -->
                 <button
                  auto_resize="true"
-                 flash_color="Yellow"
+                 flash_color="ChicletFlashColor"
                  follows="right"
                  halign="center"
                  height="23"
@@ -362,8 +362,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  label_color="Black"
                  left="0"
                  name="Unread IM messages"
-                 pad_left="0"
-                 pad_right="0"
                  tool_tip="Conversations"
                  width="35" >
                     <button.init_callback
@@ -381,9 +379,20 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          top="0"
          left_pad="3"
          name="notification_well_panel"
-         width="35"
-         min_width="35"
+         width="40"
+         min_width="40"
          user_resize="false">
+         <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="4"
+         top="0"
+         width="5" />
             <chiclet_notification
              flash_period="0.25"
              follows="right"
@@ -392,7 +401,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              left="0"
              max_displayed_count="99"
              name="notification_well"
-             top="4"
+             top="5"
              width="35">
               <button
                  bottom_pad="3"
@@ -403,31 +412,31 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                halign="center"
                height="23"
                follows="right"
-               flash_color="Yellow"
+               flash_color="ChicletFlashColor"
                 label_color="Black"
-               left="5"
+               left="0"
                name="Unread"
                image_overlay="Notices_Unread"
                image_overlay_alignment="center"
-               pad_right="5"
+               pad_right="15"
                tool_tip="Notifications"
                width="35" >
                   <button.init_callback
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
               </button>
-	    </chiclet_notification>
-        </layout_panel>
-        <icon
+                      <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
+         left="0"
          min_width="4"
-         right="-1"
          top="0"
-         width="4"/>
+         width="5" />
+	    </chiclet_notification>
+        </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
index d0a2ddb289..357dbc07cc 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
@@ -3,6 +3,6 @@
  background_visible="true"
  bg_alpha_color="black"
  follows="left|right|top"
- height="1"
+ height="0"
  layout="topleft"
  name="chat_separator_panel" />
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 5c594d3f14..677bdbc3d2 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -7,6 +7,7 @@
  left="0"
  min_height="350"
  name="panel_classified_info"
+ help_topic="profile_classified_info"
  top="0"
  width="333">
  <panel.string
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 1fbf7abda9..188ded3dab 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -9,6 +9,7 @@
  left="0"
  min_height="350"
  name="panel_edit_classified"
+ help_topic="profile_edit_classified"
  top="0"
  width="333">
  <panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index d6de5af32d..8e39697a16 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,6 +9,7 @@
  left="0"
  min_height="350"
  name="panel_edit_pick"
+ help_topic="profile_edit_pick"
  top="0"
  width="333">
   <button
@@ -38,29 +39,29 @@
    <scroll_container
      color="DkGray2"
      follows="all"
-     height="510"
+     height="500"
      layout="topleft"
      left="10"
      top_pad="10"
      name="profile_scroll"
-     reserve_scroll_corner="false"
      opaque="true"
      width="313">
     <panel
      name="scroll_content_panel"
-     follows="left|top"
+     follows="left|top|right"
      min_height="300"
      layout="topleft"
      top="0"
      background_visible="false"
-     height="510"
+     height="500"
      left="0"
-     width="295">
+     width="285">
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="290"
+     width="280"
      layout="topleft"
+     no_commit_on_selection="true"
      top="20"
      left="10"
      name="pick_snapshot" />
@@ -77,7 +78,7 @@
         <text
          type="string"
          length="1"
-         follows="left|top"
+         follows="left|top|right"
          height="15"
          font="SansSerifSmall"
          font.style="BOLD"
@@ -86,7 +87,7 @@
          top="215"
          name="Name:"
          text_color="white"
-         width="290">
+         width="280">
             Title:
         </text>
         <line_editor
@@ -99,11 +100,11 @@
          max_length="63"
          name="pick_name"
          text_color="black"
-         width="290" />
+         width="280" />
         <text
          type="string"
          length="1"
-         follows="left|top"
+         follows="left|top|right"
          height="15"
          font="SansSerifSmall"
          font.style="BOLD"
@@ -112,13 +113,13 @@
          top_pad="20"
          name="description_label"
          text_color="white"
-         width="290">
+         width="280">
             Description:
         </text>
         <text_editor
          follows="left|top|right"
          height="100"
-         width="290"
+         width="280"
          hide_scrollbar="false"
          layout="topleft"
          left="10"
@@ -132,27 +133,26 @@
          length="1"
          font="SansSerifSmall"
          font.style="BOLD"
-         follows="left|top"
+         follows="left|top|right"
          height="15"
          layout="topleft"
          left="10"
          name="location_label"
          text_color="white"
          top_pad="20"
-         width="290">
+         width="280">
             Location:
         </text>
         <text
          type="string"
          length="1"
-         follows="left|top"
+         follows="left|top|right"
          height="50"
          layout="topleft"
          left="10"
          name="pick_location"
-         right="-10"
          top_pad="2"
-         width="290"
+         width="280"
          word_wrap="true">
             loading...
         </text>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index be3c0bbd96..8268937e7f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -301,14 +301,15 @@
          left="10"
          name="partner_data_panel"
          width="285">
-            <text
+            <name_box
              follows="left|top|right"
              height="30"
+             initial_value="(retrieving)"
              layout="topleft"
              left="0"
+             link="true"
              name="partner_text"
              top="0"
-             value="[FIRST] [LAST]"
              width="285"
              word_wrap="true" />
          </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
index ac731bcdf0..c315adb33e 100644
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -118,7 +118,7 @@
      layout="topleft"
      left_delta="0"
      name="add_btn"
-     tool_tip="Offer friendship to a resident"
+     tool_tip="Offer friendship to a Resident"
      top_pad="13"
      width="80" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 86b30ebfce..aa7d621e4c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -4,67 +4,111 @@
  follows="all"
  height="238"
  name="panel_im_control_panel"
- width="180">
-    <avatar_list
-     color="DkGray2"
+ width="150">
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
      follows="all"
-     height="100"
-     ignore_online_status="true"
+     height="238"
      layout="topleft"
-     left="3"
-     name="speakers_list"
-     opaque="false"
-     show_info_btn="false"
-     show_profile_btn="false"
-     show_speaking_indicator="false"
-     top="10"
-     width="180" />
-    <button
-     bottom_pad="0"
-     follows="left|right|bottom"
-     height="23"
-     label="Group Profile"
-     left_delta="10"
-     name="group_info_btn"
-     use_ellipses="true" 
-     width="160" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     follows="left|right|bottom"
-     height="70"
-     left="0"
-     left_pad="0"
-     name="panel_call_buttons"
-     top_pad="0"
-     width="180">
-        <button
-         bottom="10"
-         follows="all"
-         height="23"
-         label="Call Group"
-         left_delta="10"
-         name="call_btn"
-         use_ellipses="true" 
-         width="160" />
-        <button
-         bottom="40"
-         follows="all"
-         height="23"
-         label="Leave Call"
-         name="end_call_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-        <button
-         bottom="10"
-         follows="all"
-         height="23"
-         label="Open Voice Controls"
-         name="voice_ctrls_btn"
-         use_ellipses="true" 
-         visible="false"
-          />
-    </panel>
+     left="5"
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="145">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="100"
+         layout="topleft"
+         min_height="0"
+         mouse_opaque="false"
+         width="145"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="100"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="false"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="145" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="group_info_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|right|bottom"
+             height="23"
+             label="Group Profile"
+             name="group_info_btn"
+             use_ellipses="true"
+             top="5"
+             width="130" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="call_btn_panel"
+         user_resize="false">
+            <button
+             follows="all"
+             height="23"
+             label="Call Group"
+             name="call_btn"
+             use_ellipses="true" 
+             width="130" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Leave Call"
+             name="end_call_btn"
+             use_ellipses="true" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Open Voice Controls"
+             name="voice_ctrls_btn"
+             use_ellipses="true" />
+        </layout_panel>
+    </layout_stack>
 </panel>
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 c0db734f8c..673052c3b5 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
@@ -88,6 +88,7 @@ background_visible="true"
      initial_value="(retrieving)"
      layout="topleft"
      left_delta="0"
+     link="true"
      name="founder_name"
      top_pad="2"
      use_ellipses="true"
@@ -150,7 +151,6 @@ background_visible="true"
              filename="panel_group_roles.xml"
              layout="topleft"
              left="0"
-             help_topic="group_roles_tab"
              name="group_roles_tab_panel"
              top="0" />
          </accordion_tab>
@@ -180,7 +180,6 @@ background_visible="true"
          filename="panel_group_land_money.xml"
          layout="topleft"
          left="0"
-         help_topic="group_land_money_tab"
          name="group_land_tab_panel"
          top="0" />
          </accordion_tab>
@@ -216,12 +215,28 @@ background_visible="true"
      visible="false"
      width="65" />-->
      <button
+     follows="bottom|right"          
+     label="Group Chat"
+     name="btn_chat"
+     right="-184"
+     left_pad="2"     
+     height="22"          
+     width="85" />
+     <button
+     follows="bottom|right"          
+     label="Group Call"
+     name="btn_call"
+     right="-97"
+     left_pad="2"     
+     height="22"          
+     width="85" />
+     <button
      height="22"
      label="Save"
      label_selected="Save"
      name="btn_apply"
      left_pad="10"
      right="-10"
-     width="100" />
+     width="85" />
      </panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 37578eae70..48083b7677 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -17,7 +17,7 @@
     </panel.string>
     <panel.string
      name="already_in_group">
-        Some avatars are already in group and were not invited.
+        Some Residents you chose are already in the group, and so were not sent an invitation.
     </panel.string>
     <text
      type="string"
@@ -26,11 +26,10 @@
      layout="topleft"
      left="7"
      name="help_text"
-     top="24"
+     top="28"
+     word_wrap="true"
      width="200">
-        You can select multiple residents to 
-invite to your group. Click &apos;Open 
-Resident Chooser&apos; to start.
+        You can select multiple Residents to invite to your group. Click &apos;Open Resident Chooser&apos; to start.
     </text>
     <button
      height="20"
@@ -48,7 +47,7 @@ Resident Chooser&apos; to start.
      left_delta="0"
      multi_select="true"
      name="invitee_list"
-     tool_tip="Hold the Ctrl key and click resident names to multi-select"
+     tool_tip="Hold the Ctrl key and click Resident names to multi-select"
      top_pad="4"
      width="200" />
     <button
@@ -57,7 +56,7 @@ Resident Chooser&apos; to start.
      layout="topleft"
      left_delta="0"
      name="remove_button"
-     tool_tip="Removes residents selected above from the invite list"
+     tool_tip="Removes the Residents selected above from the invite list"
      top_pad="4"
      width="200" />
     <text
@@ -68,6 +67,7 @@ Resident Chooser&apos; to start.
      left_delta="4"
      name="role_text"
      top_pad="5"
+     word_wrap="true"
      width="200">
         Choose what Role to assign them to:
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 5f6b911620..c243d08b97 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -65,6 +65,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tool_tip="View profile"
      top_delta="-2"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index e096715cee..0d9c2c2162 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -136,6 +136,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="63"
          name="create_subject"
+         prevalidate_callback="ascii"
          width="220" />
         <text
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 9b0b81cd0a..65b2e81d50 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -93,7 +93,7 @@
      bottom="85"
      follows="bottom"
      height="20"
-     label="Ok"
+     label="OK"
      layout="topleft"
      right="-10"
      name="btn_ok"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 9548119d58..6b3fb04549 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -210,6 +210,18 @@ including the Everyone and Owner Roles.
                 Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
             </panel.string>
+            <panel.string
+             name="power_folder_icon">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon">
+                Checkbox_Off
+            </panel.string>
          <filter_editor
          layout="topleft"
          top="5"
@@ -220,23 +232,32 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="250"
          label="Filter Abilities"
          name="filter_input" />
-            <scroll_list
-             column_padding="0"
-             draw_stripes="false"
-             follows="left|top"
-             height="200"
-             layout="topleft"
-             left="0"
-             multi_select="true"
-             name="action_list"
-             search_column="1"
-             tool_tip="Select an Ability to view more details"
-             top_pad="5"
-             width="300">
-                <scroll_list.columns
-                 name="action"
-                 width="300" />
-            </scroll_list>
+
+        <scroll_list
+         column_padding="0"
+         draw_stripes="true"
+         height="200"
+         follows="left|top"
+         layout="topleft"
+         left="0"
+         name="action_list"
+         search_column="2"
+         tool_tip="Select an Ability to view more details"
+         top_pad="5"
+         width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
         </panel>
     </tab_container>
     <panel
@@ -258,7 +279,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          name="static"
          top_pad="5"
          width="300">
-            Assigned Members
+            Assigned Roles
         </text>
         <scroll_list
          draw_stripes="true"
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 30e652befd..2e3d5a7320 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
@@ -6,84 +6,161 @@
  width="110">
     <avatar_icon
      follows="left|top"
-     height="100"
+     height="105"
      left_delta="5"
      name="avatar_icon"
      top="-5"
-     width="100"/>
+     width="105"/>
     <text
      follows="top|left|right"
      font="SansSerifLarge"
-     height="22"
+     height="19"
      layout="topleft"
      name="avatar_name"
      use_ellipses="true"
      value="Unknown"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Profile"
-     name="view_profile_btn"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Add Friend"
-     name="add_friend_btn"
-     width="100" />
-    <button
-     follows="left|top|right"
-     height="20"
-     label="Teleport"
-     name="teleport_btn"
-     width="100" />
-   <button
-     follows="left|top|right"
-     height="20"
-     label="Share"
-     name="share_btn"
-     width="100" />
-     <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
- <!--   <button
-     follows="left|top|right"
-     height="20"
-     label="Pay"
-     name="pay_btn"
-     width="100" />-->
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     top_pad="10"
-     follows="left|bottom|right"
-     height="70"
-     left="1"
-     name="panel_call_buttons"
-     width="109">
-        <button
-         bottom="10"
-         follows="left|top|right"
-         height="20"
-         label="Call"
-         left_delta="5"
-         name="call_btn"
-         width="100" />
-        <button
-         bottom="35"
-         follows="left|top|right"
+     width="110" />
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="168"
+     layout="topleft"
+     left="5"
+     name="button_stack"
+     orientation="vertical"
+     top_pad="0"
+     width="105">
+        <layout_panel
+         mouse_opaque="false"
+         auto_resize="true"
+         follows="top|left"
+         height="0"
+         layout="topleft"
+         left="2"
+         min_height="0"
+         width="100"
+         top="0"
+         name="spacer"
+         user_resize="false" />
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
          height="20"
-         label="Leave Call"
-         name="end_call_btn"
-         visible="false"
-         width="100" />
+         layout="topleft"
+         min_height="20"
+         width="100"
+         name="view_profile_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Profile"
+             name="view_profile_btn"
+             top="0"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="add_friend_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Add Friend"
+             name="add_friend_btn"
+             top="5"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="teleport_btn_panel"
+         user_resize="false">
         <button
-         bottom="10"
-         follows="left|top|right"
-         height="20"
-         label="Voice Controls"
-         name="voice_ctrls_btn"
-         visible="false"
-         width="100" />
-    </panel>
+             auto_resize="false"
+             follows="left|top|right"
+             height="20"
+             label="Teleport"
+             name="teleport_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="share_btn_panel"
+         user_resize="false">
+           <button
+             auto_resize="true"
+             follows="left|top|right"
+             height="20"
+             label="Share"
+             name="share_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="call_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Call"
+             name="call_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Leave Call"
+             name="end_call_btn"
+             width="100" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="20"
+             label="Voice Controls"
+             name="voice_ctrls_btn"
+             width="100" />
+        </layout_panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index ccd754ac5e..7204e57479 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -21,6 +21,7 @@
      label="im_header"
      layout="topleft"
      left="5"
+     mouse_opaque="false"
      name="im_header"
      top="5"
      width="295">
@@ -30,7 +31,7 @@
          image_name="Generic_Person"
          layout="topleft"
          left="3"
-         mouse_opaque="true"
+         mouse_opaque="false"
          name="avatar_icon"
          top="3"
          width="18" />
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index c899dcb750..039e1ae086 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -25,7 +25,7 @@
          title="Favorites bar">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -41,7 +41,7 @@
          title="Landmarks">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -57,7 +57,7 @@
          title="My Inventory">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="126"
@@ -73,7 +73,7 @@
            title="Library">
             <places_inventory_panel
              allow_multi_select="true"
-             border="true"
+             border="false"
              bottom="0"
              follows="left|top|right|bottom"
              height="120"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6187b8f1e2..df942b1a26 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -24,6 +24,7 @@ top="600"
 </panel.string>
 <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
 <web_browser
+bg_opaque_color="Black"
 border_visible="false"
 bottom="600"
 follows="all"
@@ -185,6 +186,7 @@ height="80">
    <text
 follows="right|bottom"
 font="SansSerifSmall"
+text_color="EmphasisColor"
 halign="right"
 height="16"
 top="12"
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 4353b306cd..4030c7184a 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -41,6 +41,7 @@ halign="center"
          follows="all"
          height="295"
          label="MY INVENTORY"
+         help_topic="my_inventory_tab"
          layout="topleft"
          left="0"
          name="All Items"
@@ -51,6 +52,7 @@ halign="center"
          follows="all"
          height="295"
          label="RECENT"
+         help_topic="recent_inventory_tab"
          layout="topleft"
          left_delta="0"
          name="Recent Items"
@@ -208,7 +210,7 @@ halign="center"
              layout="topleft"
              name="Reset Current">
                 <menu_item_call.on_click
-                 function="Inventory.ResetFilter" />
+                 function="Inventory.ResetFilters" />
             </menu_item_call>
             <menu_item_call
              label="Close All Folders"
@@ -262,7 +264,7 @@ halign="center"
                  parameter="lsl" />
             </menu_item_call>
             <menu_item_call
-             label="New Note"
+             label="New Notecard"
              layout="topleft"
              name="New Note">
                 <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index a99777848b..e779e37419 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -26,7 +26,7 @@
    </text> -->
     <tab_container
      follows="all"
-     height="575"
+     height="570"
      halign="center"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 5217ab3571..38e8b9844f 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,6 +30,7 @@
     (This page does not pass the specified whitelist)
   </text>
   <line_editor 
+   max_length="1024"
    bottom_delta="-24" 
    enabled="true" 
    follows="left|top" 
@@ -72,13 +73,15 @@
     Current Page:
   </text>
   <text 
+   name="current_url"
+   max_length="1024"
+   use_ellipses="true"
    bottom_delta="-20" 
    enabled="false" 
    follows="left|top" 
    font="SansSerif"
    height="20" 
    left="10" 
-   name="current_url"
    tool_tip="The current page for this media source"
    value="" 
    width="340" />
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 10381d3987..34cde61252 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -28,247 +28,202 @@
      name="no_partner_text"
      value="None" />
     <string
+     name="no_group_text"
+     value="None" />
+    <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-    <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="485"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
-      <panel
-         name="scroll_content_panel"
-         follows="left|top|right"
-          height="485"
+     height="535"
+     width="313"
+     border_size="0">
+      <layout_panel
+         name="profile_stack"
+         follows="all"
          layout="topleft"
          top="0"
          left="0"
-         width="297">
-	  <panel
-         follows="left|top"
-         height="117"
+         height="505"
+         user_resize="false"
+         width="313">
+        <scroll_container
+         color="DkGray2"
+         follows="all"
          layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="280">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
+         left="0"
+         name="profile_scroll"
+         opaque="true"
+         height="505"
+         width="313"
+         top="0">
+          <panel
+                layout="topleft"
+          follows="left|top|right"
+                height="505"
+               name="scroll_content_panel"
+                top="0"
+                left="0"
+                width="297">
+            <panel
+                  follows="left|top|right"
+                  height="117"
+                  layout="topleft"
+                  left="10"
+                  name="second_life_image_panel"
+                  top="0"
+                  width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="2nd_life_pic"
+               top="10"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="2nd_life_edit_icon"
+              label=""
+              left="0"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="10"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_sl_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="[SECOND_LIFE]:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="sl_description_edit"
+               top_pad="-3"
+               width="181"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
+            <panel
+             follows="left|top|right"
              height="117"
              layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top="10"
-             width="102" />
-           <icon
-           height="102"
-           image_name="Blank"
-           layout="topleft"
-           name="2nd_life_edit_icon"
-           label=""
-           left="0"
-           tool_tip="Click the Edit Profile button below to change image"
-           top="10"
-           width="102" />
+       top_pad="10"
+             left="10"
+             name="first_life_image_panel"
+             width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="real_world_pic"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="real_world_edit_icon"
+              label=""
+              left="0"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="4"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_rw_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="Real World:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="fl_description_edit"
+               top_pad="-3"
+               width="181"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
             <text
-             follows="left|top|right"
-	         font.style="BOLD"
+             follows="left|top"
              height="15"
+       font.style="BOLD"
+       font="SansSerifMedium"
              layout="topleft"
-             left_pad="10"
-             name="title_sl_descr_text"
-             text_color="white"
-             top_delta="0"
-             value="[SECOND_LIFE]:"
-             width="165" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="sl_description_edit"
-             top_pad="-3"
-             width="173"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-            </expandable_text>
-        </panel>
-        <panel
-         follows="left|top"
-         height="117"
-         layout="topleft"
-	     top_pad="10"
-         left="10"
-         name="first_life_image_panel"
-         width="280">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
-             layout="topleft"
-             left="0"
-             name="real_world_pic"
-             width="102" />
-           <icon
-           height="102"
-           image_name="Blank"
-           layout="topleft"
-           name="real_world_edit_icon"
-           label=""
-           left="0"
-           tool_tip="Click the Edit Profile button below to change image"
-           top="4"
-           width="102" />
+             left="10"
+             name="homepage_edit"
+             top_pad="0"
+             value="http://librarianavengers.org"
+             width="300"
+             word_wrap="false"
+             use_ellipses="true"
+         />
             <text
-             follows="left|top|right"
-	         font.style="BOLD"
-             height="15"
+             follows="left|top"
+           font.style="BOLD"
+             height="10"
              layout="topleft"
-             left_pad="10"
-             name="title_rw_descr_text"
+             left="10"
+             name="title_member_text"
              text_color="white"
-             top_delta="0"
-             value="Real World:"
-             width="165" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
+             top_pad="10"
+             value="Resident Since:"
+             width="300" />
+            <text
+             follows="left|top"
+             height="15"
              layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="fl_description_edit"
-             top_pad="-3"
-             width="173"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-                Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-            </expandable_text>
-        </panel>
-
-
-	<!-- <panel
-       name="lifes_images_panel"
-         follows="left|top|right"
-         height="244"
-         layout="topleft"
-         top="0"
-         left="0"
-         width="285">
-	 <panel
-         follows="left|top"
-         height="117"
-         layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="285">
-          <text
-             follows="left|top|right"
-	     font.style="BOLD"
+             left="10"
+             name="register_date"
+             value="05/31/2376"
+             width="300"
+             word_wrap="true" />
+            <text
+             follows="left|top"
+       font.style="BOLD"
              height="15"
              layout="topleft"
-             left="0"
-            name="second_life_photo_title_text"
+             left="10"
+             name="title_acc_status_text"
              text_color="white"
-             value="[SECOND_LIFE]:"
-             width="170" />
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="117"
-             layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top_pad="0"
-             width="102" />
-          </panel>
-           <icon
-           height="18"
-           image_name="AddItem_Off"
-           layout="topleft"
-           name="2nd_life_edit_icon"
-           label=""
-           left="87"
-           tool_tip="Click to select an image"
-           top="25"
-           width="18" />
-      </panel> -->
-
-
-
-
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	     font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="homepage_edit"
-         top_pad="0"
-         value="http://librarianavengers.org"
-         width="280"
-         word_wrap="false"
-         use_ellipses="true"
-         />
-        <text
-         follows="left|top"
-	     font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="10"
-         name="title_member_text"
-         text_color="white"
-         top_pad="10"
-         value="Member Since:"
-         width="280" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="register_date"
-         value="05/31/2376"
-         width="280"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_acc_status_text"
-         text_color="white"
-         top_pad="10"
-         value="Account Status:"
-         width="280" />
-       <!-- <text
+             top_pad="5"
+             value="Account Status:"
+             width="300" />
+            <!-- <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
@@ -279,81 +234,83 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-        <text
-         follows="left|top"
-         height="20"
-         layout="topleft"
-         left="10"
-         name="acc_status_text"
-         top_pad="0"
-         value="Resident. No payment info on file."
-         width="280"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_partner_text"
-         text_color="white"
-         top_pad="5"
-         value="Partner:"
-         width="280" />
-        <panel
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="partner_data_panel"
-         top_pad="0"
-         width="280">
+            <text
+            follows="left|top"
+            height="28"
+            layout="topleft"
+            left="10"
+            name="acc_status_text"
+            top_pad="0"
+            width="300"
+            word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text>
             <text
              follows="left|top"
-             height="10"
+       font.style="BOLD"
+             height="15"
              layout="topleft"
-             left="0"
-             name="partner_text"
-             top="0"
-             value="[FIRST] [LAST]"
-         width="280"
-             word_wrap="true" />
-         </panel>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_groups_text"
-         text_color="white"
-         top_pad="8"
-         value="Groups:"
-         width="280" />
-                     <expandable_text
-         follows="left|top|bottom"
-         height="60"
-         layout="topleft"
-         left="10"
-             name="sl_groups"
-       top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-        </expandable_text>
-      </panel>
- </scroll_container>
- <panel
+             left="10"
+             name="title_partner_text"
+             text_color="white"
+             top_pad="3"
+             value="Partner:"
+             width="300" />
+            <panel
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="partner_data_panel"
+             top_pad="0"
+             width="300">
+              <name_box
+               follows="left|top"
+               height="10"
+               initial_value="(retrieving)"
+               layout="topleft"
+               left="0"
+               link="true"
+               name="partner_text"
+               top="0"
+           width="300"
+               word_wrap="true" />
+            </panel>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="3"
+             value="Groups:"
+             width="300" />
+            <expandable_text
+            follows="all"
+            height="113"
+            layout="topleft"
+            left="7"
+            name="sl_groups"
+          top_pad="0"
+            width="298"
+            expanded_bg_visible="true"
+            expanded_bg_color="DkGray">
+              Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
+            </expandable_text>
+          </panel>
+        </scroll_container>
+      </layout_panel>
+      <!-- <layout_panel
      follows="bottom|left"
      layout="topleft"
      left="0"
      name="profile_buttons_panel"
-     top_pad="2"
-     bottom="10"
-     height="23"
-     width="303">
-        <button
+     height="28"
+     width="313">
+         <button
          follows="bottom|left"
          height="23"
          label="Add Friend"
@@ -361,8 +318,9 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
+         tool_tip="Offer friendship to the Resident"
          top="5"
-         width="75" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -370,7 +328,7 @@
          layout="topleft"
          name="im"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -378,7 +336,7 @@
          label="Call"
          layout="topleft"
          name="call"
-         left_pad="5"
+         left_pad="3"
          top="5"
          width="45" />
         <button
@@ -389,7 +347,7 @@
          layout="topleft"
          name="show_on_map_btn"
          top="5"
-         left_pad="5"
+         left_pad="3"
          width="45" />
         <button
          follows="bottom|left"
@@ -397,23 +355,26 @@
          label="Teleport"
          layout="topleft"
          name="teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="80" />
- </panel>
- <panel
+         width="85" />
+ </panel>-->
+ <layout_panel
      follows="bottom|left"
      layout="topleft"
      left="0"
-     top_pad="-17"
+     top_pad="0"
      name="profile_me_buttons_panel"
      visible="false"
-     height="23"
-     width="303">
+     user_resize="false" 
+     auto_resize="false" 
+     height="28"
+     width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+	 top="0"
          label="Edit Profile"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
@@ -425,7 +386,7 @@
          left_pad="10"
          name="edit_appearance_btn"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
-         right="-10"
          width="130" />
- </panel>
+ </layout_panel>
+</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 0f9b095d8c..bfc97ed5da 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -29,12 +29,12 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="50"
 	 width="600"/>
 	<panel
 	 background_visible="false"
 	 follows="left|top|right"
-	 top="5"
+	 top="3"
 	 height="23"
 	 layout="topleft"
 	 name="navigation_panel"
@@ -42,28 +42,17 @@
 	     <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Arrow_Left_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left="10"
 	     name="back_btn"
 	     tool_tip="Go back to previous location"
-	     top="3"
+	     top="2"
 	     width="31" />
-
 	    <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Arrow_Right_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left_pad="0"
 	     name="forward_btn"
@@ -73,12 +62,7 @@
 	    <button
 	     follows="left|top"
 	     height="23"
-	     image_disabled="PushButton_Disabled"
-	     image_disabled_selected="PushButton_Disabled"
 	     image_overlay="Home_Off"
-	     image_selected="PushButton_Selected"
-	     image_unselected="PushButton_Off"
-	     hover_glow_amount="0.15"
 	     layout="topleft"
 	     left_pad="7"
 	     name="home_btn"
@@ -108,7 +92,6 @@
 	         width="20" />
 	      -->
 	    </location_input>
-
 	<!--     <button -->
 	<!--      follows="right|top" -->
 	<!--      height="20" -->
@@ -124,7 +107,6 @@
 	<!--      name="search_bg" -->
 	<!--      top_delta="0" -->
 	<!--      width="168" /> -->
-
         <search_combo_box
 	     bevel_style="none"
 	     border_style="line"
@@ -144,9 +126,14 @@
          <combo_editor
           label="Search [SECOND_LIFE]"
           name="search_combo_editor"/>
+         <combo_list
+          draw_border="true"
+          border.highlight_light_color="FocusColor"
+          border.highlight_dark_color="FocusColor"
+          border.shadow_light_color="FocusColor"
+          border.shadow_dark_color="FocusColor"/>
         </search_combo_box>
 	</panel>
-
     <favorites_bar
      follows="left|right|top"
      font="SansSerifSmall"
@@ -154,16 +141,17 @@
      layout="topleft"
      left="0"
      name="favorite"
-     image_drag_indication="arrow_down.tga"
-   bottom="57"
+     image_drag_indication="Accordion_ArrowOpened_Off"
+   bottom="55"
    width="590">
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
                      image_selected="TabIcon_Close_Off"
                      tab_stop="false"
-                     follows="left|bottom" 
-                     tool_tip="Show more of My Favorites" 
+                     follows="left|bottom"
+                     tool_tip="Show more of My Favorites"
                      width="15"
+		     top="15"
                      height="15"/>
   </favorites_bar>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index f09a0e03ed..2b361c0628 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -27,7 +27,7 @@
      max_length="512"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
-     top="1"
+     top="2"
      width="283" />
     <output_monitor
      auto_update="true"
@@ -45,7 +45,7 @@
      follows="right"
      is_toggle="true"
      width="20"
-     top="1"
+     top="2"
      layout="topleft"
      left_pad="4"
      image_disabled="ComboButton_UpOff"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index f15e75dee9..ac100a2c06 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="535"
+ height="540"
  label="Notes &amp; Privacy"
  layout="topleft"
  left="0"
@@ -19,94 +19,94 @@
      height="517"
      width="313"
      border_size="0">
-        <panel
-         name="notes_stack"
+      <layout_panel
+       name="notes_stack"
+       follows="all"
+       layout="topleft"
+       top="0"
+       left="0"
+       height="475"
+       width="313">
+        <scroll_container
+         color="DkGray2"
          follows="all"
          layout="topleft"
-         top="0"
          left="0"
+         name="profile_scroll"
+         opaque="true"
          height="475"
-         width="313">
-            <scroll_container
-             color="DkGray2"
-             follows="all"
+         width="313"
+         top="0">
+          <panel
+           height="450"
+           layout="topleft"
+           name="profile_scroll_panel"
+           top="0"
+           left="0"
+           width="303">
+            <text
+             follows="left|top"
+             font="SansSerifBold"
+             height="16"
              layout="topleft"
-             left="0"
-             name="profile_scroll"
-             opaque="true"
-             height="475"
-             width="313"
-             top="0">
-              <panel
-               height="450"
-               layout="topleft"
-               name="profile_scroll_panel"
-               top="0"
-               left="0"
-               width="303">
-                <text
-                 follows="left|top"
-                 font="SansSerifBold"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="status_message"
-                 text_color="white"
-                 top="20"
-                 value="My private notes:"
-                 width="293" />
-                <text_editor
-                 follows="left|top"
-                 height="120"
-                 layout="topleft"
-                 left="10"
-                 max_length="1000"
-                 name="notes_edit"
-                 text_color="DkGray"
-                 top_pad="10"
-                 width="280"
-                 word_wrap="true" />
-                <text
-                 follows="left|top"
-                 font="SansSerifBold"
-                 height="16"
-                 layout="topleft"
-                 left="10"
-                 name="status_message2"
-                 text_color="white"
-                 top_pad="30"
-                 value="Allow this person to:"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="See my online status"
-                 layout="topleft"
-                 left="20"
-                 name="status_check"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="See me on the map"
-                 layout="topleft"
-                 left="20"
-                 name="map_check"
-                 width="293" />
-                <check_box
-                 enabled="false"
-                 height="16"
-                 label="Edit, delete or take my objects"
-                 layout="topleft"
-                 left="20"
-                 name="objects_check"
-                 width="293" />
-              </panel>
-            </scroll_container>
-        </panel>
-        <panel
-         follows="bottom|left"
-         height="30"
+             left="10"
+             name="status_message"
+             text_color="white"
+             top="20"
+             value="My private notes:"
+             width="293" />
+            <text_editor
+             follows="left|top"
+             height="120"
+             layout="topleft"
+             left="10"
+             max_length="1000"
+             name="notes_edit"
+             text_color="DkGray"
+             top_pad="10"
+             width="280"
+             word_wrap="true" />
+            <text
+             follows="left|top"
+             font="SansSerifBold"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="status_message2"
+             text_color="white"
+             top_pad="30"
+             value="Allow this person to:"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="See my online status"
+             layout="topleft"
+             left="20"
+             name="status_check"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="See me on the map"
+             layout="topleft"
+             left="20"
+             name="map_check"
+             width="293" />
+            <check_box
+             enabled="false"
+             height="16"
+             label="Edit, delete or take my objects"
+             layout="topleft"
+             left="20"
+             name="objects_check"
+             width="293" />
+          </panel>
+        </scroll_container>
+      </layout_panel>
+      <layout_panel
+       follows="bottom|left"
+       height="30"
          layout="topleft"
          left="0"
          name="notes_buttons_panel"
@@ -115,14 +115,14 @@
        <button
          follows="bottom|left"
          height="23"
-         label="Add"
+         label="Add Friend"
          layout="topleft"
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
-         width="55" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -131,18 +131,18 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="40" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
          label="Call"
          layout="topleft"
          name="call"
-         tool_tip="Call this resident"
-         left_pad="5"
+         tool_tip="Call this Resident"
+         left_pad="3"
          top="5"
-         width="55" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -150,10 +150,10 @@
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
-         tool_tip="Show the resident on the map"
+         tool_tip="Show the Resident on the map"
          top="5"
-         left_pad="5"
-         width="50" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -161,9 +161,9 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="90" />
-        </panel>
+         width="80" />
+        </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index d6d8e9562b..8895484326 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
  <panel name="Outfits"
  background_visible="true"
   follows="all"
@@ -8,7 +7,7 @@
  layout="topleft"
  min_height="350"
  min_width="240"
- width="330"
+ width="320"
  border="false">
    <tab_container
      follows="all"
@@ -16,36 +15,39 @@
      layout="topleft"
      left="10"
      name="appearance_tabs"
-     tab_min_width="100"
+     tab_min_width="140"
      tab_height="30"
      tab_position="top"
      halign="center"
      width="313">
-      <inventory_panel
-        label="MY OUTFITS"
-        help_topic="my_outfits_tab"
-	    allow_multi_select="true"
-	    follows="all"
-	    border="false"
-	    left="0"
-        top="0"
-        height="500"
-        width="290"
- 		mouse_opaque="true"
- 	    name="outfitslist_accordionpanel"
- 		start_folder="My Outfits" /> 
          <inventory_panel
-        label="WEARING"
-        help_topic="now_wearing_tab"
-        allow_multi_select="true"
-        border="false"
-        height="500"
-        width="290"
-        left="0"
-        top="0"
-        mouse_opaque="true"
-        name="cof_accordionpanel"
-        start_folder="Current Outfit" />
+           background_visible="true"
+           background_opaque="true"
+           label="MY OUTFITS"
+           help_topic="my_outfits_tab"
+           allow_multi_select="true"
+           follows="all"
+           border="false"
+           left="0"
+           top="0"
+           width="314"
+           mouse_opaque="true"
+           name="outfitslist_tab"
+           start_folder="My Outfits" /> 
+         <inventory_panel
+           follows="all"
+           background_visible="true"
+           background_opaque="true"
+           label="WEARING"
+           help_topic="now_wearing_tab"
+          allow_multi_select="true"
+           border="false"
+           left="0"
+           top="0"
+           mouse_opaque="true"
+           name="cof_accordionpanel"
+           start_folder="Current Outfit"
+           width="313" />
    </tab_container>
 	<panel
 	  background_visible="true"
@@ -83,23 +85,13 @@
 	 <button
 	  follows="bottom|left"
 		height="23" 
-		label="Edit Look" 
-		layout="topleft"
-        left="10"
-		name="look_edit_btn"
-        top="26"
-        visible="false" 
-		width="90" />
-     <button
-      follows="bottom|left"
-      height="23" 
-      label="Make Outfit" 
+      label="Save Outfit" 
       layout="topleft"
       name="make_outfit_btn"
       tool_tip="Save appearance as an outfit"
        top="26"
-      right="-110"
-      width="90" />
+       left='10'
+      width="120" />
      <button
       follows="bottom|right" 
       height="23" 
@@ -107,8 +99,19 @@
       layout="topleft"
       name="wear_btn"
       right="-10"
+      left_pad="10"
        top="26"
       tool_tip="Wear selected outfit"
-      width="90" />
+      width="120" />
+	 <button
+	  follows="bottom|left"
+		height="23" 
+		label="M" 
+		layout="topleft"
+        right="-140"
+		name="look_edit_btn"
+        top="26"
+        visible="false" 
+		width="20" />
 	 </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
index 7b88fca7c3..2c7a51f0e7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -18,17 +18,6 @@
 		 parameter="wear" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
-     layout="topleft"
-     name="add">
-        <on_click
-         function="panel_outfits_inventory_gear_default.Custom.Action"
-         parameter="add" />
-        <on_enable
-		 function="panel_outfits_inventory_gear_default.Enable"
-		 parameter="add" />
-    </menu_item_call>
-    <menu_item_call
      label="Remove From Current Outfit"
      layout="topleft"
      name="remove">
@@ -54,7 +43,7 @@
 		 parameter="rename" />
     </menu_item_call>
     <menu_item_call
-     label="Remove"
+     label="Remove Link"
      layout="topleft"
      name="remove_link">
         <on_click
@@ -65,7 +54,7 @@
 		 parameter="remove_link" />
     </menu_item_call>
     <menu_item_call
-     label="Delete"
+     label="Delete Outfit"
      layout="topleft"
      name="delete">
         <on_click
@@ -73,6 +62,6 @@
          parameter="delete" />
         <on_enable
 		 function="panel_outfits_inventory_gear_default.Enable"
-		 parameter="delete" />
+		 parameter="delete_outfit" />
     </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 08a10553a8..da3a2274c9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -3,7 +3,7 @@
 <panel
 background_visible="true"
  follows="all"
- height="570"
+ height="575"
  label="People"
  layout="topleft"
  min_height="350"
@@ -106,7 +106,7 @@ background_visible="true"
                  left_pad="5"
                  name="add_friend_btn"
                  top_delta="0"
-                 tool_tip="Add selected resident to your friends List"
+                 tool_tip="Add selected Resident to your friends List"
                  width="18">
                <commit_callback
                   function="People.addFriend" />
@@ -192,7 +192,7 @@ background_visible="true"
                  layout="topleft"
                  left_pad="5"
                  name="add_btn"
-                 tool_tip="Offer friendship to a resident"
+                 tool_tip="Offer friendship to a Resident"
                  top_delta="0"
                  width="18" />
                 <button
@@ -327,7 +327,7 @@ background_visible="true"
                  left_pad="5"
                  name="add_friend_btn"
                  top_delta="0"
-                 tool_tip="Add selected resident to your friends List"
+                 tool_tip="Add selected Resident to your friends List"
                  width="18">
                 <commit_callback
                    function="People.addFriend" />
@@ -337,7 +337,7 @@ background_visible="true"
     </tab_container>
     <panel
      follows="bottom|left"
-     height="25"
+     height="35"
      layout="topleft"
      left="10"
      name="button_bar"
@@ -350,7 +350,7 @@ background_visible="true"
          label="Profile"
          layout="topleft"
          name="view_profile_btn"
-         tool_tip="Show picture, groups, and other residents information"
+         tool_tip="Show picture, groups, and other Residents information"
          width="70" />
         <button
          follows="bottom|left"
@@ -370,7 +370,7 @@ background_visible="true"
          label="Call"
          layout="topleft"
          name="call_btn"
-         tool_tip="Call this resident"
+         tool_tip="Call this Resident"
          width="50" />
         <button
          follows="left|top"
@@ -400,7 +400,7 @@ background_visible="true"
          layout="topleft"
          name="group_info_btn"
          tool_tip="Show group information"
-         width="110" />
+         width="102" />
         <button
          follows="bottom|left"
          top="4"
@@ -410,7 +410,7 @@ background_visible="true"
          layout="topleft"
          name="chat_btn"
          tool_tip="Open chat session"
-         width="110" />
+         width="102" />
         <button
          follows="bottom|left"
          top="4"
@@ -420,6 +420,6 @@ background_visible="true"
          layout="topleft"
          name="group_call_btn"
          tool_tip="Call this group"
-         width="110" />
+         width="102" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index f68202d287..65ccd10cf0 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -7,6 +7,7 @@
  left="0"
  min_height="350"
  name="panel_pick_info"
+ help_topic="profile_pick_info"
  top="0"
  width="333">
     <button
@@ -38,33 +39,32 @@
      height="500"
      layout="topleft"
      left="10"
-     top_pad="10"
+     top_pad="5"
      name="profile_scroll"
-     reserve_scroll_corner="false"
      width="313">
     <panel
      name="scroll_content_panel"
-     follows="left|top"
+     follows="left|top|right"
      min_height="300"
      layout="topleft"
      top="0"
      background_visible="false"
-     height="470"
+     height="400"
      left="0"
-     width="295">
+     width="285">
         <texture_picker
          enabled="false"
-         follows="left|top"
+         follows="left|top|right"
          height="197"
          layout="topleft"
          left="10"
          name="pick_snapshot"
          top="20"
-         width="290" />
+         width="280" />
         <text
          follows="left|top|right"
          height="35"
-         width="290"
+         width="280"
          layout="topleft"
          font="SansSerifBig"
          font.style="BOLD"
@@ -75,28 +75,34 @@
          value="[name]"
          use_ellipses="true" />
         <text
-         follows="left|top"
+         follows="left|top|right"
          height="25"
          layout="topleft"
          left="10"
          name="pick_location"
-         width="290"
+         width="280"
          word_wrap="true"
          value="[loading...]" />
-        <text
-         follows="left|top|right"
-         height="280"
+        <text_editor
+         bg_readonly_color="DkGray2"
+         follows="all"
+         height="100"
+         width="280"
+         hide_scrollbar="false"
          layout="topleft"
          left="10"
+         top_pad="2"
+         max_length="1023"
          name="pick_desc"
-         width="290"
+         read_only="true"
+         text_readonly_color="white"
          value="[description]"
-         word_wrap="true" />
+         wrap="true" />
     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="20"
+     height="35"
      layout="topleft"
      top_pad="8"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 1fc553ff36..d31f4d039f 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="535"
+ height="540"
  label="Picks"
  layout="topleft"
  left="0"
@@ -121,10 +121,9 @@
         <panel
          layout="topleft"
          left="0"
-         height="25"
+         height="30"
          top_pad="10"
          name="buttons_cucks"
-         help_topic="picks_button_tab"
          width="313">
        <button
          enabled="false"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 8a5c023133..9bfd8b91d8 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -46,7 +46,7 @@ background_visible="true"
      height="533"
      layout="topleft"
      left="0"
-     help_topic="places_info_tab"
+     help_topic="place_profile"
      name="panel_place_profile"
      top="5"
      visible="false"
@@ -58,7 +58,7 @@ background_visible="true"
      height="533"
      layout="topleft"
      left="0"
-     help_topic="places_info_tab"
+     help_topic="landmark"
      name="panel_landmark_info"
      top="5"
      visible="false"
@@ -67,7 +67,6 @@ background_visible="true"
      height="19"
      layout="topleft"
      left="0"
-     help_topic="places_button_tab"
      name="button_panel"
      width="313">
         <button
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 17651b8caa..141678f7eb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -2,7 +2,6 @@
 
 <panel
  border="true"
- background_visible="true"
  follows="left|top|right|bottom"
  height="408"
  layout="topleft"
@@ -35,7 +34,14 @@
      name="background"
      tool_tip="Choose color for bubble chat"
      top_delta="1"
-     width="44" />
+     width="44">
+        <color_swatch.init_callback
+		     function="Pref.getUIColor"
+		     parameter="BackgroundChatColor" />
+		    <color_swatch.commit_callback
+		     function="Pref.applyUIColor"
+		     parameter="BackgroundChatColor" />
+    </color_swatch>
     <slider
      control_name="ChatBubbleOpacity"
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 18d0f8acab..ace8281b4e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -31,7 +31,6 @@
      width="300" />
     <check_box
      control_name="ChatOnlineNotification"
-	 enabled="false"
      height="16"
      label="When my friends log out or in"
      layout="topleft"
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 017c321767..6e0b94ac2b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -318,15 +318,15 @@
      height="20"
      width="300"
      top_pad="20">
-     Show IMs in:
+     Show IMs in: (Requires restart)
     </text>
     <radio_group
      height="30"
      layout="topleft"
-     left="30"
+     left_delta="30"
      control_name="ChatWindow"
      name="chat_window"
-     top_pad="10"
+     top_pad="0"
      tool_tip="Show your Instant Messages in separate windows, or in one window with many tabs (Requires restart)"
      width="331">
      <radio_item
@@ -342,10 +342,10 @@
       height="16"
       label="One window"
       layout="topleft"
-      left_delta="145"
+      left_delta="0"
       name="radio2"
       value="1"
-      top_delta="0"
+      top_pad="5"
       width="150" />
     </radio_group>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c98555735a..22c75a595e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
      width="200">
         My effects:
     </text>
-  <text
+    <text
       type="string"
       length="1"
       follows="left|top"
@@ -270,16 +270,23 @@
       name="title_afk_text"
       width="190">
     Away timeout:
-  </text>
+    </text>
     <color_swatch
-     control_name="EffectColor"
+	 can_apply_immediately="true"
      follows="left|top"
      height="50"
      layout="topleft"
      left="50"
      name="effect_color_swatch"
      tool_tip="Click to open Color Picker"
-     width="38" />
+     width="38">
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="EffectColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="EffectColor" />
+	</color_swatch>
   <combo_box
             height="23"
             layout="topleft"
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 f97ccafecc..a0fcf59fc8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -76,7 +76,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left="128"
      name="LowGraphicsDivet"
@@ -85,7 +85,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="83"
      name="MidGraphicsDivet"
@@ -94,7 +94,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="85"
      name="HighGraphicsDivet"
@@ -103,7 +103,7 @@
     <icon
      color="0.12 0.12 0.12 1"
      height="14"
-     image_name="rounded_square.tga"
+     image_name="Rounded_Square"
      layout="topleft"
      left_pad="83"
      name="UltraGraphicsDivet"
@@ -378,7 +378,7 @@
 		layout="topleft"
 		left_delta="250"
 		name="DrawDistanceMeterText2"
-		top_delta="1"
+		top_delta="0"
 		width="128">
 			m
 		</text>
@@ -395,7 +395,7 @@
 		left="216"
 		max_val="8192"
 		name="MaxParticleCount"
-		top_pad="6"
+		top_pad="7"
 		width="262" />
 		<slider
 		control_name="RenderGlowResolutionPow"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 25d7ba0903..a8e24366f2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -77,15 +77,31 @@
      name="cookies_enabled"
      top_pad="10"
      width="350" />
-    <check_box
+	<check_box
+     control_name="MediaEnabled"
+     height="16"
+     label="Media Enabled"
+     layout="topleft"
+     left="30"
+     name="media_enabled"
+     top_pad="10"
+     width="350">
+       <check_box.commit_callback
+          function="Pref.MediaEnabled" />
+    </check_box>
+	<check_box
+	 enabled_control="MediaEnabled"
      control_name="ParcelMediaAutoPlayEnable"
      height="16"
-     label="Allow Media Autoplay"
+     label="Allow Media to auto-play"
      layout="topleft"
      left="30"
      name="autoplay_enabled"
      top_pad="10"
-     width="350" />
+     width="350">
+       <check_box.commit_callback
+          function="Pref.ParcelMediaAutoPlayEnable" />
+    </check_box>
    <text
       type="string"
     length="1"
@@ -131,18 +147,6 @@
      name="show_timestamps_check_im"
      top_pad="10"
      width="237" />
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogFolder"
-     enabled="false"
-     follows="top|left|right"
-     halign="right"
-     height="19"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5" />
     <text
      type="string"
      length="1"
@@ -152,11 +156,23 @@
      left_delta="0"
      mouse_opaque="false"
      name="log_path_desc"
-     top_pad="1"
-     width="128"
-     text_color="LtGray_50">
-        Location of logs
+     top_pad="5"
+     width="128">
+        Location of logs:
     </text>    
+    <line_editor
+     bottom="366"
+     control_name="InstantMessageLogFolder"
+     enabled="false"
+     follows="top|left|right"
+     halign="right"
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="log_path_string"
+     top_pad="5"
+     width="250"/>
     <button
 	 enabled="false"
      follows="right|bottom"
@@ -164,9 +180,9 @@
      label="Browse"
      label_selected="Browse"
      layout="topleft"
-     left_pad="115"
+     left_pad="5"
      name="log_path_button"
-     top_delta="-21"
+     top_delta="0"
      width="145">
         <button.commit_callback
          function="Pref.LogPath" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 34bd6fb091..f6900cc31c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -176,7 +176,7 @@
      max_val="1024"
      min_val="32"
      name="cache_size"
-     top_delta="-1"
+     top_delta="-2"
      width="180" />
     <text
      type="string"
@@ -191,6 +191,18 @@
      width="40">
         MB
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="80"
+     name="Cache location"
+     top_delta="20"
+     width="300">
+        Cache location:
+    </text>
     <line_editor
      control_name="CacheLocationTopFolder"
      border_style="line"
@@ -199,12 +211,12 @@
      follows="left|top"
      font="SansSerif"
      handle_edit_keys_directly="true"
-     height="20"
+     height="23"
      layout="topleft"
      left="80"
      max_length="4096"
      name="cache_location"
-     top_pad="20"
+     top_pad="5"
      width="205" />
     <button
      follows="left|top"
@@ -232,20 +244,6 @@
         <button.commit_callback
          function="Pref.ResetCache" />
     </button>
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="80"
-     name="Cache location"
-     top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Cache location
-    </text>
     <text
      type="string"
      length="1"
@@ -301,15 +299,28 @@
      mouse_opaque="true"
      name="web_proxy_enabled"
      radio_style="false"
-     width="400" />
+     width="400"
+     top_pad="5"/>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="1"
+     name="Proxy location"
+     top_delta="20"
+     width="300">
+        Proxy location:
+    </text>
     <line_editor
      control_name="BrowserProxyAddress"
      enabled_control="BrowserProxyEnabled"
 	 follows="left|top"
      font="SansSerif"
-     height="20"
+     height="23"
      layout="topleft"
-     left_delta="1"
+     left_delta="0"
      name="web_proxy_editor"
      tool_tip="The name or IP address of the proxy you would like to use"
      top_pad="4"
@@ -328,16 +339,4 @@
         <button.commit_callback
          function="Pref.SetCache" />
     </button>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="-203"
-     name="Proxy location"
-     top_delta="20"
-     width="300"
-     text_color="LtGray_50">
-        Proxy location
-    </text></panel>
+  </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 677d0de243..e1d8ee241d 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,54 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 	follows="left|right|top|bottom"
-	name="MediaControls"
+	name="MediaControlsPanel"
 	background_visible="false"
 	height="200"
 	layout="topleft"
 	help_topic="prim_media_controls"
 	mouse_opaque="false"
+	min_width="300"
 	width="800">
   <string name="control_background_image_name">Inspector_Background</string>
   <string name="skip_step">0.2</string>
-  <string name="min_width">400</string>
-  <string name="min_height">120</string>
+  <string name="min_width">300</string>
+  <string name="min_height">75</string>
   <string name="zoom_near_padding">1.0</string>
-  <string name="zoom_medium_padding">1.25</string>
+  <string name="zoom_medium_padding">1.1</string>
   <string name="zoom_far_padding">1.5</string>
-  <panel
-	  name="media_region"
-	  height="100"
-	  follows="left|right|top|bottom"
+  <string name="top_world_view_avoid_zone">50</string>
+  <layout_stack
+	  name="progress_indicator_area"
+	  follows="left|right|top"
+	  height="8"
 	  layout="topleft"
-	  mouse_opaque="false"
-	  top="0" />
+	  animate="false"
+	  left="0"
+	  orientation="horizontal"
+	  top="22">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		width="0"
+		name="left_bookend_bottom"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+	<panel
+		name="media_progress_indicator"
+		mouse_opaque="false"
+		follows="left|right|top"
+		height="8"
+		layout="topleft"
+		left="0"
+		top="0"
+		auto_resize="false"
+		user_resize="false"
+		min_width="100"
+		width="200">
+	  <progress_bar
+		  name="media_progress_bar"
+		  color_bg="1 1 1 1"
+		  color_bar="1 1 1 0.96"
+		  follows="left|right|top"
+		  height="8"
+		  layout="topleft"
+		  top="0"
+		  left="0"
+		  tool_tip="Media is Loading"/>
+	</panel>
+	<layout_panel
+		name="right_bookend_bottom"
+		width="0"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
   <layout_stack
 	  name="media_controls"
-	  follows="left|right"
+	  follows="left|right|top"
 	  animate="false"
 	  height="75"
 	  layout="topleft"
+	  top="0"
 	  left="0"
+	  border_size="1"
 	  mouse_opaque="false"
-	  orientation="horizontal"
-	  top="100">
+	  orientation="horizontal">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		name="left_bookend"
+		top="0"
 		width="0"
-	  mouse_opaque="false"
+		mouse_opaque="false"
 		layout="topleft"
 		user_resize="false" />
 	<layout_panel
 		name="back"
+		top="0"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-	  mouse_opaque="false"
+		mouse_opaque="false"
 		min_width="22"
-		width="22"
-		top="4">
+		width="22">
 	  <button
+		  name="back_btn"
+		  follows="top"
 		  image_overlay="Arrow_Left_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -56,60 +101,67 @@
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
 		  auto_resize="false"
-		  height="22"
 		  layout="topleft"
 		  tool_tip="Navigate back"
-		  width="22"
+		  top="0"
 		  left="0"
-		  top_delta="4">
+		  width="22"
+		  height="22">
 		<button.commit_callback
 			function="MediaCtrl.Back" />
 	  </button>
 	</layout_panel>
 	<layout_panel
 		name="fwd"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="10"
 		min_width="22"
+		top="0"
+		height="22"
 		width="22">
 	  <button
+		  name="fwd_btn"
+		  follows="top"
 		  image_overlay="Arrow_Right_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
+		  width="22"
 		  layout="topleft"
-		  tool_tip="Navigate forward"
-		  top_delta="0"
-		  min_width="22"
-		  width="22">
+		  tool_tip="Navigate forward">
 		<button.commit_callback
 			function="MediaCtrl.Forward" />
 	  </button>
 	</layout_panel>
 	<layout_panel
 		name="home"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="-2"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
+		  name="home_btn"
+		  follows="top"
+		  image_overlay="Home_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
-		  image_overlay="Home_Off"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Home page"
+		  top="0"
 		  height="22"
-		  min_width="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Home" />
@@ -117,23 +169,27 @@
 	</layout_panel>
 	<layout_panel
 		name="media_stop"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="2"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
+		  name="media_stop_btn"
+		  follows="top"
 		  image_overlay="Stop_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
-		  height="22"
 		  layout="topleft"
 		  tool_tip="Stop media"
-		  min_width="22"
+		  top="0"
+		  height="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.MediaStop" />
@@ -141,14 +197,17 @@
 	</layout_panel>
 	<layout_panel
 		name="reload"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="6"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
+		  name="reload_btn"
+		  follows="top"
 		  image_overlay="Refresh_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -157,7 +216,8 @@
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Reload"
-		  min_width="22"
+		  top="0"
+		  height="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Reload" />
@@ -165,14 +225,17 @@
 	</layout_panel>
 	<layout_panel
 		name="stop"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="10"
+		top="0"
+		height="22"
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
+		  name="stop_btn"
+		  follows="top"
 		  image_overlay="StopReload_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -181,7 +244,8 @@
 		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Stop loading"
-		  min_width="22"
+		  top="0"
+		  height="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Stop" />
@@ -189,13 +253,17 @@
 	</layout_panel>
 	<layout_panel
 		name="play"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="14"
+		top="0"
+		height="22"
 		min_width="22"
 		width="24">
 	  <button
+		  name="play_btn"
+		  follows="top"
 		  image_overlay="Play_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -205,9 +273,8 @@
 		  layout="topleft"
 		  tool_tip = "Play media"
 		  left_delta="2"
-		  top="4"
+		  top="0"
 		  height="22"
-		  min_width="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Play" />
@@ -215,13 +282,16 @@
 	</layout_panel>
 	<layout_panel
 		name="pause"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="18"
+		top="0"
 		min_width="22"
 		width="24">
 	  <button
+		  name="pause_btn"
+		  follows="top"
 		  image_overlay="Pause_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -229,10 +299,10 @@
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
 		  layout="topleft"
+		  top="0"
 		  height="22"
 		  width="22"
 		  left_delta="-1"
-		  top="4"
 		  tool_tip = "Pause media">
 		<button.commit_callback
 			function="MediaCtrl.Pause" />
@@ -241,16 +311,19 @@
 	<!-- media URL entry  -->
 	<layout_panel
 		name="media_address"
+		mouse_opaque="false"
 		auto_resize="true"
 		user_resize="false"
 		height="24"
 		follows="left|right|bottom"
 		layout="topleft"
+		top="0"
 		width="190"
 		min_width="90">
 	  <line_editor 
 		  name="media_address_url"
-		  follows="left|right" 
+		  max_length="1024"
+		  follows="top|left|right" 
 		  height="22"
 		  top="0"
 		  tool_tip="Media URL"
@@ -261,17 +334,18 @@
 	  <layout_stack
 		  name="media_address_url_icons"
 		  animate="false"
-		  follows="right"
+		  follows="top|right"
 		  height="20"
 		  width="38"
-		  right="-2"
-		  top="-1"
-     	mouse_opaque="false"
+		  top="0"
+		  right="-1"
+		  border_size="0"
+		  mouse_opaque="false"
 		  orientation="horizontal">
 		<layout_panel
 			layout="topleft"
 			width="16"
-     	mouse_opaque="false"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false">
 		  <icon
@@ -281,13 +355,12 @@
 			  image_name="Flag"
 			  layout="topleft"
 			  tool_tip="White List enabled"
-			  min_width="16"
 			  width="16" />
 		</layout_panel>
 		<layout_panel
 			layout="topleft"
 			width="16"
-     	mouse_opaque="false"
+			mouse_opaque="false"
 			auto_resize="false"
 			user_resize="false">
 		  <icon
@@ -296,30 +369,30 @@
 			  image_name="Lock2"
 			  layout="topleft"
 			  tool_tip="Secured Browsing"
-			  min_width="16"
 			  width="16" />
 		</layout_panel>
 	  </layout_stack>
 	</layout_panel>
 	<layout_panel
 		name="media_play_position"
+		mouse_opaque="false"
 		auto_resize="true"
 		user_resize="false"
-		follows="left|right|top|bottom"
+		follows="left|right"
 		layout="topleft"
-		height="16"		
+		top="0"
+		height="22"
 		min_width="100"
 		width="200">
 	  <slider_bar
 		  name="media_play_slider"
 		  follows="left|right|top"
-		  height="20"
-		  bottom="88"
+		  top="0"
+		  height="22"
 		  increment="0.01"
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
-		  min_width="100"
 		  width="200">
 		<slider_bar.commit_callback
 			function="MediaCtrl.JumpProgress" />
@@ -327,12 +400,16 @@
 	</layout_panel>
 	<layout_panel
 		name="skip_back"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  name="skip_back_btn"
+		  follows="top"
 		  image_overlay="SkipBackward_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -343,7 +420,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Step back"
-		  top="-14"
+		  top="0"
 		  width="22"
 		  left="0">
 		<button.commit_callback
@@ -352,12 +429,16 @@
 	</layout_panel>
 	<layout_panel
 		name="skip_forward"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  name="skip_forward_btn"
+		  follows="top"
 		  image_overlay="SkipForward_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -367,8 +448,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Step forward"
-		  top="-14"
-		  min_width="22"
+		  top="0"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.SkipForward" />
@@ -376,30 +456,32 @@
 	</layout_panel>
 	<layout_panel
 		name="media_volume"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		top="-50"
+		top="0"
 		height="72"
 		min_width="22"
 		width="22">
 	  <!-- Note: this is not quite right either...the mute button is not the -->
 	  <!-- same as the others because it cannot have the "image_overlay" be  -->
 	  <!-- two different images.  -->
+	  <!-- Note also: the button and the slider must overlap! -->
 	  <button
+		  name="media_mute_button"
+		  follows="top"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="AudioMute_Off"
 		  image_unselected="Audio_Off"
 		  hover_glow_amount="0.15"
-		  name="media_mute_button"
-		  height="22"
 		  is_toggle="true"
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top="118"
-		  min_width="22"
+		  top="0"
+		  height="20"
 		  width="22" >
 		<button.commit_callback
 			function="MediaCtrl.ToggleMute" />
@@ -411,7 +493,7 @@
 	  <slider
 		  orientation="vertical"
 		  left="0"
-		  top="-2"
+		  top="16"
 		  height="50"
 		  layout="topleft"
 		  increment="0.01"
@@ -428,39 +510,29 @@
 			function="MediaCtrl.HideVolumeSlider" />
 	  </slider>
 	</layout_panel>
-	<panel
-		height="28"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-	  <icon
-		  height="26"
-		  image_name="media_panel_divider.png"
-		  layout="topleft"
-		  top="0"
-		  min_width="3"
-		  width="3" />
-	</panel>
 	<layout_panel
 		name="zoom_frame"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		height="28"
 		min_width="22"
 		width="22">
 	  <button
+		  name="zoom_frame_btn"
+		  follows="top"
 		  image_overlay="Zoom_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
 		  layout="topleft"
 		  tool_tip="Zoom into media"
-		  min_width="22"
 		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Zoom" />
@@ -468,18 +540,23 @@
 	</layout_panel>
 	<layout_panel
 		name="close"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="21"
 		width="21" >
 	  <button
+		  name="close_btn"
+		  follows="top"
 		  image_overlay="UnZoom_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
 		  image_selected="PushButton_Selected"
 		  image_unselected="PushButton_Off"
 		  hover_glow_amount="0.15"
+		  top="0"
 		  height="22"
 		  layout="topleft"
 		  tool_tip ="Zoom Back"
@@ -491,12 +568,16 @@
 	</layout_panel>
 	<layout_panel
 		name="new_window"
+		mouse_opaque="false"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+		top="0"
 		min_width="22"
 		width="22">
 	  <button
+		  name="new_window_btn"
+		  follows="top"
 		  image_overlay="ExternalBrowser_Off"
 		  image_disabled="PushButton_Disabled"
 		  image_disabled_selected="PushButton_Disabled"
@@ -506,8 +587,7 @@
 		  height="22"
 		  layout="topleft"
 		  tool_tip = "Open URL in browser"
-		  top_delta="-4"
-		  min_width="24"
+		  top="0"
 		  width="24" >
 		<button.commit_callback
 			function="MediaCtrl.Open" />
@@ -516,46 +596,17 @@
 	<!-- bookend panel -->
 	<layout_panel
 		name="right_bookend"
-		width="0"
-		layout="topleft"
-		user_resize="false" />
-  </layout_stack>
-  <layout_stack
-	  follows="left|right|bottom"
-	  height="20"
-	  layout="topleft"
-	  animate="false"
-	  left="0"
-	  orientation="horizontal"
-	  top="170">
-	<!-- outer layout_panels center the inner one -->
-	<layout_panel
-		width="0"
-		layout="topleft"
-		user_resize="false" />
-	<panel
-		name="media_progress_indicator"
-		height="20"
-		layout="topleft"
-		left="0"
+		mouse_opaque="false"
 		top="0"
-		auto_resize="false"
-		user_resize="false"
-		min_width="100"
-		width="200">
-	  <progress_bar
-		  name="media_progress_bar"
-		  color_bar="1 1 1 0.96"
-		  follows="left|right|top"
-		  top="5"
-		  height="8"
-		  layout="topleft"
-		  left="0"
-		  tool_tip="Media is Loading"/>
-	</panel>
-	<layout_panel
 		width="0"
 		layout="topleft"
 		user_resize="false" />
   </layout_stack>
+  <panel
+	  name="media_region"
+	  height="100"
+	  follows="left|right|top|bottom"
+	  layout="topleft"
+	  mouse_opaque="false"
+	  top="30" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 342cf4144f..812dc5ce59 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="535"
+ height="540"
  label="Profile"
  layout="topleft"
  left="0"
@@ -27,173 +27,182 @@
     <string
      name="no_partner_text"
      value="None" />
-    <string 
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
 	</string>
-  <scroll_container
-     color="DkGray2"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
      follows="all"
-     height="485"
      layout="topleft"
-     name="profile_scroll"
-     reserve_scroll_corner="true"
-     opaque="true"
+     left="0"
      top="0"
-     width="313">
-      <panel
-         name="scroll_content_panel"
-         follows="left|top|right"
-          height="485"
+     height="517"
+     width="313"
+     border_size="0">
+      <layout_panel
+         name="profile_stack"
+         follows="all"
          layout="topleft"
          top="0"
          left="0"
+         height="505"
          width="313">
-	 <panel
-         follows="left|top"
-         height="117"
+        <scroll_container
+         color="DkGray2"
+         follows="all"
          layout="topleft"
-         left="10"
-         name="second_life_image_panel"
-         top="0"
-         width="280">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="102"
+         left="0"
+         name="profile_scroll"
+         opaque="true"
+         height="505"
+         width="313"
+         top="0">
+          <panel
+                layout="topleft"
+          follows="left|top|right"
+                height="505"
+                name="profile_scroll_panel"
+                top="0"
+                left="0"
+                width="297">
+            <panel
+                  follows="left|top|right"
+                  height="117"
+                  layout="topleft"
+                  left="10"
+                  name="second_life_image_panel"
+                  top="0"
+                  width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="2nd_life_pic"
+               top="10"
+               width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_sl_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="[SECOND_LIFE]:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="sl_description_edit"
+               top_pad="-3"
+               width="185"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
+            <panel
+             follows="left|top|right"
+             height="117"
              layout="topleft"
-             left="0"
-             name="2nd_life_pic"
-             top="10"
-             width="102" />
+       top_pad="10"
+             left="10"
+             name="first_life_image_panel"
+             width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="117"
+               layout="topleft"
+               left="0"
+               name="real_world_pic"
+               width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_rw_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="Real World:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="fl_description_edit"
+               top_pad="-3"
+               width="185"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
             <text
-             follows="left|top|right"
-	     font.style="BOLD"
-             height="15"
+              follows="left|top"
+              height="15"
+        font.style="BOLD"
+        font="SansSerifMedium"
+              layout="topleft"
+              left="10"
+              name="homepage_edit"
+              top_pad="0"
+              value="http://librarianavengers.org"
+              width="300"
+              word_wrap="false"
+              use_ellipses="true"
+         />
+            <text
+             follows="left|top"
+           font.style="BOLD"
+             height="10"
              layout="topleft"
-             left_pad="10"
-             name="title_sl_descr_text"
+             left="10"
+             name="title_member_text"
              text_color="white"
-             top_delta="0"
-             value="[SECOND_LIFE]:"
-             width="165" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="sl_description_edit"
-             top_pad="-3"
-             width="173"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-            </expandable_text>
-        </panel>
-        <panel
-         follows="left|top"
-         height="117"
-         layout="topleft"
-	 top_pad="10"
-         left="10"
-         name="first_life_image_panel"
-         width="280">
-            <texture_picker
-             allow_no_texture="true"
-             default_image_name="None"
-             enabled="false"
-             follows="top|left"
-             height="102"
+             top_pad="10"
+             value="Resident Since:"
+             width="300" />
+            <text
+             follows="left|top"
+             height="15"
              layout="topleft"
-             left="0"
-             name="real_world_pic"
-             width="102" />
+             left="10"
+             name="register_date"
+             value="05/31/2376"
+             width="300"
+             word_wrap="true" />
             <text
-             follows="left|top|right"
-	     font.style="BOLD"
+             follows="left|top"
+       font.style="BOLD"
              height="15"
              layout="topleft"
-             left_pad="10"
-             name="title_rw_descr_text"
+             left="10"
+             name="title_acc_status_text"
              text_color="white"
-             top_delta="0"
-             value="Real World:"
-             width="165" />
-            <expandable_text
-             follows="left|top|right"
-             height="95"
-             layout="topleft"
-             left="107"
-             textbox.max_length="512"
-             name="fl_description_edit"
-             top_pad="-3"
-             width="173"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-                Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-            </expandable_text>
-        </panel>
-        <text
-         type="string"
-         follows="left|top"
-         font="SansSerifSmall"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="me_homepage_text"
-         text_color="white"
-         top_pad="0"
-         width="280">
-             Homepage:
-        </text>
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="homepage_edit"
-         top_pad="0"
-         value="http://librarianavengers.org"
-         width="280"
-         word_wrap="false"
-         use_ellipses="true"
-         />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="10"
-         name="title_member_text"
-         text_color="white"
-         top_pad="10"
-         value="Member Since:"
-         width="280" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="register_date"
-         value="05/31/1976"
-         width="280"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_acc_status_text"
-         text_color="white"
-         top_pad="10"
-         value="Account Status:"
-         width="280" />
-       <!-- <text
+             top_pad="5"
+             value="Account Status:"
+             width="300" />
+            <!-- <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
@@ -204,80 +213,82 @@
          top_delta="0"
 	 value="Go to Dashboard"
          width="100"/> -->
-        <text
-         follows="left|top"
-         height="20"
-         layout="topleft"
-         left="10"
-         name="acc_status_text"
-         top_pad="0"
-         value="Resident. No payment info on file."
-         width="280"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_partner_text"
-         text_color="white"
-         top_pad="5"
-         value="Partner:"
-         width="280" />
-        <panel
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="partner_data_panel"
-         top_pad="0"
-         width="280">
             <text
              follows="left|top"
-             height="10"
+             height="28"
              layout="topleft"
-             left="0"
-             name="partner_text"
-             top="0"
-             value="[FIRST] [LAST]"
-         width="280"
-             word_wrap="true" />
-         </panel>
-        <text
-         follows="left|top"
-	 font.style="BOLD"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_groups_text"
-         text_color="white"
-         top_pad="8"
-         value="Groups:"
-         width="280" />
-                     <expandable_text
-         follows="left|top|bottom"
-         height="60"
+             left="10"
+             name="acc_status_text"
+             top_pad="0"
+             width="300"
+             word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="title_partner_text"
+             text_color="white"
+             top_pad="3"
+             value="Partner:"
+             width="300" />
+            <panel
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="partner_data_panel"
+             top_pad="0"
+             width="300">
+              <name_box
+               follows="left|top"
+               height="10"
+               initial_value="(retrieving)"
+               layout="topleft"
+               left="0"
+               link="true"
+               name="partner_text"
+               top="0"
+           width="300"
+               word_wrap="true" />
+            </panel>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="3"
+             value="Groups:"
+             width="300" />
+            <expandable_text
+            follows="all"
+            height="113"
+            layout="topleft"
+            left="7"
+            name="sl_groups"
+            top_pad="0"
+            width="290"
+            expanded_bg_visible="true"
+            expanded_bg_color="DkGray">
+              Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
+            </expandable_text>
+          </panel>
+        </scroll_container>
+      </layout_panel>
+      <layout_panel
+              follows="bottom|left"
+         height="30"
          layout="topleft"
-         left="10"
-             name="sl_groups"
-       top_pad="0"
-         width="280"
-             expanded_bg_visible="true"
-             expanded_bg_color="DkGray">
-            Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-        </expandable_text>
-      </panel>
- </scroll_container>
- <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     name="profile_buttons_panel"
-     top_pad="2"
-     bottom="0"
-     height="19"
-     width="303">
+         name="profile_buttons_panel"
+         auto_resize="false" 
+         width="313">
         <button
          follows="bottom|left"
          height="23"
@@ -286,9 +297,9 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
-         width="77" />
+         width="80" />
         <button
          follows="bottom|left"
          height="23"
@@ -297,18 +308,18 @@
          name="im"
          tool_tip="Open instant message session"
          top="5"
-         left_pad="5"
-         width="33" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
          label="Call"
          layout="topleft"
          name="call"
-         tool_tip="Call this resident"
-         left_pad="5"
+         tool_tip="Call this Resident"
+         left_pad="3"
          top="5"
-         width="40" />
+         width="45" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -316,10 +327,10 @@
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
-         tool_tip="Show the resident on the map"
+         tool_tip="Show the Resident on the map"
          top="5"
-         left_pad="5"
-         width="44" />
+         left_pad="3"
+         width="45" />
         <button
          follows="bottom|left"
          height="23"
@@ -327,35 +338,36 @@
          layout="topleft"
          name="teleport"
          tool_tip="Offer teleport"
-         left_pad="5"
+         left_pad="3"
          top="5"
-         width="67" />
-        <button
+         width="85" />
+       <!-- <button
          follows="bottom|right"
          height="23"
          label="▼"
          layout="topleft"
          name="overflow_btn"
-         tool_tip="Pay money to or share inventory with the resident"
+         tool_tip="Pay money to or share inventory with the Resident"
          right="-1"
          top="5"
-         width="21" />
- </panel>
- <panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     top_pad="-17"
-     name="profile_me_buttons_panel"
-     visible="false"
-     height="19"
-     width="303">
+	 left_pad="3"
+         width="23" />-->
+        </layout_panel>
+      <layout_panel
+         follows="bottom|left"
+         height="30"
+         layout="topleft"
+         name="profile_me_buttons_panel"
+         visible="false"
+	       width="313">
         <button
          follows="bottom|right"
          height="23"
-         left="10"
+         left="20"
+         top="0"
          label="Edit Profile"
          name="edit_profile_btn"
+         tool_tip="Edit your personal information"
          width="130" />
         <button
          follows="bottom|right"
@@ -363,7 +375,9 @@
          label="Edit Appearance"
          left_pad="10"
          name="edit_appearance_btn"
-         right="-10"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
- </panel>
+        </layout_panel>
+    
+</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 6324ec2bd8..d46e1f9852 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -26,8 +26,8 @@
      top="2"
      width="23" />
     <text_editor
-      allow_scroll="false" 
-      bg_visible="false" 
+      allow_scroll="false"
+      bg_visible="false"
       read_only = "true"
       follows="top|left|right"
       font="SansSerifHugeBold"
@@ -55,12 +55,12 @@
      halign="center"
      layout="topleft"
      left="10"
-	 min_width="333"
+     min_width="333"
      name="tabs"
      tab_min_width="80"
      tab_height="30"
      tab_position="top"
-     top_pad="10"
+     top_pad="5"
      width="313">
         <panel
          class="panel_profile"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 18c2228906..727c5fb7b2 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -54,7 +54,7 @@
                      color="LoginProgressBoxCenterColor"
                      follows="left|right|bottom|top"
                      height="250"
-                     image_name="rounded_square.tga"
+                     image_name="Rounded_Square"
                      layout="topleft"
                      left="0"
                      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index ff55090f16..dc8f71c868 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -135,7 +135,8 @@
      left="120"
      name="covenant_help_text"
      top_pad="10"
-     width="460">
+     word_wrap="true"
+     width="360">
         Changes to the covenant will show on all parcels in the estate.
     </text>
     <text
@@ -145,9 +146,10 @@
      left_delta="0"
      name="covenant_instructions"
      top_pad="5"
-     width="465">
-        Drag and drop a notecard to change
-        the Covenant for this Estate.
+     word_wrap="true"
+     font.style="ITALIC"
+     width="360">
+        Drag and drop a notecard to change the Covenant for this estate.
     </text>
 
     <text
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 ba39e88024..3980eb86d3 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -19,9 +19,9 @@
      left="10"
      name="estate_help_text"
      top="14"
-     width="313">
-        Changes to settings on this tab will affect all
-regions in the estate.
+     word_wrap="true"
+     width="275">
+        Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
      type="string"
@@ -138,7 +138,7 @@ regions in the estate.
      name="Only Allow"
      top="250"
      width="278">
-        Restrict Access to Accounts Verified by:
+        Restrict Access to accounts verified by:
     </text>
     <check_box
      follows="top|left"
@@ -147,7 +147,7 @@ regions in the estate.
      layout="topleft"
      left_delta="0"
      name="limit_payment"
-     tool_tip="Ban unidentified residents"
+     tool_tip="Ban unidentified Residents"
      top_pad="2"
      width="278" />
     <check_box
@@ -157,7 +157,7 @@ regions in the estate.
      layout="topleft"
      left_delta="0"
      name="limit_age_verified"
-     tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+     tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
      top_pad="2"
      width="278" />
     <check_box
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 a4d24cb0fc..04dbf73be9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -136,7 +136,7 @@
      layout="topleft"
      left="10"
      name="height_text_lbl5"
-     top="186"
+     top="170"
      width="300">
         Texture Elevation Ranges
     </text>
@@ -146,7 +146,7 @@
      layout="topleft"
      left="51"
      name="height_text_lbl6"
-     top="201"
+     top="185"
      width="100">
         Southwest
     </text>
@@ -171,7 +171,7 @@
     max_val="500"
     min_val="-500"
     name="height_start_spin_0"
-    top_delta="20"
+    top_delta="15"
     width="100" />
   <spinner
    follows="left|top"
@@ -216,9 +216,9 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="10"
+     left="51"
      name="height_text_lbl8"
-     top_delta="0"
+     top_pad="10"
      width="100">
         Southeast
     </text>
@@ -243,7 +243,7 @@
        max_val="500"
        min_val="-500"
        name="height_start_spin_2"
-       top_delta="20"
+       top_delta="15"
        width="100" />
       <spinner
        follows="left|top"
@@ -291,9 +291,9 @@
        left="10"
        name="height_text_lbl10"
        top_delta="30"
-       width="270">
-        These values represent the blend range
-        for the textures above.
+       width="400"
+       word_wrap="true">
+        These values represent the blend range for the textures above.
       </text>
       <text
        follows="left|top"
@@ -302,11 +302,9 @@
        left_delta="0"
        name="height_text_lbl11"
        top_delta="32"
-       width="270">
-        Measured in meters, the LOW value
-        is the MAXIMUM height of Texture #1,
-        and the HIGH value is the MINIMUM
-        height of Texture #4.
+       width="400"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
       </text>
     <button
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 61f0fa3099..3f836a661d 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -12,13 +12,27 @@
 	appearance up to tray panel header word like "Home".
 	Embedded panels are inset by a pixel and so their
 	backgrounds will not block the world fully. -->
+
+  <sidetray_tab
+    name="sidebar_openclose"
+    help_topic="sidebar_openclose"
+    tab_title="Toggle Sidebar"
+    description="Toggle Sidebar."
+    image="TabIcon_Open_Off"
+	image_selected="TabIcon_Close_Off"
+    mouse_opaque="false"
+    background_visible="true"
+  >
+    <panel /> <!-- dummy panel, never to actually be seen -->
+  </sidetray_tab>
+
   <sidetray_tab
     name="sidebar_home"
     help_topic="sidebar_home"
     tab_title="Home"
     description="Home."
-    image="TabIcon_Open_Off"
-	image_selected="TabIcon_Close_Off"
+    image="TabIcon_Home_Off"
+    image_selected="TabIcon_Home_Selected"
     mouse_opaque="false"
     background_visible="true"
   >
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 1dd4eb095c..ab3cc036d5 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -4,7 +4,6 @@
  follows="all"
  height="570"
  min_height="350"
- label="home_tab"
  help_topic="sidetray_home"
  layout="topleft"
  top="0"
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 3578c4326d..7a6089c74e 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"
- follows="all"
+ follows="top|right"
  height="19"
  layout="topleft"
  left="0"
@@ -42,17 +42,37 @@
     <button
      auto_resize="true"
      halign="right"
+     font="SansSerifSmall"
+     follows="right|top"
+     image_overlay=""
+     image_selected="spacer35.tga"
+     image_unselected="spacer35.tga"
+     image_pressed="spacer35.tga"
+     height="16"
+     right="-228"
+     label_shadow="false"
+     name="buycurrency"
+     tool_tip="My Balance"
+     top="3"
+     width="100" />
+    <button
+     auto_resize="true"
+     halign="right"
+     font="SansSerifSmall"
      follows="right|top"
      image_selected="BuyArrow_Over"
-     image_unselected="BuyArrow_Off"
+     image_unselected="BuyArrow_Over"
      image_pressed="BuyArrow_Press"
      height="16"
-     right="-120"
-     name="buycurrency"
+     label="Buy L$"
+     label_color="EmphasisColor"
+     left_pad="0"
+     label_shadow="false"
+     name="buyL"
      pad_right="20px"
-     tool_tip="My Balance: Click to buy more L$"
-     top="0"
-     width="90" />
+     tool_tip="Click to buy more L$"
+     top="2"
+     width="100" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -60,29 +80,27 @@
      follows="right|bottom"
      halign="right"
      height="16"
-     top="4"
+     top="5"
      layout="topleft"
-     left_pad="-7"
+     left_pad="0"
      name="TimeText"
-     text_color="TimeTextColor"
      tool_tip="Current time (Pacific)"
-     width="80">
+     width="85">
         12:00 AM
     </text>
     <button
      follows="right|bottom"
-     height="16"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="15"
+     image_selected="AudioMute_Off"
+     image_pressed="Audio_Press"
+     image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="18"
-     top="1"
+     top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-
     <text
-     enabled="true"
      follows="right|bottom"
      halign="center"
      height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index ba2d61afb7..d198237e5d 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -39,7 +39,8 @@
    name="toast_text"
    word_wrap="true"
    text_color="white"
-   top="5" 
+   top="5"
+   v_pad="5" 
     use_ellipses="true"
    width="260">
     Toast text;
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..60d4a7e00b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="false"
+ border_visible="false"
+ border="false"
+ chrome="true" 
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+  <!-- floater background image -->
+  <icon
+   height="150"
+   image_name="Inspector_Background"
+   layout="topleft"
+   left="0"
+   name="normal_background"
+   top="0"
+   width="32" />
+ <slider
+  control_name="AudioLevelMaster"
+  follows="left|top"
+  left="0"
+  top="1"
+  orientation="vertical"
+  height="120"
+  increment="0.05"
+  initial_value="0.5"
+  layout="topleft"
+  name="mastervolume"
+  show_text="false"
+  slider_label.halign="right"
+  top_pad="2"
+  volume="true">
+  <slider.commit_callback
+   function="Vol.setControlFalse"
+   parameter="MuteAudio" />
+  </slider>
+  <button
+    left="7"
+    top_pad="9"
+    width="18"
+    height="12"
+    follows="top|left"
+    name="prefs_btn"
+    image_unselected="Icon_Gear_Foreground"
+    image_disabled="Icon_Gear_Background"
+    image_pressed="Icon_Gear_Press"
+    scale_image="false">
+    <button.commit_callback
+       function="Vol.GoAudioPrefs" />
+  </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 44248eedd5..fab1f11273 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -52,25 +52,25 @@ width="333">
       text_color="white"
       top="3"
       use_ellipses="true"
-      width="290"
+      width="305"
       follows="top|left"
       word_wrap="true"
       mouse_opaque="false"
       name="currentlook_name">
       MyOutfit With a really Long Name like MOOSE
       </text>
-      <!-- <text
-      text_color="LtGray_50"
-      width="290"
-      left="40"
+      <text
+      font="SansSerifSmall"
+      text_color="White_50"
+      width="300"
       height="1"
       follows="top|left"
       layout="topleft"
-      top_pad="-2"
+      top_pad="5"
       mouse_opaque="false"
       name="currentlook_title" >
-      (current outfit)
-      </text>-->
+      (unsaved)
+       </text>
    </panel>
    <filter_editor
    height="23"
@@ -80,18 +80,18 @@ width="333">
    label="Filter Outfits"
    max_length="300"
    name="Filter"
-   top_pad="0"
+   top_pad="10"
    width="303" />
    <panel
    class="panel_outfits_inventory"
    filename="panel_outfits_inventory.xml"
    name="panel_outfits_inventory"
-   height="515"
+   height="505"
    min_height="410"
    width="320"
+   left="0"
    top_pad="0"
-   follows="all"
-   />
+   follows="all" />
   <!--   <button
 	  follows="bottom|left"
 		height="23"
@@ -120,4 +120,3 @@ width="333">
    top="35"
    visible="false" />
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index b738e72423..fb5f9d2ec8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -28,12 +28,11 @@
 			 name="panel_main_inventory"
 			 top="0"
 			 label=""
-			 height="500"
+			 height="545"
 			 width="330" />
 		<panel
 			 height="25"
 			 layout="bottomright"
-			 help_topic="item_button_tab"
 			 name="button_panel"
 			 left="5"
 			 bottom="5"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 4a992dadd9..e18f59ab64 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -401,7 +401,6 @@ top_pad="10"
     <panel
 		 height="30"
 		 layout="bottomright"
-		 help_topic="button_tab"
 		 name="button_panel"
 		 left="5"
 		 bottom="2"
@@ -414,4 +413,4 @@ top_pad="10"
 		     right="-1"
 		     width="100" />
 	    </panel>
-	</panel>
\ No newline at end of file
+	</panel>
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 d26e855e2f..74f97dca4e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -153,28 +153,19 @@
 		     layout="topleft"
     		 left="5"
 		 name="CreatorNameLabel"
-		  top_pad="10"
+		  top_pad="12"
 		     width="78">
 	        Creator:
     	</text>
-	    	<avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-      top_delta="-6"
-     mouse_opaque="true"
-     width="20" />
 	    <text
 		     type="string"
-     follows="left|right"
+     follows="left|right|top"
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left_pad="5"
+     left_pad="0"
              name="Creator Name"
-		     top_delta="6"
+		     top_delta="0"
 		     width="140">
 	        Erica Linden
 	     </text>
@@ -186,28 +177,19 @@
 			layout="topleft"
 			left="5"
 			name="Owner:"
-			top_pad="10"
+			top_pad="15"
 			 width="78">
 			    Owner:
 	     </text>
-	     <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-	    top_delta="-6"
-	    mouse_opaque="true"
-     width="20" />
 	     <text
 			    type="string"
-			    follows="left|right"
+			    follows="left|right|top"
 			    font="SansSerifSmall"
 			    height="15"
 			    layout="topleft"
-			    left_pad="5"
+			    left_pad="0"
 			    name="Owner Name"
-			    top_delta="6"
+			    top_delta="0"
 			    width="140">
 			    Erica Linden
 	     </text>
@@ -219,7 +201,7 @@
 			 layout="topleft"
 			 left="5"
 			name="Group_label"
-			top_pad="10"
+			top_pad="15"
 			width="78">
 			    Group:
 	     </text>
@@ -536,7 +518,6 @@
     <panel
 		 height="25"
 		 layout="bottomright"
-		 help_topic="button_tab"
 		 name="button_panel"
 		 left="5"
 		 bottom="5"
@@ -569,4 +550,4 @@
 		     top="0"
 		     width="100" />
 	</panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 447901f984..b378944e48 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -8,6 +8,7 @@
 	<!-- Default Args - these arguments will be replaced in all strings -->
 	<string name="SECOND_LIFE">Second Life</string>
 	<string name="APP_NAME">Second Life</string>
+	<string name="CAPITALIZED_APP_NAME">SECOND LIFE</string>
 	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
 	<string name="SUPPORT_SITE">Second Life Support Portal</string>
 
@@ -66,7 +67,7 @@
 	<!-- tooltips for Urls -->
 	<string name="TooltipHttpUrl">Click to view this web page</string>
 	<string name="TooltipSLURL">Click to view this location's information</string>
-	<string name="TooltipAgentUrl">Click to view this resident's profile</string>
+	<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
 	<string name="TooltipGroupUrl">Click to view this group's description</string>
 	<string name="TooltipEventUrl">Click to view this event's description</string>
 	<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -1608,11 +1609,11 @@ Sends an HTTP request to the specified url with the body of the request and para
 	</string>
 	<string name="LSLTipText_llResetLandBanList" translate="false">
 llResetLandBanList()
-Removes all residents from the land ban list
+Removes all Residents from the land ban list
 	</string>
 	<string name="LSLTipText_llResetLandPassList" translate="false">
 llResetLandPassList()
-Removes all residents from the land access/pass list
+Removes all Residents from the land access/pass list
 	</string>
 	<string name="LSLTipText_llGetObjectPrimCount" translate="false">
 integer llGetObjectPrimCount(key object_id)
@@ -1620,7 +1621,7 @@ Returns the total number of prims for an object in the region
 	</string>
 	<string name="LSLTipText_llGetParcelPrimOwners" translate="false">
 list llGetParcelPrimOwners(vector pos)
-Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
 Requires owner-like permissions for the parcel.
 	</string>
 	<string name="LSLTipText_llGetParcelPrimCount" translate="false">
@@ -1807,7 +1808,7 @@ Clears (deletes) the media and all params from the given face.
 
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
-  <string name="FavoritesNoMatchingItems">Drag and drop a landmark here to add to your favorites.</string>
+  <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">
 		You do not have a copy of
 this texture in your inventory
@@ -2038,7 +2039,7 @@ this texture in your inventory
 	<string name="RegionInfoAllEstatesYouManage">
 		all estates that you manage for [OWNER]
 	</string>
-	<string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
+	<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
 	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
 
 	<!-- script limits floater -->
@@ -2109,7 +2110,7 @@ this texture in your inventory
 
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
-	<string name="MuteAgent">(resident)</string>
+	<string name="MuteAgent">(Resident)</string>
 	<string name="MuteObject">(object)</string>
 	<string name="MuteGroup">(group)</string>
 
@@ -2169,7 +2170,7 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
-  <string name="MuteObject">Block</string>
+  <string name="MuteObject2">Block</string>
   <string name="MuteAvatar">Block</string>
   <string name="UnmuteObject">Unblock</string>
   <string name="UnmuteAvatar">Unblock</string>
@@ -2936,7 +2937,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Click the [BUTTON NAME] button to accept/connect to this voice chat.
   </string>
   <string name="muted_message">
-    You have blocked this resident. Sending a message will automatically unblock them.
+    You have blocked this Resident. Sending a message will automatically unblock them.
   </string>
   <!--Some times string name is getting from the body of server response.
   For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index 8785dff2ae..ef885e8045 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chat_history
-	message_header="panel_chat_header.xml"
-    message_separator="panel_chat_separator.xml"
-    left_text_pad="10"
-	right_text_pad="15"
-    left_widget_pad="0"
-	right_widget_pad="10"
-	top_separator_pad="5"
-	bottom_separator_pad="5"
-	top_header_pad="17"
-	bottom_header_pad="10"
+  message_header="panel_chat_header.xml"
+  message_separator="panel_chat_separator.xml"
+  left_text_pad="10"
+  right_text_pad="15"
+  left_widget_pad="0"
+  right_widget_pad="10"
+  top_separator_pad="1"
+  bottom_separator_pad="1"
+  top_header_pad="12"
+  bottom_header_pad="5"
 	max_length="2147483647"
 	track_bottom="true"
 	name="chat_history"
 	type="string"
 	word_wrap="true"
+  line_spacing.multiple="1.0" 
   font="SansSerif">
   <more_chat_text
     mouse_opaque="true" 
     word_wrap="true"
     />
-</chat_history>
+</chat_history>
\ No newline at end of file
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 7cb973f4c8..e5cad0df2e 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
@@ -1,41 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
- font="SansSerif"
- height="25"
+ height="23"
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_adhoc.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_adhoc.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.avatar_icon
+     bottom="2"
      follows="left|top|bottom"
-     height="22"
+     height="19"
+     left="3"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22"/>
+     width="18" />
     <chiclet_im_adhoc.unread_notifications
-     font="SansSerif"
-     font_halign="center"
-     height="25"
+     halign="center"
+     height="23"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_IM"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index a9b567225e..70e4ea8d26 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,42 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
- font="SansSerif"
- height="25"
+ height="23"
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_group.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_group.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_group.group_icon
+     bottom="2"
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="22"
-     mouse_opaque="true"
+     height="18"
+     left="3"
+     mouse_opaque="false"
      name="group_icon"
-     width="22"/>
+     width="19" />
     <chiclet_im_group.unread_notifications
-     height="25"
-     font="SansSerif"
-     font_halign="center"
+     height="23"
+     halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_IM"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 9283594a4c..ec6500cf80 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,41 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
- font="SansSerif"
- height="25"
+ height="23"
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_p2p.chiclet_button 
+     height="23"
+     image_selected="PushButton_Selected"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_p2p.speaker
      auto_update="true"
      draw_border="false"
-     height="25"
+     height="23"
      left="25"
      name="speaker"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.avatar_icon
+     bottom="2"
      follows="left|top|bottom"
-     height="22"
-     mouse_opaque="true"
+     height="18"
+     left="3"
+     mouse_opaque="false"
      name="avatar_icon"
-     width="22"/>
+     width="19" />
     <chiclet_im_p2p.unread_notifications
-     height="25"
-     font="SansSerif"
-     font_halign="center"
+     height="23"
+     halign="center"
      left="25"
      mouse_opaque="false"
      name="unread"
      text_color="white"
-     v_pad="5"
+     v_pad="3"
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_IM"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_p2p>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 5a22563758..1bf9bc9e71 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
- font="SansSerif"
- height="25"
+ height="23"
  name="offer_chiclet"
  width="25">
+ <chiclet_offer.chiclet_button 
+  height="23"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_offer.icon
-  default_icon="Generic_Object_Small" 
+  bottom="2"
+  default_icon="Generic_Object_Small"
   follows="all"
-  height="22"
+  height="18"
+  left="3"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  width="19" />
  <chiclet_offer.new_message_icon
-  bottom="12"
-  height="13"
-  image_name="Unread_IM"
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_offer>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 05a23b95f9..38d9904d13 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- font="SansSerif"
- height="25"
+ height="23"
  name="script_chiclet"
  width="25">
+ <chiclet_script.chiclet_button 
+  height="23"
+  image_selected="PushButton_Selected"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_script.icon
+  bottom="2"
   follows="all"
-  height="22"
-  image_name="Generic_Object_Small" 
+  height="18"
+  image_name="Generic_Object_Small"
+  left="3"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  width="19"/>
  <chiclet_script.new_message_icon
-  bottom="12"
-  height="13"
-  image_name="Unread_IM"
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_script>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
new file mode 100644
index 0000000000..e6bdcccfdf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<folder_view_item
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
deleted file mode 100644
index 4229f34c09..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<gesture_combo_box
-           label="Gestures" 
-           list_position="below"
-           max_chars="20"
-           follows="right|top">
-  <gesture_combo_box.combo_button name="Combobox Button"
-                          label=""
-                          hover_glow_amount="0.15"
-                          scale_image="true"
-                          image_unselected="ComboButton_Off"
-                          image_selected="ComboButton_Selected"
-                          image_disabled="ComboButton_Disabled"
-                          image_disabled_selected="ComboButton_Disabled_Selected" />
-  <gesture_combo_box.drop_down_button name="Drop Down Button"
-                              label=""
-                              halign="center"
-                              hover_glow_amount="0.15"
-                              scale_image="true"
-                 image_selected="PushButton_Selected_Press"
-                 image_pressed="PushButton_Press"
-		 image_pressed_selected="PushButton_Selected_Press"
-                              image_unselected="PushButton_Off"
-                              image_disabled="PushButton_Disabled"
-                              image_disabled_selected="PushButton_Selected_Disabled" />
-  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
-                                scroll_bar_bg_visible="false" />
-  <gesture_combo_box.combo_editor name="Combo Text Entry"
-                          select_on_focus="true" />
-</gesture_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
new file mode 100644
index 0000000000..808683864d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<gesture_combo_list
+    follows="right|top">
+    <gesture_combo_list.combo_button
+     name="Combolist Button"
+     label=""
+     layout="topleft"
+     halign="center"
+     hover_glow_amount="0.15"
+     mouse_opaque="false"
+     scale_image="true"
+     image_selected="PushButton_Selected_Press"
+     image_pressed="PushButton_Press"
+     image_pressed_selected="PushButton_Selected_Press"
+     image_unselected="PushButton_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Selected_Disabled" />
+    <gesture_combo_list.combo_list 
+     bg_writeable_color="MenuDefaultBgColor"
+     scroll_bar_bg_visible="false" />
+</gesture_combo_list>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
new file mode 100644
index 0000000000..93875d66e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  bg_opaque_color="InventoryBackgroundColor"
+  background_visible="true"
+  background_opaque="true"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 1368c6826d..1c0a8ba7c5 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -3,15 +3,12 @@
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
 -->
-
-
-
 <location_input font="SansSerifSmall"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
-				add_landmark_hpad="12"
+		add_landmark_hpad="12"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -26,8 +23,8 @@
     name="Place Information"
     width="16"
     height="16"
-    left="4" 
-    top="20" 
+    left="6"
+    top="20"
                           follows="left|top"
                           hover_glow_amount="0.15"
                           image_unselected="Info_Off"
@@ -55,7 +52,7 @@
     top="21"
     />
   <voice_icon
-    enabled="true" 
+    enabled="true"
     name="voice_icon"
     width="22"
     height="18"
@@ -97,11 +94,12 @@
     />
   <damage_icon
     name="damage_icon"
-    width="20"
-    height="16"
-    top="20"
+    width="14"
+    height="13"
+    top="25"
+    left="2"
     follows="right|top"
-    image_name="Parcel_Damage_Light"
+    image_name="Parcel_Damage_Dark"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
@@ -114,17 +112,19 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-
-  <combo_button name="Location History"
-                          label=""
-                          pad_right="0"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+  <combo_button
+		name="Location History"
+                label=""
+                pad_right="0"/>
+  <combo_list
+	      bg_writeable_color="MenuDefaultBgColor"
+	      page_lines="10"
               scroll_bar_bg_visible="true" />
   <combo_editor name="Combo Text Entry"
-                text_pad_left="22"
+                text_pad_left="27"
                 select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-                border.border_thickness="0"/>
+                border.border_thickness="0" />
 </location_input>
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
index 53034afa61..58543338f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu bg_color="MenuDefaultBgColor"
       bg_visible="true"
-      drop_shadow="false"
+      drop_shadow="true"
       tear_off="false"
       shortcut_pad="15">
 </menu>
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index 4520768216..63166f32b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -15,4 +15,6 @@
              background_visible="true"
              heading_height="23"
              draw_border="false"
-             draw_heading="false" />
+             draw_heading="false"
+             border.name="dig border"
+             border.bevel_style="in" />
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 eb25493adc..1ecb813dd1 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -52,6 +52,9 @@
 	<text name="total_amount">
 		[AMT] L$
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=es-ES payment method] | [http://www.secondlife.com/my/account/currency.php?lang=es-ES currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=es-ES exchange rate]
+	</text>
 	<text name="purchase_warning_repurchase" right="-10">
 		Confirmando esta compra sólo compra la moneda.
 Tendrá que intentar de nuevo la operación.
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index e442d09e4d..33299f4cd4 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="A PROPOS DE [APP_NAME]">
+<floater name="floater_about" title="À PROPOS DE [APP_NAME]">
+	<floater.string name="AboutHeader">
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutCompiler">
+		Compilé avec [COMPILER] version [COMPILER_VERSION]
+	</floater.string>
+	<floater.string name="AboutPosition">
+		Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION] se trouvant à [HOSTNAME] ([HOSTIP])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU : [CPU]
+Mémoire : [MEMORY_MB] Mo
+Version OS : [OS_VERSION]
+Distributeur de cartes graphiques : [GRAPHICS_CARD_VENDOR]
+Cartes graphiques : [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Version Windows Graphics Driver : [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<floater.string name="AboutLibs">
+		Version OpenGL : [OPENGL_VERSION]
+
+Version libcurl : [LIBCURL_VERSION]
+Version J2C Decoder : [J2C_VERSION]
+Version Audio Driver : [AUDIO_DRIVER_VERSION]
+Version Qt Webkit : [QT_WEBKIT_VERSION]
+Version Vivox : [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		(aucun)
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		Paquets perdus : [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+	</floater.string>
 	<tab_container name="about_tab">
+		<panel label="Infos" name="support_panel">
+			<button label="Copier dans le presse-papiers" name="copy_btn"/>
+		</panel>
 		<panel label="Remerciements" name="credits_panel">
 			<text_editor name="credits_editor">
 				Second Life existe grâce aux efforts 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, 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 et de nombreuses autres personnes.
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 e2a567ff28..cf595edab9 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="À PROPOS DU TERRAIN">
+<floater name="floaterland" title="À PROPOS DES TERRAINS">
 	<floater.string name="Minutes">
 		[MINUTES] minutes
 	</floater.string>
@@ -9,6 +9,9 @@
 	<floater.string name="Seconds">
 		[SECONDS] secondes
 	</floater.string>
+	<floater.string name="Remaining">
+		restantes
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="Général" name="land_general_panel">
 			<panel.string name="new users only">
@@ -83,7 +86,7 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 			</text>
 			<text name="GroupText"/>
 			<button label="Définir..." label_selected="Définir..." name="Set..."/>
-			<check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier peut céder ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe."/>
+			<check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier du groupe peut céder ce terrain à ce groupe, afin qu&apos;il soit pris en charge par l&apos;allocation de terrains du groupe."/>
 			<button label="Céder..." label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné."/>
 			<check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu&apos;un terrain est cédé au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant."/>
 			<text name="For Sale:">
@@ -93,7 +96,7 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 				Pas à vendre
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
-				Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
+				Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
 			</text>
 			<text name="SalePending"/>
 			<button label="Vendre le terrain..." label_selected="Vendre le terrain..." name="Sell Land..."/>
@@ -117,7 +120,7 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 				Superficie :
 			</text>
 			<text name="PriceText">
-				4048 m²
+				4 048 m²
 			</text>
 			<text name="Traffic:">
 				Trafic :
@@ -282,7 +285,7 @@ ou divisé.
 				Permettre aux autres résidents de voir cette parcelle dans les résultats de recherche
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
-				Cette option est désactivée car la superficie de cette parcelle est inférieure ou égale à 128 m².
+				Cette option est désactivée car la superficie de cette parcelle est inférieure ou égale à 128 m².
 Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
@@ -373,11 +376,11 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				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="Libérer le lieu d&apos;arrivée."/>
+			<button bottom="-323" 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>
-			<combo_box bottom="-343" left="140" name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." width="140">
+			<combo_box bottom="-343" left="140" name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140">
 				<combo_box.item label="Bloqué" name="Blocked"/>
 				<combo_box.item label="Lieu d&apos;arrivée fixe" name="LandingPoint"/>
 				<combo_box.item label="Lieu d&apos;arrivée libre" name="Anywhere"/>
@@ -385,17 +388,17 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 		</panel>
 		<panel label="Médias" name="land_media_panel">
 			<text name="with media:" width="85">
-				Type :
+				Type :
 			</text>
 			<combo_box left="97" name="media type" tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre"/>
 			<text name="mime_type"/>
 			<text name="at URL:" width="85">
-				URL du domicile :
+				URL du domicile :
 			</text>
 			<line_editor left="97" name="media_url"/>
 			<button label="Définir..." label_selected="Définir..." name="set_media_url"/>
 			<text name="CurrentURL:">
-				URL actuelle :
+				URL actuelle :
 			</text>
 			<button label="Réinitialiser..." label_selected="Réinitialiser..." name="reset_media_url"/>
 			<check_box label="Masquer l&apos;URL" left="97" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML."/>
@@ -415,7 +418,7 @@ Sélectionnez l&apos;image miniature pour choisir une texture différente.
 			</text>
 			<check_box label="Échelle automatique" left="97" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement."/>
 			<text left="102" name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105">
-				Taille :
+				Taille :
 			</text>
 			<spinner left_delta="89" name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
 			<spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
@@ -423,20 +426,20 @@ Sélectionnez l&apos;image miniature pour choisir une texture différente.
 				pixels
 			</text>
 			<text name="Options:">
-				Options :
+				Options :
 			</text>
 			<check_box label="En boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
 		</panel>
 		<panel label="Audio" name="land_audio_panel">
 			<text name="MusicURL:">
-				URL de la musique :
+				URL de la musique :
 			</text>
 			<text name="Sound:">
-				Son :
+				Son :
 			</text>
 			<check_box label="Limiter les gestes et sons d&apos;objet à cette parcelle" name="check sound local"/>
 			<text name="Voice settings:">
-				Voix :
+				Voix :
 			</text>
 			<check_box label="Activer le chat vocal" name="parcel_enable_voice_channel"/>
 			<check_box label="Activer la voix (contrôlé par le domaine)" name="parcel_enable_voice_channel_is_estate_disabled"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml
new file mode 100644
index 0000000000..18e3d66bb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_activeim.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_activeim" title="IM ACTIVE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index a4ad14294e..e630208973 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -38,7 +38,7 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 		Impossible de trouver OFFSET.
 	</floater.string>
 	<floater.string name="E_ST_NO_CHANNELS">
-		Impossible se trouver les CHANNELS.
+		Impossible de trouver les CHANNELS.
 	</floater.string>
 	<floater.string name="E_ST_NO_ROTATION">
 		Impossible d&apos;obtenir l&apos;ordre de rotation.
@@ -95,7 +95,7 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 		Impossible de définir la valeur de la boucle
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossible de trouver les valeurs easeln.
+		Impossible de trouver les valeurs easeIn.
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_EASEOUT">
 		Impossible de trouver les valeurs easeOut.
@@ -112,16 +112,16 @@ La longueur maximale est de [MAX_LENGTH] secondes.
 	<text name="description_label">
 		Description :
 	</text>
-	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
-	<check_box label="Boucle" left="6" name="loop_check" tool_tip="Joue cette animation en boucle."/>
-	<spinner label="Début (%)" label_width="65" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart." width="105"/>
-	<spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l&apos;animation où la boucle finit."/>
+	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles autres animations peuvent être remplacées par cette animation"/>
+	<check_box label="Boucle" left="6" name="loop_check" tool_tip="Lit cette animation en boucle"/>
+	<spinner label="Début (%)" label_width="65" name="loop_in_point" tool_tip="Définit un point de l&apos;animation auquel retourne la boucle" width="105"/>
+	<spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit un point de l&apos;animation qui met fin à la boucle"/>
 	<text name="hand_label">
 		Mouvement de
 main
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation">
-		<combo_box.item label="Doigts écartés" name="Spread"/>
+	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle ce que font les mains pendant l&apos;animation">
+		<combo_box.item label="Espacement" name="Spread"/>
 		<combo_box.item label="Détendues" name="Relaxed"/>
 		<combo_box.item label="Pointer (les deux)" name="PointBoth"/>
 		<combo_box.item label="Poing" name="Fist"/>
@@ -138,8 +138,8 @@ main
 	<text name="emote_label">
 		Expression
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation.">
-		<combo_box.item label="None]" name="[None]"/>
+	<combo_box label="" name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l&apos;animation">
+		<combo_box.item label="(aucun)" name="[None]"/>
 		<combo_box.item label="Aaaaah" name="Aaaaah"/>
 		<combo_box.item label="Effrayé" name="Afraid"/>
 		<combo_box.item label="En colère" name="Angry"/>
@@ -166,13 +166,13 @@ pendant
 	</text>
 	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
 		<combo_box.item label="Debout" name="Standing"/>
-		<combo_box.item label="En train de marcher" name="Walking"/>
+		<combo_box.item label="Marche" name="Walking"/>
 		<combo_box.item label="Assis" name="Sitting"/>
-		<combo_box.item label="En train de voler" name="Flying"/>
+		<combo_box.item label="Vol" name="Flying"/>
 	</combo_box>
-	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
-	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement." />
-	<button label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation."/>
+	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l&apos;entrée en fondu de l&apos;animation"/>
+	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l&apos;animation"/>
+	<button label="" name="play_btn" tool_tip="Lire/pauser votre animation"/>
 	<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 3ec95a60c5..6cef2a3591 100644
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="COMMENCER LA VENTE DE TERRAIN LINDEN">
-	<check_box label="Inclure le marquage de sélection jaune" name="fence_check" />
-	<combo_box name="saletype_combo">
-		<combo_box.item name="Auction" label="Enchères" />
-		<combo_box.item name="FirstLand" label="Premier terrain" />
-	</combo_box>
-	<button label="Capture d&apos;écran" label_selected="Capture d&apos;écran"
-	     name="snapshot_btn" width="110" />
-	<button label="OK" label_selected="OK" name="ok_btn" left_delta="114"/>
-	<text name="already for sale">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="COMMENCER LA VENTE DE TERRAINS LINDEN">
+	<floater.string name="already for sale">
 		Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
-	</text>
+	</floater.string>
+	<check_box initial_value="true" label="Inclure le marquage de sélection jaune" name="fence_check"/>
+	<button label="Capture d&apos;écran" label_selected="Capture d&apos;écran" name="snapshot_btn" width="110"/>
+	<button label="Vendre à n&apos;importe qui" label_selected="Vendre à n&apos;importe qui" name="sell_to_anyone_btn"/>
+	<button label="Effacer les paramètres" label_selected="Effacer les paramètres" name="reset_parcel_btn"/>
+	<button label="Commencer les enchères" label_selected="Commencer les enchères" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index 7ff2b6b425..e784bda2e5 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="CHOISIR LE RÉSIDENT">
+<floater name="avatarpicker" title="CHOISIR UN RÉSIDENT">
+	<floater.string name="not_found">
+		&apos;[TEXT]&apos; introuvable
+	</floater.string>
+	<floater.string name="no_one_near">
+		Personne près de vous
+	</floater.string>
+	<floater.string name="no_results">
+		Aucun résultat
+	</floater.string>
+	<floater.string name="searching">
+		Recherche...
+	</floater.string>
+	<string label="OK" label_selected="OK" name="Select">
+		Sélectionner
+	</string>
+	<string name="Close">
+		Fermer
+	</string>
 	<tab_container name="ResidentChooserTabs">
 		<panel label="Rechercher" name="SearchPanel">
 			<text name="InstructSearchResidentName">
@@ -7,35 +25,23 @@
 			</text>
 			<button label="OK" label_selected="OK" name="Find"/>
 		</panel>
-		<panel label="Cartes de visite" name="CallingCardsPanel">
-			<text name="InstructSelectCallingCard">
-				Sélectionnez une carte de visite :
+		<panel label="Amis" name="FriendsPanel">
+			<text name="InstructSelectFriend">
+				Sélectionner une personne :
 			</text>
 		</panel>
 		<panel label="Près de moi" name="NearMePanel">
 			<text name="InstructSelectResident">
-				Sélectionner une personne près de vous :
+				Sélectionner une personne près de vous :
 			</text>
-			<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" left_delta="10" name="Refresh" width="105"/>
 			<slider bottom_delta="-36" label="Distance" name="near_me_range"/>
 			<text name="meters">
 				mètres
 			</text>
+			<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" left_delta="10" name="Refresh" width="105"/>
 			<scroll_list bottom_delta="-169" height="159" name="NearMe"/>
 		</panel>
 	</tab_container>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<string name="not_found">
-		&apos;[TEXT]&apos; introuvable
-	</string>
-	<string name="no_one_near">
-		Il n&apos;y a personne près de vous
-	</string>
-	<string name="no_results">
-		Aucun résultat
-	</string>
-	<string name="searching">
-		Recherche...
-	</string>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index 569126f3ec..142e13640a 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="TEXTURES DE L&apos;AVATAR">
+<floater name="avatar_texture_debug" title="TEXTURES DES AVATARS">
+	<floater.string name="InvalidAvatar">
+		AVATAR NON VALIDE
+	</floater.string>
 	<text name="label">
 		Textures fixées
 	</text>
 	<text name="composite_label">
 		Textures composées
 	</text>
-	<button label="Vider ces ID dans la console" label_selected="Vider" name="Dump" left="-185" width="175"/>
+	<button label="Vider ces ID dans la console" label_selected="Vider" left="-185" name="Dump" width="175"/>
 	<texture_picker label="Cheveux" name="hair-baked"/>
-	<texture_picker label="Cheveux" name="hair"/>
+	<texture_picker label="Cheveux" name="hair_grain"/>
+	<texture_picker label="Alpha cheveux" name="hair_alpha"/>
 	<texture_picker label="Tête" name="head-baked"/>
-	<texture_picker label="Maquillage" name="head bodypaint"/>
+	<texture_picker label="Maquillage" name="head_bodypaint"/>
+	<texture_picker label="Alpha tête" name="head_alpha"/>
+	<texture_picker label="Tatouage tête" name="head_tattoo"/>
 	<texture_picker label="Yeux" name="eyes-baked"/>
-	<texture_picker label="Œil" name="iris"/>
+	<texture_picker label="Œil" name="eyes_iris"/>
+	<texture_picker label="Alpha yeux" name="eyes_alpha"/>
 	<texture_picker label="Haut du corps" name="upper-baked"/>
-	<texture_picker label="Tatouage (haut du corps)" name="upper bodypaint"/>
-	<texture_picker label="Tricot" name="undershirt"/>
-	<texture_picker label="Gants" name="gloves"/>
-	<texture_picker label="Chemise" name="shirt"/>
-	<texture_picker label="Veste (haut)" name="upper jacket"/>
+	<texture_picker label="Peinture corporelle haut" name="upper_bodypaint"/>
+	<texture_picker label="Sous-vêtements (homme)" name="upper_undershirt"/>
+	<texture_picker label="Gants" name="upper_gloves"/>
+	<texture_picker label="Chemise" name="upper_shirt"/>
+	<texture_picker label="Veste (haut)" name="upper_jacket"/>
+	<texture_picker label="Alpha haut" name="upper_alpha"/>
+	<texture_picker label="Tatouage haut" name="upper_tattoo"/>
 	<texture_picker label="Bas du corps" name="lower-baked"/>
-	<texture_picker label="Tatouage (bas du corps)" name="lower bodypaint"/>
-	<texture_picker label="Sous-vêtements" name="underpants"/>
-	<texture_picker label="Chaussettes" name="socks"/>
-	<texture_picker label="Chaussures" name="shoes"/>
-	<texture_picker label="Pantalon" name="pants"/>
-	<texture_picker label="Veste" name="lower jacket"/>
+	<texture_picker label="Peinture corporelle bas" name="lower_bodypaint"/>
+	<texture_picker label="Sous-vêtements (femme)" name="lower_underpants"/>
+	<texture_picker label="Chaussettes" name="lower_socks"/>
+	<texture_picker label="Chaussures" name="lower_shoes"/>
+	<texture_picker label="Pantalon" name="lower_pants"/>
+	<texture_picker label="Veste" name="lower_jacket"/>
+	<texture_picker label="Alpha bas" name="lower_alpha"/>
+	<texture_picker label="Tatouage bas" name="lower_tattoo"/>
 	<texture_picker label="Jupe" name="skirt-baked"/>
 	<texture_picker label="Jupe" name="skirt"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
index fd9cd057e9..778d92793b 100644
--- a/indra/newview/skins/default/xui/fr/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml
@@ -2,15 +2,15 @@
 <floater name="beacons" title="BALISES">
 	<panel name="beacons_panel">
 		<text name="label_show">
-			Afficher :
+			Afficher :
 		</text>
 		<check_box label="Balises" name="beacons"/>
 		<check_box label="Surbrillances" name="highlights"/>
 		<text name="beacon_width_label" tool_tip="Largeur de la balise">
-			Largeur :
+			Largeur :
 		</text>
 		<text name="label_objects">
-			Pour ces objets :
+			Pour ces objets :
 		</text>
 		<check_box label="Physique" name="physical"/>
 		<check_box label="Scripté" name="scripted"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index 997ca9d27b..cad00ea866 100644
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
@@ -5,7 +5,7 @@
 	<check_box label="Fixation des sous-unités" name="GridSubUnit"/>
 	<check_box label="Afficher les sections transversales" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacité de la grille">
-		Opacité :
+		Opacité :
 	</text>
 	<slider label="Opacité de la grille" name="GridOpacity"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
index b2cef62e24..ad3872587c 100644
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="Modifier les droits relatifs au contenu">
+<floater name="floaterbulkperms" title="MODIFIER LES DROITS RELATIFS AU CONTENU">
 	<floater.string name="nothing_to_modify_text">
 		La sélection contient des contenus non modifiables.
 	</floater.string>
@@ -29,25 +29,26 @@
 	<check_box label="Sons" name="check_sound"/>
 	<icon name="icon_sound" tool_tip="Sons"/>
 	<check_box label="Textures" name="check_texture"/>
+	<icon name="icon_texture" tool_tip="Textures"/>
 	<button label="√ Tout" label_selected="Tout" name="check_all"/>
 	<button label="Effacer" label_selected="Aucun" name="check_none"/>
 	<text name="newperms">
 		Nouvelles permissions relatives au contenu
 	</text>
 	<text name="GroupLabel">
-		Groupe :
+		Groupe :
 	</text>
 	<check_box label="Partager" name="share_with_group"/>
 	<text name="AnyoneLabel">
-		N&apos;importe qui :
+		N&apos;importe qui :
 	</text>
 	<check_box label="Copier" name="everyone_copy"/>
 	<text name="NextOwnerLabel">
-		Le prochain propriétaire :
+		Le prochain propriétaire :
 	</text>
 	<check_box label="Modifier" name="next_owner_modify"/>
 	<check_box label="Copier" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transférer" name="next_owner_transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
-	<button label="OK" name="apply"/>
+	<button label="Ok" name="apply"/>
 	<button label="Annuler" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
index e439c30524..34b33bbd6b 100644
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="COLLISIONS, COUPS ET BOUSCULADES">
-	<text name="none_detected">
+	<floater.string name="none_detected">
 		Aucun détecté
-	</text>
-	<text name="bump">
+	</floater.string>
+	<floater.string name="bump">
 		[TIME]  [FIRST] [LAST] est entré en collision avec vous
-	</text>
-	<text name="llpushobject">
+	</floater.string>
+	<floater.string name="llpushobject">
 		[TIME]  [FIRST] [LAST] vous a bousculé avec un script
-	</text>
-	<text name="selected_object_collide">
+	</floater.string>
+	<floater.string name="selected_object_collide">
 		[TIME]  [FIRST] [LAST] vous a donné un coup avec un objet
-	</text>
-	<text name="scripted_object_collide">
+	</floater.string>
+	<floater.string name="scripted_object_collide">
 		[TIME]  [FIRST] [LAST] vous a donné un coup avec un objet scripté
-	</text>
-	<text name="physical_object_collide">
+	</floater.string>
+	<floater.string name="physical_object_collide">
 		[TIME]  [FIRST] [LAST] vous a donné un coup avec un objet physique
-	</text>
+	</floater.string>
+	<floater.string name="timeStr">
+		[[hour,datetime,slt]:[min,datetime,slt]]
+	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index e8b47f5365..7aa142b13e 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="ACHETER CE CONTENU">
+<floater name="floater_buy_contents" title="ACHETER DES CONTENUS">
 	<text name="contains_text">
 		[NAME] contient :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 603b7587b4..5d3a2e6312 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -1,69 +1,66 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy currency" title="ACHETER DES L$">
-	<text left="5" name="info_buying">
-		Achat de L$ :
-	</text>
-	<text left="5" name="info_cannot_buy" right="-5">
-		Impossible d&apos;acheter maintenant :
-	</text>
+	<floater.string name="buy_currency">
+		Achetez [LINDENS] L$ pour environ [LOCALAMOUNT]
+	</floater.string>
 	<text left="5" name="info_need_more" right="-5">
-		Vous avez besoin de plus de devises:
+		Vous avez besoin de plus de L$
 	</text>
-	<text name="error_message">
-		Quelque chose ne va pas.
-	</text>
-	<button label="Aller sur le site" name="error_web"/>
 	<text name="contacting">
 		En train de contacter le Lindex...
 	</text>
-	<text name="buy_action_unknown" right="-5">
-		Acheter des L$ sur le marché du LindeX
+	<text left="5" name="info_buying">
+		Acheter des L$
 	</text>
-	<text name="buy_action">
-		[NAME] L$ [PRICE]
+	<text name="balance_label">
+		J&apos;ai
+	</text>
+	<text name="balance_amount">
+		[AMT] L$
 	</text>
 	<text name="currency_action">
-		Acheter 
+		Je veux acheter
 	</text>
-	<line_editor name="currency_amt" width="65">
+	<text name="currency_label">
+		L$
+	</text>
+	<line_editor label="L$" name="currency_amt" width="65">
 		1234
 	</line_editor>
-	<text name="currency_est" width="138" left_delta="68">
-		pour environ [LOCALAMOUNT]
-	</text>
-	<text name="getting_data" width="138">
-		Obtention des données...
+	<text name="buying_label">
+		Pour le prix
 	</text>
-	<text name="balance_label">
-		Actuellement, vous avez
+	<text left_delta="68" name="currency_est" width="138">
+		environ [LOCALAMOUNT]
 	</text>
-	<text name="balance_amount">
-		[AMT] L$
-	</text>
-	<text name="buying_label">
-		Vous achetez
+	<text name="getting_data" width="138">
+		Estimation en cours...
 	</text>
-	<text name="buying_amount">
-		[AMT] L$
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
 	</text>
 	<text name="total_label">
-		Votre solde sera de
+		Mon nouveau solde sera de
 	</text>
 	<text name="total_amount">
 		[AMT] L$
 	</text>
-	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
-		En confirmant cette transaction, vous achetez
-uniquement les devises. Vous devrez recommencer
-cette opération.
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=fr-FR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=fr-FR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=fr-FR exchange rate]
+	</text>
+	<text name="exchange_rate_note">
+		Saisissez à nouveau le montant pour voir le taux de change actuel.
 	</text>
-	<text name="purchase_warning_notenough" bottom_delta="16">
-		Vous n&apos;achetez pas assez de devises.
-Veuillez saisir un montant plus élevé.
+	<text name="purchase_warning_repurchase">
+		La confirmation de cet achat n&apos;achète que des L$, pas l&apos;objet.
 	</text>
-	<button label="Acheter" name="buy_btn"/>
+	<text bottom_delta="16" name="purchase_warning_notenough">
+		Vous n&apos;achetez pas assez de L$. Veuillez augmenter le montant.
+	</text>
+	<button label="Acheter maintenant" name="buy_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
-	<string name="buy_currency">
-		Acheter [LINDENS] L$ pour environ [LOCALAMOUNT]
-	</string>
+	<text left="5" name="info_cannot_buy" right="-5">
+		Achat impossible
+	</text>
+	<button label="Accéder au Web" name="error_web"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 2b93098847..1d7eeca3c4 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="ACHETER LE TERRAIN">
+<floater name="buy land" title="ACHETER DU TERRAIN">
 	<text name="region_name_label">
 		Région :
 	</text>
@@ -51,15 +51,15 @@
 		Taille :
 	</text>
 	<text name="info_size">
-		1024 m²
+		1 024 m²
 	</text>
 	<text name="info_price_label">
 		Prix :
 	</text>
 	<text name="info_price">
 		1500 L$
-		(1,1 L$/m²)
-		vendu avec objets
+(1,1 L$/m²)
+vendu avec objets
 	</text>
 	<text name="info_action" width="380">
 		Si vous achetez ce terrain :
@@ -75,15 +75,15 @@
 		Seuls les membres Premium peuvent posséder du terrain.
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly" label="9,95 US$/mois, facturation mensuelle"/>
-		<combo_box.item name="US$7.50/month,billedquarterly" label="7,50 US$/mois, facturation trimestrielle"/>
-		<combo_box.item name="US$6.00/month,billedannually" label="6,00 US$/mois, facturation annuelle"/>
+		<combo_box.item label="9,95 US$/mois, facturation mensuelle" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="7,50 US$/mois, facturation trimestrielle" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="6,00 US$/mois, facturation annuelle" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
 		Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
 	</text>
 	<text name="land_use_reason">
-		Vous êtes propriétaire de 1 309 m² de terrain. 
+		Vous détenez 1 309 m² de terrain.
 Cette parcelle fait 512 m².
 	</text>
 	<text name="purchase_action">
@@ -99,12 +99,12 @@ Cette parcelle fait 512 m².
 		1000
 	</line_editor>
 	<text name="currency_est">
-		pour environ [AMOUNT2] US$
+		pour environ [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
 		Vous avez 2 100 L$.
 	</text>
-	<check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe." name="remove_contribution"/>
+	<check_box label="Enlever [AMOUNT] m² de contribution du groupe." name="remove_contribution"/>
 	<button label="Acheter" name="buy_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
 	<string name="can_resell">
@@ -181,26 +181,26 @@ Sélectionnez une zone plus petite.
 		Avec votre compte, vous pouvez posséder du terrain.
 	</string>
 	<string name="land_holdings">
-		Vous possédez un terrain de [BUYER] m².
+		Vous détenez [BUYER] m² de terrain.
 	</string>
 	<string name="pay_to_for_land">
 		Payez [AMOUNT] L$ à [SELLER] pour ce terrain
 	</string>
 	<string name="buy_for_US">
-		Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
+		Achetez [AMOUNT] L$ pour environ [LOCAL_AMOUNT],
 	</string>
 	<string name="parcel_meters">
-		Cette parcelle fait [AMOUNT] m².
+		Cette parcelle fait [AMOUNT] m²
 	</string>
 	<string name="premium_land">
-		Ce terrain est premium et les frais associés sont ceux d&apos;un terrain de [AMOUNT] m².
+		C&apos;est un terrain premium, [AMOUNT] m².
 	</string>
 	<string name="discounted_land">
-		Ce terrain est en solde et les frais associés sont ceux d&apos;un terrain de [AMOUNT] m².
+		Ce terrain est en solde, [AMOUNT] m².
 	</string>
 	<string name="meters_supports_object">
 		[AMOUNT] m²
-peuvent contenir [AMOUNT2] prims
+prend en charge [AMOUNT2] objets
 	</string>
 	<string name="sold_with_objects">
 		vendu avec objets
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 0bfc4e90e5..bd29f27cbc 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="ACHETER UNE COPIE DE L&apos;OBJET">
 	<text name="contents_text">
-		Contient :
+		Contient :
 	</text>
 	<text name="buy_text">
 		Acheter pour [AMOUNT] L$ à [NAME] ?
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index b2a280d854..309c93cf3b 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -11,12 +11,20 @@
 	</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"/>
-		<joystick_zoom name="zoom" tool_tip="Zoomer en direction du point central"/>
+		<panel name="zoom" tool_tip="Zoomer en direction du point central">
+			<slider_bar name="zoom_slider" tool_tip="Zoomer en direction du point central"/>
+		</panel>
 		<joystick_rotate name="cam_rotate_stick" tool_tip="Faire tourner la caméra autour du point central"/>
+		<panel name="camera_presets">
+			<button name="rear_view" tool_tip="Vue arrière"/>
+			<button name="group_view" tool_tip="Vue Groupe"/>
+			<button name="front_view" tool_tip="Vue frontale"/>
+			<button name="mouselook_view" tool_tip="Vue subjective"/>
+		</panel>
 	</panel>
 	<panel name="buttons">
 		<button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/>
-		<button label="" name="pan_btn" tool_tip="Vue panoramique"/>
+		<button label="" name="pan_btn" tool_tip="Faire un panoramique"/>
 		<button label="" name="avatarview_btn" tool_tip="Vue subjective"/>
 		<button label="" name="freecamera_btn" tool_tip="Voir l&apos;objet"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
index 15cdd4d332..b73bedd7b5 100644
--- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="GROUPES">
 	<text name="groupdesc">
 		Choisissez un groupe :
 	</text>
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index 8ce6574421..0ad6a69d75 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="CHOIX DE TEXTURE ET DE COULEUR">
+<floater name="ColorPicker" title="SÉLECTEUR DE COULEURS">
 	<text name="r_val_text">
 		Rouge :
 	</text>
@@ -21,12 +21,11 @@
 	<check_box label="Appliquer maintenant" left="4" name="apply_immediate" width="108"/>
 	<button label="" label_selected="" left_delta="138" name="color_pipette"/>
 	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
-	<button label="OK" label_selected="Sélectionner" name="select_btn"/>
+	<button label="Ok" label_selected="Ok" name="select_btn"/>
 	<text left="8" name="Current color:">
 		Couleur actuelle :
 	</text>
 	<text left="8" name="(Drag below to save.)" width="114">
-		(Faire glisser dessous
-pour enregistrer)
+		(Faire glisser dessous pour enregistrer.)
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index bf70c5415e..ccffb3f84a 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -14,8 +14,8 @@
 			<button label="Torse" label_selected="Torse" name="Torso"/>
 			<button label="Jambes" label_selected="Jambes" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item name="radio" label="Femme"/>
-				<radio_item name="radio2" label="Homme"/>
+				<radio_item label="Femme" name="radio"/>
+				<radio_item label="Homme" name="radio2"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -154,10 +154,10 @@ votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
 			<button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/>
 			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
 		</panel>
-		<panel label="Habits" name="clothes_placeholder"/>
+		<placeholder label="Habits" name="clothes_placeholder"/>
 		<panel label="Chemise" name="Shirt">
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -191,7 +191,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porte
 		</panel>
 		<panel label="Pantalon" name="Pants">
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -251,8 +251,8 @@ nouvelle paire et la porter.
 				Chaussures :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
-			<button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
+			<button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
 			<button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/>
@@ -286,7 +286,7 @@ nouvelle paire et la porter.
 				Chaussettes :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -321,7 +321,7 @@ jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porte
 			</text>
 			<texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
 			<texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="81"/>
 			<button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -355,7 +355,7 @@ inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
 				Gants :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -385,12 +385,12 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			<text name="no modify instructions">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<text name="Item Action Label" right="92" bottom="-470">
+			<text bottom="-470" name="Item Action Label" right="92">
 				Sous-vêtements
 (haut) :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -420,12 +420,12 @@ votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			<text name="no modify instructions">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<text name="Item Action Label" right="92" bottom="-470">
+			<text bottom="-470" name="Item Action Label" right="92">
 				Sous-vêtements
 (bas) :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
@@ -459,16 +459,88 @@ inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
 				Jupe :
 			</text>
 			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
 			<button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
 			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
 			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
 			<button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/>
 			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
 		</panel>
+		<panel label="Alpha" name="Alpha">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: en cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: non porté
+			</text>
+			<text name="path">
+				Dans [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer de masque alpha, faites-en glisser un de votre inventaire à votre avatar.
+Vous pouvez aussi en créer un nouveau et le porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n&apos;avez pas le droit de modifier cet objet.
+			</text>
+			<text name="Item Action Label">
+				Alpha :
+			</text>
+			<texture_picker label="Alpha bas" name="Lower Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+			<button label="Créer un nouvel alpha" label_selected="Créer un nouvel alpha" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
+			<button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
+			<button label="Annuler modification" label_selected="Annuler modification" name="Revert"/>
+		</panel>
+		<panel label="Tatouage" name="Tattoo">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: en cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: non porté
+			</text>
+			<text name="path">
+				Dans [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer de tatouage, faites-en glisser un de votre inventaire à votre avatar.
+Vous pouvez aussi en créer un nouveau et le porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n&apos;avez pas le droit de modifier cet objet.
+			</text>
+			<text name="Item Action Label">
+				Tatouage :
+			</text>
+			<texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+			<button label="Créer un nouveau tatouage" label_selected="Créer un nouveau tatouage" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
+			<button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
+			<button label="Annuler modification" label_selected="Annuler modification" name="Revert"/>
+		</panel>
 	</tab_container>
 	<scroll_container left="251" name="panel_container"/>
+	<button label="Créer tenue" label_selected="Créer une tenue..." name="make_outfit_btn"/>
 	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="Créer un ensemble..." label_selected="Créer un ensemble..." name="Make Outfit" left="152" width="125"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_device_settings.xml b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
index 5374b4e593..f5994cb604 100644
--- a/indra/newview/skins/default/xui/fr/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
@@ -1,3 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings"
-     title="PARAMÈTRES DU MATÉRIEL UTILISÉ POUR LE CHAT VOCAL" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_device_settings" title="PARAMÈTRES DU MATÉRIEL UTILISÉ POUR LE CHAT VOCAL"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index 7d6de114be..505c9236c7 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="ÉDITEUR D&apos;ENVIRONNEMENT">
+	<floater.string name="timeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</floater.string>
 	<text bottom="-45" name="EnvTimeText">
 		Heure de la
 journée
@@ -15,13 +18,12 @@ nuageuse
 		Couleur de
 l&apos;eau
 	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+	<color_swatch name="EnvWaterColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 	<text name="EnvWaterFogText">
 		Brouillard
 dans l&apos;eau
 	</text>
 	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
-	<button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
-	<button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
-	<button label="?" name="EnvSettingsHelpButton"/>
+	<button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/>
+	<button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_first_time_tip.xml b/indra/newview/skins/default/xui/fr/floater_first_time_tip.xml
new file mode 100644
index 0000000000..a1c6a19e8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_first_time_tip.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="set_name_in_the_cladd">
+	<check_box label="Désactiver les astuces" name="DontShowFirstTimeTip_checkbox"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
index 3a32e8adc5..974a5ca3a2 100644
--- a/indra/newview/skins/default/xui/fr/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="TEST DE LA POLICE">
+<floater name="contents" title="TEST DE POLICE">
 	<text name="linea">
 		OverrideTest, Times-BOLD doit être sélectionné ici. (De default/xui/fr)
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index b3026478ff..113df0acc4 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -1,18 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="GESTES UTILISÉS">
-	<text name="help_label">
-		Double-cliquez sur un geste pour jouer les animations
-et les sons.
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Lieux" name="gestures" title="GESTES">
+	<floater.string name="loading">
+		Chargement...
+	</floater.string>
+	<floater.string name="playing">
+		(lecture en cours)
+	</floater.string>
+	<floater.string name="copy_name">
+		Copie de [COPY_NAME]
+	</floater.string>
 	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
-		<column label="Déclencheur" name="trigger" width="85" />
-		<column label="Touche" name="shortcut" />
-		<column label="" name="key" />
-		<column label="Nom" name="name" width="145"/>
+		<scroll_list.columns label="Nom" name="name" width="145"/>
+		<scroll_list.columns label="Chat" name="trigger" width="85"/>
+		<scroll_list.columns label="" name="key"/>
+		<scroll_list.columns label="Touche" name="shortcut"/>
 	</scroll_list>
-	<button label="Nouveau" name="new_gesture_btn" />
-	<button label="Inventaire" name="inventory_btn" />
-	<button label="Modifier" name="edit_btn" />
-	<button label="Jouer" name="play_btn" />
-	<button label="Stop" name="stop_btn" />
+	<panel label="bottom_panel" name="bottom_panel">
+		<menu_button name="gear_btn" tool_tip="Plus d&apos;options"/>
+		<button name="new_gesture_btn" tool_tip="Faire un nouveau geste"/>
+		<button name="activate_btn" tool_tip="Activer/désactiver le geste sélectionné"/>
+		<button name="del_btn" tool_tip="Supprimer ce geste"/>
+	</panel>
+	<button label="Modifier" name="edit_btn"/>
+	<button label="Jouer" name="play_btn"/>
+	<button label="Stop" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index e9d5ea62f2..e3d604477c 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="CONFIGURATION DU MATÉRIEL">
+<floater name="Hardware Settings Floater" title="PARAMÈTRES MATÉRIELS">
 	<text name="Filtering:">
 		Filtres :
 	</text>
@@ -21,8 +21,8 @@
 	<text name="Enable VBO:">
 		Activer le VBO :
 	</text>
-	<check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
-	<slider label="Mémoire vidéo (Mo) :" name="GrapicsCardTextureMemory" tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues."/>
+	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+	<slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d&apos;être floues."/>
 	<spinner label="Indice du brouillard :" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
new file mode 100644
index 0000000000..1170d1d87b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_help_browser" title="NAVIGATEUR D&apos;AIDE">
+	<floater.string name="home_page_url">
+		http://fr.secondlife.com
+	</floater.string>
+	<floater.string name="support_page_url">
+		http://fr.secondlife.com/support
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls">
+			<button label="Ouvrir dans mon navigateur Web" name="open_browser"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
index 13ca0e8770..f212f113b3 100644
--- a/indra/newview/skins/default/xui/fr/floater_hud.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="DIDACTICIEL" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="DIDACTICIEL"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_im.xml b/indra/newview/skins/default/xui/fr/floater_im.xml
index a116c43f3f..0e4039d3af 100644
--- a/indra/newview/skins/default/xui/fr/floater_im.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="Message instantané">
 	<text name="only_user_message">
 		Vous êtes le seul participant à cette session.
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
new file mode 100644
index 0000000000..2637dfa670
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_im_box" title="Messages instantanés"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
new file mode 100644
index 0000000000..c3df4a869c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/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="Panneau de contrôle IM" name="panel_im_control_panel"/>
+		<layout_panel>
+			<line_editor label="À" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
new file mode 100644
index 0000000000..d3c461a427
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="incoming call" title="APPEL D&apos;UN(E)INCONNU(E)">
+	<floater.string name="localchat">
+		Chat vocal près de vous
+	</floater.string>
+	<floater.string name="anonymous">
+		anonyme
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		appelle.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		a rejoint un chat vocal avec conférence.
+	</floater.string>
+	<text name="question">
+		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
+	</text>
+	<button label="Accepter" label_selected="Accepter" name="Accept"/>
+	<button label="Refuser" label_selected="Refuser" name="Reject"/>
+	<button label="Lancer IM" name="Start IM"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
index 944a157f17..de74f47bcf 100644
--- a/indra/newview/skins/default/xui/fr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="inspect" title="INSPECTER LES OBJETS">
-	<scroll_list name="object_list"
-	     tool_tip="Sélectionner un objet de la liste pour le mettre en surbrillance dans le Monde.">
-		<column label="Nom" name="object_name" />
-		<column label="Propriétaire" name="owner_name" />
-		<column label="Créateur" name="creator_name" />
-		<column label="Date de création" name="creation_date" />
+	<floater.string name="timeStamp">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
+	<scroll_list name="object_list" tool_tip="Sélectionner un objet de la liste pour le mettre en surbrillance dans le Monde.">
+		<scroll_list.columns label="Nom" name="object_name"/>
+		<scroll_list.columns label="Propriétaire" name="owner_name"/>
+		<scroll_list.columns label="Créateur" name="creator_name"/>
+		<scroll_list.columns label="Date de création" name="creation_date"/>
 	</scroll_list>
-	<button label="Voir le profil du propriétaire..." name="button owner" width="172"
-	     tool_tip="Voir le profil du propriétaire de l&apos;objet en surbrillance" />
-	<button label="Voir le profil du créateur..." name="button creator" left="192" width="172"
-	     tool_tip="Voir le profil du créateur de l&apos;objet en surbrillance" />
+	<button label="Voir le profil du propriétaire..." name="button owner" tool_tip="Voir le profil du propriétaire de l&apos;objet en surbrillance" width="172"/>
+	<button label="Voir le profil du créateur..." left="192" name="button creator" tool_tip="Voir le profil du créateur de l&apos;objet en surbrillance" width="172"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index a83a95fa75..1f8b7f37ad 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,55 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="INVENTAIRE">
-	<search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="Tous les objets" name="All Items"/>
-		<inventory_panel label="Objets récents" name="Recent Items"/>
-	</tab_container>
-	<menu_bar name="Inventory Menu">
-		<menu label="Fichier" name="File">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-			<menu_item_call label="Ouvrir" name="Open"/>
-			<menu_item_call label="Nouvelle fenêtre" name="New Window"/>
-			<menu_item_call label="Afficher les filtres" name="Show Filters"/>
-			<menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
-			<menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
-			<menu_item_call label="Vider la corbeille" name="Empty Trash"/>
-		</menu>
-		<menu label="Créer" name="Create">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-			<menu_item_call label="Nouveau dossier" name="New Folder"/>
-			<menu_item_call label="Nouveau script" name="New Script"/>
-			<menu_item_call label="Nouvelle note" name="New Note"/>
-			<menu_item_call label="Nouveau geste" name="New Gesture"/>
-			<menu name="New Clothes">
-				<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
-				<menu_item_call label="Nouveau pantalon" name="New Pants"/>
-				<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
-				<menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
-				<menu_item_call label="Nouvelle veste" name="New Jacket"/>
-				<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
-				<menu_item_call label="Nouveaux gants" name="New Gloves"/>
-				<menu_item_call label="Nouveaux sous-vêtements (haut)" name="New Undershirt"/>
-				<menu_item_call label="Nouveaux sous-vêtements (bas)" name="New Underpants"/>
-			</menu>
-			<menu name="New Body Parts">
-				<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
-				<menu_item_call label="Nouvelle peau" name="New Skin"/>
-				<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
-				<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
-			</menu>
-		</menu>
-		<menu label="Trier" name="Sort">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-			<menu_item_check label="Par nom" name="By Name"/>
-			<menu_item_check label="Par date" name="By Date"/>
-			<menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
-			<menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
-		</menu>
-		<menu label="Filters" name="Filters">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-			<menu_item_check label="Modifier actuel" name="Modify Current"/>
-			<menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
-		</menu>
-	</menu_bar>
+	<floater.string name="Title">
+		Inventaire
+	</floater.string>
+	<floater.string name="TitleFetching">
+		Inventaire (Récupération de [ITEM_COUNT] articles en cours) [FILTER]
+	</floater.string>
+	<floater.string name="TitleCompleted">
+		Inventaire ([ITEM_COUNT] articles) [FILTER]
+	</floater.string>
+	<floater.string name="Fetched">
+		Récupéré
+	</floater.string>
+	<panel label="Panneau Inventaire" name="Inventory Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 44d420d865..b0d5df161c 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIÉTÉS DE L&apos;OBJET DE L&apos;INVENTAIRE">
+<floater name="item properties" title="PROPRIÉTÉS DES ARTICLES DE L&apos;INVENTAIRE">
 	<floater.string name="unknown">
 		(inconnu)
 	</floater.string>
@@ -12,6 +12,9 @@
 	<floater.string name="owner_can">
 		Le propriétaire peut :
 	</floater.string>
+	<floater.string name="acquiredDate">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</floater.string>
 	<text name="LabelItemNameTitle">
 		Nom :
 	</text>
@@ -39,21 +42,21 @@
 		Wed May 24 12:50:46 2006
 	</text>
 	<text name="OwnerLabel">
-		Vous :
+		Vous :
 	</text>
 	<check_box label="Éditer" name="CheckOwnerModify"/>
 	<check_box label="Copier" name="CheckOwnerCopy"/>
 	<check_box label="Revendre" name="CheckOwnerTransfer"/>
 	<text name="AnyoneLabel">
-		N&apos;importe qui :
+		N&apos;importe qui :
 	</text>
 	<check_box label="Copier" name="CheckEveryoneCopy"/>
 	<text name="GroupLabel">
-		Groupe :
+		Groupe :
 	</text>
 	<check_box label="Partager" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel" width="192">
-		Le prochain propriétaire :
+		Le prochain propriétaire :
 	</text>
 	<check_box label="Éditer" name="CheckNextOwnerModify"/>
 	<check_box label="Copier" name="CheckNextOwnerCopy"/>
@@ -63,5 +66,8 @@
 		<combo_box.item label="Copier" name="Copy"/>
 		<combo_box.item label="Original" name="Original"/>
 	</combo_box>
-	<spinner label="Prix : L$" name="Edit Cost"/>
+	<spinner label="Prix :" name="Edit Cost"/>
+	<text name="CurrencySymbol">
+		L$
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 8fb8d3c6f4..7727e1b657 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -12,13 +12,14 @@
 	<check_box label="Textures" name="check_texture"/>
 	<check_box label="Photos" name="check_snapshot"/>
 	<button label="Tout" label_selected="Tout" name="All" width="70"/>
-	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom_delta="0" left="83"/>
-	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom_delta="-20"/>
-	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom_delta="-36"/>
+	<button bottom_delta="0" label="Aucun" label_selected="Aucun" left="83" name="None" width="70"/>
+	<check_box bottom_delta="-20" label="Toujours montrer 
+les dossiers" name="check_show_empty"/>
+	<check_box bottom_delta="-36" label="Depuis la déconnexion" name="check_since_logoff"/>
 	<text name="- OR -">
 		Ou il y a...
 	</text>
 	<spinner label="Heures" name="spin_hours_ago"/>
 	<spinner label="Jours" name="spin_days_ago"/>
-	<button label="Fermer" label_selected="Fermer" name="Close" bottom_delta="-30"/>
+	<button bottom_delta="-30" label="Fermer" label_selected="Fermer" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index 546c95de4c..d3a1b6c61b 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="CONFIGURATION DU JOYSTICK">
-	<check_box name="enable_joystick" label="Activer :"/>
+	<check_box label="Activer :" name="enable_joystick"/>
 	<spinner label="Mapping axe des X " name="JoystickAxis1"/>
 	<spinner label="Mapping axe des Y" name="JoystickAxis2"/>
 	<spinner label="Mapping axe des Z" name="JoystickAxis0"/>
@@ -14,9 +14,9 @@
 	<text name="Control Modes:">
 		Modes de contrôle :
 	</text>
-	<check_box name="JoystickAvatarEnabled" label="Avatar"/>
-	<check_box name="JoystickBuildEnabled" label="Build"/>
-	<check_box name="JoystickFlycamEnabled" label="Flycam"/>
+	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
+	<check_box label="Build" name="JoystickBuildEnabled"/>
+	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
 		Échelle des X
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index 593ad903b9..20dffbbbc8 100644
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -1,152 +1,151 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="MESURE DU LAG">
-	<button name="client_lagmeter" tool_tip="Statut du lag client"/>
-	<text name="client">
-		Client :
-	</text>
-	<text name="client_text">
-		Normal
-	</text>
-	<button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
-	<text name="network">
-		Réseau :
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
-	<text name="server">
-		Serveur :
-	</text>
-	<text name="server_text">
-		Normal
-	</text>
-	<button label="?" name="server_help"/>
-	<button label="&gt;&gt;" name="minimize"/>
-	<string name="max_title_msg">
+	<floater.string name="max_title_msg">
 		Mesure du lag
-	</string>
-	<string name="max_width_px">
+	</floater.string>
+	<floater.string name="max_width_px">
 		360
-	</string>
-	<string name="min_title_msg">
+	</floater.string>
+	<floater.string name="min_title_msg">
 		Lag
-	</string>
-	<string name="min_width_px">
+	</floater.string>
+	<floater.string name="min_width_px">
 		90
-	</string>
-	<string name="client_text_msg">
+	</floater.string>
+	<floater.string name="client_text_msg">
 		Client
-	</string>
-	<string name="client_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_critical_fps">
 		10
-	</string>
-	<string name="client_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_warning_fps">
 		15
-	</string>
-	<string name="client_frame_time_window_bg_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_window_bg_msg">
 		Normal, fenêtre en arrière-plan
-	</string>
-	<string name="client_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_critical_msg">
 		Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="client_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_warning_msg">
 		Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
-	</string>
-	<string name="client_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_normal_msg">
 		Normal
-	</string>
-	<string name="client_draw_distance_cause_msg">
+	</floater.string>
+	<floater.string name="client_draw_distance_cause_msg">
 		Cause possible : la limite d&apos;affichage est trop élevée
-	</string>
-	<string name="client_texture_loading_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_loading_cause_msg">
 		Cause possible : images en cours de chargement
-	</string>
-	<string name="client_texture_memory_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_memory_cause_msg">
 		Cause possible : trop d&apos;images en mémoire
-	</string>
-	<string name="client_complex_objects_cause_msg">
+	</floater.string>
+	<floater.string name="client_complex_objects_cause_msg">
 		Cause possible : trop d&apos;objets complexes dans la scène
-	</string>
-	<string name="network_text_msg">
+	</floater.string>
+	<floater.string name="network_text_msg">
 		Réseau
-	</string>
-	<string name="network_packet_loss_critical_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_pct">
 		10
-	</string>
-	<string name="network_packet_loss_warning_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_pct">
 		5
-	</string>
-	<string name="network_packet_loss_critical_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_msg">
 		La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</string>
-	<string name="network_packet_loss_warning_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_msg">
 		La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</string>
-	<string name="network_performance_normal_msg">
+	</floater.string>
+	<floater.string name="network_performance_normal_msg">
 		Normal
-	</string>
-	<string name="network_ping_critical_ms">
+	</floater.string>
+	<floater.string name="network_ping_critical_ms">
 		600
-	</string>
-	<string name="network_ping_warning_ms">
+	</floater.string>
+	<floater.string name="network_ping_warning_ms">
 		300
-	</string>
-	<string name="network_ping_critical_msg">
+	</floater.string>
+	<floater.string name="network_ping_critical_msg">
 		Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_ping_warning_msg">
+	</floater.string>
+	<floater.string name="network_ping_warning_msg">
 		Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_packet_loss_cause_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_cause_msg">
 		Mauvaise connexion possible ou réglage de la bande passante trop élevé.
-	</string>
-	<string name="network_ping_cause_msg">
+	</floater.string>
+	<floater.string name="network_ping_cause_msg">
 		Mauvaise connexion possible ou app. de partage des fichiers
-	</string>
-	<string name="server_text_msg">
+	</floater.string>
+	<floater.string name="server_text_msg">
 		Serveur
-	</string>
-	<string name="server_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_critical_fps">
 		20
-	</string>
-	<string name="server_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_warning_fps">
 		30
-	</string>
-	<string name="server_single_process_max_time_ms">
+	</floater.string>
+	<floater.string name="server_single_process_max_time_ms">
 		20
-	</string>
-	<string name="server_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_critical_msg">
 		Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="server_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_warning_msg">
 		Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
-	</string>
-	<string name="server_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_normal_msg">
 		Normal
-	</string>
-	<string name="server_physics_cause_msg">
+	</floater.string>
+	<floater.string name="server_physics_cause_msg">
 		Cause possible : trop d&apos;objets physiques
-	</string>
-	<string name="server_scripts_cause_msg">
+	</floater.string>
+	<floater.string name="server_scripts_cause_msg">
 		Cause possible : trop d&apos;objets scriptés
-	</string>
-	<string name="server_net_cause_msg">
+	</floater.string>
+	<floater.string name="server_net_cause_msg">
 		Cause possible : trop de trafic réseau
-	</string>
-	<string name="server_agent_cause_msg">
+	</floater.string>
+	<floater.string name="server_agent_cause_msg">
 		Cause possible : trop de personnes en mouvement dans la région
-	</string>
-	<string name="server_images_cause_msg">
+	</floater.string>
+	<floater.string name="server_images_cause_msg">
 		Cause possible : trop de calculs d&apos;images
-	</string>
-	<string name="server_generic_cause_msg">
+	</floater.string>
+	<floater.string name="server_generic_cause_msg">
 		Cause possible : charge simulateur trop lourde
-	</string>
-	<string name="smaller_label">
+	</floater.string>
+	<floater.string name="smaller_label">
 		&gt;&gt;
-	</string>
-	<string name="bigger_label">
+	</floater.string>
+	<floater.string name="bigger_label">
 		&lt;&lt;
-	</string>
+	</floater.string>
+	<button name="client_lagmeter" tool_tip="Statut du lag client"/>
+	<text name="client">
+		Client
+	</text>
+	<text name="client_text">
+		Normal
+	</text>
+	<button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
+	<text name="network">
+		Réseau
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
+	<text name="server">
+		Serveur
+	</text>
+	<text name="server_text">
+		Normal
+	</text>
+	<button label="&gt;&gt;" name="minimize" tool_tip="Activer/désactiver la taille du floater"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index 1b3127c35d..10fe132623 100644
--- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
@@ -8,7 +8,7 @@
 		<column label="" name="hidden"/>
 	</scroll_list>
 	<button label="Téléporter" label_selected="Téléporter" name="Teleport" tool_tip="Téléportez-vous au milieu de ce terrain."/>
-	<button label="Carte" label_selected="Carte" name="Show on Map" tool_tip="Affichez ce terrain sur la carte du monde."/>
+	<button label="Carte" label_selected="Carte" name="Show on Map" tool_tip="Afficher ce terrain sur la carte du monde"/>
 	<text name="contrib_label">
 		Vos contributions :
 	</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 2231d503b2..b0a2f92f7c 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="SCRIPT : NOUVEAU SCRIPT">
+<floater name="script ed float" title="SCRIPT : NOUVEAU SCRIPT">
 	<floater.string name="not_allowed">
-		Ce scipt ne peut pas être copié, visualisé ou modifié.  Pour visualiser ou modifier un script à l&apos;intérieur d&apos;un objet, vous devez avoir les permissions requises.
+		Ce script ne peut pas être copié, visualisé ou modifié. Pour visualiser ou modifier un script à l&apos;intérieur d&apos;un objet, vous devez avoir les permissions requises.
 	</floater.string>
 	<floater.string name="script_running">
 		Exécution en cours
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 2e3d88264e..af6ae20dfe 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.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="script ed float" title="WIKI LSL">
-	<check_box label="Suivre le curseur" name="lock_check" />
-	<combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
-	<button label="Précédente" name="back_btn" left_delta="75"/>
-	<button label="Suivante" name="fwd_btn" />
+	<check_box label="Suivre le curseur" name="lock_check"/>
+	<combo_box label="Verrouiller" left_delta="120" name="history_combo" width="70"/>
+	<button label="Précédente" left_delta="75" name="back_btn"/>
+	<button label="Suivante" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 986deaabc9..339ca99c92 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="NAVIGATEUR">
+<floater name="floater_about" title="NAVIGATEUR DE MÉDIAS">
 	<floater.string name="home_page_url">
 		http://fr.secondlife.com
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
new file mode 100644
index 0000000000..27db5ea995
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="media_settings" title="PARAMÈTRES DES MÉDIAS">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<button label="Appliquer" label_selected="Appliquer" name="Apply"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index eb0f0e64ce..5993f90cef 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="Simuler une fuite de mémoire">
+<floater name="MemLeak" title="SIMULER UNE FUITE DE MÉMOIRE">
 	<spinner label="Vitesse de la fuite (octets) :" name="leak_speed"/>
 	<spinner label="Max mémoire perdue (Mo) :" name="max_leak"/>
 	<text name="total_leaked_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 528fa309eb..0e8887bb96 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="move_floater">
 	<string name="walk_forward_tooltip">
-		Vous déplacer vers l&apos;avant (appuyer sur la flèche vers le haut ou W)
+		Marcher en avant (appuyer sur la flèche vers le haut ou W)
 	</string>
 	<string name="walk_back_tooltip">
 		Marcher en arrière (appuyer sur la flèche vers le bas ou S)
@@ -21,15 +21,15 @@
 	<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)"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="Vous envoler, appuyer sur E"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="Atterrir, appuyer sur C"/>
-		<joystick_turn name="forward btn" tool_tip="Vous déplacer vers l&apos;avant (appuyer sur la flèche vers le haut ou W)"/>
+		<button label="" label_selected="" name="move up btn" tool_tip="Voler vers le haut, appuyer sur E"/>
+		<button label="" label_selected="" name="move down btn" tool_tip="Voler vers le bas, appuyer sur C"/>
+		<joystick_turn name="forward btn" tool_tip="Marcher en avant (appuyer sur la flèche vers le haut ou W)"/>
 		<joystick_turn name="backward btn" tool_tip="Marcher en arrière (appuyer sur la flèche vers le bas ou S)"/>
 	</panel>
 	<panel name="panel_modes">
 		<button label="" name="mode_walk_btn" tool_tip="Mode marche"/>
-		<button label="" name="mode_run_btn" tool_tip="Mode courir"/>
-		<button label="" name="mode_fly_btn" tool_tip="Mode voler"/>
+		<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_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index aae5770d51..f4db3201a8 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="IGNORER LES OBJETS PAR NOM">
+<floater name="mute by name" title="IGNORER L&apos;OBJET PAR NOM">
 	<text name="message">
-		Cette fonction ne marche que pour les chats et les IM,
-pas les sons. Saisissez le nom exact de l&apos;objet.
+		Ignorer un objet :
 	</text>
 	<line_editor name="object_name">
 		Nom de l&apos;objet
 	</line_editor>
+	<text name="note">
+		* Ignore uniquement le texte de l&apos;objet, pas les sons
+	</text>
 	<button label="OK" name="OK"/>
 	<button label="Annuler" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_my_friends.xml b/indra/newview/skins/default/xui/fr/floater_my_friends.xml
index 841a42a0ea..db7c026e22 100644
--- a/indra/newview/skins/default/xui/fr/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/fr/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="CONTACTS">
 	<tab_container name="friends_and_groups">
-		<panel label="Amis" name="friends_panel" />
-		<panel label="Groupes" name="groups_panel" />
+		<panel label="Amis" name="friends_panel"/>
+		<panel label="Groupes" name="groups_panel"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
new file mode 100644
index 0000000000..72775169cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="nearby_chat" title="CHAT PRÈS DE VOUS"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
index fd3782bac2..e040e948f5 100644
--- a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="notifications_console" title="CONSOLE DE NOTIFICATIONS">
 	<combo_box label="Sélectionner le type de notification" name="notification_types" width="412"/>
-	<button label="Ajouter" name="add_notification" left="417" width="78"/>
+	<button label="Ajouter" left="417" name="add_notification" width="78"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 5ffa2f236d..4e046ff3f3 100644
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="objectcontents" title="CONTENU DES OBJETS">
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="Copier vers l&apos;inventaire" label_selected="Copier vers l&apos;inventaire" name="copy_to_inventory_button" width="132" />
-	<button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
+	<button label="Copier vers l&apos;inventaire" label_selected="Copier vers l&apos;inventaire" name="copy_to_inventory_button" width="132"/>
+	<button label="Copier et porter" label_selected="Copier et porter" left="152" name="copy_and_wear_button"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
new file mode 100644
index 0000000000..38a9109c84
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outgoing call" title="APPEL EN COURS">
+	<floater.string name="localchat">
+		Chat vocal près de vous
+	</floater.string>
+	<floater.string name="anonymous">
+		anonyme
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		appelle.
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		a rejoint un chat vocal avec conférence.
+	</floater.string>
+	<text name="connecting">
+		Connexion à [CALLEE_NAME] en cours
+	</text>
+	<text name="calling">
+		En train d&apos;appeler [CALLEE_NAME]
+	</text>
+	<text name="noanswer">
+		Pas de réponse.  Veuillez réessayer ultérieurement.
+	</text>
+	<text name="leaving">
+		En train de quitter [CURRENT_CHAT].
+	</text>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 50d7049bba..30e510efb5 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
+	<string name="payee_group">
+		Payer le groupe
+	</string>
+	<string name="payee_resident">
+		Payer le résident
+	</string>
 	<text left="5" name="payee_label">
-		Payer :
+		Payer :
 	</text>
 	<icon name="icon_person" tool_tip="Résident"/>
 	<text name="payee_name">
@@ -12,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 left="4" name="amount text">
-		Ou choisissez un montant :
+		Ou choisissez un montant :
 	</text>
 	<line_editor left="60" name="amount" width="55"/>
 	<button label="Payer" label_selected="Payer" name="pay btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index a8cac0b566..c96db77721 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
 	<string name="payee_group" width="95">
-		Payer le groupe :
+		Payer le groupe
 	</string>
 	<string halign="left" name="payee_resident" width="100">
-		Payer le résident :
+		Payer le résident
 	</string>
 	<icon name="icon_person" tool_tip="Résident"/>
 	<text left="105" name="payee_name">
@@ -22,7 +22,7 @@
 	<button label="10 L$" label_selected="10 L$" left="105" name="fastpay 10"/>
 	<button label="20 L$" label_selected="20 L$" left="190" name="fastpay 20"/>
 	<text halign="left" left="5" name="amount text">
-		Ou choisissez un montant :
+		Ou choisissez un montant :
 	</text>
 	<line_editor left="65" name="amount" width="50"/>
 	<button label="Payer" label_selected="Payer" name="pay btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
index 4b885f3afb..2be2ae7c88 100644
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="DROITS PAR DÉFAUT">
+<floater name="perm prefs" title="PERMISSIONS DE CHARGEMENT PAR DÉFAUT">
 	<panel label="Droits" name="permissions">
 		<button label="?" label_selected="?" name="help"/>
 		<check_box label="Partager avec le groupe" name="share_with_group"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
index 9c998c1838..6a9a674fac 100644
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml
@@ -1,40 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Postcard" title="ENVOYER LA PHOTO PAR E-MAIL">
 	<text name="to_label" width="135">
 		E-mail du destinataire :
 	</text>
-	<line_editor name="to_form" left="143" width="127" />
+	<line_editor left="143" name="to_form" width="127"/>
 	<text name="from_label">
 		Votre e-mail :
 	</text>
-	<line_editor name="from_form" left="143" width="127" />
+	<line_editor left="143" name="from_form" width="127"/>
 	<text name="name_label">
 		Votre nom :
 	</text>
-	<line_editor name="name_form" left="143" width="127" />
+	<line_editor left="143" name="name_form" width="127"/>
 	<text name="subject_label">
 		Sujet :
 	</text>
-	<line_editor name="subject_form" left="143" width="127" />
-	<line_editor label="Saisissez votre sujet ici." name="subject_form" />
+	<line_editor left="143" name="subject_form" width="127"/>
+	<line_editor label="Saisissez votre sujet ici." name="subject_form"/>
 	<text name="msg_label">
 		Message :
 	</text>
-	<check_box label="Publier sur le web" name="allow_publish_check"
-	     tool_tip="Publiez cette carte postale sur le web." />
-	<check_box label="Contenu adulte" name="mature_check"
-	     tool_tip="Cette carte postale est à caractère adulte." />
-	<button label="?" name="publish_help_btn" />
+	<check_box label="Publier sur le web" name="allow_publish_check" tool_tip="Publiez cette carte postale sur le web."/>
+	<check_box label="Contenu adulte" name="mature_check" tool_tip="Cette carte postale est à caractère adulte."/>
+	<button label="?" name="publish_help_btn"/>
 	<text_editor name="msg_form">
 		Saisissez votre message ici.
 	</text_editor>
 	<text name="fine_print">
 		Si le destinataire s&apos;inscrit sur [SECOND_LIFE], vous recevrez un bonus.
 	</text>
-	<button label="Annuler" name="cancel_btn" />
-	<button label="Envoyer" name="send_btn" />
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Envoyer" name="send_btn"/>
 	<string name="default_subject">
-		Carte postale de [SECOND_LIFE]
+		Carte postale de [SECOND_LIFE].
 	</string>
 	<string name="default_message">
 		Ouvrez-moi !
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index ccd29a01dc..3e6d3611cc 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="PRÉFÉRENCES" min_width="330" width="626">
-	<button label="À propos" label_selected="À propos" name="About..." />
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<button label="Appliquer" label_selected="Appliquer" name="Apply" />
-	<button label="Aide" label_selected="Aide" name="Help" />
-	<tab_container name="pref core" tab_width="126" width="626" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="330" name="Preferences" title="PRÉFÉRENCES" width="626">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<tab_container name="pref core" tab_width="126" width="626">
+		<panel label="Général" name="general"/>
+		<panel label="Graphiques" name="display"/>
+		<panel label="Confidentialité" name="im"/>
+		<panel label="Son" name="audio"/>
+		<panel label="Chat" name="chat"/>
+		<panel label="Alertes" name="msgs"/>
+		<panel label="Configuration" name="input"/>
+		<panel label="Avancées" name="advanced1"/>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 4811760bbf..923d56801e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
 	<floater.string name="Title">
-		Animation : [NAME]
+		Animation : [NAME]
 	</floater.string>
 	<text name="desc txt">
 		Description :
 	</text>
-	<button label="Jouer dans le Monde" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Jouer cette animation et partagez-la avec d&apos;autres." width="131"/>
-	<button label="Jouer localement" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Jouer cette animation et soyez le seul à la voir." width="125"/>
+	<button label="Jouer dans le Monde" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Lire cette animation de façon à ce que les autres puissent la voir" width="131"/>
+	<button label="Jouer localement" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Lire cette animation de façon à ce que vous soyez la seule personne à pouvoir la voir" width="125"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
index f7a70db96e..23f86d88b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="INFORMATIONS SUR LA PETITE ANNONCE">
+<floater name="classified_preview" title="INFOS SUR LA PETITE ANNONCE">
 	<floater.string name="Title">
-		Petite annonce : [NAME]
+		Petite annonce : [NAME]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_event.xml b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
index 30e6a218cb..7590c43af1 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="INFORMATIONS SUR L&apos;ÉVÉNEMENT">
+<floater name="event_preview" title="INFORMATIONS SUR LES ÉVÉNEMENTS">
 	<floater.string name="Title">
-		Événement : [NAME]
+		Événement : [NAME]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index b2c3d18cbd..6e8767ea07 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -1,62 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<string name="stop_txt">
+	<floater.string name="step_anim">
+		Animation à jouer :
+	</floater.string>
+	<floater.string name="step_sound">
+		Son à lire :
+	</floater.string>
+	<floater.string name="step_chat">
+		Chatter pour dire :
+	</floater.string>
+	<floater.string name="step_wait">
+		Attendre :
+	</floater.string>
+	<floater.string name="stop_txt">
 		Stop
-	</string>
-	<string name="preview_txt">
+	</floater.string>
+	<floater.string name="preview_txt">
 		Prévisualiser
-	</string>
-	<string name="none_text">
+	</floater.string>
+	<floater.string name="none_text">
 		-- Aucune --
-	</string>
+	</floater.string>
+	<floater.string name="Title">
+		Geste : [NAME]
+	</floater.string>
 	<text name="desc_label">
 		Description :
 	</text>
 	<text name="trigger_label">
 		Déclencheur :
 	</text>
-	<text name="replace_text"
-	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
+	<text name="replace_text" tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
 		Remplacer par :
 	</text>
-	<line_editor left="310" name="replace_editor"
-	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste"
-	     width="120" />
+	<line_editor left="310" name="replace_editor" tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste" width="120"/>
 	<text name="key_label">
 		Raccourci :
 	</text>
-	<combo_box label="Aucun" name="modifier_combo" width="55" />
-	<combo_box label="Aucun" name="key_combo" width="55" />
+	<combo_box label="Aucun" name="modifier_combo" width="55"/>
+	<combo_box label="Aucun" name="key_combo" width="55"/>
 	<text name="library_label">
 		Bibliothèque :
 	</text>
+	<scroll_list name="library_list"/>
+	<button label="Ajouter &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
 		Étapes :
 	</text>
-	<scroll_list name="library_list">
-		Animation
-Son
-Chat
-Attendre
-	</scroll_list>
-	<button label="Ajouter &gt;&gt;" name="add_btn" />
-	<button label="Monter" name="up_btn" />
-	<button label="Descendre" name="down_btn" />
-	<button label="Supprimer" name="delete_btn" />
-	<text name="help_label">
-		Toutes les étapes ont lieu
-simultanément, sauf si vous
-ajoutez des pauses.
-	</text>
+	<button label="Vers le haut" name="up_btn"/>
+	<button label="Vers le bas" name="down_btn"/>
+	<button label="Supprimer" name="delete_btn"/>
 	<radio_group name="animation_trigger_type">
-		<radio_item name="start" label="Commencer" />
-		<radio_item name="stop" label="Stop" />
+		<radio_item label="Lancer" name="start"/>
+		<radio_item label="Arrêter" name="stop"/>
 	</radio_group>
-	<check_box label="jusqu&apos;à la fin des animations" name="wait_anim_check" />
-	<check_box label="temps en secondes" name="wait_time_check" />
-	<line_editor left_delta="130" name="wait_time_editor" />
-	<check_box label="Actifs" name="active_check"
-	     tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu&apos;il y a un conflit entre les raccourcis." />
-	<button label="Prévisualiser" name="preview_btn" width="86" />
-	<button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
+	<check_box label="jusqu&apos;à la fin des animations" name="wait_anim_check"/>
+	<check_box label="temps en secondes" name="wait_time_check"/>
+	<line_editor left_delta="130" name="wait_time_editor"/>
+	<text name="help_label">
+		Toutes les étapes ont lieu en même temps si vous n&apos;ajoutez pas d&apos;étapes d&apos;attente.
+	</text>
+	<check_box label="Actifs" name="active_check" tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu&apos;il y a un conflit entre les raccourcis."/>
+	<button label="Prévisualiser" name="preview_btn" width="86"/>
+	<button label="Enregistrer" left_delta="96" name="save_btn" width="86"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture_info.xml
index 4bdd52f14a..4a91992f6a 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Gesture" title="Raccourci du geste"/>
+<floater name="Gesture" title="RACCOURCI DU GESTE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml
new file mode 100644
index 0000000000..06caf0635d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="RACCOURCI DU GESTE">
+	<text name="trigger_label">
+		Chat :
+	</text>
+	<text name="key_label">
+		Clavier :
+	</text>
+	<combo_box label="Aucun" name="modifier_combo"/>
+	<combo_box label="Aucun" name="key_combo"/>
+	<text name="replace_text" tool_tip="Remplacez le ou les mots-clés par ces mots. Par exemple, si vous remplacez le mot-clé &quot; bonjour &quot; par &quot; salut &quot;, le chat &quot; Je voulais te dire bonjour &quot; devient &quot; Je voulais te dire salut &quot; et le geste correspondant s&apos;affiche.">
+		Remplacer :
+	</text>
+	<line_editor name="replace_editor" tool_tip="Remplacez le ou les mots-clés par ces mots. Par exemple, si vous remplacez le mot-clé &quot; bonjour &quot; par &quot; salut &quot;, le chat &quot; Je voulais te dire bonjour &quot; devient &quot; Je voulais te dire salut &quot; et le geste correspondant s&apos;affiche."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture_steps.xml
index 4bdd52f14a..4a91992f6a 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture_steps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture_steps.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Gesture" title="Raccourci du geste"/>
+<floater name="Gesture" title="RACCOURCI DU GESTE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index d5d984238a..a10c01a24c 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="REMARQUE :">
+<floater name="preview notecard" title="Remarque :">
 	<floater.string name="no_object">
 		Impossible de trouver l&apos;objet contenant cette note.
 	</floater.string>
@@ -7,7 +7,7 @@
 		Vous n&apos;avez pas le droit de voir cette note.
 	</floater.string>
 	<floater.string name="Title">
-		Note : [NAME]
+		Note : [NAME]
 	</floater.string>
 	<floater.string label="Enregistrer" label_selected="Enregistrer" name="Save">
 		Enregistrer
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 9d9b067a8d..67d93e9e92 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
 	<floater.string name="Title">
-		Son : [NAME]
+		Son : [NAME]
 	</floater.string>
 	<text name="desc txt">
 		Description :
 	</text>
-	<button label="Jouer dans le Monde" label_selected="Jouer dans le Monde" left_delta="-142" name="Sound play btn" tool_tip="Jouer ce son et partagez-le avec d&apos;autres." width="131"/>
-	<button label="Jouer localement" label_selected="Jouer localement" left="162" name="Sound audition btn" tool_tip="Jouer ce son et soyez le seul à l&apos;entendre." width="125"/>
+	<button label="Jouer dans le Monde" label_selected="Jouer dans le Monde" left_delta="-142" name="Sound play btn" tool_tip="Lire ce son de façon à ce que les autres puissent l&apos;entendre" width="131"/>
+	<button label="Jouer localement" label_selected="Jouer localement" left="162" name="Sound audition btn" tool_tip="Lire ce son de façon à ce que vous soyez la seule personne à pouvoir l&apos;entendre" width="125"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index a2653143a6..0acfd72323 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
 	<floater.string name="Title">
-		Texture : [NAME]
+		Texture : [NAME]
 	</floater.string>
 	<floater.string name="Copy">
 		Copier dans l&apos;inventaire
@@ -9,9 +9,38 @@
 	<text name="desc txt">
 		Description :
 	</text>
-	<button label="Enregistrer" name="Keep"/>
-	<button label="Supprimer" name="Discard"/>
+	<button label="OK" name="Keep"/>
+	<button label="Annuler" name="Discard"/>
 	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
+		[WIDTH] px x [HEIGHT] px
 	</text>
+	<text name="aspect_ratio">
+		Aperçu du rapport hauteur/largeur
+	</text>
+	<combo_box name="combo_aspect_ratio" tool_tip="Aperçu avec un rapport hauteur/largeur fixe">
+		<combo_item name="Unconstrained">
+			Sans contraintes
+		</combo_item>
+		<combo_item name="1:1" tool_tip="Logo du groupe ou profil dans le monde physique">
+			1:1
+		</combo_item>
+		<combo_item name="4:3" tool_tip="Profil [SECOND_LIFE]">
+			4:3
+		</combo_item>
+		<combo_item name="10:7" tool_tip="Petites annonces, repères">
+			10:7
+		</combo_item>
+		<combo_item name="3:2" tool_tip="À propos des terrains">
+			3:2
+		</combo_item>
+		<combo_item name="16:10">
+			16:10
+		</combo_item>
+		<combo_item name="16:9" tool_tip="Favoris du profil">
+			16:9
+		</combo_item>
+		<combo_item name="2:1">
+			2:1
+		</combo_item>
+	</combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
index 3ec1ebf7e6..c2663174d4 100644
--- a/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="RÉGION ET DOMAINE"/>
+<floater name="regioninfo" title="RÉGION/DOMAINE"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 77d2b37eba..c6ffd32650 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -8,7 +8,7 @@
 		Déposant :
 	</text>
 	<text name="reporter_field">
-		Loremipsum Dolorsitamut
+		Loremipsum Dolorsitamut Longnamez
 	</text>
 	<text name="sim_title">
 		Région :
@@ -23,11 +23,11 @@
 		{128.1, 128.1, 15.4}
 	</text>
 	<text name="select_object_label">
-		Cliquez sur le bouton puis l&apos;objet responsable :
+		Cliquez sur le bouton puis l&apos;objet responsable :
 	</text>
 	<button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport."/>
 	<text name="object_name_label">
-		Objet :
+		Objet :
 	</text>
 	<text left_delta="70" name="object_name" width="105">
 		Consetetur Sadipscing
@@ -36,7 +36,7 @@
 		Propriétaire :
 	</text>
 	<text left_delta="70" name="owner_name" width="105">
-		Hendrerit Vulputate
+		Hendrerit Vulputate Kamawashi Longname
 	</text>
 	<combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
 		<combo_box.item label="Sélectionnez une catégorie" name="Select_category"/>
@@ -96,8 +96,7 @@
 		Soyez aussi spécifique que possible
 	</text>
 	<text bottom_delta="-16" name="incomplete_title">
-		Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une
-enquête.
+		* Les rapports incomplets ne feront pas l&apos;objet d&apos;une enquête
 	</text>
 	<button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
 	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
index ef021ce713..e70a30fa24 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[All scripts]" title="[All scripts]"/>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
index d699011f32..7b8c5399b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="SCRIPT : SCRIPT DE ROTATION">
+<floater name="preview lsl text" title="SCRIPT : SCRIPT DE ROTATION">
 	<floater.string name="Title">
 		Script : [NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index 7d4afdf818..b9a8165457 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="RÉINITIALISER PROGRESSION">
+<floater name="queue" title="RÉINITIALISER LES PROGRÈS">
 	<floater.string name="Starting">
-		Début du [START] sur [COUNT] objets.
+		Lancement de [START] sur [COUNT] objets.
 	</floater.string>
 	<floater.string name="Done">
 		Fini.
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
index 49b0ffe542..09b903f41c 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="RECHERCHE DE SCRIPTS" width="320">
-	<check_box label="Non sensible à la casse" name="case_text"  left="75"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script search" title="RECHERCHE DE SCRIPT" width="320">
+	<check_box label="Non sensible à la casse" left="75" name="case_text"/>
 	<button label="Rechercher" label_selected="Rechercher" name="search_btn" width="96"/>
-	<button label="Remplacer" label_selected="Remplacer" name="replace_btn" left="111" width="96"/>
-	<button label="Tout remplacer" label_selected="Tout remplacer" name="replace_all_btn" left="212" width="96"/>
+	<button label="Remplacer" label_selected="Remplacer" left="111" name="replace_btn" width="96"/>
+	<button label="Tout remplacer" label_selected="Tout remplacer" left="212" name="replace_all_btn" width="96"/>
 	<text name="txt" width="65">
 		Rechercher
 	</text>
 	<text name="txt2" width="65">
 		Remplacer
 	</text>
-	<line_editor left="75" name="search_text" width="240" />
-	<line_editor left="75" name="replace_text" width="240" />
+	<line_editor left="75" name="search_text" width="240"/>
+	<line_editor left="75" name="replace_text" width="240"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
new file mode 100644
index 0000000000..8f13b64dea
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_search.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_search" title="RECHERCHER">
+	<floater.string name="loading_text">
+		Chargement...
+	</floater.string>
+	<floater.string name="done_text">
+		Terminé
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index 86c6a52f8c..3a06f4e189 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="VENDRE TERRAIN">
+<floater name="sell land" title="VENDRE DU TERRAIN">
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text name="info_parcel_label">
-				Parcelle :
+				Parcelle :
 			</text>
 			<text name="info_parcel">
-				PARCEL NAME
+				NOM DE LA PARCELLE
 			</text>
 			<text name="info_size_label">
-				Taille :
+				Taille :
 			</text>
 			<text name="info_size">
 				[AREA] m²
 			</text>
 			<text bottom_delta="-60" name="info_action">
-				Pour vendre cette
-parcelle :
+				Pour vendre cette parcelle :
 			</text>
-			<icon bottom_delta="-86" name="step_price"/>
 			<text name="price_label">
-				Votre prix de vente :
+				1. Votre prix de vente :
 			</text>
 			<text name="price_text">
 				Fixez un prix convenable.
@@ -28,28 +26,29 @@ parcelle :
 			<text name="price_ld">
 				L$
 			</text>
+			<line_editor name="price">
+				0
+			</line_editor>
 			<text name="price_per_m">
-				([PER_METER] L$ par mètre carré)
+				([PER_METER] L$/m²)
 			</text>
 			<text name="sell_to_label">
-				Vos acheteurs :
+				2. Vos acheteurs :
 			</text>
 			<text name="sell_to_text">
-				Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur
-spécifique.
+				Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur spécifique.
 			</text>
 			<combo_box bottom_delta="-32" name="sell_to">
-				<combo_box.item label="Sélectionnez --" name="--selectone--"/>
-				<combo_box.item label="N&apos;importe qui" name="Anyone"/>
-				<combo_box.item label="Personne spécifique :" name="Specificuser:"/>
+				<combo_box.item label="-- Sélectionnez --" name="--selectone--"/>
+				<combo_box.item label="Tout le monde" name="Anyone"/>
+				<combo_box.item label="Personne spécifique :" name="Specificuser:"/>
 			</combo_box>
-			<button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
+			<button label="Sélectionner" name="sell_to_select_agent" width="100"/>
 			<text name="sell_objects_label">
-				Vendez-vous des objets avec ce terrain ?
+				3. Vendez-vous les objets avec ce terrain ?
 			</text>
 			<text name="sell_objects_text">
-				Les objets transférables se trouvant sur la parcelle changeront
-de propriétaire.
+				Les objets transférables se trouvant sur la parcelle changeront de propriétaire.
 			</text>
 			<radio_group bottom_delta="-54" name="sell_objects" right="430">
 				<radio_item label="Non, rester le propriétaire des objets" name="no"/>
@@ -57,9 +56,9 @@ de propriétaire.
 			</radio_group>
 			<button label="Afficher les objets" name="show_objects" right="420" width="120"/>
 			<text bottom_delta="-30" name="nag_message_label">
-				Rappel : toute vente est définitive.
+				Rappel : Toutes les ventes sont définitives.
 			</text>
-			<button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
+			<button label="Indiquer le terrain à vendre" name="sell_btn" width="165"/>
 			<button label="Annuler" name="cancel_btn"/>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index ee076119aa..aae4729347 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="settings_debug" title="PARAMÉTRAGES DU MODE DEBUG">
+<floater name="settings_debug" title="PARAMÈTRES DE DÉBOGAGE">
 	<combo_box name="boolean_combo">
-		<combo_box.item label="TRUE" name="TRUE"/>
-		<combo_box.item label="FALSE" name="FALSE"/>
+		<combo_box.item label="VRAI" name="TRUE"/>
+		<combo_box.item label="FAUX" name="FALSE"/>
 	</combo_box>
 	<color_swatch label="Couleur" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index a28e64f7af..6c939b9c68 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="PRÉVISUALISER LA PHOTO" width="247">
+<floater name="Snapshot" title="APERÇU DE LA PHOTO" width="247">
 	<text name="type_label">
 		Destination de la photo
 	</text>
 	<radio_group label="Type de photo" name="snapshot_type_radio" width="228">
-		<radio_item name="postcard" label="Envoyer par e-mail" />
-		<radio_item name="texture" label="Enregistrer dans votre inventaire ([AMOUNT] L$)" />
-		<radio_item name="local" label="Enregistrer sur votre disque dur" />
+		<radio_item label="Envoyer par e-mail" name="postcard"/>
+		<radio_item label="Enregistrer dans votre inventaire ([AMOUNT] L$)" name="texture"/>
+		<radio_item label="Enregistrer sur votre disque dur" name="local"/>
 	</radio_group>
 	<button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées"/>
 	<button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées"/>
@@ -17,33 +17,33 @@
 		Format
 	</text>
 	<combo_box label="Résolution" name="postcard_size_combo">
-		<combo_box.item name="640x480" label="640 x 480" />
-		<combo_box.item name="800x600" label="800 x 600" />
-		<combo_box.item name="1024x768" label="1024 x 768" />
-		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
-		<combo_box.item name="Custom" label="Personnaliser" />
+		<combo_box.item label="640 x 480" name="640x480"/>
+		<combo_box.item label="800 x 600" name="800x600"/>
+		<combo_box.item label="1024 x 768" name="1024x768"/>
+		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+		<combo_box.item label="Personnaliser" name="Custom"/>
 	</combo_box>
 	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
-		<combo_box.item name="Small(128x128)" label="Petite (128 x 128)" />
-		<combo_box.item name="Medium(256x256)" label="Moyenne (256 x 256)" />
-		<combo_box.item name="Large(512x512)" label="Grande (512 x 512)" />
-		<combo_box.item name="Custom" label="Personnaliser" />
+		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+		<combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/>
+		<combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/>
+		<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
+		<combo_box.item label="Personnaliser" name="Custom"/>
 	</combo_box>
 	<combo_box label="Résolution" name="local_size_combo">
-		<combo_box.item name="CurrentWindow" label="Fenêtre actuelle" />
-		<combo_box.item name="320x240" label="320 x 240" />
-		<combo_box.item name="640x480" label="640 x 480" />
-		<combo_box.item name="800x600" label="800 x 600" />
-		<combo_box.item name="1024x768" label="1024 x 768" />
-		<combo_box.item name="1280x1024" label="1280 x 1024" />
-		<combo_box.item name="1600x1200" label="1600 x 1200" />
-		<combo_box.item name="Custom" label="Personnaliser" />
+		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+		<combo_box.item label="320 x 240" name="320x240"/>
+		<combo_box.item label="640 x 480" name="640x480"/>
+		<combo_box.item label="800 x 600" name="800x600"/>
+		<combo_box.item label="1024 x 768" name="1024x768"/>
+		<combo_box.item label="1280 x 1024" name="1280x1024"/>
+		<combo_box.item label="1600 x 1200" name="1600x1200"/>
+		<combo_box.item label="Personnaliser" name="Custom"/>
 	</combo_box>
 	<combo_box label="Format" name="local_format_combo">
-		<combo_box.item name="PNG" label="PNG" />
-		<combo_box.item name="JPEG" label="JPEG" />
-		<combo_box.item name="BMP" label="BMP" />
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
 	</combo_box>
 	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
 	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
@@ -52,9 +52,9 @@
 		Capturer :
 	</text>
 	<combo_box label="Couches de l&apos;image" name="layer_types">
-		<combo_box.item name="Colors" label="Couleurs" />
-		<combo_box.item name="Depth" label="Profondeur" />
-		<combo_box.item name="ObjectMattes" label="Matte des objets" />
+		<combo_box.item label="Couleurs" name="Colors"/>
+		<combo_box.item label="Profondeur" name="Depth"/>
+		<combo_box.item label="Matte des objets" name="ObjectMattes"/>
 	</combo_box>
 	<text name="file_size_label">
 		Taille du fichier : [SIZE] Ko
@@ -69,10 +69,10 @@
 	<button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
 	<button label="Envoyer" name="send_btn" width="118"/>
 	<flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l&apos;image dans un fichier" width="118">
-    <flyout_button.item name="save_item" label="Enregistrer"/>
-    <flyout_button.item name="saveas_item" label="Enregistrer sous..."/>
+		<flyout_button.item label="Enregistrer" name="save_item"/>
+		<flyout_button.item label="Enregistrer sous..." name="saveas_item"/>
 	</flyout_button>
-	<button label="Annuler" name="discard_btn" left="133" width="72" />
+	<button label="Annuler" left="133" name="discard_btn" width="72"/>
 	<string name="unknown">
 		inconnu
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index 9e2b30b3f6..6f0fb3421f 100644
--- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
@@ -12,9 +12,9 @@
 		Débit (kbps) :
 	</text>
 	<radio_group name="bitrate">
-		<radio_item name="32" label="32" />
-		<radio_item name="64" label="64" />
-		<radio_item name="96" label="96" />
-		<radio_item name="128" label="128" />
+		<radio_item label="32" name="32"/>
+		<radio_item label="64" name="64"/>
+		<radio_item label="96" name="96"/>
+		<radio_item label="128" name="128"/>
 	</radio_group>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index 26443e634b..3c19bb2608 100644
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="Statistiques">
+<floater name="Statistics" title="STATISTIQUES">
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
-			<stat_view label="Basic" name="basic">
+			<stat_view label="De base" name="basic">
 				<stat_bar label="FPS" name="fps"/>
-				<stat_bar label="Bandwidth" name="bandwidth"/>
-				<stat_bar label="Packet Loss" name="packet_loss"/>
-				<stat_bar label="Ping Sim" name="ping"/>
+				<stat_bar label="Bande passante" name="bandwidth"/>
+				<stat_bar label="Perte de paquets" name="packet_loss"/>
+				<stat_bar label="Ping sim" name="ping"/>
 			</stat_view>
-			<stat_view label="Advanced" name="advanced">
-				<stat_view label="Render" name="render">
+			<stat_view label="Avancées" name="advanced">
+				<stat_view label="Rendu" name="render">
 					<stat_bar label="KTris Drawn" name="ktrisframe"/>
 					<stat_bar label="KTris Drawn" name="ktrissec"/>
-					<stat_bar label="Total Objects" name="objs"/>
-					<stat_bar label="New Objects" name="newobjs"/>
+					<stat_bar label="Objets totaux" name="objs"/>
+					<stat_bar label="Nouveaux objets" name="newobjs"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
-					<stat_bar label="Count" name="numimagesstat"/>
-					<stat_bar label="Raw Count" name="numrawimagesstat"/>
-					<stat_bar label="GL Mem" name="gltexmemstat"/>
-					<stat_bar label="Formatted Mem" name="formattedmemstat"/>
-					<stat_bar label="Raw Mem" name="rawmemstat"/>
-					<stat_bar label="Bound Mem" name="glboundmemstat"/>
+					<stat_bar label="Nombre" name="numimagesstat"/>
+					<stat_bar label="Nombre brut" name="numrawimagesstat"/>
+					<stat_bar label="Mém GL" name="gltexmemstat"/>
+					<stat_bar label="Mém formatée" name="formattedmemstat"/>
+					<stat_bar label="Mém brute" name="rawmemstat"/>
+					<stat_bar label="Mém liée" name="glboundmemstat"/>
 				</stat_view>
-				<stat_view label="Network" name="network">
-					<stat_bar label="Packets In" name="packetsinstat"/>
-					<stat_bar label="Packets Out" name="packetsoutstat"/>
-					<stat_bar label="Objects" name="objectkbitstat"/>
+				<stat_view label="Réseau" name="network">
+					<stat_bar label="Paquets en entrée" name="packetsinstat"/>
+					<stat_bar label="Paquets en sortie" name="packetsoutstat"/>
+					<stat_bar label="Objets" name="objectkbitstat"/>
 					<stat_bar label="Texture" name="texturekbitstat"/>
-					<stat_bar label="Asset" name="assetkbitstat"/>
-					<stat_bar label="Layers" name="layerskbitstat"/>
-					<stat_bar label="Actual In" name="actualinkbitstat"/>
-					<stat_bar label="Actual Out" name="actualoutkbitstat"/>
-					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
+					<stat_bar label="Actif" name="assetkbitstat"/>
+					<stat_bar label="Couches" name="layerskbitstat"/>
+					<stat_bar label="Arrivés" name="actualinkbitstat"/>
+					<stat_bar label="Sortis" name="actualoutkbitstat"/>
+					<stat_bar label="Ops VFS en attente" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
-			<stat_view label="Simulator" name="sim">
-				<stat_bar label="Time Dilation" name="simtimedilation"/>
-				<stat_bar label="Sim FPS" name="simfps"/>
-				<stat_bar label="Physics FPS" name="simphysicsfps"/>
-				<stat_view label="Physics Details" name="physicsdetail">
-					<stat_bar label="Pinned Objects" name="physicspinnedtasks"/>
-					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
-					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>
-					<stat_bar label="Agent Updates/Sec" name="simagentups"/>
-					<stat_bar label="Main Agents" name="simmainagents"/>
-					<stat_bar label="Child Agents" name="simchildagents"/>
-					<stat_bar label="Objets" name="simobjects"/>
-					<stat_bar label="Active Objects" name="simactiveobjects"/>
-					<stat_bar label="Active Scripts" name="simactivescripts"/>
-					<stat_bar label="Script Events" name="simscripteps"/>
-					<stat_bar label="Packets In" name="siminpps"/>
-					<stat_bar label="Packets Out" name="simoutpps"/>
-					<stat_bar label="Pending Downloads" name="simpendingdownloads"/>
-					<stat_bar label="Pending Uploads" name="simpendinguploads"/>
-					<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
+			<stat_view label="Simulateur" name="sim">
+				<stat_bar label="Dilatation temporelle" name="simtimedilation"/>
+				<stat_bar label="FPS sim" name="simfps"/>
+				<stat_bar label="Propriétés physiques FPS" name="simphysicsfps"/>
+				<stat_view label="Détails des propriétés physiques" name="physicsdetail">
+					<stat_bar label="Objets fixés" name="physicspinnedtasks"/>
+					<stat_bar label="Objets LOD faibles" name="physicslodtasks"/>
+					<stat_bar label="Mémoire allouée" name="physicsmemoryallocated"/>
 				</stat_view>
-				<stat_view label="Time (ms)" name="simperf">
-					<stat_bar label="Total Frame Time" name="simframemsec"/>
-					<stat_bar label="Net Time" name="simnetmsec"/>
-					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>
-					<stat_bar label="Simulation Time" name="simsimothermsec"/>
-					<stat_bar label="Agent Time" name="simagentmsec"/>
-					<stat_bar label="Images Time" name="simimagesmsec"/>
-					<stat_bar label="Script Time" name="simscriptmsec"/>
+				<stat_bar label="Mises à jour avatar/s" name="simagentups"/>
+				<stat_bar label="Avatars principaux" name="simmainagents"/>
+				<stat_bar label="Avatars enfants" name="simchildagents"/>
+				<stat_bar label="Objets" name="simobjects"/>
+				<stat_bar label="Objets actifs" name="simactiveobjects"/>
+				<stat_bar label="Scripts actifs" name="simactivescripts"/>
+				<stat_bar label="Événements de scripts" name="simscripteps"/>
+				<stat_bar label="Paquets en entrée" name="siminpps"/>
+				<stat_bar label="Paquets en sortie" name="simoutpps"/>
+				<stat_bar label="En attente des téléchargements" name="simpendingdownloads"/>
+				<stat_bar label="En attente des chargements" name="simpendinguploads"/>
+				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
+				<stat_view label="Temps (ms)" name="simperf">
+					<stat_bar label="Durée du cadre totale" name="simframemsec"/>
+					<stat_bar label="Durée nette" name="simnetmsec"/>
+					<stat_bar label="Durée physique" name="simsimphysicsmsec"/>
+					<stat_bar label="Durée de la simulation" name="simsimothermsec"/>
+					<stat_bar label="Durée de l&apos;avatar" name="simagentmsec"/>
+					<stat_bar label="Durée des images" name="simimagesmsec"/>
+					<stat_bar label="Durée du script" name="simscriptmsec"/>
 				</stat_view>
 			</stat_view>
 		</container_view>
diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
new file mode 100644
index 0000000000..279320b04e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notification_chiclet" title="NOTIFICATIONS"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index c89eea517e..1c65a38828 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="TÉLÉHUB" min_height="310" height="310" >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater height="310" min_height="310" name="telehub" title="TÉLÉHUB">
 	<text name="status_text_connected">
 		Téléhub connecté à l&apos;objet [OBJECT]
 	</text>
@@ -9,17 +9,17 @@
 	<text name="help_text_connected">
 		Pour supprimer, cliquez sur Déconnecter.
 	</text>
-	<text name="help_text_not_connected" height="38" bottom_delta="-18">
+	<text bottom_delta="-18" height="38" name="help_text_not_connected">
 		Sélectionner l&apos;objet et cliquez sur Connecter
 le téléhub.
 	</text>
 	<button label="Connecter le téléhub" name="connect_btn" width="122"/>
-	<button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+	<button label="Déconnecter" left="142" name="disconnect_btn" width="98"/>
 	<text name="spawn_points_text" width="230">
 		Points d&apos;apparition (positions, pas objets) :
 	</text>
-	<button label="Ajouter point" name="add_spawn_point_btn" />
-	<button label="Supprimer point" name="remove_spawn_point_btn" />
+	<button label="Ajouter point" name="add_spawn_point_btn"/>
+	<button label="Supprimer point" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
 		Sélectionnez l&apos;objet et cliquez sur Ajouter pour
 indiquer la position. Vous pourrez ensuite
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index ff84025a44..197651c8fb 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="TEXTURE">
+<floater name="texture picker" title="CHOISIR : TEXTURE">
 	<string name="choose_picture">
 		Cliquez pour sélectionner une image
 	</string>
 	<text name="Multiple">
-		Multiple
+		Textures multiples
 	</text>
 	<text name="unknown">
-		Dimensions : [DIMENSIONS]
+		Taille : [DIMENSIONS]
 	</text>
-	<button label="Défaut" label_selected="Défaut" name="Default" width="60" />
-	<button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
-	<button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
+	<button label="Défaut" label_selected="Défaut" name="Default" width="60"/>
+	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
+	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<check_box label="Afficher les dossiers" name="show_folders_check"/>
-	<search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
-	<check_box label="Appliquer immédiatement" name="apply_immediate_check" />
-	<button label="" label_selected="" name="Pipette" bottom="-240" />
+	<search_editor label="Filtrer les textures" name="inventory search editor"/>
+	<check_box label="Appliquer maintenant" name="apply_immediate_check"/>
+	<button bottom="-240" label="" label_selected="" name="Pipette"/>
 	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+	<button label="Ok" label_selected="Ok" name="Select"/>
 	<string name="pick title">
 		Choisir :
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 3270634401..e5a5998cfb 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" short_title="Outils de construction" title="">
+<floater name="toolbox floater" short_title="OUTILS DE CONSTRUCTION" title="">
 	<floater.string name="status_rotate">
 		Pour faire tourner l&apos;objet, faîtes glisser les bandes de couleur.
 	</floater.string>
@@ -13,10 +13,10 @@
 		Cliquez et maintenez pour modifier le terrain.
 	</floater.string>
 	<floater.string name="status_camera">
-		Cliquez et faîtes glisser pour bouger la caméra
+		Cliquez et faites glisser pour bouger la caméra
 	</floater.string>
 	<floater.string name="status_grab">
-		Glisser pour déplacer, Ctrl pour soulever, Crtl-Maj pour pivoter.
+		Faites glisser pour déplacer, appuyez sur Ctrl pour soulever, Ctrl-Maj pour pivoter
 	</floater.string>
 	<floater.string name="status_place">
 		Cliquez dans le monde pour construire.
@@ -50,29 +50,32 @@
 	<radio_group name="focus_radio_group">
 		<radio_item label="Zoom" name="radio zoom"/>
 		<radio_item label="Orbite (Ctrl)" name="radio orbit"/>
-		<radio_item label="Panoramique (Ctrl-Maj)" name="radio pan"/>
+		<radio_item label="Faire un panoramique (Ctrl+Maj)" name="radio pan"/>
 	</radio_group>
 	<radio_group name="move_radio_group">
 		<radio_item label="Déplacer" name="radio move"/>
 		<radio_item label="Orbite (Ctrl)" name="radio lift"/>
-		<radio_item label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
+		<radio_item label="Faire tourner (Ctrl+Maj)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
 		<radio_item label="Bouger" name="radio position"/>
 		<radio_item label="Pivoter (Ctrl)" name="radio rotate"/>
-		<radio_item label="Étirer (Ctrl-Maj)" name="radio stretch"/>
+		<radio_item label="Étirer (Ctrl+Maj)" name="radio stretch"/>
 		<radio_item label="Sélectionner une face" name="radio select face"/>
 	</radio_group>
 	<check_box label="Modification liée" name="checkbox edit linked parts"/>
+	<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
+		þ : [COUNT]
+	</text>
 	<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
 	<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Fixer sur la grille" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode">
-		<combo_box.item label="Axe du monde" name="World"/>
-		<combo_box.item label="Axe local" name="Local"/>
-		<combo_box.item label="Axe de référence" name="Reference"/>
+	<combo_box name="combobox grid mode" tool_tip="Choisissez le type d&apos;axe de grille pour le positionnement de l&apos;objet">
+		<combo_box.item label="Grille du monde" name="World"/>
+		<combo_box.item label="Grille locale" name="Local"/>
+		<combo_box.item label="Grille de référence" name="Reference"/>
 	</combo_box>
-	<button label="Options..." label_selected="Options..." name="Options..." tool_tip="Définir les options de la grille"/>
+	<button label="Options..." label_selected="Options..." name="Options..." tool_tip="Afficher d&apos;autres options de grille"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme droit"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
@@ -112,10 +115,10 @@
 	</text>
 	<button label="Appliquer" label_selected="Appliquer" left="176" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
 	<text name="obj_count">
-		Objets : [COUNT]
+		Objets : [COUNT]
 	</text>
 	<text name="prim_count">
-		Prims : [COUNT]
+		Prims : [COUNT]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
@@ -141,13 +144,13 @@
 				Sélectionnez l&apos;objet en entier
 			</panel.string>
 			<panel.string name="Cost Default">
-				Prix : L$
+				Prix : L$
 			</panel.string>
 			<panel.string name="Cost Total">
-				Prix total : L$
+				Prix total : L$
 			</panel.string>
 			<panel.string name="Cost Per Unit">
-				Prix par : L$
+				Prix par : L$
 			</panel.string>
 			<panel.string name="Cost Mixed">
 				Prix mixte
@@ -165,23 +168,23 @@
 				Créateur :
 			</text>
 			<text name="Creator Name">
-				Thrax Linden
+				Esbee Linden
 			</text>
 			<text name="Owner:">
 				Propriétaire :
 			</text>
 			<text name="Owner Name">
-				Thrax Linden
+				Erica Linden
 			</text>
 			<text name="Group:">
 				Groupe :
 			</text>
 			<button label="Définir..." label_selected="Définir..." name="button set group" tool_tip="Choisissez un groupe pour partager les permissions de cet objet"/>
-			<name_box initial_value="Chargement…" name="Group Name Proxy"/>
+			<name_box initial_value="Chargement..." name="Group Name Proxy"/>
 			<button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les permissions au prochain propriétaire. Seul un officier peut céder les objets d&apos;un groupe."/>
 			<check_box label="Partager" name="checkbox share with group" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Transférer."/>
 			<text name="label click action">
-				Cliquer pour :
+				Cliquer pour :
 			</text>
 			<combo_box name="clickaction" width="178">
 				<combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/>
@@ -189,25 +192,27 @@
 				<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 				<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 				<combo_box.item label="Ouvrir" name="Open"/>
+				<combo_box.item label="Zoomer" name="Zoom"/>
 			</combo_box>
-			<check_box label="À vendre :" name="checkbox for sale"/>
+			<check_box label="À vendre :" name="checkbox for sale"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copie" name="Copy"/>
 				<combo_box.item label="Contenus" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Prix : L$" name="Edit Cost"/>
+			<spinner label="Prix : L$" name="Edit Cost"/>
 			<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
 					Vous pouvez modifier cet objet
 				</text>
 				<text name="Anyone can:">
-					N&apos;importe qui :
+					N&apos;importe qui :
 				</text>
+				<check_box label="Bouger" name="checkbox allow everyone move"/>
 				<check_box label="Copier" name="checkbox allow everyone copy"/>
 				<text name="Next owner can:">
-					Le prochain propriétaire :
+					Le prochain propriétaire :
 				</text>
 				<check_box label="Modifier" name="checkbox next owner can modify"/>
 				<check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
@@ -235,7 +240,7 @@
 		<panel label="Objet" name="Object">
 			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
 			<check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité"/>
-			<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L&apos;objet est supprimé 1 mn après sa création."/>
+			<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="Les objets sont supprimés une minute après leur création"/>
 			<check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l&apos;objet de ne pas entrer en collision avec d&apos;autres objets ou avatars."/>
 			<text name="label position">
 				Position (mètres)
@@ -335,8 +340,8 @@
 				Révolutions
 			</text>
 			<texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
-			<check_box label="Mirroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l&apos;axe des X."/>
-			<check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d&apos;un sculptie et le fait apparaître à l&apos;envers."/>
+			<check_box label="Mirroir" name="sculpt mirror control" tool_tip="Inverse le sculptie le long de l&apos;axe X"/>
+			<check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les normales des sculpties, qui apparaissent alors à l&apos;envers"/>
 			<text name="label sculpt type">
 				Type de raccord
 			</text>
@@ -355,7 +360,7 @@
 			<text name="edit_object">
 				Modifier les attributs de l&apos;objet :
 			</text>
-			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l&apos;objet de la souplesse sur l&apos;axe des Z (côté client uniquement)."/>
+			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Permet à l&apos;objet de se plier le long de l&apos;axe Z (côté client uniquement)"/>
 			<spinner label="Souplesse" name="FlexNumSections"/>
 			<spinner label="Gravité" name="FlexGravity"/>
 			<spinner label="Élasticité" name="FlexFriction"/>
@@ -366,9 +371,13 @@
 			<spinner label="Force Z" name="FlexForceZ"/>
 			<check_box label="Lumière" name="Light Checkbox Ctrl" tool_tip="Permet aux objets d&apos;émettre de la lumière"/>
 			<color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+			<texture_picker label="" name="light texture control" tool_tip="Cliquez pour choisir une image de projection (n&apos;a d&apos;effet que si le rendu différé est activé)"/>
 			<spinner label="Intensité" name="Light Intensity"/>
+			<spinner label="Angle de champ" name="Light FOV"/>
 			<spinner label="Portée" name="Light Radius"/>
+			<spinner label="Point central" name="Light Focus"/>
 			<spinner label="Atténuation" name="Light Falloff"/>
+			<spinner label="Ambiance" name="Light Ambiance"/>
 		</panel>
 		<panel label="Texture" name="Texture">
 			<panel.string name="string repeats per meter">
@@ -378,7 +387,7 @@
 				Répétitions par face
 			</panel.string>
 			<texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
-			<color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+			<color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 			<text name="color trans" width="88">
 				Transparence
 			</text>
@@ -426,20 +435,29 @@
 				<combo_box.item label="Tissage" name="weave"/>
 			</combo_box>
 			<text name="tex scale">
-				Répétitions par face
+				Répétitions / Face
 			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Inverser" name="checkbox flip s"/>
 			<spinner label="Vertical (V)" name="TexScaleV"/>
 			<check_box label="Inverser" name="checkbox flip t"/>
 			<spinner label="Rotation˚" left="122" name="TexRot" width="58"/>
-			<spinner label="Repeats / Meter" left="122" name="rptctrl" width="58"/>
+			<spinner label="Répétitions / Mètre" left="122" name="rptctrl" width="58"/>
 			<button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
 			<text name="tex offset">
 				Décalage de la texture
 			</text>
 			<spinner label="Horizontal (U)" name="TexOffsetU"/>
 			<spinner label="Vertical (V)" name="TexOffsetV"/>
+			<panel name="Add_Media">
+				<text name="media_tex">
+					URL du média
+				</text>
+				<button name="add_media" tool_tip="Ajouter un média"/>
+				<button name="delete_media" tool_tip="Supprimer cette texture de média"/>
+				<button name="edit_media" tool_tip="Modifier ce média"/>
+				<button label="Aligner" label_selected="Aligner le média" name="button align"/>
+			</panel>
 		</panel>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
@@ -451,13 +469,13 @@
 			Informations sur la parcelle
 		</text>
 		<text name="label_area_price">
-			Prix : [PRICE] L$ pour [AREA] m².
+			Prix : [PRICE] L$ pour [AREA] m²
 		</text>
 		<text name="label_area">
-			Surface : [AREA] m²
+			Surface : [AREA] m²
 		</text>
-		<button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="142"/>
-		<check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire : 
+		<button label="À propos des terrains" label_selected="À propos des terrains" name="button about land" width="142"/>
+		<check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorier les parcelles en fonction du type de leur propriétaire : 
 
 Vert = votre terrain 
 Turquoise = le terrain de votre groupe 
@@ -468,12 +486,12 @@ Gris = public"/>
 		<text name="label_parcel_modify">
 			Modifier la parcelle
 		</text>
-		<button label="Diviser" label_selected="Diviser" name="button subdivide land" width="142"/>
+		<button label="Sous-diviser" label_selected="Sous-diviser" name="button subdivide land" width="142"/>
 		<button label="Fusionner" label_selected="Fusionner" name="button join land" width="142"/>
 		<text name="label_parcel_trans">
 			Transactions
 		</text>
-		<button label="Acheter le terrain" label_selected="Acheter le terrain" name="button buy land" width="142"/>
+		<button label="Acheter du terrain" label_selected="Acheter du terrain" name="button buy land" width="142"/>
 		<button label="Abandonner le terrain" label_selected="Abandonner le terrain" name="button abandon land" width="142"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
index ba7052562c..2c8e8bc5bc 100644
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
@@ -1,18 +1,17 @@
-<?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="Continuer" label_selected="Continuer" name="Continue" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
+	<button label="Continuer" label_selected="Continuer" name="Continue"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
 	<radio_group name="tos_agreement">
-		<radio_item name="radio_disagree" label="Je n&apos;accepte pas les Conditions Générales d&apos;Utilisation" />
-		<radio_item name="radio_agree" label="J&apos;accepte les Conditions Générales d&apos;Utilisation" />
+		<radio_item label="Je n&apos;accepte pas les Conditions Générales d&apos;Utilisation" name="radio_disagree"/>
+		<radio_item label="J&apos;accepte les Conditions Générales d&apos;Utilisation" name="radio_agree"/>
 	</radio_group>
 	<text name="tos_title">
 		Acceptation des Conditions Générales d&apos;Utilisation
 	</text>
-	<check_box label="J&apos;accepte les Conditions d&apos;utilisation" name="agree_chk" />
+	<check_box label="J&apos;accepte les Conditions d&apos;utilisation" name="agree_chk"/>
 	<text name="tos_heading">
-		Veuillez lire attentivement les Conditions d&apos;utilisation suivantes. Pour continuer à utiliser
-[SECOND_LIFE], vous devez accepter ces conditions.
+		Veuillez lire attentivement les Conditions d&apos;utilisation suivantes. Pour vous connecter à [SECOND_LIFE], vous devez accepter l&apos;accord.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
new file mode 100644
index 0000000000..02d6430699
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_controls" title="Contrôles vocaux">
+	<panel name="control_panel">
+		<panel name="my_panel">
+			<text name="user_text" value="Mon avatar :"/>
+		</panel>
+		<layout_stack>
+			<layout_panel>
+				<slider_bar name="volume_slider_bar" tool_tip="Volume principal"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 3de5fee0ce..287f51d9f7 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -1,66 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCé">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCÉE">
+	<floater.string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</floater.string>
 	<text name="KeyFramePresetsText">
 		Préréglages eau :
 	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset" />
-	<button label="Enregistrer" label_selected="Enregistrer" name="WaterSavePreset" width="75" left_delta="75"/>
-	<button label="Supprimer" label_selected="Supprimer" name="WaterDeletePreset" left_delta="80"/>
+	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/>
+	<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">
 			<text name="BHText">
 				Couleur du brouillard
 dans l&apos;eau
 			</text>
-			<button label="?" name="WaterFogColorHelp" />
-			<color_swatch name="WaterFogColor" left="75" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+			<color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
 			<text name="WaterFogDensText">
 				Densité du brouillard
 			</text>
-			<button label="?" name="WaterFogDensityHelp" />
 			<text name="WaterUnderWaterFogModText">
 				Brouillard sous-marin
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp" />
 			<text name="BDensText">
 				Échelle des vaguelettes
 			</text>
-			<button label="?" name="WaterNormalScaleHelp" />
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
+			<slider label="1" name="WaterNormalScaleX"/>
+			<slider label="2" name="WaterNormalScaleY"/>
+			<slider label="3" name="WaterNormalScaleZ"/>
 			<text name="HDText">
 				Échelle Fresnel
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp" />
 			<text name="FresnelOffsetText">
 				Décalage Fresnel
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp" />
 			<text name="DensMultText">
 				Réfraction au dessus
 			</text>
-			<button label="?" name="WaterScaleAboveHelp" />
 			<text name="WaterScaleBelowText">
 				Réfraction en dessous
 			</text>
-			<button label="?" name="WaterScaleBelowHelp" />
 			<text name="MaxAltText">
 				Multiplicateur de flou
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp" />
 		</panel>
 		<panel label="Image" name="Waves">
 			<text name="BHText">
 				Direction grande vague
 			</text>
-			<button label="?" name="WaterWave1Help" />
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -70,7 +57,6 @@ dans l&apos;eau
 			<text name="BHText2">
 				Direction petite vague
 			</text>
-			<button label="?" name="WaterWave2Help" />
 			<text name="WaterWave2DirXText">
 				X
 			</text>
@@ -80,10 +66,6 @@ dans l&apos;eau
 			<text name="BHText3">
 				Normal Map
 			</text>
-			<button label="?" name="WaterNormalMapHelp" />
 		</panel>
 	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
new file mode 100644
index 0000000000..f1ba403bf9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="whitelist_entry">
+	<text name="media_label">
+		Saisissez une URL ou un style d&apos;URL à ajouter à la liste des domaines autorisés
+	</text>
+	<line_editor name="whitelist_entry" tool_tip="Saisissez une URL ou un style d&apos;URL à ajouter à la liste blanche"/>
+	<button label="OK" name="ok_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
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 4ff55d87b6..e28de71625 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706">
 	<text name="KeyFramePresetsText">
 		Préréglages ciel :
 	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset" />
-	<button label="Enregistrer" label_selected="Enregistrer" name="WLSavePreset" width="75" left_delta="75"/>
-	<button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
-	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
-	     name="WLDayCycleMenuButton" width="150" left_delta="95" />
+	<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_delta="95" name="WLDayCycleMenuButton" width="150"/>
 	<tab_container name="WindLight Tabs" width="706">
 		<panel label="Atmosphère" name="Atmosphere">
 			<text name="BHText">
 				Bleu de l&apos;horizon
 			</text>
-			<button label="?" name="WLBlueHorizonHelp" />
+			<button label="?" name="WLBlueHorizonHelp"/>
 			<text name="BHText2">
 				R
 			</text>
@@ -29,11 +28,11 @@
 			<text name="BDensText">
 				Quantité de brume
 			</text>
-			<button label="?" name="WLHazeHorizonHelp" />
+			<button label="?" name="WLHazeHorizonHelp"/>
 			<text name="BDensText2">
 				Densité du bleu
 			</text>
-			<button label="?" name="WLBlueDensityHelp" />
+			<button label="?" name="WLBlueDensityHelp"/>
 			<text name="BHText6">
 				R
 			</text>
@@ -49,25 +48,25 @@
 			<text name="HDText">
 				Densité de la brume
 			</text>
-			<button label="?" name="WLHazeDensityHelp" />
+			<button label="?" name="WLHazeDensityHelp"/>
 			<text name="DensMultText">
 				Multiplicateur de densité
 			</text>
-			<button label="?" name="WLDensityMultHelp" />
+			<button label="?" name="WLDensityMultHelp"/>
 			<text name="WLDistanceMultText">
 				Multiplicateur de distance
 			</text>
-			<button label="?" name="WLDistanceMultHelp" />
+			<button label="?" name="WLDistanceMultHelp"/>
 			<text name="MaxAltText">
 				Altitude maximum
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp" />
+			<button label="?" name="WLMaxAltitudeHelp"/>
 		</panel>
 		<panel label="Éclairage" name="Lighting">
 			<text name="SLCText">
 				Couleur soleil/lune
 			</text>
-			<button label="?" name="WLSunlightColorHelp" />
+			<button label="?" name="WLSunlightColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -83,11 +82,11 @@
 			<text name="TODText">
 				Position soleil/lune
 			</text>
-			<button label="?" name="WLTimeOfDayHelp" />
+			<button label="?" name="WLTimeOfDayHelp"/>
 			<text name="WLAmbientText">
 				Éclairage ambiant
 			</text>
-			<button label="?" name="WLAmbientHelp" />
+			<button label="?" name="WLAmbientHelp"/>
 			<text name="BHText5">
 				R
 			</text>
@@ -103,27 +102,27 @@
 			<text name="WLEastAngleText">
 				Angle du levant
 			</text>
-			<button label="?" name="WLEastAngleHelp" />
+			<button label="?" name="WLEastAngleHelp"/>
 			<text name="SunGlowText">
 				Rayonnement du soleil
 			</text>
-			<button label="?" name="WLSunGlowHelp" />
-			<slider label="Netteté " name="WLGlowB" />
-			<slider label="Taille    " name="WLGlowR" />
+			<button label="?" name="WLSunGlowHelp"/>
+			<slider label="Netteté " name="WLGlowB"/>
+			<slider label="Taille    " name="WLGlowR"/>
 			<text name="SceneGammaText">
 				Gamma de la scène
 			</text>
-			<button label="?" name="WLSceneGammaHelp" />
+			<button label="?" name="WLSceneGammaHelp"/>
 			<text name="WLStarText">
 				Éclat des étoiles
 			</text>
-			<button label="?" name="WLStarBrightnessHelp" />
+			<button label="?" name="WLStarBrightnessHelp"/>
 		</panel>
 		<panel label="Nuages" name="Clouds">
 			<text name="WLCloudColorText">
 				Couleur des nuages
 			</text>
-			<button label="?" name="WLCloudColorHelp" />
+			<button label="?" name="WLCloudColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -139,7 +138,7 @@
 			<text name="WLCloudColorText2">
 				Nuages XY/densité
 			</text>
-			<button label="?" name="WLCloudDensityHelp" />
+			<button label="?" name="WLCloudDensityHelp"/>
 			<text name="BHText5">
 				X
 			</text>
@@ -152,15 +151,15 @@
 			<text name="WLCloudCoverageText">
 				Couverture nuageuse
 			</text>
-			<button label="?" name="WLCloudCoverageHelp" left="407"/>
+			<button label="?" left="407" name="WLCloudCoverageHelp"/>
 			<text name="WLCloudScaleText">
 				Altitude des nuages
 			</text>
-			<button label="?" name="WLCloudScaleHelp" left="407"/>
+			<button label="?" left="407" name="WLCloudScaleHelp"/>
 			<text name="WLCloudDetailText">
 				Détails nuages (XY/densité)
 			</text>
-			<button label="?" name="WLCloudDetailHelp" left="407" bottom_delta="-2" />
+			<button bottom_delta="-2" label="?" left="407" name="WLCloudDetailHelp"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -173,15 +172,15 @@
 			<text name="WLCloudScrollXText">
 				Direction et vitesse X
 			</text>
-			<button label="?" name="WLCloudScrollXHelp" />
-			<check_box label="Verrouiller" name="WLCloudLockX" />
+			<button label="?" name="WLCloudScrollXHelp"/>
+			<check_box label="Verrouiller" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
 				Direction et vitesse Y
 			</text>
-			<button label="?" name="WLCloudScrollYHelp" />
-			<check_box label="Verrouiller" name="WLCloudLockY" />
-			<check_box label="Nuages classiques" name="DrawClassicClouds" />
-			<button label="?" name="WLClassicCloudsHelp" />
+			<button label="?" name="WLCloudScrollYHelp"/>
+			<check_box label="Verrouiller" name="WLCloudLockY"/>
+			<check_box label="Nuages classiques" name="DrawClassicClouds"/>
+			<button label="?" name="WLClassicCloudsHelp"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
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 ddb868b04a..03bbd0af08 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="CARTE DU MONDE">
 	<panel name="objects_mapview" width="542"/>
-	<icon name="self" left="-270"/>
+	<icon left="-270" name="self"/>
 	<text name="you_label">
 		Vous
 	</text>
@@ -9,39 +9,39 @@
 	<text name="home_label">
 		Domicile
 	</text>
-	<icon name="square2" left="-270"/>
+	<icon left="-270" name="square2"/>
 	<text name="auction_label">
 		Terrain aux enchères
 	</text>
-	<icon name="square" left_delta="130"/>
+	<icon left_delta="130" name="square"/>
 	<text name="land_for_sale_label">
 		Terrain à vendre
 	</text>
-	<button left="-120" width="108" label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+	<button label="Aller chez moi" label_selected="Aller chez moi" left="-120" name="Go Home" tool_tip="Vous téléporte à votre domicile" width="108"/>
 	<icon left="-262" name="person"/>
 	<check_box label="Résident" name="people_chk"/>
 	<icon left="-266" name="infohub"/>
 	<check_box label="Infohub" name="infohub_chk"/>
 	<icon left="-266" name="telehub"/>
-	<check_box label="Téléhub" name="telehubchk"/>
+	<check_box label="Téléhub" name="telehub_chk"/>
 	<icon left="-266" name="landforsale"/>
 	<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
-	<text name="events_label" left="-144">
+	<text left="-144" name="events_label">
 		Événements :
 	</text>
 	<icon left="-132" name="event"/>
 	<check_box label="PG" name="event_chk"/>
 	<icon left="-132" name="events_mature_icon"/>
-	<check_box label="Mature" name="event_mature_chk"/>
+	<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 	<icon left="-132" name="events_adult_icon"/>
 	<check_box label="Adult" name="event_adult_chk"/>
 	<icon left="-270" name="avatar_icon"/>
-	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
-		<combo_box.item name="item1" label="Amis connectés" />
+	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami(e) à afficher sur la carte" width="232">
+		<combo_box.item label="Amis connectés" name="item1"/>
 	</combo_box>
 	<icon left="-270" name="landmark_icon"/>
 	<combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
-		<combo_box.item name="item1" label="Repères" />
+		<combo_box.item label="Repères" name="item1"/>
 	</combo_box>
 	<icon left="-270" name="location_icon"/>
 	<line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155"/>
@@ -50,8 +50,8 @@
 		Résultats de la recherche :
 	</text>
 	<scroll_list left="-270" name="search_results" width="252">
-		<column label="" name="icon"/>
-		<column label="" name="sim_name"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="" name="sim_name"/>
 	</scroll_list>
 	<text left="-270" name="location_label">
 		Emplacement :
@@ -63,6 +63,6 @@
 	<button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/>
 	<button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
 	<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar" width="165"/>
-	<button label="Copier la SLurl dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copier l&apos;emplacement actuel comme SLurl pour l&apos;utiliser sur le Web." />
+	<button label="Copier la SLurl dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;une SLurl à utiliser sur le Web."/>
 	<slider label="Zoom" left="-270" name="zoom slider"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
index 7ee3ce957a..bfc4e06530 100644
--- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
@@ -8,9 +8,21 @@
 		[AGE]
 	</string>
 	<string name="Details">
-		[ACCTTYPE], [PAYMENTINFO]
-Profil : [SL_PROFILE]
+		[SL_PROFILE]
 	</string>
+	<string name="Partner">
+		Partenaire : [PARTNER]
+	</string>
+	<text name="user_name" value="Grumpity ProductEngine"/>
+	<text name="user_subtitle" value="11 mois, 3 jours"/>
+	<text name="user_details">
+		C&apos;est ma description second life et je la trouve vraiment géniale.
+	</text>
+	<text name="user_partner">
+		Erica Linden
+	</text>
 	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
 	<button label="Devenir amis" name="add_friend_btn"/>
+	<button label="IM" name="im_btn"/>
+	<button label="Plus" name="view_profile_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml
new file mode 100644
index 0000000000..9d6095632e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/inspect_group.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_group">
+	<string name="PrivateGroup">
+		Groupe privé
+	</string>
+	<string name="FreeToJoin">
+		Inscription gratuite
+	</string>
+	<string name="CostToJoin">
+		Inscription : [AMOUNT] L$
+	</string>
+	<string name="YouAreMember">
+		Vous êtes membre
+	</string>
+	<text name="group_name">
+		Groupe grognon des Orignaux Grumpity
+	</text>
+	<text name="group_subtitle">
+		123 membres
+	</text>
+	<text name="group_details">
+		Un groupe chargé de créer une pièce avec un orignal.
+Méfiez-vous de l&apos;orignal ! Méfiez-vous ! Et de la mangouste aussi !
+	</text>
+	<text name="group_cost">
+		Inscription : 123 L$
+	</text>
+	<button label="Vous inscrire" name="join_btn"/>
+	<button label="Quitter" name="leave_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml
new file mode 100644
index 0000000000..e50de400fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/inspect_object.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_object">
+	<string name="Creator">
+		Par [CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		par [CREATOR]
+propriétaire [OWNER]
+	</string>
+	<string name="Price">
+		[AMOUNT] L$
+	</string>
+	<string name="PriceFree">
+		Gratuit !
+	</string>
+	<string name="Touch">
+		Toucher
+	</string>
+	<string name="Sit">
+		M&apos;asseoir
+	</string>
+	<text name="object_name" value="Nom d&apos;objet de test vraiment très long"/>
+	<text name="object_creator">
+		par secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+	</text>
+	<text name="price_text">
+		300 000 L$
+	</text>
+	<text name="object_description">
+		Cette description d&apos;objet est vraiment très longue : elle compte au moins 80 caractères, voire plus de 120, vraiment très très longue. Who knows, really?
+	</text>
+	<text name="object_media_url">
+		http://www.superdupertest.com
+	</text>
+	<button label="Acheter" name="buy_btn"/>
+	<button label="Payer" name="pay_btn"/>
+	<button label="Prendre une copie" name="take_free_copy_btn"/>
+	<button label="Toucher" name="touch_btn"/>
+	<button label="M&apos;asseoir" name="sit_btn"/>
+	<button label="Ouvert" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="Navigation sécurisée"/>
+	<button label="Plus" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
new file mode 100644
index 0000000000..6d8c44578a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
@@ -0,0 +1,25 @@
+<?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_name">
+		Nom d&apos;objet de test vraiment très long
+	</text>
+	<text name="object_owner_label">
+		Propriétaire :
+	</text>
+	<text name="object_owner">
+		Longavatarname Johnsonlongstonnammer
+	</text>
+	<text name="object_slurl_label">
+		Lieu :
+	</text>
+	<text name="object_slurl">
+		http://slurl.com/Ahern/50/50/50
+	</text>
+	<button label="Carte" name="map_btn"/>
+	<button label="Ignorer" name="block_btn"/>
+	<button label="Fermer" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
new file mode 100644
index 0000000000..46db635afd
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="Bouton Geste" name="ShowGestureButton"/>
+	<menu_item_check label="Bouton Bouger" name="ShowMoveButton"/>
+	<menu_item_check label="Bouton Afficher" name="ShowCameraButton"/>
+	<menu_item_check label="Bouton Photo" name="ShowSnapshotButton"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
new file mode 100644
index 0000000000..02d734045a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gesture_gear">
+	<menu_item_call label="Ajouter/Supprimer des Favoris" name="activate"/>
+	<menu_item_call label="Copier" name="copy_gesture"/>
+	<menu_item_call label="Coller" name="paste"/>
+	<menu_item_call label="Copier l&apos;UUID" name="copy_uuid"/>
+	<menu_item_call label="Enregistrer dans la tenue actuelle" name="save_to_outfit"/>
+	<menu_item_call label="Éditer" name="edit_gesture"/>
+	<menu_item_call label="Inspecter" name="inspect"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
new file mode 100644
index 0000000000..3a7126fe50
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_navbar_menu">
+	<menu_item_check label="Afficher la barre de navigation" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="Afficher la barre des Favoris" name="ShowNavbarFavoritesPanel"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..59f97d8b48
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet Group Menu">
+	<menu_item_call label="Profil du groupe" name="Show Profile"/>
+	<menu_item_call label="Afficher la session" name="Chat"/>
+	<menu_item_call label="Mettre fin à la session" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..b1683ffcd0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet P2P Menu">
+	<menu_item_call label="Afficher le profil" name="Show Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Afficher la session" name="Send IM"/>
+	<menu_item_call label="Mettre fin à la session" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..9a4926b678
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Inviter dans le groupe" name="invite_to_group"/>
+	<menu_item_call label="Ignorer" name="block"/>
+	<menu_item_call label="Signaler" name="report"/>
+	<menu_item_call label="Geler" name="freeze"/>
+	<menu_item_call label="Expulser" name="eject"/>
+	<menu_item_call label="Débogage" name="debug"/>
+	<menu_item_call label="Situer sur la carte" name="find_on_map"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Payer" name="pay"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..0ecce069bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Toucher" name="touch"/>
+	<menu_item_call label="M&apos;asseoir" name="sit"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Acheter" name="buy"/>
+	<menu_item_call label="Prendre" name="take"/>
+	<menu_item_call label="Prendre une copie" name="take_copy"/>
+	<menu_item_call label="Ouvrir" name="open"/>
+	<menu_item_call label="Éditer" name="edit"/>
+	<menu_item_call label="Porter" name="wear"/>
+	<menu_item_call label="Signaler" name="report"/>
+	<menu_item_call label="Ignorer" name="block"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Supprimer" name="remove"/>
+	<menu_item_call label="En savoir plus" name="more_info"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
new file mode 100644
index 0000000000..d28d36bca7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="Me lever" name="stand_up"/>
+	<menu_item_call label="Mon apparence" name="my_appearance"/>
+	<menu_item_call label="Mon profil" name="my_profile"/>
+	<menu_item_call label="Mes amis" name="my_friends"/>
+	<menu_item_call label="Mes groupes" name="my_groups"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 4e2cb04498..d6da4b5557 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -22,6 +22,8 @@
 		<menu_item_call label="Nouveaux gants" name="New Gloves"/>
 		<menu_item_call label="Nouveau tricot" name="New Undershirt"/>
 		<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+		<menu_item_call label="Nouveau masque alpha" name="New Alpha Mask"/>
+		<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
 	</menu>
 	<menu label="Nouvelles parties du corps" name="New Body Parts">
 		<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
@@ -46,18 +48,21 @@
 	<menu_item_call label="Ouvrir" name="Sound Open"/>
 	<menu_item_call label="Purger l&apos;objet" name="Purge Item"/>
 	<menu_item_call label="Restaurer l&apos;objet" name="Restore Item"/>
+	<menu_item_call label="Trouver l&apos;original" name="Find Original"/>
 	<menu_item_call label="Ouvrir" name="Open"/>
 	<menu_item_call label="Propriétés" name="Properties"/>
 	<menu_item_call label="Renommer" name="Rename"/>
 	<menu_item_call label="Copier l&apos;UUID (identifiant universel unique)" name="Copy Asset UUID"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
+	<menu_item_call label="Coller comme lien" name="Paste As Link"/>
 	<menu_item_call label="Supprimer" name="Delete"/>
-	<menu_item_call label="Enlever les objets" name="Take Off Items"/>
+	<menu_item_call label="Enlever de la tenue" name="Remove From Outfit"/>
 	<menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit"/>
 	<menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit"/>
 	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
 	<menu_item_call label="Jouer" name="Sound Play"/>
+	<menu_item_call label="À propos du repère" name="About Landmark"/>
 	<menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
 	<menu_item_call label="Jouer localement" name="Animation Audition"/>
 	<menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
@@ -65,6 +70,7 @@
 	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Désactiver" name="Deactivate"/>
+	<menu_item_call label="Enregistrer sous" name="Save As"/>
 	<menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
 	<menu_item_call label="Porter" name="Object Wear"/>
 	<menu label="Attacher à" name="Attach To"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
new file mode 100644
index 0000000000..0e5abdad0a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="Importer" name="upload">
+		<menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
+		<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
+		<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="Nouveau dossier" name="New Folder"/>
+	<menu_item_call label="Nouveau script" name="New Script"/>
+	<menu_item_call label="Nouvelle note" name="New Note"/>
+	<menu_item_call label="Nouveau geste" name="New Gesture"/>
+	<menu label="Nouveaux habits" name="New Clothes">
+		<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+		<menu_item_call label="Nouveau pantalon" name="New Pants"/>
+		<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+		<menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+		<menu_item_call label="Nouvelle veste" name="New Jacket"/>
+		<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+		<menu_item_call label="Nouveaux gants" name="New Gloves"/>
+		<menu_item_call label="Nouveaux sous-vêtements (homme)" name="New Undershirt"/>
+		<menu_item_call label="Nouveaux sous-vêtements (femme)" name="New Underpants"/>
+		<menu_item_call label="Nouvel alpha" name="New Alpha"/>
+		<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
+	</menu>
+	<menu label="Nouvelles parties du corps" name="New Body Parts">
+		<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+		<menu_item_call label="Nouvelle peau" name="New Skin"/>
+		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..5fe7a215a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="Nouvelle fenêtre d&apos;inventaire" name="new_window"/>
+	<menu_item_call label="Trier par nom" name="sort_by_name"/>
+	<menu_item_call label="Trier en commençant par le plus récent" name="sort_by_recent"/>
+	<menu_item_call label="Afficher les filtres" name="show_filters"/>
+	<menu_item_call label="Réinitialiser les filtres" name="reset_filters"/>
+	<menu_item_call label="Fermer tous les dossiers" name="close_folders"/>
+	<menu_item_call label="Vider la corbeille" name="empty_trash"/>
+	<menu_item_call label="Vider les Objets trouvés" name="empty_lostnfound"/>
+	<menu_item_call label="Enregistrer la texture sous" name="Save Texture As"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml
index dfa794960e..2e0cafa227 100644
--- a/indra/newview/skins/default/xui/fr/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/fr/menu_landmark.xml
@@ -2,5 +2,6 @@
 <toggleable_menu name="landmark_overflow_menu">
 	<menu_item_call label="Copier la SLurl" name="copy"/>
 	<menu_item_call label="Supprimer" name="delete"/>
-	<menu_item_call label="Créer un Favori" name="pick"/>
+	<menu_item_call label="Créer une préférence" name="pick"/>
+	<menu_item_call label="Ajouter à la barre des Favoris" name="add_to_favbar"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 212216f16f..ac262a75e6 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -1,13 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="Fichier" name="File">
-		<menu_item_call label="Quitter" name="Quit" />
-	</menu>
-	<menu label="Édition" name="Edit">
-		<menu_item_call label="Préférences..." name="Preferences..." />
+	<menu label="Moi" name="File">
+		<menu_item_call label="Préférences" name="Preferences..."/>
+		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Aide" name="Help">
-		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help" />
-		<menu_item_call label="À propos de [APP_NAME]..." name="About Second Life..." />
+		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+	</menu>
+	<menu label="Débogage" name="Debug">
+		<menu label="Éditer" name="Edit">
+			<menu_item_call label="Annuler" name="Undo"/>
+			<menu_item_call label="Refaire" name="Redo"/>
+			<menu_item_call label="Couper" name="Cut"/>
+			<menu_item_call label="Copier" name="Copy"/>
+			<menu_item_call label="Coller" name="Paste"/>
+			<menu_item_call label="Supprimer" name="Delete"/>
+			<menu_item_call label="Dupliquer" name="Duplicate"/>
+			<menu_item_call label="Tout sélectionner" name="Select All"/>
+			<menu_item_call label="Désélectionner" name="Deselect"/>
+		</menu>
+		<menu_item_call label="Afficher les paramètres de débogage" name="Debug Settings"/>
+		<menu_item_call label="Paramètres de couleurs/interface" name="UI/Color Settings"/>
+		<menu_item_call label="Outil d&apos;aperçu XUI" name="UI Preview Tool"/>
+		<menu_item_call label="Afficher la barre latérale" name="Show Side Tray"/>
+		<menu_item_call label="Test widget" name="Widget Test"/>
+		<menu_item_call label="Tests inspecteurs" name="Inspectors Test"/>
+		<menu_item_check label="Reg In Client Test (restart)" name="Reg In Client Test (restart)"/>
+		<menu_item_call label="Afficher les conditions d&apos;utilisation" name="TOS"/>
+		<menu_item_call label="Afficher le message critique" name="Critical"/>
+		<menu_item_call label="Test du navigateur Web" name="Web Browser Test"/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
index 219eb4ad4c..a9facb2c30 100644
--- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Zoom rapproché" name="Zoom Close"/>
 	<menu_item_call label="Zoom moyen" name="Zoom Medium"/>
 	<menu_item_call label="Zoom éloigné" name="Zoom Far"/>
+	<menu_item_check label="Faire pivoter la carte" name="Rotate Map"/>
 	<menu_item_call label="Arrêter de suivre" name="Stop Tracking"/>
 	<menu_item_call label="Carte du monde" name="World Map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml
index 1b11dcbb0c..08d810b653 100644
--- a/indra/newview/skins/default/xui/fr/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_navbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
 	<menu_item_check label="Voir les coordonnées" name="Show Coordinates"/>
+	<menu_item_check label="Afficher les propriétés de la parcelle" name="Show Parcel Properties"/>
 	<menu_item_call label="Repère" name="Landmark"/>
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
new file mode 100644
index 0000000000..99e22aeff7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="NearBy Chat Menu">
+	<menu_item_call label="Afficher les personnes près de vous..." name="nearby_people"/>
+	<menu_item_check label="Afficher le texte ignoré" name="muted_text"/>
+	<menu_item_check label="Afficher les icônes des Buddy" name="show_buddy_icons"/>
+	<menu_item_check label="Afficher les noms" name="show_names"/>
+	<menu_item_check label="Afficher les icônes et les noms" name="show_icons_and_names"/>
+	<menu_item_call label="Taille de la police" name="font_size"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
new file mode 100644
index 0000000000..69f8e88a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Object Icon Menu">
+	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
+	<menu_item_call label="Ignorer..." name="Block"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
new file mode 100644
index 0000000000..96d9a003cd
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Participant List Context Menu">
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+	<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
new file mode 100644
index 0000000000..5adf8714cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par statut" name="sort_status"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_call label="Afficher les résidents et les objets ignorés" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
new file mode 100644
index 0000000000..34f949cf2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
+	<menu_item_call label="Quitter le groupe sélectionné" name="Leave Selected Group"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
new file mode 100644
index 0000000000..946063dda2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Avatar Context Menu">
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<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"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
new file mode 100644
index 0000000000..2185ac95e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Multi-Selected People Context Menu">
+	<menu_item_call label="Devenir amis" name="Add Friends"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
new file mode 100644
index 0000000000..45f97e062e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par distance" name="sort_distance"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_call label="Afficher les résidents et les objets interdits" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
new file mode 100644
index 0000000000..93b90ae61c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_call label="Afficher les résidents et les objets ignorés" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
new file mode 100644
index 0000000000..a3b4fb4f55
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="picks_plus_menu">
+	<menu_item_call label="Nouveau Favori" name="create_pick"/>
+	<menu_item_call label="Nouvelle petite annonce" name="create_classified"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml
index 9928e302a0..beaf37011f 100644
--- a/indra/newview/skins/default/xui/fr/menu_place.xml
+++ b/indra/newview/skins/default/xui/fr/menu_place.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
 	<menu_item_call label="Enregistrer comme repère" name="landmark"/>
-	<menu_item_call label="Créer un Favori" name="pick"/>
+	<menu_item_call label="Créer une préférence" name="pick"/>
 	<menu_item_call label="Acheter un pass" name="pass"/>
 	<menu_item_call label="Éditer" name="edit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
new file mode 100644
index 0000000000..92f9e7719d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="Ajouter un dossier" name="add_folder"/>
+	<menu_item_call label="Ajouter un repère" name="add_landmark"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
new file mode 100644
index 0000000000..3570bdec7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="Ajouter un repère" name="add_landmark"/>
+	<menu_item_call label="Ajouter un dossier" name="add_folder"/>
+	<menu_item_call label="Couper" name="cut"/>
+	<menu_item_call label="Copier" name="copy_folder"/>
+	<menu_item_call label="Coller" name="paste"/>
+	<menu_item_call label="Renommer" name="rename"/>
+	<menu_item_call label="Supprimer" name="delete"/>
+	<menu_item_call label="Agrandir" name="expand"/>
+	<menu_item_call label="Réduire" name="collapse"/>
+	<menu_item_call label="Développer tous les dossiers" name="expand_all"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse_all"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..2ad007c142
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_ladmark_gear">
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Plus d&apos;informations" name="more_info"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Ajouter un repère" name="add_landmark"/>
+	<menu_item_call label="Ajouter un dossier" name="add_folder"/>
+	<menu_item_call label="Couper" name="cut"/>
+	<menu_item_call label="Copier le repère" name="copy_landmark"/>
+	<menu_item_call label="Copier la SLurl" name="copy_slurl"/>
+	<menu_item_call label="Coller" name="paste"/>
+	<menu_item_call label="Renommer" name="rename"/>
+	<menu_item_call label="Supprimer" name="delete"/>
+	<menu_item_call label="Développer tous les dossiers" name="expand_all"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse_all"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+	<menu_item_call label="Créer une préférence" name="create_pick"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
new file mode 100644
index 0000000000..61a346c6af
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="profile_overflow_menu">
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Partager" name="share"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..3dea662cc2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Teleport History Gear Context Menu">
+	<menu_item_call label="Développer tous les dossiers" name="Expand all folders"/>
+	<menu_item_call label="Réduire tous les dossiers" name="Collapse all folders"/>
+	<menu_item_call label="Effacer l&apos;historique des téléportations" name="Clear Teleport History"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
new file mode 100644
index 0000000000..fb4582dbce
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Téléporter" name="Teleport"/>
+	<menu_item_call label="Plus d&apos;informations" name="More Information"/>
+	<menu_item_call label="Copier dans le presse-papiers" name="CopyToClipboard"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
new file mode 100644
index 0000000000..369680985d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="Ouvrir" name="TabOpen"/>
+	<menu_item_call label="Fermer" name="TabClose"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
new file mode 100644
index 0000000000..b6f429aec9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Text editor context menu">
+	<menu_item_call label="Couper" name="Cut"/>
+	<menu_item_call label="Copier" name="Copy"/>
+	<menu_item_call label="Coller" name="Paste"/>
+	<menu_item_call label="Supprimer" name="Delete"/>
+	<menu_item_call label="Tout sélectionner" name="Select All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 816070cf3a..5ed627fbc3 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
-	<menu_item_call label="Copier le nom dans le presse-papier" name="url_copy_label"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml
index f16a91cf7b..de90c3ff7e 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Voir le profil du groupe" name="show_group"/>
-	<menu_item_call label="Copier le groupe dans le presse-papier" name="url_copy_label"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Copier le groupe dans le presse-papiers" name="url_copy_label"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml
index 15db7900b3..5e96352999 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_http.xml
@@ -3,5 +3,5 @@
 	<menu_item_call label="Ouvrir la page Web" name="url_open"/>
 	<menu_item_call label="Ouvrir dans un navigateur interne" name="url_open_internal"/>
 	<menu_item_call label="Ouvrir dans un navigateur externe" name="url_open_external"/>
-	<menu_item_call label="Copier l&apos;URL dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Copier l&apos;URL dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
new file mode 100644
index 0000000000..8ab88b4be7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Afficher l&apos;article d&apos;inventaire" name="show_item"/>
+	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml
new file mode 100644
index 0000000000..67e6986f5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_map.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à cet endroit" name="teleport_to_location"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index 69449538d8..f581c3ef9d 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
-	<menu_item_call label="Me téléporter à l&apos;endroit de l&apos;objet" name="teleport_to_object"/>
-	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papier" name="url_copy_label"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
+	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
index 7d77b35036..07b0eeca49 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Afficher les informations sur la parcelle" name="show_parcel"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
new file mode 100644
index 0000000000..f4b7e212ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="Exécuter cette commande" name="run_slapp"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
index 70564a6768..e44943cf15 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Afficher les informations sur ce lieu" name="show_place"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à cet endroit" name="teleport_to_location"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
index 4aaaf34408..a5075a2740 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Me téléporter à cet endroit." name="teleport"/>
-	<menu_item_call label="Copier la SLurl dans le presse-papier" name="url_copy"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 532714531b..2d5def55f3 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,225 +1,426 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
-	<menu name="Me">
+	<menu label="Moi" name="Me">
 		<menu_item_call label="Préférences" name="Preferences"/>
-		<menu_item_call name="Manage My Account">
-			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr" />
+		<menu_item_call label="Ma Page d&apos;accueil" name="Manage My Account">
+			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
 		</menu_item_call>
-	</menu>
-	<menu label="Fichier" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu label="Importer" name="upload">
-			<menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
-			<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
-			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
-			<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_call label="Définir les droits par défaut..." name="perm prefs"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
-		<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
-		<menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk" shortcut="control|shift|X"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Quitter" name="Quit"/>
-	</menu>
-	<menu label="Édition" name="Edit">
-		<menu_item_call label="Annuler" name="Undo"/>
-		<menu_item_call label="Recommencer" name="Redo"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Couper" name="Cut"/>
-		<menu_item_call label="Copier" name="Copy"/>
-		<menu_item_call label="Coller" name="Paste"/>
-		<menu_item_call label="Supprimer" name="Delete"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Rechercher..." name="Search..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Tout sélectionner" name="Select All"/>
-		<menu_item_call label="Désélectionner" name="Deselect"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Dupliquer" name="Duplicate"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu label="Attacher l&apos;objet" name="Attach Object"/>
-		<menu label="Détacher l&apos;objet" name="Detach Object"/>
-		<menu label="Enlever mes habits" name="Take Off Clothing">
-			<menu_item_call label="Chemise" name="Shirt"/>
-			<menu_item_call label="Pantalon" name="Pants"/>
-			<menu_item_call label="Chaussures" name="Shoes"/>
-			<menu_item_call label="Chaussettes" name="Socks"/>
-			<menu_item_call label="Veste" name="Jacket"/>
-			<menu_item_call label="Gants" name="Gloves"/>
-			<menu_item_call label="Tricot" name="Menu Undershirt"/>
-			<menu_item_call label="Sous-vêtements" name="Menu Underpants"/>
-			<menu_item_call label="Jupe" name="Skirt"/>
-			<menu_item_call label="Tous les habits" name="All Clothes"/>
+		<menu_item_call label="Acheter des L$" name="Buy and Sell L$"/>
+		<menu_item_call label="Mon profil" name="Profile"/>
+		<menu_item_call label="Mon apparence" name="Appearance"/>
+		<menu_item_check label="Mon inventaire" name="Inventory"/>
+		<menu_item_call label="Afficher l&apos;inventaire de la barre latérale" name="ShowSidetrayInventory"/>
+		<menu_item_call label="Mes gestes" name="Gestures"/>
+		<menu label="Mon statut" name="Status">
+			<menu_item_call label="Absent" name="Set Away"/>
+			<menu_item_call label="Occupé" name="Set Busy"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Gestes..." name="Gestures..."/>
-		<menu_item_call label="Profil..." name="Profile..."/>
-		<menu_item_call label="Apparence..." name="Appearance..."/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu_item_check label="Amis..." name="Friends..."/>
-		<menu_item_call label="Groupes..." name="Groups..."/>
-		<menu_item_separator label="-----------" name="separator8"/>
-		<menu_item_call label="Préférences..." name="Preferences..."/>
+		<menu_item_call label="Demander le statut Admin" name="Request Admin Options"/>
+		<menu_item_call label="Quitter le statut Admin" name="Leave Admin Options"/>
+		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
-	<menu label="Affichage" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu_item_call label="Vue subjective" name="Mouselook"/>
-		<menu_item_check label="Construire" name="Build"/>
-		<menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
-		<menu_item_call label="Réinitialiser l&apos;affichage" name="Reset View"/>
-		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="Barre d&apos;outils" name="Toolbar"/>
-		<menu_item_check label="Chat local" name="Chat History"/>
-		<menu_item_check label="Communiquer" name="Instant Message"/>
-		<menu_item_check label="Inventaire" name="Inventory"/>
-		<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
-		<menu_item_check label="Liste des ignorés" name="Mute List"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
-		<menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
-		<menu_item_check label="Carte du monde" name="World Map"/>
-		<menu_item_check label="Mini-carte" name="Mini-Map"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="Statistiques" name="Statistics Bar"/>
-		<menu_item_check label="Limites des parcelles" name="Property Lines"/>
-		<menu_item_check label="Barrières d&apos;interdiction d&apos;accès" name="Banlines"/>
-		<menu_item_check label="Propriétaires fonciers" name="Land Owners"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu label="Infobulles" name="Hover Tips">
-			<menu_item_check label="Affichez les infobulles" name="Show Tips"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_check label="Infobulles des terrains" name="Land Tips"/>
-			<menu_item_check label="Infobulles de tous les objets" name="Tips On All Objects"/>
-		</menu>
-		<menu_item_check label="Voir les objets invisibles" name="Highlight Transparent"/>
-		<menu_item_check label="Balises" name="beacons"/>
-		<menu_item_check label="Masquer les particules" name="Hide Particles"/>
-		<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="Zoomer" name="Zoom In"/>
-		<menu_item_call label="Zoom par défaut" name="Zoom Default"/>
-		<menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
-		<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
+	<menu label="Communiquer" name="Communicate">
+		<menu_item_call label="Mes amis" name="My Friends"/>
+		<menu_item_call label="Mes groupes" name="My Groups"/>
+		<menu_item_check label="Chat près de vous" name="Nearby Chat"/>
+		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_check label="Média près de vous" name="Nearby Media"/>
+		<menu_item_check label="(Ancienne version) Communiquer" name="Instant Message"/>
+		<menu_item_call label="(Temp) Télécommande média" name="Preferences"/>
 	</menu>
 	<menu label="Monde" name="World">
-		<menu_item_call label="Chat" name="Chat"/>
-		<menu_item_check label="Toujours courir" name="Always Run"/>
-		<menu_item_check label="Voler" name="Fly" shortcut="F"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
-		<menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Me mettre absent(e)" name="Set Away"/>
-		<menu_item_call label="Me mettre occupé(e)" name="Set Busy"/>
-		<menu_item_call label="Arrêter d&apos;animer mon avatar" name="Stop Animating My Avatar"/>
-		<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Historique de mon compte..." name="Account History...">
-			<menu_item_call.on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/>
-		</menu_item_call>
-		<menu_item_call label="Gérer mon compte..." name="Manage My Account...">
-			<menu_item_call.on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
-		</menu_item_call>
-		<menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="Mes terrains..." name="My Land..."/>
-		<menu_item_call label="À propos du terrain..." name="About Land..."/>
-		<menu_item_call label="Acheter le terrain..." name="Buy Land..."/>
-		<menu_item_call label="Région et domaine..." name="Region/Estate..."/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu label="Environnement" name="Environment Settings">
+		<menu_item_check label="Bouger" name="Movement Controls"/>
+		<menu_item_check label="Affichage" name="Camera Controls"/>
+		<menu_item_call label="À propos des terrains" name="About Land"/>
+		<menu_item_call label="Région/Domaine" name="Region/Estate"/>
+		<menu_item_call label="Acheter du terrain" name="Buy Land"/>
+		<menu_item_call label="Mes terrains" name="My Land"/>
+		<menu label="Afficher" name="Land">
+			<menu_item_check label="Lignes d&apos;interdiction" name="Ban Lines"/>
+			<menu_item_check label="Balises" name="beacons"/>
+			<menu_item_check label="Limites du terrain" name="Property Lines"/>
+			<menu_item_check label="Propriétaires de terrains" name="Land Owners"/>
+		</menu>
+		<menu label="Repères" name="Landmarks">
+			<menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
+			<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
+		</menu>
+		<menu_item_call label="Domicile" name="Teleport Home"/>
+		<menu_item_check label="Mini-carte" name="Mini-Map"/>
+		<menu_item_check label="Carte du monde" name="World Map"/>
+		<menu_item_call label="Photo" name="Take Snapshot"/>
+		<menu label="Soleil" name="Environment Settings">
 			<menu_item_call label="Aube" name="Sunrise"/>
 			<menu_item_call label="Milieu de journée" name="Noon"/>
 			<menu_item_call label="Coucher de soleil" name="Sunset"/>
 			<menu_item_call label="Minuit" name="Midnight"/>
-			<menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
-			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Utiliser l&apos;heure du domaine" name="Revert to Region Default"/>
 			<menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor"/>
 		</menu>
 	</menu>
-	<menu label="Outils" name="Tools">
-		<menu label="Sélectionner un outil" name="Select Tool">
-			<menu_item_call label="Mise au point" name="Focus"/>
-			<menu_item_call label="Déplacer" name="Move"/>
-			<menu_item_call label="Éditer" name="Edit"/>
-			<menu_item_call label="Créer" name="Create"/>
-			<menu_item_call label="Terrain" name="Land"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
-		<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
-		<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
-		<menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
-		<menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
-		<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
-		<menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
-		<menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
-		<menu_item_call label="Options de la grille..." name="Grid Options..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
-		<menu_item_call label="Lier" name="Link"/>
-		<menu_item_call label="Délier" name="Unlink"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
-		<menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
-		<menu_item_call label="Acheter l&apos;objet" name="Menu Object Take">
-			<menu_item_call.on_enable parameter="Acheter,Prendre" name="EnableBuyOrTake"/>
-		</menu_item_call>
-		<menu_item_call label="Prendre une copie" name="Take Copy"/>
-		<menu_item_call label="Remplacer l&apos;objet dans le contenu de l&apos;objet" name="Save Object Back to Object Contents"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="Afficher la fenêtre d&apos;alertes/erreurs de script" name="Show Script Warning/Error Window"/>
-		<menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono"/>
-			<menu_item_call label="LSL" name="LSL"/>
-		</menu>
-		<menu_item_call label="Réinitialiser les scripts dans la sélection" name="Reset Scripts in Selection"/>
-		<menu_item_call label="Activer les scripts dans la sélection" name="Set Scripts to Running in Selection"/>
-		<menu_item_call label="Désactiver les scripts dans la sélection" name="Set Scripts to Not Running in Selection"/>
+	<menu label="Construire" name="BuildTools">
+		<menu_item_check label="Construire" name="Show Build Tools"/>
+		<menu label="Sélectionner l&apos;outil de construction" name="Select Tool">
+			<menu_item_call label="Outil de zoom" name="Focus"/>
+			<menu_item_call label="Outil de déplacement" name="Move"/>
+			<menu_item_call label="Outil de modification" name="Edit"/>
+			<menu_item_call label="Outil de création" name="Create"/>
+			<menu_item_call label="Outil Terrain" name="Land"/>
+		</menu>
+		<menu label="Édition" name="Edit">
+			<menu_item_call label="Annuler" name="Undo"/>
+			<menu_item_call label="Refaire" name="Redo"/>
+			<menu_item_call label="Couper" name="Cut"/>
+			<menu_item_call label="Copier" name="Copy"/>
+			<menu_item_call label="Coller" name="Paste"/>
+			<menu_item_call label="Supprimer" name="Delete"/>
+			<menu_item_call label="Dupliquer" name="Duplicate"/>
+			<menu_item_call label="Tout sélectionner" name="Select All"/>
+			<menu_item_call label="Désélectionner" name="Deselect"/>
+		</menu>
+		<menu_item_call label="Lien" name="Link"/>
+		<menu_item_call label="Annuler le lien" name="Unlink"/>
+		<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="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"/>
+		</menu>
+		<menu label="Scripts" name="Scripts">
+			<menu_item_call label="Recompiler les scripts (Mono)" name="Mono"/>
+			<menu_item_call label="Recompiler les scripts (LSL)" name="LSL"/>
+			<menu_item_call label="Réinitialiser les scripts" name="Reset Scripts"/>
+			<menu_item_call label="Définir les scripts sur Exécution" name="Set Scripts to Running"/>
+			<menu_item_call label="Définir les scripts sur Pas d&apos;exécution" name="Set Scripts to Not Running"/>
+		</menu>
+		<menu label="Options" name="Options">
+			<menu_item_check label="Modifier les parties reliées" name="Edit Linked Parts"/>
+			<menu_item_call label="Définir les droits de chargement par défaut" name="perm prefs"/>
+			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
+			<menu label="Sélection" name="Selection">
+				<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
+				<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
+				<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
+			</menu>
+			<menu label="Afficher" name="Show">
+				<menu_item_check label="Afficher la sélection masquée" name="Show Hidden Selection"/>
+				<menu_item_check label="Afficher le rayon lumineux pour la sélection" name="Show Light Radius for Selection"/>
+				<menu_item_check label="Afficher le faisceau de sélection lumineux" name="Show Selection Beam"/>
+			</menu>
+			<menu label="Grille" name="Grid">
+				<menu_item_check label="Fixer sur la grille" name="Snap to Grid"/>
+				<menu_item_call label="Fixer les coordonnées XY de l&apos;objet sur la grille" name="Snap Object XY to Grid"/>
+				<menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
+				<menu_item_call label="Options de la grille" name="Grid Options"/>
+			</menu>
+		</menu>
+		<menu label="Sélectionner les parties reliées" name="Select Linked Parts">
+			<menu_item_call label="Sélectionner la partie suivante" name="Select Next Part"/>
+			<menu_item_call label="Sélectionner la partie précédente" name="Select Previous Part"/>
+			<menu_item_call label="Inclure la partie suivante" name="Include Next Part"/>
+			<menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/>
+		</menu>
 	</menu>
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
 		<menu_item_call label="Didacticiel" name="Tutorial"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Blog officiel..." name="Official Linden Blog..."/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Aide sur le LSL..." name="Scripting Portal...">
-			<menu_item_call.on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
-		<menu_item_call label="Collisions, coups et bousculades…" name="Bumps, Pushes &amp;amp; Hits..."/>
-		<menu_item_call label="Mesure du lag" name="Lag Meter"/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu label="Signaler des bugs" name="Bug Reporting">
-			<menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
-			<menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help...">
-				<menu_item_call.on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator7"/>
-			<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101...">
-				<menu_item_call.on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
-			</menu_item_call>
-			<menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
-				<menu_item_call.on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/>
-			</menu_item_call>
-			<menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
-			<menu_item_separator label="-----------" name="separator9"/>
-			<menu_item_call label="Signaler un bug..." name="Report Bug..."/>
-		</menu>
-		<menu_item_call label="À propos de [APP_NAME]..." name="About Second Life..."/>
+		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
+		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+	</menu>
+	<menu label="Avancé" name="Advanced">
+		<menu_item_check label="Me mettre en mode absent après 30 minutes" name="Go Away/AFK When Idle"/>
+		<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
+		<menu_item_call label="Refixer les textures" name="Rebake Texture"/>
+		<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
+		<menu_item_check label="Limiter la distance de sélection" name="Limit Select Distance"/>
+		<menu_item_check label="Désactiver les contraintes de la caméra" name="Disable Camera Distance"/>
+		<menu_item_check label="Photo haute résolution" name="HighResSnapshot"/>
+		<menu_item_check label="Photos discrètes sur disque" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="Compresser les photos sur disque" name="CompressSnapshotsToDisk"/>
+		<menu_item_call label="Enregistrer la texture sous" name="Save Texture As"/>
+		<menu label="Outils de performance" name="Performance Tools">
+			<menu_item_call label="Mesure du lag" name="Lag Meter"/>
+			<menu_item_check label="Barre de statistiques" name="Statistics Bar"/>
+			<menu_item_check label="Afficher le coût de rendu de l&apos;avatar" name="Avatar Rendering Cost"/>
+		</menu>
+		<menu label="Surbrillance et visibilité" name="Highlighting and Visibility">
+			<menu_item_check label="Balise animée" name="Cheesy Beacon"/>
+			<menu_item_check label="Cacher les particules" name="Hide Particles"/>
+			<menu_item_check label="Masquer la sélection" name="Hide Selected"/>
+			<menu_item_check label="Mettre la transparence en surbrillance" name="Highlight Transparent"/>
+			<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
+			<menu_item_check label="Afficher le réticule de la vue subjective" name="ShowCrosshairs"/>
+			<menu_item_check label="Afficher les info-bulles de terrain" name="Land Tips"/>
+		</menu>
+		<menu label="Types de rendu" name="Rendering Types">
+			<menu_item_check label="Simple" name="Simple"/>
+			<menu_item_check label="Alpha" name="Alpha"/>
+			<menu_item_check label="Arbre" name="Tree"/>
+			<menu_item_check label="Avatars" name="Character"/>
+			<menu_item_check label="SurfacePath" name="SurfacePath"/>
+			<menu_item_check label="Ciel" name="Sky"/>
+			<menu_item_check label="Eau" name="Water"/>
+			<menu_item_check label="Sol" name="Ground"/>
+			<menu_item_check label="Volume" name="Volume"/>
+			<menu_item_check label="Herbe" name="Grass"/>
+			<menu_item_check label="Nuages" name="Clouds"/>
+			<menu_item_check label="Particules" name="Particles"/>
+			<menu_item_check label="Placage de relief" name="Bump"/>
+		</menu>
+		<menu label="Fonctionnalités de rendu" name="Rendering Features">
+			<menu_item_check label="Interface" name="UI"/>
+			<menu_item_check label="Sélection" name="Selected"/>
+			<menu_item_check label="En surbrillance" name="Highlighted"/>
+			<menu_item_check label="Textures dynamiques" name="Dynamic Textures"/>
+			<menu_item_check label="Ombres des pieds" name="Foot Shadows"/>
+			<menu_item_check label="Brouillard" name="Fog"/>
+			<menu_item_check label="Tester FRInfo" name="Test FRInfo"/>
+			<menu_item_check label="Objets flexibles" name="Flexible Objects"/>
+		</menu>
+		<menu_item_check label="Exécuter plusieurs threads" name="Run Multiple Threads"/>
+		<menu_item_call label="Effacer le cache du groupe" name="ClearGroupCache"/>
+		<menu_item_check label="Effet de lissage de la souris" name="Mouse Smoothing"/>
+		<menu_item_check label="Afficher les IM dans le chat près de vous" name="IMInChat"/>
+		<menu label="Raccourcis" name="Shortcuts">
+			<menu_item_check label="Rechercher" name="Search"/>
+			<menu_item_call label="Relâcher les touches" name="Release Keys"/>
+			<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
+			<menu_item_check label="Toujours courir" name="Always Run"/>
+			<menu_item_check label="Voler" name="Fly"/>
+			<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
+			<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
+			<menu_item_call label="Photo sur disque" name="Snapshot to Disk"/>
+			<menu_item_call label="Vue subjective" name="Mouselook"/>
+			<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
+			<menu_item_call label="Réinitialiser la vue" name="Reset View"/>
+			<menu_item_call label="Regarder la dernière conversation" name="Look at Last Chatter"/>
+			<menu label="Sélectionner l&apos;outil de construction" name="Select Tool">
+				<menu_item_call label="Outil de zoom" name="Focus"/>
+				<menu_item_call label="Outil de déplacement" name="Move"/>
+				<menu_item_call label="Outil de modification" name="Edit"/>
+				<menu_item_call label="Outil de création" name="Create"/>
+				<menu_item_call label="Outil Terrain" name="Land"/>
+			</menu>
+			<menu_item_call label="Zoomer en avant" name="Zoom In"/>
+			<menu_item_call label="Zoom par défaut" name="Zoom Default"/>
+			<menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
+			<menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
+		</menu>
+		<menu_item_call label="Afficher les paramètres de débogage" name="Debug Settings"/>
+		<menu_item_check label="Afficher le menu Développeurs" name="Debug Mode"/>
+	</menu>
+	<menu label="Développeurs" name="Develop">
+		<menu label="Consoles" name="Consoles">
+			<menu_item_check label="Console de textures" name="Texture Console"/>
+			<menu_item_check label="Console de débogage" name="Debug Console"/>
+			<menu_item_call label="Console de notifications" name="Notifications"/>
+			<menu_item_check label="Console de tailles de textures" name="Texture Size"/>
+			<menu_item_check label="Console des catégories de textures" name="Texture Category"/>
+			<menu_item_check label="Chronos" name="Fast Timers"/>
+			<menu_item_check label="Mémoire" name="Memory"/>
+			<menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/>
+			<menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/>
+			<menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/>
+			<menu_item_check label="Caméra" name="Camera"/>
+			<menu_item_check label="Vent" name="Wind"/>
+			<menu_item_check label="Angle de champ" name="FOV"/>
+		</menu>
+		<menu label="Afficher les infos" name="Display Info">
+			<menu_item_check label="Afficher l&apos;heure" name="Show Time"/>
+			<menu_item_check label="Afficher les infos de rendu" name="Show Render Info"/>
+			<menu_item_check label="Afficher les matrices" name="Show Matrices"/>
+			<menu_item_check label="Afficher la couleur sous le curseur" name="Show Color Under Cursor"/>
+			<menu_item_check label="Afficher les mises à jour des objets" name="Show Updates"/>
+		</menu>
+		<menu label="Forcer une erreur" name="Force Errors">
+			<menu_item_call label="Forcer le point de rupture" name="Force Breakpoint"/>
+			<menu_item_call label="Forcer LLError et plantage" name="Force LLError And Crash"/>
+			<menu_item_call label="Forcer un mauvais accès à la mémoire" name="Force Bad Memory Access"/>
+			<menu_item_call label="Forcer une boucle infinie" name="Force Infinite Loop"/>
+			<menu_item_call label="Forcer le plantage du driver" name="Force Driver Carsh"/>
+			<menu_item_call label="Forcer une exception logicielle" name="Force Software Exception"/>
+			<menu_item_call label="Forcer la déconnexion du client" name="Force Disconnect Viewer"/>
+			<menu_item_call label="Simuler une fuite de mémoire" name="Memory Leaking Simulation"/>
+		</menu>
+		<menu label="Tests de rendu" name="Render Tests">
+			<menu_item_check label="Décalage de la caméra" name="Camera Offset"/>
+			<menu_item_check label="Taux de défilement aléatoire" name="Randomize Framerate"/>
+			<menu_item_check label="Cadre lent périodique" name="Periodic Slow Frame"/>
+			<menu_item_check label="Test cadre" name="Frame Test"/>
+		</menu>
+		<menu label="Métadonnées de rendu" name="Render Metadata">
+			<menu_item_check label="Cadres" name="Bounding Boxes"/>
+			<menu_item_check label="Octree" name="Octree"/>
+			<menu_item_check label="Shadow Frusta" name="Shadow Frusta"/>
+			<menu_item_check label="Occlusion" name="Occlusion"/>
+			<menu_item_check label="Lots de rendu" name="Render Batches"/>
+			<menu_item_check label="Texture Anim" name="Texture Anim"/>
+			<menu_item_check label="Priorité de la texture" name="Texture Priority"/>
+			<menu_item_check label="Zone de texture" name="Texture Area"/>
+			<menu_item_check label="Zone de face" name="Face Area"/>
+			<menu_item_check label="Lumières" name="Lights"/>
+			<menu_item_check label="Squelette de collision" name="Collision Skeleton"/>
+			<menu_item_check label="Rayons" name="Raycast"/>
+		</menu>
+		<menu label="Rendu" name="Rendering">
+			<menu_item_check label="Axes" name="Axes"/>
+			<menu_item_check label="Tangente" name="Tangent Basis"/>
+			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
+			<menu_item_check label="Filaire" name="Wireframe"/>
+			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
+			<menu_item_check label="Objets de mémoire vidéo" name="Framebuffer Objects"/>
+			<menu_item_check label="Rendu différé" name="Deferred Rendering"/>
+			<menu_item_check label="Illumination globale" name="Global Illumination"/>
+			<menu_item_check label="Débogage GL" name="Debug GL"/>
+			<menu_item_check label="Débogage pipeline" name="Debug Pipeline"/>
+			<menu_item_check label="Alpha rapide" name="Fast Alpha"/>
+			<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
+			<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
+			<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
+			<menu_item_check label="Audit Textures" name="Audit Textures"/>
+			<menu_item_check label="Atlas des textures" name="Texture Atlas"/>
+			<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
+			<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>
+			<menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/>
+		</menu>
+		<menu label="Réseau" name="Network">
+			<menu_item_check label="Pauser l&apos;avatar" name="AgentPause"/>
+			<menu_item_call label="Activer le journal des messages" name="Enable Message Log"/>
+			<menu_item_call label="Désactiver le journal des messages" name="Disable Message Log"/>
+			<menu_item_check label="Velocity Interpolate Objects" name="Velocity Interpolate Objects"/>
+			<menu_item_check label="Interpolation ping des positions des objets" name="Ping Interpolate Object Positions"/>
+			<menu_item_call label="Abandonner un paquet" name="Drop a Packet"/>
+		</menu>
+		<menu_item_call label="Dump caméra scriptée" name="Dump Scripted Camera"/>
+		<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu label="Enregistreur" name="Recorder">
+			<menu_item_call label="Commencer la lecture" name="Start Playback"/>
+			<menu_item_call label="Arrêter la lecture" name="Stop Playback"/>
+			<menu_item_check label="Lecture en boucle" name="Loop Playback"/>
+			<menu_item_call label="Commencer l&apos;enregistrement" name="Start Record"/>
+			<menu_item_call label="Arrêter l&apos;enregistrement" name="Stop Record"/>
+		</menu>
+		<menu label="Monde" name="World">
+			<menu_item_check label="Sim Sun Override" name="Sim Sun Override"/>
+			<menu_item_check label="Balise animée" name="Cheesy Beacon"/>
+			<menu_item_check label="Météo fixe" name="Fixed Weather"/>
+			<menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/>
+		</menu>
+		<menu label="Interface" name="UI">
+			<menu_item_call label="Test du navigateur Web" name="Web Browser Test"/>
+			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
+			<menu_item_call label="Dump inventaire" name="Dump Inventory"/>
+			<menu_item_call label="Dump Timers" name="Dump Timers"/>
+			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
+			<menu_item_call label="Imprimer les infos sur l&apos;objet sélectionné" name="Print Selected Object Info"/>
+			<menu_item_call label="Imprimer les infos sur l&apos;avatar" name="Print Agent Info"/>
+			<menu_item_call label="Statistiques de mémoire" name="Memory Stats"/>
+			<menu_item_check label="Double-ClickAuto-Pilot" name="Double-ClickAuto-Pilot"/>
+			<menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/>
+			<menu_item_check label="Débogage clics" name="Debug Clicks"/>
+			<menu_item_check label="Débogage des vues" name="Debug Views"/>
+			<menu_item_check label="Débogage des info-bulles de noms" name="Debug Name Tooltips"/>
+			<menu_item_check label="Débogage des événements de souris" name="Debug Mouse Events"/>
+			<menu_item_check label="Débogage touches" name="Debug Keys"/>
+			<menu_item_check label="Débogage WindowProc" name="Debug WindowProc"/>
+		</menu>
+		<menu label="XUI" name="XUI">
+			<menu_item_call label="Recharger les paramètres de couleurs" name="Reload Color Settings"/>
+			<menu_item_call label="Afficher le test de police" name="Show Font Test"/>
+			<menu_item_call label="Charger à partir de XML" name="Load from XML"/>
+			<menu_item_call label="Enregistrer en XML" name="Save to XML"/>
+			<menu_item_check label="Afficher les noms XUI" name="Show XUI Names"/>
+			<menu_item_call label="Envoyer des IM tests" name="Send Test IMs"/>
+			<menu_item_call label="Tests inspecteurs" name="Test Inspectors"/>
+		</menu>
+		<menu label="Avatar" name="Character">
+			<menu label="Récupérer la texture fixée" name="Grab Baked Texture">
+				<menu_item_call label="Iris" name="Iris"/>
+				<menu_item_call label="Tête" name="Head"/>
+				<menu_item_call label="Haut du corps" name="Upper Body"/>
+				<menu_item_call label="Bas du corps" name="Lower Body"/>
+				<menu_item_call label="Jupe" name="Skirt"/>
+			</menu>
+			<menu label="Tests personnages" name="Character Tests">
+				<menu_item_call label="Apparence dans XML" name="Appearance To XML"/>
+				<menu_item_call label="Basculer la géométrie des personnages" name="Toggle Character Geometry"/>
+				<menu_item_call label="Test homme" name="Test Male"/>
+				<menu_item_call label="Test femme" name="Test Female"/>
+				<menu_item_call label="Activer/désactiver PG" name="Toggle PG"/>
+				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
+			</menu>
+			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
+			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
+			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
+			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
+			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
+			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
+			<menu_item_check label="Désactiver LOD" name="Disable LOD"/>
+			<menu_item_check label="Debogage Character Vis" name="Debug Character Vis"/>
+			<menu_item_check label="Afficher le squelette de collision" name="Show Collision Skeleton"/>
+			<menu_item_check label="Afficher la cible de l&apos;avatar" name="Display Agent Target"/>
+			--&gt;
+			<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
+			<menu_item_call label="Débogage des textures des avatars" name="Debug Avatar Textures"/>
+			<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
+		</menu>
+		<menu_item_call label="Compresser les images" name="Compress Images"/>
+		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
+		<menu_item_check label="Console Window on next Run" name="Console Window"/>
+		<menu_item_check label="Afficher le menu Admin" name="View Admin Options"/>
+		<menu_item_call label="Demander le statut Admin" name="Request Admin Options"/>
+		<menu_item_call label="Quitter le statut Admin" name="Leave Admin Options"/>
+	</menu>
+	<menu label="Admin" name="Admin">
+		<menu label="Object">
+			<menu_item_call label="Prendre une copie" name="Take Copy"/>
+			<menu_item_call label="Forcer le propriétaire sur moi" name="Force Owner To Me"/>
+			<menu_item_call label="Forcer la permission du propriétaire" name="Force Owner Permissive"/>
+			<menu_item_call label="Supprimer" name="Delete"/>
+			<menu_item_call label="Verrouiller" name="Lock"/>
+			<menu_item_call label="Obtenir les ID d&apos;actifs" name="Get Assets IDs"/>
+		</menu>
+		<menu label="Parcelle" name="Parcel">
+			<menu_item_call label="Propriétaire à moi" name="Owner To Me"/>
+			<menu_item_call label="Définir sur le contenu Linden" name="Set to Linden Content"/>
+			<menu_item_call label="Réclamer un terrain public" name="Claim Public Land"/>
+		</menu>
+		<menu label="Région" name="Region">
+			<menu_item_call label="Dump Temp Asset Data" name="Dump Temp Asset Data"/>
+			<menu_item_call label="Enregistrer l&apos;état de la région" name="Save Region State"/>
+		</menu>
+		<menu_item_call label="Outils divins" name="God Tools"/>
+	</menu>
+	<menu label="Admin" name="Deprecated">
+		<menu label="Joindre l&apos;objet" name="Attach Object"/>
+		<menu label="Détacher l&apos;objet" name="Detach Object"/>
+		<menu label="Me déshabiller" name="Take Off Clothing">
+			<menu_item_call label="Chemise" name="Shirt"/>
+			<menu_item_call label="Pantalon" name="Pants"/>
+			<menu_item_call label="Chaussures" name="Shoes"/>
+			<menu_item_call label="Chaussettes" name="Socks"/>
+			<menu_item_call label="Veste" name="Jacket"/>
+			<menu_item_call label="Gants" name="Gloves"/>
+			<menu_item_call label="Sous-vêtements (homme)" name="Menu Undershirt"/>
+			<menu_item_call label="Sous-vêtements (femme)" name="Menu Underpants"/>
+			<menu_item_call label="Jupe" name="Skirt"/>
+			<menu_item_call label="Alpha" name="Alpha"/>
+			<menu_item_call label="Tatouage" name="Tattoo"/>
+			<menu_item_call label="Tous les habits" name="All Clothes"/>
+		</menu>
+		<menu_item_check label="Afficher la barre d&apos;outils" name="Show Toolbar"/>
+		<menu label="Aide" name="Help">
+			<menu_item_call label="Blog officiel des Linden" name="Official Linden Blog"/>
+			<menu_item_call label="Portail d&apos;écriture de scripts" name="Scripting Portal"/>
+			<menu label="Signaler des bugs" name="Bug Reporting">
+				<menu_item_call label="JIRA" name="Public Issue Tracker"/>
+				<menu_item_call label="Aide du JIRA" name="Publc Issue Tracker Help"/>
+				<menu_item_call label="Comment signaler des bugs" name="Bug Reporing 101"/>
+				<menu_item_call label="Problèmes de sécurité" name="Security Issues"/>
+				<menu_item_call label="Wiki sur l&apos;Assurance Qualité" name="QA Wiki"/>
+			</menu>
+		</menu>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 558b04d68e..dd277c9d37 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -35,7 +35,7 @@
 	<notification functor="GenericAcknowledge" label="Message d&apos;alerte inconnu" name="MissingAlert">
 		Votre version de [APP_NAME] ne peut afficher ce message d&apos;erreur.  Veuillez vous assurer que vous avez bien la toute dernière version du client.
 
-Détails de l&apos;erreur : L&apos;alerte, appelée &apos;[_NAME]&apos; est introuvable dans notifications.xml.
+Détails de l&apos;erreur : L&apos;alerte, appelée &apos;[_NAME]&apos;, est introuvable dans notifications.xml.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="FloaterNotFound">
@@ -56,7 +56,7 @@ Détails de l&apos;erreur : L&apos;alerte, appelée &apos;[_NAME]&apos; est int
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
 	</notification>
 	<notification name="BadInstallation">
-		Une erreur est survenue lors de la mise à jour de [APP_NAME].  Veuillez télécharger la dernière version su client. http://get.secondlife.com
+		Une erreur est survenue lors de la mise à jour de [APP_NAME].  Veuillez [http://get.secondlife.com télécharger la dernière version] du client.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
@@ -149,6 +149,9 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ?
 Ajouter ce pouvoir à « [ROLE_NAME] » ?
 		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="ClickUnimplemented">
+		Désolés, pas encore mis en œuvre.
+	</notification>
 	<notification name="JoinGroupCanAfford">
 		Rejoindre ce groupe coûte [COST] L$.
 Voulez-vous continuer ?
@@ -178,10 +181,10 @@ Votre prix de vente sera de [SALE_PRICE] L$ et la vente sera disponible à [NAME
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
-		Attention : en cliquant sur Vendre à n&apos;importe qui, vous rendez votre terrain disponible à toute la communauté de [SECOND_LIFE], même aux personnes qui ne sont pas dans cette région.
+		ATTENTION : en cliquant sur Vendre à n&apos;importe qui, vous rendez votre terrain disponible à toute la communauté de [SECOND_LIFE], même aux personnes qui ne sont pas dans cette région.
 
 Le terrain sélectionné, de [LAND_SIZE] m², est mis en vente.
-Votre prix de vente sera de [SALE_PRICE] L$ et la vente sera disponible à [NAME].
+Votre prix de vente sera de [SALE_PRICE]L$ et la vente sera disponible à [NAME].
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
@@ -241,6 +244,18 @@ Objets : [N]
 Les dégâts sont autorisés dans toute la région.
 Pour que les armes fonctionnent, les scripts doivent être autorisés.
 	</notification>
+	<notification name="MultipleFacesSelected">
+		Plusieurs faces sont sélectionnées.
+Si vous poursuivez cette action, des instances séparées du média seront définies sur plusieurs faces de l&apos;objet.
+Pour ne placer le média que sur une seule face, choisissez Sélectionner une texture, cliquez sur la face de l&apos;objet de votre choix, puis sur Ajouter.
+		<usetemplate ignoretext="Le média sera défini sur plusieurs faces sélectionnées" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WhiteListInvalidatesHomeUrl">
+		Si vous ajoutez cette entrée à la liste blanche, l&apos;URL du domicile que vous avez spécifiée
+pour cette instance du média ne sera plus valide. Vous n&apos;êtes pas autorisé(e) à faire cela,
+l&apos;entrée ne peut donc pas être ajoutée à la liste blanche.
+		<usetemplate name="okbutton" yestext="Ok"/>
+	</notification>
 	<notification name="MustBeInParcel">
 		Pour définir le point d&apos;atterrissage, vous devez vous trouver à l&apos;intérieur de la parcelle.
 	</notification>
@@ -276,6 +291,10 @@ Ce dossier ne contient pas d&apos;habits, de parties du corps ni de pièces join
 	<notification name="CannotWearTrash">
 		Vous ne pouvez pas porter d&apos;habits ni de parties du corps se trouvant dans la corbeille.
 	</notification>
+	<notification name="MaxAttachmentsOnOutfit">
+		Impossible de joindre l&apos;objet.
+La limite de [MAX_ATTACHMENTS] objets joints a été dépassée. Veuillez commencer par supprimer un objet joint existant.
+	</notification>
 	<notification name="CannotWearInfoNotComplete">
 		Vous ne pouvez pas porter cet article car il n&apos;a pas encore été chargé. Veuillez réessayer dans une minute.
 	</notification>
@@ -290,7 +309,7 @@ Pour entrer dans [SECOND_LIFE], vous devez avoir un compte. Voulez-vous en crée
 		<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
 	</notification>
 	<notification name="AddClassified">
-		Les petites annonces sont publiées à l&apos;onglet Petites annonces de la section Recherche pendant une semaine.
+		Les petites annonces sont publiées à l&apos;onglet Petites annonces de la section Recherche et sur [http://secondlife.com/community/classifieds secondlife.com] pendant une semaine.
 Rédigez votre annonce, puis cliquez sur Publier pour l&apos;ajouter à la liste des annonces.
 Au moment de cliquer sur Publier, vous serez invité à payer des frais.
 Plus vous payez cher, plus votre annonce est visible dans la liste ainsi que dans les résultats de recherche de mots-clés.
@@ -301,6 +320,11 @@ Plus vous payez cher, plus votre annonce est visible dans la liste ainsi que dan
 Une fois payés, les frais ne sont pas remboursables.
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="DeleteMedia">
+		Vous avez choisi de supprimer le média associé à cette face.
+Voulez-vous vraiment continuer ?
+		<usetemplate ignoretext="Confirmer avant de supprimer un média d&apos;un objet" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="ClassifiedSave">
 		Enregistrer les changements dans l&apos;annonce [NAME] ?
 		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
@@ -393,7 +417,7 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 		Une erreur est survenue lors de l&apos;enregistrement du script compilé, suite au problème suivant : [REASON]. Essayez d&apos;enregistrer votre script ultérieurement.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Vous n&apos;avez pas défini de région de départ. 
+		Vous n&apos;avez pas défini de région de départ.
 Veuillez saisir le nom de la région dans la case Lieu de départ, ou choisissez Dernier emplacement ou Domicile comme Lieu de départ.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -408,27 +432,26 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 		Impossible d&apos;écrire le fichier [[FILE]]
 	</notification>
 	<notification name="UnsupportedHardware">
-		Avertissement : vous n&apos;avez pas la configuration système requise pour utiliser [APP_NAME]. Si vous continuez à utiliser [APP_NAME], votre performance risque d&apos;être moindre. Malheureusement, la section [SUPPORT_SITE] n&apos;offre aucune aide pour les problèmes de configuration système.
+		Avertissement : vous n&apos;avez pas la configuration système requise pour utiliser [APP_NAME]. Si vous continuez à utiliser [APP_NAME], votre performance risque d&apos;être moindre. Malheureusement, la page [SUPPORT_SITE] n&apos;offre aucune assistance pour les problèmes de configuration système.
 
 MINSPECS
-Voulez-vous visiter [_URL] pour plus d&apos;informations ?
+Voulez-vous visiter [_URL] pour plus d&apos;informations ?
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=fr
 		</url>
 		<usetemplate ignoretext="Mon matériel n&apos;est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="UnknownGPU">
-		Votre système contient une carte graphique que nous ne connaissons pas actuellement.
-Cela est souvent le cas avec le nouveau materiel qui n&apos;a pas encore été testé avec [APP_NAME].  Vous pourrez probablement utiliser [APP_NAME] sans problème, mais vous devrez peut-être ajuster les paramètres de vos graphiques.
-(Préférences &gt; Graphiques).
+		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas actuellement.
+Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME]. Vous pourrez probablement utiliser [APP_NAME] sans problème, mais vous devrez peut-être ajuster les paramètres de vos graphiques.
+(Moi &gt; Préférences &gt; Graphiques).
 		<form name="form">
 			<ignore name="ignore" text="Ma carte graphique ne peut être identifiée"/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
 		[APP_NAME] a planté lors de l&apos;initialisation des drivers graphiques.
-La qualité des graphiques sera paramétrée sur Faible pour éviter certaines erreurs de driver fréquentes.
-Certaines fonctionnalités graphiques seront donc désactivées.
+La qualité des graphiques sera paramétrée sur Faible pour éviter certaines erreurs de driver fréquentes. Certaines fonctionnalités graphiques seront donc désactivées.
 Nous vous recommandons de mettre à jour les drivers de votre carte graphique.
 La qualité des graphiques peut être augmentée à la section Préférences &gt; Graphiques
 	</notification>
@@ -481,6 +504,9 @@ Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le M
 		Expulser [AVATAR_NAME] de votre terrain ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
 	</notification>
+	<notification name="EjectAvatarFromGroup">
+		Vous avez expulsé [AVATAR_NAME] du groupe [GROUP_NAME]
+	</notification>
 	<notification name="AcquireErrorTooManyObjects">
 		Erreur d&apos;acquisition : trop d&apos;objets sélectionnés.
 	</notification>
@@ -491,7 +517,7 @@ Veuillez mettre tous les objets que vous souhaitez acquérir dans la même régi
 	<notification name="PromptGoToCurrencyPage">
 		[EXTRA]
 
-Aller sur [_URL] pour obtenir des informations sur l&apos;achat de L$ ?
+Aller sur [_URL] pour obtenir des informations sur l&apos;achat de L$ ?
 		<url name="url">
 			http://secondlife.com/app/currency/?lang=fr-FR
 		</url>
@@ -580,14 +606,14 @@ Assurez-vous que le fichier a l&apos;extension correcte.
 		Impossible de créer le fichier de sortie : [FILE]
 	</notification>
 	<notification name="DoNotSupportBulkAnimationUpload">
-		Actuellement, APP_NAME] ne prend pas en charge le chargement de lots de fichiers d&apos;animation.
+		Actuellement, [APP_NAME] ne prend pas en charge le chargement de lots de fichiers d&apos;animation.
 	</notification>
 	<notification name="CannotUploadReason">
 		Impossible de charger [FILE] suite au problème suivant : [REASON]
 Veuillez réessayer ultérieurement.
 	</notification>
 	<notification name="LandmarkCreated">
-		Vous avez ajouté &quot;[LANDMARK_NAME]&quot; à votre dossier [FOLDER_NAME].
+		Vous avez ajouté [LANDMARK_NAME] à votre dossier [FOLDER_NAME].
 	</notification>
 	<notification name="CannotCreateLandmarkNotOwner">
 		Vous ne pouvez pas créer de repère ici car le propriétaire du terrain ne l&apos;autorise pas.
@@ -611,6 +637,9 @@ Veuillez sélectionner des objets avec des scripts.
 
 Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
 	</notification>
+	<notification name="CannotOpenScriptObjectNoMod">
+		Impossible d&apos;ouvrir le script de l&apos;objet sans droits de modification.
+	</notification>
 	<notification name="CannotSetRunningSelectObjectsNoScripts">
 		Impossible de définir les scripts sur « exécution ».
 
@@ -723,7 +752,7 @@ aucune parcelle sélectionnée.
 aucun groupe sélectionné.
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
-		Cession du terrain impossible :
+		Cession du terrain impossible :
 la région dans laquelle il est situé est introuvable.
 	</notification>
 	<notification name="CannotDeedLandMultipleSelected">
@@ -768,7 +797,7 @@ vous n&apos;avez pas le droit de libérer cette parcelle.
 Les parcelles qui vous appartiennent sont en vert.
 	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
-		Impossible d&apos;abandonner le terrain :
+		Impossible d&apos;abandonner le terrain :
 la région dans laquelle il est situé est introuvable.
 	</notification>
 	<notification name="CannotReleaseLandNoTransfer">
@@ -806,11 +835,11 @@ Diviser le terrain ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
-		Division du terrain impossible :
+		Division du terrain impossible :
 la région dans laquelle il est situé est introuvable.
 	</notification>
 	<notification name="CannotJoinLandNoRegion">
-		Impossible de fusionner le terrain :
+		Impossible de fusionner le terrain :
 la région dans laquelle il est situé est introuvable.
 	</notification>
 	<notification name="CannotJoinLandNothingSelected">
@@ -861,7 +890,7 @@ Fusionner le terrain ?
 Cette erreur est généralement temporaire. Veuillez éditer et sauvegarder l&apos;élément endossable à nouveau d&apos;ici quelques minutes.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Vous avez été déconnecté(e) de [SECOND_LIFE] :
+		Vous avez été déconnecté(e) de [SECOND_LIFE] :
             [MESSAGE]
 Vous pouvez afficher vos messages instantanés et votre chat en cliquant sur Afficher IM et chat. Sinon, cliquez sur Quitter pour quitter immédiatement [APP_NAME].
 		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/>
@@ -1028,7 +1057,7 @@ Vous avez été téléporté vers une région voisine.
 Nous vous conseillons de définir votre domicile ailleurs.
 	</notification>
 	<notification name="ClothingLoading">
-		Vos vêtements sont en cours de téléchargement.
+		Vos habits sont en cours de téléchargement.
 Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voient correctement.
 		<form name="form">
 			<ignore name="ignore" text="Vos habits prennent du temps à télécharger"/>
@@ -1037,14 +1066,14 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
 	<notification name="FirstRun">
 		L&apos;installation de [APP_NAME] est terminée.
 
-S&apos;il s&apos;agit de la première fois que vous utilisez [SECOND_LIFE], vous devrez créer un compte avant de pouvoir vous connecter.
-Retourner sur [https://join.secondlife.com/index.php?lang=fr-FR secondlife.com] pour créer un nouveau compte ?
+Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte avant de pouvoir vous connecter.
+Retourner sur [http://join.secondlife.com secondlife.com] pour ouvrir un nouveau compte ?
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Nous avons des difficultés à vous connecter. Il y a peut-être un problème avec votre connexion Internet ou la [SECOND_LIFE_GRID].
 
-Vérifiez votre connextion Internet et réessayez dans quelques minutes, cliquez sur Aide pour consulter la page [SUPPORT_SITE] ou bien sur Téléporter pour essayer d&apos;aller chez vous.
+Vérifiez votre connexion Internet et réessayez dans quelques minutes, cliquez sur Aide pour consulter la page [SUPPORT_SITE] ou bien sur Téléporter pour essayer d&apos;aller chez vous.
 		<url name="url">
 			http://fr.secondlife.com/support/
 		</url>
@@ -1067,10 +1096,10 @@ Vous pourrez revenir sur votre décision plus tard.
 		[NAME] [PRICE] L$ Vous n&apos;avez pas suffisamment de L$ pour faire cela.
 	</notification>
 	<notification name="GrantedModifyRights">
-		[FIRST_NAME] [LAST_NAME] vous avez donné la permission de modifier ses objets.
+		[NAME] vous a donné la permission de modifier ses objets.
 	</notification>
 	<notification name="RevokedModifyRights">
-		Vous n&apos;avez plus le droit de modifier les objets de [FIRST_NAME] [LAST_NAME].
+		Vous n&apos;avez plus la permission de modifier les objets de [NAME]
 	</notification>
 	<notification name="FlushMapVisibilityCaches">
 		Cela videra le cache cartographique de cette région.
@@ -1151,7 +1180,7 @@ Veuillez choisir un objet à vendre et réessayer.
 	<notification name="DownloadWindowsMandatory">
 		Une nouvelle version de [APP_NAME] est disponible.
 [MESSAGE]
-Pour utiliser [APP_NAME] vous devez télécharger cette mise à jour.
+Pour utiliser [APP_NAME], vous devez télécharger cette mise à jour.
 		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
 	</notification>
 	<notification name="DownloadWindows">
@@ -1169,17 +1198,17 @@ Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure perf
 	<notification name="DownloadLinuxMandatory">
 		Une nouvelle version de [APP_NAME] est disponible.
 [MESSAGE]
-Pour utiliser [APP_NAME] vous devez télécharger cette mise à jour.
+Pour utiliser [APP_NAME], vous devez télécharger cette mise à jour.
 		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
 	</notification>
 	<notification name="DownloadLinux">
-		Une mise à jour de [SECOND_LIFE] est disponible.
+		Une mise à jour de [APP_NAME] est disponible.
 [MESSAGE]
 Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
 	</notification>
 	<notification name="DownloadLinuxReleaseForDownload">
-		Une mise à jour de [SECOND_LIFE] est disponible.
+		Une mise à jour de [APP_NAME] est disponible.
 [MESSAGE]
 Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
@@ -1187,9 +1216,9 @@ Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure perf
 	<notification name="DownloadMacMandatory">
 		Une nouvelle version de [APP_NAME] est disponible.
 [MESSAGE]
-Pour utiliser [APP_NAME] vous devez télécharger cette mise à jour.
+Pour utiliser [APP_NAME], vous devez télécharger cette mise à jour.
 
-Télécharger vers le dossier Applications ?
+Télécharger vers le dossier Applications ?
 		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
 	</notification>
 	<notification name="DownloadMac">
@@ -1197,7 +1226,7 @@ Télécharger vers le dossier Applications ?
 [MESSAGE]
 Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
 
-Télécharger vers le dossier Applications ?
+Télécharger vers le dossier Applications ?
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
 	</notification>
 	<notification name="DownloadMacReleaseForDownload">
@@ -1205,20 +1234,20 @@ Télécharger vers le dossier Applications ?
 [MESSAGE]
 Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
 
-Télécharger vers le dossier Applications ?
+Télécharger vers le dossier Applications ?
 		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
 		Si vous cédez cet objet, le groupe :
 * recevra les L$ versés pour l&apos;objet ;
-		<usetemplate ignoretext="Confimer avant que je ne cède un objet à un groupe" name="okcancelignore" notext="Annuler" yestext="Céder"/>
+		<usetemplate ignoretext="Confirmer avant que je ne cède un objet à un groupe" name="okcancelignore" notext="Annuler" yestext="Céder"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
-		Voulez-vous ouvrir votre navigateur web système pour afficher ce contenu ?
+		Voulez-vous ouvrir votre navigateur web système pour afficher ce contenu ?
 		<usetemplate ignoretext="Ouvrir mon navigateur pour consulter une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
-		Aller sur secondlife.com pour gérer votre compte ?
+		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour gérer votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour gérer mon compte" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
@@ -1238,11 +1267,11 @@ Télécharger vers le dossier Applications ?
 		<usetemplate ignoretext="Lancer mon navigateur web pour consulter le blog" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
 	</notification>
 	<notification name="WebLaunchLSLGuide">
-		Voulez-vous ouvrir le guide pour l&apos;écriture de scripts ?
+		Voulez-vous ouvrir le guide pour l&apos;écriture de scripts ?
 		<usetemplate ignoretext="Lancer mon navigateur web pour consulter le guide pour l&apos;écriture de scripts" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchLSLWiki">
-		Voulez-vous ouvrir le portail LSL pour l&apos;écriture de scripts ?
+		Voulez-vous ouvrir le portail LSL pour l&apos;écriture de scripts ?
 		<usetemplate ignoretext="Lancer mon navigateur web pour consulter le portail LSL" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
 	</notification>
 	<notification name="ReturnToOwner">
@@ -1267,8 +1296,8 @@ Quitter le groupe ?
 	<notification name="CannotStartAuctionAlreadyForSale">
 		Vous ne pouvez pas démarrer des enchères sur une parcelle déjà en vente.  Si vous êtes certain de vouloir démarrer des enchères, mettez fin à la vente.
 	</notification>
-	<notification label="Échec de la fonction Ignorer les objets par nom" name="MuteByNameFailed">
-		Vous ignorez déjà ce résident.
+	<notification label="L&apos;interdiction de l&apos;objet par nom a échoué." name="MuteByNameFailed">
+		Vous avez déjà interdit ce nom.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveItemWarn">
@@ -1359,8 +1388,12 @@ Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages i
 		<usetemplate ignoretext="Confirmer que je veux me téléporter à un repère" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
 	</notification>
 	<notification name="TeleportToPick">
-		Téléporter vers [PICK] ?
-		<usetemplate ignoretext="Confirmer que je veux me téléporter à un endroit dans mes Préférences" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
+		Vous téléporter vers [PICK] ?
+		<usetemplate ignoretext="Confirmer que je veux me téléporter à un endroit dans mes Favoris" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
+	</notification>
+	<notification name="TeleportToClassified">
+		Vous téléporter vers [CLASSIFIED] ?
+		<usetemplate ignoretext="Confirmer que je veux me téléporter à un endroit dans les Petites annonces" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
 	</notification>
 	<notification label="Envoyer un message à tout le monde dans votre domaine" name="MessageEstate">
 		Saisissez un message court qui sera envoyé à tous les résidents se trouvant actuellement sur votre domaine.
@@ -1446,9 +1479,9 @@ Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
 	<notification name="RegionEntryAccessBlocked_Change">
 		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
 
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
 		<form name="form">
-			<button name="OK" text="Modifier les Préférences"/>
+			<button name="OK" text="Modifier les préférences"/>
 			<button default="true" name="Cancel" text="Fermer"/>
 			<ignore name="ignore" text="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de pénétrer dans une région"/>
 		</form>
@@ -1474,7 +1507,7 @@ Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
 	<notification name="LandClaimAccessBlocked_Change">
 		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
 
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
 		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de réclamer un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
@@ -1498,11 +1531,11 @@ Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
 	<notification name="LandBuyAccessBlocked_Change">
 		Votre catégorie d&apos;accès ne vous autorise pas à acheter cette région.
 
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
 		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche d&apos;acheter un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
 	</notification>
 	<notification name="TooManyPrimsSelected">
-		&quot;Vous avez sélectionné trop de prims. Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.&quot;
+		Vous avez sélectionné trop de prims.  Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ProblemImportingEstateCovenant">
@@ -1517,6 +1550,7 @@ En cliquant sur Modifier les préférences, vous pourrez changer votre catégori
 	</notification>
 	<notification name="UnableToLoadNotecardAsset">
 		Impossible de charger les données de la note actuellement.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NotAllowedToViewNotecard">
 		Permissions pour afficher la note insuffisantes.
@@ -1657,14 +1691,14 @@ Déplacer les objets de l&apos;inventaire ?
 	<notification name="ClickActionNotPayable">
 		Avertissement : l&apos;action du clic Payer l&apos;objet a été définie mais ne fonctionnera que si un script est ajouté avec l&apos;event money().
 		<form name="form">
-			<ignore name="ignore" text="Je définis l&apos;action du clic Payer l&apos;objet  lorsque je construis un objet sans le script money()"/>
+			<ignore name="ignore" text="Je définis l&apos;action du clic Payer l&apos;objet lorsque je construis un objet sans le script money()"/>
 		</form>
 	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Vous n&apos;êtes autorisé à copier aucun élément dans cet objet.
 	</notification>
 	<notification name="WebLaunchAccountHistory">
-		Aller sur secondlife.com pour consulter l&apos;historique de votre compte ?
+		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
 	<notification name="ConfirmQuit">
@@ -1672,21 +1706,19 @@ Déplacer les objets de l&apos;inventaire ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php?lang=fr-FR Conditions d&apos;utilisation] et aux [http://secondlife.com/corporate/cs.php?lang=fr-FR Règles de la communauté].
+		Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php Conditions d&apos;utilisation] et aux [http://secondlife.com/corporate/cs.php Règles communautaires].
 
-Lorsqu&apos;elles sont signalées, toutes les infractions aux Conditions d&apos;utilisation et aux Règles de la communauté font l&apos;objet d&apos;une enquête et sont résolues. Pour accéder aux détails de la résolution d&apos;un incident, allez sur :
-
-http://secondlife.com/support/incidentreport.php
+Lorsqu&apos;elles sont signalées, toutes les infractions font l&apos;objet d&apos;une enquête et sont résolues. Vous pouvez consulter les détails de la résolution d&apos;un incident dans le [http://secondlife.com/support/incidentreport.php Rapport d&apos;incident].
 	</notification>
 	<notification name="HelpReportAbuseEmailEO">
-		Important : ce rapport ira au propriétaire de la région dans laquelle vous êtes et non à Linden Lab.
+		IMPORTANT : ce rapport sera envoyé au propriétaire de la région dans laquelle vous vous trouvez actuellement et non à Linden Lab.
 
-Pour aider les résidents et les visiteurs, le propriétaire de la région dans laquelle vous êtes a choisi de recevoir et de s&apos;occuper de tous les rapports envoyés à partir de cette région. Linden Lab n&apos;enquêtera pas sur les rapports que vous envoyez à partir de cet endroit.
+Pour rendre service aux résidents et visiteurs, le propriétaire de la région dans laquelle vous vous trouvez a choisi de recevoir et de résoudre tous les rapports concernant cette région. Linden Lab n&apos;enquêtera pas sur les rapports que vous envoyez depuis cet emplacement.
 
-Le propriétaire de la région traitera les rapports en fonction des règles de cette région, comme indiqué dans le réglement du domaine.
-(Les réglements sont visibles à partir du menu Monde &gt; À propos du terrain.)
+Le propriétaire de la région résoudra les incidents signalés dans les rapports selon les règles locales de cette région, telles qu&apos;elles sont définies dans le règlement du domaine.
+(Pour consulter les règlements, sélectionnez À propos des terrains dans le menu Monde.)
 
-La résolution de ce rapport ne s&apos;applique qu&apos;à cette région ; L&apos;accès aux autres endroits de [SECOND_LIFE] ne sera pas affecté par les résultats de cette enquête. Seul Linden Lab peut interdire l&apos;accès à l&apos;ensemble de [SECOND_LIFE].
+La résolution de ce rapport ne s&apos;applique qu&apos;à cette région. L&apos;accès des résidents aux autres zones de [SECOND_LIFE] ne sera pas affecté par l&apos;issue de ce rapport. Seul Linden Lab peut interdire l&apos;accès à la totalité de [SECOND_LIFE].
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Veuillez choisir une catégorie pour ce rapport d&apos;infraction.
@@ -1714,9 +1746,9 @@ Les descriptions précises nous permettent de traiter les rapports plus rapideme
 
 Il semble que vous souhaitiez reporter une infraction à des droits de propriété intellectuelle. Pour signaler correctement cette infraction :
 
-(1) Remplissez un rapport d&apos;infraction. Vous pouvez soumettre un rapport d&apos;infraction si vous pensez qu&apos;un résident exploite le système de droits de [SECOND_LIFE], par exemple en utilisant un CopyBot ou des outils similaires pour enfreindre des droits de propriété intellectuelle. Notre équipe chargée des infractions mènera une enquête et prendra les mesures nécessaires à l&apos;encontre du résident non respectueux des Conditions d&apos;utilisation ou des règles de la communauté. Sachez toutefois que l&apos;équipe chargée des infractions ne supprimera pas de contenu à l&apos;intérieur de [SECOND_LIFE].
+(1) Remplissez un rapport d&apos;infraction. Vous pouvez soumettre un rapport d&apos;infraction si vous pensez qu&apos;un résident exploite le système de droits de [SECOND_LIFE], par exemple en utilisant un CopyBot ou des outils similaires pour enfreindre des droits de propriété intellectuelle. Notre équipe chargée des infractions mènera une enquête et prendra les mesures nécessaires à l&apos;encontre du résident non respectueux des [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Conditions d&apos;utilisation] ou des [http://secondlife.com/corporate/cs.php Règles communautaires]. Sachez toutefois que l&apos;équipe chargée des infractions ne supprimera pas de contenu à l&apos;intérieur de [SECOND_LIFE].
 
-(2) Demandez à ce que du contenu à l&apos;intérieur de [SECOND_LIFE] soit supprimé. Pour demander à ce que du contenu soit supprimé de [SECOND_LIFE], vous devez soumettre un rapport d&apos;infraction valide, tel que fourni dans notre Règlement contre les violations des droit d&apos;auteurs (DMCA), à http://secondlife.com/corporate/dmca.php.
+(2) Demandez à ce que du contenu à l&apos;intérieur de Second Life soit supprimé. Pour demander à ce que du contenu soit supprimé de [SECOND_LIFE], vous devez soumettre un rapport d&apos;infraction valide, tel que fourni dans notre [http://secondlife.com/corporate/dmca.php Règlement contre les violations des droits d&apos;auteur].
 
 Si vous souhaitez toujours reporter cette infraction, veuillez fermer cette fenêtre et soumettre votre rapport.  Vous devrez peut-être sélectionner la catégorie CopyBot ou exploitation abusive des droits.
 
@@ -1732,7 +1764,7 @@ Linden Lab
 		Vous avez déjà un objet sur cette partie du corps.
 Voulez-vous le remplacer par l&apos;objet sélectionné ?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Remplacer une pièce-jointe existante par l&apos;objet sélectionné"/>
+			<ignore name="ignore" save_option="true" text="Remplacer une pièce jointe existante par l&apos;objet sélectionné"/>
 			<button ignore="Remplacer automatiquement" name="Yes" text="OK"/>
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
@@ -1747,13 +1779,17 @@ Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
 			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
 		</form>
 	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">
+		Le dossier [FOLDERNAME] est un dossier système. La suppression d&apos;un dossier système peut provoquer une instabilité.  Voulez-vous vraiment le supprimer ?
+		<usetemplate ignoretext="Confirmer avant la suppression d&apos;un dossier système" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmEmptyTrash">
-		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
-		<usetemplate ignoretext="Confimer avant de vider la corbeille" name="okcancelignore" notext="Annuler" yestext="OK"/>
+		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
+		<usetemplate ignoretext="Confirmer avant de vider la corbeille" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
-		Êtes-vous certain de vouloir supprimer l&apos;historique de vos visites et recherches ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
+		Êtes-vous certain de vouloir supprimer l&apos;historique de vos visites et recherches ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
 		Êtes-vous certain de vouloir supprimer vos cookies ?
@@ -1764,16 +1800,16 @@ Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
 	</notification>
 	<notification name="ConfirmEmptyLostAndFound">
-		Êtes-vous certain de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
-		<usetemplate ignoretext="Confimer avant de vider le dossier Objets trouvés" name="okcancelignore" notext="Non" yestext="Oui"/>
+		Êtes-vous certain de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
+		<usetemplate ignoretext="Confirmer avant de vider le dossier Objets trouvés" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="CopySLURL">
-		La SLurl suivante a été copiée dans votre presse-papier :
+		La SLurl suivante a été copiée dans votre presse-papiers :
  [SLURL]
 
 Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apos;accéder facilement à cet endroit ou bien collez-la dans la barre d&apos;adresse de votre navigateur.
 		<form name="form">
-			<ignore name="ignore" text="La SLurl est copiée dans mon presse-papier"/>
+			<ignore name="ignore" text="La SLurl est copiée dans mon presse-papiers"/>
 		</form>
 	</notification>
 	<notification name="WLSavePresetAlert">
@@ -1839,18 +1875,18 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="Cannot_Purchase_an_Attachment">
-		Vous ne pouvez pas acheter un objet s&apos;il fait partie d&apos;une pièce-jointe.
+		Vous ne pouvez pas acheter un objet s&apos;il fait partie d&apos;une pièce jointe.
 	</notification>
 	<notification label="À propos des requêtes pour les autorisations de débit" name="DebitPermissionDetails">
 		Accepter cette requête donne au script l&apos;autorisation de prélever des dollars Linden (L$) sur votre compte de manière continue. Pour révoquer cette autorisation, le propriétaire de l&apos;objet doit supprimer l&apos;objet ou bien réinitialiser les scripts dans l&apos;objet.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
-		Voulez-vous automatiquement porter l&apos;habit que vous allez créer ?
+		Voulez-vous automatiquement porter l&apos;habit que vous allez créer ?
 		<usetemplate ignoretext="Porter automatiquement tout en modifiant mon apparence" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Pour pouvoir pénétrer dans cette zone, vous devez avoir procédé à la vérification de votre âge.  Souhaitez-vous aller sur [SECOND_LIFE] et procéder à la vérification de votre âge ?
+		Pour pouvoir pénétrer dans cette zone, vous devez avoir procédé à la vérification de votre âge.  Souhaitez-vous aller sur [SECOND_LIFE] et procéder à la vérification de votre âge ?
 
 [_URL]
 		<url name="url" option="0">
@@ -1859,7 +1895,7 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
-		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
+		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
 
 [_URL]
 		<url name="url" option="0">
@@ -1989,7 +2025,7 @@ Veuillez sélectionner un seul objet.
 		Vous n&apos;avez pas le droit de copier ceci.
 	</notification>
 	<notification name="InventoryAccepted">
-		[NAME] a accepté votre envoi.
+		[NAME] a reçu votre offre d&apos;inventaire.
 	</notification>
 	<notification name="InventoryDeclined">
 		[NAME] a refusé votre envoi.
@@ -2004,12 +2040,14 @@ Veuillez sélectionner un seul objet.
 		Votre carte de visite a été refusée.
 	</notification>
 	<notification name="TeleportToLandmark">
-		A présent que vous êtes sur le continent, vous pouvez voyager par téléportation (vers [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Repères (Landmarks).
-Choisissez un repère, double-cliquez dessus et cliquez sur Téléporter.
+		Vous pouvez vous téléporter vers des endroits comme [NAME] en ouvrant le panneau Lieux sur le côté droit de votre écran, puis en sélectionnant l&apos;onglet Repères.
+Cliquez sur le repère de votre choix pour le sélectionner, puis sur Téléporter en bas du panneau.
+(Vous pouvez aussi double-cliquer sur le repère ou cliquer dessus avec le bouton droit de la souris et sélectionner Téléporter.)
 	</notification>
 	<notification name="TeleportToPerson">
-		A présent que vous êtes sur le continent, vous pouvez contacter des résidents (tel [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Cartes de visite (Calling Cards).
-Choisissez en une, double-cliquez dessus et cliquez sur Message Instantané.
+		Vous pouvez contacter des résidents comme [NAME] en ouvrant le panneau Résidents sur le côté droit de votre écran.
+Sélectionnez le résident de votre choix dans la liste, puis cliquez sur IM en bas du panneau.
+(Vous pouvez aussi double-cliquer sur le nom du résident dans la liste ou cliquer dessus avec le bouton droit de la souris et sélectionner IM.)
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
@@ -2057,18 +2095,18 @@ Veuillez sélectionner un terrain plus petit.
 	</notification>
 	<notification name="NoQuickTime">
 		Le logiciel Apple QuickTime ne semble pas installé sur votre système.
-Pour voir les vidéos sur les terrains qui le permettent, allez sur le site de QuickTime (http://www.apple.com/fr/quicktime/download) et installez le lecteur QuickTime.
+Pour voir les vidéos sur les terrains qui le permettent, allez sur le [http://www.apple.com/quicktime site de QuickTime] et installez le lecteur QuickTime.
 	</notification>
 	<notification name="NoPlugin">
-		Aucun Media Plugin n&apos;a été trouvé pour prendre en charge &quot;[MIME_TYPE]&quot;.  Les médias de ce type ne sont pas disponibles.
+		Aucun Media Plugin n&apos;a été trouvé pour prendre en charge [MIME_TYPE].  Les médias de ce type ne sont pas disponibles.
 	</notification>
 	<notification name="MediaPluginFailed">
-		Le Media Plugin suivant a échoué :
+		Le Media Plugin suivant a échoué :
     [PLUGIN]
 
 Si le problème persiste, veuillez réinstaller le plugin ou contacter le vendeur.
 		<form name="form">
-			<ignore name="ignore" text="L&apos;éxécution d&apos;un Media Plugin a échoué"/>
+			<ignore name="ignore" text="L&apos;exécution d&apos;un Media Plugin a échoué"/>
 		</form>
 	</notification>
 	<notification name="OwnedObjectsReturned">
@@ -2088,6 +2126,11 @@ Les objets non transférables donnés au groupe ont étés supprimés.
 	<notification name="UnOwnedObjectsReturned">
 		Les objets sélectionnés sur la parcelle et qui ne sont pas à vous ont été rendus à leurs propriétaires.
 	</notification>
+	<notification name="ServerObjectMessage">
+		Message de [NAME] :
+[MSG]
+		<usetemplate name="okcancelbuttons" notext="OK" yestext="Inspecter"/>
+	</notification>
 	<notification name="NotSafe">
 		Les dégâts sont autorisés sur ce terrain.
 Vous pouvez être blessé ici. Si vous décédez, vous serez téléporté à votre domicile.
@@ -2097,8 +2140,7 @@ Vous pouvez être blessé ici. Si vous décédez, vous serez téléporté à vot
 Vous ne pouvez pas voler ici.
 	</notification>
 	<notification name="PushRestricted">
-		Les bousculades sont interdites dans cette zone.
-Vous ne pouvez pas pousser les autres à moins que vous soyez propriétaire de ce terrain.
+		Les bousculades sont interdites dans cette zone. Vous ne pouvez pas pousser les autres à moins que vous soyez propriétaire de ce terrain.
 	</notification>
 	<notification name="NoVoice">
 		Le chat vocal est interdit dans cette zone. Vous n&apos;entendrez personne parler.
@@ -2134,6 +2176,9 @@ Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuill
 	<notification name="ImproperPaymentStatus">
 		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
 	</notification>
+	<notification name="MustGetAgeRgion">
+		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
+	</notification>
 	<notification name="MustGetAgeParcel">
 		Pour pouvoir pénétrer sur cette parcelle, vous devez avoir procédé à la vérification de votre âge.
 	</notification>
@@ -2196,7 +2241,8 @@ Veuillez réessayer dans quelques minutes.
 		Aucune parcelle valide n&apos;a été trouvée.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un objet appelé [OBJECTFROMNAME] appartenant à [FIRST] [LAST] vous a donné : [OBJECTTYPE] appelé(e) [OBJECTNAME].
+		Un objet appelé [OBJECTFROMNAME] appartenant à [NAME_SLURL] vous a donné un [OBJECTTYPE] :
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Garder"/>
 			<button name="Discard" text="Jeter"/>
@@ -2204,7 +2250,8 @@ Veuillez réessayer dans quelques minutes.
 		</form>
 	</notification>
 	<notification name="ObjectGiveItemUnknownUser">
-		L&apos;objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
+		Un objet appelé [OBJECTFROMNAME] appartenant à (un résident inconnu) vous a donné un [OBJECTTYPE] :
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Garder"/>
 			<button name="Discard" text="Jeter"/>
@@ -2212,14 +2259,17 @@ Veuillez réessayer dans quelques minutes.
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME] vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
+		[NAME_SLURL] vous a donné un [OBJECTTYPE] :
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Garder"/>
+			<button name="Show" text="Afficher"/>
 			<button name="Discard" text="Jeter"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
 		[NAME]
+
 [MESSAGE]
 	</notification>
 	<notification name="JoinGroup">
@@ -2231,7 +2281,7 @@ Veuillez réessayer dans quelques minutes.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME] vous propose de le/la rejoindre par téléportation :
+		[NAME] vous propose d&apos;être téléporté jusqu&apos;à son emplacement :
 
 [MESSAGE]
 		<form name="form">
@@ -2307,7 +2357,7 @@ Venant de l&apos;objet : [OBJECTNAME], appartenant à : [NAME]?
 		La recherche du [TYPE] nommé(e) [DESC] dans la base de données a échoué.
 	</notification>
 	<notification name="InvalidWearable">
-		L&apos;objet que vous essayez de porter utilise une fonctionnalité que le client ne peut lire.  Pour porter cet objet, veuillez télécharger une mise à jour du client.
+		L&apos;objet que vous essayez de porter utilise une fonctionnalité que le client ne peut lire. Pour porter cet objet, veuillez télécharger une mise à jour de [APP_NAME].
 	</notification>
 	<notification name="ScriptQuestion">
 		&apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[NAME]&apos;, aimerait :
@@ -2317,16 +2367,16 @@ Acceptez-vous ?
 		<form name="form">
 			<button name="Yes" text="Oui"/>
 			<button name="No" text="Non"/>
-			<button name="Mute" text="Ignorer"/>
+			<button name="Mute" text="Interdire"/>
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objet appelé « [OBJECTNAME] », appartenant à « [NAME] », aimerait :
+		Un objet appelé [OBJECTNAME], appartenant à [NAME], aimerait :
 
 [QUESTIONS]
 Si vous n&apos;avez pas confiance en cet objet ni en son créateur, vous devriez refuser cette requête.
 
-Accepter cette requête ?
+Accepter cette requête ?
 		<form name="form">
 			<button name="Grant" text="Accepter"/>
 			<button name="Deny" text="Refuser"/>
@@ -2347,6 +2397,14 @@ Accepter cette requête ?
 			<button name="Ignore" text="Ignorer"/>
 		</form>
 	</notification>
+	<notification name="ScriptToast">
+		[FIRST] [LAST]&apos;s &apos;[TITLE]&apos; demande la participation de l&apos;utilisateur.
+		<form name="form">
+			<button name="Open" text="Ouvrir la boîte de dialogue"/>
+			<button name="Ignore" text="Ignorer"/>
+			<button name="Block" text="Ignorer"/>
+		</form>
+	</notification>
 	<notification name="FirstBalanceIncrease">
 		Vous venez de recevoir [AMOUNT] L$.
 Votre solde en L$ est affiché en haut à droite.
@@ -2355,13 +2413,20 @@ Votre solde en L$ est affiché en haut à droite.
 		Vous venez de payer [AMOUNT] L$.
 Votre solde en L$ est affiché en haut à droite.
 	</notification>
+	<notification name="BuyLindenDollarSuccess">
+		Nous vous remercions de votre paiement.
+
+Votre solde en L$ sera mis à jour une fois le traitement terminé. Si le traitement prend plus de 20 minutes, il est possible que votre transaction soit annulée. Dans ce cas, le montant de l&apos;achat sera crédité sur votre solde en US$.
+
+Vous pouvez consulter le statut de votre paiement à la page Historique de mes transactions sur votre [http://secondlife.com/account/ Page d&apos;accueil]
+	</notification>
 	<notification name="FirstSit">
 		Vous êtes assis(e).
 Utilisez les touches de direction (ou AWSD) pour regarder autour de vous.
 Pour vous lever, cliquez sur le bouton Me lever.
 	</notification>
 	<notification name="FirstMap">
-		Cliquez et faîtes glisser pour faire défiler la carte.
+		Cliquez et faites glisser pour faire défiler la carte.
 Double-cliquez pour vous téléporter.
 Utilisez les contrôles à droite pour trouver des choses et afficher différents arrière-plans.
 	</notification>
@@ -2401,8 +2466,8 @@ Les objets que vous construisez ici seront supprimés après votre départ. N&ap
 		Vous avez ouvert le menu Avancé.
 
 Pour activer/désactiver ce menu,
-  Windows : Ctrl-Alt-D
-  Mac : ⌘-Opt-D
+  Windows : Ctrl+Alt+D
+  Mac : &#8997;&#8984;D
 	</notification>
 	<notification name="FirstSculptedPrim">
 		Vous êtes en train d&apos;éditer un sculptie. Pour spécifier la forme d&apos;un sculptie, vous devez utiliser une texture spécifique.
@@ -2439,7 +2504,7 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 	</notification>
 	<notification name="VoiceInviteAdHoc">
 		[NAME] a rejoint un chat vocal avec conférence.
-Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
+Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
 		<form name="form">
 			<button name="Accept" text="Accepter"/>
 			<button name="Decline" text="Refuser"/>
@@ -2448,7 +2513,7 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 	</notification>
 	<notification name="InviteAdHoc">
 		[NAME] vous invite à un chat conférence.
-Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
+Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
 		<form name="form">
 			<button name="Accept" text="Accepter"/>
 			<button name="Decline" text="Refuser"/>
@@ -2462,19 +2527,19 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 		Nous sommes désolés. Le nombre maximum de conversations vocales a été atteint dans cette zone. Veuillez trouver un autre endroit pour discuter.
 	</notification>
 	<notification name="VoiceChannelDisconnected">
-		Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. Vous allez maintenant être reconnecté au chat vocal spatial.
+		Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME].  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME] a mis fin à l&apos;appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+		[VOICE_CHANNEL_NAME] a mis fin à l&apos;appel.  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME] a refusé votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+		[VOICE_CHANNEL_NAME] a refusé votre appel.  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME] ne peut pas prendre votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+		[VOICE_CHANNEL_NAME] ne peut pas prendre votre appel.  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="VoiceChannelJoinFailed">
-		Echec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement. Vous allez maintenant être reconnecté au chat vocal spatial.
+		Échec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement.  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="VoiceLoginRetry">
 		Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants.
@@ -2495,12 +2560,13 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 		Une erreur est survenue pendant la connexion au chat vocal pour [VOICE_CHANNEL_NAME]. Veuillez réessayer ultérieurement.
 	</notification>
 	<notification name="ServerVersionChanged">
-		La région dans laquelle vous avez pénétré utilise une version de serveur différente, ce qui peut avoir un impact sur votre performance. Cliquez pour voir les notes de version.
+		La région dans laquelle vous avez pénétré utilise une version de serveur différente, ce qui peut avoir un impact sur votre performance. [[URL] Consultez les notes de version.]
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
 		La SLurl que vous avez saisie n&apos;est pas prise en charge.
 	</notification>
 	<notification name="IMToast">
+		[MESSAGE]
 		<form name="form">
 			<button name="respondbutton" text="Répondre"/>
 		</form>
@@ -2511,13 +2577,26 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 	<notification name="UnableToFindHelpTopic">
 		Impossible de trouver l&apos;aide.
 	</notification>
+	<notification name="ObjectMediaFailure">
+		Erreur serveur : Échec de la mise à jour ou de l&apos;obtention du média.
+&apos;[ERROR]&apos;
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearTeleportHistory">
+		Voulez-vous vraiment supprimer votre historique des téléportations ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BottomTrayButtonCanNotBeShown">
+		Le bouton sélectionné ne peut pas être affiché actuellement.
+Le bouton sera affiché quand il y aura suffisamment de place.
+	</notification>
 	<global name="UnsupportedCPU">
 		- Votre processeur ne remplit pas les conditions minimum requises.
 	</global>
 	<global name="UnsupportedGLRequirements">
 		Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
 
-Si vous avez toujours des problèmes, veuillez consulter la page [SUPPORT_SITE].
+Si vous avez toujours des problèmes, veuillez consulter la page [SUPPORT_SITE].
 	</global>
 	<global name="UnsupportedCPUAmount">
 		796
@@ -2531,14 +2610,8 @@ Si vous avez toujours des problèmes, veuillez consulter la page [SUPPORT_SITE]
 	<global name="UnsupportedRAM">
 		- Votre mémoire système ne remplit pas les conditions minimum requises.
 	</global>
-	<global name="PermYes">
-		Oui
-	</global>
-	<global name="PermNo">
-		Non
-	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
-		Si vous possédez un terrain, vous pouvez le définir comme domicile. 
-Sinon, consultez la carte et trouvez les « infohubs ».
+		Si vous possédez un terrain, vous pouvez le définir comme domicile.
+Sinon, consultez la carte et trouvez les &quot; infohubs &quot;.
 	</global>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_activeim_row.xml b/indra/newview/skins/default/xui/fr/panel_activeim_row.xml
new file mode 100644
index 0000000000..84272752cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_activeim_row.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_activeim_row">
+	<text name="contact_name">
+		Grumpity ProductEngine
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..fd5ca4b2a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="Appeler" name="call_btn"/>
+		<button label="Quitter l&apos;appel" name="end_call_btn"/>
+		<button label="Contrôles vocaux" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
new file mode 100644
index 0000000000..69e23a2e76
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_list_item">
+	<string name="FormatSeconds">
+		[COUNT] s
+	</string>
+	<string name="FormatMinutes">
+		[COUNT] mn
+	</string>
+	<string name="FormatHours">
+		[COUNT] h
+	</string>
+	<string name="FormatDays">
+		[COUNT] j
+	</string>
+	<string name="FormatWeeks">
+		[COUNT] s
+	</string>
+	<string name="FormatMonths">
+		[COUNT] m
+	</string>
+	<string name="FormatYears">
+		[COUNT] a
+	</string>
+	<text name="avatar_name" value="Inconnu"/>
+	<text name="last_interaction" value="0s"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
new file mode 100644
index 0000000000..20a355b11d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_tag_notification">
+	<panel name="msg_caption">
+		<text name="sender_tag_name">
+			Angela Testeur
+		</text>
+		<text name="tag_time" value="23:30"/>
+	</panel>
+	<text_editor name="msg_text">
+		Le renard brun et vif saute par dessus le chien paresseux.
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..986970b381
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="block_list_panel">
+	<text name="title_text">
+		Liste des ignorés
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
+	<button label="Ignorer le résident..." label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
+	<button label="Ignorer l&apos;objet par nom..." label_selected="Ignorer l&apos;objet par nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
+	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
new file mode 100644
index 0000000000..3107bf60e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray">
+	<string name="SpeakBtnToolTip">
+		Active/Désactive le micro
+	</string>
+	<string name="VoiceControlBtnToolTip">
+		Affiche/Masque le panneau de contrôle vocal
+	</string>
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_box label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/>
+		</layout_panel>
+		<layout_panel name="movement_panel">
+			<button label="Bouger" name="movement_btn" tool_tip="Affiche/Masque le contrôle des déplacements"/>
+		</layout_panel>
+		<layout_panel name="cam_panel">
+			<button label="Affichage" name="camera_btn" tool_tip="Affiche/Masque le contrôle de la caméra"/>
+		</layout_panel>
+		<layout_panel name="snapshot_panel">
+			<button label="" name="snapshots" tool_tip="Prendre une photo"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
new file mode 100644
index 0000000000..babbff3132
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_header" name="im_header">
+	<text_editor name="user_name" value="Ericag Vader"/>
+	<text name="time_box" value="23:30"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
new file mode 100644
index 0000000000..ca7b1cd971
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_classified_info">
+	<panel.string name="type_mature">
+		Mature
+	</panel.string>
+	<panel.string name="type_pg">
+		Contenu PG
+	</panel.string>
+	<text name="title" value="Infos sur la petite annonce"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="classified_name" value="[name]"/>
+			<text name="classified_location" value="[loading...]"/>
+			<text name="content_type" value="[content type]"/>
+			<text name="category" value="[category]"/>
+			<check_box label="Renouvellement automatique toutes les semaines" name="auto_renew"/>
+			<text name="price_for_listing" tool_tip="Coût de l&apos;annonce.">
+				[PRICE] L$
+			</text>
+			<text name="classified_desc" value="[description]"/>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<button label="Téléporter" name="teleport_btn"/>
+		<button label="Carte" name="show_on_map_btn"/>
+		<button label="Édition" name="edit_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
new file mode 100644
index 0000000000..836dd99097
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_alpha_panel">
+	<panel name="avatar_alpha_color_panel">
+		<texture_picker label="Alpha bas" name="Lower Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
new file mode 100644
index 0000000000..392586d8d4
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Modifier la petite annonce" name="panel_edit_classified">
+	<panel.string name="location_notice">
+		(mise à jour après l&apos;enregistrement)
+	</panel.string>
+	<text name="title">
+		Modifier la petite annonce
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
+			<text name="Name:">
+				Titre :
+			</text>
+			<text name="description_label">
+				Description :
+			</text>
+			<text name="location_label">
+				Lieu :
+			</text>
+			<text name="classified_location">
+				en cours de chargement...
+			</text>
+			<button label="Définir sur l&apos;emplacement actuel" name="set_to_curr_location_btn"/>
+			<combo_box name="content_type">
+				<combo_item name="mature_ci">
+					Contenu Mature
+				</combo_item>
+				<combo_item name="pg_ci">
+					Contenu PG
+				</combo_item>
+			</combo_box>
+			<spinner label="L$" name="price_for_listing" tool_tip="Coût de l&apos;annonce." value="50"/>
+			<check_box label="Renouvellement automatique toutes les semaines" name="auto_renew"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="Enregistrer" name="save_changes_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
new file mode 100644
index 0000000000..7de6ca8b3f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_eyes_panel">
+	<panel name="avatar_eye_color_panel">
+		<texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="eyes_main_tab" title="Yeux"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
new file mode 100644
index 0000000000..e37e0b2481
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_gloves_panel">
+	<panel name="avatar_gloves_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="gloves_main_tab" title="Gants"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
new file mode 100644
index 0000000000..9293c23e19
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_hair_panel">
+	<panel name="avatar_hair_color_panel">
+		<texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="hair_color_tab" title="Couleur"/>
+		<accordion_tab name="hair_style_tab" title="Coupe"/>
+		<accordion_tab name="hair_eyebrows_tab" title="Sourcils"/>
+		<accordion_tab name="hair_facial_tab" title="Pilosité du visage"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
new file mode 100644
index 0000000000..759db657a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_jacket_panel">
+	<panel name="avatar_jacket_color_panel">
+		<texture_picker label="Tissu (haut)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tissu (bas)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="jacket_main_tab" title="Veste"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
new file mode 100644
index 0000000000..5328e885d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_pants_panel">
+	<panel name="avatar_pants_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="pants_main_tab" title="Pantalon"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
new file mode 100644
index 0000000000..f234529764
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Modifier la préférence" name="panel_edit_pick">
+	<text name="title">
+		Modifier la préférence
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
+			<text name="Name:">
+				Titre :
+			</text>
+			<text name="description_label">
+				Description :
+			</text>
+			<text name="location_label">
+				Lieu :
+			</text>
+			<text name="pick_location">
+				en cours de chargement...
+			</text>
+			<button label="Définir sur l&apos;emplacement actuel" name="set_to_curr_location_btn"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="Enregistrer [WHAT]" name="save_changes_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index 3a13748efa..b8ab805b13 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile Edit" name="edit_profile_panel">
+<panel label="Modification du profil" name="edit_profile_panel">
 	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="RegisterDateFormat">
+		[REG_DATE] ([AGE])
 	</string>
 	<string name="AcctTypeResident" value="Résident"/>
 	<string name="AcctTypeTrial" value="Essai"/>
@@ -9,9 +13,9 @@
 	<string name="AcctTypeEmployee" value="Employé(e) de Linden Lab"/>
 	<string name="PaymentInfoUsed" value="Infos de paiement utilisées"/>
 	<string name="PaymentInfoOnFile" value="Infos de paiement enregistrées"/>
-	<string name="NoPaymentInfoOnFile" value="Aucune info de paiement"/>
-	<string name="AgeVerified" value="Âge vérifié"/>
-	<string name="NotAgeVerified" value="Âge non vérifié"/>
+	<string name="NoPaymentInfoOnFile" value="Aucune info de paiement enregistrée"/>
+	<string name="AgeVerified" value="Personne dont l&apos;âge a été vérifié"/>
+	<string name="NotAgeVerified" value="Personne dont l&apos;âge n&apos;a pas été vérifié"/>
 	<string name="partner_edit_link_url">
 		http://www.secondlife.com/account/partners.php?lang=fr
 	</string>
@@ -20,14 +24,28 @@
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
 				<panel name="lifes_images_panel">
+					<panel name="second_life_image_panel">
+						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
+					</panel>
 					<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 :"/>
+				</panel>
 				<icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
 				<text name="title_homepage_text">
-					Page d&apos;accueil :
+					Page d&apos;accueil :
 				</text>
+				<line_editor name="homepage_edit" value="http://"/>
 				<check_box label="Afficher dans les résultats de recherche" name="show_in_search_checkbox"/>
-				<text name="title_acc_status_text" value="Statut du compte :"/>
+				<text name="title_acc_status_text" value="Mon compte :"/>
+				<text name="my_account_link" value="Accéder à ma Page d&apos;accueil"/>
+				<text name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/>
+				<text name="title_partner_text" value="Mon partenaire :"/>
+				<text name="partner_edit_link" value="[Modifier [URL]]"/>
+				<panel name="partner_data_panel">
+					<text name="partner_text" value="[FIRST] [LAST]"/>
+				</panel>
 			</panel>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
new file mode 100644
index 0000000000..450b23608a
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shape_panel">
+	<panel name="avatar_sex_panel">
+		<text name="gender_text">
+			Sexe :
+		</text>
+		<radio_group name="sex_radio">
+			<radio_item label="Femme" name="radio"/>
+			<radio_item label="Homme" name="radio2"/>
+		</radio_group>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shape_body_tab" title="Corps"/>
+		<accordion_tab name="shape_head_tab" title="Tête"/>
+		<accordion_tab name="shape_eyes_tab" title="Yeux"/>
+		<accordion_tab name="shape_ears_tab" title="Oreilles"/>
+		<accordion_tab name="shape_nose_tab" title="Nez"/>
+		<accordion_tab name="shape_mouth_tab" title="Bouche"/>
+		<accordion_tab name="shape_chin_tab" title="Menton"/>
+		<accordion_tab name="shape_torso_tab" title="Torse"/>
+		<accordion_tab name="shape_legs_tab" title="Jambes"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
new file mode 100644
index 0000000000..0fe7d5bbb0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/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="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shirt_main_tab" title="Chemise"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
new file mode 100644
index 0000000000..588a2ca7b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shoes_panel">
+	<panel name="avatar_shoes_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shoes_main_tab" title="Chaussures"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
new file mode 100644
index 0000000000..5f9f49c9e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skin_panel">
+	<panel name="avatar_skin_color_panel">
+		<texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="skin_color_tab" title="Couleur de peau"/>
+		<accordion_tab name="skin_face_tab" title="Détails du visage"/>
+		<accordion_tab name="skin_makeup_tab" title="Maquillage"/>
+		<accordion_tab name="skin_body_tab" title="Détails du corps"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
new file mode 100644
index 0000000000..9d0f13c4e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skirt_panel">
+	<panel name="avatar_skirt_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="skirt_main_tab" title="Jupe"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
new file mode 100644
index 0000000000..8b062e0145
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_socks_panel">
+	<panel name="avatar_socks_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="socks_main_tab" title="Chaussettes"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
new file mode 100644
index 0000000000..1faee191e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/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="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+		<texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
new file mode 100644
index 0000000000..b9164ad862
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_underpants_panel">
+	<panel name="avatar_underpants_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="underpants_main_tab" title="Sous-vêtements (femme)"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
new file mode 100644
index 0000000000..462eff9451
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_undershirt_panel">
+	<panel name="avatar_undershirt_color_panel">
+		<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/>
+		<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="undershirt_main_tab" title="Sous-vêtements (homme)"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
new file mode 100644
index 0000000000..24ea030b33
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Portable" name="panel_edit_wearable">
+	<string name="edit_shape_title">
+		Modification de la silhouette
+	</string>
+	<string name="edit_skin_title">
+		Modification de la peau
+	</string>
+	<string name="edit_hair_title">
+		Modification des cheveux
+	</string>
+	<string name="edit_eyes_title">
+		Modification des yeux
+	</string>
+	<string name="edit_shirt_title">
+		Modification de la chemise
+	</string>
+	<string name="edit_pants_title">
+		Modification du pantalon
+	</string>
+	<string name="edit_shoes_title">
+		Modification des chaussures
+	</string>
+	<string name="edit_socks_title">
+		Modification des chaussettes
+	</string>
+	<string name="edit_jacket_title">
+		Modification de la veste
+	</string>
+	<string name="edit_skirt_title">
+		Modification de la jupe
+	</string>
+	<string name="edit_gloves_title">
+		Modification des gants
+	</string>
+	<string name="edit_undershirt_title">
+		Modification des sous-vêtements (homme)
+	</string>
+	<string name="edit_underpants_title">
+		Modification des sous-vêtements (femme)
+	</string>
+	<string name="edit_alpha_title">
+		Modification du masque alpha
+	</string>
+	<string name="edit_tattoo_title">
+		Modification du tatouage
+	</string>
+	<string name="shape_desc_text">
+		Silhouette :
+	</string>
+	<string name="skin_desc_text">
+		Peau :
+	</string>
+	<string name="hair_desc_text">
+		Cheveux :
+	</string>
+	<string name="eyes_desc_text">
+		Yeux :
+	</string>
+	<string name="shirt_desc_text">
+		Chemise :
+	</string>
+	<string name="pants_desc_text">
+		Pantalon :
+	</string>
+	<string name="shoes_desc_text">
+		Chaussures :
+	</string>
+	<string name="socks_desc_text">
+		Chaussettes :
+	</string>
+	<string name="jacket_desc_text">
+		Veste :
+	</string>
+	<string name="skirt_skirt_desc_text">
+		Jupe :
+	</string>
+	<string name="gloves_desc_text">
+		Gants :
+	</string>
+	<string name="undershirt_desc_text">
+		Sous-vêtements (homme) :
+	</string>
+	<string name="underpants_desc_text">
+		Sous-vêtements (femme) :
+	</string>
+	<string name="alpha_desc_text">
+		Masque alpha :
+	</string>
+	<string name="tattoo_desc_text">
+		Tatouage :
+	</string>
+	<text name="edit_wearable_title" value="Modification de la silhouette"/>
+	<panel label="Chemise" name="wearable_type_panel">
+		<text name="description_text" value="Silhouette :"/>
+	</panel>
+	<panel name="button_panel">
+		<button label="Enregistrer sous" name="save_as_button"/>
+		<button label="Annuler modification" name="revert_button"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
new file mode 100644
index 0000000000..3e37ba66da
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<button label="Profil du groupe" name="group_info_btn"/>
+	<panel name="panel_call_buttons">
+		<button label="Appeler le groupe" name="call_btn"/>
+		<button label="Quitter l&apos;appel" name="end_call_btn"/>
+		<button label="Ouvrir les contrôles vocaux" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 9afc4ae11d..093d65cdba 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -1,70 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_tab">
-	<string name="help_text">
-		L&apos;onglet Général contient les infos générales et les préférences du groupe ainsi que la liste des propriétaires et des membres visibles.
-	</string>
-	<string name="group_info_unchanged">
+	<panel.string name="help_text">
+		L&apos;onglet Général contient les informations générales et les préférences du groupe ainsi que la liste et les options des membres.
+
+Faites glisser le pointeur de la souris sur les options pour en savoir plus.
+	</panel.string>
+	<panel.string name="group_info_unchanged">
 		Le profil du groupe a changé.
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<line_editor label="Saisissez le nom du groupe ici" name="group_name_editor"/>
-	<text name="group_name">
-		Saisissez le nom du groupe ici
-	</text>
-	<text name="prepend_founded_by">
-		Fondé par
-	</text>
-	<text left_delta="54" name="founder_name">
-		(en attente)
-	</text>
-	<text name="group_charter_label">
-		Charte du groupe
-	</text>
-	<texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
+	</panel.string>
+	<panel.string name="incomplete_member_data_str">
+		Extraction des données du résident en cours
+	</panel.string>
 	<text_editor name="charter">
 		Indiquez ici la charte de votre groupe
 	</text_editor>
-	<button label="Rejoindre (0L$)" label_selected="Rejoindre (0L$)" name="join_button"/>
-	<button label="Affichage détaillé" label_selected="Affichage détaillé" name="info_button"/>
-	<text name="text_owners_and_visible_members">
-		Propriétaires et membres visibles
-	</text>
-	<text name="text_owners_are_shown_in_bold">
-		(Les propriétaires apparaissent en gras)
-	</text>
 	<name_list name="visible_members">
-		<name_list.columns label="Nom du membre" name="name" relwidth="0.40"/>
+		<name_list.columns label="Membre" name="name" relwidth="0.40"/>
 		<name_list.columns label="Titre" name="title" relwidth="0.25"/>
-		<name_list.columns label="Dernière connexion" name="online" relwidth="0.35"/>
 	</name_list>
-	<text name="text_group_preferences">
-		Préférences
+	<text name="active_title_label">
+		Mon titre
 	</text>
+	<combo_box name="active_title" tool_tip="Indique le titre qui apparaît en face du nom de votre avatar lorsque votre groupe est actif."/>
+	<check_box label="Recevoir des notices" name="receive_notices" tool_tip="Indique si vous souhaitez recevoir les notices envoyées au groupe.  Décochez si ce groupe vous envoie des spams."/>
+	<check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez afficher ce groupe dans votre profil"/>
 	<panel name="preferences_container">
-		<check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/>
-		<check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/>
-		<check_box label="Frais d&apos;inscription :" name="check_enrollment_fee" tool_tip="Indique s&apos;il y a des frais d&apos;inscription pour devenir membre."/>
-		<spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d&apos;inscription est cochée, cela signifie qu&apos;il faut payer des frais pour devenir membre."/>
-		<combo_box name="group_mature_check" tool_tip="Indique si les informations sur votre groupe sont classées Mature." width="195">
-			<combo_box.item name="select_mature" label="- Type de public -"/>
-			<combo_box.item name="mature" label="Contenu Mature"/>
-			<combo_box.item name="pg" label="Contenu PG"/>
+		<check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si ce groupe autorise les nouveaux membres à le rejoindre sans y être invités."/>
+		<check_box label="Frais d&apos;inscription" name="check_enrollment_fee" tool_tip="Indique s&apos;il faut payer des frais d&apos;inscription pour rejoindre ce groupe"/>
+		<spinner label="L$" name="spin_enrollment_fee" tool_tip="Les nouveaux membres doivent payer ces frais pour rejoindre le groupe quand l&apos;option Frais d&apos;inscription est cochée."/>
+		<check_box initial_value="true" label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Permettre aux autres résidents de voir ce groupe dans les résultats de recherche"/>
+		<combo_box name="group_mature_check" tool_tip="Indique si les informations sur votre groupe sont classées Mature" width="195">
+			<combo_box.item label="Contenu PG" name="pg"/>
+			<combo_box.item label="Contenu Mature" name="mature"/>
 		</combo_box>
-		<panel name="title_container">
-			<text name="active_title_label">
-				Mon titre actuel
-			</text>
-			<combo_box name="active_title" tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif."/>
-		</panel>
-		<check_box label="Recevoir les notices" name="receive_notices" tool_tip="Cochez si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/>
-		<check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil"/>
 	</panel>
-	<string name="incomplete_member_data_str">
-		Extraction des données du résident en cours
-	</string>
-	<string name="confirm_group_create_str">
-		La création de ce groupe coûte 100 L$. 
-Êtes-vous vraiment certain de vouloir dépenser 100 L$ pour créer ce groupe ?
-Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé.
-	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..28d13bf3c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil du groupe" name="GroupInfo">
+	<panel.string name="default_needs_apply_text">
+		Certaines modifications sur cet onglet n&apos;ont pas été enregistrées.
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Voulez-vous enregistrer ces modifications ?
+	</panel.string>
+	<panel.string name="group_join_btn">
+		Rejoindre ([AMOUNT] L$)...
+	</panel.string>
+	<panel.string name="group_join_free">
+		Gratuit
+	</panel.string>
+	<text name="group_name" value="(en cours de chargement...)"/>
+	<line_editor label="Saisissez le nom du groupe ici" name="group_name_editor"/>
+	<texture_picker label="" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
+	<text name="prepend_founded_by">
+		Fondateur :
+	</text>
+	<name_box initial_value="(récupération en cours)" name="founder_name"/>
+	<text name="join_cost_text">
+		Gratuit
+	</text>
+	<button label="REJOINDRE" name="btn_join"/>
+	<accordion name="groups_accordion">
+		<accordion_tab name="group_general_tab" title="Général"/>
+		<accordion_tab name="group_roles_tab" title="Rôles"/>
+		<accordion_tab name="group_notices_tab" title="Notices"/>
+		<accordion_tab name="group_land_tab" title="Terrain/Actifs"/>
+	</accordion>
+	<panel name="button_row">
+		<button label="Créer" label_selected="Nouveau groupe" name="btn_create"/>
+		<button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index 7055d9e3f2..0e59366b84 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -15,12 +15,12 @@
 Choisir un résident.
 	</text>
 	<button label="Choisir un résident" name="add_button" tool_tip=""/>
-	<name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents."/>
-	<button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés de la liste des invités."/>
+	<name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs résidents, maintenez la touche Ctrl enfoncée et cliquez sur leurs noms"/>
+	<button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés ci-dessus de la liste des invités"/>
 	<text name="role_text">
 		Assignez-leur un rôle :
 	</text>
-	<combo_box name="role_name" tool_tip="Choisissez des rôles à assigner aux membres dans la liste."/>
+	<combo_box name="role_name" tool_tip="Choisissez dans la liste de rôles que vous êtes autorisé(e) à attribuer aux membres"/>
 	<button label="Envoyer les invitations" name="ok_button"/>
 	<button label="Annuler" name="cancel_button"/>
 	<string name="GroupInvitation">
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 3ffdf53e7c..3ca22b6e21 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terrain et L$" name="land_money_tab">
 	<string name="help_text">
-		Les parcelles appartenant au groupe sont indiquées avec le détails des contributions. Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. Les onglets Planification, Détails et Ventes correspondent aux finances du groupe.
+		Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions.
 	</string>
 	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
-		Vous n&apos;avez pas la permission de voir quel terrain possède ce groupe.
+		Vous n&apos;avez pas la permission de voir quel terrain possède ce groupe
 	</string>
 	<string name="cant_view_group_accounting_text">
-		Vous n&apos;avez pas la permission d&apos;accéder aux informations
-financières de ce groupe.
+		Vous n&apos;avez pas la permission d&apos;accéder aux informations financières de ce groupe.
 	</string>
 	<string name="loading_txt">
 		Chargement...
@@ -26,61 +25,60 @@ financières de ce groupe.
 	</scroll_list>
 	<button label="Carte" label_selected="Carte" name="map_button"/>
 	<text name="total_contributed_land_label">
-		Total des contributions :
+		Total des contributions :
 	</text>
 	<text name="total_contributed_land_value">
 		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
-		Superficie déjà utilisée :
+		Superficie déjà utilisée :
 	</text>
 	<text name="total_land_in_use_value">
 		[AREA] m²
 	</text>
 	<text name="land_available_label">
-		Superficie disponible :
+		Superficie disponible :
 	</text>
 	<text name="land_available_value">
 		[AREA] m²
 	</text>
 	<text name="your_contribution_label">
-		Votre contribution :
+		Votre contribution :
 	</text>
 	<string name="land_contrib_error">
-		Impossible de définir votre don de terre.
+		Impossible de définir votre don de terrain
 	</string>
 	<text name="your_contribution_units">
-		( m² )
+		m²
 	</text>
 	<text name="your_contribution_max_value">
 		([AMOUNT] max.)
 	</text>
 	<text name="group_over_limit_text">
-		Une contribution supplémentaire du groupe est requise pour prendre en
-charge le terrain utilisé.
+		Une contribution supplémentaire est requise pour prendre en charge le terrain utilisé
 	</text>
 	<text name="group_money_heading">
 		Finances
 	</text>
 	<tab_container name="group_money_tab_container">
-		<panel label="Planification" name="group_money_planning_tab">
+		<panel label="PLANIFICATION" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
-				Calcul en cours...
+				Chargement...
 			</text_editor>
 		</panel>
-		<panel label="Détails" name="group_money_details_tab">
+		<panel label="DÉTAILS" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
-				Calcul en cours...
+				Chargement...
 			</text_editor>
-			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_details_button" tool_tip="Reculer dans le temps"/>
-			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_details_button" tool_tip="Avancer dans le temps"/>
+			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_details_button" tool_tip="Précédent"/>
+			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_details_button" tool_tip="Suivant"/>
 		</panel>
-		<panel label="Ventes" name="group_money_sales_tab">
+		<panel label="VENTES" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
-				Calcul en cours...
+				Chargement...
 			</text_editor>
-			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_sales_button" tool_tip="Reculer dans le temps"/>
-			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_sales_button" tool_tip="Avancer dans le temps"/>
+			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_sales_button" tool_tip="Précédent"/>
+			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_sales_button" tool_tip="Suivant"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 432bb8b9c1..188fe28d8a 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Notices" name="notices_tab">
-	<text name="help_text">
-		Les notices vous permettent d&apos;envoyer des messages et pièces-jointes aux membres du groupe autorisés à les recevoir. Vous pouvez désactiver la réception des notices à l&apos;onglet Général.
-	</text>
-	<text name="no_notices_text">
-		Aucune notice
-	</text>
-	<button label="?" label_selected="?" name="help_button"/>
-	<text name="lbl">
-		Anciennes notices du groupe
-	</text>
+	<panel.string name="help_text">
+		Les notices vous permettent d&apos;envoyer un message et,
+facultativement, une pièce jointe. Les notices ne peuvent être envoyées
+qu&apos;aux membres du groupe dont le rôle leur permet de
+recevoir des notices. Vous pouvez désactiver la réception des notices dans 
+l&apos;onglet Général.
+	</panel.string>
+	<panel.string name="no_notices_text">
+		Pas d&apos;anciennes notices
+	</panel.string>
 	<text name="lbl2">
-		Les notes sont conservées pendant 14 jours. La limite est de 200 notes quotidiennes par groupe.
+		Les notices sont conservées pendant 14 jours.
+200 maximum par groupe et par jour
 	</text>
 	<scroll_list name="notice_list">
-		<column label="" name="icon"/>
-		<column label="Sujet" name="subject"/>
-		<column label="De" name="from"/>
-		<column label="Date" name="date"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="Sujet" name="subject"/>
+		<scroll_list.columns label="De" name="from"/>
+		<scroll_list.columns label="Date" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
-		Aucun résultat.
+		Aucun résultat
 	</text>
-	<button label="Nouvelle note" label_selected="Créer une notice" name="create_new_notice"/>
+	<button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice" tool_tip="Créer une notice"/>
 	<button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices"/>
 	<panel label="Créer une notice" name="panel_create_new_notice">
 		<text name="lbl">
 			Créer une notice
 		</text>
-		<text name="lbl2">
-			Vous pouvez ajouter un objet simple à la note en le faisant glisser de votre inventaire vers cette section. Les objets joints doivent pouvoir être copiés et transférés. Vous ne pouvez pas envoyer de dossier.
-		</text>
 		<text bottom_delta="-79" left="20" name="lbl3">
 			Sujet :
 		</text>
@@ -43,17 +41,19 @@
 			Pièce-jointe :
 		</text>
 		<line_editor left_delta="74" name="create_inventory_name" width="190"/>
-		<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
+		<text name="string">
+			Faites glisser ici pour joindre quelque chose -- &gt;
+		</text>
+		<button label="Supprimer" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
 		<button label="Envoyer" label_selected="Envoyer" left="274" name="send_notice" width="140"/>
-		<panel name="drop_target2" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
-		<panel name="drop_target" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
+		<group_drop_target name="drop_target" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
 	</panel>
 	<panel label="Voir ancienne notice" name="panel_view_past_notice">
 		<text name="lbl">
 			Détails
 		</text>
 		<text name="lbl2">
-			Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
+			Pour envoyer une nouvelle notice, cliquez sur le bouton +
 		</text>
 		<text name="lbl3">
 			Sujet :
@@ -61,7 +61,7 @@
 		<text name="lbl4">
 			Message :
 		</text>
-		<button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
 		<line_editor left="128" name="view_inventory_name" width="256"/>
+		<button label="Ouvrir la pièce jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
new file mode 100644
index 0000000000..d3ecbd71d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="instant_message" name="panel_group_notify">
+	<string name="message_max_lines_count" value="7"/>
+	<string name="subject_font" value="SANSSERIF_BIG"/>
+	<string name="date_font" value="SANSSERIF"/>
+	<panel label="en-tête" name="header">
+		<text name="title" value="Nom de l&apos;expéditeur / Nom du groupe"/>
+	</panel>
+	<text_editor name="message" value="message"/>
+	<text name="attachment" value="Pièce jointe"/>
+	<button label="Ok" name="btn_ok"/>
+</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 65aaab40f1..d0c9f2f302 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membres et rôles" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		Certains changements n&apos;ont pas été appliqués sur ce sous-onglet.
+		Certaines modifications sur cet onglet n&apos;ont pas été enregistrées.
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Voulez-vous enregistrer les modifications ?
+		Voulez-vous enregistrer vos modifications ?
 	</panel.string>
 	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="Membres" name="members_sub_tab" tool_tip="Membres">
+		<panel height="148" label="MEMBRES" name="members_sub_tab" tool_tip="Membres">
 			<panel.string name="help_text">
 				Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
 Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
@@ -15,35 +15,46 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 			<filter_editor label="Filtrer les membres" name="filter_input"/>
 			<name_list bottom_delta="-105" height="104" name="member_list">
 				<name_list.columns label="Membre" name="name"/>
-				<name_list.columns label="Donations" name="donated" width="116"/>
-				<name_list.columns label="En ligne" name="online" width="136"/>
+				<name_list.columns label="Donation" name="donated" width="116"/>
+				<name_list.columns label="Statut" name="online" width="136"/>
 			</name_list>
 			<button label="Inviter" name="member_invite" width="165"/>
 			<button label="Expulser" name="member_eject"/>
 		</panel>
-		<panel height="148" label="Rôles" name="roles_sub_tab">
+		<panel height="148" label="RÔLES" name="roles_sub_tab">
 			<panel.string name="help_text">
-				Chaque rôle possède un titre et des pouvoirs. Un membre peut avoir plusieurs rôles mais il ne peut y avoir que 10 rôles dans un groupe, Visiteur et Propriétaire inclus.
+				Chaque rôle possède un titre et des
+pouvoirs. Les membres peuvent avoir
+un ou plusieurs rôles. Un groupe peut avoir jusqu&apos;à 10 rôles,
+notamment les rôles Tous et Propriétaire.
 			</panel.string>
 			<panel.string name="cant_delete_role">
 				Les rôles Tous et Propriétaires sont spéciaux et ne peuvent pas être supprimés.
 			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<panel.string name="power_all_have_icon">
+				Checkbox_On
+			</panel.string>
+			<panel.string name="power_partial_icon">
+				Checkbox_Off
+			</panel.string>
 			<filter_editor label="Filtrer les rôles" name="filter_input"/>
 			<scroll_list bottom_delta="-104" height="104" name="role_list">
 				<scroll_list.columns label="Rôle" name="name"/>
 				<scroll_list.columns label="Titre" name="title"/>
-				<scroll_list.columns label="Membres" name="members"/>
+				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
-			<button label="Ajouter un rôle" name="role_create"/>
+			<button label="Nouveau rôle" name="role_create"/>
 			<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 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">
 				Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
 			</panel.string>
 			<filter_editor label="Filtrer les pouvoirs" name="filter_input"/>
-			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en afficher les détails.">
-				<scroll_list.columns label="" name="icon"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en savoir plus">
 				<scroll_list.columns label="" name="action"/>
 			</scroll_list>
 		</panel>
@@ -59,47 +70,36 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 		<text name="static2">
 			Pouvoirs attribués
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="member_allowed_actions" tool_tip="Pour en savoir plus sur chaque pouvoir, consultez l&apos;onglet Pouvoirs">
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
-			Nom
+			Nom du rôle
 		</text>
-		<line_editor name="role_name">
-			Employés
-		</line_editor>
+		<line_editor name="role_name"/>
 		<text name="static3">
-			Titre
+			Titre du rôle
 		</text>
-		<line_editor name="role_title">
-			(en attente)
-		</line_editor>
+		<line_editor name="role_title"/>
 		<text name="static2">
 			Description
 		</text>
-		<text_editor name="role_description">
-			(en attente)
-		</text_editor>
+		<text_editor name="role_description"/>
 		<text name="static4">
 			Membres assignés
 		</text>
-		<check_box label="Membres visibles" name="role_visible_in_list" tool_tip="Définit si les membres de ce rôle sont visibles à partir de l&apos;onglet Général aux personnes en dehors du groupe."/>
+		<check_box label="Afficher les membres" name="role_visible_in_list" tool_tip="Détermine si les personnes n&apos;appartenant pas au groupe peuvent voir les membres de ce rôle dans l&apos;onglet Général."/>
 		<text name="static5" tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
 			Pouvoirs attribués
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="role_allowed_actions" tool_tip="Pour en savoir plus sur chaque pouvoir, consultez l&apos;onglet Pouvoirs">
 			<scroll_list.columns label="" name="checkbox"/>
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
-		<text name="static">
-			Description
-		</text>
 		<text_editor name="action_description">
 			Ce pouvoir permet d&apos;expulser des membres du groupe. Seul un propriétaire peut expulser un autre propriétaire.
 		</text_editor>
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 340ca75d19..653f1fff28 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
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<button label="Voir le profil" name="view_profile_btn"/>
+	<text name="avatar_name" value="Inconnu"/>
+	<button label="Profil" name="view_profile_btn"/>
 	<button label="Devenir amis" name="add_friend_btn"/>
+	<button label="Téléporter" name="teleport_btn"/>
 	<button label="Partager" name="share_btn"/>
 	<panel name="panel_call_buttons">
 		<button label="Appeler" name="call_btn"/>
+		<button label="Quitter l&apos;appel" name="end_call_btn"/>
+		<button label="Contrôles vocaux" name="voice_ctrls_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
new file mode 100644
index 0000000000..bf3720f411
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_panel" name="im_panel">
+	<string name="message_max_lines_count">
+		6
+	</string>
+	<panel label="im_header" name="im_header">
+		<text name="user_name" value="Erica Vader"/>
+		<text name="time_box" value="23:30"/>
+	</panel>
+	<button label="Répondre" name="reply"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
new file mode 100644
index 0000000000..1b54f093d9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="landmark_info">
+	<string name="title_create_landmark" value="Créer un repère"/>
+	<string name="title_edit_landmark" value="Modifier le repère"/>
+	<string name="title_landmark" value="Repère"/>
+	<string name="not_available" value="(s/o)"/>
+	<string name="unknown" value="(inconnu)"/>
+	<string name="public" value="(public)"/>
+	<string name="server_update_text">
+		Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
+	</string>
+	<string name="server_error_text">
+		Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
+	</string>
+	<string name="server_forbidden_text">
+		Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint.  Veuillez vérifier vos permissions avec le propriétaire de la parcelle.
+	</string>
+	<string name="acquired_date">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</string>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<text name="title" value="Profil du lieu"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="maturity_value" value="(inconnu)"/>
+			<panel name="landmark_info_panel">
+				<text name="owner_label" value="Propriétaire :"/>
+				<text name="creator_label" value="Créé par :"/>
+				<text name="created_label" value="Le :"/>
+			</panel>
+			<panel name="landmark_edit_panel">
+				<text name="title_label" value="Titre :"/>
+				<text name="notes_label" value="Mes notes :"/>
+				<text name="folder_label" value="Emplacement du repère :"/>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
new file mode 100644
index 0000000000..c4e90bed61
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Landmarks">
+	<accordion name="landmarks_accordion">
+		<accordion_tab name="tab_favorites" title="Barre des Favoris"/>
+		<accordion_tab name="tab_landmarks" title="Repères"/>
+		<accordion_tab name="tab_inventory" title="Mon inventaire"/>
+		<accordion_tab name="tab_library" title="Bibliothèque"/>
+	</accordion>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
+		<button name="add_btn" tool_tip="Ajouter un nouveau repère"/>
+		<dnd_button name="trash_btn" tool_tip="Supprimer le repère sélectionné"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index f7ab2891e8..55dff07f46 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -7,13 +7,35 @@
 		http://secondlife.com/account/request.php?lang=fr
 	</panel.string>
 	<panel name="login_widgets">
-		<line_editor name="first_name_edit" tool_tip="Prénom sur [SECOND_LIFE]"/>
-		<line_editor name="last_name_edit" tool_tip="Nom sur [SECOND_LIFE]"/>
+		<text name="first_name_text">
+			Prénom :
+		</text>
+		<line_editor name="first_name_edit" tool_tip="Prénom [SECOND_LIFE]"/>
+		<text name="last_name_text">
+			Nom :
+		</text>
+		<line_editor name="last_name_edit" tool_tip="Nom [SECOND_LIFE]"/>
+		<text name="password_text">
+			Mot de passe :
+		</text>
+		<button label="Connexion" label_selected="Connexion" name="connect_btn"/>
 		<text name="start_location_text">
-			Lieu de départ :
+			Lieu de départ :
 		</text>
+		<combo_box name="start_location_combo">
+			<combo_box.item label="Dernier emplacement" name="MyLastLocation"/>
+			<combo_box.item label="Domicile" name="MyHome"/>
+			<combo_box.item label="&lt;Saisissez le nom de la région&gt;" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="Enregistrer le mot de passe" name="remember_check"/>
 		<text name="create_new_account_text">
 			Créer un compte
 		</text>
+		<text name="forgot_password_text">
+			Nom ou mot de passe oublié ?
+		</text>
+		<text name="channel_text">
+			[VERSION]
+		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
new file mode 100644
index 0000000000..ea6cee1da5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Choses" name="main inventory panel">
+	<panel.string name="Title">
+		Choses
+	</panel.string>
+	<filter_editor label="Filtre" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Tous les objets" name="All Items"/>
+		<inventory_panel label="Objets récents" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
+		<button name="add_btn" tool_tip="Ajouter un nouvel article"/>
+		<dnd_button name="trash_btn" tool_tip="Supprimer l&apos;article sélectionné"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="Fichier" name="File">
+			<menu_item_call label="Ouvert" name="Open"/>
+			<menu label="Charger" name="upload">
+				<menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
+				<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
+				<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+				<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="Nouvelle fenêtre" name="New Window"/>
+			<menu_item_call label="Afficher les filtres" name="Show Filters"/>
+			<menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
+			<menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
+			<menu_item_call label="Vider la corbeille" name="Empty Trash"/>
+			<menu_item_call label="Vider les Objets trouvés" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="Créer" name="Create">
+			<menu_item_call label="Nouveau dossier" name="New Folder"/>
+			<menu_item_call label="Nouveau script" name="New Script"/>
+			<menu_item_call label="Nouvelle note" name="New Note"/>
+			<menu_item_call label="Nouveau geste" name="New Gesture"/>
+			<menu label="Nouveaux habits" name="New Clothes">
+				<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+				<menu_item_call label="Nouveau pantalon" name="New Pants"/>
+				<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+				<menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+				<menu_item_call label="Nouvelle veste" name="New Jacket"/>
+				<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+				<menu_item_call label="Nouveaux gants" name="New Gloves"/>
+				<menu_item_call label="Nouveaux sous-vêtements (homme)" name="New Undershirt"/>
+				<menu_item_call label="Nouveaux sous-vêtements (femme)" name="New Underpants"/>
+				<menu_item_call label="Nouvel alpha" name="New Alpha"/>
+				<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
+			</menu>
+			<menu label="Nouvelles parties du corps" name="New Body Parts">
+				<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+				<menu_item_call label="Nouvelle peau" name="New Skin"/>
+				<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+				<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Trier" name="Sort">
+			<menu_item_check label="Par nom" name="By Name"/>
+			<menu_item_check label="Par date" name="By Date"/>
+			<menu_item_check label="Dossiers toujours par nom" name="Folders Always By Name"/>
+			<menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml
index 5bedee4616..c9d77c208f 100644
--- a/indra/newview/skins/default/xui/fr/panel_me.xml
+++ b/indra/newview/skins/default/xui/fr/panel_me.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Moi" name="panel_me">
+<panel label="Mon profil" name="panel_me">
 	<tab_container name="tabs">
-		<panel label="Mon Profil" name="panel_profile"/>
-		<panel label="Préférences" name="panel_picks"/>
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="FAVORIS" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
new file mode 100644
index 0000000000..2e73072e97
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Général" name="Media Settings General">
+	<text name="home_label">
+		URL du domicile :
+	</text>
+	<line_editor name="home_url" tool_tip="L&apos;URL du domicile pour cette source média"/>
+	<text name="preview_label">
+		Prévisualiser
+	</text>
+	<text name="current_url_label">
+		URL actuelle :
+	</text>
+	<line_editor name="current_url" tool_tip="L&apos;URL actuelle pour cette source média" value=""/>
+	<button label="Réinitialiser" name="current_url_reset_btn"/>
+	<text name="controls_label">
+		Contrôles :
+	</text>
+	<combo_box name="controls">
+		<combo_item name="Standard">
+			Standard
+		</combo_item>
+		<combo_item name="Mini">
+			Mini
+		</combo_item>
+	</combo_box>
+	<check_box initial_value="false" label="Boucle auto" name="auto_loop"/>
+	<check_box initial_value="false" label="Premier clic interagit" name="first_click_interact"/>
+	<check_box initial_value="false" label="Zoom auto" name="auto_zoom"/>
+	<check_box initial_value="false" label="Lecture auto du média" name="auto_play"/>
+	<text name="media_setting_note">
+		Remarque : kes résidents peuvent ignorer ce paramètre
+	</text>
+	<check_box initial_value="false" label="Mise à l&apos;échelle auto du média sur la face de l&apos;objet" name="auto_scale"/>
+	<text name="size_label">
+		Taille :
+	</text>
+	<text name="X_label">
+		X
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
new file mode 100644
index 0000000000..88a1897f81
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Contrôles" name="Media settings for controls">
+	<check_box initial_value="false" label="Désactiver la navigation et l&apos;interactivité" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="Masquer la barre de contrôles" name="perms_owner_control"/>
+	<check_box initial_value="false" label="Désactiver la navigation et l&apos;interactivité" name="perms_group_interact"/>
+	<check_box initial_value="false" label="Masquer la barre de contrôles" name="perms_group_control"/>
+	<check_box initial_value="false" label="Désactiver la navigation et l&apos;interactivité" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="Masquer la barre de contrôles" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
new file mode 100644
index 0000000000..42641f48af
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Sécurité" name="Media Settings Security">
+	<check_box initial_value="false" label="Autoriser l&apos;accès aux URL spécifiées uniquement (par préfixe)" name="whitelist_enable"/>
+	<button label="Ajouter" name="whitelist_add"/>
+	<button label="Supprimer" name="whitelist_del"/>
+</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
new file mode 100644
index 0000000000..5ffe0b9d89
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="no_partner_text" value="Aucun"/>
+	<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="Cliquez sur le bouton Modifier le profil ci-dessous pour changer d&apos;image"/>
+				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</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 :"/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</panel>
+			<text name="me_homepage_text">
+				Page d&apos;accueil :
+			</text>
+			<text name="title_member_text" value="Membre depuis :"/>
+			<text name="register_date" value="05/31/1976"/>
+			<text name="title_acc_status_text" value="Statut du compte :"/>
+			<text name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/>
+			<text name="title_partner_text" value="Partenaire :"/>
+			<panel name="partner_data_panel">
+				<text name="partner_text" value="[FIRST] [LAST]"/>
+			</panel>
+			<text name="title_groups_text" value="Groupes :"/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
+		</panel>
+	</scroll_container>
+	<panel name="profile_buttons_panel">
+		<button label="Devenir amis" name="add_friend"/>
+		<button label="IM" name="im"/>
+		<button label="Appeler" name="call"/>
+		<button label="Carte" name="show_on_map_btn"/>
+		<button label="Téléporter" name="teleport"/>
+	</panel>
+	<panel name="profile_me_buttons_panel">
+		<button label="Modifier le profil" name="edit_profile_btn"/>
+		<button label="Changer d&apos;apparence" name="edit_appearance_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
new file mode 100644
index 0000000000..2cb6d91133
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="navigation_bar">
+	<panel name="navigation_panel">
+		<button name="back_btn" tool_tip="Revenir à l&apos;emplacement précédent"/>
+		<button name="forward_btn" tool_tip="Avancer d&apos;un emplacement"/>
+		<button name="home_btn" tool_tip="Me téléporter jusqu&apos;à mon domicile"/>
+		<location_input label="Emplacement" name="location_combo"/>
+		<search_combo_box label="Rechercher" name="search_combo_box" tool_tip="Rechercher">
+			<combo_editor label="Rechercher dans [SECOND_LIFE]" name="search_combo_editor"/>
+		</search_combo_box>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
new file mode 100644
index 0000000000..fa1ddd2430
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="nearby_chat">
+	<panel name="chat_caption">
+		<text name="sender_name">
+			CHAT PRÈS DE VOUS
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
index c236c59fbc..8ed441cbae 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
 	<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/>
+	<button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml
new file mode 100644
index 0000000000..7fa583c32b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_notes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notes et vie privée" name="panel_notes">
+	<layout_stack name="layout">
+		<panel name="notes_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="profile_scroll_panel">
+					<text name="status_message" value="Mes notes privées :"/>
+					<text name="status_message2" value="Autoriser cette personne à :"/>
+					<check_box label="Afficher mon statut en ligne" name="status_check"/>
+					<check_box label="Me situer sur la carte" name="map_check"/>
+					<check_box label="Modifier, supprimer ou prendre mes objets" name="objects_check"/>
+				</panel>
+			</scroll_container>
+		</panel>
+		<panel name="notes_buttons_panel">
+			<button label="Ajouter" name="add_friend"/>
+			<button label="IM" name="im"/>
+			<button label="Appeler" name="call"/>
+			<button label="Carte" name="show_on_map_btn"/>
+			<button label="Téléporter" name="teleport"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..1ff1227772
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<accordion_tab name="tab_outfits" title="Barre des tenues"/>
+		<accordion_tab name="tab_cof" title="Barre de la tenue actuelle"/>
+	</accordion>
+	<button label="&gt;" name="selector" tool_tip="Afficher les propriétés de la tenue"/>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
+		<button name="add_btn" tool_tip="Ajouter un nouvel objet"/>
+		<dnd_button name="trash_btn" tool_tip="Supprimer l&apos;objet sélectionné"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
new file mode 100644
index 0000000000..d900344dcc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="Nouvelle tenue" name="new"/>
+	<menu_item_call label="Porter la tenue" name="wear"/>
+	<menu_item_call label="Supprimer la tenue" name="delete"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
new file mode 100644
index 0000000000..fb669f129b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="Résidents" name="people_panel">
+	<string name="no_people" value="Personne"/>
+	<string name="no_one_near" value="Personne près de vous"/>
+	<string name="no_friends_online" value="Pas d&apos;amis connectés"/>
+	<string name="no_friends" value="Pas d&apos;amis"/>
+	<string name="no_groups" value="Pas de groupes"/>
+	<string name="people_filter_label" value="Filtrer les personnes"/>
+	<string name="groups_filter_label" value="Filtrer les groupes"/>
+	<filter_editor label="Filtre" name="filter_input"/>
+	<tab_container name="tabs">
+		<panel label="PROCHES" name="nearby_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="nearby_view_sort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			</panel>
+		</panel>
+		<panel label="AMIS" name="friends_panel">
+			<accordion name="friends_accordion">
+				<accordion_tab name="tab_online" title="En ligne"/>
+				<accordion_tab name="tab_all" title="Tout"/>
+			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="friends_viewsort_btn" tool_tip="Options"/>
+				<button name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis"/>
+			</panel>
+		</panel>
+		<panel label="GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="groups_viewsort_btn" tool_tip="Options"/>
+				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
+			</panel>
+		</panel>
+		<panel label="RÉCENT" name="recent_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="recent_viewsort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			</panel>
+		</panel>
+	</tab_container>
+	<panel name="button_bar">
+		<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
+		<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
+		<button label="Appeler" name="call_btn" tool_tip="Appeler ce résident"/>
+		<button label="Partager" name="share_btn"/>
+		<button label="Téléporter" name="teleport_btn" tool_tip="Proposez une téléportation"/>
+		<button label="Profil du groupe" name="group_info_btn" tool_tip="Voir le profil du groupe"/>
+		<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
index 642e31a2c3..e9572caac7 100644
--- a/indra/newview/skins/default/xui/fr/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<panel name="panel_pick_info">

-	<text name="title" value="Infos"/>

-	<scroll_container name="profile_scroll">

-		<panel name="scroll_content_panel">

-			<text name="pick_name" value="[name]"/>

-			<text name="pick_location" value="[chargement...]"/>

-			<text name="pick_desc" value="[description]"/>

-		</panel>

-	</scroll_container>

-	<panel name="buttons">

-		<button label="Téléporter" name="teleport_btn"/>

-		<button label="Carte" name="show_on_map_btn"/>

-		<button label="Éditer" name="edit_btn"/>

-	</panel>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_pick_info">
+	<text name="title" value="Infos"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="pick_name" value="[name]"/>
+			<text name="pick_location" value="[loading...]"/>
+			<text name="pick_desc" value="[description]"/>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<button label="Téléporter" name="teleport_btn"/>
+		<button label="Carte" name="show_on_map_btn"/>
+		<button label="Éditer" name="edit_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml
index 25aeac9e75..63a518f8a6 100644
--- a/indra/newview/skins/default/xui/fr/panel_picks.xml
+++ b/indra/newview/skins/default/xui/fr/panel_picks.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Favoris" name="panel_picks">
+	<string name="no_picks" value="Pas de favoris"/>
+	<string name="no_classifieds" value="Pas de petites annonces"/>
+	<text name="empty_picks_panel_text">
+		Il n&apos;y a pas de favoris/petites annonces ici
+	</text>
+	<accordion name="accordion">
+		<accordion_tab name="tab_picks" title="Favoris"/>
+		<accordion_tab name="tab_classifieds" title="Petites annonces"/>
+	</accordion>
 	<panel label="bottom_panel" name="edit_panel">
 		<button name="new_btn" tool_tip="Ajouter cet endroit à mes Favoris"/>
 	</panel>
 	<panel name="buttons_cucks">
+		<button label="Infos" name="info_btn"/>
+		<button label="Téléporter" name="teleport_btn"/>
 		<button label="Carte" name="show_on_map_btn"/>
+		<button label="▼" name="overflow_btn"/>
 	</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
new file mode 100644
index 0000000000..3772d8dd4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="place_profile">
+	<string name="on" value="Activé"/>
+	<string name="off" value="Désactivé"/>
+	<string name="anyone" value="Tout le monde"/>
+	<string name="available" value="disponible"/>
+	<string name="allocated" value="affecté"/>
+	<string name="title_place" value="Profil du lieu"/>
+	<string name="title_teleport_history" value="Emplacement de l&apos;historique des téléportations"/>
+	<string name="not_available" value="(s/o)"/>
+	<string name="unknown" value="(inconnu)"/>
+	<string name="public" value="(public)"/>
+	<string name="none_text" value="(aucun)"/>
+	<string name="sale_pending_text" value="(vente en cours)"/>
+	<string name="group_owned_text" value="(propriété du groupe)"/>
+	<string name="price_text" value="L$"/>
+	<string name="area_text" value="m²"/>
+	<string name="all_residents_text" value="Tous les résidents"/>
+	<string name="group_text" value="Groupe"/>
+	<string name="can_resell">
+		Le terrain acheté dans cette région peut être revendu.
+	</string>
+	<string name="can_not_resell">
+		Le terrain acheté dans cette région ne peut pas être revendu.
+	</string>
+	<string name="can_change">
+		Le terrain acheté dans cette région peut être fusionné ou divisé.
+	</string>
+	<string name="can_not_change">
+		Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+	</string>
+	<string name="server_update_text">
+		Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
+	</string>
+	<string name="server_error_text">
+		Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
+	</string>
+	<string name="server_forbidden_text">
+		Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint.  Veuillez vérifier vos permissions auprès du propriétaire de la parcelle.
+	</string>
+	<string name="acquired_date">
+		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	</string>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<string name="icon_Voice" value="parcel_drk_Voice"/>
+	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
+	<string name="icon_Fly" value="parcel_drk_Fly"/>
+	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
+	<string name="icon_Push" value="parcel_drk_Push"/>
+	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
+	<string name="icon_Build" value="parcel_drk_Build"/>
+	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
+	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
+	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
+	<string name="icon_Damage" value="parcel_drk_Damage"/>
+	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
+	<text name="title" value="Profil du lieu"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="Exemple de région"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="owner_label" value="Propriétaire :"/>
+			<text name="owner_value" value="Alex Superduperlongenamenton"/>
+			<text name="maturity_value" value="(inconnu)"/>
+			<accordion name="advanced_info_accordion">
+				<accordion_tab name="parcel_characteristics_tab" title="Parcelle">
+					<panel>
+						<text name="rating_label" value="Catégorie :"/>
+						<text name="rating_value" value="(inconnu)"/>
+						<text name="voice_label" value="Voix :"/>
+						<text name="voice_value" value="Activée"/>
+						<text name="fly_label" value="Voler :"/>
+						<text name="fly_value" value="Activé"/>
+						<text name="push_label" value="Appuyer :"/>
+						<text name="push_value" value="Désactivé"/>
+						<text name="build_label" value="Construire :"/>
+						<text name="build_value" value="Activé"/>
+						<text name="scripts_label" value="Scripts :"/>
+						<text name="scripts_value" value="Activés"/>
+						<text name="damage_label" value="Dégâts :"/>
+						<text name="damage_value" value="Désactivés"/>
+						<button label="À propos des terrains" name="about_land_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="region_information_tab" title="Région">
+					<panel>
+						<text name="region_name_label" value="Région :"/>
+						<text name="region_name" value="Pays des orignaux"/>
+						<text name="region_type_label" value="Type :"/>
+						<text name="region_type" value="Orignal"/>
+						<text name="region_rating_label" value="Catégorie :"/>
+						<text name="region_rating" value="Explicite"/>
+						<text name="region_owner_label" value="Propriétaire :"/>
+						<text name="region_owner" value="orignal Van Orignal"/>
+						<text name="region_group_label" value="Groupe :"/>
+						<text name="region_group">
+							Le puissant orignal d&apos;Orignalville
+						</text>
+						<button label="Région/Domaine" name="region_info_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="estate_information_tab" title="Domaine">
+					<panel>
+						<text name="estate_name_label" value="Domaine :"/>
+						<text name="estate_rating_label" value="Catégorie :"/>
+						<text name="estate_owner_label" value="Propriétaire :"/>
+						<text name="covenant_label" value="Règlement :"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="sales_tab" title="À vendre">
+					<panel>
+						<text name="sales_price_label" value="Prix :"/>
+						<text name="area_label" value="Surface :"/>
+						<text name="traffic_label" value="Trafic :"/>
+						<text name="primitives_label" value="Prims :"/>
+						<text name="parcel_scripts_label" value="Scripts :"/>
+						<text name="terraform_limits_label" value="Limites de terraformage :"/>
+						<text name="subdivide_label" value="Possibilité de division/fusion :"/>
+						<text name="resale_label" value="Possibilité de revente :"/>
+						<text name="sale_to_label" value="À vendre à :"/>
+					</panel>
+				</accordion_tab>
+			</accordion>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
new file mode 100644
index 0000000000..79fe4d63c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Lieux" name="places panel">
+	<string name="landmarks_tab_title" value="MES REPÈRES"/>
+	<string name="teleport_history_tab_title" value="HISTORIQUE DES TÉLÉPORTATIONS"/>
+	<filter_editor label="Filtre" name="Filter"/>
+	<panel name="button_panel">
+		<button label="Téléporter" name="teleport_btn"/>
+		<button label="Carte" name="map_btn"/>
+		<button label="Éditer" name="edit_btn"/>
+		<button label="Fermer" name="close_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+		<button label="Enregistrer" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 4f0f6a8a23..04abcc8aad 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="advanced">
+	<panel.string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</panel.string>
+	<panel.string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</panel.string>
+	<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	<color_swatch name="background" tool_tip="Choisir la couleur des bulles de chat"/>
+	<slider label="Opacité" name="bubble_chat_opacity"/>
 	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur :
+		Rapport hauteur/largeur
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
 		<combo_box.item label="4:3 (Standard CRT)" name="item1"/>
@@ -9,4 +18,31 @@
 		<combo_box.item label="8:5 (écran large)" name="item3"/>
 		<combo_box.item label="16:9 (plein écran)" name="item4"/>
 	</combo_box>
+	<check_box label="Détection automatique" name="aspect_auto_detect"/>
+	<text name="heading1">
+		Caméra :
+	</text>
+	<slider label="Angle de vue" name="camera_fov"/>
+	<slider label="Distance" name="camera_offset_scale"/>
+	<text name="heading2">
+		Positionnement automatique pour :
+	</text>
+	<check_box label="Construire/Éditer" name="edit_camera_movement" tool_tip="Utilisez le positionnement automatique de la caméra quand vous accédez au mode de modification et quand vous le quittez"/>
+	<check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra quand je suis en mode Édition"/>
+	<text name="heading3">
+		Avatars :
+	</text>
+	<check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/>
+	<check_box label="Les touches de direction me font toujours me déplacer" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Appuyer deux fois et maintenir enfoncé pour courir" name="tap_tap_hold_to_run"/>
+	<check_box label="Faire bouger les lèvres de l&apos;avatar quand il parle" name="enable_lip_sync"/>
+	<check_box label="Afficher les erreurs de script" name="show_script_errors"/>
+	<radio_group name="show_location">
+		<radio_item label="En chat" name="0"/>
+		<radio_item label="Dans une fenêtre" name="1"/>
+	</radio_group>
+	<check_box label="Basculer le mode micro quand j&apos;appuie sur la touche de contrôle de la fonction Parler :" name="push_to_talk_toggle_check" tool_tip="En mode bascule, appuyez une fois sur la touche de contrôle de la fonction, puis relâchez-la pour activer/désactiver votre micro. Si vous n&apos;êtes pas en mode bascule, le micro ne diffuse votre voix que quand vous maintenez la touche de contrôle de la fonction enfoncée."/>
+	<line_editor label="Touche de contrôle de la fonction Appuyer pour parler" name="modifier_combo"/>
+	<button label="Définir la touche" name="set_voice_hotkey_button"/>
+	<button label="Bouton central de la souris" name="set_voice_middlemouse_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
index 61fcd912f5..600a825973 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Pop-ups" name="popups" title="Pop-ups">
-	<text name="text_box">
-		Ne pas afficher les pop-ups :
+	<text name="tell_me_label">
+		Me prévenir :
 	</text>
-	<text name="dont_show_label">
-		Ne pas afficher ces pop-ups :
-	</text>
-	<button label="Activer ce pop-up" label_selected="Autoriser ce pop-up" name="enable_popup"/>
+	<check_box label="Quand je dépense ou que je reçois des L$" name="notify_money_change_checkbox"/>
+	<check_box label="Quand mes amis se connectent ou se déconnectent" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
-		Afficher ces pop-ups :
+		Toujours afficher ces alertes :
 	</text>
-	<button label="Désactiver tous les pop-ups" name="skip_dialogs_btn" tool_tip="Désactiver tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
-	<text name="text_box2">
-		Offres de notes, textures et repères :
+	<text name="dont_show_label">
+		Ne jamais afficher ces alertes :
 	</text>
-	<button label="Activer tous les pop-ups" label_selected="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..." name="reset_dialogs_btn" tool_tip="Activer tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
-	<check_box label="Accepter automatiquement" name="accept_new_inventory"/>
-	<check_box label="Afficher après avoir accepté" name="show_new_inventory"/>
-	<check_box label="Ouvrir l&apos;inventaire et sélectionner les objets reçus" name="show_in_inventory"/>
 </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 e2d00a2421..13b467d205 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -39,4 +39,5 @@
 	</text>
 	<check_box initial_value="true" label="Jouer l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
 	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+	<check_box label="Activer l&apos;historique des chats en texte brut" name="plain_text_chat_history"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 1ed3cafbc3..783bd3bcba 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,91 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_panel">
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ." label="Domicile"/>
-		<combo_box.item name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ." label="Dernier emplacement"/>
-	</combo_box>
-	<check_box label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
-	<combo_box name="fade_out_combobox">
-		<combo_box.item name="Never" label="Jamais"/>
-		<combo_box.item name="Show Temporarily" label="Afficher temporairement"/>
-		<combo_box.item name="Always" label="Toujours"/>
-	</combo_box>
-	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
-	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
-	<text name="group_titles_textbox">
-		Titres de groupe :
-	</text>
-	<check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
-	<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
-	<text name="UI Size:">
-		Taille de l&apos;interface :
+	<text name="language_textbox">
+		Langue :
 	</text>
-	<slider name="ui_scale_slider"/>
-	<check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
-	<spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
-	<check_box label="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
-		Catégorie de contenu :
+	<combo_box name="language_combobox">
+		<combo_box.item label="Choix par défaut" name="System Default Language"/>
+		<combo_box.item label="English (Anglais)" name="English"/>
+		<combo_box.item label="Dansk (Danois) - Bêta" name="Danish"/>
+		<combo_box.item label="Deutsch (Allemand) - Bêta" name="Deutsch(German)"/>
+		<combo_box.item label="Español (Espagnol) - Bêta" name="Spanish"/>
+		<combo_box.item label="Français - Bêta" name="French"/>
+		<combo_box.item label="Italiano (Italien) - Bêta" name="Italian"/>
+		<combo_box.item label="Nederlands (Néerlandais) - Bêta" name="Dutch"/>
+		<combo_box.item label="Polski (Polonais) - Bêta" name="Polish"/>
+		<combo_box.item label="Portugués (Portugais) - Bêta" name="Portugese"/>
+		<combo_box.item label="日本語 (Japonais) - Bêta" name="(Japanese)"/>
+		<combo_box.item label="Tests langue" name="TestLanguage"/>
+	</combo_box>
+	<text name="language_textbox2">
+		(redémarrage requis)
 	</text>
 	<text name="maturity_desired_prompt">
 		Je veux accéder au contenu classé :
 	</text>
+	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item name="Desired_Adult" label="PG, Mature et Adult"/>
-		<combo_box.item name="Desired_Mature" label="PG et Mature"/>
-		<combo_box.item name="Desired_PG" label="PG"/>
+		<combo_box.item label="PG, Mature et Adult" name="Desired_Adult"/>
+		<combo_box.item label="PG et Mature" name="Desired_Mature"/>
+		<combo_box.item label="PG" name="Desired_PG"/>
 	</combo_box>
-	<text name="maturity_desired_textbox">
-		PG
-	</text>
 	<text name="start_location_textbox">
-		Lieu de départ :
+		Lieu de départ :
 	</text>
-	<text name="show_names_textbox">
-		Afficher les noms :
+	<combo_box name="start_location_combo">
+		<combo_box.item label="Dernier emplacement" name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ."/>
+		<combo_box.item label="Domicile" name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ."/>
+	</combo_box>
+	<check_box initial_value="true" label="Afficher à la connexion" name="show_location_checkbox"/>
+	<text name="name_tags_textbox">
+		Étiquettes :
 	</text>
+	<radio_group name="Name_Tag_Preference">
+		<radio_item label="Désactivée" name="radio"/>
+		<radio_item label="Activée" name="radio2"/>
+		<radio_item label="Afficher brièvement" name="radio3"/>
+	</radio_group>
+	<check_box label="Afficher mon nom" name="show_my_name_checkbox1"/>
+	<check_box initial_value="true" label="Étiquettes courtes" name="small_avatar_names_checkbox"/>
+	<check_box label="Afficher les titres de groupe" name="show_all_title_checkbox1"/>
 	<text name="effects_color_textbox">
-		Couleur du faisceau de sélection :
+		Mes effets :
+	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+	<text name="title_afk_text">
+		Délai d&apos;absence :
 	</text>
+	<spinner label="" name="afk_timeout_spinner"/>
 	<text name="seconds_textbox">
 		secondes
 	</text>
-	<text name="crash_report_textbox">
-		Rapports de crash :
-	</text>
-	<text name="language_textbox">
-		Langue :
-	</text>
-	<text name="language_textbox2">
-		(redémarrage requis)
+	<text name="text_box3">
+		Réponse si occupé(e) :
 	</text>
-	<string name="region_name_prompt">
-		&lt;Saisissez le nom de la région&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox">
-		<combo_box.item name="Askbeforesending" label="Demander avant d&apos;envoyer"/>
-		<combo_box.item name="Alwayssend" label="Toujours envoyer"/>
-		<combo_box.item name="Neversend" label="Ne jamais envoyer"/>
-	</combo_box>
-	<combo_box name="language_combobox">
-		<combo_box.item name="System Default Language" label="Choix par défaut"/>
-		<combo_box.item name="English" label="English (Anglais)"/>
-		<combo_box.item name="Danish" label="Dansk (Danois) - Bêta"/>
-		<combo_box.item name="Deutsch(German)" label="Deutsch (Allemand) - Bêta"/>
-		<combo_box.item name="Spanish" label="Español (Espagnol) - Bêta"/>
-		<combo_box.item name="French" label="Français - Bêta"/>
-		<combo_box.item name="Italian" label="Italiano (Italien) - Bêta"/>
-		<combo_box.item name="Hungarian" label="Magyar (Hongrois) - Bêta"/>
-		<combo_box.item name="Dutch" label="Nederlands (Néerlandais) - Bêta"/>
-		<combo_box.item name="Polish" label="Polski (Polonais) - Bêta"/>
-		<combo_box.item name="Portugese" label="Portugués (Portugais) - Bêta"/>
-		<combo_box.item name="Russian" label="Русский (Russe) - Bêta"/>
-		<combo_box.item name="Turkish" label="Türkçe (Turc) - Bêta"/>
-		<combo_box.item name="Ukrainian" label="Українська (Ukrainien) - Bêta"/>
-		<combo_box.item name="Chinese" label="中文 (简体) (Chinois) - Bêta"/>
-		<combo_box.item name="(Japanese)" label="日本語 (Japonais) - Bêta"/>
-		<combo_box.item name="(Korean)" label="한국어 (Coréen) - Bêta"/>
-	</combo_box>
-	<check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+	<text_editor name="busy_response">
+		log_in_to_change
+	</text_editor>
 </panel>
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 6a469c7322..b4b1783190 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -12,10 +12,10 @@
 		<combo_box.item label="1024 x 768" name="1024x768"/>
 	</combo_box>
 	<text name="UI Size:">
-		Taille de l&apos;IU :
+		Taille de l&apos;UI :
 	</text>
 	<text name="QualitySpeed">
-		Qualité et vitesse :
+		Qualité et vitesse :
 	</text>
 	<text left="105" name="FasterText">
 		Plus rapide
@@ -35,37 +35,37 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
+	<panel label="Graphiques personnalisés" name="CustomGraphics Panel">
 		<text name="ShadersText">
 			Effets :
 		</text>
 		<check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
-		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter."/>
+		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
 		<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Reflets de l&apos;eau" name="Reflections"/>
+		<check_box initial_value="true" label="Reflets dans l&apos;eau" name="Reflections"/>
 		<text name="ReflectionDetailText">
-			Objets reflétés :
+			Objets reflétés :
 		</text>
 		<radio_group name="ReflectionDetailRadio">
-			<radio_item label="Terrain et Arbres" name="0"/>
-			<radio_item label="Objets statiques" name="1"/>
-			<radio_item label="Objets et avatars" name="2"/>
+			<radio_item label="Terrain et arbres" name="0"/>
+			<radio_item label="Tous les objets statiques" name="1"/>
+			<radio_item label="Tous les objets et avatars" name="2"/>
 			<radio_item label="Tout" name="3"/>
 		</radio_group>
 		<text name="AvatarRenderingText">
-			Rendu de l&apos;avatar :
+			Rendu de l&apos;avatar :
 		</text>
 		<check_box initial_value="true" label="Avatars éloignés en 2D" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Accélération du rendu" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="Mouvement des habits" name="AvatarCloth"/>
-		<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
+		<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
-		<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
-		<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
+		<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+		<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
-			Détails des rendus :
+			Détails des rendus :
 		</text>
 		<slider label="  Objets :" name="ObjectMeshDetail"/>
 		<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
@@ -95,7 +95,7 @@
 			Faible
 		</text>
 		<text name="LightingDetailText">
-			Sources lumineuses :
+			Sources lumineuses :
 		</text>
 		<radio_group name="LightingDetailRadio">
 			<radio_item label="Soleil et lune uniquement" name="SunMoon"/>
@@ -105,8 +105,8 @@
 			Rendu du terrain :
 		</text>
 		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Faible" name="0"/>
-			<radio_item label="Élevé" name="2"/>
+			<radio_item label="Bas" name="0"/>
+			<radio_item label="Haut" name="2"/>
 		</radio_group>
 	</panel>
 	<button label="Appliquer" label_selected="Appliquer" name="Apply"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
index 3beaaf5c79..c86a6da037 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -11,11 +11,18 @@
 	<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
 	<check_box label="Fermer le micro à la fin d&apos;un appel" name="auto_disengage_mic_check"/>
 	<check_box label="Accepter les cookies" name="cookies_enabled"/>
-	<check_box label="Sauvegarder les journaux sur mon ordinateur" name="log_instant_messages"/>
-	<radio_group name="ChatIMLogs">
-		<radio_item label="Chat" name="radio1"/>
-		<radio_item label="IM" name="radio2"/>
-	</radio_group>
+	<check_box label="Autoriser la lecture automatique des médias" name="autoplay_enabled"/>
+	<check_box label="Lire le média de la parcelle automatiquement" name="parcel_autoplay_enabled"/>
+	<text name="Logs:">
+		Journaux :
+	</text>
+	<check_box label="Sauvegarder les chats près de moi sur mon ordinateur" name="log_nearby_chat"/>
+	<check_box label="Sauvegarder les IM sur mon ordinateur" name="log_instant_messages"/>
+	<check_box label="Inclure les heures" name="show_timestamps_check_im"/>
 	<line_editor left="308" name="log_path_string" right="-20"/>
+	<text name="log_path_desc">
+		Emplacement des journaux
+	</text>
 	<button label="Parcourir" label_selected="Parcourir" name="log_path_button" width="150"/>
+	<button label="Liste des ignorés" name="block_list"/>
 </panel>
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 2e8f5e9a8b..ffc822d76f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -2,14 +2,14 @@
 <panel label="Contrôle et caméra" name="Input panel">
 	<button label="Autres accessoires" name="joystick_setup_button" width="175"/>
 	<text name="Mouselook:">
-		Vue subjective :
+		Vue subjective :
 	</text>
 	<text name=" Mouse Sensitivity">
 		Sensibilité de la souris
 	</text>
 	<check_box label="Inverser" name="invert_mouse"/>
 	<text name="Network:">
-		Réseau :
+		Réseau :
 	</text>
 	<text name="Maximum bandwidth">
 		Bande passante maximale
@@ -18,7 +18,7 @@
 		kbps
 	</text>
 	<check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
-	<spinner label="Numéro de port :" name="web_proxy_port"/>
+	<spinner label="Numéro de port :" name="web_proxy_port"/>
 	<text name="cache_size_label_l">
 		Taille de la mémoire
 	</text>
@@ -31,10 +31,10 @@
 		Emplacement du cache
 	</text>
 	<text name="Web:">
-		Web :
+		Web :
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Utiliser le navigateur intégré" name="internal" tool_tip="Utilisez le navigateur intégré pour obtenir de l&apos;aide, ouvrir des liens etc. Ce navigateur s&apos;ouvre dans [APP_NAME]."/>
+		<radio_item label="Utiliser le navigateur intégré" name="internal" tool_tip="Utilisez le navigateur intégré pour obtenir de l&apos;aide, ouvrir des liens, etc. Ce navigateur s&apos;ouvre dans [APP_NAME]."/>
 		<radio_item label="Utiliser mon navigateur (IE, Firefox etc.)" name="external" tool_tip="Utiliser le navigateur web système par défaut pour l&apos;aide, les liens etc. Non recommandé en mode plein écran."/>
 	</radio_group>
 	<check_box initial_value="false" label="Proxy web" name="web_proxy_enabled"/>
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 3c38da3eb9..27768ac73b 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -1,40 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Audio et vidéo" name="Preference Media panel">
+<panel label="Sons" name="Preference Media panel">
 	<slider label="Volume principal" name="System Volume"/>
-	<slider label="Son ambiant" name="Wind Volume"/>
-	<slider label="Sons" name="SFX Volume"/>
+	<check_box initial_value="true" label="Couper le son si minimisé" name="mute_when_minimized"/>
+	<slider label="Ambiant" name="Wind Volume"/>
+	<slider label="Boutons" name="UI Volume"/>
 	<slider label="Média" name="Media Volume"/>
-	<slider label="Interface" name="UI Volume"/>
-	<slider label="Musique" name="Music Volume"/>
+	<slider label="Effets sonores" name="SFX Volume"/>
+	<slider label="Flux musical" name="Music Volume"/>
+	<check_box label="Voix" name="enable_voice_check"/>
 	<slider label="Voix" name="Voice Volume"/>
-	<text_editor name="voice_unavailable">
-		Le chat vocal n&apos;est pas disponible
-	</text_editor>
-	<check_box label="Chat vocal" name="enable_voice_check"/>
+	<text name="Listen from">
+		Écouter à partir de :
+	</text>
 	<radio_group name="ear_location">
-		<radio_item label="Écouter depuis la position de la caméra" name="0"/>
-		<radio_item label="Écouter depuis la position de l&apos;avatar" name="1"/>
+		<radio_item label="Position de la caméra" name="0"/>
+		<radio_item label="Position de l&apos;avatar" name="1"/>
 	</radio_group>
-	<button label="Paramètres du matériel" name="device_settings_btn"/>
-	<text name="muting_text">
-		Volume :
-	</text>
-	<panel name="Volume Panel" width="249"/>
-	<check_box label="Couper le son" name="disable audio"/>
-	<text bottom="-195" name="streaming_prefs_text" width="145">
-		Média :
-	</text>
-	<text name="audio_prefs_text">
-		Audio :
-	</text>
-	<panel label="Volume" name="Volume Panel"/>
-	<check_box label="Couper le son quand minimisé" name="mute_when_minimized"/>
-	<check_box label="Jouer la musique disponible" name="streaming_music"/>
-	<check_box label="Jouer le média disponible" name="streaming_video"/>
-	<check_box label="Lire automatiquement le média" name="auto_streaming_video"/>
-	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
-	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
-	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
-	<spinner label="Alerte L$" name="L$ Change Threshold"/>
-	<spinner label="Alerte santé" name="Health Change Threshold"/>
+	<button label="Périphériques d&apos;entrée/de sortie" name="device_settings_btn"/>
+	<panel label="Paramètres du matériel" name="device_settings_panel">
+		<panel.string name="default_text">
+			Défaut
+		</panel.string>
+		<text name="Input">
+			Entrée
+		</text>
+		<text name="My volume label">
+			Mon volume :
+		</text>
+		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume avec le curseur"/>
+		<text name="wait_text">
+			Veuillez patienter
+		</text>
+		<text name="Output">
+			Sortie
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..dd70c40c3e
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="MediaControls">
+	<string name="control_background_image_name">
+		Inspector_Background
+	</string>
+	<string name="skip_step">
+		0.2
+	</string>
+	<layout_stack name="media_controls">
+		<layout_panel name="media_address">
+			<line_editor name="media_address_url" tool_tip="URL du média"/>
+			<layout_stack name="media_address_url_icons">
+				<layout_panel>
+					<icon name="media_whitelist_flag" tool_tip="Liste blanche activée"/>
+				</layout_panel>
+				<layout_panel>
+					<icon name="media_secure_lock_flag" tool_tip="Navigation sécurisée"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="media_play_position">
+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Progrès de la lecture du film"/>
+		</layout_panel>
+		<layout_panel name="media_volume">
+			<button name="media_volume_button" tool_tip="Couper le son de ce média"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack>
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="Le média est en cours de chargement"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index dc28547cb4..c2e291bd09 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -12,31 +12,47 @@
 	</string>
 	<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=fr-FR"/>
 	<string name="no_partner_text" value="Aucun"/>
+	<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] :"/>
+				<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<panel name="first_life_image_panel">
-				<text name="title_rw_descr_text" value="Monde physique :"/>
+				<text name="title_rw_descr_text" value="Monde physique :"/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<text name="me_homepage_text">
-				Page d&apos;accueil :
+				Page d&apos;accueil :
 			</text>
-			<text name="title_member_text" value="Membre depuis :"/>
-			<text name="title_acc_status_text" value="Statut du compte :"/>
-			<text name="title_partner_text" value="Partenaire :"/>
+			<text name="title_member_text" value="Membre depuis :"/>
+			<text name="register_date" value="05/31/1976"/>
+			<text name="title_acc_status_text" value="Statut du compte :"/>
+			<text name="acc_status_text" value="Résident. Aucune info de paiement enregistrée."/>
+			<text name="title_partner_text" value="Partenaire :"/>
 			<panel name="partner_data_panel">
 				<text name="partner_text" value="[FIRST] [LAST]"/>
 			</panel>
-			<text name="title_groups_text" value="Groupes :"/>
+			<text name="title_groups_text" value="Groupes :"/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
 		</panel>
 	</scroll_container>
 	<panel name="profile_buttons_panel">
 		<button label="Devenir amis" name="add_friend"/>
 		<button label="IM" name="im"/>
 		<button label="Appeler" name="call"/>
+		<button label="Carte" name="show_on_map_btn"/>
 		<button label="Téléporter" name="teleport"/>
+		<button label="▼" name="overflow_btn"/>
 	</panel>
 	<panel name="profile_me_buttons_panel">
 		<button label="Modifier le profil" name="edit_profile_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile_view.xml b/indra/newview/skins/default/xui/fr/panel_profile_view.xml
index 928df67e4c..146095a25f 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile_view.xml
@@ -6,10 +6,11 @@
 	<string name="status_offline">
 		Hors ligne
 	</string>
-	<text name="user_name" value="(en cours de chargement...)"/>
+	<text_editor name="user_name" value="(en cours de chargement...)"/>
 	<text name="status" value="En ligne"/>
 	<tab_container name="tabs">
-		<panel label="Profil" name="panel_profile"/>
-		<panel label="Favoris" name="panel_picks"/>
+		<panel label="PROFIL" name="panel_profile"/>
+		<panel label="FAVORIS" name="panel_picks"/>
+		<panel label="NOTES ET VIE PRIVÉE" name="panel_notes"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index f2ba297fd2..cf9f4e0fd0 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Règlement" name="Covenant">
 	<text name="estate_section_lbl">
-		Domaine :
+		Domaine
 	</text>
 	<text bottom_delta="-19" name="estate_name_lbl">
 		Nom :
@@ -34,13 +34,13 @@
 		Faire glisser une note pour changer le règlement de ce domaine.
 	</text>
 	<text name="region_section_lbl">
-		Région :
+		Région
 	</text>
 	<text name="region_name_lbl">
 		Nom :
 	</text>
 	<text name="region_name_text">
-		leyla
+		Erica
 	</text>
 	<text name="region_landtype_lbl">
 		Type :
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 1338ab9e71..0fabf92889 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -12,8 +12,8 @@
 	<button label="?" name="disable_collisions_help"/>
 	<check_box label="Désactiver la physique" name="disable_physics_check" tool_tip="Désactiver tous les effets liés à la physique dans cette région"/>
 	<button label="?" name="disable_physics_help"/>
-	<button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
-	<text name="objret_text_lbl" bottom_delta="-42">
+	<button bottom_delta="-38" label="Appliquer" name="apply_btn"/>
+	<text bottom_delta="-42" name="objret_text_lbl">
 		Renvoi de l&apos;objet
 	</text>
 	<text name="resident_text_lbl">
@@ -22,19 +22,19 @@
 	<line_editor name="target_avatar_name">
 		(aucun)
 	</line_editor>
-	<button label="Choisir..." name="choose_avatar_btn"/>
+	<button label="Choisir" name="choose_avatar_btn"/>
 	<text name="options_text_lbl">
 		Options :
 	</text>
-	<check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip="Ne renvoyer que les objets avec des scripts."/>
-	<check_box label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre"/>
-	<check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
+	<check_box label="Avec scripts" name="return_scripts" tool_tip="Renvoyer les objets avec scripts uniquement"/>
+	<check_box label="Sur le terrain d&apos;un autre résident" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre"/>
+	<check_box label="Dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
 	<button label="Renvoyer" name="return_btn"/>
 	<button label="Afficher les collisions les plus consommatrices..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
-	<button label="?" name="top_colliders_help" left="337"/>
+	<button label="?" left="337" name="top_colliders_help"/>
 	<button label="Afficher les objets scriptés les plus consommateurs..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
-	<button label="?" name="top_scripts_help" left="337"/>
+	<button label="?" left="337" name="top_scripts_help"/>
 	<button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
-	<button label="?" name="restart_help" left="177" />
+	<button label="?" left="177" name="restart_help"/>
 	<button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 425f273790..bfe33a1c3d 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Domaine" name="Estate">
-	<text name="estate_help_text" bottom="-34">
+	<text bottom="-34" name="estate_help_text">
 		Les changements apportés aux paramètres
 de cet onglet auront des répercussions sur
 toutes les régions du domaine.
 	</text>
-	<text name="estate_text" bottom_delta="-34">
+	<text bottom_delta="-34" name="estate_text">
 		Domaine :
 	</text>
 	<text name="estate_name">
 		(inconnu)
 	</text>
 	<text name="owner_text">
-		Propriétaire :
+		Propriétaire :
 	</text>
 	<text name="estate_owner">
 		(inconnu)
@@ -20,8 +20,8 @@ toutes les régions du domaine.
 	<text name="Only Allow">
 		Limiter l&apos;accès aux résidents qui :
 	</text>
-	<check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannir les résidents non identifés."/>
-	<check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannir les résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com."/>
+	<check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Interdire les résidents non identifiés"/>
+	<check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Interdire 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_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index d312646788..91d315848e 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Textures du sol" name="Textures">
 	<text name="region_text_lbl">
 		Région :
@@ -44,6 +44,7 @@
 	</text>
 	<text name="height_text_lbl11">
 		En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
+et la valeur Haut correspond à la hauteur minimum de la texture n°4.
 	</text>
 	<text name="height_text_lbl12">
 		et la valeur Haut correspond à la hauteur minimum de la texture n°4.
@@ -51,14 +52,14 @@
 	<text name="height_text_lbl13">
 		Nord-est
 	</text>
-	<spinner label="Bas" name="height_start_spin_0" />
-	<spinner label="Bas" name="height_start_spin_1" />
-	<spinner label="Bas" name="height_start_spin_2" />
-	<spinner label="Bas" name="height_start_spin_3" />
-	<spinner label="Haut" name="height_range_spin_0" />
-	<spinner label="Haut" name="height_range_spin_1" />
-	<spinner label="Haut" name="height_range_spin_2" />
-	<spinner label="Haut" name="height_range_spin_3" />
+	<spinner label="Bas" name="height_start_spin_0"/>
+	<spinner label="Bas" name="height_start_spin_1"/>
+	<spinner label="Bas" name="height_start_spin_2"/>
+	<spinner label="Bas" name="height_start_spin_3"/>
+	<spinner label="Haut" name="height_range_spin_0"/>
+	<spinner label="Haut" name="height_range_spin_1"/>
+	<spinner label="Haut" name="height_range_spin_2"/>
+	<spinner label="Haut" name="height_range_spin_3"/>
 	<text name="height_text_lbl14">
 		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
 	</text>
@@ -68,5 +69,5 @@
 	<text name="height_text_lbl16">
 		et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
 	</text>
-	<button label="Appliquer" name="apply_btn" />
+	<button label="Appliquer" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
index 7256fe4109..ea161ecae8 100644
--- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script panel">
 	<panel.string name="loading">
-		Chargement…
+		Chargement...
 	</panel.string>
 	<panel.string name="can_not_view">
-		Ce scipt ne peut pas être copié, visualisé ou modifié.  Pour visualiser ou modifier un script à l&apos;intérieur d&apos;un objet, vous devez avoir les permissions requises.
+		Ce script ne peut pas être copié, visualisé ou modifié. Pour visualiser ou modifier un script à l&apos;intérieur d&apos;un objet, vous devez avoir les permissions requises.
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
 		Les objets publics ne peuvent pas exécuter de scripts
@@ -16,7 +16,7 @@
 		Script : [NAME]
 	</panel.string>
 	<text_editor name="Script Editor">
-		Chargement…
+		Chargement...
 	</text_editor>
 	<button label="Enregistrer" label_selected="Enregistrer" name="Save_btn"/>
 	<combo_box label="Insérer..." name="Insert..."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml
new file mode 100644
index 0000000000..816834a985
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/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="Domicile." name="sidebar_home">
+		<panel label="domicile" name="panel_home"/>
+	</sidetray_tab>
+	<sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people">
+		<panel_container name="panel_container">
+			<panel label="Profil du groupe" name="panel_group_info_sidetray"/>
+			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
+		</panel_container>
+	</sidetray_tab>
+	<sidetray_tab description="Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà." label="Lieux" name="sidebar_places">
+		<panel label="Lieux" name="panel_places"/>
+	</sidetray_tab>
+	<sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me">
+		<panel label="Moi" name="panel_me"/>
+	</sidetray_tab>
+	<sidetray_tab description="Modifiez votre apparence actuelle." name="sidebar_appearance">
+		<panel label="Changer d&apos;apparence" name="sidepanel_appearance"/>
+	</sidetray_tab>
+	<sidetray_tab description="Parcourez votre inventaire." name="sidebar_inventory">
+		<panel label="Modifier l&apos;inventaire" name="sidepanel_inventory"/>
+	</sidetray_tab>
+</side_tray>
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..2899f630f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="sidetray_tab_panel">
+	<text name="sidetray_tab_title" value="Panneau latéral"/>
+	<button name="show_help" tool_tip="Afficher l&apos;aide"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
new file mode 100644
index 0000000000..48bcff1c09
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Part of side tray, see that XML file for panel config -->
+<panel label="home_tab" name="home_tab">
+	<scroll_container name="profile_scroll">
+		<panel name="profile_scroll_panel">
+			<panel name="sidebar_people">
+				<text name="tab_name" value="Résidents"/>
+				<text name="tab_description">
+					Trouvez vos amis, vos groupes, vos contacts et les personnes se trouvant près de vous.
+				</text>
+			</panel>
+			<panel name="sidebar_places">
+				<text name="tab_name" value="Lieux"/>
+				<text name="tab_description">
+					Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà.
+				</text>
+			</panel>
+			<panel name="sidebar_me">
+				<text name="tab_name" value="Mon profil"/>
+				<text name="tab_description">
+					Modifiez votre profil public.
+				</text>
+			</panel>
+			<panel name="sidebar_appearance">
+				<text name="tab_name" value="Mon apparence"/>
+				<text name="tab_description">
+					Modifiez votre apparence actuelle.
+				</text>
+			</panel>
+			<panel name="sidebar_inventory">
+				<text name="tab_name" value="Mon inventaire"/>
+				<text name="tab_description">
+					Parcourez votre inventaire.
+				</text>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 6a481a155c..9432b44f0e 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -12,11 +12,18 @@
 	<panel.string name="bandwidth_tooltip">
 		Bande passante
 	</panel.string>
+	<panel.string name="time">
+		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+	</panel.string>
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Mon solde : Cliquez ici pour acheter plus de L$"/>
-	<text name="TimeText" tool_tip="Heure actuelle (Californie)">
+	<button label="" label_selected="" name="buycurrency" tool_tip="Mon solde : Cliquez pour acheter plus de L$"/>
+	<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
 		midi
 	</text>
+	<button name="volume_btn" tool_tip="Contrôle du volume global"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
new file mode 100644
index 0000000000..81db7c8989
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="sys_well_item" title="sys_well_item">
+	<text name="title">
+		Beware the trout. BEWARE! THE! TROUT!
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
new file mode 100644
index 0000000000..623d2deae9
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Teleport History">
+	<accordion name="history_accordion">
+		<accordion_tab name="today" title="Aujourd&apos;hui"/>
+		<accordion_tab name="yesterday" title="Hier"/>
+		<accordion_tab name="2_days_ago" title="Il y a 2 jours"/>
+		<accordion_tab name="3_days_ago" title="Il y a 3 jours"/>
+		<accordion_tab name="4_days_ago" title="Il y a 4 jours"/>
+		<accordion_tab name="5_days_ago" title="Il y a 5 jours"/>
+		<accordion_tab name="6_days_and_older" title="Il y a 6 jours ou plus"/>
+		<accordion_tab name="1_month_and_older" title="Il y a 1 mois ou plus"/>
+		<accordion_tab name="6_months_and_older" title="Il y a 6 mois ou plus"/>
+	</accordion>
+	<panel label="bottom_panel" name="bottom_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
new file mode 100644
index 0000000000..9d18c52442
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+	<text name="region" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml
index a35d0eaea9..e6e95c2605 100644
--- a/indra/newview/skins/default/xui/fr/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/panel_world_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="world_map">
 	<panel.string name="Loading">
-		Chargement…
+		Chargement...
 	</panel.string>
 	<panel.string name="InvalidLocation">
 		Lieu invalide...
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
new file mode 100644
index 0000000000..456e1dcb9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Apparence" name="appearance panel">
+	<string name="No Outfit" value="Aucune tenue"/>
+	<panel name="panel_currentlook">
+		<button label="Éditer" name="editappearance_btn"/>
+		<text name="currentlook_title">
+			Tenue actuelle :
+		</text>
+		<text name="currentlook_name">
+			Ma tenue
+		</text>
+	</panel>
+	<filter_editor label="Filtre" name="Filter"/>
+	<button label="Porter" name="wear_btn"/>
+	<button label="Nouvelle tenue" name="newlook_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
new file mode 100644
index 0000000000..b310574c4c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Choses" name="objects panel">
+	<panel label="" name="sidepanel__inventory_panel">
+		<panel name="button_panel">
+			<button label="Infos" name="info_btn"/>
+			<button label="Porter" name="wear_btn"/>
+			<button label="Jouer" name="play_btn"/>
+			<button label="Téléporter" name="teleport_btn"/>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
new file mode 100644
index 0000000000..b1df70148b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="Propriétés des objets de l&apos;inventaire">
+	<panel.string name="unknown">
+		(inconnu)
+	</panel.string>
+	<panel.string name="public">
+		(public)
+	</panel.string>
+	<panel.string name="you_can">
+		Vous pouvez :
+	</panel.string>
+	<panel.string name="owner_can">
+		Le propriétaire peut :
+	</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>
+	<panel label="">
+		<text name="LabelItemNameTitle">
+			Nom :
+		</text>
+		<text name="LabelItemDescTitle">
+			Description :
+		</text>
+		<text name="LabelCreatorTitle">
+			Créateur :
+		</text>
+		<text name="LabelCreatorName">
+			Nicole Linden
+		</text>
+		<button label="Profil..." name="BtnCreator"/>
+		<text name="LabelOwnerTitle">
+			Propriétaire :
+		</text>
+		<text name="LabelOwnerName">
+			Thrax Linden
+		</text>
+		<button label="Profil..." name="BtnOwner"/>
+		<text name="LabelAcquiredTitle">
+			Acquis :
+		</text>
+		<text name="LabelAcquiredDate">
+			Wed May 24 12:50:46 2006
+		</text>
+		<text name="OwnerLabel">
+			Vous :
+		</text>
+		<check_box label="Éditer" name="CheckOwnerModify"/>
+		<check_box label="Copier" name="CheckOwnerCopy"/>
+		<check_box label="Revendre" name="CheckOwnerTransfer"/>
+		<text name="AnyoneLabel">
+			N&apos;importe qui :
+		</text>
+		<check_box label="Copier" name="CheckEveryoneCopy"/>
+		<text name="GroupLabel">
+			Groupe :
+		</text>
+		<check_box label="Partager" name="CheckShareWithGroup"/>
+		<text name="NextOwnerLabel">
+			Le prochain propriétaire :
+		</text>
+		<check_box label="Éditer" name="CheckNextOwnerModify"/>
+		<check_box label="Copier" name="CheckNextOwnerCopy"/>
+		<check_box label="Revendre" name="CheckNextOwnerTransfer"/>
+		<check_box label="À vendre" name="CheckPurchase"/>
+		<combo_box name="combobox sale copy">
+			<combo_box.item label="Copier" name="Copy"/>
+			<combo_box.item label="Original" name="Original"/>
+		</combo_box>
+		<spinner label="Prix :" name="Edit Cost"/>
+		<text name="CurrencySymbol">
+			L$
+		</text>
+	</panel>
+	<panel name="button_panel">
+		<button label="Éditer" name="edit_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+		<button label="Enregistrer" name="save_btn"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..de7751c4ff
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="object properties" title="Propriétés de l&apos;objet">
+	<panel.string name="text deed continued">
+		Céder
+	</panel.string>
+	<panel.string name="text deed">
+		Céder
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Vous pouvez modifier cet objet
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Vous pouvez modifier ces objets
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Vous ne pouvez pas modifier cet objet
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Vous ne pouvez pas modifier ces objets
+	</panel.string>
+	<panel.string name="text modify warning">
+		Cet objet comprend des parties reliées
+	</panel.string>
+	<panel.string name="Cost Default">
+		Prix : L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Prix total : L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Prix par : L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Prix mixte
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Vente mixte
+	</panel.string>
+	<panel label="">
+		<text name="Name:">
+			Nom :
+		</text>
+		<text name="Description:">
+			Description :
+		</text>
+		<text name="Creator:">
+			Créateur :
+		</text>
+		<text name="Creator Name">
+			Esbee Linden
+		</text>
+		<text name="Owner:">
+			Propriétaire :
+		</text>
+		<text name="Owner Name">
+			Erica Linden
+		</text>
+		<text name="Group:">
+			Groupe :
+		</text>
+		<button name="button set group" tool_tip="Choisissez un groupe pour partager les permissions de cet objet"/>
+		<name_box initial_value="Chargement..." name="Group Name Proxy"/>
+		<button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les permissions au prochain propriétaire. Seul un officier peut céder les objets d&apos;un groupe."/>
+		<check_box label="Partager" name="checkbox share with group" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Transférer."/>
+		<text name="label click action">
+			Cliquer pour :
+		</text>
+		<combo_box name="clickaction">
+			<combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/>
+			<combo_box.item label="S&apos;asseoir sur l&apos;objet" name="Sitonobject"/>
+			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
+			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
+			<combo_box.item label="Ouvrir" name="Open"/>
+		</combo_box>
+		<check_box label="À vendre :" name="checkbox for sale"/>
+		<combo_box name="sale type">
+			<combo_box.item label="Copier" name="Copy"/>
+			<combo_box.item label="Contenus" name="Contents"/>
+			<combo_box.item label="Original" name="Original"/>
+		</combo_box>
+		<spinner label="Prix : L$" name="Edit Cost"/>
+		<check_box label="Afficher dans les résultats de recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/>
+		<panel name="perms_build">
+			<text name="perm_modify">
+				Vous pouvez modifier cet objet
+			</text>
+			<text name="Anyone can:">
+				N&apos;importe qui :
+			</text>
+			<check_box label="Bouger" name="checkbox allow everyone move"/>
+			<check_box label="Copier" name="checkbox allow everyone copy"/>
+			<text name="Next owner can:">
+				Le prochain propriétaire :
+			</text>
+			<check_box label="Modifier" name="checkbox next owner can modify"/>
+			<check_box label="Copier" name="checkbox next owner can copy"/>
+			<check_box label="Transférer" name="checkbox next owner can transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
+			<text name="B:">
+				B :
+			</text>
+			<text name="O:">
+				O :
+			</text>
+			<text name="G:">
+				G :
+			</text>
+			<text name="E:">
+				E :
+			</text>
+			<text name="N:">
+				N :
+			</text>
+			<text name="F:">
+				F :
+			</text>
+		</panel>
+	</panel>
+	<panel name="button_panel">
+		<button label="Éditer" name="edit_btn"/>
+		<button label="Ouvrir" name="open_btn"/>
+		<button label="Payer" name="pay_btn"/>
+		<button label="Acheter" name="buy_btn"/>
+		<button label="Annuler" name="cancel_btn"/>
+		<button label="Enregistrer" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index c59e359d6e..a8e3ff1442 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings
      that are returned from one component and may appear in many places-->
 <strings>
-	<string name="create_account_url">http://join.secondlife.com/index.php?lang=fr-FR</string>
 	<string name="SECOND_LIFE">
 		Second Life
 	</string>
@@ -80,8 +79,14 @@
 	<string name="LoginDownloadingClothing">
 		Habits en cours de téléchargement...
 	</string>
+	<string name="Quit">
+		Quitter
+	</string>
+	<string name="create_account_url">
+		http://join.secondlife.com/index.php?lang=fr-FR
+	</string>
 	<string name="AgentLostConnection">
-		Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet.
+		Il y a peut-être des problèmes techniques dans cette région.  Veuillez vérifier votre connexion Internet.
 	</string>
 	<string name="TooltipPerson">
 		Personne
@@ -155,9 +160,19 @@
 	<string name="TooltipObjectIMUrl">
 		Cliquez pour afficher la description de cet objet
 	</string>
+	<string name="TooltipMapUrl">
+		Cliquez pour voir cet emplacement sur la carte
+	</string>
 	<string name="TooltipSLAPP">
 		Cliquez pour exécuter la commande secondlife:// command
 	</string>
+	<string name="CurrentURL" value=" URL actuelle : [CurrentURL]"/>
+	<string name="SLurlLabelTeleport">
+		Me téléporter vers
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		Afficher la carte pour
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Fermer (&#8984;W)
 	</string>
@@ -182,6 +197,12 @@
 	<string name="BUTTON_HELP">
 		Afficher l&apos;aide
 	</string>
+	<string name="Searching">
+		Recherche...
+	</string>
+	<string name="NoneFound">
+		Aucun résultat.
+	</string>
 	<string name="RetrievingData">
 		En cours d&apos;extraction...
 	</string>
@@ -189,7 +210,7 @@
 		Notes de version
 	</string>
 	<string name="LoadingData">
-		Chargement..
+		Chargement...
 	</string>
 	<string name="AvatarNameNobody">
 		(personne)
@@ -197,6 +218,9 @@
 	<string name="AvatarNameWaiting">
 		(en attente)
 	</string>
+	<string name="AvatarNameMultiple">
+		(multiple)
+	</string>
 	<string name="AvatarNameHippos">
 		(hippos)
 	</string>
@@ -267,10 +291,10 @@
 		racine
 	</string>
 	<string name="lsl2 script">
-		script lsl2
+		script LSL2
 	</string>
 	<string name="lsl bytecode">
-		bytecode lsl
+		bytecode LSL
 	</string>
 	<string name="tga texture">
 		texture tga
@@ -282,13 +306,13 @@
 		photo
 	</string>
 	<string name="lost and found">
-		objets trouvés
+		Objets trouvés
 	</string>
 	<string name="targa image">
 		image targa
 	</string>
 	<string name="trash">
-		poubelle
+		Poubelle
 	</string>
 	<string name="jpeg image">
 		image jpeg
@@ -308,6 +332,9 @@
 	<string name="symbolic link">
 		lien
 	</string>
+	<string name="AvatarEditingAppearance">
+		(Apparence en cours de modification)
+	</string>
 	<string name="AvatarAway">
 		Absent
 	</string>
@@ -315,7 +342,7 @@
 		Occupé
 	</string>
 	<string name="AvatarMuted">
-		Ignoré
+		Bloqué(e)
 	</string>
 	<string name="anim_express_afraid">
 		Effrayé
@@ -530,6 +557,9 @@
 	<string name="worldmap_offline">
 		Hors ligne
 	</string>
+	<string name="worldmap_results_none_found">
+		Aucun résultat.
+	</string>
 	<string name="Ok">
 		OK
 	</string>
@@ -660,16 +690,16 @@
 		Choisir le répertoire
 	</string>
 	<string name="AvatarSetNotAway">
-		Ne plus me mettre en mode absent
+		Présent
 	</string>
 	<string name="AvatarSetAway">
-		Me mettre en mode absent
+		Absent
 	</string>
 	<string name="AvatarSetNotBusy">
-		Ne plus me mettre en mode occupé
+		Pas occupé
 	</string>
 	<string name="AvatarSetBusy">
-		Me mettre en mode occupé
+		Occupé
 	</string>
 	<string name="shape">
 		Silhouette
@@ -710,9 +740,51 @@
 	<string name="skirt">
 		Jupe
 	</string>
+	<string name="alpha">
+		Alpha
+	</string>
+	<string name="tattoo">
+		Tatouage
+	</string>
 	<string name="invalid">
 		non valide
 	</string>
+	<string name="next">
+		Suivant
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		Note au groupe
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		Notices au groupe
+	</string>
+	<string name="GroupNotifySentBy">
+		Envoyée par
+	</string>
+	<string name="GroupNotifyAttached">
+		Pièce(s) jointe(s) :
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		Consultez les notices précédentes ou choisissez de ne plus recevoir ces messages ici.
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		Ouvrir la pièce jointe
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		Enregistrer la pièce jointe
+	</string>
+	<string name="TeleportOffer">
+		Offre de téléportation
+	</string>
+	<string name="StartUpNotifications">
+		De nouvelles notifications sont arrivées en votre absence.
+	</string>
+	<string name="OverflowInfoChannelString">
+		Vous avez %d notification(s) supplémentaire(s)
+	</string>
 	<string name="BodyPartsRightArm">
 		Bras droit
 	</string>
@@ -744,22 +816,56 @@
 		Appuyez sur ESC pour quitter la vue subjective
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Aucun objet correspondant ne se trouve dans l&apos;inventaire.
+		Aucun objet correspondant dans l&apos;inventaire.
 	</string>
 	<string name="InventoryNoTexture">
 		Vous n&apos;avez pas de copie de cette texture dans votre inventaire
 	</string>
+	<string name="no_transfer" value=" (pas de transfert)"/>
+	<string name="no_modify" value=" (pas de modification)"/>
+	<string name="no_copy" value=" (pas de copie)"/>
+	<string name="worn" value=" (porté)"/>
+	<string name="link" value=" (lien)"/>
+	<string name="broken_link" value=" (broken_link)"/>
 	<string name="LoadingContents">
 		chargement des contenus en cours...
 	</string>
 	<string name="NoContents">
 		Aucun contenu
 	</string>
+	<string name="WornOnAttachmentPoint" value=" (porté sur [ATTACHMENT_POINT])"/>
+	<string name="PermYes">
+		Oui
+	</string>
+	<string name="PermNo">
+		Non
+	</string>
+	<string name="Chat" value=" Chat :"/>
+	<string name="Sound" value=" Son :"/>
+	<string name="Wait" value=" --- Attendre :"/>
+	<string name="AnimFlagStop" value=" Arrêter l&apos;animation :"/>
+	<string name="AnimFlagStart" value=" Démarrer l&apos;animation :"/>
+	<string name="Wave" value=" Faire signe"/>
+	<string name="HelloAvatar" value=" Bonjour, avatar !"/>
+	<string name="ViewAllGestures" value="  Tout afficher &gt;&gt;"/>
+	<string name="Animations" value=" Animations,"/>
+	<string name="Calling Cards" value=" Cartes de visite,"/>
+	<string name="Clothing" value=" Habits,"/>
+	<string name="Gestures" value=" Gestes,"/>
+	<string name="Landmarks" value=" Repères,"/>
+	<string name="Notecards" value=" Notes,"/>
+	<string name="Objects" value=" Objets,"/>
+	<string name="Scripts" value=" Scripts,"/>
+	<string name="Sounds" value=" Sons,"/>
+	<string name="Textures" value=" Textures,"/>
+	<string name="Snapshots" value=" Photos,"/>
+	<string name="No Filters" value="Non "/>
+	<string name="Since Logoff" value=" - Depuis la déconnexion"/>
 	<string name="InvFolder My Inventory">
 		Mon inventaire
 	</string>
 	<string name="InvFolder My Favorites">
-		Mes favoris
+		Mes Favoris
 	</string>
 	<string name="InvFolder Library">
 		Bibliothèque
@@ -1013,6 +1119,15 @@
 	<string name="AgeDaysC">
 		[COUNT] jours
 	</string>
+	<string name="GroupMembersA">
+		[COUNT] membre
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] membres
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] membres
+	</string>
 	<string name="AcctTypeResident">
 		Résident
 	</string>
@@ -1032,13 +1147,13 @@
 		Infos de paiement enregistrées
 	</string>
 	<string name="NoPaymentInfoOnFile">
-		Aucune info de paiement
+		Aucune info de paiement enregistrée
 	</string>
 	<string name="AgeVerified">
-		Âge vérifié
+		Personne dont l&apos;âge a été vérifié
 	</string>
 	<string name="NotAgeVerified">
-		Âge non vérifié
+		Personne dont l&apos;âge n&apos;a pas été vérifié
 	</string>
 	<string name="Center 2">
 		Centrer 2
@@ -1107,7 +1222,7 @@
 		arrêter
 	</string>
 	<string name="CompileSuccessful">
-		Compilation réussie !
+		Compilation réussie !
 	</string>
 	<string name="CompileSuccessfulSaving">
 		Compilation réussie, enregistrement en cours...
@@ -1119,14 +1234,18 @@
 		Script (objet hors de portée)
 	</string>
 	<string name="GodToolsObjectOwnedBy">
-		Objet [OBJECT] possédé par [OWNER]
+		Objet [OBJECT] appartenant à [OWNER]
 	</string>
 	<string name="GroupsNone">
 		aucun
 	</string>
+	<string name="Group" value=" (groupe)"/>
 	<string name="Unknown">
 		(Inconnu)
 	</string>
+	<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
+	<string name="NextStipendDay" value="Prochaine prime le "/>
+	<string name="GroupIndividualShare" value="                      Groupe    Part individuelle"/>
 	<string name="Balance">
 		Solde
 	</string>
@@ -1155,26 +1274,32 @@
 		erreur
 	</string>
 	<string name="RegionInfoAllEstatesOwnedBy">
-		tous les domaines possédés par [OWNER]
+		tous les domaines appartenant à [OWNER]
 	</string>
 	<string name="RegionInfoAllEstatesYouOwn">
-		tous les domaines que vous possédez
+		tous les domaines vous appartenant
 	</string>
 	<string name="RegionInfoAllEstatesYouManage">
-		tous les domaines que vous gérez pour [owner]
+		tous les domaines que vous gérez pour [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Résidents autorisés : ([ALLOWEDAGENTS], max [MAXACCESS])
+		Résidents autorisés : ([ALLOWEDAGENTS], max. [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
-		Groupes autorisés : ([ALLOWEDGROUPS], max [MAXACCESS])
+		Groupes autorisés : ([ALLOWEDGROUPS], max. [MAXACCESS])
 	</string>
 	<string name="CursorPos">
-		Ligne [LINE], Colonne [COLUMN]
+		Ligne [LINE], colonne [COLUMN]
 	</string>
 	<string name="PanelDirCountFound">
 		[COUNT] trouvé(s)
 	</string>
+	<string name="PanelDirTimeStr">
+		[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]
+	</string>
+	<string name="PanelDirEventsDateText">
+		[mthnum,datetime,slt]/[day,datetime,slt]
+	</string>
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
@@ -1197,8 +1322,10 @@
 		Il n&apos;y a aucun règlement pour ce domaine. Le terrain sur ce domaine est vendu par le propriétaire, non par Linden Lab.  Pour en savoir plus, veuillez contacter le propriétaire.
 	</string>
 	<string name="covenant_last_modified">
-		Dernière modification :
+		Dernière modification :
 	</string>
+	<string name="none_text" value=" (aucun)"/>
+	<string name="never_text" value=" (jamais)"/>
 	<string name="GroupOwned">
 		Propriété du groupe
 	</string>
@@ -1206,29 +1333,11 @@
 		Public
 	</string>
 	<string name="ClassifiedClicksTxt">
-		Clics : [TELEPORT] téléporter, [MAP] carte, [PROFILE] profile
+		Clics : [TELEPORT] téléportation, [MAP] carte, [PROFILE] profil
 	</string>
 	<string name="ClassifiedUpdateAfterPublish">
 		(mise à jour après la publication)
 	</string>
-	<string name="GroupVoteYes">
-		Oui
-	</string>
-	<string name="GroupVoteNo">
-		Non
-	</string>
-	<string name="GroupVoteNoActiveProposals">
-		Il n&apos;y a aucune proposition active actuellement
-	</string>
-	<string name="GroupVoteNoArchivedProposals">
-		Il n&apos;y a aucune proposition archivée actuellement
-	</string>
-	<string name="GroupVoteRetrievingArchivedProposals">
-		Extraction des propositions archivées
-	</string>
-	<string name="GroupVoteRetrievingActiveProposals">
-		Extraction des propositions actives
-	</string>
 	<string name="MultiPreviewTitle">
 		Prévisualiser
 	</string>
@@ -1299,10 +1408,10 @@
 		Annuler
 	</string>
 	<string name="UploadingCosts">
-		Chargement de %s coûts
+		Charger %s coûte
 	</string>
 	<string name="UnknownFileExtension">
-		Extension de fichier inconnue. %s
+		Extension de fichier inconnue .%s
 .wav, .tga, .bmp, .jpg, .jpeg, ou .bvh acceptés
 	</string>
 	<string name="AddLandmarkNavBarMenu">
@@ -1339,10 +1448,10 @@
 		Réception
 	</string>
 	<string name="AM">
-		AM
+		Matin
 	</string>
 	<string name="PM">
-		PM
+		Après-midi
 	</string>
 	<string name="PST">
 		PST
@@ -1360,7 +1469,7 @@
 		Droite
 	</string>
 	<string name="Back">
-		Précédente
+		Arrière
 	</string>
 	<string name="North">
 		Nord
@@ -1375,10 +1484,10 @@
 		Est
 	</string>
 	<string name="Up">
-		Vers le haut
+		Haut
 	</string>
 	<string name="Down">
-		Vers le bas
+		Bas
 	</string>
 	<string name="Any Category">
 		Toutes catégories
@@ -1420,10 +1529,10 @@
 		Adult
 	</string>
 	<string name="Arts&amp;Culture">
-		Art et Culture
+		Arts et culture
 	</string>
 	<string name="Business">
-		Affaires
+		Business
 	</string>
 	<string name="Educational">
 		Éducation
@@ -1438,7 +1547,7 @@
 		Accueil pour les nouveaux
 	</string>
 	<string name="Parks&amp;Nature">
-		Parcs et Nature
+		Parcs et nature
 	</string>
 	<string name="Residential">
 		Résidentiel
@@ -1482,13 +1591,19 @@
 	<string name="---">
 		---
 	</string>
+	<string name="Multiple Media">
+		Médias multiples
+	</string>
+	<string name="Play Media">
+		Lire/pauser le média
+	</string>
 	<string name="MBCmdLineError">
 		Une erreur est survenue lors de la lecture de la ligne de commande.
-Merci de consulter : http://wiki.secondlife.com/wiki/Client_parameters
-Erreur :
+Merci de consulter : http://wiki.secondlife.com/wiki/Client_parameters
+Erreur :
 	</string>
 	<string name="MBCmdLineUsg">
-		[APP_NAME] Utilisation de la ligne de commande :
+		[APP_NAME] - Utilisation de la ligne de commande :
 	</string>
 	<string name="MBUnableToAccessFile">
 		[APP_NAME] ne peut accéder à un fichier requis.
@@ -1501,23 +1616,23 @@ Si le problème persiste, vous devrez peut-être complètement désinstaller pui
 		Erreur fatale
 	</string>
 	<string name="MBRequiresAltiVec">
-		[APP_NAME] nécessite un microprocesseur AltiVec (version G4 ou antérieure).
+		 [APP_NAME] nécessite un microprocesseur AltiVec (version G4 ou antérieure).
 	</string>
 	<string name="MBAlreadyRunning">
-		[APP_NAME] est déjà lancé.
+		[APP_NAME] est déjà en cours d&apos;exécution.
 Vérifiez si une version minimisée du programme apparaît dans votre barre de tâches.
 Si ce message persiste, redémarrez votre ordinateur.
 	</string>
 	<string name="MBFrozenCrashed">
 		[APP_NAME] semble avoir crashé lors de l&apos;utilisation précédente.
-Voulez-vous envoyer un rapport de crash ?
+Voulez-vous envoyer un rapport de crash ?
 	</string>
 	<string name="MBAlert">
 		Alerte
 	</string>
 	<string name="MBNoDirectX">
 		[APP_NAME] ne peut détecter DirectX 9.0b ou une version supérieure.
-[APP_NAME] utilise DirectX pour détecter les matériels et/ou les pilotes qui ne sont pas à jour et peuvent causer des problèmes de stabilité, de performance, ou des plantages.  Bien que vous puissiez utiliser [APP_NAME] sans DirectX, nous vous recommandons de l&apos;utiliser avec DirectX 9.0b.
+[APP_NAME] utilise DirectX pour détecter les matériels et/ou les pilotes qui ne sont pas à jour et peuvent causer des problèmes de stabilité, de performance ou des plantages.  Bien que vous puissiez utiliser [APP_NAME] sans DirectX, nous vous recommandons de l&apos;utiliser avec DirectX 9.0b.
 
 Voulez-vous continuer ?
 	</string>
@@ -1535,11 +1650,11 @@ Veuillez télécharger la dernière version sur www.secondlife.com.
 		Erreur
 	</string>
 	<string name="MBFullScreenErr">
-		Impossible d&apos;ouvrir le mode plein écran de [WIDTH] x [HEIGHT]
+		Impossible d&apos;ouvrir le mode plein écran à [WIDTH] x [HEIGHT].
 Utilisation du mode fenêtré.
 	</string>
 	<string name="MBDestroyWinFailed">
-		Erreur de fermeture lors de la destruction de la fenêtre (DestroyWindow() failed))
+		Erreur de fermeture lors de la destruction de la fenêtre (DestroyWindow() a échoué)
 	</string>
 	<string name="MBShutdownErr">
 		Erreur de fermeture
@@ -1554,14 +1669,13 @@ Utilisation du mode fenêtré.
 		Impossible de trouver la description du format pixel
 	</string>
 	<string name="MBTrueColorWindow">
-		[APP_NAME] nécessite que True Color (32-bit) soit exécuté dans une fenêtre.
-Veuillez allez sous Panneau de configuration &gt; Affichage &gt; Paramètres et régler la couleur de l&apos;écran sur 32-bit.
-Sinon, lorsque vous choisissez le mode plein écran,  [APP_NAME] ajustera automatiquement l&apos;écran à chaque utilisation.
+		[APP_NAME] nécessite True Color (32 bits) pour s&apos;exécuter.
+Accédez aux paramètres d&apos;affichage de votre ordinateur et réglez le mode couleur sur 32 bits.
 	</string>
 	<string name="MBAlpha">
-		[APP_NAME] ne peut pas être lancé car il n&apos;y pas de channel 8 bit accessible.  En général, ceci vient de problèmes avec le pilote de la carte vidéo.
+		[APP_NAME] ne peut pas s&apos;exécuter, car il n&apos;y pas de canal alpha 8 bits accessible.  En général, ceci vient de problèmes avec le pilote de la carte vidéo.
 Assurez-vous d&apos;avoir installé le pilote de carte vidéo le plus récent possible.
- Assurez-vous aussi que votre écran est réglé sur True Clor (22-bit) sous Panneau de configuration &gt; Affichage &gt; Paramètres.
+Assurez-vous aussi que votre écran est réglé sur True Color (32 bits) sous Panneau de configuration &gt; Affichage &gt; Paramètres.
 Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	</string>
 	<string name="MBPixelFmtSetErr">
@@ -1574,12 +1688,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Impossible d&apos;activer le contexte de rendu GL
 	</string>
 	<string name="MBVideoDrvErr">
-		[APP_NAME] ne peut pas être exécuté car les pilotes de votre carte vidéo n&apos;ont pas été installés correctement, ne sont pas à jour, ou sont pour du matériel non pris en charge. Assurez-vous d&apos;avoir des pilotes de cartes vidéos récents, et même si vous avez les plus récents, réinstallez-les.
+		[APP_NAME] ne peut pas s&apos;exécuter car les pilotes de votre carte vidéo n&apos;ont pas été installés correctement, ne sont pas à jour, ou sont pour du matériel non pris en charge. Assurez-vous d&apos;avoir des pilotes de cartes vidéos récents, et même si vous avez les plus récents, réinstallez-les.
 
 Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	</string>
 	<string name="5 O&apos;Clock Shadow">
-		Barbe naissante
+		Peu
 	</string>
 	<string name="All White">
 		Tout blancs
@@ -1588,50 +1702,26 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Grand yeux
 	</string>
 	<string name="Arced">
-		Arquées
+		Arqués
 	</string>
 	<string name="Arm Length">
 		Longueur des bras
 	</string>
 	<string name="Attached">
-		Minces
+		Attachés
 	</string>
 	<string name="Attached Earlobes">
-		Largeur des lobes
-	</string>
-	<string name="Back Bangs">
-		Mèches de derrière
-	</string>
-	<string name="Back Bangs Down">
-		Mèches de derrière Bas
-	</string>
-	<string name="Back Bangs Up">
-		Mèches de derrière haut
+		Lobes
 	</string>
 	<string name="Back Fringe">
 		Mèches de derrière
 	</string>
-	<string name="Back Hair">
-		Cheveux de derrière
-	</string>
-	<string name="Back Hair Down">
-		Cheveux de derrière Bas
-	</string>
-	<string name="Back Hair Up">
-		Cheveux de derrière haut
-	</string>
 	<string name="Baggy">
 		Cernés
 	</string>
 	<string name="Bangs">
 		Frange
 	</string>
-	<string name="Bangs Down">
-		Frange Bas
-	</string>
-	<string name="Bangs Up">
-		Frange Haut
-	</string>
 	<string name="Beady Eyes">
 		Yeux perçants
 	</string>
@@ -1639,22 +1729,19 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Taille du ventre
 	</string>
 	<string name="Big">
-		Gros
+		Maxi
 	</string>
 	<string name="Big Butt">
 		Grosses fesses
 	</string>
-	<string name="Big Eyeball">
-		Gros globe oculaire
-	</string>
 	<string name="Big Hair Back">
-		Cheveux volumineux : Derrière
+		Volume : Derrière
 	</string>
 	<string name="Big Hair Front">
-		Cheveux volumineux : Devant
+		Volume : Devant
 	</string>
 	<string name="Big Hair Top">
-		Cheveux volumineux : En haut
+		Volume : Haut
 	</string>
 	<string name="Big Head">
 		Grosse tête
@@ -1720,7 +1807,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Large
 	</string>
 	<string name="Brow Size">
-		Taille des sourcils
+		Taille
 	</string>
 	<string name="Bug Eyes">
 		Yeux globuleux
@@ -1738,7 +1825,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Sourcils touffus
 	</string>
 	<string name="Bushy Hair">
-		Cheveux touffus
+		Beaucoup
 	</string>
 	<string name="Butt Size">
 		Taille des fesses
@@ -1753,7 +1840,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Plus gonflante
 	</string>
 	<string name="Chaplin">
-		Chaplin
+		Moins
 	</string>
 	<string name="Cheek Bones">
 		Pommettes
@@ -1765,7 +1852,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Angle du menton
 	</string>
 	<string name="Chin Cleft">
-		Fente labiale
+		Fente du menton
 	</string>
 	<string name="Chin Curtains">
 		Favoris
@@ -1789,7 +1876,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effacer
 	</string>
 	<string name="Cleft">
-		Fente
+		Fendu
 	</string>
 	<string name="Close Set Eyes">
 		Yeux rapprochés
@@ -1810,7 +1897,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Fermé à droite
 	</string>
 	<string name="Coin Purse">
-		Bijoux de famille
+		Mini
 	</string>
 	<string name="Collar Back">
 		Col arrière
@@ -1821,20 +1908,14 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Corner Down">
 		Coin vers le bas
 	</string>
-	<string name="Corner Normal">
-		Coin normal
-	</string>
 	<string name="Corner Up">
 		Coin vers le haut
 	</string>
 	<string name="Creased">
-		Frippée
+		Fripée
 	</string>
 	<string name="Crooked Nose">
-		Nez en bec d&apos;aigle
-	</string>
-	<string name="Cropped Hair">
-		Garçonne
+		Déviation du nez
 	</string>
 	<string name="Cuff Flare">
 		Jambe
@@ -1854,15 +1935,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Default Heels">
 		Talons par défaut
 	</string>
-	<string name="Default Toe">
-		Orteil par défaut
-	</string>
 	<string name="Dense">
 		Dense
 	</string>
-	<string name="Dense hair">
-		Cheveux denses
-	</string>
 	<string name="Double Chin">
 		Double menton
 	</string>
@@ -1870,16 +1945,16 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Pointant vers le bas
 	</string>
 	<string name="Duffle Bag">
-		Membre viril
+		Maxi
 	</string>
 	<string name="Ear Angle">
 		Angle de l&apos;oreille
 	</string>
 	<string name="Ear Size">
-		Taille de l&apos;oreille
+		Taille
 	</string>
 	<string name="Ear Tips">
-		Pointes de l&apos;oreille
+		Extrémités
 	</string>
 	<string name="Egg Head">
 		Forme de la tête
@@ -1891,13 +1966,13 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Couleur des yeux
 	</string>
 	<string name="Eye Depth">
-		Profondeur des yeux
+		Profondeur
 	</string>
 	<string name="Eye Lightness">
-		Clarté des yeux
+		Clarté
 	</string>
 	<string name="Eye Opening">
-		Ouverture des yeux
+		Ouverture
 	</string>
 	<string name="Eye Pop">
 		Œil proéminent
@@ -1906,25 +1981,22 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Taille de l&apos;œil
 	</string>
 	<string name="Eye Spacing">
-		Espacement des yeux
-	</string>
-	<string name="Eyeball Size">
-		Taille du globe oculaire
+		Espacement
 	</string>
 	<string name="Eyebrow Arc">
-		Arc des sourcils
+		Arc
 	</string>
 	<string name="Eyebrow Density">
-		Épaisseur des sourcils
+		Épaisseur
 	</string>
 	<string name="Eyebrow Height">
-		Hauteur des sourcils
+		Hauteur
 	</string>
 	<string name="Eyebrow Points">
-		Direction des sourcils
+		Direction
 	</string>
 	<string name="Eyebrow Size">
-		Taille des sourcils
+		Taille
 	</string>
 	<string name="Eyelash Length">
 		Longueur des cils
@@ -1935,69 +2007,27 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Eyeliner Color">
 		Couleur de l&apos;eyeliner
 	</string>
-	<string name="Eyes Back">
-		Yeux noirs
-	</string>
 	<string name="Eyes Bugged">
 		Yeux globuleux
 	</string>
-	<string name="Eyes Forward">
-		Yeux vers l&apos;avant
-	</string>
-	<string name="Eyes Long Head">
-		Yeux longue tête
-	</string>
 	<string name="Eyes Shear Left Up">
 		Œil gauche vers le haut
 	</string>
 	<string name="Eyes Shear Right Up">
 		Œil droit vers le haut
 	</string>
-	<string name="Eyes Short Head">
-		Yeux petite tête
-	</string>
-	<string name="Eyes Spread">
-		Espacement des yeux
-	</string>
-	<string name="Eyes Sunken">
-		Yeux enfoncés
-	</string>
-	<string name="Eyes Together">
-		Yeux rapprochés
-	</string>
 	<string name="Face Shear">
 		Visage
 	</string>
 	<string name="Facial Definition">
-		Définition du visage
+		Définition
 	</string>
 	<string name="Far Set Eyes">
 		Yeux écartés
 	</string>
-	<string name="Fat">
-		Grosse
-	</string>
-	<string name="Fat Head">
-		Grosse tête
-	</string>
 	<string name="Fat Lips">
 		Lèvres épaisses
 	</string>
-	<string name="Fat Lower">
-		Inférieure plus épaisse
-	</string>
-	<string name="Fat Lower Lip">
-		Lèvre inférieure épaisse
-	</string>
-	<string name="Fat Torso">
-		Torse épais
-	</string>
-	<string name="Fat Upper">
-		Supérieure plus épaisse
-	</string>
-	<string name="Fat Upper Lip">
-		Lèvre supérieure épaisse
-	</string>
 	<string name="Female">
 		Femme
 	</string>
@@ -2011,7 +2041,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Jambes larges
 	</string>
 	<string name="Flat">
-		Plat
+		Plates
 	</string>
 	<string name="Flat Butt">
 		Fesses plates
@@ -2034,24 +2064,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Freckles">
 		Tâches de rousseur
 	</string>
-	<string name="Front Bangs Down">
-		Mèches de devant longues
-	</string>
-	<string name="Front Bangs Up">
-		Mèches de devant courtes
-	</string>
 	<string name="Front Fringe">
 		Mèches de devant
 	</string>
-	<string name="Front Hair">
-		Cheveux devant
-	</string>
-	<string name="Front Hair Down">
-		Cheveux de devant longs
-	</string>
-	<string name="Front Hair Up">
-		Cheveux de devant courts
-	</string>
 	<string name="Full Back">
 		Arrière touffu
 	</string>
@@ -2080,22 +2095,22 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Cheveux
 	</string>
 	<string name="Hair Back">
-		Cheveux : Derrière
+		Cheveux : Derrière
 	</string>
 	<string name="Hair Front">
-		Cheveux : Devant
+		Cheveux : Devant
 	</string>
 	<string name="Hair Sides">
-		Cheveux : Côtés
+		Cheveux : Côtés
 	</string>
 	<string name="Hair Sweep">
 		Sens de la coiffure
 	</string>
 	<string name="Hair Thickess">
-		Épaisseur des cheveux
+		Épaisseur
 	</string>
 	<string name="Hair Thickness">
-		Épaisseur des cheveux
+		Épaisseur
 	</string>
 	<string name="Hair Tilt">
 		Inclinaison des cheveux
@@ -2107,28 +2122,28 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Vers la droite
 	</string>
 	<string name="Hair Volume">
-		Cheveux : Volume
+		Cheveux : Volume
 	</string>
 	<string name="Hand Size">
 		Taille de la main
 	</string>
 	<string name="Handlebars">
-		Guidons
+		Plus
 	</string>
 	<string name="Head Length">
-		Longueur de la tête
+		Longueur
 	</string>
 	<string name="Head Shape">
-		Forme de la tête
+		Forme
 	</string>
 	<string name="Head Size">
-		Taille de la tête
+		Taille
 	</string>
 	<string name="Head Stretch">
-		Allongement de la tête
+		Allongement
 	</string>
 	<string name="Heel Height">
-		Hauteur des talons
+		Talons
 	</string>
 	<string name="Heel Shape">
 		Forme des talons
@@ -2143,10 +2158,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Talons hauts
 	</string>
 	<string name="High Jaw">
-		Mâchoire haute
+		Haut
 	</string>
 	<string name="High Platforms">
-		Plateformes hautes
+		Haute
 	</string>
 	<string name="High and Tight">
 		Haut et serré
@@ -2161,7 +2176,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Largeur hanche
 	</string>
 	<string name="In">
-		In
+		Rentré
 	</string>
 	<string name="In Shdw Color">
 		Couleur ombre interne
@@ -2170,7 +2185,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Opacité ombre interne
 	</string>
 	<string name="Inner Eye Corner">
-		Coin de l&apos;œil interne
+		Coin interne
 	</string>
 	<string name="Inner Eye Shadow">
 		Ombre de l&apos;œil interne
@@ -2188,7 +2203,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Angle de la mâchoire
 	</string>
 	<string name="Jaw Jut">
-		saillie de la mâchoire
+		Saillie de la mâchoire
 	</string>
 	<string name="Jaw Shape">
 		Forme de la mâchoire
@@ -2206,7 +2221,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Genoux rapprochés
 	</string>
 	<string name="Large">
-		Grande
+		Grand
 	</string>
 	<string name="Large Hands">
 		Grandes mains
@@ -2272,7 +2287,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Fente labiale
 	</string>
 	<string name="Lip Cleft Depth">
-		Profondeur de la fente labiale
+		Profondeur fente labiale
 	</string>
 	<string name="Lip Fullness">
 		Volume des lèvres
@@ -2323,10 +2338,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Torse long
 	</string>
 	<string name="Long arms">
-		Longs bras
-	</string>
-	<string name="Longcuffs">
-		Manches longues
+		Bras longs
 	</string>
 	<string name="Loose Pants">
 		Pantalons amples
@@ -2347,10 +2359,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Talons bas
 	</string>
 	<string name="Low Jaw">
-		Mâchoire basse
+		Bas
 	</string>
 	<string name="Low Platforms">
-		Plateformes basses
+		Basse
 	</string>
 	<string name="Low and Loose">
 		Bas et ample
@@ -2362,7 +2374,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Arête plus basse
 	</string>
 	<string name="Lower Cheeks">
-		Joues plus basses
+		Joue inférieure
 	</string>
 	<string name="Male">
 		Homme
@@ -2443,7 +2455,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Coin de la bouche
 	</string>
 	<string name="Mouth Position">
-		Position de la bouche
+		Position
 	</string>
 	<string name="Mowhawk">
 		Mowhawk
@@ -2452,7 +2464,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Musclé
 	</string>
 	<string name="Mutton Chops">
-		Rouflaquettes
+		Longs
 	</string>
 	<string name="Nail Polish">
 		Vernis à ongles
@@ -2485,14 +2497,11 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Pas de blush
 	</string>
 	<string name="No Eyeliner">
-		Pas de eyeliner
+		Pas d&apos;eyeliner
 	</string>
 	<string name="No Eyeshadow">
 		Pas d&apos;ombre à paupières
 	</string>
-	<string name="No Heels">
-		Pas de talons
-	</string>
 	<string name="No Lipgloss">
 		Pas de brillant à lèvres
 	</string>
@@ -2539,7 +2548,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Angle du bout du nez
 	</string>
 	<string name="Nose Tip Shape">
-		Forme du bout du nez
+		Bout du nez
 	</string>
 	<string name="Nose Width">
 		Largeur du nez
@@ -2550,9 +2559,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Nostril Width">
 		Largeur des narines
 	</string>
-	<string name="Old">
-		Vieux
-	</string>
 	<string name="Opaque">
 		Opaque
 	</string>
@@ -2575,7 +2581,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Orange
 	</string>
 	<string name="Out">
-		Dehors
+		Sorti
 	</string>
 	<string name="Out Shdw Color">
 		Couleur de l&apos;ombre externe
@@ -2584,7 +2590,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Opacité de l&apos;ombre externe
 	</string>
 	<string name="Outer Eye Corner">
-		Coin de l&apos;œil externe
+		Coin externe
 	</string>
 	<string name="Outer Eye Shadow">
 		Ombre de l&apos;œil externe
@@ -2593,7 +2599,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Ombre externe
 	</string>
 	<string name="Overbite">
-		Chevauchement
+		Rentrée
 	</string>
 	<string name="Package">
 		Parties
@@ -2641,10 +2647,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Plus rose
 	</string>
 	<string name="Platform Height">
-		Hauteur de la plateforme
+		Plateforme (hauteur)
 	</string>
 	<string name="Platform Width">
-		Largeur de la plateforme
+		Plateforme (largeur)
 	</string>
 	<string name="Pointy">
 		Pointu
@@ -2652,9 +2658,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Pointy Heels">
 		Talons pointus
 	</string>
-	<string name="Pointy Toe">
-		Orteil pointu
-	</string>
 	<string name="Ponytail">
 		Queue de cheval
 	</string>
@@ -2668,10 +2671,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Œil droit saillant
 	</string>
 	<string name="Puffy">
-		Gonflé
+		Gonflées
 	</string>
 	<string name="Puffy Eyelids">
-		Paupières gonflées
+		Paupières
 	</string>
 	<string name="Rainbow Color">
 		Couleur de l&apos;arc en ciel
@@ -2679,15 +2682,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Red Hair">
 		Cheveux roux
 	</string>
-	<string name="Red Skin">
-		Peau rouge
-	</string>
 	<string name="Regular">
 		Standard
 	</string>
-	<string name="Regular Muscles">
-		Muscles normaux
-	</string>
 	<string name="Right Part">
 		Raie à droite
 	</string>
@@ -2697,9 +2694,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Round">
 		Rond
 	</string>
-	<string name="Round Forehead">
-		Front rond
-	</string>
 	<string name="Ruddiness">
 		Rougeur
 	</string>
@@ -2712,24 +2706,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Saddle Bags">
 		Culotte de cheval
 	</string>
-	<string name="Saddlebags">
-		Culotte de cheval
-	</string>
-	<string name="Scrawny">
-		Maigre
-	</string>
 	<string name="Scrawny Leg">
 		Jambes maigres
 	</string>
 	<string name="Separate">
 		Séparés
 	</string>
-	<string name="Shading">
-		Dégradé
-	</string>
-	<string name="Shadow hair">
-		Cheveux
-	</string>
 	<string name="Shallow">
 		Creux
 	</string>
@@ -2740,17 +2722,11 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Visage
 	</string>
 	<string name="Shear Front">
-		Devant dégagé
-	</string>
-	<string name="Shear Left">
-		Gauche dégagée
+		Front
 	</string>
 	<string name="Shear Left Up">
 		Haut gauche dégagé
 	</string>
-	<string name="Shear Right">
-		Droite dégagée
-	</string>
 	<string name="Shear Right Up">
 		Haut droit dégagé
 	</string>
@@ -2761,13 +2737,13 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Dégagé devant
 	</string>
 	<string name="Shift Left">
-		Déplacer vers la gauche
+		Vers la gauche
 	</string>
 	<string name="Shift Mouth">
 		Déplacer la bouche
 	</string>
 	<string name="Shift Right">
-		Déplacer vers la droite
+		Vers la droite
 	</string>
 	<string name="Shirt Bottom">
 		Chemise
@@ -2779,10 +2755,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Plis
 	</string>
 	<string name="Shoe Height">
-		Hauteur de la chaussure
+		Hauteur
 	</string>
 	<string name="Short">
-		Court
+		Mini
 	</string>
 	<string name="Short Arms">
 		Bras courts
@@ -2800,7 +2776,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Queue de cheval courte
 	</string>
 	<string name="Short Sideburns">
-		Favoris courts
+		Court
 	</string>
 	<string name="Short Torso">
 		Torse court
@@ -2811,17 +2787,8 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Shoulders">
 		Épaules
 	</string>
-	<string name="Side Bangs">
-		Mèches sur le côté
-	</string>
-	<string name="Side Bangs Down">
-		Mèches sur le côté en bas
-	</string>
-	<string name="Side Bangs Up">
-		Mèches sur le côté en haut
-	</string>
 	<string name="Side Fringe">
-		Frange sur le côté
+		Mèches sur le côté
 	</string>
 	<string name="Sideburns">
 		Favoris
@@ -2835,41 +2802,38 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Sides Hair Up">
 		Cheveux sur le côté en haut
 	</string>
-	<string name="Skinny">
-		Maigre
-	</string>
 	<string name="Skinny Neck">
 		Cou maigre
 	</string>
 	<string name="Skirt Fit">
-		Taille de la jupe
+		Taille jupe
 	</string>
 	<string name="Skirt Length">
-		Longueur de la jupe
+		Longueur jupe
 	</string>
 	<string name="Slanted Forehead">
 		Front incliné
 	</string>
 	<string name="Sleeve Length">
-		Longueur de la manche
+		Longueur manche
 	</string>
 	<string name="Sleeve Looseness">
-		Ampleur de la manche
+		Ampleur manche
 	</string>
 	<string name="Slit Back">
-		Fente : Derrière
+		Fente : Derrière
 	</string>
 	<string name="Slit Front">
-		Fente : Devant
+		Fente : Devant
 	</string>
 	<string name="Slit Left">
-		Fente : Gauche
+		Fente : Gauche
 	</string>
 	<string name="Slit Right">
-		Fente : Droite
+		Fente : Droite
 	</string>
 	<string name="Small">
-		Petite
+		Mini
 	</string>
 	<string name="Small Hands">
 		Petites mains
@@ -2886,11 +2850,8 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Socks Length">
 		Longueur des chaussettes
 	</string>
-	<string name="Some">
-		Quelques un(e)s
-	</string>
 	<string name="Soulpatch">
-		Soulpatch
+		Barbichette
 	</string>
 	<string name="Sparse">
 		Rares
@@ -2907,14 +2868,11 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Squash Head">
 		Écraser la tête
 	</string>
-	<string name="Squash/Stretch Head">
-		Allonger/écraser la tête
-	</string>
 	<string name="Stretch Head">
 		Allonger la tête
 	</string>
 	<string name="Sunken">
-		Enfoncées
+		Saillante
 	</string>
 	<string name="Sunken Chest">
 		Poitrine enfoncée
@@ -2928,20 +2886,8 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Sweep Forward">
 		Vers l&apos;avant
 	</string>
-	<string name="Swept Back">
-		En arrière
-	</string>
-	<string name="Swept Back Hair">
-		Cheveux en arrière
-	</string>
-	<string name="Swept Forward">
-		Vers l&apos;avant
-	</string>
-	<string name="Swept Forward Hair">
-		Cheveux vers l&apos;&apos;avant
-	</string>
 	<string name="Tall">
-		Grand
+		Maxi
 	</string>
 	<string name="Taper Back">
 		Biseauter à l&apos;arrière
@@ -2958,11 +2904,8 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Thick Toe">
 		Orteil épais
 	</string>
-	<string name="Thickness">
-		Épaisseur
-	</string>
 	<string name="Thin">
-		Fins
+		Mince
 	</string>
 	<string name="Thin Eyebrows">
 		Sourcils fins
@@ -2991,12 +2934,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Tight Sleeves">
 		Manches serrées
 	</string>
-	<string name="Tilt Left">
-		Pencher sur la gauche
-	</string>
-	<string name="Tilt Right">
-		Pencher sur la droite
-	</string>
 	<string name="Toe Shape">
 		Forme de l&apos;orteil
 	</string>
@@ -3019,7 +2956,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Lisse
 	</string>
 	<string name="Underbite">
-		Rentré
+		Sortie
 	</string>
 	<string name="Unnatural">
 		Artificiel
@@ -3028,10 +2965,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Arête supérieure
 	</string>
 	<string name="Upper Cheeks">
-		Pommettes
+		Pommette
 	</string>
 	<string name="Upper Chin Cleft">
-		Fente du menton supérieure
+		Menton supérieur
 	</string>
 	<string name="Upper Eyelid Fold">
 		Paupière supérieure
@@ -3046,7 +2983,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Hauteur de la taille
 	</string>
 	<string name="Well-Fed">
-		Bien nourri
+		Ronde
 	</string>
 	<string name="White Hair">
 		Cheveux blancs
@@ -3055,7 +2992,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Large
 	</string>
 	<string name="Wide Back">
-		Dos large
+		Derrière large
 	</string>
 	<string name="Wide Front">
 		Devant large
@@ -3064,7 +3001,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Lèvres larges
 	</string>
 	<string name="Wild">
-		Revêche
+		Artificiel
 	</string>
 	<string name="Wrinkles">
 		Rides
@@ -3075,14 +3012,20 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="LocationCtrlEditLandmarkTooltip">
 		Modifier mes repères
 	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		En savoir plus sur l&apos;emplacement actuel
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		Historique de mes emplacements
+	</string>
 	<string name="UpdaterWindowTitle">
-		[APP_NAME] Mettre à jour
+		[APP_NAME] - Mise à jour
 	</string>
 	<string name="UpdaterNowUpdating">
-		En train de charger [APP_NAME]...
+		Mise à jour de [APP_NAME]...
 	</string>
 	<string name="UpdaterNowInstalling">
-		En train d&apos;installer [APP_NAME]...
+		Installation de [APP_NAME]...
 	</string>
 	<string name="UpdaterUpdatingDescriptive">
 		Le client [APP_NAME] est en train d&apos;être mis à jour.  Cela peut prendre un certain temps, merci de votre patience.
@@ -3105,6 +3048,33 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="UpdaterFailStartTitle">
 		Impossible de lancer le client
 	</string>
+	<string name="IM_logging_string">
+		-- Archivage des IM activé --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] est en train d&apos;écrire...
+	</string>
+	<string name="Unnamed">
+		(sans nom)
+	</string>
+	<string name="IM_moderated_chat_label">
+		(Modéré : Voix désactivées par défaut)
+	</string>
+	<string name="IM_unavailable_text_label">
+		Le chat écrit n&apos;est pas disponible pour cet appel.
+	</string>
+	<string name="IM_muted_text_label">
+		Votre chat écrit a été désactivé par un modérateur de groupe.
+	</string>
+	<string name="IM_default_text_label">
+		Cliquez ici pour envoyer un message instantané.
+	</string>
+	<string name="IM_to_label">
+		À
+	</string>
+	<string name="IM_moderator_label">
+		(Modérateur)
+	</string>
 	<string name="only_user_message">
 		Vous êtes le seul participant à cette session.
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index a22850bc4b..8a59764251 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -52,10 +52,11 @@
 	<text name="total_amount">
 		[AMT]L$
 	</text>
-	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
-		Confermando questa operazione si acquisterà solo
-la valuta. Per acquistare il bene, dovrai riprovare
-l&apos;operazione nuovamente.
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=it-IT payment method] | [http://www.secondlife.com/my/account/currency.php?lang=it-IT currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=it-IT exchange rate]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Confermando questa operazione si acquisterà solo la valuta. Per acquistare il bene, dovrai riprovare l&apos;operazione nuovamente.
 	</text>
 	<text name="purchase_warning_notenough" bottom_delta="16">
 		Non stai comprando abbastanza denaro.
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 723ceae552..bab805dbd2 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="[APP_NAME]について">
+<floater name="floater_about" title="[APP_NAME] について">
+	<floater.string name="AboutHeader">
+		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutCompiler">
+		コンパイラー [COMPILER] [COMPILER_VERSION] バージョン
+	</floater.string>
+	<floater.string name="AboutPosition">
+		You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at [HOSTNAME] ([HOSTIP])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU： [CPU]
+メモリ： [MEMORY_MB] MB
+OS バージョン： [OS_VERSION]
+グラフィックカード製造元： [GRAPHICS_CARD_VENDOR]
+グラフィックカード: [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Windows グラフィックドライババージョン： [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<floater.string name="AboutLibs">
+		OpenGL バージョン： [OPENGL_VERSION]
+
+libcurl バージョン： [LIBCURL_VERSION]
+J2C デコーダバージョン： [J2C_VERSION]
+オーディオドライババージョン： [AUDIO_DRIVER_VERSION]
+Qt Webkit バージョン： [QT_WEBKIT_VERSION]
+Vivox バージョン： [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		（なし）
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		パケットロス： [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）
+	</floater.string>
 	<tab_container name="about_tab">
+		<panel label="情報" name="support_panel">
+			<button label="クリップボードにコピー" name="copy_btn"/>
+		</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と、その他多数の人達によって作成されました。
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 80c76879f1..4b134526e0 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -9,6 +9,9 @@
 	<floater.string name="Seconds">
 		[SECONDS] 秒
 	</floater.string>
+	<floater.string name="Remaining">
+		残り
+	</floater.string>
 	<tab_container name="landtab">
 		<panel label="一般" name="land_general_panel">
 			<panel.string name="new users only">
@@ -21,7 +24,7 @@
 				面積：
 			</panel.string>
 			<panel.string name="area_size_text">
-				[AREA]平方メートル
+				[AREA] 平方メートル
 			</panel.string>
 			<panel.string name="auction_id_text">
 				オークションID： [ID]
@@ -81,7 +84,7 @@
 				グループ：
 			</text>
 			<button label="設定..." label_selected="設定..." name="Set..."/>
-			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループ・オフィサーは、この土地をグループに譲渡し、グループの土地配分に委ねることができます。"/>
+			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループのオフィサーはこの土地をグループに譲渡できます。そうするとグループの土地割り当てによってサポートされます。"/>
 			<button label="譲渡..." label_selected="譲渡..." name="Deed..." tool_tip="選択されたグループのオフィサーであるときのみ、土地を譲渡できます。"/>
 			<check_box label="オーナーが譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。"/>
 			<text name="For Sale:">
@@ -114,7 +117,7 @@
 				面積：
 			</text>
 			<text name="PriceText">
-				4048平方メートル
+				4048 m²
 			</text>
 			<text name="Traffic:">
 				交通量:
@@ -370,11 +373,11 @@
 				着地点: [LANDING]
 			</text>
 			<button label="設定" label_selected="設定" name="Set" tool_tip="訪問者の着地点の設定を行います。この区画内に立って行ってください。"/>
-			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="着地点をクリアしてください。"/>
+			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="着地点をクリア"/>
 			<text name="Teleport Routing: ">
 				テレポート制限：
 			</text>
-			<combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
+			<combo_box name="landing type" tool_tip="テレポート経路 -- あなたの土地へのテレポート経路を選択">
 				<combo_box.item label="不可" name="Blocked"/>
 				<combo_box.item label="着地点" name="LandingPoint"/>
 				<combo_box.item label="どこでも" name="Anywhere"/>
@@ -435,7 +438,7 @@
 			</text>
 			<check_box label="ボイスを有効にする" name="parcel_enable_voice_channel"/>
 			<check_box label="ボイスを有効にする（不動産設定）" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="この区画でのボイス使用を制限する" name="parcel_enable_voice_channel_parcel"/>
+			<check_box label="この区画でのボイス使用を制限" name="parcel_enable_voice_channel_parcel"/>
 		</panel>
 		<panel label="アクセス" name="land_access_panel">
 			<panel.string name="estate_override">
@@ -449,7 +452,7 @@
 				次の住人のアクセスをブロック：
 			</text>
 			<check_box label="Linden Labに支払い情報を登録していない住人" name="limit_payment" tool_tip="支払い情報未確認の住人を排除する"/>
-			<check_box label="年齢確認を済ませていない成人の住人" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人を禁止します。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
+			<check_box label="年齢確認を済ませていない成人の住人" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人を立入禁止にします。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
 			<check_box label="グループ・アクセスを許可：[GROUP]" name="GroupCheck" tool_tip="[一般]タブで、グループを選択してください。"/>
 			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
new file mode 100644
index 0000000000..1c743e1fd2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_activeim" title="アクティブな IM"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index a1c30ec572..9ec4bfc4e7 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
@@ -62,25 +62,25 @@
 		回転値を取得できません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_FILE">
-		Cannot open translation file.
+		ファイルを開けません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_HEADER">
-		Cannot read translation header.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_NAME">
-		Cannot read translation names.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Cannot read translation ignore value.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Cannot read translation relative value.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Cannot read translation outname value.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Cannot read translation matrix.
+		読みとることができません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_MERGECHILD">
 		Mergechild 名を取得できません。
@@ -95,7 +95,7 @@
 		ループ値を取得できません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Cannot get easeIn values.
+		easeln 値を取得できません。
 	</floater.string>
 	<floater.string name="E_ST_NO_XLT_EASEOUT">
 		easeOut 値を取得できません。
@@ -112,41 +112,41 @@
 	<text name="description_label">
 		説明：
 	</text>
-	<spinner label="優先順位" name="priority" tool_tip="このアニメーションで上書き可能な他のアニメーションを制御します。"/>
-	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生します。"/>
-	<spinner label="イン(％)" label_width="45" left="70" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します。" width="100"/>
-	<spinner label="アウト(％)" label_width="60" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します。" width="100"/>
+	<spinner label="優先順位" name="priority" tool_tip="このアニメーションがどのアニメーションを上書きするかを決めます"/>
+	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生します"/>
+	<spinner label="イン(％)" label_width="45" left="70" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" width="100"/>
+	<spinner label="アウト(％)" label_width="60" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" width="100"/>
 	<text name="hand_label">
 		手の動き
 	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="アニメーションの手の動きをコントロールします。">
-		<combo_box.item label="広がる" name="Spread"/>
+	<combo_box label="" name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
+		<combo_box.item label="広げる" name="Spread"/>
 		<combo_box.item label="リラックス" name="Relaxed"/>
-		<combo_box.item label="両方を指す" name="PointBoth"/>
+		<combo_box.item label="指を指す・両手" name="PointBoth"/>
 		<combo_box.item label="拳" name="Fist"/>
-		<combo_box.item label="リラックス左" name="RelaxedLeft"/>
-		<combo_box.item label="左を指す" name="PointLeft"/>
-		<combo_box.item label="拳左" name="FistLeft"/>
-		<combo_box.item label="リラックス右" name="RelaxedRight"/>
-		<combo_box.item label="右を指す" name="PointRight"/>
-		<combo_box.item label="拳右" name="FistRight"/>
-		<combo_box.item label="敬礼右" name="SaluteRight"/>
-		<combo_box.item label="入力する" name="Typing"/>
-		<combo_box.item label="ピース・サイン右" name="PeaceRight"/>
+		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
+		<combo_box.item label="指を指す・左" name="PointLeft"/>
+		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
+		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
+		<combo_box.item label="指を指す・右" name="PointRight"/>
+		<combo_box.item label="拳を上げる・右" name="FistRight"/>
+		<combo_box.item label="敬礼・右" name="SaluteRight"/>
+		<combo_box.item label="タイピング" name="Typing"/>
+		<combo_box.item label="ピース・右" name="PeaceRight"/>
 	</combo_box>
 	<text name="emote_label">
 		表現
 	</text>
-	<combo_box label="" name="emote_combo" tool_tip="アニメーションの顔を表情をコントロールします。">
-		<combo_box.item label="None]" name="[None]"/>
+	<combo_box label="" name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
+		<combo_box.item label="（なし）" name="[None]"/>
 		<combo_box.item label="アーーーーー" name="Aaaaah"/>
-		<combo_box.item label="怖れ" name="Afraid"/>
-		<combo_box.item label="怒り" name="Angry"/>
+		<combo_box.item label="恐れる" name="Afraid"/>
+		<combo_box.item label="怒る" name="Angry"/>
 		<combo_box.item label="満面の笑み" name="BigSmile"/>
 		<combo_box.item label="退屈" name="Bored"/>
 		<combo_box.item label="泣く" name="Cry"/>
-		<combo_box.item label="侮蔑" name="Disdain"/>
-		<combo_box.item label="困惑" name="Embarrassed"/>
+		<combo_box.item label="侮辱" name="Disdain"/>
+		<combo_box.item label="恥ずかしがる" name="Embarrassed"/>
 		<combo_box.item label="しかめっ面" name="Frown"/>
 		<combo_box.item label="キス" name="Kiss"/>
 		<combo_box.item label="笑う" name="Laugh"/>
@@ -154,10 +154,10 @@
 		<combo_box.item label="嫌悪感" name="Repulsed"/>
 		<combo_box.item label="悲しい" name="Sad"/>
 		<combo_box.item label="肩をすくめる" name="Shrug"/>
-		<combo_box.item label="笑み" name="Smile"/>
-		<combo_box.item label="驚き" name="Surprise"/>
+		<combo_box.item label="微笑む" name="Smile"/>
+		<combo_box.item label="驚く" name="Surprise"/>
 		<combo_box.item label="ウィンク" name="Wink"/>
-		<combo_box.item label="心配" name="Worry"/>
+		<combo_box.item label="心配する" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		同時進行行動
@@ -166,11 +166,11 @@
 		<combo_box.item label="立つ" name="Standing"/>
 		<combo_box.item label="歩く" name="Walking"/>
 		<combo_box.item label="座る" name="Sitting"/>
-		<combo_box.item label="飛行" name="Flying"/>
+		<combo_box.item label="飛ぶ" name="Flying"/>
 	</combo_box>
-	<spinner label="ﾌｪｰｽﾞｲﾝ(秒)" name="ease_in_time" tool_tip="アニメーションのブレンド・イン時間（秒）"/>
-	<spinner label="ﾌｪｰｽﾞｱｳﾄ(秒)" name="ease_out_time" tool_tip="アニメーションのブレンド・アウト時間（秒）"/>
-	<button label="" name="play_btn" tool_tip="アニメーションの再生／一時停止"/>
+	<spinner label="ﾌｪｰｽﾞｲﾝ(秒)" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
+	<spinner label="ﾌｪｰｽﾞｱｳﾄ(秒)" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
+	<button label="" name="play_btn" tool_tip="アニメーションの再生・一時停止"/>
 	<button label="" name="stop_btn" tool_tip="アニメーションの再生を停止"/>
 	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index ba34ec488d..e9aa287f2c 100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="リンデンの土地売買開始">
-	<check_box label="黄色の選択フェンスを含める" name="fence_check" />
-	<button label="スナップショット" label_selected="スナップショット"
-	     name="snapshot_btn" />
-	<button label="OK" label_selected="OK" name="ok_btn" />
-	<text name="already for sale">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="リンデンランドの販売開始">
+	<floater.string name="already for sale">
 		売り出し中の区画は、オークションに出品できません。
-	</text>
+	</floater.string>
+	<check_box initial_value="true" label="黄色の選択フェンスを含める" name="fence_check"/>
+	<button label="スナップショット" label_selected="スナップショット" name="snapshot_btn"/>
+	<button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn"/>
+	<button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn"/>
+	<button label="オークション開始" label_selected="オークション開始" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index df60f52ee8..7f965e490d 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater min_width="275" name="avatarpicker" title="住人を選択" width="275">
+	<floater.string name="not_found">
+		「[TEXT]」は見つかりませんでした
+	</floater.string>
+	<floater.string name="no_one_near">
+		近くに誰もいません
+	</floater.string>
+	<floater.string name="no_results">
+		検索結果：ゼロ
+	</floater.string>
+	<floater.string name="searching">
+		検索中...
+	</floater.string>
+	<string label="OK" label_selected="OK" name="Select">
+		選択
+	</string>
+	<string name="Close">
+		閉じる
+	</string>
 	<tab_container name="ResidentChooserTabs" width="265">
 		<panel label="検索" name="SearchPanel" width="145">
 			<text name="InstructSearchResidentName">
@@ -7,34 +25,22 @@
 			</text>
 			<button label="検索" label_selected="検索" name="Find"/>
 		</panel>
-		<panel label="コーリングカード" name="CallingCardsPanel" width="145">
-			<text name="InstructSelectCallingCard">
-				コーリングカードを選択：
+		<panel label="フレンド" name="FriendsPanel">
+			<text name="InstructSelectFriend">
+				アバターを選択：
 			</text>
 		</panel>
 		<panel label="自分の近く" name="NearMePanel" width="145">
 			<text name="InstructSelectResident">
 				近くの人を選択：
 			</text>
-			<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
 			<slider label="範囲" name="near_me_range"/>
 			<text name="meters" width="50">
 				メートル
 			</text>
+			<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
 		</panel>
 	</tab_container>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<string name="not_found">
-		「[TEXT]」は見つかりませんでした
-	</string>
-	<string name="no_one_near">
-		近くに誰もいません
-	</string>
-	<string name="no_results">
-		検索結果：ゼロ
-	</string>
-	<string name="searching">
-		検索中...
-	</string>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 95940dba96..4a20c58181 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="アバター・テクスチャー">
+<floater name="avatar_texture_debug" title="アバターのテクスチャ">
+	<floater.string name="InvalidAvatar">
+		無効なアバター
+	</floater.string>
 	<text name="label">
 		ベークドテクスチャ
 	</text>
@@ -8,24 +11,32 @@
 	</text>
 	<button label="テクスチャID一覧をコンソールに書き込む" label_selected="捨てる" name="Dump"/>
 	<texture_picker label="髪型" name="hair-baked"/>
-	<texture_picker label="髪" name="hair"/>
+	<texture_picker label="髪" name="hair_grain"/>
+	<texture_picker label="髪のアルファ" name="hair_alpha"/>
 	<texture_picker label="頭" name="head-baked"/>
-	<texture_picker label="メイクアップ" name="head bodypaint"/>
+	<texture_picker label="メイクアップ" name="head_bodypaint"/>
+	<texture_picker label="頭部のアルファ" name="head_alpha"/>
+	<texture_picker label="頭部のタトゥー" name="head_tattoo"/>
 	<texture_picker label="目" name="eyes-baked"/>
-	<texture_picker label="目" name="iris"/>
+	<texture_picker label="目" name="eyes_iris"/>
+	<texture_picker label="目のアルファ" name="eyes_alpha"/>
 	<texture_picker label="上半身" name="upper-baked"/>
-	<texture_picker label="上半身のタトゥー" name="upper bodypaint"/>
-	<texture_picker label="（下着の）シャツ" name="undershirt"/>
-	<texture_picker label="手袋" name="gloves"/>
-	<texture_picker label="シャツ" name="shirt"/>
-	<texture_picker label="上着" name="upper jacket"/>
+	<texture_picker label="上半身のボディペイント" name="upper_bodypaint"/>
+	<texture_picker label="下着シャツ" name="upper_undershirt"/>
+	<texture_picker label="手袋" name="upper_gloves"/>
+	<texture_picker label="シャツ" name="upper_shirt"/>
+	<texture_picker label="上着" name="upper_jacket"/>
+	<texture_picker label="アルファ（上）" name="upper_alpha"/>
+	<texture_picker label="上部のタトゥー" name="upper_tattoo"/>
 	<texture_picker label="下半身" name="lower-baked"/>
-	<texture_picker label="下半身のタトゥー" name="lower bodypaint"/>
-	<texture_picker label="（下着の）パンツ" name="underpants"/>
-	<texture_picker label="靴下" name="socks"/>
-	<texture_picker label="靴" name="shoes"/>
-	<texture_picker label="ズボン" name="pants"/>
-	<texture_picker label="上着" name="lower jacket"/>
+	<texture_picker label="下半身のボディペイント" name="lower_bodypaint"/>
+	<texture_picker label="下着パンツ" name="lower_underpants"/>
+	<texture_picker label="靴下" name="lower_socks"/>
+	<texture_picker label="靴" name="lower_shoes"/>
+	<texture_picker label="パンツ" name="lower_pants"/>
+	<texture_picker label="ジャケット" name="lower_jacket"/>
+	<texture_picker label="アルファ（下）" name="lower_alpha"/>
+	<texture_picker label="下部のタトゥー" name="lower_tattoo"/>
 	<texture_picker label="スカート" name="skirt-baked"/>
 	<texture_picker label="スカート" name="skirt"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 02bc0dd5f7..8d3dba3883 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="build options floater" title="グリッドのオプション">
+<floater name="build options floater" title="グリッドオプション">
 	<spinner label="グリッドユニット（メートル）" name="GridResolution"/>
 	<spinner label="ｸﾞﾘｯﾄﾞ範囲（ﾒｰﾄﾙ）" name="GridDrawSize"/>
 	<check_box label="サブユニットにスナップ" name="GridSubUnit"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index 9a3d432228..7afe70f4d7 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="コンテンツ権限を編集">
+<floater name="floaterbulkperms" title="コンテンツ権限の編集">
 	<floater.string name="nothing_to_modify_text">
 		選択した中に編集できないコンテンツが含まれています
 	</floater.string>
@@ -29,7 +29,8 @@
 	<check_box label="サウンド" name="check_sound"/>
 	<icon name="icon_sound" tool_tip="サウンド"/>
 	<check_box label="テクスチャー" name="check_texture"/>
-	<button label="√ すべて" label_selected="全て" name="check_all"/>
+	<icon name="icon_texture" tool_tip="テクスチャ"/>
+	<button label="すべてに √" label_selected="全て" name="check_all"/>
 	<button label="クリア" label_selected="なし" name="check_none"/>
 	<text name="newperms">
 		新しいコンテンツ権限
@@ -39,7 +40,7 @@
 	</text>
 	<check_box label="共有" name="share_with_group"/>
 	<text name="AnyoneLabel">
-		すべての人：
+		全員：
 	</text>
 	<check_box label="コピー" name="everyone_copy"/>
 	<text name="NextOwnerLabel">
@@ -47,7 +48,7 @@
 	</text>
 	<check_box label="修正" name="next_owner_modify"/>
 	<check_box label="コピー" name="next_owner_copy"/>
-	<check_box initial_value="true" label="再販/プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/>
-	<button label="OK" name="apply"/>
+	<check_box initial_value="true" label="再販・プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/>
+	<button label="Ok" name="apply"/>
 	<button label="キャンセル" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index cbd6a2f9e2..8a1e19b852 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="衝突の記録">
-	<text name="none_detected">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="衝突・プッシュ・打撃">
+	<floater.string name="none_detected">
 		検出なし
-	</text>
-	<text name="bump">
+	</floater.string>
+	<floater.string name="bump">
 		[TIME]  [FIRST] [LAST]が、あなたにぶつかりました。
-	</text>
-	<text name="llpushobject">
+	</floater.string>
+	<floater.string name="llpushobject">
 		[TIME]  [FIRST] [LAST]が、スクリプトであなたをプッシュしました。
-	</text>
-	<text name="selected_object_collide">
+	</floater.string>
+	<floater.string name="selected_object_collide">
 		[TIME]  [FIRST] [LAST]が、オブジェクトをあなたに当てました。
-	</text>
-	<text name="scripted_object_collide">
+	</floater.string>
+	<floater.string name="scripted_object_collide">
 		[TIME]  [FIRST] [LAST]が、スクリプト・オブジェクトをあなたに当てました。
-	</text>
-	<text name="physical_object_collide">
+	</floater.string>
+	<floater.string name="physical_object_collide">
 		[TIME]  [FIRST] [LAST]が、物理オブジェクトをあなたに当てました。
-	</text>
+	</floater.string>
+	<floater.string name="timeStr">
+		[[hour,datetime,slt]:[min,datetime,slt]]
+	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 8bf660d71d..53b7f24141 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="コンテンツを購入" width="340" min_width="340">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="340" name="floater_buy_contents" title="コンテンツの購入" width="340">
 	<text name="contains_text" width="320">
 		[NAME]の内容：
 	</text>
@@ -8,8 +8,8 @@
 		コンテンツを[NAME]からL$[AMOUNT]で購入しますか？
 	</text>
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn" width="73"/>
-	<button label="購入" label_selected="購入" name="buy_btn" width="73" left_delta="-77"/>
-	<check_box label="今すぐ服を着る" name="wear_check" left_delta="-125"/>
+	<button label="購入" label_selected="購入" left_delta="-77" name="buy_btn" width="73"/>
+	<check_box label="今すぐ服を着る" left_delta="-125" name="wear_check"/>
 	<text name="no_copy_text">
 		(コピーなし)
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 35516301fc..ffdcf838d3 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -1,68 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="貨幣購入">
-	<text name="info_buying">
-		貨幣を購入：
-	</text>
-	<text name="info_cannot_buy">
-		現在購入不可：
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="L$ の購入">
+	<floater.string name="buy_currency">
+		約 [LOCALAMOUNT] で L$ [LINDENS] を購入
+	</floater.string>
 	<text name="info_need_more">
-		さらにお金が必要です：
+		L$ が足りません
 	</text>
-	<text name="error_message">
-		何か変です。
-	</text>
-	<button label="ウェブ・サイトに移動" name="error_web" width="140"/>
 	<text name="contacting">
 		LindeXとコンタクト中…
 	</text>
-	<text name="buy_action_unknown">
-		LindeX通貨両替でL＄を購入
+	<text name="info_buying">
+		L$ の購入
 	</text>
-	<text name="buy_action">
-		[NAME] L$ [PRICE]
+	<text name="balance_label">
+		残高
+	</text>
+	<text name="balance_amount">
+		L$ [AMT]
 	</text>
 	<text name="currency_action">
-		L$購入
+		購入希望額
+	</text>
+	<text name="currency_label">
+		L$
 	</text>
-	<line_editor name="currency_amt">
+	<line_editor label="L$" name="currency_amt">
 		1234
 	</line_editor>
-	<text name="currency_est">
-		約[LOCALAMOUNT]
-	</text>
-	<text name="getting_data" left_delta="3">
-		データを取得しています...
-	</text>
-	<text name="balance_label">
-		現在所有している金額
+	<text name="buying_label">
+		価格
 	</text>
-	<text name="balance_amount">
-		L$ [AMT]
+	<text name="currency_est">
+		約 [LOCALAMOUNT]
 	</text>
-	<text name="buying_label">
-		購入する金額
+	<text left_delta="3" name="getting_data">
+		見積もり中...
 	</text>
-	<text name="buying_amount">
-		L$ [AMT]
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
 	</text>
 	<text name="total_label">
-		合計残高
+		新しい残高
 	</text>
 	<text name="total_amount">
 		L$ [AMT]
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP payment method] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP exchange rate]
+	</text>
+	<text name="exchange_rate_note">
+		金額を再入力して最新換算レートを確認します。
+	</text>
 	<text name="purchase_warning_repurchase">
-		この購買の確認では、通貨だけを購入します。
-再操作が必要になります。
+		この取引を決定すると、L$ を購入します。オブジェクトは購入しません。
 	</text>
 	<text name="purchase_warning_notenough">
-		あなたが買うリンデン・ドルでは足りません。
-購入額を増やしてください。
+		購入しようとしている L$ が不足しています。 金額を上げてください。
 	</text>
-	<button label="購入" name="buy_btn" />
-	<button label="取り消し" name="cancel_btn" />
-	<text name="buy_currency">
-		約[LOCALAMOUNT]でL$ [LINDENS]を購入
+	<button label="購入する" name="buy_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+	<text name="info_cannot_buy">
+		購入できません
 	</text>
+	<button label="Web サイトに移動" name="error_web" width="140"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 1ccd1f53a4..13b43d1257 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="土地を購入">
+<floater name="buy land" title="土地の購入">
 	<text name="region_name_label">
 		地域：
 	</text>
@@ -51,15 +51,15 @@
 		サイズ：
 	</text>
 	<text bottom_delta="-37" height="48" name="info_size">
-		1024平方メートル
+		1024 平方メートル
 	</text>
 	<text name="info_price_label">
 		価格：
 	</text>
 	<text name="info_price">
 		L$ 1500
-		(L$ 1.1/平方メートル)
-		オブジェクトも土地販売価格に含まれます
+(L$ 1.1/平方メートル)
+オブジェクトも土地販売価格に含まれます
 	</text>
 	<text name="info_action">
 		この土地を買うと：
@@ -75,16 +75,16 @@
 		土地を保有できるのはプレミアム・メンバーだけです
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item name="US$9.95/month,billedmonthly" label="月額9.95米ドル、月払い" />
-		<combo_box.item name="US$7.50/month,billedquarterly" label="月額7.50米ドル、年4回払い" />
-		<combo_box.item name="US$6.00/month,billedannually" label="月額6.00米ドル、年払い" />
+		<combo_box.item label="月額 9.95米ドル、 月払い" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="月額 7.50米ドル、 年4回3ヶ月毎" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="月額 6.00米ドル、 年間一括払い" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
 		毎月の土地使用料をUS$40に引き上げます
 	</text>
 	<text name="land_use_reason">
-		あなたは1,309平方メートルの土地を所有しています。 
-この区画は512平方メートルです。
+		あなたは 1309 平方メートルの土地を所有しています。
+この区画の大きさは、512 平方メートルです。
 	</text>
 	<text name="purchase_action">
 		Joe ResidentにL$4000支払って土地を購入
@@ -99,12 +99,12 @@
 		1000
 	</line_editor>
 	<text name="currency_est">
-		約US$ [AMOUNT2]
+		約 [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
 		所持金は L$2,100です。
 	</text>
-	<check_box label="[AMOUNT]平方メートルの貢献面積をグループから取り除く" name="remove_contribution"/>
+	<check_box label="グループから [AMOUNT] 平方メートルの貢献を取り除きます。" name="remove_contribution"/>
 	<button label="購入" name="buy_btn"/>
 	<button label="取り消し" name="cancel_btn"/>
 	<string name="can_resell">
@@ -181,16 +181,16 @@
 		あなたのアカウントで土地を所有できます
 	</string>
 	<string name="land_holdings">
-		あなたは [BUYER] 平方メートルの土地を所有しています
+		あなたは、[BUYER] 平方メートルの土地を所有しています。
 	</string>
 	<string name="pay_to_for_land">
 		この土地の代金として、[SELLER]にL$[AMOUNT]を支払う
 	</string>
 	<string name="buy_for_US">
-		約US$ [AMOUNT2]でL$ [AMOUNT]を購入
+		L$ [AMOUNT] を、約 [LOCAL_AMOUNT] で購入します。
 	</string>
 	<string name="parcel_meters">
-		この区画は [AMOUNT] 平方メートルあります
+		この区画は [AMOUNT] 平方メートルです。
 	</string>
 	<string name="premium_land">
 		この土地は割り増し付です。 [AMOUNT] 平方メートルの料金がかかります。
@@ -199,9 +199,8 @@
 		この土地はディスカウントされています。 [AMOUNT] 平方メートルの料金がかかります。
 	</string>
 	<string name="meters_supports_object">
-		[AMOUNT]平方メートルであれば、
-[AMOUNT2]個のオブジェクトがサポ
-ートされます
+		[AMOUNT] 平方メートル
+オブジェクト [AMOUNT2] 個サポート
 	</string>
 	<string name="sold_with_objects">
 		オブジェクトと共に販売済み
@@ -211,7 +210,7 @@
 	</string>
 	<string name="info_price_string">
 		L$ [PRICE]
-（L$ [PRICE_PER_SQM]/平方メートル）
+（L$[PRICE_PER_SQM]/平方メートル）
 [SOLD_WITH_OBJECTS]
 	</string>
 	<string name="insufficient_land_credits">
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 7e32e5b3c5..be118273fa 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -10,12 +10,20 @@
 		カメラを上下左右に移動
 	</floater.string>
 	<panel name="controls">
-		<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に移動"/>
-		<joystick_zoom name="zoom" tool_tip="向いてる方法にカメラをズーム"/>
+		<joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に動かします"/>
+		<panel name="zoom" tool_tip="向いてる方法にカメラをズーム">
+			<slider_bar name="zoom_slider" tool_tip="向いている方向にカメラをズーム"/>
+		</panel>
 		<joystick_rotate name="cam_rotate_stick" tool_tip="自分を軸にカメラを回す"/>
+		<panel name="camera_presets">
+			<button name="rear_view" tool_tip="後方視界"/>
+			<button name="group_view" tool_tip="グループ視界"/>
+			<button name="front_view" tool_tip="前方視界"/>
+			<button name="mouselook_view" tool_tip="一人称視界"/>
+		</panel>
 	</panel>
 	<panel name="buttons">
-		<button label="" name="orbit_btn" tool_tip="カメラを旋回"/>
+		<button label="" name="orbit_btn" tool_tip="カメラを回す"/>
 		<button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/>
 		<button label="" name="avatarview_btn" tool_tip="アバター視点"/>
 		<button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1895..7d91cb69ed 100644
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="グループ">
 	<text name="groupdesc">
 		グループを選択：
 	</text>
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index d041f44e08..f6739d59e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="カラー・ピッカー">
+<floater name="ColorPicker" title="カラーピッカー">
 	<text name="r_val_text">
 		赤：
 	</text>
@@ -21,11 +21,11 @@
 	<check_box label="今すぐ適用" name="apply_immediate"/>
 	<button label="" label_selected="" name="color_pipette"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
-	<button label="OK" label_selected="選択" name="select_btn"/>
+	<button label="Ok" label_selected="Ok" name="select_btn"/>
 	<text name="Current color:">
 		現在の色：
 	</text>
 	<text name="(Drag below to save.)">
-		ドラッグして保存
+		（下にドラッグして保存）
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml
index d51fb74807..61423fcf05 100644
--- a/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ b/indra/newview/skins/default/xui/ja/floater_customize.xml
@@ -14,8 +14,8 @@
 			<button label="胴体" label_selected="胴体" name="Torso"/>
 			<button label="両脚" label_selected="両脚" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item name="radio" label="女性"/>
-				<radio_item name="radio2" label="男性"/>
+				<radio_item label="女性" name="radio"/>
+				<radio_item label="男性" name="radio2"/>
 			</radio_group>
 			<text name="title">
 				[DESC]
@@ -152,10 +152,10 @@
 			<button label="別名で保存..." label_selected="別名で保存..." name="Save As"/>
 			<button label="戻す" label_selected="戻す" name="Revert"/>
 		</panel>
-		<panel label="服" name="clothes_placeholder"/>
+		<placeholder label="服" name="clothes_placeholder"/>
 		<panel label="シャツ" name="Shirt">
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しいシャツを作成" label_selected="新しいシャツを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -189,7 +189,7 @@
 		</panel>
 		<panel label="ズボン" name="Pants">
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しいズボンを作成" label_selected="新しいズボンを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -248,7 +248,7 @@
 				靴：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しい靴を作成" label_selected="新しい靴を作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -282,7 +282,7 @@
 				靴下：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しい靴下を作成" label_selected="新しい靴下を作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -317,7 +317,7 @@
 			</text>
 			<texture_picker label="上半身の生地" name="Upper Fabric" tool_tip="写真をクリックして選択"/>
 			<texture_picker label="下層生地" name="Lower Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しい上着を作成" label_selected="新しい上着を作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -351,7 +351,7 @@
 				手袋：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しい手袋を作成" label_selected="新しい手袋を作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -385,7 +385,7 @@
 				下着シャツ：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しい下着シャツを作成" label_selected="新しい下着シャツを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -419,7 +419,7 @@
 				下着パンツ：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="新しいパンツを作成" label_selected="新しいパンツを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
@@ -453,15 +453,87 @@
 				スカート：
 			</text>
 			<texture_picker label="生地" name="Fabric" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色／明暗" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<button label="スカートを作成" label_selected="スカートを作成" name="Create New"/>
 			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
 			<button label="保存" label_selected="保存" name="Save"/>
 			<button label="別名で保存..." label_selected="別名で保存..." name="Save As"/>
 			<button label="戻す" label_selected="戻す" name="Revert"/>
 		</panel>
+		<panel label="アルファ" name="Alpha">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]： 修正不可
+			</text>
+			<text name="title_loading">
+				[DESC]： ローディング...
+			</text>
+			<text name="title_not_worn">
+				[DESC]： 未着用
+			</text>
+			<text name="path">
+				参照 [PATH]
+			</text>
+			<text name="not worn instructions">
+				あなたの持ち物からアバターにドラッグして、新しいアルファマスクをつけます。
+代わりに、はじめから新しく作成して着用できます。
+			</text>
+			<text name="no modify instructions">
+				この着用物を修正する権限がありません。
+			</text>
+			<text name="Item Action Label">
+				アルファ：
+			</text>
+			<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
+			<button label="新しいアルファを作成" label_selected="新しいアルファを作成" name="Create New"/>
+			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
+			<button label="保存" label_selected="保存" name="Save"/>
+			<button label="別名で保存..." label_selected="別名で保存..." name="Save As"/>
+			<button label="元に戻す" label_selected="元に戻す" name="Revert"/>
+		</panel>
+		<panel label="タトゥ" name="Tattoo">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]： 修正不可
+			</text>
+			<text name="title_loading">
+				[DESC]： ローディング...
+			</text>
+			<text name="title_not_worn">
+				[DESC]： 未着用
+			</text>
+			<text name="path">
+				参照 [PATH]
+			</text>
+			<text name="not worn instructions">
+				あなたの持ち物からアバターにドラッグして、新しいタトゥをつけます。
+代わりに、はじめから新しく作成して着用できます。
+			</text>
+			<text name="no modify instructions">
+				この着用物を修正する権限がありません。
+			</text>
+			<text name="Item Action Label">
+				タトゥ：
+			</text>
+			<texture_picker label="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択します"/>
+			<button label="新しいタトゥを作成" label_selected="新しいタトゥを作成" name="Create New"/>
+			<button label="取り外す" label_selected="取り外す" name="Take Off"/>
+			<button label="保存" label_selected="保存" name="Save"/>
+			<button label="別名で保存..." label_selected="別名で保存..." name="Save As"/>
+			<button label="元に戻す" label_selected="元に戻す" name="Revert"/>
+		</panel>
 	</tab_container>
+	<button label="アウトフィット作成" label_selected="アウトフィット作成" name="make_outfit_btn"/>
 	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
 	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="服装を作成..." label_selected="服装を作成..." name="Make Outfit"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_device_settings.xml b/indra/newview/skins/default/xui/ja/floater_device_settings.xml
index f189acf101..3ae7356fb6 100644
--- a/indra/newview/skins/default/xui/ja/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="ボイスチャット機器の設定" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_device_settings" title="ボイスチャット機器の設定"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
index 48c22323f8..1d5f26a6eb 100644
--- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Environment Editor Floater" title="環境編集">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="自然環境エディター">
+	<floater.string name="timeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</floater.string>
 	<text name="EnvTimeText">
 		時刻
 	</text>
@@ -12,13 +15,11 @@
 	<text name="EnvWaterColorText">
 		水の色
 	</text>
-	<color_swatch name="EnvWaterColor"
-	     tool_tip="カラー・ピッカーをクリックして開く" />
+	<color_swatch name="EnvWaterColor" tool_tip="クリックしてカラーピッカーを開きます"/>
 	<text name="EnvWaterFogText">
 		水中照度
 	</text>
-	<button label="不動産の時刻を使用" name="EnvUseEstateTimeButton" />
-	<button label="空の高度な設定" name="EnvAdvancedSkyButton" />
-	<button label="水の高度な設定" name="EnvAdvancedWaterButton" />
-	<button label="?" name="EnvSettingsHelpButton" />
+	<button label="不動産の時刻を使用" name="EnvUseEstateTimeButton"/>
+	<button label="空の高度な設定" name="EnvAdvancedSkyButton"/>
+	<button label="水の高度な設定" name="EnvAdvancedWaterButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_first_time_tip.xml b/indra/newview/skins/default/xui/ja/floater_first_time_tip.xml
new file mode 100644
index 0000000000..fce9185b8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_first_time_tip.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="set_name_in_the_cladd">
+	<check_box label="クイックヒントをオフにする" name="DontShowFirstTimeTip_checkbox"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 66be1f7d84..a79854bcef 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -1,17 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="アクティブ・ジェスチャー">
-	<text name="help_label">
-		ジェスチャーをダブルクリックして、&#10;アニメーションとサウンドを再生。
-	</text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="場所" name="gestures" title="ジェスチャー">
+	<floater.string name="loading">
+		ローディング...
+	</floater.string>
+	<floater.string name="playing">
+		（再生中）
+	</floater.string>
+	<floater.string name="copy_name">
+		[COPY_NAME] のコピー
+	</floater.string>
 	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
-		<column label="トリガ" name="trigger" />
-		<column label="キー" name="shortcut" />
-		<column label="" name="key" />
-		<column label="名前" name="name" />
+		<scroll_list.columns label="名前" name="name"/>
+		<scroll_list.columns label="チャット" name="trigger"/>
+		<scroll_list.columns label="" name="key"/>
+		<scroll_list.columns label="キー" name="shortcut"/>
 	</scroll_list>
-	<button label="新規" name="new_gesture_btn" />
-	<button label="持ち物" name="inventory_btn" />
-	<button label="編集" name="edit_btn" />
-	<button label="再生" name="play_btn" />
-	<button label="停止" name="stop_btn" />
+	<panel label="bottom_panel" name="bottom_panel">
+		<menu_button name="gear_btn" tool_tip="詳細オプション"/>
+		<button name="new_gesture_btn" tool_tip="新規ジェスチャーを作成"/>
+		<button name="activate_btn" tool_tip="選択したジェスチャーのアクティベートの有無"/>
+		<button name="del_btn" tool_tip="このジェスチャーを削除"/>
+	</panel>
+	<button label="編集" name="edit_btn"/>
+	<button label="再生" name="play_btn"/>
+	<button label="停止" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index a8cc4827c5..c5a2800e0e 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -21,8 +21,8 @@
 	<text name="Enable VBO:">
 		VBO を有効化：
 	</text>
-	<check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/>
-	<slider label="テクスチャﾒﾓﾘ(MB)：" name="GrapicsCardTextureMemory" tool_tip="テクスチャーに割り当てるメモリの合計。 ビデオ・カード・メモリをデフォルトにします。 この数値を減らすと、パフォーマンスが改善されますが、テクスチャーがぼやけた感じになる場合があります。"/>
+	<check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/>
+	<slider label="テクスチャメモリ（MB）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。 ビデオカードのメモリに既定。 数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
 	<spinner label="フォグの距離比率：" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
new file mode 100644
index 0000000000..0a783713d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_help_browser" title="ヘルプブラウザ">
+	<floater.string name="home_page_url">
+		http://jp.secondlife.com
+	</floater.string>
+	<floater.string name="support_page_url">
+		http://jp.secondlife.com/support
+	</floater.string>
+	<layout_stack name="stack1">
+		<layout_panel name="external_controls">
+			<button label="Web ブラウザで開く" name="open_browser"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index a1970ebbd5..e3841c2cd9 100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="チュートリアル" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="チュートリアル"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_im.xml b/indra/newview/skins/default/xui/ja/floater_im.xml
index eec644715d..9c323f25e6 100644
--- a/indra/newview/skins/default/xui/ja/floater_im.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="インスタント・メッセージ">
 	<string name="only_user_message">
 		このセッションにいるユーザーはあなただけです。
@@ -10,7 +10,7 @@
 		このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
 	</string>
 	<string name="muted_message">
-		あなたはこの住人を無視しています。 メッセージを送信すると、無視設定は自動的に解除されます。
+		この住人をブロックしています。 メッセージを送ると、ブロックが自動的に解除されます。
 	</string>
 	<string name="generic_request_error">
 		要求中にエラーが発生しました。後でもう一度試してください。
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
new file mode 100644
index 0000000000..24cef14ee0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_im_box" title="インスタントメッセージ"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
new file mode 100644
index 0000000000..6646cc0b25
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/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="IM コントロールパネル" name="panel_im_control_panel"/>
+		<layout_panel>
+			<line_editor label="宛先" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
new file mode 100644
index 0000000000..32793faa6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="incoming call" title="不明のユーザーからのコール">
+	<floater.string name="localchat">
+		近くのボイスチャット
+	</floater.string>
+	<floater.string name="anonymous">
+		匿名ユーザー
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		がコールしています。
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		がコンファレンスチャットで、ボイスチャットに参加しました。
+	</floater.string>
+	<text name="question">
+		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
+	</text>
+	<button label="はい" label_selected="はい" name="Accept"/>
+	<button label="いいえ" label_selected="いいえ" name="Reject"/>
+	<button label="IM" name="Start IM"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 3ada48ef8e..b7c657c2f9 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="オブジェクト検査" min_width="450" >
-	<scroll_list name="object_list"
-	     tool_tip="このリストからオブジェクトを選択し、この世界で強調表示します。">
-		<column label="ｵﾌﾞｼﾞｪｸﾄ名" name="object_name" />
-		<column label="所有者名" name="owner_name" />
-		<column label="制作者名" name="creator_name" />
-		<column label="作成日" name="creation_date" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="450" name="inspect" title="オブジェクトのチェック">
+	<floater.string name="timeStamp">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</floater.string>
+	<scroll_list name="object_list" tool_tip="このリストからオブジェクトを選択し、この世界で強調表示します。">
+		<scroll_list.columns label="ｵﾌﾞｼﾞｪｸﾄ名" name="object_name"/>
+		<scroll_list.columns label="所有者名" name="owner_name"/>
+		<scroll_list.columns label="制作者名" name="creator_name"/>
+		<scroll_list.columns label="作成日" name="creation_date"/>
 	</scroll_list>
-	<button label="所有者のプロフィールを表示..." name="button owner"
-	     tool_tip="選択されたオブジェクトの所有者のプロフィールを見る" />
-	<button label="制作者のプロフィールを表示..." name="button creator"
-	     tool_tip="選択されたオブジェクトの制作者のプロフィールを見る" />
+	<button label="所有者のプロフィールを表示..." name="button owner" tool_tip="選択されたオブジェクトの所有者のプロフィールを見る"/>
+	<button label="制作者のプロフィールを表示..." name="button creator" tool_tip="選択されたオブジェクトの制作者のプロフィールを見る"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory.xml b/indra/newview/skins/default/xui/ja/floater_inventory.xml
index 680496839a..7cf16b8ff2 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory.xml
@@ -1,51 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="持ち物">
-	<search_editor label="ここに入力して検索" name="inventory search editor" />
-	<tab_container name="inventory filter tabs">
-		<inventory_panel label="すべて" name="All Items" />
-		<inventory_panel label="最近の入手アイテム" name="Recent Items" />
-	</tab_container>
-	<menu_bar name="Inventory Menu">
-		<menu label="ファイル" name="File">
-			<menu_item_call label="開く" name="Open" />
-			<menu_item_call label="新しいウィンドウ" name="New Window" />
-			<menu_item_call label="フィルタを表示" name="Show Filters" />
-			<menu_item_call label="フィルターのリセット" name="Reset Current" />
-			<menu_item_call label="すべてのフォルダを閉じる" name="Close All Folders" />
-			<menu_item_call label="ゴミ箱を空にする" name="Empty Trash" />
-		</menu>
-		<menu label="作成" name="Create">
-			<menu_item_call label="新しいフォルダ" name="New Folder" />
-			<menu_item_call label="新しいスクリプト" name="New Script" />
-			<menu_item_call label="新しいノート" name="New Note" />
-			<menu_item_call label="新しいジェスチャー" name="New Gesture" />
-			<menu name="New Clothes">
-				<menu_item_call label="新しいシャツ" name="New Shirt" />
-				<menu_item_call label="新しいズボン" name="New Pants" />
-				<menu_item_call label="新しい靴" name="New Shoes" />
-				<menu_item_call label="新しい靴下" name="New Socks" />
-				<menu_item_call label="新しいジャケット" name="New Jacket" />
-				<menu_item_call label="新しいスカート" name="New Skirt" />
-				<menu_item_call label="新しい手袋" name="New Gloves" />
-				<menu_item_call label="新しい下着" name="New Undershirt" />
-				<menu_item_call label="新しいパンツ" name="New Underpants" />
-			</menu>
-			<menu name="New Body Parts">
-				<menu_item_call label="新しいシェイプ(体型)" name="New Shape" />
-				<menu_item_call label="新しいスキン" name="New Skin" />
-				<menu_item_call label="新しい髪" name="New Hair" />
-				<menu_item_call label="新しい眼" name="New Eyes" />
-			</menu>
-		</menu>
-		<menu label="並べ替え" name="Sort">
-			<menu_item_check label="名前" name="By Name" />
-			<menu_item_check label="日付" name="By Date" />
-			<menu_item_check label="フォルダは常に名前順" name="Folders Always By Name" />
-			<menu_item_check label="システムフォルダをトップへ" name="System Folders To Top" />
-		</menu>
-		<menu label="フィルタ" name="Filters">
-			<menu_item_check label="現状を修正" name="Modify Current" />
-			<menu_item_call label="現状をリセット" name="Reset Current" />
-		</menu>
-	</menu_bar>
+	<floater.string name="Title">
+		インベントリ
+	</floater.string>
+	<floater.string name="TitleFetching">
+		持ち物 （ [ITEM_COUNT]  アイテムを取得中...） [FILTER]
+	</floater.string>
+	<floater.string name="TitleCompleted">
+		持ち物 （ [ITEM_COUNT]  アイテム） [FILTER]
+	</floater.string>
+	<floater.string name="Fetched">
+		取得済
+	</floater.string>
+	<panel label="持ち物パネル" name="Inventory Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index a3fddc7b8d..7480b04856 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -12,6 +12,9 @@
 	<floater.string name="owner_can">
 		オーナーは次のことができます：
 	</floater.string>
+	<floater.string name="acquiredDate">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</floater.string>
 	<text name="LabelItemNameTitle">
 		名前：
 	</text>
@@ -63,5 +66,8 @@
 		<combo_box.item label="コピー" name="Copy"/>
 		<combo_box.item label="オリジナル" name="Original"/>
 	</combo_box>
-	<spinner label="価格： L$" name="Edit Cost"/>
+	<spinner label="価格：" name="Edit Cost"/>
+	<text name="CurrencySymbol">
+		L$
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 2200809925..86bb5dcf62 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory Finder" title="INVENTORY_RECENT_ITEMS">
-	<check_box label="アニメーション" name="check_animation" />
-	<check_box label="コーリング・カード" name="check_calling_card" />
-	<check_box label="服" name="check_clothing" />
-	<check_box label="ジェスチャー" name="check_gesture" />
-	<check_box label="ランドマーク" name="check_landmark" />
-	<check_box label="ノートカード" name="check_notecard" />
-	<check_box label="オブジェクト" name="check_object" />
-	<check_box label="スクリプト" name="check_script" />
-	<check_box label="サウンド" name="check_sound" />
-	<check_box label="テクスチャー" name="check_texture" />
-	<check_box label="スナップショット" name="check_snapshot" />
-	<button label="すべて" label_selected="すべて" name="All" />
-	<button label="なし" label_selected="なし" name="None" />
-	<check_box label="常にフォルダを表示" name="check_show_empty" />
-	<check_box label="ログオフ以降" name="check_since_logoff" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="最近取得した持ち物アイテム">
+	<check_box label="アニメーション" name="check_animation"/>
+	<check_box label="コーリング・カード" name="check_calling_card"/>
+	<check_box label="服" name="check_clothing"/>
+	<check_box label="ジェスチャー" name="check_gesture"/>
+	<check_box label="ランドマーク" name="check_landmark"/>
+	<check_box label="ノートカード" name="check_notecard"/>
+	<check_box label="オブジェクト" name="check_object"/>
+	<check_box label="スクリプト" name="check_script"/>
+	<check_box label="サウンド" name="check_sound"/>
+	<check_box label="テクスチャー" name="check_texture"/>
+	<check_box label="スナップショット" name="check_snapshot"/>
+	<button label="すべて" label_selected="すべて" name="All"/>
+	<button label="なし" label_selected="なし" name="None"/>
+	<check_box label="常にフォルダを表示" name="check_show_empty"/>
+	<check_box label="ログオフ以降" name="check_since_logoff"/>
 	<text name="- OR -">
 		－または－
 	</text>
-	<spinner label="経過時間" name="spin_hours_ago" />
-	<spinner label="経過日数" name="spin_days_ago" />
-	<button label="閉じる" label_selected="閉じる" name="Close" />
+	<spinner label="経過時間" name="spin_hours_ago"/>
+	<spinner label="経過日数" name="spin_days_ago"/>
+	<button label="閉じる" label_selected="閉じる" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index 177567c806..9d91fe8db9 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="ジョイスティックの設定">
-	<check_box name="enable_joystick" width="120" label="ジョイスティックを使う："/>
+	<check_box label="ジョイスティックを使う：" name="enable_joystick" width="120"/>
 	<text left="180" name="joystick_type" width="320"/>
 	<spinner label="X軸マッピング" name="JoystickAxis1"/>
 	<spinner label="Y軸マッピング" name="JoystickAxis2"/>
@@ -15,9 +15,9 @@
 	<text name="Control Modes:">
 		制御モード：
 	</text>
-	<check_box left="131" name="JoystickAvatarEnabled" label="アバター"/>
-	<check_box left="201" name="JoystickBuildEnabled" label="造る"/>
-	<check_box left="271" name="JoystickFlycamEnabled" label="フライ・カメラ"/>
+	<check_box label="アバター" left="131" name="JoystickAvatarEnabled"/>
+	<check_box label="造る" left="201" name="JoystickBuildEnabled"/>
+	<check_box label="フライ・カメラ" left="271" name="JoystickFlycamEnabled"/>
 	<text left="5" name="XScale" width="120">
 		Xスケール
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index e25771ea72..e3546cd837 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,152 +1,151 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="ラグ メーター">
-	<button name="client_lagmeter" tool_tip="クライアント ラグ ステータス" />
-	<text name="client">
-		クライアント:
-	</text>
-	<text name="client_text">
-		ノーマル
-	</text>
-	<button name="network_lagmeter" tool_tip="ネットワーク ラグ ステータス" />
-	<text name="network">
-		ネットワーク:
-	</text>
-	<text name="network_text">
-		ノーマル
-	</text>
-	<button name="server_lagmeter" tool_tip="サーバー ラグ ステータス" />
-	<text name="server">
-		サーバー:
-	</text>
-	<text name="server_text">
-		ノーマル
-	</text>
-	<button label="?" name="server_help" />
-	<button label="&gt;&gt; " name="minimize" />
-	<text name="max_title_msg">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="ラグメーター">
+	<floater.string name="max_title_msg">
 		ラグ メーター
-	</text>
-	<text name="max_width_px">
+	</floater.string>
+	<floater.string name="max_width_px">
 		350
-	</text>
-	<text name="min_title_msg">
+	</floater.string>
+	<floater.string name="min_title_msg">
 		ラグ
-	</text>
-	<text name="min_width_px">
+	</floater.string>
+	<floater.string name="min_width_px">
 		90
-	</text>
-	<text name="client_text_msg">
+	</floater.string>
+	<floater.string name="client_text_msg">
 		クライアント
-	</text>
-	<text name="client_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_critical_fps">
 		10
-	</text>
-	<text name="client_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="client_frame_rate_warning_fps">
 		15
-	</text>
-	<text name="client_frame_time_window_bg_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_window_bg_msg">
 		ノーマル、ウィンドウは背景に
-	</text>
-	<text name="client_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_critical_msg">
 		クライアント フレームレート ＜ [CLIENT_FRAME_RATE_CRITICAL]
-	</text>
-	<text name="client_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_warning_msg">
 		クライアント フレームレート: [CLIENT_FRAME_RATE_CRITICAL] ～ [CLIENT_FRAME_RATE_WARNING]
-	</text>
-	<text name="client_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="client_frame_time_normal_msg">
 		ノーマル
-	</text>
-	<text name="client_draw_distance_cause_msg">
+	</floater.string>
+	<floater.string name="client_draw_distance_cause_msg">
 		考えられる原因: 描画距離の設定が大きすぎる
-	</text>
-	<text name="client_texture_loading_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_loading_cause_msg">
 		考えられる原因: 画像のロード中
-	</text>
-	<text name="client_texture_memory_cause_msg">
+	</floater.string>
+	<floater.string name="client_texture_memory_cause_msg">
 		考えられる原因: メモリ内の画像数が多すぎる
-	</text>
-	<text name="client_complex_objects_cause_msg">
+	</floater.string>
+	<floater.string name="client_complex_objects_cause_msg">
 		考えられる原因: 画面に含まれる複雑なオブジェクトが多すぎる
-	</text>
-	<text name="network_text_msg">
+	</floater.string>
+	<floater.string name="network_text_msg">
 		ネットワーク
-	</text>
-	<text name="network_packet_loss_critical_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_pct">
 		10
-	</text>
-	<text name="network_packet_loss_warning_pct">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_pct">
 		5
-	</text>
-	<text name="network_packet_loss_critical_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_critical_msg">
 		接続でドロップされるパケットの割合: ＞ [NETWORK_PACKET_LOSS_CRITICAL]
-	</text>
-	<text name="network_packet_loss_warning_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_warning_msg">
 		接続でドロップされるパケットの割合:[NETWORK_PACKET_LOSS_WARNING] ～ [NETWORK_PACKET_LOSS_CRITICAL]
-	</text>
-	<text name="network_performance_normal_msg">
+	</floater.string>
+	<floater.string name="network_performance_normal_msg">
 		ノーマル
-	</text>
-	<text name="network_ping_critical_ms">
+	</floater.string>
+	<floater.string name="network_ping_critical_ms">
 		600
-	</text>
-	<text name="network_ping_warning_ms">
+	</floater.string>
+	<floater.string name="network_ping_warning_ms">
 		300
-	</text>
-	<text name="network_ping_critical_msg">
+	</floater.string>
+	<floater.string name="network_ping_critical_msg">
 		接続の ping 時間: ＞ [NETWORK_PING_CRITICAL] ミリ秒
-	</text>
-	<text name="network_ping_warning_msg">
+	</floater.string>
+	<floater.string name="network_ping_warning_msg">
 		接続の ping 時間: [NETWORK_PING_WARNING] ～ [NETWORK_PING_CRITICAL] ミリ秒
-	</text>
-	<text name="network_packet_loss_cause_msg">
+	</floater.string>
+	<floater.string name="network_packet_loss_cause_msg">
 		接続不良になっているか、帯域幅設定が高すぎます。
-	</text>
-	<text name="network_ping_cause_msg">
+	</floater.string>
+	<floater.string name="network_ping_cause_msg">
 		接続不良になっているか、ファイル共有アプリケーションに問題があります。
-	</text>
-	<text name="server_text_msg">
+	</floater.string>
+	<floater.string name="server_text_msg">
 		サーバー
-	</text>
-	<text name="server_frame_rate_critical_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_critical_fps">
 		20
-	</text>
-	<text name="server_frame_rate_warning_fps">
+	</floater.string>
+	<floater.string name="server_frame_rate_warning_fps">
 		30
-	</text>
-	<text name="server_single_process_max_time_ms">
+	</floater.string>
+	<floater.string name="server_single_process_max_time_ms">
 		20
-	</text>
-	<text name="server_frame_time_critical_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_critical_msg">
 		シミュレーターのフレームレート: ＜ [SERVER_FRAME_RATE_CRITICAL]
-	</text>
-	<text name="server_frame_time_warning_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_warning_msg">
 		シミュレーターのフレームレート: [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING]
-	</text>
-	<text name="server_frame_time_normal_msg">
+	</floater.string>
+	<floater.string name="server_frame_time_normal_msg">
 		ノーマル
-	</text>
-	<text name="server_physics_cause_msg">
+	</floater.string>
+	<floater.string name="server_physics_cause_msg">
 		考えられる原因: 物理的オブジェクトが多すぎる
-	</text>
-	<text name="server_scripts_cause_msg">
+	</floater.string>
+	<floater.string name="server_scripts_cause_msg">
 		考えられる原因: スクリプトを含むオブジェクトが多すぎる
-	</text>
-	<text name="server_net_cause_msg">
+	</floater.string>
+	<floater.string name="server_net_cause_msg">
 		考えられる原因: ネットワーク トラフィック過大
-	</text>
-	<text name="server_agent_cause_msg">
+	</floater.string>
+	<floater.string name="server_agent_cause_msg">
 		考えられる原因: 地域内にて動いているアバターが多すぎる
-	</text>
-	<text name="server_images_cause_msg">
+	</floater.string>
+	<floater.string name="server_images_cause_msg">
 		考えられる原因: 画像計算が多すぎる
-	</text>
-	<text name="server_generic_cause_msg">
+	</floater.string>
+	<floater.string name="server_generic_cause_msg">
 		考えられる原因: シミュレーターの過負荷
+	</floater.string>
+	<floater.string name="smaller_label">
+		&gt;&gt;
+	</floater.string>
+	<floater.string name="bigger_label">
+		&lt;&lt;
+	</floater.string>
+	<button name="client_lagmeter" tool_tip="クライアント ラグ ステータス"/>
+	<text name="client">
+		クライアント
 	</text>
-	<text name="smaller_label">
-		&gt;&gt; 
+	<text name="client_text">
+		ノーマル
+	</text>
+	<button name="network_lagmeter" tool_tip="ネットワーク ラグ ステータス"/>
+	<text name="network">
+		ネットワーク
 	</text>
-	<text name="bigger_label">
-		&lt;&lt; 
+	<text name="network_text">
+		ノーマル
+	</text>
+	<button name="server_lagmeter" tool_tip="サーバー ラグ ステータス"/>
+	<text name="server">
+		サーバー
+	</text>
+	<text name="server_text">
+		ノーマル
 	</text>
+	<button label="&gt;&gt; " name="minimize" tool_tip="フローターのサイズをトグル"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 3cff79430d..474bd32cb0 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -8,7 +8,7 @@
 		<column label="" name="hidden"/>
 	</scroll_list>
 	<button label="テレポート" label_selected="テレポート" name="Teleport" tool_tip="この土地の中心にテレポート"/>
-	<button label="地図" label_selected="地図" name="Show on Map" tool_tip="この土地を世界地図に表示します。"/>
+	<button label="地図" label_selected="地図" name="Show on Map" tool_tip="この土地を世界地図に表示します"/>
 	<text name="contrib_label">
 		あなたのグループへの貢献：
 	</text>
@@ -20,21 +20,21 @@
 		現在の支払いプランでの許可された保有地：
 	</text>
 	<text name="allowed_text">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<text name="current_label">
 		現在の保有地：
 	</text>
 	<text name="current_text">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<text name="available_label">
 		土地購入可：
 	</text>
 	<text name="available_text">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<string name="area_string">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index ce1a1ecf92..5a155c9f12 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="スクリプト：新しいスクリプト">
+<floater name="script ed float" title="スクリプト： 新しいスクリプト">
 	<floater.string name="not_allowed">
-		このスクリプトは「コピー不可」のため、表示または編集することができません。 オブジェクト内のスクリプトの表示または編集には、全権限が必要です。
+		このスクリプトは「コピー不可」のため、表示・編集することができません。 オブジェクト内のスクリプトの表示・編集には、全権限が必要です。
 	</floater.string>
 	<floater.string name="script_running">
 		実行中
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index e535fc731f..2af693be64 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.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="script ed float" title="LSL WIKI">
-	<check_box label="カーソルを追う" name="lock_check" />
-	<combo_box label="ロック" name="history_combo" />
-	<button label="戻る" name="back_btn" />
-	<button label="進む" name="fwd_btn" />
+	<check_box label="カーソルを追う" name="lock_check"/>
+	<combo_box label="ロック" name="history_combo"/>
+	<button label="戻る" name="back_btn"/>
+	<button label="進む" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 3bcc40f9dd..5a6f2121f8 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="メディア・ブラウザ">
+<floater name="floater_about" title="メディアブラウザ">
 	<floater.string name="home_page_url">
 		http://jp.secondlife.com
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
new file mode 100644
index 0000000000..46ac1a8dfd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="media_settings" title="メディアの設定">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+	<button label="適用" label_selected="適用" name="Apply"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 072bb4a576..04ffd5254d 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="オブジェクト名で無視する">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="名前でオブジェクトをブロック">
 	<text name="message">
-		ﾃｷｽﾄのみに影響し、ｻｳﾝﾄﾞ(環境音など)には影響しません。
-正確なオブジェクト名を入力してください。
+		オブジェクトをブロックします：
 	</text>
 	<line_editor name="object_name">
 		オブジェクト名
 	</line_editor>
-	<button label="OK" name="OK" />
-	<button label="ｷｬﾝｾﾙ" name="Cancel" />
+	<text name="note">
+		* ブロックされるのはオブジェクトの文字だけで、音はブロックされません。
+	</text>
+	<button label="OK" name="OK"/>
+	<button label="ｷｬﾝｾﾙ" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_friends.xml b/indra/newview/skins/default/xui/ja/floater_my_friends.xml
index 10e55f0655..b55cdde5b5 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="連絡先" min_width="500">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="500" name="floater_my_friends" title="連絡先">
 	<tab_container name="friends_and_groups">
-		<panel label="フレンド" name="friends_panel" />
-		<panel label="グループ" name="groups_panel" />
+		<panel label="フレンド" name="friends_panel"/>
+		<panel label="グループ" name="groups_panel"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
new file mode 100644
index 0000000000..a3cc105048
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="nearby_chat" title="近くのチャット"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 485528e985..bd1b650f98 100644
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="オブジェクト・コンテンツ">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="objectcontents" title="オブジェクトの中身">
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="持ち物にコピー" label_selected="持ち物にコピー"
-	     name="copy_to_inventory_button" />
-	<button label="コピーして装着" label_selected="コピーして装着"
-	     name="copy_and_wear_button" />
+	<button label="持ち物にコピー" label_selected="持ち物にコピー" name="copy_to_inventory_button"/>
+	<button label="コピーして装着" label_selected="コピーして装着" name="copy_and_wear_button"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
new file mode 100644
index 0000000000..416d104586
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="outgoing call" title="コール中">
+	<floater.string name="localchat">
+		近くのボイスチャット
+	</floater.string>
+	<floater.string name="anonymous">
+		匿名ユーザー
+	</floater.string>
+	<floater.string name="VoiceInviteP2P">
+		がコールしています。
+	</floater.string>
+	<floater.string name="VoiceInviteAdHoc">
+		がコンファレンスチャットで、ボイスチャットに参加しました。
+	</floater.string>
+	<text name="connecting">
+		[CALLEE_NAME] に接続中
+	</text>
+	<text name="calling">
+		[CALLEE_NAME] にコール中
+	</text>
+	<text name="noanswer">
+		繋がりませんでした。  あとでもう一度お試しください。
+	</text>
+	<text name="leaving">
+		[CURRENT_CHAT] を終了します。
+	</text>
+	<button label="キャンセル" label_selected="キャンセル" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index bef2435fe2..4564354899 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
+	<string name="payee_group">
+		グループに支払う
+	</string>
+	<string name="payee_resident">
+		住人に支払う
+	</string>
 	<text name="payee_label">
 		支払い：
 	</text>
@@ -12,7 +18,7 @@
 	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<text name="amount text">
-		金額の指定：
+		金額を指定：
 	</text>
 	<button label="支払い" label_selected="支払い" name="pay btn"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index b304e291d3..ffd57ab67b 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
 	<string name="payee_group">
-		グループへの支払い：
+		グループに支払う
 	</string>
 	<string name="payee_resident">
-		住人への支払い：
+		住人に支払う
 	</string>
 	<icon name="icon_person" tool_tip="住人"/>
 	<text name="payee_name">
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
index e22ce24180..b2ca059ccd 100644
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_postcard.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="スナップショットをEメールで送信">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="スナップショットをメール">
 	<text name="to_label">
 		住人のEメール：
 	</text>
-	<line_editor left="145" name="to_form" width="125" />
+	<line_editor left="145" name="to_form" width="125"/>
 	<text name="from_label">
 		あなたのEメール：
 	</text>
-	<line_editor left="145" name="from_form" width="125" />
+	<line_editor left="145" name="from_form" width="125"/>
 	<text name="name_label">
 		あなたの名前：
 	</text>
-	<line_editor left="145" name="name_form" width="125" />
+	<line_editor left="145" name="name_form" width="125"/>
 	<text name="subject_label">
 		件名：
 	</text>
-	<line_editor label="件名をここに入力" left="145" name="subject_form"
-	     width="125" />
+	<line_editor label="件名をここに入力" left="145" name="subject_form" width="125"/>
 	<text name="msg_label">
 		メッセージ：
 	</text>
 	<text_editor bottom_delta="-120" height="110" name="msg_form">
 		メッセージをここに入力してください。
 	</text_editor>
-	<check_box label="ウェブ上で公開" name="allow_publish_check"
-	     tool_tip="このポストカードをウェブ上で公開します。" />
-	<check_box label="成人向けコンテンツ" name="mature_check"
-	     tool_tip="このポストカードには成人向け内容が含まれます。" />
-	<button label="?" left="300" name="publish_help_btn" />
+	<check_box label="ウェブ上で公開" name="allow_publish_check" tool_tip="このポストカードをウェブ上で公開します。"/>
+	<check_box label="成人向けコンテンツ" name="mature_check" tool_tip="このポストカードには成人向け内容が含まれます。"/>
+	<button label="?" left="300" name="publish_help_btn"/>
 	<text name="fine_print">
 		この受信者がSLに参加すると、あなたに紹介ボーナスが入ります
 	</text>
-	<button bottom_delta="-52" label="取り消し" name="cancel_btn" />
-	<button label="送信" name="send_btn" />
+	<button bottom_delta="-52" label="取り消し" name="cancel_btn"/>
+	<button label="送信" name="send_btn"/>
 	<text name="default_subject">
-		[SECOND_LIFE] からのポストカード
+		[SECOND_LIFE] からのポストカードです。
 	</text>
 	<text name="default_message">
 		これは絶対チェック！
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 3d0c82bd41..7c9a8b61bd 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Preferences" title="環境設定">
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
-	<button label="適用" label_selected="適用" name="Apply" />
-	<button label="概要" label_selected="概要" name="About..." />
-	<button label="ヘルプ" label_selected="ヘルプ" name="Help" />
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<tab_container name="pref core">
+		<panel label="一般" name="general"/>
+		<panel label="グラフィック" name="display"/>
+		<panel label="プライバシー" name="im"/>
+		<panel label="サウンド" name="audio"/>
+		<panel label="チャット" name="chat"/>
+		<panel label="警告" name="msgs"/>
+		<panel label="セットアップ" name="input"/>
+		<panel label="詳細" name="advanced1"/>
+	</tab_container>
 </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 629c1fd339..fb2f2c7433 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 audition 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 1ec868d0d8..4b4df98348 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -1,14 +1,29 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
-	<string name="stop_txt">
+	<floater.string name="step_anim">
+		プレイするアニメーション：
+	</floater.string>
+	<floater.string name="step_sound">
+		プレイするサウンド：
+	</floater.string>
+	<floater.string name="step_chat">
+		発言するチャット：
+	</floater.string>
+	<floater.string name="step_wait">
+		待機：
+	</floater.string>
+	<floater.string name="stop_txt">
 		止まる
-	</string>
-	<string name="preview_txt">
+	</floater.string>
+	<floater.string name="preview_txt">
 		プレビュー
-	</string>
-	<string name="none_text">
+	</floater.string>
+	<floater.string name="none_text">
 		-- なし --
-	</string>
+	</floater.string>
+	<floater.string name="Title">
+		ジェスチャー： [NAME]
+	</floater.string>
 	<text name="desc_label">
 		説明：
 	</text>
@@ -22,35 +37,28 @@
 	<text name="key_label">
 		ショートカット・キー：
 	</text>
-	<combo_box label="なし" name="modifier_combo" left="160"/>
+	<combo_box label="なし" left="160" name="modifier_combo"/>
 	<combo_box label="なし" name="key_combo"/>
 	<text name="library_label">
 		ライブラリ：
 	</text>
+	<scroll_list name="library_list"/>
+	<button label="追加＞＞" name="add_btn"/>
 	<text name="steps_label">
 		手順：
 	</text>
-	<scroll_list name="library_list">
-		アニメーション
-サウンド
-チャット
-待機
-	</scroll_list>
-	<button label="追加＞＞" name="add_btn"/>
-	<button label="上に移動" name="up_btn"/>
-	<button label="下に移動" name="down_btn"/>
+	<button label="上" name="up_btn"/>
+	<button label="下" name="down_btn"/>
 	<button label="削除" name="delete_btn"/>
-	<text name="help_label">
-		待機ステップを追加しない限り、
-すべてのステップが同時に行われ
-ます。
-	</text>
 	<radio_group name="animation_trigger_type">
-		<radio_item name="start" label="開始" />
-		<radio_item name="stop" label="停止" />
+		<radio_item label="開始" name="start"/>
+		<radio_item label="停止" name="stop"/>
 	</radio_group>
 	<check_box label="アニメーションが完了するまで" name="wait_anim_check"/>
 	<check_box label="秒表示の時間" name="wait_time_check"/>
+	<text name="help_label">
+		待機ステップを入れない限りは、すべてのステップが同時に起こります。
+	</text>
 	<check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェスチャーは、トリガー・フレーズを使うか、またはホット・キーを押すことによってトリガーできます。  1つのショートカット・キーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/>
 	<button label="プレビュー" name="preview_btn"/>
 	<button label="保存" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml
new file mode 100644
index 0000000000..596699d6c1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Gesture" title="ジェスチャーのショートカット">
+	<text name="trigger_label">
+		チャット：
+	</text>
+	<text name="key_label">
+		キーボード：
+	</text>
+	<combo_box label="なし" name="modifier_combo"/>
+	<combo_box label="なし" name="key_combo"/>
+	<text name="replace_text" tool_tip="これらの単語にトリガーとなる単語を置き換えます。 例えば、「howdy」と「hello」を置き換えると、「I wanted to say hello」というチャットは、ジェスチャーを交えながらの「I wanted to say howdy」に変わります。">
+		置き換え：
+	</text>
+	<line_editor name="replace_editor" tool_tip="これらの単語にトリガーとなる単語を置き換えます。 例えば、「howdy」と「hello」を置き換えると、「I wanted to say hello」というチャットは、ジェスチャーを交えながらの「I wanted to say howdy」に変わります。"/>
+</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 09c6e46fb5..d3c06cbef4 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 audition btn" tool_tip="このサウンドを自分専用に再生します。"/>
+	<button label="世界で再生" label_selected="世界で再生" name="Sound play btn" tool_tip="他人が聞こえるように再生"/>
+	<button label="ローカルに再生" label_selected="ローカルに再生" name="Sound audition btn" tool_tip="自分だけが聞こえるように再生"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 32b83f295d..3313ae84b9 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
@@ -9,9 +9,38 @@
 	<text name="desc txt">
 		説明：
 	</text>
-	<button label="保存" name="Keep"/>
-	<button label="削除" name="Discard"/>
+	<button label="OK" name="Keep"/>
+	<button label="キャンセル" name="Discard"/>
 	<text name="dimensions">
 		[WIDTH]px x [HEIGHT]px
 	</text>
+	<text name="aspect_ratio">
+		縦横比のプレビュー
+	</text>
+	<combo_box name="combo_aspect_ratio" tool_tip="固定した縦横比のプレビュー">
+		<combo_item name="Unconstrained">
+			非拘束
+		</combo_item>
+		<combo_item name="1:1" tool_tip="グループ記章か現実世界のプロフィール">
+			1:1
+		</combo_item>
+		<combo_item name="4:3" tool_tip="[SECOND_LIFE] プロフィール">
+			4:3
+		</combo_item>
+		<combo_item name="10:7" tool_tip="クラシファイド広告、検索一覧、ランドマーク">
+			10:7
+		</combo_item>
+		<combo_item name="3:2" tool_tip="土地情報">
+			3:2
+		</combo_item>
+		<combo_item name="16:10">
+			16:10
+		</combo_item>
+		<combo_item name="16:9" tool_tip="プロフィールのピック">
+			16:9
+		</combo_item>
+		<combo_item name="2:1">
+			2:1
+		</combo_item>
+	</combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index 7ac7facce5..d08c51c61e 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="地域/不動産" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="地域 / 不動産"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index ac5b2c0a2d..599cd5d98d 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -8,7 +8,7 @@
 		報告者：
 	</text>
 	<text name="reporter_field">
-		Loremipsum Dolorsitamut
+		Loremipsum Dolorsitamut Longnamez
 	</text>
 	<text name="sim_title">
 		地域：
@@ -23,7 +23,7 @@
 		{128.1, 128.1, 15.4}
 	</text>
 	<text name="select_object_label">
-		ボタンをクリック。悪意のあるオブジェクト：
+		ボタンをクリックしてから、悪意のあるオブジェクトをクリック：
 	</text>
 	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクト・ピッカー - この報告の主題となるオブジェクトを特定"/>
 	<text name="object_name_label">
@@ -36,7 +36,7 @@
 		ｵｰﾅｰ：
 	</text>
 	<text name="owner_name">
-		Hendrerit Vulputate
+		Hendrerit Vulputate Kamawashi Longname
 	</text>
 	<combo_box name="category_combo" tool_tip="カテゴリー -- この報告に最も適したカテゴリーを選択してください">
 		<combo_box.item label="カテゴリーを選択" name="Select_category"/>
@@ -93,10 +93,10 @@
 		詳細：
 	</text>
 	<text name="bug_aviso">
-		できるだけ具体的にお願いします。
+		できるだけ具体的に詳しく記入してください。
 	</text>
 	<text name="incomplete_title">
-		注意：不完全なレポートは調査されません。
+		* 不完全な報告は調査対象になりません。
 	</text>
 	<button label="嫌がらせの報告" label_selected="嫌がらせの報告" name="send_btn"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
index ef021ce713..e70a30fa24 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script" short_title="[All scripts]" title="[All scripts]"/>
+<floater name="script" short_title="[ALL SCRIPTS]" title="[ALL SCRIPTS]"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 82fe741d67..656357aa17 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="スクリプト：回転スクリプト">
+<floater name="preview lsl text" title="スクリプト： 回転スクリプト">
 	<floater.string name="Title">
 		スクリプト： [NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index 22a79e16d6..97e79fb483 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="進捗のリセット">
+<floater name="queue" title="進行のリセット">
 	<floater.string name="Starting">
 		[COUNT] アイテムの [START] を開始します。
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index 90f4393bf7..bc4f48c995 100644
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="スクリプト検索">
-	<check_box label="大文字と小文字を区別しない" name="case_text" />
-	<button label="検索" label_selected="検索" name="search_btn" />
-	<button label="置換" label_selected="置換" name="replace_btn" />
-	<button label="すべて置換" label_selected="すべて置換" name="replace_all_btn" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script search" title="スクリプトの検索">
+	<check_box label="大文字と小文字を区別しない" name="case_text"/>
+	<button label="検索" label_selected="検索" name="search_btn"/>
+	<button label="置換" label_selected="置換" name="replace_btn"/>
+	<button label="すべて置換" label_selected="すべて置換" name="replace_all_btn"/>
 	<text name="txt">
 		検索
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
new file mode 100644
index 0000000000..9d65e84072
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_search" title="検索">
+	<floater.string name="loading_text">
+		ローディング...
+	</floater.string>
+	<floater.string name="done_text">
+		完了
+	</floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 96a9a76a72..951499d0e3 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,70 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater height="496" min_height="496" name="sell land" title="土地を販売">
+<floater height="496" min_height="496" name="sell land" title="土地の販売">
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text name="info_parcel_label">
 				区画：
 			</text>
 			<text name="info_parcel">
-				区画名
+				PARCEL NAME
 			</text>
 			<text name="info_size_label">
 				サイズ：
 			</text>
 			<text name="info_size">
-				[AREA]平方メートル
+				[AREA] 平方メートル
 			</text>
 			<text bottom_delta="-57" name="info_action">
-				この区画を販売す
-るには:
+				この区画を販売：
 			</text>
-			<icon bottom_delta="-86" name="step_price"/>
 			<text name="price_label">
-				価格を設定：
+				1. 価格の設定：
 			</text>
 			<text name="price_text">
-				適正価格を選んでください。
+				適正価格を設定してください。
 			</text>
 			<text name="price_ld">
 				L$
 			</text>
+			<line_editor name="price">
+				0
+			</line_editor>
 			<text left_delta="106" name="price_per_m" width="230">
-				（1平方メートル当たりL$ [PER_METER]）
+				（1平方メートルあたり L$[PER_METER]）
 			</text>
 			<text name="sell_to_label">
-				土地の販売先：
+				2. 特定の人に販売：
 			</text>
 			<text name="sell_to_text" right="-6">
-				誰にでも販売するか、特定の人にのみ販売するかを選択してください
+				販売先の指定なしか、特定の人に販売するか選択してください。
 			</text>
 			<combo_box name="sell_to">
-				<combo_box.item label="1つ選択－－" name="--selectone--"/>
-				<combo_box.item label="誰でも" name="Anyone"/>
+				<combo_box.item label="-- 1つ選択 --" name="--selectone--"/>
+				<combo_box.item label="指定なし・誰にでも販売" name="Anyone"/>
 				<combo_box.item label="特定の人：" name="Specificuser:"/>
 			</combo_box>
-			<button label="選択..." name="sell_to_select_agent"/>
+			<button label="選択" name="sell_to_select_agent"/>
 			<text name="sell_objects_label">
-				土地と共にオブジェクトを販売しますか？
+				3. オブジェクトも土地と一緒に販売しますか？
 			</text>
 			<text name="sell_objects_text">
-				区画上にある譲渡可能なオブジェクトは所有権が変更されます
+				区画上にある、土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。
 			</text>
 			<radio_group bottom_delta="-76" height="72" name="sell_objects">
-				<radio_item name="no">
-					いいえ、オブジェクト所有権
-を保持します
-				</radio_item>
-				<radio_item bottom="-56" name="yes">
-					はい、土地と一緒にオブジェ
-クトを売ります
-				</radio_item>
+				<radio_item label="いいえ、オブジェクトの所有権を保持します" name="no"/>
+				<radio_item bottom="-56" label="はい、オブジェクトと土地を一緒に販売します" name="yes"/>
 			</radio_group>
 			<button label="オブジェクトを表示" name="show_objects" width="138"/>
 			<text name="nag_message_label">
-				注意：返品や交換はできません
+				注意： 返品・交換はできません。
 			</text>
-			<button bottom="-489" label="販売を決定" name="sell_btn"/>
-			<button label="取り消し" name="cancel_btn"/>
+			<button bottom="-489" label="土地を販売" name="sell_btn"/>
+			<button label="キャンセル" name="cancel_btn"/>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index fb9f7be7a9..22f21b0b16 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="プレビュー">
+<floater name="Snapshot" title="スナップショットのプレビュー">
 	<text name="type_label">
 		スナップショットの送り先
 	</text>
 	<radio_group label="スナップショット・タイプ" name="snapshot_type_radio">
-		<radio_item name="postcard" label="Eメールで送信" />
-		<radio_item name="texture" label="持ち物に保存（L$[AMOUNT]）" />
-		<radio_item name="local" label="ハードディスクに保存" />
+		<radio_item label="Eメールで送信" name="postcard"/>
+		<radio_item label="持ち物に保存（L$[AMOUNT]）" name="texture"/>
+		<radio_item label="ハードディスクに保存" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
 		ファイル・サイズ： [SIZE] KB
@@ -15,12 +15,12 @@
 	<button label="送信" name="send_btn"/>
 	<button label="保存（L$[AMOUNT]）" name="upload_btn"/>
 	<flyout_button label="保存" name="save_btn" tool_tip="画像をファイルに保存">
-    <flyout_button.item name="save_item" label="保存"/>
-    <flyout_button.item name="saveas_item" label="名前を付けて保存"/>
+		<flyout_button.item label="保存" name="save_item"/>
+		<flyout_button.item label="名前を付けて保存" name="saveas_item"/>
 	</flyout_button>
 	<button label="キャンセル" name="discard_btn"/>
-	<button label="全表示 &gt;&gt;" name="more_btn" tool_tip="高度なオプション"/>
-	<button label="&lt;&lt; 簡易" name="less_btn" tool_tip="高度なオプション"/>
+	<button label="全表示 &gt;&gt;" name="more_btn" tool_tip="詳しい設定"/>
+	<button label="&lt;&lt; 簡易" name="less_btn" tool_tip="詳しい設定"/>
 	<text name="type_label2">
 		サイズ
 	</text>
@@ -28,45 +28,45 @@
 		形式
 	</text>
 	<combo_box label="解像度" name="postcard_size_combo">
-		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
-		<combo_box.item name="640x480" label="640x480" />
-		<combo_box.item name="800x600" label="800x600" />
-		<combo_box.item name="1024x768" label="1024x768" />
-		<combo_box.item name="Custom" label="カスタム" />
+		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
-		<combo_box.item name="Small(128x128)" label="小（128x128）" />
-		<combo_box.item name="Medium(256x256)" label="中（256x256）" />
-		<combo_box.item name="Large(512x512)" label="大（512x512）" />
-		<combo_box.item name="Custom" label="カスタム" />
+		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
+		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
+		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
+		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<combo_box label="解像度" name="local_size_combo">
-		<combo_box.item name="CurrentWindow" label="現在のｳｨﾝﾄﾞｳ" />
-		<combo_box.item name="320x240" label="320x240" />
-		<combo_box.item name="640x480" label="640x480" />
-		<combo_box.item name="800x600" label="800x600" />
-		<combo_box.item name="1024x768" label="1024x768" />
-		<combo_box.item name="1280x1024" label="1280x1024" />
-		<combo_box.item name="1600x1200" label="1600x1200" />
-		<combo_box.item name="Custom" label="カスタム" />
+		<combo_box.item label="現在のｳｨﾝﾄﾞｳ" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<combo_box label="形式" name="local_format_combo">
-		<combo_box.item name="PNG" label="PNG" />
-		<combo_box.item name="JPEG" label="JPEG" />
-		<combo_box.item name="BMP" label="BMP" />
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
 	</combo_box>
-	<spinner label="幅" name="snapshot_width" label_width="25" width="90"/>
-	<spinner label="高さ" name="snapshot_height" label_width="30" left="115" width="90"/>
+	<spinner label="幅" label_width="25" name="snapshot_width" width="90"/>
+	<spinner label="高さ" label_width="30" left="115" name="snapshot_height" width="90"/>
 	<check_box label="縦横比の固定" name="keep_aspect_check"/>
 	<slider label="画質" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		ｷｬﾌﾟﾁｬ：
 	</text>
 	<combo_box label="画像レイヤー" name="layer_types">
-		<combo_box.item name="Colors" label="色" />
-		<combo_box.item name="Depth" label="深さ" />
-		<combo_box.item name="ObjectMattes" label="オグジェクトのつや消し" />
+		<combo_box.item label="色" name="Colors"/>
+		<combo_box.item label="深さ" name="Depth"/>
+		<combo_box.item label="オグジェクトのつや消し" name="ObjectMattes"/>
 	</combo_box>
 	<check_box label="インタフェースを表示" name="ui_check"/>
 	<check_box label="HUD オブジェクトを表示" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index d5109fe539..a24ba6e075 100644
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/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="SOUND.WAV">
 	<text name="name_label">
 		名前：
@@ -6,15 +6,15 @@
 	<text name="description_label">
 		説明：
 	</text>
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn" />
+	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
 	<button label="アップロード　（L$[AMOUNT]）" label_selected="アップロード　（L$[AMOUNT]）" name="ok_btn"/>
 	<text name="text">
 		ﾋﾞｯﾄﾚｰﾄ(kbps)：
 	</text>
 	<radio_group name="bitrate">
-		<radio_item name="32" label="32" />
-		<radio_item name="64" label="64" />
-		<radio_item name="96" label="96" />
-		<radio_item name="128" label="128" />
+		<radio_item label="32" name="32"/>
+		<radio_item label="64" name="64"/>
+		<radio_item label="96" name="96"/>
+		<radio_item label="128" name="128"/>
 	</radio_group>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 2a45d8556b..97927776c7 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Statistics" title="統計バー">
+<floater name="Statistics" title="統計">
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
 			<stat_view label="ベーシック" name="basic">
 				<stat_bar label="FPS" name="fps"/>
 				<stat_bar label="帯域幅" name="bandwidth"/>
 				<stat_bar label="パケットロス" name="packet_loss"/>
-				<stat_bar label="シムの Ping" name="ping"/>
+				<stat_bar label="Pingシム" name="ping"/>
 			</stat_view>
-			<stat_view label="詳細" name="advanced">
-				<stat_view label="レンダリング" name="render">
-					<stat_bar label="KTris の描画" name="ktrisframe"/>
-					<stat_bar label="KTris の描画" name="ktrissec"/>
+			<stat_view label="アドバンス" name="advanced">
+				<stat_view label="描画" name="render">
+					<stat_bar label="KTris 描画" name="ktrisframe"/>
+					<stat_bar label="KTris 描画" name="ktrissec"/>
 					<stat_bar label="オブジェクト合計" name="objs"/>
-					<stat_bar label="新しいオブジェクト" name="newobjs"/>
+					<stat_bar label="新規オブジェクト" name="newobjs"/>
 				</stat_view>
 				<stat_view label="テクスチャ" name="texture">
 					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="未処理のカウント" name="numrawimagesstat"/>
+					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
 					<stat_bar label="GL メモリ" name="gltexmemstat"/>
 					<stat_bar label="フォーマット済メモリ" name="formattedmemstat"/>
-					<stat_bar label="未処理のメモリ" name="rawmemstat"/>
+					<stat_bar label="Raw メモリ" name="rawmemstat"/>
 					<stat_bar label="統合メモリ" name="glboundmemstat"/>
 				</stat_view>
 				<stat_view label="ネットワーク" name="network">
@@ -38,24 +38,24 @@
 			<stat_view label="シミュレーター" name="sim">
 				<stat_bar label="時間の遅れ" name="simtimedilation"/>
 				<stat_bar label="シム FPS" name="simfps"/>
-				<stat_bar label="物理的作用 FPS" name="simphysicsfps"/>
-				<stat_view label="物理的作用の詳細" name="physicsdetail">
+				<stat_bar label="物理作用 FPS" name="simphysicsfps"/>
+				<stat_view label="物理作用の詳細" name="physicsdetail">
 					<stat_bar label="ピン留めオブジェクト" name="physicspinnedtasks"/>
 					<stat_bar label="低 LOD オブジェクト" name="physicslodtasks"/>
 					<stat_bar label="メモリ配分" name="physicsmemoryallocated"/>
-					<stat_bar label="エージェントの更新/秒" name="simagentups"/>
-					<stat_bar label="メインエージェント" name="simmainagents"/>
-					<stat_bar label="チャイルドエージェント" name="simchildagents"/>
-					<stat_bar label="オブジェクト" name="simobjects"/>
-					<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
-					<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
-					<stat_bar label="スクリプトイベント" name="simscripteps"/>
-					<stat_bar label="パケットイン" name="siminpps"/>
-					<stat_bar label="パケットアウト" name="simoutpps"/>
-					<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
-					<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
-					<stat_bar label="未送信バイト合計" name="simtotalunackedbytes"/>
 				</stat_view>
+				<stat_bar label="エージェントの更新/秒" name="simagentups"/>
+				<stat_bar label="メインエージェント" name="simmainagents"/>
+				<stat_bar label="チャイルドエージェント" name="simchildagents"/>
+				<stat_bar label="オブジェクト" name="simobjects"/>
+				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
+				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
+				<stat_bar label="スクリプトイベント" name="simscripteps"/>
+				<stat_bar label="パケットイン" name="siminpps"/>
+				<stat_bar label="パケットアウト" name="simoutpps"/>
+				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
+				<stat_bar label="保留中のアップロード" name="simpendinguploads"/>
+				<stat_bar label="未送信バイト合計" name="simtotalunackedbytes"/>
 				<stat_view label="時間（ms）" name="simperf">
 					<stat_bar label="フレーム時間合計" name="simframemsec"/>
 					<stat_bar label="総時間数" name="simnetmsec"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
new file mode 100644
index 0000000000..91e29fd595
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notification_chiclet" title="通知"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index cd590abe3c..fea497b622 100644
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.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="telehub" title="テレハブ">
 	<text name="status_text_connected">
 		物体[OBJECT]に接続されたテレハブ
@@ -12,13 +12,13 @@
 	<text name="help_text_not_connected">
 		物体を選択し「テレハブの接続」をクリックする
 	</text>
-	<button label="テレハブの接続" name="connect_btn" />
-	<button label="切断" name="disconnect_btn" />
+	<button label="テレハブの接続" name="connect_btn"/>
+	<button label="切断" name="disconnect_btn"/>
 	<text name="spawn_points_text">
 		出現地点（物体ではなく位置）
 	</text>
-	<button label="出現位置を追加" name="add_spawn_point_btn" />
-	<button label="出現地点を削除" name="remove_spawn_point_btn" />
+	<button label="出現位置を追加" name="add_spawn_point_btn"/>
+	<button label="出現地点を削除" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
 		物体を選択し「追加」をクリックし位置を指定。
 物体を移動または削除できる。
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 5102116069..c93f315628 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="texture picker" title="選択：テクスチャー">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="選択： テクスチャ">
 	<string name="choose_picture">
 		クリックして写真を選択
 	</string>
 	<text name="Multiple">
-		複数
+		複数のテクスチャ
 	</text>
 	<text name="unknown">
-		寸法: [DIMENSIONS]
+		サイズ： [DIMENSIONS]
 	</text>
-	<button label="ﾃﾞﾌｫﾙﾄ" label_selected="ﾃﾞﾌｫﾙﾄ" name="Default" />
-	<button label="なし" label_selected="なし" name="None" />
-	<button label="ブランク" label_selected="ブランク" name="Blank" />
-	<check_box label="フォルダを表示" name="show_folders_check" />
-	<search_editor label="ここにタイプして検索" name="inventory search editor" />
-	<check_box label="ただちに適用" name="apply_immediate_check" />
-	<button label="" label_selected="" name="Pipette" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
-	<button label="選択" label_selected="選択" name="Select" />
+	<button label="ﾃﾞﾌｫﾙﾄ" label_selected="ﾃﾞﾌｫﾙﾄ" name="Default"/>
+	<button label="なし" label_selected="なし" name="None"/>
+	<button label="ブランク" label_selected="ブランク" name="Blank"/>
+	<check_box label="フォルダを表示" name="show_folders_check"/>
+	<search_editor label="テクスチャをフィルター" name="inventory search editor"/>
+	<check_box label="今すぐ適用" name="apply_immediate_check"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<button label="Ok" label_selected="Ok" name="Select"/>
 	<text name="pick title">
 		ピック:
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 5ce2c291be..cbb062dea3 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -13,10 +13,10 @@
 		土地をクリックし、ボタンを押したまま入力して修正変更
 	</floater.string>
 	<floater.string name="status_camera">
-		クリック・ドラッグで視界を移動
+		クリック・ドラッグで視界移動
 	</floater.string>
 	<floater.string name="status_grab">
-		移動：ﾄﾞﾗｯｸﾞ、持ち上げ：Ctrl、回転：Ctrl+Shift
+		ドラッグで移動、Ctrlで持ち上げ、Ctrl+Shiftで回転
 	</floater.string>
 	<floater.string name="status_place">
 		インワールドでクリックして作成
@@ -50,29 +50,32 @@
 	<radio_group name="focus_radio_group">
 		<radio_item label="ズーム" name="radio zoom"/>
 		<radio_item label="軌跡（Ctrl）" name="radio orbit"/>
-		<radio_item label="パン（Ctrl+Shift）" name="radio pan"/>
+		<radio_item label="水平・垂直移動 (Ctrl+Shift)" name="radio pan"/>
 	</radio_group>
 	<radio_group name="move_radio_group">
 		<radio_item label="移動" name="radio move"/>
 		<radio_item label="持ち上げる（Ctrl）" name="radio lift"/>
-		<radio_item label="スピン（Ctrl+Shift）" name="radio spin"/>
+		<radio_item label="回転 (Ctrl+Shift)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
 		<radio_item label="移動" name="radio position"/>
 		<radio_item label="回転（Ctrl）" name="radio rotate"/>
-		<radio_item label="引伸ばす（Ctrl+Shift）" name="radio stretch"/>
-		<radio_item label="テクスチャーを選択" name="radio select face"/>
+		<radio_item label="引き延ばす (Ctrl+Shift)" name="radio stretch"/>
+		<radio_item label="面を選択" name="radio select face"/>
 	</radio_group>
 	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
+	<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
+		þ: [COUNT]
+	</text>
 	<check_box label="両側を引伸ばす" left="116" name="checkbox uniform"/>
 	<check_box initial_value="true" label="テクスチャーを引伸ばす" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="グリッドポイントにスナップ" left_delta="27" name="checkbox snap to grid"/>
-	<combo_box left_delta="60" name="combobox grid mode" width="76">
-		<combo_box.item label="ワールドルーラ" name="World"/>
-		<combo_box.item label="ローカルルーラ" name="Local"/>
-		<combo_box.item label="レファレンスルーラ" name="Reference"/>
+	<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択" width="76">
+		<combo_box.item label="ワールドグリッド" name="World"/>
+		<combo_box.item label="ローカルグリッド" name="Local"/>
+		<combo_box.item label="リファレンスグリッド" name="Reference"/>
 	</combo_box>
-	<button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを設定"/>
+	<button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションをもっと見る"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
@@ -88,10 +91,10 @@
 	<button label="" label_selected="" name="ToolRing" tool_tip="リング"/>
 	<button label="" label_selected="" name="ToolTree" tool_tip="樹木"/>
 	<button label="" label_selected="" name="ToolGrass" tool_tip="草地"/>
-	<check_box label="選択したものを保持" name="checkbox sticky"/>
+	<check_box label="選択したツールを維持" name="checkbox sticky"/>
 	<check_box label="選択したものをコピー" name="checkbox copy selection"/>
-	<check_box initial_value="true" label="中央にコピー" name="checkbox copy centers"/>
-	<check_box label="回転させてコピー" name="checkbox copy rotates"/>
+	<check_box initial_value="true" label="中央に位置" name="checkbox copy centers"/>
+	<check_box label="回転" name="checkbox copy rotates"/>
 	<radio_group name="land_radio_group">
 		<radio_item label="土地を選択" name="radio select land"/>
 		<radio_item label="ならす" name="radio flatten"/>
@@ -126,16 +129,16 @@
 				譲渡
 			</panel.string>
 			<panel.string name="text modify info 1">
-				このオブジェクトは修正できます。
+				このオブジェクトを修正できます
 			</panel.string>
 			<panel.string name="text modify info 2">
-				これらのオブジェクトは修正できます。
+				これらのオブジェクトを修正できます
 			</panel.string>
 			<panel.string name="text modify info 3">
-				このオブジェクトは修正できません。
+				このオブジェクトを修正できません
 			</panel.string>
 			<panel.string name="text modify info 4">
-				これらのオブジェクトは修正できません。
+				これらのオブジェクトを修正できません
 			</panel.string>
 			<panel.string name="text modify warning">
 				オブジェクト全体を選択して権限の設定を行ってください。
@@ -144,10 +147,10 @@
 				価格： L$
 			</panel.string>
 			<panel.string name="Cost Total">
-				合計価格： L$
+				合計： L$
 			</panel.string>
 			<panel.string name="Cost Per Unit">
-				単価： L$
+				Price Per: L$
 			</panel.string>
 			<panel.string name="Cost Mixed">
 				混合価格
@@ -165,32 +168,33 @@
 				クリエーター
 			</text>
 			<text name="Creator Name">
-				Thrax Linden
+				Esbee Linden
 			</text>
 			<text name="Owner:">
 				オーナー：
 			</text>
 			<text name="Owner Name">
-				Thrax Linden
+				Erica Linden
 			</text>
 			<text name="Group:">
 				グループ：
 			</text>
 			<button label="設定..." label_selected="設定..." name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択"/>
 			<name_box initial_value="ローディング..." name="Group Name Proxy"/>
-			<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると次の所有者の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
-			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 役割制限を有効にするには、譲渡する必要があります。"/>
+			<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
+			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
 			<text name="label click action">
 				クリックで：
 			</text>
 			<combo_box name="clickaction">
-				<combo_box.item label="触れる（デフォルト）" name="Touch/grab(default)"/>
+				<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
 				<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
 				<combo_box.item label="オブジェクトを購入" name="Buyobject"/>
 				<combo_box.item label="オブジェクトへの支払い" name="Payobject"/>
 				<combo_box.item label="開く" name="Open"/>
+				<combo_box.item label="ズーム" name="Zoom"/>
 			</combo_box>
-			<check_box label="販売中：" name="checkbox for sale"/>
+			<check_box label="販売対象：" name="checkbox for sale"/>
 			<combo_box name="sale type">
 				<combo_box.item label="コピー" name="Copy"/>
 				<combo_box.item label="コンテンツ" name="Contents"/>
@@ -200,11 +204,12 @@
 			<check_box label="検索に表示" name="search_check" tool_tip="検索結果で、このオブジェクトを人に見せる"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
-					このオブジェクトを修正できます
+					あなたはこのオブジェクトを修正できます
 				</text>
 				<text name="Anyone can:">
 					全員：
 				</text>
+				<check_box label="移動" name="checkbox allow everyone move"/>
 				<check_box label="コピー" name="checkbox allow everyone copy"/>
 				<text name="Next owner can:">
 					次の所有者：
@@ -235,7 +240,7 @@
 		<panel label="形状" name="Object">
 			<check_box label="ロック済み" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、構築中に意図しない編集を防ぐことができます。"/>
 			<check_box label="物理" name="Physical Checkbox Ctrl" tool_tip="オブジェクトに対する重力の作用と影響を有効にする"/>
-			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="作成1分後にオブジェクトを削除"/>
+			<check_box label="臨時" name="Temporary Checkbox Ctrl" tool_tip="制作後 1 分でオブジェクトは削除されます"/>
 			<check_box label="ファントム" name="Phantom Checkbox Ctrl" tool_tip="オブジェクト同士の衝突またはオブジェクトとアバターの衝突を回避"/>
 			<text name="label position">
 				位置（メートル）
@@ -275,7 +280,7 @@
 				<combo_box.item label="ゴム" name="Rubber"/>
 			</combo_box>
 			<text name="text cut">
-				パスカット（始点/終点）
+				パスカット (始点/終点)
 			</text>
 			<spinner label="B" name="cut begin"/>
 			<spinner label="E" name="cut end"/>
@@ -295,7 +300,7 @@
 				<combo_box.item label="三角形" name="Triangle"/>
 			</combo_box>
 			<text name="text twist">
-				ひねり（始点/終点）
+				ひねり (始点/終点)
 			</text>
 			<spinner label="B" name="Twist Begin"/>
 			<spinner label="E" name="Twist End"/>
@@ -313,13 +318,13 @@
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
-				プロフィール・カット（始点/終点）
+				プロフィールカット (始点/終点)
 			</text>
 			<text name="advanced_dimple">
-				くぼみ（始点/終点）
+				くぼみ (始点/終点)
 			</text>
 			<text name="advanced_slice">
-				切り取り（始点/終点）
+				切り取り (始点/終点)
 			</text>
 			<spinner label="B" name="Path Limit Begin"/>
 			<spinner label="E" name="Path Limit End"/>
@@ -335,8 +340,8 @@
 				回転体
 			</text>
 			<texture_picker label="スカルプトテクスチャー" name="sculpt texture control" tool_tip="クリックして写真を選択してください。"/>
-			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトされたプリムをX軸上で反転"/>
-			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトされたプリムのノーマルを逆転させ、裏返しに表示"/>
+			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムを X 軸上で反転させる"/>
+			<check_box label="裏返し" name="sculpt invert control" tool_tip="スカルプトプリムを反転させて裏返す"/>
 			<text name="label sculpt type">
 				縫い目のタイプ
 			</text>
@@ -355,7 +360,7 @@
 			<text name="edit_object">
 				オブジェクトの特徴を編集：
 			</text>
-			<check_box label="フレキシブル・パス" name="Flexible1D Checkbox Ctrl" tool_tip="Z軸を中心とするオブジェクトの折れ曲がりを有効にする （クライアント側のみ）"/>
+			<check_box label="フレキシブル・パス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にする（クライアント側のみ）"/>
 			<spinner label="柔軟性" label_width="72" name="FlexNumSections" width="135"/>
 			<spinner label="重力" label_width="72" name="FlexGravity" width="135"/>
 			<spinner label="ドラッグ" label_width="72" name="FlexFriction" width="135"/>
@@ -365,10 +370,14 @@
 			<spinner label="Y軸方向の力" label_width="72" name="FlexForceY" width="135"/>
 			<spinner label="Z軸方向の力" label_width="72" name="FlexForceZ" width="135"/>
 			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光"/>
-			<color_swatch label="" left_delta="74" name="colorswatch" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="" left_delta="74" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択（遅延レンダリング有効時のみ）"/>
 			<spinner label="輝度" label_width="72" name="Light Intensity" width="135"/>
+			<spinner label="FOV" name="Light FOV"/>
 			<spinner label="半径" label_width="72" name="Light Radius" width="135"/>
+			<spinner label="焦点" name="Light Focus"/>
 			<spinner label="弱まる" label_width="72" name="Light Falloff" width="135"/>
+			<spinner label="環境" name="Light Ambiance"/>
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
@@ -378,7 +387,7 @@
 				面ごとに繰り返す
 			</panel.string>
 			<texture_picker label="テクスチャー" name="texture control" tool_tip="写真をクリックして選択"/>
-			<color_swatch label="色" name="colorswatch" tool_tip="カラー・ピッカーをクリックして開く"/>
+			<color_swatch label="色" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<text name="color trans">
 				透過度 %
 			</text>
@@ -426,21 +435,32 @@
 				<combo_box.item label="織目" name="weave"/>
 			</combo_box>
 			<text name="tex scale">
-				面ごとに繰り返す
+				反復 / 面
 			</text>
 			<spinner label="水平（U）" name="TexScaleU"/>
 			<check_box label="反転" name="checkbox flip s"/>
 			<spinner label="垂直（V）" name="TexScaleV"/>
 			<check_box label="反転" name="checkbox flip t"/>
+			<spinner label="回転˚" name="TexRot"/>
+			<spinner label="反復 / メーター" name="rptctrl"/>
 			<button label="適用" label_selected="適用" name="button apply"/>
 			<text name="tex offset">
-				Texture Offset
+				テクスチャのズレ
 			</text>
 			<spinner label="水平（U）" name="TexOffsetU"/>
 			<spinner label="垂直（V）" name="TexOffsetV"/>
+			<panel name="Add_Media">
+				<text name="media_tex">
+					メディア URL
+				</text>
+				<button name="add_media" tool_tip="メディアを追加"/>
+				<button name="delete_media" tool_tip="このメディアテクスチャを削除"/>
+				<button name="edit_media" tool_tip="このメディアを編集"/>
+				<button label="揃える" label_selected="メディアを一列に揃える" name="button align"/>
+			</panel>
 		</panel>
 		<panel label="中身" name="Contents">
-			<button label="新しいスクリプト" label_selected="新しいスクリプト" name="button new script" width="120"/>
+			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script" width="120"/>
 			<button label="権限" left_delta="130" name="button permissions" width="80"/>
 		</panel>
 	</tab_container>
@@ -449,13 +469,13 @@
 			区画情報
 		</text>
 		<text name="label_area_price" width="200">
-			価格：[AREA]平方メートルあたりL$[PRICE]
+			価格： [AREA] 平方メートル L$ [PRICE]
 		</text>
 		<text name="label_area" width="200">
-			面積：[AREA]平方メートル
+			面積： [AREA] 平方メートル
 		</text>
-		<button label="土地情報..." label_selected="土地情報..." name="button about land"/>
-		<check_box label="オーナーを表示" name="checkbox show owners" tool_tip="所有権別に区画を色分けします： 
+		<button label="土地情報" label_selected="土地情報" name="button about land"/>
+		<check_box label="オーナーを表示" name="checkbox show owners" tool_tip="所有者の種類別に区画を色づけ： 
 
 緑 = あなたの土地 
 アクア = あなたのグループ所有地 
@@ -467,11 +487,11 @@
 			区画の編集
 		</text>
 		<button label="再分割" label_selected="再分割" name="button subdivide land"/>
-		<button label="統合する" label_selected="統合する" name="button join land"/>
+		<button label="統合" label_selected="統合" name="button join land"/>
 		<text name="label_parcel_trans">
 			土地取引
 		</text>
-		<button label="土地を購入" label_selected="土地を購入" name="button buy land"/>
-		<button label="土地を放棄" label_selected="土地を放棄" name="button abandon land"/>
+		<button label="土地の購入" label_selected="土地の購入" name="button buy land"/>
+		<button label="土地の放棄" label_selected="土地の放棄" name="button abandon land"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index e59f72bf30..e5d1fc5f03 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="ロード中．．．">
+<floater name="top_objects" title="ローディング...">
 	<text name="title_text">
 		ロード中．．．
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index c0d1af1d6a..85ac102885 100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -1,18 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title=" ">
-	<button label="続行" label_selected="続行" name="Continue" />
-	<button label="取り消し" label_selected="取り消し" name="Cancel" />
+	<button label="続行" label_selected="続行" name="Continue"/>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
 	<radio_group name="tos_agreement">
-		<radio_item name="radio_disagree" label="利用規約に同意しません" />
-		<radio_item name="radio_agree" label="利用規約に同意します" />
+		<radio_item label="利用規約に同意しません" name="radio_disagree"/>
+		<radio_item label="利用規約に同意します" name="radio_agree"/>
 	</radio_group>
 	<text name="tos_title">
 		利用規約
 	</text>
-	<check_box label="利用規約に同意します" name="agree_chk" />
+	<check_box label="利用規約に同意します" name="agree_chk"/>
 	<text name="tos_heading">
-		以下の利用規約を注意深くお読みください。 SecondLifeへログインするには、
-規約に同意しなければなりません。
+		次の利用規約をよくお読みください。 [SECOND_LIFE] へのログインを続けるには、規約に同意する必要があります。
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
new file mode 100644
index 0000000000..5d52144265
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_controls" title="ボイスコントロール">
+	<panel name="control_panel">
+		<panel name="my_panel">
+			<text name="user_text" value="Mya Avatar:"/>
+		</panel>
+		<layout_stack>
+			<layout_panel>
+				<slider_bar name="volume_slider_bar" tool_tip="音量"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
index 054b003197..52cd91a08a 100644
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ b/indra/newview/skins/default/xui/ja/floater_water.xml
@@ -1,66 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="水の高度な編集">
+	<floater.string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</floater.string>
 	<text name="KeyFramePresetsText">
 		水の事前設定：
 	</text>
-	<button label="新規" label_selected="新規" name="WaterNewPreset" />
-	<button label="保存" label_selected="保存" name="WaterSavePreset" />
-	<button label="削除" label_selected="削除" name="WaterDeletePreset" />
+	<button label="新規" label_selected="新規" name="WaterNewPreset"/>
+	<button label="保存" label_selected="保存" name="WaterSavePreset"/>
+	<button label="削除" label_selected="削除" name="WaterDeletePreset"/>
 	<tab_container name="Water Tabs">
 		<panel label="設定" name="Settings">
 			<text name="BHText">
 				水中のフォグ効果の色
 			</text>
-			<button label="?" name="WaterFogColorHelp" />
-			<color_swatch name="WaterFogColor"
-			     tool_tip="カラー・ピッカーをクリックして開く" />
+			<color_swatch name="WaterFogColor" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<text name="WaterFogDensText">
 				水中の透明度指数
 			</text>
-			<button label="?" name="WaterFogDensityHelp" />
 			<text name="WaterUnderWaterFogModText">
 				水中のフォグ効果加減
 			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp" />
 			<text name="BDensText">
 				さざ波の反射スケール
 			</text>
-			<button label="?" name="WaterNormalScaleHelp" />
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
+			<slider label="1" name="WaterNormalScaleX"/>
+			<slider label="2" name="WaterNormalScaleY"/>
+			<slider label="3" name="WaterNormalScaleZ"/>
 			<text name="HDText">
 				フレネル・スケール
 			</text>
-			<button label="?" name="WaterFresnelScaleHelp" />
 			<text name="FresnelOffsetText">
 				フレネル・オフセット
 			</text>
-			<button label="?" name="WaterFresnelOffsetHelp" />
 			<text name="DensMultText">
 				水面の屈折スケール
 			</text>
-			<button label="?" name="WaterScaleAboveHelp" />
 			<text name="WaterScaleBelowText">
 				水中の屈折スケール
 			</text>
-			<button label="?" name="WaterScaleBelowHelp" />
 			<text name="MaxAltText">
 				不透明度の増幅
 			</text>
-			<button label="?" name="WaterBlurMultiplierHelp" />
 		</panel>
 		<panel label="画像" name="Waves">
 			<text name="BHText">
 				大波の方向
 			</text>
-			<button label="?" name="WaterWave1Help" />
 			<text name="WaterWave1DirXText">
 				X
 			</text>
@@ -70,7 +56,6 @@
 			<text name="BHText2">
 				小波の方向
 			</text>
-			<button label="?" name="WaterWave2Help" />
 			<text name="WaterWave2DirXText">
 				X
 			</text>
@@ -80,10 +65,6 @@
 			<text name="BHText3">
 				ノーマル・マップ
 			</text>
-			<button label="?" name="WaterNormalMapHelp" />
 		</panel>
 	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
new file mode 100644
index 0000000000..b518d87477
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="whitelist_entry">
+	<text name="media_label">
+		URL か URL パターンを入力して、許可するドメインをリストに追加します。
+	</text>
+	<line_editor name="whitelist_entry" tool_tip="URL か URL パターンをホワイトリストに入力します"/>
+	<button label="OK" name="ok_btn"/>
+	<button label="キャンセル" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
index fa70de054f..feb94ef73e 100644
--- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="空の高度な編集">
 	<text name="KeyFramePresetsText">
 		空の事前設定：
 	</text>
-	<button label="新規" label_selected="新規" name="WLNewPreset" />
-	<button label="保存" label_selected="保存" name="WLSavePreset" />
-	<button label="削除" label_selected="削除" name="WLDeletePreset" />
-	<button label="デイサイクル編集"
-	     label_selected="デイサイクル編集" name="WLDayCycleMenuButton" />
+	<button label="新規" label_selected="新規" name="WLNewPreset"/>
+	<button label="保存" label_selected="保存" name="WLSavePreset"/>
+	<button label="削除" label_selected="削除" name="WLDeletePreset"/>
+	<button label="デイサイクル編集" label_selected="デイサイクル編集" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
 		<panel label="大気" name="Atmosphere">
 			<text name="BHText">
 				空の配色
 			</text>
-			<button label="?" name="WLBlueHorizonHelp" />
+			<button label="?" name="WLBlueHorizonHelp"/>
 			<text name="BHText2">
 				R
 			</text>
@@ -29,11 +28,11 @@
 			<text name="BDensText">
 				空と遠景の露光
 			</text>
-			<button label="?" name="WLHazeHorizonHelp" />
+			<button label="?" name="WLHazeHorizonHelp"/>
 			<text name="BDensText2">
 				空の配色と濃度
 			</text>
-			<button label="?" name="WLBlueDensityHelp" />
+			<button label="?" name="WLBlueDensityHelp"/>
 			<text name="BHText6">
 				R
 			</text>
@@ -49,25 +48,25 @@
 			<text name="HDText">
 				大気の不透明度
 			</text>
-			<button label="?" name="WLHazeDensityHelp" />
+			<button label="?" name="WLHazeDensityHelp"/>
 			<text name="DensMultText">
 				大気の不透明度の増幅
 			</text>
-			<button label="?" name="WLDensityMultHelp" />
+			<button label="?" name="WLDensityMultHelp"/>
 			<text name="WLDistanceMultText">
 				視界の増幅
 			</text>
-			<button label="?" name="WLDistanceMultHelp" />
+			<button label="?" name="WLDistanceMultHelp"/>
 			<text name="MaxAltText">
 				最大高度
 			</text>
-			<button label="?" name="WLMaxAltitudeHelp" />
+			<button label="?" name="WLMaxAltitudeHelp"/>
 		</panel>
 		<panel label="ライティング" name="Lighting">
 			<text name="SLCText">
 				太陽/月の色
 			</text>
-			<button label="?" name="WLSunlightColorHelp" />
+			<button label="?" name="WLSunlightColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -83,11 +82,11 @@
 			<text name="TODText">
 				太陽/月の位置
 			</text>
-			<button label="?" name="WLTimeOfDayHelp" />
+			<button label="?" name="WLTimeOfDayHelp"/>
 			<text name="WLAmbientText">
 				アンビエント
 			</text>
-			<button label="?" name="WLAmbientHelp" />
+			<button label="?" name="WLAmbientHelp"/>
 			<text name="BHText5">
 				R
 			</text>
@@ -103,27 +102,27 @@
 			<text name="WLEastAngleText">
 				東の角度
 			</text>
-			<button label="?" name="WLEastAngleHelp" />
+			<button label="?" name="WLEastAngleHelp"/>
 			<text name="SunGlowText">
 				太陽の輝き
 			</text>
-			<button label="?" name="WLSunGlowHelp" />
-			<slider label="フォーカス " name="WLGlowB" />
-			<slider label="サイズ    " name="WLGlowR" />
+			<button label="?" name="WLSunGlowHelp"/>
+			<slider label="フォーカス " name="WLGlowB"/>
+			<slider label="サイズ    " name="WLGlowR"/>
 			<text name="SceneGammaText">
 				風景ガンマ
 			</text>
-			<button label="?" name="WLSceneGammaHelp" />
+			<button label="?" name="WLSceneGammaHelp"/>
 			<text name="WLStarText">
 				星の輝き
 			</text>
-			<button label="?" name="WLStarBrightnessHelp" />
+			<button label="?" name="WLStarBrightnessHelp"/>
 		</panel>
 		<panel label="雲" name="Clouds">
 			<text name="WLCloudColorText">
 				雲の色
 			</text>
-			<button label="?" name="WLCloudColorHelp" />
+			<button label="?" name="WLCloudColorHelp"/>
 			<text name="BHText">
 				R
 			</text>
@@ -139,7 +138,7 @@
 			<text name="WLCloudColorText2">
 				雲の XY/密度
 			</text>
-			<button label="?" name="WLCloudDensityHelp" />
+			<button label="?" name="WLCloudDensityHelp"/>
 			<text name="BHText5">
 				X
 			</text>
@@ -152,15 +151,15 @@
 			<text name="WLCloudCoverageText">
 				雲の量
 			</text>
-			<button label="?" name="WLCloudCoverageHelp" />
+			<button label="?" name="WLCloudCoverageHelp"/>
 			<text name="WLCloudScaleText">
 				雲のスケール
 			</text>
-			<button label="?" name="WLCloudScaleHelp" />
+			<button label="?" name="WLCloudScaleHelp"/>
 			<text name="WLCloudDetailText">
 				雲の詳細 (XY/密度)
 			</text>
-			<button label="?" name="WLCloudDetailHelp" />
+			<button label="?" name="WLCloudDetailHelp"/>
 			<text name="BHText8">
 				X
 			</text>
@@ -173,15 +172,15 @@
 			<text name="WLCloudScrollXText">
 				雲の移動速度 (X 方向)
 			</text>
-			<button label="?" name="WLCloudScrollXHelp" />
-			<check_box label="ロック" name="WLCloudLockX" />
+			<button label="?" name="WLCloudScrollXHelp"/>
+			<check_box label="ロック" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
 				雲の移動速度 (Y 方向)
 			</text>
-			<button label="?" name="WLCloudScrollYHelp" />
-			<check_box label="ロック" name="WLCloudLockY" />
-			<check_box label="従来の雲を描画" name="DrawClassicClouds" />
-			<button label="?" name="WLClassicCloudsHelp" />
+			<button label="?" name="WLCloudScrollYHelp"/>
+			<check_box label="ロック" name="WLCloudLockY"/>
+			<check_box label="従来の雲を描画" name="DrawClassicClouds"/>
+			<button label="?" name="WLClassicCloudsHelp"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
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 6a34e49d84..370c95530a 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="世界地図">
-	<tab_container name="maptab">
-		<panel label="オブジェクト" name="objects_mapview"/>
-		<panel label="地形" name="terrain_mapview"/>
-	</tab_container>
 	<text name="you_label">
 		あなた
 	</text>
@@ -20,19 +16,19 @@
 	<button label="ホームへ" label_selected="ホームへ" name="Go Home" tool_tip="自分のホームにテレポート"/>
 	<check_box label="住人" name="people_chk"/>
 	<check_box label="インフォハブ" name="infohub_chk"/>
-	<check_box label="テレハブ" name="telehubchk"/>
+	<check_box label="テレハブ" name="telehub_chk"/>
 	<check_box label="売り地" name="land_for_sale_chk"/>
 	<text name="events_label">
 		イベント：
 	</text>
 	<check_box label="PG" name="event_chk"/>
-	<check_box label="Mature" name="event_mature_chk"/>
+	<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
 	<check_box label="Adult" name="event_adult_chk"/>
-	<combo_box label="オンラインのフレンド" name="friend combo" tool_tip="地図に表示されたフレンド">
-		<combo_box.item name="item1" label="オンラインのフレンド" />
+	<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 name="item1" label="ランドマーク" />
+	<combo_box label="ランドマーク" name="landmark combo" tool_tip="地図に表示するランドマーク">
+		<combo_box.item label="ランドマーク" name="item1"/>
 	</combo_box>
 	<line_editor label="地域名で検索" name="location" tool_tip="地域名を入力してください。"/>
 	<button label="検索" name="DoSearch" tool_tip="地域検索"/>
@@ -40,8 +36,8 @@
 		検索結果：
 	</text>
 	<scroll_list name="search_results">
-		<column label="" name="icon"/>
-		<column label="" name="sim_name"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="" name="sim_name"/>
 	</scroll_list>
 	<text name="location_label">
 		位置：
@@ -53,6 +49,6 @@
 	<button label="目的地を表示" label_selected="目的地を表示" name="Show Destination" tool_tip="選択したロケーションを地図の中心にする"/>
 	<button label="クリア" label_selected="クリア" name="Clear" tool_tip="トラッキングを停止"/>
 	<button label="現在地を表示" label_selected="現在地を表示" name="Show My Location" tool_tip="あなたのアバターのロケーションを地図の中心にする"/>
-	<button label="SLurlをクリップボードにコピー" name="copy_slurl" tool_tip="現在地をSLurlとしてコピーし、ウェブで使用"/>
+	<button label="SLurl をクリップボードにコピー" name="copy_slurl" tool_tip="現在地を SLurl としてコピーして、Webで使用します。"/>
 	<slider label="ズーム" name="zoom slider"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index e5b2a44521..df3f6d0cd0 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -8,9 +8,21 @@
 		[AGE]
 	</string>
 	<string name="Details">
-		[ACCTTYPE]、[PAYMENTINFO]
-プロフィール： [SL_PROFILE]
+		[SL_PROFILE]
 	</string>
+	<string name="Partner">
+		パートナー： [PARTNER]
+	</string>
+	<text name="user_name" value="Grumpity ProductEngine"/>
+	<text name="user_subtitle" value="11 Months, 3 days old"/>
+	<text name="user_details">
+		This is my second life description and I really think it is great.
+	</text>
+	<text name="user_partner">
+		Erica Linden
+	</text>
 	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-	<button label="フレンドを追加" name="add_friend_btn"/>
+	<button label="フレンド登録" name="add_friend_btn"/>
+	<button label="IM" name="im_btn"/>
+	<button label="詳細" name="view_profile_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
new file mode 100644
index 0000000000..b292d4b525
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_group">
+	<string name="PrivateGroup">
+		プライベートグループ
+	</string>
+	<string name="FreeToJoin">
+		参加費無料
+	</string>
+	<string name="CostToJoin">
+		参加費 L$[AMOUNT]
+	</string>
+	<string name="YouAreMember">
+		あなたはメンバーです
+	</string>
+	<text name="group_name">
+		Grumpity&apos;s Grumpy Group of Moose
+	</text>
+	<text name="group_subtitle">
+		123 メートル
+	</text>
+	<text name="group_details">
+		A group of folks charged with creating a room with a moose.
+Fear the moose!  Fear it!  And the mongoose too!
+	</text>
+	<text name="group_cost">
+		L$123 to join
+	</text>
+	<button label="参加" name="join_btn"/>
+	<button label="脱退" name="leave_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
new file mode 100644
index 0000000000..842030c39a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_object">
+	<string name="Creator">
+		制作者： [CREATOR]
+	</string>
+	<string name="CreatorAndOwner">
+		制作者： [CREATOR]
+所有者： [OWNER]
+	</string>
+	<string name="Price">
+		L$[AMOUNT]
+	</string>
+	<string name="PriceFree">
+		無料です！
+	</string>
+	<string name="Touch">
+		触る
+	</string>
+	<string name="Sit">
+		座る
+	</string>
+	<text name="object_name" value="Test Object Name That Is Really Long"/>
+	<text name="object_creator">
+		by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+	</text>
+	<text name="price_text">
+		L$300,000
+	</text>
+	<text name="object_description">
+		This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+	</text>
+	<text name="object_media_url">
+		http://www.superdupertest.com
+	</text>
+	<button label="買う" name="buy_btn"/>
+	<button label="支払う" name="pay_btn"/>
+	<button label="コピーを取る" name="take_free_copy_btn"/>
+	<button label="触る" name="touch_btn"/>
+	<button label="座る" name="sit_btn"/>
+	<button label="開く" name="open_btn"/>
+	<icon name="secure_browsing" tool_tip="安全な閲覧"/>
+	<button label="詳細" name="more_info_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
new file mode 100644
index 0000000000..483d3fec52
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
@@ -0,0 +1,25 @@
+<?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_name">
+		Test Object Name That Is Really Long
+	</text>
+	<text name="object_owner_label">
+		所有者：
+	</text>
+	<text name="object_owner">
+		Longavatarname Johnsonlongstonnammer
+	</text>
+	<text name="object_slurl_label">
+		位置：
+	</text>
+	<text name="object_slurl">
+		http://slurl.com/Ahern/50/50/50
+	</text>
+	<button label="地図" name="map_btn"/>
+	<button label="ブロック" name="block_btn"/>
+	<button label="閉じる" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
new file mode 100644
index 0000000000..3ca2de247e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="ジェスチャーボタン" name="ShowGestureButton"/>
+	<menu_item_check label="移動ボタン" name="ShowMoveButton"/>
+	<menu_item_check label="視界ボタン" name="ShowCameraButton"/>
+	<menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
new file mode 100644
index 0000000000..abf490a247
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gesture_gear">
+	<menu_item_call label="お気に入りからの追加・削除" name="activate"/>
+	<menu_item_call label="コピー" name="copy_gesture"/>
+	<menu_item_call label="貼り付け" name="paste"/>
+	<menu_item_call label="UUID をコピー" name="copy_uuid"/>
+	<menu_item_call label="現在のアウトフィットに保存" name="save_to_outfit"/>
+	<menu_item_call label="編集" name="edit_gesture"/>
+	<menu_item_call label="調べる" name="inspect"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
new file mode 100644
index 0000000000..09e70b0d1f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="hide_navbar_menu">
+	<menu_item_check label="ナビゲーションバーを表示" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="お気に入りバーを表示" name="ShowNavbarFavoritesPanel"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..5bcb96f083
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet Group Menu">
+	<menu_item_call label="グループ情報" name="Show Profile"/>
+	<menu_item_call label="セッションを表示" name="Chat"/>
+	<menu_item_call label="セッション終了" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..0887001992
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="IMChiclet P2P Menu">
+	<menu_item_call label="プロフィールを表示" name="Show Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="セッションを表示" name="Send IM"/>
+	<menu_item_call label="セッション終了" name="End Session"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..64e1505440
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="プロフィールの表示" name="view_profile"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="テレポート" name="teleport"/>
+	<menu_item_call label="グループに招待" name="invite_to_group"/>
+	<menu_item_call label="ブロック" name="block"/>
+	<menu_item_call label="報告" name="report"/>
+	<menu_item_call label="フリーズ" name="freeze"/>
+	<menu_item_call label="追放" name="eject"/>
+	<menu_item_call label="デバッグ" name="debug"/>
+	<menu_item_call label="地図で探す" name="find_on_map"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="支払う" name="pay"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..506614316e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="触る" name="touch"/>
+	<menu_item_call label="座る" name="sit"/>
+	<menu_item_call label="支払う" name="pay"/>
+	<menu_item_call label="買う" name="buy"/>
+	<menu_item_call label="取る" name="take"/>
+	<menu_item_call label="コピーを取る" name="take_copy"/>
+	<menu_item_call label="開く" name="open"/>
+	<menu_item_call label="編集" name="edit"/>
+	<menu_item_call label="装着" name="wear"/>
+	<menu_item_call label="報告" name="report"/>
+	<menu_item_call label="ブロック" name="block"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="削除" name="remove"/>
+	<menu_item_call label="詳細" name="more_info"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
new file mode 100644
index 0000000000..76c01d6109
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu name="Gear Menu">
+	<menu_item_call label="立ち上がる" name="stand_up"/>
+	<menu_item_call label="マイ 容姿" name="my_appearance"/>
+	<menu_item_call label="プロフィール" name="my_profile"/>
+	<menu_item_call label="フレンド" name="my_friends"/>
+	<menu_item_call label="グループ" name="my_groups"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 3162477c5c..623a0cdb06 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -12,7 +12,7 @@
 	<menu_item_call label="新しいスクリプト" name="New Script"/>
 	<menu_item_call label="新しいノート" name="New Note"/>
 	<menu_item_call label="新しいジェスチャー" name="New Gesture"/>
-	<menu label="新規衣類" name="New Clothes">
+	<menu label="新しい衣類" name="New Clothes">
 		<menu_item_call label="新しいシャツ" name="New Shirt"/>
 		<menu_item_call label="新しいズボン" name="New Pants"/>
 		<menu_item_call label="新しい靴" name="New Shoes"/>
@@ -22,8 +22,10 @@
 		<menu_item_call label="新しい手袋" name="New Gloves"/>
 		<menu_item_call label="新しい下着" name="New Undershirt"/>
 		<menu_item_call label="新しいパンツ" name="New Underpants"/>
+		<menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/>
+		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
 	</menu>
-	<menu label="新規身体部位" name="New Body Parts">
+	<menu label="新しい身体部位" name="New Body Parts">
 		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
 		<menu_item_call label="新しいスキン" name="New Skin"/>
 		<menu_item_call label="新しい髪" name="New Hair"/>
@@ -46,18 +48,21 @@
 	<menu_item_call label="開く" name="Sound Open"/>
 	<menu_item_call label="アイテムを除外" name="Purge Item"/>
 	<menu_item_call label="アイテムを復元" name="Restore Item"/>
+	<menu_item_call label="オリジナルを探す" name="Find Original"/>
 	<menu_item_call label="開く" name="Open"/>
 	<menu_item_call label="プロパティ" name="Properties"/>
 	<menu_item_call label="名前の変更" name="Rename"/>
 	<menu_item_call label="UUIDをコピー" name="Copy Asset UUID"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="貼り付け" name="Paste"/>
+	<menu_item_call label="リンクの貼り付け" name="Paste As Link"/>
 	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="アイテムを取り外す" name="Take Off Items"/>
+	<menu_item_call label="アウトフィットから取り除く" name="Remove From Outfit"/>
 	<menu_item_call label="服装に追加" name="Add To Outfit"/>
 	<menu_item_call label="服装を置換" name="Replace Outfit"/>
 	<menu_item_call label="会議チャット開始" name="Conference Chat Folder"/>
 	<menu_item_call label="再生" name="Sound Play"/>
+	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
 	<menu_item_call label="世界で再生" name="Animation Play"/>
 	<menu_item_call label="ローカルに再生" name="Animation Audition"/>
 	<menu_item_call label="インスタント・メッセージを送信" name="Send Instant Message"/>
@@ -65,6 +70,7 @@
 	<menu_item_call label="会議チャット開始" name="Conference Chat"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="非アクティブ" name="Deactivate"/>
+	<menu_item_call label="別名で保存" name="Save As"/>
 	<menu_item_call label="自分から取り外す" name="Detach From Yourself"/>
 	<menu_item_call label="装着" name="Object Wear"/>
 	<menu label="装着先" name="Attach To"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
new file mode 100644
index 0000000000..8b18f6bfe8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="アップロード" name="upload">
+		<menu_item_call label="画像 （L$ [COST] ）..." name="Upload Image"/>
+		<menu_item_call label="サウンド （L$[COST] ）..." name="Upload Sound"/>
+		<menu_item_call label="アニメーション （L$ [COST] ）..." name="Upload Animation"/>
+		<menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="新規フォルダ" name="New Folder"/>
+	<menu_item_call label="新規スクリプト" name="New Script"/>
+	<menu_item_call label="新規ノート" name="New Note"/>
+	<menu_item_call label="新規ジェスチャー" name="New Gesture"/>
+	<menu label="新しい衣類" name="New Clothes">
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいパンツ" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しいジャケット" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着（上）" name="New Undershirt"/>
+		<menu_item_call label="新しい下着（下）" name="New Underpants"/>
+		<menu_item_call label="新しいアルファ" name="New Alpha"/>
+		<menu_item_call label="新しいタトゥー" name="New Tattoo"/>
+	</menu>
+	<menu label="新しい身体部位" name="New Body Parts">
+		<menu_item_call label="新しいシェイプ（体型）" name="New Shape"/>
+		<menu_item_call label="新しいスキン" name="New Skin"/>
+		<menu_item_call label="新しい髪" name="New Hair"/>
+		<menu_item_call label="新しい目" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..2bac5ebaa6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="新しい持ち物ウィンドウ" name="new_window"/>
+	<menu_item_call label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_call label="新しい順に並べ替え" name="sort_by_recent"/>
+	<menu_item_call label="フィルターを表示" name="show_filters"/>
+	<menu_item_call label="フィルターをリセット" name="reset_filters"/>
+	<menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/>
+	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
+	<menu_item_call label="紛失物を空にする" name="empty_lostnfound"/>
+	<menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index de35bf2401..c134422955 100644
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="SLurl をコピー" name="copy"/>
 	<menu_item_call label="削除" name="delete"/>
 	<menu_item_call label="ピックを作成" name="pick"/>
+	<menu_item_call label="お気に入りバーに追加" name="add_to_favbar"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index afb1219095..5db56ae76b 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -1,13 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="ファイル" name="File">
-		<menu_item_call label="終了" name="Quit" />
-	</menu>
-	<menu label="編集" name="Edit">
-		<menu_item_call label="環境設定..." name="Preferences..." />
+	<menu label="ミー" name="File">
+		<menu_item_call label="環境設定" name="Preferences..."/>
+		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="[SECOND_LIFE]ヘルプ" name="Second Life Help" />
-		<menu_item_call label="[APP_NAME]について..." name="About Second Life..." />
+		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
+		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+	</menu>
+	<menu label="デバッグ" name="Debug">
+		<menu label="編集" name="Edit">
+			<menu_item_call label="元に戻す" name="Undo"/>
+			<menu_item_call label="やり直し" name="Redo"/>
+			<menu_item_call label="切り取り" name="Cut"/>
+			<menu_item_call label="コピー" name="Copy"/>
+			<menu_item_call label="貼り付け" name="Paste"/>
+			<menu_item_call label="削除" name="Delete"/>
+			<menu_item_call label="複製" name="Duplicate"/>
+			<menu_item_call label="すべて選択" name="Select All"/>
+			<menu_item_call label="選択解除" name="Deselect"/>
+		</menu>
+		<menu_item_call label="デバッグ設定を表示" name="Debug Settings"/>
+		<menu_item_call label="UI/色の設定" name="UI/Color Settings"/>
+		<menu_item_call label="XUI プレビューツール" name="UI Preview Tool"/>
+		<menu_item_call label="サイドトレイを表示" name="Show Side Tray"/>
+		<menu_item_call label="ウィジェットテスト" name="Widget Test"/>
+		<menu_item_call label="インスペクターテスト" name="Inspectors Test"/>
+		<menu_item_check label="Reg In Client Test (restart)" name="Reg In Client Test (restart)"/>
+		<menu_item_call label="利用規約を表示" name="TOS"/>
+		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
+		<menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index e1bddd872d..ec49c3a98d 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="ズーム（近）" name="Zoom Close"/>
 	<menu_item_call label="ズーム（中）" name="Zoom Medium"/>
 	<menu_item_call label="ズーム（遠）" name="Zoom Far"/>
+	<menu_item_check label="地図を回転" name="Rotate Map"/>
 	<menu_item_call label="追跡をやめる" name="Stop Tracking"/>
 	<menu_item_call label="世界地図" name="World Map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index 4c9874c645..9ae2e58198 100644
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Navbar Menu">
 	<menu_item_check label="座標を表示" name="Show Coordinates"/>
+	<menu_item_check label="区画のプロパティを表示" name="Show Parcel Properties"/>
 	<menu_item_call label="ランドマーク" name="Landmark"/>
 	<menu_item_call label="切り取り" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
new file mode 100644
index 0000000000..c2e4a27686
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="NearBy Chat Menu">
+	<menu_item_call label="近くの人を表示する..." name="nearby_people"/>
+	<menu_item_check label="ブロックされた文字を表示" name="muted_text"/>
+	<menu_item_check label="バディアイコンを表示" name="show_buddy_icons"/>
+	<menu_item_check label="名前を表示" name="show_names"/>
+	<menu_item_check label="アイコンと名前を表示" name="show_icons_and_names"/>
+	<menu_item_call label="文字の大きさ" name="font_size"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
new file mode 100644
index 0000000000..8c4f328661
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Object Icon Menu">
+	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
+	<menu_item_call label="ブロック..." name="Block"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
new file mode 100644
index 0000000000..0bc51ecde1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Participant List Context Menu">
+	<menu_item_check label="文字をミュート" name="MuteText"/>
+	<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
new file mode 100644
index 0000000000..e4ccbf43ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
new file mode 100644
index 0000000000..bfc7d15017
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+	<menu_item_call label="選択したグループから脱退" name="Leave Selected Group"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
new file mode 100644
index 0000000000..a577523754
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Avatar Context Menu">
+	<menu_item_call label="プロフィールの表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
new file mode 100644
index 0000000000..bcd562e3ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Multi-Selected People Context Menu">
+	<menu_item_call label="フレンド登録" name="Add Friends"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
new file mode 100644
index 0000000000..a31480158a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
new file mode 100644
index 0000000000..b4f177a068
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
new file mode 100644
index 0000000000..84bf90fea0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="picks_plus_menu">
+	<menu_item_call label="新しいピック" name="create_pick"/>
+	<menu_item_call label="新しいクラシファイド広告" name="create_classified"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
new file mode 100644
index 0000000000..d5ce88b055
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
new file mode 100644
index 0000000000..6f91a3ebf9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_folder_gear">
+	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
+	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="切り取り" name="cut"/>
+	<menu_item_call label="コピー" name="copy_folder"/>
+	<menu_item_call label="貼り付け" name="paste"/>
+	<menu_item_call label="名前の変更" name="rename"/>
+	<menu_item_call label="削除" name="delete"/>
+	<menu_item_call label="拡大" name="expand"/>
+	<menu_item_call label="戻す" name="collapse"/>
+	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..5a135e5f56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_ladmark_gear">
+	<menu_item_call label="テレポート" name="teleport"/>
+	<menu_item_call label="もっと詳しく" name="more_info"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
+	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="切り取り" name="cut"/>
+	<menu_item_call label="ランドマークをコピー" name="copy_landmark"/>
+	<menu_item_call label="SLurl をコピー" name="copy_slurl"/>
+	<menu_item_call label="貼り付け" name="paste"/>
+	<menu_item_call label="名前の変更" name="rename"/>
+	<menu_item_call label="削除" name="delete"/>
+	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_call label="ピックを作成" name="create_pick"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
new file mode 100644
index 0000000000..a34086bdbf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="profile_overflow_menu">
+	<menu_item_call label="支払う" name="pay"/>
+	<menu_item_call label="共有" name="share"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..901eab9166
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Teleport History Gear Context Menu">
+	<menu_item_call label="フォルダをすべて開く" name="Expand all folders"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="Collapse all folders"/>
+	<menu_item_call label="テレポートの履歴をクリア" name="Clear Teleport History"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
new file mode 100644
index 0000000000..66bc32214f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="テレポート" name="Teleport"/>
+	<menu_item_call label="もっと詳しく" name="More Information"/>
+	<menu_item_call label="クリップボードにコピー" name="CopyToClipboard"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
new file mode 100644
index 0000000000..4dd44d2ec8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Teleport History Item Context Menu">
+	<menu_item_call label="開く" name="TabOpen"/>
+	<menu_item_call label="閉じる" name="TabClose"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
new file mode 100644
index 0000000000..fcb1038a6a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Text editor context menu">
+	<menu_item_call label="切り取り" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="貼り付け" name="Paste"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="すべて選択" name="Select All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 9c5eb64cb8..92d118a5ae 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -2,5 +2,5 @@
 <context_menu name="Url Popup">
 	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 2c453922d0..1dd3d79438 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
@@ -2,5 +2,5 @@
 <context_menu name="Url Popup">
 	<menu_item_call label="グループ情報を表示" name="show_group"/>
 	<menu_item_call label="グループをクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
new file mode 100644
index 0000000000..7af2f9e2cd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="持ち物アイテムを表示" name="show_item"/>
+	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
new file mode 100644
index 0000000000..8d41e1a571
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index b478d9d6c0..d6a048dcfc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
-	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 38e31de3f7..8d264059d3 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="区画情報を表示" name="show_parcel"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
new file mode 100644
index 0000000000..a516c5a075
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Url Popup">
+	<menu_item_call label="このコマンドを実行" name="run_slapp"/>
+	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index d280ecf689..2c857ec915 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="場所の情報を表示" name="show_place"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="現地にテレポート" name="teleport_to_location"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index 355f6eb018..c3507a9a33 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="この場所にテレポート" name="teleport"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 77aeeefe02..fc0a5592dd 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,225 +1,426 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
-	<menu name="Me">
+	<menu label="ミー" name="Me">
 		<menu_item_call label="環境設定" name="Preferences"/>
-		<menu_item_call name="Manage My Account">
-			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja" />
+		<menu_item_call label="マイアカウント" name="Manage My Account">
+			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
 		</menu_item_call>
+		<menu_item_call label="L$の購入" name="Buy and Sell L$"/>
+		<menu_item_call label="マイ プロフィール" name="Profile"/>
+		<menu_item_call label="マイ 容姿" name="Appearance"/>
+		<menu_item_check label="マイ 持ち物" name="Inventory"/>
+		<menu_item_call label="サイドトレイで持ち物を表示" name="ShowSidetrayInventory"/>
+		<menu_item_call label="マイ ジェスチャー" name="Gestures"/>
+		<menu label="マイ ログイン状態" name="Status">
+			<menu_item_call label="一時退席中" name="Set Away"/>
+			<menu_item_call label="取り込み中" name="Set Busy"/>
+		</menu>
+		<menu_item_call label="管理者権限のリクエスト" name="Request Admin Options"/>
+		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
+		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
-	<menu label="ファイル" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu label="アップロード" name="upload">
-			<menu_item_call label="画像 （L$[COST]）..." name="Upload Image"/>
-			<menu_item_call label="サウンド （L$[COST]）..." name="Upload Sound"/>
-			<menu_item_call label="アニメーション （L$[COST]）..." name="Upload Animation"/>
-			<menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_call label="デフォルト権限の設定..." name="perm prefs"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
-		<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="スナップショットを撮る" name="Take Snapshot"/>
-		<menu_item_call label="スナップショットをディスクに保存" name="Snapshot to Disk"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="終了" name="Quit"/>
-	</menu>
-	<menu label="編集" name="Edit">
-		<menu_item_call label="元に戻す" name="Undo"/>
-		<menu_item_call label="やり直し" name="Redo"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="カット" name="Cut"/>
-		<menu_item_call label="コピー" name="Copy"/>
-		<menu_item_call label="貼り付け" name="Paste"/>
-		<menu_item_call label="削除" name="Delete"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="検索..." name="Search..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="すべてを選択" name="Select All"/>
-		<menu_item_call label="選択解除" name="Deselect"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="複製" name="Duplicate"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu label="オブジェクトを装着" name="Attach Object"/>
-		<menu label="オブジェクトを取り外す" name="Detach Object"/>
-		<menu label="服を脱ぐ" name="Take Off Clothing">
-			<menu_item_call label="シャツ" name="Shirt"/>
-			<menu_item_call label="ズボン" name="Pants"/>
-			<menu_item_call label="靴" name="Shoes"/>
-			<menu_item_call label="靴下" name="Socks"/>
-			<menu_item_call label="ジャケット" name="Jacket"/>
-			<menu_item_call label="手袋" name="Gloves"/>
-			<menu_item_call label="（下着の）シャツ" name="Menu Undershirt"/>
-			<menu_item_call label="（下着の）パンツ" name="Menu Underpants"/>
-			<menu_item_call label="スカート" name="Skirt"/>
-			<menu_item_call label="すべての服" name="All Clothes"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="ジェスチャー…" name="Gestures..."/>
-		<menu_item_call label="プロフィール..." name="Profile..."/>
-		<menu_item_call label="容姿..." name="Appearance..."/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu_item_check label="フレンド..." name="Friends..."/>
-		<menu_item_call label="グループ..." name="Groups..."/>
-		<menu_item_separator label="-----------" name="separator8"/>
-		<menu_item_call label="環境設定..." name="Preferences..."/>
-	</menu>
-	<menu label="表示" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-		<menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
-		<menu_item_check label="制作ツール" name="Build"/>
-		<menu_item_check label="ジョイスティック操作" name="Joystick Flycam"/>
-		<menu_item_call label="表示をリセット" name="Reset View"/>
-		<menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="ツールバー" name="Toolbar"/>
-		<menu_item_check label="ローカル・チャット" name="Chat History"/>
-		<menu_item_check label="コミュニケーション" name="Instant Message"/>
-		<menu_item_check label="持ち物" name="Inventory"/>
-		<menu_item_check label="ボイスチャット・ユーザー一覧" name="Active Speakers"/>
-		<menu_item_check label="無視リスト" name="Mute List"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
-		<menu_item_check label="移動コントロール" name="Movement Controls"/>
-		<menu_item_check label="世界地図" name="World Map"/>
-		<menu_item_check label="ミニマップ" name="Mini-Map"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="地域の統計情報" name="Statistics Bar"/>
-		<menu_item_check label="土地の境界線" name="Property Lines"/>
-		<menu_item_check label="立入禁止ライン" name="Banlines"/>
-		<menu_item_check label="土地オーナー" name="Land Owners"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu label="ヒントのポップアップ" name="Hover Tips">
-			<menu_item_check label="ヒントを表示" name="Show Tips"/>
-			<menu_item_separator label="-----------" name="separator"/>
-			<menu_item_check label="土地のヒント" name="Land Tips"/>
-			<menu_item_check label="すべてのオブジェクトに関するヒント" name="Tips On All Objects"/>
-		</menu>
-		<menu_item_check label="透明オブジェクトを強調表示" name="Highlight Transparent"/>
-		<menu_item_check label="ビーコン(標識)" name="beacons"/>
-		<menu_item_check label="パーティクルを非表示" name="Hide Particles"/>
-		<menu_item_check label="HUD装着物を表示" name="Show HUD Attachments"/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
-		<menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
-		<menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="[全画面表示]" name="Toggle Fullscreen"/>
-		<menu_item_call label="UIサイズを標準設定に戻す" name="Set UI Size to Default"/>
+	<menu label="コミュニケーション" name="Communicate">
+		<menu_item_call label="フレンド" name="My Friends"/>
+		<menu_item_call label="所属グループ" name="My Groups"/>
+		<menu_item_check label="近くのチャット" name="Nearby Chat"/>
+		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="近くのメディア" name="Nearby Media"/>
+		<menu_item_check label="（レガシー） コミュニケーション" name="Instant Message"/>
+		<menu_item_call label="（一時）メディアリモコン" name="Preferences"/>
 	</menu>
 	<menu label="世界" name="World">
-		<menu_item_call label="チャット" name="Chat"/>
-		<menu_item_check label="常に走る" name="Always Run"/>
-		<menu_item_check label="飛行" name="Fly"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="この場所のランドマークを作成" name="Create Landmark Here"/>
-		<menu_item_call label="ホームをここに設定" name="Set Home to Here"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="離席中に設定" name="Set Away"/>
-		<menu_item_call label="取り込み中に設定" name="Set Busy"/>
-		<menu_item_call label="自分のアバターのアニメーションを停止" name="Stop Animating My Avatar"/>
-		<menu_item_call label="キー制御を解除" name="Release Keys"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="アカウントの履歴..." name="Account History...">
-			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja"/>
-		</menu_item_call>
-		<menu_item_call label="マイアカウントの管理..." name="Manage My Account...">
-			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
-		</menu_item_call>
-		<menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
-		<menu_item_separator label="-----------" name="separator5"/>
-		<menu_item_call label="自分の土地..." name="My Land..."/>
-		<menu_item_call label="土地情報..." name="About Land..."/>
-		<menu_item_call label="土地を購入..." name="Buy Land..."/>
-		<menu_item_call label="地域／不動産..." name="Region/Estate..."/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu label="環境の設定" name="Environment Settings">
+		<menu_item_check label="移動" name="Movement Controls"/>
+		<menu_item_check label="視界" name="Camera Controls"/>
+		<menu_item_call label="土地について" name="About Land"/>
+		<menu_item_call label="地域 / 不動産" name="Region/Estate"/>
+		<menu_item_call label="土地の購入" name="Buy Land"/>
+		<menu_item_call label="自分の土地" name="My Land"/>
+		<menu label="表示" name="Land">
+			<menu_item_check label="立入禁止ライン" name="Ban Lines"/>
+			<menu_item_check label="ビーコン（標識）" name="beacons"/>
+			<menu_item_check label="敷地境界線" name="Property Lines"/>
+			<menu_item_check label="土地所有者" name="Land Owners"/>
+		</menu>
+		<menu label="ランドマーク" name="Landmarks">
+			<menu_item_call label="ここのランドマークを作成" name="Create Landmark Here"/>
+			<menu_item_call label="現在地をホームに設定" name="Set Home to Here"/>
+		</menu>
+		<menu_item_call label="ホーム" name="Teleport Home"/>
+		<menu_item_check label="ミニマップ" name="Mini-Map"/>
+		<menu_item_check label="世界地図" name="World Map"/>
+		<menu_item_call label="スナップショット" name="Take Snapshot"/>
+		<menu label="太陽" name="Environment Settings">
 			<menu_item_call label="日の出" name="Sunrise"/>
 			<menu_item_call label="正午" name="Noon"/>
 			<menu_item_call label="日没" name="Sunset"/>
 			<menu_item_call label="深夜" name="Midnight"/>
-			<menu_item_call label="地域の標準設定に戻す" name="Revert to Region Default"/>
-			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="エステートタイムを使用" name="Revert to Region Default"/>
 			<menu_item_call label="環境編集" name="Environment Editor"/>
 		</menu>
 	</menu>
-	<menu label="ツール" name="Tools">
-		<menu label="ツールを選ぶ" name="Select Tool">
-			<menu_item_call label="フォーカス" name="Focus"/>
-			<menu_item_call label="移動" name="Move"/>
-			<menu_item_call label="編集" name="Edit"/>
-			<menu_item_call label="作成" name="Create"/>
-			<menu_item_call label="土地" name="Land"/>
-		</menu>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
-		<menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
-		<menu_item_check label="環境で選択" name="Select By Surrounding"/>
-		<menu_item_check label="隠れた位置の選択も表示" name="Show Hidden Selection"/>
-		<menu_item_check label="選択したものの光源範囲を表示" name="Show Light Radius for Selection"/>
-		<menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_check label="グリッドにスナップ" name="Snap to Grid"/>
-		<menu_item_call label="オブジェクトのXY移動をグリッドに合わせる" name="Snap Object XY to Grid"/>
-		<menu_item_call label="グリッドをオブジェクトの位置基準で再設定" name="Use Selection for Grid"/>
-		<menu_item_call label="グリッドのオプション..." name="Grid Options..."/>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_check label="リンクされた一部を編集" name="Edit Linked Parts"/>
+	<menu label="制作" name="BuildTools">
+		<menu_item_check label="制作" name="Show Build Tools"/>
+		<menu label="制作ツールを選択" name="Select Tool">
+			<menu_item_call label="フォーカスツール" name="Focus"/>
+			<menu_item_call label="移動ツール" name="Move"/>
+			<menu_item_call label="編集ツール" name="Edit"/>
+			<menu_item_call label="クリエーションツール" name="Create"/>
+			<menu_item_call label="土地ツール" name="Land"/>
+		</menu>
+		<menu label="編集" name="Edit">
+			<menu_item_call label="元に戻す" name="Undo"/>
+			<menu_item_call label="やり直し" name="Redo"/>
+			<menu_item_call label="切り取り" name="Cut"/>
+			<menu_item_call label="コピー" name="Copy"/>
+			<menu_item_call label="貼り付け" name="Paste"/>
+			<menu_item_call label="削除" name="Delete"/>
+			<menu_item_call label="複製" name="Duplicate"/>
+			<menu_item_call label="すべて選択" name="Select All"/>
+			<menu_item_call label="選択解除" name="Deselect"/>
+		</menu>
 		<menu_item_call label="リンク" name="Link"/>
-		<menu_item_call label="リンク解除" name="Unlink"/>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="選択対象に視点移動" name="Focus on Selection"/>
-		<menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
-		<menu_item_call label="オブジェクトを購入" name="Menu Object Take">
-			<on_enable userdata="購入,取る" name="EnableBuyOrTake"/>
-		</menu_item_call>
-		<menu_item_call label="コピーを取る" name="Take Copy"/>
-		<menu_item_call label="オブジェクトをオブジェクト・コンテンツに戻して保存" name="Save Object Back to Object Contents"/>
-		<menu_item_separator label="-----------" name="separator6"/>
-		<menu_item_call label="スクリプト警告／エラー・ウィンドウを表示" name="Show Script Warning/Error Window"/>
-		<menu label="選択したオブジェクトの中のスクリプトを再コンパイル" name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono"/>
-			<menu_item_call label="LSL" name="LSL"/>
-		</menu>
-		<menu_item_call label="選択したオブジェクトの中のスクリプトをリセット" name="Reset Scripts in Selection"/>
-		<menu_item_call label="選択したオブジェクトの中のスクリプトを起動する" name="Set Scripts to Running in Selection"/>
-		<menu_item_call label="選択したオブジェクトの中のスクリプトを停止する" name="Set Scripts to Not Running in Selection"/>
+		<menu_item_call label="リンクを外す" name="Unlink"/>
+		<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 Take"/>
+			<menu_item_call label="コピーを取る" name="Take Copy"/>
+			<menu_item_call label="「マイ 持ち物」に保存" name="Save Object Back to My Inventory"/>
+			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
+		</menu>
+		<menu label="スクリプト" name="Scripts">
+			<menu_item_call label="スクリプトのリコンパイル（Mono）" name="Mono"/>
+			<menu_item_call label="スクリプトのリコンパイル（LSL）" name="LSL"/>
+			<menu_item_call label="スクリプトのリセット" name="Reset Scripts"/>
+			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
+			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
+		</menu>
+		<menu label="オプション" name="Options">
+			<menu_item_check label="リンク部位を編集" name="Edit Linked Parts"/>
+			<menu_item_call label="デフォルトのアップロード権限を設定" name="perm prefs"/>
+			<menu_item_check label="権限の詳細を表示" name="DebugPermissions"/>
+			<menu label="選択" name="Selection">
+				<menu_item_check label="私のオブジェクトだけを選択" name="Select Only My Objects"/>
+				<menu_item_check label="動的オブジェクトのみ選択" name="Select Only Movable Objects"/>
+				<menu_item_check label="環境で選択" name="Select By Surrounding"/>
+			</menu>
+			<menu label="表示" name="Show">
+				<menu_item_check label="非表示の選択を表示" name="Show Hidden Selection"/>
+				<menu_item_check label="選択した光の半径範囲を表示" name="Show Light Radius for Selection"/>
+				<menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+			</menu>
+			<menu label="グリッド" name="Grid">
+				<menu_item_check label="グリッドポイントにスナップ" name="Snap to Grid"/>
+				<menu_item_call label="オブジェクトのXY軸をグリッドにスナップ" name="Snap Object XY to Grid"/>
+				<menu_item_call label="選択をグリッドに使用" name="Use Selection for Grid"/>
+				<menu_item_call label="グリッドオプション" name="Grid Options"/>
+			</menu>
+		</menu>
+		<menu label="リンクした部分を選択" name="Select Linked Parts">
+			<menu_item_call label="次の部位を選択" name="Select Next Part"/>
+			<menu_item_call label="前回の部位を選択" name="Select Previous Part"/>
+			<menu_item_call label="次の部位を含める" name="Include Next Part"/>
+			<menu_item_call label="前回の部位を含める" name="Include Previous Part"/>
+		</menu>
 	</menu>
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
 		<menu_item_call label="チュートリアル" name="Tutorial"/>
-		<menu_item_separator label="-----------" name="separator"/>
-		<menu_item_call label="Linden公式ブログ..." name="Official Linden Blog..."/>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="スクリプト・ポータル..." name="Scripting Portal...">
-			<on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/ja" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3"/>
-		<menu_item_call label="嫌がらせの報告..." name="Report Abuse..."/>
-		<menu_item_call label="衝突の記録..." name="Bumps, Pushes &amp;amp; Hits..."/>
-		<menu_item_call label="ラグ メーター" name="Lag Meter"/>
-		<menu_item_separator label="-----------" name="separator7"/>
-		<menu label="バグの報告" name="Bug Reporting">
-			<menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..."/>
-			<menu_item_call label="パブリック問題トラッカー ヘルプ..." name="Publc Issue Tracker Help...">
-				<on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/ja" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator7"/>
-			<menu_item_call label="バグの報告 101..." name="Bug Reporing 101...">
-				<on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101"/>
-			</menu_item_call>
-			<menu_item_call label="セキュリティ問題..." name="Security Issues...">
-				<on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja"/>
-			</menu_item_call>
-			<menu_item_call label="品質保証関連Wiki..." name="QA Wiki..."/>
-			<menu_item_separator label="-----------" name="separator9"/>
-			<menu_item_call label="バグの報告..." name="Report Bug..."/>
-		</menu>
-		<menu_item_call label="[APP_NAME]について" name="About Second Life..."/>
+		<menu_item_call label="嫌がらせを報告" name="Report Abuse"/>
+		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+	</menu>
+	<menu label="アドバンス" name="Advanced">
+		<menu_item_check label="30分経過で AFK に設定" name="Go Away/AFK When Idle"/>
+		<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
+		<menu_item_call label="テクスチャのリベーク" name="Rebake Texture"/>
+		<menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/>
+		<menu_item_check label="遠くのオブジェクトを選択しない" name="Limit Select Distance"/>
+		<menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance"/>
+		<menu_item_check label="高解像度スナップショット" name="HighResSnapshot"/>
+		<menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="圧縮してスナップショットをディスクに保存する" name="CompressSnapshotsToDisk"/>
+		<menu_item_call label="別名でテクスチャを保存" name="Save Texture As"/>
+		<menu label="パフォーマンスツール" name="Performance Tools">
+			<menu_item_call label="ラグ計測器" name="Lag Meter"/>
+			<menu_item_check label="統計バー" name="Statistics Bar"/>
+			<menu_item_check label="アバターのレンダリングコストを表示" name="Avatar Rendering Cost"/>
+		</menu>
+		<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
+			<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
+			<menu_item_check label="パーティクルを非表示にする" name="Hide Particles"/>
+			<menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
+			<menu_item_check label="透明部分をハイライト" name="Highlight Transparent"/>
+			<menu_item_check label="HUD を表示" name="Show HUD Attachments"/>
+			<menu_item_check label="一人称視点のときに十字線を表示" name="ShowCrosshairs"/>
+			<menu_item_check label="土地のツールチップを表示" name="Land Tips"/>
+		</menu>
+		<menu label="レンダリング（種類）" name="Rendering Types">
+			<menu_item_check label="シンプル" name="Simple"/>
+			<menu_item_check label="アルファ" name="Alpha"/>
+			<menu_item_check label="木" name="Tree"/>
+			<menu_item_check label="アバター" name="Character"/>
+			<menu_item_check label="地表" name="SurfacePath"/>
+			<menu_item_check label="空" name="Sky"/>
+			<menu_item_check label="水" name="Water"/>
+			<menu_item_check label="地面" name="Ground"/>
+			<menu_item_check label="ボリューム" name="Volume"/>
+			<menu_item_check label="草" name="Grass"/>
+			<menu_item_check label="雲" name="Clouds"/>
+			<menu_item_check label="パーティクル" name="Particles"/>
+			<menu_item_check label="衝突" name="Bump"/>
+		</menu>
+		<menu label="レンダリング（機能）" name="Rendering Features">
+			<menu_item_check label="UI" name="UI"/>
+			<menu_item_check label="選択済" name="Selected"/>
+			<menu_item_check label="ハイライト" name="Highlighted"/>
+			<menu_item_check label="ダイナミックテクスチャ" name="Dynamic Textures"/>
+			<menu_item_check label="足の影" name="Foot Shadows"/>
+			<menu_item_check label="くもり" name="Fog"/>
+			<menu_item_check label="FRInfo のテスト" name="Test FRInfo"/>
+			<menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
+		</menu>
+		<menu_item_check label="マルチスレッド処理" name="Run Multiple Threads"/>
+		<menu_item_call label="グループキャッシュのクリア" name="ClearGroupCache"/>
+		<menu_item_check label="マウスの平滑化" name="Mouse Smoothing"/>
+		<menu_item_check label="近くのチャットに IM を表示" name="IMInChat"/>
+		<menu label="ショートカット" name="Shortcuts">
+			<menu_item_check label="検索" name="Search"/>
+			<menu_item_call label="キーをリリース" name="Release Keys"/>
+			<menu_item_call label="UI のサイズをデフォルトに設定" name="Set UI Size to Default"/>
+			<menu_item_check label="常に走る" name="Always Run"/>
+			<menu_item_check label="飛行" name="Fly"/>
+			<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
+			<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
+			<menu_item_call label="スナップショットをディスクに保存" name="Snapshot to Disk"/>
+			<menu_item_call label="一人称視点" name="Mouselook"/>
+			<menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam"/>
+			<menu_item_call label="表示をリセット" name="Reset View"/>
+			<menu_item_call label="最後の発言者を見る" name="Look at Last Chatter"/>
+			<menu label="制作ツールを選択" name="Select Tool">
+				<menu_item_call label="焦点ツール" name="Focus"/>
+				<menu_item_call label="移動ツール" name="Move"/>
+				<menu_item_call label="編集ツール" name="Edit"/>
+				<menu_item_call label="作成ツール" name="Create"/>
+				<menu_item_call label="土地ツール" name="Land"/>
+			</menu>
+			<menu_item_call label="ズームイン" name="Zoom In"/>
+			<menu_item_call label="ズーム・デフォルト" name="Zoom Default"/>
+			<menu_item_call label="ズームアウト" name="Zoom Out"/>
+			<menu_item_call label="全画面表示" name="Toggle Fullscreen"/>
+		</menu>
+		<menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
+		<menu_item_check label="開発メニューを表示" name="Debug Mode"/>
+	</menu>
+	<menu label="開発" name="Develop">
+		<menu label="コンソール" name="Consoles">
+			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
+			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
+			<menu_item_call label="通知コンソール" name="Notifications"/>
+			<menu_item_check label="テクスチャサイズのコンソール" name="Texture Size"/>
+			<menu_item_check label="テクスチャカテゴリ・コンソール" name="Texture Category"/>
+			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
+			<menu_item_check label="メモリ" name="Memory"/>
+			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
+			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
+			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
+			<menu_item_check label="カメラ" name="Camera"/>
+			<menu_item_check label="風" name="Wind"/>
+			<menu_item_check label="FOV" name="FOV"/>
+		</menu>
+		<menu label="情報を表示" name="Display Info">
+			<menu_item_check label="時間を表示" name="Show Time"/>
+			<menu_item_check label="描画情報を表示" name="Show Render Info"/>
+			<menu_item_check label="マトリックスを表示" name="Show Matrices"/>
+			<menu_item_check label="カーソルを乗せた場所の色を表示" name="Show Color Under Cursor"/>
+			<menu_item_check label="オブジェクトのアップデートを表示" name="Show Updates"/>
+		</menu>
+		<menu label="エラーを実行" name="Force Errors">
+			<menu_item_call label="ブレークポイント" name="Force Breakpoint"/>
+			<menu_item_call label="LLError とクラッシュを実行" name="Force LLError And Crash"/>
+			<menu_item_call label="バッドメモリアクセスを実行" name="Force Bad Memory Access"/>
+			<menu_item_call label="無限ループ" name="Force Infinite Loop"/>
+			<menu_item_call label="ドライバのクラッシュを実行" name="Force Driver Carsh"/>
+			<menu_item_call label="ソフトウェア例外エラーの実行" name="Force Software Exception"/>
+			<menu_item_call label="ビューワの接続遮断を実行" name="Force Disconnect Viewer"/>
+			<menu_item_call label="メモリリークのシミュレート" name="Memory Leaking Simulation"/>
+		</menu>
+		<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="Frame Test"/>
+		</menu>
+		<menu label="メタデータのレンダー" name="Render Metadata">
+			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
+			<menu_item_check label="オクトリー" name="Octree"/>
+			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
+			<menu_item_check label="オクルージョン" name="Occlusion"/>
+			<menu_item_check label="バッチの描画" name="Render Batches"/>
+			<menu_item_check label="アニメーション部分をテクスチャで表示" name="Texture Anim"/>
+			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
+			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
+			<menu_item_check label="Face Area" name="Face Area"/>
+			<menu_item_check label="光" name="Lights"/>
+			<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
+			<menu_item_check label="Raycast" name="Raycast"/>
+		</menu>
+		<menu label="レンダリング" name="Rendering">
+			<menu_item_check label="軸" name="Axes"/>
+			<menu_item_check label="接線基底" name="Tangent Basis"/>
+			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
+			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
+			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
+			<menu_item_check label="フレームバッファ・オブジェクト" name="Framebuffer Objects"/>
+			<menu_item_check label="遅延レンダリング" name="Deferred Rendering"/>
+			<menu_item_check label="グローバルイルミネーション" name="Global Illumination"/>
+			<menu_item_check label="GLデバッグ" name="Debug GL"/>
+			<menu_item_check label="経路をデバッグ" name="Debug Pipeline"/>
+			<menu_item_check label="ファーストアルファ" name="Fast Alpha"/>
+			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
+			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
+			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
+			<menu_item_check label="テクスチャの検査" name="Audit Textures"/>
+			<menu_item_check label="テクスチャアトラス" name="Texture Atlas"/>
+			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
+			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
+			<menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/>
+		</menu>
+		<menu label="ネットワーク" name="Network">
+			<menu_item_check label="エージェントを一時停止" name="AgentPause"/>
+			<menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
+			<menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
+			<menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects"/>
+			<menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
+			<menu_item_call label="パケットドロップ" name="Drop a Packet"/>
+		</menu>
+		<menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
+		<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu label="レコーダー" name="Recorder">
+			<menu_item_call label="再生開始" name="Start Playback"/>
+			<menu_item_call label="再生停止" name="Stop Playback"/>
+			<menu_item_check label="再生をループ" name="Loop Playback"/>
+			<menu_item_call label="記録開始" name="Start Record"/>
+			<menu_item_call label="記録停止" name="Stop Record"/>
+		</menu>
+		<menu label="世界" name="World">
+			<menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
+			<menu_item_check label="ビーコンの強調表示" name="Cheesy Beacon"/>
+			<menu_item_check label="固定された天気" name="Fixed Weather"/>
+			<menu_item_call label="リージョンオブジェクトのキャッシュをダンプ" name="Dump Region Object Cache"/>
+		</menu>
+		<menu label="UI" name="UI">
+			<menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
+			<menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/>
+			<menu_item_call label="持ち物の出力" name="Dump Inventory"/>
+			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
+			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
+			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
+			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
+			<menu_item_call label="メモリ使用状況" name="Memory Stats"/>
+			<menu_item_check label="ダブルクリックした場所に自動操作で移動" name="Double-ClickAuto-Pilot"/>
+			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
+			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
+			<menu_item_check label="デバッグ表示" name="Debug Views"/>
+			<menu_item_check label="デバッグ名ツールチップ" name="Debug Name Tooltips"/>
+			<menu_item_check label="マウス操作で発生するもののデバッグ" name="Debug Mouse Events"/>
+			<menu_item_check label="デバッグキー" name="Debug Keys"/>
+			<menu_item_check label="WindowProc のデバッグ" name="Debug WindowProc"/>
+		</menu>
+		<menu label="XUI" name="XUI">
+			<menu_item_call label="色の設定を更新" name="Reload Color Settings"/>
+			<menu_item_call label="フォントテストを表示" name="Show Font Test"/>
+			<menu_item_call label="XML から読み込む" name="Load from XML"/>
+			<menu_item_call label="XML で保存" name="Save to XML"/>
+			<menu_item_check label="XUI ネームを表示" name="Show XUI Names"/>
+			<menu_item_call label="テスト用 IM を送信" name="Send Test IMs"/>
+			<menu_item_call label="インスペクターテスト" name="Test Inspectors"/>
+		</menu>
+		<menu label="アバター" name="Character">
+			<menu label="ベークドテクスチャを取得" name="Grab Baked Texture">
+				<menu_item_call label="瞳" name="Iris"/>
+				<menu_item_call label="頭" name="Head"/>
+				<menu_item_call label="上半身" name="Upper Body"/>
+				<menu_item_call label="下半身" name="Lower Body"/>
+				<menu_item_call label="スカート" name="Skirt"/>
+			</menu>
+			<menu label="キャラクターテスト" name="Character Tests">
+				<menu_item_call label="容姿を XML に保存" name="Appearance To XML"/>
+				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
+				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
+				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
+				<menu_item_call label="PG のトグル" name="Toggle PG"/>
+				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
+			</menu>
+			<menu_item_call label="Params をデフォルトに実行" name="Force Params to Default"/>
+			<menu_item_check label="アニメーション情報" name="Animation Info"/>
+			<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
+			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
+			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
+			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
+			<menu_item_check label="LOD を無効にする" name="Disable LOD"/>
+			<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
+			<menu_item_check label="骨組みの衝突判定を表示" name="Show Collision Skeleton"/>
+			<menu_item_check label="エージェントのターゲットを表示" name="Display Agent Target"/>
+			--&gt;
+			<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
+			<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
+			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
+		</menu>
+		<menu_item_call label="圧縮画像" name="Compress Images"/>
+		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
+		<menu_item_check label="次回の起動時にコンソールウィンドウを表示" name="Console Window"/>
+		<menu_item_check label="管理者メニューを表示" name="View Admin Options"/>
+		<menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/>
+		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
+	</menu>
+	<menu label="管理者" name="Admin">
+		<menu label="Object">
+			<menu_item_call label="コピーを取る" name="Take Copy"/>
+			<menu_item_call label="私を所有者にする" name="Force Owner To Me"/>
+			<menu_item_call label="所有者権限の実行" name="Force Owner Permissive"/>
+			<menu_item_call label="削除" name="Delete"/>
+			<menu_item_call label="ロック" name="Lock"/>
+			<menu_item_call label="アセット ID を取得" name="Get Assets IDs"/>
+		</menu>
+		<menu label="区画" name="Parcel">
+			<menu_item_call label="私を所有者にする" name="Owner To Me"/>
+			<menu_item_call label="リンデンコンテンツに設定" name="Set to Linden Content"/>
+			<menu_item_call label="パブリックの土地を取得" name="Claim Public Land"/>
+		</menu>
+		<menu label="リージョン/地域" name="Region">
+			<menu_item_call label="一時アセットデータをダンプ" name="Dump Temp Asset Data"/>
+			<menu_item_call label="リージョンの状態を保存" name="Save Region State"/>
+		</menu>
+		<menu_item_call label="グリッドツール" name="God Tools"/>
+	</menu>
+	<menu label="管理者" name="Deprecated">
+		<menu label="オブジェクトを取り付ける" name="Attach Object"/>
+		<menu label="オブジェクトを取り外す" name="Detach Object"/>
+		<menu label="衣類を脱ぐ" name="Take Off Clothing">
+			<menu_item_call label="シャツ" name="Shirt"/>
+			<menu_item_call label="パンツ" name="Pants"/>
+			<menu_item_call label="靴" name="Shoes"/>
+			<menu_item_call label="靴下" name="Socks"/>
+			<menu_item_call label="ジャケット" name="Jacket"/>
+			<menu_item_call label="手袋" name="Gloves"/>
+			<menu_item_call label="下着シャツ" name="Menu Undershirt"/>
+			<menu_item_call label="下着パンツ" name="Menu Underpants"/>
+			<menu_item_call label="スカート" name="Skirt"/>
+			<menu_item_call label="アルファ" name="Alpha"/>
+			<menu_item_call label="タトゥ" name="Tattoo"/>
+			<menu_item_call label="すべての衣類" name="All Clothes"/>
+		</menu>
+		<menu_item_check label="ツールバーを表示" name="Show Toolbar"/>
+		<menu label="ヘルプ" name="Help">
+			<menu_item_call label="リンデン公式ブログ" name="Official Linden Blog"/>
+			<menu_item_call label="スクリプトポータル" name="Scripting Portal"/>
+			<menu label="バグの報告" name="Bug Reporting">
+				<menu_item_call label="パブリック問題トラッカー" name="Public Issue Tracker"/>
+				<menu_item_call label="パブリック問題トラッカーヘルプ" name="Publc Issue Tracker Help"/>
+				<menu_item_call label="バグ報告の基礎知識" name="Bug Reporing 101"/>
+				<menu_item_call label="セキュリティ問題" name="Security Issues"/>
+				<menu_item_call label="QA Wiki" name="QA Wiki"/>
+			</menu>
+		</menu>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index fca7c89183..33ccc579a7 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -55,7 +55,7 @@
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="はい"/>
 	</notification>
 	<notification name="BadInstallation">
-		[APP_NAME] をアップデート中にエラーが発生しました。  最新バージョンをダウンロードしてください。 http://get.secondlife.com
+		[APP_NAME] をアップデート中にエラーが発生しました。  ビューワの [http://get.secondlife.com 最新バージョンをダウンロード] してください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
@@ -159,6 +159,9 @@
 この能力を[ROLE_NAME]に割り当てますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="ClickUnimplemented">
+		申し訳ありませんが、まだ未実装です。
+	</notification>
 	<notification name="JoinGroupCanAfford">
 		このグループに参加するには、L$[COST]かかります。
 続行しますか？
@@ -171,7 +174,7 @@ L$が不足しているのでこのグループに参加することができま
 	<notification name="CreateGroupCost">
 		このグループを作るには L$100 かかります。
 一人ではグループにならないので、永久に削除されてしまいます。
-48時間以内にメンバーを勧誘し入会してもらってください。
+48 時間以内にメンバーを勧誘し、入会してもらってください。
 		<usetemplate canceltext="キャンセル" name="okcancelbuttons" notext="キャンセル" yestext="L$100 でグループを作成"/>
 	</notification>
 	<notification name="LandBuyPass">
@@ -191,13 +194,10 @@ L$が不足しているのでこのグループに参加することができま
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
-		注：「誰にでも売却する」をクリックすると、
-あなたの土地は[SECOND_LIFE] のコミュニティのどこからでも
-（この地域にないコミュニティを含む）購入できるようになります。
+		注意： 「誰にでも販売」をクリックすることで、あなたの土地はこのリージョンにいる人に限らず [SECOND_LIFE] コミュニティ全体で利用可能となります。
 
-選択された[LAND_SIZE]平方メートルの土地は、
-売り出し中に設定されています。
-売却価格L$[SALE_PRICE]で、[NAME]に売却を認可します。
+選択した [LAND_SIZE] 平方メートルの土地は、販売対象に設定されました。
+販売価格 L$[SALE_PRICE] で、[NAME] が販売対象者となります。
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
@@ -265,6 +265,18 @@ L$が不足しているのでこのグループに参加することができま
 この地域全体が「ダメージ有効」に設定されています。
 武器を使用するにはスクリプトの実行を許可する必要があります。
 	</notification>
+	<notification name="MultipleFacesSelected">
+		現在複数の面が選択されています。
+このまま続けた場合、メディアの別々の段階がオブジェクトの複数の面に設定されます。
+メディアを 1 つの面だけに取り付けるには、「テクスチャを選択」を選び、オブジェクトの希望する面をクリック、それから「追加」をクリックしてください。
+		<usetemplate ignoretext="メディアは選択した複数の面にセットされます。" name="okcancelignore" notext="キャンセル" yestext="OK"/>
+	</notification>
+	<notification name="WhiteListInvalidatesHomeUrl">
+		この入力をホワイトリストに追加すると、このメディア向けに特定した
+ホーム URL を無効とします。 あなたにはこれを実行する許可がないので、
+入力はホワイトリストには追加されません。
+		<usetemplate name="okbutton" yestext="Ok"/>
+	</notification>
 	<notification name="MustBeInParcel">
 		着地点を設定するには、この区画の内側に
 立ってください。
@@ -301,6 +313,10 @@ L$が不足しているのでこのグループに参加することができま
 	<notification name="CannotWearTrash">
 		ゴミ箱にある服やボディーパーツの着用はできません。
 	</notification>
+	<notification name="MaxAttachmentsOnOutfit">
+		オブジェクトを付けられませんでした。
+最大数の [MAX_ATTACHMENTS] 個を越えています。 どれか取り外してからお試しください。
+	</notification>
 	<notification name="CannotWearInfoNotComplete">
 		まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
 	</notification>
@@ -315,13 +331,10 @@ L$が不足しているのでこのグループに参加することができま
 		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
 	</notification>
 	<notification name="AddClassified">
-		検索ディレクトリの「クラシファイド」セクションに、
-クラシファイド広告が1週間掲載されます。
-広告を記入後、「公開」をクリックし、ディレクトリに
-追加します。
-「公開」をクリックすると、支払金額を尋ねられます。
-多く払うほど、広告がクラシファイド・リストとキーワード検索
-の上位に表示されます。
+		クラシファイド広告は、検索ディレクトリと [http://secondlife.com/community/classifieds secondlife.com] の「クラシファイド広告」セクションに一週間掲載されます。
+広告を記入したら、「掲載...」をクリックしてディレクトリに追加してください。
+「掲載」をクリックすると、支払いたい金額を尋ねられます。
+支払金額が多いほどあなたの広告は一覧とキーワード検索で上位に表示されます。
 		<usetemplate ignoretext="新規クラシファイド広告作成方法" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="DeleteClassified">
@@ -329,6 +342,11 @@ L$が不足しているのでこのグループに参加することができま
 支払い済みの料金は返金されません。
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="DeleteMedia">
+		この面にあるメディアを削除する選択をしました。
+続けますか？
+		<usetemplate ignoretext="オブジェクトからメディアを削除する前に確認する" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="ClassifiedSave">
 		クラシファイド広告[NAME]への変更を保存しますか？
 		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="保存しない" yestext="保存"/>
@@ -359,17 +377,17 @@ L$が不足しているのでこのグループに参加することができま
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="CacheWillClear">
-		[APP_NAME]の再起動後にキャッシュがクリアされます。
+		[APP_NAME] を再起動後にキャッシュがクリアされます。
 	</notification>
 	<notification name="CacheWillBeMoved">
-		[APP_NAME]の再起動後にキャッシュが移動されます。
-注意：これによりキャッシュがクリアされます。
+		[APP_NAME] を再起動後にキャッシュが移動されます。
+ご注意： キャッシュがクリアされます。
 	</notification>
 	<notification name="ChangeConnectionPort">
-		ポートの設定は、[APP_NAME]の再起動後に有効になります。
+		ポートの設定は [APP_NAME] を再起動後に反映されます。
 	</notification>
 	<notification name="ChangeSkin">
-		新しいスキンは[APP_NAME]を再起動すると現れます
+		新しいスキンは [APP_NAME] を再起動後に表示されます。
 	</notification>
 	<notification name="GoToAuctionPage">
 		[SECOND_LIFE]ウェブ・ページに移動し、 入札あるいはオークションの詳細を確認しますか？
@@ -421,7 +439,7 @@ L$が不足しているのでこのグループに参加することができま
 		次の理由で、コンパイルしたスクリプトの保存時に問題が起こりました。 [REASON]。  後でもう一度試してください。
 	</notification>
 	<notification name="StartRegionEmpty">
-		ログイン位置が不明です。 
+		ログイン位置が指定されていません。
 ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -439,7 +457,7 @@ L$が不足しているのでこのグループに参加することができま
 		警告： お使いのシステムは [APP_NAME] の必要最低限の動作環境を満たしていません。 このまま [APP_NAME] を使用すると、パフォーマンスの低下を感じるかもしれません。 恐れ入りますが [SUPPORT_SITE] ではサポート対象外のシステムに関する技術的サポートは行っておりません。
 
 最低動作環境
-[_URL] で詳しい情報を確認しますか？
+[_URL] を開いて詳しい情報を確認しますか？
 		<url name="url" option="0">
 			http://secondlife.com/support/sysreqs.php?lang=ja
 		</url>
@@ -448,18 +466,16 @@ L$が不足しているのでこのグループに参加することができま
 	<notification name="UnknownGPU">
 		お使いのシステムには、現在 [APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  [APP_NAME] は正常に実行される可能性が高いですが、表示設定を調整する必要があるかもしれません。
-（環境設定 &gt; 表示）
+（ミー ＞ 環境設定 ＞ グラフィック）
 		<form name="form">
 			<ignore name="ignore" text="使用中のグラフックカードが認識されませんでした"/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
-		[APP_NAME] は、
-グラフィック・ドライバの初期化中にクラッシュしました。
-一般的なドライバ・エラーを回避するため、「品質およびパフォーマンス」は「低」に設定されます。
-これにより、いくつかのグラフィックス機能は無効になります。
-グラフィックカード・ドライバのアップデートをお勧めします。
-「グラフィックの品質」は「環境設定」＞「表示」から上げることができます。
+		グラフィックドライバを初期化中に [APP_NAME] がクラッシュしました。
+ドライバの一般的なエラーを防ぐために、グラフィックのクオリティが低に設定されます。 そのため、一部のグラフィック特性に制限が出ます。
+お使いのグラフィックカードのドライバをアップデートするようおすすめします。
+グラフィックのクオリティは、環境設定 ＞ グラフィック で設定できます。
 	</notification>
 	<notification name="RegionNoTerraforming">
 		この地域[REGION] は、テラフォーミングができません。
@@ -516,6 +532,9 @@ L$が不足しているのでこのグループに参加することができま
 		[AVATAR_NAME] をあなたの土地から追放しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="追放"/>
 	</notification>
+	<notification name="EjectAvatarFromGroup">
+		[GROUP_NAME] から [AVATAR_NAME] を追放しました
+	</notification>
 	<notification name="AcquireErrorTooManyObjects">
 		取得エラー：選択したオブジェクトの数が多すぎます。
 	</notification>
@@ -528,7 +547,7 @@ L$が不足しているのでこのグループに参加することができま
 	<notification name="PromptGoToCurrencyPage">
 		[EXTRA]
 
-[_URL] でリンデンドル購入に関する情報を確認しますか？
+[_URL] に移動してリンデンドル購入に関する情報を確認しますか？
 		<url name="url">
 			http://secondlife.com/app/currency/?lang=ja-JP
 		</url>
@@ -654,6 +673,9 @@ L$が不足しているのでこのグループに参加することができま
 変更修正権限のある
 スクリプト化されたオブジェクトを選択してください。
 	</notification>
+	<notification name="CannotOpenScriptObjectNoMod">
+		編集権限のないオブジェクトのスクリプトを開くことはできません。
+	</notification>
 	<notification name="CannotSetRunningSelectObjectsNoScripts">
 		スクリプトの「実行」の設定ができません。
 
@@ -681,11 +703,11 @@ L$が不足しているのでこのグループに参加することができま
 	</notification>
 	<notification name="invalid_tport">
 		テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
 	</notification>
 	<notification name="invalid_region_handoff">
 		リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
 	</notification>
 	<notification name="blocked_tport">
 		申し訳ございません。テレポートは現在、ブロックされています。もう少し後でやり直してください。
@@ -762,8 +784,7 @@ L$が不足しているのでこのグループに参加することができま
 この土地がある地域を見つけることができません
 	</notification>
 	<notification name="CannotCloseFloaterBuyLand">
-		[APP_NAME]による、
-この取引の見積りが完了するまで「土地を購入」ウィンドウを閉じることはできません。
+		[APP_NAME] がこの取引価格を見積もるまでは、土地の購入ウィンドウを閉じることはできません。
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
 		土地を譲渡できません：
@@ -775,7 +796,7 @@ L$が不足しているのでこのグループに参加することができま
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
 		土地を譲渡できません：
-この土地がある地域が見つかりません。
+この土地があるリージョンが見つかりません。
 	</notification>
 	<notification name="CannotDeedLandMultipleSelected">
 		土地を譲渡できません：
@@ -819,8 +840,8 @@ L$が不足しているのでこのグループに参加することができま
 あなたの区画は緑色で表示されています。
 	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
-		土地を破棄できません：
-この土地がある地域が見つかりません。
+		土地を放棄できません：
+この土地があるリージョンが見つかりません。
 	</notification>
 	<notification name="CannotReleaseLandNoTransfer">
 		土地を破棄できません：
@@ -860,11 +881,11 @@ L$は返金されません。
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
 		土地を分割できません：
-この土地がある地域が見つかりません。
+この土地があるリージョンが見つかりません。
 	</notification>
 	<notification name="CannotJoinLandNoRegion">
 		土地を統合できません：
-この土地がある地域が見つかりません。
+この土地があるリージョンが見つかりません。
 	</notification>
 	<notification name="CannotJoinLandNothingSelected">
 		土地を統合できませんでした：
@@ -913,17 +934,13 @@ L$は返金されません。
 保存してみてください。
 	</notification>
 	<notification name="CannotSaveToAssetStore">
-		[NAME]を中央資産格納庫に保存できません。
-これは一時的な不具合です。
-服飾品などをカスタマイズし、数分後にもう一度保存してください。
+		[NAME] を保存できません。
+通常これは一時的なエラーです。 数分後にもう一度着用物をカスタマイズ・保存してください。
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		あなたは[SECOND_LIFE]からログアウトされました。
+		[SECOND_LIFE] からログアウトしました：
             [MESSAGE]
-「IMとチャットを表示」をクリックすると、
-現在あるIMとチャットを確認できます。
-確認しない場合は「終了」をクリックし、
-すぐに[APP_NAME]を終了してください。
+「IMとチャットを見る」をクリックすると、引き続き既に開いている IM とチャットを見ることができます。 「終了」をクリックすると [APP_NAME] をすぐに終了します。
 		<usetemplate name="okcancelbuttons" notext="終了" yestext="IMとチャットを表示"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1099,7 +1116,7 @@ L$は返金されません。
 	<notification name="AvatarMovedHome">
 		ホームロケーションは現在ご利用いただけません。
 近くのリージョンに移動しました。
-新たにホームを設定しなおすといいかもしれません。
+新たにホームを設定しなおしたほうがいいかもしれません。
 	</notification>
 	<notification name="ClothingLoading">
 		現在衣類をダウンロード中です。
@@ -1109,11 +1126,10 @@ L$は返金されません。
 		</form>
 	</notification>
 	<notification name="FirstRun">
-		[APP_NAME]のインストールが完了しました。
+		[APP_NAME] のインストールが完了しました。
 
-[SECOND_LIFE] の使用が初めての方は、
-ログイン前にアカウントの作成が必要です。
-[https://join.secondlife.com/index.php?lang=ja-JP secondlife.com]に移動し、新規アカウントの作成を行いますか？
+[SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
+[http://join.secondlife.com/?lang=ja-JP] で新しいアカウントを作成しますか？
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
@@ -1143,11 +1159,10 @@ F1キーを押してください。
 		[NAME] L$[PRICE] 残高不足のため実行不可です。
 	</notification>
 	<notification name="GrantedModifyRights">
-		[FIRST_NAME] [LAST_NAME] のオブジェクトの編集権限を得ました。
+		[NAME] は、あなたにオブジェクトの編集権限を与えました。
 	</notification>
 	<notification name="RevokedModifyRights">
-		[FIRST_NAME] [LAST_NAME]
-のオブジェクトを修正する権限が取り消されました。
+		[NAME] のオブジェクトを編集する権限は取り消されました
 	</notification>
 	<notification name="FlushMapVisibilityCaches">
 		この手順は、この地域の地図のキャッシュを消去します。
@@ -1229,22 +1244,21 @@ F1キーを押してください。
 [DOWNLOAD_PATH]。
 	</notification>
 	<notification name="DownloadWindowsMandatory">
-		[APP_NAME]の新しいバージョンが利用可能です。
+		[APP_NAME] の最新バージョンがご利用可能です。
 [MESSAGE]
-[APP_NAME]を使用するためには、
-このアップデートをダウンロードする必要があります。
+[APP_NAME] をご利用になるにはこのアップデートは必須です。
 		<usetemplate name="okcancelbuttons" notext="終了" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadWindows">
-		[APP_NAME]のアップデート・バージョンが利用可能です。
+		[APP_NAME] のアップデートバージョンがご利用可能です。
 [MESSAGE]
-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。
+このアップデートは必須ではありませんが、パフォーマンス向上のためにインストールをおすすめします。
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadWindowsReleaseForDownload">
-		[APP_NAME]のアップデート・バージョンが利用可能です。
+		[APP_NAME] のアップデートバージョンがご利用可能です。
 [MESSAGE]
-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。
+このアップデートは必須ではありませんが、パフォーマンス向上のためにインストールをおすすめします。
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadLinuxMandatory">
@@ -1266,28 +1280,27 @@ F1キーを押してください。
 		<usetemplate name="okcancelbuttons" notext="続ける" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadMacMandatory">
-		[APP_NAME]の新しいバージョンが利用可能です。
+		[APP_NAME] の最新バージョンがご利用可能です。
 [MESSAGE]
-[APP_NAME]を使用するために、
-このアップデートをダウンロードする必要があります。
+[APP_NAME] をご利用になるにはこのアップデートは必須です。
 
-アプリケーションがあるフォルダにダウンロードしますか？
+あなたのアプリケーションフォルダにダウンロードしますか？
 		<usetemplate name="okcancelbuttons" notext="終了" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadMac">
-		[APP_NAME]のアップデート・バージョンが利用可能です。
+		[APP_NAME] のアップデートバージョンがご利用可能です。
 [MESSAGE]
-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。
+このアップデートは必須ではありませんが、パフォーマンス向上のためにインストールをおすすめします。
 
-アプリケーションがあるフォルダにダウンロードしますか？
+あなたのアプリケーションフォルダにダウンロードしますか？
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DownloadMacReleaseForDownload">
-		[APP_NAME]のアップデート・バージョンが利用可能です。
+		[APP_NAME] のアップデートバージョンがご利用可能です。
 [MESSAGE]
-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。
+このアップデートは必須ではありませんが、パフォーマンス向上のためにインストールをおすすめします。
 
-アプリケーションがあるフォルダにダウンロードしますか？
+あなたのアプリケーションフォルダにダウンロードしますか？
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="ダウンロード"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1300,7 +1313,7 @@ F1キーを押してください。
 		<usetemplate ignoretext="ブラウザを起動して Web ページを見る" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
-		secondlife.com でアカウントの管理をしますか？
+		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウントを管理しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウントを管理する" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
@@ -1347,14 +1360,14 @@ F1キーを押してください。
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="全てのユーザを追い出す"/>
 	</notification>
 	<notification name="MuteLinden">
-		残念ながらLindenを無視設定に入れることはできません。
+		リンデンをブロックすることはできません。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CannotStartAuctionAlreadyForSale">
 		既に売り出し中の区画なのでオークションにかけることはできません。  オークションにかけたい場合は売り出し設定を解除してから行ってください。
 	</notification>
-	<notification label="オブジェクトを名前でミュートできませんでした" name="MuteByNameFailed">
-		あなたはすでにこの名前をミュートしています。
+	<notification label="名前でのオブジェクトのブロックに失敗しました" name="MuteByNameFailed">
+		この名前は既にブロック済みです。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveItemWarn">
@@ -1372,7 +1385,7 @@ F1キーを押してください。
 	</notification>
 	<notification name="BusyModeSet">
 		取り込み中モードになりました。
-チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてゴミ箱に入ります。
+チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
 		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更する" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
@@ -1449,6 +1462,10 @@ F1キーを押してください。
 		[PICK] にテレポートしますか？
 		<usetemplate ignoretext="ピックの場所にテレポートしたいか確認する" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
 	</notification>
+	<notification name="TeleportToClassified">
+		[CLASSIFIED] にテレポートしますか？
+		<usetemplate ignoretext="クラシファイド広告の場所にテレポートしたいか確認する" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+	</notification>
 	<notification label="あなたの不動産内の全員にメッセージを送信" name="MessageEstate">
 		今あなたの不動産にいる人全員に送る
 短いメッセージを入力してください。
@@ -1534,10 +1551,9 @@ F1キーを押してください。
 	<notification name="RegionEntryAccessBlocked_Change">
 		あなたのレーティング区分設定により、その地域（リージョン）へは入ることができません。
 
-「設定を変更」をクリックするとあなたのレーティング区分が上がり、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。
-あとで設定を元に戻したい場合は、「編集」＞「環境設定」＞「一般」をご覧ください。
+「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
 		<form name="form">
-			<button name="OK" text="設定の変更"/>
+			<button name="OK" text="環境設定の変更"/>
 			<button default="true" name="Cancel" text="閉じる"/>
 			<ignore name="ignore" text="選択したレーティング区分が原因で、リージョンに入ることができません"/>
 		</form>
@@ -1563,8 +1579,7 @@ F1キーを押してください。
 	<notification name="LandClaimAccessBlocked_Change">
 		あなたのレーティング区分設定により、この土地を取得することはできません。
 
-「設定を変更」をクリックするとあなたのレーティング区分が上がり、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。
-あとで設定を元に戻したい場合は、「編集」＞「環境設定」＞「一般」をご覧ください。
+「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
 		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を取得できません" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
@@ -1588,14 +1603,11 @@ F1キーを押してください。
 	<notification name="LandBuyAccessBlocked_Change">
 		あなたのレーティング区分設定により、この土地を購入することができません。
 
-「設定を変更」をクリックするとあなたのレーティング区分が上がり、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。
-あとで設定を元に戻したい場合は、「編集」＞「環境設定」＞「一般」をご覧ください。
+「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
 		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を購入できません" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
 	</notification>
 	<notification name="TooManyPrimsSelected">
-		選択したプリムが多すぎます。
-[MAX_PRIM_COUNT] を選択するか、
-プリム数を減らしてもう一度お試しください。
+		選択したプリムが多すぎます。  [MAX_PRIM_COUNT] 個選択するか、プリム数を減らしてもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ProblemImportingEstateCovenant">
@@ -1612,6 +1624,7 @@ F1キーを押してください。
 	</notification>
 	<notification name="UnableToLoadNotecardAsset">
 		現在ノートカードの資産IDを読み込むことができません。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NotAllowedToViewNotecard">
 		要求された資産IDに関するノートカードを閲覧するには権限が不十分です。
@@ -1654,10 +1667,7 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか�
 この変更が地図に反映されるまでにはしばらく時間がかかります。
 	</notification>
 	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">
-		このバージョンの [APP_NAME] は、
-この地域のボイスチャット機能に対応していません。
-ボイスチャットを正しく使用するには、
-[APP_NAME] のアップデートが必要です。
+		[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。
 	</notification>
 	<notification label="オブジェクトを購入できません" name="BuyObjectOneOwner">
 		複数のオーナーから同時にオブジェクトを購入することはできません。
@@ -1763,7 +1773,7 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか�
 		このオブジェクトには、あなたがコピーできるアイテムはありません。
 	</notification>
 	<notification name="WebLaunchAccountHistory">
-		secondlife.com でアカウント履歴を確認しますか？
+		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見る" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
 	<notification name="ConfirmQuit">
@@ -1771,32 +1781,19 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか�
 		<usetemplate ignoretext="終了時に確認する" name="okcancelignore" notext="終了しない" yestext="終了"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		利用規約違反とコミュニティースタンダード違反の報告にこのツールをご使用ください。 参照：
-
-http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php
-
-利用規約違反とコミュニティースタンダード違反に関する全てのレポートは、調査され、解決されます。
-以下のリンク先の被害報告にてその確認をすることができます。
+		このツールを利用して [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] の違反を報告してください。
 
-http://secondlife.com/support/incidentreport.php
+報告された嫌がらせはすべて調査・解決されます。 解決されたものは [http://secondlife.com/support/incidentreport.php Incident Report] で見ることができます。
 	</notification>
 	<notification name="HelpReportAbuseEmailEO">
-		重要： このレポートはLinden Lab 社ではなく、
-あなたが現在いる地域のオーナーに送られます。
--
-あなたが今いる地域のオーナーは、
-住人と訪問者へのサービスの一環として、この地域からのレポートをすべて受け付け、解決することに同意しています。
-よってLinden Lab 社が、
-あなたがここから提出するレポートを調査することはありません。
-地域のオーナーは、不動産約款で指定している地元の規則を基に、報告された問題を解決します。
-（「世界」のメニューから「土地情報」を選ぶと、約款を閲覧できます）
--
-このレポートに関する解決策は、この地域にだけ当てはまります。
-住人が[SECOND_LIFE] の他の地域へアクセスする際、
-このレポートの結果に影響されることはありません。
-Linden Lab 社だけが[SECOND_LIFE] 全域における
-アクセス制限権を持っています。
+		重要： この報告は Linden Lab には送信されず、現在あなたがいるリージョンの所有者に送信されます。
+
+住人や訪問者へのサービスの一環として、現在いるリージョンの所有者は、このリージョン内のすべての報告を自ら受け取り、解決するよう設定しています。 Linden Lab はここから送信された報告の調査を行いません。
+
+リージョンの所有者は、このリージョンの不動産約款に記載されたローカルルールに則って報告に対応します。
+（「世界」メニューの「土地情報」で約款を確認できます。）
+
+この報告への解決策は、このリージョンでのみ適用されます。 [SECOND_LIFE] のその他のエリアにアクセスする住人には、この報告の結果には影響がありません。 [SECOND_LIFE] へのアクセスを制限できるのは、Linden Lab だけです。
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		嫌がらせ報告のカテゴリを選択してください。
@@ -1823,28 +1820,17 @@ Linden Lab 社だけが[SECOND_LIFE] 全域における
 嫌がらせ報告の処理や保管に大変役立ちます。
 	</notification>
 	<notification name="HelpReportAbuseContainsCopyright">
-		住人の皆様へ、
+		こんにちは、
 
-知的財産の侵害に関する報告を行う際には、以下の点に注意してください。
+知的財産権の侵害を報告しようとしています。 正確に報告するために、以下をご確認ください：
 
-(1) 嫌がらせの報告のプロセス
-[SECOND_LIFE] の権限システムを悪用している住人を見つけたら、
-嫌がらせの報告を行ってください。
-例えばコピーBotの使用、それに似たツールの使用による知的財産権の侵害があります。
-アビューズチームは調査に基づき、
-[SECOND_LIFE] のコミュニティースタンダードや
-利用規約に違反する行為と判断された場合には適切な処置を行っています。
-ただし、コンテンツを[SECOND_LIFE] から撤去してほしい、
-といった要望にはアビューズチームは応えることができません。
+(1) 嫌がらせの報告の手順 住人が [SECOND_LIFE] の権限システムを悪用しているのを見つけたら、嫌がらせの報告をすることができます。例えば、CopyBot や似たようなコピーツールを使用して知的財産権を侵害している場合です。 担当チームは調査を行い、[SECOND_LIFE] [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] に違反する行為に対する適切な処罰を下します。  ただし、担当チームは [SECOND_LIFE] の世界からコンテンツを削除して欲しいというリクエストには応じません。
 
-(2) DMCA（デジタルミレニアム著作権法）及びコンテンツ撤去プロセス
-[SECOND_LIFE] からのコンテンツの撤去をリクエストするには、
-著作権侵害通知の提出を行う必要があります。
-参照： http://secondlife.com/corporate/dmca.php
+(2) DMCA またはコンテンツの撤去の手順 コンテンツを [SECOND_LIFE] から削除して欲しいというリクエストをするには、弊社 [http://secondlife.com/corporate/dmca.php DMCA ポリシー] で提示されているとおり、有効な侵害の通知を提出しなければなりません。.
 
-この件に関する嫌がらせの報告を続ける際は、このウィンドウを閉じてください。選択すべきカテゴリは「知的財産の侵害＞コピーBot及び権限の悪用」のほうが適しているかもしれませんのでご確認ください。
+このまま嫌がらせの報告を続けたい場合は、このウィンドウを閉じて報告を送ってください。  「コピーBot及び権限の悪用」のカテゴリを選んだ方が適切の場合があります。
 
-よろしくお願いします。
+ご協力ありがとうございます。
 
 Linden Lab
 	</notification>
@@ -1873,13 +1859,17 @@ Linden Lab
 			<button ignore="取り込み中の設定にしない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">
+		「 [FOLDERNAME] 」 は、システムフォルダです。 システムフォルダを削除すると不安定になることがあります。  続けますか？
+		<usetemplate ignoretext="システムフォルダを削除する前に確認する" name="okcancelignore" notext="キャンセル" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmEmptyTrash">
-		ゴミ箱の項目をすべて削除しますか？
-		<usetemplate ignoretext="持ち物のゴミ箱フォルダを空にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="OK"/>
+		ごみ箱の項目をすべて削除しますか？
+		<usetemplate ignoretext="持ち物のごみ箱フォルダを空にする前に確認する" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		トラベル、Web、検索の履歴をすべて削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
 		本当にクッキーをクリアしますか？
@@ -1974,7 +1964,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 	</notification>
 	<notification name="AutoWearNewClothing">
 		作成しようとしている衣類を自動的に装着しますか？
-		<usetemplate ignoretext="容姿編集画面で作成する衣類を装着する" name="okcancelignore" notext="いいえ" yestext="はい"/>
+		<usetemplate ignoretext="「マイ 容姿」を編集中に、作成する衣類を装着する" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		年齢確認を済ませていないとこの区画を訪れることができません。  [SECOND_LIFE] サイトで年齢の確認を行いますか？
@@ -2022,7 +2012,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		[FIRST] [LAST] はオフラインです。
 	</notification>
 	<notification name="AddSelfFriend">
-		残念ながら自分自身をフレンドに追加することはできません。
+		残念ながら自分自身をフレンド登録することはできません。
 	</notification>
 	<notification name="UploadingAuctionSnapshot">
 		インワールドとウェブ・サイトのスナップショットをアップロード中です...
@@ -2041,7 +2031,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		raw地形がダウンロードされました
 	</notification>
 	<notification name="GestureMissing">
-		ジェスチャー[NAME] がデータベースにありません。
+		ジェスチャーの [NAME] がデータベースに見つかりません。
 	</notification>
 	<notification name="UnableToLoadGesture">
 		ジェスチャー[NAME] を読み込むことができません。
@@ -2117,7 +2107,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		これをコピーする権限がありません。
 	</notification>
 	<notification name="InventoryAccepted">
-		[NAME]は、持ち物の提供を受け入れました。
+		[NAME] があなたが渡したアイテムを受け取りました。
 	</notification>
 	<notification name="InventoryDeclined">
 		[NAME]は、持ち物の提供を断りました。
@@ -2132,14 +2122,14 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		コーリング・カードが拒否されました。
 	</notification>
 	<notification name="TeleportToLandmark">
-		本土に到達しました。
-[NAME]などの場所にテレポートするには、画面右下にある「持ち物」ボタンをクリックし、ランドマーク（Landmarks）フォルダを選択してください。
-ランドマークをダブルクリックした後「テレポート」をクリックするとその場所へ移動します。
+		画面右の「場所」パネルを開いて、「ランドマーク」タブを選ぶと、[NAME] といった場所にテレポートできます。 
+好きなランドマークをクリックして選び、次にパネル下の「テレポート」をクリックします。
+（ランドマークをダブルクリック、または右クリックして「テレポート」を選んでも同じです。）
 	</notification>
 	<notification name="TeleportToPerson">
-		本土に到達しました。
-住人の[NAME]と接触するには、画面右下にある「持ち物」ボタンをクリックし、コーリングカード（Calling Cards）フォルダを選択してください。
-カードをダブルクリックし、「IMを送る」をクリックし、メッセージを送信してください。
+		画面右の「人」パネルを開いて、[NAME] といった住人に連絡を取ることができます。
+リストから住人を選択して、パネル下の「IM」をクリックします。
+（リストの名前をダブルクリック、または右クリックして「IM」を選んでも同じです。）
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		サーバーの境界を越えて土地を選択することできません。
@@ -2187,8 +2177,8 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 [NAMES]
 	</notification>
 	<notification name="NoQuickTime">
-		Apple社のQuickTimeがシステムにインストールされていないと思われます。
-ストリーミング・メディアの再生を行いたい場合は、QuickTimeのサイト（http：//www.apple.com/quicktime）にアクセスして、QuickTime Player をインストールしてください。
+		Apple の QuickTime ソフトウェアがお使いのシステムにインストールされていないようです。
+ストリーミングメディアをサポートする区画で見たい場合は、[http://www.apple.com/jp/quicktime QuickTime サイト] から QuickTime プレイヤーをインストールしてください。
 	</notification>
 	<notification name="NoPlugin">
 		「 [MIME_TYPE] 」の MIME タイプを扱うメディアプラグインが見つかりませんでした。  このタイプのメディアはご利用いただけません。
@@ -2222,6 +2212,11 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 	<notification name="UnOwnedObjectsReturned">
 		選択された土地の区画上にあり、あなたの所有で「なかった」オブジェクトは、本来のオーナーに返却されました。
 	</notification>
+	<notification name="ServerObjectMessage">
+		[NAME] からのメッセージ：
+[MSG]
+		<usetemplate name="okcancelbuttons" notext="OK" yestext="調べる"/>
+	</notification>
 	<notification name="NotSafe">
 		この土地ではダメージが有効です。
 ケガをするかもしれません。 死んでしまった場合はホームにテレポートされます。
@@ -2231,8 +2226,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 ここでは飛べません。
 	</notification>
 	<notification name="PushRestricted">
-		このエリアではプッシュが制限されています。
-土地所有者以外は他人をプッシュすることはできません。
+		このエリアではプッシュが制限されています。 土地所有者以外は他人をプッシュすることはできません。
 	</notification>
 	<notification name="NoVoice">
 		このエリアではボイスチャットが無効です。 誰かが話しているのを聞くことはできません。
@@ -2268,6 +2262,9 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 	<notification name="ImproperPaymentStatus">
 		この地域（リージョン）に入るために適した支払いステータスがありません。
 	</notification>
+	<notification name="MustGetAgeRgion">
+		このリージョンに入るには年齢確認済みである必要があります。
+	</notification>
 	<notification name="MustGetAgeParcel">
 		この区画に入るには年齢確認済みである必要があります。
 	</notification>
@@ -2330,33 +2327,35 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		有効な区画が見つかりませんでした。
 	</notification>
 	<notification name="ObjectGiveItem">
-		[FIRST] [LAST]所有の、
-[OBJECTFROMNAME]から、
-[OBJECTNAME]という[OBJECTTYPE]が送られてきました。
+		[NAME_SLURL] が所有する [OBJECTFROMNAME] が、あなたに [OBJECTTYPE] ：
+[ITEM_SLURL] を渡しました
 		<form name="form">
 			<button name="Keep" text="受け取る"/>
 			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="無視リストへ"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="ObjectGiveItemUnknownUser">
-		（未知のユーザー） 所有の[OBJECTFROMNAME]から、
-あなたに[OBJECTNAME]という[OBJECTTYPE]が送られてきました。
+		（不明の住人）が所有する [OBJECTFROMNAME] が、あなたに [OBJECTTYPE] ：
+[ITEM_SLURL] を渡しました
 		<form name="form">
 			<button name="Keep" text="受け取る"/>
 			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="無視リストへ"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME]は、あなたに[OBJECTNAME]という名前の[OBJECTTYPE]を渡しました。
+		[NAME_SLURL] があなたに [OBJECTTYPE]：
+[ITEM_SLURL] を渡しました
 		<form name="form">
 			<button name="Keep" text="受け取る"/>
+			<button name="Show" text="表示"/>
 			<button name="Discard" text="破棄"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
 		[NAME]
+
 [MESSAGE]
 	</notification>
 	<notification name="JoinGroup">
@@ -2368,7 +2367,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME]はあなたをテレポートで呼び寄せようとしています：
+		[NAME] はテレポートであなたを呼んでいます。
 
 [MESSAGE]
 		<form name="form">
@@ -2422,8 +2421,8 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		</form>
 	</notification>
 	<notification name="RegionRestartMinutes">
-		この地域は[MINUTES]分後に再起動されます。
-強制ログアウトとなりますので、この地域の外に出てください。
+		このリージョンは [SECONDS] 分後に再起動されます。
+このままここにいるとログアウトされます。
 	</notification>
 	<notification name="RegionRestartSeconds">
 		このリージョンは [SECONDS] 秒後に再起動されます。.
@@ -2447,7 +2446,7 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		データベースに[DESC]という名前の[TYPE]が見つかりませんでした。
 	</notification>
 	<notification name="InvalidWearable">
-		着用しようとしているアイテムはあなたのビューワでは読み込むことができません。 [APP_NAME]ビューワを最新のものにアップグレードしてからこのアイテムを着用してください。
+		着用しようとしているアイテムはあなたのビューワでは読み込むことができません。 [APP_NAME] のバージョンをアップグレードしてからこのアイテムを着用してください。
 	</notification>
 	<notification name="ScriptQuestion">
 		「[NAME]」が所有するオブジェクト「[OBJECTNAME]」を：
@@ -2457,11 +2456,11 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 		<form name="form">
 			<button name="Yes" text="はい"/>
 			<button name="No" text="いいえ"/>
-			<button name="Mute" text="無視リストに追加"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		[NAME] 所有の「 [OBJECTNAME] 」 というオブジェクトが次のことをしようとしています：
+		[NAME] が所有する「 [OBJECTNAME] 」 というオブジェクトが、次のことをしようとしています：
 
 [QUESTIONS]
 このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。
@@ -2487,14 +2486,29 @@ Webページにこれをリンクすると、他人がこの場所に簡単に�
 			<button name="Ignore" text="無視する"/>
 		</form>
 	</notification>
+	<notification name="ScriptToast">
+		[FIRST] [LAST] の「 [TITLE] 」は、ユーザーインプットをリクエストしています。
+		<form name="form">
+			<button name="Open" text="ダイアログを開く"/>
+			<button name="Ignore" text="無視"/>
+			<button name="Block" text="ブロック"/>
+		</form>
+	</notification>
 	<notification name="FirstBalanceIncrease">
-		L$[AMOUNT] を受け取りました。
+		L$ [AMOUNT] を受け取りました。
 あなたの L$ 残高は画面右上に表示されています。
 	</notification>
 	<notification name="FirstBalanceDecrease">
-		L$[AMOUNT] を支払いました。
+		L$ [AMOUNT] を支払いました。
 あなたの L$ 残高は画面右上に表示されています。
 	</notification>
+	<notification name="BuyLindenDollarSuccess">
+		お支払ありがとうございます。
+
+あなたの L$ 残高は、処理が完了するとアップデートされます。 処理に 20 分以上かかった場合、お取り引きがキャンセルされることがあります。 その場合は、購入金額はあなたの US$ 残高に追加されます。
+
+[http://secondlife.com/account/ マイアカウント] の取引履歴ページで、支払状況を確認できます。
+	</notification>
 	<notification name="FirstSit">
 		着席中です。
 周囲を見るには矢印キーか AWSD キーを使ってください。
@@ -2535,65 +2549,64 @@ Mキーを押して変更します。
 ここで制作されたものは時間が経つと削除されます。制作したアイテムを右クリックして「取る」を選び、持ち物に入れてお持ち帰りするのをお忘れなく。
 	</notification>
 	<notification name="FirstFlexible">
-		このオブジェクトはフレキシブルです。 フレキシブルオブジェクトは、「物理」ではなく「ファントム」でなければなりません。
+		このオブジェクトはフレキシブルです。 フレキシスは、「物理」ではなく「ファントム」でなければなりません。
 	</notification>
 	<notification name="FirstDebugMenus">
 		アドバンスメニューを開きました。
 
-このメニューの有効・無効設定：
+このメニューの有効・無効設定
   Windows： Ctrl+Alt+D
-  Mac： ⌘-Opt+D
+  Mac： &#8997;&#8984;D
 	</notification>
 	<notification name="FirstSculptedPrim">
-		スカルプトプリムを編集中です。 スカルプトプリムには形状の輪郭を指定するための特別なテクスチャが必要です。
+		スカルプトプリムを編集中です。 スカルプトには形状の輪郭を指定するための特別なテクスチャが必要です。
 	</notification>
 	<notification name="MaxListSelectMessage">
 		このリストから[MAX_SELECT]個までのアイテムを選択できます。
 	</notification>
 	<notification name="VoiceInviteP2P">
-		[NAME]が、あなたをボイスチャットコールに招待しています。
-コールに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。このコールをしている人をミュートにする場合は「ミュート」をクリックしてください。
+		[NAME] があなたをボイスチャットコールに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ミュート"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="AutoUnmuteByIM">
-		[FIRST] [LAST]に
-インスタント・メッセージが送信され、無視設定は自動的に解除されました。
+		[FIRST] [LAST] はインスタントメッセージを受け取り、自動的にブロックが解除されました。
 	</notification>
 	<notification name="AutoUnmuteByMoney">
-		[FIRST] [LAST]にお金を渡したため、 無視設定が自動的に解除されました。
+		[FIRST] [LAST] はお金を受け取り、自動的にブロックが解除されました。
 	</notification>
 	<notification name="AutoUnmuteByInventory">
-		[FIRST] [LAST]に持ち物を渡したため、 無視設定が自動的に解除されました。
+		[FIRST] [LAST] はアイテムを受け取り、自動的にブロックが解除されました。
 	</notification>
 	<notification name="VoiceInviteGroup">
-		[NAME]が、 グループ[GROUP]とのボイスチャットコールに参加しました。
-コールに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。このコールをしている人をミュートにする場合は「ミュート」をクリックしてください。
+		[NAME] は [GROUP]. のボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ミュート"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="VoiceInviteAdHoc">
-		[NAME]が、 会議チャットでボイスチャットコールに参加しました。
-コールに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。 このユーザーをミュート（消声）する場合は「ミュート」をクリックしてください。
+		[NAME] は コンファレンスチャットののボイスチャットコールに参加しました。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ミュート"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="InviteAdHoc">
-		[NAME]が、 あなたを会議チャットに招待しています。
-チャットに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。このユーザーをミュート（消声）する場合は「ミュート」をクリックしてください。
+		[NAME] があなたをコンファレンスチャットに招待しています。
+受け入れるをクリックするか、断る場合は拒否をクリックしてください。 ブロックをクリックすると、この発信者をブロックします。
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="拒否"/>
-			<button name="Mute" text="ミュート"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="VoiceChannelFull">
@@ -2603,19 +2616,19 @@ Mキーを押して変更します。
 		このエリアのボイスチャットは、混雑のため容量を超えてしまっています。申し訳ありませんが、他のエリアでボイスチャットをお試しください。
 	</notification>
 	<notification name="VoiceChannelDisconnected">
-		[VOICE_CHANNEL_NAME]への接続が切断されました。空間ボイスチャットに再接続されます。
+		[VOICE_CHANNEL_NAME] への接続が切れました。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME]は、コールを終了しました。空間ボイスチャットに再接続されます。
+		[VOICE_CHANNEL_NAME] がコールを終了しました。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME]は、あなたのコールを拒否しました。空間ボイスチャットに再接続されます。
+		[VOICE_CHANNEL_NAME] があなたのコールを拒否しました。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME]は、あなたのコールを受け取れません。空間ボイスチャットに再接続されます。
+		[VOICE_CHANNEL_NAME] はあなたのコールを受けることができません。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="VoiceChannelJoinFailed">
-		[VOICE_CHANNEL_NAME]への接続に失敗しました。時間をおいて、再度、試みてください。空間ボイスチャットに再接続されます。
+		[VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="VoiceLoginRetry">
 		あなた用のボイスチャンネルを作成しています。1分ほどかかります。
@@ -2636,29 +2649,43 @@ Mキーを押して変更します。
 		[VOICE_CHANNEL_NAME]のボイス・チャットに接続中に、エラーが発生しました。後でもう一度お試しください。
 	</notification>
 	<notification name="ServerVersionChanged">
-		異なるサーバーバージョンのリージョンに来ました。パフォーマンスに影響があるかもしれません。 クリックしてリリースノートを確認してみてください。
+		異なるサーバーバージョンのリージョンに来ました。パフォーマンスに影響することがあります。 [[URL] リリースノートを確認]
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
 		クリックした SLurl はサポートされていません。
 	</notification>
 	<notification name="IMToast">
+		[MESSAGE]
 		<form name="form">
 			<button name="respondbutton" text="返答"/>
 		</form>
 	</notification>
 	<notification name="AttachmentSaved">
-		付属物（アタッチメント）が保存されました。
+		アタッチメントが保存されました。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		ヘルプトピックが見つかりませんでした。
 	</notification>
+	<notification name="ObjectMediaFailure">
+		サーバーエラー： メディアのアップデートまたは失敗。
+「[ERROR]」
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearTeleportHistory">
+		テレポート履歴を削除しますか？
+		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
+	</notification>
+	<notification name="BottomTrayButtonCanNotBeShown">
+		選択したボタンを現在表示することができません。
+じゅうぶんなスペースができればボタンは表示されます。
+	</notification>
 	<global name="UnsupportedCPU">
 		- あなたの CPU の速度は必須動作環境の条件を満たしていません。
 	</global>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
 
-この問題が何度も起きる場合は、[SUPPORT_SITE] へご連絡ください。
+この問題が何度も起きる場合は、[SUPPORT_SITE] をご確認ください。
 	</global>
 	<global name="UnsupportedCPUAmount">
 		796
@@ -2672,14 +2699,8 @@ Mキーを押して変更します。
 	<global name="UnsupportedRAM">
 		- あなたのシステム・メモリは必須動作環境の条件を満たしていません。
 	</global>
-	<global name="PermYes">
-		はい
-	</global>
-	<global name="PermNo">
-		いいえ
-	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
-		自分の土地をお持ちの場合、ホームロケーションに設定できます。 
+		自分の土地をお持ちの場合、ホームロケーションに設定できます。
 お持ちでない場合は、地図で「インフォハブ」を探してください。
 	</global>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_activeim_row.xml b/indra/newview/skins/default/xui/ja/panel_activeim_row.xml
new file mode 100644
index 0000000000..84272752cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_activeim_row.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_activeim_row">
+	<text name="contact_name">
+		Grumpity ProductEngine
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..364ba76763
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<panel name="panel_call_buttons">
+		<button label="コール" name="call_btn"/>
+		<button label="コール終了" name="end_call_btn"/>
+		<button label="ボイスコントロール" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
new file mode 100644
index 0000000000..2efcb9f723
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_list_item">
+	<string name="FormatSeconds">
+		[COUNT] 秒
+	</string>
+	<string name="FormatMinutes">
+		[COUNT] 分
+	</string>
+	<string name="FormatHours">
+		[COUNT] 時間
+	</string>
+	<string name="FormatDays">
+		[COUNT] 日
+	</string>
+	<string name="FormatWeeks">
+		[COUNT] 週間
+	</string>
+	<string name="FormatMonths">
+		[COUNT] ヶ月
+	</string>
+	<string name="FormatYears">
+		[COUNT] 年
+	</string>
+	<text name="avatar_name" value="不明"/>
+	<text name="last_interaction" value="0 秒"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
new file mode 100644
index 0000000000..fd91ea97d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_tag_notification">
+	<panel name="msg_caption">
+		<text name="sender_tag_name">
+			Angela Tester
+		</text>
+		<text name="tag_time" value="23:30"/>
+	</panel>
+	<text_editor name="msg_text">
+		The quick brown fox jumps over the lazy dog.
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..58ef8c3107
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="block_list_panel">
+	<text name="title_text">
+		ブロックリスト
+	</text>
+	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+	<button label="住人をブロック..." label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
+	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
+	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
new file mode 100644
index 0000000000..5edc1b651d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray">
+	<string name="SpeakBtnToolTip">
+		マイクのオン・オフ
+	</string>
+	<string name="VoiceControlBtnToolTip">
+		ボイスコントロールパネルの表示・非表示
+	</string>
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="gesture_panel">
+			<gesture_combo_box label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
+		</layout_panel>
+		<layout_panel name="movement_panel">
+			<button label="移動" name="movement_btn" tool_tip="移動コントロールの表示・非表示"/>
+		</layout_panel>
+		<layout_panel name="cam_panel">
+			<button label="視界" name="camera_btn" tool_tip="カメラコントロールの表示・非表示"/>
+		</layout_panel>
+		<layout_panel name="snapshot_panel">
+			<button label="" name="snapshots" tool_tip="スナップショットを撮る"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
new file mode 100644
index 0000000000..babbff3132
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_header" name="im_header">
+	<text_editor name="user_name" value="Ericag Vader"/>
+	<text name="time_box" value="23:30"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
new file mode 100644
index 0000000000..1a5933a4e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_classified_info">
+	<panel.string name="type_mature">
+		Mature
+	</panel.string>
+	<panel.string name="type_pg">
+		PG コンテンツ
+	</panel.string>
+	<text name="title" value="クラシファイド広告情報"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text name="classified_name" value="[name]"/>
+			<text name="classified_location" value="[loading...]"/>
+			<text name="content_type" value="[content type]"/>
+			<text name="category" value="[category]"/>
+			<check_box label="毎週自動更新" name="auto_renew"/>
+			<text name="price_for_listing" tool_tip="掲載価格">
+				L$ [PRICE]
+			</text>
+			<text name="classified_desc" value="[description]"/>
+		</panel>
+	</scroll_container>
+	<panel name="buttons">
+		<button label="テレポート" name="teleport_btn"/>
+		<button label="地図" name="show_on_map_btn"/>
+		<button label="編集" name="edit_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
new file mode 100644
index 0000000000..7825d81c53
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_alpha_panel">
+	<panel name="avatar_alpha_color_panel">
+		<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
new file mode 100644
index 0000000000..ca065113d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="クラシファイド広告の編集" name="panel_edit_classified">
+	<panel.string name="location_notice">
+		（掲載後更新）
+	</panel.string>
+	<text name="title">
+		クラシファイド広告の編集
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
+			<text name="Name:">
+				タイトル：
+			</text>
+			<text name="description_label">
+				説明：
+			</text>
+			<text name="location_label">
+				位置：
+			</text>
+			<text name="classified_location">
+				ローディング...
+			</text>
+			<button label="現在地に設定" name="set_to_curr_location_btn"/>
+			<combo_box name="content_type">
+				<combo_item name="mature_ci">
+					Matureコンテンツ
+				</combo_item>
+				<combo_item name="pg_ci">
+					PGコンテンツ
+				</combo_item>
+			</combo_box>
+			<spinner label="L$" name="price_for_listing" tool_tip="掲載価格" value="50"/>
+			<check_box label="毎週自動更新" name="auto_renew"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="保存" name="save_changes_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
new file mode 100644
index 0000000000..0cee85f685
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_eyes_panel">
+	<panel name="avatar_eye_color_panel">
+		<texture_picker label="瞳" name="Iris" tool_tip="クリックして写真を選択します"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="eyes_main_tab" title="目"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
new file mode 100644
index 0000000000..393bd15236
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_gloves_panel">
+	<panel name="avatar_gloves_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="gloves_main_tab" title="手袋"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
new file mode 100644
index 0000000000..065771df16
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_hair_panel">
+	<panel name="avatar_hair_color_panel">
+		<texture_picker label="テクスチャ" name="Texture" tool_tip="クリックして写真を選択"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="hair_color_tab" title="色"/>
+		<accordion_tab name="hair_style_tab" title="スタイル"/>
+		<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
+		<accordion_tab name="hair_facial_tab" title="フェイシャル"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
new file mode 100644
index 0000000000..96a851cc4c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_jacket_panel">
+	<panel name="avatar_jacket_color_panel">
+		<texture_picker label="生地・上" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="生地・下" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="jacket_main_tab" title="ジャケット"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
new file mode 100644
index 0000000000..f93d3d6b14
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_pants_panel">
+	<panel name="avatar_pants_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="pants_main_tab" title="パンツ"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
new file mode 100644
index 0000000000..88c05fbae7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ピック編集" name="panel_edit_pick">
+	<text name="title">
+		ピック編集
+	</text>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<icon label="" name="edit_icon" tool_tip="クリックして画像を選択"/>
+			<text name="Name:">
+				タイトル：
+			</text>
+			<text name="description_label">
+				説明：
+			</text>
+			<text name="location_label">
+				場所：
+			</text>
+			<text name="pick_location">
+				ローディング...
+			</text>
+			<button label="現在地に設定" name="set_to_curr_location_btn"/>
+		</panel>
+	</scroll_container>
+	<panel label="bottom_panel" name="bottom_panel">
+		<button label="[WHAT] を保存" name="save_changes_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
index 5654245570..8af0802ac2 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile Edit" name="edit_profile_panel">
+<panel label="プロフィールの編集" name="edit_profile_panel">
 	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="RegisterDateFormat">
+		[REG_DATE] ([AGE])
 	</string>
 	<string name="AcctTypeResident" value="住人"/>
 	<string name="AcctTypeTrial" value="トライアル"/>
-	<string name="AcctTypeCharterMember" value="特権メンバー"/>
-	<string name="AcctTypeEmployee" value="Linden Lab従業員"/>
-	<string name="PaymentInfoUsed" value="支払い情報登録済"/>
-	<string name="PaymentInfoOnFile" value="支払い情報登録済み"/>
-	<string name="NoPaymentInfoOnFile" value="支払い情報未登録"/>
-	<string name="AgeVerified" value="年齢確認済み"/>
+	<string name="AcctTypeCharterMember" value="創立メンバー"/>
+	<string name="AcctTypeEmployee" value="Linden Lab 従業員"/>
+	<string name="PaymentInfoUsed" value="支払情報使用履歴あり"/>
+	<string name="PaymentInfoOnFile" value="支払情報登録済"/>
+	<string name="NoPaymentInfoOnFile" value="支払情報未登録"/>
+	<string name="AgeVerified" value="年齢確認済"/>
 	<string name="NotAgeVerified" value="年齢未確認"/>
 	<string name="partner_edit_link_url">
 		http://www.secondlife.com/account/partners.php?lang=ja
@@ -20,14 +24,28 @@
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
 				<panel name="lifes_images_panel">
+					<panel name="second_life_image_panel">
+						<text name="second_life_photo_title_text" value="[SECOND_LIFE]："/>
+					</panel>
 					<icon label="" name="2nd_life_edit_icon" tool_tip="クリックして画像を選択"/>
 				</panel>
+				<panel name="first_life_image_panel">
+					<text name="real_world_photo_title_text" value="現実世界："/>
+				</panel>
 				<icon label="" name="real_world_edit_icon" tool_tip="クリックして画像を選択"/>
 				<text name="title_homepage_text">
 					Web サイト：
 				</text>
+				<line_editor name="homepage_edit" value="http://"/>
 				<check_box label="検索結果に表示" name="show_in_search_checkbox"/>
-				<text name="title_acc_status_text" value="アカウントの状態："/>
+				<text name="title_acc_status_text" value="マイアカウント："/>
+				<text name="my_account_link" value="マイアカウントに移動"/>
+				<text name="acc_status_text" value="住人。 支払情報未登録。"/>
+				<text name="title_partner_text" value="マイパートナー："/>
+				<text name="partner_edit_link" value="[[URL] 編集]"/>
+				<panel name="partner_data_panel">
+					<text name="partner_text" value="[FIRST] [LAST]"/>
+				</panel>
 			</panel>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
new file mode 100644
index 0000000000..1e20eb26b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shape_panel">
+	<panel name="avatar_sex_panel">
+		<text name="gender_text">
+			性別：
+		</text>
+		<radio_group name="sex_radio">
+			<radio_item label="女性" name="radio"/>
+			<radio_item label="男性" name="radio2"/>
+		</radio_group>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shape_body_tab" title="身体"/>
+		<accordion_tab name="shape_head_tab" title="頭"/>
+		<accordion_tab name="shape_eyes_tab" title="目"/>
+		<accordion_tab name="shape_ears_tab" title="耳"/>
+		<accordion_tab name="shape_nose_tab" title="鼻"/>
+		<accordion_tab name="shape_mouth_tab" title="口"/>
+		<accordion_tab name="shape_chin_tab" title="あご"/>
+		<accordion_tab name="shape_torso_tab" title="頭"/>
+		<accordion_tab name="shape_legs_tab" title="脚"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
new file mode 100644
index 0000000000..b2eb8fa18e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/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="生地" name="Fabric" tool_tip="クリックして写真を選択"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shirt_main_tab" title="シャツ"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
new file mode 100644
index 0000000000..83e302f8f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shoes_panel">
+	<panel name="avatar_shoes_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="shoes_main_tab" title="靴"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
new file mode 100644
index 0000000000..cd7efbec68
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skin_panel">
+	<panel name="avatar_skin_color_panel">
+		<texture_picker label="頭部のタトゥー" name="Head Tattoos" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="上部のタトゥー" name="Upper Tattoos" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="下部のタトゥー" name="Lower Tattoos" tool_tip="クリックして写真を選択"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="skin_color_tab" title="肌の色"/>
+		<accordion_tab name="skin_face_tab" title="顔の詳細"/>
+		<accordion_tab name="skin_makeup_tab" title="メイクアップ"/>
+		<accordion_tab name="skin_body_tab" title="身体の詳細"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
new file mode 100644
index 0000000000..0a0936a3a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_skirt_panel">
+	<panel name="avatar_skirt_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="skirt_main_tab" title="スカート"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
new file mode 100644
index 0000000000..7cbc75624f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_socks_panel">
+	<panel name="avatar_socks_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="socks_main_tab" title="靴下"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
new file mode 100644
index 0000000000..d6aec87b45
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/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="頭部のタトゥー" name="Head Tattoo" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="上部のタトゥー" name="Upper Tattoo" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="下部のタトゥー" name="Lower Tattoo" tool_tip="クリックして写真を選択"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
new file mode 100644
index 0000000000..9287463b2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_underpants_panel">
+	<panel name="avatar_underpants_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="underpants_main_tab" title="下着パンツ"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
new file mode 100644
index 0000000000..085ad97384
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_undershirt_panel">
+	<panel name="avatar_undershirt_color_panel">
+		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
+	</panel>
+	<accordion name="wearable_accordion">
+		<accordion_tab name="undershirt_main_tab" title="下着シャツ"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
new file mode 100644
index 0000000000..2ae8e1863e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="着用可能なもの" name="panel_edit_wearable">
+	<string name="edit_shape_title">
+		シェイプを編集中
+	</string>
+	<string name="edit_skin_title">
+		スキンを編集中
+	</string>
+	<string name="edit_hair_title">
+		髪を編集中
+	</string>
+	<string name="edit_eyes_title">
+		目を編集中
+	</string>
+	<string name="edit_shirt_title">
+		シャツを編集中
+	</string>
+	<string name="edit_pants_title">
+		パンツを編集中
+	</string>
+	<string name="edit_shoes_title">
+		靴を編集中
+	</string>
+	<string name="edit_socks_title">
+		靴下を編集中
+	</string>
+	<string name="edit_jacket_title">
+		ジャケットを編集中
+	</string>
+	<string name="edit_skirt_title">
+		スカートを編集中
+	</string>
+	<string name="edit_gloves_title">
+		手袋を編集中
+	</string>
+	<string name="edit_undershirt_title">
+		下着（上）を編集中
+	</string>
+	<string name="edit_underpants_title">
+		下着（下）を編集中
+	</string>
+	<string name="edit_alpha_title">
+		アルファマスクを編集中
+	</string>
+	<string name="edit_tattoo_title">
+		タトゥーを編集中
+	</string>
+	<string name="shape_desc_text">
+		シェイプ：
+	</string>
+	<string name="skin_desc_text">
+		スキン：
+	</string>
+	<string name="hair_desc_text">
+		髪：
+	</string>
+	<string name="eyes_desc_text">
+		目：
+	</string>
+	<string name="shirt_desc_text">
+		シャツ：
+	</string>
+	<string name="pants_desc_text">
+		パンツ：
+	</string>
+	<string name="shoes_desc_text">
+		靴：
+	</string>
+	<string name="socks_desc_text">
+		靴下：
+	</string>
+	<string name="jacket_desc_text">
+		ジャケット：
+	</string>
+	<string name="skirt_skirt_desc_text">
+		スカート：
+	</string>
+	<string name="gloves_desc_text">
+		手袋：
+	</string>
+	<string name="undershirt_desc_text">
+		下着シャツ：
+	</string>
+	<string name="underpants_desc_text">
+		下着パンツ：
+	</string>
+	<string name="alpha_desc_text">
+		アルファマスク：
+	</string>
+	<string name="tattoo_desc_text">
+		タトゥ：
+	</string>
+	<text name="edit_wearable_title" value="シェイプを編集中"/>
+	<panel label="シャツ" name="wearable_type_panel">
+		<text name="description_text" value="シェイプ："/>
+	</panel>
+	<panel name="button_panel">
+		<button label="別名で保存" name="save_as_button"/>
+		<button label="元に戻す" name="revert_button"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
new file mode 100644
index 0000000000..5369daed03
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<button label="グループ情報" name="group_info_btn"/>
+	<panel name="panel_call_buttons">
+		<button label="グループにコール" name="call_btn"/>
+		<button label="コール終了" name="end_call_btn"/>
+		<button label="ボイスコントロールを開く" name="voice_ctrls_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index 43e3ca69ef..98b118f58f 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -1,74 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_tab">
-	<string name="help_text">
-		「一般」タブには、このグループに関する
-一般情報、オーナーと表示可能なメンバーのリスト 
-一般的な「グループ環境設定」、メンバーのオプションが含まれます。
+	<panel.string name="help_text">
+		「一般」タブには、メンバー一覧、設定、メンバーのオプションなど、このグループに関する一般的な情報が記されています。
 
-オプションの上でマウスカーソルを動かすと、ヘルプ情報を得られます。
-	</string>
-	<string name="group_info_unchanged">
-		グループ設定が変更されました。
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<line_editor label="新しいグループ名をここに入力してください。" name="group_name_editor" width="330"/>
-	<text name="group_name" width="330">
-		新しいグループ名をここに入力してください。
-	</text>
-	<text name="prepend_founded_by">
-		創設者
-	</text>
-	<text name="founder_name">
-		（待機中）
-	</text>
-	<text name="group_charter_label">
-		グループ理念
-	</text>
-	<texture_picker label="グループ記章" name="insignia" tool_tip="写真をクリックして選択"/>
+オプションにマウスカーソルを当てると詳しい説明が表示されます。
+	</panel.string>
+	<panel.string name="group_info_unchanged">
+		一般的なグループ情報が変更されました。
+	</panel.string>
+	<panel.string name="incomplete_member_data_str">
+		メンバー・データを検索
+	</panel.string>
 	<text_editor name="charter">
 		グループの理念、指針を記入してください
 	</text_editor>
-	<button label="参加する（L$0）" label_selected="参加する（L$0）" name="join_button"/>
-	<button label="詳細表示" label_selected="詳細表示" name="info_button"/>
-	<text name="text_owners_and_visible_members">
-		オーナーと公開メンバー
-	</text>
-	<text name="text_owners_are_shown_in_bold">
-		（オーナーは太字で表示されています）
-	</text>
 	<name_list name="visible_members">
-		<name_list.columns label="メンバー名" name="name"/>
+		<name_list.columns label="メンバー" name="name"/>
 		<name_list.columns label="タイトル" name="title"/>
-		<name_list.columns label="最終ログイン" name="online"/>
 	</name_list>
-	<text name="text_group_preferences">
-		グループ環境設定
+	<text name="active_title_label">
+		私のタイトル
 	</text>
+	<combo_box name="active_title" tool_tip="このグループをアクティブにしたときに、アバター名の上に表示されるタイトルを設定します。"/>
+	<check_box label="通知を受信" name="receive_notices" tool_tip="このグループからの通知を受信するかどうかの設定を行います。  グループからスパムが送られてくる場合はこのボックスのチェックを外してください。"/>
+	<check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="あなたのプロフィールにこのグループを表示するかどうかの設定を行います。"/>
 	<panel name="preferences_container">
-		<check_box label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/>
-		<check_box label="会員募集" name="open_enrollement" tool_tip="招待状なしに自由にこのグループに加入することを許可するかどうかを指定します"/>
-		<check_box label="入会費：" name="check_enrollment_fee" tool_tip="このグループへの参加に入会費を必須とするかどうかを指定します"/>
-		<spinner name="spin_enrollment_fee" tool_tip="「入会費」がチェックされている場合、新規会員は入会時にここに指定された金額を支払う必要があります"/>
-		<combo_box name="group_mature_check" tool_tip="グループ情報がMature向けかどうかの設定をします。">
-			<combo_box.item name="select_mature" label="- Matureの選択 -"/>
-			<combo_box.item name="mature" label="Matureコンテンツ"/>
-			<combo_box.item name="pg" label="PGコンテンツ"/>
+		<check_box label="会員募集" name="open_enrollement" tool_tip="招待されなくても新規メンバーが加入できるかどうかを設定します。"/>
+		<check_box label="入会費" name="check_enrollment_fee" tool_tip="入会費が必要かどうかを設定します。"/>
+		<spinner label="L$" name="spin_enrollment_fee" tool_tip="「入会費」にチェックが入っている場合、新規メンバーは指定された入会費を支払わなければグループに入れません。"/>
+		<check_box initial_value="true" label="検索に表示" name="show_in_group_list" tool_tip="このグループを検索結果に表示させます"/>
+		<combo_box name="group_mature_check" tool_tip="グループ情報が Mature 向けかどうかの設定をします。">
+			<combo_box.item label="PGコンテンツ" name="pg"/>
+			<combo_box.item label="Matureコンテンツ" name="mature"/>
 		</combo_box>
-		<panel name="title_container">
-			<text name="active_title_label">
-				私のアクティブ・タイトル
-			</text>
-			<combo_box name="active_title" tool_tip="このグループをアクティブ設定にした際アバターのネームタグに表示されるタイトルの設定"/>
-		</panel>
-		<check_box label="グループ通知を受信" name="receive_notices" tool_tip="グループからの通知を受信するかどうかを指定します。 このグループがスパム行為をしている場合は、このボックスのチェックを外してください"/>
-		<check_box label="プロフィールに表示" name="list_groups_in_profile" tool_tip="このグループをあなたのプロフィールに表示するかどうかを設定します"/>
 	</panel>
-	<string name="incomplete_member_data_str">
-		メンバー・データを検索
-	</string>
-	<string name="confirm_group_create_str">
-		このグループの作成にはL$100かかります。 
-このグループの作成にL$100ものお金をかけてもかまいませんか？ 慎重に判断してください。
-48時間以内に誰もこのグループに参加しなかった場合、グループは解体され、グループの名前は今後使用できなくなります。
-	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
new file mode 100644
index 0000000000..7c8cb85990
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="グループ情報" name="GroupInfo">
+	<panel.string name="default_needs_apply_text">
+		現在のタブには、保存されていない変更があります。
+	</panel.string>
+	<panel.string name="want_apply_text">
+		変更を保存しますか？
+	</panel.string>
+	<panel.string name="group_join_btn">
+		参加 （L$[AMOUNT]）
+	</panel.string>
+	<panel.string name="group_join_free">
+		無料
+	</panel.string>
+	<text name="group_name" value="（ローディング...）"/>
+	<line_editor label="新しいグループの名前を入力" name="group_name_editor"/>
+	<texture_picker label="" name="insignia" tool_tip="クリックして写真を選択します"/>
+	<text name="prepend_founded_by">
+		創始者：
+	</text>
+	<name_box initial_value="（取得中）" name="founder_name"/>
+	<text name="join_cost_text">
+		無料
+	</text>
+	<button label="参加します！" name="btn_join"/>
+	<accordion name="groups_accordion">
+		<accordion_tab name="group_general_tab" title="一般"/>
+		<accordion_tab name="group_roles_tab" title="役割"/>
+		<accordion_tab name="group_notices_tab" title="通知"/>
+		<accordion_tab name="group_land_tab" title="土地・資産"/>
+	</accordion>
+	<panel name="button_row">
+		<button label="作成" label_selected="新しいグループ" name="btn_create"/>
+		<button label="保存" label_selected="保存" name="btn_apply"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 815bb93e66..eddb0c3612 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -7,7 +7,7 @@
 		(ローディング．．．)
 	</panel.string>
 	<panel.string name="already_in_group">
-		何人かのアバターは既にグループに入っているため招待されませんでした。
+		何人かのアバターは既にグループ加入済みのため、招待されませんでした。
 	</panel.string>
 	<text bottom_delta="-96" font="SansSerifSmall" height="72" name="help_text">
 		あなたのグループに一度に複数の
@@ -16,12 +16,12 @@
 をクリックしてください。
 	</text>
 	<button bottom_delta="-10" label="リストから住人を選択" name="add_button" tool_tip=""/>
-	<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="複数の住人を選択するには、Ctrlキーを押しながら住人名をクリックします。"/>
-	<button label="リストから選択したものを削除" name="remove_button" tool_tip="上で選択した居住者を招待リストから削除します。"/>
+	<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Ctrl キーを押しながら複数の住人をクリックできます"/>
+	<button label="リストから選択したものを削除" name="remove_button" tool_tip="招待リストから上で選択した住人を削除します"/>
 	<text name="role_text">
 		割り当て先の役割を選択：
 	</text>
-	<combo_box name="role_name" tool_tip="メンバーに割り当て可能な役割をリストから選択。"/>
+	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
 	<button label="招待を送信" name="ok_button"/>
 	<button label="取り消し" name="cancel_button"/>
 	<string name="GroupInvitation">
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 2b7292d8b2..cfbc51a44e 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="土地とL$" name="land_money_tab">
 	<string name="help_text">
-		グループ所有地一覧は、寄付に関する詳細と一緒に表示されています。 「土地利用の合計」が「寄付総額」以下、または同じになるまで警告が表示されます。 「計画」、「詳細」、「販売」タブにはグループの資金に関する情報が掲載されています。
+		「土地利用の合計」が「寄付総額」以下、または同じになるまで警告が表示されます。
 	</string>
 	<button label="?" name="help_button"/>
 	<string name="cant_view_group_land_text">
-		あなたはグループ所有の土地表示を許されていません。
+		グループ所有地を確認する権限がありません。
 	</string>
 	<string name="cant_view_group_accounting_text">
-		あなたはグループの会計情報の表示を許されていません。
+		グループの会計情報を確認する権限がありません。
 	</string>
 	<string name="loading_txt">
 		ロード中．．．
@@ -25,38 +25,37 @@
 	</scroll_list>
 	<button label="地図" label_selected="地図" name="map_button"/>
 	<text name="total_contributed_land_label">
-		寄付総額：
+		寄付合計：
 	</text>
 	<text name="total_contributed_land_value" width="150">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<text name="total_land_in_use_label">
 		土地利用の合計：
 	</text>
 	<text name="total_land_in_use_value" width="150">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<text name="land_available_label">
-		利用可の土地：
+		利用可能の土地：
 	</text>
 	<text name="land_available_value" width="150">
-		[AREA]平方メートル
+		[AREA] 平方メートル
 	</text>
 	<text name="your_contribution_label">
 		あなたの貢献：
 	</text>
 	<string name="land_contrib_error">
-		土地の出資設定を行うことができませんでした。
+		土地の貢献を設定することができません
 	</string>
 	<text name="your_contribution_units">
-		(平方メートル)
+		平方メートル
 	</text>
 	<text name="your_contribution_max_value">
-		([AMOUNT]最大)
+		（最大 [AMOUNT]）
 	</text>
 	<text name="group_over_limit_text">
-		使用中の土地をサポートするには、グループ・メンバーがさらに多
-くの土地クレジットを提供する必要があります。
+		土地を使用するには、土地クレジットがもっと必要です
 	</text>
 	<text name="group_money_heading">
 		グループL$
@@ -64,22 +63,22 @@
 	<tab_container name="group_money_tab_container">
 		<panel label="計画" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
-				計算中...
+				ローディング...
 			</text_editor>
 		</panel>
 		<panel label="詳細" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
-				計算中…
+				ローディング...
 			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週の履歴"/>
-			<button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週の履歴"/>
+			<button label="前の週" label_selected="前の週" name="earlier_details_button" tool_tip="前の週"/>
+			<button label="次の週" label_selected="次の週" name="later_details_button" tool_tip="次の週"/>
 		</panel>
-		<panel label="販売" name="group_money_sales_tab">
+		<panel label="販売取引" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
-				計算中…
+				ローディング...
 			</text_editor>
-			<button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週の履歴"/>
-			<button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週の履歴"/>
+			<button label="前の週" label_selected="前の週" name="earlier_sales_button" tool_tip="前の週"/>
+			<button label="次の週" label_selected="次の週" name="later_sales_button" tool_tip="次の週"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index 1146065cd1..684e22a4da 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -1,40 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
-	<string name="help_text">
-		通知機能を使うと、グループ内ですばやく情報を伝達できます。
-複数のあて先にメッセージを送信できるほか、
-必要に応じてアイテムをメッセージに添付することもできます。 
-通知は、受信アビリティがある役割のグループ・メンバーにのみ配信されます。
-通知をオフにするには、一般タブを使います。
-	</string>
-	<string name="no_notices_text">
-		過去の通知はありません。
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<text name="lbl">
-		グループ通知アーカイブ
-	</text>
+	<panel.string name="help_text">
+		通知でメッセージと
+アイテムを添付して送ることができます。 通知を受け取る権限のある役割の
+グループメンバーが
+受け取ることができます。 通知を受け取りたくない場合は
+一般タブから設定してください。
+	</panel.string>
+	<panel.string name="no_notices_text">
+		過去の通知はありません
+	</panel.string>
 	<text name="lbl2">
-		通知は 14 日間保存されます。 通知リストは 1 つのグループにつき、1 日最大 200件 に制限されます。
+		通知は 14 日間保存されます。
+1 日の制限数は 200 通です。
 	</text>
 	<scroll_list name="notice_list">
-		<column label="" name="icon"/>
-		<column label="件名" name="subject"/>
-		<column label="送り主" name="from"/>
-		<column label="日付" name="date"/>
+		<scroll_list.columns label="" name="icon"/>
+		<scroll_list.columns label="件名" name="subject"/>
+		<scroll_list.columns label="送り主" name="from"/>
+		<scroll_list.columns label="日付" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
-		何も見つかりませんでした。
+		見つかりませんでした
 	</text>
-	<button label="新しい通知" label_selected="新しい通知を作成" name="create_new_notice"/>
+	<button label="新しい通知を作成" label_selected="新しい通知を作成" name="create_new_notice" tool_tip="新しい通知を作成"/>
 	<button label="更新" label_selected="リスト更新" name="refresh_notices"/>
 	<panel label="新しい通知を作成" name="panel_create_new_notice">
 		<text name="lbl">
 			通知を作成
 		</text>
-		<text name="lbl2">
-			持ち物からこのパネルにアイテムを 1 つドラッグして添付できます。 添付するアイテムはコピーと再販・プレゼントが可能でなければなりません。また、フォルダは送れません。
-		</text>
 		<text name="lbl3">
 			件名：
 		</text>
@@ -44,16 +38,19 @@
 		<text name="lbl5">
 			添付：
 		</text>
-		<button label="添付物を削除" label_selected="添付物を削除" name="remove_attachment"/>
-		<button label="送信" label_selected="通知を送信" name="send_notice"/>
-		<panel name="drop_target" tool_tip="持ち物からアイテムをメッセージ欄にドラッグしてください。通知と一緒に送信されます。送信するにはコピー、譲渡が可能なオブジェクトである必要があります。"/>
+		<text name="string">
+			添付するアイテムをここにドラッグ -- &gt;
+		</text>
+		<button label="取り外す" label_selected="添付物を削除" name="remove_attachment"/>
+		<button label="送信" label_selected="送信" name="send_notice"/>
+		<group_drop_target name="drop_target" tool_tip="持ち物からアイテムをメッセージ欄にドラッグしてください。通知と一緒に送信されます。送信するにはコピー、譲渡が可能なオブジェクトである必要があります。"/>
 	</panel>
 	<panel label="過去の通知を表示" name="panel_view_past_notice">
 		<text name="lbl">
 			アーカイブ通知
 		</text>
 		<text name="lbl2">
-			新しい通知の送信は、上の[新しい通知を作成する]をクリックしてください。
+			新しい通知を送信するには、+ ボタンを押してください
 		</text>
 		<text name="lbl3">
 			件名：
@@ -61,6 +58,6 @@
 		<text name="lbl4">
 			メッセージ：
 		</text>
-		<button label="添付物を開く" label_selected="添付物を開く" name="open_attachment"/>
+		<button label="添付アイテムを開く" label_selected="添付物を開く" name="open_attachment"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
new file mode 100644
index 0000000000..2edd054180
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="instant_message" name="panel_group_notify">
+	<string name="message_max_lines_count" value="7"/>
+	<string name="subject_font" value="SANSSERIF_BIG"/>
+	<string name="date_font" value="SANSSERIF"/>
+	<panel label="header" name="header">
+		<text name="title" value="送信者の名前 / グループ名"/>
+	</panel>
+	<text_editor name="message" value="message"/>
+	<text name="attachment" value="添付アイテム"/>
+	<button label="Ok" name="btn_ok"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index 963a4ba5e2..1f2d28ca4f 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メンバーと役割" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		現在のサブタブに、未適用の変更があります。
+		現在のタブには、保存されていない変更があります。
 	</panel.string>
 	<panel.string name="want_apply_text">
-		これらの変更を適用しますか？
+		変更を保存しますか？
 	</panel.string>
 	<tab_container name="roles_tab_container">
 		<panel label="メンバー" name="members_sub_tab" tool_tip="メンバー">
@@ -17,28 +17,37 @@ Ctrl キーを押しながらメンバー名をクリックすると
 			<name_list name="member_list">
 				<name_list.columns label="メンバー" name="name"/>
 				<name_list.columns label="寄付" name="donated"/>
-				<name_list.columns label="オンライン" name="online"/>
+				<name_list.columns label="ステータス" name="online"/>
 			</name_list>
 			<button label="招待" name="member_invite"/>
 			<button label="追放" name="member_eject"/>
 		</panel>
 		<panel label="役割" name="roles_sub_tab">
 			<panel.string name="help_text">
-				役割にはタイトルがあり、メンバーが行使可能な
-能力のリストが定義されます。 メンバーは、
-1つまたは複数の役割に属することができます。 1つのグループに対し、
-「全員」と「オーナー」の役割を含めて最高で10の役割を持たせることができます。
+				役割には、タイトルと許可された能力が
+割り当てられています。 メンバーは
+1つ以上の役割を持つことができます。 グループで使える役割は10つまでで、
+「全員（Everyone）」と「オーナー（Owner）」がそれに含まれています。
 			</panel.string>
 			<panel.string name="cant_delete_role">
-				「全員」と「オーナー」は特別な役割なので、削除できません。
+				「全員（Everyone）」と「オーナー（Owner）」の役割は削除することができません。
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<panel.string name="power_all_have_icon">
+				Checkbox_On
+			</panel.string>
+			<panel.string name="power_partial_icon">
+				Checkbox_Off
 			</panel.string>
 			<filter_editor label="役割を選別" name="filter_input"/>
 			<scroll_list name="role_list">
 				<scroll_list.columns label="役割" name="name"/>
 				<scroll_list.columns label="肩書き" name="title"/>
-				<scroll_list.columns label="メンバー" name="members"/>
+				<scroll_list.columns label="#" name="members"/>
 			</scroll_list>
-			<button label="役割を追加" name="role_create"/>
+			<button label="新しい役割" name="role_create"/>
 			<button label="役割を削除" name="role_delete"/>
 		</panel>
 		<panel label="能力" name="actions_sub_tab" tool_tip="能力の説明文には、どの役割・メンバーがその能力を持つかが書かれています。">
@@ -47,8 +56,7 @@ Ctrl キーを押しながらメンバー名をクリックすると
 能力によって決まります。 さまざまな能力が用意されています。
 			</panel.string>
 			<filter_editor label="能力を選別" name="filter_input"/>
-			<scroll_list name="action_list" tool_tip="能力を選択して詳細を表示します。">
-				<scroll_list.columns label="" name="icon"/>
+			<scroll_list name="action_list" tool_tip="詳細を見るには、能力を選んでください。">
 				<scroll_list.columns label="" name="action"/>
 			</scroll_list>
 		</panel>
@@ -64,55 +72,44 @@ Ctrl キーを押しながらメンバー名をクリックすると
 		<text name="static2">
 			許可された能力
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="許可された能力の詳細は「能力」タブをご覧ください。">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="member_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
-			名前
+			役割名
 		</text>
-		<line_editor name="role_name">
-			従業員
-		</line_editor>
+		<line_editor name="role_name"/>
 		<text name="static3">
-			肩書き
+			役割タイトル
 		</text>
-		<line_editor name="role_title">
-			（待機中）
-		</line_editor>
+		<line_editor name="role_title"/>
 		<text name="static2">
 			説明
 		</text>
-		<text_editor name="role_description">
-			（待機中）
-		</text_editor>
+		<text_editor name="role_description"/>
 		<text name="static4">
 			割当られたメンバー
 		</text>
-		<check_box label="メンバーが公開状態" name="role_visible_in_list" tool_tip="この役割のメンバーをグループ外の人の一般タブに表示するかどうかを設定します。"/>
+		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="グループ外の人が一般タブを見たときに、この役割のメンバーが表示されるかどうかを設定します。"/>
 		<text name="static5" tool_tip="現在選択されている役割で実行できる能力のリスト">
 			許可された能力
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="許可された能力の詳細は「能力」タブをご覧ください。">
-			<scroll_list.columns label="" name="icon"/>
+		<scroll_list name="role_allowed_actions" tool_tip="各能力の詳細は、能力のタブをご覧ください。">
 			<scroll_list.columns label="" name="checkbox"/>
 			<scroll_list.columns label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
-		<text name="static">
-			説明
-		</text>
 		<text_editor name="action_description">
 			これは「グループからメンバーを追放する」能力です。 オーナーを追放できるのは、別のオーナーだけです。
 		</text_editor>
 		<text name="static2">
-			役割と能力
+			この能力を持つ役割
 		</text>
 		<text name="static3">
-			能力のあるメンバー
+			この能力を持つメンバー
 		</text>
 	</panel>
 </panel>
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 48f04b2b5d..138a9c6360 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
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<button label="プロフィールの表示" name="view_profile_btn"/>
-	<button label="フレンドを追加" name="add_friend_btn"/>
+	<text name="avatar_name" value="不明"/>
+	<button label="プロフィール" name="view_profile_btn"/>
+	<button label="フレンド登録" name="add_friend_btn"/>
+	<button label="テレポート" name="teleport_btn"/>
 	<button label="共有" name="share_btn"/>
 	<panel name="panel_call_buttons">
 		<button label="コール" name="call_btn"/>
+		<button label="コール終了" name="end_call_btn"/>
+		<button label="ボイスコントロール" name="voice_ctrls_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
new file mode 100644
index 0000000000..9fd0cb3b0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="im_panel" name="im_panel">
+	<string name="message_max_lines_count">
+		6
+	</string>
+	<panel label="im_header" name="im_header">
+		<text name="user_name" value="Erica Vader"/>
+		<text name="time_box" value="23:30"/>
+	</panel>
+	<button label="返信" name="reply"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
new file mode 100644
index 0000000000..0f1e9b4962
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="landmark_info">
+	<string name="title_create_landmark" value="ランドマークを作成"/>
+	<string name="title_edit_landmark" value="ランドマークを編集"/>
+	<string name="title_landmark" value="ランドマーク"/>
+	<string name="not_available" value="（該当なし）"/>
+	<string name="unknown" value="（不明）"/>
+	<string name="public" value="（公開）"/>
+	<string name="server_update_text">
+		場所の情報はサーバーがアップデートされるまでご利用いただけません。
+	</string>
+	<string name="server_error_text">
+		この位置の情報は現在ご利用いただけません。あとでもう一度お試しください。
+	</string>
+	<string name="server_forbidden_text">
+		この位置の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
+	</string>
+	<string name="acquired_date">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</string>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<text name="title" value="場所のプロフィール"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="maturity_value" value="不明"/>
+			<panel name="landmark_info_panel">
+				<text name="owner_label" value="所有者："/>
+				<text name="creator_label" value="制作者："/>
+				<text name="created_label" value="制作日："/>
+			</panel>
+			<panel name="landmark_edit_panel">
+				<text name="title_label" value="タイトル："/>
+				<text name="notes_label" value="個人的メモ："/>
+				<text name="folder_label" value="ランドマークの位置："/>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
new file mode 100644
index 0000000000..45767e8c50
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Landmarks">
+	<accordion name="landmarks_accordion">
+		<accordion_tab name="tab_favorites" title="お気に入りバー"/>
+		<accordion_tab name="tab_landmarks" title="ランドマーク"/>
+		<accordion_tab name="tab_inventory" title="持ち物"/>
+		<accordion_tab name="tab_library" title="ライブラリ"/>
+	</accordion>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
+		<button name="add_btn" tool_tip="新しいランドマークを追加"/>
+		<dnd_button name="trash_btn" tool_tip="選択したランドマークを削除"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 27eed48d82..0c1505255e 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -7,13 +7,35 @@
 		http://secondlife.com/account/request.php?lang=ja
 	</panel.string>
 	<panel name="login_widgets">
+		<text name="first_name_text">
+			ファーストネーム：
+		</text>
 		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] ファーストネーム"/>
+		<text name="last_name_text">
+			ラストネーム：
+		</text>
 		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] ラストネーム"/>
+		<text name="password_text">
+			パスワード：
+		</text>
+		<button label="ログイン" label_selected="ログイン" name="connect_btn"/>
 		<text name="start_location_text">
-			開始位置：
+			ログイン位置：
 		</text>
+		<combo_box name="start_location_combo">
+			<combo_box.item label="最後にログアウトした場所" name="MyLastLocation"/>
+			<combo_box.item label="自宅（ホーム）" name="MyHome"/>
+			<combo_box.item label="＜地域名を入力＞" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="パスワードを記憶" name="remember_check"/>
 		<text name="create_new_account_text">
 			新規アカウントを作成
 		</text>
+		<text name="forgot_password_text">
+			名前またはパスワードをお忘れですか？
+		</text>
+		<text name="channel_text">
+			[VERSION]
+		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
new file mode 100644
index 0000000000..8f8e113e64
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="もの" name="main inventory panel">
+	<panel.string name="Title">
+		もの
+	</panel.string>
+	<filter_editor label="フィルター" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="すべて" name="All Items"/>
+		<inventory_panel label="最近の入手アイテム" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
+		<button name="add_btn" tool_tip="新しいアイテムの追加"/>
+		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="ファイル" name="File">
+			<menu_item_call label="開く" name="Open"/>
+			<menu label="アップロード" name="upload">
+				<menu_item_call label="画像 （L$ [COST] ）..." name="Upload Image"/>
+				<menu_item_call label="サウンド （L$[COST] ）..." name="Upload Sound"/>
+				<menu_item_call label="アニメーション （L$ [COST] ）..." name="Upload Animation"/>
+				<menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="新しいウィンドウ" name="New Window"/>
+			<menu_item_call label="フィルターを表示" name="Show Filters"/>
+			<menu_item_call label="フィルターをリセット" name="Reset Current"/>
+			<menu_item_call label="すべてのフォルダを閉じる" name="Close All Folders"/>
+			<menu_item_call label="ごみ箱を空にする" name="Empty Trash"/>
+			<menu_item_call label="紛失物を空にする" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="新規作成" name="Create">
+			<menu_item_call label="フォルダ" name="New Folder"/>
+			<menu_item_call label="スクリプト" name="New Script"/>
+			<menu_item_call label="ノート" name="New Note"/>
+			<menu_item_call label="ジェスチャー" name="New Gesture"/>
+			<menu label="衣類" name="New Clothes">
+				<menu_item_call label="シャツ" name="New Shirt"/>
+				<menu_item_call label="パンツ" name="New Pants"/>
+				<menu_item_call label="靴" name="New Shoes"/>
+				<menu_item_call label="靴下" name="New Socks"/>
+				<menu_item_call label="ジャケット" name="New Jacket"/>
+				<menu_item_call label="シャツ" name="New Skirt"/>
+				<menu_item_call label="手袋" name="New Gloves"/>
+				<menu_item_call label="下着（上）" name="New Undershirt"/>
+				<menu_item_call label="下着（下）" name="New Underpants"/>
+				<menu_item_call label="アルファ" name="New Alpha"/>
+				<menu_item_call label="タトゥ" name="New Tattoo"/>
+			</menu>
+			<menu label="身体部位" name="New Body Parts">
+				<menu_item_call label="シェイプ（体型）" name="New Shape"/>
+				<menu_item_call label="スキン" name="New Skin"/>
+				<menu_item_call label="髪" name="New Hair"/>
+				<menu_item_call label="目" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="並べ替え" name="Sort">
+			<menu_item_check label="名前順" name="By Name"/>
+			<menu_item_check label="日付順" name="By Date"/>
+			<menu_item_check label="フォルダを常に名前順に並べる" name="Folders Always By Name"/>
+			<menu_item_check label="システムフォルダを上に並べる" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
index 84151f43cf..fe51d8507d 100644
--- a/indra/newview/skins/default/xui/ja/panel_me.xml
+++ b/indra/newview/skins/default/xui/ja/panel_me.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="ミー" name="panel_me">
+<panel label="マイ プロフィール" name="panel_me">
 	<tab_container name="tabs">
 		<panel label="プロフィール" name="panel_profile"/>
 		<panel label="ピック" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
new file mode 100644
index 0000000000..18c270e43d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="一般" name="Media Settings General">
+	<text name="home_label">
+		ホーム URL：
+	</text>
+	<line_editor name="home_url" tool_tip="このメディアソースの URL"/>
+	<text name="preview_label">
+		プレビュー
+	</text>
+	<text name="current_url_label">
+		現在の URL：
+	</text>
+	<line_editor name="current_url" tool_tip="現在のメディアソースの URL" value=""/>
+	<button label="リセット" name="current_url_reset_btn"/>
+	<text name="controls_label">
+		コントロール：
+	</text>
+	<combo_box name="controls">
+		<combo_item name="Standard">
+			標準
+		</combo_item>
+		<combo_item name="Mini">
+			ミニ
+		</combo_item>
+	</combo_box>
+	<check_box initial_value="false" label="自動ループ" name="auto_loop"/>
+	<check_box initial_value="false" label="最初のクリック" name="first_click_interact"/>
+	<check_box initial_value="false" label="自動ズーム" name="auto_zoom"/>
+	<check_box initial_value="false" label="自動メディア再生" name="auto_play"/>
+	<text name="media_setting_note">
+		注： 住人はこの設定を無視できます
+	</text>
+	<check_box initial_value="false" label="オブジェクトの表面のメディアの自動スケール" name="auto_scale"/>
+	<text name="size_label">
+		サイズ：
+	</text>
+	<text name="X_label">
+		X
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
new file mode 100644
index 0000000000..357cbe372a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="コントロール" name="Media settings for controls">
+	<check_box initial_value="false" label="ナビゲーションと相互作用力を無効にする" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="コントロールバーを非表示にする" name="perms_owner_control"/>
+	<check_box initial_value="false" label="ナビゲーションと相互作用力を無効にする" name="perms_group_interact"/>
+	<check_box initial_value="false" label="コントロールバーを非表示にする" name="perms_group_control"/>
+	<check_box initial_value="false" label="ナビゲーションと相互作用力を無効にする" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="コントロールバーを非表示にする" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
new file mode 100644
index 0000000000..ed0ac0d417
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="セキュリティ" name="Media Settings Security">
+	<check_box initial_value="false" label="指定した URL にのみアクセスを許可（接頭辞）" name="whitelist_enable"/>
+	<button label="追加" name="whitelist_add"/>
+	<button label="削除" name="whitelist_del"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_my_profile.xml b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
new file mode 100644
index 0000000000..5f773a1378
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="プロフィール" name="panel_profile">
+	<string name="CaptionTextAcctInfo">
+		[ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+	</string>
+	<string name="no_partner_text" value="なし"/>
+	<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="下の「プロフィールの編集」ボタンを押して画像を変更します"/>
+				<text name="title_sl_descr_text" value="[SECOND_LIFE]："/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</panel>
+			<panel name="first_life_image_panel">
+				<icon label="" name="real_world_edit_icon" tool_tip="下の「プロフィールの編集」ボタンを押して画像を変更します"/>
+				<text name="title_rw_descr_text" value="現実世界："/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
+			</panel>
+			<text name="me_homepage_text">
+				Web サイト：
+			</text>
+			<text name="title_member_text" value="メンバー登録："/>
+			<text name="register_date" value="05/31/1976"/>
+			<text name="title_acc_status_text" value="アカウントの状態："/>
+			<text name="acc_status_text" value="住人。 支払情報未登録。"/>
+			<text name="title_partner_text" value="パートナー："/>
+			<panel name="partner_data_panel">
+				<text name="partner_text" value="[FIRST] [LAST]"/>
+			</panel>
+			<text name="title_groups_text" value="グループ："/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
+		</panel>
+	</scroll_container>
+	<panel name="profile_buttons_panel">
+		<button label="フレンド登録" name="add_friend"/>
+		<button label="IM" name="im"/>
+		<button label="コール" name="call"/>
+		<button label="地図" name="show_on_map_btn"/>
+		<button label="テレポート" name="teleport"/>
+	</panel>
+	<panel name="profile_me_buttons_panel">
+		<button label="プロフィールの編集" name="edit_profile_btn"/>
+		<button label="容姿の編集" name="edit_appearance_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
new file mode 100644
index 0000000000..ecfde1bfc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="navigation_bar">
+	<panel name="navigation_panel">
+		<button name="back_btn" tool_tip="前の場所"/>
+		<button name="forward_btn" tool_tip="次の場所"/>
+		<button name="home_btn" tool_tip="「ホーム」にテレポート"/>
+		<location_input label="場所" name="location_combo"/>
+		<search_combo_box label="検索" name="search_combo_box" tool_tip="検索">
+			<combo_editor label="[SECOND_LIFE] を検索：" name="search_combo_editor"/>
+		</search_combo_box>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
new file mode 100644
index 0000000000..c0549c8ae9
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="nearby_chat">
+	<panel name="chat_caption">
+		<text name="sender_name">
+			近くのチャット
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 04822c8848..3dbabc62be 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
-	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="エンターを押して発言、Ctrl+エンターで叫ぶ。"/>
+	<string name="min_width">
+		192
+	</string>
+	<string name="max_width">
+		320
+	</string>
+	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
+	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_notes.xml b/indra/newview/skins/default/xui/ja/panel_notes.xml
new file mode 100644
index 0000000000..5feee6e280
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_notes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="メモとプライバシー" name="panel_notes">
+	<layout_stack name="layout">
+		<panel name="notes_stack">
+			<scroll_container name="profile_scroll">
+				<panel name="profile_scroll_panel">
+					<text name="status_message" value="個人的メモ："/>
+					<text name="status_message2" value="この人に許可："/>
+					<check_box label="オンライン状況の確認" name="status_check"/>
+					<check_box label="地図で居場所を確認" name="map_check"/>
+					<check_box label="私のオブジェクトの編集・削除・取得" name="objects_check"/>
+				</panel>
+			</scroll_container>
+		</panel>
+		<panel name="notes_buttons_panel">
+			<button label="追加" name="add_friend"/>
+			<button label="IM" name="im"/>
+			<button label="コール" name="call"/>
+			<button label="地図" name="show_on_map_btn"/>
+			<button label="テレポート" name="teleport"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..9ce0156bd4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<accordion_tab name="tab_outfits" title="アウトフィットバー"/>
+		<accordion_tab name="tab_cof" title="現在のアウトフィットバー"/>
+	</accordion>
+	<button label="&gt;" name="selector" tool_tip="アウトフィットのプロパティを表示"/>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="その他のオプションを表示"/>
+		<button name="add_btn" tool_tip="新しいアイテムの追加"/>
+		<dnd_button name="trash_btn" tool_tip="選択したアイテムを削除"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
new file mode 100644
index 0000000000..dfcd9d0932
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_gear_default">
+	<menu_item_call label="新しいアウトフィット" name="new"/>
+	<menu_item_call label="アウトフィットを着る" name="wear"/>
+	<menu_item_call label="アウトフィットを削除する" name="delete"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
new file mode 100644
index 0000000000..5dffbb33ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="人" name="people_panel">
+	<string name="no_people" value="誰もいません"/>
+	<string name="no_one_near" value="近くに誰もいません"/>
+	<string name="no_friends_online" value="オンラインのフレンドはいません"/>
+	<string name="no_friends" value="フレンドはいません"/>
+	<string name="no_groups" value="グループはありません"/>
+	<string name="people_filter_label" value="人をフィルター"/>
+	<string name="groups_filter_label" value="グループをフィルター"/>
+	<filter_editor label="フィルター" name="filter_input"/>
+	<tab_container name="tabs">
+		<panel label="近く" name="nearby_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="nearby_view_sort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			</panel>
+		</panel>
+		<panel label="フレンド" name="friends_panel">
+			<accordion name="friends_accordion">
+				<accordion_tab name="tab_online" title="オンライン"/>
+				<accordion_tab name="tab_all" title="全員"/>
+			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="friends_viewsort_btn" tool_tip="オプション"/>
+				<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
+				<button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
+			</panel>
+		</panel>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="groups_viewsort_btn" tool_tip="オプション"/>
+				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成"/>
+				<button name="activate_btn" tool_tip="選択したグループをアクティベート"/>
+			</panel>
+		</panel>
+		<panel label="最新" name="recent_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<button name="recent_viewsort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			</panel>
+		</panel>
+	</tab_container>
+	<panel name="button_bar">
+		<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
+		<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開く"/>
+		<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
+		<button label="共有" name="share_btn"/>
+		<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送る"/>
+		<button label="グループ情報" name="group_info_btn" tool_tip="グループ情報を表示"/>
+		<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
index 984d5f7268..3d3b8bb3dc 100644
--- a/indra/newview/skins/default/xui/ja/panel_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_picks.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ピック" name="panel_picks">
+	<string name="no_picks" value="ピックなし"/>
+	<string name="no_classifieds" value="クラシファイド広告なし"/>
+	<text name="empty_picks_panel_text">
+		ここにはピック・クラシファイド広告はありません。
+	</text>
+	<accordion name="accordion">
+		<accordion_tab name="tab_picks" title="ピック"/>
+		<accordion_tab name="tab_classifieds" title="クラシファイド広告"/>
+	</accordion>
 	<panel label="bottom_panel" name="edit_panel">
-		<button name="new_btn" tool_tip="現在地を新規ピックに追加"/>
+		<button name="new_btn" tool_tip="現在地のピックを新規作成"/>
 	</panel>
 	<panel name="buttons_cucks">
+		<button label="情報" name="info_btn"/>
+		<button label="テレポート" name="teleport_btn"/>
 		<button label="地図" name="show_on_map_btn"/>
+		<button label="▼" name="overflow_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
new file mode 100644
index 0000000000..3ec5a3a294
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="place_profile">
+	<string name="on" value="オン"/>
+	<string name="off" value="オフ"/>
+	<string name="anyone" value="全員"/>
+	<string name="available" value="利用可"/>
+	<string name="allocated" value="割り当て済"/>
+	<string name="title_place" value="場所のプロフィール"/>
+	<string name="title_teleport_history" value="テレポート履歴の場所"/>
+	<string name="not_available" value="（該当なし）"/>
+	<string name="unknown" value="（不明）"/>
+	<string name="public" value="（公開）"/>
+	<string name="none_text" value="（なし）"/>
+	<string name="sale_pending_text" value="（販売処理中）"/>
+	<string name="group_owned_text" value="（グループ所有）"/>
+	<string name="price_text" value="L$"/>
+	<string name="area_text" value="平方メートル"/>
+	<string name="all_residents_text" value="すべての住人"/>
+	<string name="group_text" value="グループ"/>
+	<string name="can_resell">
+		このリージョンで購入した土地は、再販することができます。
+	</string>
+	<string name="can_not_resell">
+		このリージョンで購入した土地は、再販できません。
+	</string>
+	<string name="can_change">
+		このリージョンで購入した土地は、統合・分割することができます。
+	</string>
+	<string name="can_not_change">
+		このリージョンで購入した土地は、統合・分割できません。
+	</string>
+	<string name="server_update_text">
+		場所の情報は、サーバーがアップデートされるまでご利用いただけません。
+	</string>
+	<string name="server_error_text">
+		この場所の情報は現在ご利用いただけません。あとでもう一度お試しください。
+	</string>
+	<string name="server_forbidden_text">
+		この場所の情報は、アクセス制限のためご利用いただけません。  許可については区画所有者にお問い合わせください。
+	</string>
+	<string name="acquired_date">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</string>
+	<string name="icon_PG" value="parcel_drk_PG"/>
+	<string name="icon_M" value="parcel_drk_M"/>
+	<string name="icon_R" value="parcel_drk_R"/>
+	<string name="icon_Voice" value="parcel_drk_Voice"/>
+	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
+	<string name="icon_Fly" value="parcel_drk_Fly"/>
+	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
+	<string name="icon_Push" value="parcel_drk_Push"/>
+	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
+	<string name="icon_Build" value="parcel_drk_Build"/>
+	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
+	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
+	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
+	<string name="icon_Damage" value="parcel_drk_Damage"/>
+	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
+	<text name="title" value="場所のプロフィール"/>
+	<scroll_container name="place_scroll">
+		<panel name="scrolling_panel">
+			<text name="region_title" value="SampleRegion"/>
+			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
+			<expandable_text name="description" value="Du waltz die spritz"/>
+			<text name="owner_label" value="所有者："/>
+			<text name="owner_value" value="Alex Superduperlongenamenton"/>
+			<text name="maturity_value" value="不明"/>
+			<accordion name="advanced_info_accordion">
+				<accordion_tab name="parcel_characteristics_tab" title="区画">
+					<panel>
+						<text name="rating_label" value="レーティング区分："/>
+						<text name="rating_value" value="不明"/>
+						<text name="voice_label" value="ボイス："/>
+						<text name="voice_value" value="オン"/>
+						<text name="fly_label" value="飛行："/>
+						<text name="fly_value" value="オン"/>
+						<text name="push_label" value="プッシュ："/>
+						<text name="push_value" value="オフ"/>
+						<text name="build_label" value="制作："/>
+						<text name="build_value" value="オン"/>
+						<text name="scripts_label" value="スクリプト："/>
+						<text name="scripts_value" value="オン"/>
+						<text name="damage_label" value="ダメージ："/>
+						<text name="damage_value" value="オフ"/>
+						<button label="土地情報" name="about_land_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="region_information_tab" title="リージョン">
+					<panel>
+						<text name="region_name_label" value="リージョン:"/>
+						<text name="region_name" value="Mooseland"/>
+						<text name="region_type_label" value="種類："/>
+						<text name="region_type" value="Moose"/>
+						<text name="region_rating_label" value="レーティング区分："/>
+						<text name="region_rating" value="Explicit"/>
+						<text name="region_owner_label" value="所有者："/>
+						<text name="region_owner" value="moose Van Moose"/>
+						<text name="region_group_label" value="グループ："/>
+						<text name="region_group">
+							The Mighty Moose of mooseville soundvillemoose
+						</text>
+						<button label="地域 / 不動産" name="region_info_btn"/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="estate_information_tab" title="エステート（不動産）">
+					<panel>
+						<text name="estate_name_label" value="エステート（不動産）："/>
+						<text name="estate_rating_label" value="レーティング区分："/>
+						<text name="estate_owner_label" value="所有者："/>
+						<text name="covenant_label" value="約款："/>
+					</panel>
+				</accordion_tab>
+				<accordion_tab name="sales_tab" title="販売中">
+					<panel>
+						<text name="sales_price_label" value="価格："/>
+						<text name="area_label" value="面積："/>
+						<text name="traffic_label" value="トラフィック："/>
+						<text name="primitives_label" value="プリム："/>
+						<text name="parcel_scripts_label" value="スクリプト："/>
+						<text name="terraform_limits_label" value="地形編集制限："/>
+						<text name="subdivide_label" value="分割・統合許可："/>
+						<text name="resale_label" value="再版許可："/>
+						<text name="sale_to_label" value="販売先："/>
+					</panel>
+				</accordion_tab>
+			</accordion>
+		</panel>
+	</scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
new file mode 100644
index 0000000000..f74b1e52e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="場所" name="places panel">
+	<string name="landmarks_tab_title" value="マイ ランドマーク"/>
+	<string name="teleport_history_tab_title" value="テレポートの履歴"/>
+	<filter_editor label="フィルター" name="Filter"/>
+	<panel name="button_panel">
+		<button label="テレポート" name="teleport_btn"/>
+		<button label="地図" name="map_btn"/>
+		<button label="編集" name="edit_btn"/>
+		<button label="閉じる" name="close_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+		<button label="保存" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 0665dd4590..d444cccd2d 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="advanced">
+	<panel.string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</panel.string>
+	<panel.string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</panel.string>
+	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	<color_swatch name="background" tool_tip="吹き出しチャットの色を選択します"/>
+	<slider label="透明度" name="bubble_chat_opacity"/>
 	<text name="AspectRatioLabel1" tool_tip="（幅/高さ）">
-		縦横比：
+		縦横比
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="（幅/高さ）">
 		<combo_box.item label="4：3（標準CRT）" name="item1"/>
@@ -9,4 +18,31 @@
 		<combo_box.item label="8：5（ワイドスクリ－ン）" name="item3"/>
 		<combo_box.item label="16：9（ワイドスクリ－ン）" name="item4"/>
 	</combo_box>
+	<check_box label="自動検出" name="aspect_auto_detect"/>
+	<text name="heading1">
+		カメラ：
+	</text>
+	<slider label="視界角" name="camera_fov"/>
+	<slider label="距離" name="camera_offset_scale"/>
+	<text name="heading2">
+		自動ポジション：
+	</text>
+	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
+	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
+	<text name="heading3">
+		アバター：
+	</text>
+	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
+	<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
+	<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
+	<check_box label="話すときにアバターの口を動かす" name="enable_lip_sync"/>
+	<check_box label="スクリプトのエラーを表示する" name="show_script_errors"/>
+	<radio_group name="show_location">
+		<radio_item label="チャット" name="0"/>
+		<radio_item label="ウィンドウ" name="1"/>
+	</radio_group>
+	<check_box label="トリガーキーを押したときに、マイクを切り替える：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。 トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。"/>
+	<line_editor label="プッシュ・トゥ・スピークのトリガー" name="modifier_combo"/>
+	<button label="キー設定" name="set_voice_hotkey_button"/>
+	<button label="マウスの中央ボタン" name="set_voice_middlemouse_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 96123c9d98..3cd13948d2 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -1,21 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ポップアップ" name="popups" title="ポップアップ">
-	<text name="text_box">
-		ポップアップを表示しない：
+	<text name="tell_me_label">
+		知らせる：
 	</text>
-	<text name="dont_show_label">
-		次のポップアップは表示しない：
-	</text>
-	<button label="これは表示する" label_selected="これは表示する" name="enable_popup"/>
-	<text name="show_label" width="300" >
-		次のポップアップは表示：
+	<check_box label="リンデンドルを使用・受け取るとき" name="notify_money_change_checkbox"/>
+	<check_box label="フレンドがログアウト・ログインするとき" name="friends_online_notify_checkbox"/>
+	<text name="show_label" width="300">
+		常に表示する警告メッセージ：
 	</text>
-	<text name="text_box2" width="280">
-		ノートカード、テクスチャ、ランドマークの提供：
+	<text name="dont_show_label">
+		表示しない警告メッセージ：
 	</text>
-	<check_box label="自動的に承認" name="accept_new_inventory"/>
-	<check_box label="承認後、自動的に閲覧" name="show_new_inventory"/>
-	<button width="235" label="ポップアップ全てを有効化..." label_selected="「次回表示」ダイアログリセット..." name="reset_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を有効にしてください。"/>
-	<button width="235" label="これらのポップアップ全てを無効化..." name="skip_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を無効にしてください。"/>
-	<check_box label="新たに受け取ったオブジェクトを持ち物に自動的に表示" name="show_in_inventory"/>
 </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 193d43311c..7abeb36168 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -39,4 +39,5 @@
 	</text>
 	<check_box initial_value="true" label="チャット中はタイピング動作のアニメーションを再生" name="play_typing_animation"/>
 	<check_box label="オフライン時に受け取った IM をメールで送信" name="send_im_to_email"/>
+	<check_box label="文字チャットの履歴を有効にする" name="plain_text_chat_history"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 584fcd6164..387558af73 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,90 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" tool_tip="常に自宅（ホーム）にログイン" label="自宅（ホーム）"/>
-		<combo_box.item name="MyLastLocation" tool_tip="常に最後にいた場所にログイン" label="最後にログアウトした場所"/>
-	</combo_box>
-	<check_box label="ログイン画面にログイン位置を表示" name="show_location_checkbox"/>
-	<combo_box name="fade_out_combobox">
-		<combo_box.item name="Never" label="なし"/>
-		<combo_box.item name="Show Temporarily" label="一時的に表示"/>
-		<combo_box.item name="Always" label="いつも"/>
-	</combo_box>
-	<check_box label="小さなアバター名" name="small_avatar_names_checkbox"/>
-	<check_box label="画面上で自分の名前を隠す" name="show_my_name_checkbox"/>
-	<text name="group_titles_textbox">
-		グループ・タイトル：
-	</text>
-	<check_box label="グループ・タイトルをすべて非表示" name="show_all_title_checkbox"/>
-	<check_box label="画面上で自分のグループ・タイトルを隠す" name="show_my_title_checkbox"/>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックして開く"/>
-	<text name="UI Size:">
-		UI サイズ：
+	<text name="language_textbox">
+		言語：
 	</text>
-	<check_box label="解像度独立スケールを使用" name="ui_auto_scale"/>
-	<spinner label="退席までの時間：" name="afk_timeout_spinner"/>
-	<check_box label="リンデン・ドル（L$）の支払い/受け取りを通知" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
-		レーティング区分：
+	<combo_box name="language_combobox">
+		<combo_box.item label="システムデフォルト" name="System Default Language"/>
+		<combo_box.item label="English （英語）" name="English"/>
+		<combo_box.item label="Dansk （デンマーク語） – ベータ" name="Danish"/>
+		<combo_box.item label="Deutsch （ドイツ語） – ベータ" name="Deutsch(German)"/>
+		<combo_box.item label="Español （スペイン語） – ベータ" name="Spanish"/>
+		<combo_box.item label="Français （フランス語） – ベータ" name="French"/>
+		<combo_box.item label="Italiano （イタリア語） - ベータ" name="Italian"/>
+		<combo_box.item label="Nederlands （オランダ語） - ベータ" name="Dutch"/>
+		<combo_box.item label="Polski （ポーランド語） - ベータ" name="Polish"/>
+		<combo_box.item label="Português （ポルトガル語） – ベータ" name="Portugese"/>
+		<combo_box.item label="日本語 – ベータ" name="(Japanese)"/>
+		<combo_box.item label="テスト言語" name="TestLanguage"/>
+	</combo_box>
+	<text name="language_textbox2">
+		（再起動後に反映）
 	</text>
 	<text name="maturity_desired_prompt">
 		アクセスしたいコンテンツ：
 	</text>
+	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item name="Desired_Adult" label="PG、Mature、Adult"/>
-		<combo_box.item name="Desired_Mature" label="PGとMature"/>
-		<combo_box.item name="Desired_PG" label="PG"/>
+		<combo_box.item label="PG、Mature、Adult" name="Desired_Adult"/>
+		<combo_box.item label="PGとMature" name="Desired_Mature"/>
+		<combo_box.item label="PG" name="Desired_PG"/>
 	</combo_box>
-	<text name="maturity_desired_textbox">
-		PG
-	</text>
 	<text name="start_location_textbox">
 		ログイン位置：
 	</text>
-	<text name="show_names_textbox">
-		名前を表示：
+	<combo_box name="start_location_combo">
+		<combo_box.item label="最後にログアウトした場所" name="MyLastLocation" tool_tip="常に最後にいた場所にログイン"/>
+		<combo_box.item label="自宅（ホーム）" name="MyHome" tool_tip="常に自宅（ホーム）にログイン"/>
+	</combo_box>
+	<check_box initial_value="true" label="ログイン画面に表示する" name="show_location_checkbox"/>
+	<text name="name_tags_textbox">
+		名前の表示：
 	</text>
+	<radio_group name="Name_Tag_Preference">
+		<radio_item label="オフ" name="radio"/>
+		<radio_item label="オン" name="radio2"/>
+		<radio_item label="一時的に表示" name="radio3"/>
+	</radio_group>
+	<check_box label="私の名前を表示" name="show_my_name_checkbox1"/>
+	<check_box initial_value="true" label="小さいアバター名" name="small_avatar_names_checkbox"/>
+	<check_box label="グループタイトルを表示" name="show_all_title_checkbox1"/>
 	<text name="effects_color_textbox">
-		自分の効果の色：
+		私のビームの色：
+	</text>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックして開く"/>
+	<text name="title_afk_text">
+		一時退席までの時間：
 	</text>
+	<spinner label="" name="afk_timeout_spinner"/>
 	<text name="seconds_textbox">
 		秒
 	</text>
-	<text name="crash_report_textbox">
-		クラッシュ報告：
-	</text>
-	<text name="language_textbox">
-		言語：
+	<text name="text_box3">
+		取り込み中モード時の返事：
 	</text>
-	<text name="language_textbox2">
-		（再起動にて反映）
-	</text>
-	<string name="region_name_prompt">
-		&lt;地域の名前入力&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox">
-		<combo_box.item name="Askbeforesending" label="送る前に確認する"/>
-		<combo_box.item name="Alwayssend" label="常に送信"/>
-		<combo_box.item name="Neversend" label="送信しない"/>
-	</combo_box>
-	<combo_box name="language_combobox">
-		<combo_box.item name="System Default Language" label="システム・デフォルト"/>
-		<combo_box.item name="English" label="English （英語）"/>
-		<combo_box.item name="Danish" label="Dansk （デンマーク語） – ベータ"/>
-		<combo_box.item name="Deutsch(German)" label="Deutsch （ドイツ語） – ベータ"/>
-		<combo_box.item name="Spanish" label="Español （スペイン語） – ベータ"/>
-		<combo_box.item name="French" label="Français （フランス語） – ベータ"/>
-		<combo_box.item name="Italian" label="Italiano （イタリア語） - ベータ"/>
-		<combo_box.item name="Hungarian" label="Magyar （ハンガリー語） - ベータ"/>
-		<combo_box.item name="Dutch" label="Nederlands （オランダ語） - ベータ"/>
-		<combo_box.item name="Polish" label="Polski （ポーランド語） - ベータ"/>
-		<combo_box.item name="Portugese" label="Português （ポルトガル語） – ベータ"/>
-		<combo_box.item name="Russian" label="Русский （ロシア語） - ベータ"/>
-		<combo_box.item name="Turkish" label="Türkçe （トルコ語） - ベータ"/>
-		<combo_box.item name="Ukrainian" label="Українська （ウクライナ語） - ベータ"/>
-		<combo_box.item name="Chinese" label="中文 （简体） （中国語） - ベータ"/>
-		<combo_box.item name="(Japanese)" label="日本語 – ベータ"/>
-		<combo_box.item name="(Korean)" label="한국어 （韓国語） – ベータ"/>
-	</combo_box>
-	<check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
+	<text_editor name="busy_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index fba2c5f18d..191748fe91 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -12,7 +12,7 @@
 		<combo_box.item label="1024x768" name="1024x768"/>
 	</combo_box>
 	<text name="UI Size:">
-		UIサイズ：
+		UI サイズ：
 	</text>
 	<text name="QualitySpeed">
 		クオリティとスピード：
@@ -21,7 +21,7 @@
 		速い
 	</text>
 	<text name="BetterText">
-		速
+		遅い
 	</text>
 	<text name="ShadersPrefText">
 		低
@@ -35,12 +35,12 @@
 	<text name="ShadersPrefText4">
 		超高
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
+	<panel label="カスタムグラフィック" name="CustomGraphics Panel">
 		<text name="ShadersText">
 			シェーダー：
 		</text>
-		<check_box initial_value="true" label="バンプ・マッピングと光沢" name="BumpShiny"/>
-		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にするとグラフィック・カード・ドライバの種類によってはクラッシュ防止になります。"/>
+		<check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
+		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
 		<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
 		<check_box initial_value="true" label="水の反射" name="Reflections"/>
 		<text name="ReflectionDetailText">
@@ -48,16 +48,16 @@
 		</text>
 		<radio_group name="ReflectionDetailRadio">
 			<radio_item label="地形と樹木" name="0"/>
-			<radio_item label="すべての静的オブジェクト" name="1"/>
+			<radio_item label="すべての静止オブジェクト" name="1"/>
 			<radio_item label="すべてのアバターとオブジェクト" name="2"/>
 			<radio_item label="すべて" name="3"/>
 		</radio_group>
 		<text name="AvatarRenderingText">
 			アバター表示：
 		</text>
-		<check_box initial_value="true" label="アバターの精度を下げる" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="ハードウェア・スキニング" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="アバターの服" name="AvatarCloth"/>
+		<check_box initial_value="true" label="アバターの精度を上げる" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="ハードウェアスキニング" name="AvatarVertexProgram"/>
+		<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
 		<slider label="描画距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
@@ -99,7 +99,7 @@
 		</text>
 		<radio_group name="LightingDetailRadio">
 			<radio_item label="太陽と月のみ" name="SunMoon"/>
-			<radio_item label="近隣のローカル・ライト" name="LocalLights"/>
+			<radio_item label="近くのローカルサイト" name="LocalLights"/>
 		</radio_group>
 		<text name="TerrainDetailText">
 			地形詳細：
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index e0122d123f..80c0c85420 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット設定" name="im">
 	<panel.string name="log_in_to_change">
-		ログインして変更してください
+		ログインして変更
 	</panel.string>
 	<button label="履歴の消去" name="clear_cache"/>
 	<text name="cache_size_label_l">
 		（位置、画像、web、検索履歴）
 	</text>
-	<check_box label="フレンドとグループのみオンライン状況の確認可能" name="online_visibility"/>
-	<check_box label="フレンドとグループのみコールとIMの受信可能" name="voice_call_friends_only_check"/>
+	<check_box label="私のオンライン状況を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
+	<check_box label="フレンドとグループ以外からはコールとIMを受信しない" name="voice_call_friends_only_check"/>
 	<check_box label="コールが終了したらマイクのスイッチを切る" name="auto_disengage_mic_check"/>
 	<check_box label="Cookieを受け入れる" name="cookies_enabled"/>
-	<check_box label="コンピューターにログを保存" name="log_instant_messages"/>
-	<radio_group name="ChatIMLogs">
-		<radio_item label="チャット" name="radio1"/>
-		<radio_item label="IM" name="radio2"/>
-	</radio_group>
-	<button label="ブラウズ" label_selected="ブラウズ" name="log_path_button"/>
+	<check_box label="メディアの自動再生を許可する" name="autoplay_enabled"/>
+	<check_box label="自動的に区画メディアを再生する" name="parcel_autoplay_enabled"/>
+	<text name="Logs:">
+		ログ：
+	</text>
+	<check_box label="コンピューターに近くのチャットログを保存する" name="log_nearby_chat"/>
+	<check_box label="コンピューターに IM ログを保存する" name="log_instant_messages"/>
+	<check_box label="タイムスタンプを追加する" name="show_timestamps_check_im"/>
+	<text name="log_path_desc">
+		ログの保存場所
+	</text>
+	<button label="参照" label_selected="参照" name="log_path_button"/>
+	<button label="ブロックリスト" name="block_list"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index af8390ba5c..5911727c67 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -25,10 +25,10 @@
 	<text name="text_box5">
 		MB
 	</text>
-	<button label="ブラウズ" label_selected="ブラウズ" name="set_cache"/>
+	<button label="参照" label_selected="参照" name="set_cache"/>
 	<button label="リセット" label_selected="設定" name="reset_cache"/>
 	<text name="Cache location">
-		キャッシュの場所
+		キャッシュの保存場所
 	</text>
 	<text name="Web:">
 		Web：
@@ -39,7 +39,7 @@
 	</radio_group>
 	<check_box initial_value="false" label="Webプロキシ" name="web_proxy_enabled"/>
 	<line_editor name="web_proxy_editor" tool_tip="使用するプロキシ名またはIPアドレス"/>
-	<button label="ブラウズ" label_selected="ブラウズ" name="set_proxy"/>
+	<button label="参照" label_selected="参照" name="set_proxy"/>
 	<text name="Proxy location">
 		プロキシ
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 499f57d75e..9c8bda4c76 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,72 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="音声とビデオ" name="Preference Media panel">
-	<slider label="音量" name="System Volume"/>
-	<slider label="風の音量" name="Wind Volume"/>
-	<slider label="サウンド" name="SFX Volume"/>
+<panel label="サウンド" name="Preference Media panel">
+	<slider label="全体の音量" name="System Volume"/>
+	<check_box initial_value="true" label="最小化でミュート" name="mute_when_minimized"/>
+	<slider label="風" name="Wind Volume"/>
+	<slider label="ボタン" name="UI Volume"/>
 	<slider label="メディア" name="Media Volume"/>
-	<slider label="UI" name="UI Volume"/>
-	<slider label="ミュージック" name="Music Volume"/>
+	<slider label="効果音" name="SFX Volume"/>
+	<slider label="ストリーミング音楽" name="Music Volume"/>
+	<check_box label="ボイス" name="enable_voice_check"/>
 	<slider label="ボイス" name="Voice Volume"/>
-	<text_editor name="voice_unavailable">
-		ボイスチャットを利用できません
-	</text_editor>
-	<check_box label="ボイスチャット" name="enable_voice_check"/>
+	<text name="Listen from">
+		方向：
+	</text>
 	<radio_group name="ear_location">
 		<radio_item label="カメラの位置から聞く" name="0"/>
 		<radio_item label="アバターの位置から聞く" name="1"/>
 	</radio_group>
-	<button label="機器の設定" name="device_settings_btn"/>
-	<text name="muting_text">
-		ボリューム：
-	</text>
-	<check_box label="オーディオをミュート" name="disable audio"/>
-	<text name="streaming_prefs_text">
-		ストリーム環境設定：
-	</text>
-	<text name="audio_prefs_text">
-		オーディオ環境設定：
-	</text>
-	<panel label="ボリューム" name="Volume Panel"/>
-	<check_box label="メディアを自動再生" name="auto_streaming_video"/>
-	<check_box label="最小化でミュート" name="mute_when_minimized"/>
-	<text name="streaming_text">
-		ストリーミング：
-	</text>
-	<check_box label="音楽がある場合再生する" name="streaming_music"/>
-	<check_box label="ストリーミング・メディア使用可時に再生" name="streaming_video"/>
-	<text name="system_volume_text">
-		サウンド効果：
-	</text>
-	<text name="wind_volume_text">
-		風の音量：
-	</text>
-	<text name="footsteps_volume_text">
-		足音：
-	</text>
-	<text name="ui_volume_text">
-		UI音量：
-	</text>
-	<slider label="ドップラー効果" name="Doppler Effect"/>
-	<slider label="遠隔要因" name="Distance Factor"/>
-	<slider label="ロールオフ係数" name="Rolloff Factor"/>
-	<spinner label="L$変更基準点" name="L$ Change Threshold"/>
-	<spinner label="ヘルス変化基準点" name="Health Change Threshold"/>
-	<text name="doppler_effect_text">
-		オーディオ環境設定：
-	</text>
-	<text name="distance_factor_text">
-		距離係数：
-	</text>
-	<text name="rolloff_factor_text">
-		ロールオフ：
-	</text>
-	<text name="default_upload_bitrate_text">
-		デフォルトUL速度：
-	</text>
-	<radio_group name="bitrate">
-		<radio_item label="32kbps" name="32kbps"/>
-		<radio_item label="64kbps" name="64kbps"/>
-		<radio_item label="96kbps" name="96kbps"/>
-		<radio_item label="128kbps" name="128kbps"/>
-	</radio_group>
+	<button label="入力・出力機器" name="device_settings_btn"/>
+	<panel label="機器の設定" name="device_settings_panel">
+		<panel.string name="default_text">
+			デフォルト
+		</panel.string>
+		<text name="Input">
+			入力
+		</text>
+		<text name="My volume label">
+			私の音量：
+		</text>
+		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使って音量を調節します"/>
+		<text name="wait_text">
+			しばらくお待ちください。
+		</text>
+		<text name="Output">
+			出力
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..629070a18a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="MediaControls">
+	<string name="control_background_image_name">
+		Inspector_Background
+	</string>
+	<string name="skip_step">
+		0.2
+	</string>
+	<layout_stack name="media_controls">
+		<layout_panel name="media_address">
+			<line_editor name="media_address_url" tool_tip="メディア URL"/>
+			<layout_stack name="media_address_url_icons">
+				<layout_panel>
+					<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
+				</layout_panel>
+				<layout_panel>
+					<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="media_play_position">
+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="ムービー再生進行"/>
+		</layout_panel>
+		<layout_panel name="media_volume">
+			<button name="media_volume_button" tool_tip="ミュート"/>
+		</layout_panel>
+	</layout_stack>
+	<layout_stack>
+		<panel name="media_progress_indicator">
+			<progress_bar name="media_progress_bar" tool_tip="ローディング"/>
+		</panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml
index a449c10e10..767e26af4c 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile.xml
@@ -12,31 +12,47 @@
 	</string>
 	<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=ja-JP"/>
 	<string name="no_partner_text" value="なし"/>
+	<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]："/>
+				<expandable_text name="sl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<panel name="first_life_image_panel">
 				<text name="title_rw_descr_text" value="現実世界："/>
+				<expandable_text name="fl_description_edit">
+					Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+				</expandable_text>
 			</panel>
 			<text name="me_homepage_text">
-				Webサイト：
+				Web サイト：
 			</text>
 			<text name="title_member_text" value="メンバー登録："/>
+			<text name="register_date" value="05/31/1976"/>
 			<text name="title_acc_status_text" value="アカウントの状態："/>
+			<text name="acc_status_text" value="住人。 支払情報未登録"/>
 			<text name="title_partner_text" value="パートナー："/>
 			<panel name="partner_data_panel">
 				<text name="partner_text" value="[FIRST] [LAST]"/>
 			</panel>
 			<text name="title_groups_text" value="グループ："/>
+			<expandable_text name="sl_groups">
+				Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+			</expandable_text>
 		</panel>
 	</scroll_container>
 	<panel name="profile_buttons_panel">
 		<button label="フレンド登録" name="add_friend"/>
 		<button label="IM" name="im"/>
 		<button label="コール" name="call"/>
+		<button label="地図" name="show_on_map_btn"/>
 		<button label="テレポート" name="teleport"/>
+		<button label="▼" name="overflow_btn"/>
 	</panel>
 	<panel name="profile_me_buttons_panel">
 		<button label="プロフィールの編集" name="edit_profile_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_view.xml b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
index 4aa2d5d947..5666a93cf0 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
@@ -6,10 +6,11 @@
 	<string name="status_offline">
 		オフライン
 	</string>
-	<text name="user_name" value="（ローディング...）"/>
+	<text_editor name="user_name" value="（ローディング...）"/>
 	<text name="status" value="オンライン"/>
 	<tab_container name="tabs">
 		<panel label="プロフィール" name="panel_profile"/>
 		<panel label="ピック" name="panel_picks"/>
+		<panel label="メモとプライバシー" name="panel_notes"/>
 	</tab_container>
 </panel>
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 169f922149..5f43f93113 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="約款" name="Covenant">
 	<text font="SansSerifLarge" name="estate_section_lbl">
-		不動産：
+		エステート（不動産）
 	</text>
 	<text name="estate_name_lbl">
 		名前：
@@ -30,17 +30,16 @@
 		約款の変更は不動産全区画に適用となります。
 	</text>
 	<text name="covenant_instructions">
-		この不動産の約款の変更するには、
-ノートカードをドラッグ&amp;ドロップしてください。
+		この不動産約款の変更をする際は、ノートカードをドラッグ＆ドロップしてください。
 	</text>
 	<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl">
-		地域：
+		リージョン（地域）
 	</text>
 	<text name="region_name_lbl">
 		名前：
 	</text>
 	<text name="region_name_text">
-		leyla
+		Erica
 	</text>
 	<text name="region_landtype_lbl">
 		種類：
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 4e6bae7172..4209fb17e5 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -13,7 +13,7 @@
 	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効化"/>
 	<button label="?" name="disable_physics_help"/>
 	<button label="適用" name="apply_btn"/>
-	<text name="objret_text_lbl" width="120" >
+	<text name="objret_text_lbl" width="120">
 		オブジェクトの返却
 	</text>
 	<text name="resident_text_lbl">
@@ -22,13 +22,13 @@
 	<line_editor name="target_avatar_name">
 		(なし)
 	</line_editor>
-	<button label="選択..." name="choose_avatar_btn"/>
+	<button label="選択" name="choose_avatar_btn"/>
 	<text name="options_text_lbl">
 		オプション:
 	</text>
-	<check_box label="スクリプトのあるオブジェクトのみを返却" name="return_scripts" tool_tip="スクリプトがあるオブジェクトのみを返却"/>
-	<check_box label="他人の土地にあるオブジェクトのみを返却" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却"/>
-	<check_box label="この不動産の各地域のオブジェクトを返却" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却"/>
+	<check_box label="スクリプト付きのもの" name="return_scripts" tool_tip="スクリプトのオブジェクトだけ返却します"/>
+	<check_box label="他人の土地にあるもの" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却"/>
+	<check_box label="この不動産に属するすべてのリージョンのもの" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却"/>
 	<button label="返却" name="return_btn"/>
 	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
 	<button label="?" name="top_colliders_help"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 186820f00a..348878a35e 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="不動産" name="Estate">
 	<text name="estate_help_text">
 		このタブの設定を変更するとこの不動産内
@@ -19,60 +19,57 @@
 	<text name="Only Allow">
 		次へのアクセスを制限：
 	</text>
-	<check_box label="支払い情報登録済みの住人" name="limit_payment"
-	     tool_tip="支払い情報未登録の住人を排除する" />
-	<check_box label="年齢確認済みの成人" name="limit_age_verified"
-	     tool_tip="年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。" />
-	<check_box label="ボイスチャットを許可" name="voice_chat_check" />
-	<button label="?" name="voice_chat_help" />
+	<check_box label="支払い情報登録済みの住人" name="limit_payment" tool_tip="未確認の住人の立入を禁止します"/>
+	<check_box label="年齢確認済みの成人" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人を立入禁止にします。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
+	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
 		嫌がらせに関するメール先:
 	</text>
 	<string name="email_unsupported">
 		サポートされていない機能
 	</string>
-	<button label="?" name="abuse_email_address_help" />
+	<button label="?" name="abuse_email_address_help"/>
 	<text name="estate_manager_label">
 		不動産マネージャー：
 	</text>
-	<button label="?" name="estate_manager_help" />
-	<button label="追加..." name="add_estate_manager_btn" />
-	<button label="削除..." name="remove_estate_manager_btn" />
-	<check_box label="世界時間を使用" name="use_global_time_check" />
-	<button label="?" name="use_global_time_help" />
-	<check_box label="太陽固定" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="段階" name="sun_hour_slider" />
-	<check_box label="パブリック・アクセスを許可" name="externally_visible_check" />
-	<button label="?" name="externally_visible_help" />
-	<check_box label="直接テレポートを許可" name="allow_direct_teleport" />
-	<button label="?" name="allow_direct_teleport_help" />
+	<button label="?" name="estate_manager_help"/>
+	<button label="追加..." name="add_estate_manager_btn"/>
+	<button label="削除..." name="remove_estate_manager_btn"/>
+	<check_box label="世界時間を使用" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="太陽固定" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="段階" name="sun_hour_slider"/>
+	<check_box label="パブリック・アクセスを許可" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<check_box label="直接テレポートを許可" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="region_text_lbl">
 		支払い状況によりアクセスを拒否：
 	</text>
-	<check_box label="支払情報登録がないものを拒否" name="deny_anonymous" />
-	<check_box label="支払情報登録があるものを拒否" name="deny_identified" />
-	<check_box label="使用されている支払情報を拒否" name="deny_transacted" />
-	<button label="適用" name="apply_btn" />
+	<check_box label="支払情報登録がないものを拒否" name="deny_anonymous"/>
+	<check_box label="支払情報登録があるものを拒否" name="deny_identified"/>
+	<check_box label="使用されている支払情報を拒否" name="deny_transacted"/>
+	<button label="適用" name="apply_btn"/>
 	<text name="allow_resident_label">
 		許可された住人:
 	</text>
-	<button label="?" name="allow_resident_help" />
-	<button label="追加..." name="add_allowed_avatar_btn" />
-	<button label="削除..." name="remove_allowed_avatar_btn" />
+	<button label="?" name="allow_resident_help"/>
+	<button label="追加..." name="add_allowed_avatar_btn"/>
+	<button label="削除..." name="remove_allowed_avatar_btn"/>
 	<text name="allow_group_label">
 		許可されたグループ：
 	</text>
-	<button label="?" name="allow_group_help" />
-	<button label="追加..." name="add_allowed_group_btn" />
-	<button label="削除..." name="remove_allowed_group_btn" />
+	<button label="?" name="allow_group_help"/>
+	<button label="追加..." name="add_allowed_group_btn"/>
+	<button label="削除..." name="remove_allowed_group_btn"/>
 	<text name="ban_resident_label">
 		禁止された住人:
 	</text>
-	<button label="?" name="ban_resident_help" />
-	<button label="追加..." name="add_banned_avatar_btn" />
-	<button label="削除..." name="remove_banned_avatar_btn" />
-	<button label="メッセージを不動産へ送信..." name="message_estate_btn" />
-	<button label="土地からユーザーを追い出す..."
-	     name="kick_user_from_estate_btn" />
+	<button label="?" name="ban_resident_help"/>
+	<button label="追加..." name="add_banned_avatar_btn"/>
+	<button label="削除..." name="remove_banned_avatar_btn"/>
+	<button label="メッセージを不動産へ送信..." name="message_estate_btn"/>
+	<button label="土地からユーザーを追い出す..." name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
index 6527f0fbe6..d32d8f9e5d 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="地面テクスチャー" name="Textures">
 	<text name="region_text_lbl">
 		地域：
@@ -36,22 +36,23 @@
 	<text name="height_text_lbl9">
 		北東
 	</text>
-	<spinner label="低" name="height_start_spin_0" />
-	<spinner label="低" name="height_start_spin_1" />
-	<spinner label="低" name="height_start_spin_2" />
-	<spinner label="低" name="height_start_spin_3" />
-	<spinner label="高" name="height_range_spin_0" />
-	<spinner label="高" name="height_range_spin_1" />
-	<spinner label="高" name="height_range_spin_2" />
-	<spinner label="高" name="height_range_spin_3" />
+	<spinner label="低" name="height_start_spin_0"/>
+	<spinner label="低" name="height_start_spin_1"/>
+	<spinner label="低" name="height_start_spin_2"/>
+	<spinner label="低" name="height_start_spin_3"/>
+	<spinner label="高" name="height_range_spin_0"/>
+	<spinner label="高" name="height_range_spin_1"/>
+	<spinner label="高" name="height_range_spin_2"/>
+	<spinner label="高" name="height_range_spin_3"/>
 	<text name="height_text_lbl10">
-		これらの数字は、上記のテクスチャーをブレンドする範囲を表します。
+		数値は上のテクスチャのブレンド範囲を示します
 	</text>
 	<text name="height_text_lbl11">
-		計測の単位はメートルで、「低」の値はテクスチャー#1の表示高さの最大値です。
+		計測単位はメートルで、「低」の値は 1 番のテクスチャの高さの最大値です。
+「高」の値は、4 番のテクスチャの高さの最低値です。
 	</text>
 	<text name="height_text_lbl12">
 		そして「高」の値はテクスチャー#4の高さの下限となります。
 	</text>
-	<button label="適用" name="apply_btn" />
+	<button label="適用" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
new file mode 100644
index 0000000000..6ec6b3422e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/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="ホーム。" name="sidebar_home">
+		<panel label="ホーム" name="panel_home"/>
+	</sidetray_tab>
+	<sidetray_tab description="フレンド、連絡先、近くの人を探してください。" name="sidebar_people">
+		<panel_container name="panel_container">
+			<panel label="グループ情報" name="panel_group_info_sidetray"/>
+			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel_container>
+	</sidetray_tab>
+	<sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places">
+		<panel label="場所" name="panel_places"/>
+	</sidetray_tab>
+	<sidetray_tab description="あなたの公開プロフィールとピックを編集してください。" name="sidebar_me">
+		<panel label="ミー" name="panel_me"/>
+	</sidetray_tab>
+	<sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance">
+		<panel label="容姿の編集" name="sidepanel_appearance"/>
+	</sidetray_tab>
+	<sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory">
+		<panel label="持ち物を編集" name="sidepanel_inventory"/>
+	</sidetray_tab>
+</side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..8f4a76fd43
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="sidetray_tab_panel">
+	<text name="sidetray_tab_title" value="サイドパネル"/>
+	<button name="show_help" tool_tip="ヘルプを表示"/>
+</panel>
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
new file mode 100644
index 0000000000..aef1f90298
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Part of side tray, see that XML file for panel config -->
+<panel label="home_tab" name="home_tab">
+	<scroll_container name="profile_scroll">
+		<panel name="profile_scroll_panel">
+			<panel name="sidebar_people">
+				<text name="tab_name" value="人"/>
+				<text name="tab_description">
+					あなたのフレンド、グループ、連絡先、近くの人を探します。
+				</text>
+			</panel>
+			<panel name="sidebar_places">
+				<text name="tab_name" value="場所"/>
+				<text name="tab_description">
+					行きたい場所、行ったことのある場所を探します。
+				</text>
+			</panel>
+			<panel name="sidebar_me">
+				<text name="tab_name" value="マイ プロフィール"/>
+				<text name="tab_description">
+					あなたの公開プロフィールを編集します。
+				</text>
+			</panel>
+			<panel name="sidebar_appearance">
+				<text name="tab_name" value="マイ 容姿"/>
+				<text name="tab_description">
+					あなたの容姿や現在の見た目を変更します。
+				</text>
+			</panel>
+			<panel name="sidebar_inventory">
+				<text name="tab_name" value="マイ 持ち物"/>
+				<text name="tab_description">
+					あなたの持ち物を眺めます。
+				</text>
+			</panel>
+		</panel>
+	</scroll_container>
+</panel>
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 a58a6d68aa..5d122cb8cd 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -12,11 +12,18 @@
 	<panel.string name="bandwidth_tooltip">
 		帯域幅
 	</panel.string>
+	<panel.string name="time">
+		[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+	</panel.string>
+	<panel.string name="timeTooltip">
+		[year, datetime, slt] [month, datetime, slt] [day, datetime, slt] （[weekday, datetime, slt]）
+	</panel.string>
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="私の残高： ここをクリックして L$ を購入"/>
-	<text name="TimeText" tool_tip="現在時刻（太平洋時）">
+	<button label="" label_selected="" name="buycurrency" tool_tip="私の残高： クリックして L$ を購入します"/>
+	<text name="TimeText" tool_tip="現在時刻（太平洋）">
 		12：00 AM
 	</text>
+	<button name="volume_btn" tool_tip="グローバル音量設定"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
new file mode 100644
index 0000000000..81db7c8989
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel name="sys_well_item" title="sys_well_item">
+	<text name="title">
+		Beware the trout. BEWARE! THE! TROUT!
+	</text>
+</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
new file mode 100644
index 0000000000..70969f7ac0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Teleport History">
+	<accordion name="history_accordion">
+		<accordion_tab name="today" title="今日"/>
+		<accordion_tab name="yesterday" title="昨日"/>
+		<accordion_tab name="2_days_ago" title="2日前"/>
+		<accordion_tab name="3_days_ago" title="3日前"/>
+		<accordion_tab name="4_days_ago" title="4日前"/>
+		<accordion_tab name="5_days_ago" title="5日前"/>
+		<accordion_tab name="6_days_and_older" title="6日以上前"/>
+		<accordion_tab name="1_month_and_older" title="1ヶ月以上前"/>
+		<accordion_tab name="6_months_and_older" title="半年以上前"/>
+	</accordion>
+	<panel label="bottom_panel" name="bottom_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
new file mode 100644
index 0000000000..9d18c52442
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+	<text name="region" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
new file mode 100644
index 0000000000..ac41d7ce2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="容姿" name="appearance panel">
+	<string name="No Outfit" value="アウトフィットなし"/>
+	<panel name="panel_currentlook">
+		<button label="編集" name="editappearance_btn"/>
+		<text name="currentlook_title">
+			着用中のアウトフィット：
+		</text>
+		<text name="currentlook_name">
+			マイ アウトフィット
+		</text>
+	</panel>
+	<filter_editor label="フィルター" name="Filter"/>
+	<button label="装着" name="wear_btn"/>
+	<button label="新しいアウトフィット" name="newlook_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
new file mode 100644
index 0000000000..c2a61f738f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="もの" name="objects panel">
+	<panel label="" name="sidepanel__inventory_panel">
+		<panel name="button_panel">
+			<button label="情報" name="info_btn"/>
+			<button label="装着" name="wear_btn"/>
+			<button label="プレイ" name="play_btn"/>
+			<button label="テレポート" name="teleport_btn"/>
+		</panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
new file mode 100644
index 0000000000..9544e7756c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="持ち物アイテムのプロパティ">
+	<panel.string name="unknown">
+		（不明）
+	</panel.string>
+	<panel.string name="public">
+		（公開）
+	</panel.string>
+	<panel.string name="you_can">
+		あなたができること：
+	</panel.string>
+	<panel.string name="owner_can">
+		所有者ができること：
+	</panel.string>
+	<panel.string name="acquiredDate">
+		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+	</panel.string>
+	<panel label="">
+		<text name="LabelItemNameTitle">
+			名前：
+		</text>
+		<text name="LabelItemDescTitle">
+			説明：
+		</text>
+		<text name="LabelCreatorTitle">
+			制作者：
+		</text>
+		<text name="LabelCreatorName">
+			Nicole Linden
+		</text>
+		<button label="プロフィール..." name="BtnCreator"/>
+		<text name="LabelOwnerTitle">
+			所有者：
+		</text>
+		<text name="LabelOwnerName">
+			Thrax Linden
+		</text>
+		<button label="プロフィール..." name="BtnOwner"/>
+		<text name="LabelAcquiredTitle">
+			取得：
+		</text>
+		<text name="LabelAcquiredDate">
+			Wed May 24 12:50:46 2006
+		</text>
+		<text name="OwnerLabel">
+			あなた：
+		</text>
+		<check_box label="編集" name="CheckOwnerModify"/>
+		<check_box label="コピー" name="CheckOwnerCopy"/>
+		<check_box label="再販・プレゼント" name="CheckOwnerTransfer"/>
+		<text name="AnyoneLabel">
+			全員：
+		</text>
+		<check_box label="コピー" name="CheckEveryoneCopy"/>
+		<text name="GroupLabel">
+			グループ：
+		</text>
+		<check_box label="共有" name="CheckShareWithGroup"/>
+		<text name="NextOwnerLabel">
+			次の所有者：
+		</text>
+		<check_box label="編集" name="CheckNextOwnerModify"/>
+		<check_box label="コピー" name="CheckNextOwnerCopy"/>
+		<check_box label="再販・プレゼント" name="CheckNextOwnerTransfer"/>
+		<check_box label="販売する" name="CheckPurchase"/>
+		<combo_box name="combobox sale copy">
+			<combo_box.item label="コピー" name="Copy"/>
+			<combo_box.item label="オリジナル" name="Original"/>
+		</combo_box>
+		<spinner label="価格：" name="Edit Cost"/>
+		<text name="CurrencySymbol">
+			L$
+		</text>
+	</panel>
+	<panel name="button_panel">
+		<button label="編集" name="edit_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+		<button label="保存" name="save_btn"/>
+	</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
new file mode 100644
index 0000000000..5bf37954c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="object properties" title="オブジェクトのプロパティ">
+	<panel.string name="text deed continued">
+		譲渡
+	</panel.string>
+	<panel.string name="text deed">
+		譲渡
+	</panel.string>
+	<panel.string name="text modify info 1">
+		このオブジェクトを修正できます
+	</panel.string>
+	<panel.string name="text modify info 2">
+		これらのオブジェクトを修正できます
+	</panel.string>
+	<panel.string name="text modify info 3">
+		このオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 4">
+		これらのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify warning">
+		このオブジェクトには、パーツがリンクされています
+	</panel.string>
+	<panel.string name="Cost Default">
+		価格： L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		合計： L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Price Per: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Mixed Price
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Mixed Sale
+	</panel.string>
+	<panel label="">
+		<text name="Name:">
+			名前：
+		</text>
+		<text name="Description:">
+			説明：
+		</text>
+		<text name="Creator:">
+			制作者：
+		</text>
+		<text name="Creator Name">
+			Esbee Linden
+		</text>
+		<text name="Owner:">
+			所有者：
+		</text>
+		<text name="Owner Name">
+			Erica Linden
+		</text>
+		<text name="Group:">
+			グループ：
+		</text>
+		<button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択"/>
+		<name_box initial_value="ローディング..." name="Group Name Proxy"/>
+		<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
+		<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
+		<text name="label click action">
+			クリックで：
+		</text>
+		<combo_box name="clickaction">
+			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
+			<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
+			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
+			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
+			<combo_box.item label="開く" name="Open"/>
+		</combo_box>
+		<check_box label="販売対象：" name="checkbox for sale"/>
+		<combo_box name="sale type">
+			<combo_box.item label="コピー" name="Copy"/>
+			<combo_box.item label="中身" name="Contents"/>
+			<combo_box.item label="オリジナル" name="Original"/>
+		</combo_box>
+		<spinner label="価格： L$" name="Edit Cost"/>
+		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
+		<panel name="perms_build">
+			<text name="perm_modify">
+				あなたはこのオブジェクトを修正できます
+			</text>
+			<text name="Anyone can:">
+				全員：
+			</text>
+			<check_box label="移動" name="checkbox allow everyone move"/>
+			<check_box label="コピー" name="checkbox allow everyone copy"/>
+			<text name="Next owner can:">
+				次の所有者：
+			</text>
+			<check_box label="修正" name="checkbox next owner can modify"/>
+			<check_box label="コピー" name="checkbox next owner can copy"/>
+			<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/>
+			<text name="B:">
+				B.
+			</text>
+			<text name="O:">
+				O:
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+		</panel>
+	</panel>
+	<panel name="button_panel">
+		<button label="編集" name="edit_btn"/>
+		<button label="開く" name="open_btn"/>
+		<button label="支払う" name="pay_btn"/>
+		<button label="買う" name="buy_btn"/>
+		<button label="キャンセル" name="cancel_btn"/>
+		<button label="保存" name="save_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index fc9e4b67b7..2006d1cbdc 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings
      that are returned from one component and may appear in many places-->
 <strings>
-	<string name="create_account_url">http://join.secondlife.com/index.php?lang=ja-JP</string>
 	<string name="SECOND_LIFE">
 		Second Life
 	</string>
@@ -15,7 +14,7 @@
 		Second Life Grid
 	</string>
 	<string name="SUPPORT_SITE">
-		Second Lifeサポートポータル
+		Second Life サポートポータル
 	</string>
 	<string name="StartupDetectingHardware">
 		ハードウェアの検出中です...
@@ -80,8 +79,14 @@
 	<string name="LoginDownloadingClothing">
 		服をダウンロードしています...
 	</string>
+	<string name="Quit">
+		終了
+	</string>
+	<string name="create_account_url">
+		http://join.secondlife.com/index.php?lang=ja-JP
+	</string>
 	<string name="AgentLostConnection">
-		この地域には、問題が発生している可能性があります。  インターネット接続を確認してください。
+		このリージョンに不都合が発生している可能性があります。  ご使用のインターネット接続をご確認ください。
 	</string>
 	<string name="TooltipPerson">
 		人
@@ -155,9 +160,19 @@
 	<string name="TooltipObjectIMUrl">
 		クリックしてこのオブジェクトの説明文を見る
 	</string>
+	<string name="TooltipMapUrl">
+		クリックしてこの場所を地図に表示する
+	</string>
 	<string name="TooltipSLAPP">
 		クリックして secondlife:// コマンドを出す
 	</string>
+	<string name="CurrentURL" value=" 現在のURL： [CurrentURL]"/>
+	<string name="SLurlLabelTeleport">
+		テレポート
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		地図に表示
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		閉じる （&#8984;W）
 	</string>
@@ -182,59 +197,68 @@
 	<string name="BUTTON_HELP">
 		ヘルプを表示
 	</string>
-	<string name="RetrievingData">
+	<string name="Searching">
 		検索中...
 	</string>
+	<string name="NoneFound">
+		見つかりませんでした。
+	</string>
+	<string name="RetrievingData">
+		取得中...
+	</string>
 	<string name="ReleaseNotes">
 		リリースノート
 	</string>
 	<string name="LoadingData">
-		ロード中...
+		ローディング...
 	</string>
 	<string name="AvatarNameNobody">
-		(無人)
+		（なし）
 	</string>
 	<string name="AvatarNameWaiting">
-		(待機中)
+		（待機中）
+	</string>
+	<string name="AvatarNameMultiple">
+		（複数）
 	</string>
 	<string name="AvatarNameHippos">
-		(カバ)
+		(hippos)
 	</string>
 	<string name="GroupNameNone">
-		(なし)
+		（なし）
 	</string>
 	<string name="AssetErrorNone">
 		エラーなし
 	</string>
 	<string name="AssetErrorRequestFailed">
-		資産の要求: 失敗
+		アセットリクエスト： 失敗
 	</string>
 	<string name="AssetErrorNonexistentFile">
-		資産の要求: 存在しないファイル
+		アセットリクエスト： 存在しないファイル
 	</string>
 	<string name="AssetErrorNotInDatabase">
-		資産の要求: データベースでは見つからない資産
+		アセットリクエスト： データベースに見つかりませんでした
 	</string>
 	<string name="AssetErrorEOF">
-		ファイルの終わり
+		終了
 	</string>
 	<string name="AssetErrorCannotOpenFile">
-		ファイルを開くことができません
+		ファイルを開けません
 	</string>
 	<string name="AssetErrorFileNotFound">
 		ファイルが見つかりません
 	</string>
 	<string name="AssetErrorTCPTimeout">
-		ファイル転送タイムアウトです
+		ファイルの転送タイムアウト
 	</string>
 	<string name="AssetErrorCircuitGone">
-		接続が解除されました
+		サーキットエラー
 	</string>
 	<string name="AssetErrorPriceMismatch">
 		ビューワとサーバーの価格が一致していません
 	</string>
 	<string name="AssetErrorUnknownStatus">
-		ステータスが不明です
+		不明のステータス
 	</string>
 	<string name="texture">
 		テクスチャ
@@ -267,7 +291,7 @@
 		ルート
 	</string>
 	<string name="lsl2 script">
-		lsl2 スクリプト
+		LSL2 スクリプト
 	</string>
 	<string name="lsl bytecode">
 		LSL バイトコード
@@ -288,7 +312,7 @@
 		targa 画像
 	</string>
 	<string name="trash">
-		ゴミ箱
+		ごみ箱
 	</string>
 	<string name="jpeg image">
 		jpeg 画像
@@ -308,14 +332,17 @@
 	<string name="symbolic link">
 		リンク
 	</string>
+	<string name="AvatarEditingAppearance">
+		（容姿の編集）
+	</string>
 	<string name="AvatarAway">
-		退席中
+		一時退席中
 	</string>
 	<string name="AvatarBusy">
 		取り込み中
 	</string>
 	<string name="AvatarMuted">
-		ミュート
+		ブロック中
 	</string>
 	<string name="anim_express_afraid">
 		怖れ
@@ -525,11 +552,14 @@
 		頷く
 	</string>
 	<string name="texture_loading">
-		ロード中...
+		ローディング...
 	</string>
 	<string name="worldmap_offline">
 		オフライン
 	</string>
+	<string name="worldmap_results_none_found">
+		見つかりませんでした。
+	</string>
 	<string name="Ok">
 		OK
 	</string>
@@ -660,13 +690,13 @@
 		参照
 	</string>
 	<string name="AvatarSetNotAway">
-		一時退席中を解除
+		一時退席中解除
 	</string>
 	<string name="AvatarSetAway">
 		一時退席中
 	</string>
 	<string name="AvatarSetNotBusy">
-		取り込み中を解除
+		取り込み中解除
 	</string>
 	<string name="AvatarSetBusy">
 		取り込み中
@@ -678,7 +708,7 @@
 		スキン
 	</string>
 	<string name="hair">
-		髪型
+		髪
 	</string>
 	<string name="eyes">
 		目
@@ -687,7 +717,7 @@
 		シャツ
 	</string>
 	<string name="pants">
-		ズボン
+		パンツ
 	</string>
 	<string name="shoes">
 		靴
@@ -696,7 +726,7 @@
 		靴下
 	</string>
 	<string name="jacket">
-		上着
+		ジャケット
 	</string>
 	<string name="gloves">
 		手袋
@@ -710,9 +740,51 @@
 	<string name="skirt">
 		スカート
 	</string>
+	<string name="alpha">
+		アルファ
+	</string>
+	<string name="tattoo">
+		タトゥ
+	</string>
 	<string name="invalid">
 		無効
 	</string>
+	<string name="next">
+		次へ
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		グループ通知
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		グループ通知
+	</string>
+	<string name="GroupNotifySentBy">
+		送信者
+	</string>
+	<string name="GroupNotifyAttached">
+		添付：
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		ここで過去の通知を表示するか、メッセージを受け取らない設定をします。
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		添付アイテムを開く
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		添付アイテムを保存
+	</string>
+	<string name="TeleportOffer">
+		テレポートを渡す
+	</string>
+	<string name="StartUpNotifications">
+		不在中に新しい通知が届きました。
+	</string>
+	<string name="OverflowInfoChannelString">
+		You have %d more notification
+	</string>
 	<string name="BodyPartsRightArm">
 		右腕
 	</string>
@@ -749,14 +821,48 @@
 	<string name="InventoryNoTexture">
 		持ち物内にこのテクスチャのコピーがありません
 	</string>
+	<string name="no_transfer" value=" （再販/プレゼント不可）"/>
+	<string name="no_modify" value=" （編集不可）"/>
+	<string name="no_copy" value=" （コピー不可）"/>
+	<string name="worn" value=" （着用中）"/>
+	<string name="link" value=" （リンク）"/>
+	<string name="broken_link" value=" （壊れたリンク）"/>
 	<string name="LoadingContents">
 		コンテンツをロード中です...
 	</string>
 	<string name="NoContents">
 		コンテンツなし
 	</string>
+	<string name="WornOnAttachmentPoint" value=" （[ATTACHMENT_POINT] に装着中）"/>
+	<string name="PermYes">
+		はい
+	</string>
+	<string name="PermNo">
+		いいえ
+	</string>
+	<string name="Chat" value=" チャット："/>
+	<string name="Sound" value=" サウンド："/>
+	<string name="Wait" value=" --- 待機：:"/>
+	<string name="AnimFlagStop" value=" アニメーションを停止："/>
+	<string name="AnimFlagStart" value=" アニメーションを開始："/>
+	<string name="Wave" value=" 手を振る"/>
+	<string name="HelloAvatar" value=" やあ、アバター！"/>
+	<string name="ViewAllGestures" value="  すべて表示 &gt;&gt;"/>
+	<string name="Animations" value="アニメーション、"/>
+	<string name="Calling Cards" value="コーリングカード、"/>
+	<string name="Clothing" value="衣類、"/>
+	<string name="Gestures" value="ジェスチャー、"/>
+	<string name="Landmarks" value="ランドマーク、"/>
+	<string name="Notecards" value="ノートカード、"/>
+	<string name="Objects" value="オブジェクト、"/>
+	<string name="Scripts" value="スクリプト、"/>
+	<string name="Sounds" value="サウンド、"/>
+	<string name="Textures" value="テクスチャ、"/>
+	<string name="Snapshots" value="スナップショット、"/>
+	<string name="No Filters" value="いいえ "/>
+	<string name="Since Logoff" value=" - ログオフ以来"/>
 	<string name="InvFolder My Inventory">
-		私の持ち物
+		マイ 持ち物
 	</string>
 	<string name="InvFolder My Favorites">
 		お気に入り
@@ -792,7 +898,7 @@
 		新規フォルダ
 	</string>
 	<string name="InvFolder Inventory">
-		持ち物
+		インベントリ
 	</string>
 	<string name="InvFolder Uncompressed Images">
 		圧縮されていない画像
@@ -801,7 +907,7 @@
 		身体部位
 	</string>
 	<string name="InvFolder Trash">
-		ゴミ箱
+		ごみ箱
 	</string>
 	<string name="InvFolder Photo Album">
 		フォトアルバム
@@ -825,7 +931,7 @@
 		着用中のアウトフィット
 	</string>
 	<string name="InvFolder My Outfits">
-		私のアウトフィット
+		マイ アウトフィット
 	</string>
 	<string name="InvFolder Friends">
 		フレンド
@@ -1013,6 +1119,15 @@
 	<string name="AgeDaysC">
 		[COUNT] 日間
 	</string>
+	<string name="GroupMembersA">
+		[COUNT] 人
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] 人
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] 人
+	</string>
 	<string name="AcctTypeResident">
 		住人
 	</string>
@@ -1020,22 +1135,22 @@
 		トライアル
 	</string>
 	<string name="AcctTypeCharterMember">
-		特権メンバー
+		創立メンバー
 	</string>
 	<string name="AcctTypeEmployee">
-		Linden Lab従業員
+		Linden Lab 従業員
 	</string>
 	<string name="PaymentInfoUsed">
-		支払い情報登録済
+		支払情報使用履歴あり
 	</string>
 	<string name="PaymentInfoOnFile">
-		支払い情報登録済み
+		支払情報登録済
 	</string>
 	<string name="NoPaymentInfoOnFile">
-		支払い情報未登録
+		支払情報未登録
 	</string>
 	<string name="AgeVerified">
-		年齢確認済み
+		年齢確認済
 	</string>
 	<string name="NotAgeVerified">
 		年齢未確認
@@ -1056,13 +1171,13 @@
 		中心
 	</string>
 	<string name="Bottom Left">
-		Bottom Left
+		左下
 	</string>
 	<string name="Bottom">
-		Bottom
+		下部
 	</string>
 	<string name="Bottom Right">
-		Bottom Right
+		右下
 	</string>
 	<string name="CompileQueueDownloadedCompiling">
 		ダウンロード完了、コンパイル中
@@ -1124,9 +1239,13 @@
 	<string name="GroupsNone">
 		なし
 	</string>
+	<string name="Group" value=" （グループ）"/>
 	<string name="Unknown">
 		（不明）
 	</string>
+	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
+	<string name="NextStipendDay" value="次回のお小遣い支給日は"/>
+	<string name="GroupIndividualShare" value="                      グループ       個人の割り当て"/>
 	<string name="Balance">
 		残高
 	</string>
@@ -1175,6 +1294,12 @@
 	<string name="PanelDirCountFound">
 		[COUNT] 件見つかりました
 	</string>
+	<string name="PanelDirTimeStr">
+		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</string>
+	<string name="PanelDirEventsDateText">
+		[mthnum,datetime,slt]/[day,datetime,slt]
+	</string>
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
@@ -1194,11 +1319,13 @@
 		この不動産には約款がありません。
 	</string>
 	<string name="RegionNoCovenantOtherOwner">
-		この不動産には約款がありません。 この不動産上の土地は不動産所有者により販売され、Linden Lab では販売していません。  販売に関するお問い合わせは、不動産所有者までお願い致します。
+		この不動産には約款がありません。 この不動産上の土地は不動産所有者により販売され、Linden Lab は販売しません。  販売に関するお問い合わせは、不動産所有者までお願い致します。
 	</string>
 	<string name="covenant_last_modified">
 		最終修正日：
 	</string>
+	<string name="none_text" value=" （なし）"/>
+	<string name="never_text" value=" （無）"/>
 	<string name="GroupOwned">
 		グループ所有
 	</string>
@@ -1211,29 +1338,11 @@
 	<string name="ClassifiedUpdateAfterPublish">
 		（掲載後更新）
 	</string>
-	<string name="GroupVoteYes">
-		はい
-	</string>
-	<string name="GroupVoteNo">
-		いいえ
-	</string>
-	<string name="GroupVoteNoActiveProposals">
-		継続中の提案は現在ありません
-	</string>
-	<string name="GroupVoteNoArchivedProposals">
-		提案のアーカイブは現在ありません
-	</string>
-	<string name="GroupVoteRetrievingArchivedProposals">
-		提案のアーカイブを取得中です
-	</string>
-	<string name="GroupVoteRetrievingActiveProposals">
-		継続中の提案を取得中です
-	</string>
 	<string name="MultiPreviewTitle">
 		プレビュー
 	</string>
 	<string name="MultiPropertiesTitle">
-		Properties
+		プロパティ
 	</string>
 	<string name="InvOfferAnObjectNamed">
 		オブジェクト名
@@ -1251,7 +1360,7 @@
 		不明なユーザー所有
 	</string>
 	<string name="InvOfferGaveYou">
-		gave you
+		が渡しました
 	</string>
 	<string name="InvOfferYouDecline">
 		You decline
@@ -1263,10 +1372,10 @@
 		合計
 	</string>
 	<string name="GroupMoneyBought">
-		bought
+		は購入しました
 	</string>
 	<string name="GroupMoneyPaidYou">
-		paid you
+		があなたに支払いました
 	</string>
 	<string name="GroupMoneyPaidInto">
 		paid into
@@ -1275,10 +1384,10 @@
 		bought pass to
 	</string>
 	<string name="GroupMoneyPaidFeeForEvent">
-		paid fee for event
+		がイベント用の費用を支払いました
 	</string>
 	<string name="GroupMoneyPaidPrizeForEvent">
-		paid prize for event
+		がイベント用の賞金を支払いました
 	</string>
 	<string name="GroupMoneyBalance">
 		残高
@@ -1290,7 +1399,7 @@
 		支出
 	</string>
 	<string name="ViewerObjectContents">
-		中身
+		内容
 	</string>
 	<string name="AcquiredItems">
 		取得アイテム
@@ -1345,10 +1454,10 @@
 		PM
 	</string>
 	<string name="PST">
-		米国西部標準時
+		太平洋標準時
 	</string>
 	<string name="PDT">
-		米国西部夏時間
+		太平洋夏時間
 	</string>
 	<string name="Forward">
 		前
@@ -1414,7 +1523,7 @@
 		なし
 	</string>
 	<string name="Linden Location">
-		Linden所在地
+		Linden 所在地
 	</string>
 	<string name="Adult">
 		Adult
@@ -1435,7 +1544,7 @@
 		たまり場
 	</string>
 	<string name="Newcomer Friendly">
-		新住人に好意的
+		新住人に優しい
 	</string>
 	<string name="Parks&amp;Nature">
 		公園と自然
@@ -1482,6 +1591,12 @@
 	<string name="---">
 		---
 	</string>
+	<string name="Multiple Media">
+		複数のメディア
+	</string>
+	<string name="Play Media">
+		メディアを再生/一時停止
+	</string>
 	<string name="MBCmdLineError">
 		コマンドラインにエラーが見つかりました。
 リンク先を参照してください： http://wiki.secondlife.com/wiki/Client_parameters
@@ -1501,7 +1616,7 @@
 		致命的なエラー
 	</string>
 	<string name="MBRequiresAltiVec">
-		[APP_NAME] は、AltiVec搭載のプロセッサが必要です。（G4 以降）
+		 [APP_NAME] は、AltiVec搭載のプロセッサが必要です。（G4 以降）
 	</string>
 	<string name="MBAlreadyRunning">
 		[APP_NAME] はすでに実行中です。
@@ -1554,9 +1669,8 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		ピクセル形式情報が見つかりません
 	</string>
 	<string name="MBTrueColorWindow">
-		[APP_NAME] をウィンドウで実行するには、True Color（32ビット）が必要です。
-「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （32 ビット)」に設定してください。
-全画面を選択した場合、実行時に [APP_NAME] は自動的にスクリーンを調整します。
+		[APP_NAME] を実行するには、True Color（32ビット）が必要です。
+お使いのコンピューターの「コントロールパネル」＞「画面」＞「設定」に行き、「最高 （32 ビット)」に設定してください。
 	</string>
 	<string name="MBAlpha">
 		[APP_NAME] は 8 ビットのアルファチャンネルを取得できないため実行できません。  通常ビデオカードのドライバの問題で起こります。
@@ -1599,39 +1713,15 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Attached Earlobes">
 		耳たぶ
 	</string>
-	<string name="Back Bangs">
-		後ろにかき上げた前髪
-	</string>
-	<string name="Back Bangs Down">
-		後ろにかき上げて下ろした前髪
-	</string>
-	<string name="Back Bangs Up">
-		後ろにかき上げて持ち上げた前髪
-	</string>
 	<string name="Back Fringe">
 		後ろ髪の毛先
 	</string>
-	<string name="Back Hair">
-		後ろ髪
-	</string>
-	<string name="Back Hair Down">
-		下ろした後ろ髪
-	</string>
-	<string name="Back Hair Up">
-		アップにした後ろ髪
-	</string>
 	<string name="Baggy">
 		たるんでいる
 	</string>
 	<string name="Bangs">
 		前髪
 	</string>
-	<string name="Bangs Down">
-		下ろした前髪
-	</string>
-	<string name="Bangs Up">
-		持ち上げた前髪
-	</string>
 	<string name="Beady Eyes">
 		ビーズのような目
 	</string>
@@ -1644,9 +1734,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Big Butt">
 		大
 	</string>
-	<string name="Big Eyeball">
-		大きい眼球
-	</string>
 	<string name="Big Hair Back">
 		髪の大部分： 後ろ
 	</string>
@@ -1765,7 +1852,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		あごの角度
 	</string>
 	<string name="Chin Cleft">
-		あごの先の割れ具合
+		あごの先の割れ
 	</string>
 	<string name="Chin Curtains">
 		あごに沿ったひげ
@@ -1821,9 +1908,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Corner Down">
 		ダウン
 	</string>
-	<string name="Corner Normal">
-		ノーマル
-	</string>
 	<string name="Corner Up">
 		アップ
 	</string>
@@ -1833,9 +1917,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Crooked Nose">
 		曲がった鼻
 	</string>
-	<string name="Cropped Hair">
-		短く刈り込んだ髪
-	</string>
 	<string name="Cuff Flare">
 		袖口のフレア
 	</string>
@@ -1854,15 +1935,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Default Heels">
 		デフォルトのかかと
 	</string>
-	<string name="Default Toe">
-		デフォルトのつま先
-	</string>
 	<string name="Dense">
 		濃
 	</string>
-	<string name="Dense hair">
-		密度の多い髪
-	</string>
 	<string name="Double Chin">
 		二重あご
 	</string>
@@ -1908,9 +1983,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Eye Spacing">
 		目と目のあいだの幅
 	</string>
-	<string name="Eyeball Size">
-		眼球の大きさ
-	</string>
 	<string name="Eyebrow Arc">
 		眉毛のアーチ
 	</string>
@@ -1935,35 +2007,14 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Eyeliner Color">
 		アイライナーの色
 	</string>
-	<string name="Eyes Back">
-		目・戻る
-	</string>
 	<string name="Eyes Bugged">
 		下まぶたがたるんだ目
 	</string>
-	<string name="Eyes Forward">
-		目・次へ
-	</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">
-		離れた目
-	</string>
-	<string name="Eyes Sunken">
-		くぼんだ目
-	</string>
-	<string name="Eyes Together">
-		Eyes Together
+		右側を上に
 	</string>
 	<string name="Face Shear">
 		顔のゆがみ
@@ -1974,30 +2025,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Far Set Eyes">
 		離れた目
 	</string>
-	<string name="Fat">
-		太った
-	</string>
-	<string name="Fat Head">
-		太めの頭
-	</string>
 	<string name="Fat Lips">
 		大
 	</string>
-	<string name="Fat Lower">
-		Fat Lower
-	</string>
-	<string name="Fat Lower Lip">
-		厚めの下唇
-	</string>
-	<string name="Fat Torso">
-		太めの頭部
-	</string>
-	<string name="Fat Upper">
-		Fat Upper
-	</string>
-	<string name="Fat Upper Lip">
-		厚めの上唇
-	</string>
 	<string name="Female">
 		女性
 	</string>
@@ -2034,24 +2064,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Freckles">
 		しみ・そばかす
 	</string>
-	<string name="Front Bangs Down">
-		下ろした前髪
-	</string>
-	<string name="Front Bangs Up">
-		上げた前髪
-	</string>
 	<string name="Front Fringe">
 		前髪の毛先
 	</string>
-	<string name="Front Hair">
-		前髪
-	</string>
-	<string name="Front Hair Down">
-		下ろした前髪
-	</string>
-	<string name="Front Hair Up">
-		アップにした前髪
-	</string>
 	<string name="Full Back">
 		刈られていない髪
 	</string>
@@ -2125,7 +2140,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		頭の大きさ
 	</string>
 	<string name="Head Stretch">
-		頭の伸び具合
+		頭の伸び
 	</string>
 	<string name="Heel Height">
 		ヒールの高さ
@@ -2325,9 +2340,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Long arms">
 		長
 	</string>
-	<string name="Longcuffs">
-		ロングカフス
-	</string>
 	<string name="Loose Pants">
 		ゆったり
 	</string>
@@ -2490,9 +2502,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="No Eyeshadow">
 		なし
 	</string>
-	<string name="No Heels">
-		なし
-	</string>
 	<string name="No Lipgloss">
 		なし
 	</string>
@@ -2518,10 +2527,10 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		なし
 	</string>
 	<string name="Normal Lower">
-		Normal Lower
+		下
 	</string>
 	<string name="Normal Upper">
-		Normal Upper
+		上
 	</string>
 	<string name="Nose Left">
 		左曲がり
@@ -2550,9 +2559,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Nostril Width">
 		鼻の穴の幅
 	</string>
-	<string name="Old">
-		Old
-	</string>
 	<string name="Opaque">
 		濃いめ
 	</string>
@@ -2652,9 +2658,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Pointy Heels">
 		幅狭
 	</string>
-	<string name="Pointy Toe">
-		先の細いつま先
-	</string>
 	<string name="Ponytail">
 		ポニーテール
 	</string>
@@ -2679,15 +2682,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Red Hair">
 		赤毛
 	</string>
-	<string name="Red Skin">
-		赤い肌
-	</string>
 	<string name="Regular">
 		均整のとれた
 	</string>
-	<string name="Regular Muscles">
-		均整のとれた筋肉
-	</string>
 	<string name="Right Part">
 		右分け
 	</string>
@@ -2697,9 +2694,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Round">
 		まるっこい
 	</string>
-	<string name="Round Forehead">
-		丸みを帯びた額
-	</string>
 	<string name="Ruddiness">
 		血色
 	</string>
@@ -2712,24 +2706,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Saddle Bags">
 		腰回りの肉付き
 	</string>
-	<string name="Saddlebags">
-		腰回りの肉付き
-	</string>
-	<string name="Scrawny">
-		骨張った
-	</string>
 	<string name="Scrawny Leg">
 		骨張った脚
 	</string>
 	<string name="Separate">
 		離れた
 	</string>
-	<string name="Shading">
-		Shading
-	</string>
-	<string name="Shadow hair">
-		Shadow hair
-	</string>
 	<string name="Shallow">
 		なだらか
 	</string>
@@ -2742,15 +2724,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Shear Front">
 		前方を刈る
 	</string>
-	<string name="Shear Left">
-		左側
-	</string>
 	<string name="Shear Left Up">
 		左半分を上に
 	</string>
-	<string name="Shear Right">
-		右側
-	</string>
 	<string name="Shear Right Up">
 		右半分を上に
 	</string>
@@ -2811,15 +2787,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Shoulders">
 		肩
 	</string>
-	<string name="Side Bangs">
-		サイドに流した前髪
-	</string>
-	<string name="Side Bangs Down">
-		ダウン
-	</string>
-	<string name="Side Bangs Up">
-		アップ
-	</string>
 	<string name="Side Fringe">
 		サイドの毛先
 	</string>
@@ -2835,9 +2802,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Sides Hair Up">
 		アップ
 	</string>
-	<string name="Skinny">
-		細身
-	</string>
 	<string name="Skinny Neck">
 		細
 	</string>
@@ -2886,9 +2850,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Socks Length">
 		靴下丈
 	</string>
-	<string name="Some">
-		Some
-	</string>
 	<string name="Soulpatch">
 		ソウルパッチ
 	</string>
@@ -2907,9 +2868,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Squash Head">
 		カボチャ型
 	</string>
-	<string name="Squash/Stretch Head">
-		カボチャ/縦長頭
-	</string>
 	<string name="Stretch Head">
 		縦長
 	</string>
@@ -2928,18 +2886,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Sweep Forward">
 		前へ
 	</string>
-	<string name="Swept Back">
-		オールバック
-	</string>
-	<string name="Swept Back Hair">
-		オールバックヘア
-	</string>
-	<string name="Swept Forward">
-		前へ
-	</string>
-	<string name="Swept Forward Hair">
-		後ろへ
-	</string>
 	<string name="Tall">
 		高
 	</string>
@@ -2958,9 +2904,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Thick Toe">
 		厚め
 	</string>
-	<string name="Thickness">
-		厚み
-	</string>
 	<string name="Thin">
 		薄い
 	</string>
@@ -2991,12 +2934,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Tight Sleeves">
 		タイト
 	</string>
-	<string name="Tilt Left">
-		左に傾斜
-	</string>
-	<string name="Tilt Right">
-		右に傾斜
-	</string>
 	<string name="Toe Shape">
 		つま先の形
 	</string>
@@ -3075,6 +3012,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="LocationCtrlEditLandmarkTooltip">
 		マイ ランドマークを編集
 	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		現在地の詳細を見る
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		マイロケーション履歴
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] アップデート
 	</string>
@@ -3105,6 +3048,33 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="UpdaterFailStartTitle">
 		ビューワの起動に失敗しました
 	</string>
+	<string name="IM_logging_string">
+		-- インスタントメッセージの保存開始 --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] は入力中...
+	</string>
+	<string name="Unnamed">
+		（名前なし）
+	</string>
+	<string name="IM_moderated_chat_label">
+		（モデレート： デフォルトでボイスはオフ）
+	</string>
+	<string name="IM_unavailable_text_label">
+		このコールでは文字チャットが利用できません。
+	</string>
+	<string name="IM_muted_text_label">
+		グループのモデレータが、あなたの文字チャットを使用禁止にしました。
+	</string>
+	<string name="IM_default_text_label">
+		ここをクリックしてインスタントメッセージを開始。
+	</string>
+	<string name="IM_to_label">
+		宛先
+	</string>
+	<string name="IM_moderator_label">
+		（モデレータ）
+	</string>
 	<string name="only_user_message">
 		このセッションにいるユーザーはあなただけです。
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 440704eafa..72c183d03b 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -3,11 +3,11 @@
 	<message_set name="errors">
 		<message name="invalid_tport">
 			テレポート処理中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
 		</message>
 		<message name="invalid_region_handoff">
 			リージョン間の移動中に問題が発生しました。 ログインし直す必要があるかもしれません。
-このメッセージが何度も出る場合は、[SUPPORT_SITE] へご連絡ください。
+このメッセージが何度も出る場合は、[SUPPORT_SITE] をご確認ください。
 		</message>
 		<message name="blocked_tport">
 			申し訳ございません。テレポートは現在、ブロックされています。もう少し後でやり直してください。
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 aac8438fdc..f17c069ecf 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -52,6 +52,9 @@
 	<text name="total_amount">
 		L$ [AMT]
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=pt-BR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=pt-BR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=pt-BR exchange rate]
+	</text>
 	<text name="purchase_warning_repurchase">
 		Confirmando esta compra só compra a moeda.
 Você precisará tentar novamente a operação.
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
index 142a5eb5e6..7ba82fbd2c 100644
--- a/indra/newview/tests/lldateutil_test.cpp
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -179,4 +179,14 @@ namespace tut
 			LLDateUtil::ageFromDate("12/31/2009", mNow),
 			"Joined today" );
 	}
+
+	template<> template<>
+	void dateutil_object_t::test<5>()
+	{
+		set_test_name("2010 rollover");
+		LLDate now(std::string("2010-01-04T12:00:00Z"));
+		ensure_equals("days",
+			LLDateUtil::ageFromDate("12/13/2009", now),
+			"3 weeks old" );
+	}
 }
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index ec612c4606..297d98ad8d 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -78,9 +78,24 @@ static void substitute_string(std::string &input, const std::string &search, con
 	}
 }
 
+class LLAgent
+{
+public:
+	LLAgent() {}
+	~LLAgent() {}
+#ifdef __GNUC__
+	__attribute__ ((noinline))
+#endif
+	BOOL isGodlike() const { return FALSE; }
+private:
+	int dummy;
+};
+LLAgent gAgent;
+
 std::string LLWeb::expandURLSubstitutions(const std::string &url,
 										  const LLSD &default_subs)
 {
+	(void)gAgent.isGodlike(); // ref symbol to stop compiler from stripping it
 	std::string new_url = url;
 	substitute_string(new_url, "[TOPIC]", default_subs["TOPIC"].asString());
 	substitute_string(new_url, "[VERSION]", gVersion);
@@ -91,6 +106,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
 	return new_url;
 }
 
+
 //----------------------------------------------------------------------------
 	
 namespace tut
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0db18525d7..00a903431a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -822,13 +822,15 @@ class LinuxManifest(ViewerManifest):
             'dst': self.get_dst_prefix(),
             'inst': self.build_path_of(installer_name)})
         try:
-            # --numeric-owner hides the username of the builder for
-            # security etc.
-            self.run_command('tar -C %(dir)s --numeric-owner -cjf '
-                             '%(inst_path)s.tar.bz2 %(inst_name)s' % {
-                'dir': self.get_build_prefix(),
-                'inst_name': installer_name,
-                'inst_path':self.build_path_of(installer_name)})
+            # only create tarball if it's not a debug build.
+            if self.args['buildtype'].lower() != 'debug':
+                # --numeric-owner hides the username of the builder for
+                # security etc.
+                self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+                                 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+                        'dir': self.get_build_prefix(),
+                        'inst_name': installer_name,
+                        'inst_path':self.build_path_of(installer_name)})
         finally:
             self.run_command("mv %(inst)s %(dst)s" % {
                 'dst': self.get_dst_prefix(),
@@ -852,7 +854,14 @@ class Linux_i686Manifest(LinuxManifest):
                 print "Skipping %s - not found" % libfile
                 pass
 
-        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+            
+        if(self.args['buildtype'].lower() != 'debug'):
+            print "* packaging stripped viewer binary."
+            self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+        else:
+            print "* packaging un-stripped viewer binary."
+            self.path("secondlife-bin","bin/do-not-directly-run-secondlife-bin")
+
         self.path("../linux_crash_logger/linux-crash-logger-stripped","bin/linux-crash-logger.bin")
         self.path("../linux_updater/linux-updater-stripped", "bin/linux-updater.bin")
         self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin")
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index 364088ab31..b9f61ca7e1 100644
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -143,7 +143,7 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential
                         << " with uri '" << uri << "', credentials " << printable_credentials << LL_ENDL;
 
 	// Arriving in SRVRequest state
-    LLEventStream replyPump("reply", true);
+    LLEventStream replyPump("SRVreply", true);
     // Should be an array of one or more uri strings.
     LLSD rewrittenURIs;
     {
@@ -160,8 +160,11 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential
 			seconds_to_timeout = credentials["cfg_srv_timeout"].asReal();
 		}
 
-		filter.eventAfter(seconds_to_timeout, 
-			getProgressEventLLSD("offline", "fail.login"));
+        // If the SRV request times out (e.g. EXT-3934), simulate response: an
+        // array containing our original URI.
+        LLSD fakeResponse(LLSD::emptyArray());
+        fakeResponse.append(uri);
+		filter.eventAfter(seconds_to_timeout, fakeResponse);
 
 		std::string srv_pump_name = "LLAres";
 		if(credentials.has("cfg_srv_pump"))
@@ -178,6 +181,10 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential
     } // we no longer need the filter
 
     LLEventPump& xmlrpcPump(LLEventPumps::instance().obtain("LLXMLRPCTransaction"));
+    // EXT-4193: use a DIFFERENT reply pump than for the SRV request. We used
+    // to share them -- but the EXT-3934 fix made it possible for an abandoned
+    // SRV response to arrive just as we were expecting the XMLRPC response.
+    LLEventStream loginReplyPump("loginreply", true);
 
     // Loop through the rewrittenURIs, counting attempts along the way.
     // Because of possible redirect responses, we may make more than one
@@ -188,7 +195,7 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential
          urit != urend; ++urit)
     {
         LLSD request(credentials);
-        request["reply"] = replyPump.getName();
+        request["reply"] = loginReplyPump.getName();
         request["uri"] = *urit;
         std::string status;
 
@@ -213,11 +220,11 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD credential
             // possible for the reply to arrive before the post() call
             // returns. Subsequent responses, of course, must be awaited
             // without posting again.
-            for (mAuthResponse = validateResponse(replyPump.getName(),
-                                     postAndWait(self, request, xmlrpcPump, replyPump, "reply"));
+            for (mAuthResponse = validateResponse(loginReplyPump.getName(),
+                                 postAndWait(self, request, xmlrpcPump, loginReplyPump, "reply"));
                  mAuthResponse["status"].asString() == "Downloading";
-                 mAuthResponse = validateResponse(replyPump.getName(),
-                                     waitForEventOn(self, replyPump)))
+                 mAuthResponse = validateResponse(loginReplyPump.getName(),
+                                     waitForEventOn(self, loginReplyPump)))
             {
                 // Still Downloading -- send progress update.
                 sendProgressEvent("offline", "downloading");
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index 7159959a4f..51f5cd0692 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -215,14 +215,14 @@ namespace tut
     void llviewerlogin_object::test<1>()
     {
         DEBUG;
-		// Testing login with immediate repsonses from Ares and XMLPRC
+		// Testing login with immediate responses from Ares and XMLPRC
 		// The response from both requests will come before the post request exits.
 		// This tests an edge case of the login state handling.
 		LLEventStream llaresPump("LLAres"); // Dummy LLAres pump.
 		LLEventStream xmlrpcPump("LLXMLRPCTransaction"); // Dummy XMLRPC pump
 
 		bool respond_immediately = true;
-		// Have 'dummy ares' repsond immediately. 
+		// Have 'dummy ares' respond immediately. 
 		LLAresListener dummyLLAres("dummy_llares", respond_immediately);
 		dummyLLAres.listenTo(llaresPump);
 
@@ -251,7 +251,7 @@ namespace tut
         DEBUG;
 		// Tests a successful login in with delayed responses. 
 		// Also includes 'failure' that cause the login module
-		// To re-attempt connection, once from a basic failure
+		// to re-attempt connection, once from a basic failure
 		// and once from the 'indeterminate' response.
 
 		set_test_name("LLLogin multiple srv uris w/ success");
@@ -441,8 +441,8 @@ namespace tut
 		// Testing normal login procedure.
 		LLEventStream llaresPump("LLAres"); // Dummy LLAres pump.
 
-		// LLAresListener dummyLLAres("dummy_llares");
-		// dummyLLAres.listenTo(llaresPump);
+		LLAresListener dummyLLAres("dummy_llares");
+		dummyLLAres.listenTo(llaresPump);
 
 		LLLogin login;
 		LoginListener listener("test_ear");
@@ -464,6 +464,18 @@ namespace tut
 		LLSD frame_event;
 		mainloop.post(frame_event);
 
-		ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login"); 
+		// In this state we have NOT sent a reply from LLAresListener -- in
+		// fact there's no such object. Nonetheless, we expect the timeout to
+		// have stepped the login module forward to try to authenticate with
+		// the original URI.
+		ensure_equals("Auth state", listener.lastEvent()["change"].asString(), "authenticating"); 
+		ensure_equals("Attempt", listener.lastEvent()["data"]["attempt"].asInteger(), 1); 
+		ensure_equals("URI", listener.lastEvent()["data"]["request"]["uri"].asString(), "login.bar.com");
+
+		// EXT-4193: if the SRV reply isn't lost but merely late, and if it
+		// arrives just at the moment we're expecting the XMLRPC reply, the
+		// original code got confused and crashed. Drive that case here. We
+		// observe that without the fix, this call DOES repro.
+		dummyLLAres.sendReply();
 	}
 }