summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2006-06-13 21:31:02 +0000
committerAndre Klapper <aklapper@src.gnome.org>2006-06-13 21:31:02 +0000
commit5a7b4b28808bc70140ac526d7a1b089f45306782 (patch)
treeb08dc7c6b64d300955087156f22ad47e5f15e163
parent8186cf1fc9cd9ad2dd0f377c13ac60794c33df7f (diff)
downloadevolution-data-server-5a7b4b28808bc70140ac526d7a1b089f45306782.tar.gz
changing "couldn't", "can't" and "didn't" to proper English. Fixes bug
2006-06-13 Andre Klapper <a9016009@gmx.de> * 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.
-rw-r--r--ChangeLog6
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/libebook/e-book.c2
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/backends/file/e-cal-backend-file.c2
-rw-r--r--camel/providers/groupwise/ChangeLog6
-rw-r--r--camel/providers/groupwise/camel-groupwise-store.c2
-rw-r--r--camel/providers/imap/ChangeLog6
-rw-r--r--camel/providers/imap/camel-imap-store.c2
-rw-r--r--src/server.c2
10 files changed, 35 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d7f583f1..4a8af1927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * src/server.c:
+ changing "couldn't", "can't" and "didn't" to proper
+ English. Fixes bug #342160.
+
2006-06-12 Harish Krishnaswamy <kharish@novell.com>
* configure.in, NEWS: EDS 1.7.3 release updates
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6bfc9f082..52e692d65 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * libebook/e-book.c:
+ changing "couldn't", "can't" and "didn't" to proper
+ English. Fixes bug #342160.
+
2006-06-13 Ross Burton <ross@openedhand.com>
* libebook/e-vcard.[ch]:
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 10ecdbb37..9c777df44 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 4ab6d5b5b..b9b767ff3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * 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 <pchenthill@novell.com>
Fixes #335069
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index aa7ebb1d5..9fc98f55c 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 48d75c050..140c6f5db 100644
--- a/camel/providers/groupwise/ChangeLog
+++ b/camel/providers/groupwise/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * camel-groupwise-store.c:
+ changing "couldn't", "can't" and "didn't" to proper
+ English. Fixes bug #342160.
+
2006-06-13 Parthasarathi Susarla <sparthasarathi@novell.com>
Fixes bug #167517 on bnc
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 085d93330..3fc7d5331 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 7cf0d1fd7..65b524d3a 100644
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * camel-imap-store.c:
+ changing "couldn't", "can't" and "didn't" to proper
+ English. Fixes bug #342160.
+
2006-05-22 Jeffrey Stedfast <fejj@novell.com>
* 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 8612a8488..2accd709e 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 cd1e105b4..f661fce54 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);
}