Merge lp:~indicator-applet-developers/evolution-indicator/ubuntu into lp:~ubuntu-desktop/evolution-indicator/ubuntu

[Ted Gould]

0.2.8

[lp:~indicator-applet-developers/evolution-indicator/ubuntu]

72. By Ted Gould on 2010-03-30

Removing patch accidentally committed.

=== modified file 'configure.ac'
--- configure.ac	2010-03-04 17:26:07 +0000
+++ configure.ac	2010-03-30 18:45:43 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(evolution-indicator, 0.2.7, [])
+AC_INIT(evolution-indicator, 0.2.8, [])
 AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR(src/evolution-indicator.c)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-23 02:04:46 +0000
+++ debian/changelog	2010-03-30 18:45:43 +0000
@@ -1,3 +1,11 @@
+evolution-indicator (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release
+    * Fix ngettext syntax that was causing incorrect translations
+      (LP: #549768)
+
+ -- Ted Gould <[e-mail]>  Tue, 30 Mar 2010 13:36:57 -0500
+
 evolution-indicator (0.2.7-0ubuntu2) lucid; urgency=low
 
   * debian/patches/01_no_debug_spamming.patch:

=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c	2010-03-04 05:05:05 +0000
+++ src/evolution-indicator.c	2010-03-30 18:45:43 +0000
@@ -292,8 +292,8 @@
     }
 
     trans = g_dngettext (PACKAGE, 
-                         _("%d New Message"), 
-                         _("%d New Messages"),
+                         "%d New Message", 
+                         "%d New Messages",
                          message_count);
     
     title = g_strdup_printf (trans, message_count);