From f26027937c668e79de3eec280bebee3ce4b579b2 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Fri, 27 Mar 2015 01:58:21 +0100
Subject: [PATCH] Prefs refactoring: Sound & Media tab

---
 .../xui/da/panel_preferences_sound.xml        | 111 ++--
 .../xui/de/panel_preferences_alerts.xml       |   5 -
 .../xui/de/panel_preferences_sound.xml        |  63 +-
 .../xui/en/panel_preferences_alerts.xml       |  30 +-
 .../default/xui/en/panel_preferences_chat.xml |   2 +-
 .../xui/en/panel_preferences_sound.xml        | 546 ++++++++++--------
 .../xui/es/panel_preferences_alerts.xml       |   5 -
 .../xui/es/panel_preferences_sound.xml        |  53 +-
 .../xui/fr/panel_preferences_sound.xml        |  84 +--
 .../xui/it/panel_preferences_sound.xml        |  16 +-
 .../xui/ja/panel_preferences_alerts.xml       |   8 +-
 .../xui/ja/panel_preferences_sound.xml        |  68 ++-
 .../xui/pl/panel_preferences_alerts.xml       |   5 -
 .../xui/pl/panel_preferences_sound.xml        |  59 +-
 .../xui/pt/panel_preferences_sound.xml        |  76 +--
 .../xui/ru/panel_preferences_sound.xml        |  16 +-
 .../xui/tr/panel_preferences_sound.xml        |  76 +--
 .../xui/zh/panel_preferences_sound.xml        |  76 +--
 18 files changed, 696 insertions(+), 603 deletions(-)

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 fd1b5bef06..2a4056eae6 100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -3,60 +3,59 @@
 	<panel.string name="middle_mouse">
 		Midterste museknap
 	</panel.string>
-	<slider label="Generel" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">
-		Sluk for lyd når minimeret
-	</text>
-	<slider label="Knapper" name="UI Volume"/>
-	<slider label="Omgivelser" name="Wind Volume"/>
-	<slider label="Lyd effekter" name="SFX Volume"/>
-	<slider label="Musik" name="Music Volume"/>
-	<check_box label="Aktiveret" name="enable_music"/>
-	<slider label="Media" name="Media Volume"/>
-	<check_box label="Aktiveret" name="enable_media"/>
-	<slider label="Stemme chat" name="Voice Volume"/>
-	<check_box label="Aktiveret" name="enable_voice_check_volume"/>
-	<check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="true"/>
-	<check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="true"/>
-	<text name="voice_chat_settings">
-		Stemme chat opsætning
-	</text>
-	<text name="Listen from">
-		Hør stemmer fra:
-	</text>
-	<radio_group name="ear_location">
-		<radio_item label="Kamera position" name="0"/>
-		<radio_item label="Avatar position" name="1"/>
-	</radio_group>
-	<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)"/>
-	<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"/>
-	<button label="Input/Output enheder" name="device_settings_btn"/>
-	<panel label="Enhedsopsætning" name="device_settings_panel">
-		<panel.string name="default_text">
-			Standard
-		</panel.string>
-		<panel.string name="default system device">
-			Standard systemenhed
-		</panel.string>
-		<panel.string name="no device">
-			Ingen enheder
-		</panel.string>
-		<text name="Input">
-			Input
-		</text>
-		<text name="My volume label">
-			Min lydstyrke:
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ændre lydstyrke med denne skyder"/>
-		<text name="wait_text">
-			Vent venligst
-		</text>
-		<text name="Output">
-			Output
-		</text>
-	</panel>
+	<tab_container name="tabs">
+		<panel name="Media Sounds Panel">
+			<slider label="Generel" name="System Volume"/>
+			<check_box label="Sluk for lyd når minimeret" name="mute_when_minimized"/>
+			<slider label="Knapper" name="UI Volume"/>
+			<slider label="Omgivelser" name="Wind Volume"/>
+			<slider label="Lyd effekter" name="SFX Volume"/>
+			<slider label="Musik" name="Music Volume"/>
+			<check_box label="Aktiveret" name="enable_music"/>
+			<slider label="Media" name="Media Volume"/>
+			<check_box label="Aktiveret" name="enable_media"/>
+			<slider label="Stemme chat" name="Voice Volume"/>
+			<check_box label="Aktiveret" name="enable_voice_check_volume"/>
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="true"/>
+			<check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="true"/>
+		</panel>
+		<panel name="Media Voice tab">
+			<radio_group name="ear_location">
+				<radio_item label="Kamera position" name="0"/>
+				<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)"/>
+			<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"/>
+			<button label="Input/Output enheder" name="device_settings_btn"/>
+			<panel label="Enhedsopsætning" name="device_settings_panel">
+				<panel.string name="default_text">
+					Standard
+				</panel.string>
+				<panel.string name="default system device">
+					Standard systemenhed
+				</panel.string>
+				<panel.string name="no device">
+					Ingen enheder
+				</panel.string>
+				<text name="Input">
+					Input
+				</text>
+				<text name="My volume label">
+					Min lydstyrke:
+				</text>
+				<slider_bar name="mic_volume_slider" tool_tip="Ændre lydstyrke med denne skyder"/>
+				<text name="wait_text">
+					Vent venligst
+				</text>
+				<text name="Output">
+					Output
+				</text>
+			</panel>
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index 1fb8e75fad..0659837de1 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -24,11 +24,6 @@
 	<check_box label="Als Toasts" name="friends_online_notify_checkbox"/>
 	<check_box name="OnlineOfflinetoNearbyChat" label="In lokalem Chat &amp; Konsole"/>
 	<check_box label="Nur in lokalem Chat" name="OnlineOfflinetoNearbyChatHistory"/>
-	<text name="friends_logon_sounds_label">
-		Klang abspielen wenn sich Freunde:
-	</text>
-	<check_box label="Einloggen" name="friends_notify_online_sound"/>
-	<check_box label="Ausloggen" name="friends_notify_offline_sound"/>
 	<check_box label="Wenn sich die Skriptanzahl in der Region ändert" name="FSReportTotalScriptCountChanges"/>
 	<spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="Der Schwellwert, ab dem Änderungen an der Skriptanzahl in der Region gemeldet werden [Standard: 100]"/>
 	<check_box label="Kollisionsmeldungen im Chat in der Nähe anzeigen" name="FSCollisionMessagesInChat"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index 63a1e68858..6537a5ba09 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -4,8 +4,8 @@
 	Mittlere Maustaste
 </panel.string>
 <tab_container label="Firestorm Prefs" name="tabs">
-    <!-- General -->
-    <panel label="Allgemein" name="Media General Panel">
+    <!-- Sounds -->
+    <panel label="Allgemein" name="Media Sounds Panel">
 		<slider label="Master-Lautstärke" name="System Volume"/>
 		<check_box name="mute_when_minimized" label="Stummschalten, wenn minimiert"/>
 		<slider label="Schaltflächen" name="UI Volume"/>
@@ -19,30 +19,23 @@
 		<check_box label="Aktiviert" name="enable_media"/>
 		<slider label="Voice-Chat" name="Voice Volume"/>
 		<check_box label="Aktiviert" name="enable_voice_check_volume"/>
-		<check_box label="Automatische Audio-Wiedergabe zulassen" name="audio_auto_play_btn" tool_tip="Hier aktivieren, um Audio-Streams automatisch wiederzugeben."/>
+		<text name="friends_logon_sounds_label">
+			Klang abspielen wenn sich Freunde:
+		</text>
+		<check_box label="Einloggen" name="friends_notify_online_sound"/>
+		<check_box label="Ausloggen" name="friends_notify_offline_sound"/>
+		<text name="money_change_threshold_label" tool_tip="Spielt einen Soundbenachrichtung ab, wenn der angegebene Geldbetrag empfangen oder ausgegeben wird." width="160">
+			Schwellwert für L$-Änderung:
+		</text>
+    </panel>
+	
+	<!-- Media -->
+	<panel label="Media" name="Media Media Panel">
 		<check_box label="Automatische Medien-Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben."/>
 		<check_box name="media_allowscript_btn" tool_tip="Erlaubt bzw. verbietet Scripten die Kontrolle über die Medienwiedergabe" label="Skripte erlauben Medien abzuspielen" />
 		<check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden."/>
 		<check_box name="media_filter" tool_tip="Aktiviert den Medienfilter, der abhängig der Medien-URL die Wiedergabe erlaubt oder verbietet." label="Medienfilter aktivieren (erhöhte Sicherheit)"/>
