Merged from viewer-release

34 files changed, 244 insertions, 81 deletions

diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 9ff6a4e1a0..aba6c310f1 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -310,7 +310,8 @@ public:
 
 	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }
 	void			popVisible()				{ setVisible(mLastVisible); }
-	
+	BOOL			getLastVisible()	const	{ return mLastVisible; }
+
 	LLHandle<LLView>	getHandle()				{ mHandle.bind(this); return mHandle; }
 
 	U32			getFollows() const				{ return mReshapeFlags; }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd93f1bfa6..510dc815f0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3309,6 +3309,17 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
+    <key>FlycamBuildModeScale</key>
+    <map>
+      <key>Comment</key>
+      <string>Scale factor to apply to flycam movements when in build mode.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>FlycamFeathering</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 62766f9229..1a3001c413 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -47,9 +47,11 @@ ATI ASUS EAH26xx				.*ATI.*ASUS.*EAH26.*				3		1
 ATI ASUS EAH34xx				.*ATI.*ASUS.*EAH34.*				1		1
 ATI ASUS EAH36xx				.*ATI.*ASUS.*EAH36.*				3		1
 ATI ASUS EAH38xx				.*ATI.*ASUS.*EAH38.*				3		1
+ATI ASUS EAH43xx				.*ATI.*ASUS.*EAH43.*				1		1
 ATI ASUS EAH45xx				.*ATI.*ASUS.*EAH45.*				1		1
 ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
 ATI ASUS EAH57xx				.*ATI.*ASUS.*EAH57.*				3		1
+ATI ASUS EAH58xx				.*ATI.*ASUS.*EAH58.*				3		1
 ATI Radeon X1xxx				.*ATI.*ASUS.*X1.*					3		1
 ATI Radeon X7xx					.*ATI.*ASUS.*X7.*					1		1
 ATI Radeon X500					.*ATI.*Diamond X5.*					1		1
@@ -70,6 +72,7 @@ ATI M56							.*ATI.*M56.*						1		1
 ATI M71							.*ATI.*M71.*						1		1
 ATI M72							.*ATI.*M72.*						1		1
 ATI M76							.*ATI.*M76.*						3		1
+ATI Mobility Radeon 4100		.*ATI.*Mobility *41.*				0		1
 ATI Mobility Radeon 7xxx		.*ATI.*Mobility *Radeon 7.*			0		1
 ATI Mobility Radeon 8xxx		.*ATI.*Mobility *Radeon 8.*			0		1
 ATI Mobility Radeon 9800		.*ATI.*Mobility *98.*				0		1
@@ -81,6 +84,8 @@ ATI Mobility Radeon HD 2600		.*ATI.*Mobility *HD *26.*			3		1
 ATI Mobility Radeon HD 3400		.*ATI.*Mobility *HD *34.*			1		1
 ATI Mobility Radeon HD 3600		.*ATI.*Mobility *HD *36.*			3		1
 ATI Mobility Radeon HD 3800		.*ATI.*Mobility *HD *38.*			3		1
+ATI Mobility Radeon HD 5400		.*ATI.*Mobility *HD *54.*			1		1
+ATI Mobility Radeon HD 5500		.*ATI.*Mobility *HD *55.*			1		1
 ATI Mobility Radeon X1xxx		.*ATI.*Mobility *X1.*				0		1
 ATI Mobility Radeon X2xxx		.*ATI.*Mobility *X2.*				0		1
 ATI Mobility Radeon X3xx		.*ATI.*Mobility *X3.*				1		1
@@ -102,13 +107,16 @@ ATI Radeon HD 4500				.*ATI.*Radeon HD *45.*				3		1
 ATI Radeon HD 4600				.*ATI.*Radeon HD *46.*				3		1
 ATI Radeon HD 4700				.*ATI.*Radeon HD *47.*				3		1
 ATI Radeon HD 4800				.*ATI.*Radeon.*HD *48.*				3		1
+ATI Radeon HD 5400				.*ATI.*Radeon.*HD *54.*				3		1
+ATI Radeon HD 5500				.*ATI.*Radeon.*HD *55.*				3		1
 ATI Radeon HD 5600				.*ATI.*Radeon.*HD *56.*				3		1
 ATI Radeon HD 5700				.*ATI.*Radeon.*HD *57.*				3		1
 ATI Radeon HD 5800				.*ATI.*Radeon.*HD *58.*				3		1
 ATI Radeon HD 5900				.*ATI.*Radeon.*HD *59.*				3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.* 				0		0
 ATI Radeon 2100					.*ATI.*Radeon 21.*					0		1
