Merge pull request #5852 from secondlife/marchcat/slua-26.2

26.2 -> SLua viewer

7 files changed, 10 insertions, 61 deletions

diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 49e1397e9f..c756bc6969 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="JOYSTICK OPSÆTNING">
 	<check_box label="Aktiver Joystick:" name="enable_joystick"/>
-	<spinner label="X akse mapping" name="JoystickAxis1"/>
-	<spinner label="Y akse mapping" name="JoystickAxis2"/>
-	<spinner label="Z akse mapping" name="JoystickAxis0"/>
-	<spinner label="Hældning mapping" name="JoystickAxis4"/>
-	<spinner label="Drejning mapping" name="JoystickAxis5"/>
-	<spinner label="Rulning mapping" name="JoystickAxis3"/>
-	<spinner label="Zoom mapping" name="JoystickAxis6"/>
+	<spinner label="X akse mapping" name="JoystickAxis1" label_width="115" width="155"/>
+	<spinner label="Y akse mapping" name="JoystickAxis2" label_width="115" width="155"/>
+	<spinner label="Z akse mapping" name="JoystickAxis0" label_width="115" width="155"/>
+	<spinner label="Hældning mapping" name="JoystickAxis4" label_width="115" width="155"/>
+	<spinner label="Drejning mapping" name="JoystickAxis5" label_width="115" width="155"/>
+	<spinner label="Rulning mapping" name="JoystickAxis3" label_width="115" width="155"/>
+	<spinner label="Zoom mapping" name="JoystickAxis6" label_width="115" width="155"/>
 	<check_box label="Direkte zoom" name="ZoomDirect"/>
 	<check_box label="3D Cursor" name="Cursor3D"/>
 	<check_box label="Auto opret" name="AutoLeveling"/>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
deleted file mode 100644
index cb4cbba570..0000000000
--- a/indra/newview/skins/default/xui/da/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="Lyd enheder">
-	<text name="voice_label">
-		Stemme chat
-	</text>
-	<check_box label="Aktiveret" name="enable_voice"/>
-</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
deleted file mode 100644
index 86ad251103..0000000000
--- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Steder" name="voice_effects" title="STEMME MORPH">
-	<string name="no_voice_effect">
-		(Ingen stemme &quot;morph&quot;)
-	</string>
-	<string name="active_voice_effect">
-		(Aktiv)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Ikke aktiveret)
-	</string>
-	<string name="new_voice_effect">
-		(Ny!)
-	</string>
-	<text name="preview_text">
-		For at se
-	</text>
-	<text name="status_text">
-		Optag en prøve, klik derefter på en stemme for at høre hvordan det vil lyde.
-	</text>
-	<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] 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 navn" name="name"/>
-		<scroll_list.columns label="Udløber" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
index 443e84b64a..e05be4e310 100644
--- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
@@ -3,7 +3,7 @@
 	<text name="media_label">
 		Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)"/>
+	<line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)" bottom_delta="25"/>
 	<button label="OK" name="ok_btn"/>
 	<button label="Annullér" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index 7caa17d514..fa245416cf 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -4,6 +4,7 @@
 		Vis mig når:
 	</text>
 	<check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/>
+    <check_box name="notify_money_spend_checkbox" left_delta="70"/>
 	<check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
 		Vis altid:
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index 26d2ae4abd..acae39061b 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -30,7 +30,7 @@
 		<radio_item label="Avatar position" name="1"/>
 	</radio_group>
 	<check_box label="Bevæg avatar-læber når der snakkes" name="enable_lip_sync"/>
-	<check_box label="Skift tale tænd/sluk når jeg trykker:" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/>
+	<check_box label="Skift tale tænd/sluk når jeg trykker" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/>
 	<line_editor label="Tryk-for-tale udløser" name="modifier_combo"/>
 	<button label="Angiv taste" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste muse-knap"/>
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
deleted file mode 100644
index 50f561ec7f..0000000000
--- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Voice Morphing Off
-	</string>
-	<string name="preview_voice_effects">
-		Se stemme &quot;morph&quot;  ▶
-	</string>
-	<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; for at ændre din stemme">
-		<combo_box.item label="Stemme morph slukket" name="no_voice_effect"/>
-	</combo_box>
-</panel>