-		<button label="Listen bearbeiten..." name="edit_media_lists_button" left_pad="45"/>
-		<text name="show_stream_metadata_text">
-			Musikstream-Titel anzeigen:
-		</text>
-		<radio_group name="show_stream_metadata">
-			<radio_item label="Aus" name="radio_off"/>
-			<radio_item label="Toasts" name="radio_toasts"/>
-			<radio_item label="Chat in der Nähe" name="radio_chat"/>
-		</radio_group>
-        <check_box name="StreamMetadataAnnounceToChat" label="Stream-Titel an diesen Kanal senden:" width="230"/>
-        <check_box name="FSFadeAudioStream" tool_tip="Aktiviert Fading, wenn sich der Parzellen-Audiostream ändert" label="Parzellen-Audiostream-Fading aktivieren:"/>
-		<slider label="Einblenden" label_width="70" name="FSAudioMusicFadeIn" tool_tip="Einblenddauer für Parzellen-Audiostream."/>
-		<text name="FSAudioMusicFadeInSeconds">
-			Sekunden
-		</text>
-		<slider label="Ausblenden" label_width="70" name="FSAudioMusicFadeOut" tool_tip="Ausblenddauer für Parzellen-Audiostream."/>
-		<text name="FSAudioMusicFadeOutSeconds">
-			Sekunden
-		</text>
+		<button label="Listen bearbeiten..." name="edit_media_lists_button"/>
         <text name="Media Rolloff">
             Lautstärkeabfall-Distanz:
         </text>
@@ -54,13 +47,33 @@
         <text name="MaxMeters">
             Meter
         </text>
-		<text name="money_change_threshold_label" tool_tip="Spielt einen Soundbenachrichtung ab, wenn der angegebene Geldbetrag empfangen oder ausgegeben wird." width="160">
-			Schwellwert für L$-Änderung:
+    </panel>
+	
+	<!-- Music -->
+	<panel label="Musik" name="Media Music Panel">
+		<check_box label="Automatische Audio-Wiedergabe zulassen" name="audio_auto_play_btn" tool_tip="Hier aktivieren, um Audio-Streams automatisch wiederzugeben."/>
+        <check_box name="FSFadeAudioStream" tool_tip="Aktiviert Fading, wenn sich der Parzellen-Audiostream ändert" label="Parzellen-Audiostream-Fading aktivieren:"/>
+		<slider label="Einblenden:" width="270" label_width="70" name="FSAudioMusicFadeIn" tool_tip="Einblenddauer für Parzellen-Audiostream."/>
+		<text left_delta="275" name="FSAudioMusicFadeInSeconds">
+			Sekunden
 		</text>
+		<slider label="Ausblenden:" width="270" label_width="70" name="FSAudioMusicFadeOut" tool_tip="Ausblenddauer für Parzellen-Audiostream."/>
+		<text left_delta="275" name="FSAudioMusicFadeOutSeconds">
+			Sekunden
+		</text>
+		<text name="show_stream_metadata_text">
+			Musikstream-Titel anzeigen:
+		</text>
+		<radio_group name="show_stream_metadata">
+			<radio_item label="Aus" name="radio_off"/>
+			<radio_item label="Toasts" name="radio_toasts"/>
+			<radio_item label="Chat in der Nähe" name="radio_chat"/>
+		</radio_group>
+        <check_box name="StreamMetadataAnnounceToChat" label="Stream-Titel an diesen Kanal senden:" width="230"/>
     </panel>
 
 	<!-- Voice -->
-	<panel label="Voice-Chat-Einstellungen" name="Media Voice tab">
+	<panel label="Voice-Chat" name="Media Voice tab">
 		<check_box label="Voice-Chat aktivieren" name="enable_voice_check" width="140"/>
 		<button name="reset_voice_button" tool_tip="Voice-Chat zurücksetzen"/>
 		<check_box label="Voice-Chat in mehreren Viewer-Instanzen gleichzeitig erlauben" name="VoiceMultiInstance"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 42583a2c19..4e46722a4f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -183,34 +183,6 @@
       left_pad="0"
       name="OnlineOfflinetoNearbyChatHistory"
       width="180" />
-      <text
-        type="string"
-        length="1"
-        follows="top|left"
-        height="15"
-        layout="topleft"
-        left="30"
-        top_pad="2"
-        name="friends_logon_sounds_label"
-        width="225">
-        Play a sound when my friends:
-      </text>
-      <check_box
-      control_name="PlayModeUISndFriendOnline"
-      name="friends_notify_online_sound"
-      label="Log in"
-      layout="topleft"
-      left_pad="10"
-      height="16"
-      width="85" />
-      <check_box
-      control_name="PlayModeUISndFriendOffline"
-      name="friends_notify_offline_sound"
-      label="Log out"
-      layout="topleft"
-      left_pad="0"
-      height="18"
-      width="85" />
       
       <check_box
       control_name="FSReportTotalScriptCountChanges"
@@ -218,7 +190,7 @@
       label="When the region's total script count changes:"
       layout="topleft"
       left="10"
-      top_pad="2"
+      top_pad="7"
       name="FSReportTotalScriptCountChanges"
       width="300" />
       <spinner
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2a47acc303..fc9243656d 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -418,7 +418,7 @@
              left="20"
              height="12"
              width="110"
-             top_pad="10">
+             top_pad="15">
                  Show IMs in:
             </text>
             <radio_group
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 99a2d591b4..ab4cf25216 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -26,15 +26,15 @@
  tab_min_width="50"
  tab_position="top" >
 
-    <!-- General -->
+    <!-- Sounds -->
     <panel
      top_pad="5"
      bottom="-1"
      left="1"
      right="-1"
      follows="all"
-     label="General"
-     name="Media General Panel" >
+     label="Sounds"
+     name="Media Sounds Panel" >
 
         <slider
          control_name="AudioLevelMaster"
@@ -50,7 +50,7 @@
          name="System Volume"
          show_text="false"
          slider_label.halign="right"
-         top="5"
+         top="10"
          volume="true"
          width="300">
             <slider.commit_callback
@@ -351,17 +351,78 @@
          name="enable_voice_check_volume"
          width="110"/>
 
-        <check_box
-         name="audio_auto_play_btn"
-         control_name="FSParcelMusicAutoPlay"
-         enabled_control="AudioStreamingMusic"
+        <text
+         type="string"
+         length="1"
+         follows="top|left"
+         height="15"
+         layout="topleft"
+         left="26"
+         top_pad="15"
+         name="friends_logon_sounds_label"
+         width="225">
+            Play a sound when my friends:
+        </text>
+        <check_box
+         control_name="PlayModeUISndFriendOnline"
+         name="friends_notify_online_sound"
+         label="Log in"
          layout="topleft"
-         height="16"
-         width="230"
-         tool_tip="Check this to automatically start audio streams."
-         label="Allow Audio to auto-play"
          top_pad="5"
-         left="25"/>
+         left_delta="5"
+         height="16"
+         width="85" />
+        <check_box
+         control_name="PlayModeUISndFriendOffline"
+         name="friends_notify_offline_sound"
+         label="Log out"
+         layout="topleft"
+         left_pad="0"
+         height="18"
+         width="85" />
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left="26"
+         name="money_change_threshold_label"
+         tool_tip="Plays a sound when money is spent or received higher then the amount set here."
+         mouse_opaque="false"
+         top_pad="10"
+         width="117">
+            L$ change threshold:
+        </text>
+        <spinner
+         control_name="UISndMoneyChangeThreshold"
+         enabled="true"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         top_pad="7"
+         left_delta="5"
+         increment="10"
+         initial_value="10"
+         max_val="10000"
+         min_val="0"
+         name="money_change_threshold"
+         width="75" />
+
+    </panel>
+
+    <!-- Media -->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Media"
+     name="Media Media Panel" >
+
         <check_box
          name="media_auto_play_btn"
          control_name="ParcelMediaAutoPlayEnable"
@@ -370,8 +431,8 @@
          height="16"
          width="230"
          tool_tip="Check this to automatically start media."
-         label="Allow Media to auto-play"
-         top_pad="1"
+         label="Allow media to auto-play"
+         top_pad="10"
          left="25"/>
         <check_box
          name="media_allowscript_btn"
@@ -382,7 +443,7 @@
          width="230"
          tool_tip="This settings allows / disallows scripted prims from controlling your media connections"
          label="Allow inworld scripts to play media"
-         top_pad="1"
+         top_pad="3"
          left="25"/>
         <check_box
          name="media_show_on_others_btn"
@@ -393,7 +454,7 @@
          width="230"
          tool_tip="Uncheck this to hide media attached to other avatars nearby"
          label="Play media attached to other avatars"
-         top_pad="1"
+         top_pad="3"
          left="25"/>
 
         <check_box
@@ -412,63 +473,237 @@
          follows="left|top"
          height="23"
          label="Manage Media Sites"
-         top_delta="-5"
-         left_pad="10"
+         top_pad="3"
          name="edit_media_lists_button"
-         width="150">
+         width="200">
             <button.commit_callback
              function="Floater.Show"
              parameter="media_lists" />
         </button>
-        
-		<text
-			type="string"
-			length="1"
-			follows="left|top"
-			height="20"
-			layout="topleft"
-			left="26"
-			name="show_stream_metadata_text"
-			top_pad="2"
-			width="200">
-			Show stream title notifications:
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left="25"
+         name="Media Rolloff"
+         mouse_opaque="false"
+         top_pad="15"
+         width="450">
+            Media source volume rolloff distance:
         </text>
