[Xfce4-commits] <xfce4-power-manager:master> Remove Xfce prefix from notifications, dialogs, ... (bug#7268)

[Ali Abdallah]

Updating branch refs/heads/master
         to 747b3956d8f83a1c144a6f8de60f701bc33a274e (commit)
       from c8d29b6e2dde6091e0bebbd2761f98f323beba02 (commit)

commit 747b3956d8f83a1c144a6f8de60f701bc33a274e
Author: Ali Abdallah <aliov at xfce.org>
Date:   Mon Feb 14 11:01:55 2011 +0100

    Remove Xfce prefix from notifications, dialogs, ...  (bug#7268)

 settings/xfce4-power-manager-settings.desktop.in |    4 ++--
 src/xfce4-power-manager.desktop.in               |    2 +-
 src/xfpm-battery.c                               |    2 +-
 src/xfpm-power.c                                 |   14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/settings/xfce4-power-manager-settings.desktop.in b/settings/xfce4-power-manager-settings.desktop.in
index 55fc303..7cbd09f 100644
--- a/settings/xfce4-power-manager-settings.desktop.in
+++ b/settings/xfce4-power-manager-settings.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
-_Name=Xfce 4 Power Manager
+_Name=Power Manager
 _GenericName=Power Manager
-_Comment=Settings for the Xfce 4 Power Manager
+_Comment=Settings for the Xfce Power Manager
 Exec=xfce4-power-manager-settings
 Icon=xfpm-ac-adapter
 Terminal=false
diff --git a/src/xfce4-power-manager.desktop.in b/src/xfce4-power-manager.desktop.in
index 6df34ad..34074eb 100644
--- a/src/xfce4-power-manager.desktop.in
+++ b/src/xfce4-power-manager.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Xfce Power Manager
+_Name=Power Manager
 _Comment=Power management for the Xfce desktop
 Icon=xfpm-ac-adapter
 Exec=xfce4-power-manager
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index 81f4a4c..73208fb 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -226,7 +226,7 @@ xfpm_battery_notify_idle (gpointer data)
 	return FALSE;
 	
     xfpm_notify_show_notification (battery->priv->notify, 
-				   _("Xfce power manager"), 
+				   _("Power Manager"), 
 				   message, 
 				   gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
 				   8000,
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index ff12d69..6c5d80f 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -297,7 +297,7 @@ xfpm_power_report_error (XfpmPower *power, const gchar *error, const gchar *icon
     }
     
     xfpm_notify_show_notification (power->priv->notify, 
-				   _("Xfce power manager"), 
+				   _("Power Manager"), 
 				   error, 
 				   icon_name,
 				   10000,
@@ -421,7 +421,7 @@ xfpm_power_tray_exit_activated_cb (gpointer data)
 			       _("Quit"),
 			       _("All running instances of the power manager will exit"),
 			       "%s",
-			        _("Quit Xfce power manager?"));
+			        _("Quit the power manager?"));
     if ( ret )
     {
 	xfpm_quit ();
@@ -517,7 +517,7 @@ xfpm_power_show_tray_menu (XfpmPower *power,
     mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
     gtk_widget_set_sensitive (mi, TRUE);
     gtk_widget_show (mi);
-    g_signal_connect (mi, "activate", G_CALLBACK (xfpm_about), _("Xfce Power Manager"));
+    g_signal_connect (mi, "activate", G_CALLBACK (xfpm_about), _("Power Manager"));
     
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), mi);
     
@@ -652,7 +652,7 @@ xfpm_power_show_critical_action_notification (XfpmPower *power, XfpmBattery *bat
 	      
     n = 
 	xfpm_notify_new_notification (power->priv->notify, 
-				      _("Xfce power manager"), 
+				      _("Power Manager"), 
 				      message, 
 				      gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
 				      20000,
@@ -688,7 +688,7 @@ xfpm_power_show_critical_action_gtk (XfpmPower *power)
     message = _("System is running on low power. "\
                "Save your work to avoid losing data");
     
-    dialog = gtk_dialog_new_with_buttons (_("Xfce Power Manager"), NULL, GTK_DIALOG_MODAL,
+    dialog = gtk_dialog_new_with_buttons (_("Power Manager"), NULL, GTK_DIALOG_MODAL,
                                           NULL);
     
     gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -840,7 +840,7 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
 	{
 	    if ( notify )
 		xfpm_notify_show_notification (power->priv->notify, 
-					       _("Xfce power manager"), 
+					       _("Power Manager"), 
 					       _("System is running on low power"), 
 					       gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
 					       10000,
@@ -854,7 +854,7 @@ xfpm_power_battery_charge_changed_cb (XfpmBattery *battery, XfpmPower *power)
 	    
 	    if ( notify )
 		xfpm_notify_show_notification (power->priv->notify, 
-					       _("Xfce power manager"), 
+					       _("Power Manager"), 
 					       _("Battery charge level is low"), 
 					       gtk_status_icon_get_icon_name (GTK_STATUS_ICON (battery)),
 					       10000,