From a1b2d6af9ff30d6de2672dcd4df7adefb1068157 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Sat, 28 Aug 2010 19:38:40 -0400 Subject: [PATCH] Bug 628196 - Miscellaneous string fixes --- .../backends/webdav/e-book-backend-webdav.c | 8 ++++---- addressbook/libedata-book/e-data-book.c | 4 ++-- calendar/libecal/e-cal.c | 2 +- calendar/libedata-cal/e-data-cal.c | 4 ++-- camel/camel-sasl-popb4smtp.c | 4 ++-- camel/providers/local/camel-spool-summary.c | 22 +++++++++++----------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c index 3d6dc19..84bfd74 100644 --- a/addressbook/backends/webdav/e-book-backend-webdav.c +++ b/addressbook/backends/webdav/e-book-backend-webdav.c @@ -326,7 +326,7 @@ e_book_backend_webdav_create_contact(EBookBackend *backend, } else { e_data_book_respond_create (book, opid, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, - _("Create resource '%s' failed with http status: %d"), uid, status), + _("Create resource '%s' failed with HTTP status: %d"), uid, status), NULL); } g_free(uid); @@ -400,7 +400,7 @@ e_book_backend_webdav_remove_contacts(EBookBackend *backend, e_data_book_respond_remove_contacts (book, opid, webdav_handle_auth_request (webdav), deleted_ids); } else { - g_warning("DELETE failed with http status %d", status); + g_warning("DELETE failed with HTTP status %d", status); } continue; } @@ -450,7 +450,7 @@ e_book_backend_webdav_modify_contact(EBookBackend *backend, e_data_book_respond_modify (book, opid, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, - "Modify contact failed with http status: %d", status), + "Modify contact failed with HTTP status: %d", status), NULL); return; } @@ -863,7 +863,7 @@ download_contacts(EBookBackendWebdav *webdav, EFlag *running, g_free (new_ctag); if (book_view) e_data_book_view_unref(book_view); - return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "PROPFIND on webdav failed with http status %d", status); + return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "PROPFIND on webdav failed with HTTP status %d", status); } if (message->response_body == NULL) { g_warning("No response body in webdav PROPFIND result"); diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c index abd07a1..284a03f 100644 --- a/addressbook/libedata-book/e-data-book.c +++ b/addressbook/libedata-book/e-data-book.c @@ -173,7 +173,7 @@ e_data_book_status_to_string (EDataBookStatus status) { E_DATA_BOOK_STATUS_UNSUPPORTED_FIELD, N_("Unsupported field") }, { E_DATA_BOOK_STATUS_UNSUPPORTED_AUTHENTICATION_METHOD, N_("Unsupported authentication method") }, { E_DATA_BOOK_STATUS_TLS_NOT_AVAILABLE, N_("TLS not available") }, - { E_DATA_BOOK_STATUS_NO_SUCH_BOOK, N_("Address Book does not exist") }, + { E_DATA_BOOK_STATUS_NO_SUCH_BOOK, N_("Address book does not exist") }, { E_DATA_BOOK_STATUS_BOOK_REMOVED, N_("Book removed") }, { E_DATA_BOOK_STATUS_OFFLINE_UNAVAILABLE, N_("Not available in offline mode") }, { E_DATA_BOOK_STATUS_SEARCH_SIZE_LIMIT_EXCEEDED, N_("Search size limit exceeded") }, @@ -607,7 +607,7 @@ void e_data_book_respond_get_supported_auth_methods (EDataBook *book, guint32 opid, GError *error, GList *auth_methods) { /* Translators: The '%s' is replaced with a detailed error message */ - return_error_and_list (book->priv->gdbus_object, e_gdbus_book_complete_get_supported_auth_methods, opid, error, _("Cannot get supported auth methods: %s"), auth_methods, FALSE); + return_error_and_list (book->priv->gdbus_object, e_gdbus_book_complete_get_supported_auth_methods, opid, error, _("Cannot get supported authentication methods: %s"), auth_methods, FALSE); } static gchar * diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c index 3352ad6..0b9db97 100644 --- a/calendar/libecal/e-cal.c +++ b/calendar/libecal/e-cal.c @@ -4030,7 +4030,7 @@ e_cal_get_error_message (ECalendarStatus status) case E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED : return _("Authentication required"); case E_CALENDAR_STATUS_DBUS_EXCEPTION : - return _("A DBUS exception has occurred"); + return _("A D-Bus exception has occurred"); case E_CALENDAR_STATUS_OTHER_ERROR : return _("Unknown error"); case E_CALENDAR_STATUS_OK : diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c index 9bf79e9..088983f 100644 --- a/calendar/libedata-cal/e-data-cal.c +++ b/calendar/libedata-cal/e-data-cal.c @@ -115,7 +115,7 @@ e_data_cal_status_to_string (EDataCalCallStatus status) { UnsupportedAuthenticationMethod, N_("Unsupported authentication method") }, { TLSNotAvailable, N_("TLS not available") }, { NoSuchCal, N_("Calendar does not exist") }, - { UnknownUser, N_("UnknownUser") }, + { UnknownUser, N_("Unknown user") }, { OfflineUnavailable, N_("Not available in offline mode") }, { SearchSizeLimitExceeded, N_("Search size limit exceeded") }, { SearchTimeLimitExceeded, N_("Search time limit exceeded") }, @@ -626,7 +626,7 @@ e_data_cal_notify_ldap_attribute (EDataCal *cal, EServerMethodContext context, G GDBusMethodInvocation *invocation = context; if (error) { /* Translators: The '%s' is replaced with a detailed error message */ - data_cal_return_error (invocation, error, _("Cannot retrieve calendar's ldap attribute: %s")); + data_cal_return_error (invocation, error, _("Cannot retrieve calendar's LDAP attribute: %s")); g_error_free (error); } else e_gdbus_cal_complete_get_ldap_attribute (cal->priv->gdbus_object, invocation, attribute ? attribute : ""); diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c index 744fdae..043291b 100644 --- a/camel/camel-sasl-popb4smtp.c +++ b/camel/camel-sasl-popb4smtp.c @@ -86,7 +86,7 @@ sasl_popb4smtp_challenge (CamelSasl *sasl, g_set_error ( error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE, - _("POP Before SMTP auth using an unknown transport")); + _("POP Before SMTP authentication using an unknown transport")); return NULL; } @@ -94,7 +94,7 @@ sasl_popb4smtp_challenge (CamelSasl *sasl, g_set_error ( error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE, - _("POP Before SMTP auth using a non-pop source")); + _("POP Before SMTP authentication using a non-POP source")); return NULL; } diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c index ceb4087..eb5b72d 100644 --- a/camel/providers/local/camel-spool-summary.c +++ b/camel/providers/local/camel-spool-summary.c @@ -159,11 +159,11 @@ spool_summary_sync_full (CamelMboxSummary *cls, /* sync out content */ if (fsync(fdout) == -1) { - g_warning("Cannot sync temporary folder: %s", g_strerror (errno)); + g_warning("Cannot synchronize temporary folder: %s", g_strerror (errno)); g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync temporary folder %s: %s"), + _("Could not synchronize temporary folder %s: %s"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno)); goto error; @@ -171,11 +171,11 @@ spool_summary_sync_full (CamelMboxSummary *cls, /* see if we can write this much to the spool file */ if (fstat(fd, &st) == -1) { - g_warning("Cannot sync temporary folder: %s", g_strerror (errno)); + g_warning("Cannot synchronize temporary folder: %s", g_strerror (errno)); g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync temporary folder %s: %s"), + _("Could not synchronize temporary folder %s: %s"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno)); goto error; @@ -183,11 +183,11 @@ spool_summary_sync_full (CamelMboxSummary *cls, spoollen = st.st_size; if (fstat(fdout, &st) == -1) { - g_warning("Cannot sync temporary folder: %s", g_strerror (errno)); + g_warning("Cannot synchronize temporary folder: %s", g_strerror (errno)); g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync temporary folder %s: %s"), + _("Could not synchronize temporary folder %s: %s"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno)); goto error; @@ -201,11 +201,11 @@ spool_summary_sync_full (CamelMboxSummary *cls, || fsync(fd) == -1 || lseek(fd, 0, SEEK_SET) == -1 || lseek(fdout, 0, SEEK_SET) == -1)) { - g_warning("Cannot sync spool folder: %s", g_strerror (errno)); + g_warning("Cannot synchronize spool folder: %s", g_strerror (errno)); g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync spool folder %s: %s"), + _("Could not synchronize spool folder %s: %s"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno)); /* incase we ran out of room, remove any trailing space first */ @@ -237,7 +237,7 @@ spool_summary_sync_full (CamelMboxSummary *cls, g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync spool folder %s: %s\n" + _("Could not synchronize spool folder %s: %s\n" "Folder may be corrupt, copy saved in '%s'"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno), tmpname); @@ -256,7 +256,7 @@ spool_summary_sync_full (CamelMboxSummary *cls, g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync spool folder %s: %s\n" + _("Could not synchronize spool folder %s: %s\n" "Folder may be corrupt, copy saved in '%s'"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno), tmpname); @@ -269,7 +269,7 @@ spool_summary_sync_full (CamelMboxSummary *cls, g_set_error ( error, G_IO_ERROR, g_io_error_from_errno (errno), - _("Could not sync spool folder %s: %s\n" + _("Could not synchronize spool folder %s: %s\n" "Folder may be corrupt, copy saved in '%s'"), ((CamelLocalSummary *)cls)->folder_path, g_strerror (errno), tmpname); -- 2.7.4