merge

80 files changed, 3574 insertions, 602 deletions

diff --git a/indra/llplugin/llplugincookiestore.cpp b/indra/llplugin/llplugincookiestore.cpp
index 85b1e70d78..da770c5f2e 100644
--- a/indra/llplugin/llplugincookiestore.cpp
+++ b/indra/llplugin/llplugincookiestore.cpp
@@ -99,7 +99,7 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 	std::string::size_type cookie_end = mCookie.size();
 	std::string::size_type field_start = 0;
 
-	lldebugs << "parsing cookie: " << mCookie << llendl;
+	LL_DEBUGS("CookieStoreParse") << "parsing cookie: " << mCookie << LL_ENDL;
 	while(field_start < cookie_end)
 	{
 		// Finding the start of the next field requires honoring special quoting rules
@@ -167,10 +167,10 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 			++value_end;
 		}
 
-		lldebugs 
+		LL_DEBUGS("CookieStoreParse") 
 			<< "    field name: \"" << mCookie.substr(name_start, name_end - name_start) 
 			<< "\", value: \"" << mCookie.substr(value_start, value_end - value_start) << "\""
-			<< llendl;
+			<< LL_ENDL;
 				
 		// See whether this field is one we know
 		if(first_field)
@@ -195,13 +195,13 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 #if 1
 				time_t date = curl_getdate(date_string.c_str(), NULL );
 				mDate.secondsSinceEpoch((F64)date);
-				lldebugs << "        expire date parsed to: " << mDate.asRFC1123() << llendl;
+				LL_DEBUGS("CookieStoreParse") << "        expire date parsed to: " << mDate.asRFC1123() << LL_ENDL;
 #else
 				// This doesn't work (rfc1123-format dates cause it to fail)
 				if(!mDate.fromString(date_string))
 				{
 					// Date failed to parse.
-					llwarns << "failed to parse cookie's expire date: " << date << llendl;
+					LL_WARNS("CookieStoreParse") << "failed to parse cookie's expire date: " << date << LL_ENDL;
 					return false;
 				}
 #endif
@@ -232,9 +232,14 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 			{
 				// We don't care about the value of this field (yet)
 			}
+			else if(matchName(name_start, name_end, "httponly"))
+			{
+				// We don't care about the value of this field (yet)
+			}
 			else
 			{
 				// An unknown field is a parse failure
+				LL_WARNS("CookieStoreParse") << "unexpected field name: " << mCookie.substr(name_start, name_end - name_start) << LL_ENDL;
 				return false;
 			}
 			
@@ -270,7 +275,7 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 		mCookie += host;
 		mDomainEnd = mCookie.size();
 		
-		lldebugs << "added domain (" << mDomainStart << " to " << mDomainEnd << "), new cookie is: " << mCookie << llendl;
+		LL_DEBUGS("CookieStoreParse") << "added domain (" << mDomainStart << " to " << mDomainEnd << "), new cookie is: " << mCookie << LL_ENDL;
 	}
 
 	// If the cookie doesn't have a path, add "/".
@@ -288,7 +293,7 @@ bool LLPluginCookieStore::Cookie::parse(const std::string &host)
 		mCookie += "/";
 		mPathEnd = mCookie.size();
 		
-		lldebugs << "added path (" << mPathStart << " to " << mPathEnd << "), new cookie is: " << mCookie << llendl;
+		LL_DEBUGS("CookieStoreParse") << "added path (" << mPathStart << " to " << mPathEnd << "), new cookie is: " << mCookie << LL_ENDL;
 	}
 	
 	
@@ -566,7 +571,7 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 	Cookie *cookie = Cookie::createFromString(s, cookie_start, cookie_end, host);
 	if(cookie)
 	{
-		lldebugs << "setting cookie: " << cookie->getCookie() << llendl;
+		LL_DEBUGS("CookieStoreUpdate") << "setting cookie: " << cookie->getCookie() << LL_ENDL;
 		
 		// Create a key for this cookie
 		std::string key = cookie->getKey();
@@ -579,7 +584,7 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 			{
 				// If we're marking cookies as changed, we should keep it anyway since we'll need to send it out with deltas.
 				cookie->setDead(true);
-				lldebugs << "    marking dead" << llendl;
+				LL_DEBUGS("CookieStoreUpdate") << "    marking dead" << LL_ENDL;
 			}
 			else
 			{
@@ -590,7 +595,7 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 				delete cookie;
 				cookie = NULL;
 
-				lldebugs << "    removing" << llendl;
+				LL_DEBUGS("CookieStoreUpdate") << "    removing" << LL_ENDL;
 			}
 		}
 		
@@ -607,7 +612,7 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 					delete cookie;
 					cookie = NULL;
 
-					lldebugs << "    unchanged" << llendl;
+					LL_DEBUGS("CookieStoreUpdate") << "    unchanged" << LL_ENDL;
 				}
 				else
 				{
@@ -619,7 +624,7 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 					if(mark_changed)
 						mHasChangedCookies = true;
 
-					lldebugs << "    replacing" << llendl;
+					LL_DEBUGS("CookieStoreUpdate") << "    replacing" << LL_ENDL;
 				}
 			}
 			else
@@ -631,10 +636,15 @@ void LLPluginCookieStore::setOneCookie(const std::string &s, std::string::size_t
 				if(mark_changed)
 					mHasChangedCookies = true;
 
-				lldebugs << "    adding" << llendl;
+				LL_DEBUGS("CookieStoreUpdate") << "    adding" << LL_ENDL;
 			}
 		}
 	}
+	else
+	{
+		LL_WARNS("CookieStoreUpdate") << "failed to parse cookie: " << s.substr(cookie_start, cookie_end - cookie_start) << LL_ENDL;
+	}
+
 }
 
 void LLPluginCookieStore::clearCookies()
diff --git a/indra/llplugin/tests/llplugincookiestore_test.cpp b/indra/llplugin/tests/llplugincookiestore_test.cpp
index 020d9c1977..c903464c64 100644
--- a/indra/llplugin/tests/llplugincookiestore_test.cpp
+++ b/indra/llplugin/tests/llplugincookiestore_test.cpp
@@ -127,7 +127,7 @@ namespace tut
 		// Valid, distinct cookies:
 		
 		std::string cookie01 = "cookieA=value; domain=example.com; path=/";
-		std::string cookie02 = "cookieB=value; domain=example.com; path=/"; // different name
+		std::string cookie02 = "cookieB=value; Domain=example.com; Path=/; Max-Age=10; Secure; Version=1; Comment=foo!; HTTPOnly"; // cookie with every supported field, in different cases.
 		std::string cookie03 = "cookieA=value; domain=foo.example.com; path=/"; // different domain
 		std::string cookie04 = "cookieA=value; domain=example.com; path=/bar/"; // different path
 		std::string cookie05 = "cookieC; domain=example.com; path=/"; // empty value
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 0959722aa6..dfb427f293 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -860,5 +860,16 @@ void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top,
 	panel->reshape( width, height, 1);
 	panel->setRect(panel_rect);
 }
+BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	//header may be not the first child but we need to process it first
+	if(y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT/2) )
+	{
+		//inside tab header
+		//fix for EXT-6619
+		return TRUE;
+	}
+	return LLUICtrl::handleToolTip(x, y, mask);
+}
 
 
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 4b8b22405e..fb19d17e99 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -148,6 +148,8 @@ public:
 	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
 
+	virtual BOOL handleToolTip(S32 x, S32 y, MASK mask);
+
 	virtual bool addChild(LLView* child, S32 tab_group);
 
 	bool isExpanded() { return mDisplayChildren; }
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index af5fa4f388..3ce32a05b0 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -22,17 +22,6 @@
         <key>Value</key>
             <string>|TOKEN COPY BusyModeResponse|</string>
         </map>
-    <key>InstantMessageLogFolder</key>
-        <map>
-        <key>Comment</key>
-            <string>Top level folder to your log files.</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>String</string>
-        <key>Value</key>
-            <string />
-        </map>				
     <key>InstantMessageLogPath</key>
         <map>
         <key>Comment</key>
@@ -55,10 +44,10 @@
         <key>Value</key>
             <integer>0</integer>
         </map>
-    <key>LogChat</key>
+    <key>LogNearbyChat</key>
         <map>
         <key>Comment</key>
-            <string>Log Chat</string>
+            <string>Log Nearby Chat messages to a file. Is used instead of LogChat but with the "1" default value.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
@@ -110,5 +99,46 @@
         <key>Value</key>
             <integer>1</integer>
         </map>
+
+    <!-- Settings below are for back compatibility only.
+    They are not used in current viewer anymore. But they can't be removed to avoid
+    influence on previous versions of the viewer in case of settings are not used or default value
+    should be changed. See EXT-6661. -->
+
+    <!-- 1.23 settings -->
+    <key>LogChat</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogChatIM</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Incoming Instant Messages with Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogChatTimestamp</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Timestamp of Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <!-- End of back compatibility settings -->
     </map>
 </llsd>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 43c8c679c6..8e959993fe 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3016,41 +3016,59 @@ void LLAppViewer::migrateCacheDirectory()
 #endif // LL_WINDOWS || LL_DARWIN
 }
 
+//static
+S32 LLAppViewer::getCacheVersion() 
+{
+	static const S32 cache_version = 7;
+
+	return cache_version ;
+}
+
 bool LLAppViewer::initCache()
 {
 	mPurgeCache = false;
-	// Purge cache if user requested it
-	if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
-		gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
+	BOOL disable_texture_cache = FALSE ;
+	BOOL read_only = mSecondInstance ? TRUE : FALSE;
+	LLAppViewer::getTextureCache()->setReadOnly(read_only) ;
+
+	if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getCacheVersion()) 
 	{
-		gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
-		mPurgeCache = true;
+		if(read_only) 
+		{
+			disable_texture_cache = TRUE ; //if the cache version of this viewer is different from the running one, this viewer can not use the texture cache.
+		}
+		else
+		{
+			mPurgeCache = true; // Purge cache if the version number is different.
+			gSavedSettings.setS32("LocalCacheVersion", LLAppViewer::getCacheVersion());
+		}
 	}
-	// Purge cache if it belongs to an old version
-	else
+
+	if(!read_only)
 	{
-		static const S32 cache_version = 6;
-		if (gSavedSettings.getS32("LocalCacheVersion") != cache_version)
+		// Purge cache if user requested it
+		if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
+			gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
 		{
+			gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
 			mPurgeCache = true;
-			gSavedSettings.setS32("LocalCacheVersion", cache_version);
 		}
-	}
 	
-	// We have moved the location of the cache directory over time.
-	migrateCacheDirectory();
-
-	// Setup and verify the cache location
-	std::string cache_location = gSavedSettings.getString("CacheLocation");
-	std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
-	if (new_cache_location != cache_location)
-	{
-		gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
-		purgeCache(); // purge old cache
-		gSavedSettings.setString("CacheLocation", new_cache_location);
-		gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location));
-	}
+		// We have moved the location of the cache directory over time.
+		migrateCacheDirectory();
 	
+		// Setup and verify the cache location
+		std::string cache_location = gSavedSettings.getString("CacheLocation");
+		std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
+		if (new_cache_location != cache_location)
+		{
+			gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
+			purgeCache(); // purge old cache
+			gSavedSettings.setString("CacheLocation", new_cache_location);
+			gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location));
+		}
+	}
+
 	if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")))
 	{
 		LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
@@ -3058,7 +3076,7 @@ bool LLAppViewer::initCache()
 		gSavedSettings.setString("CacheLocationTopFolder", "");
 	}
 	
-	if (mPurgeCache)
+	if (mPurgeCache && !read_only)
 	{
 		LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
 		purgeCache();
@@ -3067,14 +3085,13 @@ bool LLAppViewer::initCache()
 	LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache"));
 	
 	// Init the texture cache
-	// Allocate 80% of the cache size for textures
-	BOOL read_only = mSecondInstance ? TRUE : FALSE;
+	// Allocate 80% of the cache size for textures	
 	const S32 MB = 1024*1024;
 	S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
 	const S64 MAX_CACHE_SIZE = 1024*MB;
 	cache_size = llmin(cache_size, MAX_CACHE_SIZE);
 	S64 texture_cache_size = ((cache_size * 8)/10);
-	S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, read_only);
+	S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, disable_texture_cache);
 	texture_cache_size -= extra;
 
 	LLSplashScreen::update(LLTrans::getString("StartupInitializingVFS"));
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index a915b7fa50..60645c46d4 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -102,6 +102,8 @@ public:
 	static LLImageDecodeThread* getImageDecodeThread() { return sImageDecodeThread; }
 	static LLTextureFetch* getTextureFetch() { return sTextureFetch; }
 
+	static S32 getCacheVersion() ;
+
 	const std::string& getSerialNumber() { return mSerialNumber; }
 	
 	bool getPurgeCache() const { return mPurgeCache; }
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 6dfa8397a0..f13e74679d 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -135,7 +135,7 @@ LLCallFloater::~LLCallFloater()
 
 	if(LLVoiceClient::instanceExists())
 	{
-		gVoiceClient->removeObserver(this);
+		LLVoiceClient::instance().removeObserver(this);
 	}
 	LLTransientFloaterMgr::getInstance()->removeControlView(this);
 }
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 60ce16aafb..e2c5ad6d02 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1083,10 +1083,8 @@ void LLFloaterPreference::onClickLogPath()
 	{
 		return; //Canceled!
 	}
-	std::string chat_log_dir = picker.getDirName();
-	std::string chat_log_top_folder= gDirUtilp->getBaseFileName(chat_log_dir);
-	gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir);
-	gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder);
+
+	gSavedPerAccountSettings.setString("InstantMessageLogPath", picker.getDirName());
 }
 
 void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index d4eecc8c48..438159b2e6 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -75,12 +75,13 @@ public:
 			return false;
 		}
 
-		//*TODO by what to replace showing groups floater?
 		if (tokens[0].asString() == "list")
 		{
 			if (tokens[1].asString() == "show")
 			{
-				//LLFloaterReg::showInstance("contacts", "groups");
+				LLSD params;
+				params["people_panel_tab_name"] = "groups_panel";
+				LLSideTray::getInstance()->showPanel("panel_people", params);
 				return true;
 			}
             return false;
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index c8d5d782b7..5d72827a7a 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -207,7 +207,7 @@ void	LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
 		return;
 	}
 
-	if (gSavedPerAccountSettings.getBOOL("LogChat")) 
+	if (gSavedPerAccountSettings.getBOOL("LogNearbyChat"))
 	{
 		LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
 	}
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 8d8c996374..a1cdbdad59 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -280,6 +280,17 @@ void LLLandmarksPanel::onShowOnMap()
 	doActionOnCurSelectedLandmark(boost::bind(&LLLandmarksPanel::doShowOnMap, this, _1));
 }
 
+//virtual
+void LLLandmarksPanel::onShowProfile()
+{
+	LLFolderViewItem* cur_item = getCurSelectedItem();
+
+	if(!cur_item)
+		return;
+
+	cur_item->getListener()->performAction(mCurrentSelectedList->getModel(),"about");
+}
+
 // virtual
 void LLLandmarksPanel::onTeleport()
 {
@@ -306,6 +317,7 @@ void LLLandmarksPanel::updateVerbs()
 	bool landmark_selected = isLandmarkSelected();
 	mTeleportBtn->setEnabled(landmark_selected && isActionEnabled("teleport"));
 	mShowOnMapBtn->setEnabled(landmark_selected && isActionEnabled("show_on_map"));
+	mShowProfile->setEnabled(landmark_selected && isActionEnabled("more_info"));
 
 	// TODO: mantipov: Uncomment when mShareBtn is supported
 	// Share button should be enabled when neither a folder nor a landmark is selected
@@ -977,13 +989,10 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
 
 void LLLandmarksPanel::onCustomAction(const LLSD& userdata)
 {
-	LLFolderViewItem* cur_item = getCurSelectedItem();
-	if(!cur_item)
-		return;
 	std::string command_name = userdata.asString();
 	if("more_info" == command_name)
 	{
-		cur_item->getListener()->performAction(mCurrentSelectedList->getModel(),"about");
+		onShowProfile();
 	}
 	else if ("teleport" == command_name)
 	{
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index c9217a4b2f..da5d683cfc 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -57,6 +57,7 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void onSearchEdit(const std::string& string);
 	/*virtual*/ void onShowOnMap();
+	/*virtual*/ void onShowProfile();
 	/*virtual*/ void onTeleport();
 	/*virtual*/ void updateVerbs();
 
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 4f2d6374ca..93ebae334f 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -74,6 +74,7 @@ static const LLUUID PARCEL_AUDIO_LIST_ITEM_UUID = LLUUID("DF4B020D-8A24-4B95-AB5
 // LLPanelNearByMedia
 //
 
+
 LLPanelNearByMedia::LLPanelNearByMedia()
 :	mMediaList(NULL),
 	  mEnableAllCtrl(NULL),
@@ -87,6 +88,8 @@ LLPanelNearByMedia::LLPanelNearByMedia()
 	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
 							gSavedSettings.getBOOL("MediaTentativeAutoPlay");
 
+	gSavedSettings.getControl(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)->getSignal()->connect(boost::bind(&LLPanelNearByMedia::handleMediaAutoPlayChanged, this, _2));
+
 	mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll",		boost::bind(&LLPanelNearByMedia::onClickEnableAll, this));
 	mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll",		boost::bind(&LLPanelNearByMedia::onClickDisableAll, this));
 	mCommitCallbackRegistrar.add("MediaListCtrl.GoMediaPrefs", boost::bind(&LLPanelNearByMedia::onAdvancedButtonClick, this));
@@ -168,12 +171,19 @@ BOOL LLPanelNearByMedia::postBuild()
 	mLessRect = getRect();
 	mLessRect.mBottom = minimized_controls->getRect().mBottom;
 
-	getChild<LLUICtrl>("more_less_btn")->setValue(false);
+	getChild<LLUICtrl>("more_btn")->setVisible(false);
 	onMoreLess();
 	
 	return TRUE;
 }
 
+void LLPanelNearByMedia::handleMediaAutoPlayChanged(const LLSD& newvalue)
+{
+	// update mParcelAudioAutoStart if AUTO_PLAY_MEDIA_SETTING changes
+	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+							gSavedSettings.getBOOL("MediaTentativeAutoPlay");							
+}
+
 /*virtual*/
 void LLPanelNearByMedia::onMouseEnter(S32 x, S32 y, MASK mask)
 {
@@ -954,7 +964,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick()
 
 void LLPanelNearByMedia::onMoreLess()
 {
-	bool is_more = getChild<LLUICtrl>("more_less_btn")->getValue();
+	bool is_more = getChild<LLUICtrl>("more_btn")->getVisible();
 	mNearbyMediaPanel->setVisible(is_more);
 
 	// enable resizing when expanded
@@ -964,6 +974,9 @@ void LLPanelNearByMedia::onMoreLess()
 	new_rect.translate(getRect().mRight - new_rect.mRight, getRect().mTop - new_rect.mTop);
 
 	setShape(new_rect);
+
+	getChild<LLUICtrl>("more_btn")->setVisible(!is_more);
+	getChild<LLUICtrl>("less_btn")->setVisible(is_more);
 }
 
 void LLPanelNearByMedia::updateControls()
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
index af4659365f..7c07867df3 100644
--- a/indra/newview/llpanelnearbymedia.h
+++ b/indra/newview/llpanelnearbymedia.h
@@ -63,6 +63,10 @@ public:
 	// interaction with our buttons.
 	bool getParcelAudioAutoStart();
 
+	// callback for when the auto play media preference changes
+	// to update mParcelAudioAutoStart
+	void handleMediaAutoPlayChanged(const LLSD& newvalue);
+
 	LLPanelNearByMedia();
 	virtual ~LLPanelNearByMedia();
 
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 54455afa4f..17784c31e3 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -252,6 +252,9 @@ BOOL LLPanelPlaces::postBuild()
 	mOverflowBtn = getChild<LLButton>("overflow_btn");
 	mOverflowBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onOverflowButtonClicked, this));
 
+	mPlaceInfoBtn = getChild<LLButton>("profile_btn");
+	mPlaceInfoBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onProfileButtonClicked, this));
+
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	registrar.add("Places.OverflowMenu.Action",  boost::bind(&LLPanelPlaces::onOverflowMenuItemClicked, this, _2));
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
@@ -745,6 +748,14 @@ void LLPanelPlaces::onOverflowButtonClicked()
 	LLMenuGL::showPopup(this, menu, rect.mRight, rect.mTop);
 }
 
+void LLPanelPlaces::onProfileButtonClicked()
+{
+	if (!mActivePanel)
+		return;
+
+	mActivePanel->onShowProfile();
+}
+
 bool LLPanelPlaces::onOverflowMenuItemEnable(const LLSD& param)
 {
 	std::string value = param.asString();
@@ -1060,8 +1071,11 @@ void LLPanelPlaces::updateVerbs()
 	mSaveBtn->setVisible(isLandmarkEditModeOn);
 	mCancelBtn->setVisible(isLandmarkEditModeOn);
 	mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn);
+	mPlaceInfoBtn->setVisible(mPlaceInfoType != LANDMARK_INFO_TYPE && mPlaceInfoType != TELEPORT_HISTORY_INFO_TYPE
+			&& !is_create_landmark_visible && !isLandmarkEditModeOn);
 
 	mShowOnMapBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos);
+	mPlaceInfoBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos);
 
 	if (is_place_info_visible)
 	{
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 97cf43d222..7a77fc9300 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -98,6 +98,7 @@ private:
 	bool onOverflowMenuItemEnable(const LLSD& param);
 	void onCreateLandmarkButtonClicked(const LLUUID& folder_id);
 	void onBackButtonClicked();
+	void onProfileButtonClicked();
 
 	void toggleMediaPanel();
 	void togglePickPanel(BOOL visible);
@@ -128,6 +129,7 @@ private:
 	LLButton*					mCancelBtn;
 	LLButton*					mCloseBtn;
 	LLButton*					mOverflowBtn;
+	LLButton*					mPlaceInfoBtn;
 
 	LLPlacesInventoryObserver*	mInventoryObserver;
 	LLPlacesParcelObserver*		mParcelObserver;
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp
index 9806b8c64d..42cf3b03a3 100644
--- a/indra/newview/llpanelplacestab.cpp
+++ b/indra/newview/llpanelplacestab.cpp
@@ -56,6 +56,7 @@ void LLPanelPlacesTab::setPanelPlacesButtons(LLPanelPlaces* panel)
 {
 	mTeleportBtn = panel->getChild<LLButton>("teleport_btn");
 	mShowOnMapBtn = panel->getChild<LLButton>("map_btn");
+	mShowProfile = panel->getChild<LLButton>("profile_btn");
 }
 
 void LLPanelPlacesTab::onRegionResponse(const LLVector3d& landmark_global_pos,
diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
index ce77a42259..f4e93a7658 100644
--- a/indra/newview/llpanelplacestab.h
+++ b/indra/newview/llpanelplacestab.h
@@ -45,6 +45,7 @@ public:
 	virtual void onSearchEdit(const std::string& string) = 0;
 	virtual void updateVerbs() = 0;		// Updates buttons at the bottom of Places panel
 	virtual void onShowOnMap() = 0;
+	virtual void onShowProfile() = 0;
 	virtual void onTeleport() = 0;
 
 	bool isTabVisible(); // Check if parent TabContainer is visible.
@@ -62,6 +63,7 @@ public:
 protected:
 	LLButton*				mTeleportBtn;
 	LLButton*				mShowOnMapBtn;
+	LLButton*				mShowProfile;
 
 	// Search string for filtering landmarks and teleport history locations
 	static std::string		sFilterSubString;
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 0a34531eee..c0b2244038 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -496,6 +496,20 @@ void LLTeleportHistoryPanel::onShowOnMap()
 	}
 }
 
+//virtual
+void LLTeleportHistoryPanel::onShowProfile()
+{
+	if (!mLastSelectedFlatlList)
+		return;
+
+	LLTeleportHistoryFlatItem* itemp = dynamic_cast<LLTeleportHistoryFlatItem *> (mLastSelectedFlatlList->getSelectedItem());
+
+	if(!itemp)
+		return;
+
+	LLTeleportHistoryFlatItem::showPlaceInfoPanel(itemp->getIndex());
+}
+
 // virtual
 void LLTeleportHistoryPanel::onTeleport()
 {
@@ -544,6 +558,7 @@ void LLTeleportHistoryPanel::updateVerbs()
 	{
 		mTeleportBtn->setEnabled(false);
 		mShowOnMapBtn->setEnabled(false);
+		mShowProfile->setEnabled(false);
 		return;
 	}
 
@@ -551,6 +566,7 @@ void LLTeleportHistoryPanel::updateVerbs()
 
 	mTeleportBtn->setEnabled(NULL != itemp);
 	mShowOnMapBtn->setEnabled(NULL != itemp);
+	mShowProfile->setEnabled(NULL != itemp);
 }
 
 void LLTeleportHistoryPanel::getNextTab(const LLDate& item_date, S32& tab_idx, LLDate& tab_date)
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index 5e2ccc0c93..a456ca506f 100644
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -73,6 +73,7 @@ public:
 
 	/*virtual*/ void onSearchEdit(const std::string& string);
 	/*virtual*/ void onShowOnMap();
