? calendar.error
? common/.deps
? common/.libs
? common/authentication.lo
? common/libevolution-calendarprivate.la
? gui/apps_evolution_calendar-2.4.schemas
? gui/libevolution-calendar.la
? gui/dialogs/.libs
? gui/dialogs/alarm-dialog.lo
? gui/dialogs/alarm-list-dialog.lo
? gui/dialogs/cal-attachment-select-file.lo
? gui/dialogs/cal-prefs-dialog.lo
? gui/dialogs/calendar-setup.lo
? gui/dialogs/cancel-comp.lo
? gui/dialogs/changed-comp.lo
? gui/dialogs/comp-editor-page.lo
? gui/dialogs/comp-editor-util.lo
? gui/dialogs/comp-editor.lo
? gui/dialogs/copy-source-dialog.lo
? gui/dialogs/delete-comp.lo
? gui/dialogs/delete-error.lo
? gui/dialogs/e-delegate-dialog.lo
? gui/dialogs/e-send-options-utils.lo
? gui/dialogs/event-editor.lo
? gui/dialogs/event-page.lo
? gui/dialogs/libcal-dialogs.la
? gui/dialogs/meeting-page.lo
? gui/dialogs/recur-comp.lo
? gui/dialogs/recurrence-page.lo
? gui/dialogs/save-comp.lo
? gui/dialogs/schedule-page.lo
? gui/dialogs/select-source-dialog.lo
? gui/dialogs/send-comp.lo
? gui/dialogs/task-details-page.lo
? gui/dialogs/task-editor.lo
? gui/dialogs/task-page.lo
? gui/dialogs/url-editor-dialog.lo
? importers/icalendar-importer.lo
? importers/libevolution-calendar-importers.la
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2802.2.1
diff -u -p -r1.2802.2.1 ChangeLog
--- ChangeLog	2 Sep 2005 14:17:35 -0000	1.2802.2.1
+++ ChangeLog	17 Sep 2005 11:09:41 -0000
@@ -1,3 +1,11 @@
+2005-09-17  Jon Ander Hernandez <hernandez@movimage.com>
+
+	Fixes #313118
+
+	* calendar/gui/alarm-notify/alarm-notify-dialog.c 
+	(add_alarm_to_notified_alarms_dialog): Don't use mark-up for
+	translatable strings.
+
 2005-09-01  Dinesh Layek  <ldinesh@novell.com>
 
 	Fixes #314922, 311694, 314918
Index: gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.35
diff -u -p -r1.35 alarm-notify-dialog.c
--- gui/alarm-notify/alarm-notify-dialog.c	12 Aug 2005 13:55:51 -0000	1.35
+++ gui/alarm-notify/alarm-notify-dialog.c	17 Sep 2005 11:09:41 -0000
@@ -323,7 +323,7 @@ add_alarm_to_notified_alarms_dialog (Ala
 	GtkTreeIter iter;
 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (na->treeview));
 	AlarmFuncInfo *funcinfo = NULL;
-	gchar *to_display = NULL, *start, *end;
+	gchar *to_display = NULL, *start, *end, *str;
 	icaltimezone *current_zone;
 	
 	g_return_val_if_fail (trigger != -1, iter);
@@ -344,9 +344,11 @@ add_alarm_to_notified_alarms_dialog (Ala
 	current_zone = config_data_get_timezone ();
 	start = timet_to_str_with_zone (occur_start, current_zone);
 	end = timet_to_str_with_zone (occur_end, current_zone);
-	to_display = g_strdup_printf (_("<big><b>%s</b></big>\n%s until %s"), 
-		summary, start, end);
+	str = g_strdup_printf (_("%s until %s"), start, end);
+	to_display = g_strdup_printf ("<big><b>%s</b></big>\n%s", 
+		summary, str);
 	g_free (start);
+	g_free (str);
 	g_free (end);
 	gtk_list_store_set (GTK_LIST_STORE(model), &iter, 
 		ALARM_DISPLAY_COLUMN, to_display, -1);