-		<radio_group
-			control_name="ShowStreamMetadata"
-			height="20"
-			width="300"
-			layout="topleft"
-			left_pad="0"
-			name="show_stream_metadata">
+        <slider
+         can_edit_text="true"
+         control_name="MediaRollOffMin"
+         decimal_digits="0"
+         label="Starts getting quieter at:"
+         follows="left|top"
+         height="15"
+         increment="1"
+         initial_value="5"
+         layout="topleft"
+         left="45"
+         max_val="512"
+         min_val="1"
+         name="MediaRollOffMin"
+         top_delta="20"
+         width="380"
+         label_width="165"
+         tool_tip="Minimum distance from the source for rolloff to begin taking effect."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="385"
+         name="MinMeters"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            meters
+        </text>
+        <slider
+         can_edit_text="true"
+         control_name="MediaRollOffMax"
+         decimal_digits="0"
+         label="Completely disappears at:"
+         follows="left|top"
+         height="15"
+         increment="1"
+         initial_value="30"
+         layout="topleft"
+         left="45"
+         max_val="512"
+         min_val="1"
+         name="MediaRollOffMax"
+         top_delta="17"
+         width="380"
+         label_width="165"
+         tool_tip="Maximum distance from the source for rolloff to completely mute the sound."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="385"
+         name="MaxMeters"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            meters
+        </text>
+
+    </panel>
+
+    <!-- Music -->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Music"
+     name="Media Music Panel" >
+
+        <check_box
+         name="audio_auto_play_btn"
+         control_name="FSParcelMusicAutoPlay"
+         enabled_control="AudioStreamingMusic"
+         layout="topleft"
+         height="16"
+         width="230"
+         tool_tip="Check this to automatically start audio streams."
+         label="Allow audio streams to auto-play"
+         top_pad="10"
+         left="25"/>
+
+        <check_box
+         name="FSFadeAudioStream"
+         control_name="FSFadeAudioStream"
+         follows="left|top"
+         layout="topleft"
+         height="16"
+         tool_tip="Check this if fading should be used when the parcel audio stream changes"
+         label="Enable Parcel Audio Fading:"
+         top_pad="3"
+         left="25"/>
+        <slider
+         can_edit_text="true"
+         control_name="FSAudioMusicFadeIn"
+         decimal_digits="2"
+         enabled_control="FSFadeAudioStream"
+         label="Fade in:"
+         follows="left|top"
+         height="15"
+         increment="0.05"
+         initial_value="3"
+         layout="topleft"
+         left="45"
+         max_val="10"
+         min_val="0"
+         name="FSAudioMusicFadeIn"
+         top_delta="20"
+         width="250"
+         label_width="50"
+         tool_tip="Audio fade in time for parcel audio."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="255"
+         name="FSAudioMusicFadeInSeconds"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            seconds
+        </text>
+        <slider
+         can_edit_text="true"
+         control_name="FSAudioMusicFadeOut"
+         decimal_digits="2"
+         enabled_control="FSFadeAudioStream"
+         label="Fade out:"
+         follows="left|top"
+         height="15"
+         increment="0.05"
+         initial_value="2"
+         layout="topleft"
+         left="45"
+         max_val="10"
+         min_val="0"
+         name="FSAudioMusicFadeOut"
+         top_delta="17"
+         width="250"
+         label_width="50"
+         tool_tip="Audio fade out time for parcel audio."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="255"
+         name="FSAudioMusicFadeOutSeconds"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            seconds
+        </text>
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="20"
+         layout="topleft"
+         left="26"
+         name="show_stream_metadata_text"
+         top_pad="20"
+         width="250">
+            Show stream title notifications:
+        </text>
+        <radio_group
+         control_name="ShowStreamMetadata"
+         height="20"
+         width="350"
+         layout="topleft"
+         top_pad="1"
+         left_delta="20"
+         name="show_stream_metadata">
             <radio_item
-				label="Off"
-				name="radio_off"
-				top="0"
-				layout="topleft"
-				height="16"
-				left="0"
-				value="0"
-				width="90" />
+                label="Off"
+                name="radio_off"
+                top="0"
+                layout="topleft"
+                height="16"
+                left="0"
+                value="0"
+                width="50" />
             <radio_item
-				label="Toasts"
-				left_pad="1"
-				layout="topleft"
-				height="16"
-				name="radio_toasts"
-				value="1"
-				width="90" />
+                label="Toasts"
+                left_pad="1"
+                layout="topleft"
+                height="16"
+                name="radio_toasts"
+                value="1"
+                width="65" />
             <radio_item
-				label="Nearby Chat"
-				left_pad="1"
-				layout="topleft"
-				height="16"
-				name="radio_chat"
-				value="2"
-				width="90" />
+                label="Nearby Chat"
+                left_pad="1"
+                layout="topleft"
+                height="16"
+                name="radio_chat"
+                value="2"
+                width="70" />
         </radio_group>
         <check_box
-         top_pad="1"
-         left="45"
+         top_pad="3"
          control_name="StreamMetadataAnnounceToChat"
          name="StreamMetadataAnnounceToChat"
          label="Send stream title to channel:"
@@ -491,187 +726,6 @@
          name="StreamMetadataAnnounceChannel"
          width="90" />
 
-        <check_box
-         name="FSFadeAudioStream"
-         control_name="FSFadeAudioStream"
-         follows="left|top"
-         layout="topleft"
-         height="16"
-         tool_tip="Check this if fading should be used when the parcel audio stream changes"
-         label="Enable Parcel Audio Fading:"
-         top_delta="28"
-         left="25"/>
-        <slider
-         can_edit_text="true"
-         control_name="FSAudioMusicFadeIn"
-         decimal_digits="2"
-         enabled_control="FSFadeAudioStream"
-         label="Fade in"
-         follows="left|top"
-         height="15"
-         increment="0.05"
-         initial_value="3"
-         layout="topleft"
-         left="45"
-         max_val="10"
-         min_val="0"
-         name="FSAudioMusicFadeIn"
-         top_delta="17"
-         width="250"
-         label_width="50"
-         tool_tip="Audio fade in time for parcel audio."/>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="255"
-         name="FSAudioMusicFadeInSeconds"
-         mouse_opaque="false"
-         top_delta="2"
-         width="90">
-            seconds
-        </text>
-        <slider
-         can_edit_text="true"
-         control_name="FSAudioMusicFadeOut"
-         decimal_digits="2"
-         enabled_control="FSFadeAudioStream"
-         label="Fade out"
-         follows="left|top"
-         height="15"
-         increment="0.05"
-         initial_value="2"
-         layout="topleft"
-         left="45"
-         max_val="10"
-         min_val="0"
-         name="FSAudioMusicFadeOut"
-         top_delta="15"
-         width="250"
-         label_width="50"
-         tool_tip="Audio fade out time for parcel audio."/>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="255"
-         name="FSAudioMusicFadeOutSeconds"
-         mouse_opaque="false"
-         top_delta="2"
-         width="90">
-            seconds
-        </text>
-		 
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left="25"
-         name="Media Rolloff"
-         mouse_opaque="false"
-         top_delta="18"
-         width="250">
-            Sound source rolloff distance:
-        </text>
-        <slider
-         can_edit_text="true"
-         control_name="MediaRollOffMin"
-         decimal_digits="0"
-         label="Min"
-         follows="left|top"
-         height="15"
-         increment="1"
-         initial_value="5"
-         layout="topleft"
-         left="45"
-         max_val="512"
-         min_val="1"
-         name="MediaRollOffMin"
-         top_delta="17"
-         width="240"
-         label_width="25"
-         tool_tip="Minimum distance from the source for rolloff to begin taking effect."/>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="245"
-         name="MinMeters"
-         mouse_opaque="false"
-         top_delta="2"
-         width="90">
-            meters
-        </text>
-        <slider
-         can_edit_text="true"
-         control_name="MediaRollOffMax"
-         decimal_digits="0"
-         label="Max"
-         follows="left|top"
-         height="15"
-         increment="1"
-         initial_value="30"
-         layout="topleft"
-         left="45"
-         max_val="512"
-         min_val="1"
-         name="MediaRollOffMax"
-         top_delta="15"
-         width="240"
-         label_width="25"
-         tool_tip="Maximum distance from the source for rolloff to completely mute the sound."/>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="245"
-         name="MaxMeters"
-         mouse_opaque="false"
-         top_delta="2"
-         width="90">
-            meters
-        </text>
-		
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left="26"
-         name="money_change_threshold_label"
-         tool_tip="Plays a sound when money is spent or received higher then the amount set here."
-         mouse_opaque="false"
-         top_delta="18"
-         width="117">
-            L$ change threshold:
-        </text>
-        <spinner
-         top_delta="-4"
-         control_name="UISndMoneyChangeThreshold"
-         enabled="true"
-         decimal_digits="0"
-         layout="topleft"
-         follows="left|top"
-         height="18"
-         left_pad="5"
-         increment="10"
-         initial_value="10"
-         max_val="10000"
-         min_val="0"
-         name="money_change_threshold"
-         width="60" />
-
     </panel>
 
     <!-- Voice -->
@@ -681,7 +735,7 @@
      left="1"
      right="-1"
      follows="all"
-     label="Voice Settings"
+     label="Voice"
      name="Media Voice tab" >
 
         <check_box
@@ -935,7 +989,7 @@
          label="Audio Device Settings"
          layout="topleft"
          left="20"
-         top_pad="3"
+         top_pad="6"
          name="device_settings_btn"
          width="190">
         </button>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
