changing "cancelled" to "canceled" in user-visible strings. Fixes bug

2006-06-15  Andre Klapper  <a9016009@gmx.de>

	* addressbook/libebook/e-book.c:
	* calendar/libecal/e-cal.c:
	* calendar/libecal/e-cal.c:
	* camel/camel-gpg-context.c:
	* camel/camel-net-utils.c:
	* camel/providers/pop3/camel-pop3-store.c:
	* camel/providers/pop3/camel-pop3-folder.c:
	* camel/providers/nntp/camel-nntp-store.c:
	* camel/providers/nntp/camel-nntp-folder.c:
	* camel/providers/imap4/camel-imap4-folder.c:
	* camel/providers/imap4/camel-imap4-store.c:
	* camel/providers/imapp/camel-imapp-store.c:
	* camel/providers/smtp/camel-smtp-transport.c:
	* camel/providers/groupwise/camel-groupwise-folder.c:
	* camel/providers/local/camel-maildir-folder.c:
	* camel/providers/local/camel-mbox-folder.c:
	* camel/providers/local/camel-mh-folder.c:
	changing "cancelled" to "canceled" in user-visible strings.
	Fixes bug #342163.

26 files changed, 96 insertions, 29 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 94a1b8afe..1f6625198 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* libebook/e-book.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Andre Klapper <a9016009@gmx.de>
 
 	* addressbook/libebook/e-book.c:
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index a0517703e..880af792e 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -2713,7 +2713,7 @@ do_open (gboolean sync,
 			/* Cancelled */
 			book->priv->load_state = E_BOOK_SOURCE_NOT_LOADED;
 			g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED,
-				     _("%s: cancelled"), "e_book_open");
+				     _("%s: canceled"), "e_book_open");
 			return FALSE;
 		}
 		else if (status == E_BOOK_ERROR_OK) {
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 958ba437a..8ab0f2346 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* libecal/e-cal.c: 
+	* libecal/e-cal.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Harish Krishnaswamy  <kharish@novell.com>
 
 	* libecal/e-cal-component.c: (get_attachment_list),
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 9c212ec2e..e1888129e 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -5130,7 +5130,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 cancelled");
+		return _("Operation has been canceled");
 	case E_CALENDAR_STATUS_COULD_NOT_CANCEL :
 		return _("Could not cancel operation");
 	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED :
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0f7ee127b..d626b857e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-gpg-context.c: 
+	* camel-net-utils.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Andre Klapper <a9016009@gmx.de>
 
 	* addressbook/libebook/e-book.c:
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 8b685f8ef..c31fab861 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -854,7 +854,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex)
 			gpg->send_passwd = TRUE;
 		} else {
 			if (!camel_exception_is_set (ex))
-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled."));
+				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled."));
 			return -1;
 		}
 		
@@ -1054,7 +1054,7 @@ gpg_ctx_op_step (struct _GpgCtx *gpg, CamelException *ex)
 		goto exception;
 
 	if ((polls[5].revents & POLLIN) && camel_operation_cancel_check(NULL)) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled."));
+		camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled."));
 		gpg_ctx_op_cancel(gpg);
 		return -1;
 	}
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index e628da8f7..e14f2f502 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -494,12 +494,12 @@ cs_waitinfo(void *(worker)(void *), struct _addrinfo_msg *msg, const char *error
 #endif
 						     );
 			else
-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled"));
 			
 			/* We cancel so if the thread impl is decent it causes immediate exit.
 			   We detach so we dont need to wait for it to exit if it isn't.
 			   We check the reply port incase we had a reply in the mean time, which we free later */
-			d(printf("Cancelling lookup thread and leaving it\n"));
+			d(printf("Canceling lookup thread and leaving it\n"));
 			msg->cancelled = 1;
 			pthread_detach(id);
 			pthread_cancel(id);
