aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/providers/local/camel-mbox-summary.c10
-rw-r--r--camel/providers/local/camel-spool-summary.c4
3 files changed, 19 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index baed2cf800..5304e9cdee 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-11 Ettore Perazzoli <ettore@ximian.com>
+
+ * providers/local/camel-spool-summary.c (summary_rebuild):
+ s/summarising/summarizing/.
+ (summary_rebuild): Likewise.
+
+ * providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
+ s/summarise/summarize/.
+ (mbox_summary_sync_quick): Likewise.
+ (summary_rebuild): Likewise.
+ (mbox_summary_check): Likewise.
+
2001-08-10 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap/camel-imap-utils.c (imap_quote_string): Added an
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 5f9ca6941d..1a1b867d8e 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -246,12 +246,12 @@ summary_rebuild(CamelMboxSummary *mbs, off_t offset, CamelException *ex)
/* FIXME: If there is a failure, it shouldn't clear the summary and restart,
it should try and merge the summary info's. This is a bit tricky. */
- camel_operation_start(NULL, _("Summarising folder"));
+ camel_operation_start(NULL, _("Summarizing folder"));
fd = open(cls->folder_path, O_RDONLY);
if (fd == -1) {
printf("%s failed to open: %s", cls->folder_path, strerror(errno));
- camel_exception_setv(ex, 1, _("Could not open folder: %s: summarising from position %ld: %s"),
+ camel_exception_setv(ex, 1, _("Could not open folder: %s: summarizing from position %ld: %s"),
cls->folder_path, offset, strerror(errno));
camel_operation_end(NULL);
return -1;
@@ -368,7 +368,7 @@ mbox_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Camel
/* check if the summary is up-to-date */
if (stat(cls->folder_path, &st) == -1) {
camel_folder_summary_clear(s);
- camel_exception_setv(ex, 1, _("Cannot summarise folder: %s: %s"), cls->folder_path, strerror(errno));
+ camel_exception_setv(ex, 1, _("Cannot summarize folder: %s: %s"), cls->folder_path, strerror(errno));
return -1;
}
@@ -504,7 +504,7 @@ mbox_summary_sync_full(CamelLocalSummary *cls, gboolean expunge, CamelFolderChan
fd = open(cls->folder_path, O_RDONLY);
if (fd == -1) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not open folder to summarise: %s: %s"),
+ _("Could not open folder to summarize: %s: %s"),
cls->folder_path, strerror(errno));
camel_operation_end(NULL);
return -1;
@@ -705,7 +705,7 @@ mbox_summary_sync_quick(CamelLocalSummary *cls, gboolean expunge, CamelFolderCha
fd = open(cls->folder_path, O_RDWR);
if (fd == -1) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not open folder to summarise: %s: %s"),
+ _("Could not open folder to summarize: %s: %s"),
cls->folder_path, strerror(errno));
camel_operation_end(NULL);
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 6a44fdf7cb..e9dd4aea1d 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -376,12 +376,12 @@ summary_rebuild(CamelSpoolSummary *cls, off_t offset, CamelException *ex)
/* FIXME: If there is a failure, it shouldn't clear the summary and restart,
it should try and merge the summary info's. This is a bit tricky. */
- camel_operation_start(NULL, _("Summarising folder"));
+ camel_operation_start(NULL, _("Summarizing folder"));
fd = open(cls->folder_path, O_RDONLY);
if (fd == -1) {
printf("%s failed to open: %s", cls->folder_path, strerror(errno));
- camel_exception_setv(ex, 1, _("Could not open folder: %s: summarising from position %ld: %s"),
+ camel_exception_setv(ex, 1, _("Could not open folder: %s: summarizing from position %ld: %s"),
cls->folder_path, offset, strerror(errno));
camel_operation_end(NULL);
return -1;