index 46a452cf96..07b0b065db 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
@@ -23,11 +23,6 @@
 	<check_box name="friends_online_notify_checkbox" label="En tostadas" width="95"/>
 	<check_box name="OnlineOfflinetoNearbyChat" label="En el chat local y en la consola" width="195"/>
 	<check_box label="Sólo en el chat local" name="OnlineOfflinetoNearbyChatHistory"/>
-	<text name="friends_logon_sounds_label">
-		Reproducir un sonido cuando mis amigos:
-	</text>
-	<check_box name="friends_notify_online_sound" label="Se conectan" width="95"/>
-	<check_box name="friends_notify_offline_sound" label="Se desconectan" width="95" />
 	<check_box label="Cuando el total de scripts de la región cambie:" name="FSReportTotalScriptCountChanges"/>
 	<spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="Umbral de cambios de total de scripts antes de reportarlo (Por defecto: 100)"/>
 	<check_box label="Mostrar notificaciones de colisión en el chat local" name="FSCollisionMessagesInChat"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index 8667eed9c4..206d59673b 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sonidos" name="Preference Media panel">
 	<tab_container label="Prefs. Firestorm" name="tabs">
-		<panel label="General" name="Media General Panel">
+		<panel label="General" name="Media Sounds Panel">
 			<slider label="Volumen general" name="System Volume"/>
 			<check_box label="Silenciar al minimizar" name="mute_when_minimized"/>
 			<slider label="Botones" name="UI Volume"/>
@@ -15,46 +15,55 @@
 			<check_box label="Activado" name="enable_media"/>
 			<slider label="Chat de voz" name="Voice Volume"/>
 			<check_box label="Activado" name="enable_voice_check_volume"/>
-			<check_box name="media_auto_play_btn" tool_tip="Activa/desactiva la reproducción automática de medios cuando te conectas o cambias de región." label="Permitir reproducción automática de medios al entrar en una región"/>
-			<check_box name="media_allowscript_btn" tool_tip="Permite/impide que los scripts de los prims controlen tus conexiones de medios" label="Permitir que los scripts prims reproduzcan medios"/>
-			<check_box name="media_show_on_others_btn" tool_tip="Desactiva para ocultar los medios anexados a avatares de tu entorno" label="Reproducir medios anexados a otros avatares"/>
-			<check_box name="media_filter" tool_tip="Activa/desactiva el filtro que te permite escoger a qué servidores permites la reproducción de medios" label="Activar filtro de medios (seguridad mejorada)"/>
-			<button label="Administrar servidores de medios" name="edit_media_lists_button" width="200" left_pad="50"/>
+			<text name="friends_logon_sounds_label">
+				Reproducir un sonido cuando mis amigos:
+			</text>
+			<check_box name="friends_notify_online_sound" label="Se conectan" width="95"/>
+			<check_box name="friends_notify_offline_sound" label="Se desconectan" width="95" />
+			<text name="money_change_threshold_label" tool_tip="Reproduce un sonido cuando se gasta o recibe una cantidad de dinero superior a la configurada.">
+				Umbral de L$:
+			</text>
+		</panel>
+		<panel name="Media Music Panel">
+			<check_box name="FSFadeAudioStream" tool_tip="Activa el fundido de sonido cuando cambia el flujo de audio de parcela" label="Fundido de audio de parcela:"/>
+			<slider label="Entrada:" name="FSAudioMusicFadeIn" tool_tip="Tiempo de fundido de entrada de audio de parcela."/>
+			<text name="FSAudioMusicFadeInSeconds">
+				segundos
+			</text>
+			<slider label="Salida:" name="FSAudioMusicFadeOut" tool_tip="Tiempo de fundido de salida de audio de parcela."/>
+			<text name="FSAudioMusicFadeOutSeconds">
+				segundos
+			</text>
 			<text name="show_stream_metadata_text" width="230">
 				Mostrar notificaciones de título de flujo:
 			</text>
 			<radio_group name="show_stream_metadata" width="270">
 				<radio_item label="No" name="radio_off"/>
-				<radio_item label="Tostadas" name="radio_toasts"/>
+				<radio_item label="Tostadas" width="75" name="radio_toasts"/>
 				<radio_item label="Chat local" name="radio_chat"/>
 			</radio_group>
 			<check_box name="StreamMetadataAnnounceToChat" label="Enviar el título del flujo al canal:"/>
 			<spinner top_delta="-3" left_pad="25" name="StreamMetadataAnnounceChannel"/>
-			<check_box name="FSFadeAudioStream" tool_tip="Activa el fundido de sonido cuando cambia el flujo de audio de parcela" label="Fundido de audio de parcela:"/>
-			<slider label="Entrada" name="FSAudioMusicFadeIn" tool_tip="Tiempo de fundido de entrada de audio de parcela."/>
-			<text name="FSAudioMusicFadeInSeconds">
-				segundos
-			</text>
-			<slider label="Salida" name="FSAudioMusicFadeOut" tool_tip="Tiempo de fundido de salida de audio de parcela."/>
-			<text name="FSAudioMusicFadeOutSeconds">
-				segundos
-			</text>
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box name="media_auto_play_btn" tool_tip="Activa/desactiva la reproducción automática de medios cuando te conectas o cambias de región." label="Permitir reproducción automática de medios al entrar en una región"/>
+			<check_box name="media_allowscript_btn" tool_tip="Permite/impide que los scripts de los prims controlen tus conexiones de medios" label="Permitir que los scripts prims reproduzcan medios"/>
+			<check_box name="media_show_on_others_btn" tool_tip="Desactiva para ocultar los medios anexados a avatares de tu entorno" label="Reproducir medios anexados a otros avatares"/>
+			<check_box name="media_filter" tool_tip="Activa/desactiva el filtro que te permite escoger a qué servidores permites la reproducción de medios" label="Activar filtro de medios (seguridad mejorada)"/>
+			<button label="Administrar servidores de medios" name="edit_media_lists_button" width="200" />
 			<text name="Media Rolloff" width="270">
 				Distancia de atenuación de la fuente del audio:
 			</text>
-			<slider label="Mín" name="MediaRollOffMin" tool_tip="Distancia mínima de la fuente de sonido para que la atenuación empiece a tener efecto."/>
+			<slider name="MediaRollOffMin" tool_tip="Distancia mínima de la fuente de sonido para que la atenuación empiece a tener efecto."/>
 			<text name="MinMeters">
 				metros
 			</text>
-			<slider label="Máx" name="MediaRollOffMax" tool_tip="Distancia de la fuente de sonido para silenciarlo completamente."/>
+			<slider name="MediaRollOffMax" tool_tip="Distancia de la fuente de sonido para silenciarlo completamente."/>
 			<text name="MaxMeters">
 				metros
 			</text>
-			<text name="money_change_threshold_label" tool_tip="Reproduce un sonido cuando se gasta o recibe una cantidad de dinero superior a la configurada.">
-				Umbral de L$:
-			</text>
 		</panel>
-		<panel label="Configuración de voz" name="Media Voice tab">
+		<panel label="Voz" name="Media Voice tab">
 			<check_box label="Activar voz" name="enable_voice_check"/>
 			<text name="Listen from">
 				Escuchar desde:
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 37eb6bbeb0..844c35a545 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -3,38 +3,54 @@
 	<panel.string name="middle_mouse">
 		Bouton central de la souris
 	</panel.string>
