diff options
Diffstat (limited to 'camel/providers/imap')
-rw-r--r-- | camel/providers/imap/camel-imap-command.c | 14 | ||||
-rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 6 | ||||
-rw-r--r-- | camel/providers/imap/camel-imap-provider.c | 4 | ||||
-rw-r--r-- | camel/providers/imap/camel-imap-store.c | 20 |
4 files changed, 21 insertions, 23 deletions
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c index 932bccfde8..9f79db5020 100644 --- a/camel/providers/imap/camel-imap-command.c +++ b/camel/providers/imap/camel-imap-command.c @@ -217,16 +217,16 @@ imap_read_response (CamelImapStore *store, CamelException *ex) g_warning ("Unexpected response from IMAP server: %s", respbuf); camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "Unexpected response from IMAP server: " - "%s", respbuf); + _("Unexpected response from IMAP " + "server: %s"), respbuf); camel_imap_response_free (response); return NULL; } retcode = imap_next_word (retcode); camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "IMAP command failed: %s", - retcode ? retcode : "Unknown error"); + _("IMAP command failed: %s"), + retcode ? retcode : _("Unknown error")); camel_imap_response_free (response); return NULL; } @@ -367,8 +367,8 @@ camel_imap_response_extract (CamelImapResponse *response, const char *type, } else { resp = NULL; camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "IMAP server response did not contain " - "%s information", type); + _("IMAP server response did not contain " + "%s information"), type); } g_ptr_array_free (response->untagged, TRUE); @@ -403,7 +403,7 @@ camel_imap_response_extract_continuation (CamelImapResponse *response, } camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "Unexpected OK response from IMAP server: %s", + _("Unexpected OK response from IMAP server: %s"), response->status); camel_imap_response_free (response); return NULL; diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 0a4189372a..46d80c6e29 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -216,7 +216,7 @@ camel_imap_folder_new (CamelStore *parent, const char *folder_name, if (!imap_folder->summary) { camel_object_unref (CAMEL_OBJECT (folder)); camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - "Could not load summary for %s", + _("Could not load summary for %s"), folder_name); return NULL; } @@ -575,8 +575,8 @@ imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex) } if (!p) { camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "Could not find message body in FETCH " - "response."); + _("Could not find message body in FETCH " + "response.")); g_free (result); return NULL; } diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c index 21452d5cee..a94daa3e19 100644 --- a/camel/providers/imap/camel-imap-provider.c +++ b/camel/providers/imap/camel-imap-provider.c @@ -36,9 +36,9 @@ static gint imap_url_equal (gconstpointer a, gconstpointer b); static CamelProvider imap_provider = { "imap", - "IMAPv4", + N_("IMAPv4"), - "For reading and storing mail on IMAP servers.", + N_("For reading and storing mail on IMAP servers."), "mail", diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 80dc8dcd3c..a731ac9a68 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -136,10 +136,10 @@ camel_imap_store_get_type (void) } static CamelServiceAuthType password_authtype = { - "Password", + N_("Password"), - "This option will connect to the IMAP server using a " - "plaintext password.", + N_("This option will connect to the IMAP server using a " + "plaintext password."), "", TRUE @@ -163,9 +163,9 @@ query_auth_types_connected (CamelService *service, CamelException *ex) if (!ret) { camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, - "Could not connect to IMAP server on %s.", + _("Could not connect to IMAP server on %s."), service->url->host ? service->url->host : - "(unknown host)"); + _("(unknown host)")); } return ret; @@ -227,7 +227,7 @@ imap_connect (CamelService *service, CamelException *ex) if (!service->url->authmech && !service->url->passwd) { gchar *prompt; - prompt = g_strdup_printf ("%sPlease enter the IMAP password for %s@%s", + prompt = g_strdup_printf (_("%sPlease enter the IMAP password for %s@%s"), errbuf ? errbuf : "", service->url->user, service->url->host); service->url->passwd = camel_session_query_authenticator (session, @@ -238,7 +238,7 @@ imap_connect (CamelService *service, CamelException *ex) errbuf = NULL; if (!service->url->passwd) { - camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, + camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, "You didn\'t enter a password."); return FALSE; } @@ -249,12 +249,10 @@ imap_connect (CamelService *service, CamelException *ex) service->url->user, service->url->passwd); if (!response) { - errbuf = g_strdup_printf ("Unable to authenticate to IMAP server.\n" - "%s\n\n", + errbuf = g_strdup_printf (_("Unable to authenticate to IMAP server.\n%s\n\n"), camel_exception_get_description (ex)); camel_exception_clear (ex); } else { - g_message ("IMAP Service sucessfully authenticated user %s", service->url->user); authenticated = TRUE; camel_imap_response_free (response); } @@ -456,7 +454,7 @@ get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelExce summary_file, ex); } else { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, - "Could not create directory %s: %s", + _("Could not create directory %s: %s"), summary_file, g_strerror (errno)); } g_free (summary_file); |