diff -Nru indicator-printers-0.1.3/aclocal.m4 indicator-printers-0.1.4/aclocal.m4 --- indicator-printers-0.1.3/aclocal.m4 2012-02-17 18:17:05.000000000 +0000 +++ indicator-printers-0.1.4/aclocal.m4 2012-03-06 18:12:06.000000000 +0000 @@ -459,7 +459,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 41 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -472,13 +472,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -521,7 +519,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' diff -Nru indicator-printers-0.1.3/configure indicator-printers-0.1.4/configure --- indicator-printers-0.1.3/configure 2012-02-17 18:17:06.000000000 +0000 +++ indicator-printers-0.1.4/configure 2012-03-06 18:12:07.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.3. +# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.4. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='indicator-printers' PACKAGE_TARNAME='indicator-printers' -PACKAGE_VERSION='0.1.3' -PACKAGE_STRING='indicator-printers 0.1.3' +PACKAGE_VERSION='0.1.4' +PACKAGE_STRING='indicator-printers 0.1.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1357,7 +1357,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures indicator-printers 0.1.3 to adapt to many kinds of systems. +\`configure' configures indicator-printers 0.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1428,7 +1428,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-printers 0.1.3:";; + short | recursive ) echo "Configuration of indicator-printers 0.1.4:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-printers configure 0.1.3 +indicator-printers configure 0.1.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1910,7 +1910,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by indicator-printers $as_me 0.1.3, which was +It was created by indicator-printers $as_me 0.1.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2727,7 +2727,7 @@ # Define the identity of the package. PACKAGE='indicator-printers' - VERSION='0.1.3' + VERSION='0.1.4' cat >>confdefs.h <<_ACEOF @@ -11534,14 +11534,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.35.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 $as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -11702,7 +11700,11 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -13775,7 +13777,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by indicator-printers $as_me 0.1.3, which was +This file was extended by indicator-printers $as_me 0.1.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13841,7 +13843,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -indicator-printers config.status 0.1.3 +indicator-printers config.status 0.1.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru indicator-printers-0.1.3/configure.ac indicator-printers-0.1.4/configure.ac --- indicator-printers-0.1.3/configure.ac 2012-02-17 18:15:04.000000000 +0000 +++ indicator-printers-0.1.4/configure.ac 2012-03-06 18:11:11.000000000 +0000 @@ -1,5 +1,5 @@ -AC_INIT(indicator-printers, 0.1.3) +AC_INIT(indicator-printers, 0.1.4) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([]) diff -Nru indicator-printers-0.1.3/debian/changelog indicator-printers-0.1.4/debian/changelog --- indicator-printers-0.1.3/debian/changelog 2012-03-06 21:46:30.000000000 +0000 +++ indicator-printers-0.1.4/debian/changelog 2012-03-06 21:46:31.000000000 +0000 @@ -1,3 +1,10 @@ +indicator-printers (0.1.4-0ubuntu1) precise; urgency=low + + * New upstream release. + - fix small i18n problems, thanks Gabor! (LP: #945547) + + -- Lars Uebernickel Tue, 06 Mar 2012 22:21:12 +0100 + indicator-printers (0.1.3-0ubuntu2) precise; urgency=low * Add symbolic printer icons by Daniel Planas Armangue (LP: #840151) diff -Nru indicator-printers-0.1.3/src/indicator-printers.c indicator-printers-0.1.4/src/indicator-printers.c --- indicator-printers-0.1.3/src/indicator-printers.c 2012-02-17 18:11:14.000000000 +0000 +++ indicator-printers-0.1.4/src/indicator-printers.c 2012-03-06 17:59:26.000000000 +0000 @@ -22,6 +22,7 @@ #include "indicator-menu-item.h" #include "dbus-names.h" +#include #include #include @@ -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); diff -Nru indicator-printers-0.1.3/src/indicator-printers-menu.c indicator-printers-0.1.4/src/indicator-printers-menu.c --- indicator-printers-0.1.3/src/indicator-printers-menu.c 2012-02-15 10:11:04.000000000 +0000 +++ indicator-printers-0.1.4/src/indicator-printers-menu.c 2012-03-06 17:59:26.000000000 +0000 @@ -18,6 +18,8 @@ #include "indicator-printers-menu.h" +#include + #include #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; diff -Nru indicator-printers-0.1.3/src/indicator-printer-state-notifier.c indicator-printers-0.1.4/src/indicator-printer-state-notifier.c --- indicator-printers-0.1.3/src/indicator-printer-state-notifier.c 2012-02-16 16:27:35.000000000 +0000 +++ indicator-printers-0.1.4/src/indicator-printer-state-notifier.c 2012-03-06 17:59:26.000000000 +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"),