-ATI Radeon 3100					.*ATI.*Radeon 31.*					1		1
+ATI Radeon 3000					.*ATI.*Radeon 30.*					0		1
+ATI Radeon 3100					.*ATI.*Radeon 31.*					0		1
 ATI Radeon 7xxx					.*ATI.*Radeon 7.*					0		1
 ATI Radeon 8xxx					.*ATI.*Radeon 8.*					0		1
 ATI Radeon 9000					.*ATI.*Radeon 90.*					0		1
@@ -166,20 +174,39 @@ Intel Broadwater 				.*Intel.*Broadwater.*				0		0
 Intel Brookdale					.*Intel.*Brookdale.*				0		0
 Intel Cantiga					.*Intel.*Cantiga.*					0		0
 Intel Eaglelake					.*Intel.*Eaglelake.*				0		1
+Intel Graphics Media HD			.*Intel(R) Graphics Media.*HD.*		0		1
+Intel HD Graphics				.*Intel(R) HD Graphics.*			0		1
 Intel Mobile 4 Series			.*Intel.*Mobile.*4 Series.*			0		1
-Intel Media Graphics HD			.*Intel.*Media.*Graphics.*HD.*		0		1
+Intel Media Graphics HD			.*Intel Media Graphics HD.*			0		1
 Intel Montara					.*Intel.*Montara.*					0		0
 Intel Pineview					.*Intel.*Pineview.*					0		1
 Intel Springdale				.*Intel.*Springdale.*				0		0
 Matrox							.*Matrox.*							0		0
 Mesa							.*Mesa.*							0		0
-NVIDIA GT 120					.*NVIDIA.*GeForce.*GT.*12.*			2		1
-NVIDIA GT 130					.*NVIDIA.*GeForce.*GT.*13.*			3		1
-NVIDIA GTS 250					.*NVIDIA.*GeForce.*GTS.*25.*		3		1
-NVIDIA GTX 260					.*NVIDIA.*GeForce.*GTX.*26.*		3		1
-NVIDIA GTX 270					.*NVIDIA.*GeForce.*GTX.*27.*		3		1
-NVIDIA GTX 280					.*NVIDIA.*GeForce.*GTX.*28.*		3		1
-NVIDIA GTX 290					.*NVIDIA.*GeForce.*GTX.*29.*		3		1
+NVIDIA 310M						.*NVIDIA GeForce 310M.*				0		1
+NVIDIA 310						.*NVIDIA GeForce 310.*				0		1
+NVIDIA 320M						.*NVIDIA GeForce 320M.*				0		1
+NVIDIA G100M					.*NVIDIA GeForce G *100M.*			0		1
+NVIDIA G102M					.*NVIDIA GeForce G *102M.*			0		1
+NVIDIA G103M					.*NVIDIA GeForce G *103M.*			0		1
+NVIDIA G105M					.*NVIDIA GeForce G *105M.*			0		1
+NVIDIA G210M					.*NVIDIA GeForce G210M.*			0		1
+NVIDIA GT 120					.*NVIDIA GeForce GT 12.*			0		1
+NVIDIA GT 130					.*NVIDIA GeForce GT 13.*			1		1
+NVIDIA GT 220					.*NVIDIA GeForce GT 22.*			0		1
+NVIDIA GT 230					.*NVIDIA GeForce GT 23.*			1		1
+NVIDIA GT 240					.*NVIDIA GeForce GT 24.*			1		1
+NVIDIA GT 320					.*NVIDIA GeForce GT 32.*			0		1
+NVIDIA GT 330M					.*NVIDIA GeForce GT 330M.*			1		1
+NVIDIA GTS 240					.*NVIDIA GeForce GTS 24.*			1		1
+NVIDIA GTS 250					.*NVIDIA GeForce GTS 25.*			3		1
+NVIDIA GTS 360M					.*NVIDIA GeForce GTS 360M.*			3		1
+NVIDIA GTX 260					.*NVIDIA GeForce GTX 26.*			3		1
+NVIDIA GTX 270					.*NVIDIA GeForce GTX 27.*			3		1
+NVIDIA GTX 280					.*NVIDIA GeForce GTX 28.*			3		1
+NVIDIA GTX 290					.*NVIDIA GeForce GTX 29.*			3		1
+NVIDIA GTX 470					.*NVIDIA GeForce GTX 47.*			3		1
+NVIDIA GTX 480					.*NVIDIA GeForce GTX 48.*			3		1
 NVIDIA C51						.*NVIDIA.*C51.*						0		1
 NVIDIA G72						.*NVIDIA.*G72.*						1		1
 NVIDIA G73						.*NVIDIA.*G73.*						1		1
