[gnome-settings-daemon] printing: try out some new primary text

[William Jon McCann <mccann src gnome org>]

commit a52ad7dc69d09d1cc00ca71bd6bd64e194b17a83
Author: William Jon McCann <jmccann redhat com>
Date:   Fri Jan 28 19:11:29 2011 -0500

    printing: try out some new primary text

 .../gsd-print-notifications-manager.c              |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/plugins/print-notifications/gsd-print-notifications-manager.c b/plugins/print-notifications/gsd-print-notifications-manager.c
index 98a0ac8..d2a8d8f 100644
--- a/plugins/print-notifications/gsd-print-notifications-manager.c
+++ b/plugins/print-notifications/gsd-print-notifications-manager.c
@@ -90,7 +90,7 @@ on_cups_notification (GDBusConnection *connection,
 
         if (g_strcmp0 (signal_name, "PrinterAdded") == 0) {
                 /* Translators: New printer has been added */
-                primary_text = g_strdup (_("New printer"));
+                primary_text = g_strdup (_("Printer added"));
                 if (g_variant_n_children (parameters) == 1) {
                         g_variant_get (parameters, "(&s)", &printer_name);
                         secondary_text = g_strdup_printf ("%s", printer_name);
@@ -122,28 +122,28 @@ on_cups_notification (GDBusConnection *connection,
                                                         break;
                                                 case IPP_JOB_STOPPED:
                                                         /* Translators: A print job has been stopped */
-                                                        primary_text = g_strdup (_("Print job stopped"));
+                                                        primary_text = g_strdup (_("Printing stopped"));
                                                         /* Translators: "print-job xy" on a printer */
                                                         secondary_text = g_strdup_printf (_("\"%s\" on printer %s"), jobs[i].title, jobs[i].dest);
                                                         actual->data = GINT_TO_POINTER (-1);
                                                         break;
                                                 case IPP_JOB_CANCELED:
                                                         /* Translators: A print job has been canceled */
-                                                        primary_text = g_strdup (_("Print job canceled"));
+                                                        primary_text = g_strdup (_("Printing canceled"));
                                                         /* Translators: "print-job xy" on a printer */
                                                         secondary_text = g_strdup_printf (_("\"%s\" on printer %s"), jobs[i].title, jobs[i].dest);
                                                         actual->data = GINT_TO_POINTER (-1);
                                                         break;
                                                 case IPP_JOB_ABORTED:
                                                         /* Translators: A print job has been aborted */
-                                                        primary_text = g_strdup (_("Print job aborted"));
+                                                        primary_text = g_strdup (_("Printing aborted"));
                                                         /* Translators: "print-job xy" on a printer */
                                                         secondary_text = g_strdup_printf (_("\"%s\" on printer %s"), jobs[i].title, jobs[i].dest);
                                                         actual->data = GINT_TO_POINTER (-1);
                                                         break;
                                                 case IPP_JOB_COMPLETED:
                                                         /* Translators: A print job has been completed */
-                                                        primary_text = g_strdup (_("Print job completed"));
+                                                        primary_text = g_strdup (_("Printing completed"));
                                                         /* Translators: "print-job xy" on a printer */
                                                         secondary_text = g_strdup_printf (_("\"%s\" on printer %s"), jobs[i].title, jobs[i].dest);
                                                         actual->data = GINT_TO_POINTER (-1);
@@ -179,10 +179,7 @@ on_cups_notification (GDBusConnection *connection,
                                         index = i;
 
                         if (index >= 0) {
-                                /* Translators: Somebody sent something to printer */
-                                primary_text = g_strdup (_("New print job"));
-                                /* Translators: "print-job xy" on a printer */
-                                secondary_text = g_strdup_printf (_("\"%s\" on printer %s"), jobs[index].title, jobs[index].dest);
+                                /* Only display a notification if there is some problem */
                         }
 
                         manager->priv->actual_jobs =