@@ -656,7 +656,7 @@ camel_getaddrinfo(const char *name, const char *service, const struct addrinfo *
 	g_return_val_if_fail(name != NULL, NULL);
 	
 	if (camel_operation_cancel_check(NULL)) {
-		camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+		camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled"));
 		return NULL;
 	}
 
@@ -787,7 +787,7 @@ camel_getnameinfo(const struct sockaddr *sa, socklen_t salen, char **host, char
 	int result;
 
 	if (camel_operation_cancel_check(NULL)) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled"));
 		return -1;
 	}
 
diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog
index 140c6f5db..63cdaeaf0 100644
--- a/camel/providers/groupwise/ChangeLog
+++ b/camel/providers/groupwise/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-groupwise-folder.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-13  Andre Klapper <a9016009@gmx.de>
 
 	* camel-groupwise-store.c:
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 54a40e494..9902c8c4b 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -121,7 +121,7 @@ groupwise_folder_get_message( CamelFolder *folder, const char *uid, CamelExcepti
 		camel_stream_reset (stream);
 		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) msg, stream) == -1) {
 			if (errno == EINTR) {
-				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 				camel_object_unref (msg);
 				camel_object_unref (cache_stream);
 				camel_object_unref (stream);
diff --git a/camel/providers/imap4/ChangeLog b/camel/providers/imap4/ChangeLog
index 74744e573..11d488eda 100644
--- a/camel/providers/imap4/ChangeLog
+++ b/camel/providers/imap4/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-imap4-folder.c: 
+	* camel-imap4-store.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-09  Chris Heath  <chris@heathens.co.nz>
 
 	* camel-imap4-journal.c (camel_imap4_journal_append): Fix memory leak.
diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c
index a3228433c..428ea1ed2 100644
--- a/camel/providers/imap4/camel-imap4-folder.c
+++ b/camel/providers/imap4/camel-imap4-folder.c
@@ -785,7 +785,7 @@ imap4_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
 			if (errno == EINTR) {
 				CAMEL_SERVICE_UNLOCK (folder->parent_store, connect_lock);
-				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 				camel_object_unref (message);
 				camel_object_unref (stream);
 				return NULL;
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index af93dbeec..ab948c999 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -260,7 +260,7 @@ connect_to_server (CamelIMAP4Engine *engine, struct addrinfo *ai, int ssl_mode,
 	if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) {
 		if (errno == EINTR)
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
+					     _("Connection canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Could not connect to %s: %s"),
diff --git a/camel/providers/imapp/ChangeLog b/camel/providers/imapp/ChangeLog
index 30fc6f64c..5df64b0a8 100644
--- a/camel/providers/imapp/ChangeLog
+++ b/camel/providers/imapp/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-imapp-store.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2005-04-17  Changwoo Ryu  <cwryu@debian.org>
 
 	** See bug #300891
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c
index 167529afa..568939b70 100644
--- a/camel/providers/imapp/camel-imapp-store.c
+++ b/camel/providers/imapp/camel-imapp-store.c
@@ -245,7 +245,7 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls)
 		camel_freeaddrinfo(ai);
 		if (ret == -1) {
 			if (errno == EINTR)
-				camel_exception_throw(CAMEL_EXCEPTION_USER_CANCEL, _("Connection cancelled"));
+				camel_exception_throw(CAMEL_EXCEPTION_USER_CANCEL, _("Connection canceled"));
 			else
 				camel_exception_throw(CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 						      _("Could not connect to %s (port %s): %s"),
diff --git a/camel/providers/local/ChangeLog b/camel/providers/local/ChangeLog
index d50e73d71..eb1a531cb 100644
--- a/camel/providers/local/ChangeLog
+++ b/camel/providers/local/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-maildir-folder.c: 
+	* camel-mbox-folder.c: 
+	* camel-mh-folder.c:
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Tor Lillqvist  <tml@novell.com>
 
 	* camel-mbox-summary.c (summary_update, mbox_summary_check)
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 0713c15cf..8d6ef8e50 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -212,7 +212,7 @@ maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const Ca
 	
 	if (errno == EINTR)
 		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("Maildir append message cancelled"));
+				     _("Maildir append message canceled"));
 	else
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to maildir folder: %s: %s"),
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 97b9280ff..ad5002282 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -274,7 +274,7 @@ mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const Camel
 fail_write:
 	if (errno == EINTR)
 		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("Mail append cancelled"));
+				     _("Mail append canceled"));
 	else
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to mbox file: %s: %s"),
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 5095b7169..73162978d 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -172,7 +172,7 @@ mh_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMe
 	
 	if (errno == EINTR)
 		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-				     _("MH append message cancelled"));
+				     _("MH append message canceled"));
 	else
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Cannot append message to mh folder: %s: %s"),
diff --git a/camel/providers/nntp/ChangeLog b/camel/providers/nntp/ChangeLog
index 1cb8d17dc..f019558e0 100644
--- a/camel/providers/nntp/ChangeLog
+++ b/camel/providers/nntp/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-nntp-store.c: 
+	* camel-nntp-folder.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Andre Klapper <a9016009@gmx.de>
 
 	* addressbook/libebook/e-book.c:
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index abfe153ae..cc7950b6b 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -152,7 +152,7 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const char *id, cons
 	
  fail:
 	if (errno == EINTR)
