From 5a7b4b28808bc70140ac526d7a1b089f45306782 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Tue, 13 Jun 2006 21:31:02 +0000 Subject: [PATCH] changing "couldn't", "can't" and "didn't" to proper English. Fixes bug 2006-06-13 Andre Klapper * addressbook/libebook/e-book.c: * calendar/backends/file/e-cal-backend-file.c: * camel/providers/groupwise/camel-groupwise-store.c: * camel/providers/imap/camel-imap-store.c: * src/server.c: changing "couldn't", "can't" and "didn't" to proper English. Fixes bug #342160. --- ChangeLog | 6 ++++++ addressbook/ChangeLog | 6 ++++++ addressbook/libebook/e-book.c | 2 +- calendar/ChangeLog | 6 ++++++ calendar/backends/file/e-cal-backend-file.c | 2 +- camel/providers/groupwise/ChangeLog | 6 ++++++ camel/providers/groupwise/camel-groupwise-store.c | 2 +- camel/providers/imap/ChangeLog | 6 ++++++ camel/providers/imap/camel-imap-store.c | 2 +- src/server.c | 2 +- 10 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d7f583..4a8af19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Andre Klapper + + * src/server.c: + changing "couldn't", "can't" and "didn't" to proper + English. Fixes bug #342160. + 2006-06-12 Harish Krishnaswamy * configure.in, NEWS: EDS 1.7.3 release updates diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 6bfc9f0..52e692d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Andre Klapper + + * libebook/e-book.c: + changing "couldn't", "can't" and "didn't" to proper + English. Fixes bug #342160. + 2006-06-13 Ross Burton * libebook/e-vcard.[ch]: diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c index 10ecdbb..9c777df 100644 --- a/addressbook/libebook/e-book.c +++ b/addressbook/libebook/e-book.c @@ -2614,7 +2614,7 @@ e_book_cancel (EBook *book, } else { g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_COULD_NOT_CANCEL, - _("%s: couldn't cancel"), "e_book_cancel"); + _("%s: could not cancel"), "e_book_cancel"); rv = FALSE; } diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4ab6d5b..b9b767f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Andre Klapper + + * backends/file/e-cal-backend-file.c: + changing "couldn't", "can't" and "didn't" to proper + English. Fixes bug #342160. + 2006-06-13 Chenthill Palanisamy Fixes #335069 diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c index aa7ebb1..9fc98f5 100644 --- a/calendar/backends/file/e-cal-backend-file.c +++ b/calendar/backends/file/e-cal-backend-file.c @@ -200,7 +200,7 @@ save_file_when_idle (gpointer user_data) error_malformed_uri: g_mutex_unlock (priv->idle_save_mutex); e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), - _("Can't save calendar data: Malformed URI.")); + _("Cannot save calendar data: Malformed URI.")); return TRUE; error: diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog index 48d75c0..140c6f5 100644 --- a/camel/providers/groupwise/ChangeLog +++ b/camel/providers/groupwise/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Andre Klapper + + * camel-groupwise-store.c: + changing "couldn't", "can't" and "didn't" to proper + English. Fixes bug #342160. + 2006-06-13 Parthasarathi Susarla Fixes bug #167517 on bnc diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c index 085d933..3fc7d53 100644 --- a/camel/providers/groupwise/camel-groupwise-store.c +++ b/camel/providers/groupwise/camel-groupwise-store.c @@ -211,7 +211,7 @@ groupwise_auth_loop (CamelService *service, CamelException *ex) if (!service->url->passwd) { camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, - _("You didn't enter a password.")); + _("You did not enter a password.")); return FALSE; } } diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog index 7cf0d1f..65b524d 100644 --- a/camel/providers/imap/ChangeLog +++ b/camel/providers/imap/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Andre Klapper + + * camel-imap-store.c: + changing "couldn't", "can't" and "didn't" to proper + English. Fixes bug #342160. + 2006-05-22 Jeffrey Stedfast * camel-imap-command.c (imap_read_untagged): Make sure the literal diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 8612a84..2accd70 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -1357,7 +1357,7 @@ imap_auth_loop (CamelService *service, CamelException *ex) if (!service->url->passwd) { camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, - _("You didn't enter a password.")); + _("You did not enter a password.")); return FALSE; } } diff --git a/src/server.c b/src/server.c index cd1e105..f661fce 100644 --- a/src/server.c +++ b/src/server.c @@ -103,7 +103,7 @@ gnome_segv_handler (int signo) _exit (1); } else if (in_segv > 1) { /* dialog display isn't working out */ - fprintf (stderr, _("Multiple segmentation faults occurred; can't display error dialog\n")); + fprintf (stderr, _("Multiple segmentation faults occurred; cannot display error dialog\n")); _exit (1); } -- 2.7.4