diff options
| author | Andre Klapper <a9016009@gmx.de> | 2006-01-06 23:08:39 +0800 |
|---|---|---|
| committer | Andre Klapper <aklapper@src.gnome.org> | 2006-01-06 23:08:39 +0800 |
| commit | ae743e85c9635aa16292ec3fffb48020a6ca66b1 (patch) | |
| tree | a083ddc504130251752c84823c4e86c4aa54ff6e /mail | |
| parent | de7b39a1ded4990ab537f805cd237c44fbd16777 (diff) | |
| download | gsoc2013-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 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 4 | ||||
| -rw-r--r-- | mail/mail-session.c | 2 |
4 files changed, 11 insertions, 4 deletions
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; } |