Print Indicator

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

  1. bug945547
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Approved by: Charles Kerr
Approved revision: 54
Merge reported by: Lars Karlitski
Merged at revision: not available
Proposed branch: lp:~kelemeng/indicator-printers/bug945547
Merge into: lp:indicator-printers/0.1
Diff against target: 66 lines (+9/-8)
3 files modified
src/indicator-printer-state-notifier.c (+4/-6)
src/indicator-printers-menu.c (+3/-1)
src/indicator-printers.c (+2/-1)
To merge this branch: bzr merge lp:~kelemeng/indicator-printers/bug945547
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+95731@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good

review: Approve
Revision history for this message
Lars Karlitski (larsu) wrote :

Thanks for the patch, Gabor!

And thank you Charles for reviewing it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/indicator-printer-state-notifier.c'
2--- src/indicator-printer-state-notifier.c 2012-02-16 16:36:05 +0000
3+++ src/indicator-printer-state-notifier.c 2012-03-03 12:13:20 +0000
4@@ -120,16 +120,14 @@
5 GtkWidget *image;
6 gchar *primary_text;
7 gchar *secondary_text;
8- const gchar *fmt;
9
10 image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
11 primary_text = g_strdup_printf (reason, printer);
12
13- if (njobs == 1)
14- fmt = _("You have %d job queued to print on this printer.");
15- else
16- fmt = _("You have %d jobs queued to print on this printer.");
17- secondary_text = g_strdup_printf (fmt, njobs);
18+ secondary_text = g_strdup_printf (ngettext(
19+ "You have %d job queued to print on this printer.",
20+ "You have %d jobs queued to print on this printer.", njobs),
21+ njobs);
22
23 dialog = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
24 "title", _("Printing Problem"),
25
26=== modified file 'src/indicator-printers-menu.c'
27--- src/indicator-printers-menu.c 2012-02-15 10:40:19 +0000
28+++ src/indicator-printers-menu.c 2012-03-03 12:13:20 +0000
29@@ -18,6 +18,8 @@
30
31 #include "indicator-printers-menu.h"
32
33+#include <glib/gi18n.h>
34+
35 #include <cups/cups.h>
36
37 #include "spawn-printer-settings.h"
38@@ -195,7 +197,7 @@
39
40 switch (state) {
41 case IPP_PRINTER_STOPPED:
42- dbusmenu_menuitem_property_set (item, "indicator-right", "Paused");
43+ dbusmenu_menuitem_property_set (item, "indicator-right", _("Paused"));
44 dbusmenu_menuitem_property_set_bool (item, "indicator-right-is-lozenge", FALSE);
45 break;
46
47
48=== modified file 'src/indicator-printers.c'
49--- src/indicator-printers.c 2012-02-17 18:14:02 +0000
50+++ src/indicator-printers.c 2012-03-03 12:13:20 +0000
51@@ -22,6 +22,7 @@
52 #include "indicator-menu-item.h"
53 #include "dbus-names.h"
54
55+#include <glib/gi18n.h>
56 #include <gtk/gtk.h>
57
58 #include <libindicator/indicator.h>
59@@ -287,7 +288,7 @@
60 gtk_widget_show (GTK_WIDGET (image));
61
62 priv->entry.name_hint = PACKAGE_NAME;
63- priv->entry.accessible_desc = "Printers";
64+ priv->entry.accessible_desc = _("Printers");
65 priv->entry.menu = GTK_MENU (g_object_ref_sink (menu));
66 priv->entry.image = g_object_ref_sink (image);
67

Subscribers

People subscribed via source and target branches