-	<slider label="Volume principal" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">
-		Couper lorsque minimisé
-	</text>
-	<slider label="Boutons" name="UI Volume"/>
-	<slider label="Ambiant" name="Wind Volume"/>
-	<slider label="Effets sonores" name="SFX Volume"/>
-	<slider label="Flux musical" name="Music Volume"/>
-	<check_box label="Activé" name="enable_music"/>
-	<slider label="Média" name="Media Volume"/>
-	<check_box label="Activé" name="enable_media"/>
-	<slider label="Chat vocal" name="Voice Volume"/>
-	<check_box label="Activé" name="enable_voice_check"/>
-	<check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cocher pour autoriser la lecture automatique du média." value="true"/>
-	<check_box label="Lire le média attaché aux autres avatars" name="media_show_on_others_btn" tool_tip="Décocher pour masquer le média attaché aux autres avatars près de vous." value="true"/>
-	<check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cocher cette case pour entendre les sons associés aux gestes." value="true"/>
-	<text name="voice_chat_settings">
-		Paramètres du chat vocal
-	</text>
-	<text name="Listen from">
-		Écouter à partir de :
-	</text>
-	<radio_group name="ear_location">
-		<radio_item label="Position de la caméra" name="0"/>
-		<radio_item label="Position de l&apos;avatar" name="1"/>
-	</radio_group>
-	<check_box label="Faire bouger les lèvres de l&apos;avatar lorsqu&apos;il parle" name="enable_lip_sync"/>
-	<check_box label="Activer/désactiver la fonction Parler quand j&apos;appuie sur :" name="push_to_talk_toggle_check" tool_tip="En mode bascule, appuyez une fois sur la touche de contrôle de la fonction, puis relâchez-la pour activer/désactiver votre micro. Si vous n&apos;êtes pas en mode bascule, le micro ne diffuse votre voix que lorsque vous maintenez la touche de contrôle de la fonction enfoncée."/>
-	<line_editor label="Touche de contrôle de la fonction Appuyer pour parler" name="modifier_combo"/>
-	<button label="Définir la touche" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="Réinitialiser sur le bouton central de la souris"/>
-	<button label="Périphériques d&apos;entrée/de sortie" name="device_settings_btn"/>
-	<panel label="Paramètres du matériel" name="device_settings_panel"/>
+	<tab_container name="tabs">
+		<panel name="Media Sounds Panel">
+			<slider label="Volume principal" name="System Volume"/>
+			<check_box initial_value="true" name="mute_when_minimized"/>
+			<text name="mute_chb_label">
+				Couper lorsque minimisé
+			</text>
+			<slider label="Boutons" name="UI Volume"/>
+			<slider label="Ambiant" name="Wind Volume"/>
+			<slider label="Effets sonores" name="SFX Volume"/>
+			<slider label="Flux musical" name="Music Volume"/>
+			<check_box label="Activé" name="enable_music"/>
+			<slider label="Média" name="Media Volume"/>
+			<check_box label="Activé" name="enable_media"/>
+			<slider label="Chat vocal" name="Voice Volume"/>
+			<check_box label="Activé" name="enable_voice_check"/>
+			<check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cocher cette case pour entendre les sons associés aux gestes." />
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cocher pour autoriser la lecture automatique du média." value="true"/>
+			<check_box label="Lire le média attaché aux autres avatars" name="media_show_on_others_btn" tool_tip="Décocher pour masquer le média attaché aux autres avatars près de vous." value="true"/>
+		</panel>
+		<panel name="Media Voice tab">
+			<text name="voice_chat_settings">
+				Paramètres du chat vocal
+			</text>
+			<text name="Listen from">
+				Écouter à partir de :
+			</text>
+			<radio_group name="ear_location">
+				<radio_item label="Position de la caméra" name="0"/>
+				<radio_item label="Position de l&apos;avatar" name="1"/>
+			</radio_group>
+			<check_box label="Faire bouger les lèvres de l&apos;avatar lorsqu&apos;il parle" name="enable_lip_sync"/>
+			<check_box label="Activer/désactiver la fonction Parler quand j&apos;appuie sur :" name="push_to_talk_toggle_check" tool_tip="En mode bascule, appuyez une fois sur la touche de contrôle de la fonction, puis relâchez-la pour activer/désactiver votre micro. Si vous n&apos;êtes pas en mode bascule, le micro ne diffuse votre voix que lorsque vous maintenez la touche de contrôle de la fonction enfoncée."/>
+			<line_editor label="Touche de contrôle de la fonction Appuyer pour parler" name="modifier_combo"/>
+			<button label="Définir la touche" name="set_voice_hotkey_button"/>
+			<button name="set_voice_middlemouse_button" tool_tip="Réinitialiser sur le bouton central de la souris"/>
+			<button label="Périphériques d&apos;entrée/de sortie" name="device_settings_btn"/>
+			<panel label="Paramètres du matériel" name="device_settings_panel"/>
+		</panel>
+	</tab_container>
+</panel>
+
+
+
+
+
+
+
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
index 6dfc2c66de..cd5ebc442b 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
@@ -4,7 +4,7 @@
 		Pulsante centrale del mouse
 	</panel.string>
 	<tab_container label="Preferenze Firestorm" name="tabs">
-		<panel label="Generale" name="Media General Panel">
+		<panel label="Generale" name="Media Sounds Panel">
 			<slider label="Volume generale" name="System Volume"/>
 			<check_box label="Muta quando ridotto ad icona" name="mute_when_minimized"/>
 			<slider label="Interfaccia" name="UI Volume"/>
@@ -17,26 +17,30 @@
 			<check_box label="Abilita" name="enable_media"/>
 			<slider label="Volume Voice" name="Voice Volume"/>
 			<check_box label="Abilita" name="enable_voice_check_volume"/>
+		</panel>
+		<panel name="Media Media Panel">
 			<check_box label="Riproduci automaticamente lo streaming quando entri in Regione" name="media_auto_play_btn" tool_tip="Spunta per startare automaticamente i Media quando entri in una Sim."/>
 			<check_box name="media_allowscript_btn" tool_tip="Questa impostazione consente/impedisce di controllare le connessioni multimediali da parte di script di altri utenti" label="Consenti agli script di un residente di riprodurre Media"/>
 			<check_box label="Riproduci media indossati da altri Avatar" name="media_show_on_others_btn" tool_tip="Non selezionare se non si vogliono ascoltare i media indossati su altri avatar."/>
 			<check_box name="media_filter" tool_tip="Selezionare questa opzione per abilitare il filtro che permette di scegliere se riprodurre file multimediali da un host specifico" label="Attiva filtro Media (Aumenta la sicrezza)"/>
 			<button label="Gestisci siti Media" name="edit_media_lists_button"/>
-			<check_box name="ShowStreamMetadata" label="Mostra titoli Media nella local chat"/>
-			<check_box name="StreamMetadataAnnounceToChat" label="Trasmetti titolo su un Canale:"/>
 			<text name="Media Rolloff" width="220">
 				Distanza di attenuazione Audio/Media:
 			</text>
-			<slider label="Min" name="MediaRollOffMin" tool_tip="Distanza minima dalla sorgente per la quale avvenga l'effetto di attenuazione."/>
+			<slider name="MediaRollOffMin" tool_tip="Distanza minima dalla sorgente per la quale avvenga l'effetto di attenuazione."/>
 			<text name="MinMeters">
 				metri
 			</text>
-			<slider label="Max" name="MediaRollOffMax" tool_tip="Distanza massima dalla fonte sonora per disattivare completamente l'audio."/>
+			<slider name="MediaRollOffMax" tool_tip="Distanza massima dalla fonte sonora per disattivare completamente l'audio."/>
 			<text name="MaxMeters">
 				metri
 			</text>
 		</panel>
-		<panel label="Impostazioni Voice" name="Media Voice tab">
+		<panel name="Media Music Panel">
+			<check_box name="ShowStreamMetadata" label="Mostra titoli Media nella local chat"/>
+			<check_box name="StreamMetadataAnnounceToChat" label="Trasmetti titolo su un Canale:"/>
+		</panel>
+		<panel label="Voice" name="Media Voice tab">
 			<check_box label="Abilita Voice" name="enable_voice_check"/>
 			<text name="Listen from">
 				Ascolta da:
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 4603ec1e3e..74bf99e039 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@@ -24,13 +24,7 @@
 	<check_box label="トーストで通知" name="friends_online_notify_checkbox" />
     <check_box name="OnlineOfflinetoNearbyChat" label="チャット履歴とコンソールで通知" />
 	<check_box label="チャット履歴のみ" name="OnlineOfflinetoNearbyChatHistory" />
-	
-	<text name="friends_logon_sounds_label">
-        フレンドのステータスが変わったら通知音:
-    </text>
-    <check_box name="friends_notify_online_sound" label="ログイン時" />
-    <check_box name="friends_notify_offline_sound" label="ログアウト時" />
-      
+	      
     <check_box label="地域全体のスクリプト数に変化があった時W:" name="FSReportTotalScriptCountChanges" />
     <spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="通知の対象とするスクリプト数の閾値を設定します。（デフォルトは100）" />
 	
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 5ddd35fc70..168b7a6f84 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -7,7 +7,7 @@
 <tab_container label="Firestorm環境設定" name="tabs">
 
 	<!-- 一般 -->
-	<panel label="一般"  name="Media General Panel" >
+	<panel label="一般"  name="Media Sounds Panel" >
 	
 		<slider label="全体の音量" name="System Volume"/>
 		<check_box initial_value="true" label="最小化でミュート" name="mute_when_minimized"/>
@@ -29,31 +29,24 @@
 		<check_box label="有効" name="enable_media"/>
 		<slider label="ボイスチャット" name="Voice Volume"/>
 		<check_box label="有効" name="enable_voice_check_volume"/>
-		<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/>
+		<text name="friends_logon_sounds_label">
+			フレンドのステータスが変わったら通知音:
+		</text>
+		<check_box name="friends_notify_online_sound" label="ログイン時" />
+		<check_box name="friends_notify_offline_sound" label="ログアウト時" />
+		<text name="money_change_threshold_label" tool_tip="ここに設定した額より大きい金額を消費または受領した場合に音を鳴らします。">
+            L$入出金通知音の閾値：
+        </text>
+        <spinner name="money_change_threshold" left_pad="5" />
+		
+	</panel>
+
+	<panel name="Media Media Panel">
+		<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します"/>
 		<check_box label="他の住人のスクリプトがメディアを再生することを許可" name="media_allowscript_btn" tool_tip="他の住人がスクリプトの入ったオブジェクトを使って土地のメディアをコントロールすることを許可／禁止します"/>
-		<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/>
+		<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします"/>
 		<check_box label="メディアフィルターを有効にする（セキュリティレベルが上がります）" name="media_filter" tool_tip="このチェックを入れることで、特定のサイトのメディアを再生するかどうかフィルターをかけることができるようになります"/>
