aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-10-24 13:23:27 +0800
committerDan Winship <danw@src.gnome.org>2000-10-24 13:23:27 +0800
commit360675f54b51d53ac99409077f2d31d96284fb9b (patch)
tree265d70af032473fbdf08d04695ed2a9b3c5b4a34 /mail
parentbabd37f2f7b43ea61df0d320ac7344d18debae72 (diff)
downloadgsoc2013-evolution-360675f54b51d53ac99409077f2d31d96284fb9b.tar.gz
gsoc2013-evolution-360675f54b51d53ac99409077f2d31d96284fb9b.tar.zst
gsoc2013-evolution-360675f54b51d53ac99409077f2d31d96284fb9b.zip
lots of i18n fixes
svn path=/trunk/; revision=6143
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/component-factory.c4
-rw-r--r--mail/folder-browser.c20
-rw-r--r--mail/mail-callbacks.c14
-rw-r--r--mail/mail-config-gui.c30
-rw-r--r--mail/mail-crypto.c8
-rw-r--r--mail/mail-display.c33
-rw-r--r--mail/mail-format.c48
-rw-r--r--mail/mail-local.c32
-rw-r--r--mail/mail-tools.c12
-rw-r--r--mail/mail-vfolder.c2
-rw-r--r--mail/message-list.c16
-rw-r--r--mail/message-thread.c22
13 files changed, 109 insertions, 136 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index dd6f72ac58..4e6c4a339e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2000-10-23 Dan Winship <danw@helixcode.com>
+ * *: Add some missing _()s and N_()s.
+
+2000-10-23 Dan Winship <danw@helixcode.com>
+
* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR.
2000-10-23 Jeffrey Stedfast <fejj@helixcode.com>
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 17d67c46de..2bf099a2f2 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -327,7 +327,7 @@ mail_add_new_storage (const char *uri, Evolution_Shell corba_shell, CamelExcepti
if (url->host == NULL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "Bad storage URL (no server): %s",
+ _("Bad storage URL (no server): %s"),
uri);
return;
}
@@ -346,7 +346,7 @@ mail_add_new_storage (const char *uri, Evolution_Shell corba_shell, CamelExcepti
return;
default:
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- "mail_tool_add_new_storage: Cannot register storage on shell");
+ _("Cannot register storage with shell"));
break;
}
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 86f5214b45..a88b5db0ac 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -134,12 +134,12 @@ folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show
}
static char * search_options[] = {
- "Body or subject contains",
- "Body contains",
- "Subject contains",
- "Body does not contain",
- "Subject does not contain",
- "Custom search",
+ N_("Body or subject contains"),
+ N_("Body contains"),
+ N_("Subject contains"),
+ N_("Body does not contain"),
+ N_("Subject does not contain"),
+ N_("Custom search"),
NULL
};
@@ -265,7 +265,11 @@ create_option_menu (char **menu_list, int item, void *data)
while (*menu_list){
GtkWidget *entry;
- entry = e_utf8_gtk_menu_item_new_with_label (GTK_MENU(menu), *menu_list);
+ /* We don't use e_utf8_gtk_menu_item_new_with_label here
+ * because the string comes from gettext and so is localized,
+ * not UTF-8.
+ */
+ entry = gtk_menu_item_new_with_label (_(*menu_list));
gtk_widget_show (entry);
gtk_object_set_data((GtkObject *)entry, "search_option", (void *)i);
gtk_menu_append (GTK_MENU (menu), entry);
@@ -307,7 +311,7 @@ search_save(GtkWidget *w, FolderBrowser *fb)
/* some special case code for the custom search position */
if (index == CUSTOM_SEARCH_ID) {
g_free(text);
- text = g_strdup("Custom");
+ text = g_strdup(_("Custom"));
} else {
if (text == NULL || text[0] == 0) {
g_free (text);
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index e6f6e4c59e..e2b8c8b4be 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -160,8 +160,9 @@ fetch_mail (GtkWidget *widget, gpointer user_data)
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
GTK_TYPE_WINDOW);
- gnome_error_dialog_parented ("You have no mail sources "
- "configured", GTK_WINDOW (win));
+ gnome_error_dialog_parented (_("You have no mail sources "
+ "configured"),
+ GTK_WINDOW (win));
return;
}
@@ -171,8 +172,9 @@ fetch_mail (GtkWidget *widget, gpointer user_data)
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
GTK_TYPE_WINDOW);
- gnome_error_dialog_parented ("You have no mail sources "
- "configured", GTK_WINDOW (win));
+ gnome_error_dialog_parented (_("You have no mail sources "
+ "configured"),
+ GTK_WINDOW (win));
return;
}
@@ -207,7 +209,7 @@ send_queued_mail (GtkWidget *widget, gpointer user_data)
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
GTK_TYPE_WINDOW);
- gnome_error_dialog_parented ("You have not set a transport method",
+ gnome_error_dialog_parented (_("You have not set a mail transport method"),
GTK_WINDOW (win));
return;
}
@@ -216,7 +218,7 @@ send_queued_mail (GtkWidget *widget, gpointer user_data)
GtkWidget *win = gtk_widget_get_ancestor (GTK_WIDGET (user_data),
GTK_TYPE_WINDOW);
- gnome_error_dialog_parented ("You have no Outbox configured",
+ gnome_error_dialog_parented (_("You have no Outbox configured"),
GTK_WINDOW (win));
return;
}
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 56a251c58d..65b3fd5791 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -720,7 +720,7 @@ service_page_item_auth_activate (GtkWidget *menuitem,
authtype = gtk_object_get_data (GTK_OBJECT (menuitem), "authtype");
put_html (GTK_HTML (spitem->auth_html),
- authtype->description);
+ _(authtype->description));
}
static void
@@ -885,7 +885,7 @@ service_page_item_new (MailDialogServicePage *page, MailService *mcs)
/* Description */
description = html_new (TRUE);
- put_html (GTK_HTML (description), mcs->provider->description);
+ put_html (GTK_HTML (description), _(mcs->provider->description));
gtk_box_pack_start (GTK_BOX (item->vbox),
description->parent->parent,
TRUE, TRUE, 0);
@@ -1104,7 +1104,7 @@ source_page_new (GSList *sources)
MailDialogSourcePage *page = g_new0 (MailDialogSourcePage, 1);
GtkWidget *html;
- page->page = service_page_new ("Mail source type:", sources);
+ page->page = service_page_new (_("Mail source type:"), sources);
page->vbox = page->page->vbox;
html = html_new (FALSE);
@@ -1128,7 +1128,7 @@ news_page_new (GSList *sources)
MailDialogNewsPage *page = g_new0 (MailDialogNewsPage, 1);
GtkWidget *html;
- page->page = service_page_new ("News source type:", sources);
+ page->page = service_page_new (_("News source type:"), sources);
page->vbox = page->page->vbox;
html = html_new (FALSE);
@@ -2230,9 +2230,9 @@ static gchar *describe_test_service (gpointer in_data, gboolean gerund)
test_service_input_t *input = (test_service_input_t *) in_data;
if (gerund) {
- return g_strdup_printf ("Testing \"%s\"", input->url);
+ return g_strdup_printf (_("Testing \"%s\""), input->url);
} else {
- return g_strdup_printf ("Test connection to \"%s\"", input->url);
+ return g_strdup_printf (_("Test connection to \"%s\""), input->url);
}
}
@@ -2241,12 +2241,6 @@ static void setup_test_service (gpointer in_data, gpointer op_data, CamelExcepti
test_service_input_t *input = (test_service_input_t *) in_data;
test_service_data_t *data = (test_service_data_t *) op_data;
- if (!input->url) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No URL was provided to test");
- return;
- }
-
data->success = FALSE;
}
@@ -2341,18 +2335,6 @@ static void setup_query_authtypes (gpointer in_data, gpointer op_data, CamelExce
query_authtypes_input_t *input = (query_authtypes_input_t *) in_data;
query_authtypes_data_t *data = (query_authtypes_data_t *) op_data;
- if (!input->page) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No service page was provided to test");
- return;
- }
-
- if (!input->url) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No URL was provided to test");
- return;
- }
-
data->items = NULL;
data->service = NULL;
}
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 47279e29b3..5d97b7d46a 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -134,8 +134,8 @@ crypto_exec_with_passwd (char *path, char *argv[], const char *input,
if ((pipe (ip_fds) < 0 ) ||
(pipe (op_fds) < 0 ) ||
(pipe (diag_fds) < 0 )) {
- *diagnostics = g_strdup_printf ("Couldn't create pipe to %s: "
- "%s", PGP_PROGRAM,
+ *diagnostics = g_strdup_printf (_("Couldn't create pipe to "
+ "%s: %s"), PGP_PROGRAM,
g_strerror (errno));
return 0;
}
@@ -161,11 +161,11 @@ crypto_exec_with_passwd (char *path, char *argv[], const char *input,
cleanup_before_exec(passwd_fds[0]);
execvp (path, argv);
- fprintf (stderr, "Could not execute %s: %s\n", argv[0],
+ fprintf (stderr, _("Could not execute %s: %s\n"), argv[0],
g_strerror (errno));
_exit (255);
} else if (child < 0) {
- *diagnostics = g_strdup_printf ("Cannot fork %s: %s",
+ *diagnostics = g_strdup_printf (_("Cannot fork %s: %s"),
argv[0], g_strerror (errno));
return 0;
}
diff --git a/mail/mail-display.c b/mail/mail-display.c
index f98244b655..ca3c2990f2 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -84,7 +84,7 @@ write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
if (fd == -1) {
char *msg;
- msg = g_strdup_printf ("Could not open file %s:\n%s",
+ msg = g_strdup_printf (_("Could not open file %s:\n%s"),
name, g_strerror (errno));
gnome_error_dialog (msg);
g_free (msg);
@@ -96,7 +96,7 @@ write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
|| camel_stream_flush (stream_fs) == -1) {
char *msg;
- msg = g_strdup_printf ("Could not write data: %s",
+ msg = g_strdup_printf (_("Could not write data: %s"),
strerror (errno));
gnome_error_dialog (msg);
g_free (msg);
@@ -114,8 +114,10 @@ make_safe_filename (const char *prefix, CamelMimePart *part)
char *safe, *p;
name = camel_mime_part_get_filename (part);
- if (!name)
- name = "attachment";
+ if (!name) {
+ /* This is a filename. Translators take note. */
+ name = _("attachment");
+ }
p = strrchr (name, '/');
if (p)
@@ -190,7 +192,7 @@ save_cb (GtkWidget *widget, gpointer user_data)
filename = make_safe_filename (g_get_home_dir (), part);
file_select = GTK_FILE_SELECTION (
- gtk_file_selection_new ("Save Attachment"));
+ gtk_file_selection_new (_("Save Attachment")));
gtk_file_selection_set_filename (file_select, filename);
g_free (filename);
@@ -230,8 +232,8 @@ launch_cb (GtkWidget *widget, gpointer user_data)
}
#endif
if (!tmpdir) {
- char *msg = g_strdup_printf ("Could not create temporary "
- "directory: %s",
+ char *msg = g_strdup_printf (_("Could not create temporary "
+ "directory: %s"),
g_strerror (errno));
gnome_error_dialog (msg);
g_free (msg);
@@ -291,13 +293,16 @@ pixmap_press (GtkWidget *ebox, GdkEventButton *event, gpointer user_data)
handler = mail_lookup_handler (gtk_object_get_data (user_data,
"mime_type"));
+ /* Save item */
+ menu[0].name = _(menu[0].name);
+
/* External view item */
if (handler && handler->application) {
- menu[1].name = g_strdup_printf (menu[1].name,
+ menu[1].name = g_strdup_printf (_(menu[1].name),
handler->application->name);
} else {
- menu[1].name = g_strdup_printf (menu[1].name,
- N_("External Viewer"));
+ menu[1].name = g_strdup_printf (_(menu[1].name),
+ _("External Viewer"));
mask |= 1;
}
@@ -320,13 +325,13 @@ pixmap_press (GtkWidget *ebox, GdkEventButton *event, gpointer user_data)
else
name = "bonobo";
menu[2].name = g_strdup_printf (
- N_("View Inline (via %s)"), name);
+ _("View Inline (via %s)"), name);
} else
- menu[2].name = g_strdup (menu[2].name);
+ menu[2].name = g_strdup (_(menu[2].name));
} else
- menu[2].name = g_strdup (N_("Hide"));
+ menu[2].name = g_strdup (_("Hide"));
} else {
- menu[2].name = g_strdup (menu[2].name);
+ menu[2].name = g_strdup (_(menu[2].name));
mask |= 2;
}
diff --git a/mail/mail-format.c b/mail/mail-format.c
index ccbdf420fd..76c21000a6 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -474,7 +474,7 @@ attachment_header (CamelMimePart *part, const char *mime_type,
/* Write the MIME type */
info = gnome_vfs_mime_get_value (mime_type, "description");
htmlinfo = e_text_to_html (info ? info : mime_type, 0);
- mail_html_write (md->html, md->stream, "%s attachment", htmlinfo);
+ mail_html_write (md->html, md->stream, _("%s attachment"), htmlinfo);
g_free (htmlinfo);
/* Write the name, if we have it. */
@@ -585,31 +585,33 @@ write_headers (CamelMimeMessage *message, MailDisplay *md)
"cellspacing=0 border=1>"
"<tr><td><table>\n");
- write_field_to_stream ("From:", camel_mime_message_get_from (message),
+ write_field_to_stream (_("From:"),
+ camel_mime_message_get_from (message),
TRUE, TRUE, md->html, md->stream);
reply_to = camel_mime_message_get_reply_to (message);
if (reply_to) {
- write_field_to_stream ("Reply-To:", reply_to, TRUE, FALSE,
+ write_field_to_stream (_("Reply-To:"), reply_to, TRUE, FALSE,
md->html, md->stream);
}
recipients = camel_mime_message_get_recipients (
message, CAMEL_RECIPIENT_TYPE_TO);
string = camel_address_encode (CAMEL_ADDRESS (recipients));
- write_field_to_stream ("To:", string ? string : "", TRUE, TRUE,
+ write_field_to_stream (_("To:"), string ? string : "", TRUE, TRUE,
md->html, md->stream);
g_free (string);
recipients = camel_mime_message_get_recipients(message, CAMEL_RECIPIENT_TYPE_CC);
string = camel_address_encode(CAMEL_ADDRESS(recipients));
if (string) {
- write_field_to_stream ("Cc:", string, TRUE, TRUE,
+ write_field_to_stream (_("Cc:"), string, TRUE, TRUE,
md->html, md->stream);
}
g_free (string);
- write_field_to_stream ("Subject:", camel_mime_message_get_subject (message),
+ write_field_to_stream (_("Subject:"),
+ camel_mime_message_get_subject (message),
FALSE, TRUE, md->html, md->stream);
mail_html_write (md->html, md->stream,
@@ -829,8 +831,8 @@ decode_pgp (const char *ciphertext, MailDisplay *md)
}
#else
camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
- "No GPG/PGP support available in this copy "
- "of Evolution.");
+ _("No GPG/PGP support available in this copy "
+ "of Evolution."));
#endif
mail_html_write (md->html, md->stream,
@@ -840,15 +842,15 @@ decode_pgp (const char *ciphertext, MailDisplay *md)
get_url_for_icon ("gnome-lockscreen.png", md));
if (camel_exception_is_set (&ex)) {
- mail_html_write (md->html, md->stream,
- "Encrypted message not displayed<br><br>\n");
+ mail_html_write (md->html, md->stream, "%s<br><br>\n",
+ _("Encrypted message not displayed"));
mail_error_write (md->html, md->stream,
camel_exception_get_description (&ex));
camel_exception_clear (&ex);
} else {
- mail_html_write (md->html, md->stream,
- "Encrypted message<br><br>\n"
- "Click icon to decrypt.");
+ mail_html_write (md->html, md->stream, "%s<br><br>\n%s",
+ _("Encrypted message"),
+ _("Click icon to decrypt."));
}
mail_html_write (md->html, md->stream, "</td></tr></table>");
@@ -1450,7 +1452,7 @@ handle_message_external_body (CamelMimePart *part, const char *mime_type,
url = g_strdup_printf ("ftp://%s%s%s", site, path, ftype);
g_free (path);
- desc = g_strdup_printf ("Pointer to FTP site (%s)", url);
+ desc = g_strdup_printf (_("Pointer to FTP site (%s)"), url);
} else if (!g_strcasecmp (access_type, "local-file")) {
const char *name, *site;
@@ -1461,9 +1463,14 @@ handle_message_external_body (CamelMimePart *part, const char *mime_type,
url = g_strdup_printf ("file://%s%s", *name == '/' ? "" : "/",
name);
- desc = g_strdup_printf ("Pointer to local file (%s)%s%s%s",
- name, site ? " valid at site \"" : "",
- site ? site : "", site ? "\"" : "");
+ if (site) {
+ desc = g_strdup_printf (_("Pointer to local file (%s) "
+ "valid at site \"%s\""),
+ name, site);
+ } else {
+ desc = g_strdup_printf (_("Pointer to local file (%s)"),
+ name);
+ }
} else if (!g_strcasecmp (access_type, "URL")) {
const char *urlparam;
char *s, *d;
@@ -1495,11 +1502,12 @@ handle_message_external_body (CamelMimePart *part, const char *mime_type,
fallback:
if (!desc) {
if (access_type) {
- desc = g_strdup_printf ("Pointer to unknown external "
- "data (\"%s\" type)",
+ desc = g_strdup_printf (_("Pointer to unknown "
+ "external data "
+ "(\"%s\" type)"),
access_type);
} else
- desc = g_strdup ("Malformed external-body part.");
+ desc = g_strdup (_("Malformed external-body part."));
}
#if 0 /* FIXME */
diff --git a/mail/mail-local.c b/mail/mail-local.c
index a852b7c183..e2d5a8cea1 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -290,18 +290,6 @@ setup_reconfigure_folder (gpointer in_data, gpointer op_data, CamelException *ex
{
reconfigure_folder_input_t *input = (reconfigure_folder_input_t *) in_data;
- if (!IS_FOLDER_BROWSER (input->fb)) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "Input has a bad FolderBrowser in reconfigure_folder");
- return;
- }
-
- if (!input->newtype) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No new folder type in reconfigure_folder");
- return;
- }
-
gtk_object_ref (GTK_OBJECT (input->fb));
}
@@ -336,7 +324,7 @@ do_reconfigure_folder(gpointer in_data, gpointer op_data, CamelException *ex)
/* first, 'close' the old folder */
if (input->fb->folder != NULL) {
- update_progress("Closing current folder", 0.0);
+ update_progress(_("Closing current folder"), 0.0);
mail_tool_camel_lock_up ();
camel_folder_sync(input->fb->folder, FALSE, ex);
@@ -368,7 +356,7 @@ do_reconfigure_folder(gpointer in_data, gpointer op_data, CamelException *ex)
/* rename the old mbox and open it again, without indexing */
tmpname = g_strdup_printf("%s_reconfig", meta->name);
printf("renaming %s to %s, and opening it\n", meta->name, tmpname);
- update_progress("Renaming old folder and opening", 0.0);
+ update_progress(_("Renaming old folder and opening"), 0.0);
mail_tool_camel_lock_up ();
camel_store_rename_folder(fromstore, meta->name, tmpname, ex);
@@ -389,7 +377,7 @@ do_reconfigure_folder(gpointer in_data, gpointer op_data, CamelException *ex)
/* create a new mbox */
printf("Creating the destination mbox\n");
- update_progress("Creating new folder", 0.0);
+ update_progress(_("Creating new folder"), 0.0);
flags = CAMEL_STORE_FOLDER_CREATE;
if (meta->indexed)
@@ -404,7 +392,7 @@ do_reconfigure_folder(gpointer in_data, gpointer op_data, CamelException *ex)
goto cleanup;
}
- update_progress("Copying messages", 0.0);
+ update_progress(_("Copying messages"), 0.0);
mail_tool_move_folder_contents (fromfolder, tofolder, FALSE, ex);
printf("delete old mbox ...\n");
@@ -415,9 +403,11 @@ do_reconfigure_folder(gpointer in_data, gpointer op_data, CamelException *ex)
g_free(meta->format);
meta->format = g_strdup(input->newtype);
if (save_metainfo(meta) == -1) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, "Cannot save folder metainfo; "
- "you'll probably find you can't\n"
- "open this folder anymore: %s", tourl);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Cannot save folder metainfo; "
+ "you'll probably find you can't\n"
+ "open this folder anymore: %s"),
+ tourl);
}
free_metainfo(meta);
@@ -450,8 +440,8 @@ cleanup_reconfigure_folder (gpointer in_data, gpointer op_data, CamelException
if (camel_exception_is_set(ex)) {
GtkWidget *win = gtk_widget_get_ancestor((GtkWidget *)input->frame, GTK_TYPE_WINDOW);
- gnome_error_dialog_parented ("If you can no longer open this mailbox, then\n"
- "you may need to repair it manually.", GTK_WINDOW (win));
+ gnome_error_dialog_parented (_("If you can no longer open this mailbox, then\n"
+ "you may need to repair it manually."), GTK_WINDOW (win));
}
gtk_object_unref (GTK_OBJECT (input->fb));
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 6eb11b3bb2..11e15012bb 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -261,7 +261,7 @@ mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean
/* Get all uids of source */
- mail_op_set_message ("Examining %s", source->full_name);
+ mail_op_set_message (_("Examining %s"), source->full_name);
uids = camel_folder_get_uids (source);
printf ("mail_tool_move_folder: got %d messages in source\n", uids->len);
@@ -312,7 +312,8 @@ mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean
/* Info */
- mail_op_set_message ("Retrieving message %d of %d", i + 1, uids->len);
+ mail_op_set_message (_("Retrieving message %d of %d"),
+ i + 1, uids->len);
/* Get the message */
@@ -324,7 +325,8 @@ mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean
/* Append it to dest */
- mail_op_set_message ("Writing message %d of %d", i + 1, uids->len);
+ mail_op_set_message (_("Writing message %d of %d"),
+ i + 1, uids->len);
if (summary_capability)
info = camel_folder_get_message_info (source, uids->pdata[i]);
@@ -352,7 +354,7 @@ mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean
} else
camel_folder_free_uids (source, uids);
- mail_op_set_message ("Saving changes to %s", source->full_name);
+ mail_op_set_message (_("Saving changes to %s"), source->full_name);
camel_folder_sync (source, TRUE, ex);
@@ -384,7 +386,7 @@ mail_tool_generate_forward_subject (CamelMimeMessage *msg)
if (from) {
if (subject && *subject) {
- fwd_subj = g_strdup_printf (_("[%s] %s"), from, subject);
+ fwd_subj = g_strdup_printf ("[%s] %s", from, subject);
} else {
fwd_subj = g_strdup_printf (_("[%s] (forwarded message)"),
from);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 8909a2f933..a0c3289806 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -144,7 +144,7 @@ vfolder_create_storage(EvolutionShellComponent *shell_component)
corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
- storage = evolution_storage_new ("VFolders");
+ storage = evolution_storage_new (_("VFolders"));
if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
g_warning ("Cannot register storage");
return;
diff --git a/mail/message-list.c b/mail/message-list.c
index 64ec31837d..6442e2aa47 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -508,13 +508,13 @@ ml_value_to_string (ETableModel *etm, int col, const void *value, void *data)
case COL_MESSAGE_STATUS:
switch ((int) value) {
case 0:
- return g_strdup ("Unseen");
+ return g_strdup (_("Unseen"));
break;
case 1:
- return g_strdup ("Seen");
+ return g_strdup (_("Seen"));
break;
case 2:
- return g_strdup ("Answered");
+ return g_strdup (_("Answered"));
break;
default:
return g_strdup ("");
@@ -1691,21 +1691,15 @@ static void cleanup_regenerate_messagelist (gpointer in_data, gpointer op_data,
static gchar *describe_regenerate_messagelist (gpointer in_data, gboolean gerund)
{
if (gerund)
- return g_strdup ("Rebuilding message view");
+ return g_strdup (_("Rebuilding message view"));
else
- return g_strdup ("Rebuild message view");
+ return g_strdup (_("Rebuild message view"));
}
static void setup_regenerate_messagelist (gpointer in_data, gpointer op_data, CamelException *ex)
{
regenerate_messagelist_input_t *input = (regenerate_messagelist_input_t *) in_data;
- if (!IS_MESSAGE_LIST (input->ml)) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No messagelist specified to regenerate");
- return;
- }
-
gtk_object_ref (GTK_OBJECT (input->ml));
e_table_model_pre_change (input->ml->table_model);
}
diff --git a/mail/message-thread.c b/mail/message-thread.c
index dd391c1201..4114ae0f33 100644
--- a/mail/message-thread.c
+++ b/mail/message-thread.c
@@ -522,33 +522,15 @@ static void cleanup_thread_messages (gpointer in_data, gpointer op_data, CamelEx
static gchar *describe_thread_messages (gpointer in_data, gboolean gerund)
{
if (gerund)
- return g_strdup ("Threading message list");
+ return g_strdup (_("Threading message list"));
else
- return g_strdup ("Thread message list");
+ return g_strdup (_("Thread message list"));
}
static void setup_thread_messages (gpointer in_data, gpointer op_data, CamelException *ex)
{
thread_messages_input_t *input = (thread_messages_input_t *) in_data;
- if (!IS_MESSAGE_LIST (input->ml)) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No messagelist to thread was provided to thread_messages");
- return;
- }
-
- if (!input->uids) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No uids were provided to thread_messages");
- return;
- }
-
- if (!input->build) {
- camel_exception_set (ex, CAMEL_EXCEPTION_INVALID_PARAM,
- "No build callback provided to thread_messages");
- return;
- }
-
gtk_object_ref (GTK_OBJECT (input->ml));
}