Index: calendar/gui/e-itip-control.c
===================================================================
--- calendar/gui/e-itip-control.c	(revision 33835)
+++ calendar/gui/e-itip-control.c	(working copy)
@@ -1324,38 +1324,41 @@
 show_current_event (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
+	const gchar *itip_title, *boldname;
+	char *options, *itip_desc;
 	gboolean show_selector = FALSE;
-	
+
 	priv = itip->priv;
 
 	priv->type = E_CAL_SOURCE_TYPE_EVENT;
+	
+	boldname = "<b>%s</b>";
 
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published meeting information.");
+		itip_desc = g_strdup_printf (_("%s has published meeting information."), boldname);
 		itip_title = _("Meeting Information");
 		options = get_publish_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_REQUEST:
 		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests the presence of %s at a meeting.");
+			/*FIXME: this is ugly */
+			itip_desc = g_strdup_printf (_("%s requests the presence of %s at a meeting."), boldname, "%s");
 		else
-			itip_desc = _("<b>%s</b> requests your presence at a meeting.");
+			itip_desc = g_strdup_printf(_("%s requests your presence at a meeting."), boldname);
 		itip_title = _("Meeting Proposal");
 		options = get_request_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_ADD:
 		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to be added to an existing meeting.");
+		itip_desc = g_strdup_printf(_("%s wishes to be added to an existing meeting."), boldname);
 		itip_title = _("Meeting Update");
 		options = get_publish_options ();
 		break;
 	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest meeting information.");
+		itip_desc = g_strdup_printf(_("%s wishes to receive the latest meeting information."), boldname);
 		itip_title = _("Meeting Update Request");
 		options = get_refresh_options ();
 
@@ -1363,7 +1366,7 @@
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a meeting request.");
+		itip_desc = g_strdup_printf(_("%s has replied to a meeting request."), boldname);
 		itip_title = _("Meeting Reply");
 		options = get_reply_options ();
 
@@ -1371,7 +1374,7 @@
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has canceled a meeting.");
+		itip_desc = g_strdup_printf(_("%s has canceled a meeting."), boldname);
 		itip_title = _("Meeting Cancelation");
 		/* FIXME priv->current_ecal will always be NULL so the
 		 * user won't see an error message, the OK button will
@@ -1382,13 +1385,14 @@
 		adjust_item (itip, priv->comp);
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = g_strdup_printf(_("%s has sent an unintelligible message."), boldname);
 		itip_title = _("Bad Meeting Message");
 		options = NULL;
 	}
 
 	write_html (itip, itip_desc, itip_title, options);
 	g_free (options);
+	g_free (itip_desc);
 
 	if (priv->calendar_uid)
 		priv->current_ecal = start_calendar_server_by_uid (itip, priv->calendar_uid, priv->type);
@@ -1400,17 +1404,19 @@
 show_current_todo (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
+	const gchar *itip_title, *boldname;
+	char *options, *itip_desc;
 	gboolean show_selector = FALSE;
-	
+
 	priv = itip->priv;
 
 	priv->type = E_CAL_SOURCE_TYPE_TODO;
 
+	boldname = "<b>%s</b>";
+
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published task information.");
+		itip_desc = g_strdup_printf(_("%s has published task information."), boldname);
 		itip_title = _("Task Information");
 		options = get_publish_options ();
 		show_selector = TRUE;
@@ -1418,21 +1424,22 @@
 	case ICAL_METHOD_REQUEST:
 		/* FIXME Does this need to handle like events above? */
 		if (priv->delegator_address != NULL)
-			itip_desc = _("<b>%s</b> requests %s to perform a task.");
+			/*FIXME: this is ugly */
+			itip_desc = g_strdup_printf(_("%s requests %s to perform a task."), boldname, "%s");
 		else
-			itip_desc = _("<b>%s</b> requests you perform a task.");
+			itip_desc = g_strdup_printf(_("%s requests you perform a task."), boldname);
 		itip_title = _("Task Proposal");
 		options = get_request_options ();
 		show_selector = TRUE;
 		break;
 	case ICAL_METHOD_ADD:
 		/* FIXME Whats going on here? */
-		itip_desc = _("<b>%s</b> wishes to be added to an existing task.");
+		itip_desc = g_strdup_printf(_("%s wishes to be added to an existing task."), boldname);
 		itip_title = _("Task Update");
 		options = get_publish_options ();
 		break;
 	case ICAL_METHOD_REFRESH:
-		itip_desc = _("<b>%s</b> wishes to receive the latest task information.");
+		itip_desc = g_strdup_printf(_("%s wishes to receive the latest task information."), boldname);
 		itip_title = _("Task Update Request");
 		options = get_refresh_options ();
 
@@ -1440,7 +1447,7 @@
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a task assignment.");
+		itip_desc = g_strdup_printf(_("%s has replied to a task assignment."), boldname);
 		itip_title = _("Task Reply");
 		options = get_reply_options ();
 
@@ -1448,7 +1455,7 @@
 		adjust_item (itip, priv->comp);
 		break;
 	case ICAL_METHOD_CANCEL:
-		itip_desc = _("<b>%s</b> has canceled a task.");
+		itip_desc = g_strdup_printf(_("%s has canceled a task."), boldname);
 		itip_title = _("Task Cancelation");
 		/* FIXME priv->current_ecal will always be NULL so the
 		 * user won't see an error message, the OK button will
@@ -1459,13 +1466,14 @@
 		adjust_item (itip, priv->comp);
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = g_strdup_printf(_("%s has sent an unintelligible message."), boldname);
 		itip_title = _("Bad Task Message");
 		options = NULL;
 	}
 
 	write_html (itip, itip_desc, itip_title, options);
 	g_free (options);
+	g_free (itip_desc);
 
 	if (priv->calendar_uid)
 		priv->current_ecal = start_calendar_server_by_uid (itip, priv->calendar_uid, priv->type);
@@ -1477,35 +1485,38 @@
 show_current_freebusy (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
-	const gchar *itip_title, *itip_desc;
-	char *options;
+	const gchar *itip_title, *boldname;
+	char *options, *itip_desc;
 
 	priv = itip->priv;
 
+	boldname = "<b>%s</b>";
+
 	switch (priv->method) {
 	case ICAL_METHOD_PUBLISH:
-		itip_desc = _("<b>%s</b> has published free/busy information.");
+		itip_desc = g_strdup_printf(_("%s has published free/busy information."), boldname);
 		itip_title = _("Free/Busy Information");
 		options = NULL;
 		break;
 	case ICAL_METHOD_REQUEST:
-		itip_desc = _("<b>%s</b> requests your free/busy information.");
+		itip_desc = g_strdup_printf(_("%s requests your free/busy information."), boldname);
 		itip_title = _("Free/Busy Request");
 		options = get_request_fb_options ();
 		break;
 	case ICAL_METHOD_REPLY:
-		itip_desc = _("<b>%s</b> has replied to a free/busy request.");
+		itip_desc = g_strdup_printf(_("%s has replied to a free/busy request."), boldname);
 		itip_title = _("Free/Busy Reply");
 		options = NULL;
 		break;
 	default:
-		itip_desc = _("<b>%s</b> has sent an unintelligible message.");
+		itip_desc = g_strdup_printf(_("%s has sent an unintelligible message."), boldname);
 		itip_title = _("Bad Free/Busy Message");
 		options = NULL;
 	}
 
 	write_html (itip, itip_desc, itip_title, options);
 	g_free (options);
+	g_free (itip_desc);
 }
 
 static icalcomponent *
