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 --- addressbook/ChangeLog | 5 +++++ addressbook/gui/widgets/eab-gui-util.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'addressbook') 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 + * evolution/addressbook/gui/widgets/eab-gui-util.c: + changing "cancelled" (British English) + to "canceled" (American English). Fixes bug 325334. + 2006-01-04 Shi Pu * 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"), -- cgit