-		<button label="メディアフィルター編集" name="edit_media_lists_button" left_pad="120"/>
-		<text name="show_stream_metadata_text">
-			曲のタイトルの通知方法:
-        </text>
-		<radio_group name="show_stream_metadata">
-            <radio_item label="通知しない" name="radio_off" value="0" />
-            <radio_item label="トースト" name="radio_toasts" value="1" />
-            <radio_item label="周辺チャット" name="radio_chat" value="2" />
-        </radio_group>
-		<check_box label="曲のタイトルを次のチャンネルに送る" name="StreamMetadataAnnounceToChat"/>
-		<check_box name="FSFadeAudioStream" tool_tip="区画に流れている曲が変わる時にフェードイン／フェードアウトさせたい場合にここにチェックを入れて下さい。" label="区画音声のフェードを有効にする:" />
-        <slider label="フェードイン" name="FSAudioMusicFadeIn"          width="280"
-         label_width="80" tool_tip="区画に流れている音声のフェードインする時間を設定します。" />
-        <text name="FSAudioMusicFadeInSeconds" left_delta="285">
-            秒
-        </text>
-        <slider label="フェードアウト" name="FSAudioMusicFadeOut"          width="280"
-         label_width="80" tool_tip="区画に流れている音声のフェードアウトする時間を設定します。"/>
-        <text name="FSAudioMusicFadeOutSeconds" left_delta="285">
-            秒
-        </text>
+		<button label="メディアフィルター編集" name="edit_media_lists_button"/>
 		<text name="Media Rolloff" width="400">
 			メディア音量のロールオフ距離（それ以上大きく或いは小さくならない距離）：
 		</text>
@@ -65,13 +58,28 @@
 		<text name="MaxMeters">
 			メートル
 		</text>
-		<text name="money_change_threshold_label" tool_tip="ここに設定した額より大きい金額を消費または受領した場合に音を鳴らします。">
-            L$入出金通知音の閾値：
-        </text>
-        <spinner name="money_change_threshold" left_pad="5" />
-		
 	</panel>
-	
+	<panel name="Media Music Panel">
+		<text name="show_stream_metadata_text">
+			曲のタイトルの通知方法:
+        </text>
+		<radio_group name="show_stream_metadata">
+            <radio_item label="通知しない" width="75" name="radio_off" value="0" />
+            <radio_item label="トースト" name="radio_toasts" value="1" />
+            <radio_item label="周辺チャット" name="radio_chat" value="2" />
+        </radio_group>
+		<check_box label="曲のタイトルを次のチャンネルに送る" name="StreamMetadataAnnounceToChat"/>
+		<check_box name="FSFadeAudioStream" tool_tip="区画に流れている曲が変わる時にフェードイン／フェードアウトさせたい場合にここにチェックを入れて下さい。" label="区画音声のフェードを有効にする:" />
+        <slider label="フェードイン" name="FSAudioMusicFadeIn" width="280" label_width="80" tool_tip="区画に流れている音声のフェードインする時間を設定します。" />
+        <text name="FSAudioMusicFadeInSeconds" left_delta="285">
+            秒
+        </text>
+        <slider label="フェードアウト" name="FSAudioMusicFadeOut" width="280" label_width="80" tool_tip="区画に流れている音声のフェードアウトする時間を設定します。"/>
+        <text name="FSAudioMusicFadeOutSeconds" left_delta="285">
+            秒
+        </text>
+	</panel>
+
 	<!-- ボイス -->
 	<panel label="ボイス設定" name="Media Voice tab" >
 	
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
index be6e3f5f2c..dfec7e222f 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@@ -22,11 +22,6 @@
 		<check_box label="W tostach" name="friends_online_notify_checkbox"/>
 		<check_box name="OnlineOfflinetoNearbyChat" label="W czacie lokalnym i konsoli"/>
 		<check_box label="Tylko w czacie lokalnym" name="OnlineOfflinetoNearbyChatHistory"/>
-		<text name="friends_logon_sounds_label">
-			Odtwórz dźwięk gdy moi znajomi:
-		</text>
-		<check_box label="Logują się" name="friends_notify_online_sound"/>
-		<check_box label="Wylogowywują się" name="friends_notify_offline_sound"/>
 		<check_box label="Gdy zmienia się liczba skryptów w regionie:" name="FSReportTotalScriptCountChanges"/>
 		<spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="Próg zmiany całkowitej ilości skryptów w regionie, od którego pokazana zostanie informacja [Domyślnie: 100]"/>
 		<check_box label="Powiadomienia o kolizjach w czacie lokalnym" name="FSCollisionMessagesInChat"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index 8a1b1db66a..8c7ca312e0 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -4,7 +4,7 @@
 		Środkowy przycisk myszy
 	</panel.string>
 	<tab_container label="Ust. Firestorma" name="tabs">
-		<panel label="Ogólne" name="Media General Panel">
+		<panel label="Dźwięki" name="Media Sounds Panel">
 			<slider label="Głośność ogólna" name="System Volume"/>
 			<check_box label="Wycisz gdy zminimalizowane" name="mute_when_minimized"/>
 			<slider label="Interfejs" name="UI Volume"/>
@@ -17,21 +17,35 @@
 			<check_box label="Włączone" name="enable_media"/>
 			<slider label="Rozmowy głosowe" name="Voice Volume"/>
 			<check_box label="Włączone" name="enable_voice_check_volume"/>
-			<check_box label="Automatycznie odtwarzaj muzykę" name="audio_auto_play_btn" tool_tip="Zaznacz tę funkcję, aby automatycznie uruchamiać muzykę strumieniową."/>
+			<text name="friends_logon_sounds_label">
+				Odtwórz dźwięk gdy moi znajomi:
+			</text>
+			<check_box label="Logują się" name="friends_notify_online_sound"/>
+			<check_box label="Wylogowywują się" name="friends_notify_offline_sound"/>
+			<text name="money_change_threshold_label" tool_tip="Przeglądarka będzie odtwarzać 'dźwięk pieniędzy' tylko wtedy, gdy wydawana lub otrzymywana kwota jest wyższa niż wartość ustawiona tutaj.">
+				Próg zmiany ilości L$:
+			</text>
+		</panel>
+		<panel name="Media Media Panel">
 			<check_box label="Automatycznie odtwarzaj media" name="media_auto_play_btn" tool_tip="Zaznacz tę funkcję, aby automatycznie uruchamiać media."/>
 			<check_box name="media_allowscript_btn" tool_tip="To ustawienie pozwala lub zabrania oskryptowanym primom kontrolować Twoje media" label="Pozwalaj skryptom w świecie odtwarzać media"/>
 			<check_box label="Uruchamiaj media dołączone do innych awatarów" name="media_show_on_others_btn" tool_tip="Odznacz tę funkcję by ukryć media załączone do awatarów w pobliżu"/>
-			<check_box name="media_filter" tool_tip="Zaznacz tą opcję, aby móc wybierać, czy odtwarzać media z konkretnego hosta, czy nie" label="Włącz filtr mediów (zwiększone bezp.)"/>
+			<check_box name="media_filter" tool_tip="Zaznacz tą opcję, aby móc wybierać, czy odtwarzać media z konkretnego hosta, czy nie" label="Włącz filtr mediów (zwiększone bezpieczeństwo)"/>
 			<button label="Zarządzaj witrynami" name="edit_media_lists_button"/>
-			<text name="show_stream_metadata_text">
-				Powiadomienia o tytule strumienia:
+			<text name="Media Rolloff">
+				Rozchodzenie się dźwięku mediów:
 			</text>
-			<radio_group name="show_stream_metadata">
-				<radio_item label="Wyłącz" name="radio_off" />
-				<radio_item label="Tosty" name="radio_toasts" />
-				<radio_item label="Czat lokalny" name="radio_chat" />
-			</radio_group>
-			<check_box name="StreamMetadataAnnounceToChat" label="Wysyłaj tytuł strum. na kanał:"/>
+			<slider label="Zaczyna być ciszej po:" name="MediaRollOffMin" tool_tip="Minimalny dystans od źródła, aby ściszanie mediów zaczęło działać."/>
+			<text name="MinMeters">
+				metrach
+			</text>
+			<slider label="Całkowicie zanika po:" name="MediaRollOffMax" tool_tip="Maksymalny dystans od źródła, aby dźwięk był słyszalny."/>
+			<text name="MaxMeters">
+				metrach
+			</text>
+		</panel>
+		<panel label="Muzyka" name="Media Music Panel">
+			<check_box label="Automatycznie odtwarzaj muzykę" name="audio_auto_play_btn" tool_tip="Zaznacz tę funkcję, aby automatycznie uruchamiać muzykę strumieniową."/>
 			<check_box name="FSFadeAudioStream" tool_tip="Zaznacz to pole, jeśli wygładzanie ma być używane, gdy zmieni się muzyka strumieniowa na działce" label="Płynnie wygładzaj przechodzenie między strumieniami muzyki na działkach:"/>
 			<slider label="Wejście" name="FSAudioMusicFadeIn" tool_tip="Czas wygładzania dla dźwięku działki przy wchodzeniu. Ustaw na 0, aby wyłączyć wygładzanie."/>
 			<text name="FSAudioMusicFadeInSeconds">