+	/*virtual*/ void onShowProfile();
 	/*virtual*/ void onTeleport();
 	///*virtual*/ void onCopySLURL();
 	/*virtual*/ void updateVerbs();
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index b010f4d72f..7cde350d5a 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -104,8 +104,13 @@ BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func
 								   S32 x, S32 y,
 								   bool close_popups)
 {
-	for (popup_list_t::iterator popup_it = mPopups.begin();
-		popup_it != mPopups.end();)
+	BOOL handled = FALSE;
+
+	// make a copy of list of popups, in case list is modified during mouse event handling
+	popup_list_t popups(mPopups);
+	for (popup_list_t::iterator popup_it = popups.begin(), popup_end = popups.end();
+		popup_it != popup_end;
+		++popup_it)
 	{
 		LLView* popup = popup_it->get();
 		if (!popup 
@@ -121,23 +126,19 @@ BOOL LLPopupView::handleMouseEvent(boost::function<BOOL(LLView*, S32, S32)> func
 		{
 			if (func(popup, popup_x, popup_y))
 			{
-				return TRUE;
+				handled = TRUE;
+				break;
 			}
 		}
 
 		if (close_popups)
 		{
-			popup_list_t::iterator cur_popup_it = popup_it++;
-			mPopups.erase(cur_popup_it);
+			mPopups.remove(*popup_it);
 			popup->onTopLost();
 		}
-		else
-		{
-			++popup_it;
-		}
 	}
 
-	return FALSE;
+	return handled;
 }
 
 
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index e9a80907b7..af440a3689 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -47,7 +47,6 @@
 #include "llsyswellwindow.h"
 #include "llimfloater.h"
 #include "llscriptfloater.h"
-#include "llfontgl.h"
 
 #include <algorithm>
 
@@ -582,7 +581,6 @@ void LLScreenChannel::showToastsTop()
 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;
@@ -593,34 +591,26 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
 
 	mStartUpToastPanel->setOnFadeCallback(boost::bind(&LLScreenChannel::onStartUpToastHide, this));
 
+	LLPanel* wrapper_panel = mStartUpToastPanel->getChild<LLPanel>("wrapper_panel");
 	LLTextBox* text_box = mStartUpToastPanel->getChild<LLTextBox>("toast_text");
 
 	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_height + gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_height);
-	mStartUpToastPanel->setRect(toast_rect);
 
 	text_box->setValue(text);
 	text_box->setVisible(TRUE);
+
+	S32 old_height = text_box->getRect().getHeight();
+	text_box->reshapeToFitText();
+	text_box->setOrigin(text_box->getRect().mLeft, (wrapper_panel->getRect().getHeight() - text_box->getRect().getHeight())/2);
+	S32 new_height = text_box->getRect().getHeight();
+	S32 height_delta = new_height - old_height;
+
+	toast_rect.setLeftTopAndSize(0, toast_rect.getHeight() + height_delta +gSavedSettings.getS32("ToastGap"), getRect().getWidth(), toast_rect.getHeight());
+	mStartUpToastPanel->setRect(toast_rect);
+
 	addChild(mStartUpToastPanel);
 	
 	mStartUpToastPanel->setVisible(TRUE);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 94a32873ec..c7eb9320e4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -889,13 +889,12 @@ bool idle_startup()
 		}
 
 		//Default the path if one isn't set.
-		if (gSavedPerAccountSettings.getString("InstantMessageLogFolder").empty())
+		// *NOTE: unable to check variable differ from "InstantMessageLogPath" because it was
+		// provided in pre 2.0 viewer. See EXT-6661
+		if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty())
 		{
 			gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir());
-			std::string chat_log_dir = gDirUtilp->getChatLogsDir();
-			std::string chat_log_top_folder=gDirUtilp->getBaseFileName(chat_log_dir);
-			gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir);
-			gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder);
+			gSavedPerAccountSettings.setString("InstantMessageLogPath", gDirUtilp->getChatLogsDir());
 		}
 		else
 		{
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 651070a2ea..df79725474 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -742,7 +742,7 @@ LLTextureCache::LLTextureCache(bool threaded)
 	  mHeaderMutex(NULL),
 	  mListMutex(NULL),
 	  mHeaderAPRFile(NULL),
-	  mReadOnly(FALSE),
+	  mReadOnly(TRUE), //do not allow to change the texture cache until setReadOnly() is called.
 	  mTexturesSizeTotal(0),
 	  mDoPurge(FALSE)
 {
@@ -929,13 +929,16 @@ U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_
 S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
 const char* entries_filename = "texture.entries";
 const char* cache_filename = "texture.cache";
-const char* textures_dirname = "textures";
+const char* old_textures_dirname = "textures";
+//change the location of the texture cache to prevent from being deleted by old version viewers.
+const char* textures_dirname = "texturecache";
 
 void LLTextureCache::setDirNames(ELLPath location)
 {
 	std::string delem = gDirUtilp->getDirDelimiter();
-	mHeaderEntriesFileName = gDirUtilp->getExpandedFilename(location, entries_filename);
-	mHeaderDataFileName = gDirUtilp->getExpandedFilename(location, cache_filename);
+
+	mHeaderEntriesFileName = gDirUtilp->getExpandedFilename(location, textures_dirname, entries_filename);
+	mHeaderDataFileName = gDirUtilp->getExpandedFilename(location, textures_dirname, cache_filename);
 	mTexturesDirName = gDirUtilp->getExpandedFilename(location, textures_dirname);
 }
 
@@ -947,16 +950,38 @@ void LLTextureCache::purgeCache(ELLPath location)
 	{
 		setDirNames(location);
 		llassert_always(mHeaderAPRFile == NULL);
-		LLAPRFile::remove(mHeaderEntriesFileName, getLocalAPRFilePool());
-		LLAPRFile::remove(mHeaderDataFileName, getLocalAPRFilePool());
+
+		//remove the legacy cache if exists
+		std::string texture_dir = mTexturesDirName ;
+		mTexturesDirName = gDirUtilp->getExpandedFilename(location, old_textures_dirname);
+		if(LLFile::isdir(mTexturesDirName))
+		{
+			std::string file_name = gDirUtilp->getExpandedFilename(location, entries_filename);
+			LLAPRFile::remove(file_name, getLocalAPRFilePool());
+
+			file_name = gDirUtilp->getExpandedFilename(location, cache_filename);
+			LLAPRFile::remove(file_name, getLocalAPRFilePool());
+
+			purgeAllTextures(true);
+		}
+		mTexturesDirName = texture_dir ;
 	}
+
+	//remove the current texture cache.
 	purgeAllTextures(true);
 }
 
-S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
+//is called in the main thread before initCache(...) is called.
+void LLTextureCache::setReadOnly(BOOL read_only)
 {
-	mReadOnly = read_only;
-	
+	mReadOnly = read_only ;
+}
+
+//called in the main thread.
+S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL disable_texture_cache)
+{
+	llassert_always(getPending() == 0) ; //should not start accessing the texture cache before initialized.
+
 	S64 header_size = (max_size * 2) / 10;
 	S64 max_entries = header_size / TEXTURE_CACHE_ENTRY_SIZE;
 	sCacheMaxEntries = (S32)(llmin((S64)sCacheMaxEntries, max_entries));
@@ -968,6 +993,15 @@ S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
 		sCacheMaxTexturesSize = max_size;
 	max_size -= sCacheMaxTexturesSize;
 	
+	if(disable_texture_cache) //the texture cache is disabled
+	{
+		llinfos << "The texture cache is disabled!" << llendl ;
+		setReadOnly(TRUE) ;
+		purgeAllTextures(true); 
+
+		return max_size ;
+	}
+
 	LL_INFOS("TextureCache") << "Headers: " << sCacheMaxEntries
 			<< " Textures size: " << sCacheMaxTexturesSize/(1024*1024) << " MB" << LL_ENDL;
 
@@ -976,6 +1010,7 @@ S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
 	if (!mReadOnly)
 	{
 		LLFile::mkdir(mTexturesDirName);
+		
 		const char* subdirs = "0123456789abcdef";
 		for (S32 i=0; i<16; i++)
 		{
@@ -986,6 +1021,8 @@ S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
 	readHeaderCache();
 	purgeTextures(true); // calc mTexturesSize and make some room in the texture cache if we need it
 
+	llassert_always(getPending() == 0) ; //should not start accessing the texture cache before initialized.
+
 	return max_size; // unused cache space
 }
 
@@ -1462,9 +1499,9 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
 		}
 		if (purge_directories)
 		{
-			gDirUtilp->deleteFilesInDir(mTexturesDirName,mask);
+			gDirUtilp->deleteFilesInDir(mTexturesDirName, mask);
 			LLFile::rmdir(mTexturesDirName);
-		}
+		}		
 	}
 	mHeaderIDMap.clear();
 	mTexturesSizeMap.clear();
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index ca8815ee7e..5dc06ff401 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -110,7 +110,8 @@ public:
 	/*virtual*/ S32 update(U32 max_time_ms);	
 	
 	void purgeCache(ELLPath location);
-	S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
+	void setReadOnly(BOOL read_only) ;
+	S64 initCache(ELLPath location, S64 maxsize, BOOL disable_texture_cache);
 
 	handle_t readFromCache(const std::string& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
 						   ReadResponder* responder);
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 84c463495b..a9bbee784d 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -181,10 +181,10 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
 		parent = object->getRootEdit();
 	}
 
-
-	BOOL touchable = (object && object->flagHandleTouch()) 
-					 || (parent && parent->flagHandleTouch());
-
+	if (handleMediaClick(mPick))
+	{
+		return TRUE;
+	}
 
 	// If it's a left-click, and we have a special action, do it.
 	if (useClickAction(mask, object, parent))
@@ -286,14 +286,12 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
 		}
 	}
 
-	if (handleMediaClick(mPick))
-	{
-		return TRUE;
-	}
-
 	// put focus back "in world"
 	gFocusMgr.setKeyboardFocus(NULL);
 
+	BOOL touchable = (object && object->flagHandleTouch()) 
+					 || (parent && parent->flagHandleTouch());
+
 	// Switch to grab tool if physical or triggerable
 	if (object && 
 		!object->isAvatar() && 
@@ -513,21 +511,22 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 	}
 
 	LLViewerObject* click_action_object = click_action_pick.getObject();
-	if (click_action_object && useClickAction(mask, click_action_object, click_action_object->getRootEdit()))
+	if (handleMediaHover(mHoverPick))
 	{
+		// *NOTE: If you think the hover glow conflicts with the media outline, you
+		// could disable it here.
 		show_highlight = true;
-		ECursorType cursor = cursor_from_object(click_action_object);
-		gViewerWindow->setCursor(cursor);
+		// cursor set by media object
 		lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
 	}
-	else if (handleMediaHover(mHoverPick))
+	else if (click_action_object && useClickAction(mask, click_action_object, click_action_object->getRootEdit()))
 	{
-		// *NOTE: If you think the hover glow conflicts with the media outline, you
-		// could disable it here.
 		show_highlight = true;
-		// cursor set by media object
+		ECursorType cursor = cursor_from_object(click_action_object);
+		gViewerWindow->setCursor(cursor);
 		lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
 	}
+	
 	else if ((object && !object->isAvatar() && object->usePhysics()) 
 			 || (parent && !parent->isAvatar() && parent->usePhysics()))
 	{
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 6f037177fa..874995a09e 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -413,7 +413,6 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
 
 bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
 {
-	if(LLVoiceClient::getInstance())
 	LLVoiceClient::getInstance()->updateSettings();
 	return true;
 }
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index af0dcd8e35..a5adb11c53 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1426,15 +1426,15 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
 //virtual
 void LLViewerFetchedTexture::setKnownDrawSize(S32 width, S32 height)
 {
-	if(mKnownDrawWidth != width || mKnownDrawHeight != height)
+	if(mKnownDrawWidth < width || mKnownDrawHeight < height)
 	{
-		mKnownDrawWidth = width;
-		mKnownDrawHeight = height;
+		mKnownDrawWidth = llmax(mKnownDrawWidth, width) ;
+		mKnownDrawHeight = llmax(mKnownDrawHeight, height) ;
 
 		mKnownDrawSizeChanged = TRUE ;
 		mFullyLoaded = FALSE ;
 	}
-	addTextureStats((F32)(width * height));
+	addTextureStats((F32)(mKnownDrawWidth * mKnownDrawHeight));
 }
 
 //virtual
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ae3f680cbf..a96a6bf1b3 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -838,7 +838,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 							LLPanelLogin::refreshLocation( true );
 							LLPanelLogin::updateLocationUI();
 						}
-						return LLWindowCallbacks::DND_MOVE;
+						return LLWindowCallbacks::DND_COPY;
 					};
 				}
 
