Merge branch 'gst-revamp' into next

6 files changed, 4 insertions, 17 deletions

diff --git a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
index eb47fa2..d15d186 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="music_play" tool_tip="Streaming-Musik spielen/unterbrechen" />
-        <button name="music_pause" tool_tip="Streaming-Musik unterbrechen" />
         <button name="music_stop" tool_tip="Streaming-Musik beenden" />
         <icon name="media_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="media_play" tool_tip="Streaming-Musik abspielen/unterbrechen" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index d3174af..8020e9a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -28,7 +28,7 @@
              width="350" />
         <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Local Chat" left="148" mouse_opaque="true"
+             label="Show IMs with Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
         <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
index ff498ba..7b601b4 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="music_play" tool_tip="Jouer/pauser le flux musical" />
-        <button name="music_pause" tool_tip="Pauser le flux musical" />
         <button name="music_stop" tool_tip="Arrêter le flux musical" />
         <icon name="media_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="media_play" tool_tip="Jouer/pauser le flux musical" />
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
index 7c87dc3..89791a5 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
@@ -4,8 +4,6 @@
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
         <button name="music_play"
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
-        <button name="music_pause"
-             tool_tip="ストリーミング・ミュージックの一時停止" />
         <button name="music_stop"
              tool_tip="ストリーミング・ミュージックの停止" />
         <icon name="media_icon"
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
index 3b3aa0e..fa5a010 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="music_play" tool_tip="스트리밍 음악 재생/일시 정지" />
-        <button name="music_pause" tool_tip="스트리밍 음악 일시 정지" />
         <button name="music_stop" tool_tip="스트리밍 음악 중지" />
         <icon name="media_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="media_play" tool_tip="스트리밍 음악 재생/일시 정지" />
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
index d62fe09..466db79 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
@@ -4,7 +4,7 @@
      name="media_controls" width="220">
         <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_music.tga" label="" left_delta="6" mouse_opaque="true"
-             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="music_icon" scale_image="true" tool_tip="Play streaming music"
              width="14" />
         <button bottom="-21" enabled="true" follows="left|top" height="20"
           image_overlay="icn_play.tga"
@@ -13,15 +13,7 @@
              image_disabled="flyout_btn_left_disabled.tga"
               label="" left_delta="16"
              mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-             tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-             label="" left_delta="0"
-             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-             tool_tip="Pause streaming music" width="20" />
+             tool_tip="Play streaming music" width="20" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_stop.tga"
              image_unselected="flyout_btn_right.tga"
@@ -33,7 +25,7 @@
   <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_media.tga"
              label="" left_delta="22" mouse_opaque="true"
-             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
              width="17" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_play.tga"