@@ -41,22 +55,17 @@
 			<text name="FSAudioMusicFadeOutSeconds">
 				sekund
 			</text>
-			<text name="Media Rolloff">
-				Rozchodzenie się dźwięku:
-			</text>
-			<slider label="Min" name="MediaRollOffMin" tool_tip="Minimalny dystans od źródła, aby media były słyszalne."/>
-			<text name="MinMeters">
-				metry
-			</text>
-			<slider label="Max" name="MediaRollOffMax" tool_tip="Maksymalny dystans od źródła, aby dźwięk został całkowicie wyciszony."/>
-			<text name="MaxMeters">
-				metry
-			</text>
-			<text name="money_change_threshold_label" tool_tip="Przeglądarka będzie odtwarzać 'dźwięk pieniędzy' tylko wtedy, gdy wydawana lub otrzymywana kwota jest wyższa niż wartość ustawiona tutaj.">
-				Próg zmiany ilości L$:
+			<text name="show_stream_metadata_text">
+				Powiadomienia o tytule strumienia:
 			</text>
+			<radio_group name="show_stream_metadata">
+				<radio_item label="Wyłącz" width="75" name="radio_off" />
+				<radio_item label="Tosty" name="radio_toasts" />
+				<radio_item label="Czat lokalny" name="radio_chat" />
+			</radio_group>
+			<check_box name="StreamMetadataAnnounceToChat" width="210" label="Wysyłaj tytuł strumienia na kanał:"/>
 		</panel>
-		<panel label="Rozmowy głosowe" name="Media Voice tab">
+		<panel label="Głos" name="Media Voice tab">
 			<check_box label="Włącz rozmowy głosowe" name="enable_voice_check" width="155"/>
 			<button tool_tip="Resetuj rozmowy głosowe" name="reset_voice_button"/>
 			<check_box label="Gdy działa kilka kopii przeglądarki na raz, to zezwól na rozmowy głosowe w każdej z nich" name="VoiceMultiInstance" />
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
index fff5fd7005..d6b402f8f5 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -3,38 +3,46 @@
 	<panel.string name="middle_mouse">
 		Botão do meio do mouse
 	</panel.string>
-	<slider label="Volume principal" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">
-		Silenciar ao minimizar
-	</text>
-	<slider label="Botões" name="UI Volume"/>
-	<slider label="Ambiente" name="Wind Volume"/>
-	<slider label="Efeitos sonoros" name="SFX Volume"/>
-	<slider label="Streaming de música" name="Music Volume"/>
-	<check_box label="Ativado" name="enable_music"/>
-	<slider label="Mídia" name="Media Volume"/>
-	<check_box label="Ativado" name="enable_media"/>
-	<slider label="Bate-papo de voz" name="Voice Volume"/>
-	<check_box label="Ativado" name="enable_voice_check"/>
-	<check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/>
-	<check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/>
-	<check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" value="true"/>
-	<text name="voice_chat_settings">
-		Configuração de bate-papo de voz
-	</text>
-	<text name="Listen from">
-		Ouvir a partir de:
-	</text>
-	<radio_group name="ear_location">
-		<radio_item label="Posição de câmera" name="0"/>
-		<radio_item label="Posição do avatar" name="1"/>
-	</radio_group>
-	<check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/>
-	<check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Fora do modo de alternância, o microfone só transmite sua voz enquanto o botão estiver pressionado."/>
-	<line_editor label="Botão apertar e falar" name="modifier_combo"/>
-	<button label="Definir chave" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/>
-	<button label="Controles de entrada/saída" name="device_settings_btn" width="180"/>
-	<panel label="Configuração dos dispositivo" name="device_settings_panel"/>
+	<tab_container name="tabs">
+		<panel name="Media Sounds Panel">
+			<slider label="Volume principal" name="System Volume"/>
+			<check_box initial_value="true" name="mute_when_minimized"/>
+			<text name="mute_chb_label">
+				Silenciar ao minimizar
+			</text>
+			<slider label="Botões" name="UI Volume"/>
+			<slider label="Ambiente" name="Wind Volume"/>
+			<slider label="Efeitos sonoros" name="SFX Volume"/>
+			<slider label="Streaming de música" name="Music Volume"/>
+			<check_box label="Ativado" name="enable_music"/>
+			<slider label="Mídia" name="Media Volume"/>
+			<check_box label="Ativado" name="enable_media"/>
+			<slider label="Bate-papo de voz" name="Voice Volume"/>
+			<check_box label="Ativado" name="enable_voice_check"/>
+			<check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" />
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/>
+			<check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/>
+		</panel>
+		<panel name="Media Voice tab">
+			<text name="voice_chat_settings">
+				Configuração de bate-papo de voz
+			</text>
+			<text name="Listen from">
+				Ouvir a partir de:
+			</text>
+			<radio_group name="ear_location">
+				<radio_item label="Posição de câmera" name="0"/>
+				<radio_item label="Posição do avatar" name="1"/>
+			</radio_group>
+			<check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/>
+			<check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Fora do modo de alternância, o microfone só transmite sua voz enquanto o botão estiver pressionado."/>
+			<line_editor label="Botão apertar e falar" name="modifier_combo"/>
+			<button label="Definir chave" name="set_voice_hotkey_button"/>
+			<button name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/>
+			<button label="Controles de entrada/saída" name="device_settings_btn" width="180"/>
+			<panel label="Configuração dos dispositivo" name="device_settings_panel"/>
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
index 6f8e696c28..c9aa7b1242 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
@@ -5,7 +5,7 @@
 </panel.string>
 <tab_container label="Настройки Файршторма" name="tabs">
     <!-- General -->
-    <panel label="Основное" name="Media General Panel">
+    <panel label="Основное" name="Media Sounds Panel">
 		<slider label="Общая громкость" name="System Volume"/>
 		<check_box name="mute_when_minimized" label="Заглушить если свернуть"/>
 		<slider label="Кнопки" name="UI Volume"/>
@@ -18,13 +18,14 @@
 		<check_box label="Вкл." name="enable_media"/>
 		<slider label="Голосовой чат" name="Voice Volume"/>
 		<check_box label="Вкл." name="enable_voice_check_volume"/>
+    </panel>
+
+	<panel name="Media Media Panel">
 		<check_box label="Разрешить автоматическое воспроизведение" name="media_auto_play_btn" tool_tip="" value="true"/>
 		<check_box name="media_allowscript_btn" tool_tip="Эта установка разрешает / запрещает объектам со скриптами использовать медиа" label="Разрешить медиа для скриптов" />
 		<check_box label="Воспроизводить медиа других аватаров" name="media_show_on_others_btn" tool_tip="Отключите данную опцию, чтоб не слышать медиа, которые прикреплены к ближайшим пользователям" value="true"/>
 		<check_box name="media_filter" tool_tip="Установка данного фильтра позволяет вам выбирать в каких регионах воспроизводить медиа" label="Медиа фильтр (Повышенная безопасность)"/>
-		<button label="Редактировать список медиа..." name="edit_media_lists_button" left_pad="45"/>
-        <check_box name="ShowStreamMetadata" label="Показать титул песни"/>
-        <check_box name="StreamMetadataAnnounceToChat" label="Послать титул песни на канал:" width="230"/>
+		<button label="Редактировать список медиа..." name="edit_media_lists_button" />
         <text name="Media Rolloff">
             Расстояние слышимости:
         </text>
@@ -36,7 +37,12 @@
         <text name="MaxMeters">
             Метров
         </text>
-    </panel>
+	</panel>
+
+	<panel name="Media Music Panel">
+        <check_box name="ShowStreamMetadata" label="Показать титул песни"/>
+        <check_box name="StreamMetadataAnnounceToChat" label="Послать титул песни на канал:" width="230"/>
+	</panel>
 
     <!-- Voice -->
     <panel label="Настройки голоса" name="Media Voice tab">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
index 9256f1d324..dec63a7491 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
@@ -3,38 +3,46 @@
 	<panel.string name="middle_mouse">
 		Orta Fare
 	</panel.string>
