Index: gui/misc.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/misc.c,v
retrieving revision 1.7
diff -u -r1.7 misc.c
--- gui/misc.c	11 Feb 2006 19:14:49 -0000	1.7
+++ gui/misc.c	13 Feb 2006 14:51:25 -0000
@@ -109,9 +109,9 @@
 		seconds = difference % 60;
 		if (seconds)
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-			str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes), seconds, ngettext(_("second"), _("seconds"), seconds));
+			str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext("minute", "minutes", minutes), seconds, ngettext("second", "seconds", seconds));
 		else 
-			str = g_strdup_printf (_("(%d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes));
+			str = g_strdup_printf (_("(%d %s)"), minutes, ngettext("minute", "minutes", minutes));
 	} else {
 		guint hours, minutes, seconds;
 		char *s_hours = NULL, *s_minutes = NULL, *s_seconds = NULL;
@@ -122,11 +122,11 @@
 
 
 		if (seconds)
-			s_seconds = g_strdup_printf (ngettext(_(" %u second"), _(" %u seconds"), seconds), seconds);	
+			s_seconds = g_strdup_printf (_(" %u %s"), seconds, ngettext("second", "seconds", seconds));	
 		if (minutes)
-			s_minutes = g_strdup_printf (ngettext(_(" %u minute"), _(" %u minutes"), minutes), minutes);
+			s_minutes = g_strdup_printf (_(" %u %s"), minutes, ngettext("minute", "minutes", minutes));
 		if (hours)
-			s_hours = g_strdup_printf (ngettext(_("%u hour"),_("%u hours"), hours), hours);
+			s_hours = g_strdup_printf (_("%u %s"), hours, ngettext("hour", "hours", hours));
 
 		if (s_minutes && s_seconds)
 			str = g_strconcat ("(", s_hours, s_minutes, s_seconds, ")", NULL);
Index: gui/alarm-notify/util.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/util.c,v
retrieving revision 1.7
diff -u -r1.7 util.c
--- gui/alarm-notify/util.c	11 Feb 2006 19:14:49 -0000	1.7
+++ gui/alarm-notify/util.c	13 Feb 2006 14:51:25 -0000
@@ -62,9 +62,9 @@
 		seconds = difference % 60;
 		if (seconds)
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-			str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes), seconds, ngettext(_("second"), _("seconds"), seconds));
+			str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext("minute", "minutes", minutes), seconds, ngettext("second", "seconds", seconds));
 		else
-			str = g_strdup_printf (_("(%d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes));
+			str = g_strdup_printf (_("(%d %s)"), minutes, ngettext("minute", "minutes", minutes));
 	} else {
 		guint hours, minutes, seconds;
 		char *s_hours = NULL, *s_minutes = NULL, *s_seconds = NULL;
@@ -75,11 +75,11 @@
 
 		
 		if (seconds)
-			s_seconds = g_strdup_printf (ngettext(_(" %u second"), _(" %u seconds"), seconds), seconds);
+			s_seconds = g_strdup_printf (_(" %u %s"), seconds, ngettext("second", "seconds", seconds));	
 		if (minutes)
-			s_minutes = g_strdup_printf (ngettext(_(" %u minute"), _(" %u minutes"), minutes), minutes);
+			s_minutes = g_strdup_printf (_(" %u %s"), minutes, ngettext("minute", "minutes", minutes));
 		if (hours)
-			s_hours = g_strdup_printf (ngettext(_("%u hour"),_("%u hours"), hours), hours);
+			s_hours = g_strdup_printf (_("%u %s"), hours, ngettext("hour", "hours", hours));
 
 		if (s_minutes && s_seconds)
                         str = g_strconcat ("(", s_hours, s_minutes, s_seconds, ")", NULL);
Index: gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.77
diff -u -r1.77 recurrence-page.c
--- gui/dialogs/recurrence-page.c	12 Feb 2006 21:53:32 -0000	1.77
+++ gui/dialogs/recurrence-page.c	13 Feb 2006 14:51:26 -0000
@@ -989,28 +989,28 @@
 		 * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or 
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
 		 */
-		N_("first"),
+		N_("ordinal|first"),
 		/* TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
 		 * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
 		 * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or 
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
 		 */
-		N_("second"),
+		N_("ordinal|second"),
 		/* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 		 * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or 
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
 		 */
-		N_("third"),
+		N_("ordinal|third"),
 		/* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 		 * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or 
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
 		 */
-		N_("fourth"),
+		N_("ordinal|fourth"),
 		/* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 		 * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or 
 		 * the name of a week day (like 'Monday' or 'Friday') always follow.
 		 */
-		N_("last")
+		N_("ordinal|last")
 	};
 
 	GtkWidget *menu, *submenu, *item, *submenu_item;
@@ -1021,7 +1021,7 @@
 
 	/* Relation */
 	for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) {
-		item = gtk_menu_item_new_with_label (_(options[i]));
+		item = gtk_menu_item_new_with_label (Q_(options[i]));
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show (item);
 	}
