[Xfce4-commits] <xfce4-mixer:master> Make name and description more meaningful (bug #5817)

[Guido Berhoerster]

Updating branch refs/heads/master
         to 397c3ea65a63d770509b141b4db45a11541e5ba3 (commit)
       from e64ddd86a5abfaf6e34d5cd1d57eb0b5656ce6c6 (commit)

commit 397c3ea65a63d770509b141b4db45a11541e5ba3
Author: Guido Berhoerster <guido+xfce at berhoerster.name>
Date:   Thu Sep 27 16:31:08 2012 +0200

    Make name and description more meaningful (bug #5817)

 NEWS                               |    1 +
 panel-plugin/mixer.desktop.in      |    4 ++--
 panel-plugin/xfce-plugin-dialog.c  |    2 +-
 xfce4-mixer/main.c                 |    2 +-
 xfce4-mixer/xfce-mixer-window.c    |    4 ++--
 xfce4-mixer/xfce4-mixer.desktop.in |    4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index e3a9aaf..cf8b487 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@
 - Mute a track when the volume is set to 0% and unmute when set to a higher
   value (bug #8291).
 - Add an item to the panel plugin context menu for muting (bug #7944).
+- Make name and description more meaningful (bug #5817).
 
 
 4.8.0
diff --git a/panel-plugin/mixer.desktop.in b/panel-plugin/mixer.desktop.in
index fb46a41..fb45c14 100644
--- a/panel-plugin/mixer.desktop.in
+++ b/panel-plugin/mixer.desktop.in
@@ -1,7 +1,7 @@
 [Xfce Panel]
 Type=X-XFCE-PanelPlugin
-_Name=Mixer
-_Comment=Volume control for your sound card
+_Name=Audio Mixer
+_Comment=Adjust volume levels
 Icon=multimedia-volume-control
 X-XFCE-Internal=false
 X-XFCE-Module=mixer
diff --git a/panel-plugin/xfce-plugin-dialog.c b/panel-plugin/xfce-plugin-dialog.c
index 789a18c..4a120bf 100644
--- a/panel-plugin/xfce-plugin-dialog.c
+++ b/panel-plugin/xfce-plugin-dialog.c
@@ -193,7 +193,7 @@ xfce_plugin_dialog_create_contents (XfcePluginDialog *dialog)
   gchar         *title;
 
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "multimedia-volume-control");
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Mixer Plugin"));
+  gtk_window_set_title (GTK_WINDOW (dialog), _("Audio Mixer Plugin"));
 
   xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), _("Configure the mixer track and left-click command"));
   
diff --git a/xfce4-mixer/main.c b/xfce4-mixer/main.c
index e459f8f..a4c32d7 100644
--- a/xfce4-mixer/main.c
+++ b/xfce4-mixer/main.c
@@ -58,7 +58,7 @@ main (int    argc,
 #endif
 
   /* Set application name */
-  g_set_application_name (_("Mixer"));
+  g_set_application_name (_("Audio Mixer"));
 
   /* Initialize GTK+ */
   gtk_init (&argc, &argv);
diff --git a/xfce4-mixer/xfce-mixer-window.c b/xfce4-mixer/xfce-mixer-window.c
index 0c6a1e9..14bd6f3 100644
--- a/xfce4-mixer/xfce-mixer-window.c
+++ b/xfce4-mixer/xfce-mixer-window.c
@@ -164,7 +164,7 @@ xfce_mixer_window_init (XfceMixerWindow *window)
 
   /* Configure the main window */
   gtk_window_set_icon_name (GTK_WINDOW (window), "multimedia-volume-control");
-  gtk_window_set_title (GTK_WINDOW (window), _("Mixer"));
+  gtk_window_set_title (GTK_WINDOW (window), _("Audio Mixer"));
   gtk_window_set_default_size (GTK_WINDOW (window), width, height);
   gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
   gtk_dialog_set_has_separator (GTK_DIALOG (window), FALSE);
@@ -283,7 +283,7 @@ xfce_mixer_window_soundcard_changed (XfceMixerCardCombo *combo,
   g_return_if_fail (IS_XFCE_MIXER_WINDOW (window));
   g_return_if_fail (GST_IS_MIXER (card));
 
-  title = g_strdup_printf ("%s - %s", _("Mixer"), xfce_mixer_get_card_display_name (card));
+  title = g_strdup_printf ("%s - %s", _("Audio Mixer"), xfce_mixer_get_card_display_name (card));
   gtk_window_set_title (GTK_WINDOW (window), title);
   g_free (title);
 
diff --git a/xfce4-mixer/xfce4-mixer.desktop.in b/xfce4-mixer/xfce4-mixer.desktop.in
index c962d84..42ac691 100644
--- a/xfce4-mixer/xfce4-mixer.desktop.in
+++ b/xfce4-mixer/xfce4-mixer.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
-_Name=Mixer
-_Comment=Audio mixer for the Xfce Desktop Environment
+_Name=Audio Mixer
+_Comment=Adjust volume levels
 Icon=multimedia-volume-control
 Exec=xfce4-mixer
 Type=Application