From ae743e85c9635aa16292ec3fffb48020a6ca66b1 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Fri, 6 Jan 2006 15:08:39 +0000 Subject: changing "cancelled" (British English) to "canceled" (American English). 2006-01-06 Andre Klapper * addressbook/gui/widgets/eab-gui-util.c: * calendar/calendar.error.xml: * calendar/gui/dialogs/task-details-page.glade: * calendar/gui/e-cal-component-preview.c: * calendar/gui/e-cal-model-tasks.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-itip-control.c: * calendar/gui/print.c: * mail/mail-ops.c: * mail/mail-send-recv.c: * mail/mail-session.c: * plugins/itip-formatter/itip-formatter.c: * plugins/itip-formatter/itip-view.c: changing "cancelled" (British English) to "canceled" (American English). Fixes bug 325334. svn path=/trunk/; revision=31088 --- calendar/gui/e-itip-control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'calendar/gui/e-itip-control.c') diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index eaa31a9b13..d34b9d9fb7 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -1227,9 +1227,9 @@ get_cancel_options (gboolean found, icalcomponent_kind kind) if (!found) { switch (kind) { case ICAL_VEVENT_COMPONENT: - return g_strdup_printf ("%s", _("The meeting has been cancelled, however it could not be found in your calendars")); + return g_strdup_printf ("%s", _("The meeting has been canceled, however it could not be found in your calendars")); case ICAL_VTODO_COMPONENT: - return g_strdup_printf ("%s", _("The task has been cancelled, however it could not be found in your task lists")); + return g_strdup_printf ("%s", _("The task has been canceled, however it could not be found in your task lists")); default: g_assert_not_reached (); return NULL; @@ -1345,8 +1345,8 @@ show_current_event (EItipControl *itip) adjust_item (itip, priv->comp); break; case ICAL_METHOD_CANCEL: - itip_desc = _("%s has cancelled a meeting."); - itip_title = _("Meeting Cancellation"); + itip_desc = _("%s has canceled a meeting."); + 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 * just be de-sensitized */ @@ -1422,8 +1422,8 @@ show_current_todo (EItipControl *itip) adjust_item (itip, priv->comp); break; case ICAL_METHOD_CANCEL: - itip_desc = _("%s has cancelled a task."); - itip_title = _("Task Cancellation"); + itip_desc = _("%s has canceled a task."); + 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 * just be de-sensitized */ -- cgit v1.2.3