-		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 	else
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), msgid, g_strerror (errno));
 	
@@ -228,7 +228,7 @@ nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *e
 	message = camel_mime_message_new ();
 	if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
 		if (errno == EINTR)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, g_strerror (errno));
 		camel_object_unref(message);
@@ -367,7 +367,7 @@ nntp_folder_append_message_online (CamelFolder *folder, CamelMimeMessage *mime_m
 	    || camel_stream_write (stream, "\r\n.\r\n", 5) == -1
 	    || (ret = camel_nntp_stream_line (nntp_store->stream, (unsigned char **)&line, &u)) == -1) {
 		if (errno == EINTR)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Posting failed: %s"), g_strerror (errno));
 	} else if (atoi(line) != 240) {
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c08295766..74118ffb7 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -193,7 +193,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam
 	if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) {
 		if (errno == EINTR)
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
+					     _("Connection canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Could not connect to %s: %s"),
@@ -212,7 +212,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam
 	if (camel_nntp_stream_line (store->stream, &buf, &len) == -1) {
 		if (errno == EINTR)
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
+					     _("Connection canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Could not read greeting from %s: %s"),
@@ -1268,7 +1268,7 @@ camel_nntp_raw_commandv (CamelNNTPStore *store, CamelException *ex, char **line,
 
 ioerror:
 	if (errno == EINTR)
-		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled."));
+		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled."));
 	else
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("NNTP Command failed: %s"), g_strerror(errno));
 	return -1;
diff --git a/camel/providers/pop3/ChangeLog b/camel/providers/pop3/ChangeLog
index 88f38f35f..b205fb370 100644
--- a/camel/providers/pop3/ChangeLog
+++ b/camel/providers/pop3/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-pop3-store.c: 
+	* camel-pop3-folder.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-06-15  Andre Klapper <a9016009@gmx.de>
 
 	* addressbook/libebook/e-book.c:
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 76753b584..84522c908 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -260,7 +260,7 @@ pop3_refresh_info (CamelFolder *folder, CamelException *ex)
 
 	if (i == -1) {
 		if (errno == EINTR)
-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 					      _("Cannot get POP summary: %s"),
@@ -428,7 +428,7 @@ pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 
 		if (fi->err != 0) {
 			if (fi->err == EINTR)
-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 			else
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 						      _("Cannot get message %s: %s"),
@@ -489,7 +489,7 @@ pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 		/* Check to see we have safely written flag set */
 		if (fi->err != 0) {
 			if (fi->err == EINTR)
-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 			else
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 						      _("Cannot get message %s: %s"),
@@ -507,7 +507,7 @@ pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 	message = camel_mime_message_new ();
 	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, stream) == -1) {
 		if (errno == EINTR)
-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 					      _("Cannot get message %s: %s"),
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index e35342c57..cccad6e3e 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -176,7 +176,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam
 	if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
 		if (errno == EINTR)
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
+					     _("Connection canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Could not connect to %s: %s"),
@@ -438,7 +438,7 @@ try_sasl(CamelPOP3Store *store, const char *mech, CamelException *ex)
 	
  ioerror:
 	if (errno == EINTR) {
-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled"));
 	} else {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Failed to authenticate on POP server %s: %s"),
@@ -519,7 +519,7 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err
 	
 	if (status == -1) {
 		if (errno == EINTR) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Canceled"));
 		} else {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 					      _("Unable to connect to POP server %s.\n"
diff --git a/camel/providers/smtp/ChangeLog b/camel/providers/smtp/ChangeLog
index 0db397bf0..37ebab256 100644
--- a/camel/providers/smtp/ChangeLog
+++ b/camel/providers/smtp/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Andre Klapper  <a9016009@gmx.de>
+
+	* camel-smtp-transport.c: 
+	changing "cancelled" to "canceled" in user-visible strings.
+	Fixes bug #342163.
+
 2006-05-10  Jeffrey Stedfast  <fejj@novell.com>
 
 	* camel-smtp-transport.c (smtp_helo): Implement the correct fix.
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 1d8ccc8b5..29836c2bc 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -263,7 +263,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, Cam
 	if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
 		if (errno == EINTR)
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
+					     _("Connection canceled"));
 		else
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 					      _("Could not connect to %s: %s"),