@@ -857,7 +857,11 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 					if (obj && !obj->getRegion()->getCapability("ObjectMedia").empty())
 					{
 						LLTextureEntry *te = obj->getTE(object_face);
-						if (te)
+
+						// can modify URL if we can modify the object or we have navigate permissions
+						bool allow_modify_url = obj->permModify() || obj->hasMediaPermission( te->getMediaData(), LLVOVolume::MEDIA_PERM_INTERACT );
+
+						if (te && allow_modify_url )
 						{
 							if (drop)
 							{
@@ -888,29 +892,24 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 									// URL passes the whitelist
 									if (te->getMediaData()->checkCandidateUrl( url ) )
 									{
-										// we are allowed to modify the object or we have navigate permissions
-										// NOTE: Design states you you can change the URL if you have media 
-										//       navigate permissions even if you do not have prim modify rights
-										if ( obj->permModify() || obj->hasMediaPermission( te->getMediaData(), LLVOVolume::MEDIA_PERM_INTERACT ) )
+										// just navigate to the URL
+										if (obj->getMediaImpl(object_face))
 										{
-											// just navigate to the URL
-											if (obj->getMediaImpl(object_face))
-											{
-												obj->getMediaImpl(object_face)->navigateTo(url);
-											}
-											else 
-											{
-												// This is very strange.  Navigation should
-												// happen via the Impl, but we don't have one.
-												// This sends it to the server, which /should/
-												// trigger us getting it.  Hopefully.
-												LLSD media_data;
-												media_data[LLMediaEntry::CURRENT_URL_KEY] = url;
-												obj->syncMediaData(object_face, media_data, true, true);
-												obj->sendMediaDataUpdate();
-											}
-											result = LLWindowCallbacks::DND_LINK;
+											obj->getMediaImpl(object_face)->navigateTo(url);
 										}
+										else 
+										{
+											// This is very strange.  Navigation should
+											// happen via the Impl, but we don't have one.
+											// This sends it to the server, which /should/
+											// trigger us getting it.  Hopefully.
+											LLSD media_data;
+											media_data[LLMediaEntry::CURRENT_URL_KEY] = url;
+											obj->syncMediaData(object_face, media_data, true, true);
+											obj->sendMediaDataUpdate();
+										}
+										result = LLWindowCallbacks::DND_LINK;
+										
 									}
 								}
 								LLSelectMgr::getInstance()->unhighlightObjectOnly(mDragHoveredObject);
@@ -930,6 +929,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
 										LLSelectMgr::getInstance()->highlightObjectOnly(mDragHoveredObject);
 									}
 									result = (! te->hasMedia()) ? LLWindowCallbacks::DND_COPY : LLWindowCallbacks::DND_LINK;
+
 								}
 							}
 						}
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index fac7fa6a18..7bb1006e93 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -139,13 +139,10 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess
 
 LLVoiceChannel::~LLVoiceChannel()
 {
-	// Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed.
-	// Using call of instanceExists() instead of gVoiceClient in check to avoid crash in LLVoiceClient::removeObserver() 
-	// when quitting viewer by closing console window before login (though in case of such quit crash will occur 
-	// later in other destructors anyway). EXT-5524
+	// Must check instance exists here, the singleton MAY have already been destroyed.
 	if(LLVoiceClient::instanceExists())
 	{
-		gVoiceClient->removeObserver(this);
+		LLVoiceClient::instance().removeObserver(this);
 	}
 	
 	sVoiceChannelMap.erase(mSessionID);
diff --git a/indra/newview/skins/default/textures/arrow_down.tga b/indra/newview/skins/default/textures/arrow_down.tga
new file mode 100644
index 0000000000..81dc9d3b6c
--- /dev/null
+++ b/indra/newview/skins/default/textures/arrow_down.tga
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 1e2440580e..27f8b4bb39 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -6,7 +6,7 @@
  name="Hardware Settings Floater"
  help_topic="hardware_settings_floater"
  title="HARDWARE SETTINGS"
- width="500">
+ width="615">
     <text
      type="string"
      length="1"
@@ -16,7 +16,7 @@
      left="10"
      name="Filtering:"
      top="20"
-     width="128">
+     width="188">
         Filtering:
     </text>
     <check_box
@@ -37,7 +37,7 @@
      left="10"
      name="Antialiasing:"
      top_pad="7"
-     width="128">
+     width="188">
         Antialiasing:
     </text>
     <combo_box
@@ -79,13 +79,13 @@
      increment="0.01"
      initial_value="1"
      label="Gamma:"
-     label_width="138"
+     label_width="198"
      layout="topleft"
      left="10"
      max_val="2"
      name="gamma"
      top_pad="7"
-     width="202" />
+     width="262" />
     <text
      type="string"
      length="1"
@@ -95,7 +95,7 @@
      left_pad="10"
      name="(brightness, lower is brighter)"
      top_delta="2"
-     width="315">
+     width="385">
         (0 = default brightness, lower = brighter)
     </text>
     <text
@@ -107,7 +107,7 @@
      left="10"
      name="Enable VBO:"
      top_pad="10"
-     width="128">
+     width="188">
         Enable VBO:
     </text>
     <check_box
@@ -128,14 +128,14 @@
      increment="16"
      initial_value="32"
      label="Texture Memory (MB):"
-     label_width="135"
+     label_width="195"
      layout="topleft"
      left="10"
      max_val="4096"
      name="GraphicsCardTextureMemory"
      tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
      top_pad="10"
-     width="300" />
+     width="360" />
     <spinner
      control_name="RenderFogRatio"
      decimal_digits="1"
@@ -143,14 +143,14 @@
      height="22"
      initial_value="4"
      label="Fog Distance Ratio:"
-     label_width="138"
+     label_width="198"
      layout="topleft"
      left_delta="0"
      max_val="10"
      min_val="0.5"
      name="fog"
      top_pad="7"
-     width="202" />
+     width="262" />
     <button
      follows="right|bottom"
      height="22"
diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
index 39fb54d513..a7ecc39ed8 100644
--- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
@@ -1,8 +1,8 @@
 <button
  chrome="true"
- image_selected="Info_Small"
- image_unselected="Info_Small"
- image_pressed="Info_Small"
+ image_selected="Info_Over"
+ image_unselected="Info_Over"
+ image_pressed="Info_Over"
  height="12"
  name="inspector_info_ctrl"
  width="12" />
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4655fa8c46..e95300a4b3 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar
- follows="left|top|right"
+ follows="left|top"
  height="18"
  layout="topleft"
  left_delta="0"
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 1b04d01abf..27d66945d9 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="408"
  label="Things"
@@ -61,6 +62,7 @@
      left="7"
      name="inventory filter tabs"
      tab_height="30"
+     tab_group="1"
      tab_position="top"
      tab_min_width="100"
      top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 53dda1927a..ff2aae645b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -64,19 +64,31 @@
 		  function="MediaListCtrl.GoMediaPrefs" />
 	</button>
 	<button
-		name="more_less_btn"
+		name="more_btn"
 		follows="right"
 		tool_tip="Advanced Controls"
 		top_delta="0"
 		right="-8"
 		width="66"
 		height="22"
-		toggle="true"
 		label="More &gt;&gt;"
 		label_selected="Less &lt;&lt;">
 	  <button.commit_callback
 		  function="MediaListCtrl.MoreLess" />
 	</button>
+  <button
+		name="less_btn"
+		follows="right"
+		tool_tip="Advanced Controls"
+		top_delta="0"
+		right="-8"
+		width="66"
+		height="22"
+		label="More &gt;&gt;"
+		label_selected="Less &lt;&lt;">
+      <button.commit_callback
+        function="MediaListCtrl.MoreLess" />
+  </button>
   </panel>
   <panel
 	  name="nearby_media_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 6152dd1587..8131b75b70 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Side tray panel -->
 <panel
+ default_tab_group="1"
  follows="all"
  height="449"
  label="People"
@@ -56,6 +57,7 @@
      layout="topleft"
      left="5"
      name="tabs"
+     tab_group="1"
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c61007a9e1..a7a0efcdb3 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="570"
  label="Places"
@@ -37,6 +38,7 @@ background_visible="true"
      name="Places Tabs"
      tab_min_width="80"
      tab_height="30"
+     tab_group="1"
      tab_position="top"
      top_pad="10"
      width="315" />
@@ -132,5 +134,14 @@ background_visible="true"
          right="-10"
          top="1"
          width="60" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Profile"
+         layout="topleft"
+         name="profile_btn"
+         right="-1"
+         top="1"
+         width="111" />
     </panel>
 </panel>
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 3d7f392404..fca9b4bca1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -84,7 +84,7 @@
     </text>
     <check_box
 	 enabled="false"
-     control_name="LogChat"
+     control_name="LogNearbyChat"
      height="16"
      label="Save nearby chat logs on my computer"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 11069b3ac3..e7384fa77f 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -64,7 +64,6 @@
    text_color="white"
    top="5"
    translate="false"
-   v_pad="5" 
    use_ellipses="true"
    width="260">
     Toast text;
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c5efa2e221..73650a19dc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 background_visible="true"
+default_tab_group="1"
 follows="all"
 height="570"
 label="Outfits"
@@ -90,6 +91,7 @@ width="333">
    min_height="410"
    width="320"
    left="0"
+   tab_group="1"
    top_pad="6"
    follows="all" />
   <!--   <button
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index c453d415b4..49bf2a7442 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -264,7 +264,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 				[COUNT]
 			</text>
 			<text left="4" name="Autoreturn" width="412">
-				Devolución automática de objetos de otros Residentes (minutos, 0 para desactivarla):
+				Devolución automática de objetos de otros (en min., 0 para desactivarla):
 			</text>
 			<line_editor name="clean other time" right="-20"/>
 			<text name="Object Owners:" width="150">
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index 9a0a566a55..a40f65d5d0 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -13,17 +13,17 @@
 		No puede unirse ni dividirse.
 	</floater.string>
 	<floater.string name="cant_buy_for_group">
-		No tiene permiso de comprar terreno para el grupo que tiene activado.
+		No tienes permiso de comprar terreno para el grupo que tienes activado.
 	</floater.string>
 	<floater.string name="no_land_selected">
 		No se ha seleccionado terreno.
 	</floater.string>
 	<floater.string name="multiple_parcels_selected">
 		Se han seleccionado varias parcelas diferentes. 
-Inténtelo seleccionando un área más pequeña.
+Inténtalo seleccionando un área más pequeña.
 	</floater.string>
 	<floater.string name="no_permission">
-		No tiene permiso de comprar terreno para el grupo que tiene activado.
+		No tienes permiso de comprar terreno para el grupo que tienes activado.
 	</floater.string>
 	<floater.string name="parcel_not_for_sale">
 		La parcela seleccionada no está en venta.
@@ -32,20 +32,20 @@ Inténtelo seleccionando un área más pequeña.
 		El grupo ya es propietario de la parcela.
 	</floater.string>
 	<floater.string name="you_already_own">
-		Usted ya es propietario de la parcela.
+		Ya eres propietario de la parcela.
 	</floater.string>
 	<floater.string name="set_to_sell_to_other">
-		La parcela seleccionada está marcada para ser vendida a otro
+		La parcela seleccionada está marcada para ser vendida a otro.
 	</floater.string>
 	<floater.string name="no_public_land">
 		El área seleccionada no tiene terreno público.
 	</floater.string>
 	<floater.string name="not_owned_by_you">
-		Está seleccionado un terreno propiedad de otro Residente. 
+		Estás seleccionado un terreno propiedad de otro Residente. 
 Prueba a seleccionar un área más pequeña.
 	</floater.string>
 	<floater.string name="processing">
-		Procesando su compra...
+		Procesando tu compra...
  
 (Llevará uno o dos minutos).
 	</floater.string>
@@ -68,10 +68,10 @@ Prueba a seleccionar un área más pequeña.
 		no necesita
 	</floater.string>
 	<floater.string name="must_upgrade">
-		Para poseer terreno, su cuenta debe ascender de categoría.
+		Para poseer terreno, tu cuenta debe ascender de categoría.
 	</floater.string>
 	<floater.string name="cant_own_land">
-		Su cuenta puede poseer terreno.
+		Tu cuenta puede poseer terreno.
 	</floater.string>
 	<floater.string name="land_holdings">
 		Tienes [BUYER] m² de terreno.
@@ -112,16 +112,16 @@ los suficientes créditos de uso en contribución de terreno
 para cubrir esta parcela.
 	</floater.string>
 	<floater.string name="have_enough_lindens">
-		Tiene [AMOUNT] L$, cantidad suficiente para comprar este terreno.
+		Tienes [AMOUNT] L$, cantidad suficiente para comprar este terreno.
 	</floater.string>
 	<floater.string name="not_enough_lindens">
-		Sólo tiene [AMOUNT] L$. Necesitaría [AMOUNT2] L$ más.
+		Sólo tienes [AMOUNT] L$. Necesitarías [AMOUNT2] L$ más.
 	</floater.string>
 	<floater.string name="balance_left">
-		Tras la compra, aún tendrá [AMOUNT] L$.
+		Tras la compra, aún tendrás [AMOUNT] L$.
 	</floater.string>
 	<floater.string name="balance_needed">
-		Para costearse este terreno, deberá comprar, al menos, [AMOUNT] L$.
+		Para costearte este terreno, deberás comprar, al menos, [AMOUNT] L$.
 	</floater.string>
 	<floater.string name="no_parcel_selected">
 		(No se ha seleccionado una parcela)
@@ -163,7 +163,7 @@ para cubrir esta parcela.
 		Podrá o no unirse o dividirse.
 	</text>
 	<text name="covenant_text">
-		Deve aceptar el Contrato del Estado:
+		Debes aceptar el Contrato del Estado:
 	</text>
 	<text left="470" name="covenant_timestamp_text"/>
 	<text_editor name="covenant_editor">
@@ -198,7 +198,7 @@ se vende con los objetos
 	</text>
 	<button label="Ir al sitio web" name="error_web"/>
 	<text name="account_action">
-		Ascienda a la categoría de miembro premium.
+		Asciende a la categoría de miembro premium.
 	</text>
 	<text name="account_reason">
 		Sólo pueden ser propietarios de terreno los miembros premium.
@@ -209,7 +209,7 @@ se vende con los objetos
 		<combo_box.item label="6.00 US$/mes, facturados anualmente" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
-		Aumenta su cuota mensual por uso de terreno a 40 US$/mes.
+		Aumenta tu cuota mensual por uso de terreno a 40 US$/mes.
 	</text>
 	<text name="land_use_reason">
 		Tienes 1309 m² de terreno.
@@ -219,7 +219,7 @@ Esta parcela es de 512 m².
 		Pagar al residente Joe 4.000 L$ por el terreno
 	</text>
 	<text name="currency_reason">
-		Tiene 2.100 L$.
+		Tienes 2.100 L$.
 	</text>
 	<text name="currency_action">
 		Comprar más L$
@@ -231,7 +231,7 @@ Esta parcela es de 512 m².
 		por, aprox., [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
-		Tiene 2.100 L$.
+		Tienes 2.100 L$.
 	</text>
 	<check_box label="Quitar [AMOUNT] m² de las contribuciones de grupo." name="remove_contribution"/>
 	<button label="Comprar" name="buy_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index 2b5fc7f193..021e5fb6b7 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -22,6 +22,6 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
 	</text>
 	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
-	<button label="Expulsar" label_selected="Expulsar" name="Reject"/>
+	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
 	<button label="Comenzar un MI" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 0cbee11bfb..36e7e40e59 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -11,12 +11,12 @@
 	<check_box label="Sonidos" name="check_sound"/>
 	<check_box label="Texturas" name="check_texture"/>
 	<check_box label="Fotos" name="check_snapshot"/>
-	<button label="Todo" label_selected="Todo" name="All" width="70"/>
-	<button label="Nada" label_selected="Nada" name="None" width="70" bottom_delta="0" left="83"/>
+	<button label="Todos" label_selected="Todo" name="All" width="70"/>
+	<button label="Ninguno" label_selected="Nada" name="None" width="70" bottom_delta="0" left="83"/>
 	<check_box label="Mostrar siempre las&#10;carpetas" name="check_show_empty"/>
 	<check_box label="Desde el fin de sesión" name="check_since_logoff" bottom_delta="-36"/>
 	<text name="- OR -">
-		- O -
+		- o -
 	</text>
 	<spinner label="horas atrás" name="spin_hours_ago"/>
 	<spinner label="días atrás" name="spin_days_ago"/>
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index 36a02b7300..ed7055b3a1 100644
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -17,7 +17,7 @@
 		<column label="Superficie" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
-		Propiedades de terreno permitidas en el plan de pago actual:
+		Propiedad de terreno permitida en el plan de pago:
 	</text>
 	<text name="allowed_text">
 		[AREA] m²
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index a3851ea2b0..59f953c239 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -182,7 +182,7 @@
 			<button label="Configurar..." label_selected="Configurar..." name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
 			<name_box initial_value="Cargando..." name="Group Name Proxy"/>
 			<button label="Transferir" label_selected="Transferir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
-			<check_box label="Comprtir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
+			<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
 			<text name="label click action" width="180">
 				Al tocarlo:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index c5afb99d49..8cbe4299a8 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Quitar" name="Detach"/>
 	<menu_item_call label="Soltar" name="Drop"/>
-	<menu_item_call label="Levantarse" name="Stand Up"/>
+	<menu_item_call label="Levantarme" name="Stand Up"/>
 	<menu_item_call label="Mi apariencia" name="Appearance..."/>
 	<menu_item_call label="Mis amigos" name="Friends..."/>
 	<menu_item_call label="Mis grupos" name="Groups..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 46b6d3ece6..67e56844b1 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
-	<menu_item_call label="Levantarse" name="Stand Up"/>
+	<menu_item_call label="Levantarme" name="Stand Up"/>
 	<context_menu label="Quitarme  ▶" name="Take Off &gt;">
 		<context_menu label="Ropas  ▶" name="Clothes &gt;">
 			<menu_item_call label="Camisa" name="Shirt"/>
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
index cb8fb82f0d..f21866e54f 100644
--- a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
-	<menu_item_call label="Levantarse" name="stand_up"/>
+	<menu_item_call label="Levantarme" name="stand_up"/>
 	<menu_item_call label="Mi apariencia" name="my_appearance"/>
 	<menu_item_call label="Mi perfil" name="my_profile"/>
 	<menu_item_call label="Mis amigos" name="my_friends"/>
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
index c315cb2f2c..b0f15be1b6 100644
--- a/indra/newview/skins/default/xui/es/menu_land.xml
+++ b/indra/newview/skins/default/xui/es/menu_land.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Land Pie">
 	<menu_item_call label="Acerca del terreno" name="Place Information..."/>
-	<menu_item_call label="Sentarse aquí" name="Sit Here"/>
+	<menu_item_call label="Sentarme aquí" name="Sit Here"/>
 	<menu_item_call label="Comprar este terreno" name="Land Buy"/>
 	<menu_item_call label="Comprar un pase" name="Land Buy Pass"/>
 	<menu_item_call label="Construir" name="Create"/>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 1677b9461e..d2743cd4fc 100644
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -4,12 +4,12 @@
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Construir" name="Build"/>
 	<menu_item_call label="Abrir" name="Open"/>
-	<menu_item_call label="Sentarse aquí" name="Object Sit"/>
+	<menu_item_call label="Sentarme aquí" name="Object Sit"/>
 	<menu_item_call label="Levantarme" name="Object Stand Up"/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<context_menu label="Ponerme  ▶" name="Put On">
-		<menu_item_call label="Ponerse" name="Wear"/>
+		<menu_item_call label="Ponerme" name="Wear"/>
 		<context_menu label="Anexar  ▶" name="Object Attach"/>
 		<context_menu label="Anexar como HUD  ▶" name="Object Attach HUD"/>
 	</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
index 60c92eec75..ed69683de9 100644
--- a/indra/newview/skins/default/xui/es/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Ver el perfil" name="View Profile"/>
 	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
 	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Compartir" name="Share"/>
 	<menu_item_call label="Pagar" name="Pay"/>
 	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index 88df983838..dc1486d879 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
 	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
 	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Mapa" name="Map"/>
 	<menu_item_call label="Compartir" name="Share"/>
 	<menu_item_call label="Pagar" name="Pay"/>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index b87d6c6deb..4ab6000994 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
 	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
 	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Compartir" name="Share"/>
 	<menu_item_call label="Pagar" name="Pay"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 93964a2f4f..bef803b45c 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -19,7 +19,7 @@
 		<menu_item_call label="Dejar el estatus de Administrador" name="Leave Admin Options"/>
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
-	<menu label="Comunicarse" name="Communicate">
+	<menu label="Comunicarme" name="Communicate">
 		<menu_item_call label="Mis amigos" name="My Friends"/>
 		<menu_item_call label="Mis grupos" name="My Groups"/>
 		<menu_item_check label="Chat" name="Nearby Chat"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index df18b88832..082841af31 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -74,7 +74,7 @@ Detalles del error: la notificación de nombre &apos;[_NAME]&apos; no se ha enco
 	<notification name="LoginFailedNoNetwork">
 		No se puede conectar con [SECOND_LIFE_GRID].
 &apos;[DIAGNOSTIC]&apos;
-Asegúrate de que tu conexión a internet está funcionando adecuadamente.
+Asegúrate de que tu conexión a Internet está funcionando adecuadamente.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
@@ -86,19 +86,19 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente.
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No guardarlos" yestext="Guardarlos"/>
 	</notification>
 	<notification name="CompileQueueSaveText">
-		Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtelo más tarde.
+		Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
 	</notification>
 	<notification name="CompileQueueSaveBytecode">
-		Hubo un problema al subir el script compilado por la siguiente razón: [REASON]. Por favor, inténtelo más tarde.
+		Hubo un problema al subir el script compilado por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
 	</notification>
 	<notification name="WriteAnimationFail">
-		Hubo un problema al escribir los datos de la animación. Por favor, inténtelo más tarde.
+		Hubo un problema al escribir los datos de la animación. Por favor, inténtalo más tarde.
 	</notification>
 	<notification name="UploadAuctionSnapshotFail">
 		Hubo un problema al subir la foto de la subasta por la siguiente razón: [REASON]
 	</notification>
 	<notification name="UnableToViewContentsMoreThanOne">
-		No se puede ver a la vez los contenidos de más de un ítem. Por favor, elija un solo objeto y vuelva a intentarlo.
+		No se puede ver a la vez los contenidos de más de un ítem. Por favor, elige un solo objeto y vuelve a intentarlo.
 	</notification>
 	<notification name="SaveClothingBodyChanges">
 		¿Guardar todos los cambios en la ropa y partes del cuerpo?
@@ -119,11 +119,11 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente.
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="RevokeModifyRights">
-		¿Quiere revocar los derechos de modificación a [FIRST_NAME] [LAST_NAME]?
+		¿Quieres revocar los derechos de modificación a [FIRST_NAME] [LAST_NAME]?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="RevokeModifyRightsMultiple">
-		¿Quiere revocar los derechos de modificación a los residentes seleccionados?
+		¿Quieres revocar los derechos de modificación a los residentes seleccionados?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="UnableToCreateGroup">
@@ -188,7 +188,7 @@ Por favor, invita a miembros en las próximas 48 horas.
 		<usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Crear un grupo por 100 L$"/>
 	</notification>
 	<notification name="LandBuyPass">
-		Por [COST] L$ puede entrar a este terreno (&apos;[PARCEL_NAME]&apos;) durante [TIME] horas. ¿Comprar un pase?
+		Por [COST] L$ puedes entrar a este terreno (&apos;[PARCEL_NAME]&apos;) durante [TIME] horas. ¿Comprar un pase?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="SalePriceRestriction">
@@ -208,7 +208,7 @@ El precio de venta será de [SALE_PRICE] L$ y se autoriza la compra a [NAME].
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
-		¿Estás seguros de que quieres devolver todos los objetos de esta parcela que estén compartidos con el grupo &apos;[NAME]&apos; al inventario de su propietario anterior?
+		¿Estás seguro de que quieres devolver todos los objetos de esta parcela que estén compartidos con el grupo &apos;[NAME]&apos; al inventario de su propietario anterior?
 
 *ATENCIÓN* ¡Esto borrará los objetos no transferibles que se hayan cedido al grupo!
 
@@ -304,7 +304,7 @@ debes estar dentro de ella.
 La carpeta del vestuario contiene partes del cuerpo, u objetos a anexar o que no son ropa.
 	</notification>
 	<notification name="CannotWearTrash">
-		No puede vestirte ropas o partes del cuerpo que estén en la Papelera
+		No puedes vestirte ropas o partes del cuerpo que estén en la Papelera
 	</notification>
 	<notification name="MaxAttachmentsOnOutfit">
 		No se puede anexar el objeto.
@@ -426,7 +426,7 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, vuelve a intentar guardarlo más tarde..
 	</notification>
 	<notification name="StartRegionEmpty">
-		Perdon, no está definida tu Posición inicial.
+		Perdón, no está definida tu Posición inicial.
 Por favor, escribe el nombre de la región en el cajetín de Posición inicial, o elige para esa posición Mi Base o Mi última posición.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -639,22 +639,22 @@ Por favor, inténtalo más tarde.
 	</notification>
 	<notification name="CannotRecompileSelectObjectsNoScripts">
 		No se pudo &apos;recompilar&apos;.
-Seleccione un objeto con script.
+Selecciona un objeto con script.
 	</notification>
 	<notification name="CannotRecompileSelectObjectsNoPermission">
 		No se pudo &apos;recompilar&apos;.
 
-Seleccione objetos con scripts en los que usted tenga permiso para modificarlos.
+Selecciona objetos con scripts en los que tengas permiso para modificarlos.
 	</notification>
 	<notification name="CannotResetSelectObjectsNoScripts">
 		No se pudo &apos;reiniciar&apos;.
 
-Seleccione objetos con scripts.
+Selecciona objetos con scripts.
 	</notification>
 	<notification name="CannotResetSelectObjectsNoPermission">
 		No se pudo &apos;reiniciar&apos;.
 
-Seleccione objetos con scripts en los que usted tenga permiso para modificarlos.
+Selecciona objetos con scripts en los que tengas permiso para modificarlos.
 	</notification>
 	<notification name="CannotOpenScriptObjectNoMod">
 		Imposible abrir el script del objeto sin modificar los permisos.
@@ -662,7 +662,7 @@ Seleccione objetos con scripts en los que usted tenga permiso para modificarlos.
 	<notification name="CannotSetRunningSelectObjectsNoScripts">
 		No se puede configurar ningún script como &apos;ejecutándose&apos;.
 
-Seleccione objetos con scripts.
+Selecciona objetos con scripts.
 	</notification>
 	<notification name="CannotSetRunningNotSelectObjectsNoScripts">
 		No se puede configurar ningún script como &apos;no ejecutándose&apos;.
@@ -770,7 +770,7 @@ no se ha seleccionado una parcela.
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
 		No se ha podido transferir el terreno:
-no ha seleccionado un grupo.
+no has seleccionado un grupo.
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
 		No se ha podido transferir el terreno:
@@ -800,7 +800,7 @@ Vuelve a intentarlo en unos segundos.
 	</notification>
 	<notification name="CannotReleaseLandSelected">
 		No se ha podido abandonar el terreno:
-no es propietario de todas las parcelas seleccionadas.
+no eres propietario de todas las parcelas seleccionadas.
 
 Por favor, selecciona una sola parcela.
 	</notification>
@@ -903,7 +903,7 @@ Deberás reconfigurar el nombre y las opciones de la nueva parcela.
 Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el ítem de aquí a unos minutos.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Vaya, se ha cerrado tu sesión en [SECOND_LIFE]
+		Vaya, se ha cerrado tu sesión en [SECOND_LIFE].
             [MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
 	</notification>
@@ -1093,9 +1093,9 @@ Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de pod
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
-		Tenemos problemas de conexión. Puede deberse a un problema de tu conexión a internet o de [SECOND_LIFE_GRID].
+		Tenemos problemas de conexión. Puede deberse a un problema de tu conexión a Internet o de [SECOND_LIFE_GRID].
 
-Puedes revisar tu conexión a internet y volver a intentarlo en unos minutos, pulsar Ayuda para conectarte a [SUPPORT_SITE], o pulsar Teleporte para intentar teleportarte a tu Base.
+Puedes revisar tu conexión a Internet y volver a intentarlo en unos minutos, pulsar Ayuda para conectarte a [SUPPORT_SITE], o pulsar Teleporte para intentar teleportarte a tu Base.
 		<url name="url">
 			http://es.secondlife.com/support/
 		</url>
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
index 7afa50c0a2..6d53b401c0 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
@@ -29,7 +29,7 @@
 			<text name="classified_location">
 				cargando...
 			</text>
-			<button label="Configurarlo en esta localización" name="set_to_curr_location_btn"/>
+			<button label="Configurar en esta posición" name="set_to_curr_location_btn"/>
 			<text name="category_label" value="Categoría:"/>
 			<text name="content_type_label" value="Tipo de contenido:"/>
 			<icons_combo_box label="Contenido general" name="content_type">
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
index bde29f1665..f8a03d2302 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
@@ -21,11 +21,11 @@
 			<text name="pick_location">
 				cargando...
 			</text>
-			<button label="Configurar en la posición actual" name="set_to_curr_location_btn"/>
+			<button label="Configurar en mi posición" name="set_to_curr_location_btn"/>
 		</panel>
 	</scroll_container>
 	<panel label="bottom_panel" name="bottom_panel">
-		<button label="Guardar el destacado" name="save_changes_btn"/>
+		<button label="Guardar" name="save_changes_btn"/>
 		<button label="Cancelar" name="cancel_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_notes.xml b/indra/newview/skins/default/xui/es/panel_notes.xml
index bf8da4cf73..8de2afa767 100644
--- a/indra/newview/skins/default/xui/es/panel_notes.xml
+++ b/indra/newview/skins/default/xui/es/panel_notes.xml
@@ -15,7 +15,7 @@
 		<panel name="notes_buttons_panel">
 			<button label="Añadir como amigo" name="add_friend" tool_tip="Ofrecer amistad a este Residente"/>
 			<button label="MI" name="im" tool_tip="Abrir un mensaje instantáneo"/>
-			<button label="Llamada" name="call" tool_tip="Llamar a este Residente"/>
+			<button label="Llamar" name="call" tool_tip="Llamar a este Residente"/>
 			<button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/>
 			<button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 6008c6a934..376aea5278 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -49,9 +49,9 @@ Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el
 	<panel name="button_bar">
 		<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
 		<button label="MI" name="im_btn" tool_tip="Abrir un mensaje instantáneo"/>
-		<button label="Llamada" name="call_btn" tool_tip="Llamar a este Residente"/>
+		<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
 		<button label="Compartir" name="share_btn"/>
-		<button label="Teleportarse" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+		<button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 		<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
 		<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
 		<button label="Multiconferencia" name="group_call_btn" tool_tip="Llamar a este grupo"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 46d8984889..7a65eb32bc 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -49,7 +49,7 @@
 		Mostrar los MI en: 
 	</text>
 	<text name="requires_restart_label">
-		(requiere reiniciar)
+		 (requiere reiniciar)
 	</text>
 	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
 		<radio_item label="Varias ventanas" name="radio" value="0"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 54b60b276c..9ee7bef493 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -24,8 +24,7 @@
 	<check_box label="Impedir los &apos;empujones&apos;" name="restrict_pushobject"/>
 	<check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
 	<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
-	<check_box label="Bloquear el mostrar el terreno en 
-la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+	<check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
 	<spinner label="Nº máximo de avatares" label_width="120" name="agent_limit_spin" width="180"/>
 	<spinner label="Plus de objetos" label_width="120" name="object_bonus_spin" width="180"/>
 	<text label="Calificación" name="access_text">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index a8fc7f6b58..4cee677420 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -89,7 +89,7 @@
 		Descargando la ropa...
 	</string>
 	<string name="LoginFailedNoNetwork">
-		Error de red: no se ha podido conectar; por favor, revisa tu conexión a internet.
+		Error de red: no se ha podido conectar; por favor, revisa tu conexión a Internet.
 	</string>
 	<string name="LoginFailed">
 		Error en el inicio de sesión.
@@ -101,7 +101,7 @@
 		http://join.secondlife.com/index.php?lang=es-ES
 	</string>
 	<string name="AgentLostConnection">
-		Esta región puede estar teniendo problemas. Por favor, comprueba tu conexión a internet.
+		Esta región puede estar teniendo problemas. Por favor, comprueba tu conexión a Internet.
 	</string>
 	<string name="SavingSettings">
 		Guardando tus configuraciones...
@@ -1543,10 +1543,10 @@
 		No se ha aportado un contrato para este estado. El terreno de este estado lo vende el propietario del estado, no Linden Lab.  Por favor, contacta con ese propietario para informarte sobre la venta.
 	</string>
 	<string name="covenant_last_modified">
-		Última modificación:
+		Última modificación: 
 	</string>
 	<string name="none_text" value="(no hay)"/>
-	<string name="never_text" value="(nunca)"/>
+	<string name="never_text" value=" (nunca)"/>
 	<string name="GroupOwned">
 		Propiedad del grupo
 	</string>
@@ -2013,7 +2013,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Puente: ancho
 	</string>
 	<string name="Broad">
-		Ancho
+		Aumentar
 	</string>
 	<string name="Brow Size">
 		Arco ciliar
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index 7e7ed6202f..e0e0061729 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -10,7 +10,7 @@ Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE].
 Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE].
 		</message>
 		<message name="blocked_tport">
-			Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelva a intentarlo en un momento. Si sigue sin poder teleportarse, desconéctese y vuelva a iniciar sesión para solucionar el problema.
+			Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelve a intentarlo en un momento. Si sigues sin poder teleportarte, desconéctate y vuelve a iniciar sesión para solucionar el problema.
 		</message>
 		<message name="nolandmark_tport">
 			Lo sentimos, pero el sistema no ha podido localizar el destino de este hito.
@@ -20,22 +20,22 @@ Si sigues recibiendo este mensaje, por favor, acude al [SUPPORT_SITE].
 Vuelva a intentarlo en un momento.
 		</message>
 		<message name="noaccess_tport">
-			Lo sentimos, pero usted no tiene acceso al destino de este teleporte.
+			Lo sentimos, pero no tienes acceso al destino de este teleporte.
 		</message>
 		<message name="missing_attach_tport">
-			Aún no han llegado sus objetos anexados. Espere unos segundos más o desconéctese y vuelva a iniciar sesión antes de teleportarse.
+			Aún no han llegado tus objetos anexados. Espera unos segundos más o desconéctate y vuelve a iniciar sesión antes de teleportarte.
 		</message>
 		<message name="too_many_uploads_tport">
-			La cola de espera en esta región está actualmente obstruida, por lo que su petición de teleporte no se atenderá en un tiempo prudencial. Por favor, vuelva a intentarlo en unos minutos o vaya a una zona menos ocupada.
+			La cola de espera en esta región está actualmente obstruida, por lo que tu petición de teleporte no se atenderá en un tiempo prudencial. Por favor, vuelve a intentarlo en unos minutos o ve a una zona menos ocupada.
 		</message>
 		<message name="expired_tport">
-			Lo sentimos, pero el sistema no ha podido atender a su petición de teleporte en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos.
+			Lo sentimos, pero el sistema no ha podido atender a tu petición de teleporte en un tiempo prudencial. Por favor, vuelve a intentarlo en unos minutos.
 		</message>
 		<message name="expired_region_handoff">
-			Lo sentimos, pero el sistema no ha podido completar su paso a otra región en un tiempo prudencial. Por favor, vuelva a intentarlo en unos pocos minutos.
+			Lo sentimos, pero el sistema no ha podido completar tu paso a otra región en un tiempo prudencial. Por favor, vuelve a intentarlo en unos minutos.
 		</message>
 		<message name="no_host">
-			Ha sido imposible encontrar el destino del teleporte: o está desactivado temporalmente o ya no existe. Por favor, vuelva a intentarlo en unos pocos minutos.
+			Ha sido imposible encontrar el destino del teleporte: o está desactivado temporalmente o ya no existe. Por favor, vuelve a intentarlo en unos minutos.
 		</message>
 		<message name="no_inventory_host">
 			En estos momentos no está disponible el sistema del inventario.
diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml
index 10c30eb361..f71f935c24 100644
--- a/indra/newview/skins/default/xui/nl/floater_about.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about.xml
@@ -1,20 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="OVER [CAPITALIZED_APP_NAME]">
-<tab_container name="about_tab">
-	<panel name="credits_panel">
-	<text_editor name="credits_editor">
-		Second Life wordt u aangeboden door 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.
+	<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">
+		Gemaakt met [COMPILER] versie [COMPILER_VERSION]
+	</floater.string>
+	<floater.string name="AboutPosition">
+		U bent op [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] gelegen op [HOSTNAME] ([HOSTIP])
+[SERVER_VERSION]
+[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+	</floater.string>
+	<floater.string name="AboutSystem">
+		CPU: [CPU]
+Geheugen: [MEMORY_MB] MB
+OS Versie: [OS_VERSION]
+Grafische Kaard Vendor: [GRAPHICS_CARD_VENDOR]
+Grafische Kaard: [GRAPHICS_CARD]
+	</floater.string>
+	<floater.string name="AboutDriver">
+		Windows Grafische Driver Versie: [GRAPHICS_DRIVER_VERSION]
+	</floater.string>
+	<floater.string name="AboutLibs">
+		OpenGL Versie: [OPENGL_VERSION]
+
+libcurl Versie: [LIBCURL_VERSION]
+J2C Decoder Versie: [J2C_VERSION]
+Audio Driver Versie: [AUDIO_DRIVER_VERSION]
+Qt Webkit Versie: [QT_WEBKIT_VERSION]
+Vivox Versie: [VIVOX_VERSION]
+	</floater.string>
+	<floater.string name="none">
+		(none)
+	</floater.string>
+	<floater.string name="AboutTraffic">
+		Pakketten Verloren: [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ëren naar Klembord" name="copy_btn"/>
+		</panel>
+		<panel label="Credits" name="credits_panel">
+			<text_editor name="credits_editor">
+				Second Life wordt u aangeboden door 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.
 
 Een &apos;Dank u&apos; voor de volgende bewoners voor het helpen zorgdragen dat dit de beste versie tot nu toe is: 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
 
 
 
 To be a success in business, be daring, be first, be different. --Henry Marchant
-	</text_editor>
-	</panel>
-	<panel name="licenses_panel">
-	<text_editor name="credits_editor">
-3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+			</text_editor>
+		</panel>
+		<panel label="Licenties" 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
@@ -35,10 +75,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 All rights reserved. See licenses.txt for details.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-	</text_editor>
-	</panel>
-</tab_container>
-	<string name="you_are_at">
-		U bent op [POSITION]
-	</string>
+			</text_editor>
+		</panel>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_mute_object.xml b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
index 7a34be1bd7..edea63b42c 100644
--- a/indra/newview/skins/default/xui/nl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/nl/floater_mute_object.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="NEGEER OBJECT OP NAAM">
-	<text name="message" bottom_delta="-40">
-		Negeer op naam heeft alleen invloed op object chat
-en IM, niet op geluiden. U dient de naam van het object 
-exact te typen.
+<floater name="mute by name" title="BLOKKEER VOORWERP BIJ NAAM">
+	<text bottom_delta="-40" name="message">
+		Blokkeer een Voorwerp:
 	</text>
-	<line_editor name="object_name" bottom_delta="-58">
+	<line_editor bottom_delta="-58" name="object_name">
 		Object naam
 	</line_editor>
+	<text name="note">
+		* Blokkeerd alleen object tekst, niet de geluiden
+	</text>
 	<button label="Ok" name="OK"/>
 	<button label="Annuleren" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
index 19b11ede0a..a50773c2b3 100644
--- a/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/nl/floater_report_abuse.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="MISBRUIK RAPPORTEREN">
-	<check_box label="Voeg schermafbeelding toe" name="screen_check"/>
+	<floater.string name="Screenshot">
+		Schermafbeelding
+	</floater.string>
+	<check_box label="Gebruik deze schermafbeelding" name="screen_check"/>
 	<text name="reporter_title" width="110">
 		Rapporteur:
 	</text>
-	<text name="reporter_field" left_delta="70">
-		Loremipsum Dolorsitamut
+	<text left_delta="70" name="reporter_field">
+		Loremipsum Dolorsitamut Longnamez
 	</text>
 	<text name="sim_title">
 		Regio:
 	</text>
-	<text name="sim_field" left_delta="70">
+	<text left_delta="70" name="sim_field">
 		Regionaam
 	</text>
 	<text name="pos_title">
 		Positie:
 	</text>
-	<text name="pos_field" left_delta="70">
+	<text left_delta="70" name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
 	<text name="select_object_label">
-		Klik de knop, daarna het object:
+		Klik de knop, vervolgens het misbruik voorwerp:
 	</text>
 	<button label="" label_selected="" name="pick_btn" tool_tip="Objectkiezer - Identificeer een object als het onderwerp van dit rapport"/>
 	<text name="object_name_label">
-		Naam:
+		voorwerp:
 	</text>
 	<text name="object_name" width="120">
 		Consetetur Sadipscing
@@ -33,54 +36,53 @@
 		Eigenaar:
 	</text>
 	<text name="owner_name">
-		Hendrerit Vulputate
+		Hendrerit Vulputate Kamawashi Longname
 	</text>
 	<combo_box name="category_combo" tool_tip="Categorie -- selecteer de categorie die dit rapport het best beschrijft">
-		<combo_box.item name="Select_category" label="Selecteer categorie"/>
-		<combo_box.item name="Age__Age_play" label="Leeftijd &gt; Leeftijd spelen"/>
-		<combo_box.item name="Age__Adult_resident_on_Teen_Second_Life" label="Leeftijd &gt; Volwassen inwoner in Teen Second Life"/>
-		<combo_box.item name="Age__Underage_resident_outside_of_Teen_Second_Life" label="Leeftijd &gt; Minderjarige inwoner buiten Teen Second Life"/>
-		<combo_box.item name="Assault__Combat_sandbox___unsafe_area" label="Aanval &gt; Gevechtszandbak / onveilig gebied"/>
-		<combo_box.item name="Assault__Safe_area" label="Aanval &gt; Veilig gebied"/>
-		<combo_box.item name="Assault__Weapons_testing_sandbox" label="Aanval &gt; Zandbak voor het testen van wapens"/>
-		<combo_box.item name="Commerce__Failure_to_deliver_product_or_service" label="Handel &gt; Product of dienst is niet geleverd"/>
-		<combo_box.item name="Disclosure__Real_world_information" label="Openbaring &gt; Echte wereld informatie"/>
-		<combo_box.item name="Disclosure__Remotely_monitoring chat" label="Openbaring &gt; Op afstand chat afluisteren"/>
-		<combo_box.item name="Disclosure__Second_Life_information_chat_IMs" label="Openbaring &gt; Second Life informatie/chat/IMs"/>
-		<combo_box.item name="Disturbing_the_peace__Unfair_use_of_region_resources" label="Vredebreuk &gt; Oneerlijk gebruik van regiomiddelen"/>
-		<combo_box.item name="Disturbing_the_peace__Excessive_scripted_objects" label="Vredebreuk &gt; Excessieve gescripte objecten"/>
-		<combo_box.item name="Disturbing_the_peace__Object_littering" label="Vredebreuk &gt; Objecten laten rondslingeren"/>
-		<combo_box.item name="Disturbing_the_peace__Repetitive_spam" label="Vredebreuk &gt; Herhaalde spam"/>
-		<combo_box.item name="Disturbing_the_peace__Unwanted_advert_spam" label="Vredebreuk &gt; Ongewenste reclame-spam"/>
-		<combo_box.item name="Fraud__L$" label="Fraude &gt; L$"/>
-		<combo_box.item name="Fraud__Land" label="Fraude &gt; Land"/>
-		<combo_box.item name="Fraud__Pyramid_scheme_or_chain_letter" label="Fraude &gt; Piramideschema of kettingbrief"/>
-		<combo_box.item name="Fraud__US$" label="Fraude &gt; US$"/>
-		<combo_box.item name="Harassment__Advert_farms___visual_spam" label="Intimidatie &gt; Reclameverzamelingen / visuele spam"/>
-		<combo_box.item name="Harassment__Defaming_individuals_or_groups" label="Intimidatie &gt; Individuen of groepen in diskrediet brengen"/>
-		<combo_box.item name="Harassment__Impeding_movement" label="Intimidatie &gt; Beweging verhinderen"/>
-		<combo_box.item name="Harassment__Sexual_harassment" label="Intimidatie &gt; Seksuele intimidatie"/>
-		<combo_box.item name="Harassment__Solicting_inciting_others_to_violate_ToS" label="Intimidatie &gt; Anderen uitnodigen/aanzetten tot het schenden van de ToS"/>
-		<combo_box.item name="Harassment__Verbal_abuse" label="Intimidatie &gt; Verbaal misbruik"/>
-		<combo_box.item name="Indecency__Broadly_offensive_content_or_conduct" label="Onfatsoenlijkheid &gt; Globaal beledigende inhoud of gedrag"/>
-		<combo_box.item name="Indecency__Inappropriate_avatar_name" label="Onfatsoenlijkheid &gt; Ongepaste avatar naam"/>
-		<combo_box.item name="Indecency__Mature_content_in_PG_region" label="Onfatsoenlijkheid &gt; Ongepaste inhoud of gedrag in een PG regio"/>
-		<combo_box.item name="Indecency__Inappropriate_content_in_Mature_region" label="Onfatsoenlijkheid &gt; Ongepaste inhoud of gedrag in een Mature regio"/>
-		<combo_box.item name="Intellectual_property_infringement_Content_Removal" label="Inbreuk op intellectueel eigendom &gt; Verwijderen van inhoud"/>
-		<combo_box.item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" label="Inbreuk op intellectueel eigendom &gt; CopyBot of misbruik van permissies"/>
-		<combo_box.item name="Intolerance" label="Intolerantie"/>
-		<combo_box.item name="Land__Abuse_of_sandbox_resources" label="Land &gt; Misbruik van zandbakmiddelen"/>
-		<combo_box.item name="Land__Encroachment__Objects_textures" label="Land &gt; Indringing &gt; Objecten/texturen"/>
-		<combo_box.item name="Land__Encroachment__Particles" label="Land &gt; Indringing &gt; Particles"/>
-		<combo_box.item name="Land__Encroachment__Trees_plants" label="Land &gt; Indringing &gt; Bomen/planten"/>
-		<combo_box.item name="Wagering_gambling" label="Weddenschappen/gokken"/>
-		<combo_box.item name="Other" label="Anders"/>
+		<combo_box.item label="Selecteer categorie" name="Select_category"/>
+		<combo_box.item label="Leeftijd &gt; Leeftijd spelen" name="Age__Age_play"/>
+		<combo_box.item label="Leeftijd &gt; Volwassen inwoner in Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
+		<combo_box.item label="Leeftijd &gt; Minderjarige inwoner buiten Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="Aanval &gt; Gevechtszandbak / onveilig gebied" name="Assault__Combat_sandbox___unsafe_area"/>
+		<combo_box.item label="Aanval &gt; Veilig gebied" name="Assault__Safe_area"/>
+		<combo_box.item label="Aanval &gt; Zandbak voor het testen van wapens" name="Assault__Weapons_testing_sandbox"/>
+		<combo_box.item label="Handel &gt; Product of dienst is niet geleverd" name="Commerce__Failure_to_deliver_product_or_service"/>
+		<combo_box.item label="Openbaring &gt; Echte wereld informatie" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="Openbaring &gt; Op afstand chat afluisteren" name="Disclosure__Remotely_monitoring chat"/>
+		<combo_box.item label="Openbaring &gt; Second Life informatie/chat/IMs" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="Vredebreuk &gt; Oneerlijk gebruik van regiomiddelen" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
+		<combo_box.item label="Vredebreuk &gt; Excessieve gescripte objecten" name="Disturbing_the_peace__Excessive_scripted_objects"/>
+		<combo_box.item label="Vredebreuk &gt; Objecten laten rondslingeren" name="Disturbing_the_peace__Object_littering"/>
+		<combo_box.item label="Vredebreuk &gt; Herhaalde spam" name="Disturbing_the_peace__Repetitive_spam"/>
+		<combo_box.item label="Vredebreuk &gt; Ongewenste reclame-spam" name="Disturbing_the_peace__Unwanted_advert_spam"/>
+		<combo_box.item label="Fraude &gt; L$" name="Fraud__L$"/>
+		<combo_box.item label="Fraude &gt; Land" name="Fraud__Land"/>
+		<combo_box.item label="Fraude &gt; Piramideschema of kettingbrief" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="Fraude &gt; US$" name="Fraud__US$"/>
+		<combo_box.item label="Intimidatie &gt; Reclameverzamelingen / visuele spam" name="Harassment__Advert_farms___visual_spam"/>
+		<combo_box.item label="Intimidatie &gt; Individuen of groepen in diskrediet brengen" name="Harassment__Defaming_individuals_or_groups"/>
+		<combo_box.item label="Intimidatie &gt; Beweging verhinderen" name="Harassment__Impeding_movement"/>
+		<combo_box.item label="Intimidatie &gt; Seksuele intimidatie" name="Harassment__Sexual_harassment"/>
+		<combo_box.item label="Intimidatie &gt; Anderen uitnodigen/aanzetten tot het schenden van de ToS" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
+		<combo_box.item label="Intimidatie &gt; Verbaal misbruik" name="Harassment__Verbal_abuse"/>
+		<combo_box.item label="Onfatsoenlijkheid &gt; Globaal beledigende inhoud of gedrag" name="Indecency__Broadly_offensive_content_or_conduct"/>
+		<combo_box.item label="Onfatsoenlijkheid &gt; Ongepaste avatar naam" name="Indecency__Inappropriate_avatar_name"/>
+		<combo_box.item label="Onfatsoenlijkheid &gt; Ongepaste inhoud of gedrag in een PG regio" name="Indecency__Mature_content_in_PG_region"/>
+		<combo_box.item label="Onfatsoenlijkheid &gt; Ongepaste inhoud of gedrag in een Mature regio" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="Inbreuk op intellectueel eigendom &gt; Verwijderen van inhoud" name="Intellectual_property_infringement_Content_Removal"/>
+		<combo_box.item label="Inbreuk op intellectueel eigendom &gt; CopyBot of misbruik van permissies" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
+		<combo_box.item label="Intolerantie" name="Intolerance"/>
+		<combo_box.item label="Land &gt; Misbruik van zandbakmiddelen" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="Land &gt; Indringing &gt; Objecten/texturen" name="Land__Encroachment__Objects_textures"/>
+		<combo_box.item label="Land &gt; Indringing &gt; Particles" name="Land__Encroachment__Particles"/>
+		<combo_box.item label="Land &gt; Indringing &gt; Bomen/planten" name="Land__Encroachment__Trees_plants"/>
+		<combo_box.item label="Weddenschappen/gokken" name="Wagering_gambling"/>
+		<combo_box.item label="Anders" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		Misbruikernaam:
 	</text>
 	<button label="Kies inwoner" label_selected="" name="select_abuser" tool_tip="Selecteer de naam van de misbruiker uit een lijst"/>
-	<check_box label="Naam van misbruiker onbekend" name="omit_abuser_name" tool_tip="Vink dit aan wanneer u niet in staat bent de naam van de misbruiker te geven"/>
 	<text name="abuser_name_title2">
 		Locatie van misbruik:
 	</text>
@@ -91,13 +93,11 @@
 		Details:
 	</text>
 	<text name="bug_aviso">
-		Wees alstublieft zo specifiek mogelijk m.b.t. datum, locatie, 
-aard van het misbruik, relevante chat/IM tekst, en selecteer 
-het object indien mogelijk.
+		Wees zo specifiek mogelijk
 	</text>
 	<text name="incomplete_title">
-		Let op: onvolledige rapporten zullen niet worden onderzocht.
+		Let Op: Onvolledige verslagen zullen niet worden onderzocht
 	</text>
-	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
 	<button label="Misbruik rapporteren" label_selected="Misbruik rapporteren" name="send_btn"/>
+	<button label="Annuleren" label_selected="Annuleren" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_stats.xml b/indra/newview/skins/default/xui/nl/floater_stats.xml
new file mode 100644
index 0000000000..0db3f76735
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/floater_stats.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Statistics" title="STATISTIEKEN">
+	<scroll_container name="statistics_scroll">
+		<container_view name="statistics_view">
+			<stat_view label="Basis" name="basic">
+				<stat_bar label="FPS" name="fps"/>
+				<stat_bar label="Bandbreedte" name="bandwidth"/>
+				<stat_bar label="Pakket Verlies" name="packet_loss"/>
+				<stat_bar label="Ping Sim" name="ping"/>
+			</stat_view>
+			<stat_view label="Geavanceerd" name="advanced">
+				<stat_view label="Weergeven" name="render">
+					<stat_bar label="KTris Tekenen" name="ktrisframe"/>
+					<stat_bar label="KTris Tekenen" name="ktrissec"/>
+					<stat_bar label="Totaal Voorwerpen" name="objs"/>
+					<stat_bar label="Nieuwe Voorwerpen" name="newobjs"/>
+				</stat_view>
+				<stat_view label="Textuur" 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="Netwerk" name="network">
+					<stat_bar label="Pakketten In" name="packetsinstat"/>
+					<stat_bar label="Pakketten Uit" name="packetsoutstat"/>
+					<stat_bar label="Voorwerpen" name="objectkbitstat"/>
+					<stat_bar label="Textuur" name="texturekbitstat"/>
+					<stat_bar label="Bezit" name="assetkbitstat"/>
+					<stat_bar label="Lagen" name="layerskbitstat"/>
+					<stat_bar label="Daadwerkelijk In" name="actualinkbitstat"/>
+					<stat_bar label="Daadwerkelijk Out" name="actualoutkbitstat"/>
+					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
+				</stat_view>
+			</stat_view>
+			<stat_view label="Simulator" name="sim">
+				<stat_bar label="Tijd Dilatatie" 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="Voorwerpen" name="simobjects"/>
+					<stat_bar label="Actieve Voorwerpen" name="simactiveobjects"/>
+					<stat_bar label="Actieve Scripts" name="simactivescripts"/>
+					<stat_bar label="Actieve Evenementen" name="simscripteps"/>
+					<stat_bar label="Pakketten In" name="siminpps"/>
+					<stat_bar label="Pakketten Uit" name="simoutpps"/>
+					<stat_bar label="Wachtende Downloads" name="simpendingdownloads"/>
+					<stat_bar label="Wachtende Uploads" name="simpendinguploads"/>
+					<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
+				</stat_view>
+				<stat_view label="Tijd (ms)" name="simperf">
+					<stat_bar label="Totale Frame Tijd" name="simframemsec"/>
+					<stat_bar label="Net Time" name="simnetmsec"/>
+					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>
+					<stat_bar label="Simulatie Tijd" name="simsimothermsec"/>
+					<stat_bar label="Agent Tijd" name="simagentmsec"/>
+					<stat_bar label="Plaatjes Tijd" name="simimagesmsec"/>
+					<stat_bar label="Script Tijd" name="simscriptmsec"/>
+				</stat_view>
+			</stat_view>
+		</container_view>
+	</scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/nl/menu_inventory.xml b/indra/newview/skins/default/xui/nl/menu_inventory.xml
index 6a514422b9..c3b47cbddb 100644
--- a/indra/newview/skins/default/xui/nl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/nl/menu_inventory.xml
@@ -12,7 +12,7 @@
 	<menu_item_call label="Nieuw script" name="New Script"/>
 	<menu_item_call label="Nieuwe notitie" name="New Note"/>
 	<menu_item_call label="Nieuw gebaar" name="New Gesture"/>
-	<menu name="New Clothes" label="Nieuwe Kleding">
+	<menu label="Nieuwe Kleding" name="New Clothes">
 		<menu_item_call label="Nieuw shirt" name="New Shirt"/>
 		<menu_item_call label="Nieuwe broek" name="New Pants"/>
 		<menu_item_call label="Nieuwe schoenen" name="New Shoes"/>
@@ -22,31 +22,47 @@
 		<menu_item_call label="Nieuwe handschoenen" name="New Gloves"/>
 		<menu_item_call label="Nieuw onderhemd" name="New Undershirt"/>
 		<menu_item_call label="Nieuwe onderbroek" name="New Underpants"/>
+		<menu_item_call label="Nieuw Alpha Masker" name="New Alpha Mask"/>
+		<menu_item_call label="Nieuwe Tattoo" name="New Tattoo"/>
 	</menu>
-	<menu name="New Body Parts" label="Nieuwe Lichaamsdelen">
+	<menu label="Nieuwe Lichaamsdelen" name="New Body Parts">
 		<menu_item_call label="Nieuwe postuur" name="New Shape"/>
 		<menu_item_call label="Nieuwe huid" name="New Skin"/>
 		<menu_item_call label="Nieuw haar" name="New Hair"/>
 		<menu_item_call label="Nieuwe ogen" name="New Eyes"/>
 	</menu>
+	<menu label="Change Type" name="Change Type">
+		<menu_item_call label="Standaard" name="Default"/>
+		<menu_item_call label="Handschoenen" name="Gloves"/>
+		<menu_item_call label="Jas" name="Jacket"/>
+		<menu_item_call label="Broek" name="Pants"/>
+		<menu_item_call label="Vorm" name="Shape"/>
+		<menu_item_call label="Schoenen" name="Shoes"/>
+		<menu_item_call label="Overhemd" name="Shirt"/>
+		<menu_item_call label="Rok" name="Skirt"/>
+		<menu_item_call label="Onderbroek" name="Underpants"/>
+		<menu_item_call label="Onderhemd" name="Undershirt"/>
+	</menu>
 	<menu_item_call label="Teleport" name="Landmark Open"/>
 	<menu_item_call label="Open" name="Animation Open"/>
 	<menu_item_call label="Open" name="Sound Open"/>
 	<menu_item_call label="Verwijderen item" name="Purge Item"/>
 	<menu_item_call label="Herstellen item" name="Restore Item"/>
+	<menu_item_call label="Ga Naar Link" name="Goto Link"/>
 	<menu_item_call label="Open" name="Open"/>
 	<menu_item_call label="Eigenschappen" name="Properties"/>
 	<menu_item_call label="Hernoemen" name="Rename"/>
 	<menu_item_call label="Kopieer asset UUID" name="Copy Asset UUID"/>
 	<menu_item_call label="Kopiëren" name="Copy"/>
 	<menu_item_call label="Plakken" name="Paste"/>
+	<menu_item_call label="Plak Als Link" name="Paste As Link"/>
 	<menu_item_call label="Verwijderen" name="Delete"/>
 	<menu_item_call label="Items uitdoen" name="Take Off Items"/>
 	<menu_item_call label="Voeg toe aan kleding" name="Add To Outfit"/>
 	<menu_item_call label="Vervang kleding" name="Replace Outfit"/>
 	<menu_item_call label="Start conferentie chat" name="Conference Chat Folder"/>
 	<menu_item_call label="Afspelen" name="Sound Play"/>
-	<menu_item_call label="Over landmarkering" name="Teleport To Landmark"/>
+	<menu_item_call label="Over Landmark" name="About Landmark"/>
 	<menu_item_call label="In wereld afspelen" name="Animation Play"/>
 	<menu_item_call label="Lokaal afspelen" name="Animation Audition"/>
 	<menu_item_call label="Stuur instant message" name="Send Instant Message"/>
@@ -54,8 +70,8 @@
 	<menu_item_call label="Start conferentie chat" name="Conference Chat"/>
 	<menu_item_call label="Activeren" name="Activate"/>
 	<menu_item_call label="Deactiveren" name="Deactivate"/>
+	<menu_item_call label="Opslaan Als" name="Save As"/>
 	<menu_item_call label="Losmaken van jezelf" name="Detach From Yourself"/>
-	<menu_item_call label="Herstellen naar laatste positie" name="Restore to Last Position"/>
 	<menu_item_call label="Dragen" name="Object Wear"/>
 	<menu label="Bevestigen aan" name="Attach To"/>
 	<menu label="Bevestigen aan HUD" name="Attach To HUD"/>
diff --git a/indra/newview/skins/default/xui/nl/menu_inventory_add.xml b/indra/newview/skins/default/xui/nl/menu_inventory_add.xml
new file mode 100644
index 0000000000..09330b9597
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/menu_inventory_add.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_inventory_add">
+	<menu label="Upload" name="upload">
+		<menu_item_call label="Plaatje (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Geluid (L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Animatie (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Bulk (L$[COST] per bestand)..." name="Bulk Upload"/>
+	</menu>
+	<menu_item_call label="Nieuwe Map" name="New Folder"/>
+	<menu_item_call label="Nieuw Script" name="New Script"/>
+	<menu_item_call label="Nieuw Notitie" name="New Note"/>
+	<menu_item_call label="Nieuw Gebaar" name="New Gesture"/>
+	<menu label="Nieuwe Kleding" name="New Clothes">
+		<menu_item_call label="Nieuw Overhemd" name="New Shirt"/>
+		<menu_item_call label="Nieuwe Broek" name="New Pants"/>
+		<menu_item_call label="Nieuwe Schoenen" name="New Shoes"/>
+		<menu_item_call label="Nieuwe Sokken" name="New Socks"/>
+		<menu_item_call label="Nieuw Jas" name="New Jacket"/>
+		<menu_item_call label="Nieuw Rok" name="New Skirt"/>
+		<menu_item_call label="Nieuwe Handschoenen" name="New Gloves"/>
+		<menu_item_call label="Nieuw Hemd" name="New Undershirt"/>
+		<menu_item_call label="Nieuwe Onderbroek" name="New Underpants"/>
+		<menu_item_call label="Nieuwe Alpha" name="New Alpha"/>
+		<menu_item_call label="Nieuwe Tattoo" name="New Tattoo"/>
+	</menu>
+	<menu label="Nieuwe Lichaamsdelen" name="New Body Parts">
+		<menu_item_call label="Nieuwe Vorm" name="New Shape"/>
+		<menu_item_call label="Nieuwe Huid" name="New Skin"/>
+		<menu_item_call label="Nieuw Haar" name="New Hair"/>
+		<menu_item_call label="Nieuwe Ogen" name="New Eyes"/>
+	</menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/nl/menu_picks.xml b/indra/newview/skins/default/xui/nl/menu_picks.xml
new file mode 100644
index 0000000000..2e53dbda58
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/menu_picks.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Picks">
+	<menu_item_call label="Info" name="pick_info"/>
+	<menu_item_call label="Bewerken" name="pick_edit"/>
+	<menu_item_call label="Teleport" name="pick_teleport"/>
+	<menu_item_call label="Kaart" name="pick_map"/>
+	<menu_item_call label="Verweideren" name="pick_delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/nl/panel_group_roles.xml b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
index ffaaa8137a..507906c0d7 100644
--- a/indra/newview/skins/default/xui/nl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/nl/panel_group_roles.xml
@@ -1,92 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Leden &amp; Rollen" name="roles_tab">
-	<string name="default_needs_apply_text">
-		Er zijn niet toegepaste wijzigingen op de huidige sub-tab.
-	</string>
-	<string name="want_apply_text">
-		Wilt u deze wijzigingen toepassen?
-	</string>
-	<button label="?" name="help_button"/>
-	<panel name="members_header">
-		<text name="static">
-			Leden &amp; Rollen
-		</text>
-		<text name="static2">
-			Groepsleden krijgen Rollen met Mogelijkheden toegekend. Deze instellingen
-kunnen eenvoudig aangepast worden, zodat meer organisatie en flexibiliteit
-mogelijk is.
-		</text>
-	</panel>
-	<panel name="roles_header">
-		<text name="static">
-			Rollen
-		</text>
-		<text name="role_properties_modifiable">
-			Selecteer een Rol hieronder. U kunt zijn Naam, Omschrijving en
-Lid Titel wijzigen.
-		</text>
-		<text name="role_properties_not_modifiable">
-			Selecteer een Rol hieronder om zijn eigenschappen, Leden en
-toegestane Mogelijkheden te bekijken.
-		</text>
-		<text bottom_delta="-28" name="role_actions_modifiable">
-			U kunt ook Mogelijkheden aan de Rol toekennen.
-		</text>
-		<text name="role_actions_not_modifiable">
-			U kunt de toegekende Mogelijkheden bekijken, maar niet wijzigen.
-		</text>
-	</panel>
-	<panel name="actions_header">
-		<text name="static">
-			Mogelijkheden
-		</text>
-		<text name="static2">
-			U kunt de Omschrijving van een Mogelijkheid bekijken en welke Rollen en
-Leden de Mogelijkheid kunnen uitvoeren.
-		</text>
-	</panel>
+	<panel.string name="default_needs_apply_text">
+		Er zijn niet opgeslagen veranderingen op de huidige tab
+	</panel.string>
+	<panel.string name="want_apply_text">
+		Wilt u deze wijzigingen opslaan?
+	</panel.string>
 	<tab_container height="164" name="roles_tab_container">
-		<panel height="148" label="Leden" name="members_sub_tab" tool_tip="Leden">
-			<line_editor bottom="127" name="search_text"/>
-			<button label="Zoeken" name="search_button"/>
-			<button label="Alles Tonen" name="show_all_button"/>
-			<name_list  bottom_delta="-105" height="104" name="member_list">
-				<column label="Lid Naam" name="name"/>
-				<column label="Gedoneerde Tier" name="donated"/>
-				<column label="Laatste Login" name="online"/>
-			</name_list>
-			<button label="Nieuw Lid Uitnodigen..." name="member_invite"/>
-			<button label="Uitwerpen uit de Groep" name="member_eject"/>
-			<string name="help_text">
+		<panel height="148" label="LEDEN" name="members_sub_tab" tool_tip="Leden">
+			<panel.string name="help_text">
 				U kunt Rollen aan Leden toewijzen of van Leden afnemen. Selecteer meerdere Leden door de Ctrl toets ingedrukt te houden en op hun namen te klikken.
-			</string>
+			</panel.string>
+			<filter_editor label="Filter Leden" name="filter_input"/>
+			<name_list bottom_delta="-105" height="104" name="member_list">
+				<name_list.columns label="Lid Naam" name="name"/>
+				<name_list.columns label="Donaties" name="donated"/>
+				<name_list.columns label="Laatste Login" name="online"/>
+			</name_list>
+			<button label="Uitnodigen" name="member_invite"/>
+			<button label="Uitwerpen" name="member_eject"/>
 		</panel>
-		<panel height="148" label="Rollen" name="roles_sub_tab">
-			<line_editor bottom="127" name="search_text"/>
-			<button label="Zoeken" name="search_button"/>
-			<button label="Alles Tonen" name="show_all_button"/>
+		<panel height="148" label="ROLLEN" name="roles_sub_tab">
+			<panel.string name="help_text">
+				Rollen hebben een titel en een toegestane lijst met Vaardigheden die Leden kunnen uitvoeren. Leden kunnen tot 1 of meer Rollen behoren. Een groep kan tot 10 Rollen bevatten, inclusief de Iedereen en Eigenaren Rollen.
+			</panel.string>
+			<panel.string name="cant_delete_role">
+				De &apos;Iedereen&apos; en &apos;Eigenaren&apos; Rollen zijn speciaal en kunnen niet verwijderd worden.
+			</panel.string>
+			<panel.string name="power_folder_icon">
+				Inv_FolderClosed
+			</panel.string>
+			<filter_editor label="Filter Rollen" name="filter_input"/>
 			<scroll_list bottom_delta="-104" height="104" name="role_list">
-				<column label="Rol Naam" name="name"/>
-				<column label="Titel" name="title"/>
-				<column label="Leden" name="members"/>
+				<scroll_list.columns label="Rol" name="name"/>
+				<scroll_list.columns label="Titel" name="title"/>
+				<scroll_list.columns label="Leden" name="members"/>
 			</scroll_list>
-			<button label="Nieuwe Rol Maken..." name="role_create"/>
+			<button label="Nieuwe Rol..." name="role_create"/>
 			<button label="Rol Verwijderen" name="role_delete"/>
-			<string name="help_text">
-				Rollen hebben een titel en een toegestane lijst met Mogelijkheden die Leden kunnen uitvoeren. Leden kunnen tot 1 of meer Rollen behoren. Een groep kan tot 10 Rollen bevatten, inclusief de Iedereen en Eigenaren Rollen.
-			</string>
-			<string name="cant_delete_role">
-				De &apos;Iedereen&apos; en &apos;Eigenaren&apos; Rollen zijn speciaal en kunnen niet verwijderd worden.
-			</string>
 		</panel>
-		<panel height="148" label="Mogelijkheden" name="actions_sub_tab">
-			<line_editor bottom="127" name="search_text"/>
-			<button label="Zoeken" name="search_button"/>
-			<button label="Alles Tonen" name="show_all_button"/>
-			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecteer een Mogelijkheid om meer details te bekijken."/>
-			<string name="help_text">
+		<panel height="148" label="VAARDIGHEDEN" name="actions_sub_tab" tool_tip="Je kan een vaardigheid&apos;s beschrijving en welke Rollen en Leden kunnen uitvoeren van de Vaardigheid.">
+			<panel.string name="help_text">
 				Mogelijkheden stellen leden in staat om specifieke dingen in een groep te doen. Er is een brede variëteit aan Mogelijkheden.
-			</string>
+			</panel.string>
+			<filter_editor label="Filter Vaardigheden" name="filter_input"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Selecteer een Vaardigheid om meer details te bekijken"/>
 		</panel>
 	</tab_container>
 	<panel name="members_footer">
@@ -96,15 +54,12 @@ Leden de Mogelijkheid kunnen uitvoeren.
 		<text name="static2">
 			Toegestane Mogelijkheden
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="Kijk voor details van elke Toegestane Mogelijkheid in de Mogelijkheden tab."/>
+		<scroll_list name="member_allowed_actions" tool_tip="Voor details van elke Toegestane Vaardigheid in de Mogelijkheden tab"/>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
 			Naam
 		</text>
-		<text name="static2">
-			Omschrijving
-		</text>
 		<line_editor name="role_name">
 			Werknemers
 		</line_editor>
@@ -114,30 +69,33 @@ Leden de Mogelijkheid kunnen uitvoeren.
 		<line_editor name="role_title">
 			(wachten)
 		</line_editor>
+		<text name="static2">
+			Omschrijving
+		</text>
 		<text_editor name="role_description">
 			(wachten)
 		</text_editor>
 		<text name="static4">
-			Toegewezen Leden
+			Toegewezen Rollen
 		</text>
+		<check_box label="Leden Onthullen" name="role_visible_in_list" tool_tip="Bepaalt of leden van deze rol zichtbaar zijn in de Algemeen tab voor mensen buiten de groep."/>
 		<text name="static5" tool_tip="Een lijst met Mogelijkheden die de geselecteerd rol kan uitvoeren.">
 			Toegestane Mogelijkheden
 		</text>
-		<check_box label="Leden zijn zichtbaar" name="role_visible_in_list" tool_tip="Bepaalt of leden van deze rol zichtbaar zijn in de Algemeen tab voor mensen buiten de groep."/>
-		<scroll_list name="role_allowed_actions" tool_tip="Kijk voor details van elke Toegestane Mogelijkheid in de Mogelijkheden tab."/>
+		<scroll_list name="role_allowed_actions" tool_tip="For details of each allowed ability see the abilities tab"/>
 	</panel>
 	<panel name="actions_footer">
 		<text name="static">
-			Omschrijving
+			Vaardigheid omschrijving
 		</text>
 		<text_editor name="action_description">
 			Dit is de Mogelijkheid &apos;Werp Leden uit deze Groep&apos;. Alleen een Eigenaar kan een andere Eigenaar uitwerpen.
 		</text_editor>
 		<text name="static2">
-			Rollen met Mogelijkheid
+			Rollen met deze vaardigheid
 		</text>
 		<text name="static3">
-			Leden met Mogelijkheid
+			Leden met deze vaardigheid
 		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_login.xml b/indra/newview/skins/default/xui/nl/panel_login.xml
index 235e15e7fb..bcc888061f 100644
--- a/indra/newview/skins/default/xui/nl/panel_login.xml
+++ b/indra/newview/skins/default/xui/nl/panel_login.xml
@@ -6,34 +6,36 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=nl-NL
 	</panel.string>
-<panel name="login_widgets">
-	<text name="first_name_text">
-		Voornaam:
-	</text>
-	<text name="last_name_text">
-		Achternaam:
-	</text>
-	<text name="password_text">
-		Wachtwoord:
-	</text>
-	<text name="start_location_text">
-		Startlocatie:
-	</text>
-	<combo_box name="start_location_combo">
-		<combo_box.item name="MyHome" label="Mijn Thuis"/>
-		<combo_box.item name="MyLastLocation" label="Mijn Laatste Locatie"/>
-		<combo_box.item name="Typeregionname" label="&lt; Type regio naam &gt;"/>
-	</combo_box>
-	<check_box label="Onthoud wachtwoord" name="remember_check"/>
-	<button label="Inloggen" label_selected="Inloggen" name="connect_btn"/>
-	<text name="create_new_account_text">
-		Nieuw account maken
-	</text>
-	<text name="forgot_password_text">
-		Naam of wachtwoord vergeten?
-	</text>
-	<text name="channel_text">
-		[VERSION]
-	</text>
-</panel>
+	<panel name="login_widgets">
+		<text name="first_name_text">
+			Voornaam:
+		</text>
+		<line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] Voornaam"/>
+		<text name="last_name_text">
+			Achternaam:
+		</text>
+		<line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Achternaam"/>
+		<text name="password_text">
+			Paswoord:
+		</text>
+		<button label="Inloggen" label_selected="Inloggen" name="connect_btn"/>
+		<text name="start_location_text">
+			Start locatie:
+		</text>
+		<combo_box name="start_location_combo">
+			<combo_box.item label="Mijn Laatste Locatie" name="MyLastLocation"/>
+			<combo_box.item label="Mijn Thuis" name="MyHome"/>
+			<combo_box.item label="&lt;Tik regio naam&gt;" name="Typeregionname"/>
+		</combo_box>
+		<check_box label="Onthoud paswoord" name="remember_check"/>
+		<text name="create_new_account_text">
+			Maak een nieuwe account
+		</text>
+		<text name="forgot_password_text">
+			Naam of paswoord vergeten?
+		</text>
+		<text name="channel_text">
+			[VERSION]
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_main_inventory.xml b/indra/newview/skins/default/xui/nl/panel_main_inventory.xml
new file mode 100644
index 0000000000..c533cc20c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/nl/panel_main_inventory.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Dingen" name="main inventory panel">
+	<panel.string name="Title">
+		Dingen
+	</panel.string>
+	<filter_editor label="Filter" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Alle Voorwerpen" name="All Items"/>
+		<inventory_panel label="Recente Voorwerpen" name="Recent Items"/>
+	</tab_container>
+	<panel name="bottom_panel">
+		<button name="options_gear_btn" tool_tip="Toon extra opties"/>
+		<button name="add_btn" tool_tip="Voeg nieuw voorwerp toe"/>
+		<dnd_button name="trash_btn" tool_tip="Remove selected item"/>
+	</panel>
+	<menu_bar name="Inventory Menu">
+		<menu label="Bestand" name="File">
+			<menu_item_call label="Open" name="Open"/>
+			<menu label="Upload" name="upload">
+				<menu_item_call label="Plaatje (L$[COST])..." name="Upload Image"/>
+				<menu_item_call label="Geluid (L$[COST])..." name="Upload Sound"/>
+				<menu_item_call label="Animatie (L$[COST])..." name="Upload Animation"/>
+				<menu_item_call label="Bulk (L$[COST] per bestand)..." name="Bulk Upload"/>
+			</menu>
+			<menu_item_call label="Nieuw Venster" name="New Window"/>
+			<menu_item_call label="Toon Filters" name="Show Filters"/>
+			<menu_item_call label="Reset Filters" name="Reset Current"/>
+			<menu_item_call label="Sluit Alle Mappen" name="Close All Folders"/>
+			<menu_item_call label="Prullenbak Leegmaken" name="Empty Trash"/>
+			<menu_item_call label="Leeg Verloren En Gevonden" name="Empty Lost And Found"/>
+		</menu>
+		<menu label="Maken" name="Create">
+			<menu_item_call label="Nieuwe Map" name="New Folder"/>
+			<menu_item_call label="Nieuw Script" name="New Script"/>
+			<menu_item_call label="Nieuwe Notitie" name="New Note"/>
+			<menu_item_call label="Nieuw Gebaar" name="New Gesture"/>
+			<menu label="Nieuwe Kleding" name="New Clothes">
+				<menu_item_call label="Nieuw Overhemd" name="New Shirt"/>
+				<menu_item_call label="Nieuwe Broek" name="New Pants"/>
+				<menu_item_call label="Nieuwe Schoenen" name="New Shoes"/>
+				<menu_item_call label="Nieuwe Sokken" name="New Socks"/>
+				<menu_item_call label="Nieuwe Jas" name="New Jacket"/>
+				<menu_item_call label="Nieuwe Rok" name="New Skirt"/>
+				<menu_item_call label="Nieuwe Handschoenen" name="New Gloves"/>
+				<menu_item_call label="Nieuw Hemd" name="New Undershirt"/>
+				<menu_item_call label="Nieuwe Onderbroek" name="New Underpants"/>
+				<menu_item_call label="Nieuwe Alpha" name="New Alpha"/>
+				<menu_item_call label="Nieuwe Tattoo" name="New Tattoo"/>
+			</menu>
+			<menu label="Nieuwe Lichaamsdelen" name="New Body Parts">
+				<menu_item_call label="Nieuwe Vorm" name="New Shape"/>
+				<menu_item_call label="Nieuwe Huid" name="New Skin"/>
+				<menu_item_call label="Nieuw Haar" name="New Hair"/>
+				<menu_item_call label="Nieuwe Ogen" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Sorteer" name="Sort">
+			<menu_item_check label="Bij Naam" name="By Name"/>
+			<menu_item_check label="Bij Datum" name="By Date"/>
+			<menu_item_check label="Mappen Altijd Op Naam" name="Folders Always By Name"/>
+			<menu_item_check label="Syteemmappen Naar Boven" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/nl/panel_world_map.xml b/indra/newview/skins/default/xui/nl/panel_world_map.xml
index 11855b7fc1..d9a0b66fbc 100644
--- a/indra/newview/skins/default/xui/nl/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/nl/panel_world_map.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="world_map">
+	<panel.string name="Loading">
+		Laden...
+	</panel.string>
+	<panel.string name="InvalidLocation">
+		Ongeldige Locatie
+	</panel.string>
 	<panel.string name="world_map_north">
 		N
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index 0be5ec9e86..ae8d3b89dc 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -4,10 +4,21 @@
      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=nl-NL</string>
+	<string name="SUPPORT_SITE">
+		Second Life Ondersteunings Portaal
+	</string>
+	<string name="StartupDetectingHardware">
+		Detecteert hardware...
+	</string>
+	<string name="StartupLoading">
+		Laden
+	</string>
 	<string name="LoginInProgress">
 		Inloggen. Het kan lijken dat [APP_NAME] is vastgelopen. Wacht u alstublieft... .
 	</string>
+	<string name="LoginInProgressNoFrozen">
+		Inloggen...
+	</string>
 	<string name="LoginAuthenticating">
 		Authenticeren
 	</string>
@@ -26,11 +37,14 @@
 	<string name="LoginInitializingMultimedia">
 		Multimedia initialiseren...
 	</string>
+	<string name="LoginInitializingFonts">
+		Lettertypen laden...
+	</string>
 	<string name="LoginVerifyingCache">
-		Cache bestanden verifiëren (kan 60-90 seconden duren)...
+		Veriveren cache bestanden (kan 60-90 seconden duren)...
 	</string>
 	<string name="LoginProcessingResponse">
-		Antwoord verwerken...
+		Reactie Verwerken...
 	</string>
 	<string name="LoginInitializingWorld">
 		Wereld initialiseren...
@@ -56,9 +70,15 @@
 	<string name="LoginDownloadingClothing">
 		Kleding downloaden...
 	</string>
+	<string name="LoginFailedNoNetwork">
+		Netwerk Fout: Kon geen verbinding maken, kijk uw nerwerk connectie na alstublieft.
+	</string>
 	<string name="Quit">
 		Afsluiten
 	</string>
+	<string name="create_account_url">
+		http://join.secondlife.com/index.php?lang=nl-NL
+	</string>
 	<string name="AgentLostConnection">
 		Deze regio kan problemen ondervinden. Controleer alstublieft uw verbinding met het internet.
 	</string>
@@ -77,39 +97,9 @@
 	<string name="TooltipIsGroup">
 		(Groep)
 	</string>
-	<string name="TooltipFlagScript">
-		Script
-	</string>
-	<string name="TooltipFlagPhysics">
-		Fysiek
-	</string>
-	<string name="TooltipFlagTouch">
-		Aanraken
-	</string>
-	<string name="TooltipFlagL$">
-		L$
-	</string>
-	<string name="TooltipFlagDropInventory">
-		Deponeer inventaris
-	</string>
-	<string name="TooltipFlagPhantom">
-		Fantoom
-	</string>
-	<string name="TooltipFlagTemporary">
-		Tijdelijk
-	</string>
-	<string name="TooltipFlagRightClickMenu">
-		(Rechtsklikken voor menu)
-	</string>
-	<string name="TooltipFreeToCopy">
-		Vrij te kopiëren
-	</string>
 	<string name="TooltipForSaleL$">
 		Te koop: L$[AMOUNT]
 	</string>
-	<string name="TooltipForSaleMsg">
-		Te koop: [MESSAGE]
-	</string>
 	<string name="TooltipFlagGroupBuild">
 		Groep bouwen
 	</string>
@@ -137,6 +127,76 @@
 	<string name="TooltipMustSingleDrop">
 		Slechts een enkel item kan hier naartoe gesleept worden
 	</string>
+	<string name="TooltipHttpUrl">
+		Klik om deze web pagina te bekijken
+	</string>
+	<string name="TooltipSLURL">
+		Klik om deze locatie informatie te bekijken
+	</string>
+	<string name="TooltipAgentUrl">
+		Klik om deze inwoner zijn profiel te bekijken
+	</string>
+	<string name="TooltipGroupUrl">
+		Klik om deze groeps informatie te bekijken
+	</string>
+	<string name="TooltipEventUrl">
+		Klik om deze evenement informatie te bekijken
+	</string>
+	<string name="TooltipClassifiedUrl">
+		Klik om deze advertentie te bekijken
+	</string>
+	<string name="TooltipParcelUrl">
+		Klik om deze perceel informatie te bekijken
+	</string>
+	<string name="TooltipTeleportUrl">
+		Klik om  naar deze lokatie te teleporteren
+	</string>
+	<string name="TooltipObjectIMUrl">
+		Klik om deze object informatie te bekijken
+	</string>
+	<string name="TooltipMapUrl">
+		Klik om deze locatie op een map te bekijken
+	</string>
+	<string name="TooltipSLAPP">
+		Klik om het secondlife:// commando te starten
+	</string>
+	<string name="CurrentURL" value="HuidigeURL: [HuidigeURL]"/>
+	<string name="SLurlLabelTeleport">
+		Teleporteer naar
+	</string>
+	<string name="SLurlLabelShowOnMap">
+		Toon Map voor
+	</string>
+	<string name="BUTTON_CLOSE_DARWIN">
+		Sluiten (⌘W)
+	</string>
+	<string name="BUTTON_CLOSE_WIN">
+		Sluiten (Ctrl+W)
+	</string>
+	<string name="BUTTON_RESTORE">
+		Restore
+	</string>
+	<string name="BUTTON_MINIMIZE">
+		Minimaliseren
+	</string>
+	<string name="BUTTON_TEAR_OFF">
+		Afscheuren
+	</string>
+	<string name="BUTTON_DOCK">
+		Koppelen
+	</string>
+	<string name="BUTTON_UNDOCK">
+		Loskoppelen
+	</string>
+	<string name="BUTTON_HELP">
+		Toon Help
+	</string>
+	<string name="Searching">
+		Zoeken...
+	</string>
+	<string name="NoneFound">
+		Geen gevonden.
+	</string>
 	<string name="RetrievingData">
 		Ophalen...
 	</string>
@@ -191,8 +251,77 @@
 	<string name="AssetErrorUnknownStatus">
 		Onbekende status
 	</string>
-	<string name="AvatarEditingApparance">
-		(Uiterlijk bewerken)
+	<string name="texture">
+		textuur
+	</string>
+	<string name="sound">
+		geluid
+	</string>
+	<string name="calling card">
+		visitekaart
+	</string>
+	<string name="landmark">
+		landmarkering
+	</string>
+	<string name="legacy script">
+		legacy script
+	</string>
+	<string name="clothing">
+		kleding
+	</string>
+	<string name="object">
+		object
+	</string>
+	<string name="note card">
+		notecard
+	</string>
+	<string name="folder">
+		map
+	</string>
+	<string name="root">
+		root
+	</string>
+	<string name="lsl2 script">
+		LSL2 script
+	</string>
+	<string name="lsl bytecode">
+		LSL bytecode
+	</string>
+	<string name="tga texture">
+		tga textuur
+	</string>
+	<string name="body part">
+		lichaamsdeel
+	</string>
+	<string name="snapshot">
+		foto
+	</string>
+	<string name="lost and found">
+		Verloren en Gevonden
+	</string>
+	<string name="targa image">
+		targa plaatje
+	</string>
+	<string name="trash">
+		Prullenbak
+	</string>
+	<string name="jpeg image">
+		jpeg plaatje
+	</string>
+	<string name="animation">
+		animatie
+	</string>
+	<string name="gesture">
+		gebaar
+	</string>
+	<string name="simstate">
+		simstate
+	</string>
+	<string name="favorite">
+		favorieten
+	</string>
+	<string name="symbolic link">
+		link
 	</string>
 	<string name="AvatarAway">
 		Afwezig
@@ -414,7 +543,19 @@
 		Laden...
 	</string>
 	<string name="worldmap_offline">
-		Offline
+		Off line
+	</string>
+	<string name="worldmap_results_none_found">
+		Geen gevonden.
+	</string>
+	<string name="Ok">
+		OK
+	</string>
+	<string name="Premature end of file">
+		Vroegtijdig eind van bestand
+	</string>
+	<string name="ST_NO_JOINT">
+		Kan niet ROOT of JOINT vinden.
 	</string>
 	<string name="whisper">
 		fluistert:
@@ -422,6 +563,57 @@
 	<string name="shout">
 		schreeuwt:
 	</string>
+	<string name="ringing">
+		Verbinden met in-wereld voice chat...
+	</string>
+	<string name="connected">
+		Verbonden
+	</string>
+	<string name="unavailable">
+		Voice is niet beschikbaar op uw huidige locatie
+	</string>
+	<string name="hang_up">
+		Verbinding met in-wereld voicechat verbroken
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		&apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming verleend om te: [PERMISSIONS].
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		&apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming geweigerd om te: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Linden dollars (L$) van u wegnemen
+	</string>
+	<string name="ActOnControlInputs">
+		Acteren op uw bedieningsinvoer
+	</string>
+	<string name="RemapControlInputs">
+		Uw bedieningsinvoer herdefiniëren
+	</string>
+	<string name="AnimateYourAvatar">
+		Animeer uw avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Bevestig aan uw avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Eigendom vrijgeven en openbaar worden
+	</string>
+	<string name="LinkAndDelink">
+		Koppelen met en ontkoppelen van andere objecten
+	</string>
+	<string name="AddAndRemoveJoints">
+		Toevoegen en verwijderen koppelingen met andere objecten
+	</string>
+	<string name="ChangePermissions">
+		Wijzig zijn permissies
+	</string>
+	<string name="TrackYourCamera">
+		Volg uw camera
+	</string>
+	<string name="ControlYourCamera">
+		Bedien uw camera
+	</string>
 	<string name="SIM_ACCESS_PG">
 		PG
 	</string>
@@ -440,8 +632,6 @@
 	<string name="land_type_unknown">
 		(onbekend)
 	</string>
-	<string name="covenant_never_modified">Laatst gewijzigd: (nooit)</string>
-	<string name="covenant_modified">Laatst gewijzigd: </string>
 	<string name="all_files">
 		Alle bestanden
 	</string>
@@ -487,17 +677,739 @@
 	<string name="choose_the_directory">
 		Kies folder
 	</string>
+	<string name="AvatarSetNotAway">
+		Niet Afwezig Instellen
+	</string>
+	<string name="AvatarSetAway">
+		Afwezig Instellen
+	</string>
+	<string name="AvatarSetNotBusy">
+		Niet Bezig Instellen
+	</string>
+	<string name="AvatarSetBusy">
+		Bezig Instellen
+	</string>
+	<string name="shape">
+		Postuur
+	</string>
+	<string name="skin">
+		Huid
+	</string>
+	<string name="hair">
+		Haar
+	</string>
+	<string name="eyes">
+		Ogen
+	</string>
+	<string name="shirt">
+		Hemd
+	</string>
+	<string name="pants">
+		Broek
+	</string>
+	<string name="shoes">
+		Schoenen
+	</string>
+	<string name="socks">
+		Sokken
+	</string>
+	<string name="jacket">
+		Jas
+	</string>
+	<string name="gloves">
+		Handschoenen
+	</string>
+	<string name="undershirt">
+		onderhemd
+	</string>
+	<string name="underpants">
+		Onderbroek
+	</string>
+	<string name="skirt">
+		Rok
+	</string>
+	<string name="alpha">
+		Alpha
+	</string>
+	<string name="tattoo">
+		Tattoo
+	</string>
+	<string name="invalid">
+		ongeldig
+	</string>
+	<string name="next">
+		Volgende
+	</string>
+	<string name="ok">
+		OK
+	</string>
+	<string name="GroupNotifyGroupNotice">
+		Groep Mededeling
+	</string>
+	<string name="GroupNotifyGroupNotices">
+		Groep Mededelingen
+	</string>
+	<string name="GroupNotifySentBy">
+		Verzonden Door:
+	</string>
+	<string name="GroupNotifyAttached">
+		Bijgevoegt:
+	</string>
+	<string name="GroupNotifyViewPastNotices">
+		Bekijk alle mededelingen en bijlages van verzonden Mededelingen in het verleden
+	</string>
+	<string name="GroupNotifyOpenAttachment">
+		Open Bijlage
+	</string>
+	<string name="GroupNotifySaveAttachment">
+		Sla Bijlage Op
+	</string>
+	<string name="TeleportOffer">
+		Teleporteer Aanbieding
+	</string>
+	<string name="StartUpNotification">
+		[%d] Nieuwe mededelingen aangekomen terwijl u weg was ...
+	</string>
+	<string name="StartUpNotifications">
+		[%d] Nieuwe mededelingen aangekomen terwijl u weg was ...
+	</string>
+	<string name="OverflowInfoChannelString">
+		U heeft [%d] meer mededelingen
+	</string>
+	<string name="BodyPartsRightArm">
+		Rechter Arm
+	</string>
+	<string name="BodyPartsHead">
+		Hoofd
+	</string>
+	<string name="BodyPartsLeftArm">
+		Linker Arm
+	</string>
+	<string name="BodyPartsLeftLeg">
+		Linker Been
+	</string>
+	<string name="BodyPartsTorso">
+		Torso
+	</string>
+	<string name="BodyPartsRightLeg">
+		Rechter Been
+	</string>
+	<string name="GraphicsQualityLow">
+		Laag
+	</string>
+	<string name="GraphicsQualityMid">
+		Middel
+	</string>
+	<string name="GraphicsQualityHigh">
+		Hoog
+	</string>
+	<string name="LeaveMouselook">
+		Druk op ESC om terug te keren naar Wereld Zicht
+	</string>
+	<string name="InventoryNoMatchingItems">
+		Geen overeenkomende objecten gevonden in de voorraad.
+	</string>
+	<string name="InventoryNoTexture">
+		Je hebt geen kopie van deze texture in je inventaris
+	</string>
+	<string name="no_transfer" value="(no transfer)"/>
+	<string name="no_modify" value="(no modify)"/>
+	<string name="no_copy" value="(no copy)"/>
+	<string name="worn" value="(worn)"/>
+	<string name="link" value="(link)"/>
+	<string name="broken_link" value="(broken_link)&quot;"/>
+	<string name="LoadingContents">
+		Loading contents...
+	</string>
+	<string name="NoContents">
+		No contents
+	</string>
+	<string name="WornOnAttachmentPoint" value="(worn on [ATTACHMENT_POINT])"/>
+	<string name="Chat" value="Chat :"/>
+	<string name="Sound" value="Geluid :"/>
+	<string name="Wait" value="--- Wachten :"/>
+	<string name="AnimFlagStop" value="Stop Animatie :"/>
+	<string name="AnimFlagStart" value="Start Animatie :"/>
+	<string name="Wave" value="Wave"/>
+	<string name="HelloAvatar" value="Hallo, avatar!"/>
+	<string name="ViewAllGestures" value="Bekijk alles &gt;"/>
+	<string name="Animations" value="Animaties,"/>
+	<string name="Calling Cards" value="Calling Cards,"/>
+	<string name="Clothing" value="Kleding,"/>
+	<string name="Gestures" value="Gestures,"/>
+	<string name="Landmarks" value="Landmarks,"/>
+	<string name="Notecards" value="Notecards,"/>
+	<string name="Objects" value="Objecten,"/>
+	<string name="Scripts" value="Scripts,"/>
+	<string name="Sounds" value="Geluiden,"/>
+	<string name="Textures" value="Textures,"/>
+	<string name="Snapshots" value="Snapshots,"/>
+	<string name="No Filters" value="Nee"/>
+	<string name="Since Logoff" value="- Sinds Afmelden"/>
+	<string name="InvFolder My Inventory">
+		Mijn Inventaris
+	</string>
+	<string name="InvFolder My Favorites">
+		Mijn Favorieten
+	</string>
+	<string name="InvFolder Library">
+		Bibliotheek
+	</string>
+	<string name="InvFolder Textures">
+		Textures
+	</string>
+	<string name="InvFolder Sounds">
+		Geluiden
+	</string>
+	<string name="InvFolder Calling Cards">
+		Calling Cards
+	</string>
+	<string name="InvFolder Landmarks">
+		Landmarks
+	</string>
+	<string name="InvFolder Scripts">
+		Scripts
+	</string>
+	<string name="InvFolder Clothing">
+		Kleding
+	</string>
+	<string name="InvFolder Objects">
+		Objecten
+	</string>
+	<string name="InvFolder Notecards">
+		Notecards
+	</string>
+	<string name="InvFolder New Folder">
+		Nieuwe Map
+	</string>
+	<string name="InvFolder Inventory">
+		Inventaris
+	</string>
+	<string name="InvFolder Uncompressed Images">
+		Ongecomprimeerde Afbeeldingen
+	</string>
+	<string name="InvFolder Body Parts">
+		Lichaams Delen
+	</string>
+	<string name="InvFolder Trash">
+		Afval
+	</string>
+	<string name="InvFolder Photo Album">
+		Foto Album
+	</string>
+	<string name="InvFolder Lost And Found">
+		Verloren en Gevonden
+	</string>
+	<string name="InvFolder Uncompressed Sounds">
+		Ongecomprimeerde Geluiden
+	</string>
+	<string name="InvFolder Animations">
+		Animaties
+	</string>
+	<string name="InvFolder Gestures">
+		Gebaren
+	</string>
+	<string name="InvFolder favorite">
+		Favoriten
+	</string>
+	<string name="InvFolder Current Outfit">
+		Huidige Uitrusting
+	</string>
+	<string name="InvFolder My Outfits">
+		Mijn Uitrustingen
+	</string>
+	<string name="InvFolder Friends">
+		Vrienden
+	</string>
+	<string name="InvFolder All">
+		Alles
+	</string>
+	<string name="Buy">
+		Koop
+	</string>
+	<string name="BuyforL$">
+		Koop voor L$
+	</string>
+	<string name="Stone">
+		Steen
+	</string>
+	<string name="Metal">
+		Metaal
+	</string>
+	<string name="Glass">
+		Glas
+	</string>
+	<string name="Wood">
+		Hout
+	</string>
+	<string name="Flesh">
+		Vlees
+	</string>
+	<string name="Plastic">
+		Plastic
+	</string>
+	<string name="Rubber">
+		Rubber
+	</string>
+	<string name="Light">
+		Licht
+	</string>
+	<string name="KBShift">
+		Shift
+	</string>
+	<string name="KBCtrl">
+		Ctrl
+	</string>
+	<string name="Chest">
+		Borstkas
+	</string>
+	<string name="Skull">
+		Schedel
+	</string>
+	<string name="Left Shoulder">
+		Linker Schouder
+	</string>
+	<string name="Right Shoulder">
+		Rechter Schouder
+	</string>
+	<string name="Left Hand">
+		Linker Hand
+	</string>
+	<string name="Right Hand">
+		Rechter Hand
+	</string>
+	<string name="Left Foot">
+		Linker Voet
+	</string>
+	<string name="Right Foot">
+		Rechter Voet
+	</string>
+	<string name="Spine">
+		Ruggegraat
+	</string>
+	<string name="Pelvis">
+		Bekken
+	</string>
+	<string name="Mouth">
+		Mond
+	</string>
+	<string name="Chin">
+		Kin
+	</string>
+	<string name="Left Ear">
+		Linker Oor
+	</string>
+	<string name="Right Ear">
+		Rechter Oor
+	</string>
+	<string name="Left Eyeball">
+		Linker Oogbal
+	</string>
+	<string name="Right Eyeball">
+		Rechter Oogbal
+	</string>
+	<string name="Nose">
+		Neus
+	</string>
+	<string name="R Upper Arm">
+		R Boven Arm
+	</string>
+	<string name="R Forearm">
+		R Onder Arm
+	</string>
+	<string name="L Upper Arm">
+		L Boven Arm
+	</string>
+	<string name="L Forearm">
+		L Onder Arm
+	</string>
+	<string name="Right Hip">
+		Rechter Heup
+	</string>
+	<string name="R Upper Leg">
+		R Boven Been
+	</string>
+	<string name="R Lower Leg">
+		R Onder Been
+	</string>
+	<string name="Left Hip">
+		Linker Heub
+	</string>
+	<string name="L Upper Leg">
+		L Boven Been
+	</string>
+	<string name="L Lower Leg">
+		L Onder Been
+	</string>
+	<string name="Stomach">
+		Maag
+	</string>
+	<string name="Left Pec">
+		Left Pec
+	</string>
+	<string name="Right Pec">
+		Right Pec
+	</string>
+	<string name="YearsMonthsOld">
+		[AGEYEARS] [AGEMONTHS] oud
+	</string>
+	<string name="YearsOld">
+		[AGEYEARS] oud
+	</string>
+	<string name="MonthsOld">
+		[AGEMONTHS] oud
+	</string>
+	<string name="WeeksOld">
+		[AGEWEEKS] oud
+	</string>
+	<string name="DaysOld">
+		[AGEDAYS] oud
+	</string>
+	<string name="TodayOld">
+		Vandaag toegetreden
+	</string>
+	<string name="AgeYearsA">
+		[COUNT] jaar
+	</string>
+	<string name="AgeYearsB">
+		[COUNT] jaar
+	</string>
+	<string name="AgeYearsC">
+		[COUNT] jaar
+	</string>
+	<string name="AgeMonthsA">
+		[COUNT] maand
+	</string>
+	<string name="AgeMonthsB">
+		[COUNT] maanden
+	</string>
+	<string name="AgeMonthsC">
+		[COUNT] maanden
+	</string>
+	<string name="AgeWeeksA">
+		[COUNT] week
+	</string>
+	<string name="AgeWeeksB">
+		[COUNT] weken
+	</string>
+	<string name="AgeWeeksC">
+		[COUNT] weken
+	</string>
+	<string name="AgeDaysA">
+		[COUNT] dag
+	</string>
+	<string name="AgeDaysB">
+		[COUNT] dagen
+	</string>
+	<string name="AgeDaysC">
+		[COUNT] dagen
+	</string>
+	<string name="GroupMembersA">
+		[COUNT] lid
+	</string>
+	<string name="GroupMembersB">
+		[COUNT] leden
+	</string>
+	<string name="GroupMembersC">
+		[COUNT] leden
+	</string>
+	<string name="AcctTypeResident">
+		bewoner
+	</string>
+	<string name="AcctTypeTrial">
+		Trial
+	</string>
+	<string name="AcctTypeCharterMember">
+		Charter Member
+	</string>
+	<string name="AcctTypeEmployee">
+		Linden Lab Werknemer
+	</string>
+	<string name="PaymentInfoUsed">
+		Betalings info gebruikt
+	</string>
+	<string name="PaymentInfoOnFile">
+		Betalings info op bestand
+	</string>
+	<string name="NoPaymentInfoOnFile">
+		Geen betalings info op bestand
+	</string>
+	<string name="AgeVerified">
+		Leeftijd gecontroleerd
+	</string>
+	<string name="NotAgeVerified">
+		Niet leeftijd gecontroleerd
+	</string>
+	<string name="Center 2">
+		Centrum 2
+	</string>
+	<string name="Top Right">
+		Rechts Boven
+	</string>
+	<string name="Top">
+		Boven
+	</string>
+	<string name="Top Left">
+		Links Boven
+	</string>
+	<string name="Center">
+		Centrum
+	</string>
+	<string name="Bottom Left">
+		Links beneden
+	</string>
+	<string name="Bottom">
+		Beneden
+	</string>
+	<string name="Bottom Right">
+		Rechts beneden
+	</string>
+	<string name="CompileQueueDownloadedCompiling">
+		Dedownload, nu samenstellen
+	</string>
+	<string name="CompileQueueScriptNotFound">
+		Script niet gevonden op server.
+	</string>
+	<string name="CompileQueueProblemDownloading">
+		Problem downloading
+	</string>
+	<string name="CompileQueueInsufficientPermDownload">
+		Onvoldoende rechten om een script te downloaden.
+	</string>
+	<string name="CompileQueueInsufficientPermFor">
+		Onvoldoende rechten voor
+	</string>
+	<string name="CompileQueueUnknownFailure">
+		Onbekende fout te downloaden
+	</string>
+	<string name="CompileQueueTitle">
+		Hercompilatie vooruitgang
+	</string>
+	<string name="CompileQueueStart">
+		Hercompilatie
+	</string>
+	<string name="ResetQueueTitle">
+		Reset Vooruitgang
+	</string>
+	<string name="ResetQueueStart">
+		reset
+	</string>
+	<string name="RunQueueTitle">
+		Set Running Progress
+	</string>
+	<string name="RunQueueStart">
+		set running
+	</string>
+	<string name="NotRunQueueTitle">
+		Set Not Running Progress
+	</string>
+	<string name="NotRunQueueStart">
+		set not running
+	</string>
+	<string name="CompileSuccessful">
+		Compileren succesvol!
+	</string>
+	<string name="CompileSuccessfulSaving">
+		Compileren succesvol, opslaan...
+	</string>
+	<string name="SaveComplete">
+		Opslaan gereed.
+	</string>
+	<string name="ObjectOutOfRange">
+		Script (object buiten het bereik)
+	</string>
+	<string name="GodToolsObjectOwnedBy">
+		Object [OBJECT] eigendom van [OWNER]
+	</string>
+	<string name="GroupsNone">
+		geen
+	</string>
+	<string name="Group" value="(group)"/>
+	<string name="Unknown">
+		(Unknown)
+	</string>
+	<string name="SummaryForTheWeek" value="Samenvatting voor deze week, vanaf"/>
+	<string name="NextStipendDay" value="The next stipend day is"/>
+	<string name="GroupIndividualShare" value="Groep       Individueel Aandeel"/>
+	<string name="Balance">
+		Banksaldo
+	</string>
+	<string name="Credits">
+		Credits
+	</string>
+	<string name="Debits">
+		Debiteert
+	</string>
+	<string name="Total">
+		Totaal
+	</string>
+	<string name="NoGroupDataFound">
+		Geen groep gegevens gevonden voor groep
+	</string>
+	<string name="IMParentEstate">
+		parent estate
+	</string>
+	<string name="IMMainland">
+		mainland
+	</string>
+	<string name="IMTeen">
+		tiener
+	</string>
+	<string name="RegionInfoError">
+		fout
+	</string>
+	<string name="RegionInfoAllEstatesOwnedBy">
+		all estates owned by [OWNER]
+	</string>
+	<string name="RegionInfoAllEstatesYouOwn">
+		all estates that you own
+	</string>
+	<string name="RegionInfoAllEstatesYouManage">
+		all estates that you manage for [OWNER]
+	</string>
+	<string name="RegionInfoAllowedResidents">
+		Toegestane bewoners: ([ALLOWEDAGENTS], max [MAXACCESS])
+	</string>
+	<string name="RegionInfoAllowedGroups">
+		Toegestane groepen: ([ALLOWEDGROUPS], max [MAXACCESS])
+	</string>
+	<string name="CursorPos">
+		Lijn [LINE], Column [COLUMN]
+	</string>
+	<string name="PanelDirCountFound">
+		[COUNT] gevonden
+	</string>
+	<string name="PanelContentsNewScript">
+		Nieuw Script
+	</string>
+	<string name="MuteByName">
+		(by name)
+	</string>
+	<string name="MuteAgent">
+		(resident)
+	</string>
+	<string name="MuteObject">
+		(object)
+	</string>
+	<string name="MuteGroup">
+		(group)
+	</string>
+	<string name="RegionNoCovenant">
+		There is no Covenant provided for this Estate.
+	</string>
+	<string name="RegionNoCovenantOtherOwner">
+		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
+	</string>
+	<string name="covenant_last_modified">
+		Laatst bewerkt:
+	</string>
+	<string name="none_text" value="(none)"/>
+	<string name="never_text" value="(never)"/>
+	<string name="GroupOwned">
+		Groep Eigendom
+	</string>
+	<string name="Public">
+		Openbaar
+	</string>
+	<string name="ClassifiedClicksTxt">
+		Klikken: [TELEPORT] teleport, [MAP] map, [PROFILE] profiel
+	</string>
+	<string name="ClassifiedUpdateAfterPublish">
+		(zal bijwerken na publiceren)
+	</string>
+	<string name="MultiPreviewTitle">
+		Preview
+	</string>
+	<string name="MultiPropertiesTitle">
+		Eigenschappen
+	</string>
+	<string name="InvOfferAnObjectNamed">
+		Een object genaamd
+	</string>
+	<string name="InvOfferOwnedByGroup">
+		Eigendom van groep
+	</string>
+	<string name="InvOfferOwnedByUnknownGroup">
+		Eigendom van een onbekende groep
+	</string>
+	<string name="InvOfferOwnedBy">
+		Eigendom van
+	</string>
+	<string name="InvOfferOwnedByUnknownUser">
+		Eigendom van onbekende gebruiker
+	</string>
+	<string name="InvOfferGaveYou">
+		gaf je
+	</string>
+	<string name="InvOfferYouDecline">
+		You decline
+	</string>
+	<string name="InvOfferFrom">
+		van
+	</string>
+	<string name="GroupMoneyTotal">
+		Totaal
+	</string>
+	<string name="GroupMoneyBought">
+		kocht
+	</string>
+	<string name="GroupMoneyPaidYou">
+		betaald u
+	</string>
+	<string name="GroupMoneyPaidInto">
+		gestort
+	</string>
+	<string name="GroupMoneyBoughtPassTo">
+		bought pass to
+	</string>
+	<string name="GroupMoneyPaidFeeForEvent">
+		betaalde vergoeding voor evenement
+	</string>
+	<string name="GroupMoneyPaidPrizeForEvent">
+		betaalde prijs voor evenement
+	</string>
+	<string name="GroupMoneyBalance">
+		Banksaldo
+	</string>
+	<string name="GroupMoneyCredits">
+		Credits
+	</string>
+	<string name="GroupMoneyDebits">
+		Debiteert
+	</string>
+	<string name="ViewerObjectContents">
+		Inhoud
+	</string>
+	<string name="AcquiredItems">
+		Verworven objecten
+	</string>
+	<string name="Cancel">
+		Annuleren
+	</string>
+	<string name="UploadingCosts">
+		Uploading [%s] kosten
+	</string>
+	<string name="UnknownFileExtension">
+		Onbekende extensie [.%s]
+Verwacht .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+	</string>
+	<string name="AddLandmarkNavBarMenu">
+		Voeg Landmark toe...
+	</string>
+	<string name="EditLandmarkNavBarMenu">
+		Bewerk Landmark...
+	</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+
@@ -508,82 +1420,1790 @@
 	<string name="accel-win-shift">
 		Shift+
 	</string>
-	<string name="GraphicsQualityLow">
-		Laag
+	<string name="FileSaved">
+		Bestand Opgeslagen
 	</string>
-	<string name="GraphicsQualityMid">
-		Middel
+	<string name="Receiving">
+		Ontvangen
 	</string>
-	<string name="GraphicsQualityHigh">
+	<string name="AM">
+		AM
+	</string>
+	<string name="PM">
+		PM
+	</string>
+	<string name="PST">
+		PST
+	</string>
+	<string name="PDT">
+		PDT
+	</string>
+	<string name="Forward">
+		Vooruit
+	</string>
+	<string name="Left">
+		Links
+	</string>
+	<string name="Right">
+		Rechts
+	</string>
+	<string name="Back">
+		Achteruit
+	</string>
+	<string name="North">
+		Noord
+	</string>
+	<string name="South">
+		Zuid
+	</string>
+	<string name="West">
+		West
+	</string>
+	<string name="East">
+		Oost
+	</string>
+	<string name="Up">
+		Omhoog
+	</string>
+	<string name="Down">
+		Omlaag
+	</string>
+	<string name="Any Category">
+		Elke Categorie
+	</string>
+	<string name="Shopping">
+		Boodschappen
+	</string>
+	<string name="Land Rental">
+		Land Verhuur
+	</string>
+	<string name="Property Rental">
+		Verhuur van onroerend goed
+	</string>
+	<string name="Special Attraction">
+		Speciale Attractie
+	</string>
+	<string name="New Products">
+		Nieuwe Producten
+	</string>
+	<string name="Employment">
+		Employment
+	</string>
+	<string name="Wanted">
+		Gezocht
+	</string>
+	<string name="Service">
+		Service
+	</string>
+	<string name="Personal">
+		Personal
+	</string>
+	<string name="None">
+		Geen
+	</string>
+	<string name="Linden Location">
+		Linden locatie
+	</string>
+	<string name="Adult">
+		Adult
+	</string>
+	<string name="Arts&amp;Culture">
+		Kunst &amp; Cultuur
+	</string>
+	<string name="Business">
+		Zakelijk
+	</string>
+	<string name="Educational">
+		Educatief
+	</string>
+	<string name="Gaming">
+		Spelen
+	</string>
+	<string name="Hangout">
+		Ontmoetingsplaats
+	</string>
+	<string name="Newcomer Friendly">
+		Nieuwkomervriendelijk
+	</string>
+	<string name="Parks&amp;Nature">
+		Parken &amp; natuur
+	</string>
+	<string name="Residential">
+		Woongebied
+	</string>
+	<string name="Stage">
+		Stage
+	</string>
+	<string name="Other">
+		Anders
+	</string>
+	<string name="Any">
+		Any
+	</string>
+	<string name="You">
+		Jij
+	</string>
+	<string name="Multiple Media">
+		Meerdere Media
+	</string>
+	<string name="Play Media">
+		Play/Pause Media
+	</string>
+	<string name="MBCmdLineError">
+		An error was found parsing the command line.
+Please see: http://wiki.secondlife.com/wiki/Client_parameters
+Error:
+	</string>
+	<string name="MBCmdLineUsg">
+		[APP_NAME] Command line usage:
+	</string>
+	<string name="MBUnableToAccessFile">
+		[APP_NAME] is unable to access a file that it needs.
+
+This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
+If this message persists, restart your computer and try again.
+If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
+	</string>
+	<string name="MBFatalError">
+		Fatal Error
+	</string>
+	<string name="MBRequiresAltiVec">
+		[APP_NAME] requires a processor with AltiVec (G4 or later).
+	</string>
+	<string name="MBAlreadyRunning">
+		[APP_NAME] is already running.
+Check your task bar for a minimized copy of the program.
+If this message persists, restart your computer.
+	</string>
+	<string name="MBFrozenCrashed">
+		[APP_NAME] appears to have frozen or crashed on the previous run.
+Would you like to send a crash report?
+	</string>
+	<string name="MBAlert">
+		Alert
+	</string>
+	<string name="MBNoDirectX">
+		[APP_NAME] is unable to detect DirectX 9.0b or greater.
+[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
+
+Do you wish to continue?
+	</string>
+	<string name="MBWarning">
+		Warning
+	</string>
+	<string name="MBNoAutoUpdate">
+		Automatic updating is not yet implemented for Linux.
+Please download the latest version from www.secondlife.com.
+	</string>
+	<string name="MBRegClassFailed">
+		RegisterClass failed
+	</string>
+	<string name="MBError">
+		Error
+	</string>
+	<string name="MBFullScreenErr">
+		Unable to run fullscreen at [WIDTH] x [HEIGHT].
+Running in window.
+	</string>
+	<string name="MBDestroyWinFailed">
+		Shutdown Error while destroying window (DestroyWindow() failed)
+	</string>
+	<string name="MBShutdownErr">
+		Shutdown Error
+	</string>
+	<string name="MBDevContextErr">
+		Can&apos;t make GL device context
+	</string>
+	<string name="MBPixelFmtErr">
+		Can&apos;t find suitable pixel format
+	</string>
+	<string name="MBPixelFmtDescErr">
+		Can&apos;t get pixel format description
+	</string>
+	<string name="MBTrueColorWindow">
+		[APP_NAME] requires True Color (32-bit) to run.
+Please go to your computer&apos;s display settings and set the color mode to 32-bit.
+	</string>
+	<string name="MBAlpha">
+		[APP_NAME] is unable to run because it can&apos;t get an 8 bit alpha channel.  Usually this is due to video card driver issues.
+Please make sure you have the latest video card drivers installed.
+Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
+If you continue to receive this message, contact the [SUPPORT_SITE].
+	</string>
+	<string name="MBPixelFmtSetErr">
+		Can&apos;t set pixel format
+	</string>
+	<string name="MBGLContextErr">
+		Can&apos;t create GL rendering context
+	</string>
+	<string name="MBGLContextActErr">
+		Can&apos;t activate GL rendering context
+	</string>
+	<string name="MBVideoDrvErr">
+		[APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
+
+If you continue to receive this message, contact the [SUPPORT_SITE].
+	</string>
+	<string name="5 O&apos;Clock Shadow">
+		Stoppels
+	</string>
+	<string name="All White">
+		Alles Wit
+	</string>
+	<string name="Anime Eyes">
+		Ogen Animeren
+	</string>
+	<string name="Arced">
+		Gebogen
+	</string>
+	<string name="Arm Length">
+		Arm Lengte
+	</string>
+	<string name="Attached">
+		Bijgevoegt
+	</string>
+	<string name="Attached Earlobes">
+		Bijgevoegde Oorlellen
+	</string>
+	<string name="Back Bangs">
+		Achterkant Pony
+	</string>
+	<string name="Back Bangs Down">
+		Achterkant Pony Neer
+	</string>
+	<string name="Back Bangs Up">
+		Achterkant Pony Omhoog
+	</string>
+	<string name="Back Fringe">
+		Achterkant Franje
+	</string>
+	<string name="Back Hair">
+		Achterkant Haar
+	</string>
+	<string name="Back Hair Down">
+		Achterkant Haar Neer
+	</string>
+	<string name="Back Hair Up">
+		Achterkant Haar Omhoog
+	</string>
+	<string name="Baggy">
+		Oogwallen
+	</string>
+	<string name="Bangs">
+		Pony
+	</string>
+	<string name="Bangs Down">
+		Pony Neer
+	</string>
+	<string name="Bangs Up">
+		Pony Omhoog
+	</string>
+	<string name="Beady Eyes">
+		Kraaloogjes
+	</string>
+	<string name="Belly Size">
+		Buik Grootte
+	</string>
+	<string name="Big">
+		Groot
+	</string>
+	<string name="Big Butt">
+		Grote Kont
+	</string>
+	<string name="Big Eyeball">
+		Grote Oogbol
+	</string>
+	<string name="Big Hair Back">
+		Haar Volume Achter
+	</string>
+	<string name="Big Hair Front">
+		Haar Volume Voor
+	</string>
+	<string name="Big Hair Top">
+		Haar Volume Boven
+	</string>
+	<string name="Big Head">
+		Groot Hoofd
+	</string>
+	<string name="Big Pectorals">
+		Groote Borstspieren
+	</string>
+	<string name="Big Spikes">
+		Grote Stekels
+	</string>
+	<string name="Black">
+		Zwart
+	</string>
+	<string name="Blonde">
+		Blond
+	</string>
+	<string name="Blonde Hair">
+		Blond Haar
+	</string>
+	<string name="Blush">
+		Blozen
+	</string>
+	<string name="Blush Color">
+		Bloos Kleur
+	</string>
+	<string name="Blush Opacity">
+		Bloos Opaciteit
+	</string>
+	<string name="Body Definition">
+		Lichaam Definitie
+	</string>
+	<string name="Body Fat">
+		Lichaam vet
+	</string>
+	<string name="Body Freckles">
+		Lichaam Sproeten
+	</string>
+	<string name="Body Thick">
+		Lichaam Dik
+	</string>
+	<string name="Body Thickness">
+		Lichaam Dikte
+	</string>
+	<string name="Body Thin">
+		Lichaam Dun
+	</string>
+	<string name="Bow Legged">
+		Boog Benen
+	</string>
+	<string name="Breast Buoyancy">
+		Borst Drijfvermogen
+	</string>
+	<string name="Breast Cleavage">
+		Borst Splijting
+	</string>
+	<string name="Breast Size">
+		Borst Grootte
+	</string>
+	<string name="Bridge Width">
+		Brug Breedte
+	</string>
+	<string name="Broad">
+		Breed
+	</string>
+	<string name="Brow Size">
+		Wenkbrauw Grootte
+	</string>
+	<string name="Bug Eyes">
+		Insect Ogen
+	</string>
+	<string name="Bugged Eyes">
+		Insect Ogen
+	</string>
+	<string name="Bulbous">
+		Bolle
+	</string>
+	<string name="Bulbous Nose">
+		Bolle Neus
+	</string>
+	<string name="Bushy Eyebrows">
+		Borstelige Wenkbrauwen
+	</string>
+	<string name="Bushy Hair">
+		Borstelig Haar
+	</string>
+	<string name="Butt Size">
+		Kont Grootte
+	</string>
+	<string name="bustle skirt">
+		Bustle Skirt
+	</string>
+	<string name="no bustle">
+		No Bustle
+	</string>
+	<string name="more bustle">
+		More Bustle
+	</string>
+	<string name="Chaplin">
+		Smalle Snor
+	</string>
+	<string name="Cheek Bones">
+		Jukbeenderen
+	</string>
+	<string name="Chest Size">
+		Borst Grootte
+	</string>
+	<string name="Chin Angle">
+		Kin Hoek
+	</string>
+	<string name="Chin Cleft">
+		Gespleten Kin
+	</string>
+	<string name="Chin Curtains">
+		Kin Gordijnen
+	</string>
+	<string name="Chin Depth">
+		Kin Diepte
+	</string>
+	<string name="Chin Heavy">
+		Kin Zware
+	</string>
+	<string name="Chin In">
+		Kin In
+	</string>
+	<string name="Chin Out">
+		Kin uit
+	</string>
+	<string name="Chin-Neck">
+		Kin-Nek
+	</string>
+	<string name="Clear">
+		Opschonen
+	</string>
+	<string name="Cleft">
+		Gespleten
+	</string>
+	<string name="Close Set Eyes">
+		Close Set Eyes
+	</string>
+	<string name="Closed">
+		Gesloten
+	</string>
+	<string name="Closed Back">
+		Gesloten Achterkant
+	</string>
+	<string name="Closed Front">
+		Gesloten Voorkant
+	</string>
+	<string name="Closed Left">
+		Gesloten Links
+	</string>
+	<string name="Closed Right">
+		Gesloten Rechts
+	</string>
+	<string name="Coin Purse">
+		Verminder Grootte
+	</string>
+	<string name="Collar Back">
+		Kraag Achterkant
+	</string>
+	<string name="Collar Front">
+		Kraag Voorkant
+	</string>
+	<string name="Corner Down">
+		Hoek Omlaag
+	</string>
+	<string name="Corner Normal">
+		Hoek Normaal
+	</string>
+	<string name="Corner Up">
+		Hoek Omhoog
+	</string>
+	<string name="Creased">
+		Gevouwen
+	</string>
+	<string name="Crooked Nose">
+		Kromte Neus
+	</string>
+	<string name="Cropped Hair">
+		Bijgesneden Haar
+	</string>
+	<string name="Cuff Flare">
+		Cuff Flare
+	</string>
+	<string name="Dark">
+		Donker
+	</string>
+	<string name="Dark Green">
+		Donker Groen
+	</string>
+	<string name="Darker">
+		Donkerder
+	</string>
+	<string name="Deep">
+		Diep
+	</string>
+	<string name="Default Heels">
+		Standaard Hielen
+	</string>
+	<string name="Default Toe">
+		Standaard Teen
+	</string>
+	<string name="Dense">
+		Dicht
+	</string>
+	<string name="Dense hair">
+		Dicht haar
+	</string>
+	<string name="Double Chin">
+		Dubbele Kin
+	</string>
+	<string name="Downturned">
+		Downturned
+	</string>
+	<string name="Duffle Bag">
+		Vergroot Grootte
+	</string>
+	<string name="Ear Angle">
+		Oor Hoek
+	</string>
+	<string name="Ear Size">
+		Oor Grootte
+	</string>
+	<string name="Ear Tips">
+		Oor Punten
+	</string>
+	<string name="Egg Head">
+		Ei Hoofd
+	</string>
+	<string name="Eye Bags">
+		Oog Zakken
+	</string>
+	<string name="Eye Color">
+		Oog Kleur
+	</string>
+	<string name="Eye Depth">
+		Oog Diepte
+	</string>
+	<string name="Eye Lightness">
+		Oog Lichtheid
+	</string>
+	<string name="Eye Opening">
+		Oog Opening
+	</string>
+	<string name="Eye Pop">
+		Asymmetrisch
+	</string>
+	<string name="Eye Size">
+		Oog Grootte
+	</string>
+	<string name="Eye Spacing">
+		Oog Afstand
+	</string>
+	<string name="Eyeball Size">
+		Oogbal Grootte
+	</string>
+	<string name="Eyebrow Arc">
+		Wenkbrauw Boog
+	</string>
+	<string name="Eyebrow Density">
+		Wenkbrauw Dichtheid
+	</string>
+	<string name="Eyebrow Height">
+		Wenkbrauw Hoogte
+	</string>
+	<string name="Eyebrow Points">
+		Wenkbrauw Punten
+	</string>
+	<string name="Eyebrow Size">
+		Eyebrow Grootte
+	</string>
+	<string name="Eyelash Length">
+		Eyelash Lengte
+	</string>
+	<string name="Eyeliner">
+		Eyeliner
+	</string>
+	<string name="Eyeliner Color">
+		Eyeliner Kleur
+	</string>
+	<string name="Eyes Back">
+		Ogen Achteruit
+	</string>
+	<string name="Eyes Bugged">
+		Insect Ogen
+	</string>
+	<string name="Eyes Forward">
+		Ogen Vooruit
+	</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">
+		Eyes Spread
+	</string>
+	<string name="Eyes Sunken">
+		Ingevallen Ogen
+	</string>
+	<string name="Eyes Together">
+		Ogen Bij Elkaar
+	</string>
+	<string name="Face Shear">
+		Gezicht Gelijkheid
+	</string>
+	<string name="Facial Definition">
+		Gezichts Definitie
+	</string>
+	<string name="Far Set Eyes">
+		Ogen Uit Elkaar
+	</string>
+	<string name="Fat">
+		Dik
+	</string>
+	<string name="Fat Head">
+		Dik Hoofd
+	</string>
+	<string name="Fat Lips">
+		Dikke Lippen
+	</string>
+	<string name="Fat Lower">
+		Fat Lower
+	</string>
+	<string name="Fat Lower Lip">
+		Fat Lower Lip
+	</string>
+	<string name="Fat Torso">
+		Fat Torso
+	</string>
+	<string name="Fat Upper">
+		Fat Upper
+	</string>
+	<string name="Fat Upper Lip">
+		Dikke Boven Lip
+	</string>
+	<string name="Female">
+		Vrouw
+	</string>
+	<string name="Fingerless">
+		Vingerloos
+	</string>
+	<string name="Fingers">
+		Vingers
+	</string>
+	<string name="Flared Cuffs">
+		Verbrede Vorm
+	</string>
+	<string name="Flat">
+		Plat
+	</string>
+	<string name="Flat Butt">
+		Platte Kont
+	</string>
+	<string name="Flat Head">
+		Plat Hoofd
+	</string>
+	<string name="Flat Toe">
+		Platte Teen
+	</string>
+	<string name="Foot Size">
+		Voet Grootte
+	</string>
+	<string name="Forehead Angle">
+		Voorhoofd Hoek
+	</string>
+	<string name="Forehead Heavy">
+		Zwaar Voorhoofd
+	</string>
+	<string name="Freckles">
+		Sproeten
+	</string>
+	<string name="Front Bangs Down">
+		Voorkant Pony Omlaag
+	</string>
+	<string name="Front Bangs Up">
+		Voorkant Pony Omhoog
+	</string>
+	<string name="Front Fringe">
+		Voorste Rand
+	</string>
+	<string name="Front Hair">
+		Gezichtshaar
+	</string>
+	<string name="Front Hair Down">
+		Gezichtshaar Omlaag
+	</string>
+	<string name="Front Hair Up">
+		Gezichtshaar Omhoog
+	</string>
+	<string name="Full Back">
+		Volle Achterkant
+	</string>
+	<string name="Full Eyeliner">
+		Volle Eyeliner
+	</string>
+	<string name="Full Front">
+		Volle Voorkant
+	</string>
+	<string name="Full Hair Sides">
+		Full Hair Sides
+	</string>
+	<string name="Full Sides">
+		Volle Zijkanten
+	</string>
+	<string name="Glossy">
+		Glanzend
+	</string>
+	<string name="Glove Fingers">
+		Vinger Handschoenen
+	</string>
+	<string name="Glove Length">
+		Handschoen Lengte
+	</string>
+	<string name="Hair">
+		Haar
+	</string>
+	<string name="Hair Back">
+		Haar: Zwart
+	</string>
+	<string name="Hair Front">
+		Haar: Voorkant
+	</string>
+	<string name="Hair Sides">
+		Haar: Zijkant
+	</string>
+	<string name="Hair Sweep">
+		Hair Sweep
+	</string>
+	<string name="Hair Thickess">
+		Haar Dikheid
+	</string>
+	<string name="Hair Thickness">
+		Hair Dikheid
+	</string>
+	<string name="Hair Tilt">
+		Hair Tilt
+	</string>
+	<string name="Hair Tilted Left">
+		Hair Tilted Left
+	</string>
+	<string name="Hair Tilted Right">
+		Hair Tilted Right
+	</string>
+	<string name="Hair Volume">
+		Haar: Volume
+	</string>
+	<string name="Hand Size">
+		Hand Grootte
+	</string>
+	<string name="Handlebars">
+		Handlebars
+	</string>
+	<string name="Head Length">
+		Hoofd Lengte
+	</string>
+	<string name="Head Shape">
+		Hoofd Vorm
+	</string>
+	<string name="Head Size">
+		Hooft Grootte
+	</string>
+	<string name="Head Stretch">
+		Hoofd Uitrekken
+	</string>
+	<string name="Heel Height">
+		Hiel Hoogte
+	</string>
+	<string name="Heel Shape">
+		Hiel Vorm
+	</string>
+	<string name="Height">
+		Hoogte
+	</string>
+	<string name="High">
 		Hoog
 	</string>
-	
-	<!-- PARCEL_CATEGORY_UI_STRING -->
-	<string name="Linden Location">Linden locatie</string>
-	<string name="Adult">Adult</string>
-	<string name="Arts&amp;Culture">Kunst &amp; Cultuur</string>
-	<string name="Business">Zakelijk</string>
-	<string name="Educational">Educatief</string>
-	<string name="Gaming">Spelen</string>
-	<string name="Hangout">Ontmoetingsplaats</string>
-	<string name="Newcomer Friendly">Nieuwkomervriendelijk</string>
-	<string name="Parks&amp;Nature">Parken &amp; natuur</string>
-	<string name="Residential">Woongebied</string>
-	<string name="Shopping">Winkelen</string>
-	<string name="Other">Anders</string>
-	
-	<string name="ringing">
-		Verbinden met in-wereld voice chat...
+	<string name="High Heels">
+		Hoge Hielen
 	</string>
-	<string name="connected">
-		Verbonden
+	<string name="High Jaw">
+		Hoge Kaak
 	</string>
-	<string name="unavailable">
-		Voice is niet beschikbaar op uw huidige locatie
+	<string name="High Platforms">
+		High Platforms
 	</string>
-	<string name="hang_up">
-		Verbinding met in-wereld voicechat verbroken
+	<string name="High and Tight">
+		Hoog en Strak
+	</string>
+	<string name="Higher">
+		Hoger
+	</string>
+	<string name="Hip Length">
+		Heup Lengte
+	</string>
+	<string name="Hip Width">
+		Heup Breedte
+	</string>
+	<string name="In">
+		Naar Binnen
+	</string>
+	<string name="In Shdw Color">
+		Binnenste Schaduw Kleur
+	</string>
+	<string name="In Shdw Opacity">
+		Binnenste Schaduw Opaciteit
+	</string>
+	<string name="Inner Eye Corner">
+		Binnenste Oog Hoek
+	</string>
+	<string name="Inner Eye Shadow">
+		Binnenste Oog Schaduw
+	</string>
+	<string name="Inner Shadow">
+		Binnenste Schaduw
+	</string>
+	<string name="Jacket Length">
+		Jas Lengte
+	</string>
+	<string name="Jacket Wrinkles">
+		Jas Rimpels
+	</string>
+	<string name="Jaw Angle">
+		Kaak Hoek
+	</string>
+	<string name="Jaw Jut">
+		Jaw Jut
+	</string>
+	<string name="Jaw Shape">
+		Kaak Vorm
+	</string>
+	<string name="Join">
+		Samenvoegen
+	</string>
+	<string name="Jowls">
+		Kaken
+	</string>
+	<string name="Knee Angle">
+		Knie Hoek
+	</string>
+	<string name="Knock Kneed">
+		Knieën Naar binnen
+	</string>
+	<string name="Large">
+		Fors
+	</string>
+	<string name="Large Hands">
+		Grote Handen
+	</string>
+	<string name="Left Part">
+		Linker Deel
+	</string>
+	<string name="Leg Length">
+		Been Lengte
+	</string>
+	<string name="Leg Muscles">
+		Been Spieren
+	</string>
+	<string name="Less">
+		Minder
+	</string>
+	<string name="Less Body Fat">
+		Minder Lichaams Vet
+	</string>
+	<string name="Less Curtains">
+		Less Curtains
+	</string>
+	<string name="Less Freckles">
+		Minder Sproeten
+	</string>
+	<string name="Less Full">
+		Minder Vol
+	</string>
+	<string name="Less Gravity">
+		Minder Zwaartekracht
+	</string>
+	<string name="Less Love">
+		Less Love
+	</string>
+	<string name="Less Muscles">
+		Minder Spieren
+	</string>
+	<string name="Less Muscular">
+		Minder Spieren
+	</string>
+	<string name="Less Rosy">
+		Minder Rooskleurig
+	</string>
+	<string name="Less Round">
+		Minder Rond
+	</string>
+	<string name="Less Saddle">
+		Minder Heupen
+	</string>
+	<string name="Less Square">
+		Minder Vierkant
+	</string>
+	<string name="Less Volume">
+		Minder Volume
+	</string>
+	<string name="Less soul">
+		Minder Ziel
+	</string>
+	<string name="Lighter">
+		Lichter
+	</string>
+	<string name="Lip Cleft">
+		Gespleten Lip
+	</string>
+	<string name="Lip Cleft Depth">
+		Gespleten Lip Diepte
+	</string>
+	<string name="Lip Fullness">
+		Lip Volheid
+	</string>
+	<string name="Lip Pinkness">
+		Rozeheid Lippen
+	</string>
+	<string name="Lip Ratio">
+		Lip Ratio
+	</string>
+	<string name="Lip Thickness">
+		Lip Dikheid
+	</string>
+	<string name="Lip Width">
+		Lip Breedte
+	</string>
+	<string name="Lipgloss">
+		Lipgloss
+	</string>
+	<string name="Lipstick">
+		Lipstick
+	</string>
+	<string name="Lipstick Color">
+		Lipstick Kleur
+	</string>
+	<string name="Long">
+		Lang
+	</string>
+	<string name="Long Head">
+		Lang Hoofd
+	</string>
+	<string name="Long Hips">
+		Lange Heupen
+	</string>
+	<string name="Long Legs">
+		Lange Benen
+	</string>
+	<string name="Long Neck">
+		Lange Nek
+	</string>
+	<string name="Long Pigtails">
+		Long Pigtails
+	</string>
+	<string name="Long Ponytail">
+		Lange Paardenstaart
+	</string>
+	<string name="Long Torso">
+		Lang Torso
+	</string>
+	<string name="Long arms">
+		Lange Armen
+	</string>
+	<string name="Longcuffs">
+		Longcuffs
+	</string>
+	<string name="Loose Pants">
+		Losse Broek
+	</string>
+	<string name="Loose Shirt">
+		Los Shirt
+	</string>
+	<string name="Loose Sleeves">
+		Losse Mouwen
+	</string>
+	<string name="Love Handles">
+		Love Handles
+	</string>
+	<string name="Low">
+		Laag
+	</string>
+	<string name="Low Heels">
+		Lage Hielen
+	</string>
+	<string name="Low Jaw">
+		Lage Kaak
+	</string>
+	<string name="Low Platforms">
+		Lage Platforms
+	</string>
+	<string name="Low and Loose">
+		Laag en Los
+	</string>
+	<string name="Lower">
+		Lager
+	</string>
+	<string name="Lower Bridge">
+		Lagere Brug
+	</string>
+	<string name="Lower Cheeks">
+		Lagere Wangen
+	</string>
+	<string name="Male">
+		Man
+	</string>
+	<string name="Middle Part">
+		Middelste Deel
+	</string>
+	<string name="More">
+		Meer
+	</string>
+	<string name="More Blush">
+		Meer Blozen
+	</string>
+	<string name="More Body Fat">
+		Meer Lichaams Vet
+	</string>
+	<string name="More Curtains">
+		More Curtains
+	</string>
+	<string name="More Eyeshadow">
+		Meer Oogshadow
+	</string>
+	<string name="More Freckles">
+		Meer Sproeten
+	</string>
+	<string name="More Full">
+		Meer Vol
+	</string>
+	<string name="More Gravity">
+		Meer Zwaartekracht
+	</string>
+	<string name="More Lipstick">
+		Meer Lippenstift
+	</string>
+	<string name="More Love">
+		Meer Lovehandels
+	</string>
+	<string name="More Lower Lip">
+		Meer Onder Lip
+	</string>
+	<string name="More Muscles">
+		Meer Spieren
+	</string>
+	<string name="More Muscular">
+		Meer Spieren
+	</string>
+	<string name="More Rosy">
+		More Rosy
+	</string>
+	<string name="More Round">
+		Meer Rond
+	</string>
+	<string name="More Saddle">
+		Meer Heupen
+	</string>
+	<string name="More Sloped">
+		Meer Hellend
+	</string>
+	<string name="More Square">
+		Meer Vierkant
+	</string>
+	<string name="More Upper Lip">
+		Meer Boven Lip
+	</string>
+	<string name="More Vertical">
+		Meer Verticaal
+	</string>
+	<string name="More Volume">
+		Meer Volume
+	</string>
+	<string name="More soul">
+		Meer ziel
+	</string>
+	<string name="Moustache">
+		Snor
+	</string>
+	<string name="Mouth Corner">
+		Mond Hoek
+	</string>
+	<string name="Mouth Position">
+		Mond Positie
+	</string>
+	<string name="Mowhawk">
+		Hanekam
+	</string>
+	<string name="Muscular">
+		Gespiert
+	</string>
+	<string name="Mutton Chops">
+		Mutton Chops
+	</string>
+	<string name="Nail Polish">
+		Nagel Lak
+	</string>
+	<string name="Nail Polish Color">
+		Nagel Lak Kleur
+	</string>
+	<string name="Narrow">
+		Smal
+	</string>
+	<string name="Narrow Back">
+		Smalle Achterkant
+	</string>
+	<string name="Narrow Front">
+		Smalle Voorkant
+	</string>
+	<string name="Narrow Lips">
+		Smalle Lippen
+	</string>
+	<string name="Natural">
+		Natural
+	</string>
+	<string name="Neck Length">
+		Nek Lengte
+	</string>
+	<string name="Neck Thickness">
+		Nek Dikheid
+	</string>
+	<string name="No Blush">
+		Geen Bloos
+	</string>
+	<string name="No Eyeliner">
+		Geen Eyeliner
+	</string>
+	<string name="No Eyeshadow">
+		Geen Oogschaduw
+	</string>
+	<string name="No Heels">
+		Geen Hakken
+	</string>
+	<string name="No Lipgloss">
+		Geen Lipgloss
+	</string>
+	<string name="No Lipstick">
+		Geen Lippenstift
+	</string>
+	<string name="No Part">
+		Geen Deel
+	</string>
+	<string name="No Polish">
+		Geen Glans
+	</string>
+	<string name="No Red">
+		Geen Rood
+	</string>
+	<string name="No Spikes">
+		Geen Stekels
+	</string>
+	<string name="No White">
+		Geen Wit
+	</string>
+	<string name="No Wrinkles">
+		Geen Rimpels
+	</string>
+	<string name="Normal Lower">
+		Normaal Onder
+	</string>
+	<string name="Normal Upper">
+		Normaal Boven
+	</string>
+	<string name="Nose Left">
+		Neus Links
+	</string>
+	<string name="Nose Right">
+		Neus Rechts
+	</string>
+	<string name="Nose Size">
+		Neus Grootte
+	</string>
+	<string name="Nose Thickness">
+		Neus Dickheid
+	</string>
+	<string name="Nose Tip Angle">
+		Neus Top Hoek
+	</string>
+	<string name="Nose Tip Shape">
+		Neus Top Vorm
+	</string>
+	<string name="Nose Width">
+		Neus Breedte
+	</string>
+	<string name="Nostril Division">
+		Nostril Division
+	</string>
+	<string name="Nostril Width">
+		Neusgat Breedte
+	</string>
+	<string name="Old">
+		Oud
+	</string>
+	<string name="Opaque">
+		Ondoorzichtig
+	</string>
+	<string name="Open">
+		Open
+	</string>
+	<string name="Open Back">
+		Open Achterkant
+	</string>
+	<string name="Open Front">
+		Open Voorkant
+	</string>
+	<string name="Open Left">
+		Open Links
+	</string>
+	<string name="Open Right">
+		Open Rechts
+	</string>
+	<string name="Orange">
+		Oranje
+	</string>
+	<string name="Out">
+		Uit
+	</string>
+	<string name="Out Shdw Color">
+		Buitenste Schaduw Kleur
+	</string>
+	<string name="Out Shdw Opacity">
+		Buitenste Schaduw Opaciteit
+	</string>
+	<string name="Outer Eye Corner">
+		Buitenste Oog Hoek
+	</string>
+	<string name="Outer Eye Shadow">
+		Buitenste Oog Schaduw
+	</string>
+	<string name="Outer Shadow">
+		Buitenste Schaduw
+	</string>
+	<string name="Overbite">
+		Overbeet
+	</string>
+	<string name="Package">
+		Genitaliën
+	</string>
+	<string name="Painted Nails">
+		Gelakte Nagels
+	</string>
+	<string name="Pale">
+		Dof
+	</string>
+	<string name="Pants Crotch">
+		Broek Kruis
+	</string>
+	<string name="Pants Fit">
+		Broek Passend
+	</string>
+	<string name="Pants Length">
+		Broek Lengte
+	</string>
+	<string name="Pants Waist">
+		Broek Teille
+	</string>
+	<string name="Pants Wrinkles">
+		Broek Rimpels
+	</string>
+	<string name="Part">
+		Deel
+	</string>
+	<string name="Part Bangs">
+		Part Bangs
+	</string>
+	<string name="Pectorals">
+		Borstspieren
+	</string>
+	<string name="Pigment">
+		Pigment
+	</string>
+	<string name="Pigtails">
+		Pigtails
+	</string>
+	<string name="Pink">
+		Roze
+	</string>
+	<string name="Pinker">
+		Rozer
+	</string>
+	<string name="Platform Height">
+		Platform Hoogte
+	</string>
+	<string name="Platform Width">
+		Platform Breedte
+	</string>
+	<string name="Pointy">
+		Puntig
+	</string>
+	<string name="Pointy Heels">
+		Puntige Hielen
+	</string>
+	<string name="Pointy Toe">
+		Puntige Tenen
+	</string>
+	<string name="Ponytail">
+		Paardenstaard
+	</string>
+	<string name="Poofy Skirt">
+		Poofy Skirt
+	</string>
+	<string name="Pop Left Eye">
+		Asymmetrisch Links
+	</string>
+	<string name="Pop Right Eye">
+		Asymmetrisch Rechts
+	</string>
+	<string name="Puffy">
+		Opgezwollen
+	</string>
+	<string name="Puffy Eyelids">
+		Opgezwollen Oogleden
+	</string>
+	<string name="Rainbow Color">
+		Regenboog Kleur
+	</string>
+	<string name="Red Hair">
+		Rood Haar
+	</string>
+	<string name="Red Skin">
+		Rode Huid
+	</string>
+	<string name="Regular">
+		Normaal
+	</string>
+	<string name="Regular Muscles">
+		Normale Spieren
+	</string>
+	<string name="Right Part">
+		Rechter Deel
+	</string>
+	<string name="Rosy Complexion">
+		Rosy Complexion
+	</string>
+	<string name="Round">
+		Rond
+	</string>
+	<string name="Round Forehead">
+		Rond Voorhoofd
+	</string>
+	<string name="Ruddiness">
+		Rossige kleur
+	</string>
+	<string name="Ruddy">
+		Rossig
+	</string>
+	<string name="Rumpled Hair">
+		Rumpled Hair
+	</string>
+	<string name="Saddle Bags">
+		Saddle Bags
+	</string>
+	<string name="Saddlebags">
+		Saddlebags
+	</string>
+	<string name="Scrawny">
+		Magere
+	</string>
+	<string name="Scrawny Leg">
+		Mager Been
+	</string>
+	<string name="Separate">
+		Scheiden
+	</string>
+	<string name="Shading">
+		Shading
+	</string>
+	<string name="Shadow hair">
+		Schaduw Haar
+	</string>
+	<string name="Shallow">
+		Ondiep
+	</string>
+	<string name="Shear Back">
+		Shear Back
+	</string>
+	<string name="Shear Face">
+		Shear Face
+	</string>
+	<string name="Shear Front">
+		Shear Front
+	</string>
+	<string name="Shear Left">
+		Shear Left
+	</string>
+	<string name="Shear Left Up">
+		Shear Left Up
+	</string>
+	<string name="Shear Right">
+		Shear Right
+	</string>
+	<string name="Shear Right Up">
+		Shear Right Up
+	</string>
+	<string name="Sheared Back">
+		Sheared Back
+	</string>
+	<string name="Sheared Front">
+		Sheared Front
+	</string>
+	<string name="Shift Left">
+		Verplaats Links
+	</string>
+	<string name="Shift Mouth">
+		Verplaats Mond
+	</string>
+	<string name="Shift Right">
+		Verplaats Rechts
+	</string>
+	<string name="Shirt Bottom">
+		Hemd Onderkant
+	</string>
+	<string name="Shirt Fit">
+		Hemd Passend
+	</string>
+	<string name="Shirt Wrinkles">
+		Hemd Rimpels
+	</string>
+	<string name="Shoe Height">
+		Schoen Hoogte
+	</string>
+	<string name="Short">
+		Kort
+	</string>
+	<string name="Short Arms">
+		Korte Armen
+	</string>
+	<string name="Short Legs">
+		Korte Benen
+	</string>
+	<string name="Short Neck">
+		Korte Nek
+	</string>
+	<string name="Short Pigtails">
+		Short Pigtails
+	</string>
+	<string name="Short Ponytail">
+		Korte Paardenstaart
+	</string>
+	<string name="Short Sideburns">
+		Korte Bakkebaarden
+	</string>
+	<string name="Short Torso">
+		Korte Torso
+	</string>
+	<string name="Short hips">
+		Korte Heupen
+	</string>
+	<string name="Shoulders">
+		Shouders
+	</string>
+	<string name="Side Bangs">
+		Side Bangs
+	</string>
+	<string name="Side Bangs Down">
+		Side Bangs Down
+	</string>
+	<string name="Side Bangs Up">
+		Side Bangs Up
+	</string>
+	<string name="Side Fringe">
+		Side Fringe
+	</string>
+	<string name="Sideburns">
+		Bakkebaarden
+	</string>
+	<string name="Sides Hair">
+		Sides Hair
+	</string>
+	<string name="Sides Hair Down">
+		Sides Hair Down
+	</string>
+	<string name="Sides Hair Up">
+		Sides Hair Up
+	</string>
+	<string name="Skinny">
+		Broodmager
+	</string>
+	<string name="Skinny Neck">
+		Smalle Nek
+	</string>
+	<string name="Skirt Fit">
+		Skirt Fit
+	</string>
+	<string name="Skirt Length">
+		Rok Lengte
+	</string>
+	<string name="Slanted Forehead">
+		Schuin voorhoofd
+	</string>
+	<string name="Sleeve Length">
+		Mouw Lengte
+	</string>
+	<string name="Sleeve Looseness">
+		Mouw Losheid
+	</string>
+	<string name="Slit Back">
+		Spleet: Achter
+	</string>
+	<string name="Slit Front">
+		Spleet: Voor
+	</string>
+	<string name="Slit Left">
+		Spleet: Links
+	</string>
+	<string name="Slit Right">
+		Spleet: Rechts
+	</string>
+	<string name="Small">
+		Klein
+	</string>
+	<string name="Small Hands">
+		Kleine Handen
+	</string>
+	<string name="Small Head">
+		Klein Hoofd
+	</string>
+	<string name="Smooth">
+		Glad
+	</string>
+	<string name="Smooth Hair">
+		Glad Haar
+	</string>
+	<string name="Socks Length">
+		Sok Lengte
+	</string>
+	<string name="Some">
+		enkele
+	</string>
+	<string name="Soulpatch">
+		Soulpatch
+	</string>
+	<string name="Sparse">
+		Schaars
+	</string>
+	<string name="Spiked Hair">
+		Puntig Haar
+	</string>
+	<string name="Square">
+		Vierkant
+	</string>
+	<string name="Square Toe">
+		Vierkante Teen
+	</string>
+	<string name="Squash Head">
+		Squash Head
+	</string>
+	<string name="Squash/Stretch Head">
+		Squash/Stretch Head
+	</string>
+	<string name="Stretch Head">
+		Uitgerekt Hoofd
+	</string>
+	<string name="Sunken">
+		Verzonken
+	</string>
+	<string name="Sunken Chest">
+		Verzonken Borstkas
+	</string>
+	<string name="Sunken Eyes">
+		Verzonken Ogen
+	</string>
+	<string name="Sweep Back">
+		Sweep Back
+	</string>
+	<string name="Sweep Forward">
+		Sweep Forward
+	</string>
+	<string name="Swept Back">
+		Swept Back
+	</string>
+	<string name="Swept Back Hair">
+		Swept Back Hair
+	</string>
+	<string name="Swept Forward">
+		Swept Forward
+	</string>
+	<string name="Swept Forward Hair">
+		Swept Forward Hair
+	</string>
+	<string name="Tall">
+		Lang
+	</string>
+	<string name="Taper Back">
+		Spits Achter
+	</string>
+	<string name="Taper Front">
+		Spits Voor
+	</string>
+	<string name="Thick Heels">
+		Dikke Hielen
+	</string>
+	<string name="Thick Neck">
+		Dikke Nek
+	</string>
+	<string name="Thick Toe">
+		Dikke Teen
+	</string>
+	<string name="Thickness">
+		Dikheid
+	</string>
+	<string name="Thin">
+		Dun
+	</string>
+	<string name="Thin Eyebrows">
+		Dunne Wenkbrouwen
+	</string>
+	<string name="Thin Lips">
+		Dunne Lippen
+	</string>
+	<string name="Thin Nose">
+		Dunne Neus
+	</string>
+	<string name="Tight Chin">
+		Strakke Kin
+	</string>
+	<string name="Tight Cuffs">
+		Strakke Manchetten
+	</string>
+	<string name="Tight Pants">
+		Strakke Broek
+	</string>
+	<string name="Tight Shirt">
+		Strak Hemd
+	</string>
+	<string name="Tight Skirt">
+		Strakke Rok
+	</string>
+	<string name="Tight Sleeves">
+		Strakke Mouwen
+	</string>
+	<string name="Tilt Left">
+		Tilt Left
+	</string>
+	<string name="Tilt Right">
+		Tilt Right
+	</string>
+	<string name="Toe Shape">
+		Teen Vorm
+	</string>
+	<string name="Toe Thickness">
+		Teen Dikheid
+	</string>
+	<string name="Torso Length">
+		Borstkas Lengte
+	</string>
+	<string name="Torso Muscles">
+		Borstkas Spieren
+	</string>
+	<string name="Torso Scrawny">
+		Magere Borstkas
+	</string>
+	<string name="Unattached">
+		Niet Verbonden
+	</string>
+	<string name="Uncreased">
+		Uncreased
+	</string>
+	<string name="Underbite">
+		onderbeet
+	</string>
+	<string name="Unnatural">
+		Onnatuurlijk
+	</string>
+	<string name="Upper Bridge">
+		Boven Brug
+	</string>
+	<string name="Upper Cheeks">
+		Bovenste Wangen
+	</string>
+	<string name="Upper Chin Cleft">
+		Bovenste Kin Gespleten
+	</string>
+	<string name="Upper Eyelid Fold">
+		Bovenste Ooglid Gevouwen
+	</string>
+	<string name="Upturned">
+		Omgekeerde
+	</string>
+	<string name="Very Red">
+		Erg Rood
+	</string>
+	<string name="Waist Height">
+		Taille Hoogte
+	</string>
+	<string name="Well-Fed">
+		Goed Gevoed
+	</string>
+	<string name="White Hair">
+		Wit Haar
+	</string>
+	<string name="Wide">
+		Breed
+	</string>
+	<string name="Wide Back">
+		Breede Achterkant
+	</string>
+	<string name="Wide Front">
+		Breed Voorkant
+	</string>
+	<string name="Wide Lips">
+		Breed Lippen
+	</string>
+	<string name="Wild">
+		Wild
+	</string>
+	<string name="Wrinkles">
+		Rimpels
+	</string>
+	<string name="LocationCtrlAddLandmarkTooltip">
+		Add to My Landmarks
+	</string>
+	<string name="LocationCtrlEditLandmarkTooltip">
+		Edit My Landmark
+	</string>
+	<string name="LocationCtrlInfoBtnTooltip">
+		See more info about the current location
+	</string>
+	<string name="LocationCtrlComboBtnTooltip">
+		My location history
+	</string>
+	<string name="UpdaterWindowTitle">
+		[APP_NAME] Update
+	</string>
+	<string name="UpdaterNowUpdating">
+		Now updating [APP_NAME]...
+	</string>
+	<string name="UpdaterNowInstalling">
+		Installing [APP_NAME]...
+	</string>
+	<string name="UpdaterUpdatingDescriptive">
+		Your [APP_NAME] Viewer is being updated to the latest release.  This may take some time, so please be patient.
+	</string>
+	<string name="UpdaterProgressBarTextWithEllipses">
+		Downloading update...
+	</string>
+	<string name="UpdaterProgressBarText">
+		Downloading update
+	</string>
+	<string name="UpdaterFailDownloadTitle">
+		Failed to download update
+	</string>
+	<string name="UpdaterFailUpdateDescriptive">
+		An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com.
+	</string>
+	<string name="UpdaterFailInstallTitle">
+		Failed to install update
+	</string>
+	<string name="UpdaterFailStartTitle">
+		Failed to start viewer
+	</string>
+	<string name="IM_logging_string">
+		-- Instant message logging enabled --
+	</string>
+	<string name="IM_typing_start_string">
+		[NAME] is typing...
+	</string>
+	<string name="Unnamed">
+		(Unnamed)
+	</string>
+	<string name="IM_moderated_chat_label">
+		(Moderated: Voices off by default)
+	</string>
+	<string name="IM_unavailable_text_label">
+		Text chat is not available for this call.
+	</string>
+	<string name="IM_muted_text_label">
+		Your text chat has been disabled by a Group Moderator.
+	</string>
+	<string name="IM_default_text_label">
+		Click here to instant message.
+	</string>
+	<string name="IM_to_label">
+		To
+	</string>
+	<string name="IM_moderator_label">
+		(Moderator)
 	</string>
-  <string name="ScriptQuestionCautionChatGranted">
-	&apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming verleend om te: [PERMISSIONS].
-  </string>
-  <string name="ScriptQuestionCautionChatDenied">
-	&apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming geweigerd om te: [PERMISSIONS].
-  </string>
-  <string name="ScriptTakeMoney">
-	Linden dollars (L$) van u wegnemen
-  </string>
-  <string name="ActOnControlInputs">
-	Acteren op uw bedieningsinvoer
-  </string>
-  <string name="RemapControlInputs">
-	Uw bedieningsinvoer herdefiniëren
-  </string>
-  <string name="AnimateYourAvatar">
-	Animeer uw avatar
-  </string>
-  <string name="AttachToYourAvatar">
-	Bevestig aan uw avatar
-  </string>
-  <string name="ReleaseOwnership">
-	Eigendom vrijgeven en openbaar worden
-  </string>
-  <string name="LinkAndDelink">
-	Koppelen met en ontkoppelen van andere objecten
-  </string>
-  <string name="AddAndRemoveJoints">
-	Toevoegen en verwijderen koppelingen met andere objecten
-  </string>
-  <string name="ChangePermissions">
-	Wijzig zijn permissies
-  </string>
-  <string name="TrackYourCamera">
-	Volg uw camera
-  </string>
-  <string name="ControlYourCamera">
-	Bedien uw camera
-  </string>
-	
 	<string name="only_user_message">
 		U bent de enige gebruiker in deze sessie.
 	</string>
@@ -626,31 +3246,4 @@
 	<string name="close_on_no_ability">
 		U heeft niet langer de mogelijkheid om in deze chatsessie te zijn.
 	</string>
-			<string name="AcctTypeResident">
-				Inwoner
-			</string>
-			<string name="AcctTypeTrial">
-				Proef
-			</string>
-			<string name="AcctTypeCharterMember">
-				Charter lid
-			</string>
-			<string name="AcctTypeEmployee">
-				Linden Lab werknemer
-			</string>
-			<string name="PaymentInfoUsed">
-				Betalingsinformatie gebruikt
-			</string>
-			<string name="PaymentInfoOnFile">
-				Betalingsinformatie aanwezig
-			</string>
-			<string name="NoPaymentInfoOnFile">
-				Geen betalingsinfo aanwezig
-			</string>
-			<string name="AgeVerified">
-				Leeftijd geverifieerd
-			</string>
-			<string name="NotAgeVerified">
-				Leeftijd niet geverifieerd
-			</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/nl/teleport_strings.xml b/indra/newview/skins/default/xui/nl/teleport_strings.xml
index ff43e0f32f..12a81447c0 100644
--- a/indra/newview/skins/default/xui/nl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/nl/teleport_strings.xml
@@ -2,12 +2,12 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Er is een probleem opgetreden bij het verwerken van uw verzoek voor een teleport. U dient wellicht opnieuw in te loggen voor uw kunt teleporteren. Wanneer u deze boodschap blijft ontvangen, controleert u dan alstublieft de Tech Support FAQ op:
-www.secondlife.com/support
+			Probleem ondervonden bij het verwerken van uw verzoek voor een teleport. Het kan nodig zijn om opnieuw in te loggen voordat u kunt teleporteren. 
+Als u dit bericht blijft krijgen, controleert u dan alstublieft [SUPPORT_SITE].
 		</message>
 		<message name="invalid_region_handoff">
-			Er is een probleem opgetreden bij het oversteken naar een andere regio. U dient wellicht opnieuw in te loggen voor uw kunt oversteken naar andere regio&apos;s. Wanneer u deze boodschap blijft ontvangen, controleert u dan alstublieft de Tech Support FAQ op:
-www.secondlife.com/support
+			Er is een probleem opgetreden bij het oversteken naar een andere regio. U dient wellicht opnieuw in te loggen voor uw kunt oversteken naar andere regio&apos;s.
+Als u dit bericht blijft krijgen, controleert u dan alstublieft [SUPPORT_SITE].
 		</message>
 		<message name="blocked_tport">
 			Sorry, teleport is momenteel geblokkeerd. Probeer het zo meteen opnieuw. Indien u nog steeds niet kunt teleporteren, log dan alstublieft uit en weer in om het probleem te verhelpen.
diff --git a/install.xml b/install.xml
index 899bd0a6cc..fefa4d729e 100644
--- a/install.xml
+++ b/install.xml
@@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>455d9ce60837366a7e744751bdc8b6c3</string>
+            <string>a90135a68d2821eef742d15cb06b15b9</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100329.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100407-cookie-api.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>