From 8b0b7c9e89baa351301562b81da2446e6b46d3c3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 25 Nov 2011 21:51:37 +0100
Subject: [PATCH] Made media lists floater localizable plus minor overhaul and
 German translation

---
 indra/newview/floatermedialists.cpp           |  4 +-
 .../default/xui/de/floater_media_lists.xml    | 42 +++++++++++++++++++
 .../default/xui/en/floater_media_lists.xml    | 38 ++++++++++-------
 3 files changed, 67 insertions(+), 17 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_media_lists.xml

diff --git a/indra/newview/floatermedialists.cpp b/indra/newview/floatermedialists.cpp
index 1adabda578..336d5bda23 100644
--- a/indra/newview/floatermedialists.cpp
+++ b/indra/newview/floatermedialists.cpp
@@ -107,7 +107,7 @@ void FloaterMediaLists::onWhitelistAdd( void* data )
 	self->getChildView("input_domain")->setVisible(true);
 	self->getChildView("commit_domain")->setVisible(true);
 	self->getChild<LLUICtrl>("add_text")->
-	setValue(std::string("Enter domain or URL to always allow:"));
+	setValue(self->getString("EnterUrlAllow"));
 	self->getChildView("add_text")->setVisible(true);
 	sIsWhitelist = true;
 }
@@ -152,7 +152,7 @@ void FloaterMediaLists::onBlacklistAdd( void* data )
 	self->getChildView("input_domain")->setVisible(true);
 	self->getChildView("commit_domain")->setVisible(true);
 	self->getChild<LLUICtrl>("add_text")->
-	setValue(std::string("Enter domain or URL to never allow:"));
+	setValue(self->getString("EnterUrlDeny"));
 	self->getChildView("add_text")->setVisible(true);
 	self->sIsWhitelist = false;
 }
diff --git a/indra/newview/skins/default/xui/de/floater_media_lists.xml b/indra/newview/skins/default/xui/de/floater_media_lists.xml
new file mode 100644
index 0000000000..ac95698c0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_media_lists.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floatermedialists" title="Medienlisten">
+	<floater.string name="EnterUrlAllow">
+		Domäne oder URL eingeben, die immer erlaubt wird:
+	</floater.string>
+	<floater.string name="EnterUrlDeny">
+		Domäne oder URL eingeben, die niemals erlaubt wird:
+	</floater.string>
+	<layout_stack name="lists_layout_stack">
+		<layout_panel name="whitelist_layout_panel">
+			<text name="whitelist_text">
+				Erlaubte Domänen:
+			</text>
+			<layout_stack name="whitelist_buttons_layout_stack">
+				<layout_panel name="whitelist_buttons_panel_add">
+					<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_whitelist"/>
+				</layout_panel>
+				<layout_panel name="whitelist_buttons_panel_remove">
+					<button label="Entfernen" label_selected="Entfernen" name="remove_whitelist"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+
+		<layout_panel name="blacklist_layout_panel">
+			<text name="blacklist_text">
+				Blockierte Domänen:
+			</text>
+			<layout_stack name="blacklist_buttons_layout_stack">
+				<layout_panel name="blacklist_buttons_panel_add">
+					<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_blacklist"/>
+				</layout_panel>
+				<layout_panel name="blacklist_buttons_panel_remove">
+					<button label="Entfernen" label_selected="Entfernen" name="remove_blacklist"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+
+<!-- This text will be replaced accordingly to ast for a URL/Domain to add to white-/blacklist -->
+	<text initial_value="URL eingeben:" name="add_text"/>
+	<button label="Hinzufügen" label_selected="Hinzufügen" name="commit_domain"/>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_media_lists.xml b/indra/newview/skins/default/xui/en/floater_media_lists.xml
index f35558725f..ff520129da 100644
--- a/indra/newview/skins/default/xui/en/floater_media_lists.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_lists.xml
@@ -9,14 +9,22 @@
     name="floatermedialists"
 	title="Media Lists"
     width="460"
+    min_height="300"
+    min_width="460"
 	rect_control="MediaListRect">
+	<floater.string name="EnterUrlAllow">
+		Enter domain or URL to always allow:
+	</floater.string>
+	<floater.string name="EnterUrlDeny">
+		Enter domain or URL to never allow:
+	</floater.string>
 
 	<layout_stack
 		name="lists_layout_stack"
 		left="10"
 		top="10"
 		right="-10"
-		height="230"
+		height="234"
 		follows="all"
 		orientation="horizontal"
 		layout="topleft">
@@ -24,7 +32,7 @@
 	<layout_panel
 		name="whitelist_layout_panel"
 		width="220"
-		height="200"
+		height="204"
 		auto_resize="true"
 		follows="all"
 		layout="topleft">
@@ -62,7 +70,7 @@
 		name="whitelist_buttons_layout_stack"
 		left="0"
 		top_pad="4"
-		height="16"
+		height="20"
 		follows="left|right|bottom"
 		orientation="horizontal"
 		layout="topleft">
@@ -70,7 +78,7 @@
 	<layout_panel
 		name="whitelist_buttons_panel_add"
 		width="110"
-		height="16"
+		height="20"
 		user_resize="false"
 		auto_resize="true"
 		follows="all"
@@ -79,7 +87,7 @@
 	<button
 		top="0"
 		left="0"
-		height="16"
+		height="20"
 		right="-2"
 		enabled="true"
 		follows="all"
@@ -94,7 +102,7 @@
 	<layout_panel
 		name="whitelist_buttons_panel_remove"
 		width="110"
-		height="16"
+		height="20"
 		auto_resize="true"
 		follows="all"
 		layout="topleft">
@@ -102,7 +110,7 @@
 	<button
 		top="0"
 		left="2"
-		height="16"
+		height="20"
 		right="-1"
 		enabled="true"
 		follows="all"
@@ -121,7 +129,7 @@
 	<layout_panel
 		name="blacklist_layout_panel"
 		width="220"
-		height="200"
+		height="204"
 		auto_resize="true"
 		follows="all"
 		layout="topleft">
@@ -159,7 +167,7 @@
 		name="blacklist_buttons_layout_stack"
 		left="5"
 		top_pad="4"
-		height="16"
+		height="20"
 		follows="left|right|bottom"
 		orientation="horizontal"
 		layout="topleft">
@@ -167,7 +175,7 @@
 	<layout_panel
 		name="blacklist_buttons_panel_add"
 		width="110"
-		height="16"
+		height="20"
 		user_resize="false"
 		auto_resize="true"
 		follows="all"
@@ -176,7 +184,7 @@
 	<button
 		top="0"
 		left="0"
-		height="16"
+		height="20"
 		right="-2"
 		enabled="true"
 		follows="all"
@@ -191,7 +199,7 @@
 	<layout_panel
 		name="blacklist_buttons_panel_remove"
 		width="110"
-		height="16"
+		height="20"
 		auto_resize="true"
 		follows="all"
 		layout="topleft">
@@ -199,7 +207,7 @@
 	<button
 		top="0"
 		left="2"
-		height="16"
+		height="20"
 		right="-1"
 		enabled="true"
 		follows="all"
@@ -237,7 +245,7 @@
 		top_pad="4"
 		follows="left|bottom|right"
 		font="SansSerifSmall"
-		height="16"
+		height="20"
 		name="input_domain"
 		right="-94"
 		select_all_on_focus_received="true"
@@ -249,7 +257,7 @@
 		follows="bottom|right"
 		font="SansSerifSmall"
 		halign="center"
-		height="16"
+		height="20"
 		left_pad="4"
 		label="Add"
 		label_selected="Add"