[xine-cvs] HG: gxine: Changes to the A/V menus: "Settings" -> "Controls"; "Configure plugins".

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1189535868 -3600
# Node ID 91be65a58d3ba916e52beada889d2fc447ff8491
# Parent  53d072871574395f7be7e49e74b8c6ebc7379bbd
Changes to the A/V menus: "Settings" -> "Controls"; "Configure plugins".
Related changes to the settings window title & the settings show/hide buttons.

diff -r 91be65a58d3ba916e52beada889d2fc447ff8491 -r 53d072871574395f7be7e49e74b8c6ebc7379bbd misc/toolbar-fullscreen.xml
--- a/misc/toolbar-fullscreen.xml	Tue Sep 11 19:37:48 2007 +0100
+++ b/misc/toolbar-fullscreen.xml	Tue Sep 11 19:28:43 2007 +0100
@@ -27,7 +27,7 @@
    <button image="gtk-index" relief="none" tip="~Show/hide the playlist"
 	   onclick="playlist_show ();" accept-drop="1" autoplay="0"
 	   />
-   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V settings"
+   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V controls"
 	   onclick="settings_show ();"
 	   />
    <label text="" box-expand="1" width="20" />
diff -r 91be65a58d3ba916e52beada889d2fc447ff8491 -r 53d072871574395f7be7e49e74b8c6ebc7379bbd misc/toolbar-window.xml
--- a/misc/toolbar-window.xml	Tue Sep 11 19:37:48 2007 +0100
+++ b/misc/toolbar-window.xml	Tue Sep 11 19:28:43 2007 +0100
@@ -26,7 +26,7 @@
    <button image="gtk-index" relief="none" tip="~Show/hide the playlist"
 	   onclick="playlist_show ();" accept-drop="1" autoplay="0"
 	   />
-   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V settings"
+   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V controls"
 	   onclick="settings_show ();"
 	   />
    <label text="" box-expand="1" width="20" />
diff -r 91be65a58d3ba916e52beada889d2fc447ff8491 -r 53d072871574395f7be7e49e74b8c6ebc7379bbd src/menu.c
--- a/src/menu.c	Tue Sep 11 19:37:48 2007 +0100
+++ b/src/menu.c	Tue Sep 11 19:28:43 2007 +0100
@@ -360,14 +360,14 @@ static const GtkActionEntry main_actions
   { "SubsMenu",		"gxine-settings-spu",	N_("_Subtitles"),		NULL },
   { "ViewMisc",		GTK_STOCK_PROPERTIES,	N_("_Settings"),		NULL },
   { "VideoMenu",	NULL,			N_("V_ideo"),			NULL },
-  CB(VideoSettings,	GTK_STOCK_PROPERTIES,	/* Video */ N_("_Settings..."),	NULL),
-  { "VideoConfigMenu",	GTK_STOCK_PREFERENCES,	N_("_Configure"),		NULL },
+  CB(VideoSettings,	GTK_STOCK_PROPERTIES,	/* Video */ N_("_Controls..."),	NULL),
+  { "VideoConfigMenu",	GTK_STOCK_PREFERENCES,	N_("_Configure plugins"),	NULL },
   CB(DeinterlaceConf,	NULL,			N_("_Deinterlace..."),		NULL),
   CB(VideoPPConf,	NULL,			N_("_Video post-processing..."),NULL),
   { "AudioMenu",	NULL,			N_("_Audio"),			NULL },
-  CB(AudioSettings,	GTK_STOCK_PROPERTIES,	/* Audio */ N_("_Settings..."),	NULL),
+  CB(AudioSettings,	GTK_STOCK_PROPERTIES,	/* Audio */ N_("_Controls..."),	NULL),
   CB(AudioEq,		GTK_STOCK_PROPERTIES,	N_("_Equaliser..."),		NULL),
-  { "AudioConfigMenu",	GTK_STOCK_PREFERENCES,	N_("_Configure"),		NULL },
+  { "AudioConfigMenu",	GTK_STOCK_PREFERENCES,	N_("_Configure plugins"),		NULL },
   CB(AudioPPConf,	NULL,			N_("_Audio post-processing..."),NULL),
   { "MediaMenu",	NULL,			N_("_Media"),			NULL },
   CB(MediaAdd,		GTK_STOCK_NEW,		N_("_Add media mark..."),	"<control>D"),
diff -r 91be65a58d3ba916e52beada889d2fc447ff8491 -r 53d072871574395f7be7e49e74b8c6ebc7379bbd src/settings.c
--- a/src/settings.c	Tue Sep 11 19:37:48 2007 +0100
+++ b/src/settings.c	Tue Sep 11 19:28:43 2007 +0100
@@ -96,7 +96,7 @@ struct slider_window_s {
 };
 
 static struct slider_window_s settings_window = {
-  N_("Settings"), settings_page, NULL, FALSE
+  N_("Controls"), settings_page, NULL, FALSE
 };
 
 static const struct slider_s *