aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
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 /plugins
parentde7b39a1ded4990ab537f805cd237c44fbd16777 (diff)
downloadgsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.gz
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.bz2
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.lz
gsoc2013-evolution-ae743e85c9635aa16292ec3fffb48020a6ca66b1.tar.xz
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 'plugins')
-rw-r--r--plugins/itip-formatter/ChangeLog7
-rw-r--r--plugins/itip-formatter/itip-formatter.c6
-rw-r--r--plugins/itip-formatter/itip-view.c8
3 files changed, 14 insertions, 7 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index c0c4e808ac..abb1759c3d 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-06 Andre Klapper <a9016009@gmx.de>
+
+ * evolution/plugins/itip-formatter/itip-formatter.c:
+ * evolution/plugins/itip-formatter/itip-view.c:
+ changing "cancelled" (British English)
+ to "canceled" (American English). Fixes bug 325334.
+
2006-01-06 Simon Zheng <simon.zheng@sun.com>
* itip-formatter.c:
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 57622296f8..4d88964174 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -802,7 +802,7 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
case ITIP_VIEW_RESPONSE_CANCEL:
/* FIXME some calendars just might not save it at all, is this accurate? */
itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
- _("Sent to calendar '%s' as cancelled"), e_source_peek_name (source));
+ _("Sent to calendar '%s' as canceled"), e_source_peek_name (source));
break;
default:
g_assert_not_reached ();
@@ -902,9 +902,9 @@ remove_delegate (FormatItipPObject *pitip, const char *delegate, const char *del
if (status)
send_comp_to_attendee (E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp, delegator, pitip->current_ecal, comment);
if (status) {
- itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Sent a cancellation notice to the delegate"));
+ itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Sent a cancelation notice to the delegate"));
} else
- itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Could not send the cancellation notice to the delegate"));
+ itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Could not send the cancelation notice to the delegate"));
g_free (comment);
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 34a059797a..3a8244adce 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -370,9 +370,9 @@ set_calendar_sender_text (ItipView *view)
break;
case ITIP_VIEW_MODE_CANCEL:
if (priv->sentby)
- sender = g_strdup_printf (_("<b>%s</b> through %s has cancelled the following meeting:"), organizer, priv->sentby);
+ sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following meeting:"), organizer, priv->sentby);
else
- sender = g_strdup_printf (_("<b>%s</b> has cancelled the following meeting."), organizer);
+ sender = g_strdup_printf (_("<b>%s</b> has canceled the following meeting."), organizer);
break;
case ITIP_VIEW_MODE_COUNTER:
sender = g_strdup_printf (_("<b>%s</b> has proposed the following meeting changes."), attendee);
@@ -438,9 +438,9 @@ set_tasklist_sender_text (ItipView *view)
break;
case ITIP_VIEW_MODE_CANCEL:
if (priv->sentby)
- sender = g_strdup_printf (_("<b>%s</b> through %s has cancelled the following assigned task:"), organizer, priv->sentby);
+ sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following assigned task:"), organizer, priv->sentby);
else
- sender = g_strdup_printf (_("<b>%s</b> has cancelled the following assigned task:"), organizer);
+ sender = g_strdup_printf (_("<b>%s</b> has canceled the following assigned task:"), organizer);
break;
case ITIP_VIEW_MODE_COUNTER:
sender = g_strdup_printf (_("<b>%s</b> has proposed the following task assignment changes:"), attendee);