aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c2
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/calendar.error.xml12
-rw-r--r--calendar/gui/dialogs/task-details-page.glade2
-rw-r--r--calendar/gui/e-cal-component-preview.c2
-rw-r--r--calendar/gui/e-cal-model-tasks.c4
-rw-r--r--calendar/gui/e-calendar-table.c2
-rw-r--r--calendar/gui/e-itip-control.c12
-rw-r--r--calendar/gui/print.c2
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-ops.c2
-rw-r--r--mail/mail-send-recv.c4
-rw-r--r--mail/mail-session.c2
-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
17 files changed, 60 insertions, 30 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c22daf0041..12fad55d08 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06 Andre Klapper <a9016009@gmx.de>
+ * evolution/addressbook/gui/widgets/eab-gui-util.c:
+ changing "cancelled" (British English)
+ to "canceled" (American English). Fixes bug 325334.
+
2006-01-04 Shi Pu <shi.pu@sun.com>
* gui/component/addressbook-config.c (eabc_details_search): add a not
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 7d210fcdbe..d37de933a9 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -58,7 +58,7 @@ static const char *status_to_string[] = {
/* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"),
/* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"),
/* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"),
- /* E_BOOK_ERROR_CANCELLED */ N_("Cancelled"),
+ /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"),
/* E_BOOK_ERROR_COULD_NOT_CANCEL */ N_("Could not cancel"),
/* E_BOOK_ERROR_AUTHENTICATION_FAILED */ N_("Authentication Failed"),
/* E_BOOK_ERROR_AUTHENTICATION_REQUIRED */ N_("Authentication Required"),
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 059c2c1896..ffc2b3837a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-06 Andre Klapper <a9016009@gmx.de>
+ * evolution/calendar/calendar.error.xml:
+ * evolution/calendar/gui/e-itip-control.c:
+ * evolution/calendar/gui/dialogs/task-details-page.glade:
+ * evolution/calendar/gui/e-cal-component-preview.c:
+ * evolution/calendar/gui/e-cal-model-tasks.c:
+ * evolution/calendar/gui/e-calendar-table.c:
+ * evolution/calendar/gui/print.c:
+ changing "cancelled" (British English)
+ to "canceled" (American English). Fixes bug 325334.
+
2005-01-06 Andre Klapper <a9016009@gmx.de>
* calendar.error.xml: changed "RSVP" to "reply". Fixes bug 261071.
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index c7bd8f973a..d262bb8495 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -2,8 +2,8 @@
<error-list domain="calendar">
<error id="prompt-cancel-meeting" type="question" defult="GTK_RESPONSE_YES">
- <_primary>Would you like to send all the participants a cancellation notice?</_primary>
- <_secondary>If you do not send a cancellation notice, the other participants may not know the meeting is cancelled.</_secondary>
+ <_primary>Would you like to send all the participants a cancelation notice?</_primary>
+ <_secondary>If you do not send a cancelation notice, the other participants may not know the meeting is canceled.</_secondary>
<button _label="Do not Send" response="GTK_RESPONSE_NO"/>
<button _label="Send Notice" response="GTK_RESPONSE_YES"/>
</error>
@@ -16,8 +16,8 @@
</error>
<error id="prompt-cancel-task" type="question" defult="GTK_RESPONSE_YES">
- <_primary>Would you like to send all the participants a cancellation notice?</_primary>
- <_secondary>If you do not send a cancellation notice, the other participants may not know the task has been deleted.</_secondary>
+ <_primary>Would you like to send all the participants a cancelation notice?</_primary>
+ <_secondary>If you do not send a cancelation notice, the other participants may not know the task has been deleted.</_secondary>
<button _label="Do not Send" response="GTK_RESPONSE_NO"/>
<button _label="Send Notice" response="GTK_RESPONSE_YES"/>
</error>
@@ -30,8 +30,8 @@
</error>
<error id="prompt-cancel-journal" type="question" defult="GTK_RESPONSE_YES">
- <_primary>Would you like to send a cancellation notice for this journal entry?</_primary>
- <_secondary>If you do not send a cancellation notice, the other participants may not know the journal has been deleted.</_secondary>
+ <_primary>Would you like to send a cancelation notice for this journal entry?</_primary>
+ <_secondary>If you do not send a cancelation notice, the other participants may not know the journal has been deleted.</_secondary>
<button _label="Do not Send" response="GTK_RESPONSE_NO"/>
<button _label="Send Notice" response="GTK_RESPONSE_YES"/>
</error>
diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade
index 910f7835b2..05891f99de 100644
--- a/calendar/gui/dialogs/task-details-page.glade
+++ b/calendar/gui/dialogs/task-details-page.glade
@@ -270,7 +270,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget6">
<property name="visible">True</property>
- <property name="label" translatable="yes">Cancelled</property>
+ <property name="label" translatable="yes">Canceled</property>
<property name="use_underline">True</property>
</widget>
</child>
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 982e4a3ab3..055d933175 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -231,7 +231,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
str = g_strdup (_("Completed"));
break;
case ICAL_STATUS_CANCELLED :
- str = g_strdup (_("Cancelled"));
+ str = g_strdup (_("Canceled"));
break;
case ICAL_STATUS_NONE :
default :
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index fd27f2d7b3..1ea87b2d71 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -346,7 +346,7 @@ get_status (ECalModelComponent *comp_data)
case ICAL_STATUS_COMPLETED:
return _("Completed");
case ICAL_STATUS_CANCELLED:
- return _("Cancelled");
+ return _("Canceled");
default:
return "";
}
@@ -659,7 +659,7 @@ set_status (ECalModelComponent *comp_data, const char *value)
status = ICAL_STATUS_INPROCESS;
else if (!e_util_utf8_strcasecmp (value, _("Completed")))
status = ICAL_STATUS_COMPLETED;
- else if (!e_util_utf8_strcasecmp (value, _("Cancelled")))
+ else if (!e_util_utf8_strcasecmp (value, _("Canceled")))
status = ICAL_STATUS_CANCELLED;
else {
g_warning ("Invalid status: %s\n", value);
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index b6788c6cb8..5ac2e52d2a 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -461,7 +461,7 @@ e_calendar_table_init (ECalendarTable *cal_table)
strings = g_list_append (strings, (char*) _("Not Started"));
strings = g_list_append (strings, (char*) _("In Progress"));
strings = g_list_append (strings, (char*) _("Completed"));
- strings = g_list_append (strings, (char*) _("Cancelled"));
+ strings = g_list_append (strings, (char*) _("Canceled"));
e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),
strings);
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 */
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 91f7480a6d..e1b17901f1 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2372,7 +2372,7 @@ print_comp_item (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
status_string = _("Completed");
break;
case ICAL_STATUS_CANCELLED:
- status_string = _("Cancelled");
+ status_string = _("Canceled");
break;
default:
break;
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d1c68b26ac..97728accf7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-06 Andre Klapper <a9016009@gmx.de>
+ * evolution/mail/mail-ops.c:
+ * evolution/mail/mail-send-recv.c:
+ * evolution/mail/mail-session.c:
+ changing "cancelled" (British English)
+ to "canceled" (American English). Fixes bug 325334.
+
2006-01-06 Simon Zheng <simon.zheng@sun.com>
* em-account-editor.c:
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 99354ce47a..f8e1dce030 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -758,7 +758,7 @@ send_queue_send(struct _mail_msg *mm)
if (j > 0)
report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len);
else if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL)
- report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Cancelled."));
+ report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled."));
else
report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete."));
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 5ca2449f96..ec1ab66eaa 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -155,7 +155,7 @@ receive_cancel(GtkButton *button, struct _send_info *info)
if (info->state == SEND_ACTIVE) {
camel_operation_cancel(info->cancel);
if (info->status)
- e_clipped_label_set_text(info->status, _("Cancelling..."));
+ e_clipped_label_set_text(info->status, _("Canceling..."));
info->state = SEND_CANCELLED;
}
if (info->stop)
@@ -610,7 +610,7 @@ receive_done (char *uri, void *data)
switch(info->state) {
case SEND_CANCELLED:
- e_clipped_label_set_text(info->status, _("Cancelled."));
+ e_clipped_label_set_text(info->status, _("Canceled."));
break;
default:
info->state = SEND_COMPLETE;
diff --git a/mail/mail-session.c b/mail/mail-session.c
index d8ebb0ec13..b132130616 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -238,7 +238,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain,
g_free(url);
if (ret == NULL)
- camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled operation."));
+ camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled operation."));
return ret;
}
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);
generated by cgit (git 2.34.1) at 2024-11-13 21:24:17 +0800