-	<slider label="Ana ses düzeyi" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">
-		Küçültüldüğünde sustur
-	</text>
-	<slider label="Düğmeler" name="UI Volume"/>
-	<slider label="Ortam" name="Wind Volume"/>
-	<slider label="Ses Efektleri" name="SFX Volume"/>
-	<slider label="Müzik akışı" name="Music Volume"/>
-	<check_box label="Etkin" name="enable_music"/>
-	<slider label="Ortam" name="Media Volume"/>
-	<check_box label="Etkin" name="enable_media"/>
-	<slider label="Sesli Sohbet" name="Voice Volume"/>
-	<check_box label="Etkin" name="enable_voice_check"/>
-	<check_box label="Ortamı otomatik oynatmaya izin ver" name="media_auto_play_btn" tool_tip="istiyorsa ortamı otomatik oynatmak için bunu işaretleyin" value="true"/>
-	<check_box label="Diğer avatarlara eklenen ortamı oynat" name="media_show_on_others_btn" tool_tip="Yakınlardaki diğer avatarlara eklenen ortamı gizlemek için bunun işaretini kaldırın" value="true"/>
-	<check_box label="Mimiklere ses eşlik etsin" name="gesture_audio_play_btn" tool_tip="Mimiklerle beraber ses duymak için bunu işaretleyin" value="true"/>
-	<text name="voice_chat_settings">
-		Sesli Sohbet Ayarları
-	</text>
-	<text name="Listen from">
-		Şuradan dinle:
-	</text>
-	<radio_group name="ear_location">
-		<radio_item label="Kamera konumu" name="0"/>
-		<radio_item label="Avatar konumu" name="1"/>
-	</radio_group>
-	<check_box label="Konuşurken avatar dudaklarını hareket ettir" name="enable_lip_sync"/>
-	<check_box label="Aşağıdaki düğmeye bastığımda konuşmayı aç/kapat:" name="push_to_talk_toggle_check" tool_tip="Toggle (dönüşümlü) modda mikrofonunuzu açıp kapatmak için tetikleyici tuşuna BİR KERE basıp bırakın. Toggle (dönüşümlü) modda değilken mikrofonunuz sadece tetikleyici tuş basılı tutulurken sesinizi yayınlar."/>
-	<line_editor label="Bas-Konuş tetikleyici" name="modifier_combo"/>
-	<button label="Tuş Ayarla" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="Orta Fare Düğmesine Sıfırla"/>
-	<button label="Giriş/Çıkış cihazları" name="device_settings_btn"/>
-	<panel label="Cihaz Ayarları" name="device_settings_panel"/>
+	<tab_container name="tabs">
+		<panel name="Media Sounds Panel">
+			<slider label="Ana ses düzeyi" name="System Volume"/>
+			<check_box initial_value="true" name="mute_when_minimized"/>
+			<text name="mute_chb_label">
+				Küçültüldüğünde sustur
+			</text>
+			<slider label="Düğmeler" name="UI Volume"/>
+			<slider label="Ortam" name="Wind Volume"/>
+			<slider label="Ses Efektleri" name="SFX Volume"/>
+			<slider label="Müzik akışı" name="Music Volume"/>
+			<check_box label="Etkin" name="enable_music"/>
+			<slider label="Ortam" name="Media Volume"/>
+			<check_box label="Etkin" name="enable_media"/>
+			<slider label="Sesli Sohbet" name="Voice Volume"/>
+			<check_box label="Etkin" name="enable_voice_check"/>
+			<check_box label="Mimiklere ses eşlik etsin" name="gesture_audio_play_btn" tool_tip="Mimiklerle beraber ses duymak için bunu işaretleyin"/>
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box label="Ortamı otomatik oynatmaya izin ver" name="media_auto_play_btn" tool_tip="istiyorsa ortamı otomatik oynatmak için bunu işaretleyin"/>
+			<check_box label="Diğer avatarlara eklenen ortamı oynat" name="media_show_on_others_btn" tool_tip="Yakınlardaki diğer avatarlara eklenen ortamı gizlemek için bunun işaretini kaldırın" />
+		</panel>
+		<panel name="Media Voice tab">
+			<text name="voice_chat_settings">
+				Sesli Sohbet Ayarları
+			</text>
+			<text name="Listen from">
+				Şuradan dinle:
+			</text>
+			<radio_group name="ear_location">
+				<radio_item label="Kamera konumu" name="0"/>
+				<radio_item label="Avatar konumu" name="1"/>
+			</radio_group>
+			<check_box label="Konuşurken avatar dudaklarını hareket ettir" name="enable_lip_sync"/>
+			<check_box label="Aşağıdaki düğmeye bastığımda konuşmayı aç/kapat:" name="push_to_talk_toggle_check" tool_tip="Toggle (dönüşümlü) modda mikrofonunuzu açıp kapatmak için tetikleyici tuşuna BİR KERE basıp bırakın. Toggle (dönüşümlü) modda değilken mikrofonunuz sadece tetikleyici tuş basılı tutulurken sesinizi yayınlar."/>
+			<line_editor label="Bas-Konuş tetikleyici" name="modifier_combo"/>
+			<button label="Tuş Ayarla" name="set_voice_hotkey_button"/>
+			<button name="set_voice_middlemouse_button" tool_tip="Orta Fare Düğmesine Sıfırla"/>
+			<button label="Giriş/Çıkış cihazları" name="device_settings_btn"/>
+			<panel label="Cihaz Ayarları" name="device_settings_panel"/>
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
index e57f08fd74..ef3c1540a6 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -3,38 +3,46 @@
 	<panel.string name="middle_mouse">
 		滑鼠中鍵
 	</panel.string>
-	<slider label="主音量" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">
-		最小化時靜音
-	</text>
-	<slider label="按鍵音" name="UI Volume"/>
-	<slider label="環境音" name="Wind Volume"/>
-	<slider label="音效" name="SFX Volume"/>
-	<slider label="串流音樂" name="Music Volume"/>
-	<check_box label="已啟用" name="enable_music"/>
-	<slider label="媒體" name="Media Volume"/>
-	<check_box label="已啟用" name="enable_media"/>
-	<slider label="語音聊天" name="Voice Volume"/>
-	<check_box label="已啟用" name="enable_voice_check"/>
-	<check_box label="允許媒體自動播放" name="media_auto_play_btn" tool_tip="若你想要，可以勾選這個允許媒體自動播放" value="true"/>
-	<check_box label="播放附加到其他化身身上的媒體" name="media_show_on_others_btn" tool_tip="若未勾選，將隱藏附著於附近其他化身身上的媒體" value="true"/>
-	<check_box label="播放來自姿勢的聲音" name="gesture_audio_play_btn" tool_tip="勾選即可聽到來自姿勢的聲音" value="true"/>
-	<text name="voice_chat_settings">
-		語音聊天設定
-	</text>
-	<text name="Listen from">
-		傾聽位置：
-	</text>
-	<radio_group name="ear_location">
-		<radio_item label="攝影機位置" name="0"/>
-		<radio_item label="化身位置" name="1"/>
-	</radio_group>
-	<check_box label="說話時同步移動化身嘴唇" name="enable_lip_sync"/>
-	<check_box label="切換說話 / 靜音，當我按下：" name="push_to_talk_toggle_check" tool_tip="在切換模式下，按下再放開啟動鍵一次，即可打開或關閉麥克風。 不在切換狀態時，麥克風只有在啟動鍵被按下時才會放送你的聲音。"/>
-	<line_editor label="「按下後說話」啟動鍵" name="modifier_combo"/>
-	<button label="設定按鍵" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="重設滑鼠中鍵按鈕"/>
-	<button label="輸入 / 輸出設備" name="device_settings_btn"/>
-	<panel label="設備設定" name="device_settings_panel"/>
+	<tab_container name="tabs">
+		<panel name="Media Sounds Panel">
+			<slider label="主音量" name="System Volume"/>
+			<check_box initial_value="true" name="mute_when_minimized"/>
+			<text name="mute_chb_label">
+				最小化時靜音
+			</text>
+			<slider label="按鍵音" name="UI Volume"/>
+			<slider label="環境音" name="Wind Volume"/>
+			<slider label="音效" name="SFX Volume"/>
+			<slider label="串流音樂" name="Music Volume"/>
+			<check_box label="已啟用" name="enable_music"/>
+			<slider label="媒體" name="Media Volume"/>
+			<check_box label="已啟用" name="enable_media"/>
+			<slider label="語音聊天" name="Voice Volume"/>
+			<check_box label="已啟用" name="enable_voice_check"/>
+			<check_box label="播放來自姿勢的聲音" name="gesture_audio_play_btn" tool_tip="勾選即可聽到來自姿勢的聲音" />
+		</panel>
+		<panel name="Media Media Panel">
+			<check_box label="允許媒體自動播放" name="media_auto_play_btn" tool_tip="若你想要，可以勾選這個允許媒體自動播放" />
+			<check_box label="播放附加到其他化身身上的媒體" name="media_show_on_others_btn" tool_tip="若未勾選，將隱藏附著於附近其他化身身上的媒體" />
+		</panel>
+		<panel name="Media Voice tab">
+			<text name="voice_chat_settings">
+				語音聊天設定
+			</text>
+			<text name="Listen from">
+				傾聽位置：
+			</text>
+			<radio_group name="ear_location">
+				<radio_item label="攝影機位置" name="0"/>
+				<radio_item label="化身位置" name="1"/>
+			</radio_group>
+			<check_box label="說話時同步移動化身嘴唇" name="enable_lip_sync"/>
+			<check_box label="切換說話 / 靜音，當我按下：" name="push_to_talk_toggle_check" tool_tip="在切換模式下，按下再放開啟動鍵一次，即可打開或關閉麥克風。 不在切換狀態時，麥克風只有在啟動鍵被按下時才會放送你的聲音。"/>
+			<line_editor label="「按下後說話」啟動鍵" name="modifier_combo"/>
+			<button label="設定按鍵" name="set_voice_hotkey_button"/>
+			<button name="set_voice_middlemouse_button" tool_tip="重設滑鼠中鍵按鈕"/>
+			<button label="輸入 / 輸出設備" name="device_settings_btn"/>
+			<panel label="設備設定" name="device_settings_panel"/>
+		</panel>
+	</tab_container>
 </panel>