aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-migrate.c30
-rw-r--r--mail/e-mail-reader.c2
-rw-r--r--mail/em-folder-utils.c2
-rw-r--r--mail/em-format-html.c4
-rw-r--r--mail/importers/mail-importer.c2
-rw-r--r--mail/mail-ops.c6
-rw-r--r--mail/mail-tools.c6
7 files changed, 26 insertions, 26 deletions
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index e262dc7126..98eef5a927 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -1209,18 +1209,18 @@ is_mail_folder (const gchar *metadata)
gchar *type;
if (!(doc = xmlParseFile (metadata))) {
- g_warning ("Cannot parse `%s'", metadata);
+ g_warning ("Cannot parse '%s'", metadata);
return FALSE;
}
if (!(node = xmlDocGetRootElement (doc))) {
- g_warning ("`%s' corrupt: document contains no root node", metadata);
+ g_warning ("'%s' corrupt: document contains no root node", metadata);
xmlFreeDoc (doc);
return FALSE;
}
if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) {
- g_warning ("`%s' corrupt: root node is not 'efolder'", metadata);
+ g_warning ("'%s' corrupt: root node is not 'efolder'", metadata);
xmlFreeDoc (doc);
return FALSE;
}
@@ -1591,7 +1591,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
g_set_error (
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
- _("Unable to create new folder `%s': %s"),
+ _("Unable to create new folder '%s': %s"),
dest->str, g_strerror (errno));
goto fatal;
}
@@ -1619,7 +1619,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
g_set_error (
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
- _("Unable to copy folder `%s' to `%s': %s"),
+ _("Unable to copy folder '%s' to '%s': %s"),
src->str, dest->str, g_strerror (errno));
goto fatal;
}
@@ -1815,7 +1815,7 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, GError **error)
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to scan for existing mailboxes at "
- "`%s': %s"), session->srcdir, g_strerror (errno));
+ "'%s': %s"), session->srcdir, g_strerror (errno));
return FALSE;
}
@@ -2025,7 +2025,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *data_dir, GError **error)
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to open old POP keep-on-server data "
- "`%s': %s"), cache_dir, g_strerror (errno));
+ "'%s': %s"), cache_dir, g_strerror (errno));
g_free (cache_dir);
return FALSE;
}
@@ -2041,7 +2041,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *data_dir, GError **error)
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to create POP3 keep-on-server data "
- "directory `%s': %s"), cache_dir,
+ "directory '%s': %s"), cache_dir,
g_strerror (errno));
g_string_free (oldpath, TRUE);
g_free (cache_dir);
@@ -2073,7 +2073,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *data_dir, GError **error)
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to copy POP3 keep-on-server data "
- "`%s': %s"), oldpath->str,
+ "'%s': %s"), oldpath->str,
g_strerror (errno));
success = FALSE;
}
@@ -2357,7 +2357,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
ppath_len++; /* For the separating slash. */
/* Take account of the fact that we need to translate every
- * separator into `subfolders/'.
+ * separator into 'subfolders/'.
*/
p = vpath;
while (1) {
@@ -2391,7 +2391,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
break;
}
- memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too. */
+ memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too. */
dp += newp - p + 1;
memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
@@ -2544,7 +2544,7 @@ em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GE
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Failed to create local mail storage "
- "`%s': %s"), path + 5, g_strerror (errno));
+ "'%s': %s"), path + 5, g_strerror (errno));
g_free (session->srcdir);
camel_object_unref (session);
g_free (path);
@@ -2557,7 +2557,7 @@ em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GE
g_set_error (
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
- _("Failed to create local mail storage `%s': %s"),
+ _("Failed to create local mail storage '%s': %s"),
path, lex.desc);
g_free (session->srcdir);
camel_object_unref (session);
@@ -3029,7 +3029,7 @@ e_mail_migrate (EShellBackend *shell_backend,
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to create local mail folders at "
- "`%s': %s"), data_dir, g_strerror (errno));
+ "'%s': %s"), data_dir, g_strerror (errno));
return FALSE;
}
}
@@ -3047,7 +3047,7 @@ e_mail_migrate (EShellBackend *shell_backend,
error, E_SHELL_MIGRATE_ERROR,
E_SHELL_MIGRATE_ERROR_FAILED,
_("Unable to read settings from previous "
- "Evolution install, `evolution/config.xmldb' "
+ "Evolution install, 'evolution/config.xmldb' "
"does not exist or is corrupt."));
return FALSE;
}
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index d3ffde3597..684b97c085 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2875,7 +2875,7 @@ e_mail_reader_get_action (EMailReader *reader,
if (action == NULL)
g_critical (
- "%s: action `%s' not found", G_STRFUNC, action_name);
+ "%s: action '%s' not found", G_STRFUNC, action_name);
return action;
}
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index c840644870..98168866ae 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -504,7 +504,7 @@ struct _EMCreateFolderTempData
static gchar *
emfu_create_folder__desc (struct _EMCreateFolder *m)
{
- return g_strdup_printf (_("Creating folder `%s'"), m->full_name);
+ return g_strdup_printf (_("Creating folder '%s'"), m->full_name);
}
static void
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 7cf5a1f2f6..8e1cfcef3e 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1395,7 +1395,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
camel_http_stream_set_proxy ((CamelHttpStream *)instream, proxy);
g_free (proxy);
}
- camel_operation_start(NULL, _("Retrieving `%s'"), job->u.uri);
+ camel_operation_start(NULL, _("Retrieving '%s'"), job->u.uri);
tmp_stream = (CamelHttpStream *)instream;
content_type = camel_http_stream_get_content_type(tmp_stream);
length = camel_header_raw_find(&tmp_stream->headers, "Content-Length", NULL);
@@ -1404,7 +1404,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
total = atoi(length);
camel_content_type_unref(content_type);
} else
- camel_operation_start_transient(NULL, _("Retrieving `%s'"), job->u.uri);
+ camel_operation_start_transient(NULL, _("Retrieving '%s'"), job->u.uri);
camel_url_free(url);
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index ee1c958d12..f61ce2658b 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -152,7 +152,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
if (m->cancel)
oldcancel = camel_operation_register(m->cancel);
- camel_operation_start(NULL, _("Importing `%s'"), folder->full_name);
+ camel_operation_start(NULL, _("Importing '%s'"), folder->full_name);
camel_folder_freeze(folder);
while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
CamelMimeMessage *msg;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 73ad926390..7cbb91bede 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -595,7 +595,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
folder = mail_tool_uri_to_folder (sent_folder_uri, 0, ex);
if (camel_exception_is_set(ex)) {
g_string_append_printf (err, _("Failed to append to %s: %s\n"
- "Appending to local `Sent' folder instead."),
+ "Appending to local 'Sent' folder instead."),
sent_folder_uri, camel_exception_get_description (ex));
camel_exception_clear (ex);
}
@@ -622,7 +622,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
if (err->len)
g_string_append(err, "\n\n");
g_string_append_printf (err, _("Failed to append to %s: %s\n"
- "Appending to local `Sent' folder instead."),
+ "Appending to local 'Sent' folder instead."),
name, camel_exception_get_description (ex));
camel_object_ref (sent_folder);
camel_object_unref (folder);
@@ -638,7 +638,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
if (err->len)
g_string_append(err, "\n\n");
- g_string_append_printf (err, _("Failed to append to local `Sent' folder: %s"),
+ g_string_append_printf (err, _("Failed to append to local 'Sent' folder: %s"),
camel_exception_get_description (ex));
}
}
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 9e268d85cf..f006b1b963 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -120,7 +120,7 @@ mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex)
path = g_build_filename (data_dir, "spool", NULL);
if (g_stat(path, &st) == -1 && g_mkdir_with_parents(path, 0700) == -1) {
- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory `%s': %s"),
+ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory '%s': %s"),
path, g_strerror(errno));
g_free(path);
return NULL;
@@ -150,7 +150,7 @@ mail_tool_do_movemail (const gchar *source_url, CamelException *ex)
if (strcmp(uri->protocol, "mbox") != 0) {
/* This is really only an internal error anyway */
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
- _("Trying to movemail a non-mbox source `%s'"),
+ _("Trying to movemail a non-mbox source '%s'"),
source_url);
camel_url_free(uri);
return NULL;
@@ -298,7 +298,7 @@ mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex)
/* FIXME?: the filter:get_folder callback should do this itself? */
curi = em_uri_to_camel(uri);
if (uri == NULL) {
- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: `%s'"), uri);
+ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: '%s'"), uri);
return NULL;
}
uri = curi;