[evolution-data-server] Bug 571723 - Prefer "Cancelled" over "Canceled" in translatable strings

[Milan Crha <mcrha src gnome org>]

commit 93fc31eebfdab99b1973235e90d12b8a24854546
Author: Milan Crha <mcrha redhat com>
Date:   Wed May 11 20:33:03 2016 +0200

    Bug 571723 - Prefer "Cancelled" over "Canceled" in translatable strings

 addressbook/libedata-book/e-book-sqlite.c |    2 +-
 calendar/libecal/e-cal.c                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-sqlite.c b/addressbook/libedata-book/e-book-sqlite.c
index 784af2d..cee1ea7 100644
--- a/addressbook/libedata-book/e-book-sqlite.c
+++ b/addressbook/libedata-book/e-book-sqlite.c
@@ -1764,7 +1764,7 @@ ebsql_check_cancel (gpointer ref)
            g_cancellable_is_cancelled (ebsql->priv->cancel)) {
                EBSQL_NOTE (
                        CANCEL,
-                       g_printerr ("CANCEL: An operation was canceled\n"));
+                       g_printerr ("CANCEL: An operation was cancelled\n"));
                return -1;
        }
 
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index da0df1b..fe39615 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -2323,7 +2323,7 @@ e_cal_get_error_message (ECalendarStatus status)
        case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED :
                return _("Protocol not supported");
        case E_CALENDAR_STATUS_CANCELLED :
-               return _("Operation has been canceled");
+               return _("Operation has been cancelled");
        case E_CALENDAR_STATUS_COULD_NOT_CANCEL :
                return _("Could not cancel operation");
        case E_CALENDAR_STATUS_AUTHENTICATION_FAILED :