aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-itip-control.c
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2006-01-06 23:08:39 +0800
committerAndre Klapper <aklapper@src.gnome.org>2006-01-06 23:08:39 +0800
commitae743e85c9635aa16292ec3fffb48020a6ca66b1 (patch)
treea083ddc504130251752c84823c4e86c4aa54ff6e /calendar/gui/e-itip-control.c
parentde7b39a1ded4990ab537f805cd237c44fbd16777 (diff)
downloadgsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.gz
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.zst
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.zip
changing "cancelled" (British English) to "canceled" (American English).
2006-01-06 Andre Klapper <a9016009@gmx.de> * 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
Diffstat (limited to 'calendar/gui/e-itip-control.c')
-rw-r--r--calendar/gui/e-itip-control.c12
1 files changed, 6 insertions, 6 deletions
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 ("<i>%s</i>", _("The meeting has been cancelled, however it could not be found in your calendars"));
+ return g_strdup_printf ("<i>%s</i>", _("The meeting has been canceled, however it could not be found in your calendars"));
case ICAL_VTODO_COMPONENT:
- return g_strdup_printf ("<i>%s</i>", _("The task has been cancelled, however it could not be found in your task lists"));
+ return g_strdup_printf ("<i>%s</i>", _("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 = _("<b>%s</b> has cancelled a meeting.");
- itip_title = _("Meeting Cancellation");
+ itip_desc = _("<b>%s</b> 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 = _("<b>%s</b> has cancelled a task.");
- itip_title = _("Task Cancellation");
+ itip_desc = _("<b>%s</b> 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 */