@@ -215,6 +242,8 @@ NVIDIA GeForce 8600M			.*NVIDIA.*GeForce.*8600M.*			1		1
 NVIDIA GeForce 8600				.*NVIDIA.*GeForce 86.*				3		1
 NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*				3		1
 NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*				3		1
+NVIDIA GeForce 9100				.*NVIDIA.*GeForce 9100.*			0		1
+NVIDIA GeForce 9200				.*NVIDIA.*GeForce 9200.*			0		1
 NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*			1		1
 NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*			1		1
 NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index f241d18a21..87c5a830e9 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1868,7 +1868,8 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 		LLView::child_list_t::const_iterator menu_itor;
 		for (menu_itor = list->begin(); menu_itor != list->end(); ++menu_itor)
 		{
-			(*menu_itor)->setVisible(TRUE);
+			(*menu_itor)->setVisible(FALSE);
+			(*menu_itor)->pushVisible(TRUE);
 			(*menu_itor)->setEnabled(TRUE);
 		}
 		
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index bc28140b75..2cc61a69c1 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -452,13 +452,15 @@ void hide_context_entries(LLMenuGL& menu,
 	// if the first element is a separator, it will not be shown.
 	BOOL is_previous_entry_separator = TRUE;
 
-	LLView::child_list_t::const_iterator itor;
-	for (itor = list->begin(); itor != list->end(); ++itor)
+	for (LLView::child_list_t::const_iterator itor = list->begin(); 
+		 itor != list->end(); 
+		 ++itor)
 	{
-		std::string name = (*itor)->getName();
+		LLView *menu_item = (*itor);
+		std::string name = menu_item->getName();
 
 		// descend into split menus:
-		LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(*itor);
+		LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(menu_item);
 		if ((name == "More") && branchp)
 		{
 			hide_context_entries(*branchp->getBranch(), entries_to_show, disabled_entries);
@@ -479,7 +481,7 @@ void hide_context_entries(LLMenuGL& menu,
 		// between two separators).
 		if (found)
 		{
-			const BOOL is_entry_separator = (dynamic_cast<LLMenuItemSeparatorGL *>(*itor) != NULL);
+			const BOOL is_entry_separator = (dynamic_cast<LLMenuItemSeparatorGL *>(menu_item) != NULL);
 			if (is_entry_separator && is_previous_entry_separator)
 				found = false;
 			is_previous_entry_separator = is_entry_separator;
@@ -487,16 +489,23 @@ void hide_context_entries(LLMenuGL& menu,
 		
 		if (!found)
 		{
-			(*itor)->setVisible(FALSE);
+			if (!menu_item->getLastVisible())
+			{
+				menu_item->setVisible(FALSE);
+			}
+			menu_item->setEnabled(FALSE);
 		}
 		else
 		{
-			(*itor)->setVisible(TRUE);
+			menu_item->setVisible(TRUE);
+			// A bit of a hack so we can remember that some UI element explicitly set this to be visible
+			// so that some other UI element from multi-select doesn't later set this invisible.
+			menu_item->pushVisible(TRUE);
 			for (itor2 = disabled_entries.begin(); itor2 != disabled_entries.end(); ++itor2)
 			{
 				if (*itor2 == name)
 				{
-					(*itor)->setEnabled(FALSE);
+					menu_item->setEnabled(FALSE);
 				}
 			}
 		}
@@ -3730,6 +3739,9 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			disabled_items.push_back(std::string("Share"));
 		}
 
+		addOpenRightClickMenuOption(items);
+		items.push_back(std::string("Properties"));
+
 		getClipboardEntries(true, items, disabled_items, flags);
 
 		items.push_back(std::string("Gesture Separator"));
@@ -4379,7 +4391,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		{
 			can_open = FALSE;
 		}
-
 		items.push_back(std::string("Share"));
 		if (!canShare())
 		{
@@ -4390,6 +4401,11 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		{
 			addOpenRightClickMenuOption(items);
 		}
+		else
+		{
+			disabled_items.push_back(std::string("Open"));
+			disabled_items.push_back(std::string("Open Original"));
+		}
 
 		items.push_back(std::string("Properties"));
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 7e9a2cb716..7463658003 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -323,7 +323,9 @@ BOOL get_is_item_removable(const LLInventoryModel* model, const LLUUID& id)
 
 BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id)
 {
-	// This function doesn't check the folder's children.
+	// NOTE: This function doesn't check the folder's children.
+	// See LLFolderBridge::isItemRemovable for a function that does
+	// consider the children.
 
 	if (!model)
 	{
@@ -337,17 +339,29 @@ BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id)
 
 	if (!isAgentAvatarValid()) return FALSE;
 
-	LLInventoryCategory* category = model->getCategory(id);
+	const LLInventoryCategory* category = model->getCategory(id);
 	if (!category)
 	{
 		return FALSE;
 	}
 
-	if (LLFolderType::lookupIsProtectedType(category->getPreferredType()))
+	const LLFolderType::EType folder_type = category->getPreferredType();
+	
+	if (LLFolderType::lookupIsProtectedType(folder_type))
 	{
 		return FALSE;
 	}
 
+	// Can't delete the outfit that is currently being worn.
+	if (folder_type == LLFolderType::FT_OUTFIT)
+	{
+		const LLViewerInventoryItem *base_outfit_link = LLAppearanceMgr::instance().getBaseOutfitLink();
+		if (base_outfit_link && (category == base_outfit_link->getLinkedCategory()))
+		{
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 0ff3bb30dc..323a07a9ab 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -948,7 +948,6 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
 		return;
 
 	bool is_modifiable = false;
-	bool is_complete   = false;
 	bool is_copyable   = false;
 
 	if(mWearableItem)
@@ -956,17 +955,16 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
 		const LLPermissions& perm = mWearableItem->getPermissions();
 		is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
 		is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID());
-		is_complete = mWearableItem->isFinished();
 	}
 
-	if (is_modifiable && is_complete)
+	if (is_modifiable)
 	{
 		// Update picker controls
 		for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(update_color_swatch_ctrl, this, _1, _2));
 		for_each_picker_ctrl_entry <LLTextureCtrl>     (panel, type, boost::bind(update_texture_ctrl, this, _1, _2));
 	}
 
-	if (!is_modifiable || !is_complete || !is_copyable)
+	if (!is_modifiable || !is_copyable)
 	{
 		// Disable controls
 		for_each_picker_ctrl_entry <LLColorSwatchCtrl> (panel, type, boost::bind(set_enabled_color_swatch_ctrl, false, _1, _2));
@@ -1007,6 +1005,7 @@ void LLPanelEditWearable::revertChanges()
 	mWearablePtr->revertValues();
 	mNameEditor->setText(mWearablePtr->getName());
 	updatePanelPickerControls(mWearablePtr->getType());
+	gAgentAvatarp->wearableUpdated(mWearablePtr->getType(), FALSE);
 }
 
 void LLPanelEditWearable::showWearable(LLWearable* wearable, BOOL show)
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 240a539f2e..79d8fc7df9 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -57,9 +57,6 @@
 #define RY_I	5
 #define RZ_I	3
 
-// flycam translations in build mode should be reduced
-const F32 BUILDMODE_FLYCAM_T_SCALE = 3.f;
-
 // minimum time after setting away state before coming back
 const F32 MIN_AFK_TIME = 2.f;
 
@@ -924,14 +921,15 @@ void LLViewerJoystick::moveFlycam(bool reset)
 			cur_delta[i] = llmin(cur_delta[i]+dead_zone[i], 0.f);
 		}
 
-		// we need smaller camera movements in build mode
+		// We may want to scale camera movements up or down in build mode.
 		// NOTE: this needs to remain after the deadzone calculation, otherwise
 		// we have issues with flycam "jumping" when the build dialog is opened/closed  -Nyx
 		if (in_build_mode)
 		{
 			if (i == X_I || i == Y_I || i == Z_I)
 			{
-				cur_delta[i] /= BUILDMODE_FLYCAM_T_SCALE;
+				static LLCachedControl<F32> build_mode_scale(gSavedSettings,"FlycamBuildModeScale");
+				cur_delta[i] *= build_mode_scale;
 			}
 		}
 
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 053fe4d9d9..a096a87928 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -219,7 +219,7 @@ Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel
 				Region objekt bonus faktor: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				Prim forbrug:
+				Prim benyttelse:
 			</text>
 			<text name="objects_available">
 				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index cd6c03058b..c331908c3c 100644
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
@@ -24,6 +24,9 @@
 	<floater.string name="mini_map_northwest">
 		NV
 	</floater.string>
+	<floater.string name="mini_map_caption">
+		MINIKORT
+	</floater.string>
 	<text label="N" name="floater_map_north" text="N">
 		N
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index f49fd8c99a..a26f2f95c9 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -24,9 +24,6 @@
 	<floater.string name="Title">
 		Bevægelse: [NAME]
 	</floater.string>
-	<text name="name_text">
-		Navn:
-	</text>
 	<text name="desc_label">
 		Beskrivelse:
 	</text>
@@ -53,12 +50,15 @@
 	<button label="Op" name="up_btn"/>
 	<button label="Ned" name="down_btn"/>
 	<button label="Fjern" name="delete_btn"/>
+	<text name="options_text">
+		(valg)
+	</text>
 	<radio_group name="animation_trigger_type">
 		<radio_item label="Start" name="start"/>
 		<radio_item label="Stop" name="stop"/>
 	</radio_group>
 	<check_box label="Indtil animation er færdig" name="wait_anim_check"/>
-	<check_box label="tid i sekunder" name="wait_time_check"/>
+	<check_box label="tid i sekunder:" name="wait_time_check"/>
 	<text name="help_label">
 		Alle trin vil ske samtidigt, medmindre du tilføjer vente trin.
 	</text>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index a62bd60757..926c2429ac 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -1,23 +1,75 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Foto">
+<floater name="Snapshot" title="SE FOTO">
 	<floater.string name="unknown">
 		ukendt
 	</floater.string>
+	<radio_group label="foto type" name="snapshot_type_radio">
+		<radio_item label="Email" name="postcard"/>
+		<radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/>
+		<radio_item label="Gem til min computer" name="local"/>
+	</radio_group>
+	<text name="file_size_label">
+		[SIZE] KB
+	</text>
 	<button label="Tag nyt foto" name="new_snapshot_btn"/>
-	<line_editor label="Beskrivelse" name="description"/>
-	<panel name="panel_snapshot_main">
-		<button label="Del foto" name="share"/>
-		<button label="Gem foto" name="save"/>
-		<button label="Sæt til profilbillede" name="set_profile_pic"/>
-	</panel>
-	<panel name="panel_snapshot_share">
-		<button label="Del på internettet" name="share_to_web"/>
-		<button label="E-mail foto" name="share_to_email"/>
-		<button label="Tilbage" name="cancel_share"/>
-	</panel>
-	<panel name="panel_snapshot_save">
-		<button label="Gem til min beholdning" name="save_to_inventory"/>
-		<button label="Gem til min computer" name="save_to_computer"/>
-		<button label="Tilbage" name="cancel_save"/>
-	</panel>
+	<button label="Send" name="send_btn"/>
+	<button label="Gem (L$[AMOUNT])" name="upload_btn"/>
+	<flyout_button label="Gem" name="save_btn" tool_tip="Gem billede til en fil">
+		<flyout_button.item label="Gem" name="save_item"/>
+		<flyout_button.item label="Gem som..." name="saveas_item"/>
+	</flyout_button>
+	<button label="Mere" name="more_btn" tool_tip="Avancerede valg"/>
+	<button label="Mindre" name="less_btn" tool_tip="Avanceret opsætning"/>
+	<button label="Annullér" name="discard_btn"/>
+	<text name="type_label2">
+		Størrelse
+	</text>
+	<text name="format_label">
+		Format
+	</text>
+	<combo_box label="Opløsning" name="postcard_size_combo">
+		<combo_box.item label="Nuværende vindue" name="CurrentWindow"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="Brugerdefineret" name="Custom"/>
+	</combo_box>
+	<combo_box label="Opløsning" name="texture_size_combo">
+		<combo_box.item label="Nuværende vindue" name="CurrentWindow"/>
+		<combo_box.item label="Lille (128x128)" name="Small(128x128)"/>
+		<combo_box.item label="Medium (256x256)" name="Medium(256x256)"/>
+		<combo_box.item label="Stor (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Brugeropsat" name="Custom"/>
+	</combo_box>
+	<combo_box label="Opløsning" name="local_size_combo">
+		<combo_box.item label="Nuværende vindue" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="Brugeropsat" name="Custom"/>
+	</combo_box>
+	<combo_box label="Format" name="local_format_combo">
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
+	</combo_box>
+	<spinner label="Bredde" name="snapshot_width"/>
+	<spinner label="Højde" name="snapshot_height"/>
+	<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
+	<slider label="Billedkvalitet" name="image_quality_slider"/>
+	<text name="layer_type_label">
+		Indfang:
+	</text>
+	<combo_box label="Billedlag" name="layer_types">
+		<combo_box.item label="Farver" name="Colors"/>
+		<combo_box.item label="Dybde" name="Depth"/>
+	</combo_box>
+	<check_box label="Snitflade" name="ui_check"/>
+	<check_box label="HUDs" name="hud_check"/>
+	<check_box label="Behold åben efter gem" name="keep_open_check"/>
+	<check_box label="Frys billede (fuld skærm)" name="freeze_frame_check"/>
+	<check_box label="Auto-optegn" name="auto_snapshot_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
index 543224c6f6..86ad251103 100644
--- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Steder" name="voice_effects" title="SE STEMME &quot;MORPH&quot;">
+<floater label="Steder" name="voice_effects" title="STEMME MORPH">
 	<string name="no_voice_effect">
 		(Ingen stemme &quot;morph&quot;)
 	</string>
@@ -12,18 +12,19 @@
 	<string name="new_voice_effect">
 		(Ny!)
 	</string>
+	<text name="preview_text">
+		For at se
+	</text>
 	<text name="status_text">
-		For at se stemme &quot;morph&quot; effekter, skal du klikke på &quot;optag&quot; kanppen for at optage en stump stemme, derefter klik på en stemme &quot;morph&quot; på listen for at høre hvordan det vil lyde.
-
-For at vende tilbage til lokal stemme-chat luk dette vindue.
+		Optag en prøve, klik derefter på en stemme for at høre hvordan det vil lyde.
 	</text>
-	<button label="Optage prøve" name="record_btn" tool_tip="Optag en stemmeprøve."/>
+	<button label="Optag" name="record_btn" tool_tip="Optag en stemmeprøve."/>
 	<button label="Stop" name="record_stop_btn"/>
 	<text name="voice_morphing_link">
-		[[URL] Hent stemme &quot;morph&quot;]
+		[[URL] Abonnér nu]
 	</text>
 	<scroll_list name="voice_effect_list" tool_tip="Optag en prøve med din stemme og klik på en effekt for at teste.">
-		<scroll_list.columns label="Stemme &quot;morph&quot;" name="name"/>
+		<scroll_list.columns label="Stemme navn" name="name"/>
 		<scroll_list.columns label="Udløber" name="expires"/>
 	</scroll_list>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
index bf52e5d57f..e70b7ce33d 100644
--- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
@@ -3,11 +3,13 @@
 	<menu_item_call label="Berør" name="Attachment Object Touch"/>
 	<menu_item_call label="Redigér" name="Edit..."/>
 	<menu_item_call label="Tag af" name="Detach"/>
-	<menu_item_call label="Smid" name="Drop"/>
 	<menu_item_call label="Stå op" name="Stand Up"/>
 	<menu_item_call label="Skift sæt" name="Change Outfit"/>
+	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
+	<menu_item_call label="Redigér min figur" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>
 	<menu_item_call label="Grupper" name="Groups..."/>
 	<menu_item_call label="Profil" name="Profile..."/>
 	<menu_item_call label="Debug teksturer" name="Debug..."/>
+	<menu_item_call label="Smid" name="Drop"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
index 35bb1ae685..d6a6f2724f 100644
--- a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
@@ -4,6 +4,6 @@
 	<menu_item_call label="Tag på - Tilføj til nuværende sæt" name="wear_add"/>
 	<menu_item_call label="Tag af - Fjern fra nuværende sæt" name="take_off"/>
 	<menu_item_call label="Redigér sæt" name="edit"/>
-	<menu_item_call label="Omdøb" name="rename"/>
+	<menu_item_call label="Omdøb sæt" name="rename"/>
 	<menu_item_call label="Slet sæt" name="delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
new file mode 100644
index 0000000000..08d1c25d6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_topinfobar">
+	<menu_item_check label="Vis koordinater" name="Show Coordinates"/>
+	<menu_item_check label="Vis egenskaber for parcel" name="Show Parcel Properties"/>
+	<menu_item_call label="Landemærke" name="Landmark"/>
+	<menu_item_call label="Kopi" name="Copy"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index 6449a00f2f..0d36a08652 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -175,6 +175,7 @@
 			<menu_item_check label="Søg" name="Search"/>
 			<menu_item_call label="Frigør taster" name="Release Keys"/>
 			<menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/>
+			<menu_item_check label="Vis avanceret menu" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_check label="Løb altid" name="Always Run"/>
 			<menu_item_check label="Flyv" name="Fly"/>
 			<menu_item_call label="Luk vindue" name="Close Window"/>
diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
index 6ec5e50e5b..6a84c518ee 100644
--- a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit Wearable Context Menu">
-	<menu_item_call label="Tag på" name="wear"/>
+	<menu_item_call label="Erstat" name="wear"/>
 	<menu_item_call label="Tilføj" name="wear_add"/>
 	<menu_item_call label="Tag af" name="take_off_or_detach"/>
 	<menu_item_call label="Tag af" name="detach"/>
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
new file mode 100644
index 0000000000..39f99ad6aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Wearing">
+	<menu_item_call label="Redigér sæt" name="edit"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
new file mode 100644
index 0000000000..878c8bb04d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Wearing">
+	<menu_item_call label="Redigér sæt" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 76cf73e1e6..5ae329033d 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -288,8 +288,7 @@ Gå til [_URL] for information om køb af L$?
 		Kunne ikke &apos;forstå&apos; filen: [FILE]
 	</notification>
 	<notification name="CorruptedProtectedDataStore">
-		Vi kan ikke læse dine beskyttede data så de nulstilles.
-   Dette kan ske hvis du ændrer din netværksopsætning.
+		Vi kan ikke udfylde dit brugernavn og password.  Dette kan ske hvis du ændrer netværksopsætning
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DoNotSupportBulkAnimationUpload">
diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
index de764d8025..d2ade170d1 100644
--- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
 	<text name="item_name" value="..."/>
+	<panel name="btn_lock" tool_tip="Du har ikke rettigheder til at redigere"/>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="Rediger denne figur"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
index de764d8025..88b0636e9e 100644
--- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
+	<button name="btn_delete" tool_tip="Fjern fra sæt"/>
 	<text name="item_name" value="..."/>
+	<panel name="btn_lock" tool_tip="Du har ikke rettigheder til at redigere"/>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="Redigere denne ting der kan tages på"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
index 91d90a5660..700ad4fa14 100644
--- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
+	<button name="btn_delete" tool_tip="Fjern fra sæt"/>
 	<text name="item_name" value="..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
index 6af84de0c7..dd8d86cfbf 100644
--- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="dummy_clothing_item">
 	<text name="item_name" value="..."/>
+	<panel name="btn_add_panel">
+		<button name="btn_add" tool_tip="Tilføj flere genstande af denne type"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
index f927f918a1..604c166ef0 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
@@ -90,6 +90,7 @@
 	<string name="tattoo_desc_text">
 		Tatovering:
 	</string>
+	<labeled_back_button label="Gem" name="back_btn" tool_tip="Tilbage til redigering"/>
 	<text name="edit_wearable_title" value="Redigerer kropsbygning"/>
 	<panel label="Trøje" name="wearable_type_panel">
 		<text name="description_text" value="Kropsbygning:"/>
@@ -102,6 +103,6 @@
 	</panel>
 	<panel name="button_panel">
 		<button label="Gem som" name="save_as_button"/>
-		<button label="Vend tilbage" name="revert_button"/>
+		<button label="Annullér ændringer" name="revert_button"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index 3079a23d20..eccddb55c8 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
@@ -46,7 +46,7 @@
 		<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når &quot;Tilmeldingsgebyr&quot; er valgt." width="60"/>
 		<combo_box name="group_mature_check" tool_tip="Angiver om din gruppes information anses som &apos;mature&apos;." width="150">
 			<combo_item name="select_mature">
-				- Vælg Mature -
+				- Vælg indholdsrating -
 			</combo_item>
 			<combo_box.item label="Mature indhold" name="mature"/>
 			<combo_box.item label="PG indhold" name="pg"/>
diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
index a02c9ba399..3890f07324 100644
--- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
@@ -13,7 +13,9 @@
 	<string name="Filter.All" value="Alle"/>
 	<string name="Filter.Clothes/Body" value="Tøj/Krop"/>
 	<string name="Filter.Objects" value="Objekter"/>
-	<string name="Filter.Custom" value="Tilpasset filter"/>
+	<string name="Filter.Clothing" value="Tøj"/>
+	<string name="Filter.Bodyparts" value="Kropsdele"/>
+	<string name="replace_body_part" value="Klik for at erstatte din nuværende figur"/>
 	<text name="title" value="Redigér sæt"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
@@ -25,7 +27,7 @@
 		<layout_panel label="IM kontrolpanel" name="outfit_wearables_panel">
 			<layout_stack name="filter_panels">
 				<layout_panel name="add_button_and_combobox">
-					<button label="Tilføj mere..." name="show_add_wearables_btn"/>
+					<button label="Tilføj mere..." name="show_add_wearables_btn" tool_tip="Åben/Luk"/>
 				</layout_panel>
 				<layout_panel name="filter_panel">
 					<filter_editor label="Filtrér tøj i beholdning" name="look_item_filter"/>
@@ -36,6 +38,6 @@
 	</layout_stack>
 	<panel name="save_revert_button_bar">
 		<button label="Gem" name="save_btn"/>
-		<button label="Gendan" name="revert_btn"/>
+		<button label="Annullér ændringer" name="revert_btn" tool_tip="Vend tilbage til sidst gemte version"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
index 4bc9ff99a9..da40bd3c27 100644
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
@@ -6,7 +6,7 @@
 	</tab_container>
 	<panel name="bottom_panel">
 		<button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
-		<dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/>
+		<dnd_button name="trash_btn" tool_tip="Slet valgte sæt"/>
 		<button label="Gem som" name="save_btn"/>
 		<button label="Tag på" name="wear_btn" tool_tip="Tag valgte sæt på"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 586896041d..62214089f5 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -50,10 +50,7 @@
 			m
 		</text>
 		<slider label="Maks. antal partikler:" name="MaxParticleCount"/>
-		<slider label="Maks. avatar optegningsafstand:" name="MaxAvatarDrawDistance"/>
-		<text name="DrawDistanceMeterText3">
-			m
-		</text>
+		<slider label="Maks. antal mini-avatarer:" name="MaxNumberAvatarDrawn"/>
 		<slider label="Efterbehandlingskvalitet:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Netmaske detaljer:
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
index 8800d2e12d..50f561ec7f 100644
--- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_voice_effect">
 	<string name="no_voice_effect">
-		Ingen stemme &quot;morph&quot;
+		Voice Morphing Off
 	</string>
 	<string name="preview_voice_effects">
 		Se stemme &quot;morph&quot;  ▶
@@ -9,7 +9,7 @@
 	<string name="get_voice_effects">
 		Hente stemme &quot;morph&quot;  ▶
 	</string>
-	<combo_box name="voice_effect" tool_tip="Vælg en stemme &quot;morph&quot; effekt for at ændre din stemme.">
-		<combo_box.item label="Ingen stemme &quot;morph&quot;" name="no_voice_effect"/>
+	<combo_box name="voice_effect" tool_tip="Vælg en stemme &quot;morph&quot; for at ændre din stemme">
+		<combo_box.item label="Stemme morph slukket" name="no_voice_effect"/>
 	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index be049bea38..c5caefe070 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -3,12 +3,14 @@
 	<string name="No Outfit" value="Intet sæt"/>
 	<string name="Unsaved Changes" value="Ikke gemte ændringer"/>
 	<string name="Now Wearing" value="Bærer nu..."/>
+	<string name="Changing outfits" value="Skift sæt"/>
 	<panel name="panel_currentlook">
 		<button label="E" name="editappearance_btn"/>
 		<button label="O" name="openoutfit_btn"/>
 		<text name="currentlook_status">
 			(Status)
 		</text>
+		<button label="" name="edit_outfit_btn" tool_tip="Redigér dette sæt"/>
 	</panel>
 	<filter_editor label="Filtrér sæt" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index 701a59bade..ff20e21999 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Objekt profil">
+<panel name="item properties" title="Profil for genstand">
 	<panel.string name="unknown">
 		(ukendt)
 	</panel.string>
@@ -15,7 +15,7 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
-	<text name="title" value="Objekt profil"/>
+	<text name="title" value="Profil for genstand"/>
 	<text name="where" value="(Beholdning)"/>
 	<panel label="">
 		<text name="LabelItemNameTitle">
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index af0f685826..66c75aca4c 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -294,6 +294,9 @@
 	<string name="ReleaseNotes">
 		Noter om version
 	</string>
+	<string name="RELEASE_NOTES_BASE_URL">
+		http://wiki.secondlife.com/wiki/Release_Notes/
+	</string>
 	<string name="LoadingData">
 		Henter...
 	</string>
@@ -840,6 +843,9 @@
 	<string name="invalid">
 		ugyldig
 	</string>
+	<string name="none">
+		ingen
+	</string>
 	<string name="shirt_not_worn">
 		Trøje - ikke på
 	</string>