aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2012-03-06 22:16:06 +0100
committerLars Uebernickel <lars.uebernickel@canonical.com>2012-03-06 22:16:06 +0100
commit85fc36ca17b8d908434c9e480a3240be72b1b6fa (patch)
tree3964d6a90698e68f7cc96f17d073c1afa4239647 /src
parent66cdfa18d909ad66f376b217047664235ccfc6f8 (diff)
parenteec4fb8e1b1edf50f770b6f25f4601ffbfe37aa9 (diff)
downloadayatana-indicator-printers-85fc36ca17b8d908434c9e480a3240be72b1b6fa.tar.gz
ayatana-indicator-printers-85fc36ca17b8d908434c9e480a3240be72b1b6fa.tar.bz2
ayatana-indicator-printers-85fc36ca17b8d908434c9e480a3240be72b1b6fa.zip
Import upstream version 0.1.4
Diffstat (limited to 'src')
-rw-r--r--src/indicator-printer-state-notifier.c10
-rw-r--r--src/indicator-printers-menu.c4
-rw-r--r--src/indicator-printers.c3
3 files changed, 9 insertions, 8 deletions
diff --git a/src/indicator-printer-state-notifier.c b/src/indicator-printer-state-notifier.c
index 8261274..65eb5b0 100644
--- a/src/indicator-printer-state-notifier.c
+++ b/src/indicator-printer-state-notifier.c
@@ -120,16 +120,14 @@ show_alert_box (const gchar *printer,
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"),
diff --git a/src/indicator-printers-menu.c b/src/indicator-printers-menu.c
index e739a63..ef42169 100644
--- a/src/indicator-printers-menu.c
+++ b/src/indicator-printers-menu.c
@@ -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 @@ update_printer_menuitem (IndicatorPrintersMenu *self,
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;
diff --git a/src/indicator-printers.c b/src/indicator-printers.c
index b69c093..78f36da 100644
--- a/src/indicator-printers.c
+++ b/src/indicator-printers.c
@@ -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 @@ indicator_printers_init (IndicatorPrinters *self)
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);