Merge lp:~kelemeng/indicator-printers/bug945547 into lp:indicator-printers/0.1

[Gabor Kelemen]

[Charles Kerr (charlesk)]

Looks good

review: Approve

[Lars Karlitski (larsu)]

Thanks for the patch, Gabor!

And thank you Charles for reviewing it.

=== modified file 'src/indicator-printer-state-notifier.c'
--- src/indicator-printer-state-notifier.c	2012-02-16 16:36:05 +0000
+++ src/indicator-printer-state-notifier.c	2012-03-03 12:13:20 +0000
@@ -120,16 +120,14 @@
     GtkWidget *image;
     gchar *primary_text;
     gchar *secondary_text;
-    const gchar *fmt;
 
     image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
     primary_text = g_strdup_printf (reason, printer);
 
-    if (njobs == 1)
-        fmt = _("You have %d job queued to print on this printer.");
-    else
-        fmt = _("You have %d jobs queued to print on this printer.");
-    secondary_text = g_strdup_printf (fmt, njobs);
+    secondary_text = g_strdup_printf (ngettext(
+                   "You have %d job queued to print on this printer.", 
+                   "You have %d jobs queued to print on this printer.", njobs),
+                   njobs);
 
     dialog = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
                            "title", _("Printing Problem"),
 
=== modified file 'src/indicator-printers-menu.c'
--- src/indicator-printers-menu.c	2012-02-15 10:40:19 +0000
+++ src/indicator-printers-menu.c	2012-03-03 12:13:20 +0000
@@ -18,6 +18,8 @@
 
 #include "indicator-printers-menu.h"
 
+#include <glib/gi18n.h>
+
 #include <cups/cups.h>
 
 #include "spawn-printer-settings.h"
@@ -195,7 +197,7 @@
 
     switch (state) {
         case IPP_PRINTER_STOPPED:
-            dbusmenu_menuitem_property_set (item, "indicator-right", "Paused");
+            dbusmenu_menuitem_property_set (item, "indicator-right", _("Paused"));
             dbusmenu_menuitem_property_set_bool (item, "indicator-right-is-lozenge", FALSE);
             break;
 
 
=== modified file 'src/indicator-printers.c'
--- src/indicator-printers.c	2012-02-17 18:14:02 +0000
+++ src/indicator-printers.c	2012-03-03 12:13:20 +0000
@@ -22,6 +22,7 @@
 #include "indicator-menu-item.h"
 #include "dbus-names.h"
 
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <libindicator/indicator.h>
@@ -287,7 +288,7 @@
     gtk_widget_show (GTK_WIDGET (image));
 
     priv->entry.name_hint = PACKAGE_NAME;
-    priv->entry.accessible_desc = "Printers";
+    priv->entry.accessible_desc = _("Printers");
     priv->entry.menu = GTK_MENU (g_object_ref_sink (menu));
     priv->entry.image = g_object_ref_sink (image);