[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-314-g853d84f
ticho at claws-mail.org
ticho at claws-mail.org
Sat Aug 25 11:41:09 CEST 2018
The branch, gtk3 has been updated
via 853d84f38d01664a55b5e65d22d9dec55d79c324 (commit)
via bf32f9cb1f3807b6d3c3698c898c95eecebd8d8d (commit)
via 7be212fe5ba10b8e4264b215e17bda96a59175a4 (commit)
via b38873d103d697f7fff2a96dd162e4c4d7f62758 (commit)
via 4c3ca98d30a1d2875f949922ee8aad562890cf3a (commit)
via dae2a17f44d3fa1decb1285b9f509c84dc2e5214 (commit)
via c2c94ee2ddf4510205874d42c8fe3e99dfbfeab4 (commit)
via 7363f657b7e1ca17a8cd38be7fae5ee71a7adc41 (commit)
via 6b6dc6067580f66e940f403621ec5c066583b44e (commit)
via 4ce9b9a45da2885ee3d6884fec408de45720b0a4 (commit)
via 1a7555f59e6207f6f81dee03f69954ecfce93708 (commit)
via 4d7a7a503767f22270d87846a20eb3e1bde4647e (commit)
via 3271b0bc8edcf49264abe4f60f87977561e238b4 (commit)
via 4f8b9327298a9f6d094a6d34b255bb78cbba9788 (commit)
via ebb399a07f46651dc9fdc19f729acb72c6922ca8 (commit)
via 673f0f89f04ffb25aaf9e41a539c0322f52f2092 (commit)
via 3c6c882a1952f8976da438a22a006c7483f51efb (commit)
via ced04f3355768c241373564b9d71565be81900f3 (commit)
via d468e0fd5ad4ac421e82c2771854ffc2226e1269 (commit)
via 4e684cb79903d9e0890897d6b6e2f2fdfeffaa6c (commit)
via f03a00bc638d1f4d91876380201ded22040eef79 (commit)
via 332c8f05291c1d556900ae7cc91465eb7a59621e (commit)
via 0f02917ab4d3f5609f198c003273b9b0eb4b37a9 (commit)
via 5c2f8b69dc423417edabd1b42027a4af0b64e525 (commit)
via 6365753f0328412d1b0f68d9b9a3b1430bd319b7 (commit)
via 4fded1ba83f66b3490eaf6ba8d8ead0b0d01d541 (commit)
via d154a3365375aafa22340fef04b29c50a780712e (commit)
via d5df752666f9d2c65d435ec99d6f5f45da3b7fcd (commit)
via 1f32f6f79e4a5a094c824cfdfa340906b5482294 (commit)
via 4092c7128f6dd29c0576330092eb049607eb0936 (commit)
via 2e49be62251eaf87a73e1fb623cede52301144a6 (commit)
via 71d3173258c25cfbb449fee7a9c2ef49de869737 (commit)
via e0473d3257478d345f0dd2f686e08e4e14ea5c4f (commit)
via ff726cd1aff7e80ff7071bfed51de0cdc3ff3620 (commit)
via 2f9243b9b63d0fc9c14e4af89fffb5b03d132f86 (commit)
via 606145f4a91b1c0626fc2227dbdc06438aeccdf9 (commit)
via 3f9089db78e742a8f28178382c89ad3c18513963 (commit)
via 4ab13a1fadcff85c88a2d843c0004807bbe653a5 (commit)
via 3d6e21305917de23c0901d3098a770f204e17ebe (commit)
via 37bbb866aa29525c5ea036f90239502b6a2cff0a (commit)
via 7009a9e482cc430e89e5827e0c9fb25cf4af61be (commit)
via 633236aab87ce4db5bb2fc33aa18fefcf83b8363 (commit)
via 537c51bf42a47a7b52b30bfb7abdf0838c3ff251 (commit)
from d1d885030577e131bd3de216fa48f8fac7c9b266 (commit)
Summary of changes:
NEWS | 138 +
README | 1 +
RELEASE_NOTES | 242 +-
configure.ac | 7 +-
manual/de/dist/pdf/Makefile.am | 2 +-
manual/de/dist/ps/Makefile.am | 2 +-
manual/dist/pdf/Makefile.am | 2 +-
manual/dist/ps/Makefile.am | 2 +-
manual/es/dist/pdf/Makefile.am | 2 +-
manual/es/dist/ps/Makefile.am | 2 +-
manual/fr/dist/pdf/Makefile.am | 2 +-
manual/fr/dist/ps/Makefile.am | 2 +-
manual/pl/dist/pdf/Makefile.am | 2 +-
manual/pl/dist/ps/Makefile.am | 2 +-
po/es.po | 5403 ++++++++++----------
po/fr.po | 2405 ++++-----
src/account.c | 22 +-
src/addrgather.c | 2 +-
src/advsearch.c | 2 +
src/codeconv.c | 67 +
src/common/md5.h | 6 +
src/common/pkcs5_pbkdf2.c | 2 +
src/common/tlds.h | 12 +-
src/common/utils.h | 6 -
src/crash.c | 2 +-
src/entity.c | 2 -
src/folderutils.c | 112 +-
src/folderutils.h | 6 +-
src/folderview.c | 13 +-
src/gtk/foldersort.c | 2 +-
src/gtk/foldersort.h | 2 +-
src/gtk/gtkutils.c | 97 +
src/gtk/gtkutils.h | 6 +
src/gtk/quicksearch.c | 4 +
src/html.c | 5 +-
src/inc.c | 36 +-
src/ldaputil.c | 4 +-
src/main.c | 2 +
src/mainwindow.c | 3 +-
src/matcher.c | 52 +-
src/matcher.h | 1 +
src/matcher_parser_parse.y | 24 +
src/plugins/archive/Makefile.am | 2 +-
src/plugins/bogofilter/Makefile.am | 2 +-
src/plugins/bsfilter/Makefile.am | 2 +-
src/plugins/clamd/Makefile.am | 2 +-
src/plugins/clamd/libclamd/Makefile.am | 7 +-
src/plugins/dillo/Makefile.am | 2 +-
src/plugins/fancy/Makefile.am | 2 +-
src/plugins/fancy/fancy_prefs.c | 2 +-
src/plugins/gdata/cm_gdata_contacts.c | 2 +-
src/plugins/gdata/cm_gdata_contacts.h | 2 +-
src/plugins/gdata/cm_gdata_prefs.h | 2 +-
src/plugins/gdata/gdata_plugin.c | 2 +-
src/plugins/gdata/gdata_plugin.h | 2 +-
src/plugins/mailmbox/Makefile.am | 2 +-
src/plugins/notification/Makefile.am | 2 +-
src/plugins/notification/notification_banner.h | 2 +-
src/plugins/notification/notification_command.c | 2 +-
src/plugins/notification/notification_command.h | 2 +-
src/plugins/notification/notification_core.c | 2 +-
src/plugins/notification/notification_core.h | 2 +-
.../notification/notification_foldercheck.c | 2 +-
.../notification/notification_foldercheck.h | 2 +-
src/plugins/notification/notification_hotkeys.c | 2 +-
src/plugins/notification/notification_hotkeys.h | 2 +-
src/plugins/notification/notification_indicator.c | 2 +-
src/plugins/notification/notification_indicator.h | 2 +-
src/plugins/notification/notification_lcdproc.c | 2 +-
src/plugins/notification/notification_lcdproc.h | 2 +-
src/plugins/notification/notification_pixbuf.c | 2 +-
src/plugins/notification/notification_pixbuf.h | 2 +-
src/plugins/notification/notification_plugin.c | 2 +-
src/plugins/notification/notification_plugin.h | 2 +-
src/plugins/notification/notification_popup.c | 2 +-
src/plugins/notification/notification_popup.h | 2 +-
src/plugins/notification/notification_prefs.h | 2 +-
src/plugins/notification/notification_trayicon.c | 4 +-
src/plugins/notification/notification_trayicon.h | 2 +-
src/plugins/pdf_viewer/poppler_viewer.c | 2 +-
src/plugins/perl/Makefile.am | 2 +-
src/plugins/perl/perl_gtk.c | 2 +-
src/plugins/perl/perl_gtk.h | 2 +-
src/plugins/perl/perl_plugin.c | 2 +-
src/plugins/perl/perl_plugin.h | 2 +-
src/plugins/python/Makefile.am | 2 +-
src/plugins/python/accounttype.c | 2 +-
src/plugins/python/accounttype.h | 2 +-
src/plugins/python/clawsmailmodule.c | 2 +-
src/plugins/python/clawsmailmodule.h | 2 +-
src/plugins/python/composewindowtype.c | 2 +-
src/plugins/python/composewindowtype.h | 2 +-
src/plugins/python/folderpropertiestype.c | 2 +-
src/plugins/python/folderpropertiestype.h | 2 +-
src/plugins/python/foldertype.c | 2 +-
src/plugins/python/foldertype.h | 2 +-
src/plugins/python/mailboxtype.c | 2 +-
src/plugins/python/mailboxtype.h | 2 +-
src/plugins/python/messageinfotype.c | 2 +-
src/plugins/python/messageinfotype.h | 2 +-
src/plugins/python/nodetype.c | 2 +-
src/plugins/python/nodetype.h | 2 +-
src/plugins/python/python_plugin.c | 2 +-
src/plugins/rssyl/Makefile.am | 2 +-
src/plugins/rssyl/libfeed/parser.c | 2 -
src/plugins/rssyl/opml_export.c | 2 +-
src/plugins/rssyl/opml_import.c | 2 +-
src/plugins/rssyl/parse822.c | 2 +-
src/plugins/rssyl/plugin.c | 2 +-
src/plugins/rssyl/rssyl.c | 2 +-
src/plugins/rssyl/rssyl_add_item.c | 2 +-
src/plugins/rssyl/rssyl_cb_menu.c | 2 +-
src/plugins/rssyl/rssyl_deleted.c | 2 +-
src/plugins/rssyl/rssyl_gtk.c | 2 +-
src/plugins/rssyl/rssyl_parse_feed.c | 2 +-
src/plugins/rssyl/rssyl_subscribe.c | 2 +-
src/plugins/rssyl/rssyl_subscribe_gtk.c | 2 +-
src/plugins/rssyl/strutils.c | 26 +-
src/plugins/spam_report/Makefile.am | 2 +-
src/plugins/spamassassin/Makefile.am | 2 +-
src/plugins/tnef_parse/Makefile.am | 2 +-
src/plugins/vcalendar/claws.def | 3 +
src/plugins/vcalendar/vcal_meeting_gtk.c | 161 +-
src/prefs_account.c | 34 +-
src/prefs_matcher.c | 124 +-
src/prefs_msg_colors.c | 2 +-
src/prefs_receive.c | 6 +-
src/prefs_receive.h | 3 +
src/procmsg.h | 2 +-
src/quote_fmt_parse.y | 2 +-
src/stock_pixmap.c | 5 +-
src/summaryview.c | 42 +-
src/toolbar.c | 21 +-
133 files changed, 4970 insertions(+), 4332 deletions(-)
- Log -----------------------------------------------------------------
commit 853d84f38d01664a55b5e65d22d9dec55d79c324
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sat Aug 25 11:00:56 2018 +0200
Update vcalendar's claws.def file for Windows build after recent changes.
Thanks to Abhay S. Kushwaha.
diff --git a/src/plugins/vcalendar/claws.def b/src/plugins/vcalendar/claws.def
index 8bb01be..a0add79 100644
--- a/src/plugins/vcalendar/claws.def
+++ b/src/plugins/vcalendar/claws.def
@@ -91,6 +91,9 @@ gtk_cmctree_node_get_row_data
gtkut_convert_int_to_gdk_color
gtkutils_scroll_one_line
gtkutils_scroll_page
+gtkut_time_select_combo_new
+gtkut_time_select_get_time
+gtkut_time_select_select_by_time
gtkut_ui_manager
gtkut_widget_draw_now
gtkut_window_new
commit bf32f9cb1f3807b6d3c3698c898c95eecebd8d8d
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sat Aug 25 10:58:49 2018 +0200
Improve Left Arrow keypress handling for childless folders in folderview.
Based on patch by Abhay S. Kushwaha.
diff --git a/src/folderview.c b/src/folderview.c
index eb18fa0..95d07cf 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2149,10 +2149,13 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
break;
case GDK_KEY_Left:
if (folderview->selected) {
- if (GTK_CMCTREE_ROW(folderview->selected)->expanded) {
+ /* If the folder is expanded and can be collapsed, do that... */
+ if (GTK_CMCTREE_ROW(folderview->selected)->expanded &&
+ GTK_CMCTREE_ROW(folderview->selected)->children != NULL) {
gtk_cmctree_collapse(GTK_CMCTREE(folderview->ctree),
folderview->selected);
} else {
+ /* ...otherwise, move cursor to its parent node. */
if ((item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
folderview->selected))) {
if ((node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree),
commit 7be212fe5ba10b8e4264b215e17bda96a59175a4
Author: wwp <subscript at free.fr>
Date: Fri Aug 24 14:59:13 2018 +0200
Optimize (for speed) and factorize code related to marking folders
as read/unread recursively. A bit of code format fixing too.
diff --git a/src/folderutils.c b/src/folderutils.c
index 355af85..9d71a51 100644
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -27,6 +27,9 @@
#include "mainwindow.h"
#include "summaryview.h"
+static gboolean folderutils_mark_all_read_node_func(GNode *node, gpointer data);
+
+
gint folderutils_delete_duplicates(FolderItem *item,
DeleteDuplicatesMode mode)
{
@@ -119,60 +122,23 @@ gint folderutils_delete_duplicates(FolderItem *item,
return dups;
}
-void folderutils_mark_all_read(FolderItem *item)
+void folderutils_mark_all_read(FolderItem *item, gboolean mark_as_read)
{
MsgInfoList *msglist, *cur;
MainWindow *mainwin = mainwindow_get_mainwindow();
int i = 0, m = 0;
- debug_print("marking all read in item %s\n", (item==NULL)?"NULL":item->name);
- cm_return_if_fail(item != NULL);
-
-
- folder_item_update_freeze();
- if (mainwin && mainwin->summaryview &&
- mainwin->summaryview->folder_item == item) {
- debug_print("folder opened, using summary\n");
- summary_mark_all_read(mainwin->summaryview, FALSE);
- } else {
- msglist = folder_item_get_msg_list(item);
- debug_print("got msglist %p\n", msglist);
- if (msglist == NULL) {
- folder_item_update_thaw();
- return;
- }
- folder_item_set_batch(item, TRUE);
- for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
- MsgInfo *msginfo = cur->data;
-
- if (msginfo->flags.perm_flags & (MSG_NEW | MSG_UNREAD)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- m++;
- }
- i++;
- procmsg_msginfo_free(&msginfo);
- }
- folder_item_set_batch(item, FALSE);
- folder_item_close(item);
- debug_print("marked %d messages out of %d as read\n", m, i);
- g_slist_free(msglist);
- }
- folder_item_update_thaw();
-}
+ gchar *msg = mark_as_read?"read":"unread";
+ void(*summary_mark_func)(SummaryView*, gboolean) =
+ mark_as_read?summary_mark_all_read:summary_mark_all_unread;
-void folderutils_mark_all_unread(FolderItem *item)
-{
- MsgInfoList *msglist, *cur;
- MainWindow *mainwin = mainwindow_get_mainwindow();
- int i = 0, m = 0;
- debug_print("marking all unread in item %s\n", (item==NULL)?"NULL":item->name);
+ debug_print("marking all %s in item %s\n", msg, (item==NULL)?"NULL":item->name);
cm_return_if_fail(item != NULL);
-
folder_item_update_freeze();
if (mainwin && mainwin->summaryview &&
mainwin->summaryview->folder_item == item) {
debug_print("folder opened, using summary\n");
- summary_mark_all_unread(mainwin->summaryview, FALSE);
+ summary_mark_func(mainwin->summaryview, FALSE);
} else {
msglist = folder_item_get_msg_list(item);
debug_print("got msglist %p\n", msglist);
@@ -184,65 +150,45 @@ void folderutils_mark_all_unread(FolderItem *item)
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
MsgInfo *msginfo = cur->data;
- if (!(msginfo->flags.perm_flags & MSG_UNREAD)) {
- procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
- m++;
+ if (mark_as_read) {
+ if (msginfo->flags.perm_flags & (MSG_NEW | MSG_UNREAD)) {
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ m++;
+ }
+ } else {
+ if (!(msginfo->flags.perm_flags & MSG_UNREAD)) {
+ procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+ m++;
+ }
}
i++;
procmsg_msginfo_free(&msginfo);
}
folder_item_set_batch(item, FALSE);
folder_item_close(item);
- debug_print("marked %d messages out of %d as unread\n", m, i);
+ debug_print("marked %d messages out of %d as %s\n", m, i, msg);
g_slist_free(msglist);
}
folder_item_update_thaw();
}
-void folderutils_mark_all_read_recursive(FolderItem *item)
+static gboolean folderutils_mark_all_read_node_func(GNode *node, gpointer data)
{
- GNode *node;
-
- cm_return_if_fail(item != NULL);
-
- folderutils_mark_all_read(item);
-
- cm_return_if_fail(item->folder != NULL);
- cm_return_if_fail(item->folder->node != NULL);
-
- node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
-
- while (node != NULL) {
- if (node->data != NULL) {
- FolderItem *sub_item = (FolderItem *) node->data;
- node = node->next;
- folderutils_mark_all_read_recursive(sub_item);
- }
+ if (node) {
+ FolderItem *sub_item = (FolderItem *) node->data;
+ folderutils_mark_all_read(sub_item, (gboolean) GPOINTER_TO_INT(data));
}
+ return(FALSE);
}
-void folderutils_mark_all_unread_recursive(FolderItem *item)
+void folderutils_mark_all_read_recursive(FolderItem *item, gboolean mark_as_read)
{
- GNode *node;
-
cm_return_if_fail(item != NULL);
- folderutils_mark_all_unread(item);
-
cm_return_if_fail(item->folder != NULL);
cm_return_if_fail(item->folder->node != NULL);
- node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
-
- while (node != NULL) {
- if (node->data != NULL) {
- FolderItem *sub_item = (FolderItem *) node->data;
- node = node->next;
- folderutils_mark_all_unread_recursive(sub_item);
- }
- }
+ g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ folderutils_mark_all_read_node_func,
+ GINT_TO_POINTER(mark_as_read));
}
diff --git a/src/folderutils.h b/src/folderutils.h
index 64a5c2e..9394d44 100644
--- a/src/folderutils.h
+++ b/src/folderutils.h
@@ -29,9 +29,7 @@ typedef enum {
gint folderutils_delete_duplicates(FolderItem *item,
DeleteDuplicatesMode mode);
-void folderutils_mark_all_read (FolderItem *item);
-void folderutils_mark_all_unread (FolderItem *item);
-void folderutils_mark_all_read_recursive (FolderItem *item);
-void folderutils_mark_all_unread_recursive (FolderItem *item);
+void folderutils_mark_all_read (FolderItem *item, gboolean read);
+void folderutils_mark_all_read_recursive (FolderItem *item, gboolean read);
#endif /* FOLDERUTILS_H */
diff --git a/src/folderview.c b/src/folderview.c
index 0b3d0aa..eb18fa0 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -880,14 +880,14 @@ static void mark_all_read_unread_handler(GtkAction *action, gpointer data,
if (read) {
if (recursive)
- folderutils_mark_all_read_recursive(item);
+ folderutils_mark_all_read_recursive(item, TRUE);
else
- folderutils_mark_all_read(item);
+ folderutils_mark_all_read(item, TRUE);
} else {
if (recursive)
- folderutils_mark_all_unread_recursive(item);
+ folderutils_mark_all_read_recursive(item, FALSE);
else
- folderutils_mark_all_unread(item);
+ folderutils_mark_all_read(item, FALSE);
}
if (folderview->summaryview->folder_item != item && !recursive)
summary_unlock(folderview->summaryview);
diff --git a/src/summaryview.c b/src/summaryview.c
index d6f179e..1fd33a9 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4251,7 +4251,7 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkCMCTreeNode *node;
gboolean froze = FALSE;
-
+
if (summary_is_locked(summaryview))
return;
@@ -4261,16 +4261,16 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
START_LONG_OPERATION(summaryview, TRUE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node))
+ node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
folder_item_set_batch(summaryview->folder_item, FALSE);
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node)) {
+ node = gtkut_ctree_node_next(ctree, node)) {
if (!GTK_CMCTREE_ROW(node)->expanded)
summary_set_row_marks(summaryview, node);
}
END_LONG_OPERATION(summaryview);
-
+
summary_status_show(summaryview);
}
@@ -4297,7 +4297,7 @@ void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkCMCTreeNode *node;
gboolean froze = FALSE;
-
+
if (summary_is_locked(summaryview))
return;
@@ -4307,16 +4307,16 @@ void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
START_LONG_OPERATION(summaryview, TRUE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node))
+ node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_unread(summaryview, node);
folder_item_set_batch(summaryview->folder_item, FALSE);
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node)) {
+ node = gtkut_ctree_node_next(ctree, node)) {
if (!GTK_CMCTREE_ROW(node)->expanded)
summary_set_row_marks(summaryview, node);
}
END_LONG_OPERATION(summaryview);
-
+
summary_status_show(summaryview);
}
commit b38873d103d697f7fff2a96dd162e4c4d7f62758
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 24 14:38:52 2018 +0200
Fix building manual PDF and PS formats when building outside of source dir.
diff --git a/manual/de/dist/pdf/Makefile.am b/manual/de/dist/pdf/Makefile.am
index f8df2b2..050a7d9 100644
--- a/manual/de/dist/pdf/Makefile.am
+++ b/manual/de/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2pdf -o . ../../claws-mail-manual.xml
+ -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/de/dist/ps/Makefile.am b/manual/de/dist/ps/Makefile.am
index 39dd670..96a9069 100644
--- a/manual/de/dist/ps/Makefile.am
+++ b/manual/de/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2ps -o . ../../claws-mail-manual.xml
+ -docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.ps
diff --git a/manual/dist/pdf/Makefile.am b/manual/dist/pdf/Makefile.am
index 3637765..2a78f05 100644
--- a/manual/dist/pdf/Makefile.am
+++ b/manual/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2pdf -o . ../../claws-mail-manual.xml
+ -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/dist/ps/Makefile.am b/manual/dist/ps/Makefile.am
index 763d45d..d4f067c 100644
--- a/manual/dist/ps/Makefile.am
+++ b/manual/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2ps -o . ../../claws-mail-manual.xml
+ -docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.ps
diff --git a/manual/es/dist/pdf/Makefile.am b/manual/es/dist/pdf/Makefile.am
index 2007348..4382322 100644
--- a/manual/es/dist/pdf/Makefile.am
+++ b/manual/es/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2pdf -o . ../../claws-mail-manual.xml
+ -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/es/dist/ps/Makefile.am b/manual/es/dist/ps/Makefile.am
index ab88be6..7b26017 100644
--- a/manual/es/dist/ps/Makefile.am
+++ b/manual/es/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2ps -o . ../../claws-mail-manual.xml
+ -docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.ps
diff --git a/manual/fr/dist/pdf/Makefile.am b/manual/fr/dist/pdf/Makefile.am
index a08985e..b7a8a53 100644
--- a/manual/fr/dist/pdf/Makefile.am
+++ b/manual/fr/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2pdf -o . ../../claws-mail-manual.xml
+ -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/fr/dist/ps/Makefile.am b/manual/fr/dist/ps/Makefile.am
index 1ab81e8..53f5bdb 100644
--- a/manual/fr/dist/ps/Makefile.am
+++ b/manual/fr/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2ps -o . ../../claws-mail-manual.xml
+ -docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.ps
diff --git a/manual/pl/dist/pdf/Makefile.am b/manual/pl/dist/pdf/Makefile.am
index f06a5ab..02eec0b 100644
--- a/manual/pl/dist/pdf/Makefile.am
+++ b/manual/pl/dist/pdf/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.pdf: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2pdf -o . ../../claws-mail-manual.xml
+ -docbook2pdf -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/pl/dist/ps/Makefile.am b/manual/pl/dist/ps/Makefile.am
index 4664ec8..48a27df 100644
--- a/manual/pl/dist/ps/Makefile.am
+++ b/manual/pl/dist/ps/Makefile.am
@@ -22,7 +22,7 @@ claws-mail-manual.ps: \
../../plugins.xml \
../../starting.xml \
../../claws-mail-manual.xml
- -docbook2ps -o . ../../claws-mail-manual.xml
+ -docbook2ps -o . "$(srcdir)/../../claws-mail-manual.xml"
maintainer-clean:
-rm claws-mail-manual.ps
commit 4c3ca98d30a1d2875f949922ee8aad562890cf3a
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 24 14:09:12 2018 +0200
Fix various plugins including generated .h files when building outside of source dir.
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index ec5594f..c3cb051 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -30,7 +30,7 @@ archive_la_LIBADD = \
archive_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index fd41b2c..acb5f4e 100644
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -27,7 +27,7 @@ bogofilter_la_LIBADD = $(cygwin_export_lib) \
bogofilter_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 0b92019..72bee25 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 8099afb..a66e992 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -27,7 +27,7 @@ clamd_la_CPPFLAGS = \
-I$(top_srcdir)/src/plugins/clamd/libclamd \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/clamd/libclamd/Makefile.am b/src/plugins/clamd/libclamd/Makefile.am
index f1f9f34..a71ac3e 100644
--- a/src/plugins/clamd/libclamd/Makefile.am
+++ b/src/plugins/clamd/libclamd/Makefile.am
@@ -8,9 +8,10 @@ libclamd_plugin_la_CPPFLAGS = \
$(GTK_CFLAGS) \
-I$(top_srcdir) \
-I$(top_builddir) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/gtk
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/common \
+ -I$(top_srcdir)/src/gtk
if BUILD_CLAMD_PLUGIN
noinst_LTLIBRARIES = libclamd-plugin.la
diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
index d3453c5..5c15449 100644
--- a/src/plugins/dillo/Makefile.am
+++ b/src/plugins/dillo/Makefile.am
@@ -28,7 +28,7 @@ dillo_la_LIBADD = $(cygwin_export_lib) \
dillo_la_CPPFLAGS = \
-I$(top_srcdir)/src \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 519b885..bfd1dd0 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 99d935c..c5fe369 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib/gi18n.h>
+#include "common/version.h"
#include "defs.h"
-#include "version.h"
#include "claws.h"
#include "plugin.h"
#include "gtkutils.h"
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 62acb27..1eceab5 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 41800a7..35c2f1c 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -19,7 +19,7 @@ IFLAGS = \
-I$(top_srcdir)/src/plugins/notification/gtkhotkey \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 31f162e..3df58c3 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -25,7 +25,7 @@ perl_la_LIBADD = \
perl_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index d8da14a..fe7592e 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -45,7 +45,7 @@ python_la_LDFLAGS = \
python_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 6106f39..29209b2 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 43ba72e..5a077dd 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
if OS_WIN32
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 71e6c06..98e3518 100644
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -30,7 +30,7 @@ spamassassin_la_LIBADD = $(cygwin_export_lib) \
spamassassin_la_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk \
$(ENCHANT_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index cf599ae..3dfe9c8 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -71,7 +71,7 @@ tnef_parse_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
IFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/common \
- -I$(top_builddir)/src/common \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src/gtk
tnef_parse_la_CPPFLAGS = \
commit dae2a17f44d3fa1decb1285b9f509c84dc2e5214
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 24 13:48:38 2018 +0200
Fix configure version detection when building outside of srcdir.
diff --git a/configure.ac b/configure.ac
index 3a0eb5d..55cbec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,13 @@ if test \( -d .git \); then
echo "echo ${GIT_VERSION}" > ./version
fi
else
- GIT_VERSION=`sh -c ". ./$srcdir/version"`
+ GIT_VERSION=`sh -c ". $srcdir/version"`
fi
+
+if test \( -z "$GIT_VERSION" \); then
+ AC_MSG_ERROR([*** could not determine program version])
+fi
+
MAJOR_VERSION=${GIT_VERSION%%.*}
MINOR_VERSION=${GIT_VERSION#*.}
MINOR_VERSION=${MINOR_VERSION%%.*}
commit c2c94ee2ddf4510205874d42c8fe3e99dfbfeab4
Author: Colin Leroy <colin at colino.net>
Date: Fri Aug 24 13:51:32 2018 +0200
Better GUI (with calendar) for date filtering condition.
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index a2b0ed5..efed2d2 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -2132,3 +2132,14 @@ gboolean gtkut_time_select_get_time(GtkComboBox *combo, int *hour, int *minute)
return TRUE;
}
+
+void gtk_calendar_select_today(GtkCalendar *calendar)
+{
+ time_t t = time (NULL);
+ struct tm buft;
+ struct tm *lt = localtime_r (&t, &buft);
+
+ mktime(lt);
+ gtk_calendar_select_day(calendar, lt->tm_mday);
+ gtk_calendar_select_month(calendar, lt->tm_mon, lt->tm_year + 1900);
+}
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 04d6b8e..6018019 100644
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -192,6 +192,8 @@ GtkWidget *gtkut_time_select_combo_new();
void gtkut_time_select_select_by_time(GtkComboBox *combo, int hour, int minute);
gboolean gtkut_time_select_get_time(GtkComboBox *combo, int *hour, int *minute);
+void gtk_calendar_select_today(GtkCalendar *calendar);
+
typedef void (*ClawsIOFunc)(gpointer data, gint source, GIOCondition condition);
gint
claws_input_add (gint source,
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 027d0bd..5c423ff 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -39,6 +39,7 @@
#include "prefs_gtk.h"
#include "prefs_matcher.h"
#include "prefs_common.h"
+#include "procheader.h"
#include "mainwindow.h"
#include "foldersel.h"
#include "manage_window.h"
@@ -101,6 +102,9 @@ static struct Matcher {
#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
#endif
+ GtkWidget *calendar;
+ GtkWidget *time_label;
+ GtkWidget *time_entry;
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
@@ -554,6 +558,11 @@ static void prefs_matcher_create(void)
#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
#endif
+ GtkWidget *calendar;
+ GtkWidget *time_label;
+ GtkWidget *time_entry;
+ GtkWidget *date_hbox;
+ GtkWidget *date_vbox;
static GdkGeometry geometry;
GtkSizeGroup *size_group;
@@ -754,6 +763,21 @@ static void prefs_matcher_create(void)
gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 2, 3,
GTK_FILL, GTK_SHRINK, 4, 0);
+ /* Date widgets */
+ date_vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ calendar = gtk_calendar_new();
+ gtk_box_pack_start(GTK_BOX(hbox), calendar, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(lower_hbox), date_vbox, FALSE, FALSE, 0);
+
+ date_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ gtk_box_pack_start(GTK_BOX(date_vbox), date_hbox, FALSE, FALSE, 0);
+
+ time_entry = gtkut_time_select_combo_new();
+ gtk_box_pack_start(GTK_BOX(date_hbox), time_entry, FALSE, FALSE, 0);
+ time_label = gtk_label_new(_("on:"));
+ gtk_misc_set_alignment(GTK_MISC(time_label), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(date_hbox), time_label, FALSE, FALSE, 0);
+
/* test info button */
test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
@@ -866,6 +890,9 @@ static void prefs_matcher_create(void)
matcher.regexp_checkbtn = regexp_checkbtn;
matcher.bool_op_combo = bool_op_combo;
matcher.test_btn = test_btn;
+ matcher.calendar = calendar;
+ matcher.time_label = time_label;
+ matcher.time_entry = time_entry;
#ifndef USE_ALT_ADDRBOOK
matcher.addressbook_select_btn = addressbook_select_btn;
#endif
@@ -971,6 +998,9 @@ static void prefs_matcher_reset_condition(void)
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), "");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
+
+ gtk_calendar_select_today(GTK_CALENDAR(matcher.calendar));
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), 0, 0);
}
/*!
@@ -1489,6 +1519,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
const gchar *header;
const gchar *expr;
gint value, sel;
+ gint year, month, day, hour, minute;
if (value_criteria == -1)
return NULL;
@@ -1544,8 +1575,6 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
case CRITERIA_HEADERS_PART:
case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
- case CRITERIA_DATE_AFTER:
- case CRITERIA_DATE_BEFORE:
case CRITERIA_MESSAGE:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
@@ -1555,6 +1584,20 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
}
break;
+ case CRITERIA_DATE_AFTER:
+ case CRITERIA_DATE_BEFORE:
+ expr = NULL;
+ gtk_calendar_get_date(GTK_CALENDAR(matcher.calendar), &year, &month, &day);
+ if (gtkut_time_select_get_time(GTK_COMBO_BOX(matcher.time_entry), &hour, &minute))
+ expr = g_strdup_printf("%4d-%02d-%02d %02d:%02d:00",
+ year, month + 1, day, hour, minute);
+
+ if (expr == NULL) {
+ alertpanel_error(_("Invalid hour."));
+ return NULL;
+ }
+ break;
+
case CRITERIA_TEST:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
@@ -1949,7 +1992,13 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
(value == MATCH_ABOOK));
prefs_matcher_enable_widget(matcher.string_entry,
(MATCH_CASE_REGEXP(value) ||
- value == MATCH_TEST || value == MATCH_DATE));
+ value == MATCH_TEST));
+ prefs_matcher_enable_widget(matcher.calendar,
+ (value == MATCH_DATE));
+ prefs_matcher_enable_widget(matcher.time_label,
+ (value == MATCH_DATE));
+ prefs_matcher_enable_widget(matcher.time_entry,
+ (value == MATCH_DATE));
prefs_matcher_enable_widget(matcher.numeric_entry,
MATCH_NUMERIC(value));
prefs_matcher_enable_widget(matcher.numeric_label,
@@ -1990,6 +2039,8 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
case MATCH_DATE:
prefs_matcher_set_model(matcher.match_combo, matcher.model_date);
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Date is"));
+ gtk_calendar_select_today(GTK_CALENDAR(matcher.calendar));
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), 0, 0);
break;
case MATCH_AGE:
prefs_matcher_set_model(matcher.match_combo, matcher.model_age);
@@ -2431,6 +2482,8 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
GtkWidget *menu;
GtkTreeIter iter;
gboolean is_valid;
+ struct tm lt;
+ char zone[6];
if (currently_selected)
return TRUE;
@@ -2531,9 +2584,17 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
case MATCHCRITERIA_TEST:
+ gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
+ break;
+
case MATCHCRITERIA_DATE_AFTER:
case MATCHCRITERIA_DATE_BEFORE:
- gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
+ zone[0] = '\0';
+ procheader_date_parse_to_tm(prop->expr, <, zone);
+ gtk_calendar_select_day(GTK_CALENDAR(matcher.calendar), lt.tm_mday);
+ gtk_calendar_select_month(GTK_CALENDAR(matcher.calendar), lt.tm_mon, lt.tm_year + 1900);
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), lt.tm_hour, lt.tm_min);
+
break;
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
commit 7363f657b7e1ca17a8cd38be7fae5ee71a7adc41
Author: Colin Leroy <colin at colino.net>
Date: Fri Aug 24 11:07:06 2018 +0200
Move time selector from vCalendar to gtkutils
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 1f5938b..a2b0ed5 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -2046,3 +2046,89 @@ gpointer gtkut_tree_view_get_selected_pointer(GtkTreeView *view,
return ptr;
}
+
+static GList *get_predefined_times(void)
+{
+ int h,m;
+ GList *times = NULL;
+ for (h = 0; h < 24; h++) {
+ for (m = 0; m < 60; m += 15) {
+ gchar *tmp = g_strdup_printf("%02d:%02d", h, m);
+ times = g_list_append(times, tmp);
+ }
+ }
+ return times;
+}
+
+static int get_list_item_num(int h, int m)
+{
+ if (m % 15 != 0)
+ return -1;
+
+ return (h*4 + m/15);
+}
+
+GtkWidget *gtkut_time_select_combo_new()
+{
+ GtkWidget *combo = gtk_combo_box_text_new_with_entry();
+ GList *times = get_predefined_times();
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(combo), -1);
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(combo), times);
+
+ list_free_strings_full(times);
+
+ return combo;
+}
+
+
+void gtkut_time_select_select_by_time(GtkComboBox *combo, int hour, int minute)
+{
+ gchar *time_text = g_strdup_printf("%02d:%02d", hour, minute);
+ gint num = get_list_item_num(hour, minute);
+
+ if (num > -1)
+ combobox_select_by_text(combo, time_text);
+ else
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))), time_text);
+
+ g_free(time_text);
+}
+
+static void get_time_from_combo(GtkComboBox *combo, int *h, int *m)
+{
+ gchar *tmp;
+ gchar **parts;
+
+ if (!h || !m)
+ return;
+
+ tmp = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combo))), 0, -1);
+ parts = g_strsplit(tmp, ":", 2);
+ if (parts[0] && parts[1] && *parts[0] && *parts[1]) {
+ *h = atoi(parts[0]);
+ *m = atoi(parts[1]);
+ }
+ g_strfreev(parts);
+ g_free(tmp);
+}
+
+gboolean gtkut_time_select_get_time(GtkComboBox *combo, int *hour, int *minute)
+{
+ const gchar *value = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))));
+
+ if (value == NULL || strlen(value) != 5)
+ return FALSE;
+
+ if (hour == NULL || minute == NULL)
+ return FALSE;
+
+ get_time_from_combo(combo, hour, minute);
+
+ if (*hour < 0 || *hour > 23)
+ return FALSE;
+ if (*minute < 0 || *minute > 59)
+ return FALSE;
+
+ return TRUE;
+}
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index b35cf34..04d6b8e 100644
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -188,6 +188,10 @@ GtkUIManager *gtkut_ui_manager(void);
GdkPixbuf *claws_load_pixbuf_fitting(GdkPixbuf *pixbuf, int box_width,
int box_height);
+GtkWidget *gtkut_time_select_combo_new();
+void gtkut_time_select_select_by_time(GtkComboBox *combo, int hour, int minute);
+gboolean gtkut_time_select_get_time(GtkComboBox *combo, int *hour, int *minute);
+
typedef void (*ClawsIOFunc)(gpointer data, gint source, GIOCondition condition);
gint
claws_input_add (gint source,
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 4e9e094..299e033 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -396,24 +396,6 @@ static gchar *get_organizer_name(VCalMeeting *meet)
return g_strdup("");
}
-static void get_time_from_combo(GtkWidget *combo, int *h, int *m)
-{
- gchar *tmp;
- gchar **parts;
-
- if (!h || !m)
- return;
-
- tmp = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combo))), 0, -1);
- parts = g_strsplit(tmp, ":", 2);
- if (parts[0] && parts[1] && *parts[0] && *parts[1]) {
- *h = atoi(parts[0]);
- *m = atoi(parts[1]);
- }
- g_strfreev(parts);
- g_free(tmp);
-}
-
static int get_current_gmt_offset(void)
{
time_t now = time(NULL);
@@ -477,9 +459,9 @@ static gchar *get_date(VCalMeeting *meet, int start)
lt->tm_sec = 0;
if (start) {
- get_time_from_combo(meet->start_time, <->tm_hour, <->tm_min);
+ gtkut_time_select_get_time(GTK_COMBO_BOX(meet->start_time), <->tm_hour, <->tm_min);
} else {
- get_time_from_combo(meet->end_time, <->tm_hour, <->tm_min);
+ gtkut_time_select_get_time(GTK_COMBO_BOX(meet->end_time), <->tm_hour, <->tm_min);
}
debug_print("%d %d %d, %d:%d\n", lt->tm_mday, lt->tm_mon, lt->tm_year, lt->tm_hour, lt->tm_min);
@@ -547,14 +529,6 @@ static gboolean meeting_key_pressed(GtkWidget *widget,
return FALSE;
}
-static int get_list_item_num(int h, int m)
-{
- if (m % 15 != 0)
- return -1;
-
- return (h*4 + m/15);
-}
-
static void meeting_end_changed(GtkWidget *widget, gpointer data);
static void meeting_start_changed(GtkWidget *widget, gpointer data)
@@ -564,9 +538,8 @@ static void meeting_start_changed(GtkWidget *widget, gpointer data)
struct tm end_lt;
time_t start_t, end_t;
guint d, m, y;
- int num = -1;
- if (strlen(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->start_time))))) < 5)
+ if (!gtkut_time_select_get_time(GTK_COMBO_BOX(meet->start_time), &start_lt.tm_hour, &start_lt.tm_min))
return;
tzset();
@@ -583,7 +556,6 @@ static void meeting_start_changed(GtkWidget *widget, gpointer data)
gtk_calendar_get_date(GTK_CALENDAR(meet->start_c), &y, &m, &d);
start_lt.tm_mday = d; start_lt.tm_mon = m; start_lt.tm_year = y - 1900;
- get_time_from_combo(meet->start_time, &start_lt.tm_hour, &start_lt.tm_min);
start_t = mktime(&start_lt);
debug_print("start %s\n", ctime(&start_t));
@@ -591,7 +563,8 @@ static void meeting_start_changed(GtkWidget *widget, gpointer data)
gtk_calendar_get_date(GTK_CALENDAR(meet->end_c), &y, &m, &d);
end_lt.tm_mday = d; end_lt.tm_mon = m; end_lt.tm_year = y - 1900;
- get_time_from_combo(meet->end_time, &end_lt.tm_hour, &end_lt.tm_min);
+ gtkut_time_select_get_time(GTK_COMBO_BOX(meet->end_time), &end_lt.tm_hour, &end_lt.tm_min);
+
end_t = mktime(&end_lt);
debug_print("end %s\n", ctime(&end_t));
@@ -618,19 +591,8 @@ static void meeting_start_changed(GtkWidget *widget, gpointer data)
end_lt.tm_mon,
end_lt.tm_year + 1900);
- num = get_list_item_num(end_lt.tm_hour, end_lt.tm_min);
- if (num > -1) {
- gchar *time_text = g_strdup_printf("%02d:%02d", end_lt.tm_hour, end_lt.tm_min);
- combobox_select_by_text(GTK_COMBO_BOX(meet->end_time), time_text);
- g_free(time_text);
- } else {
- gchar *tmp = g_strdup_printf("%02d:%02d",
- end_lt.tm_hour,
- end_lt.tm_min);
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->end_time))),
- tmp);
- g_free(tmp);
- }
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->end_time), end_lt.tm_hour, end_lt.tm_min);
+
g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(meet->end_time)), meeting_end_changed, meet);
g_signal_handlers_unblock_by_func(meet->end_c, meeting_end_changed, meet);
}
@@ -642,9 +604,8 @@ static void meeting_end_changed(GtkWidget *widget, gpointer data)
struct tm end_lt;
time_t start_t, end_t;
guint d, m, y;
- int num = -1;
- if (strlen(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->end_time))))) < 5)
+ if (!gtkut_time_select_get_time(GTK_COMBO_BOX(meet->end_time), &end_lt.tm_hour, &end_lt.tm_min))
return;
start_t = time(NULL);
end_t = time(NULL);
@@ -662,14 +623,13 @@ static void meeting_end_changed(GtkWidget *widget, gpointer data)
gtk_calendar_get_date(GTK_CALENDAR(meet->start_c), &y, &m, &d);
start_lt.tm_mday = d; start_lt.tm_mon = m; start_lt.tm_year = y - 1900;
- get_time_from_combo(meet->start_time, &start_lt.tm_hour, &start_lt.tm_min);
+ gtkut_time_select_get_time(GTK_COMBO_BOX(meet->start_time), &start_lt.tm_hour, &start_lt.tm_min);
start_t = mktime(&start_lt);
debug_print("start %s\n", ctime(&start_t));
gtk_calendar_get_date(GTK_CALENDAR(meet->end_c), &y, &m, &d);
end_lt.tm_mday = d; end_lt.tm_mon = m; end_lt.tm_year = y - 1900;
- get_time_from_combo(meet->end_time, &end_lt.tm_hour, &end_lt.tm_min);
end_t = mktime(&end_lt);
@@ -699,19 +659,7 @@ static void meeting_end_changed(GtkWidget *widget, gpointer data)
start_lt.tm_mon,
start_lt.tm_year + 1900);
- num = get_list_item_num(start_lt.tm_hour, start_lt.tm_min);
- if (num > -1) {
- gchar *time_text = g_strdup_printf("%02d:%02d", start_lt.tm_hour, start_lt.tm_min);
- combobox_select_by_text(GTK_COMBO_BOX(meet->start_time), time_text);
- g_free(time_text);
- } else {
- gchar *tmp = g_strdup_printf("%02d:%02d",
- start_lt.tm_hour,
- start_lt.tm_min);
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->start_time))),
- tmp);
- g_free(tmp);
- }
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->start_time), start_lt.tm_hour, start_lt.tm_min);
g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(meet->start_time)), meeting_start_changed, meet);
g_signal_handlers_unblock_by_func(meet->start_c, meeting_start_changed, meet);
@@ -1374,19 +1322,6 @@ static gboolean send_meeting_cb(GtkButton *widget, gpointer data)
return res;
}
-static GList *get_predefined_times(void)
-{
- int h,m;
- GList *times = NULL;
- for (h = 0; h < 24; h++) {
- for (m = 0; m < 60; m += 15) {
- gchar *tmp = g_strdup_printf("%02d:%02d", h, m);
- times = g_list_append(times, tmp);
- }
- }
- return times;
-}
-
static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
{
VCalMeeting *meet = g_new0(VCalMeeting, 1);
@@ -1395,9 +1330,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
gchar *s = NULL;
int i = 0, num = 0;
GtkWidget *scrolledwin;
- GList *times = NULL;
GList *accounts;
- gchar *time_text = NULL;
#ifdef GENERIC_UMPC
GtkWidget *notebook;
GtkWidget *maemo_vbox0;
@@ -1421,17 +1354,9 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
meet->avail_img = gtk_image_new_from_stock
(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
- times = get_predefined_times();
-
- meet->start_time = gtk_combo_box_text_new_with_entry();
- gtk_combo_box_set_active(GTK_COMBO_BOX(meet->start_time), -1);
- combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(meet->start_time), times);
+ meet->start_time = gtkut_time_select_combo_new();
- meet->end_time = gtk_combo_box_text_new_with_entry();
- gtk_combo_box_set_active(GTK_COMBO_BOX(meet->end_time), -1);
- combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(meet->end_time), times);
-
- list_free_strings_full(times);
+ meet->end_time = gtkut_time_select_combo_new();
meet->location = gtk_entry_new();
meet->summary = gtk_entry_new();
@@ -1497,9 +1422,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
gtk_calendar_select_month(GTK_CALENDAR(meet->start_c),
lt->tm_mon, lt->tm_year + 1900);
- time_text = g_strdup_printf("%02d:%02d", lt->tm_hour, 0);
- combobox_select_by_text(GTK_COMBO_BOX(meet->start_time), time_text);
- g_free(time_text);
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->start_time), lt->tm_hour, 0);
t += 3600;
lt = localtime_r(&t, &buft2);
@@ -1509,10 +1432,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
gtk_calendar_select_month(GTK_CALENDAR(meet->end_c),
lt->tm_mon, lt->tm_year + 1900);
- time_text = g_strdup_printf("%02d:%02d", lt->tm_hour, 0);
- combobox_select_by_text(GTK_COMBO_BOX(meet->end_time), time_text);
- g_free(time_text);
-
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->end_time), lt->tm_hour, 0);
} else {
gtk_calendar_select_day(GTK_CALENDAR(meet->start_c),
get_dtdate(event->dtstart, DAY));
@@ -1526,37 +1446,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
get_dtdate(event->dtend, MONTH)-1,
get_dtdate(event->dtend, YEAR));
- num = get_list_item_num(get_dtdate(event->dtstart, HOUR),
- get_dtdate(event->dtstart, MINUTE));
- if (num > -1) {
- time_text = g_strdup_printf("%02d:%02d", get_dtdate(event->dtstart, HOUR),
- get_dtdate(event->dtstart, MINUTE));
- combobox_select_by_text(GTK_COMBO_BOX(meet->start_time), time_text);
- g_free(time_text);
- } else {
- gchar *tmp = g_strdup_printf("%02d:%02d",
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->start_time),
get_dtdate(event->dtstart, HOUR),
get_dtdate(event->dtstart, MINUTE));
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->start_time))),
- tmp);
- g_free(tmp);
- }
- num = get_list_item_num(get_dtdate(event->dtend, HOUR),
- get_dtdate(event->dtend, MINUTE));
- if (num > -1) {
- time_text = g_strdup_printf("%02d:%02d", get_dtdate(event->dtend, HOUR),
- get_dtdate(event->dtend, MINUTE));
- combobox_select_by_text(GTK_COMBO_BOX(meet->end_time), time_text);
- g_free(time_text);
- } else {
- gchar *tmp = g_strdup_printf("%02d:%02d",
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->end_time),
get_dtdate(event->dtend, HOUR),
get_dtdate(event->dtend, MINUTE));
- gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(meet->end_time))),
- tmp);
- g_free(tmp);
- }
}
g_signal_connect(G_OBJECT(meet->start_c), "day-selected",
@@ -1764,7 +1660,7 @@ VCalMeeting *vcal_meeting_create(VCalEvent *event)
VCalMeeting *vcal_meeting_create_with_start(VCalEvent *event, struct tm *sdate)
{
VCalMeeting *meet = vcal_meeting_create(event);
- int num = -1;
+
gtk_calendar_select_day(GTK_CALENDAR(meet->start_c),
sdate->tm_mday);
gtk_calendar_select_day(GTK_CALENDAR(meet->end_c),
@@ -1776,22 +1672,13 @@ VCalMeeting *vcal_meeting_create_with_start(VCalEvent *event, struct tm *sdate)
sdate->tm_mon, sdate->tm_year+1900);
if (sdate->tm_hour != 0) {
- num = get_list_item_num(sdate->tm_hour, 0);
- if (num > -1) {
- gchar *time_text = g_strdup_printf("%02d:%02d", sdate->tm_hour, 0);
- combobox_select_by_text(GTK_COMBO_BOX(meet->start_time), time_text);
- g_free(time_text);
- }
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->start_time), sdate->tm_hour, 0);
+
if (sdate->tm_hour < 23) {
- num = get_list_item_num(sdate->tm_hour+1, 0);
- if (num > -1) {
- gchar *time_text = g_strdup_printf("%02d:%02d", sdate->tm_hour+1, 0);
- combobox_select_by_text(GTK_COMBO_BOX(meet->end_time), time_text);
- g_free(time_text);
- }
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->end_time), sdate->tm_hour+1, 0);
} else {
struct tm tm_tomorrow;
- gchar *time_text;
+
tm_tomorrow.tm_mday = sdate->tm_mday;
tm_tomorrow.tm_mon = sdate->tm_mon;
tm_tomorrow.tm_wday = sdate->tm_wday;
@@ -1803,9 +1690,7 @@ VCalMeeting *vcal_meeting_create_with_start(VCalEvent *event, struct tm *sdate)
gtk_calendar_select_month(GTK_CALENDAR(meet->end_c),
tm_tomorrow.tm_mon, tm_tomorrow.tm_year);
- time_text = g_strdup_printf("%02d:%02d", 0, 0);
- combobox_select_by_text(GTK_COMBO_BOX(meet->end_time), time_text);
- g_free(time_text);
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(meet->end_time), 0, 0);
}
}
return meet;
@@ -2171,7 +2056,7 @@ gboolean vcal_meeting_export_freebusy(const gchar *path, const gchar *user,
icalcomponent_add_property(tzc,
icalproperty_new_tzname("Greenwich meridian time"));
- icalcomponent_add_component(timezone, tzc);
+ icalcomponent_add_component(timezone, tzc);
icalcomponent_add_component(calendar, timezone);
commit 6b6dc6067580f66e940f403621ec5c066583b44e
Author: Colin Leroy <colin at colino.net>
Date: Fri Aug 24 10:17:27 2018 +0200
Filtering: simple GUI for date_after/before
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 96b9169..027d0bd 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -106,6 +106,7 @@ static struct Matcher {
GtkWidget *addressbook_select_btn;
GtkTreeModel *model_age;
+ GtkTreeModel *model_date;
GtkTreeModel *model_age_units;
GtkTreeModel *model_contain;
GtkTreeModel *model_found;
@@ -186,7 +187,10 @@ enum {
CRITERIA_AGE_LOWER_HOURS = 40,
CRITERIA_MESSAGEID = 41,
- CRITERIA_HEADERS_CONT = 42
+ CRITERIA_HEADERS_CONT = 42,
+
+ CRITERIA_DATE_AFTER = 43,
+ CRITERIA_DATE_BEFORE = 44
};
enum {
@@ -202,7 +206,8 @@ enum {
MATCH_PARTIAL = 9,
MATCH_ABOOK = 10,
MATCH_TAGS = 11,
- MATCH_TEST = 12
+ MATCH_TEST = 12,
+ MATCH_DATE = 13
};
enum {
@@ -338,6 +343,11 @@ static void prefs_matcher_models_create(void)
matcher.model_age_units = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+ COMBOBOX_ADD(store, _("after"), CRITERIA_DATE_AFTER);
+ COMBOBOX_ADD(store, _("before"), CRITERIA_DATE_BEFORE);
+ matcher.model_date = GTK_TREE_MODEL(store);
+
+ store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
COMBOBOX_ADD(store, _("higher than"), CRITERIA_SCORE_GREATER);
COMBOBOX_ADD(store, _("lower than"), CRITERIA_SCORE_LOWER);
COMBOBOX_ADD(store, _("exactly"), CRITERIA_SCORE_EQUAL);
@@ -618,19 +628,20 @@ static void prefs_matcher_create(void)
criteria_combo = gtkut_sc_combobox_create(NULL, FALSE);
store = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(criteria_combo)));
- COMBOBOX_ADD(store, _("All messages"), 0);
- COMBOBOX_ADD(store, _("Header"), 1);
- COMBOBOX_ADD(store, _("Age"), 2);
- COMBOBOX_ADD(store, _("Phrase"), 3);
- COMBOBOX_ADD(store, _("Flags"), 4);
- COMBOBOX_ADD(store, _("Color labels"), 5);
- COMBOBOX_ADD(store, _("Thread"), 6);
- COMBOBOX_ADD(store, _("Score"), 7);
- COMBOBOX_ADD(store, _("Size"), 8);
- COMBOBOX_ADD(store, _("Partially downloaded"), 9);
- COMBOBOX_ADD(store, _("Address book"), 10);
- COMBOBOX_ADD(store, _("Tags"), 11);
- COMBOBOX_ADD(store, _("External program test"), 12);
+ COMBOBOX_ADD(store, _("All messages"), MATCH_ALL);
+ COMBOBOX_ADD(store, _("Header"), MATCH_HEADER);
+ COMBOBOX_ADD(store, _("Age"), MATCH_AGE);
+ COMBOBOX_ADD(store, _("Phrase"), MATCH_PHRASE);
+ COMBOBOX_ADD(store, _("Flags"), MATCH_FLAG);
+ COMBOBOX_ADD(store, _("Color labels"), MATCH_LABEL);
+ COMBOBOX_ADD(store, _("Thread"), MATCH_THREAD);
+ COMBOBOX_ADD(store, _("Score"), MATCH_SCORE);
+ COMBOBOX_ADD(store, _("Size"), MATCH_SIZE);
+ COMBOBOX_ADD(store, _("Partially downloaded"), MATCH_PARTIAL);
+ COMBOBOX_ADD(store, _("Address book"), MATCH_ABOOK);
+ COMBOBOX_ADD(store, _("Tags"), MATCH_TAGS);
+ COMBOBOX_ADD(store, _("External program test"), MATCH_TEST);
+ COMBOBOX_ADD(store, _("Date"), MATCH_DATE);
gtk_widget_set_size_request(criteria_combo, 150, -1);
gtk_combo_box_set_active(GTK_COMBO_BOX(criteria_combo), MATCH_ALL);
@@ -1160,6 +1171,10 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
return CRITERIA_AGE_GREATER;
case MATCHCRITERIA_AGE_LOWER:
return CRITERIA_AGE_LOWER;
+ case MATCHCRITERIA_DATE_AFTER:
+ return CRITERIA_DATE_AFTER;
+ case MATCHCRITERIA_DATE_BEFORE:
+ return CRITERIA_DATE_BEFORE;
case MATCHCRITERIA_SCORE_GREATER:
return CRITERIA_SCORE_GREATER;
case MATCHCRITERIA_SCORE_LOWER:
@@ -1256,6 +1271,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
return MATCHCRITERIA_AGE_GREATER_HOURS;
case CRITERIA_AGE_LOWER_HOURS:
return MATCHCRITERIA_AGE_LOWER_HOURS;
+ case CRITERIA_DATE_AFTER:
+ return MATCHCRITERIA_DATE_AFTER;
+ case CRITERIA_DATE_BEFORE:
+ return MATCHCRITERIA_DATE_BEFORE;
case CRITERIA_SCORE_GREATER:
return MATCHCRITERIA_SCORE_GREATER;
case CRITERIA_SCORE_LOWER:
@@ -1381,6 +1400,7 @@ static gint prefs_matcher_get_criteria(void)
case MATCH_ALL:
return CRITERIA_ALL;
case MATCH_AGE:
+ case MATCH_DATE:
case MATCH_SCORE:
case MATCH_SIZE:
case MATCH_FLAG:
@@ -1524,6 +1544,8 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
case CRITERIA_HEADERS_PART:
case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
+ case CRITERIA_DATE_AFTER:
+ case CRITERIA_DATE_BEFORE:
case CRITERIA_MESSAGE:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
@@ -1927,7 +1949,7 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
(value == MATCH_ABOOK));
prefs_matcher_enable_widget(matcher.string_entry,
(MATCH_CASE_REGEXP(value) ||
- value == MATCH_TEST));
+ value == MATCH_TEST || value == MATCH_DATE));
prefs_matcher_enable_widget(matcher.numeric_entry,
MATCH_NUMERIC(value));
prefs_matcher_enable_widget(matcher.numeric_label,
@@ -1965,6 +1987,10 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("content is"));
break;
+ case MATCH_DATE:
+ prefs_matcher_set_model(matcher.match_combo, matcher.model_date);
+ gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Date is"));
+ break;
case MATCH_AGE:
prefs_matcher_set_model(matcher.match_combo, matcher.model_age);
prefs_matcher_set_model(matcher.match_combo2, matcher.model_age_units);
@@ -2301,6 +2327,10 @@ static void prefs_matcher_set_criteria(const gint criteria)
case CRITERIA_AGE_LOWER_HOURS:
match_criteria = MATCH_AGE;
break;
+ case CRITERIA_DATE_AFTER:
+ case CRITERIA_DATE_BEFORE:
+ match_criteria = MATCH_DATE;
+ break;
case CRITERIA_SCORE_GREATER:
case CRITERIA_SCORE_LOWER:
case CRITERIA_SCORE_EQUAL:
@@ -2373,6 +2403,7 @@ static void prefs_matcher_set_criteria(const gint criteria)
criteria);
break;
case MATCH_AGE:
+ case MATCH_DATE:
case MATCH_SCORE:
case MATCH_SIZE:
case MATCH_FLAG:
@@ -2500,6 +2531,8 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
case MATCHCRITERIA_TEST:
+ case MATCHCRITERIA_DATE_AFTER:
+ case MATCHCRITERIA_DATE_BEFORE:
gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
break;
commit 4ce9b9a45da2885ee3d6884fec408de45720b0a4
Author: Colin Leroy <colin at colino.net>
Date: Fri Aug 24 09:58:09 2018 +0200
Filtering: add date_before and date_after
diff --git a/src/advsearch.c b/src/advsearch.c
index 3abbeaa..ecd3acd 100644
--- a/src/advsearch.c
+++ b/src/advsearch.c
@@ -157,6 +157,8 @@ gchar *advsearch_expand_search_string(const gchar *search_string)
{ "c", "cc", 1, TRUE, TRUE },
{ "C", "to_or_cc", 1, TRUE, TRUE },
{ "D", "deleted", 0, FALSE, FALSE },
+ { "da", "date_after", 1, FALSE, TRUE },
+ { "db", "date_before", 1, FALSE, TRUE },
{ "e", "header \"Sender\"", 1, TRUE, TRUE },
{ "E", "execute", 1, FALSE, TRUE },
{ "f", "from", 1, TRUE, TRUE },
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index a0241d3..63e92e0 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -485,6 +485,10 @@ static gchar *search_descr_strings[] = {
"c S", N_("messages carbon-copied to S"),
"C S", N_("message is either To: or Cc: to S"),
"D", N_("deleted messages"), /** how I can filter deleted messages **/
+ "da \"YYYY-MM-dd HH:mm:ss\"", N_("messages whose date is after requested date "
+ "(time is optional)"),
+ "db \"YYYY-MM-dd HH:mm:ss\"", N_("messages whose date is before requested date "
+ "(time is optional)"),
"e S", N_("messages which contain S in the Sender field"),
"E S", N_("true if execute \"S\" succeeds"),
"f S", N_("messages originating from user S"),
diff --git a/src/matcher.c b/src/matcher.c
index a0d8ab7..29581e9 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -112,6 +112,8 @@ static const MatchParser matchparser_tab[] = {
{MATCHCRITERIA_AGE_LOWER, "age_lower"},
{MATCHCRITERIA_AGE_GREATER_HOURS, "age_greater_hours"},
{MATCHCRITERIA_AGE_LOWER_HOURS, "age_lower_hours"},
+ {MATCHCRITERIA_DATE_AFTER, "date_after"},
+ {MATCHCRITERIA_DATE_BEFORE, "date_before"},
{MATCHCRITERIA_NEWSGROUPS, "newsgroups"},
{MATCHCRITERIA_NOT_NEWSGROUPS, "~newsgroups"},
{MATCHCRITERIA_MESSAGEID, "messageid"},
@@ -932,6 +934,27 @@ static gboolean matcherprop_match(MatcherProp *prop,
}
return ret;
}
+ case MATCHCRITERIA_DATE_AFTER:
+ {
+ gboolean ret;
+
+ ret = prop->value < info->date_t;
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message date [ %ld ] is after [ %d ]\n",
+ info->date_t, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message date [ %ld ] is not after [ %d ]\n",
+ info->date_t, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_AGE_LOWER:
age_mult_hours = 24;
/* Fallthrough intended */
@@ -959,6 +982,27 @@ static gboolean matcherprop_match(MatcherProp *prop,
}
return ret;
}
+ case MATCHCRITERIA_DATE_BEFORE:
+ {
+ gboolean ret;
+
+ ret = prop->value > info->date_t;
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message date [ %ld ] is before [ %d ]\n",
+ info->date_t, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message date [ %ld ] is not before [ %d ]\n",
+ info->date_t, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SCORE_GREATER:
{
gboolean ret = (info->score > prop->value);
@@ -1912,6 +1956,8 @@ gboolean matcherlist_match(MatcherList *matchers, MsgInfo *info)
case MATCHCRITERIA_AGE_LOWER:
case MATCHCRITERIA_AGE_GREATER_HOURS:
case MATCHCRITERIA_AGE_LOWER_HOURS:
+ case MATCHCRITERIA_DATE_AFTER:
+ case MATCHCRITERIA_DATE_BEFORE:
case MATCHCRITERIA_NEWSGROUPS:
case MATCHCRITERIA_NOT_NEWSGROUPS:
case MATCHCRITERIA_MESSAGEID:
@@ -2104,6 +2150,8 @@ gchar *matcherprop_to_string(MatcherProp *matcher)
return g_strdup(criteria_str);
case MATCHCRITERIA_TEST:
case MATCHCRITERIA_NOT_TEST:
+ case MATCHCRITERIA_DATE_AFTER:
+ case MATCHCRITERIA_DATE_BEFORE:
quoted_expr = matcher_quote_str(matcher->expr);
matcher_str = g_strdup_printf("%s \"%s\"",
criteria_str, quoted_expr);
diff --git a/src/matcher.h b/src/matcher.h
index e9c3239..392924d 100644
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -88,6 +88,7 @@ enum {
MC_(TO_OR_CC), MC_(NOT_TO_AND_NOT_CC),
MC_(AGE_GREATER), MC_(AGE_LOWER),
MC_(AGE_GREATER_HOURS), MC_(AGE_LOWER_HOURS),
+ MC_(DATE_AFTER), MC_(DATE_BEFORE),
MC_(NEWSGROUPS), MC_(NOT_NEWSGROUPS),
MC_(MESSAGEID), MC_(NOT_MESSAGEID),
MC_(INREPLYTO), MC_(NOT_INREPLYTO),
diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index ea37c44..19726de 100644
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -25,6 +25,7 @@
#include "utils.h"
#include "filtering.h"
+#include "procheader.h"
#include "matcher.h"
#include "matcher_parser.h"
#include "matcher_parser_lex.h"
@@ -326,6 +327,7 @@ int matcher_parserwrap(void)
%token MATCHER_CC MATCHER_NOT_CC MATCHER_TO_OR_CC MATCHER_NOT_TO_AND_NOT_CC
%token MATCHER_AGE_GREATER MATCHER_AGE_LOWER MATCHER_NEWSGROUPS
%token MATCHER_AGE_GREATER_HOURS MATCHER_AGE_LOWER_HOURS
+%token MATCHER_DATE_AFTER MATCHER_DATE_BEFORE
%token MATCHER_NOT_NEWSGROUPS MATCHER_INREPLYTO MATCHER_NOT_INREPLYTO
%token MATCHER_MESSAGEID MATCHER_NOT_MESSAGEID
%token MATCHER_REFERENCES MATCHER_NOT_REFERENCES MATCHER_SCORE_GREATER
@@ -989,6 +991,28 @@ MATCHER_ALL
value = strtol($2, NULL, 0);
prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
+| MATCHER_DATE_AFTER MATCHER_STRING
+{
+ gint criteria = 0;
+ gchar *expr = NULL;
+ time_t value;
+
+ criteria = MATCHCRITERIA_DATE_AFTER;
+ expr = $2;
+ value = procheader_date_parse(NULL, expr, 0);
+ prop = matcherprop_new(criteria, NULL, 0, expr, value);
+}
+| MATCHER_DATE_BEFORE MATCHER_STRING
+{
+ gint criteria = 0;
+ gchar *expr = NULL;
+ time_t value;
+
+ criteria = MATCHCRITERIA_DATE_BEFORE;
+ expr = $2;
+ value = procheader_date_parse(NULL, expr, 0);
+ prop = matcherprop_new(criteria, NULL, 0, expr, value);
+}
| MATCHER_NEWSGROUPS match_type MATCHER_STRING
{
gint criteria = 0;
commit 1a7555f59e6207f6f81dee03f69954ecfce93708
Author: Colin Leroy <colin at colino.net>
Date: Thu Aug 23 10:51:52 2018 +0200
Only handle GTK events when matcher test thread takes more than 0 seconds.
diff --git a/src/matcher.c b/src/matcher.c
index ab42c75..a0d8ab7 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -730,7 +730,9 @@ static gboolean matcherprop_match_test(const MatcherProp *prop,
debug_print("waiting for test thread\n");
while(!td->done) {
/* don't let the interface freeze while waiting */
- claws_do_idle();
+ if (time(NULL) - start_time > 0) {
+ claws_do_idle();
+ }
if (time(NULL) - start_time > 30) {
pthread_cancel(pt);
td->done = TRUE;
commit 4d7a7a503767f22270d87846a20eb3e1bde4647e
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Wed Aug 22 15:00:58 2018 +0200
Add null pointer checks to pkcs5_pbkdf2().
diff --git a/src/common/pkcs5_pbkdf2.c b/src/common/pkcs5_pbkdf2.c
index 5abbf01..1475a33 100644
--- a/src/common/pkcs5_pbkdf2.c
+++ b/src/common/pkcs5_pbkdf2.c
@@ -93,6 +93,8 @@ pkcs5_pbkdf2(const gchar *pass, size_t pass_len, const guchar *salt,
guint count;
size_t r;
+ if (pass == NULL || salt == NULL || key == NULL)
+ return -1;
if (rounds < 1 || key_len == 0)
return -1;
if (salt_len == 0 || salt_len > SIZE_MAX - 4)
commit 3271b0bc8edcf49264abe4f60f87977561e238b4
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Tue Aug 21 19:52:33 2018 +0200
Added null parameter checks in codeconv.c where appropriate.
diff --git a/src/codeconv.c b/src/codeconv.c
index de939ed..b200f35 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -158,6 +158,8 @@ static gint conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
gchar *out = outbuf;
JISState state = JIS_ASCII;
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
/*
* Loop outputs up to 3 bytes in each pass (aux kanji) and we
* need 1 byte to terminate the output
@@ -262,6 +264,8 @@ static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym)
guint16 out_code;
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
jis_code &= 0x7f;
sound_sym &= 0x7f;
@@ -298,6 +302,8 @@ static gint conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
gchar *out = outbuf;
JISState state = JIS_ASCII;
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
/*
* Loop outputs up to 6 bytes in each pass (aux shift + aux
* kanji) and we need up to 4 bytes to terminate the output
@@ -391,6 +397,8 @@ static gint conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
const guchar *in = inbuf;
gchar *out = outbuf;
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
/*
* Loop outputs up to 2 bytes in each pass and we need 1 byte
* to terminate the output
@@ -441,6 +449,9 @@ static gint conv_jistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *eucstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
Xalloca(eucstr, outlen, return -1);
if (conv_jistoeuc(eucstr, outlen, inbuf) <0)
@@ -454,6 +465,9 @@ static gint conv_sjistoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
tmpstr = conv_iconv_strdup(inbuf, CS_SHIFT_JIS, CS_UTF_8);
if (tmpstr) {
strncpy2(outbuf, tmpstr, outlen);
@@ -471,6 +485,9 @@ static gint conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
static gboolean iconv_ok = TRUE;
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
if (cd == (iconv_t)-1) {
if (!iconv_ok) {
strncpy2(outbuf, inbuf, outlen);
@@ -503,6 +520,10 @@ static gint conv_euctoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
static gint conv_anytoutf8(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gint r = -1;
+
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
switch (conv_guess_ja_encoding(inbuf)) {
case C_ISO_2022_JP:
r = conv_jistoutf8(outbuf, outlen, inbuf);
@@ -528,6 +549,9 @@ static gint conv_utf8toeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
static gboolean iconv_ok = TRUE;
gchar *tmpstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
if (cd == (iconv_t)-1) {
if (!iconv_ok) {
strncpy2(outbuf, inbuf, outlen);
@@ -561,6 +585,9 @@ static gint conv_utf8tojis(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *eucstr;
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
Xalloca(eucstr, outlen, return -1);
if (conv_utf8toeuc(eucstr, outlen, inbuf) < 0)
@@ -628,21 +655,33 @@ static CharSet conv_guess_ja_encoding(const gchar *str)
static gint conv_jistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
return conv_jistoutf8(outbuf, outlen, inbuf);
}
static gint conv_sjistodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
return conv_sjistoutf8(outbuf, outlen, inbuf);
}
static gint conv_euctodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
return conv_euctoutf8(outbuf, outlen, inbuf);
}
void conv_utf8todisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_if_fail(inbuf != NULL);
+ cm_return_if_fail(outbuf != NULL);
+
if (g_utf8_validate(inbuf, -1, NULL) == TRUE)
strncpy2(outbuf, inbuf, outlen);
else
@@ -652,6 +691,10 @@ void conv_utf8todisp(gchar *outbuf, gint outlen, const gchar *inbuf)
static gint conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gint r = 0;
+
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
if (conv_anytoutf8(outbuf, outlen, inbuf) < 0)
r = -1;
if (g_utf8_validate(outbuf, -1, NULL) != TRUE)
@@ -661,6 +704,9 @@ static gint conv_anytodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
static gint conv_ustodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
strncpy2(outbuf, inbuf, outlen);
conv_unreadable_8bit(outbuf);
@@ -671,6 +717,9 @@ void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
{
gchar *tmpstr;
+ cm_return_if_fail(inbuf != NULL);
+ cm_return_if_fail(outbuf != NULL);
+
codeconv_set_strict(TRUE);
tmpstr = conv_iconv_strdup(inbuf, conv_get_locale_charset_str(),
CS_INTERNAL);
@@ -699,6 +748,9 @@ void conv_localetodisp(gchar *outbuf, gint outlen, const gchar *inbuf)
static gint conv_noconv(gchar *outbuf, gint outlen, const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, 0);
+ cm_return_val_if_fail(outbuf != NULL, 0);
+
strncpy2(outbuf, inbuf, outlen);
return 0;
}
@@ -752,6 +804,9 @@ void conv_code_converter_destroy(CodeConverter *conv)
gint conv_convert(CodeConverter *conv, gchar *outbuf, gint outlen,
const gchar *inbuf)
{
+ cm_return_val_if_fail(inbuf != NULL, -1);
+ cm_return_val_if_fail(outbuf != NULL, -1);
+
if (conv->code_conv_func != conv_noconv)
return conv->code_conv_func(outbuf, outlen, inbuf);
else {
@@ -776,6 +831,8 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
size_t len;
CodeConvFunc conv_func;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
if (!strcmp2(src_code, dest_code)) {
CharSet dest_charset = conv_get_charset_from_str(dest_code);
if (strict_mode && dest_charset == C_UTF_8) {
@@ -899,6 +956,8 @@ static gchar *conv_iconv_strdup(const gchar *inbuf,
iconv_t cd;
gchar *outbuf;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
if (!src_code && !dest_code &&
g_utf8_validate(inbuf, -1, NULL))
return g_strdup(inbuf);
@@ -943,6 +1002,8 @@ gchar *conv_iconv_strdup_with_cd(const gchar *inbuf, iconv_t cd)
size_t n_conv;
size_t len;
+ cm_return_val_if_fail(inbuf != NULL, NULL);
+
inbuf_p = inbuf;
in_size = strlen(inbuf);
in_left = in_size;
@@ -1546,6 +1607,8 @@ gchar *conv_unmime_header(const gchar *str, const gchar *default_encoding,
{
gchar buf[BUFFSIZE];
+ cm_return_val_if_fail(str != NULL, NULL);
+
if (is_ascii_str(str))
return unmime_header(str, addr_field);
@@ -1802,6 +1865,8 @@ gchar *conv_filename_from_utf8(const gchar *utf8_file)
gchar *fs_file;
GError *error = NULL;
+ cm_return_val_if_fail(utf8_file != NULL, NULL);
+
fs_file = g_filename_from_utf8(utf8_file, -1, NULL, NULL, &error);
if (error) {
debug_print("failed to convert encoding of file name: %s\n",
@@ -1819,6 +1884,8 @@ gchar *conv_filename_to_utf8(const gchar *fs_file)
gchar *utf8_file = NULL;
GError *error = NULL;
+ cm_return_val_if_fail(utf8_file != NULL, NULL);
+
utf8_file = g_filename_to_utf8(fs_file, -1, NULL, NULL, &error);
if (error) {
g_warning("failed to convert encoding of file name: %s",
commit 4f8b9327298a9f6d094a6d34b255bb78cbba9788
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Tue Aug 21 11:53:16 2018 +0200
Move the typedef for "u32" from utils.h to md5.h, since it is only used there.
diff --git a/src/common/md5.h b/src/common/md5.h
index 90cc63a..bf82fd7 100644
--- a/src/common/md5.h
+++ b/src/common/md5.h
@@ -23,6 +23,12 @@
#include "utils.h"
+#ifndef HAVE_U32_TYPEDEF
+ #undef u32 /* maybe there is a macro with this name */
+ typedef guint32 u32;
+ #define HAVE_U32_TYPEDEF
+#endif
+
typedef struct { /* Hmm, should be private */
u32 A,B,C,D;
u32 nblocks;
diff --git a/src/common/utils.h b/src/common/utils.h
index a1f356e..c09032f 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -68,12 +68,6 @@ typedef gint64 goffset;
#define G_MAXOFFSET G_MAXINT64
#endif
-#ifndef HAVE_U32_TYPEDEF
- #undef u32 /* maybe there is a macro with this name */
- typedef guint32 u32;
- #define HAVE_U32_TYPEDEF
-#endif
-
#ifndef BIG_ENDIAN_HOST
#if (G_BYTE_ORDER == G_BIG_ENDIAN)
#define BIG_ENDIAN_HOST 1
commit ebb399a07f46651dc9fdc19f729acb72c6922ca8
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Tue Aug 21 11:49:15 2018 +0200
Removed an unused #include from libfeed's parser.c.
diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
index be9458c..02603a0 100644
--- a/src/plugins/rssyl/libfeed/parser.c
+++ b/src/plugins/rssyl/libfeed/parser.c
@@ -28,8 +28,6 @@
#include <ctype.h>
#include <errno.h>
-#include <codeconv.h>
-
#include "feed.h"
#include "parser.h"
commit 673f0f89f04ffb25aaf9e41a539c0322f52f2092
Author: wwp <subscript at free.fr>
Date: Tue Aug 21 10:21:11 2018 +0200
Fix missing check for a retrieving interval minimum value in
accounts prefs, don't use abbreviated units there and follow
the global prefs style.
diff --git a/src/prefs_account.c b/src/prefs_account.c
index f5f5f4e..b49d221 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -40,6 +40,7 @@
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_account.h"
+#include "prefs_receive.h"
#include "prefs_common.h"
#include "prefs_customheader.h"
#include "account.h"
@@ -1014,6 +1015,8 @@ static void auto_configure_cb (GtkWidget *widget,
#endif
static void prefs_account_edit_custom_header (void);
+static void prefs_account_receive_itv_spinbutton_value_changed_cb(GtkWidget *w,
+ gpointer data);
#define COMBOBOX_PRIVACY_PLUGIN_ID 3
@@ -1777,14 +1780,14 @@ static void receive_create_widget_func(PrefsPage * _page,
autochk_min_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(autochk_min_spinbtn), TRUE);
gtk_box_pack_start(GTK_BOX(hbox2), autochk_min_spinbtn, FALSE, FALSE, 0);
- autochk_min_label = gtk_label_new(_("mins"));
+ autochk_min_label = gtk_label_new(_("minutes"));
gtk_box_pack_start(GTK_BOX(hbox2), autochk_min_label, FALSE, FALSE, 0);
adj = gtk_adjustment_new(5, 0, 99, 1, 10, 0);
autochk_sec_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(autochk_sec_spinbtn), TRUE);
gtk_box_pack_start(GTK_BOX(hbox2), autochk_sec_spinbtn, FALSE, FALSE, 0);
- autochk_sec_label = gtk_label_new(_("secs"));
+ autochk_sec_label = gtk_label_new(_("seconds"));
gtk_box_pack_start(GTK_BOX(hbox2), autochk_sec_label, FALSE, FALSE, 0);
autochk_widgets = g_new0(struct AutocheckWidgets, 1);
@@ -1808,6 +1811,15 @@ static void receive_create_widget_func(PrefsPage * _page,
g_signal_connect(G_OBJECT(filter_on_recv_checkbtn), "toggled",
G_CALLBACK(prefs_account_filter_on_recv_toggled),
NULL);
+ g_signal_connect(G_OBJECT(autochk_hour_spinbtn), "value-changed",
+ G_CALLBACK(prefs_account_receive_itv_spinbutton_value_changed_cb),
+ (gpointer) page);
+ g_signal_connect(G_OBJECT(autochk_min_spinbtn), "value-changed",
+ G_CALLBACK(prefs_account_receive_itv_spinbutton_value_changed_cb),
+ (gpointer) page);
+ g_signal_connect(G_OBJECT(autochk_sec_spinbtn), "value-changed",
+ G_CALLBACK(prefs_account_receive_itv_spinbutton_value_changed_cb),
+ (gpointer) page);
PACK_CHECK_BUTTON (vbox1, filterhook_on_recv_checkbtn,
_("Allow filtering using plugins on receiving"));
@@ -4091,7 +4103,7 @@ PrefsAccount *prefs_account_new_from_config(const gchar *label)
/* Start the auto-check interval, if needed. */
if (!ac_prefs->autochk_use_default && ac_prefs->autochk_use_custom
- && ac_prefs->autochk_itv > 0) {
+ && ac_prefs->autochk_itv > PREFS_RECV_AUTOCHECK_MIN_INTERVAL) {
inc_account_autocheck_timer_set_interval(ac_prefs);
}
@@ -5571,3 +5583,19 @@ gchar *prefs_account_cache_dir(PrefsAccount *ac_prefs, gboolean for_server)
return dir;
}
+
+static void prefs_account_receive_itv_spinbutton_value_changed_cb(GtkWidget *w, gpointer data)
+{
+ ReceivePage *page = (ReceivePage *)data;
+ gint seconds = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (page->autochk_widgets->autochk_sec_spinbtn));
+ gint minutes = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (page->autochk_widgets->autochk_min_spinbtn));
+ gint hours = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON(page->autochk_widgets->autochk_hour_spinbtn));
+ if (seconds < PREFS_RECV_AUTOCHECK_MIN_INTERVAL && minutes == 0 && hours == 0) {
+ gtk_spin_button_set_value (
+ GTK_SPIN_BUTTON (page->autochk_widgets->autochk_sec_spinbtn),
+ PREFS_RECV_AUTOCHECK_MIN_INTERVAL);
+ }
+}
diff --git a/src/prefs_receive.c b/src/prefs_receive.c
index 8eceafa..68b7ded 100644
--- a/src/prefs_receive.c
+++ b/src/prefs_receive.c
@@ -32,6 +32,7 @@
#include <gdk/gdkkeysyms.h>
#include "prefs_common.h"
+#include "prefs_receive.h"
#include "prefs_gtk.h"
#include "inc.h"
@@ -88,9 +89,10 @@ static void prefs_receive_itv_spinbutton_value_changed_cb(GtkWidget *w, gpointer
GTK_SPIN_BUTTON (page->spinbtn_autochk_min));
gint hours = gtk_spin_button_get_value_as_int (
GTK_SPIN_BUTTON(page->spinbtn_autochk_hour));
- if (seconds < 10 && minutes == 0 && hours == 0) {
+ if (seconds < PREFS_RECV_AUTOCHECK_MIN_INTERVAL && minutes == 0 && hours == 0) {
gtk_spin_button_set_value (
- GTK_SPIN_BUTTON (page->spinbtn_autochk_sec), 10.0);
+ GTK_SPIN_BUTTON (page->spinbtn_autochk_sec),
+ PREFS_RECV_AUTOCHECK_MIN_INTERVAL);
}
}
diff --git a/src/prefs_receive.h b/src/prefs_receive.h
index 0a024a1..7f7db2c 100644
--- a/src/prefs_receive.h
+++ b/src/prefs_receive.h
@@ -20,6 +20,9 @@
#ifndef PREFS_RECEIVE_H
#define PREFS_RECEIVE_H
+#define PREFS_RECV_AUTOCHECK_MIN_INTERVAL 10
+
+
void prefs_receive_init (void);
void prefs_receive_done (void);
commit 3c6c882a1952f8976da438a22a006c7483f51efb
Author: wwp <subscript at free.fr>
Date: Tue Aug 21 10:20:05 2018 +0200
Fix wrong time unit shown in offline-override dialog (IMAP), and
while we're at it, use the most appropriate reduced number+unit.
diff --git a/src/inc.c b/src/inc.c
index 2415e46..ed681fb 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1596,7 +1596,7 @@ void inc_account_autocheck_timer_set_interval(PrefsAccount *account)
gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
{
- int length = 10; /* minutes */
+ gint length = 10; /* seconds */
gint answer = G_ALERTDEFAULT;
#ifdef HAVE_NETWORKMANAGER_SUPPORT
@@ -1606,7 +1606,7 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
#endif
if (prefs_common.autochk_newmail)
- length = prefs_common.autochk_itv; /* minutes */
+ length = prefs_common.autochk_itv; /* seconds */
if (force_ask) {
inc_offline_overridden_no = (time_t)0;
@@ -1620,13 +1620,37 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
else if (time(NULL) - inc_offline_overridden_no < length * 60) /* seconds */
return FALSE;
- if (!force_ask)
+ if (!force_ask) {
+ gchar *unit = _("seconds");
+
+ /* show the offline override time (length) using the must appropriate unit:
+ the biggest unit possible (hours, minutes, seconds), provided that there
+ is not inferior unit involved: 1 hour, 150 minutes, 25 minutes, 90 minutes,
+ 30 seconds, 90 seconds. */
+ if ((length / 3600) > 0) { /* hours? */
+ if (((length % 3600) % 60) == 0) { /* no seconds left? */
+ if ((length % 3600) > 0) { /* minutes left? */
+ length = length / 60;
+ unit = ngettext("minute", "minutes", length);
+ } else {
+ length = length / 3600;
+ unit = ngettext("hour", "hours", length);
+ }
+ } /* else: seconds */
+ } else {
+ if ((length / 60) > 0) { /* minutes left? */
+ if ((length % 60) == 0) {
+ length = length / 60;
+ unit = ngettext("minute", "minutes", length);
+ }
+ } /* else: seconds */
+ }
tmp = g_strdup_printf(
- _("%s%sYou're working offline. Override for %d minutes?"),
+ _("%s%sYou're working offline. Override for %d %s?"),
msg?msg:"",
msg?"\n\n":"",
- length);
- else
+ length, unit);
+ } else
tmp = g_strdup_printf(
_("%s%sYou're working offline. Override?"),
msg?msg:"",
commit ced04f3355768c241373564b9d71565be81900f3
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sat Aug 18 14:28:45 2018 +0200
Remove unneeded includes from entity.c.
diff --git a/src/entity.c b/src/entity.c
index 98a01e4..12069d4 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -20,9 +20,7 @@
#include "claws-features.h"
#endif
-#include "defs.h"
#include "utils.h"
-#include "entity.h"
#define ENTITY_MAX_LEN 8
#define DECODED_MAX_LEN 6
commit d468e0fd5ad4ac421e82c2771854ffc2226e1269
Author: wwp <subscript at free.fr>
Date: Sat Aug 18 09:56:41 2018 +0200
Warn and fail rather than miserably crashing when format string in
faulty.
diff --git a/src/account.c b/src/account.c
index cf28983..e73a012 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1977,8 +1977,14 @@ gboolean account_signatures_matchlist_str_found(const gchar *str, const gchar *f
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
- found = (strcmp(tmp, str) == 0);
- g_free(tmp);
+ if (tmp) {
+ found = (strcmp(tmp, str) == 0);
+ g_free(tmp);
+ } else {
+ g_warning("account_signatures_matchlist_str_found: g_strdup_printf failed, check format '%s'",
+ format);
+ return FALSE;
+ }
}
return found;
}
@@ -1995,9 +2001,15 @@ gboolean account_signatures_matchlist_nchar_found(const gchar *str, const gchar
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
- len = strlen(tmp);
- found = (strncmp(tmp, str, len) == 0);
- g_free(tmp);
+ if (tmp) {
+ len = strlen(tmp);
+ found = (strncmp(tmp, str, len) == 0);
+ g_free(tmp);
+ } else {
+ g_warning("account_signatures_matchlist_nchar_found: g_strdup_printf failed, check format '%s'",
+ format);
+ return FALSE;
+ }
}
return found;
}
commit 4e684cb79903d9e0890897d6b6e2f2fdfeffaa6c
Author: wwp <subscript at free.fr>
Date: Sat Aug 18 09:34:09 2018 +0200
Fix for Bug 4072: Crash when clicking 'reply' or 'reply with quote'
Wrong '%\n' format causes a crash in g_strdup_printf.
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 03c872a..92e300e 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -491,7 +491,7 @@ static void quote_fmt_show_msg(MsgInfo *msginfo, const gchar *body,
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
- if (!signature && account_signatures_matchlist_nchar_found(buf, "%\n"))
+ if (!signature && account_signatures_matchlist_nchar_found(buf, "%s\n"))
break;
if (quoted && quote_str)
commit f03a00bc638d1f4d91876380201ded22040eef79
Author: wwp <wwp at free.fr>
Date: Thu Aug 16 08:45:55 2018 +0200
Fix/normalize product name in few places in UI and in several source files.
diff --git a/src/addrgather.c b/src/addrgather.c
index d15cc49..b8c8054 100644
--- a/src/addrgather.c
+++ b/src/addrgather.c
@@ -251,7 +251,7 @@ static gboolean addrgather_dlg_harvest() {
contact->name = g_strdup(person->last_name);
if (! contact->name || strlen(contact->name) < 1)
contact->name = g_strdup(person->email);
- contact->remarks = g_strdup(N_("address added by claws-mail"));
+ contact->remarks = g_strdup(N_("address added by Claws Mail"));
contact->email = g_strdup(person->email);
contact->book = g_strdup(name);
addressbook_dbus_add_contact(contact, &error);
diff --git a/src/crash.c b/src/crash.c
index 8b8985c..a6f10dd 100644
--- a/src/crash.c
+++ b/src/crash.c
@@ -481,7 +481,7 @@ static const gchar *get_operating_system(void)
/*!
*\brief see if the crash dialog is allowed (because some
- * developers may prefer to run claws-mail under gdb...)
+ * developers may prefer to run Claws Mail under gdb...)
*/
static gboolean is_crash_dialog_allowed(void)
{
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index df0c0c1..fe5717d 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2004-2018 the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gtk/foldersort.h b/src/gtk/foldersort.h
index 505dbb2..331bd12 100644
--- a/src/gtk/foldersort.h
+++ b/src/gtk/foldersort.h
@@ -1,5 +1,5 @@
/*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2004-2018 the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 1c6ba7d..63531b0 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
* Copyright (C) 2011-2016 the Claws Mail team
*
diff --git a/src/plugins/gdata/cm_gdata_contacts.h b/src/plugins/gdata/cm_gdata_contacts.h
index 1be697c..9b70faa 100644
--- a/src/plugins/gdata/cm_gdata_contacts.h
+++ b/src/plugins/gdata/cm_gdata_contacts.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/cm_gdata_prefs.h b/src/plugins/gdata/cm_gdata_prefs.h
index b99f77f..eb4c8d8 100644
--- a/src/plugins/gdata/cm_gdata_prefs.h
+++ b/src/plugins/gdata/cm_gdata_prefs.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/gdata_plugin.c b/src/plugins/gdata/gdata_plugin.c
index e623d96..d7ded2d 100644
--- a/src/plugins/gdata/gdata_plugin.c
+++ b/src/plugins/gdata/gdata_plugin.c
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/gdata/gdata_plugin.h b/src/plugins/gdata/gdata_plugin.h
index eb9c363..ba508a2 100644
--- a/src/plugins/gdata/gdata_plugin.h
+++ b/src/plugins/gdata/gdata_plugin.h
@@ -1,4 +1,4 @@
-/* GData plugin for Claws-Mail
+/* GData plugin for Claws Mail
* Copyright (C) 2011 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_banner.h b/src/plugins/notification/notification_banner.h
index e529686..55ab7f6 100644
--- a/src/plugins/notification/notification_banner.h
+++ b/src/plugins/notification/notification_banner.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_command.c b/src/plugins/notification/notification_command.c
index ac4bfb8..c7a1806 100644
--- a/src/plugins/notification/notification_command.c
+++ b/src/plugins/notification/notification_command.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_command.h b/src/plugins/notification/notification_command.h
index 9656f18..8b62566 100644
--- a/src/plugins/notification/notification_command.h
+++ b/src/plugins/notification/notification_command.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index 967f67f..c585b2c 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_core.h b/src/plugins/notification/notification_core.h
index b1ed955..d3efc16 100644
--- a/src/plugins/notification/notification_core.h
+++ b/src/plugins/notification/notification_core.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index 43e22c9..f53537d 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -1,5 +1,5 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_foldercheck.h b/src/plugins/notification/notification_foldercheck.h
index 0da6313..361663e 100644
--- a/src/plugins/notification/notification_foldercheck.h
+++ b/src/plugins/notification/notification_foldercheck.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_hotkeys.c b/src/plugins/notification/notification_hotkeys.c
index 0674666..f2d51f0 100644
--- a/src/plugins/notification/notification_hotkeys.c
+++ b/src/plugins/notification/notification_hotkeys.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_hotkeys.h b/src/plugins/notification/notification_hotkeys.h
index 54c4e96..5a75e5b 100644
--- a/src/plugins/notification/notification_hotkeys.h
+++ b/src/plugins/notification/notification_hotkeys.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_indicator.c b/src/plugins/notification/notification_indicator.c
index 083ff54..920a768 100644
--- a/src/plugins/notification/notification_indicator.c
+++ b/src/plugins/notification/notification_indicator.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_indicator.h b/src/plugins/notification/notification_indicator.h
index bc1be5e..95360c0 100644
--- a/src/plugins/notification/notification_indicator.h
+++ b/src/plugins/notification/notification_indicator.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2009 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_lcdproc.c b/src/plugins/notification/notification_lcdproc.c
index 491045f..874caa7 100644
--- a/src/plugins/notification/notification_lcdproc.c
+++ b/src/plugins/notification/notification_lcdproc.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_lcdproc.h b/src/plugins/notification/notification_lcdproc.h
index e8371e7..71f753a 100644
--- a/src/plugins/notification/notification_lcdproc.h
+++ b/src/plugins/notification/notification_lcdproc.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_pixbuf.c b/src/plugins/notification/notification_pixbuf.c
index 23448fb..f50d3d1 100644
--- a/src/plugins/notification/notification_pixbuf.c
+++ b/src/plugins/notification/notification_pixbuf.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_pixbuf.h b/src/plugins/notification/notification_pixbuf.h
index 25392b3..a18ac72 100644
--- a/src/plugins/notification/notification_pixbuf.h
+++ b/src/plugins/notification/notification_pixbuf.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_plugin.c b/src/plugins/notification/notification_plugin.c
index 2798e3a..18671d6 100644
--- a/src/plugins/notification/notification_plugin.c
+++ b/src/plugins/notification/notification_plugin.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_plugin.h b/src/plugins/notification/notification_plugin.h
index eef161c..9b42e2c 100644
--- a/src/plugins/notification/notification_plugin.h
+++ b/src/plugins/notification/notification_plugin.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index 9a7dde8..35ca9a6 100644
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_popup.h b/src/plugins/notification/notification_popup.h
index c4317f6..449e98c 100644
--- a/src/plugins/notification/notification_popup.h
+++ b/src/plugins/notification/notification_popup.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_prefs.h b/src/plugins/notification/notification_prefs.h
index 5f8189c..2234de0 100644
--- a/src/plugins/notification/notification_prefs.h
+++ b/src/plugins/notification/notification_prefs.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index e93c7ad..ee7689d 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
*/
/* This module is of course inspired by the trayicon plugin which is
- * shipped with Claws-Mail, copyrighted by the Claws-Mail Team. */
+ * shipped with Claws Mail, copyrighted by the Claws Mail Team. */
#ifdef HAVE_CONFIG_H
# include "config.h"
diff --git a/src/plugins/notification/notification_trayicon.h b/src/plugins/notification/notification_trayicon.h
index b72609d..65c2731 100644
--- a/src/plugins/notification/notification_trayicon.h
+++ b/src/plugins/notification/notification_trayicon.h
@@ -1,4 +1,4 @@
-/* Notification plugin for Claws-Mail
+/* Notification plugin for Claws Mail
* Copyright (C) 2005-2007 Holger Berndt and the Claws Mail Team.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index d861b69..05a139e 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -90,7 +90,7 @@ static void pdf_viewer_show_controls(PdfViewer *viewer, gboolean show);
static gboolean pdf_viewer_scroll_page(MimeViewer *_viewer, gboolean up);
static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up);
-/** Claws-Mail Plugin functions*/
+/** Claws Mail Plugin functions */
gint plugin_init(gchar **error);
const gchar *plugin_name(void);
const gchar *plugin_desc(void);
diff --git a/src/plugins/perl/perl_gtk.c b/src/plugins/perl/perl_gtk.c
index f69feb9..ae60465 100644
--- a/src/plugins/perl/perl_gtk.c
+++ b/src/plugins/perl/perl_gtk.c
@@ -2,7 +2,7 @@
*
* Copyright (C) 2004-2007 Holger Berndt
*
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
* Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_gtk.h b/src/plugins/perl/perl_gtk.h
index 75fae32..f570208 100644
--- a/src/plugins/perl/perl_gtk.h
+++ b/src/plugins/perl/perl_gtk.h
@@ -2,7 +2,7 @@
*
* Copyright (C) 2004-2007 Holger Berndt
*
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
* Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index 9c69566..afeb83c 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -2,7 +2,7 @@
*
* Copyright (C) 2004-2007 Holger Berndt
*
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
* Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/perl/perl_plugin.h b/src/plugins/perl/perl_plugin.h
index f2d6a9f..d461a1a 100644
--- a/src/plugins/perl/perl_plugin.h
+++ b/src/plugins/perl/perl_plugin.h
@@ -2,7 +2,7 @@
*
* Copyright (C) 2004-2007 Holger Berndt
*
- * Sylpheed and Claws-Mail are GTK+ based, lightweight, and fast e-mail clients
+ * Sylpheed and Claws Mail are GTK+ based, lightweight, and fast e-mail clients
* Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/accounttype.c b/src/plugins/python/accounttype.c
index 63588c2..c86a6c3 100644
--- a/src/plugins/python/accounttype.c
+++ b/src/plugins/python/accounttype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/accounttype.h b/src/plugins/python/accounttype.h
index 07328d6..15c6bbd 100644
--- a/src/plugins/python/accounttype.h
+++ b/src/plugins/python/accounttype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/clawsmailmodule.c b/src/plugins/python/clawsmailmodule.c
index d86ae72..e6eddeb 100644
--- a/src/plugins/python/clawsmailmodule.c
+++ b/src/plugins/python/clawsmailmodule.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009-2012 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/clawsmailmodule.h b/src/plugins/python/clawsmailmodule.h
index 1f1056f..371a3c4 100644
--- a/src/plugins/python/clawsmailmodule.h
+++ b/src/plugins/python/clawsmailmodule.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/composewindowtype.c b/src/plugins/python/composewindowtype.c
index 822cc7f..b7c3311 100644
--- a/src/plugins/python/composewindowtype.c
+++ b/src/plugins/python/composewindowtype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/composewindowtype.h b/src/plugins/python/composewindowtype.h
index 14ddc26..4e1020e 100644
--- a/src/plugins/python/composewindowtype.h
+++ b/src/plugins/python/composewindowtype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/folderpropertiestype.c b/src/plugins/python/folderpropertiestype.c
index c5fcd30..0c43e9a 100644
--- a/src/plugins/python/folderpropertiestype.c
+++ b/src/plugins/python/folderpropertiestype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/folderpropertiestype.h b/src/plugins/python/folderpropertiestype.h
index 752f082..1b5973e 100644
--- a/src/plugins/python/folderpropertiestype.h
+++ b/src/plugins/python/folderpropertiestype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index ae27f8f..6bb0b9e 100644
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/foldertype.h b/src/plugins/python/foldertype.h
index aa27a5a..bfc1b11 100644
--- a/src/plugins/python/foldertype.h
+++ b/src/plugins/python/foldertype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/mailboxtype.c b/src/plugins/python/mailboxtype.c
index aa4be0e..becfe64 100644
--- a/src/plugins/python/mailboxtype.c
+++ b/src/plugins/python/mailboxtype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/mailboxtype.h b/src/plugins/python/mailboxtype.h
index 58c49d6..1def4b5 100644
--- a/src/plugins/python/mailboxtype.h
+++ b/src/plugins/python/mailboxtype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2013 Holger Berndt <hb at claws-mail.org>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/messageinfotype.c b/src/plugins/python/messageinfotype.c
index 62794af..da58934 100644
--- a/src/plugins/python/messageinfotype.c
+++ b/src/plugins/python/messageinfotype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009-2014 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/messageinfotype.h b/src/plugins/python/messageinfotype.h
index 301275a..9ccdb64 100644
--- a/src/plugins/python/messageinfotype.h
+++ b/src/plugins/python/messageinfotype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/nodetype.c b/src/plugins/python/nodetype.c
index 70f4978..1632e27 100644
--- a/src/plugins/python/nodetype.c
+++ b/src/plugins/python/nodetype.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/nodetype.h b/src/plugins/python/nodetype.h
index 735ef58..29d1244 100644
--- a/src/plugins/python/nodetype.h
+++ b/src/plugins/python/nodetype.h
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index 14646f1..dac6298 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -1,4 +1,4 @@
-/* Python plugin for Claws-Mail
+/* Python plugin for Claws Mail
* Copyright (C) 2009 Holger Berndt
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index 6bde580..dfc7c90 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* This file (C) 2008 Andrej Kacian <andrej at kacian.sk>
*
* - Export feed list to OPML
diff --git a/src/plugins/rssyl/opml_import.c b/src/plugins/rssyl/opml_import.c
index 1c37909..7544c5f 100644
--- a/src/plugins/rssyl/opml_import.c
+++ b/src/plugins/rssyl/opml_import.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index e45c9c9..b153936 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/plugin.c b/src/plugins/rssyl/plugin.c
index 3dd6436..5b82343 100644
--- a/src/plugins/rssyl/plugin.c
+++ b/src/plugins/rssyl/plugin.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index c400e96..c98590e 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index 922ad4e..25ce836 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 5874326..79e70ea 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index 4da0f83..497ed34 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_gtk.c b/src/plugins/rssyl/rssyl_gtk.c
index 7ed6692..1fd4ecf 100644
--- a/src/plugins/rssyl/rssyl_gtk.c
+++ b/src/plugins/rssyl/rssyl_gtk.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_parse_feed.c b/src/plugins/rssyl/rssyl_parse_feed.c
index 237a2fe..265001b 100644
--- a/src/plugins/rssyl/rssyl_parse_feed.c
+++ b/src/plugins/rssyl/rssyl_parse_feed.c
@@ -203,7 +203,7 @@ gboolean rssyl_parse_feed(RFolderItem *ritem, Feed *feed)
rssyl_folder_read_existing(ritem);
if( claws_is_exiting() ) {
- debug_print("RSSyl: Claws-Mail is exiting, bailing out\n");
+ debug_print("RSSyl: Claws Mail is exiting, bailing out\n");
log_print(LOG_PROTOCOL, RSSYL_LOG_ABORTED_EXITING, ritem->url);
folder_item_update_thaw();
return TRUE;
diff --git a/src/plugins/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index a5a0024..1af78c5 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 04dc977..72fe502 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
* This file (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 7ef6098..eb15b75 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail-- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2005 Andrej Kacian <andrej at kacian.sk>
*
* - a strreplace function (something like sed's s/foo/bar/g)
diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 76f73b9..eb7cf94 100644
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -1,5 +1,5 @@
/*
- * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2004-2017 Hiroyuki Yamamoto & The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/procmsg.h b/src/procmsg.h
index d1cb479..1dda93d 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -81,7 +81,7 @@
#define MSG_RETRCPT_GOT (1U << 17) /* got return receipt */
/* RESERVED */
-#define MSG_RESERVED_CLAWS (1U << 30) /* for claws-mail */
+#define MSG_RESERVED_CLAWS (1U << 30) /* for Claws Mail */
#define MSG_RESERVED (1U << 31)
#define MSG_MOVE (1U << 0)
commit 332c8f05291c1d556900ae7cc91465eb7a59621e
Author: wwp <wwp at free.fr>
Date: Thu Aug 16 08:37:13 2018 +0200
Sucesfuly fix typos in LDAP log prints.
diff --git a/src/ldaputil.c b/src/ldaputil.c
index 983e970..13070dd 100644
--- a/src/ldaputil.c
+++ b/src/ldaputil.c
@@ -78,7 +78,7 @@ static GList *ldaputil_test_v3( LDAP *ld, gint tov, gint *errcode ) {
attribs, 0, NULL, NULL, &timeout, 0, &result );
if( rc == LDAP_SUCCESS ) {
- log_print(LOG_PROTOCOL, _("LDAP (search): succesful\n"));
+ log_print(LOG_PROTOCOL, _("LDAP (search): successful\n"));
/* Process entries */
for( e = ldap_first_entry( ld, result );
e != NULL;
@@ -153,7 +153,7 @@ static GList *ldaputil_test_v2( LDAP *ld, gint tov ) {
attribs, 0, NULL, NULL, &timeout, 0, &result );
if( rc == LDAP_SUCCESS ) {
- log_print(LOG_PROTOCOL, _("LDAP (search): succesful\n"));
+ log_print(LOG_PROTOCOL, _("LDAP (search): successful\n"));
/* Process entries */
for( e = ldap_first_entry( ld, result );
e != NULL;
commit 0f02917ab4d3f5609f198c003273b9b0eb4b37a9
Author: Paul <paul at claws-mail.org>
Date: Wed Aug 15 18:41:58 2018 +0100
for release 3.17.0
diff --git a/NEWS b/NEWS
index 72cdba8..05ff6b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,143 @@
Changes of the Claws Mail GTK2 branch
+* 3.17.0
+--------
+
+* the minimum GLib requirement is now 2.28.
+
+* the mimimum GTK+2 requirement is now 2.24.
+
+* nettle is now required, following removal of libcrypt from glibc.
+
+* explicit use of --disable-gnutls is now required if gnuTLS support
+ is not required.
+
+* SOCKS proxy support has been added.
+ Global settings can be found on the Mail Handling/Proxy page.
+ This can be overridden by Account settings on the new Proxy page.
+
+* Accounts can now have their own auto-check intervals, or follow the
+ global interval.
+
+* in the options for 'default selection when entering a folder',
+ 'first [...]' has been renamed to 'oldest [...]', and
+ 'newest [...]' items have been added.
+
+* Message List: when changing sort key by clicking column header,
+ the sort direction is now preserved
+
+* Message View: keypress handling for scrolling, (PgUp/Down, Space,
+ Backspace), has been improved.
+
+* the Network Log now displays output from LDAP operations.
+
+* "Go to last error" has been added to the Log Window context menu.
+
+* Filtering/Processing: "mark_as_spam" is no longer a final action,
+ since it does not move the marked message.
+
+* Filtering/Processing: Resent-From and Resent-To have been added in
+ Any/All header(s) (in Address Book) matcher rules.
+
+* when a Return-Receipt request is received by an unknown address,
+ the user is now required to choose which Account to send it from.
+
+* Colour Labels: confirmation is asked for when clearing or
+ overriding existing colour labels.
+
+* Address Book: basic contact merging has been added.
+
+* NetworkManager support: ported from libnm-util/libnm-glib to libnm.
+
+* Dillo plugin: this HTML rendering plugin is now once again
+ available.
+
+* RSSyl plugin: the modified time is no longer considered when
+ matching deleted items.
+
+* RSSyl plugin: Handle 404 and other fetch failures better.
+
+* Attachment Remover plugin: the user is now notified about what has
+ been done when processing multiple selections.
+
+* SpamAssassin plugin: added support for compression (the server must
+ have compression enabled, and the local spamc too).
+
+* SpamAssassin plugin: disabled SSLv3.
+
+* when using the hidden preference, hide_timezone, the time in the
+ Date header is converted to UTC.
+
+* various other UI improvements.
+
+* many behind-the-scenes improvements.
+
+* updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+ Dutch, Finnish, French, German, Hungarian, Norwegian Bokmål,
+ Romanian, Russian, Slovak, Spanish, Swedish, Traditional
+ Chinese, Turkish.
+
+* bug fixes:
+ o bug 3754, 'interactive auth dialogs pops endlessly'
+ o bug 3919, 'manual filtering does not move spam'
+ o bug 3936, 'LDAP StartTLS does not work for addressbooks'
+ o bug 3947, 'Build break with --disable-libsm
+ --enable-crash-dialog'
+ o bug 3957, 'Claws-Mail 64bit crashes when saving a draft'
+ o bug 3960, 'Sends unencrypted emails when encryption fails'
+ o bug 3971, 'Deleted rss feed item reappears as unread on
+ feed refreshing'
+ o bug 3973, ''select all' in summaryview does not
+ automatically focus the summaryview'
+ o bug 3978, '"From" column displays both name and email
+ address for Outbox'
+ o bug 3984, 'Copy-paste in find/filter field works
+ incorrectly'
+ o bug 3985, 'an empty progress bar remains after POP mail
+ check completes'
+ o bug 3986, 'IMAP quick search using non-ASCII characters
+ creates an infinite loop'
+ o bug 3993, 'Claws Mail connects to IMAP server when it
+ should not'
+ o bug 4014, '"Work offline" doesn't seem to affect RSS'
+ o bug 4022, 'Closing "Account Preferences" window opens "Edit
+ Accounts" window if "Edit Accounts" window has
+ been opened before at least once'
+ o bug 4023, 'Fix some small issues'
+ o bug 4033, 'Claws Mail crashes [malloc(): memory corruption]
+ while trying to save account password greater
+ than 136 chars'
+ o bug 4056, 'Impossible to disable overriding of offline
+ mode'
+ o bug 4058, '# in extended search description window should
+ not be translated'
+ o bug 4068, 'Claws Mail hangs when getting news from a
+ certain feed'
+ o actionsrc was not updated after mailbox name change
+ o two crashes caused by bad GtkListStore management in
+ editaddress.c
+ o wrong malloc of clamd_socket struct, (CID 1220477)
+ o vCalendar: possible access to uninitilized folder pointer
+ (CID 1402515)
+ o vCalendar: mismatch and unneeded display of unavailable
+ folder class in warning (CID 1434197)
+ o vCalendar: Skip whitespace chars at the beginning of ics
+ stream
+ o buffer overrun, always writing at buffer size + 1. (CID
+ 1434188)
+ o wrong use of pointer-to-array as an array CID 1434191)
+ o sensitivity of few preferences widgets of the SA plug-in
+ o compilation using --enable-generic-umpc
+ o crash in quicksearch keypress handling
+ o quoting in reply to format=flowed message
+ o HTML <hX> header handling
+ o 'sort_type' is lost when changing 'sort_key' from
+ /View/sort the bug was apparent with a descending sort
+ o Return-Receipts: MDN mail-accountname leak
+ o auth retry in Managesieve - wrong state variable was being
+ set
+ o memory leaks
+
* 3.16.0
--------
diff --git a/README b/README
index ed26f3b..153538b 100644
--- a/README
+++ b/README
@@ -660,6 +660,7 @@ http://www.thewildbeast.co.uk/claws-mail/bugzilla/index.cgi
GTK 2 Version
-------------
+2018-08-15 3.17.0
2017-12-17 3.16.0
2017-08-29 3.15.1
2017-03-26 3.15.0
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index df52b58..a976714 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-17th December 2017 Claws Mail 3.16.0
+15th August 2018 Claws Mail 3.17.0
CLAWS MAIL RELEASE NOTES
http://www.claws-mail.org
@@ -9,113 +9,143 @@ email client.
New in this release:
~~~~~~~~~~~~~~~~~~~~
-* Preferences: for the 'default selection on entering a folder' on
- the Display/Summaries page, the first new, first unread, and first
- marked message options are now sort-order aware.
-
-* Preferences: the previously hidden preference to 'Warn when sending
- to more recipients than []' has been added to the
- Mail Handling/Sending page.
-
-* Preferences: Toolbars/Compose window: Sign/Encrypt toggle buttons
- can been added to the toolbar.
-
-* Preferences: Fancy Plugin: allow stylesheet file/folder names to
- have spaces in them.
-
-* Account Preferences: a 'Show password' checkbox has been added next
- to the password fields.
-
-* Account Preferences: the OpenPGP and S/MIME preferences have been
- split into two separate pages.
-
-* Account Preferences: newline characters are disallowed in account
- usernames and passwords, and warnings are shown to the user if this
- is attempted.
-
-* Compose: more UTF-8 list-item characters have been added.
-
-* Address book: a 'Show password' checkbox has been added next to the
- LDAP server 'bind password' field.
-
-* GPG: full key/signature fingerprints are now shown instead of the
- short versions.
-
-* SSL Certificate Manager: added support for ipv6 addresses.
-
-* NNTP: Fetch XOVER and XHDR data in batches of 5000 and use the
- statusbar progress meter when opening/refreshing a NNTP folder.
-
-* CLI: the --insert option has been added to --compose, to allow
- inserting files from the command line.
-
-* Plugins window: keyboard shortcuts to Load/Unload buttons have
- been added.
-
-* PDF Viewer Plugin: a print button has been added.
-
-* The HTML parser now supports all entities.
-
-* Tools: a simple bash completion helper has been added,
- tools/bash_completion/claws-mail.
-
-* Updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
- Dutch, Finnish, French, German, Hungarian, Italian,
- Norwegian Bokmål, Russian, Slovak, Spanish, Swedish, Turkish.
-
-* New translations: Japanese, Polish, Romanian.
-
-* Bug fixes:
- o bug 3266, 'procmime.c: FILE leak in specific circumstances'
- o bug 3784, 'Very similar strings in src/gtk/about.c'
- o bug 3793, 'Segfaults when master passphrase dialog is
- launched in the middle of autocompletion'
- o bug 3795, 'Fix typo in utils.c'
- o bug 3796, 'Fix format-security warnings in alertpanel_ use'
- o bug 3797, 'Unfold quoting renders quotes completely
- confusing'
- o bug 3801, 'Broken auto wrapping'
- o bug 3808, 'vCalendar plugin does not load due to undefined
- symbol icaltime_from_timet'
- o bug 3813, '"mouse up" activates link even if "mouse down"
- occurred outside the link / cannot copy link
- text'
- o bug 3814, 'end of mouse drag or text selection erroneously
- activates links'
- o bug 3819, 'Duplicate definition of global pygtk symbols'
- o bug 3821, 'Potential security issue with libetpan code in
- mailmbox plugin'
- o bug 3916, 'message view shows wrong message contents'
- o bug 3843, 'Non-functional "Change to..." command in
- Spelling menu'
- o bug 3852, 'delete header entry button doesn't restore
- colour'
- o bug 3881, 'Hide Read Threads eats emails'
- o bug 3886, '"About to send mail to 2 recipients" warning
- when one of them is Reply-To'
- o bug 3892, 'build fails with enchant-2.1.0'
- o bug 3893, 'Text mode open/copy web links ignores trailing
- tilde(s)'
- o bug 3924, 'Fix configuration of sieve plugin on FreeBSD
- (segfaulted)'
- o bug 3931, 'segfault searching server with master password'
- o off-by-one error in textview's quote unfolding
- o Make sure outgoing messages have a trailing newline
- o 'add_to_addressbook' filtering action correctly add the
- name
- o improved handling of bad filenames get_serverport() in
- ssl_manager.c
- o building against older webkitgtk versions
- o crash in mailimf_group_parse() in mailmbox plugin
- o missing invalid regexp indication in folder preferences.
- o truncated input widgets in preferences window
- o ignore_thread not marking complete thread
- o buffer length handling in GnuTLS password encryption and
- decryption
- o many memory leaks
+* the minimum GLib requirement is now 2.28.
+
+* the mimimum GTK+2 requirement is now 2.24.
+
+* nettle is now required, following removal of libcrypt from glibc.
+
+* explicit use of --disable-gnutls is now required if gnuTLS support
+ is not required.
+
+* SOCKS proxy support has been added.
+ Global settings can be found on the Mail Handling/Proxy page.
+ This can be overridden by Account settings on the new Proxy page.
+
+* Accounts can now have their own auto-check intervals, or follow the
+ global interval.
+
+* in the options for 'default selection when entering a folder',
+ 'first [...]' has been renamed to 'oldest [...]', and
+ 'newest [...]' items have been added.
+
+* Message List: when changing sort key by clicking column header,
+ the sort direction is now preserved
+
+* Message View: keypress handling for scrolling, (PgUp/Down, Space,
+ Backspace), has been improved.
+
+* the Network Log now displays output from LDAP operations.
+
+* "Go to last error" has been added to the Log Window context menu.
+
+* Filtering/Processing: "mark_as_spam" is no longer a final action,
+ since it does not move the marked message.
+
+* Filtering/Processing: Resent-From and Resent-To have been added in
+ Any/All header(s) (in Address Book) matcher rules.
+
+* when a Return-Receipt request is received by an unknown address,
+ the user is now required to choose which Account to send it from.
+
+* Colour Labels: confirmation is asked for when clearing or
+ overriding existing colour labels.
+
+* Address Book: basic contact merging has been added.
+
+* NetworkManager support: ported from libnm-util/libnm-glib to libnm.
+
+* Dillo plugin: this HTML rendering plugin is now once again
+ available.
+
+* RSSyl plugin: the modified time is no longer considered when
+ matching deleted items.
+
+* RSSyl plugin: Handle 404 and other fetch failures better.
+
+* Attachment Remover plugin: the user is now notified about what has
+ been done when processing multiple selections.
+
+* SpamAssassin plugin: added support for compression (the server must
+ have compression enabled, and the local spamc too).
+
+* SpamAssassin plugin: disabled SSLv3.
+
+* when using the hidden preference, hide_timezone, the time in the
+ Date header is converted to UTC.
+
+* various other UI improvements.
+
+* many behind-the-scenes improvements.
+
+* updated translations: Brazilian Portuguese, Catalan, Czech, Danish,
+ Dutch, Finnish, French, German, Hungarian, Norwegian Bokmål,
+ Romanian, Russian, Slovak, Spanish, Swedish, Traditional
+ Chinese, Turkish.
+
+* bug fixes:
+ o bug 3754, 'interactive auth dialogs pops endlessly'
+ o bug 3919, 'manual filtering does not move spam'
+ o bug 3936, 'LDAP StartTLS does not work for addressbooks'
+ o bug 3947, 'Build break with --disable-libsm
+ --enable-crash-dialog'
+ o bug 3957, 'Claws-Mail 64bit crashes when saving a draft'
+ o bug 3960, 'Sends unencrypted emails when encryption fails'
+ o bug 3971, 'Deleted rss feed item reappears as unread on
+ feed refreshing'
+ o bug 3973, ''select all' in summaryview does not
+ automatically focus the summaryview'
+ o bug 3978, '"From" column displays both name and email
+ address for Outbox'
+ o bug 3984, 'Copy-paste in find/filter field works
+ incorrectly'
+ o bug 3985, 'an empty progress bar remains after POP mail
+ check completes'
+ o bug 3986, 'IMAP quick search using non-ASCII characters
+ creates an infinite loop'
+ o bug 3993, 'Claws Mail connects to IMAP server when it
+ should not'
+ o bug 4014, '"Work offline" doesn't seem to affect RSS'
+ o bug 4022, 'Closing "Account Preferences" window opens "Edit
+ Accounts" window if "Edit Accounts" window has
+ been opened before at least once'
+ o bug 4023, 'Fix some small issues'
+ o bug 4033, 'Claws Mail crashes [malloc(): memory corruption]
+ while trying to save account password greater
+ than 136 chars'
+ o bug 4056, 'Impossible to disable overriding of offline
+ mode'
+ o bug 4058, '# in extended search description window should
+ not be translated'
+ o bug 4068, 'Claws Mail hangs when getting news from a
+ certain feed'
+ o actionsrc was not updated after mailbox name change
+ o two crashes caused by bad GtkListStore management in
+ editaddress.c
+ o wrong malloc of clamd_socket struct, (CID 1220477)
+ o vCalendar: possible access to uninitilized folder pointer
+ (CID 1402515)
+ o vCalendar: mismatch and unneeded display of unavailable
+ folder class in warning (CID 1434197)
+ o vCalendar: Skip whitespace chars at the beginning of ics
+ stream
+ o buffer overrun, always writing at buffer size + 1. (CID
+ 1434188)
+ o wrong use of pointer-to-array as an array CID 1434191)
+ o sensitivity of few preferences widgets of the SA plug-in
+ o compilation using --enable-generic-umpc
+ o crash in quicksearch keypress handling
+ o quoting in reply to format=flowed message
+ o HTML <hX> header handling
+ o 'sort_type' is lost when changing 'sort_key' from
+ /View/sort the bug was apparent with a descending sort
+ o Return-Receipts: MDN mail-accountname leak
+ o auth retry in Managesieve - wrong state variable was being
+ set
+ o memory leaks
For further details of the numbered bugs and RFEs listed above
-see http://claws-mail.org/bug/[BUG NUMBER]
+see https://www.claws-mail.org/bug/[BUG NUMBER]
---------------------------------------------------------------------
See ChangeLog for full information regarding changes in this release.
commit 5c2f8b69dc423417edabd1b42027a4af0b64e525
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Aug 15 00:53:29 2018 +0200
Update list of TLDs for release
diff --git a/src/common/tlds.h b/src/common/tlds.h
index 8f80742..e42a7b2 100644
--- a/src/common/tlds.h
+++ b/src/common/tlds.h
@@ -6,7 +6,7 @@
#define __TLDS_H__
static const gchar *toplvl_domains [] = {
- /* Version 2017121600, Last Updated Sat Dec 16 07:07:01 2017 UTC */
+ /* Version 2018081400, Last Updated Tue Aug 14 07:07:01 2018 UTC */
"aaa",
"aarp",
"abarth",
@@ -173,7 +173,6 @@ static const gchar *toplvl_domains [] = {
"boo",
"book",
"booking",
- "boots",
"bosch",
"bostik",
"boston",
@@ -248,6 +247,7 @@ static const gchar *toplvl_domains [] = {
"ch",
"chanel",
"channel",
+ "charity",
"chase",
"chat",
"cheap",
@@ -622,6 +622,7 @@ static const gchar *toplvl_domains [] = {
"immo",
"immobilien",
"in",
+ "inc",
"industries",
"infiniti",
"info",
@@ -649,7 +650,6 @@ static const gchar *toplvl_domains [] = {
"itau",
"itv",
"iveco",
- "iwc",
"jaguar",
"java",
"jcb",
@@ -752,6 +752,7 @@ static const gchar *toplvl_domains [] = {
"living",
"lixil",
"lk",
+ "llc",
"loan",
"loans",
"locker",
@@ -806,7 +807,6 @@ static const gchar *toplvl_domains [] = {
"memorial",
"men",
"menu",
- "meo",
"merckmsd",
"metlife",
"mg",
@@ -1081,7 +1081,6 @@ static const gchar *toplvl_domains [] = {
"sandvikcoromant",
"sanofi",
"sap",
- "sapo",
"sarl",
"sas",
"save",
@@ -1164,6 +1163,7 @@ static const gchar *toplvl_domains [] = {
"soy",
"space",
"spiegel",
+ "sport",
"spot",
"spreadbetting",
"sr",
@@ -1373,7 +1373,6 @@ static const gchar *toplvl_domains [] = {
"xfinity",
"xihuan",
"xin",
- "xperia",
"xxx",
"xyz",
"yachts",
@@ -1407,7 +1406,6 @@ static const gchar *toplvl_domains [] = {
"lib",
/* Name.Space */
"books",
- "inc",
"music",
"union",
/* OpenNIC */
commit 6365753f0328412d1b0f68d9b9a3b1430bd319b7
Author: Ricardo Mones <ricardo at mones.org>
Date: Wed Aug 15 00:50:57 2018 +0200
Some fixes to Spanish translation
diff --git a/po/es.po b/po/es.po
index 88a35e4..de98366d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10172,7 +10172,7 @@ msgstr "Descargar enlace"
#: src/plugins/fancy/fancy_viewer.c:811
msgid "Save Image As"
-msgstr "Descargar imagen como"
+msgstr "Guardar imagen como"
#: src/plugins/fancy/fancy_viewer.c:821
msgid "Copy Image"
@@ -10954,7 +10954,7 @@ msgstr "Puerto del servidor"
#: src/plugins/managesieve/sieve_prefs.c:183
msgid "Connect to this port instead of the default"
-msgstr "Conectar a este puerto en lugar de al predeterminado"
+msgstr "Conectar a este puerto en lugar del predeterminado"
#: src/plugins/managesieve/sieve_prefs.c:187
msgid "Encryption"
@@ -14722,7 +14722,7 @@ msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
#: src/prefs_account.c:2494
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr ""
-"Cifrar los mensajes enviados con la clave propia además de las del "
+"Cifrar los mensajes enviados con la clave propia además de la del "
"destinatario"
#: src/prefs_account.c:2496
@@ -14788,7 +14788,7 @@ msgctxt ""
"In account preferences, referring to whether or not use proxy settings from "
"common preferences"
msgid "Use default settings"
-msgstr "Usar configuración predeterminada"
+msgstr "Usar la configuración predeterminada"
#: src/prefs_account.c:2905
msgid "Use global proxy server settings"
@@ -15914,7 +15914,7 @@ msgstr "Eliminar cuerpos de mensaje antiguos"
#: src/prefs_folder_item.c:589
msgid "Discard folder cache"
-msgstr "Descartar la caché de carpeta"
+msgstr "Descartar la caché de la carpeta"
#: src/prefs_folder_item.c:894
msgid "Request Return Receipt"
commit 4fded1ba83f66b3490eaf6ba8d8ead0b0d01d541
Author: wwp <wwp at free.fr>
Date: Wed Aug 15 00:02:00 2018 +0200
French translation: last fixes and updates.
diff --git a/po/fr.po b/po/fr.po
index f107874..3a51df9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 17:55+0100\n"
+"PO-Revision-Date: 2018-08-14 23:56+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -2063,7 +2063,7 @@ msgid ""
msgstr ""
"Impossible de mettre le message en file d'attente d'envoi :\n"
"\n"
-"Sa signature a échoué : %s"
+"Le chiffrement a échoué : %s"
#: src/compose.c:5230
msgid ""
@@ -3266,8 +3266,8 @@ msgid ""
"to:\n"
" uid=102376,ou=people,dc=claws-mail,dc=org"
msgstr ""
-"L'identificateur unique (ID) du carnet d'adresses est utilisé pour créer un "
-"nom absolu (DN) formaté comme suit :\n"
+"L'identifiant unique (ID) du carnet d'adresses est utilisé pour créer un nom "
+"absolu (DN) formaté comme suit :\n"
" uid=102376,ou=people,dc=claws-mail,dc=org"
#: src/expldifdlg.c:437
@@ -3314,7 +3314,7 @@ msgstr "DN relatif"
#: src/expldifdlg.c:515
msgid "Unique ID"
-msgstr "Identifiant unique"
+msgstr "Identifiant unique (ID)"
#: src/expldifdlg.c:523
msgid ""
@@ -5604,176 +5604,176 @@ msgstr "Erreur IMAP sur %s :"
#: src/imap.c:615
msgid "authenticated"
-msgstr " authentifié"
+msgstr "authentifié"
#: src/imap.c:618
msgid "not authenticated"
-msgstr " non authentifié"
+msgstr "non authentifié"
#: src/imap.c:621
msgid "bad state"
-msgstr " état incorrect"
+msgstr "état incorrect"
#: src/imap.c:624
msgid "stream error"
-msgstr " erreur de flux"
+msgstr "erreur de flux"
#: src/imap.c:627
msgid "parse error (very probably non-RFC compliance from the server)"
msgstr ""
-" erreur d'analyse (très probablement due au non-respect des RFC de la part "
-"du serveur)"
+"erreur d'analyse (très probablement due au non-respect des RFC de la part du "
+"serveur)"
#: src/imap.c:631
msgid "connection refused"
-msgstr " connexion refusée"
+msgstr "connexion refusée"
#: src/imap.c:634
msgid "memory error"
-msgstr " erreur de mémoire"
+msgstr "erreur de mémoire"
#: src/imap.c:637
msgid "fatal error"
-msgstr " erreur fatale"
+msgstr "erreur fatale"
#: src/imap.c:640
msgid "protocol error (very probably non-RFC compliance from the server)"
msgstr ""
-" erreur de protocole (très probablement due au non-respect des RFC de la "
-"part du serveur)"
+"erreur de protocole (très probablement due au non-respect des RFC de la part "
+"du serveur)"
#: src/imap.c:644
msgid "connection not accepted"
-msgstr " connexion non acceptée"
+msgstr "connexion non acceptée"
#: src/imap.c:647
msgid "APPEND error"
-msgstr " erreur de la commande « APPEND »"
+msgstr "erreur de la commande « APPEND »"
#: src/imap.c:650
msgid "NOOP error"
-msgstr " erreur NOOP"
+msgstr "erreur NOOP"
#: src/imap.c:653
msgid "LOGOUT error"
-msgstr " erreur de la commande « LOGOUT »"
+msgstr "erreur de la commande « LOGOUT »"
#: src/imap.c:656
msgid "CAPABILITY error"
-msgstr " erreur de la commande « CAPABILITY »"
+msgstr "erreur de la commande « CAPABILITY »"
#: src/imap.c:659
msgid "CHECK error"
-msgstr " erreur de la commande « CHECK »"
+msgstr "erreur de la commande « CHECK »"
#: src/imap.c:662
msgid "CLOSE error"
-msgstr " erreur de la commande « CLOSE »"
+msgstr "erreur de la commande « CLOSE »"
#: src/imap.c:665
msgid "EXPUNGE error"
-msgstr " erreur de la commande « EXPUNGE »"
+msgstr "erreur de la commande « EXPUNGE »"
#: src/imap.c:668
msgid "COPY error"
-msgstr " erreur de la commande « COPY »"
+msgstr "erreur de la commande « COPY »"
#: src/imap.c:671
msgid "UID COPY error"
-msgstr " erreur de la commande « UID COPY »"
+msgstr "erreur de la commande « UID COPY »"
#: src/imap.c:674
msgid "CREATE error"
-msgstr " erreur de la commande « CREATE »"
+msgstr "erreur de la commande « CREATE »"
#: src/imap.c:677
msgid "DELETE error"
-msgstr " erreur de la commande « DELETE »"
+msgstr "erreur de la commande « DELETE »"
#: src/imap.c:680
msgid "EXAMINE error"
-msgstr " erreur de la commande « EXAMINE »"
+msgstr "erreur de la commande « EXAMINE »"
#: src/imap.c:683
msgid "FETCH error"
-msgstr " erreur de la commande « FETCH »"
+msgstr "erreur de la commande « FETCH »"
#: src/imap.c:686
msgid "UID FETCH error"
-msgstr " erreur de la commande « UID FETCH »"
+msgstr "erreur de la commande « UID FETCH »"
#: src/imap.c:689
msgid "LIST error"
-msgstr " erreur de la commande « LIST »"
+msgstr "erreur de la commande « LIST »"
#: src/imap.c:692
msgid "LOGIN error"
-msgstr " erreur de la commande « LOGIN »"
+msgstr "erreur de la commande « LOGIN »"
#: src/imap.c:695
msgid "LSUB error"
-msgstr " erreur de la commande « LSUB »"
+msgstr "erreur de la commande « LSUB »"
#: src/imap.c:698
msgid "RENAME error"
-msgstr " erreur de la commande « RENAME »"
+msgstr "erreur de la commande « RENAME »"
#: src/imap.c:701
msgid "SEARCH error"
-msgstr " erreur de la commande « SEARCH »"
+msgstr "erreur de la commande « SEARCH »"
#: src/imap.c:704
msgid "UID SEARCH error"
-msgstr " erreur de la commande « UID SEARCH »"
+msgstr "erreur de la commande « UID SEARCH »"
#: src/imap.c:707
msgid "SELECT error"
-msgstr " erreur de la commande « SELECT »"
+msgstr "erreur de la commande « SELECT »"
#: src/imap.c:710
msgid "STATUS error"
-msgstr " erreur de la commande « STATUS »"
+msgstr "erreur de la commande « STATUS »"
#: src/imap.c:713
msgid "STORE error"
-msgstr " erreur de la commande « STORE »"
+msgstr "erreur de la commande « STORE »"
#: src/imap.c:716
msgid "UID STORE error"
-msgstr " erreur de la commande « UID STORE »"
+msgstr "erreur de la commande « UID STORE »"
#: src/imap.c:719
msgid "SUBSCRIBE error"
-msgstr " erreur de la commande « SUBSCRIBE »"
+msgstr "erreur de la commande « SUBSCRIBE »"
#: src/imap.c:722
msgid "UNSUBSCRIBE error"
-msgstr " erreur de la commande « UNSUBSCRIBE »"
+msgstr "erreur de la commande « UNSUBSCRIBE »"
#: src/imap.c:725
msgid "STARTTLS error"
-msgstr " erreur de la commande « STARTTLS »"
+msgstr "erreur de la commande « STARTTLS »"
#: src/imap.c:728
msgid "INVAL error"
-msgstr " erreur de la commande « INVAL »"
+msgstr "erreur de la commande « INVAL »"
#: src/imap.c:731
msgid "EXTENSION error"
-msgstr " erreur de la commande « EXTENSION »"
+msgstr "erreur de la commande « EXTENSION »"
#: src/imap.c:734
msgid "SASL error"
-msgstr " erreur SASL"
+msgstr "erreur SASL"
#: src/imap.c:738
msgid "SSL/TLS error"
-msgstr "Erreur SSL/TLS"
+msgstr "erreur SSL/TLS"
#: src/imap.c:742
#, c-format
msgid "Unknown error [%d]"
-msgstr " Erreur inconnue [%d]"
+msgstr "Erreur inconnue [%d]"
#: src/imap.c:946
msgid ""
@@ -6658,7 +6658,7 @@ msgstr "LDAP erreur (renommage) : de '%s' vers '%s' : %d (%s)\n"
#: src/ldaputil.c:81 src/ldaputil.c:156
msgid "LDAP (search): succesful\n"
-msgstr "LDAP (recherche) : succés\n"
+msgstr "LDAP (recherche) : succès\n"
#: src/ldaputil.c:112 src/ldaputil.c:200
#, c-format
@@ -11156,7 +11156,7 @@ msgstr "Automatique"
#: src/plugins/managesieve/sieve_prefs.c:390
msgid "Sieve server must not contain a space."
-msgstr "Le nom de serveur Sieve ne peut contenir d'espace."
+msgstr "Le nom de serveur Sieve ne doit pas contenir d'espace."
#: src/plugins/managesieve/sieve_prefs.c:396
msgid "Sieve server is not entered."
@@ -11868,7 +11868,7 @@ msgstr "Pivoter à droite"
#: src/plugins/pdf_viewer/poppler_viewer.c:1969
msgid "Print Document"
-msgstr "Imprimer le Document"
+msgstr "Imprimer le document"
#: src/plugins/pdf_viewer/poppler_viewer.c:1972
msgid "Document Info"
@@ -12136,7 +12136,7 @@ msgstr "Spécifier la clé manuellement"
#: src/plugins/pgpcore/prefs_gpg.c:398
msgid "User or key ID:"
-msgstr "Identifiant utilisateur·rice ou de clé :"
+msgstr "Identifiant d'utilisateur·rice ou de clé :"
#: src/plugins/pgpcore/prefs_gpg.c:442
msgid "No secret key found."
@@ -13519,7 +13519,7 @@ msgstr "Chemin du socket Unix"
#: src/plugins/spamassassin/spamassassin_gtk.c:364
msgid "Use compression"
-msgstr "Utiliser la compression"
+msgstr "Activer la compression"
#: src/plugins/spamassassin/spamassassin_gtk.c:368
msgid "Enable compression if spamd uses it, otherwise disable it."
@@ -14970,7 +14970,7 @@ msgstr "Utiliser l'authentification (SMTP AUTH)"
#: src/prefs_account.c:2947 src/prefs_proxy.c:123
msgid "Username"
-msgstr "Utilisateur"
+msgstr "Utilisateur·rice"
#: src/prefs_account.c:2981
msgid "Use proxy server for sending"
@@ -14982,7 +14982,7 @@ msgid ""
"outgoing server, bypassing any configured proxy server."
msgstr ""
"Si l'option est désactivée, les messages seront envoyés directement au "
-"serveur d'envoi, sans utiliser les paramètres de serveur mandataire"
+"serveur d'envoi, sans utiliser les paramètres de serveur mandataire."
#: src/prefs_account.c:3096
msgid "SMTP port"
@@ -15079,7 +15079,7 @@ msgstr "La commande externe d'envoi est non spécifiée."
#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur·rice ne doit pas contenir de caractère de retour à "
+"L'identifiant d'utilisateur·rice ne doit pas contenir de caractère de retour à "
"la ligne."
#: src/prefs_account.c:3350
@@ -15090,7 +15090,7 @@ msgstr ""
#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur·rice SMTP ne doit pas contenir de caractère de "
+"L'identifiant d'utilisateur·rice SMTP ne doit pas contenir de caractère de "
"retour à la ligne."
#: src/prefs_account.c:3383
commit d154a3365375aafa22340fef04b29c50a780712e
Author: Ricardo Mones <ricardo at mones.org>
Date: Tue Aug 14 18:32:04 2018 +0200
Update Spanish translation
diff --git a/po/es.po b/po/es.po
index b1f54c3..88a35e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,17 +1,17 @@
# Spanish translation of Claws Mail.
-# Copyright © 2000-2017 The Claws Mail team.
+# Copyright © 2000-2018 The Claws Mail team.
# This file is distributed under the same license
# as the Claws Mail package, see COPYING file.
#
-# Ricardo Mones <ricardo at mones.org>, 2000-2017.
+# Ricardo Mones <ricardo at mones.org>, 2000-2018.
# Carles Tubio Terrón <c at rles-tub.io>, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: Claws Mail 3.16.0\n"
+"Project-Id-Version: Claws Mail 3.17.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2017-12-12 12:25+0100\n"
-"PO-Revision-Date: 2017-12-12 12:57+0100\n"
+"POT-Creation-Date: 2018-08-08 07:59+0100\n"
+"PO-Revision-Date: 2018-08-14 18:28+0200\n"
"Last-Translator: Ricardo Mones <ricardo at mones.org>\n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: src/account.c:395 src/account.c:462
+#: src/account.c:401 src/account.c:468
msgid ""
"Some composing windows are open.\n"
"Please close all the composing windows before editing accounts."
@@ -28,15 +28,15 @@ msgstr ""
"Hay ventanas de composición abiertas.\n"
"Cierre todas las ventanas de composición antes de editar las cuentas."
-#: src/account.c:440
+#: src/account.c:446
msgid "Can't create folder."
msgstr "No se puede crear la carpeta."
-#: src/account.c:727
+#: src/account.c:734
msgid "Edit accounts"
msgstr "Editar cuentas"
-#: src/account.c:744
+#: src/account.c:751
msgid ""
"Using 'Get Mail' will retrieve messages from your Accounts in the order "
"given, the checkbox indicates which accounts will be included. Bold text "
@@ -46,60 +46,60 @@ msgstr ""
"orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
"indica la cuenta predeterminada."
-#: src/account.c:815
+#: src/account.c:822
msgid " _Set as default account "
msgstr " _Establecer como primaria "
-#: src/account.c:907
+#: src/account.c:914
msgid "Accounts with remote folders cannot be copied."
msgstr "Las cuentas con carpetas remotas no se pueden copiar."
-#: src/account.c:914
+#: src/account.c:921
#, c-format
msgid "Copy of %s"
msgstr "Copia de %s"
-#: src/account.c:1097
+#: src/account.c:1118
#, c-format
msgid "Do you really want to delete the account '%s'?"
msgstr "¿Realmente quiere borrar la cuenta «%s»?"
-#: src/account.c:1099
+#: src/account.c:1120
msgid "(Untitled)"
msgstr "(Sin título)"
-#: src/account.c:1100
+#: src/account.c:1121
msgid "Delete account"
msgstr "Borrar cuenta"
-#: src/account.c:1590
+#: src/account.c:1595
msgctxt "Accounts List Get Column Name"
msgid "G"
msgstr "R"
-#: src/account.c:1596
+#: src/account.c:1601
msgid "'Get Mail' retrieves mail from the checked accounts"
msgstr "«Recibir correo» recupera el correo de las cuentas marcadas"
-#: src/account.c:1603 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:126 src/compose.c:7452 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
-#: src/editaddress_other_attributes_ldap.c:302
-#: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
+#: src/account.c:1608 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/addressbook.c:127 src/compose.c:7413 src/editaddress.c:1472
+#: src/editaddress.c:1501 src/editaddress.c:1517
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1803
-#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1870 src/prefs_template.c:79
+#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:469
+#: src/plugins/pdf_viewer/poppler_viewer.c:1828
+#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
msgid "Name"
msgstr "Nombre"
-#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1616 src/prefs_account.c:1200 src/prefs_account.c:4622
msgid "Protocol"
msgstr "Protocolo"
-#: src/account.c:1619 src/ssl_manager.c:100
+#: src/account.c:1624 src/ssl_manager.c:100
msgid "Server"
msgstr "Servidor"
@@ -150,16 +150,17 @@ msgstr ""
"%s\n"
"%s"
-#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
+#: src/action.c:988 src/compose.c:5222 src/compose.c:5227 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:857
#: src/plugins/tnef_parse/tnef_parse.c:75
#: src/plugins/vcalendar/vcal_folder.c:1823
#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1840
-#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1845
+#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:62
msgid "Unknown error"
msgstr "Error desconocido"
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1206 src/action.c:1385
msgid "Completed"
msgstr "Completado"
@@ -173,11 +174,11 @@ msgstr "--- Ejecutando: %s\n"
msgid "--- Ended: %s\n"
msgstr "--- Finalizado: %s\n"
-#: src/action.c:1279
+#: src/action.c:1292
msgid "Action's input/output"
msgstr "Entrada/salida de la acción"
-#: src/action.c:1607
+#: src/action.c:1631
#, c-format
msgid ""
"Enter the argument for the following action:\n"
@@ -188,11 +189,11 @@ msgstr ""
"(«%%h» será sustituido con el parámetro)\n"
" %s"
-#: src/action.c:1612
+#: src/action.c:1636
msgid "Action's hidden user argument"
msgstr "Parámetro de usuario oculto para la acción"
-#: src/action.c:1616
+#: src/action.c:1640
#, c-format
msgid ""
"Enter the argument for the following action:\n"
@@ -203,7 +204,7 @@ msgstr ""
"(«%%u» será sustituido con el parámetro)\n"
" %s"
-#: src/action.c:1621
+#: src/action.c:1645
msgid "Action's user argument"
msgstr "Parámetro de usuario para la acción"
@@ -219,7 +220,7 @@ msgstr "No se puede copiar una agenda a si misma."
msgid "Cannot move a folder to itself or to its sub-structure."
msgstr "No se puede mover la carpeta a si misma o a su sub-estructura."
-#: src/addr_compl.c:689 src/addressbook.c:4965
+#: src/addr_compl.c:689 src/addressbook.c:5013
#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
msgid "Group"
msgstr "Grupo"
@@ -260,31 +261,31 @@ msgstr "fax"
msgid "website"
msgstr "página web"
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
msgid "Attribute name"
msgstr "Nombre del atributo"
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
msgid "Delete all attribute names"
msgstr "Borrar todos los nombres de atributo"
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
msgid "Do you really want to delete all attribute names?"
msgstr "¿Quiere borrar realmente todos los nombres de atributos?"
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
msgid "Delete attribute name"
msgstr "Borrar nombre de atributo"
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
msgid "Do you really want to delete this attribute name?"
msgstr "¿Quiere borrar realmente este nombre de atributo?"
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
msgid "Reset to default"
msgstr "Reiniciar valores"
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
msgid ""
"Do you really want to replace all attribute names\n"
"with the default set?"
@@ -292,36 +293,36 @@ msgstr ""
"¿Realmente quiere reemplazar todos los nombres de\n"
"atributos con los valores iniciales predeterminados?"
-#: src/addrcustomattr.c:212 src/addressbook.c:439 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:279
-#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1697 src/prefs_template.c:1110
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1312 src/prefs_actions.c:1084
+#: src/prefs_filtering.c:1699 src/prefs_template.c:1111
msgid "_Delete"
msgstr "_Borrar"
-#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1698 src/prefs_template.c:1111
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
msgid "Delete _all"
msgstr "_Borrar todo"
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
msgid "_Reset to default"
msgstr "_Reiniciar valores"
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
msgid "Attribute name is not set."
msgstr "No se estableció el nombre del atributo."
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
msgctxt "Dialog title"
msgid "Edit attribute names"
msgstr "Editar nombres de atributos"
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
msgid "New attribute name:"
msgstr "Nombre del nuevo atributo:"
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
msgid ""
"Adding or removing attribute names won't affect attributes already set for "
"contacts."
@@ -355,8 +356,8 @@ msgstr "No se encontraron direcciones de correo duplicadas en la agenda"
msgid "Duplicate email addresses"
msgstr "Direcciones de correo duplicadas"
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
+#: src/addrduplicates.c:442 src/addressadd.c:234
+#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
msgid "Address"
msgstr "Dirección"
@@ -364,185 +365,189 @@ msgstr "Dirección"
msgid "Address book path"
msgstr "Ruta a la agenda de direcciones"
-#: src/addrduplicates.c:793 src/addressbook.c:1440 src/addressbook.c:1493
+#: src/addrduplicates.c:790 src/addressbook.c:1442 src/addressbook.c:1495
msgid "Delete address(es)"
msgstr "Borrar dirección(es)"
-#: src/addrduplicates.c:794 src/addressbook.c:1494
+#: src/addrduplicates.c:791 src/addressbook.c:1496
msgid "Really delete the address(es)?"
msgstr "¿Borrar realmente la(s) dirección(es)?"
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:840
msgid "Delete address"
msgstr "Borrar dirección"
-#: src/addrduplicates.c:843 src/addressbook.c:1441
+#: src/addrduplicates.c:841 src/addressbook.c:1443
msgid "This address data is readonly and cannot be deleted."
msgstr "Esta dirección es solo de lectura y no se puede borrar."
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:201
msgid "Add to address book"
msgstr "Añadir a la agenda"
-#: src/addressadd.c:207
+#: src/addressadd.c:214
msgid "Contact"
msgstr "Contacto"
-#: src/addressadd.c:238 src/addressbook.c:128 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:245 src/addressbook.c:129 src/editaddress.c:1256
+#: src/editaddress.c:1300 src/editgroup.c:290
msgid "Remarks"
msgstr "Notas"
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:286 src/addressbook_foldersel.c:158
msgid "Select Address Book Folder"
msgstr "Seleccionar carpeta de la agenda"
-#: src/addressadd.c:534 src/addressbook.c:3215 src/addressbook.c:3266
+#: src/addressadd.c:596 src/addressbook.c:3261 src/addressbook.c:3312
msgid "Add address(es)"
msgstr "Añadir dirección(es)"
-#: src/addressadd.c:535
+#: src/addressadd.c:597
msgid "Can't add the specified address"
msgstr "No se puede añadir la dirección especificada"
-#: src/addressbook.c:127 src/addressbook.c:4953 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
+#: src/addressbook.c:128 src/addressbook.c:5001 src/editaddress.c:1245
+#: src/editaddress.c:1283 src/editgroup.c:289 src/expldifdlg.c:517
#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
msgid "Email Address"
msgstr "Dirección de correo"
-#: src/addressbook.c:406
+#: src/addressbook.c:404
msgid "_Book"
msgstr "_Agenda"
-#: src/addressbook.c:407 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:604 src/mainwindow.c:514
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:405 src/addressbook.c:436 src/addressbook.c:465
+#: src/addressbook.c:482 src/compose.c:604 src/mainwindow.c:515
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
msgid "_Edit"
msgstr "_Editar"
-#: src/addressbook.c:408 src/compose.c:609 src/mainwindow.c:517
-#: src/messageview.c:212
+#: src/addressbook.c:406 src/compose.c:609 src/mainwindow.c:518
+#: src/messageview.c:213
msgid "_Tools"
msgstr "_Herramientas"
-#: src/addressbook.c:409 src/compose.c:610 src/mainwindow.c:519
-#: src/messageview.c:213
+#: src/addressbook.c:407 src/compose.c:610 src/mainwindow.c:520
+#: src/messageview.c:214
msgid "_Help"
msgstr "_Ayuda"
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:468
msgid "New _Book"
msgstr "Nueva _agenda"
-#: src/addressbook.c:413 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:469
msgid "New _Folder"
msgstr "Nueva _carpeta"
-#: src/addressbook.c:414
+#: src/addressbook.c:412
msgid "New _vCard"
msgstr "Nueva _vCard"
-#: src/addressbook.c:418
+#: src/addressbook.c:416
msgid "New _JPilot"
msgstr "Nuevo _JPilot"
-#: src/addressbook.c:421
+#: src/addressbook.c:419
msgid "New LDAP _Server"
msgstr "Nuevo servidor LDAP"
-#: src/addressbook.c:425
+#: src/addressbook.c:423
msgid "_Edit book"
msgstr "_Editar agenda"
-#: src/addressbook.c:426
+#: src/addressbook.c:424
msgid "_Delete book"
msgstr "_Borrar agenda"
-#: src/addressbook.c:428 src/compose.c:621
+#: src/addressbook.c:426 src/compose.c:621
#: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
msgid "_Save"
msgstr "_Guardar..."
-#: src/addressbook.c:429 src/compose.c:625 src/messageview.c:222
+#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:223
#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
msgid "_Close"
msgstr "_Cerrar"
-#: src/addressbook.c:432 src/addressbook.c:481 src/messageview.c:226
+#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:227
msgid "_Select all"
msgstr "_Seleccionar todo"
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:472 src/addressbook.c:488
msgid "C_ut"
msgstr "C_ortar"
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:633 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/compose.c:633 src/mainwindow.c:549 src/messageview.c:226
#: src/plugins/managesieve/sieve_editor.c:96
msgid "_Copy"
msgstr "_Copiar"
-#: src/addressbook.c:436 src/addressbook.c:475 src/addressbook.c:491
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:97
msgid "_Paste"
msgstr "_Pegar"
-#: src/addressbook.c:441 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:485
msgid "New _Address"
msgstr "Nueva _dirección"
-#: src/addressbook.c:442 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:470 src/addressbook.c:486
msgid "New _Group"
msgstr "Nuevo _grupo"
-#: src/addressbook.c:444 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:492
msgid "_Mail To"
msgstr "_Correo para"
-#: src/addressbook.c:448
+#: src/addressbook.c:443 src/addressbook.c:496
+msgid "_Merge"
+msgstr "_Fusionar"
+
+#: src/addressbook.c:447
msgid "Import _LDIF file..."
msgstr "Importar fichero _LDIF..."
-#: src/addressbook.c:449
+#: src/addressbook.c:448
msgid "Import M_utt file..."
msgstr "Importar fichero M_utt..."
-#: src/addressbook.c:450
+#: src/addressbook.c:449
msgid "Import _Pine file..."
msgstr "Importar fichero _Pine..."
-#: src/addressbook.c:452
+#: src/addressbook.c:451
msgid "Export _HTML..."
msgstr "Exportar _HTML..."
-#: src/addressbook.c:453
+#: src/addressbook.c:452
msgid "Export LDI_F..."
msgstr "Exportar LDI_F..."
-#: src/addressbook.c:455
+#: src/addressbook.c:454
msgid "Find duplicates..."
msgstr "Buscar duplicados..."
-#: src/addressbook.c:456
+#: src/addressbook.c:455
msgid "Edit custom attributes..."
msgstr "Editar atributos de usuario..."
-#: src/addressbook.c:459 src/compose.c:711 src/mainwindow.c:813
-#: src/messageview.c:337
+#: src/addressbook.c:458 src/compose.c:711 src/mainwindow.c:814
+#: src/messageview.c:338
msgid "_About"
msgstr "_Acerca de"
-#: src/addressbook.c:495
+#: src/addressbook.c:494
msgid "_Browse Entry"
msgstr "_Ver entrada"
#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:253 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:143
+#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:403
#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
#: src/prefs_themes.c:851 src/prefs_themes.c:852
msgid "Unknown"
@@ -648,20 +653,20 @@ msgstr "Se necesita autenticación (más) fuerte"
msgid "Sources"
msgstr "Fuentes"
-#: src/addressbook.c:919 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2519
+#: src/addressbook.c:919 src/prefs_matcher.c:631 src/prefs_other.c:488
+#: src/toolbar.c:268 src/toolbar.c:2522
msgid "Address book"
msgstr "Agenda de direcciones"
-#: src/addressbook.c:1114 src/editldap.c:793
+#: src/addressbook.c:1115 src/editldap.c:793
msgid "Search"
msgstr "Buscar"
-#: src/addressbook.c:1485
+#: src/addressbook.c:1487
msgid "Delete group"
msgstr "Borrar grupo"
-#: src/addressbook.c:1486
+#: src/addressbook.c:1488
msgid ""
"Really delete the group(s)?\n"
"The addresses it contains will not be lost."
@@ -669,26 +674,26 @@ msgstr ""
"¿Quiere borrar el(los) grupo(s)?\n"
"Las direcciones que contienen no se perderán."
-#: src/addressbook.c:2194
+#: src/addressbook.c:2215
msgid "Cannot paste. Target address book is readonly."
msgstr "No puedo pegar. El libro de direcciones destino es solo de lectura."
-#: src/addressbook.c:2204
+#: src/addressbook.c:2225
msgid "Cannot paste into an address group."
msgstr "No se puede pegar dentro de un grupo de direcciones."
-#: src/addressbook.c:2912
+#: src/addressbook.c:2958
#, c-format
msgid "Do you want to delete the query results and addresses in '%s'?"
msgstr "¿Quiere borrar los resultados de la búsqueda y direcciones en «%s»?"
-#: src/addressbook.c:2915 src/addressbook.c:2941 src/addressbook.c:2948
+#: src/addressbook.c:2961 src/addressbook.c:2987 src/addressbook.c:2994
#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
#: src/toolbar.c:497
msgid "Delete"
msgstr "Borrar"
-#: src/addressbook.c:2924
+#: src/addressbook.c:2970
#, c-format
msgid ""
"Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -697,20 +702,20 @@ msgstr ""
"¿Quiere borrar «%s»? Si borra sólo la carpeta las direcciones que contenga "
"se moverán a la carpeta padre."
-#: src/addressbook.c:2927 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/addressbook.c:2973 src/imap_gtk.c:368 src/mh_gtk.c:206
#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
msgid "Delete folder"
msgstr "Borrar carpeta"
-#: src/addressbook.c:2928
+#: src/addressbook.c:2974
msgid "Delete _folder only"
msgstr "Borrar sólo _carpeta"
-#: src/addressbook.c:2928
+#: src/addressbook.c:2974
msgid "Delete folder and _addresses"
msgstr "Borrar carpeta y _direcciones"
-#: src/addressbook.c:2939
+#: src/addressbook.c:2985
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
@@ -719,7 +724,7 @@ msgstr ""
"¿Quiere borrar «%s»?\n"
"Las direcciones que contiene no se perderán."
-#: src/addressbook.c:2946
+#: src/addressbook.c:2992
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
@@ -728,28 +733,28 @@ msgstr ""
"¿Quiere borrar «%s»?\n"
"Las direcciones que contiene se perderán."
-#: src/addressbook.c:3060
+#: src/addressbook.c:3106
#, c-format
msgid "Search '%s'"
msgstr " Buscar «%s»"
-#: src/addressbook.c:3198 src/addressbook.c:3247
+#: src/addressbook.c:3244 src/addressbook.c:3293
msgid "New Contacts"
msgstr "Nuevos contactos"
-#: src/addressbook.c:4086
+#: src/addressbook.c:4132
msgid "New user, could not save index file."
msgstr "Nuevo usuario, no se puede guardar el fichero índice."
-#: src/addressbook.c:4090
+#: src/addressbook.c:4136
msgid "New user, could not save address book files."
msgstr "Nuevo usuario, no se pueden guardar los ficheros de direcciones"
-#: src/addressbook.c:4100
+#: src/addressbook.c:4146
msgid "Old address book converted successfully."
msgstr "Antigua agenda de direcciones convertida con éxito"
-#: src/addressbook.c:4105
+#: src/addressbook.c:4151
msgid ""
"Old address book converted,\n"
"could not save new address index file."
@@ -757,7 +762,7 @@ msgstr ""
"Antigua agenda de direcciones convertida,\n"
"no se puede guardar el nuevo fichero índice."
-#: src/addressbook.c:4118
+#: src/addressbook.c:4164
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -765,7 +770,7 @@ msgstr ""
"No se puede convertir la antigua agenda,\n"
"pero se crearon nuevos ficheros vacíos."
-#: src/addressbook.c:4124
+#: src/addressbook.c:4170
msgid ""
"Could not convert address book,\n"
"could not save new address index file."
@@ -773,7 +778,7 @@ msgstr ""
"No se puede convertir la antigua agenda,\n"
"no se pudo guardar el fichero índice para la nueva."
-#: src/addressbook.c:4129
+#: src/addressbook.c:4175
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -781,148 +786,131 @@ msgstr ""
"No se puede convertir la antigua agenda\n"
"y no se pudieron crear ficheros para la nueva."
-#: src/addressbook.c:4136 src/addressbook.c:4142
+#: src/addressbook.c:4182 src/addressbook.c:4188
msgid "Addressbook conversion error"
msgstr "Error en la conversión de la agenda"
-#: src/addressbook.c:4257
+#: src/addressbook.c:4303
msgid "Addressbook Error"
msgstr "Error en la agenda"
-#: src/addressbook.c:4258
+#: src/addressbook.c:4304
msgid "Could not read address index"
msgstr "No se puede leer el índice de direcciones"
-#: src/addressbook.c:4589
+#: src/addressbook.c:4635
msgid "Busy searching..."
msgstr "Buscando..."
-#: src/addressbook.c:4917 src/prefs_send.c:216
+#: src/addressbook.c:4965 src/prefs_send.c:220
msgid "Interface"
msgstr "Interfaz"
-#: src/addressbook.c:4929
+#: src/addressbook.c:4977
msgid "Address Books"
msgstr "Agendas de direcciones"
-#: src/addressbook.c:4941
+#: src/addressbook.c:4989
msgid "Person"
msgstr "Persona"
-#: src/addressbook.c:4977 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
+#: src/addressbook.c:5025 src/exporthtml.c:884 src/folderview.c:354
+#: src/folderview.c:442 src/prefs_account.c:3169 src/prefs_folder_column.c:77
msgid "Folder"
msgstr "Carpeta"
-#: src/addressbook.c:4989
+#: src/addressbook.c:5037
msgid "vCard"
msgstr "vCard"
-#: src/addressbook.c:5001 src/addressbook.c:5013
+#: src/addressbook.c:5049 src/addressbook.c:5061
msgid "JPilot"
msgstr "JPilot"
-#: src/addressbook.c:5025
+#: src/addressbook.c:5073
msgid "LDAP servers"
msgstr "Servidores LDAP"
-#: src/addressbook.c:5037
+#: src/addressbook.c:5085
msgid "LDAP Query"
msgstr "Petición LDAP"
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:984 src/importldif.c:541
msgid "Address Book"
msgstr "Agenda de direcciones"
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1621 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
-#: src/prefs_matcher.c:2526
-msgid "Any"
-msgstr "Cualquiera"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
msgid "Please specify name for address book."
msgstr "Especifique el nombre de la agenda por favor."
-#: src/addrgather.c:180
+#: src/addrgather.c:186
msgid "No available address book."
msgstr "No hay agendas disponibles."
-#: src/addrgather.c:201
+#: src/addrgather.c:207
msgid "Please select the mail headers to search."
msgstr "Seleccione las cabeceras a buscar por favor."
-#: src/addrgather.c:208
+#: src/addrgather.c:214
msgid "Collecting addresses..."
msgstr "Recopilando direcciones..."
-#: src/addrgather.c:248
+#: src/addrgather.c:254
msgid "address added by claws-mail"
msgstr "dirección añadida por claws-mail"
-#: src/addrgather.c:276
+#: src/addrgather.c:285
msgid "Addresses collected successfully."
msgstr "Direcciones recopiladas con éxito."
-#: src/addrgather.c:351
+#: src/addrgather.c:360
msgid "Current folder:"
msgstr "Directorio actual:"
-#: src/addrgather.c:362
+#: src/addrgather.c:371
msgid "Address book name:"
msgstr "Agenda de direcciones :"
-#: src/addrgather.c:389
+#: src/addrgather.c:398
msgid "Address book folder size:"
msgstr "Tamaño de la carpeta de agenda:"
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
msgid ""
"Maximum amount of entries per folder within the newly created address book"
msgstr "Número máximo de entradas por carpeta dentro de la nueva agenda creada"
-#: src/addrgather.c:407
+#: src/addrgather.c:415
msgid "Process these mail header fields"
msgstr "Procesar las siguientes cabeceras"
-#: src/addrgather.c:426
+#: src/addrgather.c:434
msgid "Include subfolders"
msgstr "Incluir subcarpetas"
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1405
msgid "Header Name"
msgstr "Nombre cabecera"
-#: src/addrgather.c:451
+#: src/addrgather.c:498
msgid "Address Count"
msgstr "N.º direcciones"
-#: src/addrgather.c:561
+#: src/addrgather.c:585
msgid "Header Fields"
msgstr "Campos cabecera"
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:586 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:981
msgid "Finish"
msgstr "Finalizar"
-#: src/addrgather.c:620
+#: src/addrgather.c:644
msgid "Collect email addresses from selected messages"
msgstr "Recopilar direcciones de correo de los mensajes seleccionados"
-#: src/addrgather.c:624
+#: src/addrgather.c:648
msgid "Collect email addresses from folder"
msgstr "Recopilar direcciones de correo de la carpeta"
@@ -951,47 +939,47 @@ msgid "Update failed. Changes not written to Directory."
msgstr ""
"Falló la actualización. No se escribieron los cambios en el directorio."
-#: src/alertpanel.c:146 src/compose.c:9794
+#: src/alertpanel.c:144 src/compose.c:9737
msgid "Notice"
msgstr "Notificación"
-#: src/alertpanel.c:159 src/compose.c:5852 src/compose.c:6380
-#: src/compose.c:12251 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
+#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
+#: src/compose.c:12180 src/file_checker.c:78 src/file_checker.c:101
+#: src/messageview.c:856 src/plugins/pgpcore/sgpgme.c:806
+#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5024
msgid "Warning"
msgstr "Aviso"
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5789 src/inc.c:663
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:719
#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
msgid "Error"
msgstr "Error"
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
msgid "_View log"
msgstr "_Ver traza"
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
msgid "Show this message next time"
msgstr "Mostrar este mensaje de nuevo"
-#: src/browseldap.c:218
+#: src/browseldap.c:223
msgid "Browse Directory Entry"
msgstr "Ver entrada del directorio"
-#: src/browseldap.c:237
+#: src/browseldap.c:243
msgid "Server Name:"
msgstr "Nombre del servidor :"
-#: src/browseldap.c:247
+#: src/browseldap.c:253
msgid "Distinguished Name (dn):"
msgstr "Nombre distinguido (dn) :"
-#: src/browseldap.c:270
+#: src/browseldap.c:284
msgid "LDAP Name"
msgstr "Nombre LDAP"
-#: src/browseldap.c:272
+#: src/browseldap.c:290
msgid "Attribute Value"
msgstr "Valor del atributo"
@@ -1080,7 +1068,7 @@ msgstr "Su versión de Claws Mail es demasiado antigua para el módulo «%s»."
msgid "Your version of Claws Mail is too old for the plugin."
msgstr "Su versión de Claws Mail es demasiado antigua para el módulo."
-#: src/common/session.c:183 src/imap.c:1207
+#: src/common/session.c:202 src/imap.c:1225
msgid "SSL/TLS handshake failed\n"
msgstr "Negociación SSL/TLS fallida\n"
@@ -1113,30 +1101,30 @@ msgstr "El mensaje es demasiado grande (Máximo %s)\n"
msgid "couldn't start STARTTLS session\n"
msgstr "no se pudo iniciar la sesión STARTTLS\n"
-#: src/common/socket.c:571
+#: src/common/socket.c:573
msgid "Socket IO timeout.\n"
msgstr "Tiempo límite de E/S en el conector.\n"
-#: src/common/socket.c:600
+#: src/common/socket.c:602
msgid "Connection timed out.\n"
msgstr "La conexión excedió el límite de tiempo.\n"
-#: src/common/socket.c:734
+#: src/common/socket.c:742
#, c-format
msgid "%s:%d: connection failed (%s).\n"
msgstr "%s:%d: la conexión ha fallado (%s).\n"
-#: src/common/socket.c:974
+#: src/common/socket.c:982
#, c-format
msgid "%s:%d: unknown host.\n"
msgstr "%s:%d: anfitrión desconocido.\n"
-#: src/common/socket.c:1066
+#: src/common/socket.c:1074
#, c-format
msgid "%s:%s: host lookup failed (%s).\n"
msgstr "%s:%s: falló la búsqueda de la máquina (%s).\n"
-#: src/common/socket.c:1370
+#: src/common/socket.c:1378
#, c-format
msgid "write on fd%d: %s\n"
msgstr "escribir en fd%d: %s\n"
@@ -1226,232 +1214,232 @@ msgstr "<no en el certificado>"
msgid "(Subject cleared by RegExp)"
msgstr "(Asunto vacío por expr. reg.)"
-#: src/common/utils.c:256
+#: src/common/utils.c:220
#, c-format
msgid "%dB"
msgstr "%d B"
-#: src/common/utils.c:257
+#: src/common/utils.c:221
#, c-format
msgid "%d.%02dKB"
msgstr "%d.%02d kB"
-#: src/common/utils.c:258
+#: src/common/utils.c:222
#, c-format
msgid "%d.%02dMB"
msgstr "%d.%02d MB"
-#: src/common/utils.c:259
+#: src/common/utils.c:223
#, c-format
msgid "%.2fGB"
msgstr "%.2f GB"
-#: src/common/utils.c:4781
+#: src/common/utils.c:4749
msgctxt "Complete day name for use by strftime"
msgid "Sunday"
msgstr "Domingo"
-#: src/common/utils.c:4782
+#: src/common/utils.c:4750
msgctxt "Complete day name for use by strftime"
msgid "Monday"
msgstr "Lunes"
-#: src/common/utils.c:4783
+#: src/common/utils.c:4751
msgctxt "Complete day name for use by strftime"
msgid "Tuesday"
msgstr "Martes"
-#: src/common/utils.c:4784
+#: src/common/utils.c:4752
msgctxt "Complete day name for use by strftime"
msgid "Wednesday"
msgstr "Miércoles"
-#: src/common/utils.c:4785
+#: src/common/utils.c:4753
msgctxt "Complete day name for use by strftime"
msgid "Thursday"
msgstr "Jueves"
-#: src/common/utils.c:4786
+#: src/common/utils.c:4754
msgctxt "Complete day name for use by strftime"
msgid "Friday"
msgstr "Viernes"
-#: src/common/utils.c:4787
+#: src/common/utils.c:4755
msgctxt "Complete day name for use by strftime"
msgid "Saturday"
msgstr "Sábado"
-#: src/common/utils.c:4789
+#: src/common/utils.c:4757
msgctxt "Complete month name for use by strftime"
msgid "January"
msgstr "Enero"
-#: src/common/utils.c:4790
+#: src/common/utils.c:4758
msgctxt "Complete month name for use by strftime"
msgid "February"
msgstr "Febrero"
-#: src/common/utils.c:4791
+#: src/common/utils.c:4759
msgctxt "Complete month name for use by strftime"
msgid "March"
msgstr "Marzo"
-#: src/common/utils.c:4792
+#: src/common/utils.c:4760
msgctxt "Complete month name for use by strftime"
msgid "April"
msgstr "Abril"
-#: src/common/utils.c:4793
+#: src/common/utils.c:4761
msgctxt "Complete month name for use by strftime"
msgid "May"
msgstr "Mayo"
-#: src/common/utils.c:4794
+#: src/common/utils.c:4762
msgctxt "Complete month name for use by strftime"
msgid "June"
msgstr "Junio"
-#: src/common/utils.c:4795
+#: src/common/utils.c:4763
msgctxt "Complete month name for use by strftime"
msgid "July"
msgstr "Julio"
-#: src/common/utils.c:4796
+#: src/common/utils.c:4764
msgctxt "Complete month name for use by strftime"
msgid "August"
msgstr "Agosto"
-#: src/common/utils.c:4797
+#: src/common/utils.c:4765
msgctxt "Complete month name for use by strftime"
msgid "September"
msgstr "Septiembre"
-#: src/common/utils.c:4798
+#: src/common/utils.c:4766
msgctxt "Complete month name for use by strftime"
msgid "October"
msgstr "Octubre"
-#: src/common/utils.c:4799
+#: src/common/utils.c:4767
msgctxt "Complete month name for use by strftime"
msgid "November"
msgstr "Noviembre"
-#: src/common/utils.c:4800
+#: src/common/utils.c:4768
msgctxt "Complete month name for use by strftime"
msgid "December"
msgstr "Diciembre"
-#: src/common/utils.c:4802
+#: src/common/utils.c:4770
msgctxt "Abbr. day name for use by strftime"
msgid "Sun"
msgstr "Dom"
-#: src/common/utils.c:4803
+#: src/common/utils.c:4771
msgctxt "Abbr. day name for use by strftime"
msgid "Mon"
msgstr "Lun"
-#: src/common/utils.c:4804
+#: src/common/utils.c:4772
msgctxt "Abbr. day name for use by strftime"
msgid "Tue"
msgstr "Mar"
-#: src/common/utils.c:4805
+#: src/common/utils.c:4773
msgctxt "Abbr. day name for use by strftime"
msgid "Wed"
msgstr "Mié"
-#: src/common/utils.c:4806
+#: src/common/utils.c:4774
msgctxt "Abbr. day name for use by strftime"
msgid "Thu"
msgstr "Jue"
-#: src/common/utils.c:4807
+#: src/common/utils.c:4775
msgctxt "Abbr. day name for use by strftime"
msgid "Fri"
msgstr "Vie"
-#: src/common/utils.c:4808
+#: src/common/utils.c:4776
msgctxt "Abbr. day name for use by strftime"
msgid "Sat"
msgstr "Sáb"
-#: src/common/utils.c:4810
+#: src/common/utils.c:4778
msgctxt "Abbr. month name for use by strftime"
msgid "Jan"
msgstr "Ene"
-#: src/common/utils.c:4811
+#: src/common/utils.c:4779
msgctxt "Abbr. month name for use by strftime"
msgid "Feb"
msgstr "Feb"
-#: src/common/utils.c:4812
+#: src/common/utils.c:4780
msgctxt "Abbr. month name for use by strftime"
msgid "Mar"
msgstr "Mar"
-#: src/common/utils.c:4813
+#: src/common/utils.c:4781
msgctxt "Abbr. month name for use by strftime"
msgid "Apr"
msgstr "Abr"
-#: src/common/utils.c:4814
+#: src/common/utils.c:4782
msgctxt "Abbr. month name for use by strftime"
msgid "May"
msgstr "May"
-#: src/common/utils.c:4815
+#: src/common/utils.c:4783
msgctxt "Abbr. month name for use by strftime"
msgid "Jun"
msgstr "Jun"
-#: src/common/utils.c:4816
+#: src/common/utils.c:4784
msgctxt "Abbr. month name for use by strftime"
msgid "Jul"
msgstr "Jul"
-#: src/common/utils.c:4817
+#: src/common/utils.c:4785
msgctxt "Abbr. month name for use by strftime"
msgid "Aug"
msgstr "Ago"
-#: src/common/utils.c:4818
+#: src/common/utils.c:4786
msgctxt "Abbr. month name for use by strftime"
msgid "Sep"
msgstr "Sep"
-#: src/common/utils.c:4819
+#: src/common/utils.c:4787
msgctxt "Abbr. month name for use by strftime"
msgid "Oct"
msgstr "Oct"
-#: src/common/utils.c:4820
+#: src/common/utils.c:4788
msgctxt "Abbr. month name for use by strftime"
msgid "Nov"
msgstr "Nov"
-#: src/common/utils.c:4821
+#: src/common/utils.c:4789
msgctxt "Abbr. month name for use by strftime"
msgid "Dec"
msgstr "Dic"
-#: src/common/utils.c:4832
+#: src/common/utils.c:4800
msgctxt "For use by strftime (morning)"
msgid "AM"
msgstr "AM"
-#: src/common/utils.c:4833
+#: src/common/utils.c:4801
msgctxt "For use by strftime (afternoon)"
msgid "PM"
msgstr "PM"
-#: src/common/utils.c:4834
+#: src/common/utils.c:4802
msgctxt "For use by strftime (morning, lowercase)"
msgid "am"
msgstr "am"
-#: src/common/utils.c:4835
+#: src/common/utils.c:4803
msgctxt "For use by strftime (afternoon, lowercase)"
msgid "pm"
msgstr "pm"
@@ -1461,15 +1449,15 @@ msgid "_Add..."
msgstr "_Añadir..."
#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/plugins/rssyl/rssyl_cb_menu.c:326
msgid "_Remove"
msgstr "Elimina_r"
-#: src/compose.c:596 src/folderview.c:254
+#: src/compose.c:596 src/folderview.c:253
msgid "_Properties..."
msgstr "_Propiedades..."
-#: src/compose.c:603 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:212
msgid "_Message"
msgstr "_Mensaje"
@@ -1537,7 +1525,7 @@ msgstr "_Recortado"
msgid "_Unwrapped"
msgstr "_Sin recortar"
-#: src/compose.c:641 src/mainwindow.c:549
+#: src/compose.c:641 src/mainwindow.c:550
#: src/plugins/managesieve/sieve_editor.c:99
msgid "Select _all"
msgstr "_Seleccionar todo"
@@ -1602,7 +1590,7 @@ msgstr "Borrar línea"
msgid "Delete to end of line"
msgstr "Borrar hasta el final de la línea"
-#: src/compose.c:660 src/messageview.c:228
+#: src/compose.c:660 src/messageview.c:229
#: src/plugins/managesieve/sieve_editor.c:102
msgid "_Find"
msgstr "_Buscar"
@@ -1647,47 +1635,47 @@ msgstr "_Sistema de privacidad"
msgid "_Priority"
msgstr "_Prioridad"
-#: src/compose.c:687 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:265
msgid "Character _encoding"
msgstr "Codificación de caract_eres"
-#: src/compose.c:692 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:270
msgid "Western European"
msgstr "Europeo Occidental"
-#: src/compose.c:693 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:271
msgid "Baltic"
msgstr "Báltico"
-#: src/compose.c:694 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:272
msgid "Hebrew"
msgstr "Hebreo"
-#: src/compose.c:695 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:273
msgid "Arabic"
msgstr "Árabe"
-#: src/compose.c:696 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:274
msgid "Cyrillic"
msgstr "Cirílico"
-#: src/compose.c:697 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:275
msgid "Japanese"
msgstr "Japonés"
-#: src/compose.c:698 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:276
msgid "Chinese"
msgstr "Chino"
-#: src/compose.c:699 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:277
msgid "Korean"
msgstr "Coreano"
-#: src/compose.c:700 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:278
msgid "Thai"
msgstr "Tailandés"
-#: src/compose.c:703 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:314
msgid "_Address book"
msgstr "_Agenda de direcciones"
@@ -1695,7 +1683,7 @@ msgstr "_Agenda de direcciones"
msgid "_Template"
msgstr "Plan_tilla"
-#: src/compose.c:707 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:334
msgid "Actio_ns"
msgstr "Accio_nes"
@@ -1731,11 +1719,11 @@ msgstr "Mostrar _regleta"
msgid "_Normal"
msgstr "_Normal"
-#: src/compose.c:728 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:303
msgid "_All"
msgstr "_Todo"
-#: src/compose.c:729 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:304
msgid "_Sender"
msgstr "_Remitente"
@@ -1759,48 +1747,48 @@ msgstr "_Baja"
msgid "_Lowest"
msgstr "M_uy baja"
-#: src/compose.c:744 src/mainwindow.c:878 src/messageview.c:350
+#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:351
msgid "_Automatic"
msgstr "_Automático"
-#: src/compose.c:745 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:352
msgid "7bit ASCII (US-ASC_II)"
msgstr "ASCII de 7 bits (US-ASC_II)"
-#: src/compose.c:746 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:353
msgid "Unicode (_UTF-8)"
msgstr "Unicode (_UTF-8)"
-#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:356
+#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:357
msgid "Central European (ISO-8859-_2)"
msgstr "Centroeuropeo (ISO-8859-_2)"
-#: src/compose.c:753 src/mainwindow.c:887 src/messageview.c:359
+#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:360
msgid "Greek (ISO-8859-_7)"
msgstr "Griego (ISO-8859-_7)"
-#: src/compose.c:758 src/mainwindow.c:892 src/messageview.c:364
+#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:365
msgid "Turkish (ISO-8859-_9)"
msgstr "Turco (ISO-8859-_9)"
-#: src/compose.c:1087
+#: src/compose.c:1040
msgid "New message From format error."
msgstr "Error de formato en el «Desde» del mensaje nuevo."
-#: src/compose.c:1180
+#: src/compose.c:1133
msgid "New message subject format error."
msgstr "Error de formato en el asunto del mensaje nuevo."
-#: src/compose.c:1212 src/quote_fmt.c:563
+#: src/compose.c:1165 src/quote_fmt.c:563
#, c-format
msgid "The body of the \"New message\" template has an error at line %d."
msgstr "Error en el cuerpo de la plantilla de «Componer» en la línea %d."
-#: src/compose.c:1477
+#: src/compose.c:1430
msgid "Unable to reply. The original email probably doesn't exist."
msgstr "No se puede responder. El correo original probablemente no existe."
-#: src/compose.c:1660 src/quote_fmt.c:580
+#: src/compose.c:1613 src/quote_fmt.c:580
msgid ""
"The \"From\" field of the \"Reply\" template contains an invalid email "
"address."
@@ -1808,12 +1796,12 @@ msgstr ""
"El campo «Desde» de la plantilla «Responder» contiene una dirección de "
"correo inválida."
-#: src/compose.c:1709 src/quote_fmt.c:583
+#: src/compose.c:1662 src/quote_fmt.c:583
#, c-format
msgid "The body of the \"Reply\" template has an error at line %d."
msgstr "Error en el cuerpo de la plantilla de «Responder» en la línea %d."
-#: src/compose.c:1843 src/compose.c:2035 src/quote_fmt.c:600
+#: src/compose.c:1796 src/compose.c:1988 src/quote_fmt.c:600
msgid ""
"The \"From\" field of the \"Forward\" template contains an invalid email "
"address."
@@ -1821,55 +1809,55 @@ msgstr ""
"El campo «Desde» de la plantilla «Reenviar» contiene una dirección de correo "
"inválida."
-#: src/compose.c:1904 src/quote_fmt.c:603
+#: src/compose.c:1857 src/quote_fmt.c:603
#, c-format
msgid "The body of the \"Forward\" template has an error at line %d."
msgstr "Error en el cuerpo de la plantilla de «Reenviar» en la línea %d."
-#: src/compose.c:2078
+#: src/compose.c:2031
msgid "Fw: multiple emails"
msgstr "Rv: múltiples correos"
-#: src/compose.c:2580
+#: src/compose.c:2533
#, c-format
msgid "The body of the \"Redirect\" template has an error at line %d."
msgstr "Error en el cuerpo de la plantilla de «Redirigir» en la línea %d."
-#: src/compose.c:2647 src/gtk/headers.h:14
+#: src/compose.c:2600 src/gtk/headers.h:14
msgid "Cc:"
msgstr "Cc:"
-#: src/compose.c:2650 src/gtk/headers.h:15
+#: src/compose.c:2603 src/gtk/headers.h:15
msgid "Bcc:"
msgstr "Bcc:"
-#: src/compose.c:2653 src/gtk/headers.h:12
+#: src/compose.c:2606 src/gtk/headers.h:12
msgid "Reply-To:"
msgstr "Responder-A:"
-#: src/compose.c:2656 src/compose.c:5023 src/compose.c:5025
+#: src/compose.c:2609 src/compose.c:4971 src/compose.c:4973
#: src/gtk/headers.h:33
msgid "Newsgroups:"
msgstr "Grupos:"
-#: src/compose.c:2659 src/gtk/headers.h:34
+#: src/compose.c:2612 src/gtk/headers.h:34
msgid "Followup-To:"
msgstr "Seguimiento-A:"
-#: src/compose.c:2662 src/gtk/headers.h:17
+#: src/compose.c:2615 src/gtk/headers.h:17
msgid "In-Reply-To:"
msgstr "En-Respuesta-A:"
-#: src/compose.c:2666 src/compose.c:5020 src/compose.c:5028
-#: src/gtk/headers.h:13 src/summary_search.c:481
+#: src/compose.c:2619 src/compose.c:4968 src/compose.c:4976
+#: src/gtk/headers.h:13 src/summary_search.c:423
msgid "To:"
msgstr "Para:"
-#: src/compose.c:2856
+#: src/compose.c:2809
msgid "Couldn't attach a file (charset conversion failed)."
msgstr "No se pudo adjuntar un fichero (falló la conversión de caracteres)."
-#: src/compose.c:2862
+#: src/compose.c:2815
#, c-format
msgid ""
"The following file has been attached: \n"
@@ -1884,16 +1872,16 @@ msgstr[1] ""
"Se han adjuntado los siguientes ficheros: \n"
"%s"
-#: src/compose.c:3142
+#: src/compose.c:3095
msgid "The \"Quotation mark\" of the template is invalid."
msgstr "La «marca de cita» de la plantilla no es válida."
-#: src/compose.c:3671
+#: src/compose.c:3624
#, c-format
msgid "Could not get size of file '%s'."
msgstr "No se puede obtener el tamaño del fichero «%s»."
-#: src/compose.c:3689
+#: src/compose.c:3642
#, c-format
msgid ""
"You are about to insert a file of %s in the message body. Are you sure you "
@@ -1902,57 +1890,57 @@ msgstr ""
"Está a punto de insertar un fichero de %s en el cuerpo del mensaje. ¿Está "
"seguro de que desea hacerlo?"
-#: src/compose.c:3692
+#: src/compose.c:3645
msgid "Are you sure?"
msgstr "¿Está seguro?"
-#: src/compose.c:3693 src/compose.c:10850 src/compose.c:11728
+#: src/compose.c:3646 src/compose.c:10781 src/compose.c:11659
msgid "_Insert"
msgstr "_Insertar"
-#: src/compose.c:3817
+#: src/compose.c:3771
#, c-format
msgid "File %s is empty."
msgstr "El fichero %s esta vacío."
-#: src/compose.c:3818
+#: src/compose.c:3772
msgid "Empty file"
msgstr "Fichero vacío"
-#: src/compose.c:3819
+#: src/compose.c:3773
msgid "_Attach anyway"
msgstr "_Adjuntar igualmente"
-#: src/compose.c:3828
+#: src/compose.c:3782
#, c-format
msgid "Can't read %s."
msgstr "No puedo leer %s."
-#: src/compose.c:3855
+#: src/compose.c:3809
#, c-format
msgid "Message: %s"
msgstr "Mensaje: %s"
-#: src/compose.c:4860 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4814 src/plugins/managesieve/sieve_editor.c:696
#: src/plugins/python/composewindowtype.c:498
msgid " [Edited]"
msgstr " [Editado]"
-#: src/compose.c:4867 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4821 src/plugins/python/composewindowtype.c:501
#, c-format
msgid "%s - Compose message%s"
msgstr "%s - Componer mensaje%s"
-#: src/compose.c:4870 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4824 src/plugins/python/composewindowtype.c:504
#, c-format
msgid "[no subject] - Compose message%s"
msgstr "[sin asunto] - Componer mensaje%s"
-#: src/compose.c:4872 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4826 src/plugins/python/composewindowtype.c:492
msgid "Compose message"
msgstr "Componer un mensaje nuevo"
-#: src/compose.c:4899 src/messageview.c:903
+#: src/compose.c:4853 src/messageview.c:885
msgid ""
"Account for sending mail is not specified.\n"
"Please select a mail account before sending."
@@ -1960,105 +1948,114 @@ msgstr ""
"No especificó ninguna cuenta para enviar.\n"
"Seleccione alguna cuenta antes de enviar."
-#: src/compose.c:5120 src/compose.c:5157
+#: src/compose.c:5068 src/compose.c:5105
#, c-format
msgid "The only recipient is the default '%s' address. Send anyway?"
msgstr ""
"El único destinatario es la dirección predeterminada «%s». ¿Enviar de todas "
"formas?"
-#: src/compose.c:5122 src/compose.c:5159 src/compose.c:5202 src/compose.c:5251
-#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5070 src/compose.c:5107 src/compose.c:5145 src/compose.c:5188
+#: src/prefs_account.c:3754 src/toolbar.c:487 src/toolbar.c:519
msgid "Send"
msgstr "Enviar"
-#: src/compose.c:5124 src/compose.c:5161 src/compose.c:5195 src/compose.c:5244
-#: src/compose.c:5790 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:3030
+#: src/compose.c:5072 src/compose.c:5109 src/compose.c:5146 src/compose.c:5189
+#: src/compose.c:5751 src/folderview.c:2543 src/messageview.c:857
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3042
msgid "_Send"
msgstr "_Enviar"
-#: src/compose.c:5178
+#: src/compose.c:5126
msgid "Recipient is not specified."
msgstr "No se especificó el destinatario."
-#: src/compose.c:5197 src/compose.c:5246
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "_A la cola"
-
-#: src/compose.c:5198
+#: src/compose.c:5141
#, c-format
msgid "Subject is empty. %s"
msgstr "El asunto esta vacío. %s"
-#: src/compose.c:5199 src/compose.c:5248
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5142 src/compose.c:5185
+#: src/plugins/attachwarner/attachwarner.c:215
msgid "Send it anyway?"
msgstr "¿Enviarlo igualmente?"
-#: src/compose.c:5200 src/compose.c:5249
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5143 src/compose.c:5186
+#: src/plugins/attachwarner/attachwarner.c:215
msgid "Queue it anyway?"
msgstr "¿Ponerlo en la cola igualmente?"
-#: src/compose.c:5202 src/compose.c:5251 src/toolbar.c:520
+#: src/compose.c:5145 src/compose.c:5188 src/toolbar.c:520
msgid "Send later"
msgstr "Enviar después"
-#: src/compose.c:5247
+#: src/compose.c:5146 src/compose.c:5189
+msgid "_Queue"
+msgstr "_A la cola"
+
+#: src/compose.c:5184
#, c-format
msgid "Sending to %d recipients. %s"
msgstr "Enviando a %d destinatarios. %s"
-#: src/compose.c:5304 src/compose.c:10292
+#: src/compose.c:5213
+msgid "Could not queue message."
+msgstr "El mensaje no se pudo poner en la cola."
+
+#: src/compose.c:5216
+#, c-format
msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
"\n"
-"Charset conversion failed."
+"%s."
msgstr ""
-"No se puede poner en la cola el mensaje para enviar:\n"
+"No se puede poner en la cola el mensaje:\n"
"\n"
-"Falló la conversión del conjunto caracteres."
+"%s."
-#: src/compose.c:5307 src/compose.c:10295
+#: src/compose.c:5220
+#, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
msgstr ""
"No se puede poner en la cola el mensaje para enviar:\n"
"\n"
-"No se pudo obtener la clave de cifrado del destinatario."
+"Falló la firma: %s"
-#: src/compose.c:5313 src/compose.c:10289
+#: src/compose.c:5225
#, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
-"Signature failed: %s"
+"Encryption failed: %s"
msgstr ""
"No se puede poner en la cola el mensaje para enviar:\n"
"\n"
-"Falló la firma: %s"
+"Falló el cifrado: %s"
-#: src/compose.c:5316
-#, c-format
+#: src/compose.c:5230
msgid ""
"Could not queue message for sending:\n"
"\n"
-"%s."
+"Charset conversion failed."
msgstr ""
"No se puede poner en la cola el mensaje para enviar:\n"
"\n"
-"%s."
+"Falló la conversión del conjunto caracteres."
-#: src/compose.c:5318
-msgid "Could not queue message for sending."
-msgstr "No se puede poner en la cola el mensaje para enviar."
+#: src/compose.c:5234
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"No se puede poner en la cola el mensaje para enviar:\n"
+"\n"
+"No se pudo obtener la clave de cifrado del destinatario."
-#: src/compose.c:5333 src/compose.c:5393
+#: src/compose.c:5294 src/compose.c:5354
msgid ""
"The message was queued but could not be sent.\n"
"Use \"Send queued messages\" from the main window to retry."
@@ -2066,7 +2063,7 @@ msgstr ""
"El mensaje está en la cola pero no se pudo enviar.\n"
"Utilice «Enviar mensaje(s) en cola» en la ventana principal para enviarlo"
-#: src/compose.c:5389
+#: src/compose.c:5350
#, c-format
msgid ""
"%s\n"
@@ -2075,7 +2072,7 @@ msgstr ""
"%s\n"
"Utilice «Enviar mensaje(s) en cola» en la ventana principal para reintentar."
-#: src/compose.c:5786
+#: src/compose.c:5747
#, c-format
msgid ""
"Can't convert the character encoding of the message \n"
@@ -2086,7 +2083,7 @@ msgstr ""
"al conjunto de caracteres %s especificado.\n"
"¿Enviarlo como %s?"
-#: src/compose.c:5848
+#: src/compose.c:5809
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
@@ -2099,103 +2096,98 @@ msgstr ""
"\n"
"¿Enviarlo de todas formas?"
-#: src/compose.c:5959
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "No se puede cifrar el correo: %s"
-
-#: src/compose.c:6080
+#: src/compose.c:6041
msgid "Encryption warning"
msgstr "Aviso de cifrado"
-#: src/compose.c:6081
+#: src/compose.c:6042
msgid "C_ontinue"
msgstr "C_ontinuar"
-#: src/compose.c:6130
+#: src/compose.c:6091
msgid "No account for sending mails available!"
msgstr "¡No hay ninguna cuenta disponible para enviar correos!"
-#: src/compose.c:6139
+#: src/compose.c:6100
msgid "Selected account isn't NNTP: Posting is impossible."
msgstr "La cuenta seleccionada no es NNTP: es imposible enviar el post."
-#: src/compose.c:6379
+#: src/compose.c:6340
#, c-format
msgid "Attachment %s doesn't exist anymore. Ignore?"
msgstr "El adjunto %s ya no existe. ¿Ignorar?"
-#: src/compose.c:6380 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
+#: src/compose.c:6342 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
msgid "Cancel sending"
msgstr "Cancelar envío"
-#: src/compose.c:6380
+#: src/compose.c:6342
msgid "Ignore attachment"
msgstr "Ignorar adjunto"
-#: src/compose.c:6436
+#: src/compose.c:6398
#, c-format
msgid "Original %s part"
msgstr "Parte original %s"
-#: src/compose.c:7036
+#: src/compose.c:6998
msgid "Add to address _book"
msgstr "Añadir a la agen_da"
-#: src/compose.c:7206
+#: src/compose.c:7165
msgid "Delete entry contents"
msgstr "Borrar contenidos de la cuenta"
-#: src/compose.c:7210 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7169 src/plugins/vcalendar/vcal_meeting_gtk.c:289
msgid "Use <tab> to autocomplete from addressbook"
msgstr "Usar «tab» para autocompletar con la agenda"
-#: src/compose.c:7440
+#: src/compose.c:7401
msgid "Mime type"
msgstr "Tipo MIME"
-#: src/compose.c:7446 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:447
+#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:451
+#: src/prefs_matcher.c:629 src/prefs_summaries.c:441
+#: src/prefs_summary_column.c:84 src/summaryview.c:449
msgid "Size"
msgstr "Tamaño"
-#: src/compose.c:7509
+#: src/compose.c:7470
msgid "Save Message to "
msgstr "Guardar mensaje en "
-#: src/compose.c:7546 src/editjpilot.c:276 src/editldap.c:517
+#: src/compose.c:7498 src/editjpilot.c:276 src/editldap.c:517
#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1080
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
#: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:300
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
msgid "_Browse"
msgstr "_Explorar"
-#: src/compose.c:7568
+#: src/compose.c:7520
msgid "Select folder to save message to"
msgstr "Seleccionar la carpeta en la que guardar el mensaje"
-#: src/compose.c:8025
+#: src/compose.c:7977
msgid "Hea_der"
msgstr "_Cabecera"
-#: src/compose.c:8030
+#: src/compose.c:7982
msgid "_Attachments"
msgstr "_Adjuntos"
-#: src/compose.c:8044
+#: src/compose.c:7996
msgid "Othe_rs"
msgstr "Ot_ros"
-#: src/compose.c:8059
+#: src/compose.c:8011
msgid "S_ubject:"
msgstr "As_unto:"
-#: src/compose.c:8283
+#: src/compose.c:8235
#, c-format
msgid ""
"Spell checker could not be started.\n"
@@ -2204,19 +2196,19 @@ msgstr ""
"No se puede iniciar el corrector ortográfico.\n"
"%s"
-#: src/compose.c:8430
+#: src/compose.c:8382
msgid "_From:"
msgstr "_Desde:"
-#: src/compose.c:8447
+#: src/compose.c:8399
msgid "Account to use for this email"
msgstr "Cuenta a usar para este correo"
-#: src/compose.c:8449
+#: src/compose.c:8401
msgid "Sender address to be used"
msgstr "Dirección del remitente a usar"
-#: src/compose.c:8631
+#: src/compose.c:8583
#, c-format
msgid ""
"The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2225,50 +2217,50 @@ msgstr ""
"No se ha podido cargar el sistema de privacidad «%s». No será posible firmar "
"o cifrar este mensaje."
-#: src/compose.c:8742 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8694 src/plugins/archive/archiver_gtk.c:1179
msgid "_None"
msgstr "_Ninguno"
-#: src/compose.c:8843 src/prefs_template.c:751
+#: src/compose.c:8795 src/prefs_template.c:751
#, c-format
msgid "The body of the template has an error at line %d."
msgstr "Error en el cuerpo de la plantilla en la línea %d."
-#: src/compose.c:8940
+#: src/compose.c:8892
#, c-format
msgctxt "'%s' stands for a header name"
msgid "Template '%s' format error."
msgstr "Error de formato en la cabecera «%s» de la plantilla."
-#: src/compose.c:9364
+#: src/compose.c:9315
msgid "Invalid MIME type."
msgstr "Tipo MIME inválido."
-#: src/compose.c:9379
+#: src/compose.c:9330
msgid "File doesn't exist or is empty."
msgstr "El fichero no existe o está vacío."
-#: src/compose.c:9453
+#: src/compose.c:9404
msgid "Properties"
msgstr "Propiedades"
-#: src/compose.c:9470
+#: src/compose.c:9421
msgid "MIME type"
msgstr "Tipo MIME"
-#: src/compose.c:9511
+#: src/compose.c:9454
msgid "Encoding"
msgstr "Codificación"
-#: src/compose.c:9531
+#: src/compose.c:9474
msgid "Path"
msgstr "Ruta"
-#: src/compose.c:9532
+#: src/compose.c:9475
msgid "File name"
msgstr "Nombre de fichero"
-#: src/compose.c:9791
+#: src/compose.c:9734
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -2279,34 +2271,19 @@ msgstr ""
"¿Desea terminar el proceso?\n"
"Id. de proceso: %d"
-#: src/compose.c:10258 src/messageview.c:1105
+#: src/compose.c:10202 src/messageview.c:1086
msgid "Claws Mail needs network access in order to send this email."
msgstr "Claws Mail necesita acceso a la red para poder enviar este correo."
-#: src/compose.c:10284
-msgid "Could not queue message."
-msgstr "El mensaje no se pudo poner en la cola."
-
-#: src/compose.c:10286
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"No se puede poner en la cola el mensaje:\n"
-"\n"
-"%s."
-
-#: src/compose.c:10464
+#: src/compose.c:10395
msgid "Could not save draft."
msgstr "No se puede guardar el borrador."
-#: src/compose.c:10468
+#: src/compose.c:10399
msgid "Could not save draft"
msgstr "No se puede guardar el borrador"
-#: src/compose.c:10469
+#: src/compose.c:10400
msgid ""
"Could not save draft.\n"
"Do you want to cancel exit or discard this email?"
@@ -2314,24 +2291,24 @@ msgstr ""
"No se ha podido guardar el borrador.\n"
"¿Desea cancelar la salida o descartar este correo?"
-#: src/compose.c:10471
+#: src/compose.c:10402
msgid "_Cancel exit"
msgstr "_Cancelar salida"
-#: src/compose.c:10471
+#: src/compose.c:10402
msgid "_Discard email"
msgstr "_Descartar correo"
-#: src/compose.c:10661 src/compose.c:10675
+#: src/compose.c:10591 src/compose.c:10605
msgid "Select file"
msgstr "Seleccionar fichero"
-#: src/compose.c:10689
+#: src/compose.c:10619
#, c-format
msgid "File '%s' could not be read."
msgstr "No se puede leer el fichero «%s»."
-#: src/compose.c:10691
+#: src/compose.c:10621
#, c-format
msgid ""
"File '%s' contained invalid characters\n"
@@ -2340,50 +2317,50 @@ msgstr ""
"El fichero «%s» contenía caracteres inválidos para\n"
"la codificación actual, la inserción puede ser incorrecta."
-#: src/compose.c:10770
+#: src/compose.c:10700
msgid "Discard message"
msgstr "Descartar mensaje"
-#: src/compose.c:10771
+#: src/compose.c:10701
msgid "This message has been modified. Discard it?"
msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
-#: src/compose.c:10772 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10702 src/plugins/managesieve/sieve_editor.c:434
msgid "_Discard"
msgstr "_Descartar"
-#: src/compose.c:10772 src/compose.c:10776
+#: src/compose.c:10702 src/compose.c:10707
msgid "_Save to Drafts"
msgstr "Guardar en _Borradores"
-#: src/compose.c:10774 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:432
msgid "Save changes"
msgstr "Guardar cambios"
-#: src/compose.c:10775
+#: src/compose.c:10706
msgid "This message has been modified. Save the latest changes?"
msgstr "Este mensaje se ha modificado. ¿Guardar los últimos cambios?"
-#: src/compose.c:10776
+#: src/compose.c:10707
msgid "_Don't save"
msgstr "_No guardar"
-#: src/compose.c:10847
+#: src/compose.c:10778
#, c-format
msgid "Do you want to apply the template '%s'?"
msgstr "¿Quiere aplicar la plantilla «%s»?"
-#: src/compose.c:10849
+#: src/compose.c:10780
msgid "Apply template"
msgstr "Aplicar plantilla"
-#: src/compose.c:10850 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:310
-#: src/prefs_toolbar.c:1063
+#: src/compose.c:10781 src/prefs_actions.c:329 src/prefs_filtering_action.c:594
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:769 src/prefs_template.c:310
+#: src/prefs_toolbar.c:1018
msgid "_Replace"
msgstr "_Reemplazar"
-#: src/compose.c:11721
+#: src/compose.c:11652
#, c-format
msgid ""
"Do you want to insert the contents of the file into the message body, or "
@@ -2398,20 +2375,20 @@ msgstr[1] ""
"¿Quiere insertar el contenido de estos %d ficheros en el cuerpo del correo o "
"prefiere adjuntarlos al mismo?"
-#: src/compose.c:11727
+#: src/compose.c:11658
msgid "Insert or attach?"
msgstr "¿Insertar o adjuntar?"
-#: src/compose.c:11728
+#: src/compose.c:11659
msgid "_Attach"
msgstr "_Adjuntar"
-#: src/compose.c:11948
+#: src/compose.c:11877
#, c-format
msgid "Quote format error at line %d."
msgstr "Error de formato de cita en la línea %d."
-#: src/compose.c:12245
+#: src/compose.c:12174
#, c-format
msgid ""
"You are about to reply to %d messages. Opening the windows could take some "
@@ -2458,11 +2435,11 @@ msgstr "Crear informe de error"
msgid "Save crash information"
msgstr "Guardar información de terminación incorrecta"
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:149 src/editaddress.c:287
msgid "Add New Person"
msgstr "Añadir persona nueva"
-#: src/editaddress.c:157
+#: src/editaddress.c:151
msgid ""
"Adding a new person requires at least one of the\n"
"following values to be set:\n"
@@ -2488,7 +2465,7 @@ msgstr ""
"Pulse «Aceptar» para seguir editando este contacto.\n"
"Pulse «Cancelar» para cerrar sin guardar."
-#: src/editaddress.c:168
+#: src/editaddress.c:162
msgid ""
"Adding a new person requires at least one of the\n"
"following values to be set:\n"
@@ -2510,35 +2487,35 @@ msgstr ""
"Pulse «Aceptar» para seguir editando este contacto.\n"
"Pulse «Cancelar» para cerrar sin guardar."
-#: src/editaddress.c:232
+#: src/editaddress.c:288
msgid "Edit Person Details"
msgstr "Editar detalles personales"
-#: src/editaddress.c:410
+#: src/editaddress.c:506
msgid "An Email address must be supplied."
msgstr "Debe especificarse una dirección de correo."
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:205
msgid "A Name and Value must be supplied."
msgstr "Debe especificarse un Nombre y un Valor"
-#: src/editaddress.c:675 src/prefs_folder_item.c:1694
+#: src/editaddress.c:819 src/prefs_folder_item.c:1693
msgid "Discard"
msgstr "Descartar"
-#: src/editaddress.c:676
+#: src/editaddress.c:820
msgid "Apply"
msgstr "Aplicar"
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:850 src/editaddress.c:899
msgid "Edit Person Data"
msgstr "Editar datos personales"
-#: src/editaddress.c:784
+#: src/editaddress.c:928
msgid "Choose a picture"
msgstr "Elegir una imagen"
-#: src/editaddress.c:803
+#: src/editaddress.c:947
#, c-format
msgid ""
"Failed to import image: \n"
@@ -2547,58 +2524,58 @@ msgstr ""
"Falló al importar la imagen: \n"
"%s"
-#: src/editaddress.c:845
+#: src/editaddress.c:989
msgid "_Set picture"
msgstr "A_sociar imagen"
-#: src/editaddress.c:846
+#: src/editaddress.c:990
msgid "_Unset picture"
msgstr "Q_uitar imagen asociada"
-#: src/editaddress.c:904
+#: src/editaddress.c:1048
msgid "Photo"
msgstr "Foto"
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
+#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:516
#: src/exporthtml.c:761 src/ldif.c:746
msgid "Display Name"
msgstr "Nombre mostrado"
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:754
msgid "Last Name"
msgstr "Apellidos"
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:750
msgid "First Name"
msgstr "Nombre"
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1113 src/editaddress.c:1115
msgid "Nickname"
msgstr "Apodo"
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1251 src/editaddress.c:1292
msgid "Alias"
msgstr "Alias"
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:221
+#: src/editaddress.c:1477 src/editaddress.c:1510 src/editaddress.c:1526
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:221
msgid "Value"
msgstr "Valor"
-#: src/editaddress.c:1425
+#: src/editaddress.c:1592
msgid "_User Data"
msgstr "Datos de _usuario"
-#: src/editaddress.c:1426
+#: src/editaddress.c:1593
msgid "_Email Addresses"
msgstr "_Direcciones de correo"
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1596 src/editaddress.c:1599
msgid "O_ther Attributes"
msgstr "O_tros atributos"
-#: src/editaddress.c:1583
+#: src/editaddress.c:1767
#, c-format
msgid ""
"Failed to save image: \n"
@@ -2628,8 +2605,8 @@ msgid " Check File "
msgstr " Comprobar fichero "
#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
-#: src/wizard.c:1196 src/wizard.c:1616
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2173
+#: src/wizard.c:1197 src/wizard.c:1617
msgid "File"
msgstr "Fichero"
@@ -2677,12 +2654,12 @@ msgstr "Editar carpeta"
msgid "Input the new name of folder:"
msgstr "Nombre de la nueva carpeta:"
-#: src/editgroup.c:556 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
msgid "New folder"
msgstr "Nueva carpeta"
-#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:571 src/mh_gtk.c:145
#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
msgid "Input the name of new folder:"
msgstr "Nombre de la nueva carpeta:"
@@ -2707,33 +2684,35 @@ msgstr "Elemento(s) adicional(es) de la dirección"
msgid "Add New JPilot Entry"
msgstr "Añadir nueva entrada JPilot"
-#: src/editldap_basedn.c:136
+#: src/editldap_basedn.c:153
msgid "Edit LDAP - Select Search Base"
msgstr "Editar LDAP - Seleccionar base de búsqueda"
-#: src/editldap_basedn.c:155 src/editldap.c:440
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2925
+#: src/prefs_proxy.c:98
msgid "Hostname"
msgstr "Nombre de máquina"
-#: src/editldap_basedn.c:165 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
+#: src/editldap_basedn.c:182 src/editldap.c:457
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2932
+#: src/prefs_proxy.c:105 src/ssl_manager.c:108
msgid "Port"
msgstr "Puerto"
-#: src/editldap_basedn.c:175 src/editldap.c:501
+#: src/editldap_basedn.c:192 src/editldap.c:501
msgid "Search Base"
msgstr "Base de búsqueda"
-#: src/editldap_basedn.c:196
+#: src/editldap_basedn.c:220
msgid "Available Search Base(s)"
msgstr "Base(s) de búsqueda disponible(s)"
-#: src/editldap_basedn.c:286
+#: src/editldap_basedn.c:326
msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"No pude leer la base de búsqueda del servidor - configúrela manualmente"
-#: src/editldap_basedn.c:290 src/editldap.c:281
+#: src/editldap_basedn.c:330 src/editldap.c:281
msgid "Could not connect to server"
msgstr "No se puede conectar al servidor"
@@ -2777,7 +2756,7 @@ msgstr ""
msgid "STARTTLS"
msgstr "STARTTLS"
-#: src/editldap.c:469 src/prefs_account.c:3478
+#: src/editldap.c:469 src/prefs_account.c:3827
msgid "SSL/TLS"
msgstr "SSL/TLS"
@@ -2885,8 +2864,8 @@ msgstr ""
"primero en la caché antes de efectuar una nueva petición al servidor. El "
"valor predeterminado de 600 segundos (10 minutos), debería ser suficiente "
"para la mayoría de los servidores. Un valor mayor reducirá el tiempo de "
-"búsqueda en las búsquedas siguientes. Esto es útil para los servidores lentos "
-"a costa de un mayor uso de memoria para almacenar los resultados."
+"búsqueda en las búsquedas siguientes. Esto es útil para los servidores "
+"lentos a costa de un mayor uso de memoria para almacenar los resultados."
#: src/editldap.c:630
msgid "Include server in dynamic search"
@@ -2943,8 +2922,9 @@ msgstr "Contraseña de enlace"
msgid "The password to be used when connecting as the \"Bind DN\" user."
msgstr "La contraseña a usar al conectar como el usuario \"DN de enlace\"."
-#: src/editldap.c:738 src/prefs_account.c:1314 src/prefs_account.c:1868
-#: src/prefs_account.c:2587 src/prefs_account.c:2615
+#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
+#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
+#: src/prefs_proxy.c:146
msgid "Show password"
msgstr "Mostrar contraseña"
@@ -2967,7 +2947,7 @@ msgstr ""
"El número máximo de entradas que deberían retornarse en los resultados de la "
"búsqueda."
-#: src/editldap.c:792 src/prefs_account.c:3369
+#: src/editldap.c:792 src/prefs_account.c:3718
msgid "Basic"
msgstr "Básicas"
@@ -2979,45 +2959,45 @@ msgstr "Extendido"
msgid "Add New LDAP Server"
msgstr "Añadir nuevo servidor LDAP"
-#: src/edittags.c:187 src/prefs_filtering_action.c:1450
+#: src/edittags.c:192 src/prefs_filtering_action.c:1426
#: src/prefs_summaries.c:448
msgid "Tag"
msgstr "Etiqueta"
-#: src/edittags.c:216
+#: src/edittags.c:221
msgid "Delete tag"
msgstr "Borrar etiqueta"
-#: src/edittags.c:217
+#: src/edittags.c:222
msgid "Do you really want to delete this tag?"
msgstr "¿Quiere borrar realmente esta etiqueta?"
-#: src/edittags.c:251
+#: src/edittags.c:257
msgid "Delete all tags"
msgstr "Borrar todas las etiquetas"
-#: src/edittags.c:252
+#: src/edittags.c:258
msgid "Do you really want to delete all tags?"
msgstr "¿Quiere borrar realmente todas las etiquetas?"
-#: src/edittags.c:423
+#: src/edittags.c:430
msgid "You entered a reserved tag name, please choose another instead."
msgstr "El nombre de etiqueta introducido está reservado, elija uno distinto."
-#: src/edittags.c:465
+#: src/edittags.c:472
msgid "Tag is not set."
msgstr "Etiqueta no establecida."
-#: src/edittags.c:530
+#: src/edittags.c:537
msgctxt "Dialog title"
msgid "Apply tags"
msgstr "Aplicar etiquetas"
-#: src/edittags.c:544
+#: src/edittags.c:551
msgid "New tag:"
msgstr "Nueva etiqueta:"
-#: src/edittags.c:577
+#: src/edittags.c:584
msgid "Please select tags to apply/remove. Changes are immediate."
msgstr ""
"Seleccione las etiquetas a aplicar/eliminar. Los cambios son inmediatos."
@@ -3042,11 +3022,11 @@ msgstr "Añadir nueva entrada vCard"
msgid "Impossible to set the client certificate.\n"
msgstr "Imposible establecer el certificado de cliente.\n"
-#: src/etpan/nntp-thread.c:865
+#: src/etpan/nntp-thread.c:939
msgid "couldn't get xover range\n"
msgstr "no se pudo obtener el rango xover\n"
-#: src/etpan/nntp-thread.c:963
+#: src/etpan/nntp-thread.c:1038
msgid "couldn't get xhdr range\n"
msgstr "no se pudo obtener el rango xhdr\n"
@@ -3101,7 +3081,7 @@ msgid "HTML Output File"
msgstr "Fichero HTML de salida"
#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/importldif.c:568
msgid "B_rowse"
msgstr "Explo_rar"
@@ -3109,20 +3089,20 @@ msgstr "Explo_rar"
msgid "Stylesheet"
msgstr "Hoja de estilos"
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:125 src/mainwindow.c:1170
#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1041
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6197
msgid "None"
msgstr "Ninguno"
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:519 src/prefs_other.c:126
+#: src/prefs_other.c:414
msgid "Default"
msgstr "Por omisión"
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
msgid "Full"
msgstr "Completo"
@@ -3167,11 +3147,11 @@ msgstr "Formatear enlaces de correo electrónico"
msgid "Format User Attributes"
msgstr "Formatear atributos del usuario"
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
msgid "Address Book:"
msgstr "Agenda de direcciones :"
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
msgid "File Name:"
msgstr "Nombre de fichero :"
@@ -3183,7 +3163,7 @@ msgstr "Abrir con el navegador web"
msgid "Export Address Book to HTML File"
msgstr "Exportar agenda a un fichero HTML"
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:979
msgid "File Info"
msgstr "Información de fichero"
@@ -3354,7 +3334,7 @@ msgstr "Exportar agenda a un fichero LDIF"
msgid "Distinguished Name"
msgstr "Nombre distinguido"
-#: src/export.c:113 src/summaryview.c:8233
+#: src/export.c:113 src/summaryview.c:8369
msgid "Export to mbox file"
msgstr "Exportar a fichero mbox"
@@ -3394,8 +3374,8 @@ msgstr "Seleccionar la carpeta a exportar"
msgid "Full Name"
msgstr "Nombre completo"
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/exporthtml.c:771 src/importldif.c:980
+#: src/plugins/archive/archiver_gtk.c:771
msgid "Attributes"
msgstr "Atributos"
@@ -3424,12 +3404,12 @@ msgstr "Sin especificar."
msgid "The file %s is missing! Do you want to use the backup file from %s?"
msgstr "¡Falta el fichero «%s»! ¿Desea usar la copia de respaldo de «%s»?"
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:85 src/file_checker.c:108
#, c-format
msgid "Could not copy %s to %s"
msgstr "No se puede copiar «%s» a «%s»"
-#: src/file_checker.c:98
+#: src/file_checker.c:99
#, c-format
msgid ""
"The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3538,51 +3518,51 @@ msgstr "la acción no se pudo aplicar\n"
msgid "no further processing after action [ %s ]\n"
msgstr "no se sigue procesando después de la acción [ %s ]\n"
-#: src/filtering.c:810
+#: src/filtering.c:809
#, c-format
msgid "processing rule '%s' [ %s ]\n"
msgstr "procesando regla «%s» [ %s ]\n"
-#: src/filtering.c:814
+#: src/filtering.c:813
#, c-format
msgid "processing rule <unnamed> [ %s ]\n"
msgstr "procesando regla <sinnombre> [ %s ]\n"
-#: src/filtering.c:832
+#: src/filtering.c:831
#, c-format
msgid "disabled rule '%s' [ %s ]\n"
msgstr "desactivada regla «%s» [ %s ]\n"
-#: src/filtering.c:836
+#: src/filtering.c:835
#, c-format
msgid "disabled rule <unnamed> [ %s ]\n"
msgstr "desactivada regla <sinnombre> [ %s ]\n"
-#: src/filtering.c:874
+#: src/filtering.c:873
msgid "undetermined"
msgstr "indeterminada"
-#: src/filtering.c:878
+#: src/filtering.c:877
msgid "incorporation"
msgstr "incorporación"
-#: src/filtering.c:882
+#: src/filtering.c:881
msgid "manually"
msgstr "manualmente"
-#: src/filtering.c:886
+#: src/filtering.c:885
msgid "folder processing"
msgstr "procesamiento de la carpeta"
-#: src/filtering.c:890
+#: src/filtering.c:889
msgid "pre-processing"
msgstr "pre-procesamiento"
-#: src/filtering.c:894
+#: src/filtering.c:893
msgid "post-processing"
msgstr "post-procesamiento"
-#: src/filtering.c:909
+#: src/filtering.c:908
#, c-format
msgid ""
"filtering message (%s%s%s)\n"
@@ -3599,11 +3579,11 @@ msgstr ""
"%s%s %s\n"
"%s%s %s\n"
-#: src/filtering.c:911 src/filtering.c:920
+#: src/filtering.c:910 src/filtering.c:919
msgid ": "
msgstr ": "
-#: src/filtering.c:918
+#: src/filtering.c:917
#, c-format
msgid ""
"filtering message (%s%s%s)\n"
@@ -3612,164 +3592,165 @@ msgstr ""
"filtrando mensaje (%s%s%s)\n"
"%sfichero de mensaje: %s\n"
-#: src/folder.c:1570 src/prefs_folder_item.c:315
+#: src/folder.c:1591 src/prefs_folder_item.c:315
msgid "Inbox"
msgstr "Entrada"
-#: src/folder.c:1574
+#: src/folder.c:1595
msgid "Sent"
msgstr "Enviado"
-#: src/folder.c:1578 src/prefs_folder_item.c:318
+#: src/folder.c:1599 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:318
msgid "Queue"
msgstr "Cola"
-#: src/folder.c:1582 src/prefs_folder_item.c:319
+#: src/folder.c:1603 src/prefs_folder_item.c:319
msgid "Trash"
msgstr "Papelera"
-#: src/folder.c:1586 src/prefs_folder_item.c:317
+#: src/folder.c:1607 src/prefs_folder_item.c:317
msgid "Drafts"
msgstr "Borradores"
-#: src/folder.c:2017
+#: src/folder.c:2038
#, c-format
msgid "Processing (%s)...\n"
msgstr "Procesando (%s)...\n"
-#: src/folder.c:3262
+#: src/folder.c:3283
#, c-format
msgid "Copying %s to %s...\n"
msgstr "Copiando %s a %s...\n"
-#: src/folder.c:3262
+#: src/folder.c:3283
#, c-format
msgid "Moving %s to %s...\n"
msgstr "Moviendo %s a %s...\n"
-#: src/folder.c:3572
+#: src/folder.c:3593
#, c-format
msgid "Updating cache for %s..."
msgstr "Actualizando caché para %s..."
-#: src/folder.c:4434
+#: src/folder.c:4455
msgid "Processing messages..."
msgstr "Procesando mensajes..."
-#: src/folder.c:4569
+#: src/folder.c:4590
#, c-format
msgid "Synchronising %s for offline use...\n"
msgstr "Sincronizando %s para uso sin conexión...\n"
-#: src/folder.c:4828
+#: src/folder.c:4849
msgid "A folder name cannot begin or end with a dot."
msgstr "El nombre de una carpeta no puede empezar o terminar con un punto."
-#: src/folder.c:4832
+#: src/folder.c:4853
msgid "A folder name can not end with a space."
msgstr "El nombre de una carpeta no puede terminar con un espacio."
-#: src/foldersel.c:250
+#: src/foldersel.c:249
msgid "Select folder"
msgstr "Seleccionar carpeta"
-#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
msgid "NewFolder"
msgstr "NuevaCarpeta"
-#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:580 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/vcalendar/vcal_folder.c:2064
#, c-format
msgid "'%c' can't be included in folder name."
msgstr "No se puede usar «%c» en el nombre de la carpeta."
-#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/plugins/vcalendar/vcal_folder.c:2071
#, c-format
msgid "The folder '%s' already exists."
msgstr "La carpeta «%s» ya existe."
-#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:602 src/imap_gtk.c:230 src/mh_gtk.c:173
#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
#: src/plugins/rssyl/rssyl_cb_menu.c:124
#, c-format
msgid "Can't create the folder '%s'."
msgstr "No se puede crear la carpeta «%s»."
-#: src/folderview.c:247
+#: src/folderview.c:246
msgid "Mark all re_ad"
msgstr "Marcar todos como l_eídos"
-#: src/folderview.c:248
+#: src/folderview.c:247
msgid "Mark all u_nread"
msgstr "Marcar todos como _no leídos"
-#: src/folderview.c:249
+#: src/folderview.c:248
msgid "Mark all read recursi_vely"
msgstr "Marcar todos como leídos recurs_ivamente"
-#: src/folderview.c:250
+#: src/folderview.c:249
msgid "Mark all unread recursi_vely"
msgstr "Marcar todos como no leídos recursi_vamente"
-#: src/folderview.c:252
+#: src/folderview.c:251
msgid "R_un processing rules"
msgstr "Ejec_utar reglas de procesamiento"
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:252 src/mainwindow.c:554
msgid "_Search folder..."
msgstr "_Buscar en carpeta..."
-#: src/folderview.c:255
+#: src/folderview.c:254
msgid "Process_ing..."
msgstr "Pr_ocesamiento..."
-#: src/folderview.c:256
+#: src/folderview.c:255
msgid "Empty _trash..."
msgstr "_Vaciar papelera..."
-#: src/folderview.c:257
+#: src/folderview.c:256
msgid "Send _queue..."
msgstr "Enviar _cola..."
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:396 src/folderview.c:443
#: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6471
msgid "New"
msgstr "Nuevos"
-#: src/folderview.c:398 src/folderview.c:445
+#: src/folderview.c:397 src/folderview.c:444
#: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6473
#: src/toolbar.c:512
msgid "Unread"
msgstr "No leídos"
-#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:398 src/plugins/notification/notification_lcdproc.c:149
#: src/prefs_folder_column.c:80
msgid "Total"
msgstr "Total"
#. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:448
+#: src/folderview.c:446 src/summaryview.c:450
msgid "#"
msgstr "N.º"
-#: src/folderview.c:782
+#: src/folderview.c:781
msgid "Setting folder info..."
msgstr "Estableciendo información de carpeta..."
-#: src/folderview.c:867 src/summaryview.c:4182
+#: src/folderview.c:866 src/summaryview.c:4235
msgid "Mark all as read"
msgstr "Marcar todo como leído"
-#: src/folderview.c:868
+#: src/folderview.c:867
msgid ""
"Do you really want to mark all mails in this folder and its sub-folders as "
"read?"
@@ -3777,15 +3758,15 @@ msgstr ""
"¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como "
"leídos?"
-#: src/folderview.c:870 src/summaryview.c:4183
+#: src/folderview.c:869 src/summaryview.c:4236
msgid "Do you really want to mark all mails in this folder as read?"
msgstr "¿Quiere realmente marcar todos los correos en la carpeta como leídos?"
-#: src/folderview.c:873 src/summaryview.c:4221
+#: src/folderview.c:872 src/summaryview.c:4281
msgid "Mark all as unread"
msgstr "Marcar todo como no leído"
-#: src/folderview.c:874
+#: src/folderview.c:873
msgid ""
"Do you really want to mark all mails in this folder and its sub-folders as "
"unread?"
@@ -3793,95 +3774,95 @@ msgstr ""
"¿Desea marcar todos los correos en esta carpeta y sus subcarpetas como no "
"leídos?"
-#: src/folderview.c:876 src/summaryview.c:4222
+#: src/folderview.c:875 src/summaryview.c:4282
msgid "Do you really want to mark all mails in this folder as unread?"
msgstr ""
"¿Quiere realmente marcar todos los correos en la carpeta como no leídos?"
-#: src/folderview.c:1066 src/imap.c:4606
+#: src/folderview.c:1065 src/imap.c:4631
#, c-format
msgid "Scanning folder %s/%s..."
msgstr "Revisando carpeta %s/%s..."
-#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
+#: src/folderview.c:1068 src/imap.c:4635 src/mainwindow.c:5235 src/setup.c:96
#, c-format
msgid "Scanning folder %s..."
msgstr "Revisando carpeta %s..."
-#: src/folderview.c:1100
+#: src/folderview.c:1099
msgid "Rebuild folder tree"
msgstr "Reconstruir árbol de carpetas"
-#: src/folderview.c:1101
+#: src/folderview.c:1100
msgid ""
"Rebuilding the folder tree will remove local caches. Do you want to continue?"
msgstr ""
"Reconstruir el árbol de carpetas eliminará la caché local. ¿Desea continuar?"
-#: src/folderview.c:1111
+#: src/folderview.c:1110
msgid "Rebuilding folder tree..."
msgstr "Reconstruyendo árbol de carpetas..."
-#: src/folderview.c:1113
+#: src/folderview.c:1112
msgid "Scanning folder tree..."
msgstr "Explorando árbol de carpetas..."
-#: src/folderview.c:1204
+#: src/folderview.c:1203
#, c-format
msgid "Couldn't scan folder %s\n"
msgstr "No se puede explorar la carpeta %s\n"
-#: src/folderview.c:1258
+#: src/folderview.c:1257
msgid "Checking for new messages in all folders..."
msgstr "Comprobar mensajes nuevos en todas las carpetas..."
-#: src/folderview.c:2229
+#: src/folderview.c:2228
#, c-format
msgid "Closing folder %s..."
msgstr "Cerrando carpeta %s..."
-#: src/folderview.c:2324
+#: src/folderview.c:2323
#, c-format
msgid "Opening folder %s..."
msgstr "Abriendo carpeta %s..."
-#: src/folderview.c:2342
+#: src/folderview.c:2341
msgid "Folder could not be opened."
msgstr "No se puede abrir la carpeta."
-#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
+#: src/folderview.c:2483 src/mainwindow.c:2880 src/mainwindow.c:2885
msgid "Empty trash"
msgstr "Vaciar papelera"
-#: src/folderview.c:2485
+#: src/folderview.c:2484
msgid "Delete all messages in trash?"
msgstr "¿Borrar todos los mensajes de la papelera?"
-#: src/folderview.c:2486
+#: src/folderview.c:2485
msgid "_Empty trash"
msgstr "_Vaciar papelera"
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
+#: src/folderview.c:2529 src/inc.c:1635 src/toolbar.c:3020
msgid "Offline warning"
msgstr "Notificación conexión"
-#: src/folderview.c:2530 src/toolbar.c:3009
+#: src/folderview.c:2530 src/toolbar.c:3021
msgid "You're working offline. Override?"
msgstr "Está trabajando sin conexión ¿Ignorar?"
-#: src/folderview.c:2541 src/toolbar.c:3028
+#: src/folderview.c:2541 src/toolbar.c:3040
msgid "Send queued messages"
msgstr "Enviar mensajes en la cola"
-#: src/folderview.c:2542 src/toolbar.c:3029
+#: src/folderview.c:2542 src/toolbar.c:3041
msgid "Send all queued messages?"
msgstr "¿Enviar todos los mensajes en la cola?"
-#: src/folderview.c:2551 src/toolbar.c:3048
+#: src/folderview.c:2551 src/toolbar.c:3060
msgid "Some errors occurred while sending queued messages."
msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
-#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
+#: src/folderview.c:2554 src/main.c:2792 src/toolbar.c:3063
#, c-format
msgid ""
"Some errors occurred while sending queued messages:\n"
@@ -3947,7 +3928,7 @@ msgstr "¡Mover falló!"
msgid "Processing configuration for folder %s"
msgstr "Configuración de procesamiento para la carpeta «%s»"
-#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
+#: src/folderview.c:3176 src/summaryview.c:4690 src/summaryview.c:4796
msgid "The destination folder can only be used to store subfolders."
msgstr "La carpeta destino sólo puede usarse para almacenar subcarpetas."
@@ -3971,7 +3952,7 @@ msgstr " Buscar "
msgid "Newsgroup name"
msgstr "Nombre de grupo"
-#: src/grouplistdialog.c:205 src/prefs_send.c:184
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
msgid "Messages"
msgstr "Mensajes"
@@ -3997,7 +3978,7 @@ msgstr "desconocido"
msgid "Can't retrieve newsgroup list."
msgstr "No se puede obtener la lista de grupos."
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
+#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1863 src/summaryview.c:1626
msgid "Done."
msgstr "Hecho."
@@ -4031,11 +4012,11 @@ msgstr ""
#: src/gtk/about.c:162 src/gtk/about.c:850
msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2018\n"
"The Claws Mail Team\n"
"and Hiroyuki Yamamoto"
msgstr ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2018\n"
"El equipo de Claws Mail\n"
"e Hiroyuki Yamamoto"
@@ -4070,7 +4051,7 @@ msgstr ""
"Localización: %s (caracteres: %s)\n"
"Sistema operativo: desconocido"
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
+#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:528
msgid "The Claws Mail Team"
msgstr "El equipo de Claws Mail"
@@ -4190,44 +4171,44 @@ msgstr ""
"Debería haber recibido una copia de la GNU General Public License junto con "
"este programa; en caso contrario, vea "
-#: src/gtk/about.c:717 src/main.c:2604
+#: src/gtk/about.c:717 src/main.c:2616
msgid "Session statistics\n"
msgstr "Estadísticas de sesión\n"
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2626 src/main.c:2629
#, c-format
msgid "Started: %s\n"
msgstr "Iniciado: %s\n"
-#: src/gtk/about.c:737 src/main.c:2623
+#: src/gtk/about.c:737 src/main.c:2635
msgid "Incoming traffic\n"
msgstr "Tráfico entrante\n"
-#: src/gtk/about.c:740 src/main.c:2626
+#: src/gtk/about.c:740 src/main.c:2638
#, c-format
msgid "Received messages: %d\n"
msgstr "Mensajes recibidos: %d\n"
-#: src/gtk/about.c:747 src/main.c:2632
+#: src/gtk/about.c:747 src/main.c:2644
msgid "Outgoing traffic\n"
msgstr "Tráfico saliente\n"
-#: src/gtk/about.c:750 src/main.c:2635
+#: src/gtk/about.c:750 src/main.c:2647
#, c-format
msgid "New/redirected messages: %d\n"
msgstr "Mensajes nuevos/redirigidos: %d\n"
-#: src/gtk/about.c:755 src/main.c:2639
+#: src/gtk/about.c:755 src/main.c:2651
#, c-format
msgid "Replied messages: %d\n"
msgstr "Mensajes respondidos: %d\n"
-#: src/gtk/about.c:760 src/main.c:2643
+#: src/gtk/about.c:760 src/main.c:2655
#, c-format
msgid "Forwarded messages: %d\n"
msgstr "Mensajes reenviados: %d\n"
-#: src/gtk/about.c:765 src/main.c:2647
+#: src/gtk/about.c:765 src/main.c:2659
#, c-format
msgid "Total outgoing messages: %d\n"
msgstr "Total mensajes salientes: %d\n"
@@ -4260,77 +4241,77 @@ msgstr "_Notas de la versión"
msgid "_Statistics"
msgstr "E_stadísticas"
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:363
msgid "Orange"
msgstr "Naranja"
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:367
msgid "Red"
msgstr "Rojo"
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:371
msgid "Pink"
msgstr "Rosa"
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:375
msgid "Sky blue"
msgstr "Azul cielo"
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:379
msgid "Blue"
msgstr "Azul"
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:383
msgid "Green"
msgstr "Verde"
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:387
msgid "Brown"
msgstr "Marrón"
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:391
msgid "Grey"
msgstr "Gris"
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:395
msgid "Light brown"
msgstr "Marrón claro"
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:399
msgid "Dark red"
msgstr "Rojo oscuro"
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:403
msgid "Dark pink"
msgstr "Rosa oscuro"
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:407
msgid "Steel blue"
msgstr "Azul acero"
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:411
msgid "Gold"
msgstr "Dorado"
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:415
msgid "Bright green"
msgstr "Verde brillante"
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:419
msgid "Magenta"
msgstr "Magenta"
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:241
msgid "Set mailbox order"
msgstr "Establecer orden de los buzones"
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:275
msgid "Move mailboxes up or down to change the sort order in the Folder list."
msgstr ""
"Mueva los buzones arriba o abajo para cambiar la posición en la lista de "
"carpetas."
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:309
msgid "Mailboxes"
msgstr "Buzones"
@@ -4356,16 +4337,16 @@ msgstr "No se pudo inicializar el diccionario %s:"
msgid "No misspelled word found."
msgstr "No se encontraron faltas ortográficas."
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
msgid "Replace unknown word"
msgstr "Sustituir palabra desconocida"
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
#, c-format
msgid "Replace \"%s\" with: "
msgstr "Sustituir «%s» con: "
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
msgid ""
"Holding down Control key while pressing Enter\n"
"will learn from mistake.\n"
@@ -4373,55 +4354,55 @@ msgstr ""
"Si pulsa la tecla Control junto con el Retorno\n"
"de carro se aprenderá del error.\n"
-#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
msgid "More..."
msgstr "Más..."
-#: src/gtk/gtkaspell.c:1861
+#: src/gtk/gtkaspell.c:1867
#, c-format
msgid "\"%s\" unknown in dictionary '%s'"
msgstr "«%s» desconocida en el diccionario «%s»"
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1883
msgid "Accept in this session"
msgstr "Aceptar para esta sesión"
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1893
msgid "Add to personal dictionary"
msgstr "Añadir al diccionario personal"
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1903
msgid "Replace with..."
msgstr "Sustituir por..."
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1916
#, c-format
msgid "Check with %s"
msgstr " Comprobar con %s"
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1938
msgid "(no suggestions)"
msgstr "(no hay sugerencias)"
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2012
#, c-format
msgid "Dictionary: %s"
msgstr "Diccionario: %s"
-#: src/gtk/gtkaspell.c:2021
+#: src/gtk/gtkaspell.c:2027
#, c-format
msgid "Use alternate (%s)"
msgstr "Usar alternativo (%s)"
-#: src/gtk/gtkaspell.c:2032
+#: src/gtk/gtkaspell.c:2038
msgid "Use both dictionaries"
msgstr "Usar ambos diccionarios"
-#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
msgid "Check while typing"
msgstr "Comprobar mientras se escribe"
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:2154
#, c-format
msgid ""
"The spell checker could not change dictionary.\n"
@@ -4430,7 +4411,7 @@ msgstr ""
"El corrector no pudo cambiar de diccionario.\n"
"%s"
-#: src/gtk/gtkaspell.c:2203
+#: src/gtk/gtkaspell.c:2210
#, c-format
msgid ""
"The spell checker could not change the alternate dictionary.\n"
@@ -4439,26 +4420,26 @@ msgstr ""
"El corrector ortográfico no pudo cambiar el diccionario alternativo.\n"
"%s"
-#: src/gtk/gtkutils.c:1939
+#: src/gtk/gtkutils.c:1868
msgid "Failed: no service record found."
msgstr "Falló: no hay registro del servicio."
-#: src/gtk/gtkutils.c:1942
+#: src/gtk/gtkutils.c:1871
msgid "Failed: network error."
msgstr "Falló: error de la red."
-#: src/gtk/gtkutils.c:1945
+#: src/gtk/gtkutils.c:1874
#, c-format
msgid "Failed: unknown error (%d)."
msgstr "Falló: error desconocido (%d)."
-#: src/gtk/gtkutils.c:2015
+#: src/gtk/gtkutils.c:1944
msgid "Configuring..."
msgstr "Configurando..."
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1242
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:442
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:448
msgid "Date"
msgstr "Fecha"
@@ -4466,13 +4447,13 @@ msgstr "Fecha"
msgid "Date:"
msgstr "Fecha:"
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1239
+#: src/prefs_matcher.c:2161 src/prefs_summaries.c:444
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:446
msgid "From"
msgstr "Desde"
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:416
msgid "From:"
msgstr "Desde:"
@@ -4488,14 +4469,14 @@ msgstr "Remitente:"
msgid "Reply-To"
msgstr "Responder-A"
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1240
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:445
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:447
msgid "To"
msgstr "Para"
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1241
+#: src/prefs_matcher.c:2163 src/quote_fmt.c:58
msgid "Cc"
msgstr "Cc"
@@ -4503,8 +4484,8 @@ msgstr "Cc"
msgid "Bcc"
msgstr "Bcc"
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1243
+#: src/prefs_matcher.c:2165 src/quote_fmt.c:61
msgid "Message-ID"
msgstr "ID-Mensaje"
@@ -4516,8 +4497,8 @@ msgstr "ID-Mensaje:"
msgid "In-Reply-To"
msgstr "En-Respuesta-A"
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
-#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1245
+#: src/prefs_matcher.c:2167 src/quote_fmt.c:60
msgid "References"
msgstr "Referencias"
@@ -4525,18 +4506,18 @@ msgstr "Referencias"
msgid "References:"
msgstr "Referencias:"
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1238
+#: src/prefs_matcher.c:2160 src/prefs_summaries.c:446
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:445
msgid "Subject"
msgstr "Asunto"
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
-#: src/summary_search.c:488
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/summary_search.c:430
msgid "Subject:"
msgstr "Asunto:"
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
msgid "Comments"
msgstr "Comentarios"
@@ -4548,7 +4529,7 @@ msgstr "Comentarios:"
msgid "Keywords"
msgstr "Palabras-Clave"
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:706
msgid "Keywords:"
msgstr "Palabras-Clave:"
@@ -4624,8 +4605,8 @@ msgstr "Recibido"
msgid "Received:"
msgstr "Recibido:"
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1244
+#: src/prefs_matcher.c:2166 src/quote_fmt.c:59
msgid "Newsgroups"
msgstr "Grupos"
@@ -4651,11 +4632,11 @@ msgstr "Visto:"
#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2823
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/summaryview.c:2853
msgid "Status"
msgstr "Estado"
-#: src/gtk/headers.h:37 src/prefs_themes.c:1033
+#: src/gtk/headers.h:37
msgid "Status:"
msgstr "Estado:"
@@ -4723,7 +4704,7 @@ msgstr "Precedencia"
msgid "Precedence:"
msgstr "Precedencia:"
-#: src/gtk/headers.h:46 src/prefs_account.c:1078
+#: src/gtk/headers.h:46 src/prefs_account.c:1170
msgid "Organization"
msgstr "Organización"
@@ -4954,35 +4935,39 @@ msgstr ""
"Los siguientes iconos se usan para mostrar el estado de los mensajes y las "
"carpetas:"
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
#, c-format
msgid "Input password for %s on %s:"
msgstr "Contraseña para %s en %s:"
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
#, c-format
msgid "Input password for %s:"
msgstr "Introduzca contraseña para %s:"
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
msgid "Input password:"
msgstr "Introduzca contraseña:"
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
msgid "Input password"
msgstr "Introducir contraseña"
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
msgid "Remember password for this session"
msgstr "Recordar la contraseña para esta sesión"
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
msgid "Remember this"
msgstr "Recordar esto"
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:453
+msgid "_Go to last error"
+msgstr "_Ir al último error"
+
+#: src/gtk/logwindow.c:460
msgid "Clear _Log"
msgstr "_Limpiar traza"
@@ -5033,18 +5018,18 @@ msgstr ""
"\n"
"%s\n"
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:791
#: src/plugins/address_keeper/address_keeper_prefs.c:273
#: src/plugins/archive/archiver_prefs.c:106
#: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bogofilter/bogofilter_gtk.c:482
#: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
#: src/plugins/fancy/fancy_prefs.c:114
#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
#: src/plugins/gdata/cm_gdata_prefs.c:137
#: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:427
+#: src/plugins/managesieve/sieve_prefs.c:423
#: src/plugins/notification/notification_prefs.c:398
#: src/plugins/notification/notification_prefs.c:413
#: src/plugins/notification/notification_prefs.c:432
@@ -5053,11 +5038,11 @@ msgstr ""
#: src/plugins/notification/notification_prefs.c:486
#: src/plugins/notification/notification_prefs.c:504
#: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
#: src/plugins/rssyl/rssyl_prefs.c:70
#: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
msgid "Plugins"
msgstr "Módulos"
@@ -5069,7 +5054,7 @@ msgstr "_Cargar..."
msgid "_Unload"
msgstr "_Descargar"
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
msgid "Description"
msgstr "Descripción"
@@ -5095,16 +5080,16 @@ msgstr "Módulos cargados"
msgid "Page Index"
msgstr "Índice de páginas"
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:842
msgid "_Hide"
msgstr "_Ocultar"
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
-#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
-#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
-#: src/prefs_account.c:3477 src/prefs_account.c:3570
-#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1879
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:692
+#: src/prefs_account.c:3717 src/prefs_account.c:3735 src/prefs_account.c:3753
+#: src/prefs_account.c:3771 src/prefs_account.c:3789 src/prefs_account.c:3807
+#: src/prefs_account.c:3826 src/prefs_account.c:3919 src/prefs_account.c:3937
+#: src/prefs_filtering_action.c:1401 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1883
msgid "Account"
msgstr "Cuenta"
@@ -5307,7 +5292,7 @@ msgstr ""
"se permiten todas las expresiones de filtrado, pero no se pueden mezclar "
"usando operadores lógicos con las expresiones anteriores"
-#: src/gtk/quicksearch.c:537 src/summary_search.c:521
+#: src/gtk/quicksearch.c:537 src/summary_search.c:463
msgid "Extended Search"
msgstr "Búsqueda extendida"
@@ -5345,27 +5330,27 @@ msgstr "Mientras teclea"
msgid "Run on select"
msgstr "Ejecutar sobre la selección"
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:784
msgid "Clear the current search"
msgstr "Limpiar la búsqueda actual"
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:794 src/summary_search.c:414
msgid "Edit search criteria"
msgstr "Editar el criterio de búsqueda"
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:803
msgid "Information about extended symbols"
msgstr "Información sobre los símbolos extendidos"
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:841 src/gtk/quicksearch.c:865
msgid "_Information"
msgstr "_Información"
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:842 src/gtk/quicksearch.c:866
msgid "E_dit"
msgstr "E_ditar"
-#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
+#: src/gtk/quicksearch.c:843 src/gtk/quicksearch.c:867 src/prefs_actions.c:347
#: src/prefs_filtering.c:495 src/prefs_template.c:329
msgid "C_lear"
msgstr "_Limpiar"
@@ -5384,7 +5369,6 @@ msgid "Signer"
msgstr "Firmante"
#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:989
msgid "Name: "
msgstr "Nombre: "
@@ -5515,15 +5499,15 @@ msgstr "Etiquetas:"
#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
#: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3423
-#: src/summaryview.c:3441 src/summaryview.c:3462
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3453
+#: src/summaryview.c:3471 src/summaryview.c:3510
msgid "(No From)"
msgstr "(Sin remite)"
#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
#: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3474
-#: src/summaryview.c:3477
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3522
+#: src/summaryview.c:3525
msgid "(No Subject)"
msgstr "(Sin asunto)"
@@ -5531,9 +5515,9 @@ msgstr "(Sin asunto)"
msgid "Error:"
msgstr "Error:"
-#: src/image_viewer.c:299 src/mimeview.c:2611
+#: src/image_viewer.c:299 src/mimeview.c:2613
#: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/plugins/pdf_viewer/poppler_viewer.c:700
msgid "Filename:"
msgstr "Nombre del fichero:"
@@ -5811,17 +5795,17 @@ msgstr "Falló la conexión con %s"
msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
msgstr "La conexión IMAP con %s se ha desconectado. Reconectando...\n"
-#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
-#: src/imap.c:4587 src/imap.c:5398
+#: src/imap.c:1039 src/imap.c:3681 src/imap.c:4340 src/imap.c:4434
+#: src/imap.c:4612 src/imap.c:5423
msgid "Claws Mail needs network access in order to access the IMAP server."
msgstr ""
"Claws Mail necesita acceso a la red para poder acceder al servidor IMAP."
-#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1149 src/inc.c:869 src/news.c:400 src/send_message.c:284
msgid "Insecure connection"
msgstr "Conexión insegura"
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1150 src/inc.c:870 src/news.c:401 src/send_message.c:285
msgid ""
"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
"not available in this build of Claws Mail. \n"
@@ -5834,104 +5818,108 @@ msgstr ""
"\n"
"¿Quiere seguir conectando con este servidor? La comunicación no sería segura."
-#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1156 src/inc.c:876 src/news.c:407 src/send_message.c:291
msgid "Con_tinue connecting"
msgstr "Seguir conec_tando"
-#: src/imap.c:1165
+#: src/imap.c:1166
#, c-format
msgid "Account '%s': Connecting to IMAP server: %s:%d..."
msgstr "Cuenta «%s»: Conectando al servidor IMAP: %s:%d..."
-#: src/imap.c:1213
+#: src/imap.c:1231
#, c-format
msgid "Can't connect to IMAP server: %s:%d"
msgstr "No se puede conectar al servidor IMAP: %s:%d"
-#: src/imap.c:1216
+#: src/imap.c:1234
#, c-format
msgid "Can't connect to IMAP server: %s:%d\n"
msgstr "No se puede conectar al servidor IMAP: %s:%d\n"
-#: src/imap.c:1249 src/imap.c:4077
+#: src/imap.c:1266 src/imap.c:4102
msgid "Can't start STARTTLS session.\n"
msgstr "No se puede iniciar la sesión STARTTLS.\n"
-#: src/imap.c:1316
+#: src/imap.c:1333
#, c-format
msgid "Couldn't login to IMAP server %s.\n"
msgstr "No se puede entrar al servidor IMAP %s.\n"
-#: src/imap.c:1319
+#: src/imap.c:1336
#, c-format
msgid "Couldn't login to IMAP server %s."
msgstr "No se puede entrar al servidor IMAP %s."
-#: src/imap.c:1747
+#: src/imap.c:1764
msgid "Adding messages..."
msgstr "Añadiendo mensajes..."
-#: src/imap.c:1952 src/mh.c:529
+#: src/imap.c:1969 src/mh.c:529
msgid "Copying messages..."
msgstr "Copiando mensajes..."
-#: src/imap.c:2545
+#: src/imap.c:2491
+msgid "Search failed due to server error."
+msgstr "La búsqueda falló debido a un error en el servidor."
+
+#: src/imap.c:2570
msgid "can't set deleted flags\n"
msgstr "no se pueden establecer los flags «borrado»\n"
-#: src/imap.c:2552 src/imap.c:5028
+#: src/imap.c:2577 src/imap.c:5053
msgid "can't expunge\n"
msgstr "no puedo purgar\n"
-#: src/imap.c:2903
+#: src/imap.c:2928
#, c-format
msgid "Looking for unsubscribed folders in %s..."
msgstr "Buscando carpetas no suscritas en %s..."
-#: src/imap.c:2906
+#: src/imap.c:2931
#, c-format
msgid "Looking for subfolders of %s..."
msgstr "Buscando subcarpetas de %s..."
-#: src/imap.c:3196
+#: src/imap.c:3221
msgid "can't create mailbox: LIST failed\n"
msgstr "no puedo crear el buzón: LIST falló\n"
-#: src/imap.c:3211
+#: src/imap.c:3236
msgid "can't create mailbox\n"
msgstr "no puedo crear el buzón\n"
-#: src/imap.c:3342
+#: src/imap.c:3367
#, c-format
msgid "can't rename mailbox: %s to %s\n"
msgstr "no puedo renombrar el buzón: %s a %s\n"
-#: src/imap.c:3455
+#: src/imap.c:3480
msgid "can't delete mailbox\n"
msgstr "no se puede borrar el buzón\n"
-#: src/imap.c:3734
+#: src/imap.c:3759
msgid "LIST failed\n"
msgstr "LIST falló\n"
-#: src/imap.c:3819
+#: src/imap.c:3844
msgid "Flagging messages..."
msgstr "Etiquetando mensajes..."
-#: src/imap.c:3922
+#: src/imap.c:3947
#, c-format
msgid "can't select folder: %s\n"
msgstr "no se puede seleccionar la carpeta: %s\n"
-#: src/imap.c:4074
+#: src/imap.c:4099
msgid "Server requires STARTTLS to log in.\n"
msgstr "El servidor necesita STARTTLS para acceder a él.\n"
-#: src/imap.c:4084
+#: src/imap.c:4109
msgid "Can't refresh capabilities.\n"
msgstr "No se pueden refrescar las capacidades.\n"
-#: src/imap.c:4089
+#: src/imap.c:4114
#, c-format
msgid ""
"Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5940,20 +5928,20 @@ msgstr ""
"La conexión con %s falló: el servidor necesita STARTTLS, pero Claws Mail ha "
"sido compilado sin soporte para STARTTLS.\n"
-#: src/imap.c:4097
+#: src/imap.c:4122
msgid "Server logins are disabled.\n"
msgstr "Los accesos al servidor están deshabilitados.\n"
-#: src/imap.c:4320
+#: src/imap.c:4345
msgid "Fetching message..."
msgstr "Recuperando mensaje..."
-#: src/imap.c:5021
+#: src/imap.c:5046
#, c-format
msgid "can't set deleted flags: %d\n"
msgstr "no se pueden establecer los flags 'borrado': %d\n"
-#: src/imap.c:6056
+#: src/imap.c:6081
msgid ""
"You have one or more IMAP accounts defined. However this version of Claws "
"Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6004,7 +5992,7 @@ msgstr "S_uscripciones"
msgid "_Subscribe..."
msgstr "_Suscribir..."
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:170
msgid "_Unsubscribe..."
msgstr "Des_uscribir..."
@@ -6041,20 +6029,20 @@ msgstr "Heredar las propiedades de la carpeta padre"
#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2056
#, c-format
msgid "Input new name for '%s':"
msgstr "Introduzca el nuevo nombre para «%s»:"
#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/vcalendar/vcal_folder.c:2057
msgid "Rename folder"
msgstr "Renombrar carpeta"
#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/vcalendar/vcal_folder.c:2077
msgid ""
"The folder could not be renamed.\n"
"The new folder name is not allowed."
@@ -6087,7 +6075,7 @@ msgstr ""
#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2005
+#: src/plugins/vcalendar/vcal_folder.c:2010
#, c-format
msgid "Can't remove the folder '%s'."
msgstr "No se puede eliminar la carpeta «%s»."
@@ -6114,7 +6102,7 @@ msgstr "_Buscar"
msgid "Choose a subfolder of %s to subscribe to: "
msgstr "Elija una subcarpeta de %s a la que suscribirse: "
-#: src/imap_gtk.c:536 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:681
msgid "Subscribe"
msgstr "Suscribir"
@@ -6147,8 +6135,8 @@ msgstr "suscribir"
msgid "unsubscribe"
msgstr "desuscribir"
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
-#: src/prefs_folder_item.c:1503
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1446 src/prefs_folder_item.c:1474
+#: src/prefs_folder_item.c:1502
msgid "Apply to subfolders"
msgstr "Aplicar a subcarpetas"
@@ -6156,7 +6144,7 @@ msgstr "Aplicar a subcarpetas"
msgid "_Subscribe"
msgstr "_Suscribir"
-#: src/imap_gtk.c:575 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
msgid "_Unsubscribe"
msgstr "Des_uscribir"
@@ -6208,23 +6196,23 @@ msgstr "Seleccione y renombre los campos LDIF a importar."
msgid "File imported."
msgstr "Fichero importado."
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
msgid "Please select a file."
msgstr "Seleccione un fichero."
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
msgid "Address book name must be supplied."
msgstr "Debe proporcionar un nombre de agenda de direcciones."
-#: src/importldif.c:496
+#: src/importldif.c:380
msgid "LDIF file imported successfully."
msgstr "Fichero LDIF importado con éxito."
-#: src/importldif.c:581
+#: src/importldif.c:465
msgid "Select LDIF File"
msgstr "Seleccionar fichero LDIF"
-#: src/importldif.c:667
+#: src/importldif.c:551
msgid ""
"Specify the name for the address book that will be created from the LDIF "
"file data."
@@ -6232,43 +6220,43 @@ msgstr ""
"Especifique el nombre para la agenda que será creada a partir de los datos "
"del fichero LDIF."
-#: src/importldif.c:672
+#: src/importldif.c:556
msgid "File Name"
msgstr "Nombre del fichero"
-#: src/importldif.c:682
+#: src/importldif.c:566
msgid "The full file specification of the LDIF file to import."
msgstr "La especificación completa del fichero LDIF a importar."
-#: src/importldif.c:689
+#: src/importldif.c:573
msgid "Select the LDIF file to import."
msgstr "Seleccione el fichero LDIF a importar."
-#: src/importldif.c:725
+#: src/importldif.c:705
msgid "R"
msgstr "R"
-#: src/importldif.c:726 src/summaryview.c:441
+#: src/importldif.c:710 src/summaryview.c:443
msgid "S"
msgstr "S"
-#: src/importldif.c:727
+#: src/importldif.c:716
msgid "LDIF Field Name"
msgstr "Nombre de campo LDIF"
-#: src/importldif.c:728
+#: src/importldif.c:721
msgid "Attribute Name"
msgstr "Nombre de atributo"
-#: src/importldif.c:783
+#: src/importldif.c:740
msgid "LDIF Field"
msgstr "Campo LDIF"
-#: src/importldif.c:795
+#: src/importldif.c:752
msgid "Attribute"
msgstr "Atributo"
-#: src/importldif.c:807
+#: src/importldif.c:764
msgid ""
"Choose the LDIF field that will be renamed or selected for import in the "
"list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6286,35 +6274,35 @@ msgstr ""
"debajo de la lista. Doble clic en cualquier parte de la fila y también será "
"seleccionado el campo para importar."
-#: src/importldif.c:822
+#: src/importldif.c:779
msgid "The LDIF field can be renamed to the User Attribute name."
msgstr "El campo LDIF puede renombrarse al nombre del atributo de usuario."
-#: src/importldif.c:827
+#: src/importldif.c:784
msgid "Select for Import"
msgstr "Seleccionar para importar"
-#: src/importldif.c:832
+#: src/importldif.c:789
msgid "Select the LDIF field for import into the address book."
msgstr "Seleccionar el campo LDIF para importarlo a la agenda."
-#: src/importldif.c:834
+#: src/importldif.c:791
msgid " Modify "
msgstr " Modificar "
-#: src/importldif.c:839
+#: src/importldif.c:796
msgid "This button will update the list above with the data supplied."
msgstr "Este botón actualizará la lista superior con los datos proporcionados."
-#: src/importldif.c:911
+#: src/importldif.c:870
msgid "Records Imported:"
msgstr "Registros importados :"
-#: src/importldif.c:943
+#: src/importldif.c:902
msgid "Import LDIF file into Address Book"
msgstr "Importar fichero LDIF a la agenda"
-#: src/importldif.c:980
+#: src/importldif.c:939
msgid "Proceed"
msgstr "Proceder"
@@ -6346,7 +6334,7 @@ msgstr "Seleccionar fichero Pine"
msgid "Import Pine file into Address Book"
msgstr "Importar fichero Pine a la agenda"
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:190 src/inc.c:298 src/inc.c:324
msgid "Claws Mail needs network access in order to get mails."
msgstr "Claws Mail necesita acceso a la red para poder obtener el correo."
@@ -6355,133 +6343,133 @@ msgstr "Claws Mail necesita acceso a la red para poder obtener el correo."
msgid "%s failed\n"
msgstr "%s falló\n"
-#: src/inc.c:416
+#: src/inc.c:472
msgid "Retrieving new messages"
msgstr "Obteniendo nuevos mensajes"
-#: src/inc.c:474
+#: src/inc.c:530
msgid "Standby"
msgstr "En espera"
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:671 src/inc.c:725
msgid "Cancelled"
msgstr "Cancelado"
-#: src/inc.c:626
+#: src/inc.c:682
msgid "Retrieving"
msgstr "Recuperando"
-#: src/inc.c:635
+#: src/inc.c:691
#, c-format
msgid "Done (%d message (%s) received)"
msgid_plural "Done (%d messages (%s) received)"
msgstr[0] "Hecho (%d mensaje (%s) recibido)"
msgstr[1] "Hecho (%d mensajes (%s) recibidos)"
-#: src/inc.c:641
+#: src/inc.c:697
msgid "Done (no new messages)"
msgstr "Hecho (no hay mensajes nuevos)"
-#: src/inc.c:646
+#: src/inc.c:702
msgid "Connection failed"
msgstr "Conexión fallida"
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:705 src/plugins/managesieve/managesieve.c:888
msgid "Auth failed"
msgstr "Autorización fallida"
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
+#: src/inc.c:712 src/prefs_matcher.c:397 src/prefs_summaries.c:453
+#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6497
msgid "Locked"
msgstr "Bloqueado"
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:722 src/plugins/spamassassin/spamassassin_gtk.c:394
msgid "Timeout"
msgstr "Tiempo límite"
-#: src/inc.c:752
+#: src/inc.c:808
#, c-format
msgid "Finished (%d new message)"
msgid_plural "Finished (%d new messages)"
msgstr[0] "Finalizado (%d mensaje nuevo)"
msgstr[1] "Finalizado (%d mensajes nuevos)"
-#: src/inc.c:756
+#: src/inc.c:812
msgid "Finished (no new messages)"
msgstr "Finalizado (no hay mensajes nuevos)"
-#: src/inc.c:795
+#: src/inc.c:853
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s: Recuperando nuevos mensajes"
-#: src/inc.c:825
+#: src/inc.c:883
#, c-format
msgid "Account '%s': Connecting to POP3 server: %s:%d..."
msgstr "Cuenta «%s»: Conectando al servidor POP3: %s:%d..."
-#: src/inc.c:843
+#: src/inc.c:917
#, c-format
msgid "Can't connect to POP3 server: %s:%d"
msgstr "No se puede conectar al servidor POP3: %s:%d"
-#: src/inc.c:847
+#: src/inc.c:921
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "No se puede conectar al servidor POP3: %s:%d\n"
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1001 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:514
msgid "Authenticating..."
msgstr "Autentificando..."
-#: src/inc.c:929
+#: src/inc.c:1003
#, c-format
msgid "Retrieving messages from %s (%s)..."
msgstr "Obteniendo mensajes de %s (%s)..."
-#: src/inc.c:935
+#: src/inc.c:1009
msgid "Getting the number of new messages (STAT)..."
msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
-#: src/inc.c:939
+#: src/inc.c:1013
msgid "Getting the number of new messages (LAST)..."
msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
-#: src/inc.c:943
+#: src/inc.c:1017
msgid "Getting the number of new messages (UIDL)..."
msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
-#: src/inc.c:947
+#: src/inc.c:1021
msgid "Getting the size of messages (LIST)..."
msgstr "Obteniendo el tamaño de los mensajes (LIST)..."
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1028 src/send_message.c:532
msgid "Quitting"
msgstr "Saliendo"
-#: src/inc.c:979
+#: src/inc.c:1053
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
-#: src/inc.c:992
+#: src/inc.c:1066
#, c-format
msgid "Retrieving (%d message (%s) received)"
msgid_plural "Retrieving (%d messages (%s) received)"
msgstr[0] "Recuperando (%d mensaje (%s) recibido)"
msgstr[1] "Recuperando (%d mensajes (%s) recibidos)"
-#: src/inc.c:1151
+#: src/inc.c:1225
#, c-format
msgid "Connection to %s:%d failed."
msgstr "Ha fallado la conexión con %s:%d."
-#: src/inc.c:1156
+#: src/inc.c:1230
msgid "Error occurred while processing mail."
msgstr "Ocurrió un error mientras se procesaba el correo."
-#: src/inc.c:1162
+#: src/inc.c:1236
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -6490,37 +6478,37 @@ msgstr ""
"Ocurrió un error mientras se procesaba el correo:\n"
"%s"
-#: src/inc.c:1168
+#: src/inc.c:1242
msgid "No disk space left."
msgstr "No hay espacio libre en disco."
-#: src/inc.c:1173
+#: src/inc.c:1247
msgid "Can't write file."
msgstr "No se puede escribir el fichero."
-#: src/inc.c:1178
+#: src/inc.c:1252
msgid "Socket error."
msgstr "Error de conector."
-#: src/inc.c:1181
+#: src/inc.c:1255
#, c-format
msgid "Socket error on connection to %s:%d."
msgstr "Error de conector conectando con %s:%d."
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1260 src/send_message.c:443 src/send_message.c:706
msgid "Connection closed by the remote host."
msgstr "Conexión cerrada por la máquina remota."
-#: src/inc.c:1189
+#: src/inc.c:1263
#, c-format
msgid "Connection to %s:%d closed by the remote host."
msgstr "Conexión con %s:%d cerrada por la máquina remota."
-#: src/inc.c:1194
+#: src/inc.c:1268
msgid "Mailbox is locked."
msgstr "El buzón está bloqueado."
-#: src/inc.c:1198
+#: src/inc.c:1272
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -6529,11 +6517,11 @@ msgstr ""
"El buzón está bloqueado:\n"
"%s"
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1278 src/send_message.c:691
msgid "Authentication failed."
msgstr "La autenticación falló."
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1284 src/send_message.c:694
#, c-format
msgid ""
"Authentication failed:\n"
@@ -6542,7 +6530,7 @@ msgstr ""
"La autenticación falló:\n"
"%s"
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1289 src/send_message.c:710
msgid ""
"Session timed out. You may be able to recover by increasing the timeout "
"value in Preferences/Other/Miscellaneous."
@@ -6550,38 +6538,63 @@ msgstr ""
"La sesión ha expirado. Puede ser capaz de recuperarla incrementando el "
"tiempo límite de la sesión en «Preferencias/Otras/Miscelánea»."
-#: src/inc.c:1220
+#: src/inc.c:1294
#, c-format
msgid "Connection to %s:%d timed out."
msgstr "La conexión con %s:%d excedió el límite de tiempo."
-#: src/inc.c:1258
+#: src/inc.c:1332
msgid "Incorporation cancelled\n"
msgstr "Incorporación cancelada\n"
-#: src/inc.c:1523
+#: src/inc.c:1625
#, c-format
msgid "%s%sYou're working offline. Override for %d minutes?"
msgstr "%s%sEstá trabajando sin conexión. ¿Ignorarlo durante %d minutos?"
-#: src/inc.c:1529
+#: src/inc.c:1631
#, c-format
msgid "%s%sYou're working offline. Override?"
msgstr "%s%sEstá trabajando sin conexión ¿Ignorar?"
-#: src/inc.c:1536
+#: src/inc.c:1638
msgid "On_ly once"
msgstr "Só_lo una vez"
-#: src/ldapupdate.c:1044
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr "Error LDAP (buscar): para el atributo «%s»: %d (%s)\n"
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr "Error LDAP (modificar): para el DN «%s»: %d (%s)\n"
+
+#: src/ldapupdate.c:1046
msgid "Some SN"
msgstr "Algún SN"
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr "Error LDAP (renombrar): de «%s» a «%s»: %d (%s)\n"
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): succesful\n"
+msgstr "LDAP (buscar): con éxito\n"
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr "Error LDAP (buscar): %d (%s)\n"
+
#: src/ldif.c:758
msgid "Nick Name"
msgstr "Apodo"
-#: src/main.c:249
+#: src/main.c:247
#, c-format
msgid ""
"File '%s' already exists.\n"
@@ -6590,7 +6603,7 @@ msgstr ""
"El fichero «%s» ya existe.\n"
"No se puede crear la carpeta."
-#: src/main.c:370
+#: src/main.c:368
#, c-format
msgid ""
"Configuration for %s found.\n"
@@ -6599,7 +6612,7 @@ msgstr ""
"Encontrada configuración para %s.\n"
"¿Desea migrar esta configuración?"
-#: src/main.c:372
+#: src/main.c:370
#, c-format
msgid ""
"\n"
@@ -6612,11 +6625,11 @@ msgstr ""
"Sus reglas de filtrado de Sylpheed se pueden convertir\n"
"con un script que encontrará en %s."
-#: src/main.c:384
+#: src/main.c:382
msgid "Keep old configuration"
msgstr "Conservar la configuración antigua"
-#: src/main.c:387
+#: src/main.c:385
msgid ""
"Keeping a backup will allow you to go back to an older version, but may take "
"a while if you have cached IMAP or News data, and will take some extra room "
@@ -6626,31 +6639,31 @@ msgstr ""
"pero puede tardar cierto tiempo si tiene datos de Noticias o IMAP cacheados "
"y ocupará espacio adicional en el disco."
-#: src/main.c:395
+#: src/main.c:393
msgid "Migration of configuration"
msgstr "Migración de la configuración"
-#: src/main.c:406
+#: src/main.c:404
msgid "Copying configuration... This may take a while..."
msgstr "Copiando configuración... Esto puede tardar un rato..."
-#: src/main.c:415
+#: src/main.c:413
msgid "Migration failed!"
msgstr "¡La migración falló!"
-#: src/main.c:424
+#: src/main.c:422
msgid "Migrating configuration..."
msgstr "Migrando la configuración..."
-#: src/main.c:1138
+#: src/main.c:1130
msgid "g_thread is not supported by glib.\n"
msgstr "g_thread no está soportado por glib.\n"
-#: src/main.c:1158 src/main.c:1162 src/main.c:1166
+#: src/main.c:1150 src/main.c:1154 src/main.c:1158
msgid "(or older)"
msgstr "(o anterior)"
-#: src/main.c:1483
+#: src/main.c:1494
#, c-format
msgid ""
"The following plugin failed to load. Check the Plugins configuration for "
@@ -6669,7 +6682,7 @@ msgstr[1] ""
"de los módulos para más información:\n"
"%s"
-#: src/main.c:1525
+#: src/main.c:1536
msgid ""
"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6679,7 +6692,7 @@ msgstr ""
"ser debido a una cuenta IMAP que esté fallando. Utilice «Reconstruir árbol "
"de carpetas» en la carpeta padre del buzón para intentar arreglarlo."
-#: src/main.c:1531
+#: src/main.c:1542
msgid ""
"Claws Mail has detected a configured mailbox, but could not load it. It is "
"probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6689,36 +6702,36 @@ msgstr ""
"probable que esté soportado por un módulo externo desactualizado. Por favor "
"reinstale el módulo e inténtelo de nuevo."
-#: src/main.c:1776
+#: src/main.c:1789
msgid "Missing filename\n"
msgstr "Falta el nombre de fichero\n"
-#: src/main.c:1783
+#: src/main.c:1796
msgid "Cannot open filename for reading\n"
msgstr "No se puede abrir el fichero para lectura\n"
-#: src/main.c:1794
+#: src/main.c:1807
msgid "Malformed header\n"
msgstr "Cabecera mal formada\n"
-#: src/main.c:1801
+#: src/main.c:1814
msgid "Duplicated 'To:' header\n"
msgstr "Cabecera «To:» duplicada\n"
-#: src/main.c:1812
+#: src/main.c:1825
msgid "Missing required 'To:' header\n"
msgstr "Falta la cabecera «To:» obligatoria\n"
-#: src/main.c:1958
+#: src/main.c:1971
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPCIÓN]...\n"
-#: src/main.c:1960
+#: src/main.c:1973
msgid " --compose [address] open composition window"
msgstr " --compose [dirección] abre la ventana de edición"
-#: src/main.c:1961
+#: src/main.c:1974
msgid ""
" --compose-from-file file\n"
" open composition window with data from given file;\n"
@@ -6736,11 +6749,11 @@ msgstr ""
"vacía,\n"
" después el cuerpo hasta fin de fichero."
-#: src/main.c:1966
+#: src/main.c:1979
msgid " --subscribe [uri] subscribe to the given URI if possible"
msgstr " --subscribe [uri] suscribirse a la URI dada si es posible"
-#: src/main.c:1967
+#: src/main.c:1980
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6750,7 +6763,7 @@ msgstr ""
" abre la ventana de composición con los ficheros\n"
" especificados como adjuntos"
-#: src/main.c:1970
+#: src/main.c:1983
msgid ""
" --insert file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6760,23 +6773,23 @@ msgstr ""
" abre la ventana de composición con los ficheros\n"
" especificados insertados"
-#: src/main.c:1973
+#: src/main.c:1986
msgid " --receive receive new messages"
msgstr " --receive recibe los mensajes nuevos"
-#: src/main.c:1974
+#: src/main.c:1987
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all recibe mensajes nuevos de todas las cuentas"
-#: src/main.c:1975
+#: src/main.c:1988
msgid " --cancel-receiving cancel receiving of messages"
msgstr " --cancel-receiving cancela la recepción de mensajes en curso"
-#: src/main.c:1976
+#: src/main.c:1989
msgid " --cancel-sending cancel sending of messages"
msgstr " --cancel-sending cancela el envío de mensajes en curso"
-#: src/main.c:1977
+#: src/main.c:1990
msgid ""
" --search folder type request [recursive]\n"
" searches mail\n"
@@ -6796,15 +6809,15 @@ msgstr ""
" recursivo: falso si parám. empieza por: 0, n, N, f "
"o F"
-#: src/main.c:1984
+#: src/main.c:1997
msgid " --send send all queued messages"
msgstr " --send enviar todos los mensajes en la cola"
-#: src/main.c:1985
+#: src/main.c:1998
msgid " --status [folder]... show the total number of messages"
msgstr " --status [carpeta]... muestra el número total de mensajes"
-#: src/main.c:1986
+#: src/main.c:1999
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -6812,15 +6825,15 @@ msgstr ""
" --status-full [carpeta]...\n"
" muestra el estado de cada carpeta"
-#: src/main.c:1988
+#: src/main.c:2001
msgid " --statistics show session statistics"
msgstr " --statistics muestra las estadísticas de la sesión"
-#: src/main.c:1989
+#: src/main.c:2002
msgid " --reset-statistics reset session statistics"
msgstr " --reset-statistics reinicializa las estadísticas de la sesión"
-#: src/main.c:1990
+#: src/main.c:2003
msgid ""
" --select folder[/msg] jumps to the specified folder/message\n"
" folder is a folder id like 'folder/sub_folder'"
@@ -6828,35 +6841,35 @@ msgstr ""
" --select carpt[/mnsj] va a la carpeta/mensaje especificados\n"
" carpt es un identificador como «carpeta/subcarpeta»"
-#: src/main.c:1992
+#: src/main.c:2005
msgid " --online switch to online mode"
msgstr " --online cambiar a modo de trabajo con conexión"
-#: src/main.c:1993
+#: src/main.c:2006
msgid " --offline switch to offline mode"
msgstr " --offline cambiar a modo de trabajo sin conexión"
-#: src/main.c:1994
+#: src/main.c:2007
msgid " --exit --quit -q exit Claws Mail"
msgstr " --exit --quit -q salir de Claws Mail"
-#: src/main.c:1995
+#: src/main.c:2008
msgid " --debug debug mode"
msgstr " --debug modo de depuración"
-#: src/main.c:1996
+#: src/main.c:2009
msgid " --toggle-debug toggle debug mode"
msgstr " --toggle-debug activa o desactiva el modo de depuración"
-#: src/main.c:1997
+#: src/main.c:2010
msgid " --help -h display this help and exit"
msgstr " --help -h presenta esta ayuda y finaliza"
-#: src/main.c:1998
+#: src/main.c:2011
msgid " --version -v output version information and exit"
msgstr " --version -v informa de la versión y finaliza"
-#: src/main.c:1999
+#: src/main.c:2012
msgid ""
" --version-full -V output version and built-in features information "
"and exit"
@@ -6864,11 +6877,11 @@ msgstr ""
" --version-full -V informa de la versión y características incluidas y "
"finaliza"
-#: src/main.c:2000
+#: src/main.c:2013
msgid " --config-dir output configuration directory"
msgstr " --config-dir muestra el directorio del configuración"
-#: src/main.c:2001
+#: src/main.c:2014
msgid ""
" --alternate-config-dir [dir]\n"
" use specified configuration directory"
@@ -6876,7 +6889,7 @@ msgstr ""
" --alternate-config-dir [dir]\n"
" usa el directorio del configuración especificado"
-#: src/main.c:2003
+#: src/main.c:2016
msgid ""
" --geometry -geometry WxH+X+Y\n"
" set geometry for main window"
@@ -6884,846 +6897,846 @@ msgstr ""
" --geometry -geometry ANxAL+X+Y\n"
" establece la geometría de la ventana principal"
-#: src/main.c:2056
+#: src/main.c:2069
msgid "Unknown option\n"
msgstr "Error desconocido\n"
-#: src/main.c:2074
+#: src/main.c:2087
#, c-format
msgid "Processing (%s)..."
msgstr "Procesando (%s)..."
-#: src/main.c:2077
+#: src/main.c:2090
msgid "top level folder"
msgstr "carpeta superior"
-#: src/main.c:2160
+#: src/main.c:2172
msgid "Queued messages"
msgstr "Mensajes en cola"
-#: src/main.c:2161
+#: src/main.c:2173
msgid "Some unsent messages are queued. Exit now?"
msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
-#: src/main.c:2908
+#: src/main.c:2920
msgid "NetworkManager: network is online.\n"
msgstr "NetworkManager: la red está conectada.\n"
-#: src/main.c:2914
+#: src/main.c:2926
msgid "NetworkManager: network is offline.\n"
msgstr "NetworkManager: la red está desconectada.\n"
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:514 src/messageview.c:209
msgid "_File"
msgstr "_Fichero"
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
+#: src/mainwindow.c:516 src/messageview.c:211 src/summaryview.c:438
msgid "_View"
msgstr "_Ver"
-#: src/mainwindow.c:518
+#: src/mainwindow.c:519
msgid "_Configuration"
msgstr "_Configuración"
-#: src/mainwindow.c:522
+#: src/mainwindow.c:523
msgid "_Add mailbox"
msgstr "_Añadir buzón"
-#: src/mainwindow.c:523
+#: src/mainwindow.c:524
msgid "MH..."
msgstr "MH..."
-#: src/mainwindow.c:526
+#: src/mainwindow.c:527
msgid "Change mailbox order..."
msgstr "Reorganizar buzones..."
-#: src/mainwindow.c:529
+#: src/mainwindow.c:530
msgid "_Import mbox file..."
msgstr "_Importar fichero mbox..."
-#: src/mainwindow.c:530
+#: src/mainwindow.c:531
msgid "_Export to mbox file..."
msgstr "_Exportar a fichero mbox..."
-#: src/mainwindow.c:531
+#: src/mainwindow.c:532
msgid "_Export selected to mbox file..."
msgstr "_Exportar la selección a un fichero mbox..."
-#: src/mainwindow.c:533
+#: src/mainwindow.c:534
msgid "Empty all _Trash folders"
msgstr "Vaciar _todas las papeleras"
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:537 src/messageview.c:218
msgid "_Save email as..."
msgstr "_Guardar mensaje como..."
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:538 src/messageview.c:219
msgid "_Save part as..."
msgstr "_Guardar parte como..."
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:541 src/messageview.c:220
msgid "Page setup..."
msgstr "Configurar página..."
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:542 src/messageview.c:221
msgid "_Print..."
msgstr "_Imprimir..."
-#: src/mainwindow.c:543
+#: src/mainwindow.c:544
msgid "Synchronise folders"
msgstr "Sincronizar carpetas"
-#: src/mainwindow.c:545
+#: src/mainwindow.c:546
msgid "E_xit"
msgstr "_Salir"
-#: src/mainwindow.c:550
+#: src/mainwindow.c:551
msgid "Select _thread"
msgstr "Seleccionar _hilo"
-#: src/mainwindow.c:552
+#: src/mainwindow.c:553
msgid "_Find in current message..."
msgstr "_Buscar en el mensaje actual..."
-#: src/mainwindow.c:554
+#: src/mainwindow.c:555
msgid "_Quick search"
msgstr "Búsqueda _rápida"
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
msgid "Show or hi_de"
msgstr "Mostrar u o_cultar"
-#: src/mainwindow.c:558
+#: src/mainwindow.c:559
msgid "_Toolbar"
msgstr "_Barra de herramientas"
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
msgid "Set displayed _columns"
msgstr "Establecer _columnas visibles"
-#: src/mainwindow.c:561
+#: src/mainwindow.c:562
msgid "In _folder list..."
msgstr "En la lista de _carpetas..."
-#: src/mainwindow.c:562
+#: src/mainwindow.c:563
msgid "In _message list..."
msgstr "En la lista de _mensajes..."
-#: src/mainwindow.c:567
+#: src/mainwindow.c:568
msgid "La_yout"
msgstr "_Aspecto"
-#: src/mainwindow.c:569
+#: src/mainwindow.c:570
msgid "_Sort"
msgstr "_Ordenar"
-#: src/mainwindow.c:571
+#: src/mainwindow.c:572
msgid "_Attract by subject"
msgstr "_Atraer por asunto"
-#: src/mainwindow.c:573
+#: src/mainwindow.c:574
msgid "E_xpand all threads"
msgstr "E_xpandir todos los hilos"
-#: src/mainwindow.c:574
+#: src/mainwindow.c:575
msgid "Co_llapse all threads"
msgstr "Co_lapsar todos los hilos"
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:577 src/messageview.c:232
msgid "_Go to"
msgstr "_Ir a"
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:578 src/messageview.c:233
msgid "_Previous message"
msgstr "Mensaje _anterior"
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:579 src/messageview.c:234
msgid "_Next message"
msgstr "Mensaje _siguiente"
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:236
msgid "P_revious unread message"
msgstr "Mensaje a_nterior no leído"
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:237
msgid "N_ext unread message"
msgstr "Mensaje s_iguiente no leído"
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:239
msgid "Previous ne_w message"
msgstr "Mensaje nue_vo anterior"
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:240
msgid "Ne_xt new message"
msgstr "Mensaje nuev_o siguiente"
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:242
msgid "Previous _marked message"
msgstr "Mensaje _marcado anterior"
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:243
msgid "Next m_arked message"
msgstr "Mensaje m_arcado siguiente"
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:245
msgid "Previous _labeled message"
msgstr "Mensaje _etiquetado anterior"
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:246
msgid "Next la_beled message"
msgstr "Mensaje e_tiquetado siguiente"
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:248
msgid "Previous opened message"
msgstr "Mensaje abierto anterior"
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:249
msgid "Next opened message"
msgstr "Mensaje abierto siguiente"
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:596 src/messageview.c:251
msgid "Parent message"
msgstr "Mensaje padre"
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:598 src/messageview.c:253
msgid "Next unread _folder"
msgstr "Siguiente _carpeta sin leer"
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:254
msgid "F_older..."
msgstr "_Carpeta..."
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:200
msgid "Next part"
msgstr "Parte siguiente"
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:257 src/mimeview.c:201
msgid "Previous part"
msgstr "Parte anterior"
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:605 src/messageview.c:258
msgid "Message scroll"
msgstr "Desplazamiento del mensaje"
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:606 src/messageview.c:259
msgid "Previous line"
msgstr "Línea anterior"
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:607 src/messageview.c:260
msgid "Next line"
msgstr "Línea siguiente"
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:479
msgid "Previous page"
msgstr "Página anterior"
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:487
+#: src/mainwindow.c:609 src/messageview.c:262 src/printing.c:485
msgid "Next page"
msgstr "Página siguiente"
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:627 src/messageview.c:280
msgid "Decode"
msgstr "Decodificar"
-#: src/mainwindow.c:633
+#: src/mainwindow.c:634
msgid "Open in new _window"
msgstr "Abrir en ventana _nueva"
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:635 src/messageview.c:287
msgid "Mess_age source"
msgstr "Fuente del mens_aje"
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:637 src/messageview.c:288
msgid "Message part"
msgstr "Parte del mensaje"
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:638 src/messageview.c:289
msgid "View as text"
msgstr "Mostrar como texto"
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:639 src/messageview.c:290 src/toolbar.c:494
msgid "Open"
msgstr "Abrir"
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:292
msgid "Open with..."
msgstr "Abrir con..."
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:645 src/messageview.c:295
msgid "Quotes"
msgstr "Citas"
-#: src/mainwindow.c:646
+#: src/mainwindow.c:647
msgid "_Update summary"
msgstr "_Actualizar resumen"
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
msgid "Recei_ve"
msgstr "Reci_bir"
-#: src/mainwindow.c:650
+#: src/mainwindow.c:651
msgid "Get from _current account"
msgstr "De la cuenta _actual"
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
msgid "Get from _all accounts"
msgstr "De _todas las cuentas"
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
msgid "Cancel receivin_g"
msgstr "Cancelar re_cepción"
-#: src/mainwindow.c:655
+#: src/mainwindow.c:656
msgid "_Send queued messages"
msgstr "_Enviar mensajes en la cola"
-#: src/mainwindow.c:660
+#: src/mainwindow.c:661
msgid "Compose a_n email message"
msgstr "Compo_ner un mensaje de correo"
-#: src/mainwindow.c:661
+#: src/mainwindow.c:662
msgid "Compose a news message"
msgstr "Componer un mensaje de noticias"
-#: src/mainwindow.c:663 src/messageview.c:300
+#: src/mainwindow.c:664 src/messageview.c:301
#: src/plugins/notification/notification_banner.c:95
msgid "_Reply"
msgstr "_Responder"
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
+#: src/mainwindow.c:665 src/messageview.c:302 src/summaryview.c:430
msgid "Repl_y to"
msgstr "Respon_der a"
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:668 src/messageview.c:305
msgid "Mailing _list"
msgstr "_Lista-Correo"
-#: src/mainwindow.c:668
+#: src/mainwindow.c:669
msgid "Follow-up and reply to"
msgstr "Seguir y responder a"
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2449
msgid "_Forward"
msgstr "Reen_viar"
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2450
msgid "For_ward as attachment"
msgstr "Reen_viar como adjunto"
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:674 src/messageview.c:310 src/toolbar.c:2451
msgid "Redirec_t"
msgstr "Redirigi_r"
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
msgid "Mailing-_List"
msgstr "Lista-Correo"
-#: src/mainwindow.c:676
+#: src/mainwindow.c:677
msgid "Post"
msgstr "Postear"
-#: src/mainwindow.c:678
+#: src/mainwindow.c:679
msgid "Help"
msgstr "_Ayuda"
-#: src/mainwindow.c:682
+#: src/mainwindow.c:683
msgid "Unsubscribe"
msgstr "Desuscribir"
-#: src/mainwindow.c:684
+#: src/mainwindow.c:685
msgid "View archive"
msgstr "Ver archivo"
-#: src/mainwindow.c:686
+#: src/mainwindow.c:687
msgid "Contact owner"
msgstr "Contactar proprietario"
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
msgid "M_ove..."
msgstr "M_over..."
-#: src/mainwindow.c:691
+#: src/mainwindow.c:692
msgid "_Copy..."
msgstr "_Copiar..."
-#: src/mainwindow.c:692
+#: src/mainwindow.c:693
msgid "Move to _trash"
msgstr "Mover a la p_apelera"
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
msgid "_Delete..."
msgstr "_Borrar..."
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
msgid "Move thread to tr_ash"
msgstr "Mover hilo a la p_apelera"
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
msgid "Delete t_hread"
msgstr "Borrar _hilo"
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
msgid "Cancel a news message"
msgstr "Cancelar una noticia"
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
+#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:431
msgid "_Mark"
msgstr "_Marcar"
-#: src/mainwindow.c:701
+#: src/mainwindow.c:702
msgid "_Unmark"
msgstr "_Desmarcar"
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
msgid "Mark as rea_d"
msgstr "Marcar como _leído"
-#: src/mainwindow.c:705
+#: src/mainwindow.c:706
msgid "Mark as unr_ead"
msgstr "Marcar como _no leído"
-#: src/mainwindow.c:707
+#: src/mainwindow.c:708
msgid "Mark all read"
msgstr "Marcar todos como leídos"
-#: src/mainwindow.c:708
+#: src/mainwindow.c:709
msgid "Mark all unread"
msgstr "Marcar todos como no leídos"
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:199 src/toolbar.c:242
#: src/toolbar.c:503
msgid "Ignore thread"
msgstr "Ignorar hilo"
-#: src/mainwindow.c:711
+#: src/mainwindow.c:712
msgid "Unignore thread"
msgstr "Dejar de ignorar hilo"
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:200 src/toolbar.c:243
#: src/toolbar.c:504
msgid "Watch thread"
msgstr "Observar hilo"
-#: src/mainwindow.c:713
+#: src/mainwindow.c:714
msgid "Unwatch thread"
msgstr "Dejar de observar hilo"
-#: src/mainwindow.c:716
+#: src/mainwindow.c:717
msgid "Mark as _spam"
msgstr "Marcar como ba_sura"
-#: src/mainwindow.c:717
+#: src/mainwindow.c:718
msgid "Mark as _ham"
msgstr "Marcar como _bueno"
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:181 src/toolbar.c:507
msgid "Lock"
msgstr "Bloquear"
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:182 src/toolbar.c:508
msgid "Unlock"
msgstr "Desbloquear"
-#: src/mainwindow.c:723 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:432
msgid "Color la_bel"
msgstr "Etiqueta de co_lor"
-#: src/mainwindow.c:724 src/summaryview.c:431
+#: src/mainwindow.c:725 src/summaryview.c:433
msgid "Ta_gs"
msgstr "Eti_quetas"
-#: src/mainwindow.c:727
+#: src/mainwindow.c:728
msgid "Re-_edit"
msgstr "Re_editar"
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:731 src/messageview.c:311 src/mimeview.c:1015
msgid "Check signature"
msgstr "Verificar firma"
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:736 src/messageview.c:315
msgid "Add sender to address boo_k"
msgstr "Añadir _remitente a la agenda"
-#: src/mainwindow.c:737
+#: src/mainwindow.c:738
msgid "C_ollect addresses"
msgstr "Rec_olectar direcciones"
-#: src/mainwindow.c:738
+#: src/mainwindow.c:739
msgid "From current _folder..."
msgstr "De la _carpeta actual..."
-#: src/mainwindow.c:739
+#: src/mainwindow.c:740
msgid "From selected _messages..."
msgstr "De los _mensajes seleccionados..."
-#: src/mainwindow.c:742
+#: src/mainwindow.c:743
msgid "_Filter all messages in folder"
msgstr "_Filtrar todos los mensajes en la carpeta"
-#: src/mainwindow.c:743
+#: src/mainwindow.c:744
msgid "Filter _selected messages"
msgstr "_Filtrar los mensajes seleccionados"
-#: src/mainwindow.c:744
+#: src/mainwindow.c:745
msgid "Run folder pr_ocessing rules"
msgstr "Ejecutar reglas de procesamiento de la carpeta"
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:747 src/messageview.c:318
msgid "_Create filter rule"
msgstr "Crear regla de f_iltrado"
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:319
+#: src/messageview.c:325
msgid "_Automatically"
msgstr "_Automático"
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
+#: src/messageview.c:320 src/messageview.c:326
msgid "By _From"
msgstr "Por el _Desde"
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
+#: src/messageview.c:321 src/messageview.c:327
msgid "By _To"
msgstr "Por el _Para"
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:322
+#: src/messageview.c:328
msgid "By _Subject"
msgstr "Por el A_sunto"
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
+#: src/mainwindow.c:753 src/messageview.c:324 src/summaryview.c:436
msgid "Create processing rule"
msgstr "Crear regla de procesamiento"
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:760 src/messageview.c:331
msgid "List _URLs..."
msgstr "Listar _URLs..."
-#: src/mainwindow.c:766
+#: src/mainwindow.c:767
msgid "Ch_eck for new messages in all folders"
msgstr "Comprobar m_ensajes nuevos en todas las carpetas"
-#: src/mainwindow.c:767
+#: src/mainwindow.c:768
msgid "Delete du_plicated messages"
msgstr "Borrar los mensajes re_petidos"
-#: src/mainwindow.c:768
+#: src/mainwindow.c:769
msgid "In selected folder"
msgstr "En la carpeta seleccionada"
-#: src/mainwindow.c:769
+#: src/mainwindow.c:770
msgid "In all folders"
msgstr "En todas las carpetas"
-#: src/mainwindow.c:772
+#: src/mainwindow.c:773
msgid "E_xecute"
msgstr "E_jecutar"
-#: src/mainwindow.c:773
+#: src/mainwindow.c:774
msgid "Exp_unge"
msgstr "P_urgar"
-#: src/mainwindow.c:776
+#: src/mainwindow.c:777
msgid "SSL/TLS cer_tificates"
msgstr "Cer_tificados SSL/TLS"
-#: src/mainwindow.c:779
+#: src/mainwindow.c:780
msgid "Filtering Lo_g"
msgstr "Traza de f_iltrado"
-#: src/mainwindow.c:780
+#: src/mainwindow.c:781
msgid "Network _Log"
msgstr "Tra_za de red"
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
msgid "_Forget all session passwords"
msgstr "_Olvidar todas las contraseñas de sesión"
-#: src/mainwindow.c:784
+#: src/mainwindow.c:785
msgid "Forget _master passphrase"
msgstr "Olvidar la contraseña _maestra"
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
msgid "C_hange current account"
msgstr "_Cambiar cuenta actual"
-#: src/mainwindow.c:790
+#: src/mainwindow.c:791
msgid "_Preferences for current account..."
msgstr "_Preferencias de la cuenta actual..."
-#: src/mainwindow.c:791
+#: src/mainwindow.c:792
msgid "Create _new account..."
msgstr "Crear _nueva cuenta..."
-#: src/mainwindow.c:792
+#: src/mainwindow.c:793
msgid "_Edit accounts..."
msgstr "_Editar cuentas..."
-#: src/mainwindow.c:795
+#: src/mainwindow.c:796
msgid "P_references..."
msgstr "P_referencias..."
-#: src/mainwindow.c:796
+#: src/mainwindow.c:797
msgid "Pre-pr_ocessing..."
msgstr "Pre-pr_ocesamiento..."
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
msgid "Post-pro_cessing..."
msgstr "Post-pro_cesamiento..."
-#: src/mainwindow.c:798
+#: src/mainwindow.c:799
msgid "_Filtering..."
msgstr "_Filtrado..."
-#: src/mainwindow.c:799
+#: src/mainwindow.c:800
msgid "_Templates..."
msgstr "_Plantillas..."
-#: src/mainwindow.c:800
+#: src/mainwindow.c:801
msgid "_Actions..."
msgstr "_Acciones..."
-#: src/mainwindow.c:801
+#: src/mainwindow.c:802
msgid "Tag_s..."
msgstr "Etiqueta_s..."
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
msgid "Plu_gins..."
msgstr "_Módulos..."
-#: src/mainwindow.c:806
+#: src/mainwindow.c:807
msgid "_Manual"
msgstr "_Manual"
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
msgid "_Online User-contributed FAQ"
msgstr "P_F de usuarios en línea (FAQ)"
-#: src/mainwindow.c:808
+#: src/mainwindow.c:809
msgid "Icon _Legend"
msgstr "_Leyenda de iconos"
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
msgid "Set as default client"
msgstr "Establecer como cliente predeterminado"
-#: src/mainwindow.c:817
+#: src/mainwindow.c:818
msgid "Offline _mode"
msgstr "_Modo sin conexión"
-#: src/mainwindow.c:818
+#: src/mainwindow.c:819
msgid "Men_ubar"
msgstr "Barra de men_u"
-#: src/mainwindow.c:819
+#: src/mainwindow.c:820
msgid "_Message view"
msgstr "Vista de _mensaje"
-#: src/mainwindow.c:821
+#: src/mainwindow.c:822
msgid "Status _bar"
msgstr "_Barra de estado"
-#: src/mainwindow.c:823
+#: src/mainwindow.c:824
msgid "Column headers"
msgstr "Cabeceras de columna"
-#: src/mainwindow.c:824
+#: src/mainwindow.c:825
msgid "Th_read view"
msgstr "_Vista jerárquica"
-#: src/mainwindow.c:825
+#: src/mainwindow.c:826
msgid "Hide read threads"
msgstr "Ocultar los hilos leídos"
-#: src/mainwindow.c:826
+#: src/mainwindow.c:827
msgid "_Hide read messages"
msgstr "_Ocultar los mensajes leídos"
-#: src/mainwindow.c:827
+#: src/mainwindow.c:828
msgid "Hide deleted messages"
msgstr "Ocultar los mensajes borrados"
-#: src/mainwindow.c:828
+#: src/mainwindow.c:829
msgid "_Fullscreen"
msgstr "Pantalla _completa"
-#: src/mainwindow.c:829 src/messageview.c:342
+#: src/mainwindow.c:830 src/messageview.c:343
msgid "Show all _headers"
msgstr "Mostrar todas las ca_beceras"
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:344
msgid "_Collapse all"
msgstr "Co_lapsar todos"
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:345
msgid "Collapse from level _2"
msgstr "Colapsar desde el nivel _2"
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:346
msgid "Collapse from level _3"
msgstr "Colapsar desde el nivel _3"
-#: src/mainwindow.c:836
+#: src/mainwindow.c:837
msgid "Text _below icons"
msgstr "Texto _bajo los iconos"
-#: src/mainwindow.c:837
+#: src/mainwindow.c:838
msgid "Text be_side icons"
msgstr "Texto _junto a los iconos"
-#: src/mainwindow.c:838
+#: src/mainwindow.c:839
msgid "_Icons only"
msgstr "Sólo _iconos"
-#: src/mainwindow.c:839
+#: src/mainwindow.c:840
msgid "_Text only"
msgstr "Sólo _texto"
-#: src/mainwindow.c:846
+#: src/mainwindow.c:847
msgid "_Standard"
msgstr "_Estándar"
-#: src/mainwindow.c:847
+#: src/mainwindow.c:848
msgid "_Three columns"
msgstr "_Tres columnas"
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
msgid "_Wide message"
msgstr "Mensaje _ancho"
-#: src/mainwindow.c:849
+#: src/mainwindow.c:850
msgid "W_ide message list"
msgstr "L_ista de mensajes ancha"
-#: src/mainwindow.c:850
+#: src/mainwindow.c:851
msgid "S_mall screen"
msgstr "_Pantalla pequeña"
-#: src/mainwindow.c:854
+#: src/mainwindow.c:855
msgid "By _number"
msgstr "Por _número"
-#: src/mainwindow.c:855
+#: src/mainwindow.c:856
msgid "By s_ize"
msgstr "Por _tamaño"
-#: src/mainwindow.c:856
+#: src/mainwindow.c:857
msgid "By _date"
msgstr "Por _fecha"
-#: src/mainwindow.c:857
+#: src/mainwindow.c:858
msgid "By thread date"
msgstr "Por fecha del hilo"
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
msgid "By s_ubject"
msgstr "Por el as_unto"
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
msgid "By _color label"
msgstr "Por el _color"
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
msgid "By tag"
msgstr "Por la etiqueta"
-#: src/mainwindow.c:863
+#: src/mainwindow.c:864
msgid "By _mark"
msgstr "Por _marca"
-#: src/mainwindow.c:864
+#: src/mainwindow.c:865
msgid "By _status"
msgstr "Por e_stado"
-#: src/mainwindow.c:865
+#: src/mainwindow.c:866
msgid "By a_ttachment"
msgstr "Por adjun_to"
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
msgid "By score"
msgstr "Por puntuación"
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
msgid "By locked"
msgstr "Por bloqueado"
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
msgid "D_on't sort"
msgstr "N_o ordenar"
-#: src/mainwindow.c:872 src/prefs_summaries.c:462
+#: src/mainwindow.c:873 src/prefs_summaries.c:462
msgid "Ascending"
msgstr "Ascendente"
-#: src/mainwindow.c:873 src/prefs_summaries.c:463
+#: src/mainwindow.c:874 src/prefs_summaries.c:463
msgid "Descending"
msgstr "Descendente"
-#: src/mainwindow.c:915 src/messageview.c:387
+#: src/mainwindow.c:916 src/messageview.c:388
msgid "_Auto detect"
msgstr "_Auto detectar"
-#: src/mainwindow.c:1312 src/summaryview.c:6287
+#: src/mainwindow.c:1294 src/summaryview.c:6423
msgid "Apply tags..."
msgstr "Aplicar etiquetas..."
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1943
msgid "Some error(s) happened. Click here to view log."
msgstr "Ocurrió algún error. Pulse aquí para ver la traza registrada."
-#: src/mainwindow.c:1973
+#: src/mainwindow.c:1958
msgid "You are online. Click the icon to go offline"
msgstr "Esta conectado. Pulse en el icono para desconectarse"
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1961
msgid "You are offline. Click the icon to go online"
msgstr "Esta desconectado. Pulse en el icono para conectarse"
-#: src/mainwindow.c:1990
+#: src/mainwindow.c:1975
msgid "Select account"
msgstr "Seleccionar cuenta"
-#: src/mainwindow.c:2017 src/prefs_logging.c:136
+#: src/mainwindow.c:2002 src/prefs_logging.c:136
msgid "Network log"
msgstr "Traza del protocolo"
-#: src/mainwindow.c:2021
+#: src/mainwindow.c:2006
msgid "Filtering/Processing debug log"
msgstr "Traza de depuración de filtrado/procesamiento"
-#: src/mainwindow.c:2040 src/prefs_logging.c:378
+#: src/mainwindow.c:2025 src/prefs_logging.c:378
msgid "filtering log enabled\n"
msgstr "traza de filtrado activada\n"
-#: src/mainwindow.c:2042 src/prefs_logging.c:380
+#: src/mainwindow.c:2027 src/prefs_logging.c:380
msgid "filtering log disabled\n"
msgstr "traza de filtrado desactivada\n"
-#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
-#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
+#: src/mainwindow.c:2463 src/mainwindow.c:2470 src/mainwindow.c:2513
+#: src/mainwindow.c:2546 src/mainwindow.c:2578 src/mainwindow.c:2623
#: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1076
msgid "Untitled"
msgstr "Sin título"
-#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2624 src/prefs_summary_open.c:114
msgid "none"
msgstr "ninguna"
-#: src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/mainwindow.c:2881 src/mainwindow.c:2886
msgid "Delete all messages in trash folders?"
msgstr "¿Borrar todos los mensajes de las papeleras?"
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2882
msgid "Don't quit"
msgstr "No salir"
-#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:189
msgid "Add mailbox"
msgstr "Añadir buzón"
-#: src/mainwindow.c:2934
+#: src/mainwindow.c:2914
msgid ""
"Input the location of mailbox.\n"
"If an existing mailbox is specified, it will be\n"
@@ -7733,18 +7746,18 @@ msgstr ""
"Si especifica un buzón existente será\n"
"escaneado automáticamente."
-#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:196
#: src/plugins/rssyl/rssyl_gtk.c:132
#, c-format
msgid "The mailbox '%s' already exists."
msgstr "El buzón «%s» ya existe."
-#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:741
msgid "Mailbox"
msgstr "Correo"
-#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2930 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
msgid ""
"Creation of the mailbox failed.\n"
"Maybe some files already exist, or you don't have the permission to write "
@@ -7754,54 +7767,54 @@ msgstr ""
"Quizás ya existan los ficheros o no tenga permisos suficientes para "
"escribir en el directorio."
-#: src/mainwindow.c:3419
+#: src/mainwindow.c:3411
msgid "No posting allowed"
msgstr "No esta permitido enviar"
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:3993
msgid "Mbox import has failed."
msgstr "La importación de mbox ha fallado."
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4002 src/mainwindow.c:4011
msgid "Export to mbox has failed."
msgstr "La exportación a mbox ha fallado."
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
msgid "Exit"
msgstr "Salir"
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
msgid "Exit Claws Mail?"
msgstr "¿Salir de Claws Mail?"
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4245
msgid "Folder synchronisation"
msgstr "Sincronización de carpeta"
-#: src/mainwindow.c:4253
+#: src/mainwindow.c:4246
msgid "Do you want to synchronise your folders now?"
msgstr "¿Quiere sincronizar sus carpetas ahora?"
-#: src/mainwindow.c:4254
+#: src/mainwindow.c:4247
msgid "_Synchronise"
msgstr "_Sincronizar"
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4692
msgid "Deleting duplicated messages..."
msgstr "Borrando mensajes duplicados..."
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4702
msgid "No duplicate message found in selected folder.\n"
msgstr "No se encontró ningún mensaje duplicado en la carpeta seleccionada.\n"
-#: src/mainwindow.c:4718
+#: src/mainwindow.c:4708
#, c-format
msgid "Deleted %d duplicate message in selected folder.\n"
msgid_plural "Deleted %d duplicate messages in selected folder.\n"
msgstr[0] "Borrado %d mensaje repetido en la carpeta seleccionada.\n"
msgstr[1] "Borrados %d mensajes repetidos en la carpeta seleccionada.\n"
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4712
#, c-format
msgid "Marked %d duplicate message for deletion in selected folder.\n"
msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7810,61 +7823,61 @@ msgstr[0] ""
msgstr[1] ""
"Marcados para borrar %d mensajes duplicados en la carpeta seleccionada.\n"
-#: src/mainwindow.c:4760
+#: src/mainwindow.c:4750
msgid "Deleting duplicated messages in all folders..."
msgstr "Borrando los mensajes duplicados en todas las carpetas..."
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4756
#, c-format
msgid "Deleted %d duplicate message in %d folders.\n"
msgid_plural "Deleted %d duplicate messages in %d folders.\n"
msgstr[0] "Borrado %d mensaje repetido en %d carpetas.\n"
msgstr[1] "Borrados %d mensajes repetidos en %d carpetas.\n"
-#: src/mainwindow.c:4771
+#: src/mainwindow.c:4761
#, c-format
msgid "No duplicate message found in %d folders.\n"
msgstr "No se encontró ningún mensaje duplicado en %d carpetas.\n"
-#: src/mainwindow.c:4933 src/messageview.c:2657
+#: src/mainwindow.c:4923 src/messageview.c:2658
msgid "Select folder to go to"
msgstr "Seleccionar la carpeta a la que ir"
-#: src/mainwindow.c:5034 src/summaryview.c:5778
+#: src/mainwindow.c:5024 src/summaryview.c:5866
msgid "Processing rules to apply before folder rules"
msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
-#: src/mainwindow.c:5042
+#: src/mainwindow.c:5032
msgid "Processing rules to apply after folder rules"
msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
-#: src/mainwindow.c:5050 src/summaryview.c:5789
+#: src/mainwindow.c:5040 src/summaryview.c:5877
msgid "Filtering configuration"
msgstr "Configuración de filtrado"
-#: src/mainwindow.c:5165
+#: src/mainwindow.c:5155
msgid "Can not register as default client: impossible to get executable path."
msgstr ""
"No se puede registrar como cliente predeterminado: imposible obtener la ruta "
"al ejecutable."
-#: src/mainwindow.c:5224
+#: src/mainwindow.c:5214
msgid "Claws Mail has been registered as default client."
msgstr "Se ha registrado Claws Mail como cliente predeterminado."
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5216
msgid ""
"Can not register as default client: impossible to write to the registry."
msgstr ""
"No se puede registrar como cliente predeterminado: imposible escribir en el "
"registro."
-#: src/mainwindow.c:5240 src/setup.c:91
+#: src/mainwindow.c:5230 src/setup.c:91
#, c-format
msgid "Scanning folder %s%c%s..."
msgstr "Revisando carpeta %s%c%s..."
-#: src/mainwindow.c:5384
+#: src/mainwindow.c:5374
#, c-format
msgid "Forgotten %d password in %d accounts.\n"
msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7894,7 +7907,7 @@ msgid "tag"
msgstr "etiqueta"
#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
+#: src/message_search.c:203 src/prefs_matcher.c:738 src/summary_search.c:456
msgid "Case sensitive"
msgstr "Sensible a mayús./minús."
@@ -7902,21 +7915,21 @@ msgstr "Sensible a mayús./minús."
msgid "Case insensitive"
msgstr "Ignorar mayús./minús."
-#: src/matcher.c:1859
+#: src/matcher.c:1863
#, c-format
msgid "checking if message matches [ %s ]\n"
msgstr "comprobando si el mensaje coincide [ %s ]\n"
-#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
+#: src/matcher.c:1934 src/matcher.c:1953 src/matcher.c:1966
msgid "message matches\n"
msgstr "el mensaje coincide\n"
-#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
+#: src/matcher.c:1941 src/matcher.c:1959 src/matcher.c:1968
msgid "message does not match\n"
msgstr "el mensaje no coincide\n"
-#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
+#: src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237 src/matcher.c:2238
msgid "(none)"
msgstr "(ninguna)"
@@ -7944,8 +7957,8 @@ msgstr "Sobreescribir fichero mbox"
msgid "This file already exists. Do you want to overwrite it?"
msgstr "Este fichero ya existe. ¿Desea sobreescribir su contenido?"
-#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:598 src/textview.c:3095
+#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1844
+#: src/prefs_themes.c:598 src/textview.c:3128
msgid "Overwrite"
msgstr "Sobreescribir"
@@ -7970,39 +7983,39 @@ msgstr "Buscar en el mensaje actual"
msgid "Find text:"
msgstr "Buscar texto:"
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:306 src/summary_search.c:780
msgid "Search failed"
msgstr "Búsqueda fallida"
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:307 src/summary_search.c:781
msgid "Search string not found."
msgstr "Cadena no encontrada."
-#: src/message_search.c:338
+#: src/message_search.c:316
msgid "Beginning of message reached; continue from end?"
msgstr "Se llegó al principio del mensaje. ¿Seguir desde el final?"
-#: src/message_search.c:341
+#: src/message_search.c:319
msgid "End of message reached; continue from beginning?"
msgstr "Se llegó al final del mensaje. ¿Seguir desde el principio?"
-#: src/message_search.c:344 src/summary_search.c:850
+#: src/message_search.c:322 src/summary_search.c:792
msgid "Search finished"
msgstr "Búsqueda concluida"
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:298 src/textview.c:252
msgid "Compose _new message"
msgstr "Componer un mensaje _nuevo"
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:713 src/messageview.c:1434 src/messageview.c:1585
msgid "Claws Mail - Message View"
msgstr "Claws Mail - Vista de mensaje"
-#: src/messageview.c:842
+#: src/messageview.c:843
msgid "<No Return-Path found>"
msgstr "<No se encontró Return-Path>"
-#: src/messageview.c:849
+#: src/messageview.c:850
#, c-format
msgid ""
"The notification address to which the return receipt is\n"
@@ -8017,65 +8030,51 @@ msgstr ""
"Dirección de retorno: %s\n"
"Se recomienda no enviar el acuse de recibo."
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:857
msgid "_Don't Send"
msgstr "_No enviar"
-#: src/messageview.c:875
-#, c-format
-msgctxt "'%s' stands for 'To' then 'Cc'"
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not send the return receipt."
-msgstr ""
-"Este mensaje solicita una notificación de acuse de recibo\n"
-"pero de acuerdo con sus cabeceras «%s» y «%s» no fue\n"
-"oficialmente dirigido a usted.\n"
-"Se recomienda no enviar el acuse de recibo."
-
-#: src/messageview.c:1385
+#: src/messageview.c:1364
#, c-format
msgid "Fetching message (%s)..."
msgstr "Recuperando mensaje (%s)..."
-#: src/messageview.c:1421 src/procmime.c:1009
+#: src/messageview.c:1400 src/procmime.c:1016
#, c-format
msgid "Couldn't decrypt: %s"
msgstr "No se puede descifrar: %s"
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1481 src/messageview.c:1489
msgid "Message doesn't conform to MIME standard. It may render wrongly."
msgstr ""
"El mensaje no cumple el estándar MIME. Puede mostrarse incorrectamente."
-#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
-#: src/summaryview.c:4885 src/textview.c:3083
+#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:2049
+#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4969
+#: src/summaryview.c:4972 src/textview.c:3116
msgid "Save as"
msgstr "Guardar como"
-#: src/messageview.c:1865
+#: src/messageview.c:1843
msgid "Overwrite existing file?"
msgstr "¿Sobreescribir el fichero existente?"
-#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
-#: src/summaryview.c:4920
+#: src/messageview.c:1851 src/summaryview.c:4989 src/summaryview.c:4992
+#: src/summaryview.c:5007
#, c-format
msgid "Couldn't save the file '%s'."
msgstr "No se pudo guardar el fichero «%s»."
-#: src/messageview.c:1926
+#: src/messageview.c:1904
#, c-format
msgid "Show all %s."
msgstr "Mostrar todo %s."
-#: src/messageview.c:1928
+#: src/messageview.c:1906
msgid "Only the first megabyte of text is shown."
msgstr "Mostrar sólo el primer megabyte de texto."
-#: src/messageview.c:1959
+#: src/messageview.c:1937
msgid ""
"You got a return receipt for this message: it has been displayed by the "
"recipient."
@@ -8083,19 +8082,19 @@ msgstr ""
"Recibió un acuse de recibo en este mensaje: éste ha sido visualizado por el "
"destinatario."
-#: src/messageview.c:1962
+#: src/messageview.c:1940
msgid "You asked for a return receipt in this message."
msgstr "Usted solicitó acuse de recibo en este mensaje."
-#: src/messageview.c:1968
+#: src/messageview.c:1946
msgid "This message asks for a return receipt."
msgstr "Este mensaje solicita acuse de recibo."
-#: src/messageview.c:1969
+#: src/messageview.c:1947
msgid "Send receipt"
msgstr "Enviar acuse de recibo"
-#: src/messageview.c:2012
+#: src/messageview.c:1990
msgid ""
"This message has been partially retrieved,\n"
"and has been deleted from the server."
@@ -8103,7 +8102,7 @@ msgstr ""
"Este mensaje se ha descargado parcialmente,\n"
"y ha sido eliminado del servidor."
-#: src/messageview.c:2018
+#: src/messageview.c:1996
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8112,15 +8111,15 @@ msgstr ""
"Este mensaje se ha descargado parcialmente;\n"
"es de %s."
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:2000 src/messageview.c:2022
msgid "Mark for download"
msgstr "Marcar para descargar"
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:2001 src/messageview.c:2013
msgid "Mark for deletion"
msgstr "Marcar para eliminar"
-#: src/messageview.c:2028
+#: src/messageview.c:2006
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8129,12 +8128,12 @@ msgstr ""
"Este mensaje se ha descargado parcialmente;\n"
"es de %s y será descargado."
-#: src/messageview.c:2033 src/messageview.c:2046
+#: src/messageview.c:2011 src/messageview.c:2024
#: src/prefs_filtering_action.c:180 src/toolbar.c:506
msgid "Unmark"
msgstr "Desmarca"
-#: src/messageview.c:2039
+#: src/messageview.c:2017
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8143,11 +8142,34 @@ msgstr ""
"Este mensaje se ha descargado parcialmente;\n"
"es de %s y será eliminado."
-#: src/messageview.c:2112
+#: src/messageview.c:2094
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
+msgstr ""
+"Este mensaje solicita una notificación de acuse de recibo\n"
+"pero de acuerdo con sus cabeceras «%s» y «%s» no fue\n"
+"oficialmente dirigido a usted.\n"
+"Se recomienda no enviar el acuse de recibo."
+
+#: src/messageview.c:2102 src/messageview.c:2110
msgid "Return Receipt Notification"
msgstr "Notificación de acuse de recibo"
-#: src/messageview.c:2113
+#: src/messageview.c:2104 src/messageview.c:2115
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: src/messageview.c:2104 src/messageview.c:2115
+msgid "_Send Notification"
+msgstr "_Enviar notificación"
+
+#: src/messageview.c:2111
msgid ""
"More than one of your accounts uses the address that this message was sent "
"to.\n"
@@ -8159,19 +8181,11 @@ msgstr ""
"Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
"acuse de recibo:"
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/messageview.c:2117
-msgid "_Send Notification"
-msgstr "_Enviar notificación"
-
-#: src/messageview.c:2206
+#: src/messageview.c:2207
msgid "Cannot print: the message doesn't contain text."
msgstr "No se puede imprimir: el mensaje no contiene texto."
-#: src/messageview.c:2967
+#: src/messageview.c:2968
msgid ""
"\n"
" There are no messages in this folder"
@@ -8179,7 +8193,7 @@ msgstr ""
"\n"
" No hay mensajes en esta carpeta"
-#: src/messageview.c:2975
+#: src/messageview.c:2976
msgid ""
"\n"
" Message has been deleted"
@@ -8187,7 +8201,7 @@ msgstr ""
"\n"
" El mensaje se ha borrado"
-#: src/messageview.c:2976
+#: src/messageview.c:2977
msgid ""
"\n"
" Message has been deleted or moved to another folder"
@@ -8195,8 +8209,8 @@ msgstr ""
"\n"
" El mensaje se ha borrado o movido a otra carpeta"
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
-#: src/summaryview.c:7054
+#: src/messageview.c:3010 src/messageview.c:3016 src/summaryview.c:4367
+#: src/summaryview.c:7190
msgid "An error happened while learning.\n"
msgstr "Ocurrió un error mientras se aprendía.\n"
@@ -8264,31 +8278,31 @@ msgstr "Gu_ardar todo..."
msgid "MIME Type"
msgstr "Tipo MIME"
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1020 src/mimeview.c:1025 src/mimeview.c:1030
+#: src/mimeview.c:1035
msgid "View full information"
msgstr "Ver la información completa"
-#: src/mimeview.c:1047
+#: src/mimeview.c:1041
msgid "Check again"
msgstr "Verificar de nuevo"
-#: src/mimeview.c:1059
+#: src/mimeview.c:1053
#, c-format
msgid "%s Click the icon to check it."
msgstr "%s Pulse en el icono para comprobarla."
-#: src/mimeview.c:1061
+#: src/mimeview.c:1055
#, c-format
msgid "%s Click the icon or hit '%s' to check it."
msgstr "%s Pulse en el icono o la tecla «%s» para comprobarla."
-#: src/mimeview.c:1071
+#: src/mimeview.c:1065
msgid "Timeout checking the signature. Click the icon to try again."
msgstr ""
"Expiró el tiempo comprobando la firma. Pulse en el icono para reintentarlo."
-#: src/mimeview.c:1073
+#: src/mimeview.c:1067
#, c-format
msgid ""
"Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8296,26 +8310,26 @@ msgstr ""
"Expiró el tiempo comprobando la firma. Pulse en el icono o la tecla «%s» "
"para reintentarlo."
-#: src/mimeview.c:1313
+#: src/mimeview.c:1307
msgid "Checking signature..."
msgstr "Verificando firma..."
-#: src/mimeview.c:1354
+#: src/mimeview.c:1348
msgid "Go back to email"
msgstr "Volver al correo"
-#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:449
+#: src/mimeview.c:1762 src/mimeview.c:1854 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:447
#, c-format
msgid "Couldn't save the part of multipart message: %s"
msgstr "No se pudo guardar la parte del mensaje multipartes: %s"
-#: src/mimeview.c:1840 src/textview.c:3093
+#: src/mimeview.c:1841 src/textview.c:3126
#, c-format
msgid "Overwrite existing file '%s'?"
msgstr "¿Sobreescribir el fichero existente «%s»?"
-#: src/mimeview.c:1864
+#: src/mimeview.c:1865
#, c-format
msgid ""
"An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8324,54 +8338,54 @@ msgstr ""
"Ha ocurrido un error al guardar la parte del mensaje n.º %d. ¿Desea cancelar "
"la operación o ignorar el error y continuar?"
-#: src/mimeview.c:1867
+#: src/mimeview.c:1868
msgid "Error saving all message parts"
msgstr "Error guardando todas las partes del mensaje"
-#: src/mimeview.c:1868
+#: src/mimeview.c:1869
msgid "Skip"
msgstr "Ignorar"
-#: src/mimeview.c:1868
+#: src/mimeview.c:1869
msgid "Skip all"
msgstr "Ignorar todos"
-#: src/mimeview.c:1878
+#: src/mimeview.c:1879
#, c-format
msgid "%d file saved successfully."
msgid_plural "%d files saved successfully."
msgstr[0] "%d fichero guardado con éxito."
msgstr[1] "%d ficheros guardados con éxito."
-#: src/mimeview.c:1886
+#: src/mimeview.c:1887
#, c-format
msgid "%d file saved successfully"
msgid_plural "%d files saved successfully"
msgstr[0] "%d fichero guardado con éxito"
msgstr[1] "%d ficheros guardados con éxito"
-#: src/mimeview.c:1891
+#: src/mimeview.c:1892
#, c-format
msgid "%s, %d file failed."
msgid_plural "%s, %d files failed."
msgstr[0] "%s, %d fichero falló."
msgstr[1] "%s, %d ficheros fallaron."
-#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1300
+#: src/mimeview.c:1925 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1280
msgid "Select destination folder"
msgstr "Seleccionar carpeta destino"
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1932 src/plugins/archive/archiver_prefs.c:148
#, c-format
msgid "'%s' is not a directory."
msgstr "«%s» no es un directorio."
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3043
msgid "Open with"
msgstr "Abrir con"
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
#, c-format
msgid ""
"Enter the command-line to open file:\n"
@@ -8380,7 +8394,7 @@ msgstr ""
"Teclee la orden para abrir el fichero:\n"
"(«%s» será sustituido por el fichero)"
-#: src/mimeview.c:2281
+#: src/mimeview.c:2282
#, c-format
msgid ""
"Could not convert attachment name to UTF-16:\n"
@@ -8391,11 +8405,11 @@ msgstr ""
"\n"
"%s"
-#: src/mimeview.c:2289
+#: src/mimeview.c:2290
msgid "Execute untrusted binary?"
msgstr "¿Ejecutar binario no fiable?"
-#: src/mimeview.c:2290
+#: src/mimeview.c:2291
msgid ""
"This attachment is an executable file. Executing untrusted binaries is "
"dangerous and could probably lead to compromission of your computer.\n"
@@ -8407,99 +8421,99 @@ msgstr ""
"\n"
"¿Desea ejecutar este fichero?"
-#: src/mimeview.c:2294
+#: src/mimeview.c:2295
msgid "Run binary"
msgstr "Ejecutar binario"
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2598 src/plugins/att_remover/att_remover.c:304
msgid "Type:"
msgstr "Tipo:"
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
+#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:701 src/summaryview.c:2743
msgid "Size:"
msgstr "Tamaño:"
-#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/mimeview.c:2613 src/plugins/vcalendar/vcalendar.c:1253
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
msgid "Description:"
msgstr "Descripción:"
-#: src/news.c:303
+#: src/news.c:299
#, c-format
msgid "NNTP connection to %s:%d has been disconnected.\n"
msgstr "La conexión NNTP con %s:%d se ha desconectado.\n"
-#: src/news.c:336
+#: src/news.c:334
#, c-format
msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
msgstr "Cuenta «%s»: Conectando al servidor NNTP: %s:%d...\n"
-#: src/news.c:357
+#: src/news.c:370
#, c-format
msgid "Error logging in to %s:%d...\n"
msgstr "Error entrando en %s:%d...\n"
-#: src/news.c:438
+#: src/news.c:450
msgid ""
"Libetpan does not support return code 480 so for now we choose to continue\n"
msgstr ""
"Libetpan no soporta el código de retorno 480 por ahora, escogemos continuar\n"
-#: src/news.c:447
+#: src/news.c:459
msgid "Mode reader failed, continuing nevertheless\n"
msgstr "Falló el modo «reader», se continúa sin embargo\n"
-#: src/news.c:451
+#: src/news.c:463
#, c-format
msgid "Error creating session with %s:%d\n"
msgstr "Error creando sesión con %s:%d\n"
-#: src/news.c:466
+#: src/news.c:478
#, c-format
msgid "Error authenticating to %s:%d...\n"
msgstr "Error autenticándose en %s:%d...\n"
-#: src/news.c:491
+#: src/news.c:503
msgid "Claws Mail needs network access in order to access the News server."
msgstr ""
"Claws Mail necesita acceso a la red para poder acceder al servidor de "
"noticias."
-#: src/news.c:862
+#: src/news.c:874
#, c-format
msgid "couldn't select group: %s\n"
msgstr "no se pudo seleccionar el grupo: %s\n"
-#: src/news.c:1054 src/news.c:1232
+#: src/news.c:1066 src/news.c:1244
#, c-format
msgid "couldn't set group: %s\n"
msgstr "no se pudo establecer el grupo: %s\n"
-#: src/news.c:1063
+#: src/news.c:1075
#, c-format
msgid "invalid article range: %d - %d\n"
msgstr "rango de artículos inválido: %d - %d\n"
-#: src/news.c:1133 src/news.c:1160 src/news.c:1187
+#: src/news.c:1145 src/news.c:1172 src/news.c:1199
msgid "couldn't get xhdr\n"
msgstr "no se pudo obtener xhdr\n"
-#: src/news.c:1225
+#: src/news.c:1237
#, c-format
msgid "getting xover %d - %d in %s...\n"
msgstr "obteniendo xover %d - %d en %s...\n"
-#: src/news.c:1240
+#: src/news.c:1252
msgid "couldn't get xover\n"
msgstr "no se pudo obtener xover\n"
-#: src/news.c:1257
+#: src/news.c:1269
msgid "invalid xover line\n"
msgstr "línea xover inválida\n"
-#: src/news.c:1459
+#: src/news.c:1471
msgid ""
"You have one or more News accounts defined. However this version of Claws "
"Mail has been built without News support; your News accounts are disabled.\n"
@@ -8574,11 +8588,11 @@ msgstr "Contraseña nueva:"
msgid "Confirm passphrase:"
msgstr "Confirmar contraseña:"
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:52
msgid "Acpi Notifier"
msgstr "Notificador ACPI"
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:68
msgid ""
"Make sure that the kernel module 'acerhk' is loaded.\n"
"You can get it from http://www.cakey.de/acerhk/"
@@ -8586,7 +8600,7 @@ msgstr ""
"Asegúrese de que el módulo del núcleo «acerhk» está cargado.\n"
"Puede obtenerlo de http://www.cakey.de/acerhk/"
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
msgid ""
"Make sure that the kernel module 'acer_acpi' is loaded.\n"
"You can get it from http://code.google.com/p/aceracpi/"
@@ -8594,19 +8608,19 @@ msgstr ""
"Asegúrese de que el módulo del núcleo «acer_acpi» está cargado.\n"
"Puede obtenerlo de http://code.google.com/p/aceracpi/"
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
msgid "Make sure that the kernel module 'asus_laptop' is loaded."
msgstr "Asegúrese de que el módulo del núcleo «asus_laptop» está cargado."
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
msgid "Make sure that the kernel module 'asus_acpi' is loaded."
msgstr "Asegúrese de que el módulo del núcleo «asus_acpi» está cargado."
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
msgstr "Asegúrese de que el módulo del núcleo «ibm_acpi» está cargado."
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
msgid ""
"Make sure that you have apanelc installed.\n"
"You can get it from http://apanel.sourceforge.net/"
@@ -8614,78 +8628,78 @@ msgstr ""
"Asegúrese de que tiene apanelc instalado.\n"
"Puede obtenerlo de http://apanel.sourceforge.net/"
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:208
+#: src/plugins/acpi_notifier/acpi_notifier.c:214
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
msgid "Control file doesn't exist."
msgstr "El fichero de control no existe."
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:306
msgid " : no new or unread mail"
msgstr " : no hay correo nuevo o sin leer"
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
msgid " : unread mail"
msgstr " : mensajes sin leer"
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
msgid " : new mail"
msgstr " : mensajes nuevos"
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:310
+#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:322
msgid "off"
msgstr "apagado"
-#: src/plugins/acpi_notifier/acpi_notifier.c:311
-#: src/plugins/acpi_notifier/acpi_notifier.c:317
-#: src/plugins/acpi_notifier/acpi_notifier.c:323
+#: src/plugins/acpi_notifier/acpi_notifier.c:312
+#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: src/plugins/acpi_notifier/acpi_notifier.c:324
msgid "blinking"
msgstr "parpadeante"
-#: src/plugins/acpi_notifier/acpi_notifier.c:313
-#: src/plugins/acpi_notifier/acpi_notifier.c:319
-#: src/plugins/acpi_notifier/acpi_notifier.c:325
+#: src/plugins/acpi_notifier/acpi_notifier.c:314
+#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: src/plugins/acpi_notifier/acpi_notifier.c:326
msgid "on"
msgstr "encendido"
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+#: src/plugins/acpi_notifier/acpi_notifier.c:348
+#: src/plugins/acpi_notifier/acpi_notifier.c:357
+#: src/plugins/acpi_notifier/acpi_notifier.c:372
msgid "LED "
msgstr "LED "
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:387
msgid "ACPI type: "
msgstr "Tipo de ACPI: "
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:396
msgid "ACPI file: "
msgstr "Fichero ACPI: "
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:407
msgid "values - On: "
msgstr "valores - Encendido: "
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:412
msgid " - Off: "
msgstr " - Apagado: "
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:434
msgid "Blink when user interaction is required"
msgstr "Parpadear cuando sea necesaria la intervención del usuario"
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:868
msgid "This plugin handles various ACPI mail LEDs."
msgstr "Este módulo controla algunos LEDs de notificación de correo ACPI."
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:889
msgid "Laptop LED"
msgstr "LED del portátil"
#: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:257
+#: src/plugins/attachwarner/attachwarner.c:252
msgid "Failed to register check before send hook"
msgstr "Falló el registro de la función de comprobar antes de enviar"
@@ -8713,11 +8727,11 @@ msgid "Address book path where addresses are kept"
msgstr "Ruta en la agenda donde se guardarán las direcciones"
#: src/plugins/address_keeper/address_keeper_prefs.c:123
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:557 src/prefs_filtering_action.c:564
+#: src/prefs_matcher.c:674
msgid "Select..."
msgstr "Seleccionar..."
@@ -8801,15 +8815,15 @@ msgstr "Archivador"
msgid "Archiving"
msgstr "Archivando"
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:126
msgid "Press Cancel button to stop archiving"
msgstr "Pulse el botón Cancelar para detener el archivado"
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:142
msgid "Archiving:"
msgstr "Archivando:"
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:526
#, c-format
msgid ""
"Some uninitialized data prevents from starting\n"
@@ -8820,7 +8834,7 @@ msgstr ""
"debido a algunos datos no inicializados:\n"
"%s%s"
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:529
msgid ""
"\n"
"- the folder to archive is not set"
@@ -8828,7 +8842,7 @@ msgstr ""
"\n"
"• no se estableció la carpeta a archivar"
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:530
msgid ""
"\n"
"- the name for archive is not set"
@@ -8836,37 +8850,37 @@ msgstr ""
"\n"
"• no se estableció el nombre del archivo"
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:553
#, c-format
msgid "%s: Exists. Continue anyway?"
msgstr "%s : ya existe. ¿Continuar de todas formas?"
-#: src/plugins/archive/archiver_gtk.c:555
+#: src/plugins/archive/archiver_gtk.c:556
#, c-format
msgid "%s: Is a link. Cannot continue"
msgstr "%s: es un enlace. No se puede continuar"
-#: src/plugins/archive/archiver_gtk.c:558
+#: src/plugins/archive/archiver_gtk.c:559
#, c-format
msgid "%s: Is a directory. Cannot continue"
msgstr "%s: es un directorio. No se puede continuar"
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:562
#, c-format
msgid "%s: Missing permissions. Cannot continue"
msgstr "%s: no hay permisos. No se puede continuar"
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:565
#, c-format
msgid "%s: Unknown error. Cannot continue"
msgstr "%s: error desconocido. No se puede continuar"
-#: src/plugins/archive/archiver_gtk.c:572
-#: src/plugins/archive/archiver_gtk.c:619
+#: src/plugins/archive/archiver_gtk.c:573
+#: src/plugins/archive/archiver_gtk.c:620
msgid "Creating archive"
msgstr "Creando archivo"
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:586
#, c-format
msgid ""
"Not a valid file name:\n"
@@ -8875,7 +8889,7 @@ msgstr ""
"Nombre de fichero inválido:\n"
"%s."
-#: src/plugins/archive/archiver_gtk.c:590
+#: src/plugins/archive/archiver_gtk.c:591
#, c-format
msgid ""
"Not a valid Claws Mail folder:\n"
@@ -8884,7 +8898,7 @@ msgstr ""
"Nombre de carpeta de Claws Mail inválida:\n"
"%s."
-#: src/plugins/archive/archiver_gtk.c:614
+#: src/plugins/archive/archiver_gtk.c:615
#, c-format
msgid ""
"Adding files in folder failed\n"
@@ -8899,7 +8913,7 @@ msgstr ""
"\n"
"¿Continuar de todas formas?"
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:632
#, c-format
msgid ""
"Archive creation error:\n"
@@ -8908,176 +8922,176 @@ msgstr ""
"Error creando el archivo:\n"
"%s"
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:745
msgid "Archive result"
msgstr "Resultado del archivado"
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:775
msgid "Values"
msgstr "Valores"
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:785
msgid "Archive"
msgstr "Archivo"
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:791
msgid "Archive format"
msgstr "Formato de archivo"
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:798
msgid "Compression method"
msgstr "Método de compresión"
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:806
msgid "Number of files"
msgstr "Número de ficheros"
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:814
msgid "Archive Size"
msgstr "Tamaño del archivo"
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:822
msgid "Folder Size"
msgstr "Tamaño de la carpeta"
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:831
msgid "Compression level"
msgstr "Nivel de compresión"
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:522
+#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/pdf_viewer/poppler_viewer.c:720 src/prefs_folder_item.c:521
msgid "Yes"
msgstr "Sí"
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:521
+#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:520
#: src/prefs_summaries.c:380
msgid "No"
msgstr "No"
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:839
msgid "MD5 checksum"
msgstr "Suma de control MD5"
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:847
msgid "Descriptive names"
msgstr "Nombres descriptivos"
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:855
msgid "Delete selected files"
msgstr "Borrar los ficheros seleccionados"
-#: src/plugins/archive/archiver_gtk.c:861
-#: src/plugins/archive/archiver_gtk.c:1324
+#: src/plugins/archive/archiver_gtk.c:864
+#: src/plugins/archive/archiver_gtk.c:1329
msgid "Select mails before"
msgstr "Seleccionar correos antes de"
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:920
msgid "Select folder to archive"
msgstr "Seleccionar carpeta a archivar"
-#: src/plugins/archive/archiver_gtk.c:938
+#: src/plugins/archive/archiver_gtk.c:941
msgid "Select file name for archive [suffix should reflect archive like .tgz]"
msgstr ""
"Seleccione un nombre para el archivo (el sufijo debería reflejar el tipo, p."
"ej.: .tgz)"
-#: src/plugins/archive/archiver_gtk.c:986
+#: src/plugins/archive/archiver_gtk.c:989
#, c-format
msgid "%ld of %ld"
msgstr "%ld de %ld"
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1042
msgid "Create Archive"
msgstr "Crear un archivo"
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1057
msgid "Enter Archiver arguments"
msgstr "Parámetros de archivado"
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1071
msgid "Folder to archive"
msgstr "Carpeta a archivar"
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1078
msgid "Folder which is the root of the archive"
msgstr "Carpeta raíz del archivo"
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1083
msgid "Click this button to select a folder which is to be root of the archive"
msgstr ""
"Pulse este botón para seleccionar la carpeta que será la raíz del archivo"
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1089
msgid "Name for archive"
msgstr "Nombre del archivo"
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1095
msgid "Archive location and name"
msgstr "Ubicación y nombre del archivo"
-#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_gtk.c:1097
#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:435
+#: src/plugins/pgpcore/select-keys.c:493
msgid "_Select"
msgstr "_Seleccionar"
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1100
msgid "Click this button to select a name and location for the archive"
msgstr "Pulse este botón para seleccionar el nombre y ubicación del archivo"
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1102
msgid "Choose compression"
msgstr "Elija la compresión"
-#: src/plugins/archive/archiver_gtk.c:1109
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1128
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1142
-#: src/plugins/archive/archiver_gtk.c:1150
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1170
-#: src/plugins/archive/archiver_gtk.c:1177
+#: src/plugins/archive/archiver_gtk.c:1114
+#: src/plugins/archive/archiver_gtk.c:1120
+#: src/plugins/archive/archiver_gtk.c:1126
+#: src/plugins/archive/archiver_gtk.c:1133
+#: src/plugins/archive/archiver_gtk.c:1139
+#: src/plugins/archive/archiver_gtk.c:1147
+#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1161
+#: src/plugins/archive/archiver_gtk.c:1167
+#: src/plugins/archive/archiver_gtk.c:1175
+#: src/plugins/archive/archiver_gtk.c:1182
#, c-format
msgid "Choose this option to use %s compression for the archive"
msgstr "Elija esta opción para usar la compresión %s en el archivo"
-#: src/plugins/archive/archiver_gtk.c:1226
+#: src/plugins/archive/archiver_gtk.c:1231
msgid "Choose format"
msgstr "Elegir formato"
-#: src/plugins/archive/archiver_gtk.c:1238
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1243
+#: src/plugins/archive/archiver_gtk.c:1249
+#: src/plugins/archive/archiver_gtk.c:1255
+#: src/plugins/archive/archiver_gtk.c:1261
#, c-format
msgid "Choose this to use %s as format for the archive"
msgstr "Elija esto para usar el formato %s en el archivo"
-#: src/plugins/archive/archiver_gtk.c:1276
+#: src/plugins/archive/archiver_gtk.c:1281
msgid "Miscellaneous options"
msgstr "Opciones adicionales"
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1290
msgid "_Recursive"
msgstr "_Recursivo"
-#: src/plugins/archive/archiver_gtk.c:1289
+#: src/plugins/archive/archiver_gtk.c:1294
msgid "Choose this option to include subfolders in the archive"
msgstr "Incluir las subcarpetas en el archivo"
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1296
msgid "_MD5sum"
msgstr "Suma de control _MD5"
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1300
msgid ""
"Choose this option to add MD5 checksums for each file in the archive.\n"
"Be aware though, that this dramatically increases the time it\n"
@@ -9087,11 +9101,11 @@ msgstr ""
"Cuidado: esta opción incrementa dramáticamente el tiempo que se tardará\n"
"en crear el archivo"
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1304
msgid "R_ename"
msgstr "R_enombrar"
-#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_gtk.c:1308
#: src/plugins/archive/archiver_prefs.c:427
msgid ""
"Choose this option to use descriptive names for each file in the archive.\n"
@@ -9102,7 +9116,7 @@ msgstr ""
"El esquema de nombrado es: fecha_desde at para@asunto.\n"
"Los nombres se truncarán a un máximo de 96 caracteres."
-#: src/plugins/archive/archiver_gtk.c:1311
+#: src/plugins/archive/archiver_gtk.c:1316
msgid ""
"Choose this option to delete mails after archiving\n"
"At this point only handles IMAP4, Local mbox and POP3"
@@ -9110,11 +9124,11 @@ msgstr ""
"Borrar los correos después del archivado.\n"
"Actualmente sólo soporta IMAP4, mbox local y POP3"
-#: src/plugins/archive/archiver_gtk.c:1315
+#: src/plugins/archive/archiver_gtk.c:1320
msgid "Selection options"
msgstr "Opciones de selección"
-#: src/plugins/archive/archiver_gtk.c:1331
+#: src/plugins/archive/archiver_gtk.c:1336
msgid ""
"Select emails before a certain date\n"
"Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9188,7 +9202,7 @@ msgstr ""
"necesario para crear los archivos"
#: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:765
+#: src/plugins/managesieve/sieve_manager.c:769
msgid "Rename"
msgstr "Renombrar"
@@ -9201,20 +9215,20 @@ msgid "Remove attachments"
msgstr "Eliminar adjuntos"
#: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1099
msgid "Remove"
msgstr "Eliminar"
#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2807
+#: src/prefs_summary_column.c:79 src/summaryview.c:2837
msgid "Attachment"
msgstr "Adjunto"
-#: src/plugins/att_remover/att_remover.c:422
+#: src/plugins/att_remover/att_remover.c:424
msgid "Destroy attachments"
msgstr "Destruir adjuntos"
-#: src/plugins/att_remover/att_remover.c:423
+#: src/plugins/att_remover/att_remover.c:425
msgid ""
"Do you really want to remove all attachments from the selected messages?\n"
"\n"
@@ -9225,20 +9239,34 @@ msgstr ""
"\n"
"Los datos borrados no se podrán recuperar."
-#: src/plugins/att_remover/att_remover.c:484
+#: src/plugins/att_remover/att_remover.c:468
+msgid "The selected messages don't have any attachments."
+msgstr "Los mensajes seleccionados no tienen ningún adjunto."
+
+#: src/plugins/att_remover/att_remover.c:471
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr "Adjuntos eliminados de %d de los %d mensajes seleccionados."
+
+#: src/plugins/att_remover/att_remover.c:474
+#, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr "Adjuntos eliminados de todos los %d mensajes seleccionados."
+
+#: src/plugins/att_remover/att_remover.c:503
msgid "This message doesn't have any attachments."
msgstr "Este mensaje no tiene ningún adjunto"
-#: src/plugins/att_remover/att_remover.c:499
+#: src/plugins/att_remover/att_remover.c:516
msgid "Remove attachments..."
msgstr "Eliminar adjuntos..."
-#: src/plugins/att_remover/att_remover.c:511
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:528
+#: src/plugins/att_remover/att_remover.c:588
msgid "AttRemover"
msgstr "Eliminador de adjuntos"
-#: src/plugins/att_remover/att_remover.c:576
+#: src/plugins/att_remover/att_remover.c:593
msgid ""
"This plugin removes attachments from mails.\n"
"\n"
@@ -9250,11 +9278,11 @@ msgstr ""
"Aviso: esta operación es completamente irreversible y los adjuntos borrados "
"se perderán para siempre jamás."
-#: src/plugins/att_remover/att_remover.c:600
+#: src/plugins/att_remover/att_remover.c:617
msgid "Attachment handling"
msgstr "Gestión de adjuntos"
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
#, c-format
msgid ""
"An attachment is mentioned in the mail you're sending, but no file was "
@@ -9268,17 +9296,17 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
msgid "Attachment warning"
msgstr "Aviso de adjuntos"
-#: src/plugins/attachwarner/attachwarner.c:250
-#: src/plugins/attachwarner/attachwarner.c:287
-#: src/plugins/attachwarner/attachwarner.c:339
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
msgid "Attach warner"
msgstr "Aviso de adjuntos"
-#: src/plugins/attachwarner/attachwarner.c:297
+#: src/plugins/attachwarner/attachwarner.c:292
msgid ""
"Warns user if some reference to attachments is found in the message text and "
"no file is attached."
@@ -9328,7 +9356,7 @@ msgid ""
"Don't check for missing attachments when forwarding or redirecting messages"
msgstr "No comprueba si faltan adjuntos al reenviar o redirigir mensajes"
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:308
msgid "Signatures"
msgstr "Firmas"
@@ -9353,10 +9381,27 @@ msgid "Attach Warner"
msgstr "Aviso de adjuntos"
#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
msgid "Bogofilter"
msgstr "Bogofilter"
+#: src/plugins/bogofilter/bogofilter.c:107
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:117
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:670
+#: src/prefs_matcher.c:705 src/prefs_matcher.c:1616 src/prefs_matcher.c:1623
+#: src/prefs_matcher.c:1631 src/prefs_matcher.c:1633 src/prefs_matcher.c:2518
+#: src/prefs_matcher.c:2522
+msgid "Any"
+msgstr "Cualquiera"
+
#: src/plugins/bogofilter/bogofilter.c:456
msgid "Bogofilter: fetching bodies..."
msgstr "Bogofilter: recuperando cuerpos..."
@@ -9440,72 +9485,72 @@ msgstr ""
"Bogofilter»"
#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:624
+#: src/plugins/spamassassin/spamassassin.c:642
msgid "Spam detection"
msgstr "Detección de correo basura"
#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:625
+#: src/plugins/spamassassin/spamassassin.c:643
msgid "Spam learning"
msgstr "Aprendizaje de correo basura"
#: src/plugins/bogofilter/bogofilter_gtk.c:161
#: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
msgid "Process messages on receiving"
msgstr "Procesar mensajes al recibir"
#: src/plugins/bogofilter/bogofilter_gtk.c:169
#: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:374
msgid "Maximum size"
msgstr "Tamaño máximo"
#: src/plugins/bogofilter/bogofilter_gtk.c:178
#: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:383
msgid "Messages larger than this will not be checked"
msgstr "No se comprobarán los mensajes mayores de este tamaño"
#: src/plugins/bogofilter/bogofilter_gtk.c:181
#: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1640
msgid "KB"
msgstr "kB"
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
msgid "Delete spam"
msgstr "Borrar basura"
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
msgid "Save spam in..."
msgstr "Guardar correo basura en..."
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
msgid "Only mark as spam"
msgstr "Solo marcar como basura"
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
#: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
msgid ""
"Folder for storing identified spam. Leave empty to use the trash folder."
msgstr ""
"Carpeta para almacenar el correo basura identificado. Déjelo vacío para usar "
"la Papelera."
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
#: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
msgid "Click this button to select a folder for storing spam"
msgstr ""
"Pulse este botón para seleccionar una carpeta donde guardar el correo basura"
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
msgid "When unsure, move to"
msgstr "Si es dudoso, mover a"
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
msgid ""
"Folder for storing mail for which spam status is Unsure. Leave empty to use "
"the Inbox folder."
@@ -9513,29 +9558,29 @@ msgstr ""
"Carpeta para almacenar el correo cuya identificación como basura no es "
"segura. Déjelo vacío para usar la carpeta de Entrada."
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
msgid "Click this button to select a folder for storing Unsure mails."
msgstr ""
"Pulse este botón para seleccionar una carpeta donde guardar los correos cuya "
"identificación como basura no es segura."
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
msgid "Insert X-Bogosity header"
msgstr "Insertar la cabecera «X-Bogosity»"
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
msgid "Only done for messages in MH folders"
msgstr "Sólo se realiza para mensajes en carpetas MH"
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
#: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
msgid "Whitelist senders found in address book/folder"
msgstr "Permitir los remitentes presentes en la agenda/carpeta"
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
#: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
msgid ""
"Messages coming from your address book contacts will be received in the "
"normal folder even if detected as spam"
@@ -9543,20 +9588,20 @@ msgstr ""
"Los mensajes que vengan de los contactos de su agenda de direcciones serán "
"recibidos en la carpeta normal aunque se detecten como correo basura"
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
#: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
msgid "Click this button to select a book or folder in the address book"
msgstr ""
"Pulse este botón para seleccionar una agenda o carpeta de la agenda de "
"direcciones"
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
#: src/plugins/bsfilter/bsfilter_gtk.c:207
msgid "Learn whitelisted emails as ham"
msgstr "Aprender como buenos los correos en la lista blanca"
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
msgid ""
"If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
"learn it as ham."
@@ -9564,17 +9609,17 @@ msgstr ""
"Si Bogofilter cree que un correo es basura o no está seguro pero esta en la "
"lista blanca se aprende como bueno."
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
msgid "Bogofilter call"
msgstr "Llamada a Bogofilter"
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
msgid "Path to bogofilter executable"
msgstr "Ruta al ejecutable bogofilter"
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
#: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
msgid "Mark spam as read"
msgstr "Marcar correo basura como leído"
@@ -9645,7 +9690,7 @@ msgstr ""
"Las opciones se encuentran en «/Configuración/Preferencias/Módulos/Bsfilter»"
#: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
msgid "Save spam in"
msgstr "Guardar correo basura en"
@@ -9666,7 +9711,7 @@ msgid "Path to bsfilter executable"
msgstr "Ruta al ejecutable bsfilter"
#: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:550
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
msgid "Clam AntiVirus"
msgstr "Antivirus Clam"
@@ -9788,56 +9833,56 @@ msgstr "Detección de virus"
msgid "Select folder to store infected messages in"
msgstr "Seleccionar la carpeta en la que almacenar los mensajes infectados"
-#: src/plugins/clamd/clamav_plugin_gtk.c:250
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
msgid "Enable virus scanning"
msgstr "Activar la verificación de virus"
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
msgid "Maximum attachment size"
msgstr "Tamaño máximo del adjunto"
-#: src/plugins/clamd/clamav_plugin_gtk.c:271
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
msgid "Message attachments larger than this will not be scanned"
msgstr "Los adjuntos mayores de este tamaño no se verificarán"
-#: src/plugins/clamd/clamav_plugin_gtk.c:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
msgid "MB"
msgstr "MB"
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
msgid "Save infected mail in"
msgstr "Guardar el correo infectado en"
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
msgid "Save mail that contains viruses"
msgstr "Guardar el correo que contiene virus"
-#: src/plugins/clamd/clamav_plugin_gtk.c:296
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
msgid ""
"Folder for storing infected mail. Leave empty to use the default trash folder"
msgstr ""
"Carpeta para almacenar el correo infectado. Déjela vacía para usar la "
"papelera predeterminada"
-#: src/plugins/clamd/clamav_plugin_gtk.c:304
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
msgid "Click this button to select a folder for storing infected mail"
msgstr ""
"Pulse este botón para seleccionar una carpeta donde almacenar el correo "
"infectado"
-#: src/plugins/clamd/clamav_plugin_gtk.c:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
msgid "Automatic configuration"
msgstr "Configuración automática"
-#: src/plugins/clamd/clamav_plugin_gtk.c:317
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
msgid "Should configuration be done automatic or manual"
msgstr "Realizar la configuración automática o manual"
-#: src/plugins/clamd/clamav_plugin_gtk.c:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
msgid "Where is clamd.conf"
msgstr "¿Dónde está «clamd.conf»?"
-#: src/plugins/clamd/clamav_plugin_gtk.c:333
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
msgid ""
"Full path to clamd.conf. If this field is not empty then the plugin has been "
"able to locate the file automatically"
@@ -9845,36 +9890,36 @@ msgstr ""
"Ruta completa a «clamd.conf». Si este campo no está vacío entonces el módulo "
"fue capaz de encontrar el fichero automáticamente"
-#: src/plugins/clamd/clamav_plugin_gtk.c:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
msgid "Br_owse"
msgstr "_Examinar"
-#: src/plugins/clamd/clamav_plugin_gtk.c:341
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
msgid "Click this button to select full path to clamd.conf"
msgstr "Pulse este botón para seleccionar la ruta completa a «clamd.conf»"
-#: src/plugins/clamd/clamav_plugin_gtk.c:349
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
msgid "Check permission for folders and adjust if necessary"
msgstr "Compruebe los permisos de las carpetas y ajústelos si es necesario"
-#: src/plugins/clamd/clamav_plugin_gtk.c:362
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
msgid "Click this button to check and adjust folder permissions"
msgstr "Pulse este botón para comprobar y ajustar los permisos de las carpetas"
-#: src/plugins/clamd/clamav_plugin_gtk.c:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
msgid "Remote Host"
msgstr "Anfitrión remoto"
-#: src/plugins/clamd/clamav_plugin_gtk.c:378
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
msgid "Hostname or IP for remote host running clamav daemon"
msgstr ""
"Nombre o dirección IP de la máquina que está ejecutando el demonio clamav"
-#: src/plugins/clamd/clamav_plugin_gtk.c:398
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
msgid "Port number where clamav daemon is listening"
msgstr "Número de puerto donde escucha el demonio clamav"
-#: src/plugins/clamd/clamav_plugin_gtk.c:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
msgid ""
"New config\n"
"No socket information.\n"
@@ -9884,7 +9929,7 @@ msgstr ""
"No hay información de conector.\n"
"Antivirus desactivado."
-#: src/plugins/clamd/clamav_plugin_gtk.c:529
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
msgid ""
"New config\n"
"Clamd does not respond to ping.\n"
@@ -9916,26 +9961,26 @@ msgstr ""
msgid "Could not create socket"
msgstr "No se pudo crear el conector"
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:441
msgid ": File does not exist"
msgstr ": El fichero no existe"
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:454
msgid ": Unable to open"
msgstr ": No se puede abrir"
-#: src/plugins/clamd/libclamd/clamd-plugin.c:470
-#: src/plugins/clamd/libclamd/clamd-plugin.c:475
-#: src/plugins/clamd/libclamd/clamd-plugin.c:489
+#: src/plugins/clamd/libclamd/clamd-plugin.c:473
+#: src/plugins/clamd/libclamd/clamd-plugin.c:478
+#: src/plugins/clamd/libclamd/clamd-plugin.c:492
msgid "Socket write error"
msgstr "Error de escritura en el conector"
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:485
#, c-format
msgid "%s: Error reading"
msgstr "%s: Error leyendo"
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:499
msgid "Socket read error"
msgstr "Error de lectura en el conector"
@@ -10000,7 +10045,8 @@ msgstr "Abrir en el visor (contenidos remotos activados)"
msgid "Do nothing (remote content is disabled)"
msgstr "No hacer nada (contenidos remotos desactivados)"
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:209 src/prefs_account.c:3920
+#: src/prefs_proxy.c:241
msgid "Proxy"
msgstr "Proxy"
@@ -10048,8 +10094,8 @@ msgstr "Las CSS en este fichero se aplicarán a todas las partes HTML"
#: src/plugins/fancy/fancy_prefs.c:308
#: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1574 src/prefs_account.c:1663 src/prefs_account.c:2205
#: src/prefs_customheader.c:234
msgid "Bro_wse"
msgstr "E_xplorar"
@@ -10058,93 +10104,93 @@ msgstr "E_xplorar"
msgid "Select stylesheet"
msgstr "Seleccionar estilos"
-#: src/plugins/fancy/fancy_viewer.c:418
+#: src/plugins/fancy/fancy_viewer.c:416
msgid "Remote content loading is disabled."
msgstr "Carga de contenidos remotos desactivada."
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:495
msgid "Load images"
msgstr "Cargar imágenes"
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:497
msgid "Enable remote content"
msgstr "Activar contenidos remotos"
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:499
msgid "Enable Javascript"
msgstr "Activar Javascript"
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:501
msgid "Enable Plugins"
msgstr "Activar módulos"
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:503
msgid "Enable Java"
msgstr "Activar Java"
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:505
msgid "Open links with external browser"
msgstr "Abrir enlaces con el navegador externo"
-#: src/plugins/fancy/fancy_viewer.c:689
+#: src/plugins/fancy/fancy_viewer.c:687
#, c-format
msgid "An error occurred: %d\n"
msgstr "Ocurrió un error: %d\n"
-#: src/plugins/fancy/fancy_viewer.c:745
+#: src/plugins/fancy/fancy_viewer.c:743
#, c-format
msgid "%s is a malformed or not supported feed"
msgstr "%s es un canal mal formado o no soportado"
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:754
msgid "Search the Web"
msgstr "Buscar en la web"
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:766
msgid "Open in Viewer"
msgstr "Abrir en el visor"
-#: src/plugins/fancy/fancy_viewer.c:770
+#: src/plugins/fancy/fancy_viewer.c:768
msgid "Open in Viewer (enable remote content)"
msgstr "Abrir en el visor (activar contenidos remotos)"
-#: src/plugins/fancy/fancy_viewer.c:779
+#: src/plugins/fancy/fancy_viewer.c:777
msgid "Open in Browser"
msgstr "Abrir con el navegador"
-#: src/plugins/fancy/fancy_viewer.c:789
+#: src/plugins/fancy/fancy_viewer.c:787
msgid "Open Image"
msgstr "Abrir imagen"
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:796
msgid "Copy Link"
msgstr "Copiar enlace"
-#: src/plugins/fancy/fancy_viewer.c:802
+#: src/plugins/fancy/fancy_viewer.c:800
msgid "Download Link"
msgstr "Descargar enlace"
-#: src/plugins/fancy/fancy_viewer.c:813
+#: src/plugins/fancy/fancy_viewer.c:811
msgid "Save Image As"
msgstr "Descargar imagen como"
-#: src/plugins/fancy/fancy_viewer.c:823
+#: src/plugins/fancy/fancy_viewer.c:821
msgid "Copy Image"
msgstr "Copiar imagen"
-#: src/plugins/fancy/fancy_viewer.c:841
+#: src/plugins/fancy/fancy_viewer.c:839
msgid "Import feed"
msgstr "Importar canal"
-#: src/plugins/fancy/fancy_viewer.c:1120
+#: src/plugins/fancy/fancy_viewer.c:1118
msgid "Fancy"
msgstr "Fancy"
-#: src/plugins/fancy/fancy_viewer.c:1148
+#: src/plugins/fancy/fancy_viewer.c:1146
msgid "Fancy HTML Viewer"
msgstr "Visor HTML Fancy"
-#: src/plugins/fancy/fancy_viewer.c:1153
+#: src/plugins/fancy/fancy_viewer.c:1151
#, c-format
msgid ""
"This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10324,17 +10370,17 @@ msgstr "Módulo GData: Error de autorización: %s\n"
msgid "GData plugin: Authorization successful\n"
msgstr "Módulo GData: Autorización realizada con éxito\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
msgid "GData plugin: Starting interactive authorization\n"
msgstr "Módulo GData: Iniciando la autorización interactiva\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
msgid "GData plugin: Got authorization code, requesting authorization\n"
msgstr ""
"Módulo GData: Consiguió el código de autorización, solicitando la "
"autorización\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
msgid ""
"GData plugin: No authorization code received, authorization request "
"cancelled\n"
@@ -10342,16 +10388,24 @@ msgstr ""
"Módulo GData: No se recibió el código de autorización, cancelada la "
"solicitud de la autorización\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+"Módulo GData: la autorización interactiva todavía se está ejecutando, "
+"no se inició una nueva sesión\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
#, c-format
msgid "GData plugin: Authorization refresh error: %s\n"
msgstr "Módulo GData: Error de actualización de autorización: %s\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
msgid "GData plugin: Authorization refresh successful\n"
msgstr "Módulo GData: Actualización de autorización correcta\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
#, c-format
msgid ""
"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10359,17 +10413,17 @@ msgstr ""
"Módulo GData: tiempo transcurrido desde el último refresco: %d minutos, "
"refrescando ahora\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
msgid "GData plugin: Trying to refresh authorization\n"
msgstr "Módulo GData: Tratando de renovar la autorización\n"
#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1936
msgid "Authentication"
msgstr "Autenticación"
#: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
msgid "Username:"
msgstr "Usuario:"
@@ -10416,32 +10470,32 @@ msgstr ""
msgid "GData integration"
msgstr "Integración con GData"
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
#: src/plugins/libravatar/libravatar_prefs.c:546
msgid "Libravatar"
msgstr "Libravatar"
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
msgid "Failed to register avatar header update hook"
msgstr ""
"Falló el registro de la función de actualización de cabeceras de avatar"
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
msgid "Failed to register avatar image render hook"
msgstr ""
"Falló el registro de la función de representación de imágenes de avatar"
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
msgid "Failed to create avatar image cache directory"
msgstr "Fallo al crear el directorio de caché de imágenes"
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
msgid "Failed to load missing items cache"
msgstr "Fallo al cargar la caché de elementos ausentes"
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
msgid ""
"Display libravatar profiles' images for mail messages. More\n"
"info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10546,8 +10600,8 @@ msgid "Cache refresh interval"
msgstr "Intervalo de refresco de la caché"
#: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1619
+#: src/prefs_account.c:1776 src/prefs_matcher.c:335 src/prefs_receive.c:178
msgid "hours"
msgstr "horas"
@@ -10692,71 +10746,71 @@ msgstr ""
"Se borrarán todas las carpetas y mensajes bajo «%s».\n"
"¿Está seguro de que quiere borrarlos?"
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
msgid "No Sieve auth method available\n"
msgstr "Ningún método de autenticación Sieve disponible\n"
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
msgid "Selected Sieve auth method not available\n"
msgstr ""
"El método para la autenticación Sieve seleccionado no está disponible\n"
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
msgid "Disconnected"
msgstr "Desconectado"
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
#, c-format
msgid "Disconnected: %s"
msgstr "Desconectado: %s"
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
#, c-format
msgid "unhandled message on Sieve session: %s\n"
msgstr "mensaje desconocido en la sesión de Sieve: %s\n"
-#: src/plugins/managesieve/managesieve.c:732
+#: src/plugins/managesieve/managesieve.c:733
msgid "STARTTLS failed"
msgstr "STARTTLS falló"
-#: src/plugins/managesieve/managesieve.c:797
-#: src/plugins/managesieve/managesieve.c:813
-#: src/plugins/managesieve/managesieve.c:840
-#: src/plugins/managesieve/managesieve.c:922
-#: src/plugins/managesieve/managesieve.c:940
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
msgid "error occurred on SIEVE session\n"
msgstr "hubo un error en la sesión Sieve\n"
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
#, c-format
msgid "error occurred on Sieve session. data: %s\n"
msgstr "hubo un error en la sesión Sieve. data: %s\n"
-#: src/plugins/managesieve/managesieve.c:875
+#: src/plugins/managesieve/managesieve.c:876
#, c-format
msgid "unhandled message on Sieve session: %d\n"
msgstr "mensaje desconocido en la sesión de Sieve: %d\n"
-#: src/plugins/managesieve/managesieve.c:1132
+#: src/plugins/managesieve/managesieve.c:1152
msgid "Sieve: retrying auth\n"
msgstr "Sieve: reintentar autenticación\n"
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1154
msgid "Auth method not available"
msgstr "Método de autenticación no disponible"
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1171
#, c-format
msgid "sending error on Sieve session: %s\n"
msgstr "enviando error en la sesión de Sieve: %s\n"
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5676
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5763
msgid "_Filter"
msgstr "_Filtrar"
#: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
msgid "Chec_k Syntax"
msgstr "Comprobar sinta_xis"
@@ -10765,7 +10819,7 @@ msgid "Re_vert"
msgstr "Re_vertir"
#: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
+#: src/plugins/managesieve/sieve_editor.c:724
#: src/plugins/managesieve/sieve_manager.c:182
msgid "Unable to get script contents"
msgstr "No se puede obtener el contenido del script"
@@ -10798,22 +10852,22 @@ msgstr "Guardando..."
msgid "Checking syntax..."
msgstr "Comprobando la sintaxis..."
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
msgid "This script has been modified. Save the latest changes?"
msgstr "Este script ha sido modificado. ¿Guardar los últimos cambios?"
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
#, c-format
msgid "%s - Sieve Filter%s"
msgstr "%s - Sieve Filtro%s"
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1282
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1304
msgid "Loading..."
msgstr "Cargando..."
#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:245
msgid "Add Sieve script"
msgstr "Añadir script Sieve"
@@ -10821,44 +10875,44 @@ msgstr "Añadir script Sieve"
msgid "Enter name for a new Sieve filter script."
msgstr "Introduzca un nombre para el nuevo script Sieve."
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:246
msgid "Enter new name for the script."
msgstr "Introduzca un nombre para el script."
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:327
#, c-format
msgid "Do you really want to delete the filter '%s'?"
msgstr "¿Realmente desea eliminar el filtro «%s»?"
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:328
msgid "Delete filter"
msgstr "Eliminar filtro"
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:482
msgid "Active"
msgstr "Activo"
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:493
msgid "An account can only have one active script at a time."
msgstr "Una cuenta sólo puede tener un script activo a la vez."
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:580
msgid "Unable to connect"
msgstr "No se ha podido conectar"
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:627
msgid "Listing scripts..."
msgstr "Listando scripts..."
-#: src/plugins/managesieve/sieve_manager.c:626
+#: src/plugins/managesieve/sieve_manager.c:630
msgid "Connecting..."
msgstr "Conectando..."
-#: src/plugins/managesieve/sieve_manager.c:658
+#: src/plugins/managesieve/sieve_manager.c:662
msgid "Manage Sieve Filters"
msgstr "Gestionar filtros Sieve"
-#: src/plugins/managesieve/sieve_manager.c:800
+#: src/plugins/managesieve/sieve_manager.c:804
msgid "To use Sieve, enable it in an account's preferences."
msgstr "Para usar el Sieve, habilitarlo en las preferencias de la cuenta."
@@ -10881,92 +10935,93 @@ msgstr ""
msgid "Enable Sieve"
msgstr "Activar Sieve"
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1194
msgid "Server information"
msgstr "Información del servidor"
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
msgid "Server name"
msgstr "Nombre del servidor"
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
msgid "Connect to this host instead of the host used for receiving mail"
msgstr ""
"Conectar a este servidor en lugar del servidor utilizado para recibir correo"
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
msgid "Server port"
msgstr "Puerto del servidor"
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
msgid "Connect to this port instead of the default"
msgstr "Conectar a este puerto en lugar de al predeterminado"
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
msgid "Encryption"
msgstr "Cifrado"
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
msgid "No encryption"
msgstr "Sin cifrado"
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
msgid "Use STARTTLS when available"
msgstr "Usar STARTTLS si está disponible"
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
msgid "Require STARTTLS"
msgstr "Requerir STARTTLS"
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
msgid "No authentication"
msgstr "Sin autenticación"
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
msgid "Use same authentication as for receiving mail"
msgstr "Utilizar la misma autenticación que para la recepción de correo"
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
msgid "Specify authentication"
msgstr "Especificar autenticación"
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
-#: src/prefs_account.c:1832
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1389
+#: src/prefs_account.c:1982
msgid "User ID"
msgstr "Usuario"
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
-#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
-#: src/wizard.c:1214 src/wizard.c:1634
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1395
+#: src/prefs_account.c:2005 src/prefs_account.c:2733 src/prefs_account.c:2761
+#: src/prefs_account.c:2958 src/prefs_proxy.c:134 src/wizard.c:1215
+#: src/wizard.c:1635
msgid "Password"
msgstr "Contraseña"
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
-#: src/prefs_account.c:1804
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1702
+#: src/prefs_account.c:1954
msgid "Authentication method"
msgstr "Método de autenticación"
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
-#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
-#: src/prefs_themes.c:1112
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1712
+#: src/prefs_account.c:1963 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
msgid "Automatic"
msgstr "Automático"
-#: src/plugins/managesieve/sieve_prefs.c:394
+#: src/plugins/managesieve/sieve_prefs.c:390
msgid "Sieve server must not contain a space."
msgstr "El servidor de Sieve no debe contener un espacio."
-#: src/plugins/managesieve/sieve_prefs.c:400
+#: src/plugins/managesieve/sieve_prefs.c:396
msgid "Sieve server is not entered."
msgstr "No se especificó el servidor Sieve."
-#: src/plugins/managesieve/sieve_prefs.c:428
+#: src/plugins/managesieve/sieve_prefs.c:424
msgid "Sieve"
msgstr "Sieve"
@@ -11004,7 +11059,7 @@ msgstr ""
msgid "Log file"
msgstr "Fichero de registro"
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
msgid "Folder:"
msgstr "Carpeta:"
@@ -11206,7 +11261,7 @@ msgid "Popup"
msgstr "Emergente"
#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/prefs_receive.c:153
msgid "Command"
msgstr "Orden"
@@ -11273,12 +11328,12 @@ msgid "Show banner"
msgstr "Mostrar panel"
#: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:228
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:147
+#: src/prefs_receive.c:229
msgid "Never"
msgstr "Nunca"
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:227
#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
msgid "Always"
msgstr "Siempre"
@@ -11354,8 +11409,8 @@ msgstr "Color de primer plano"
#: src/plugins/notification/notification_prefs.c:927
#: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
+#: src/prefs_msg_colors.c:284
msgid "Background"
msgstr "Fondo"
@@ -11377,8 +11432,8 @@ msgstr "Tiempo límite del emergente"
#: src/plugins/notification/notification_prefs.c:1072
#: src/plugins/notification/notification_prefs.c:1367
#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:574
-#: src/prefs_receive.c:200 src/prefs_summaries.c:542
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_other.c:570
+#: src/prefs_receive.c:201 src/prefs_summaries.c:542
msgid "seconds"
msgstr "segundos"
@@ -11415,7 +11470,7 @@ msgstr "Selecciona orden"
msgid "Enable command"
msgstr "Activar orden"
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:266
msgid "Command to execute"
msgstr "Orden a ejecutar"
@@ -11564,128 +11619,128 @@ msgid_plural "%d new articles in RSS feeds arrived"
msgstr[0] "recibido %d artículo de canal RSS nuevo"
msgstr[1] "recibidos %d artículos de canal RSS nuevos"
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
msgid "Title:"
msgstr "Título:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
msgid "Author:"
msgstr "Autor:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:707
msgid "Creator:"
msgstr "Creador:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
msgid "Producer:"
msgstr "Productor:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:711
msgid "Created:"
msgstr "Creado:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:715
msgid "Modified:"
msgstr "Modificado:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:718
msgid "Format:"
msgstr "Formato:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:720
+#: src/plugins/pdf_viewer/poppler_viewer.c:723
msgid "Optimized:"
msgstr "Optimizado:"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1185
+#: src/plugins/pdf_viewer/poppler_viewer.c:1206
msgid "PDF properties"
msgstr "Propiedades del PDF"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1355
msgid "Enter password"
msgstr "Introducir contraseña"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1334
+#: src/plugins/pdf_viewer/poppler_viewer.c:1356
msgid ""
"This document is locked and requires a password before it can be opened."
msgstr "Este documento está bloqueado y necesita una contraseña para abrirlo."
-#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
#, c-format
msgid "%s Document"
msgstr "%s documento"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1377
#, c-format
msgid "of %d"
msgstr "de %d"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
msgid "PDF rendering failed for an unknown reason."
msgstr "La presentación del PDF falló por razones desconocidas."
-#: src/plugins/pdf_viewer/poppler_viewer.c:1735
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
+#: src/plugins/pdf_viewer/poppler_viewer.c:1758
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
msgid "Document Index"
msgstr "Índice del documento"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
msgid "First Page"
msgstr "Primera página"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
msgid "Previous Page"
msgstr "Página anterior"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1946
msgid "Next Page"
msgstr "Página siguiente"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1949
msgid "Last Page"
msgstr "Última página"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
msgid "Zoom In"
msgstr "Aumentar"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
msgid "Zoom Out"
msgstr "Disminuir"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1957
msgid "Fit Page"
msgstr "Ajustar página"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1960
msgid "Fit Page Width"
msgstr "Ajustar ancho"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
msgid "Rotate Left"
msgstr "Rotar izquierda"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
msgid "Rotate Right"
msgstr "Rotar derecha"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
msgid "Print Document"
msgstr "Imprimir documento"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
msgid "Document Info"
msgstr "Información del documento"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
msgid "Page Number"
msgstr "Número de página"
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1979
msgid "Zoom Factor"
msgstr "Factor de aumento"
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2089
#, c-format
msgid ""
"This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11698,13 +11753,13 @@ msgstr ""
"\n"
"Cualquier comentario será bienvenido: iwkse at claws-mail.org"
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
-#: src/plugins/pdf_viewer/poppler_viewer.c:2078
-#: src/plugins/pdf_viewer/poppler_viewer.c:2098
+#: src/plugins/pdf_viewer/poppler_viewer.c:2095
+#: src/plugins/pdf_viewer/poppler_viewer.c:2103
+#: src/plugins/pdf_viewer/poppler_viewer.c:2123
msgid "PDF Viewer"
msgstr "Visor PDF"
-#: src/plugins/pdf_viewer/poppler_viewer.c:2074
+#: src/plugins/pdf_viewer/poppler_viewer.c:2099
#, c-format
msgid ""
"Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11886,29 +11941,29 @@ msgstr "Almacenar la contraseña en memoria"
msgid "Expire after"
msgstr "Caduca después de"
-#: src/plugins/pgpcore/prefs_gpg.c:179
+#: src/plugins/pgpcore/prefs_gpg.c:178
msgid "Setting to '0' will store the passphrase for the whole session"
msgstr "Estableciéndolo a '0' guarda la contraseña durante toda la sesión"
-#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:2071
+#: src/prefs_receive.c:188
msgid "minutes"
msgstr "minutos"
-#: src/plugins/pgpcore/prefs_gpg.c:193
+#: src/plugins/pgpcore/prefs_gpg.c:192
msgid "Grab input while entering a passphrase"
msgstr "Capturar la entrada al introducir la contraseña"
-#: src/plugins/pgpcore/prefs_gpg.c:200
+#: src/plugins/pgpcore/prefs_gpg.c:199
msgid "Display warning on start-up if GnuPG doesn't work"
msgstr "Mostrar un aviso al inicio si GnuPG no funciona"
-#: src/plugins/pgpcore/prefs_gpg.c:203
+#: src/plugins/pgpcore/prefs_gpg.c:202
msgid "Path to GnuPG executable"
msgstr "Ruta al ejecutable de GnuPG"
-#: src/plugins/pgpcore/prefs_gpg.c:208
+#: src/plugins/pgpcore/prefs_gpg.c:207
msgid ""
"If left blank the location of the GnuPG executable will be automatically "
"determined."
@@ -11916,105 +11971,105 @@ msgstr ""
"Si está en blanco la ubicación del ejecutable de GnuPG se determinará de "
"manera automática."
-#: src/plugins/pgpcore/prefs_gpg.c:249
+#: src/plugins/pgpcore/prefs_gpg.c:248
msgid "Select GnuPG executable"
msgstr "Seleccionar ejecutable de GnuPG"
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:358
msgid "Sign key"
msgstr "Clave para firmar"
-#: src/plugins/pgpcore/prefs_gpg.c:369
+#: src/plugins/pgpcore/prefs_gpg.c:366
msgid "Use default GnuPG key"
msgstr "Usar la clave GnuPG predeterminada"
-#: src/plugins/pgpcore/prefs_gpg.c:380
+#: src/plugins/pgpcore/prefs_gpg.c:377
msgid "Select key by your email address"
msgstr "Seleccionar clave en base a la dirección de correo"
-#: src/plugins/pgpcore/prefs_gpg.c:391
+#: src/plugins/pgpcore/prefs_gpg.c:388
msgid "Specify key manually"
msgstr "Especificar la clave manualmente"
-#: src/plugins/pgpcore/prefs_gpg.c:401
+#: src/plugins/pgpcore/prefs_gpg.c:398
msgid "User or key ID:"
msgstr "Usuario o ID de clave:"
-#: src/plugins/pgpcore/prefs_gpg.c:445
+#: src/plugins/pgpcore/prefs_gpg.c:442
msgid "No secret key found."
msgstr "No se encontró ninguna clave secreta."
-#: src/plugins/pgpcore/prefs_gpg.c:448
+#: src/plugins/pgpcore/prefs_gpg.c:445
msgid "Generate a new key pair"
msgstr "Generar un nuevo par de claves"
-#: src/plugins/pgpcore/prefs_gpg.c:687
+#: src/plugins/pgpcore/prefs_gpg.c:688
msgid "GPG"
msgstr "GPG"
-#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:917
msgid "S/MIME"
msgstr "S/MIME"
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:98
#, c-format
msgid "No exact match for '%s'; please select the key."
msgstr "No hay coincidencia exacta para «%s», por favor seleccione la clave."
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
#, c-format
msgid "Collecting info for '%s' ... %c"
msgstr "Recogiendo información para «%s» ... %c"
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:145
msgid "Undefined"
msgstr "Indefinida"
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:149
#: src/plugins/pgpcore/sgpgme.c:165
msgid "Marginal"
msgstr "Marginal"
-#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:153
#: src/plugins/pgpcore/sgpgme.c:169
msgid "Ultimate"
msgstr "Absoluta"
-#: src/plugins/pgpcore/select-keys.c:381
+#: src/plugins/pgpcore/select-keys.c:408
msgid "Select Keys"
msgstr "Seleccione claves"
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:457
msgid "Key ID"
msgstr "ID de clave"
-#: src/plugins/pgpcore/select-keys.c:411
+#: src/plugins/pgpcore/select-keys.c:475
msgid "Trust"
msgstr "Confianza"
-#: src/plugins/pgpcore/select-keys.c:436
+#: src/plugins/pgpcore/select-keys.c:494
msgid "_Other"
msgstr "_Otras"
-#: src/plugins/pgpcore/select-keys.c:437
+#: src/plugins/pgpcore/select-keys.c:495
msgid "Do_n't encrypt"
msgstr "_No cifrar"
-#: src/plugins/pgpcore/select-keys.c:596
+#: src/plugins/pgpcore/select-keys.c:676
msgid "Add key"
msgstr "Añadir clave"
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:677
msgid "Enter another user or key ID:"
msgstr "Teclee otro usuario o ID-clave:"
-#: src/plugins/pgpcore/select-keys.c:619
+#: src/plugins/pgpcore/select-keys.c:699
#, c-format
msgid "Encrypt to %s <%s>"
msgstr "Cifrar para %s <%s>"
-#: src/plugins/pgpcore/select-keys.c:620
+#: src/plugins/pgpcore/select-keys.c:700
#, c-format
msgid ""
"This encryption key is not fully trusted.\n"
@@ -12313,7 +12368,7 @@ msgstr "No se puede convertir el texto a un conjunto de caracteres válido."
#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:413
+#: src/plugins/smime/smime.c:417
#, c-format
msgid "Couldn't initialize GPG context, %s"
msgstr "No se pudo inicializar el contexto GPG, %s"
@@ -12446,11 +12501,11 @@ msgstr ""
msgid "Signature boundary not found."
msgstr "No se encontró el delimitador de la firma."
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:498
msgid "Couldn't parse decrypted file."
msgstr "No se puede interpretar el fichero descifrado."
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:505
msgid "Couldn't parse decrypted file parts."
msgstr "No se pueden interpretar las partes del fichero."
@@ -12513,13 +12568,13 @@ msgid "Show Python console..."
msgstr "Mostrar la consola de Python..."
#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/rssyl/rssyl_feed_props.c:471
msgid "Refresh"
msgstr "Refrescar"
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
-#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
-#: src/wizard.c:1624
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2722
+#: src/prefs_account.c:2750 src/prefs_account.c:3192 src/wizard.c:1205
+#: src/wizard.c:1625
msgid "Browse"
msgstr "Explorar"
@@ -12691,7 +12746,7 @@ msgctxt "Empty RSS feed title placeholder"
msgid "(empty)"
msgstr "(vacío)"
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
msgid "Refresh all feeds"
msgstr "Refrescar todos los canales"
@@ -12708,22 +12763,23 @@ msgstr "Introduzca la URL del canal de información al que suscribirse:"
msgid "'%c' can't be used in folder name."
msgstr "No se puede usar «%c» en el nombre de la carpeta."
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:251 src/plugins/rssyl/rssyl_cb_menu.c:298
+#: src/plugins/rssyl/rssyl_feed_props.c:201
msgid "Claws Mail needs network access in order to update the feed."
msgid_plural "Claws Mail needs network access in order to update feeds."
msgstr[0] "Claws Mail necesita acceso a la red para actualizar el canal."
msgstr[1] "Claws Mail necesita acceso a la red para actualizar los canales."
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:324
#, c-format
msgid "Really remove the feed tree `%s' ?\n"
msgstr "¿Quiere realmente eliminar el árbol de canales «%s»?\n"
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:325
msgid "Remove feed tree"
msgstr "Eliminar árbol de canales"
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
msgid "Select an OPML file"
msgstr "Seleccionar un fichero OPML"
@@ -12769,51 +12825,51 @@ msgstr ""
"RSSyl: La aplicación está finalizando, no se pudo finalizar la actualización "
"del canal en «%s»\n"
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:270
msgid "HTTP Basic authentication"
msgstr "Usar autenticación HTTP básica"
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:292
msgid "Use default refresh interval"
msgstr "Usar el intervalo de refresco predeterminado"
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:304
msgid "Keep old items"
msgstr "Guardar elementos antiguos"
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:310
msgid "_Trim"
msgstr "Recor_tar"
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:312
msgid "Update feed, deleting items which are no longer in the source feed"
msgstr "Actualizar canal, borrando elementos que no se encuentren en la fuente"
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:315
msgid "Fetch comments if possible"
msgstr "Recuperar los comentarios si es posible"
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:335
msgid "Always mark it as new"
msgstr "Marcarlo siempre como nuevo"
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:337
msgid "Only mark it as new if its text has changed"
msgstr "Sólo marcarlo como nuevo si su texto ha cambiado"
-#: src/plugins/rssyl/rssyl_feed_props.c:349
+#: src/plugins/rssyl/rssyl_feed_props.c:339
msgid "Never mark it as new"
msgstr "Nunca marcarlo como nuevo"
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:344
msgid "Add item title to the top of message"
msgstr "Añadir el título del elemento en la parte superior del mensaje"
-#: src/plugins/rssyl/rssyl_feed_props.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:351
msgid "Ignore title rename"
msgstr "Ignorar el renombrado del título"
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:356
msgid ""
"Enable this to keep current folder name, even if feed author changes title "
"of the feed."
@@ -12821,54 +12877,54 @@ msgstr ""
"Activar esto para mantener el nombre actual de la capeta incluso si el autor "
"del canal cambia el título del mismo."
-#: src/plugins/rssyl/rssyl_feed_props.c:370
+#: src/plugins/rssyl/rssyl_feed_props.c:360
#: src/plugins/vcalendar/vcal_prefs.c:593
msgid "Verify SSL/TLS certificate validity"
msgstr "Verificar la validez del certificado SSL/TLS"
-#: src/plugins/rssyl/rssyl_feed_props.c:390
+#: src/plugins/rssyl/rssyl_feed_props.c:380
msgid "User name"
msgstr "Nombre de usuario"
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:393
msgid "Source URL"
msgstr "URL de origen"
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:406
msgid "Fetch comments on posts aged less than"
msgstr "Recuperar los comentarios de elementos con una antiguedad inferior a"
-#: src/plugins/rssyl/rssyl_feed_props.c:424
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1609 src/prefs_folder_item.c:567 src/prefs_matcher.c:336
msgid "days"
msgstr "días"
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:415
msgid "Set to -1 to fetch all comments"
msgstr "Establecer a -1 para recuperarlos todos"
-#: src/plugins/rssyl/rssyl_feed_props.c:449
+#: src/plugins/rssyl/rssyl_feed_props.c:439
msgid "If an item changes"
msgstr "Si un elemento cambia"
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:444
msgid "Items"
msgstr "Elementos"
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:457
msgid "Refresh interval"
msgstr "Intervalo de refresco"
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:465
msgid "Set to 0 to disable automatic refreshing for this feed"
msgstr "Establecer a 0 para desactivar el refresco automático de este canal"
-#: src/plugins/rssyl/rssyl_feed_props.c:527
+#: src/plugins/rssyl/rssyl_feed_props.c:517
msgid "_OK"
msgstr "_Aceptar"
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:525
msgid "Set feed properties"
msgstr "Establecer las propiedades del canal"
@@ -12989,27 +13045,27 @@ msgstr "_Editar propiedades del canal después de suscribirse"
msgid "Updating comments for '%s'..."
msgstr "Actualizando comentarios para «%s»..."
-#: src/plugins/rssyl/rssyl_update_feed.c:105
+#: src/plugins/rssyl/rssyl_update_feed.c:107
#: src/plugins/vcalendar/vcal_folder.c:1620
msgid "401 (Authorisation required)"
msgstr "401 (Se requiere autorización)"
-#: src/plugins/rssyl/rssyl_update_feed.c:108
+#: src/plugins/rssyl/rssyl_update_feed.c:110
#: src/plugins/vcalendar/vcal_folder.c:1623
msgid "403 (Unauthorised)"
msgstr "403 (No autorizado)"
-#: src/plugins/rssyl/rssyl_update_feed.c:111
+#: src/plugins/rssyl/rssyl_update_feed.c:113
#: src/plugins/vcalendar/vcal_folder.c:1626
msgid "404 (Not found)"
msgstr "404 (No encontrado)"
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
#, c-format
msgid "Error %d"
msgstr "Error %d"
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
#, c-format
msgctxt "First parameter is URL, second is error text"
msgid ""
@@ -13023,7 +13079,7 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
#, c-format
msgid ""
"No valid feed found at\n"
@@ -13032,21 +13088,21 @@ msgstr ""
"Canal no válido encontrado en\n"
"<b>%s</b>"
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
msgid "Untitled feed"
msgstr "Canal sin título"
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
#, c-format
msgid "RSSyl: Possibly invalid feed without title at %s.\n"
msgstr "RSSyl: Posible canal inválido sin título en «%s»\n"
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
#, c-format
msgid "Updating feed '%s'..."
msgstr "Actualizando canal «%s»..."
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:268
#, c-format
msgid ""
"Couldn't process feed at\n"
@@ -13059,7 +13115,7 @@ msgstr ""
"\n"
"Por favor contacte con los desarrolladores, esto no debería suceder."
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:352
msgid "Claws Mail needs network access in order to update your feeds."
msgstr "Claws Mail necesita acceso a la red para actualizar los canales."
@@ -13108,24 +13164,24 @@ msgstr ""
"\n"
"GPGME es copyright 2001 por Werner Koch <dd9jn at gnu.org>"
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:425
#, c-format
msgid "Couldn't set GPG protocol, %s"
msgstr "No se pudo establecer el protocolo GPG, %s"
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:453
msgid "Couldn't open temporary file"
msgstr "No se pudo abrir el fichero temporal"
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:464 src/plugins/smime/smime.c:479
msgid "Couldn't write to temporary file"
msgstr "No se pudo escribir en el fichero temporal"
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:490
msgid "Couldn't close temporary file"
msgstr "No se pudo cerrar el fichero temporal"
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:712
msgid ""
"Please note that email headers, like Subject, are not encrypted by the S/"
"MIME system."
@@ -13175,32 +13231,32 @@ msgstr "Habilitado"
msgid "Forward to:"
msgstr "Reenviar a:"
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
msgid "Password:"
msgstr "Contraseña:"
#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
msgid "SpamAssassin"
msgstr "SpamAssassin"
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:181
msgid "SpamAssassin plugin couldn't connect to spamd.\n"
msgstr "El módulo SpamAssassin no pudo conectar con spamd.\n"
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:197
msgid "SpamAssassin plugin filtering failed.\n"
msgstr "Falló el filtrado con el módulo SpamAssassin.\n"
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:223
msgid "SpamAssassin plugin is disabled by its preferences.\n"
msgstr "El módulo SpamAssassin esta deshabilitado por sus preferencias.\n"
-#: src/plugins/spamassassin/spamassassin.c:216
+#: src/plugins/spamassassin/spamassassin.c:228
msgid "SpamAssassin: filtering message..."
msgstr "SpamAssassin: filtrando mensaje..."
-#: src/plugins/spamassassin/spamassassin.c:345
+#: src/plugins/spamassassin/spamassassin.c:357
msgid ""
"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
"error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -13210,7 +13266,7 @@ msgstr ""
"error es que el demonio spamd no está disponible. Por favor, asegúrese de "
"que spamd está ejecutándose y accesible."
-#: src/plugins/spamassassin/spamassassin.c:402
+#: src/plugins/spamassassin/spamassassin.c:415
msgid ""
"Claws Mail needs network access in order to feed the mail to the remote "
"learner."
@@ -13218,17 +13274,17 @@ msgstr ""
"Claws Mail necesita acceso a la red para enviar este correo al programa de "
"aprendizaje remoto."
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:560
msgid "Failed to get username"
msgstr "Fallo al obtener en nombre de usuario"
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:577
msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
msgstr ""
"El módulo SpamAssassin esta cargado pero deshabilitado por sus "
"preferencias.\n"
-#: src/plugins/spamassassin/spamassassin.c:593
+#: src/plugins/spamassassin/spamassassin.c:611
msgid ""
"This plugin can check all messages that are received from an IMAP, LOCAL or "
"POP account for spam using a SpamAssassin server. You will need a "
@@ -13252,59 +13308,67 @@ msgstr ""
"\n"
"Las opciones están en /Configuración/Preferencias/Módulos/SpamAssassin"
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
msgid "Localhost"
msgstr "Máquina local"
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
msgid "TCP"
msgstr "TCP"
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
msgid "Unix Socket"
msgstr "Conector Unix"
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
msgid "Select folder to save spam to"
msgstr "Seleccionar la carpeta en la que guardar el correo basura"
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
msgid "Enable SpamAssassin plugin"
msgstr "Habilitar el módulo SpamAssassin"
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
msgid "Transport"
msgstr "Transporte"
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
msgid "Type of transport"
msgstr "Tipo de transporte"
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
msgid "User"
msgstr "Usuario"
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
msgid "User to use with spamd server"
msgstr "Usuario a utilizar con el servidor spamd"
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
msgid "spamd"
msgstr "spamd"
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
msgid "Hostname or IP address of spamd server"
msgstr "Nombre o dirección IP del servidor spamd"
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
msgid "Port of spamd server"
msgstr "Puerto del servidor spamd"
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
msgid "Path of Unix socket"
msgstr "Ruta al conector Unix"
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr "Utilizar compresión"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr "Activa la compresión si spamd la usa, si no la desactiva."
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
msgid ""
"Maximum time allowed for checking. If the check takes longer it will be "
"aborted."
@@ -13376,11 +13440,11 @@ msgstr "_Crear nueva reunión..."
msgid "_Go to today"
msgstr "_Ir a hoy"
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
msgid "Start"
msgstr "Inicio"
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
msgid "Show"
msgstr "Mostrar"
@@ -13460,15 +13524,15 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
msgid "Week number"
msgstr "N.º de semana"
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
msgid "Previous month"
msgstr "Mes anterior"
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
msgid "Next month"
msgstr "Mes siguiente"
@@ -13506,11 +13570,11 @@ msgstr ""
msgid "Calendar"
msgstr "Calendario"
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:99
msgid "Create meeting from message..."
msgstr "Crear reunión a partir del mensaje..."
-#: src/plugins/vcalendar/vcalendar.c:120
+#: src/plugins/vcalendar/vcalendar.c:119
#, c-format
msgid ""
"You are about to create %d meetings, one by one. Do you want to continue?"
@@ -13542,7 +13606,7 @@ msgstr "Tiene un elemento pendiente."
#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:729
msgid "Details follow:"
msgstr "Los detalles son los siguientes:"
@@ -13570,11 +13634,11 @@ msgstr "(este evento es recurrente)"
msgid "(this event is part of a recurring event)"
msgstr "(este evento es parte de un evento recurrente)"
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:728
msgid "You have received an answer to an unknown meeting proposal."
msgstr "Se recibió una respuesta a una propuesta de reunión desconocida."
-#: src/plugins/vcalendar/vcalendar.c:747
+#: src/plugins/vcalendar/vcalendar.c:732
#, c-format
msgid ""
"You have received an answer to a meeting proposal.\n"
@@ -13583,35 +13647,35 @@ msgstr ""
"Se recibió una respuesta a una propuesta de reunión.\n"
"%s ha %s la invitación cuyos detalles se indican:"
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:811
msgid "Error - could not get the calendar MIME part."
msgstr "Error - no se pudo obtener la parte MIME del calendario."
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:818
msgid "Error - no calendar part found."
msgstr "Error - no se encontró la parte del calendario."
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:832
msgid "Error - Unknown calendar component type."
msgstr "Error - Tipo de componente de calendario desconocido."
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:964
msgid "Send a notification to the attendees"
msgstr "Enviar una notificación a los asistentes"
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:973
msgid "Cancel meeting"
msgstr "Cancelar reunión"
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:974
msgid "Are you sure you want to cancel this meeting?"
msgstr "¿Está seguro de que quiere cancelar esta reunión?"
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1069
msgid "No account found"
msgstr "No se encontró ninguna cuenta"
-#: src/plugins/vcalendar/vcalendar.c:1082
+#: src/plugins/vcalendar/vcalendar.c:1070
msgid ""
"You have no account matching any attendee.\n"
"Do you want to reply anyway?"
@@ -13619,128 +13683,128 @@ msgstr ""
"No tiene ninguna cuenta que coincida con algún convocado.\n"
"¿Desea responder de todas maneras?"
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1072
msgid "Reply anyway"
msgstr "Responder igualmente"
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1201
msgid "Answer"
msgstr "Responder"
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1202
msgid "Edit meeting..."
msgstr "Editar reunión..."
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1203
msgid "Cancel meeting..."
msgstr "Cancelar reunión..."
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1204
msgid "Launch website"
msgstr "Abrir página web"
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1208
msgid "You are already busy at this time."
msgstr "Usted ya está ocupado a esa hora."
-#: src/plugins/vcalendar/vcalendar.c:1259
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcalendar.c:1247
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
msgid "Event:"
msgstr "Evento:"
-#: src/plugins/vcalendar/vcalendar.c:1260
+#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1694
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
msgid "Organizer:"
msgstr "Organizador:"
-#: src/plugins/vcalendar/vcalendar.c:1261
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
msgid "Location:"
msgstr "Ubicación:"
-#: src/plugins/vcalendar/vcalendar.c:1262
+#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
msgid "Summary:"
msgstr "Resumen:"
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1251
msgid "Starting:"
msgstr "Comienza:"
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1252
msgid "Ending:"
msgstr "Finaliza:"
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcalendar.c:1254
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
msgid "Attendees:"
msgstr "Convocados:"
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1256
msgid "Action:"
msgstr "Acción:"
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
msgid "_New meeting..."
msgstr "_Nueva reunión..."
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
msgid "_Export calendar..."
msgstr "_Exportar calendario..."
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
msgid "_Subscribe to Webcal..."
msgstr "_Suscribirse a Webcal..."
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
msgid "_Rename..."
msgstr "_Renombrar..."
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
msgid "U_pdate subscriptions"
msgstr "A_ctualizar suscripciones"
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
msgid "_List view"
msgstr "Vista en _lista"
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
msgid "_Week view"
msgstr "Vista _semanal"
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:175
msgid "_Month view"
msgstr "Vista _mensual"
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1102
msgid "Meetings"
msgstr "Reuniones"
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1501
msgid "in the past"
msgstr "en el pasado"
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1504
msgid "today"
msgstr "hoy"
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1507
msgid "tomorrow"
msgstr "mañana"
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1510
msgid "this week"
msgstr "esta semana"
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1513
msgid "later"
msgstr "más tarde"
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1517
#, c-format
msgid ""
"\n"
@@ -13772,7 +13836,7 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1837
+#: src/plugins/vcalendar/vcal_folder.c:1842
#, c-format
msgid ""
"This URL does not look like a Webcal URL:\n"
@@ -13783,49 +13847,49 @@ msgstr ""
"%s\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1868
-#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
#, c-format
msgid "Could not create directory %s"
msgstr "No se puede crear el directorio %s"
-#: src/plugins/vcalendar/vcal_folder.c:1911
+#: src/plugins/vcalendar/vcal_folder.c:1916
msgid "Claws Mail needs network access in order to update the Webcal feed."
msgstr ""
"Claws Mail necesita acceso a la red para actualizar la subscripción del "
"calendario web."
-#: src/plugins/vcalendar/vcal_folder.c:1922
+#: src/plugins/vcalendar/vcal_folder.c:1927
#, c-format
msgid "Fetching calendar for %s..."
msgstr "Recuperando calendario para %s..."
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1928
msgid "new subscription"
msgstr "nueva suscripción"
-#: src/plugins/vcalendar/vcal_folder.c:1934
+#: src/plugins/vcalendar/vcal_folder.c:1939
msgid "Claws Mail needs network access in order to update the subscription."
msgstr ""
"Claws Mail necesita acceso a la red para poder actualizar la subscripción."
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1951
msgid "Subscribe to Webcal"
msgstr "Suscribirse a un calendario web"
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1951
msgid "Enter the WebCal URL:"
msgstr "Introduzca la URL del calendario web:"
-#: src/plugins/vcalendar/vcal_folder.c:1958
+#: src/plugins/vcalendar/vcal_folder.c:1963
msgid "Could not parse the URL."
msgstr "No se pudo procesar la URL."
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1991
msgid "Do you really want to unsubscribe?"
msgstr "¿Desea realmente desuscribirse?"
-#: src/plugins/vcalendar/vcal_folder.c:1987
+#: src/plugins/vcalendar/vcal_folder.c:1992
msgid "Delete subscription"
msgstr "Borrar suscripción"
@@ -13861,35 +13925,35 @@ msgstr "recurso"
msgid "room"
msgstr "lugar"
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:559
msgid "Past"
msgstr "Pasado"
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:562
msgid "Today"
msgstr "Hoy"
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:565
msgid "Tomorrow"
msgstr "Mañana"
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:568
msgid "This week"
msgstr "Esta semana"
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:571
msgid "Later"
msgstr "Más tarde"
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1247
msgid "Accepted: "
msgstr "Aceptada: "
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1249
msgid "Declined: "
msgstr "Rehusada: "
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1251
msgid "Tentatively Accepted: "
msgstr "Aceptada provisionalmente: "
@@ -14041,7 +14105,7 @@ msgid "available"
msgstr "disponible"
#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
msgid "Free/busy retrieval failed"
msgstr "Falló la recuperación de libre/ocupado"
@@ -14058,22 +14122,22 @@ msgid "Not everyone is available. See tooltips for more info..."
msgstr ""
"No todos están disponibles. Vea las notas flotantes para más información..."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1120
#, c-format
msgid "Fetching planning for %s..."
msgstr "Recuperando la planificación para %s..."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1147
msgid "Available"
msgstr "Disponible"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1160
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1167
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1175
msgid "Everyone is available."
msgstr "Todos están disponibles."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1176
msgid ""
"Everyone seems available, but some free/busy information failed to be "
"retrieved."
@@ -14081,7 +14145,7 @@ msgstr ""
"Todos parecen estar disponibles, pero no se pudo recuperar alguna "
"información de libre/ocupado."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1346
msgid ""
"Could not send the meeting invitation.\n"
"Check the recipients."
@@ -14089,61 +14153,61 @@ msgstr ""
"No se pudo enviar la invitación de reunión.\n"
"Compruebe los destinatarios."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1450
msgid "Save & Send"
msgstr "Guardar y enviar"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
msgid "Check availability"
msgstr "Comprobar disponibilidad"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1574
msgid "Starts at:"
msgstr "Comienza a las:"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1580
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
msgid "on:"
msgstr "en:"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
msgid "Ends at:"
msgstr "Finaliza a las:"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1639
msgid "New meeting"
msgstr "Nueva reunión"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
#, c-format
msgid "%s - Edit meeting"
msgstr "%s - Editar reunión"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
msgid "Time:"
msgstr "Hora:"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1853
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1856
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
#, c-format
msgid "Upcoming event: %s"
msgstr "Evento inminente: %s"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
#, c-format
msgid ""
"You have a meeting or event soon.\n"
@@ -14160,39 +14224,39 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1885
#, c-format
msgid "Remind me in %d minute"
msgid_plural "Remind me in %d minutes"
msgstr[0] "Recuérdamelo en %d minuto"
msgstr[1] "Recuérdamelo en %d minutos"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2011
msgid "Empty calendar"
msgstr "Calendario vacío"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
msgid "There is nothing to export."
msgstr "No hay nada que exportar."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2052
msgid "Could not export the calendar."
msgstr "No se puede exportar el calendario."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2069
msgid "Export calendar to ICS"
msgstr "Exportar calendario a ICS"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
#, c-format
msgid "Couldn't export calendar to '%s'\n"
msgstr "No se puede exportar el calendario a «%s»\n"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2208
msgid "Could not export the freebusy info."
msgstr "No se puede exportar la información de libre/ocupado."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2240
#, c-format
msgid "Couldn't export free/busy to '%s'\n"
msgstr "No se puede exportar la información de libre/ocupado a «%s»\n"
@@ -14337,56 +14401,56 @@ msgstr "hubo un error en la sesión POP\n"
msgid "TOP command unsupported\n"
msgstr "orden TOP no soportada\n"
-#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
+#: src/prefs_account.c:366 src/prefs_account.c:1583 src/prefs_account.c:2650
msgid "POP"
msgstr "POP"
-#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
-#: src/wizard.c:1499
+#: src/prefs_account.c:367 src/prefs_account.c:1696 src/prefs_account.c:2665
+#: src/wizard.c:1500
msgid "IMAP"
msgstr "IMAP"
-#: src/prefs_account.c:337
+#: src/prefs_account.c:368
msgid "News (NNTP)"
msgstr "Noticias (NNTP)"
-#: src/prefs_account.c:338 src/wizard.c:1500
+#: src/prefs_account.c:369 src/wizard.c:1501
msgid "Local mbox file"
msgstr "Fichero mbox local"
-#: src/prefs_account.c:339
+#: src/prefs_account.c:370
msgid "None (SMTP only)"
msgstr "Ninguno (sólo SMTP)"
-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1132
msgid "Name of account"
msgstr "Nombre de cuenta"
-#: src/prefs_account.c:1049
+#: src/prefs_account.c:1141
msgid "Set as default"
msgstr "Marcar como primaria"
-#: src/prefs_account.c:1057
+#: src/prefs_account.c:1149
msgid "Personal information"
msgstr "Información personal"
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1158
msgid "Full name"
msgstr "Nombre completo"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1164
msgid "Mail address"
msgstr "Dirección de correo"
-#: src/prefs_account.c:1135 src/wizard.c:1523
+#: src/prefs_account.c:1227 src/wizard.c:1524
msgid "Auto-configure"
msgstr "Configuración automática"
-#: src/prefs_account.c:1137 src/wizard.c:1524
+#: src/prefs_account.c:1229 src/wizard.c:1525
msgid "Cancel"
msgstr "Cancelar"
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1246
msgid ""
"Warning: this version of Claws Mail\n"
"has been built without IMAP and News support."
@@ -14394,77 +14458,77 @@ msgstr ""
"Aviso: esta versión de Claws Mail\n"
"se construyó sin soporte para IMAP y noticias."
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1277
msgid "This server requires authentication"
msgstr "Este servidor requiere autenticación"
-#: src/prefs_account.c:1192
+#: src/prefs_account.c:1284
msgid "Authenticate on connect"
msgstr "Autenticación al conectar"
-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1346
msgid "News server"
msgstr "Servidor de news"
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1352
msgid "Server for receiving"
msgstr "Servidor de recepción"
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1358
msgid "Local mailbox"
msgstr "Buzón local"
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1365
msgid "SMTP server (send)"
msgstr "Servidor SMTP (enviar)"
-#: src/prefs_account.c:1281
+#: src/prefs_account.c:1373
msgid "Use mail command rather than SMTP server"
msgstr "Usar mandato para correo en vez de servidor SMTP"
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1382
msgid "command to send mails"
msgstr "orden para enviar los correos"
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1457
#, c-format
msgid "Account%d"
msgstr "Cuenta%d"
-#: src/prefs_account.c:1461
+#: src/prefs_account.c:1557
msgid "Local"
msgstr "Local"
-#: src/prefs_account.c:1467 src/prefs_account.c:1556
+#: src/prefs_account.c:1563 src/prefs_account.c:1652
msgid "Default Inbox"
msgstr "Entrada predeterminada"
-#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
-#: src/prefs_account.c:1570
+#: src/prefs_account.c:1570 src/prefs_account.c:1577 src/prefs_account.c:1659
+#: src/prefs_account.c:1666
msgid "Unfiltered messages will be stored in this folder"
msgstr "Los mensajes sin filtrar se guardarán en esta carpeta"
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1585
msgid "Use secure authentication (APOP)"
msgstr "Utilizar autenticación segura (APOP)"
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1588
msgid "Remove messages on server when received"
msgstr "Eliminar los mensajes del servidor al recibirlos"
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1599
msgid "Remove after"
msgstr "Eliminar después de"
-#: src/prefs_account.c:1510 src/prefs_account.c:1520
+#: src/prefs_account.c:1606 src/prefs_account.c:1616
msgid "0 days and 0 hours : remove immediately"
msgstr "0 días y 0 horas: borrar inmediatamente"
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1629
msgid "Receive size limit"
msgstr "Límite de tamaño al recibir"
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1632
msgid ""
"Messages over this limit will be partially retrieved. When selecting them "
"you will be able to download them fully or delete them."
@@ -14472,83 +14536,103 @@ msgstr ""
"Los mensajes que sobrepasen este límite serán recuperados parcialmente. Al "
"seleccionarlos podrá descargarlos por completo o borrarlos."
-#: src/prefs_account.c:1576 src/prefs_account.c:2530
+#: src/prefs_account.c:1672 src/prefs_account.c:2680
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1583
+#: src/prefs_account.c:1679
msgid "Maximum number of articles to download"
msgstr "Número máximo de artículos a descargar"
-#: src/prefs_account.c:1593
+#: src/prefs_account.c:1689
msgid "unlimited if 0 is specified"
msgstr "sin límite si se especifica 0"
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1714
msgid "Plain text"
msgstr "Texto plano"
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1727
msgid "IMAP server directory"
msgstr "Directorio del servidor IMAP"
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1731
msgid "(usually empty)"
msgstr "(vacío habitualmente)"
-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1745
msgid "Show subscribed folders only"
msgstr "Mostrar sólo carpetas suscritas"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1752
msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
msgstr ""
"Modo de ancho de banda eficiente (evita recuperar las etiquetas remotas)"
-#: src/prefs_account.c:1658
+#: src/prefs_account.c:1754
msgid "This mode uses less bandwidth, but can be slower with some servers."
msgstr ""
"Este modo usa menos ancho de banda, pero puede ser más lento con algunos "
"servidores."
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1761 src/prefs_receive.c:162
+msgid "Automatic checking"
+msgstr "Comprobación automática"
+
+#: src/prefs_account.c:1764
+msgid "Use global settings"
+msgstr "Utilizar la configuración global"
+
+#: src/prefs_account.c:1770 src/prefs_receive.c:169
+msgid "Check for new mail every"
+msgstr "Comprobar si hay correo nuevo cada"
+
+#: src/prefs_account.c:1783
+msgid "mins"
+msgstr "mins"
+
+#: src/prefs_account.c:1790
+msgid "secs"
+msgstr "segs"
+
+#: src/prefs_account.c:1809
msgid "Filter messages on receiving"
msgstr "Filtrar mensajes al recibir"
-#: src/prefs_account.c:1672
+#: src/prefs_account.c:1816
msgid "Allow filtering using plugins on receiving"
msgstr "Permitir el filtrado usando módulos al recibir"
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1820
msgid "'Get Mail' checks for new messages on this account"
msgstr "«Recibir correo» comprueba si hay nuevos mensajes en esta cuenta"
-#: src/prefs_account.c:1759 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
+#: src/prefs_account.c:1909 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:622 src/prefs_matcher.c:1965 src/prefs_matcher.c:1987
msgid "Header"
msgstr "Cabecera"
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1911
msgid "Generate Message-ID"
msgstr "Generar identificador de mensaje"
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1914
msgid "Send account mail address in Message-ID"
msgstr "Enviar la dirección de correo de la cuenta en el «Message-Id»"
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1917
msgid "Add user agent header"
msgstr "Añadir cabecera de agente de usuario"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1924
msgid "Add user-defined header"
msgstr "Añadir cabecera de usuario"
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1939
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Autenticación SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:2037
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
@@ -14556,166 +14640,201 @@ msgstr ""
"Si deja estos campos vacíos, se utilizarán el mismo identificador de usuario "
"y contraseña usados para la recepción."
-#: src/prefs_account.c:1898
+#: src/prefs_account.c:2048
msgid "Authenticate with POP before sending"
msgstr "Autenticación con POP antes de enviar"
-#: src/prefs_account.c:1913
-msgid "POP authentication timeout: "
-msgstr "Tiempo límite para autenticación POP: "
+#: src/prefs_account.c:2063
+msgid "POP authentication timeout"
+msgstr "Tiempo límite para autenticación POP"
-#: src/prefs_account.c:2001 src/prefs_account.c:2047
+#: src/prefs_account.c:2151 src/prefs_account.c:2197
msgid "Signature"
msgstr "Firma"
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2154
msgid "Automatically insert signature"
msgstr "Insertar la firma automáticamente"
-#: src/prefs_account.c:2009
+#: src/prefs_account.c:2159
msgid "Signature separator"
msgstr "Separador de la firma"
-#: src/prefs_account.c:2034
+#: src/prefs_account.c:2184
msgid "Command output"
msgstr "Salida de la orden"
-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2217
msgid "Automatically set the following addresses"
msgstr "Establecer las siguientes direcciones automáticamente"
-#: src/prefs_account.c:2119
+#: src/prefs_account.c:2269
msgid "Spell check dictionaries"
msgstr "Diccionarios de corrección ortográfica"
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_account.c:2279 src/prefs_folder_item.c:1103
#: src/prefs_spelling.c:162
msgid "Default dictionary"
msgstr "Diccionario predeterminado"
-#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_account.c:2292 src/prefs_folder_item.c:1137
#: src/prefs_spelling.c:174
msgid "Default alternate dictionary"
msgstr "Diccionario alternativo predeterminado"
-#: src/prefs_account.c:2228 src/prefs_account.c:3423
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2378 src/prefs_account.c:3772
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1448
+#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
msgid "Compose"
msgstr "Componer"
-#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/prefs_account.c:2393 src/prefs_folder_item.c:1476 src/prefs_quote.c:134
#: src/toolbar.c:490
msgid "Reply"
msgstr "Responder"
-#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2408 src/prefs_filtering_action.c:191
+#: src/prefs_folder_item.c:1504 src/prefs_quote.c:149 src/toolbar.c:495
msgid "Forward"
msgstr "Reenviar"
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2455
msgid "Default privacy system"
msgstr "Sistema de privacidad predeterminado"
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2484
msgid "Always sign messages"
msgstr "Firmar siempre los mensajes"
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2486
msgid "Always encrypt messages"
msgstr "Cifrar siempre los mensajes"
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2488
msgid "Always sign messages when replying to a signed message"
msgstr "Firmar siempre los mensajes al responder a un mensaje firmado"
-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2491
msgid "Always encrypt messages when replying to an encrypted message"
msgstr "Cifrar siempre los mensajes al responder a un mensaje cifrado"
-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2494
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr ""
"Cifrar los mensajes enviados con la clave propia además de las del "
"destinatario"
-#: src/prefs_account.c:2346
+#: src/prefs_account.c:2496
msgid "Save sent encrypted messages as clear text"
msgstr "Guardar en claro los mensajes enviados cifrados"
-#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
+#: src/prefs_account.c:2654 src/prefs_account.c:2669 src/prefs_account.c:2683
msgid "Don't use SSL/TLS"
msgstr "No usar SSL/TLS"
-#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2657 src/prefs_account.c:2672 src/prefs_account.c:2692
+#: src/prefs_account.c:2703
msgid "Use SSL/TLS"
msgstr "Usar SSL/TLS"
-#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
+#: src/prefs_account.c:2660 src/prefs_account.c:2675 src/prefs_account.c:2706
msgid "Use STARTTLS command to start encrypted session"
msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2696
msgid "Send (SMTP)"
msgstr "Enviar (SMTP)"
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2700
msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
msgstr "No usar SSL/TLS (pero usar STARTTLS si es necesario)"
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2711
msgid "Client certificates"
msgstr "Certificados de cliente"
-#: src/prefs_account.c:2569
+#: src/prefs_account.c:2719
msgid "Certificate for receiving"
msgstr "Certificado para recepción"
-#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
-#: src/prefs_account.c:2604
+#: src/prefs_account.c:2724 src/prefs_account.c:2726 src/prefs_account.c:2752
+#: src/prefs_account.c:2754
msgid "Client certificate file as a PKCS12 or PEM file"
msgstr "Certificado de cliente como fichero PKCS12 o PEM"
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2747
msgid "Certificate for sending"
msgstr "Certificado para envío"
-#: src/prefs_account.c:2637
+#: src/prefs_account.c:2787
msgid "Automatically accept valid SSL/TLS certificates"
msgstr "Aceptar automáticamente los certificados SSL/TLS válidos"
-#: src/prefs_account.c:2640
+#: src/prefs_account.c:2790
msgid "Use non-blocking SSL/TLS"
msgstr "Usar SSL/TLS no-bloqueante"
-#: src/prefs_account.c:2652
+#: src/prefs_account.c:2802
msgid "Turn this off if you have SSL/TLS connection problems"
msgstr "Desactive esto si tiene problemas de conexión con SSL/TLS"
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2894 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr "Usar un servidor proxy"
+
+#: src/prefs_account.c:2903
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr "Usar configuración predeterminada"
+
+#: src/prefs_account.c:2905
+msgid "Use global proxy server settings"
+msgstr "Utilizar la configuración global del proxy"
+
+#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
+msgid "Use authentication"
+msgstr "Usar autenticación"
+
+#: src/prefs_account.c:2947 src/prefs_proxy.c:123
+msgid "Username"
+msgstr "Usuario"
+
+#: src/prefs_account.c:2981
+msgid "Use proxy server for sending"
+msgstr "Utilizar un servidor proxy para enviar"
+
+#: src/prefs_account.c:2983
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+"Si se desactiva los mensajes se enviarán conectando directamente con el "
+"servidor de salida configurado, ignorando las configuraciones de proxy."
+
+#: src/prefs_account.c:3096
msgid "SMTP port"
msgstr "Puerto SMTP"
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:3103
msgid "POP port"
msgstr "Puerto POP"
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:3110
msgid "IMAP port"
msgstr "Puerto IMAP"
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:3117
msgid "NNTP port"
msgstr "Puerto NNTP"
-#: src/prefs_account.c:2814
+#: src/prefs_account.c:3123
msgid "Domain name"
msgstr "Nombre de dominio"
-#: src/prefs_account.c:2817
+#: src/prefs_account.c:3126
msgid ""
"The domain name will be used in the generated Message-ID, and when "
"connecting to SMTP servers."
@@ -14723,128 +14842,131 @@ msgstr ""
"El nombre de dominio se usará en la parte derecha de los identificadores de "
"mensaje generados («Message-Id») y al conectar a servidores SMTP."
-#: src/prefs_account.c:2831
+#: src/prefs_account.c:3140
msgid "Use command to communicate with server"
msgstr "Usar orden para comunicarse con el servidor"
-#: src/prefs_account.c:2840
+#: src/prefs_account.c:3149
msgid "Mark cross-posted messages as read and color:"
msgstr "Marcar los mensajes cruzados como leídos y de color:"
-#: src/prefs_account.c:2896
+#: src/prefs_account.c:3205
msgid "Put sent messages in"
msgstr "Poner mensajes enviados en"
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:3207
msgid "Put queued messages in"
msgstr "Poner mensajes para la cola en"
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3209
msgid "Put draft messages in"
msgstr "Poner borradores de mensajes en"
-#: src/prefs_account.c:2902
+#: src/prefs_account.c:3211
msgid "Put deleted messages in"
msgstr "Poner mensajes borrados en"
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3270
msgid "Account name is not entered."
msgstr "No se especificó el nombre de la cuenta."
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3274
msgid "Mail address is not entered."
msgstr "No se especificó la dirección de correo."
-#: src/prefs_account.c:2973
+#: src/prefs_account.c:3282
msgid "SMTP server is not entered."
msgstr "No se especificó el servidor SMTP."
-#: src/prefs_account.c:2978
+#: src/prefs_account.c:3287
msgid "User ID is not entered."
msgstr "No se especificó el usuario."
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3292
msgid "POP server is not entered."
msgstr "No se especificó el servidor POP."
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3312
msgid "The default Inbox folder doesn't exist."
msgstr "La carpeta de entrada predeterminada no existe."
-#: src/prefs_account.c:3009
+#: src/prefs_account.c:3318
msgid "IMAP server is not entered."
msgstr "No se especificó el servidor IMAP."
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3323
msgid "NNTP server is not entered."
msgstr "No se especificó el servidor NNTP."
-#: src/prefs_account.c:3020
+#: src/prefs_account.c:3329
msgid "local mailbox filename is not entered."
msgstr "no se especificó el nombre de fichero del buzón local."
-#: src/prefs_account.c:3026
+#: src/prefs_account.c:3335
msgid "mail command is not entered."
msgstr "no se especificó el mandato de correo."
-#: src/prefs_account.c:3036
+#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
-msgstr "El identificador de usuario no puede contener caracteres de salto de línea."
+msgstr ""
+"El identificador de usuario no puede contener caracteres de salto de línea."
-#: src/prefs_account.c:3041
+#: src/prefs_account.c:3350
msgid "Password cannot contain a newline character."
msgstr "La contraseña no puede contener caracteres de salto de línea."
-#: src/prefs_account.c:3069
+#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
-msgstr "El identificador de usuario SMTP no puede contener caracteres de salto de línea."
+msgstr ""
+"El identificador de usuario SMTP no puede contener caracteres de salto de "
+"línea."
-#: src/prefs_account.c:3074
+#: src/prefs_account.c:3383
msgid "SMTP password cannot contain a newline character."
msgstr "La contraseña SMTP no puede contener caracteres de salto de línea."
-#: src/prefs_account.c:3387
+#: src/prefs_account.c:3736
msgid "Receive"
msgstr "Recibir"
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
+#: src/prefs_account.c:3790 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
msgid "Templates"
msgstr "Plantillas"
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3808
msgid "Privacy"
msgstr "Privacidad"
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3938
msgid "Advanced"
msgstr "Avanzadas"
-#: src/prefs_account.c:3906
+#: src/prefs_account.c:4287
msgid "Preferences for new account"
msgstr "Preferencias para una nueva cuenta"
-#: src/prefs_account.c:3908
+#: src/prefs_account.c:4289
#, c-format
msgid "%s - Account preferences"
msgstr "%s - Preferencias de la cuenta"
-#: src/prefs_account.c:4029 src/wizard.c:1388
+#: src/prefs_account.c:4410 src/wizard.c:1389
msgid "Failed (wrong address)"
msgstr "Falló (dirección errónea)"
-#: src/prefs_account.c:4114
+#: src/prefs_account.c:4495
msgid "Select signature file"
msgstr "Seleccionar fichero de firma"
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
+#: src/prefs_account.c:4513 src/prefs_account.c:4530 src/wizard.c:1066
msgid "Select certificate file"
msgstr "Seleccionar fichero del certificado"
-#: src/prefs_account.c:4245
+#: src/prefs_account.c:4626
msgid "Protocol:"
msgstr "Protocolo:"
-#: src/prefs_account.c:4385
+#: src/prefs_account.c:4797
#, c-format
msgid "%s (plugin not loaded)"
msgstr "%s (módulo no cargado)"
@@ -14877,9 +14999,9 @@ msgstr "Añadir la nueva acción de arriba a la lista"
msgid "Replace the selected action in list with the action above"
msgstr "Sustituir la acción seleccionada en la lista con la acción de arriba"
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:319
-#: src/prefs_toolbar.c:1069
+#: src/prefs_actions.c:337 src/prefs_filtering_action.c:600
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:775 src/prefs_template.c:319
+#: src/prefs_toolbar.c:1024
msgid "D_elete"
msgstr "B_orrar"
@@ -14903,9 +15025,9 @@ msgstr "Mover arriba la acción seleccionada"
msgid "Move selected action down"
msgstr "Mover abajo la acción seleccionada"
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
+#: src/prefs_actions.c:535 src/prefs_filtering_action.c:691
#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:892
#: src/prefs_template.c:471
msgid "(New)"
msgstr "(Nueva)"
@@ -14961,20 +15083,20 @@ msgstr "Borrar todas las acciones"
msgid "Do you really want to delete all the actions?"
msgstr "¿Realmente quiere borrar todas las acciones?"
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:571
+#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2112 src/prefs_template.c:571
#: src/prefs_template.c:596
msgid "Entry not saved"
msgstr "Entrada no guardada"
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
-#: src/prefs_filtering.c:1524 src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
msgid "The entry was not saved. Close anyway?"
msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:573
+#: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2115 src/prefs_template.c:573
#: src/prefs_template.c:598 src/prefs_template.c:603
msgid "_Continue editing"
msgstr "_Seguir editando"
@@ -15073,7 +15195,7 @@ msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
msgid "for a literal %"
msgstr "para un carácter %"
-#: src/prefs_actions.c:998 src/prefs_themes.c:1088
+#: src/prefs_actions.c:998 src/prefs_themes.c:1090
msgid "Actions"
msgstr "Acciones"
@@ -15085,8 +15207,8 @@ msgstr ""
"Las acciones son una forma de que el usuario pueda lanzar órdenes externas "
"que procesen un fichero de mensaje o alguna de sus partes."
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1699
-#: src/prefs_template.c:1112
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1701
+#: src/prefs_template.c:1113
msgid "D_uplicate"
msgstr "D_uplicar"
@@ -15099,15 +15221,15 @@ msgstr "Acciones actuales"
msgid "Action string is not valid."
msgstr "La cadena de la acción no es válida."
-#: src/prefs_common.c:236 src/prefs_quote.c:69
+#: src/prefs_common.c:237 src/prefs_quote.c:69
msgid "Hello,\\n"
msgstr "Hola,\\n"
-#: src/prefs_common.c:314
+#: src/prefs_common.c:315
msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
msgstr "El %d\\n%f escribió:\\n%q\\n%X"
-#: src/prefs_common.c:320 src/prefs_quote.c:85
+#: src/prefs_common.c:321 src/prefs_quote.c:85
msgid ""
"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15115,7 +15237,7 @@ msgstr ""
"\\n\\nInicio del mensaje redirigido:\\n\\n?d{Fecha: %d\\n}?f{Desde: %f\\n}?"
"t{Para: %t\\n}?c{Cc: %c\\n}?n{Grupos: %n\\n}?s{Asunto: %s\\n}\\n\\n%M"
-#: src/prefs_common.c:448
+#: src/prefs_common.c:449
msgid "%x(%a) %H:%M"
msgstr "%x(%a) %H:%M"
@@ -15216,8 +15338,8 @@ msgstr "Redacción"
msgid "Custom header configuration"
msgstr "Configuración de cabeceras de usuario"
-#: src/prefs_customheader.c:502 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
+#: src/prefs_customheader.c:502 src/prefs_display_header.c:589
+#: src/prefs_matcher.c:1592 src/prefs_matcher.c:1607
msgid "Header name is not set."
msgstr "No se estableció el nombre de cabecera."
@@ -15290,19 +15412,19 @@ msgstr "Configuración de cabeceras mostradas"
msgid "Header name"
msgstr "Cabecera"
-#: src/prefs_display_header.c:319
+#: src/prefs_display_header.c:311
msgid "Displayed Headers"
msgstr "Cabeceras mostradas"
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:373
msgid "Hidden headers"
msgstr "Cabeceras ocultas"
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:399
msgid "Show all unspecified headers"
msgstr "Mostrar todas las cabeceras"
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:599
msgid "This header is already in the list."
msgstr "Esa cabecera ya existe en la lista."
@@ -15340,7 +15462,7 @@ msgstr ""
"un script cuando se usa la opción «Mostrar como texto» del menú contextual"
#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:352
+#: src/prefs_message.c:351
msgid "Message View"
msgstr "Vista de mensaje"
@@ -15368,7 +15490,7 @@ msgid "Message flags"
msgstr "Marcas de mensaje"
#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
+#: src/prefs_summary_column.c:77 src/summaryview.c:2843 src/toolbar.c:505
msgid "Mark"
msgstr "Marca"
@@ -15388,14 +15510,14 @@ msgstr "Marcar como basura"
msgid "Mark as ham"
msgstr "Marcar como bueno"
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1418
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
msgid "Execute"
msgstr "Ejecutar"
#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
msgid "Color label"
-msgstr "Etiqueta de color"
+msgstr "Color"
#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
#: src/prefs_filtering_action.c:193
@@ -15407,9 +15529,9 @@ msgid "Redirect"
msgstr "Redirigir"
#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
+#: src/prefs_filtering_action.c:1422 src/prefs_matcher.c:628
#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:449
+#: src/summaryview.c:451
msgid "Score"
msgstr "Puntos"
@@ -15422,8 +15544,8 @@ msgid "Set score"
msgstr "Establecer puntos"
#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:88 src/summaryview.c:451
+#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:632
+#: src/prefs_summary_column.c:88 src/summaryview.c:453
msgid "Tags"
msgstr "Etiquetas"
@@ -15451,8 +15573,8 @@ msgstr "Detener filtro"
msgid "Action configuration"
msgstr "Configuración de la acción"
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1894
+#: src/prefs_matcher.c:585
msgid "Rule"
msgstr "Regla"
@@ -15460,65 +15582,65 @@ msgstr "Regla"
msgid "Action"
msgstr "Acción"
-#: src/prefs_filtering_action.c:938
+#: src/prefs_filtering_action.c:922
msgid "Command-line not set"
msgstr "Orden no establecida"
-#: src/prefs_filtering_action.c:939
+#: src/prefs_filtering_action.c:923
msgid "Destination is not set."
msgstr "Destino no establecido."
-#: src/prefs_filtering_action.c:950
+#: src/prefs_filtering_action.c:934
msgid "Recipient is not set."
msgstr "Destinatario no establecido."
-#: src/prefs_filtering_action.c:968
+#: src/prefs_filtering_action.c:952
msgid "Score is not set"
msgstr "Puntuación no establecida"
-#: src/prefs_filtering_action.c:976
+#: src/prefs_filtering_action.c:960
msgid "Header is not set."
msgstr "No se estableció la cabecera."
-#: src/prefs_filtering_action.c:983
+#: src/prefs_filtering_action.c:967
msgid "Target addressbook/folder is not set."
msgstr "No se especificó agenda/carpeta de destino."
-#: src/prefs_filtering_action.c:997
+#: src/prefs_filtering_action.c:977
msgid "Tag name is empty."
msgstr "El nombre de la etiqueta está vacío."
-#: src/prefs_filtering_action.c:1219
+#: src/prefs_filtering_action.c:1199
msgid "No action was defined."
msgstr "No se definió ninguna acción."
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_filtering_action.c:1237 src/prefs_matcher.c:2159
#: src/quote_fmt.c:79
msgid "literal %"
msgstr "carácter %"
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1246 src/prefs_matcher.c:2168
msgid "filename (should not be modified)"
msgstr "nombre de fichero (no debe modificarse)"
-#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1247 src/prefs_matcher.c:2169
#: src/quote_fmt.c:87
msgid "new line"
msgstr "nueva línea"
-#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
+#: src/prefs_filtering_action.c:1248 src/prefs_matcher.c:2170
msgid "escape character for quotes"
msgstr "carácter de escape para citas"
-#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
+#: src/prefs_filtering_action.c:1249 src/prefs_matcher.c:2171
msgid "quote character"
msgstr "carácter de cita"
-#: src/prefs_filtering_action.c:1278
+#: src/prefs_filtering_action.c:1258
msgid "Filtering Action: 'Execute'"
msgstr "Acción de filtrado: «Ejecutar»"
-#: src/prefs_filtering_action.c:1279
+#: src/prefs_filtering_action.c:1259
msgid ""
"'Execute' allows you to send a message or message element to an external "
"program or script.\n"
@@ -15528,23 +15650,23 @@ msgstr ""
"externo o script.\n"
"Se pueden usar los siguientes símbolos:"
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1402
msgid "Recipient"
msgstr "Destinatario"
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1406
msgid "Book/Folder"
msgstr "Agenda/carpeta"
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1410
msgid "Destination"
msgstr "Destino"
-#: src/prefs_filtering_action.c:1438
+#: src/prefs_filtering_action.c:1414
msgid "Color"
msgstr "Colorear"
-#: src/prefs_filtering_action.c:1524
+#: src/prefs_filtering_action.c:1500
msgid "Current action list"
msgstr "Lista actual de acciones"
@@ -15626,39 +15748,39 @@ msgstr "La cadena de condición esta vacía."
msgid "Action string is empty."
msgstr "La cadena de la acción esta vacía."
-#: src/prefs_filtering.c:1209
+#: src/prefs_filtering.c:1210
msgid "Delete rule"
msgstr "Borrar regla"
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1211
msgid "Do you really want to delete this rule?"
msgstr "¿Quiere borrar realmente esta regla?"
-#: src/prefs_filtering.c:1228
+#: src/prefs_filtering.c:1229
msgid "Delete all rules"
msgstr "Borrar todas las reglas"
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1230
msgid "Do you really want to delete all the rules?"
msgstr "¿Quiere borrar realmente todas las reglas?"
-#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1481
msgid "Filtering rules not saved"
msgstr "Reglas de filtrado no guardadas"
-#: src/prefs_filtering.c:1480
+#: src/prefs_filtering.c:1482
msgid "The list of filtering rules have been modified. Close anyway?"
msgstr "La lista de reglas de filtrado ha sido modificada. ¿Cerrar igualmente?"
-#: src/prefs_filtering.c:1702
+#: src/prefs_filtering.c:1704
msgid "Move one page up"
msgstr "Mover una página arriba"
-#: src/prefs_filtering.c:1703
+#: src/prefs_filtering.c:1705
msgid "Move one page down"
msgstr "Mover una página abajo"
-#: src/prefs_filtering.c:1858
+#: src/prefs_filtering.c:1862
msgid "Enable"
msgstr "Activar"
@@ -15683,8 +15805,8 @@ msgstr "Columnas ocultas"
msgid "Displayed columns"
msgstr "Columnas visibles"
-#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:425
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1032
msgid " Use default "
msgstr " Usar configuración inicial "
@@ -15698,7 +15820,7 @@ msgstr ""
"Sin embargo puede establecerlas en todo el árbol de carpetas del buzón "
"usando «Aplicar a subcarpetas»."
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
+#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:885
msgid ""
"Apply to\n"
"subfolders"
@@ -15723,12 +15845,12 @@ msgid "Simplify Subject RegExp"
msgstr "Expr. reg. para simplificar asunto"
#: src/prefs_folder_item.c:370
-msgid "Test string:"
-msgstr "Texto de prueba:"
+msgid "Test string"
+msgstr "Texto de prueba"
#: src/prefs_folder_item.c:387
-msgid "Result:"
-msgstr "Resultado:"
+msgid "Result"
+msgstr "Resultado"
#: src/prefs_folder_item.c:402
msgid "Folder chmod"
@@ -15738,23 +15860,23 @@ msgstr "Permisos de la carpeta"
msgid "Folder color"
msgstr "Color de la carpeta"
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
+#: src/prefs_folder_item.c:440 src/prefs_folder_item.c:1677
msgid "Pick color for folder"
msgstr "Elegir color para la carpeta"
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:458
msgid "Run Processing rules at start-up"
msgstr "Ejecutar las reglas de procesamiento al iniciar"
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:473
msgid "Run Processing rules when opening"
msgstr "Ejecutar las reglas de procesamiento al abrir"
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:487
msgid "Scan for new mail"
msgstr "Examinar si hay correo nuevo"
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:489
msgid ""
"Turn this option on if mail is delivered directly to this folder by server "
"side filtering on IMAP or by an external application"
@@ -15762,11 +15884,11 @@ msgstr ""
"Active esta opción si el correo es servido directamente en esta carpeta por "
"el filtrado del servidor en IMAP o por una aplicación externa"
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:509
msgid "Select the HTML part of multipart messages"
msgstr "Seleccionar la parte HTML en mensajes multiparte"
-#: src/prefs_folder_item.c:527
+#: src/prefs_folder_item.c:526
msgid ""
"\"Default\" will follow global preference (found in /Preferences/Message "
"View/Text Options)"
@@ -15774,64 +15896,64 @@ msgstr ""
"«Por omisión» obedecerá las preferencias globales (que se encuentran en /"
"Preferencias/Vista de mensaje/Opciones de texto)"
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:536
msgid "Synchronise for offline use"
msgstr "Sincronizar para uso sin conexión"
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:557
msgid "Fetch message bodies from the last"
msgstr "Recuperar cuerpos de mensaje desde el último"
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:564
msgid "0: all bodies"
msgstr "0: todos los cuerpos"
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:572
msgid "Remove older messages bodies"
msgstr "Eliminar cuerpos de mensaje antiguos"
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:589
msgid "Discard folder cache"
msgstr "Descartar la caché de carpeta"
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:894
msgid "Request Return Receipt"
msgstr "Solicitar acuse de recibo"
-#: src/prefs_folder_item.c:910
+#: src/prefs_folder_item.c:909
msgid "Save copy of outgoing messages to this folder instead of Sent"
msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
-#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
-#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#: src/prefs_folder_item.c:923 src/prefs_folder_item.c:975
+#: src/prefs_folder_item.c:1001 src/prefs_folder_item.c:1027
#, c-format
msgctxt "folder properties: %s stands for a header name"
msgid "Default %s"
msgstr "Cabecera %s predeterminada"
-#: src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:949
#, c-format
msgctxt "folder properties: %s stands for a header name"
msgid "Default %s for replies"
msgstr "Cabecera %s para respuestas"
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1052
msgid "Default account"
msgstr "Cuenta primaria"
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1690
msgid "Discard cache"
msgstr "Descartar caché"
-#: src/prefs_folder_item.c:1692
+#: src/prefs_folder_item.c:1691
msgid "Do you really want to discard the local cached data for this folder?"
msgstr "¿Quiere borrar realmente los datos locales en caché para esta carpeta?"
-#: src/prefs_folder_item.c:1825
+#: src/prefs_folder_item.c:1824
msgid "General"
msgstr "Genéricas"
-#: src/prefs_folder_item.c:1904
+#: src/prefs_folder_item.c:1903
#, c-format
msgid "Properties for folder %s"
msgstr "Propiedades de la carpeta %s"
@@ -15840,7 +15962,7 @@ msgstr "Propiedades de la carpeta %s"
msgid "Folder and Message Lists"
msgstr "Carpeta y listas de mensajes"
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2033
msgid "Message"
msgstr "Mensaje"
@@ -15866,7 +15988,7 @@ msgstr "Usar una tipografía distinta para imprimir"
msgid "Message Printing"
msgstr "Impresión de mensajes"
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:765
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:773
#: src/prefs_themes.c:421
msgid "Display"
msgstr "Ver"
@@ -15875,7 +15997,7 @@ msgstr "Ver"
msgid "Fonts"
msgstr "Tipografías"
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:517
msgid "Preferences"
msgstr "Preferencias"
@@ -16020,7 +16142,7 @@ msgstr "Mensajes de error"
msgid "Status messages for filtering/processing log"
msgstr "Mensajes de estado de filtrado/traza de procesamiento"
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:772
msgid "Other"
msgstr "Otras"
@@ -16028,247 +16150,247 @@ msgstr "Otras"
msgid "Logging"
msgstr "Depuración"
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:330
msgid "more than"
msgstr "más que"
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:331
msgid "less than"
msgstr "menos que"
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:337
msgid "weeks"
msgstr "semanas"
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
msgid "higher than"
msgstr "más alto que"
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:342
msgid "lower than"
msgstr "más bajo que"
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
msgid "exactly"
msgstr "exactamente"
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:347
msgid "greater than"
msgstr "mayor que"
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:348
msgid "smaller than"
msgstr "menor que"
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:353
msgid "bytes"
msgstr "bytes"
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:354
msgid "kilobytes"
msgstr "kilobytes"
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:355
msgid "megabytes"
msgstr "megabytes"
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:359
msgid "contains"
msgstr "contiene"
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:360
msgid "doesn't contain"
msgstr "no contiene"
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:384
msgid "headers part"
msgstr "sección cabeceras"
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:385
msgid "headers values"
msgstr "valores de cabeceras"
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:386
msgid "body part"
msgstr "sección cuerpo"
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:387
msgid "whole message"
msgstr "mensaje completo"
-#: src/prefs_matcher.c:394 src/summaryview.c:6351
+#: src/prefs_matcher.c:393 src/summaryview.c:6487
msgid "Marked"
msgstr "Marcado"
-#: src/prefs_matcher.c:395 src/summaryview.c:6349
+#: src/prefs_matcher.c:394 src/summaryview.c:6485
msgid "Deleted"
msgstr "Borrado"
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
msgid "Replied"
msgstr "Respondido"
-#: src/prefs_matcher.c:397 src/summaryview.c:6343
+#: src/prefs_matcher.c:396 src/summaryview.c:6479
msgid "Forwarded"
msgstr "Reenviado"
-#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2339
+#: src/prefs_matcher.c:398 src/summaryview.c:6469 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
msgid "Spam"
msgstr "Basura"
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:399
msgid "Has attachment"
msgstr "Tiene adjunto"
-#: src/prefs_matcher.c:401 src/summaryview.c:6369
+#: src/prefs_matcher.c:400 src/summaryview.c:6505
msgid "Signed"
msgstr "Firmado"
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
msgid "set"
msgstr "establecido"
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:405
msgid "not set"
msgstr "no establecido"
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:409
msgid "yes"
msgstr "si"
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:410
msgid "no"
msgstr "no"
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
msgid "Any tags"
msgstr "Cualquier etiqueta"
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:415
msgid "Specific tag"
msgstr "Etiqueta específica"
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
msgid "ignored"
msgstr "ignorado"
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:420
msgid "not ignored"
msgstr "no ignorado"
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:421
msgid "watched"
msgstr "observado"
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:422
msgid "not watched"
msgstr "no observado"
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:426
msgid "found"
msgstr "encontrado"
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:427
msgid "not found"
msgstr "no encontrado"
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
msgid "0 (Passed)"
msgstr "0 (Pasado)"
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:432
msgid "non-0 (Failed)"
msgstr "no-0 (Fallido)"
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:568
msgid "Condition configuration"
msgstr "Configuración de la condición"
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
-msgstr "Criterio de búsqueda:"
+#: src/prefs_matcher.c:612
+msgid "Match criteria"
+msgstr "Criterio de búsqueda"
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:621
msgid "All messages"
msgstr "Todos los mensajes"
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:623
msgid "Age"
msgstr "Edad"
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:624
msgid "Phrase"
msgstr "Frase"
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:625
msgid "Flags"
msgstr "Marcas"
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
+#: src/prefs_matcher.c:626 src/prefs_msg_colors.c:341
msgid "Color labels"
-msgstr "Etiquetas de colores"
+msgstr "Colores"
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:627
msgid "Thread"
msgstr "Hilo"
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:630
msgid "Partially downloaded"
msgstr "Parcialmente descargado"
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:633
msgid "External program test"
msgstr "Prueba con un programa externo"
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
-#: src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:705 src/prefs_matcher.c:1613 src/prefs_matcher.c:1628
+#: src/prefs_matcher.c:2515
msgctxt "Filtering Matcher Menu"
msgid "All"
msgstr "Todos"
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:739
msgid "Use regexp"
msgstr "Usar exp.reg."
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:815
msgid "Message must match"
msgstr "El mensaje debe cumplir"
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:819
msgid "at least one"
msgstr "al menos una de"
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:820
msgid "all"
msgstr "todas"
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:823
msgid "of above rules"
msgstr "las reglas anteriores"
-#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1531 src/prefs_matcher.c:1597
msgid "Search pattern is not set."
msgstr "No se estableció el patrón de búsqueda."
-#: src/prefs_matcher.c:1545
+#: src/prefs_matcher.c:1540
msgid "Test command is not set."
msgstr "No se estableció la orden de prueba."
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1614
msgid "all addresses in all headers"
msgstr "todas las direcciones en todas las cabeceras"
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1617
msgid "any address in any header"
msgstr "cualquier dirección en cualquier cabecera"
-#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:1619
#, c-format
msgid "the address(es) in header '%s'"
msgstr "la(s) dirección(es) en la cabecera «%s»"
-#: src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1620
#, c-format
msgid ""
"Book/folder path is not set.\n"
@@ -16281,83 +16403,83 @@ msgstr ""
"Si quiere encontrar coincidencias de «%s» en todo el libro de direcciones "
"deberá seleccionar «%s» en la lista desplegable de agenda/carpeta."
-#: src/prefs_matcher.c:1844
+#: src/prefs_matcher.c:1839
msgid "Headers part"
msgstr "Sección cabeceras"
-#: src/prefs_matcher.c:1848
+#: src/prefs_matcher.c:1843
msgid "Headers values"
msgstr "Valores de cabeceras"
-#: src/prefs_matcher.c:1852
+#: src/prefs_matcher.c:1847
msgid "Body part"
msgstr "Sección cuerpo"
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1851
msgid "Whole message"
msgstr "Mensaje completo"
-#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:1964 src/prefs_matcher.c:2006
msgid "in"
msgstr "en"
-#: src/prefs_matcher.c:1971
+#: src/prefs_matcher.c:1966
msgid "content is"
msgstr "contenido es"
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:1975
msgid "Age is"
msgstr "Edad es"
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1980
msgid "Flag"
msgstr "Marca"
-#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:1981 src/prefs_matcher.c:1996
msgid "is"
msgstr "es"
-#: src/prefs_matcher.c:1991
+#: src/prefs_matcher.c:1986
msgid "Name:"
msgstr "Nombre:"
-#: src/prefs_matcher.c:2000
+#: src/prefs_matcher.c:1995
msgid "Label"
msgstr "Etiqueta"
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2001
msgid "Value:"
msgstr "Valor:"
-#: src/prefs_matcher.c:2021
+#: src/prefs_matcher.c:2016
msgid "Score is"
msgstr "Puntuación es"
-#: src/prefs_matcher.c:2022
+#: src/prefs_matcher.c:2017
msgid "points"
msgstr "puntos"
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2027
msgid "Size is"
msgstr "Tamaño es"
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2032
msgid "Scope:"
msgstr "Alcance:"
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2034
msgid "tags"
msgstr "etiquetas"
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2039
msgid "type is"
msgstr "tipo es"
-#: src/prefs_matcher.c:2048
+#: src/prefs_matcher.c:2043
msgid "Program returns"
msgstr "El programa devuelve"
-#: src/prefs_matcher.c:2118
+#: src/prefs_matcher.c:2113
msgid ""
"The entry was not saved.\n"
"Close anyway?"
@@ -16365,11 +16487,11 @@ msgstr ""
"La entrada no fue guardada.\n"
"¿Cerrar igualmente?"
-#: src/prefs_matcher.c:2184
+#: src/prefs_matcher.c:2180
msgid "Match Type: 'Test'"
msgstr "Tipo de coincidencia: «Probar»"
-#: src/prefs_matcher.c:2185
+#: src/prefs_matcher.c:2181
msgid ""
"'Test' allows you to test a message or message element using an external "
"program or script. The program will return either 0 or 1.\n"
@@ -16381,87 +16503,87 @@ msgstr ""
"\n"
"Se pueden usar los siguientes símbolos:"
-#: src/prefs_matcher.c:2284
+#: src/prefs_matcher.c:2280
msgid "Current condition rules"
msgstr "Reglas de condición actuales"
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
msgid "Headers"
msgstr "Cabeceras"
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
msgid "Display header pane above message view"
msgstr "Mostrar panel de cabeceras sobre el mensaje"
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
msgid "Display (X-)Face in message view"
msgstr "Mostrar (X-)Face en la vista del mensaje"
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
msgid "Display Face in message view"
msgstr "Mostrar Face en la vista del mensaje"
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
msgid "Display headers in message view"
msgstr "Mostrar cabeceras en la vista del mensaje"
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
msgid "HTML messages"
msgstr "Mensajes HTML"
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
msgid "Render HTML messages as text"
msgstr "Presentar los mensajes HTML como texto"
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
msgid "Render HTML-only messages with plugin if possible"
msgstr "Mostrar los mensajes HTML con un módulo si es posible"
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
msgid "Select the HTML part of multipart/alternative messages"
msgstr "Seleccionar la parte HTML en mensajes «multipart/alternative»"
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
msgid "Line space"
msgstr "Interlineado"
-#: src/prefs_message.c:188 src/prefs_message.c:221
+#: src/prefs_message.c:187 src/prefs_message.c:220
msgid "pixels"
msgstr "píxels"
-#: src/prefs_message.c:194
+#: src/prefs_message.c:193
msgid "Scroll"
msgstr "Desplazamiento"
-#: src/prefs_message.c:196
+#: src/prefs_message.c:195
msgid "Half page"
msgstr "Media página"
-#: src/prefs_message.c:202
+#: src/prefs_message.c:201
msgid "Smooth scroll"
msgstr "Desplazamiento suave"
-#: src/prefs_message.c:208
+#: src/prefs_message.c:207
msgid "Step"
msgstr "Paso"
-#: src/prefs_message.c:228
+#: src/prefs_message.c:227
msgid "Show attachment descriptions (rather than names)"
msgstr "Mostrar descripciones de los adjuntos (en vez de nombres)"
-#: src/prefs_message.c:231
+#: src/prefs_message.c:230
msgid "Quotation"
msgstr "Citas"
-#: src/prefs_message.c:240
+#: src/prefs_message.c:239
msgid "Collapse quoted text on double click"
msgstr "Colapsar el texto citado al hacer doble clic"
-#: src/prefs_message.c:247
-msgid "Treat these characters as quotation marks: "
-msgstr "Tratar estos caracteres como marcas de cita: "
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
+msgstr "Tratar estos caracteres como marcas de cita"
-#: src/prefs_message.c:353
+#: src/prefs_message.c:352
msgid "Text Options"
msgstr "Opciones de texto"
@@ -16490,36 +16612,36 @@ msgstr ""
msgid "Configuration warning"
msgstr "Aviso de configuración"
-#: src/prefs_msg_colors.c:146
+#: src/prefs_msg_colors.c:153
msgid "Message view"
msgstr "Vista de mensaje"
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:160
msgid "Enable coloration of message text"
msgstr "Permitir colores en el texto del mensaje"
-#: src/prefs_msg_colors.c:161
+#: src/prefs_msg_colors.c:168
msgid "Quote"
msgstr "Cita"
-#: src/prefs_msg_colors.c:173
+#: src/prefs_msg_colors.c:180
msgid "Cycle quote colors"
msgstr "Reutilizar colores de citación"
-#: src/prefs_msg_colors.c:177
+#: src/prefs_msg_colors.c:184
msgid "If there are more than 3 quote levels, the colors will be reused"
msgstr "Si hay más de 3 niveles de cita se reutilizarán los colores"
-#: src/prefs_msg_colors.c:183
+#: src/prefs_msg_colors.c:190
msgid "1st Level"
msgstr "Primer nivel"
-#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:239
+#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:232
msgid "Text"
msgstr "Texto"
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:200
msgctxt "Tooltip"
msgid "Pick color for 1st level text"
msgstr "Elegir el color para el texto de primer nivel"
@@ -16528,58 +16650,59 @@ msgstr "Elegir el color para el texto de primer nivel"
msgid "2nd Level"
msgstr "Segundo nivel"
-#: src/prefs_msg_colors.c:227
+#: src/prefs_msg_colors.c:218
msgctxt "Tooltip"
msgid "Pick color for 2nd level text"
msgstr "Elegir el color para el texto de segundo nivel"
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:226
msgid "3rd Level"
msgstr "Tercer nivel"
-#: src/prefs_msg_colors.c:252
+#: src/prefs_msg_colors.c:236
msgctxt "Tooltip"
msgid "Pick color for 3rd level text"
msgstr "Elegir el color para el texto de tercer nivel"
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:245
msgid "Enable coloration of text background"
msgstr "Habilitar el color en el fondo del texto"
-#: src/prefs_msg_colors.c:274
+#: src/prefs_msg_colors.c:254
msgctxt "Tooltip"
msgid "Pick color for 1st level text background"
msgstr "Elegir el color para el fondo del texto de primer nivel"
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:267
msgctxt "Tooltip"
msgid "Pick color for 2nd level text background"
msgstr "Elegir el color para el fondo del texto de segundo nivel"
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:280
msgctxt "Tooltip"
msgid "Pick color for 3rd level text background"
msgstr "Elegir el color para el fondo del texto de tercer nivel"
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:292
msgctxt "Tooltip"
msgid "Pick color for links"
msgstr "Elegir el color para los enlaces"
-#: src/prefs_msg_colors.c:335
+#: src/prefs_msg_colors.c:296
msgid "URI link"
msgstr "Enlace URI"
-#: src/prefs_msg_colors.c:351
+#: src/prefs_msg_colors.c:304
msgctxt "Tooltip"
msgid "Pick color for signatures"
msgstr "Elegir el color para las firmas"
-#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:365
msgid "Folder list"
msgstr "Lista de carpetas"
-#: src/prefs_msg_colors.c:370
+#: src/prefs_msg_colors.c:318
+msgctxt "Tooltip"
msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
@@ -16588,21 +16711,22 @@ msgstr ""
"la opción «Ejecutar inmediatamente movimientos o borrados de mensajes» está "
"desactivada"
-#: src/prefs_msg_colors.c:374
+#: src/prefs_msg_colors.c:323
msgid "Target folder"
msgstr "Carpeta de destino"
-#: src/prefs_msg_colors.c:388
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip"
msgid "Pick color for folders containing new messages"
msgstr "Elegir el color para las carpetas que contiene mensajes nuevos"
-#: src/prefs_msg_colors.c:390
+#: src/prefs_msg_colors.c:334
msgid "Folder containing new messages"
msgstr "Carpeta que contiene mensajes nuevos"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
+#: src/prefs_msg_colors.c:359 src/prefs_msg_colors.c:391
#, c-format
msgctxt "Tooltip"
msgid "Pick color for 'color %d'"
@@ -16610,70 +16734,70 @@ msgstr "Seleccionar el color para el «color %d»"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
+#: src/prefs_msg_colors.c:363 src/prefs_msg_colors.c:395
#, c-format
msgid "Set label for 'color %d'"
msgstr "Establecer la etiqueta para el «color %d»"
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:582
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "Elegir el color para el «color %d»"
-
-#: src/prefs_msg_colors.c:590
+#: src/prefs_msg_colors.c:490
msgctxt "Dialog title"
msgid "Pick color for 1st level text"
msgstr "Elegir color del texto de primer nivel"
-#: src/prefs_msg_colors.c:593
+#: src/prefs_msg_colors.c:492
msgctxt "Dialog title"
msgid "Pick color for 2nd level text"
msgstr "Elegir color del texto de segundo nivel"
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:494
msgctxt "Dialog title"
msgid "Pick color for 3rd level text"
msgstr "Elegir color del texto de tercer nivel"
-#: src/prefs_msg_colors.c:599
+#: src/prefs_msg_colors.c:496
msgctxt "Dialog title"
msgid "Pick color for 1st level text background"
msgstr "Elegir color de fondo del texto de primer nivel"
-#: src/prefs_msg_colors.c:602
+#: src/prefs_msg_colors.c:498
msgctxt "Dialog title"
msgid "Pick color for 2nd level text background"
msgstr "Elegir color de fondo del texto de segundo nivel"
-#: src/prefs_msg_colors.c:605
+#: src/prefs_msg_colors.c:500
msgctxt "Dialog title"
msgid "Pick color for 3rd level text background"
msgstr "Elegir color de fondo del texto de tercer nivel"
-#: src/prefs_msg_colors.c:608
+#: src/prefs_msg_colors.c:502
msgctxt "Dialog title"
msgid "Pick color for links"
msgstr "Elegir color para «color %d»"
-#: src/prefs_msg_colors.c:611
+#: src/prefs_msg_colors.c:504
msgctxt "Dialog title"
msgid "Pick color for target folder"
msgstr "Elegir color de la carpeta destino"
-#: src/prefs_msg_colors.c:614
+#: src/prefs_msg_colors.c:506
msgctxt "Dialog title"
msgid "Pick color for signatures"
msgstr "Elegir color de las firmas"
-#: src/prefs_msg_colors.c:617
+#: src/prefs_msg_colors.c:508
msgctxt "Dialog title"
msgid "Pick color for folder"
msgstr "Elegir color para «color %d»"
-#: src/prefs_msg_colors.c:831
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:531
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Elegir el color para el «color %d»"
+
+#: src/prefs_msg_colors.c:732
msgid "Colors"
msgstr "Colores"
@@ -16693,35 +16817,35 @@ msgstr ""
"Puede también modificar cada atajo de menú presionando\n"
"la(s) tecla(s) al situar el puntero sobre el elemento."
-#: src/prefs_other.c:496
+#: src/prefs_other.c:492
msgid "Add address to destination when double-clicked"
msgstr "Añadir la dirección al destino con doble clic"
-#: src/prefs_other.c:499
+#: src/prefs_other.c:495
msgid "On exit"
msgstr "Al salir"
-#: src/prefs_other.c:502
+#: src/prefs_other.c:498
msgid "Confirm on exit"
msgstr "Confirmar al salir"
-#: src/prefs_other.c:509
+#: src/prefs_other.c:505
msgid "Empty trash on exit"
msgstr "Vaciar la papelera al salir"
-#: src/prefs_other.c:512
+#: src/prefs_other.c:508
msgid "Warn if there are queued messages"
msgstr "Avisar si existen mensajes en cola"
-#: src/prefs_other.c:514
+#: src/prefs_other.c:510
msgid "Keyboard shortcuts"
msgstr "Atajos de teclado"
-#: src/prefs_other.c:517
+#: src/prefs_other.c:513
msgid "Enable customisable keyboard shortcuts"
msgstr "Habilitar los atajos de teclado configurables"
-#: src/prefs_other.c:520
+#: src/prefs_other.c:516
msgid ""
"If checked, you can change the keyboard shortcuts of most of the menu items "
"by focusing on the menu item and pressing a key combination.\n"
@@ -16732,15 +16856,15 @@ msgstr ""
"de teclas.\n"
"Desmarque esta opción si quiere bloquear todos los atajos existentes."
-#: src/prefs_other.c:527
+#: src/prefs_other.c:523
msgid " Choose preset keyboard shortcuts... "
msgstr "Seleccionar configuración de atajos de teclado..."
-#: src/prefs_other.c:537
+#: src/prefs_other.c:533
msgid "Metadata handling"
msgstr "Gestión de metadatos"
-#: src/prefs_other.c:538
+#: src/prefs_other.c:534
msgid ""
"Safer mode asks the OS to write metadata to disk directly;\n"
"it avoids data loss after crashes but can take some time."
@@ -16749,33 +16873,33 @@ msgstr ""
"metadatos;\n"
"Evita la pérdida de datos en caso de caídas pero puede llevar cierto tiempo."
-#: src/prefs_other.c:542
+#: src/prefs_other.c:538
msgid "Safer"
msgstr "Más seguro"
-#: src/prefs_other.c:544
+#: src/prefs_other.c:540
msgid "Faster"
msgstr "Más rápido"
-#: src/prefs_other.c:562
+#: src/prefs_other.c:558
msgid "Socket I/O timeout"
msgstr "Tiempo límite de E/S del conector"
-#: src/prefs_other.c:583
+#: src/prefs_other.c:579
msgid "Ask before emptying trash"
msgstr "Preguntar antes de vaciar la papelera"
-#: src/prefs_other.c:585
+#: src/prefs_other.c:581
msgid "Ask about account specific filtering rules when filtering manually"
msgstr ""
"Preguntar sobre las reglas de filtrado específicas de la cuenta al filtrar "
"manualmente"
-#: src/prefs_other.c:590
+#: src/prefs_other.c:586
msgid "Use secure file deletion if possible"
msgstr "Usar borrado de ficheros seguro si es posible"
-#: src/prefs_other.c:594
+#: src/prefs_other.c:590
msgid ""
"Use secure file deletion if possible\n"
"(the 'shred' program is not available)"
@@ -16783,7 +16907,7 @@ msgstr ""
"Usar borrado de ficheros seguro si es posible\n"
"(el programa «shred» no está disponible)"
-#: src/prefs_other.c:599
+#: src/prefs_other.c:595
msgid ""
"Use the 'shred' program to overwrite files with random data before deleting "
"them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16792,19 +16916,19 @@ msgstr ""
"aleatorios antes de borrarlos. Esto ralentiza el borrado. Asegúrese de leer "
"las implicaciones en la página del manual de shred."
-#: src/prefs_other.c:603
+#: src/prefs_other.c:599
msgid "Synchronise offline folders as soon as possible"
msgstr "Sincronizar carpetas sin conexión tan pronto como sea posible"
-#: src/prefs_other.c:606
+#: src/prefs_other.c:602
msgid "Master passphrase"
msgstr "Contraseña maestra"
-#: src/prefs_other.c:609
+#: src/prefs_other.c:605
msgid "Use a master passphrase"
msgstr "Utilizar una contraseña maestra"
-#: src/prefs_other.c:612
+#: src/prefs_other.c:608
msgid ""
"If checked, your saved account passwords will be protected by a master "
"passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16812,128 +16936,116 @@ msgstr ""
"Si se activa, las contraseñas guardadas de sus cuentas estarán protegidas "
"por una contraseña maestra. Si no se establece ninguna se le solicitará una."
-#: src/prefs_other.c:617
+#: src/prefs_other.c:613
msgid "Change master passphrase"
msgstr "Cambiar la contraseña maestra"
-#: src/prefs_other.c:777
+#: src/prefs_other.c:773
msgid "Miscellaneous"
msgstr "Miscelánea"
+#: src/prefs_proxy.c:240 src/prefs_receive.c:413 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "Manejo de correo"
+
#: src/prefs_quote.c:77
msgid "On %d\\n%f wrote:\\n\\n%q"
msgstr "El %d\\n%f escribió:\\n\\n%q"
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:143
msgid "External incorporation program"
msgstr "Programa externo para incorporación"
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:146
msgid "Use external program for receiving mail"
msgstr "Usar un programa externo para recibir correo"
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr "Comprobación automática"
-
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr "Comprobar si hay correo nuevo cada"
-
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:213
msgid "Check for new mail on start-up"
msgstr "Comprobar si hay correo nuevo al inicio"
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:216
msgid "Dialogs"
msgstr "Diálogos"
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:218
msgid "Show receive dialog"
msgstr "Mostrar diálogo de recepción"
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:228
msgid "Only on manual receiving"
msgstr "Sólo al recibir manualmente"
-#: src/prefs_receive.c:238
+#: src/prefs_receive.c:239
msgid "Close receive dialog when finished"
msgstr "Cerrar el diálogo de recepción al finalizar"
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:242
msgid "Don't popup error dialog on receive error"
msgstr "No mostrar diálogo de error si hay error de recepción"
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:245
msgid "After receiving new mail"
msgstr "Después de recibir correo nuevo"
-#: src/prefs_receive.c:246
+#: src/prefs_receive.c:247
msgid "Go to Inbox"
msgstr "Ir a Entrada"
-#: src/prefs_receive.c:248
+#: src/prefs_receive.c:249
msgid "Update all local folders"
msgstr "Actualizar todas las carpetas locales"
-#: src/prefs_receive.c:250
+#: src/prefs_receive.c:251
msgid "Run command"
msgstr "Ejecutar una orden"
-#: src/prefs_receive.c:255
+#: src/prefs_receive.c:256
msgid "after automatic check"
msgstr "después de la comprobación automática"
-#: src/prefs_receive.c:257
+#: src/prefs_receive.c:258
msgid "after manual check"
msgstr "después de la comprobación manual"
-#: src/prefs_receive.c:265
+#: src/prefs_receive.c:278
#, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-"Orden a ejecutar:\n"
-"(usar %d como n.º de mensajes nuevos)"
+msgid "Use %d as number of new mails"
+msgstr "Use %d como n.º de mensajes nuevos"
-#: src/prefs_receive.c:408 src/prefs_send.c:415
-msgid "Mail Handling"
-msgstr "Manejo de correo"
-
-#: src/prefs_receive.c:409
+#: src/prefs_receive.c:414
msgid "Receiving"
msgstr "Recepción"
-#: src/prefs_send.c:172
+#: src/prefs_send.c:176
msgid "Save sent messages"
msgstr "Guardar mensajes enviados"
-#: src/prefs_send.c:175
+#: src/prefs_send.c:179
msgid "Never send Return Receipts"
msgstr "No enviar nunca acuses de recibo"
-#: src/prefs_send.c:193
+#: src/prefs_send.c:197
msgid "Confirm before sending queued messages"
msgstr "Confirmar antes de enviar los mensajes en la cola"
-#: src/prefs_send.c:196
+#: src/prefs_send.c:200
msgid "Show send dialog"
msgstr "Mostrar diálogo de envío"
-#: src/prefs_send.c:199
+#: src/prefs_send.c:203
msgid "Warn when Subject is empty"
msgstr "Avisar cuando el asunto esta vacío"
-#: src/prefs_send.c:205
-msgid "Warn when sending to more recipients than:"
-msgstr "Avisar al enviar a un nº de destinatarios mayor que"
+#: src/prefs_send.c:209
+msgid "Warn when sending to more recipients than"
+msgstr "Avisar al enviar a un n.º de destinatarios mayor que"
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
msgid "Outgoing encoding"
msgstr "Codificación de caracteres para enviar"
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
msgid ""
"If 'Automatic' is selected, the optimal encoding for the current locale will "
"be used"
@@ -16941,131 +17053,131 @@ msgstr ""
"Si selecciona «Automático» se utilizará la codificación óptima para la "
"localización actual."
-#: src/prefs_send.c:263
+#: src/prefs_send.c:267
msgid "7bit ASCII (US-ASCII)"
msgstr "ASCII de 7 bits (US-ASCII)"
-#: src/prefs_send.c:264
+#: src/prefs_send.c:268
msgid "Unicode (UTF-8)"
msgstr "Unicode (UTF-8)"
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
msgid "Western European (ISO-8859-1)"
msgstr "Europeo Occidental (ISO-8859-1)"
-#: src/prefs_send.c:267
+#: src/prefs_send.c:271
msgid "Western European (ISO-8859-15)"
msgstr "Europeo Occidental (ISO-8859-15)"
-#: src/prefs_send.c:269
+#: src/prefs_send.c:273
msgid "Central European (ISO-8859-2)"
msgstr "Centroeuropeo (ISO-8859-2)"
-#: src/prefs_send.c:271
+#: src/prefs_send.c:275
msgid "Baltic (ISO-8859-13)"
msgstr "Báltico (ISO-8859-13)"
-#: src/prefs_send.c:272
+#: src/prefs_send.c:276
msgid "Baltic (ISO-8859-4)"
msgstr "Báltico (ISO-8859-4)"
-#: src/prefs_send.c:274
+#: src/prefs_send.c:278
msgid "Greek (ISO-8859-7)"
msgstr "Griego (ISO-8859-7)"
-#: src/prefs_send.c:276
+#: src/prefs_send.c:280
msgid "Hebrew (ISO-8859-8)"
msgstr "Hebreo (ISO-8859-8)"
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
msgid "Hebrew (Windows-1255)"
msgstr "Hebreo (Windows-1255)"
-#: src/prefs_send.c:279
+#: src/prefs_send.c:283
msgid "Arabic (ISO-8859-6)"
msgstr "Arábigo (ISO-8859-6)"
-#: src/prefs_send.c:280
+#: src/prefs_send.c:284
msgid "Arabic (Windows-1256)"
msgstr "Arábigo (Windows-1256)"
-#: src/prefs_send.c:282
+#: src/prefs_send.c:286
msgid "Turkish (ISO-8859-9)"
msgstr "Turco (ISO-8859-9)"
-#: src/prefs_send.c:284
+#: src/prefs_send.c:288
msgid "Cyrillic (ISO-8859-5)"
msgstr "Cirílico (ISO-8859-5)"
-#: src/prefs_send.c:285
+#: src/prefs_send.c:289
msgid "Cyrillic (KOI8-R)"
msgstr "Cirílico (KOI8-R)"
-#: src/prefs_send.c:286
+#: src/prefs_send.c:290
msgid "Cyrillic (X-MAC-CYRILLIC)"
msgstr "Cirílico (X-MAC-CYRILLIC)"
-#: src/prefs_send.c:287
+#: src/prefs_send.c:291
msgid "Cyrillic (KOI8-U)"
msgstr "Cirílico (KOI8-U)"
-#: src/prefs_send.c:288
+#: src/prefs_send.c:292
msgid "Cyrillic (Windows-1251)"
msgstr "Cirílico (Windows-1251)"
-#: src/prefs_send.c:290
+#: src/prefs_send.c:294
msgid "Japanese (ISO-2022-JP)"
msgstr "Japonés (ISO-2022-JP)"
-#: src/prefs_send.c:292
+#: src/prefs_send.c:296
msgid "Japanese (EUC-JP)"
msgstr "Japonés (EUC-JP)"
-#: src/prefs_send.c:293
+#: src/prefs_send.c:297
msgid "Japanese (Shift_JIS)"
msgstr "Japonés (Shift_JIS)"
-#: src/prefs_send.c:296
+#: src/prefs_send.c:300
msgid "Simplified Chinese (GB18030)"
msgstr "Chino simplificado (GB18030)"
-#: src/prefs_send.c:297
+#: src/prefs_send.c:301
msgid "Simplified Chinese (GB2312)"
msgstr "Chino simplificado (GB2312)"
-#: src/prefs_send.c:298
+#: src/prefs_send.c:302
msgid "Simplified Chinese (GBK)"
msgstr "Chino simplificado (GBK)"
-#: src/prefs_send.c:299
+#: src/prefs_send.c:303
msgid "Traditional Chinese (Big5)"
msgstr "Chino tradicional (Big5)"
-#: src/prefs_send.c:301
+#: src/prefs_send.c:305
msgid "Traditional Chinese (EUC-TW)"
msgstr "Chino tradicional (EUC-TW)"
-#: src/prefs_send.c:302
+#: src/prefs_send.c:306
msgid "Chinese (ISO-2022-CN)"
msgstr "Chino (ISO-2022-CN)"
-#: src/prefs_send.c:305
+#: src/prefs_send.c:309
msgid "Korean (EUC-KR)"
msgstr "Coreano (EUC-KR)"
-#: src/prefs_send.c:307
+#: src/prefs_send.c:311
msgid "Thai (TIS-620)"
msgstr "Tailandés (TIS-620)"
-#: src/prefs_send.c:308
+#: src/prefs_send.c:312
msgid "Thai (Windows-874)"
msgstr "Tailandés (Windows-874)"
-#: src/prefs_send.c:312
+#: src/prefs_send.c:316
msgid "Transfer encoding"
msgstr "Codificación de envío"
-#: src/prefs_send.c:323
+#: src/prefs_send.c:327
msgid ""
"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
"characters"
@@ -17073,8 +17185,8 @@ msgstr ""
"Especificar la codificación de envío (Content-Transfer-Encoding) usada "
"cuando el cuerpo del mensaje contiene caracteres no-ASCII"
-#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:519 src/send_message.c:523
+#: src/send_message.c:528
msgid "Sending"
msgstr "Enviando"
@@ -17126,92 +17238,92 @@ msgstr "Elegir color de los fallos ortográficos. Usar negro para subrayar"
msgid "Spell Checking"
msgstr "Corrección ortográfica"
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161
msgid "the abbreviated weekday name"
msgstr "el día la semana abreviado"
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:162
msgid "the full weekday name"
msgstr "el día de la semana completo"
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:163
msgid "the abbreviated month name"
msgstr "el nombre del mes abreviado"
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:164
msgid "the full month name"
msgstr "el nombre del mes completo"
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:165
msgid "the preferred date and time for the current locale"
msgstr "la fecha y hora preferida para la localización actual"
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:166
msgid "the century number (year/100)"
msgstr "el número de siglo (año/100)"
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:167
msgid "the day of the month as a decimal number"
msgstr "el día del mes como número decimal"
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:168
msgid "the hour as a decimal number using a 24-hour clock"
msgstr "la hora como número usando el reloj de 24 horas"
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:169
msgid "the hour as a decimal number using a 12-hour clock"
msgstr "la hora como número usando el reloj de 12 horas"
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:170
msgid "the day of the year as a decimal number"
msgstr "el día del año como número decimal"
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:171
msgid "the month as a decimal number"
msgstr "el mes como número decimal"
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:172
msgid "the minute as a decimal number"
msgstr "el minuto como número decimal"
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:173
msgid "either AM or PM"
msgstr "AM o PM"
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:174
msgid "the second as a decimal number"
msgstr "el segundo como número decimal"
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:175
msgid "the day of the week as a decimal number"
msgstr "el día de la semana como número decimal"
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:176
msgid "the preferred date for the current locale"
msgstr "la fecha preferida para la localización actual"
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:177
msgid "the last two digits of a year"
msgstr "los dos últimos dígitos del año"
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:178
msgid "the year as a decimal number"
msgstr "el año como número decimal"
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:179
msgid "the time zone or name or abbreviation"
msgstr "zona horaria o nombre o abreviatura"
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
+#: src/prefs_summaries.c:200 src/prefs_summaries.c:248
#: src/prefs_summaries.c:565
msgid "Date format"
msgstr "Formato de fecha"
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:224
msgid "Specifier"
msgstr "Especificador"
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:266
msgid "Example"
msgstr "Ejemplo"
@@ -17340,14 +17452,19 @@ msgid "Date format help"
msgstr "Ayuda del formato de fecha"
#: src/prefs_summaries.c:602
-msgid "Confirm before marking all messages in a folder as read"
-msgstr "Confirmar antes de marcar todos los correos en una carpeta como leídos"
+msgid "Confirm before marking all messages in a folder as read or unread"
+msgstr "Confirmar antes de marcar todos los correos en una carpeta como "
+"leídos o no leídos"
#: src/prefs_summaries.c:605
+msgid "Confirm before overriding color label of messages"
+msgstr "Confirmar antes de sobreescribir el color de los mensajes"
+
+#: src/prefs_summaries.c:608
msgid "Translate header names"
msgstr "Traducir nombres de cabeceras"
-#: src/prefs_summaries.c:607
+#: src/prefs_summaries.c:610
msgid ""
"The display of standard headers (such as 'From:', 'Subject:') will be "
"translated into your language."
@@ -17355,7 +17472,7 @@ msgstr ""
"Las cabeceras estándar mostradas (como «From:», «Subject:») serán traducidas "
"a su idioma."
-#: src/prefs_summaries.c:766
+#: src/prefs_summaries.c:774
msgid "Summaries"
msgstr "Resúmenes"
@@ -17372,38 +17489,50 @@ msgstr ""
"el orden utilizando los botones Arriba/Abajo, o arrastrando los elementos."
#: src/prefs_summary_open.c:109
-msgid "first marked email"
-msgstr "primer correo marcado"
+msgid "oldest marked email"
+msgstr "el correo marcado más antiguo"
#: src/prefs_summary_open.c:110
-msgid "first new email"
-msgstr "primer correo nuevo"
+msgid "oldest new email"
+msgstr "el correo nuevo más antiguo"
#: src/prefs_summary_open.c:111
-msgid "first unread email"
-msgstr "primer correo no leído"
+msgid "oldest unread email"
+msgstr "el correo no leído más antiguo"
#: src/prefs_summary_open.c:112
msgid "last opened email"
-msgstr "último correo abierto"
+msgstr "el último correo abierto"
#: src/prefs_summary_open.c:113
-msgid "last email in the list"
-msgstr "último correo de la lista"
+msgid "newest email in the list"
+msgstr "el correo más reciente de la lista"
#: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "primer correo de la lista"
+msgid "oldest email in the list"
+msgstr "el correo más antiguo de la lista"
+
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr "el correo marcado más reciente"
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr "el correo nuevo más reciente"
-#: src/prefs_summary_open.c:185
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
+msgstr "el correo no leído más reciente"
+
+#: src/prefs_summary_open.c:188
msgid " Selection when entering a folder"
msgstr " Selección al entrar en una carpeta"
-#: src/prefs_summary_open.c:230
+#: src/prefs_summary_open.c:233
msgid "Possible selections"
msgstr "Selecciones posibles"
-#: src/prefs_summary_open.c:265
+#: src/prefs_summary_open.c:268
msgid "Selection on folder opening"
msgstr "Selección al abrir una carpeta"
@@ -17515,11 +17644,11 @@ msgstr "Borrar todas las plantillas"
msgid "Do you really want to delete all the templates?"
msgstr "¿Quiere borrar realmente todas las plantillas?"
-#: src/prefs_template.c:1232
+#: src/prefs_template.c:1233
msgid "Current templates"
msgstr "Plantillas actuales"
-#: src/prefs_template.c:1260
+#: src/prefs_template.c:1261
msgid "Template"
msgstr "Plantilla"
@@ -17669,31 +17798,31 @@ msgstr "Obtener más..."
msgid "Information"
msgstr "Información"
-#: src/prefs_themes.c:997
-msgid "Author: "
-msgstr "Autor: "
+#: src/prefs_themes.c:998
+msgid "Author"
+msgstr "Autor"
-#: src/prefs_themes.c:1005
-msgid "URL:"
-msgstr "URL:"
+#: src/prefs_themes.c:1006
+msgid "URL"
+msgstr "URL"
-#: src/prefs_themes.c:1047
+#: src/prefs_themes.c:1048
msgid "Preview"
msgstr "Apariencia"
-#: src/prefs_themes.c:1103
+#: src/prefs_themes.c:1105
msgid "SVG rendering"
msgstr "Procesamiento de SVG"
-#: src/prefs_themes.c:1110
+#: src/prefs_themes.c:1112
msgid "Enable alpha channel"
msgstr "Habilitar el canal alfa"
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1113
msgid "Force scaling"
msgstr "Forzar escalado"
-#: src/prefs_themes.c:1117
+#: src/prefs_themes.c:1119
msgid "Pixels per inch (PPI)"
msgstr "Píxeles por pulgada (PPP)"
@@ -17713,67 +17842,67 @@ msgstr "El elemento no tiene un icono definido."
msgid "Item has no text defined."
msgstr "El elemento no tiene un texto definido."
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:896
msgid "Toolbar item"
msgstr "Ítem de la barra de herramientas"
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:912
msgid "Item type"
msgstr "Tipo de ítem"
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:922
msgid "Internal Function"
msgstr "Función interna"
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:923
msgid "User Action"
msgstr "Acción de usuario"
-#: src/prefs_toolbar.c:958 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
msgid "Separator"
msgstr "Separador"
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:932
msgid "Event executed on click"
msgstr "Evento ejecutado al pulsar"
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:959
msgid "Toolbar text"
msgstr "Texto asociado"
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
msgid "Icon"
msgstr "Icono"
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1010
msgid "A_dd"
msgstr "Aña_dir"
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
msgid "Toolbars"
msgstr "Barras de herramientas"
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1231
msgid "Main Window"
msgstr "Ventana principal"
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1245
msgid "Message Window"
msgstr "Ventana de mensaje"
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1259
msgid "Compose Window"
msgstr "Ventana de composición"
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1374
msgid "Icon text"
msgstr "Texto del icono"
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1383
msgid "Mapped event"
msgstr "Evento mapeado"
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1690
msgid "Toolbar item icon"
msgstr "Icono de ítem de herramientas"
@@ -17801,35 +17930,35 @@ msgstr "Recortar texto a"
msgid "Wrapping"
msgstr "Recorte de líneas"
-#: src/printing.c:436
+#: src/printing.c:434
msgid "Print preview"
msgstr "Previsualizar impresión"
-#: src/printing.c:479
+#: src/printing.c:477
msgid "First page"
msgstr "Primera página"
-#: src/printing.c:489
+#: src/printing.c:487
msgid "Last page"
msgstr "Última página"
-#: src/printing.c:495
+#: src/printing.c:493
msgid "Zoom 100%"
msgstr "Aumento 100%"
-#: src/printing.c:497
+#: src/printing.c:495
msgid "Zoom fit"
msgstr "Aumento ajustado"
-#: src/printing.c:499
+#: src/printing.c:497
msgid "Zoom in"
msgstr "Aumentar"
-#: src/printing.c:501
+#: src/printing.c:499
msgid "Zoom out"
msgstr "Disminuir"
-#: src/printing.c:700
+#: src/printing.c:698
#, c-format
msgid "Page %d"
msgstr "Página %d"
@@ -17842,7 +17971,7 @@ msgstr "No hay información disponible"
msgid "No recipient keys defined."
msgstr "No se definió ninguna clave para el destinatario."
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:438 src/procmime.c:440 src/procmime.c:441
msgid "[Error decoding BASE64]\n"
msgstr "[Error decodificando BASE64]\n"
@@ -18203,97 +18332,97 @@ msgstr "El campo «Marca de cita» de la plantilla «Responder» es inválido."
msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
msgstr "El campo «Marca de cita» de la plantilla «Reenviar» es inválido."
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:543
#, c-format
msgid "Enter text to replace '%s'"
msgstr "Introducir texto para sustituir «%s»"
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:544
msgid "Enter variable"
msgstr "Introducir variable"
-#: src/send_message.c:152
+#: src/send_message.c:153
#, c-format
msgid "Sending message using command: %s\n"
msgstr "Enviando mensaje usando la orden: %s\n"
-#: src/send_message.c:166
+#: src/send_message.c:167
#, c-format
msgid "Couldn't execute command: %s"
msgstr "No se pudo ejecutar la orden: %s"
-#: src/send_message.c:202
+#: src/send_message.c:203
#, c-format
msgid "Error occurred while executing command: %s"
msgstr "Ha habido un error ejecutando la orden: %s"
-#: src/send_message.c:350
+#: src/send_message.c:352
msgid "Connecting"
msgstr "Conectando"
-#: src/send_message.c:355
+#: src/send_message.c:357
msgid "Doing POP before SMTP..."
msgstr "Haciendo POP antes de SMTP..."
-#: src/send_message.c:358
+#: src/send_message.c:360
msgid "POP before SMTP"
msgstr "POP antes de SMTP"
-#: src/send_message.c:363
+#: src/send_message.c:365
#, c-format
msgid "Account '%s': Connecting to SMTP server: %s:%d..."
msgstr "Cuenta «%s»: Conectando al servidor SMTP: %s:%d..."
-#: src/send_message.c:420
+#: src/send_message.c:438
msgid "Mail sent successfully."
msgstr "Correo enviado con éxito."
-#: src/send_message.c:486
+#: src/send_message.c:504
msgid "Sending HELO..."
msgstr "Enviando HELO..."
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:505 src/send_message.c:510 src/send_message.c:515
msgid "Authenticating"
msgstr "Autenticándose"
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:506 src/send_message.c:511
msgid "Sending message..."
msgstr "Enviando mensaje..."
-#: src/send_message.c:491
+#: src/send_message.c:509
msgid "Sending EHLO..."
msgstr "Enviando EHLO..."
-#: src/send_message.c:500
+#: src/send_message.c:518
msgid "Sending MAIL FROM..."
msgstr "Enviando MAIL FROM..."
-#: src/send_message.c:504
+#: src/send_message.c:522
msgid "Sending RCPT TO..."
msgstr "Enviando RCPT TO..."
-#: src/send_message.c:509
+#: src/send_message.c:527
msgid "Sending DATA..."
msgstr "Enviando DATA..."
-#: src/send_message.c:513
+#: src/send_message.c:531
msgid "Quitting..."
msgstr "Saliendo..."
-#: src/send_message.c:542
+#: src/send_message.c:560
#, c-format
msgid "Sending message (%d / %d bytes)"
msgstr "Enviando mensaje (%d / %d bytes)"
-#: src/send_message.c:595
+#: src/send_message.c:613
msgid "Sending message"
msgstr "Enviando mensaje"
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:682 src/send_message.c:702
msgid "Error occurred while sending the message."
msgstr "Ocurrió un error enviando los mensajes."
-#: src/send_message.c:667
+#: src/send_message.c:685
#, c-format
msgid ""
"Error occurred while sending the message:\n"
@@ -18331,333 +18460,333 @@ msgstr "%s - Fuente"
msgid "Saved SSL/TLS certificates"
msgstr "Certificados SSL/TLS guardados"
-#: src/ssl_manager.c:410
+#: src/ssl_manager.c:406
msgid "Delete certificate"
msgstr "Eliminar certificado"
-#: src/ssl_manager.c:411
+#: src/ssl_manager.c:407
msgid "Do you really want to delete this certificate?"
msgstr "¿Quiere borrar realmente este certificado?"
-#: src/summary_search.c:305
+#: src/summary_search.c:292
msgid "Search messages"
msgstr "Buscar en los mensajes"
-#: src/summary_search.c:327
+#: src/summary_search.c:314
msgid "Match any of the following"
msgstr "Coincidir con alguno de los siguientes"
-#: src/summary_search.c:329
+#: src/summary_search.c:316
msgid "Match all of the following"
msgstr "Coincidir con todos los siguientes"
-#: src/summary_search.c:495
+#: src/summary_search.c:437
msgid "Body:"
msgstr "Cuerpo:"
-#: src/summary_search.c:502
+#: src/summary_search.c:444
msgid "Condition:"
msgstr "Condición:"
-#: src/summary_search.c:536
+#: src/summary_search.c:478
msgid "Find _all"
msgstr "Encontrar _todos"
-#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#: src/summary_search.c:693 src/summaryview.c:1092 src/summaryview.c:1354
#, c-format
msgid "Searching in %s... \n"
msgstr "Buscando en %s...\n"
-#: src/summary_search.c:846
+#: src/summary_search.c:788
msgid "Beginning of list reached; continue from end?"
msgstr "Se llegó al principio de la lista, ¿seguir desde el final?"
-#: src/summary_search.c:848
+#: src/summary_search.c:790
msgid "End of list reached; continue from beginning?"
msgstr "Se terminó la lista, ¿comenzar desde el principio?"
-#: src/summaryview.c:432
+#: src/summaryview.c:434
msgid "Create _filter rule"
msgstr "Crear regla de _filtrado"
-#: src/summaryview.c:560
+#: src/summaryview.c:562
msgid "Toggle quick search bar"
msgstr "Conmutar barra de búsqueda rápida"
-#: src/summaryview.c:597
+#: src/summaryview.c:599
msgid "Toggle multiple selection"
msgstr "Commutar la selección múltiple"
-#: src/summaryview.c:1280
+#: src/summaryview.c:1282
msgid "Process mark"
msgstr "Procesar marcas"
-#: src/summaryview.c:1281
+#: src/summaryview.c:1283
msgid "Some marks are left. Process them?"
msgstr "Quedan algunas marcas. ¿Procesarlas?"
-#: src/summaryview.c:1331
+#: src/summaryview.c:1333
#, c-format
msgid "Scanning folder (%s)..."
msgstr "Revisando carpeta (%s)..."
-#: src/summaryview.c:1883 src/summaryview.c:1931
+#: src/summaryview.c:1913 src/summaryview.c:1961
msgid "No more unread messages"
msgstr "No hay más mensajes sin leer"
-#: src/summaryview.c:1884
+#: src/summaryview.c:1914
msgid "No unread message found. Search from the end?"
msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
-#: src/summaryview.c:1896 src/summaryview.c:1944 src/summaryview.c:1981
-#: src/summaryview.c:2029 src/summaryview.c:2096
+#: src/summaryview.c:1926 src/summaryview.c:1974 src/summaryview.c:2011
+#: src/summaryview.c:2059 src/summaryview.c:2126
msgid ""
"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
msgstr ""
"Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
-#: src/summaryview.c:1908
+#: src/summaryview.c:1938
msgid "No unread messages."
msgstr "No hay mensajes sin leer."
-#: src/summaryview.c:1932
+#: src/summaryview.c:1962
msgid "No unread message found. Go to next folder?"
msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
-#: src/summaryview.c:1968 src/summaryview.c:2016
+#: src/summaryview.c:1998 src/summaryview.c:2046
msgid "No more new messages"
msgstr "No hay más mensajes nuevos"
-#: src/summaryview.c:1969
+#: src/summaryview.c:1999
msgid "No new message found. Search from the end?"
msgstr "No hay mensajes nuevos. ¿Buscar desde el final?"
-#: src/summaryview.c:1993
+#: src/summaryview.c:2023
msgid "No new messages."
msgstr "No hay mensajes nuevos."
-#: src/summaryview.c:2017
+#: src/summaryview.c:2047
msgid "No new message found. Go to next folder?"
msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
-#: src/summaryview.c:2050 src/summaryview.c:2083
+#: src/summaryview.c:2080 src/summaryview.c:2113
msgid "No more marked messages"
msgstr "No hay más mensajes marcados"
-#: src/summaryview.c:2051
+#: src/summaryview.c:2081
msgid "No marked message found. Search from the end?"
msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
-#: src/summaryview.c:2060
+#: src/summaryview.c:2090
msgid "No marked messages."
msgstr "No hay mensajes marcados."
-#: src/summaryview.c:2084
+#: src/summaryview.c:2114
msgid "No marked message found. Go to next folder?"
msgstr "No hay mensajes marcados. ¿Ir a la carpeta siguiente?"
-#: src/summaryview.c:2117 src/summaryview.c:2146
+#: src/summaryview.c:2147 src/summaryview.c:2176
msgid "No more labeled messages"
msgstr "No hay más mensajes etiquetados"
-#: src/summaryview.c:2118
+#: src/summaryview.c:2148
msgid "No labeled message found. Search from the end?"
msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
-#: src/summaryview.c:2127 src/summaryview.c:2160
+#: src/summaryview.c:2157 src/summaryview.c:2190
msgid "No labeled messages."
msgstr "No hay mensajes etiquetados."
-#: src/summaryview.c:2147
+#: src/summaryview.c:2177
msgid "No labeled message found. Search from the beginning?"
msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
-#: src/summaryview.c:2464
+#: src/summaryview.c:2494
msgid "Attracting messages by subject..."
msgstr "Agrupando mensajes por el asunto..."
-#: src/summaryview.c:2649
+#: src/summaryview.c:2679
#, c-format
msgid "%d deleted"
msgstr "%d borrado(s)"
-#: src/summaryview.c:2653
+#: src/summaryview.c:2683
#, c-format
msgid "%s%d moved"
msgstr "%s%d movidos"
-#: src/summaryview.c:2654 src/summaryview.c:2661
+#: src/summaryview.c:2684 src/summaryview.c:2691
msgid ", "
msgstr ", "
-#: src/summaryview.c:2659
+#: src/summaryview.c:2689
#, c-format
msgid "%s%d copied"
msgstr "%s%d copiado"
-#: src/summaryview.c:2673
+#: src/summaryview.c:2703
msgid " item selected"
msgid_plural " items selected"
msgstr[0] " elemento seleccionado"
msgstr[1] " elementos seleccionados"
-#: src/summaryview.c:2691 src/summaryview.c:2734
+#: src/summaryview.c:2721 src/summaryview.c:2764
#, c-format
msgid "%d new, %d unread, %d total (%s)"
msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
-#: src/summaryview.c:2709
+#: src/summaryview.c:2739
msgid "Message summary"
msgstr "Resumen de mensajes"
-#: src/summaryview.c:2710
+#: src/summaryview.c:2740
msgid "New:"
msgstr "Nuevos:"
-#: src/summaryview.c:2711
+#: src/summaryview.c:2741
msgid "Unread:"
msgstr "Sin leer:"
-#: src/summaryview.c:2712
+#: src/summaryview.c:2742
msgid "Total:"
msgstr "Total:"
-#: src/summaryview.c:2714
+#: src/summaryview.c:2744
msgid "Marked:"
msgstr "Marcados:"
-#: src/summaryview.c:2715
+#: src/summaryview.c:2745
msgid "Replied:"
msgstr "Respondidos:"
-#: src/summaryview.c:2716
+#: src/summaryview.c:2746
msgid "Forwarded:"
msgstr "Reenviados:"
-#: src/summaryview.c:2717
+#: src/summaryview.c:2747
msgid "Locked:"
msgstr "Bloqueados:"
-#: src/summaryview.c:2718
+#: src/summaryview.c:2748
msgid "Ignored:"
msgstr "ignorados:"
-#: src/summaryview.c:2719
+#: src/summaryview.c:2749
msgid "Watched:"
msgstr "Observados:"
-#: src/summaryview.c:2729
+#: src/summaryview.c:2759
#, c-format
msgid "%d/%d selected (%s/%s), %d unread"
msgstr "%d/%d seleccionados (%s/%s), %d sin leer"
-#: src/summaryview.c:3022
+#: src/summaryview.c:3052
msgid "Sorting summary..."
msgstr "Ordenando el resumen..."
-#: src/summaryview.c:3190
+#: src/summaryview.c:3220
msgid "Setting summary from message data..."
msgstr "Estableciendo el resumen de los mensajes..."
-#: src/summaryview.c:3395
+#: src/summaryview.c:3425
msgid "(No Date)"
msgstr "(Sin fecha)"
-#: src/summaryview.c:3447
+#: src/summaryview.c:3482
msgid "(No Recipient)"
msgstr "(Sin destinatario)"
-#: src/summaryview.c:3482
+#: src/summaryview.c:3530
#, c-format
msgid "From: %s, on %s"
msgstr "Desde: %s, en %s"
-#: src/summaryview.c:3491
+#: src/summaryview.c:3539
#, c-format
msgid "To: %s, on %s"
msgstr "Para: %s, en %s"
-#: src/summaryview.c:4356
-msgid "You're not the author of the article.\n"
-msgstr "Usted no es el autor del artículo.\n"
+#: src/summaryview.c:4428
+msgid "You're not the author of the article."
+msgstr "Usted no es el autor del artículo."
-#: src/summaryview.c:4446
+#: src/summaryview.c:4518
#, c-format
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the %d selected messages?"
msgstr[0] "¿Quiere borrar realmente el mensaje seleccionado?"
msgstr[1] "¿Quiere borrar realmente los %d mensajes seleccionados?"
-#: src/summaryview.c:4449
+#: src/summaryview.c:4521
msgid "Delete message"
msgid_plural "Delete messages"
msgstr[0] "Borrar mensaje"
msgstr[1] "Borrar mensajes"
-#: src/summaryview.c:4613
+#: src/summaryview.c:4685
msgid "Destination is same as current folder."
msgstr "El destino es el mismo que la carpeta actual."
-#: src/summaryview.c:4668
+#: src/summaryview.c:4740
msgid "Select folder to move selected message to"
msgid_plural "Select folder to move selected messages to"
msgstr[0] "Seleccionar la carpeta a la que mover el mensaje seleccionado"
msgstr[1] "Seleccionar la carpeta a la que mover los mensajes seleccionados"
-#: src/summaryview.c:4719
+#: src/summaryview.c:4791
msgid "Destination to copy is same as current folder."
msgstr "El destino de copia es la carpeta actual."
-#: src/summaryview.c:4753
+#: src/summaryview.c:4825
msgid "Select folder to copy selected message to"
msgid_plural "Select folder to copy selected messages to"
msgstr[0] "Seleccionar la carpeta a la que copiar el mensaje seleccionado"
msgstr[1] "Seleccionar la carpeta a la que copiar los mensajes seleccionados"
-#: src/summaryview.c:4889
+#: src/summaryview.c:4976
msgid "Append or Overwrite"
msgstr "Añadir o sobreescribir"
-#: src/summaryview.c:4890
+#: src/summaryview.c:4977
msgid "Append or overwrite existing file?"
msgstr "¿Añadir o sobreescribir el fichero existente?"
-#: src/summaryview.c:4891
+#: src/summaryview.c:4978
msgid "_Append"
msgstr "_Añadir"
-#: src/summaryview.c:4891
+#: src/summaryview.c:4978
msgid "_Overwrite"
msgstr "S_obreescribir"
-#: src/summaryview.c:4932
+#: src/summaryview.c:5019
#, c-format
msgid ""
"You are about to print %d messages, one by one. Do you want to continue?"
msgstr "Está a punto de imprimir %d mensajes, uno a uno. ¿Desea continuar?"
-#: src/summaryview.c:5390
+#: src/summaryview.c:5477
msgid "Building threads..."
msgstr "Construyendo jerarquía..."
-#: src/summaryview.c:5638
+#: src/summaryview.c:5725
msgid "Skip these rules"
msgstr "Saltarse estas reglas"
-#: src/summaryview.c:5641
+#: src/summaryview.c:5728
msgid "Apply these rules regardless of the account they belong to"
msgstr ""
"Aplicar estas reglas independientemente de la cuenta a la que pertenecen"
-#: src/summaryview.c:5644
+#: src/summaryview.c:5731
msgid "Apply these rules if they apply to the current account"
msgstr "Aplicar estas reglas si se aplican a la cuenta actual"
-#: src/summaryview.c:5673
+#: src/summaryview.c:5760
msgid "Filtering"
msgstr "Filtrando"
-#: src/summaryview.c:5674
+#: src/summaryview.c:5761
msgid ""
"There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"
@@ -18665,55 +18794,69 @@ msgstr ""
"Hay ciertas reglas de filtrado que pertenecen a una cuenta.\n"
"Por favor seleccione que quiere hacer con ellas:"
-#: src/summaryview.c:5704
+#: src/summaryview.c:5792
msgid "Filtering..."
msgstr "Filtrando..."
-#: src/summaryview.c:5783
+#: src/summaryview.c:5871
msgid "Processing configuration"
msgstr "Configuración de procesamiento"
-#: src/summaryview.c:6329
+#: src/summaryview.c:6019
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr "¿Quiere reiniciar realmente el color de todos los mensajes "
+"seleccionados?"
+
+#: src/summaryview.c:6021
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr "¿Quiere aplicar este color realmente a todos los mensajes "
+"seleccionados?"
+
+#: src/summaryview.c:6022
+msgid "Set color label"
+msgstr "Establecer color"
+
+#: src/summaryview.c:6465
msgid "Ignored thread"
msgstr "Hilo ignorado"
-#: src/summaryview.c:6331
+#: src/summaryview.c:6467
msgid "Watched thread"
msgstr "Hilo observado"
-#: src/summaryview.c:6339
+#: src/summaryview.c:6475
msgid "Replied but also forwarded - click to see reply"
msgstr "Respondido y también reenviado - pulse para ver la respuesta"
-#: src/summaryview.c:6341
+#: src/summaryview.c:6477
msgid "Replied - click to see reply"
msgstr "Respondido - pulse para ver la respuesta"
-#: src/summaryview.c:6353
+#: src/summaryview.c:6489
msgid "To be moved"
msgstr "Será movido"
-#: src/summaryview.c:6355
+#: src/summaryview.c:6491
msgid "To be copied"
msgstr "Será copiado"
-#: src/summaryview.c:6367
+#: src/summaryview.c:6503
msgid "Signed, has attachment(s)"
msgstr "Firmado, tiene adjunto(s)"
-#: src/summaryview.c:6371
+#: src/summaryview.c:6507
msgid "Encrypted, has attachment(s)"
msgstr "Cifrado, tiene adjunto(s)"
-#: src/summaryview.c:6373
+#: src/summaryview.c:6509
msgid "Encrypted"
msgstr "Cifrado"
-#: src/summaryview.c:6375
+#: src/summaryview.c:6511
msgid "Has attachment(s)"
msgstr "Tiene adjunto(s)"
-#: src/summaryview.c:8046
+#: src/summaryview.c:8182
#, c-format
msgid ""
"Regular expression (regexp) error:\n"
@@ -18722,11 +18865,11 @@ msgstr ""
"Error en la expresión regular (regexp):\n"
"%s"
-#: src/summaryview.c:8149
+#: src/summaryview.c:8285
msgid "Go back to the folder list (You have unread messages)"
msgstr "Volver a la lista de carpetas (tiene mensajes sin leer)"
-#: src/summaryview.c:8154
+#: src/summaryview.c:8290
msgid "Go back to the folder list"
msgstr "Volver a la lista de carpetas"
@@ -18790,61 +18933,61 @@ msgstr "«Traza de red»"
msgid " in the Tools menu for more information."
msgstr " en el menú Herramientas para más información."
-#: src/textview.c:986
+#: src/textview.c:989
msgid " The following can be performed on this part\n"
msgstr " Puede efectuar las siguientes acciones en esta parte haciendo\n"
-#: src/textview.c:988
+#: src/textview.c:991
msgid " by right-clicking the icon or list item:"
msgstr " clic con el botón derecho en el icono o elemento de la lista:"
-#: src/textview.c:992
+#: src/textview.c:995
msgid " - To save, select "
msgstr " - Para guardar, seleccione "
-#: src/textview.c:993
+#: src/textview.c:996
msgid "'Save as...'"
msgstr "«Guardar como...»"
# NOTE: closing quote is within and untranslated string
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:998 src/textview.c:1010 src/textview.c:1022
+#: src/textview.c:1032
msgid " (Shortcut key: '"
msgstr " (Atajo de teclado: ')"
-#: src/textview.c:1003
+#: src/textview.c:1006
msgid " - To display as text, select "
msgstr " - Para mostrar como texto, seleccione "
-#: src/textview.c:1004
+#: src/textview.c:1007
msgid "'Display as text'"
msgstr "«Mostrar como texto»"
-#: src/textview.c:1015
+#: src/textview.c:1018
msgid " - To open with an external program, select "
msgstr " - Para abrir con un programa externo, seleccione "
-#: src/textview.c:1016
+#: src/textview.c:1019
msgid "'Open'"
msgstr "«Abrir»"
-#: src/textview.c:1024
+#: src/textview.c:1027
msgid " (alternately double-click, or click the middle "
msgstr " (alternativamente doble clic, o clic con el botón "
-#: src/textview.c:1025
+#: src/textview.c:1028
msgid "mouse button)\n"
msgstr "central del ratón)\n"
-#: src/textview.c:1027
+#: src/textview.c:1030
msgid " - Or use "
msgstr " - O utilice"
-#: src/textview.c:1028
+#: src/textview.c:1031
msgid "'Open with...'"
msgstr "«Abrir con...»"
-#: src/textview.c:1147
+#: src/textview.c:1152
#, c-format
msgid ""
"The command to view attachment as text failed:\n"
@@ -18855,47 +18998,47 @@ msgstr ""
" %s\n"
"Código de salida %d\n"
-#: src/textview.c:2206
+#: src/textview.c:2228
msgid "Tags: "
msgstr "Etiquetas: "
-#: src/textview.c:2914
+#: src/textview.c:2947
msgid "The real URL is different from the displayed URL."
msgstr "La URL real es distinta de la URL mostrada."
-#: src/textview.c:2915
+#: src/textview.c:2948
msgid "Displayed URL:"
msgstr "URL mostrada:"
-#: src/textview.c:2916
+#: src/textview.c:2949
msgid "Real URL:"
msgstr "URL real:"
-#: src/textview.c:2917
+#: src/textview.c:2950
msgid "Open it anyway?"
msgstr "¿Abrirla de todas formas?"
-#: src/textview.c:2918
+#: src/textview.c:2951
msgid "Phishing attempt warning"
msgstr "Aviso de intento de «phishing»"
-#: src/textview.c:2919
+#: src/textview.c:2952
msgid "_Open URL"
msgstr "_Abrir URL"
-#: src/toolbar.c:224 src/toolbar.c:2291
+#: src/toolbar.c:224 src/toolbar.c:2294
msgid "Receive Mail from all Accounts"
msgstr "Recibir correo para todas las cuentas"
-#: src/toolbar.c:225 src/toolbar.c:2296
+#: src/toolbar.c:225 src/toolbar.c:2299
msgid "Receive Mail from current Account"
msgstr "Recibir correo para la cuenta actual"
-#: src/toolbar.c:226 src/toolbar.c:2300
+#: src/toolbar.c:226 src/toolbar.c:2303
msgid "Send Queued Messages"
msgstr "Enviar mensajes en la cola"
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
msgid "Compose Email"
msgstr "Componer correo"
@@ -18903,35 +19046,35 @@ msgstr "Componer correo"
msgid "Compose News"
msgstr "Componer noticia"
-#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
msgid "Reply to Message"
msgstr "Responder al mensaje"
-#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
msgid "Reply to Sender"
msgstr "Responder al remitente"
-#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
msgid "Reply to All"
msgstr "Responder a todos"
-#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
msgid "Reply to Mailing-list"
msgstr "Responder a la lista de correo"
-#: src/toolbar.c:233 src/toolbar.c:2312
+#: src/toolbar.c:233 src/toolbar.c:2315
msgid "Open email"
msgstr "Abrir correo"
-#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
msgid "Forward Message"
msgstr "Reenviar mensaje"
-#: src/toolbar.c:235 src/toolbar.c:2457
+#: src/toolbar.c:235 src/toolbar.c:2460
msgid "Trash Message"
msgstr "Mensaje a la papelera"
-#: src/toolbar.c:236 src/toolbar.c:2461
+#: src/toolbar.c:236 src/toolbar.c:2464
msgid "Delete Message"
msgstr "Borrar mensaje"
@@ -18939,11 +19082,11 @@ msgstr "Borrar mensaje"
msgid "Delete duplicate messages"
msgstr "Borrar los mensajes duplicados"
-#: src/toolbar.c:239 src/toolbar.c:2469
+#: src/toolbar.c:239 src/toolbar.c:2472
msgid "Go to Previous Unread Message"
msgstr "Ir al mensaje anterior no leído"
-#: src/toolbar.c:240 src/toolbar.c:2473
+#: src/toolbar.c:240 src/toolbar.c:2476
msgid "Go to Next Unread Message"
msgstr "Ir al mensaje siguiente no leído"
@@ -18991,55 +19134,55 @@ msgstr "Aprender correo basura o bueno"
msgid "Open folder/Go to folder list"
msgstr "Abrir carpeta/Ir a la lista de carpetas"
-#: src/toolbar.c:258 src/toolbar.c:2479
+#: src/toolbar.c:258 src/toolbar.c:2482
msgid "Send Message"
msgstr "Enviar mensaje"
-#: src/toolbar.c:259 src/toolbar.c:2483
+#: src/toolbar.c:259 src/toolbar.c:2486
msgid "Put into queue folder and send later"
msgstr "Poner en la cola y enviar después"
-#: src/toolbar.c:260 src/toolbar.c:2487
+#: src/toolbar.c:260 src/toolbar.c:2490
msgid "Save to draft folder"
msgstr "Guardar como borrador"
-#: src/toolbar.c:261 src/toolbar.c:2491
+#: src/toolbar.c:261 src/toolbar.c:2494
msgid "Insert file"
msgstr "Insertar fichero"
-#: src/toolbar.c:262 src/toolbar.c:2495
+#: src/toolbar.c:262 src/toolbar.c:2498
msgid "Attach file"
msgstr "Adjuntar fichero"
-#: src/toolbar.c:263 src/toolbar.c:2499
+#: src/toolbar.c:263 src/toolbar.c:2502
msgid "Insert signature"
msgstr "Insertar firma"
-#: src/toolbar.c:264 src/toolbar.c:2503
+#: src/toolbar.c:264 src/toolbar.c:2506
msgid "Replace signature"
msgstr "Reemplazar firma"
-#: src/toolbar.c:265 src/toolbar.c:2507
+#: src/toolbar.c:265 src/toolbar.c:2510
msgid "Edit with external editor"
msgstr "Editar con un editor externo"
-#: src/toolbar.c:266 src/toolbar.c:2511
+#: src/toolbar.c:266 src/toolbar.c:2514
msgid "Wrap long lines of current paragraph"
msgstr "Cortar líneas largas del párrafo actual"
-#: src/toolbar.c:267 src/toolbar.c:2515
+#: src/toolbar.c:267 src/toolbar.c:2518
msgid "Wrap all long lines"
msgstr "Cortar todas las líneas largas"
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
msgid "Check spelling"
msgstr "Verificar ortografía"
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
msgid "Sign"
msgstr "Firmar"
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
msgid "Encrypt"
msgstr "Cifrar"
@@ -19047,15 +19190,15 @@ msgstr "Cifrar"
msgid "Claws Mail Actions Feature"
msgstr "Acciones de Claws Mail"
-#: src/toolbar.c:275 src/toolbar.c:2556
+#: src/toolbar.c:275 src/toolbar.c:2559
msgid "Cancel receiving"
msgstr "Cancelar recepción"
-#: src/toolbar.c:277 src/toolbar.c:2564
+#: src/toolbar.c:277 src/toolbar.c:2567
msgid "Cancel receiving/sending"
msgstr "Cancelar recepción/envío"
-#: src/toolbar.c:278 src/toolbar.c:2304
+#: src/toolbar.c:278 src/toolbar.c:2307
msgid "Close window"
msgstr "Cerrar ventana"
@@ -19094,7 +19237,7 @@ msgstr "Todo"
msgid "List"
msgstr "Lista"
-#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
msgid "Delete duplicates"
msgstr "Borrar duplicados"
@@ -19186,71 +19329,71 @@ msgstr "El mensaje se cifrará"
msgid "Message will not be encrypted"
msgstr "El mensaje no se cifrará"
-#: src/toolbar.c:2286
+#: src/toolbar.c:2289
msgid "Go to folder list"
msgstr "Ir a la lista de carpetas"
-#: src/toolbar.c:2292
+#: src/toolbar.c:2295
msgid "Receive Mail from selected Account"
msgstr "Recibir correo para la cuenta seleccionada"
-#: src/toolbar.c:2308
+#: src/toolbar.c:2311
msgid "Open preferences"
msgstr "Abrir preferencias"
-#: src/toolbar.c:2319
+#: src/toolbar.c:2322
msgid "Compose with selected Account"
msgstr "Componer correo con la cuenta seleccionada"
-#: src/toolbar.c:2340
+#: src/toolbar.c:2343
msgid "Learn as..."
msgstr "Aprender como..."
-#: src/toolbar.c:2350
+#: src/toolbar.c:2353
msgid "Learn as _Spam"
msgstr "Aprender como correo basura"
-#: src/toolbar.c:2351
+#: src/toolbar.c:2354
msgid "Learn as _Ham"
msgstr "Aprender como bueno"
-#: src/toolbar.c:2358
+#: src/toolbar.c:2361
msgid "Delete duplicates options"
msgstr "Opciones de borrado de duplicados"
-#: src/toolbar.c:2362
+#: src/toolbar.c:2365
msgid "Delete duplicates in selected folder"
msgstr "Borrar duplicados en la carpeta seleccionada"
-#: src/toolbar.c:2363
+#: src/toolbar.c:2366
msgid "Delete duplicates in all folders"
msgstr "Borrar duplicados en todas las carpetas"
-#: src/toolbar.c:2374
+#: src/toolbar.c:2377
msgid "Reply to Message options"
msgstr "Opciones de responder al mensaje"
-#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
msgid "_Reply with quote"
msgstr "Responder con _cita"
-#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
msgid "Reply without _quote"
msgstr "_Responder sin cita"
-#: src/toolbar.c:2391
+#: src/toolbar.c:2394
msgid "Reply to Sender options"
msgstr "Opciones de responder al remitente"
-#: src/toolbar.c:2408
+#: src/toolbar.c:2411
msgid "Reply to All options"
msgstr "Opciones de responder a todos"
-#: src/toolbar.c:2425
+#: src/toolbar.c:2428
msgid "Reply to Mailing-list options"
msgstr "Opciones de responder a la lista de correo"
-#: src/toolbar.c:2442
+#: src/toolbar.c:2445
msgid "Forward Message options"
msgstr "Opciones de reenviar mensaje"
@@ -19275,12 +19418,12 @@ msgstr "Por favor seleccione la URL a abrir."
msgid "Select All"
msgstr "Seleccionar todo"
-#: src/wizard.c:521
+#: src/wizard.c:522
msgctxt "Welcome Mail Subject"
msgid "Welcome to Claws Mail"
msgstr "Bienvenido a Claws Mail"
-#: src/wizard.c:544
+#: src/wizard.c:545
#, c-format
msgid ""
"\n"
@@ -19372,47 +19515,47 @@ msgstr ""
"hacerlo en «%s».\n"
"\n"
-#: src/wizard.c:619
+#: src/wizard.c:620
msgid "Please enter the mailbox name."
msgstr "Por favor introduzca el nombre del buzón."
-#: src/wizard.c:647
+#: src/wizard.c:648
msgid "Please enter your name and email address."
msgstr "Por favor introduzca su nombre y dirección de correo."
-#: src/wizard.c:658
+#: src/wizard.c:659
msgid "Please enter your receiving server and username."
msgstr "Por favor introduzca su servidor de recepción y nombre de usuario."
-#: src/wizard.c:668
+#: src/wizard.c:669
msgid "Please enter your username."
msgstr "Por favor introduzca su nombre de usuario."
-#: src/wizard.c:678
+#: src/wizard.c:679
msgid "Please enter your SMTP server."
msgstr "Por favor introduzca su servidor SMTP."
-#: src/wizard.c:689
+#: src/wizard.c:690
msgid "Please enter your SMTP username."
msgstr "Por favor introduzca su nombre de usuario SMTP."
-#: src/wizard.c:974
+#: src/wizard.c:975
msgid "Your name:"
msgstr "Su nombre:"
-#: src/wizard.c:985
+#: src/wizard.c:986
msgid "Your email address:"
msgstr "Su dirección de correo:"
-#: src/wizard.c:996
+#: src/wizard.c:997
msgid "Your organization:"
msgstr "Su organización:"
-#: src/wizard.c:1030
+#: src/wizard.c:1031
msgid "Mailbox name:"
msgstr "Nombre del buzón:"
-#: src/wizard.c:1038
+#: src/wizard.c:1039
msgid ""
"You can also specify an absolute path, for example: \"/home/john/Documents/"
"Mail\""
@@ -19420,7 +19563,7 @@ msgstr ""
"Puede especificar también una ruta absoluta, por ejemplo: «/home/usuario/"
"Documentos/Correo»"
-#: src/wizard.c:1109
+#: src/wizard.c:1110
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:25\""
@@ -19428,55 +19571,51 @@ msgstr ""
"Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
"com:25»"
-#: src/wizard.c:1112
+#: src/wizard.c:1113
msgid "SMTP server address:"
msgstr "Dirección del servidor SMTP:"
-#: src/wizard.c:1118
-msgid "Use authentication"
-msgstr "Usar autenticación"
-
-#: src/wizard.c:1127
+#: src/wizard.c:1128
msgid "(empty to use the same as receive)"
msgstr "(vacío para usar el mismo que en la recepción)"
-#: src/wizard.c:1141
+#: src/wizard.c:1142
msgid "SMTP username:"
msgstr "Usuario SMTP:"
-#: src/wizard.c:1152
+#: src/wizard.c:1153
msgid "SMTP password:"
msgstr "Contraseña SMTP:"
-#: src/wizard.c:1165
+#: src/wizard.c:1166
msgid "Use SSL/TLS to connect to SMTP server"
msgstr "Usar SSL/TLS para conectar al servidor SMTP"
-#: src/wizard.c:1176 src/wizard.c:1596
+#: src/wizard.c:1177 src/wizard.c:1597
msgid "Use STARTTLS command to start encryption"
msgstr "Usar la orden STARTTLS para abrir la sesión cifrada"
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1189 src/wizard.c:1609
msgid "Client SSL/TLS certificate (optional)"
msgstr "Certificado SSL/TLS de cliente (opcional)"
-#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
+#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
msgid "Server address:"
msgstr "Dirección del servidor:"
-#: src/wizard.c:1320
+#: src/wizard.c:1321
msgid "Local mailbox:"
msgstr "Buzón local:"
-#: src/wizard.c:1489
+#: src/wizard.c:1490
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/wizard.c:1498
+#: src/wizard.c:1499
msgid "POP3"
msgstr "POP3"
-#: src/wizard.c:1554
+#: src/wizard.c:1555
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:110\""
@@ -19484,19 +19623,19 @@ msgstr ""
"Puede especificar el número de puerto añadiéndolo al final: «correo.ejemplo."
"com:110»"
-#: src/wizard.c:1585
+#: src/wizard.c:1586
msgid "Use SSL/TLS to connect to receiving server"
msgstr "Usar SSL/TLS para conectar al servidor de recepción"
-#: src/wizard.c:1650
+#: src/wizard.c:1651
msgid "IMAP server directory:"
msgstr "Directorio del servidor IMAP:"
-#: src/wizard.c:1661
+#: src/wizard.c:1662
msgid "Show only subscribed folders"
msgstr "Mostrar sólo las carpetas suscritas"
-#: src/wizard.c:1669
+#: src/wizard.c:1670
msgid ""
"Warning: this version of Claws Mail\n"
"has been built without IMAP support."
@@ -19504,15 +19643,15 @@ msgstr ""
"Aviso: esta versión de Claws Mail\n"
"se construyó sin soporte IMAP."
-#: src/wizard.c:1787
+#: src/wizard.c:1788
msgid "Claws Mail Setup Wizard"
msgstr "Ayudante de configuración de Claws Mail"
-#: src/wizard.c:1820
+#: src/wizard.c:1821
msgid "Welcome to Claws Mail"
msgstr "Bienvenido a Claws Mail "
-#: src/wizard.c:1827
+#: src/wizard.c:1828
msgid ""
"Welcome to the Claws Mail setup wizard.\n"
"\n"
@@ -19526,31 +19665,31 @@ msgstr ""
"correo más comunes de manera que pueda comenzar a usar Claws Mail en menos "
"de cinco minutos."
-#: src/wizard.c:1840
+#: src/wizard.c:1841
msgid "About You"
msgstr "Sobre usted"
-#: src/wizard.c:1848 src/wizard.c:1863 src/wizard.c:1878 src/wizard.c:1894
+#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
msgid "Bold fields must be completed"
msgstr "Los campos en etiquetados en negrilla deben ser completados"
-#: src/wizard.c:1855
+#: src/wizard.c:1856
msgid "Receiving mail"
msgstr "Recibiendo correo"
-#: src/wizard.c:1870
+#: src/wizard.c:1871
msgid "Sending mail"
msgstr "Enviando correo"
-#: src/wizard.c:1886
+#: src/wizard.c:1887
msgid "Saving mail on disk"
msgstr "Guardando el correo en el disco"
-#: src/wizard.c:1902
+#: src/wizard.c:1903
msgid "Configuration finished"
msgstr "Configuración finalizada."
-#: src/wizard.c:1909
+#: src/wizard.c:1910
msgid ""
"Claws Mail is now ready.\n"
"Click Save to start."
commit d5df752666f9d2c65d435ec99d6f5f45da3b7fcd
Author: wwp <wwp at free.fr>
Date: Tue Aug 14 17:58:18 2018 +0200
French translation: introduce inclusive modern French forms (I guess we'll get
feedback about this), patch by Colin.
diff --git a/po/fr.po b/po/fr.po
index 144cfbc..f107874 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 17:32+0100\n"
+"PO-Revision-Date: 2018-08-14 17:55+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -643,7 +643,7 @@ msgstr ""
#: src/addressbook.c:542
msgid "LDAP search terminated on request"
-msgstr "Recherche LDAP interrompue conformément à la demande"
+msgstr "Recherche LDAP interrompue par l'utilisateur·rice"
#: src/addressbook.c:543
msgid "Error starting STARTTLS connection"
@@ -765,12 +765,13 @@ msgstr "Nouveaux contacts"
#: src/addressbook.c:4132
msgid "New user, could not save index file."
-msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
+msgstr "Nouvel utilisateur·rice. Impossible d'enregistrer le fichier index."
#: src/addressbook.c:4136
msgid "New user, could not save address book files."
msgstr ""
-"Nouvel utilisateur. Impossible d'enregistrer le fichier de carnet d'adresses."
+"Nouvel utilisateur·rice. Impossible d'enregistrer le fichier de carnet "
+"d'adresses."
#: src/addressbook.c:4146
msgid "Old address book converted successfully."
@@ -1754,7 +1755,7 @@ msgstr "À _tous"
#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:304
msgid "_Sender"
-msgstr "À l'_expéditeur"
+msgstr "À l'_expéditeur·rice"
#: src/compose.c:730
msgid "_Mailing-list"
@@ -1802,7 +1803,7 @@ msgstr "Turc (ISO-8859-_9)"
#: src/compose.c:1040
msgid "New message From format error."
-msgstr "Erreur de formatage du modèle d'expéditeur des nouveaux messages."
+msgstr "Erreur de formatage du modèle d'expéditeur·rice des nouveaux messages."
#: src/compose.c:1133
msgid "New message subject format error."
@@ -1917,11 +1918,11 @@ msgid ""
"want to do that?"
msgstr ""
"Vous êtes sur le point d'insérer un fichier de %s dans le corps du message. "
-"Êtes-vous sûr de vouloir faire cela ?"
+"Êtes-vous sûr·e de vouloir faire cela ?"
#: src/compose.c:3645
msgid "Are you sure?"
-msgstr "Êtes-vous sûr ?"
+msgstr "Êtes-vous sûr·e ?"
#: src/compose.c:3646 src/compose.c:10781 src/compose.c:11659
msgid "_Insert"
@@ -1981,8 +1982,8 @@ msgstr ""
#, c-format
msgid "The only recipient is the default '%s' address. Send anyway?"
msgstr ""
-"Le seul destinataire est l'adresse « %s » par défaut. Voulez-vous quand même "
-"envoyer le message ?"
+"Le/la seul·e destinataire est l'adresse « %s » par défaut. Voulez-vous quand "
+"même envoyer le message ?"
#: src/compose.c:5070 src/compose.c:5107 src/compose.c:5145 src/compose.c:5188
#: src/prefs_account.c:3754 src/toolbar.c:487 src/toolbar.c:519
@@ -2237,7 +2238,7 @@ msgstr "Compte à utiliser pour l'envoi de ce message"
#: src/compose.c:8401
msgid "Sender address to be used"
-msgstr "Adresse email à utiliser en tant qu'expéditeur"
+msgstr "Adresse email à utiliser en tant qu'expéditeur·rice"
#: src/compose.c:8583
#, c-format
@@ -2602,7 +2603,7 @@ msgstr "Valeur"
#: src/editaddress.c:1592
msgid "_User Data"
-msgstr "Nom d'_utilisateur"
+msgstr "Nom d'_utilisateur·rice"
#: src/editaddress.c:1593
msgid "_Email Addresses"
@@ -2944,7 +2945,7 @@ msgid ""
"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "
"performing a search."
msgstr ""
-"Le nom d'utilisateur pour se connecter au serveur LDAP. Ce nom est en "
+"Le nom d'utilisateur·rice pour se connecter au serveur LDAP. Ce nom est en "
"général utilisé seulement par des serveurs protégés. Ce nom est typiquement "
"écrit comme suit : « cn=user, dc=claws-mail,dc=com ». En général, il suffit "
"de laisser ce champ vide pour effectuer des recherches."
@@ -2955,7 +2956,7 @@ msgstr "Mot de passe de connexion"
#: src/editldap.c:735
msgid "The password to be used when connecting as the \"Bind DN\" user."
-msgstr "Le mot de passe de l'utilisateur « Bind DN »."
+msgstr "Le mot de passe de l'utilisateur·rice « Bind DN »."
#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
@@ -3245,7 +3246,7 @@ msgid ""
"you wish to proceed without a suffix?"
msgstr ""
"Un suffixe est requis si la donnée est destinée à être utilisé par un "
-"serveur LDAP. Êtes-vous sûr de vouloir continuer sans suffixe ?"
+"serveur LDAP. Êtes-vous sûr·e de vouloir continuer sans suffixe ?"
#: src/expldifdlg.c:261
msgid "Error creating LDIF file"
@@ -3342,10 +3343,10 @@ msgid ""
"above will be used if the DN user attribute is not found."
msgstr ""
"Le carnet d'adresses peut contenir des entrées qui étaient précédemment "
-"importées d'un fichier LDIF. L'attribut utilisateur « nom absolu » (DN), si "
-"présent dans les données du carnet d'adresses, peut être utilisé dans le "
-"fichier LDIF exporté. S'il n'est pas présent, le RDN (nom relatif) ci-dessus "
-"sera utilisé."
+"importées d'un fichier LDIF. L'attribut utilisateur·rice « nom absolu "
+"» (DN), si présent dans les données du carnet d'adresses, peut être utilisé "
+"dans le fichier LDIF exporté. S'il n'est pas présent, le RDN (nom relatif) "
+"ci-dessus sera utilisé."
#: src/expldifdlg.c:558
msgid "Exclude record if no Email Address"
@@ -3494,7 +3495,7 @@ msgid ""
"rule is not account-based, all rules are applied on user request anyway\n"
msgstr ""
"règle non relative à un compte, toutes les règles sont appliquées par "
-"requête utilisateur de toute façon\n"
+"requête utilisateur·rice de toute façon\n"
#: src/filtering.c:649
#, c-format
@@ -3503,18 +3504,18 @@ msgid ""
"request\n"
msgstr ""
"règle basée sur un compte [id=%d, nom='%s'], mais toutes les règles sont "
-"appliquées, à la demande de l'utilisateur\n"
+"appliquées, à la demande de l'utilisateur·rice\n"
#: src/filtering.c:667
#, c-format
msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
msgstr ""
"règle basée sur un compte [id=%d, name='%s'], sautée à la demande de "
-"l'utilisateur\n"
+"l'utilisateur·rice\n"
#: src/filtering.c:672
msgid "rule is account-based, skipped on user request\n"
-msgstr "règle basée sur un compte, sautée à la demande de l'utilisateur\n"
+msgstr "règle basée sur un compte, sautée à la demande de l'utilisateur·rice\n"
#: src/filtering.c:694
#, c-format
@@ -4048,7 +4049,7 @@ msgid ""
"For support and discussion subscribe to the Claws Mail users' mailing list:"
msgstr ""
"Pour vos questions ou discussions, vous pouvez vous inscrire à la liste de "
-"diffusion des utilisateurs de Claws Mail :"
+"diffusion des utilisateur·rice·s de Claws Mail :"
#: src/gtk/about.c:146
msgid ""
@@ -4106,7 +4107,7 @@ msgstr "L'équipe de Claws Mail"
#: src/gtk/about.c:266
msgid "Previous team members"
-msgstr "Les anciens membres de l'équipe"
+msgstr "Les ancien·ne·s membres de l'équipe"
#: src/gtk/about.c:285
msgid "The translation team"
@@ -4126,7 +4127,7 @@ msgstr "Réalisation des icônes"
#: src/gtk/about.c:360
msgid "Contributors"
-msgstr "Contributeurs"
+msgstr "Contributeur·rice·s"
#: src/gtk/about.c:408
msgid "Compiled-in Features"
@@ -4509,11 +4510,11 @@ msgstr "De:"
#: src/gtk/headers.h:11
msgid "Sender"
-msgstr "Expéditeur"
+msgstr "Expéditeur·rice"
#: src/gtk/headers.h:11
msgid "Sender:"
-msgstr "Expéditeur:"
+msgstr "Expéditeur·rice:"
#: src/gtk/headers.h:12
msgid "Reply-To"
@@ -4601,11 +4602,11 @@ msgstr "Expéditeur-de-renvoi:"
#: src/gtk/headers.h:24
msgid "Resent-Sender"
-msgstr "Ré-expéditeur"
+msgstr "Ré-expéditeur·rice"
#: src/gtk/headers.h:24
msgid "Resent-Sender:"
-msgstr "Ré-expéditeur:"
+msgstr "Ré-expéditeur·rice:"
#: src/gtk/headers.h:25
msgid "Resent-To"
@@ -5186,7 +5187,8 @@ msgstr "messages supprimés"
#: src/gtk/quicksearch.c:488
msgid "messages which contain S in the Sender field"
msgstr ""
-"messages contenant S dans l'en-tête d'expéditeur (en-tête « Expéditeur: »)"
+"messages contenant S dans l'en-tête d'expéditeur·rice (en-tête « "
+"Expéditeur·rice: »)"
#: src/gtk/quicksearch.c:489
msgid "true if execute \"S\" succeeds"
@@ -5194,7 +5196,7 @@ msgstr "vrai si l'exécution de « S » réussit"
#: src/gtk/quicksearch.c:490
msgid "messages originating from user S"
-msgstr "messages venant de l'expéditeur S"
+msgstr "messages venant de l'expéditeur·rice S"
#: src/gtk/quicksearch.c:491
msgid "forwarded messages"
@@ -5353,7 +5355,7 @@ msgid ""
"in order to match and be displayed in the message list.\n"
"The following symbols can be used:"
msgstr ""
-"La recherche avancée permet à l'utilisateur de définir des critères de "
+"La recherche avancée permet à l'utilisateur·rice de définir des critères de "
"recherche précis en vue de restreindre la liste d'affichage aux messages "
"répondant à ces critères.\n"
"Il est possible d'utiliser les symboles suivants :"
@@ -5556,7 +5558,7 @@ msgstr "Labels :"
#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3453
#: src/summaryview.c:3471 src/summaryview.c:3510
msgid "(No From)"
-msgstr "(Pas d'expéditeur)"
+msgstr "(Pas d'expéditeur·rice)"
#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
#: src/plugins/notification/notification_popup.c:624
@@ -5839,12 +5841,12 @@ msgstr ""
#: src/imap.c:977
#, c-format
msgid "Connection to %s failed: login refused.%s"
-msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s"
+msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s"
#: src/imap.c:981
#, c-format
msgid "Connection to %s failed: login refused.%s\n"
-msgstr "La connexion vers %s a échoué : nom d'utilisateur refusé.%s\n"
+msgstr "La connexion vers %s a échoué : nom d'utilisateur·rice refusé.%s\n"
#: src/imap.c:999
#, c-format
@@ -6147,7 +6149,7 @@ msgstr "Impossible de supprimer le dossier '%s'."
msgid "Do you want to search for unsubscribed subfolders of '%s'?"
msgstr ""
"Voulez-vous rechercher les sous-dossiers de '%s' auxquels vous n'êtes pas "
-"inscrit(e) ?"
+"inscrit·e ?"
#: src/imap_gtk.c:509
msgid "Search recursively"
@@ -7448,7 +7450,7 @@ msgstr "Vérifier la signature"
#: src/mainwindow.c:736 src/messageview.c:315
msgid "Add sender to address boo_k"
-msgstr "A_jouter l'expéditeur au carnet d'adresses"
+msgstr "A_jouter l'expéditeur·rice au carnet d'adresses"
#: src/mainwindow.c:738
msgid "C_ollect addresses"
@@ -8174,8 +8176,8 @@ msgid ""
"You got a return receipt for this message: it has been displayed by the "
"recipient."
msgstr ""
-"Vous avez demandé un accusé de réception pour ce message : cela a été mis en "
-"évidence pour le destinataire."
+"Vous avez demandé un accusé de réception pour ce message : le message a été "
+"affiché par le/la destinataire."
#: src/messageview.c:1940
msgid "You asked for a return receipt in this message."
@@ -8248,7 +8250,7 @@ msgid ""
"It is advised to not send the return receipt."
msgstr ""
"Ce message demande un accusé de réception, or d'après\n"
-"les en-têtes « %s » et « %s », vous n'en êtes pas le\n"
+"les en-têtes « %s » et « %s », vous n'en êtes pas le/la\n"
"destinataire officiel.\n"
"Il est conseillé de ne pas envoyer cet accusé de réception."
@@ -8339,7 +8341,7 @@ msgid ""
"Really remove the mailbox '%s'?\n"
"(The messages are NOT deleted from the disk)"
msgstr ""
-"Êtes-vous sûr de ne plus vouloir utiliser la boîte aux lettres\n"
+"Êtes-vous sûr·e de ne plus vouloir utiliser la boîte aux lettres\n"
"« %s » ?\n"
"Note : les messages ne seront PAS effacés du disque."
@@ -8793,7 +8795,8 @@ msgstr " - Éteint : "
#: src/plugins/acpi_notifier/acpi_notifier.c:434
msgid "Blink when user interaction is required"
-msgstr "Faire clignoter lorsque l'interaction de l'utilisateur est requise"
+msgstr ""
+"Faire clignoter lorsque l'interaction de l'utilisateur·rice est requise"
#: src/plugins/acpi_notifier/acpi_notifier.c:868
msgid "This plugin handles various ACPI mail LEDs."
@@ -10348,7 +10351,7 @@ msgid ""
msgstr ""
"Ce module modifie les messages téléchargés. Il insère des en-têtes contenant "
"des informations sur la téléchargement: UIDL, nom du compte mail, serveur "
-"POP, nom de l'utilisateur et la date de récupération.\n"
+"POP, nom de l'utilisateur·rice et la date de récupération.\n"
"\n"
"Les options de ce module sont modifiables dans /Configuration/Préférences/"
"Modules/Fetchinfo."
@@ -10402,7 +10405,7 @@ msgstr "UserID"
msgid "Adds the X-FETCH-USERID header with the user ID"
msgstr ""
"Ajout de l'en-tête X-FETCH-USERID avec pour valeur l'identifiant de "
-"l'utilisateur"
+"l'utilisateur·rice"
#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
msgid "Fetch time"
@@ -10555,7 +10558,7 @@ msgstr "Authentification"
#: src/plugins/gdata/cm_gdata_prefs.c:84
#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
msgid "Username:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur·rice :"
#: src/plugins/gdata/cm_gdata_prefs.c:95
msgid "Polling interval (seconds):"
@@ -10791,16 +10794,16 @@ msgstr "Génère une image à la façon jeu d'arcade 8-bit"
#: src/plugins/libravatar/libravatar_prefs.c:319
msgid "Redirect to a user provided URL"
-msgstr "Utiliser à partir d'une URL fournie par l'utilisateur"
+msgstr "Utiliser à partir d'une URL fournie par l'utilisateur·rice"
#: src/plugins/libravatar/libravatar_prefs.c:333
msgid ""
"Enter the URL you want to be redirected when no user icon is available. "
"Leave an empty URL to use the default libravatar orange icon."
msgstr ""
-"Saisir l'URL que vous voulez utiliser lorsqu'aucune icône utilisateur n'est "
-"disponible. Laisser le champ vide afin d'utiliser l'icône orange par défaut "
-"de libravatar."
+"Saisir l'URL que vous voulez utiliser lorsqu'aucune icône utilisateur·rice "
+"n'est disponible. Laisser le champ vide afin d'utiliser l'icône orange par "
+"défaut de libravatar."
#: src/plugins/libravatar/libravatar_prefs.c:382
msgid "_Allow redirects to other sites"
@@ -10821,7 +10824,8 @@ msgstr "Autoriser les serveurs fédérés"
#: src/plugins/libravatar/libravatar_prefs.c:393
msgid "Try to get avatar from sender's domain libravatar server"
msgstr ""
-"Obtenir l'avatar à partir du serveur libravatar du domaine de l'expéditeur"
+"Obtenir l'avatar à partir du serveur libravatar du domaine de "
+"l'expéditeur·rice"
#: src/plugins/libravatar/libravatar_prefs.c:410
msgid "Request timeout"
@@ -11127,7 +11131,7 @@ msgstr "Utiliser l'authentification"
#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1389
#: src/prefs_account.c:1982
msgid "User ID"
-msgstr "Nom d'utilisateur"
+msgstr "Nom d'utilisateur·rice"
#: src/plugins/managesieve/sieve_prefs.c:246
#: src/plugins/rssyl/rssyl_feed_props.c:383
@@ -11287,7 +11291,7 @@ msgid ""
"\n"
"Feedback to <berndth at gmx.de> is welcome."
msgstr ""
-"Ce module fournit divers moyens de notifier l'utilisateur de nouveaux "
+"Ce module fournit divers moyens de notifier l'utilisateur·rice de nouveaux "
"emails.\n"
"De nombreuses options de configuration sont disponibles dans la section "
"modules des préférences.\n"
@@ -11761,15 +11765,15 @@ msgstr "Titre :"
#: src/plugins/pdf_viewer/poppler_viewer.c:705
msgid "Author:"
-msgstr "Auteur :"
+msgstr "Auteur·rice :"
#: src/plugins/pdf_viewer/poppler_viewer.c:707
msgid "Creator:"
-msgstr "Créateur :"
+msgstr "Créateur·rice :"
#: src/plugins/pdf_viewer/poppler_viewer.c:708
msgid "Producer:"
-msgstr "Producteur :"
+msgstr "Producteur·rice :"
#: src/plugins/pdf_viewer/poppler_viewer.c:711
msgid "Created:"
@@ -11927,7 +11931,7 @@ msgstr "Phrase secrète"
#: src/plugins/pgpcore/passphrase.c:248
msgid "[no user id]"
-msgstr "[pas d'identifiant utilisateur]"
+msgstr "[pas d'identifiant utilisateur·rice]"
#: src/plugins/pgpcore/passphrase.c:260
msgid "Please enter the passphrase for the new key:"
@@ -12132,7 +12136,7 @@ msgstr "Spécifier la clé manuellement"
#: src/plugins/pgpcore/prefs_gpg.c:398
msgid "User or key ID:"
-msgstr "Identifiant d'utilisateur ou de clé :"
+msgstr "Identifiant utilisateur·rice ou de clé :"
#: src/plugins/pgpcore/prefs_gpg.c:442
msgid "No secret key found."
@@ -12201,7 +12205,7 @@ msgstr "Ajouter une clé"
#: src/plugins/pgpcore/select-keys.c:677
msgid "Enter another user or key ID:"
-msgstr "Saisir un autre utilisateur ou l'ID de la clé :"
+msgstr "Saisir un autre utilisateur·rice ou l'ID de la clé :"
#: src/plugins/pgpcore/select-keys.c:699
#, c-format
@@ -12221,7 +12225,7 @@ msgid ""
msgstr ""
"La clé de chiffrement n'est pas totalement de confiance.\n"
"Si vous choisissez de chiffrer le message avec cette clé, vous\n"
-"ne serez pas sûr qu'elle sera remise au destinataire désiré.\n"
+"ne serez pas sûr·e qu'elle sera remise au/à la destinataire désiré.\n"
"\n"
"Clé: ID %s, identité primaire %s <%s>\n"
"\n"
@@ -12349,7 +12353,7 @@ msgstr "Révoqué"
#: src/plugins/pgpcore/sgpgme.c:407
#, c-format
msgid "Owner Trust: %s\n"
-msgstr "Confiance dans le possesseur : %s\n"
+msgstr "Confiance dans le/la possesseur·euse : %s\n"
#: src/plugins/pgpcore/sgpgme.c:408
msgid "No key!"
@@ -12575,7 +12579,7 @@ msgstr "La signature des données a échoué, %s"
#, c-format
msgid "Data signing failed due to invalid signer: %s"
msgstr ""
-"La signature des données a échoué à cause d'un signataire non valide : %s"
+"La signature des données a échoué à cause d'un·e signataire non valide : %s"
#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
msgid "Data signing failed, no results."
@@ -13036,7 +13040,7 @@ msgstr "Vérifier la validité du certificat SSL/TLS"
#: src/plugins/rssyl/rssyl_feed_props.c:380
msgid "User name"
-msgstr "Utilisateur"
+msgstr "Utilisateur·rice"
#: src/plugins/rssyl/rssyl_feed_props.c:393
msgid "Source URL"
@@ -13266,7 +13270,7 @@ msgstr ""
"Impossible de traiter le fil\n"
"<b>%s</b>\n"
"\n"
-"Merci de reporter le problème aux développeurs."
+"Merci de reporter le problème aux développeur·euse·s."
#: src/plugins/rssyl/rssyl_update_feed.c:352
msgid "Claws Mail needs network access in order to update your feeds."
@@ -13430,7 +13434,7 @@ msgstr ""
#: src/plugins/spamassassin/spamassassin.c:560
msgid "Failed to get username"
-msgstr "Échec lors de la récupération du nom d'utilisateur"
+msgstr "Échec lors de la récupération du nom d'utilisateur·rice"
#: src/plugins/spamassassin/spamassassin.c:577
msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
@@ -13491,11 +13495,11 @@ msgstr "Type de transport"
#: src/plugins/spamassassin/spamassassin_gtk.c:307
msgid "User"
-msgstr "Nom d'utilisateur"
+msgstr "Nom d'utilisateur·rice"
#: src/plugins/spamassassin/spamassassin_gtk.c:320
msgid "User to use with spamd server"
-msgstr "Utilisateur à fournir au serveur « spamd »"
+msgstr "Utilisateur·rice à fournir au serveur « spamd »"
#: src/plugins/spamassassin/spamassassin_gtk.c:322
msgid "spamd"
@@ -13775,11 +13779,11 @@ msgstr "Vous avez créé un rendez-vous."
#: src/plugins/vcalendar/vcalendar.c:485
msgid "You have been invited to a meeting."
-msgstr "Vous avez été convié à un rendez-vous. "
+msgstr "Vous avez été convié·e à un rendez-vous. "
#: src/plugins/vcalendar/vcalendar.c:493
msgid "A meeting to which you had been invited has been cancelled."
-msgstr "Un rendez-vous auquel vous étiez convié a été annulé."
+msgstr "Un rendez-vous auquel vous étiez convié·e a été annulé."
#: src/plugins/vcalendar/vcalendar.c:502
msgid "You have been forwarded an appointment."
@@ -13820,7 +13824,7 @@ msgstr "Error - Le composant calendrier n'est pas d'un type connu."
#: src/plugins/vcalendar/vcalendar.c:964
msgid "Send a notification to the attendees"
-msgstr "Envoyer une notification aux invités"
+msgstr "Envoyer une notification aux invité·e·s"
#: src/plugins/vcalendar/vcalendar.c:973
msgid "Cancel meeting"
@@ -13839,7 +13843,7 @@ msgid ""
"You have no account matching any attendee.\n"
"Do you want to reply anyway?"
msgstr ""
-"Vous n'avez pas de compte correspondant à un invité. Voulez-vous tout de "
+"Vous n'avez pas de compte correspondant à un·e invité·e. Voulez-vous tout de "
"même répondre ?"
#: src/plugins/vcalendar/vcalendar.c:1072
@@ -13875,7 +13879,7 @@ msgstr "Évènement :"
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1694
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
msgid "Organizer:"
-msgstr "Organisateur :"
+msgstr "Organisateur·rice :"
#: src/plugins/vcalendar/vcalendar.c:1249
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
@@ -13901,7 +13905,7 @@ msgstr "Fin :"
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
msgid "Attendees:"
-msgstr "Invités :"
+msgstr "Invité·e·s :"
#: src/plugins/vcalendar/vcalendar.c:1256
msgid "Action:"
@@ -14803,8 +14807,8 @@ msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr ""
-"Laisser ces champs vides pour utiliser le nom d'utilisateur et le mot de "
-"passe spécifiés pour la réception."
+"Laisser ces champs vides pour utiliser le nom d'utilisateur·rice et le mot "
+"de passe spécifiés pour la réception."
#: src/prefs_account.c:2048
msgid "Authenticate with POP before sending"
@@ -14888,8 +14892,8 @@ msgstr "Toujours chiffrer la réponse à un message chiffré"
#: src/prefs_account.c:2494
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr ""
-"Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
-"destinataire"
+"Chiffrer les messages envoyés avec votre propre clé en plus de celle du/de "
+"la destinataire"
#: src/prefs_account.c:2496
msgid "Save sent encrypted messages as clear text"
@@ -15046,7 +15050,7 @@ msgstr "Le serveur d'envoi (SMTP) est non spécifié."
#: src/prefs_account.c:3287
msgid "User ID is not entered."
-msgstr "Le nom d'utilisateur est non spécifié."
+msgstr "Le nom d'utilisateur·rice est non spécifié."
#: src/prefs_account.c:3292
msgid "POP server is not entered."
@@ -15075,8 +15079,8 @@ msgstr "La commande externe d'envoi est non spécifiée."
#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur ne doit pas contenir de caractère de retour à la "
-"ligne."
+"L'identifiant utilisateur·rice ne doit pas contenir de caractère de retour à "
+"la ligne."
#: src/prefs_account.c:3350
msgid "Password cannot contain a newline character."
@@ -15086,8 +15090,8 @@ msgstr ""
#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur SMTP ne doit pas contenir de caractère de retour à "
-"la ligne."
+"L'identifiant utilisateur·rice SMTP ne doit pas contenir de caractère de "
+"retour à la ligne."
#: src/prefs_account.c:3383
msgid "SMTP password cannot contain a newline character."
@@ -15305,14 +15309,14 @@ msgstr ""
#: src/prefs_actions.c:974
msgid "to send user provided text to command's standard input"
msgstr ""
-"pour envoyer un texte fourni par l'utilisateur à l'entrée standard de la "
-"commande"
+"pour envoyer un texte fourni par l'utilisateur·rice à l'entrée standard de "
+"la commande"
#: src/prefs_actions.c:975
msgid "to send user provided hidden text to command's standard input"
msgstr ""
-"pour envoyer un texte caché fourni par l'utilisateur à l'entrée standard de "
-"la commande"
+"pour envoyer un texte caché fourni par l'utilisateur·rice à l'entrée "
+"standard de la commande"
#: src/prefs_actions.c:976
msgid "<span weight=\"bold\">End with:</span>"
@@ -15357,11 +15361,11 @@ msgstr ""
#: src/prefs_actions.c:984
msgid "for a user provided argument"
-msgstr "pour un texte fourni par l'utilisateur"
+msgstr "pour un texte fourni par l'utilisateur·rice"
#: src/prefs_actions.c:985
msgid "for a user provided hidden argument (e.g. password)"
-msgstr "pour un texte caché fourni par l'utilisateur (ex : mot de passe)"
+msgstr "pour un texte caché fourni par l'utilisateur·rice (ex : mot de passe)"
#: src/prefs_actions.c:986
msgid "for the text selection"
@@ -15386,10 +15390,10 @@ msgid ""
"The Actions feature is a way for the user to launch external commands to "
"process a complete message file or just one of its parts."
msgstr ""
-"La fonctionnalité des actions est un moyen pour l'utilisateur d'exécuter des "
-"commandes externes depuis Claws Mail. Il est par exemple possible de "
-"manipuler physiquement ou graphiquement (vue du message, fenêtre de "
-"composition) les messages ou une de leurs parties."
+"La fonctionnalité des actions est un moyen pour l'utilisateur·rice "
+"d'exécuter des commandes externes depuis Claws Mail. Il est par exemple "
+"possible de manipuler physiquement ou graphiquement (vue du message, fenêtre "
+"de composition) les messages ou une de leurs parties."
#: src/prefs_actions.c:1086 src/prefs_filtering.c:1701
#: src/prefs_template.c:1113
@@ -15837,7 +15841,7 @@ msgid ""
"program or script.\n"
"The following symbols can be used:"
msgstr ""
-"L'action de filtrage « Exécuter » permet à l'utilisateur d'envoyer un "
+"L'action de filtrage « Exécuter » permet à l'utilisateur·rice d'envoyer un "
"message ou élément d'en-tête de message à un programme ou un script "
"externe.\n"
"Il est possible d'utiliser les symboles suivants :"
@@ -16700,10 +16704,10 @@ msgid ""
"\n"
"The following symbols can be used:"
msgstr ""
-"La condition de filtrage « Test » permet à l'utilisateur de faire un test "
-"sur un message ou élément d'en-tête de message en utilisant un programme ou "
-"un script externe. Le programme doit retourner 0 ou 1 (0 étant la valeur "
-"validant la condition de filtrage).\n"
+"La condition de filtrage « Test » permet à l'utilisateur·rice de faire un "
+"test sur un message ou élément d'en-tête de message en utilisant un "
+"programme ou un script externe. Le programme doit retourner 0 ou 1 (0 étant "
+"la valeur validant la condition de filtrage).\n"
"\n"
"Il est possible d'utiliser les symboles suivants :"
@@ -17660,7 +17664,7 @@ msgstr ""
#: src/prefs_summaries.c:555
msgid "Display sender using address book"
-msgstr "Afficher le nom de l'expéditeur en utilisant le carnet d'adresses"
+msgstr "Afficher le nom de l'expéditeur·rice en utilisant le carnet d'adresses"
#: src/prefs_summaries.c:559
msgid "Show tooltips"
@@ -17931,7 +17935,7 @@ msgstr ""
#: src/prefs_themes.c:575
msgid "Do you want to install theme for all users?"
-msgstr "Voulez-vous installer le thème pour tous les utilisateurs ?"
+msgstr "Voulez-vous installer le thème pour tou·te·s les utilisateur·rice·s ?"
#: src/prefs_themes.c:595
msgid "Theme exists"
@@ -17979,7 +17983,7 @@ msgstr ""
#: src/prefs_themes.c:803
#, c-format
msgid "%d themes available (%d user, %d system, 1 internal)"
-msgstr "%d thèmes disponibles (%d utilisateur, %d système, 1 interne)"
+msgstr "%d thèmes disponibles (%d utilisateur·rice, %d système, 1 interne)"
#: src/prefs_themes.c:844
#, c-format
@@ -18017,7 +18021,7 @@ msgstr "Informations"
#: src/prefs_themes.c:998
msgid "Author"
-msgstr "Auteur"
+msgstr "Auteur·rice"
#: src/prefs_themes.c:1006
msgid "URL"
@@ -18254,23 +18258,23 @@ msgstr "personnaliser le format de la date (voir 'man strftime')"
#: src/quote_fmt.c:51
msgid "email address of sender"
-msgstr "adresse email de l'expéditeur"
+msgstr "adresse email de l'expéditeur·rice"
#: src/quote_fmt.c:52
msgid "full name of sender"
-msgstr "nom complet de l'expéditeur"
+msgstr "nom complet de l'expéditeur·rice"
#: src/quote_fmt.c:53
msgid "first name of sender"
-msgstr "prénom de l'expéditeur"
+msgstr "prénom de l'expéditeur·rice"
#: src/quote_fmt.c:54
msgid "last name of sender"
-msgstr "nom de l'expéditeur"
+msgstr "nom de l'expéditeur·rice"
#: src/quote_fmt.c:55
msgid "initials of sender"
-msgstr "initiales de l'expéditeur"
+msgstr "initiales de l'expéditeur·rice"
#: src/quote_fmt.c:62
msgid "message body"
@@ -18424,9 +18428,9 @@ msgid ""
"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
"user-entered text"
msgstr ""
-"insérer un texte saisi par l'utilisateur :\n"
+"insérer un texte saisi par l'utilisateur·rice :\n"
"<span style=\"oblique\">sub_expr</span> définit une variable à remplacer\n"
-"par un texte fourni par l'utilisateur. Plusieurs appels identiques sont "
+"par un texte fourni par l'utilisateur·rice. Plusieurs appels identiques sont "
"possibles :\n"
"ils seront tous remplacés par le même texte associé à la variable"
@@ -18503,8 +18507,8 @@ msgid ""
"Override From header. This doesn't change the account used to compose the "
"new message."
msgstr ""
-"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé pour "
-"les nouveaux messages."
+"Forcer l'en-tête d'expéditeur·rice. Cela ne changera pas le compte utilisé "
+"pour les nouveaux messages."
#: src/quote_fmt.c:297
msgid "Use template when replying to messages"
@@ -18513,8 +18517,8 @@ msgstr "Utiliser un modèle de formatage personnalisé lors d'une réponse"
#: src/quote_fmt.c:320
msgid "Override From header. This doesn't change the account used to reply."
msgstr ""
-"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé lors "
-"d'une réponse."
+"Forcer l'en-tête d'expéditeur·rice. Cela ne changera pas le compte utilisé "
+"lors d'une réponse."
#: src/quote_fmt.c:331 src/quote_fmt.c:459
msgid "Quotation mark"
@@ -18527,8 +18531,8 @@ msgstr "Utiliser un modèle de formatage personnalisé lors d'un transfert"
#: src/quote_fmt.c:448
msgid "Override From header. This doesn't change the account used to forward."
msgstr ""
-"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé lors "
-"d'un transfert."
+"Forcer l'en-tête d'expéditeur·rice. Cela ne changera pas le compte utilisé "
+"lors d'un transfert."
#: src/quote_fmt.c:539
msgid "Defaults"
@@ -18667,7 +18671,7 @@ msgstr ""
"D'abord, vous devez spécifier l'emplacement de la boîte.\n"
"Vous pouvez utiliser une boîte existante au format MH,\n"
"si vous en avez une.\n"
-"Si vous n'êtes pas sûr, cliquez sur OK."
+"Si vous n'êtes pas sûr·e, cliquez sur OK."
#: src/sourcewindow.c:64
msgid "Source of the message"
@@ -18932,7 +18936,7 @@ msgstr "À : %s, le %s"
#: src/summaryview.c:4428
msgid "You're not the author of the article."
-msgstr "Vous n'êtes pas l'auteur de cet article."
+msgstr "Vous n'êtes pas l'auteur·rice de cet article."
#: src/summaryview.c:4518
#, c-format
@@ -19283,7 +19287,7 @@ msgstr "Répondre au message"
#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
msgid "Reply to Sender"
-msgstr "Répondre à l'expéditeur"
+msgstr "Répondre à l'expéditeur·rice"
#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
msgid "Reply to All"
@@ -19458,7 +19462,7 @@ msgstr "Composer"
#: src/toolbar.c:491
msgctxt "Toolbar"
msgid "Sender"
-msgstr "Expéditeur"
+msgstr "Expéditeur·rice"
#: src/toolbar.c:492
msgid "All"
@@ -19614,7 +19618,7 @@ msgstr "Répondre _sans citer le message"
#: src/toolbar.c:2394
msgid "Reply to Sender options"
-msgstr "Options de réponse à l'expéditeur"
+msgstr "Options de réponse à l'expéditeur·rice"
#: src/toolbar.c:2411
msgid "Reply to All options"
@@ -19757,7 +19761,7 @@ msgstr "Veuillez saisir votre nom et adresse email."
#: src/wizard.c:659
msgid "Please enter your receiving server and username."
msgstr ""
-"Veuillez saisir votre serveur de réception et votre compte utilisateur."
+"Veuillez saisir votre serveur de réception et votre compte utilisateur·rice."
#: src/wizard.c:669
msgid "Please enter your username."
@@ -19769,7 +19773,7 @@ msgstr "Veuillez saisir votre serveur d'envoi (SMTP)."
#: src/wizard.c:690
msgid "Please enter your SMTP username."
-msgstr "Veuillez saisir votre nom d'utilisateur sur le serveur d'envoi."
+msgstr "Veuillez saisir votre nom d'utilisateur·rice sur le serveur d'envoi."
#: src/wizard.c:975
msgid "Your name:"
@@ -19813,7 +19817,7 @@ msgstr "(si non renseigné, utilise le même qu'en réception)"
#: src/wizard.c:1142
msgid "SMTP username:"
-msgstr "Nom d'utilisateur SMTP :"
+msgstr "Nom d'utilisateur·rice SMTP :"
#: src/wizard.c:1153
msgid "SMTP password:"
commit 1f32f6f79e4a5a094c824cfdfa340906b5482294
Author: wwp <wwp at free.fr>
Date: Tue Aug 14 17:33:38 2018 +0200
French translation: fix few uses of ID and capitalization.
diff --git a/po/fr.po b/po/fr.po
index c317dba..144cfbc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 17:21+0100\n"
+"PO-Revision-Date: 2018-08-14 17:32+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -3058,11 +3058,11 @@ msgstr "Impossible de définir le certificat client.\n"
#: src/etpan/nntp-thread.c:939
msgid "couldn't get xover range\n"
-msgstr "Impossible d'obtenir le xover range\n"
+msgstr "impossible d'obtenir le xover range\n"
#: src/etpan/nntp-thread.c:1038
msgid "couldn't get xhdr range\n"
-msgstr "Impossible d'obtenir le xhdr range\n"
+msgstr "impossible d'obtenir le xhdr range\n"
#: src/exphtmldlg.c:105
msgid "Please specify output directory and file to create."
@@ -3313,7 +3313,7 @@ msgstr "DN relatif"
#: src/expldifdlg.c:515
msgid "Unique ID"
-msgstr "ID unique"
+msgstr "Identifiant unique"
#: src/expldifdlg.c:523
msgid ""
@@ -11927,7 +11927,7 @@ msgstr "Phrase secrète"
#: src/plugins/pgpcore/passphrase.c:248
msgid "[no user id]"
-msgstr "[pas d'ID utilisateur]"
+msgstr "[pas d'identifiant utilisateur]"
#: src/plugins/pgpcore/passphrase.c:260
msgid "Please enter the passphrase for the new key:"
@@ -12001,7 +12001,7 @@ msgid ""
" Importing key ID "
msgstr ""
"\n"
-" Importation de l'ID de clé "
+" Importation de l'ID de la clé "
#: src/plugins/pgpcore/pgp_viewer.c:269
msgid " This key has been imported to your keyring.\n"
@@ -12310,7 +12310,7 @@ msgstr "Erreur de vérification de la signature : %s\n"
#: src/plugins/pgpcore/sgpgme.c:361
#, c-format
msgid "Signature made on %s using %s key ID %s\n"
-msgstr "Signature faite le %s avec la clé %s ID %s\n"
+msgstr "Signature faite le %s avec la clé (type %s) ID %s\n"
#: src/plugins/pgpcore/sgpgme.c:367
#, c-format
commit 4092c7128f6dd29c0576330092eb049607eb0936
Author: wwp <wwp at free.fr>
Date: Tue Aug 14 17:21:57 2018 +0200
Fix French translation file.
diff --git a/po/fr.po b/po/fr.po
index c8b4de6..c317dba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 17:01+0100\n"
+"PO-Revision-Date: 2018-08-14 17:21+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -521,7 +521,7 @@ msgstr "Co_mposer"
#: src/addressbook.c:443 src/addressbook.c:496
msgid "_Merge"
-msgstr ""
+msgstr "_Fusionner"
#: src/addressbook.c:447
msgid "Import _LDIF file..."
@@ -2054,7 +2054,7 @@ msgstr ""
"Sa signature a échoué : %s"
#: src/compose.c:5225
-#, fuzzy, c-format
+#, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
@@ -2960,9 +2960,8 @@ msgstr "Le mot de passe de l'utilisateur « Bind DN »."
#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
#: src/prefs_proxy.c:146
-#, fuzzy
msgid "Show password"
-msgstr "Mot de passe SMTP :"
+msgstr "Afficher le mot de passe"
#: src/editldap.c:747
msgid "Timeout (secs)"
@@ -3058,14 +3057,12 @@ msgid "Impossible to set the client certificate.\n"
msgstr "Impossible de définir le certificat client.\n"
#: src/etpan/nntp-thread.c:939
-#, fuzzy
msgid "couldn't get xover range\n"
-msgstr "Impossible de faire un xover.\n"
+msgstr "Impossible d'obtenir le xover range\n"
#: src/etpan/nntp-thread.c:1038
-#, fuzzy
msgid "couldn't get xhdr range\n"
-msgstr "Impossible d'obtenir xhdr\n"
+msgstr "Impossible d'obtenir le xhdr range\n"
#: src/exphtmldlg.c:105
msgid "Please specify output directory and file to create."
@@ -4063,13 +4060,12 @@ msgstr ""
"suivante :"
#: src/gtk/about.c:162 src/gtk/about.c:850
-#, fuzzy
msgid ""
"Copyright (C) 1999-2018\n"
"The Claws Mail Team\n"
"and Hiroyuki Yamamoto"
msgstr ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2018\n"
"L'équipe Claws Mail\n"
"et Hiroyuki Yamamoto"
@@ -5016,9 +5012,8 @@ msgid "Remember this"
msgstr "S'en souvenir"
#: src/gtk/logwindow.c:453
-#, fuzzy
msgid "_Go to last error"
-msgstr "_Aller à aujourd'hui"
+msgstr "_Atteindre la dernière erreur"
#: src/gtk/logwindow.c:460
msgid "Clear _Log"
@@ -5101,14 +5096,12 @@ msgid "Plugins"
msgstr "Modules"
#: src/gtk/pluginwindow.c:336
-#, fuzzy
msgid "_Load..."
-msgstr "Charger.."
+msgstr "_Charger.."
#: src/gtk/pluginwindow.c:337
-#, fuzzy
msgid "_Unload"
-msgstr "Enlever"
+msgstr "_Enlever"
#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
msgid "Description"
@@ -5928,9 +5921,8 @@ msgid "Copying messages..."
msgstr "Copie des messages en cours.."
#: src/imap.c:2491
-#, fuzzy
msgid "Search failed due to server error."
-msgstr "Échec : problème de connexion réseau."
+msgstr "Échec de la recherche dû à un problème de serveur."
#: src/imap.c:2570
msgid "can't set deleted flags\n"
@@ -6121,14 +6113,14 @@ msgstr ""
"le nouveau nom proposé n'est pas autorisé."
#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
-#, fuzzy, c-format
+#, c-format
msgid "Select folder to move folder '%s' to"
-msgstr "Sélection du dossier où déplacer le message sélectionné"
+msgstr "Sélection du dossier où déplacer le dossier '%s'"
#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
-#, fuzzy, c-format
+#, c-format
msgid "Select folder to copy folder '%s' to"
-msgstr "Sélection du dossier où copier le message sélectionné"
+msgstr "Sélection du dossier où copier le dossier '%s'"
#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
#, c-format
@@ -6645,13 +6637,13 @@ msgstr "_Seulement pour cette fois-ci"
#: src/ldapupdate.c:680
#, c-format
msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
-msgstr ""
+msgstr "LDAP erreur (recherche) : pour l'attribut '%s' : %d (%s)\n"
#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
#: src/ldapupdate.c:1330
#, c-format
msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
-msgstr ""
+msgstr "LDAP erreur (modification) : pour le DN '%s' : %d (%s)\n"
#: src/ldapupdate.c:1046
msgid "Some SN"
@@ -6660,16 +6652,16 @@ msgstr "Un SN"
#: src/ldapupdate.c:1133
#, c-format
msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
-msgstr ""
+msgstr "LDAP erreur (renommage) : de '%s' vers '%s' : %d (%s)\n"
#: src/ldaputil.c:81 src/ldaputil.c:156
msgid "LDAP (search): succesful\n"
-msgstr ""
+msgstr "LDAP (recherche) : succés\n"
#: src/ldaputil.c:112 src/ldaputil.c:200
#, c-format
msgid "LDAP error (search): %d (%s)\n"
-msgstr ""
+msgstr "LDAP erreur (recherche) : %d (%s)\n"
#: src/ldif.c:758
msgid "Nick Name"
@@ -6853,15 +6845,14 @@ msgstr ""
" fichiers spécifiés attachés"
#: src/main.c:1983
-#, fuzzy
msgid ""
" --insert file1 [file2]...\n"
" open composition window with specified files\n"
" inserted"
msgstr ""
-" --attach fichier1 [fichier2]..\n"
+" --insert fichier1 [fichier2]..\n"
" ouvrir une fenêtre de composition avec les\n"
-" fichiers spécifiés attachés"
+" fichiers spécifiés insérés"
#: src/main.c:1986
msgid " --receive receive new messages"
@@ -9361,19 +9352,19 @@ msgstr ""
"Les données supprimées seront irrécupérables."
#: src/plugins/att_remover/att_remover.c:468
-#, fuzzy
msgid "The selected messages don't have any attachments."
-msgstr "Ce message n'a pas de pièces jointes."
+msgstr "Les messages sélectionnés n'ont pas de pièces jointes."
#: src/plugins/att_remover/att_remover.c:471
#, c-format
msgid "Attachments removed from %d of the %d selected messages."
msgstr ""
+"Les pièces jointes ont été enlevées à %d messages parmi les %d sélectionnés."
#: src/plugins/att_remover/att_remover.c:474
-#, fuzzy, c-format
+#, c-format
msgid "Attachments removed from all %d selected messages."
-msgstr "Récupération d'adresses email des messages sélectionnés"
+msgstr "Les pièces jointes ont été enlevées des %d messages sélectionnés."
#: src/plugins/att_remover/att_remover.c:503
msgid "This message doesn't have any attachments."
@@ -10528,12 +10519,12 @@ msgstr ""
"Module GData : code d'autorisation non reçu, requête d'autorisation annulée\n"
#: src/plugins/gdata/cm_gdata_contacts.c:494
-#, fuzzy
msgid ""
"GData plugin: Interactive authorization still running, no additional session "
"started\n"
msgstr ""
-"Module GData : code d'authentification reçu, authentification requise\n"
+"Module GData : autorisation interactive toujours en cours, nouvelle session "
+"non nécessaire\n"
#: src/plugins/gdata/cm_gdata_contacts.c:511
#, c-format
@@ -11104,11 +11095,11 @@ msgstr "Connection à ce port au lieu du port par défaut"
#: src/plugins/managesieve/sieve_prefs.c:187
msgid "Encryption"
-msgstr "Chiffrage"
+msgstr "Chiffrement"
#: src/plugins/managesieve/sieve_prefs.c:190
msgid "No encryption"
-msgstr "Pas de chiffrage"
+msgstr "Pas de chiffrement"
#: src/plugins/managesieve/sieve_prefs.c:192
msgid "Use STARTTLS when available"
@@ -11872,9 +11863,8 @@ msgid "Rotate Right"
msgstr "Pivoter à droite"
#: src/plugins/pdf_viewer/poppler_viewer.c:1969
-#, fuzzy
msgid "Print Document"
-msgstr "Document %s"
+msgstr "Imprimer le Document"
#: src/plugins/pdf_viewer/poppler_viewer.c:1972
msgid "Document Info"
@@ -13524,13 +13514,14 @@ msgid "Path of Unix socket"
msgstr "Chemin du socket Unix"
#: src/plugins/spamassassin/spamassassin_gtk.c:364
-#, fuzzy
msgid "Use compression"
-msgstr "Choix de la compression"
+msgstr "Utiliser la compression"
#: src/plugins/spamassassin/spamassassin_gtk.c:368
msgid "Enable compression if spamd uses it, otherwise disable it."
msgstr ""
+"N'activer la compression que si spamd la supporte, sinon la laisser "
+"désactivée."
#: src/plugins/spamassassin/spamassassin_gtk.c:403
msgid ""
@@ -14753,9 +14744,8 @@ msgid "Automatic checking"
msgstr "Relève automatique du courriel"
#: src/prefs_account.c:1764
-#, fuzzy
msgid "Use global settings"
-msgstr "Utiliser les paramètres de serveur mandataire de GNOME"
+msgstr "Utiliser les paramètres globaux"
#: src/prefs_account.c:1770 src/prefs_receive.c:169
msgid "Check for new mail every"
@@ -14763,11 +14753,11 @@ msgstr "Relever automatiquement toutes les"
#: src/prefs_account.c:1783
msgid "mins"
-msgstr ""
+msgstr "mins"
#: src/prefs_account.c:1790
msgid "secs"
-msgstr ""
+msgstr "secs"
#: src/prefs_account.c:1809
msgid "Filter messages on receiving"
@@ -14821,9 +14811,8 @@ msgid "Authenticate with POP before sending"
msgstr "S'authentifier sur le POP avant l'envoi"
#: src/prefs_account.c:2063
-#, fuzzy
msgid "POP authentication timeout"
-msgstr "Délai maximal pour l'authentification POP :"
+msgstr "Délai d'attente maximal pour l'authentification POP"
#: src/prefs_account.c:2151 src/prefs_account.c:2197
msgid "Signature"
@@ -14957,41 +14946,39 @@ msgid "Turn this off if you have SSL/TLS connection problems"
msgstr "À désactiver en cas de problème de connexion SSL/TLS"
#: src/prefs_account.c:2894 src/prefs_proxy.c:73
-#, fuzzy
msgid "Use proxy server"
msgstr "Utiliser un serveur mandataire"
#: src/prefs_account.c:2903
-#, fuzzy
msgctxt ""
"In account preferences, referring to whether or not use proxy settings from "
"common preferences"
msgid "Use default settings"
-msgstr " Remise à zéro "
+msgstr "Remise à zéro des réglages"
#: src/prefs_account.c:2905
-#, fuzzy
msgid "Use global proxy server settings"
-msgstr "Utiliser les paramètres de serveur mandataire de GNOME"
+msgstr "Utiliser les paramètres de serveur mandataire globaux"
#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
msgid "Use authentication"
msgstr "Utiliser l'authentification (SMTP AUTH)"
#: src/prefs_account.c:2947 src/prefs_proxy.c:123
-#, fuzzy
msgid "Username"
-msgstr "Utilisateur :"
+msgstr "Utilisateur"
#: src/prefs_account.c:2981
msgid "Use proxy server for sending"
-msgstr ""
+msgstr "Utiliser le serveur mandataire pour l'envoi"
#: src/prefs_account.c:2983
msgid ""
"If disabled, messages will be sent using direct connection to configured "
"outgoing server, bypassing any configured proxy server."
msgstr ""
+"Si l'option est désactivée, les messages seront envoyés directement au "
+"serveur d'envoi, sans utiliser les paramètres de serveur mandataire"
#: src/prefs_account.c:3096
msgid "SMTP port"
@@ -15088,18 +15075,24 @@ msgstr "La commande externe d'envoi est non spécifiée."
#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
msgstr ""
+"L'identifiant utilisateur ne doit pas contenir de caractère de retour à la "
+"ligne."
#: src/prefs_account.c:3350
msgid "Password cannot contain a newline character."
msgstr ""
+"Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
msgstr ""
+"L'identifiant utilisateur SMTP ne doit pas contenir de caractère de retour à "
+"la ligne."
#: src/prefs_account.c:3383
msgid "SMTP password cannot contain a newline character."
msgstr ""
+"Le mot de passe SMTP ne doit pas contenir de caractère de retour à la ligne."
#: src/prefs_account.c:3736
msgid "Receive"
@@ -16049,14 +16042,12 @@ msgid "Simplify Subject RegExp"
msgstr "Enlever la RegExp suivante du sujet"
#: src/prefs_folder_item.c:370
-#, fuzzy
msgid "Test string"
-msgstr "Chaîne de test :"
+msgstr "Chaîne de test"
#: src/prefs_folder_item.c:387
-#, fuzzy
msgid "Result"
-msgstr "Résultat :"
+msgstr "Résultat"
#: src/prefs_folder_item.c:402
msgid "Folder chmod"
@@ -16520,9 +16511,8 @@ msgid "Condition configuration"
msgstr "Conditions de filtrage"
#: src/prefs_matcher.c:612
-#, fuzzy
msgid "Match criteria"
-msgstr "Critère :"
+msgstr "Critère"
#: src/prefs_matcher.c:621
msgid "All messages"
@@ -16794,9 +16784,8 @@ msgid "Collapse quoted text on double click"
msgstr "Replier les citations par un double-clic"
#: src/prefs_message.c:246
-#, fuzzy
msgid "Treat these characters as quotation marks"
-msgstr "Traiter ces caractères comme préfixe de citation :"
+msgstr "Traiter ces caractères comme préfixe de citation"
#: src/prefs_message.c:352
msgid "Text Options"
@@ -16919,23 +16908,20 @@ msgid "Folder list"
msgstr "Liste des dossiers"
#: src/prefs_msg_colors.c:318
-#, fuzzy
msgctxt "Tooltip"
msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
msgstr ""
-"Sélection de la couleur des dossiers ciblés. (Les dossiers ciblés sont "
-"utilisés quand l'option « Configuration/Préférences/Affichage/Liste des "
-"messages/Exécuter immédiatement la suppression ou le déplacement de messages "
-"» est désactivée.)"
+"Sélection de la couleur des dossiers ciblés. Les dossiers ciblés sont "
+"utilisés quand l'option « Exécuter immédiatement la suppression ou le "
+"déplacement de messages » est désactivée"
#: src/prefs_msg_colors.c:323
msgid "Target folder"
msgstr "Dossier ciblé"
#: src/prefs_msg_colors.c:330
-#, fuzzy
msgctxt "Tooltip"
msgid "Pick color for folders containing new messages"
msgstr "Sélection de la couleur des dossiers contenant des nouveaux messages"
@@ -17233,11 +17219,9 @@ msgid "after manual check"
msgstr "après une relève manuelle"
#: src/prefs_receive.c:278
-#, fuzzy, c-format
+#, c-format
msgid "Use %d as number of new mails"
-msgstr ""
-"Commande à exécuter :\n"
-"(%d : nombre de nouveaux messages)"
+msgstr "Utiliser %d pour le nombre de nouveaux messages"
#: src/prefs_receive.c:414
msgid "Receiving"
@@ -17265,11 +17249,8 @@ msgid "Warn when Subject is empty"
msgstr "Prévenir si le sujet est vide."
#: src/prefs_send.c:209
-#, fuzzy
msgid "Warn when sending to more recipients than"
-msgstr ""
-"Prévenir lors de l'insertion dans le corps du message d'un fichier plus "
-"grand que"
+msgstr "Prévenir lors de l'envoi à un nombre de destinataires plus grand que"
#: src/prefs_send.c:225
msgid "Outgoing encoding"
@@ -17690,15 +17671,14 @@ msgid "Date format help"
msgstr "Symboles pour formater la date"
#: src/prefs_summaries.c:602
-#, fuzzy
msgid "Confirm before marking all messages in a folder as read or unread"
-msgstr "Confirmer avant de marquer tous les messages d'un dossier comme lus"
+msgstr ""
+"Confirmer avant de marquer tous les messages d'un dossier comme lus ou non "
+"lus"
#: src/prefs_summaries.c:605
-#, fuzzy
msgid "Confirm before overriding color label of messages"
-msgstr ""
-"Demander une confirmation avant d'envoyer les messages en file d'attente"
+msgstr "Confirmer avant de remplacer la couleur des messages"
#: src/prefs_summaries.c:608
msgid "Translate header names"
@@ -17731,48 +17711,40 @@ msgstr ""
"faire glisser."
#: src/prefs_summary_open.c:109
-#, fuzzy
msgid "oldest marked email"
-msgstr "1er message marqué"
+msgstr "message marqué le plus ancien"
#: src/prefs_summary_open.c:110
-#, fuzzy
msgid "oldest new email"
-msgstr "1er nouveau message"
+msgstr "nouveau message le plus ancien"
#: src/prefs_summary_open.c:111
-#, fuzzy
msgid "oldest unread email"
-msgstr "1er message non lu"
+msgstr "message non lu le plus ancien"
#: src/prefs_summary_open.c:112
msgid "last opened email"
msgstr "dernier message ouvert"
#: src/prefs_summary_open.c:113
-#, fuzzy
msgid "newest email in the list"
-msgstr "dernier message dans la liste"
+msgstr "message le plus récent dans la liste"
#: src/prefs_summary_open.c:115
-#, fuzzy
msgid "oldest email in the list"
-msgstr "dernier message dans la liste"
+msgstr "message le plus ancien dans la liste"
#: src/prefs_summary_open.c:116
-#, fuzzy
msgid "newest marked email"
-msgstr "1er message marqué"
+msgstr "message marqué le plus récent"
#: src/prefs_summary_open.c:117
-#, fuzzy
msgid "newest new email"
-msgstr "1er nouveau message"
+msgstr "nouveau message le plus récent"
#: src/prefs_summary_open.c:118
-#, fuzzy
msgid "newest unread email"
-msgstr "1er message non lu"
+msgstr "message non lu le plus récent"
#: src/prefs_summary_open.c:188
msgid " Selection when entering a folder"
@@ -18044,14 +18016,12 @@ msgid "Information"
msgstr "Informations"
#: src/prefs_themes.c:998
-#, fuzzy
msgid "Author"
-msgstr "Auteur :"
+msgstr "Auteur"
#: src/prefs_themes.c:1006
-#, fuzzy
msgid "URL"
-msgstr "URL :"
+msgstr "URL"
#: src/prefs_themes.c:1048
msgid "Preview"
@@ -18961,9 +18931,8 @@ msgid "To: %s, on %s"
msgstr "À : %s, le %s"
#: src/summaryview.c:4428
-#, fuzzy
msgid "You're not the author of the article."
-msgstr "Vous n'êtes pas l'auteur de cet article.\n"
+msgstr "Vous n'êtes pas l'auteur de cet article."
#: src/summaryview.c:4518
#, c-format
@@ -19062,19 +19031,16 @@ msgid "Processing configuration"
msgstr "Configuration du filtrage/traitement"
#: src/summaryview.c:6019
-#, fuzzy
msgid "Do you really want to reset the color label of all selected messages?"
-msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
+msgstr "Voulez-vous vraiment effacer la couleur des messages sélectionnés ?"
#: src/summaryview.c:6021
-#, fuzzy
msgid "Do you really want to apply this color label to all selected messages?"
-msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
+msgstr "Voulez-vous vraiment remplacer la couleur des messages sélectionnés ?"
#: src/summaryview.c:6022
-#, fuzzy
msgid "Set color label"
-msgstr "Par _couleur"
+msgstr "Assigner une couleur"
#: src/summaryview.c:6465
msgid "Ignored thread"
@@ -19444,14 +19410,12 @@ msgid "Check spelling"
msgstr "Vérifier l'orthographe"
#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
-#, fuzzy
msgid "Sign"
-msgstr "Signé par"
+msgstr "Signer"
#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
-#, fuzzy
msgid "Encrypt"
-msgstr "_Chiffrer"
+msgstr "Chiffrer"
#: src/toolbar.c:274
msgid "Claws Mail Actions Feature"
@@ -19581,24 +19545,20 @@ msgid "Learn ham"
msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
#: src/toolbar.c:1916
-#, fuzzy
msgid "Message will be signed"
-msgstr "Message pour lequel une réponse a été envoyée"
+msgstr "Le message sera signé"
#: src/toolbar.c:1918
-#, fuzzy
msgid "Message will not be signed"
-msgstr "Message appartenant à un fil de discussion ignoré"
+msgstr "Le message ne sera pas signé"
#: src/toolbar.c:1937
-#, fuzzy
msgid "Message will be encrypted"
-msgstr "Même si le message doit être chiffré"
+msgstr "Le message sera chiffré"
#: src/toolbar.c:1939
-#, fuzzy
msgid "Message will not be encrypted"
-msgstr "Même si le message doit être chiffré"
+msgstr "Le message ne sera pas chiffré"
#: src/toolbar.c:2289
msgid "Go to folder list"
commit 2e49be62251eaf87a73e1fb623cede52301144a6
Author: wwp <wwp at free.fr>
Date: Tue Aug 14 17:02:24 2018 +0200
French translation: few fixes more.
diff --git a/po/fr.po b/po/fr.po
index 6b54f99..c8b4de6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
"POT-Creation-Date: 2018-08-08 07:59+0100\n"
-"PO-Revision-Date: 2018-08-14 16:24+0100\n"
+"PO-Revision-Date: 2018-08-14 17:01+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -521,7 +521,7 @@ msgstr "Co_mposer"
#: src/addressbook.c:443 src/addressbook.c:496
msgid "_Merge"
-msgstr "_Fusionner"
+msgstr ""
#: src/addressbook.c:447
msgid "Import _LDIF file..."
@@ -2054,7 +2054,7 @@ msgstr ""
"Sa signature a échoué : %s"
#: src/compose.c:5225
-#, c-format
+#, fuzzy, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
@@ -2062,7 +2062,7 @@ msgid ""
msgstr ""
"Impossible de mettre le message en file d'attente d'envoi :\n"
"\n"
-"Le chiffrement a échoué : %s"
+"Sa signature a échoué : %s"
#: src/compose.c:5230
msgid ""
@@ -2960,8 +2960,9 @@ msgstr "Le mot de passe de l'utilisateur « Bind DN »."
#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
#: src/prefs_proxy.c:146
+#, fuzzy
msgid "Show password"
-msgstr "Afficher le mot de passe"
+msgstr "Mot de passe SMTP :"
#: src/editldap.c:747
msgid "Timeout (secs)"
@@ -3057,12 +3058,14 @@ msgid "Impossible to set the client certificate.\n"
msgstr "Impossible de définir le certificat client.\n"
#: src/etpan/nntp-thread.c:939
+#, fuzzy
msgid "couldn't get xover range\n"
-msgstr "Impossible d'obtenir le xover range\n"
+msgstr "Impossible de faire un xover.\n"
#: src/etpan/nntp-thread.c:1038
+#, fuzzy
msgid "couldn't get xhdr range\n"
-msgstr "Impossible d'obtenir le xhdr range\n"
+msgstr "Impossible d'obtenir xhdr\n"
#: src/exphtmldlg.c:105
msgid "Please specify output directory and file to create."
@@ -4060,12 +4063,13 @@ msgstr ""
"suivante :"
#: src/gtk/about.c:162 src/gtk/about.c:850
+#, fuzzy
msgid ""
"Copyright (C) 1999-2018\n"
"The Claws Mail Team\n"
"and Hiroyuki Yamamoto"
msgstr ""
-"Copyright (C) 1999-2018\n"
+"Copyright (C) 1999-2017\n"
"L'équipe Claws Mail\n"
"et Hiroyuki Yamamoto"
@@ -5012,8 +5016,9 @@ msgid "Remember this"
msgstr "S'en souvenir"
#: src/gtk/logwindow.c:453
+#, fuzzy
msgid "_Go to last error"
-msgstr "_Atteindre la dernière erreur"
+msgstr "_Aller à aujourd'hui"
#: src/gtk/logwindow.c:460
msgid "Clear _Log"
@@ -5096,12 +5101,14 @@ msgid "Plugins"
msgstr "Modules"
#: src/gtk/pluginwindow.c:336
+#, fuzzy
msgid "_Load..."
-msgstr "_Charger.."
+msgstr "Charger.."
#: src/gtk/pluginwindow.c:337
+#, fuzzy
msgid "_Unload"
-msgstr "_Enlever"
+msgstr "Enlever"
#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
msgid "Description"
@@ -5886,7 +5893,7 @@ msgstr "_Poursuivre la connexion"
#: src/imap.c:1166
#, c-format
msgid "Account '%s': Connecting to IMAP server: %s:%d..."
-msgstr "Compte '%s' : Connexion au serveur IMA : %s:%d.."
+msgstr "Compte '%s' : Connexion au serveur IMAP : %s:%d.."
#: src/imap.c:1231
#, c-format
@@ -5921,8 +5928,9 @@ msgid "Copying messages..."
msgstr "Copie des messages en cours.."
#: src/imap.c:2491
+#, fuzzy
msgid "Search failed due to server error."
-msgstr "Échec de la recherche dû à un problème de serveur."
+msgstr "Échec : problème de connexion réseau."
#: src/imap.c:2570
msgid "can't set deleted flags\n"
@@ -6113,14 +6121,14 @@ msgstr ""
"le nouveau nom proposé n'est pas autorisé."
#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
-#, c-format
+#, fuzzy, c-format
msgid "Select folder to move folder '%s' to"
-msgstr "Sélection du dossier où déplacer le dossier '%s'"
+msgstr "Sélection du dossier où déplacer le message sélectionné"
#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
-#, c-format
+#, fuzzy, c-format
msgid "Select folder to copy folder '%s' to"
-msgstr "Sélection du dossier où copier le dossier '%s'"
+msgstr "Sélection du dossier où copier le message sélectionné"
#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
#, c-format
@@ -6637,13 +6645,13 @@ msgstr "_Seulement pour cette fois-ci"
#: src/ldapupdate.c:680
#, c-format
msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
-msgstr "LDAP erreur (recherche) : pour l'attribut '%s' : %d (%s)\n"
+msgstr ""
#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
#: src/ldapupdate.c:1330
#, c-format
msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
-msgstr "LDAP erreur (modification) : pour le DN '%s' : %d (%s)\n"
+msgstr ""
#: src/ldapupdate.c:1046
msgid "Some SN"
@@ -6652,16 +6660,16 @@ msgstr "Un SN"
#: src/ldapupdate.c:1133
#, c-format
msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
-msgstr "LDAP erreur (renommage) : de '%s' vers '%s' : %d (%s)\n"
+msgstr ""
#: src/ldaputil.c:81 src/ldaputil.c:156
msgid "LDAP (search): succesful\n"
-msgstr "LDAP (recherche) : succès\n"
+msgstr ""
#: src/ldaputil.c:112 src/ldaputil.c:200
#, c-format
msgid "LDAP error (search): %d (%s)\n"
-msgstr "LDAP erreur (recherche) : %d (%s)\n"
+msgstr ""
#: src/ldif.c:758
msgid "Nick Name"
@@ -6845,14 +6853,15 @@ msgstr ""
" fichiers spécifiés attachés"
#: src/main.c:1983
+#, fuzzy
msgid ""
" --insert file1 [file2]...\n"
" open composition window with specified files\n"
" inserted"
msgstr ""
-" --insert fichier1 [fichier2]..\n"
+" --attach fichier1 [fichier2]..\n"
" ouvrir une fenêtre de composition avec les\n"
-" fichiers spécifiés insérés"
+" fichiers spécifiés attachés"
#: src/main.c:1986
msgid " --receive receive new messages"
@@ -9352,19 +9361,19 @@ msgstr ""
"Les données supprimées seront irrécupérables."
#: src/plugins/att_remover/att_remover.c:468
+#, fuzzy
msgid "The selected messages don't have any attachments."
-msgstr "Les messages sélectionnés n'ont pas de pièces jointes."
+msgstr "Ce message n'a pas de pièces jointes."
#: src/plugins/att_remover/att_remover.c:471
#, c-format
msgid "Attachments removed from %d of the %d selected messages."
msgstr ""
-"Les pièces jointes ont été enlevées à %d messages parmi les %d sélectionnés."
#: src/plugins/att_remover/att_remover.c:474
-#, c-format
+#, fuzzy, c-format
msgid "Attachments removed from all %d selected messages."
-msgstr "Les pièces jointes ont été enlevées des %d messages sélectionnés."
+msgstr "Récupération d'adresses email des messages sélectionnés"
#: src/plugins/att_remover/att_remover.c:503
msgid "This message doesn't have any attachments."
@@ -10519,12 +10528,12 @@ msgstr ""
"Module GData : code d'autorisation non reçu, requête d'autorisation annulée\n"
#: src/plugins/gdata/cm_gdata_contacts.c:494
+#, fuzzy
msgid ""
"GData plugin: Interactive authorization still running, no additional session "
"started\n"
msgstr ""
-"Module GData : autorisation interactive toujours en cours, nouvelle session "
-"non nécessaire\n"
+"Module GData : code d'authentification reçu, authentification requise\n"
#: src/plugins/gdata/cm_gdata_contacts.c:511
#, c-format
@@ -10595,7 +10604,7 @@ msgstr ""
"\n"
"Le protocole GData est une interface aux services Google.\n"
"Pour l'instant, la seule fonctionnalité est l'utilisation des Contacts "
-"Googles dans la complétion d'adresse (touche Tab).\n"
+"Google dans la complétion d'adresse (touche Tab).\n"
"\n"
"Vos commentaires et retours sont les bienvenus auprès de <berndth at gmx.de>."
@@ -11095,11 +11104,11 @@ msgstr "Connection à ce port au lieu du port par défaut"
#: src/plugins/managesieve/sieve_prefs.c:187
msgid "Encryption"
-msgstr "Chiffrement"
+msgstr "Chiffrage"
#: src/plugins/managesieve/sieve_prefs.c:190
msgid "No encryption"
-msgstr "Pas de chiffrement"
+msgstr "Pas de chiffrage"
#: src/plugins/managesieve/sieve_prefs.c:192
msgid "Use STARTTLS when available"
@@ -11185,7 +11194,7 @@ msgid ""
"\n"
"Current log is %s"
msgstr ""
-"Ce module écrit un résumé des entêtes dans un fichier de log pour chaque "
+"Ce module écrit un résumé des en-têtes dans un fichier de log pour chaque "
"mail\n"
"reçu, après le filtrage.\n"
"\n"
@@ -11863,8 +11872,9 @@ msgid "Rotate Right"
msgstr "Pivoter à droite"
#: src/plugins/pdf_viewer/poppler_viewer.c:1969
+#, fuzzy
msgid "Print Document"
-msgstr "Imprimer le Document"
+msgstr "Document %s"
#: src/plugins/pdf_viewer/poppler_viewer.c:1972
msgid "Document Info"
@@ -12591,8 +12601,8 @@ msgid ""
"are email headers, like Subject."
msgstr ""
"Veuillez prendre en compte que les pièces jointes ne sont pas chiffrées par "
-"le système PGP/Inline, ni les en-têtes de message, comme par exemple "
-"l'entête Sujet."
+"le système PGP/Inline, ni les en-têtes de message, comme par exemple l'en-"
+"tête Sujet."
#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
#, c-format
@@ -13514,14 +13524,13 @@ msgid "Path of Unix socket"
msgstr "Chemin du socket Unix"
#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#, fuzzy
msgid "Use compression"
-msgstr "Utiliser la compression"
+msgstr "Choix de la compression"
#: src/plugins/spamassassin/spamassassin_gtk.c:368
msgid "Enable compression if spamd uses it, otherwise disable it."
msgstr ""
-"N'activer la compression que si spamd la supporte, sinon la laisser "
-"désactivée."
#: src/plugins/spamassassin/spamassassin_gtk.c:403
msgid ""
@@ -14301,7 +14310,7 @@ msgid ""
"retrieved."
msgstr ""
"Tout le monde semble disponible, mais un ou des statuts de disponibilité "
-"n'ontpu être récupérés."
+"n'ont pu être récupérés."
#: src/plugins/vcalendar/vcal_meeting_gtk.c:1346
msgid ""
@@ -14744,8 +14753,9 @@ msgid "Automatic checking"
msgstr "Relève automatique du courriel"
#: src/prefs_account.c:1764
+#, fuzzy
msgid "Use global settings"
-msgstr "Utiliser les paramètres globaux"
+msgstr "Utiliser les paramètres de serveur mandataire de GNOME"
#: src/prefs_account.c:1770 src/prefs_receive.c:169
msgid "Check for new mail every"
@@ -14753,11 +14763,11 @@ msgstr "Relever automatiquement toutes les"
#: src/prefs_account.c:1783
msgid "mins"
-msgstr "mins"
+msgstr ""
#: src/prefs_account.c:1790
msgid "secs"
-msgstr "secs"
+msgstr ""
#: src/prefs_account.c:1809
msgid "Filter messages on receiving"
@@ -14811,8 +14821,9 @@ msgid "Authenticate with POP before sending"
msgstr "S'authentifier sur le POP avant l'envoi"
#: src/prefs_account.c:2063
+#, fuzzy
msgid "POP authentication timeout"
-msgstr "Délai maximal pour l'authentification POP"
+msgstr "Délai maximal pour l'authentification POP :"
#: src/prefs_account.c:2151 src/prefs_account.c:2197
msgid "Signature"
@@ -14946,39 +14957,41 @@ msgid "Turn this off if you have SSL/TLS connection problems"
msgstr "À désactiver en cas de problème de connexion SSL/TLS"
#: src/prefs_account.c:2894 src/prefs_proxy.c:73
+#, fuzzy
msgid "Use proxy server"
msgstr "Utiliser un serveur mandataire"
#: src/prefs_account.c:2903
+#, fuzzy
msgctxt ""
"In account preferences, referring to whether or not use proxy settings from "
"common preferences"
msgid "Use default settings"
-msgstr "Remise à zéro des réglages"
+msgstr " Remise à zéro "
#: src/prefs_account.c:2905
+#, fuzzy
msgid "Use global proxy server settings"
-msgstr "Utiliser les paramètres de serveur mandataire globaux"
+msgstr "Utiliser les paramètres de serveur mandataire de GNOME"
#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
msgid "Use authentication"
msgstr "Utiliser l'authentification (SMTP AUTH)"
#: src/prefs_account.c:2947 src/prefs_proxy.c:123
+#, fuzzy
msgid "Username"
-msgstr "Utilisateur"
+msgstr "Utilisateur :"
#: src/prefs_account.c:2981
msgid "Use proxy server for sending"
-msgstr "Utiliser le serveur mandataire pour l'envoi"
+msgstr ""
#: src/prefs_account.c:2983
msgid ""
"If disabled, messages will be sent using direct connection to configured "
"outgoing server, bypassing any configured proxy server."
msgstr ""
-"Si l'option est désactivée, les messages seront envoyés directement au "
-"serveur d'envoi, sans utiliser les paramètres de serveur mandataire"
#: src/prefs_account.c:3096
msgid "SMTP port"
@@ -15075,24 +15088,18 @@ msgstr "La commande externe d'envoi est non spécifiée."
#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur ne doit pas contenir de caractère de retour à la "
-"ligne."
#: src/prefs_account.c:3350
msgid "Password cannot contain a newline character."
msgstr ""
-"Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
msgstr ""
-"L'identifiant utilisateur SMTP ne doit pas contenir de caractère de retour à "
-"la ligne."
#: src/prefs_account.c:3383
msgid "SMTP password cannot contain a newline character."
msgstr ""
-"Le mot de passe SMTP ne doit pas contenir de caractère de retour à la ligne."
#: src/prefs_account.c:3736
msgid "Receive"
@@ -16042,12 +16049,14 @@ msgid "Simplify Subject RegExp"
msgstr "Enlever la RegExp suivante du sujet"
#: src/prefs_folder_item.c:370
+#, fuzzy
msgid "Test string"
-msgstr "Chaîne de test"
+msgstr "Chaîne de test :"
#: src/prefs_folder_item.c:387
+#, fuzzy
msgid "Result"
-msgstr "Résultat"
+msgstr "Résultat :"
#: src/prefs_folder_item.c:402
msgid "Folder chmod"
@@ -16511,8 +16520,9 @@ msgid "Condition configuration"
msgstr "Conditions de filtrage"
#: src/prefs_matcher.c:612
+#, fuzzy
msgid "Match criteria"
-msgstr "Critère"
+msgstr "Critère :"
#: src/prefs_matcher.c:621
msgid "All messages"
@@ -16784,8 +16794,9 @@ msgid "Collapse quoted text on double click"
msgstr "Replier les citations par un double-clic"
#: src/prefs_message.c:246
+#, fuzzy
msgid "Treat these characters as quotation marks"
-msgstr "Traiter ces caractères comme préfixe de citation"
+msgstr "Traiter ces caractères comme préfixe de citation :"
#: src/prefs_message.c:352
msgid "Text Options"
@@ -16908,20 +16919,23 @@ msgid "Folder list"
msgstr "Liste des dossiers"
#: src/prefs_msg_colors.c:318
+#, fuzzy
msgctxt "Tooltip"
msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
msgstr ""
-"Sélection de la couleur des dossiers ciblés. Les dossiers ciblés sont "
-"utilisés quand l'option « Exécuter immédiatement la suppression ou le "
-"déplacement de messages » est désactivée"
+"Sélection de la couleur des dossiers ciblés. (Les dossiers ciblés sont "
+"utilisés quand l'option « Configuration/Préférences/Affichage/Liste des "
+"messages/Exécuter immédiatement la suppression ou le déplacement de messages "
+"» est désactivée.)"
#: src/prefs_msg_colors.c:323
msgid "Target folder"
msgstr "Dossier ciblé"
#: src/prefs_msg_colors.c:330
+#, fuzzy
msgctxt "Tooltip"
msgid "Pick color for folders containing new messages"
msgstr "Sélection de la couleur des dossiers contenant des nouveaux messages"
@@ -17219,9 +17233,11 @@ msgid "after manual check"
msgstr "après une relève manuelle"
#: src/prefs_receive.c:278
-#, c-format
+#, fuzzy, c-format
msgid "Use %d as number of new mails"
-msgstr "Utiliser %d pour le nombre de nouveaux messages"
+msgstr ""
+"Commande à exécuter :\n"
+"(%d : nombre de nouveaux messages)"
#: src/prefs_receive.c:414
msgid "Receiving"
@@ -17249,8 +17265,11 @@ msgid "Warn when Subject is empty"
msgstr "Prévenir si le sujet est vide."
#: src/prefs_send.c:209
+#, fuzzy
msgid "Warn when sending to more recipients than"
-msgstr "Prévenir lors de l'envoi à un nombre de destinataires plus grand que"
+msgstr ""
+"Prévenir lors de l'insertion dans le corps du message d'un fichier plus "
+"grand que"
#: src/prefs_send.c:225
msgid "Outgoing encoding"
@@ -17671,14 +17690,15 @@ msgid "Date format help"
msgstr "Symboles pour formater la date"
#: src/prefs_summaries.c:602
+#, fuzzy
msgid "Confirm before marking all messages in a folder as read or unread"
-msgstr ""
-"Confirmer avant de marquer tous les messages d'un dossier comme lus ou non "
-"lus"
+msgstr "Confirmer avant de marquer tous les messages d'un dossier comme lus"
#: src/prefs_summaries.c:605
+#, fuzzy
msgid "Confirm before overriding color label of messages"
-msgstr "Confirmer avant de remplacer la couleur des messages"
+msgstr ""
+"Demander une confirmation avant d'envoyer les messages en file d'attente"
#: src/prefs_summaries.c:608
msgid "Translate header names"
@@ -17711,40 +17731,48 @@ msgstr ""
"faire glisser."
#: src/prefs_summary_open.c:109
+#, fuzzy
msgid "oldest marked email"
-msgstr "message marqué le plus ancien"
+msgstr "1er message marqué"
#: src/prefs_summary_open.c:110
+#, fuzzy
msgid "oldest new email"
-msgstr "nouveau message le plus ancien"
+msgstr "1er nouveau message"
#: src/prefs_summary_open.c:111
+#, fuzzy
msgid "oldest unread email"
-msgstr "message non lu le plus ancien"
+msgstr "1er message non lu"
#: src/prefs_summary_open.c:112
msgid "last opened email"
msgstr "dernier message ouvert"
#: src/prefs_summary_open.c:113
+#, fuzzy
msgid "newest email in the list"
-msgstr "message le plus récent dans la liste"
+msgstr "dernier message dans la liste"
#: src/prefs_summary_open.c:115
+#, fuzzy
msgid "oldest email in the list"
-msgstr "message le plus ancien dans la liste"
+msgstr "dernier message dans la liste"
#: src/prefs_summary_open.c:116
+#, fuzzy
msgid "newest marked email"
-msgstr "message marqué le plus récent"
+msgstr "1er message marqué"
#: src/prefs_summary_open.c:117
+#, fuzzy
msgid "newest new email"
-msgstr "nouveau message le plus récent"
+msgstr "1er nouveau message"
#: src/prefs_summary_open.c:118
+#, fuzzy
msgid "newest unread email"
-msgstr "message non lu le plus récent"
+msgstr "1er message non lu"
#: src/prefs_summary_open.c:188
msgid " Selection when entering a folder"
@@ -17767,7 +17795,7 @@ msgid ""
"Override composing account's From header. This doesn't change the composing "
"account."
msgstr ""
-"Forcer l'entête « De: » du compte de composition. Cela ne changera pas le "
+"Forcer l'en-tête « De: » du compte de composition. Cela ne changera pas le "
"compte de composition pour l'envoi."
#: src/prefs_template.c:308
@@ -18016,12 +18044,14 @@ msgid "Information"
msgstr "Informations"
#: src/prefs_themes.c:998
+#, fuzzy
msgid "Author"
-msgstr "Auteur"
+msgstr "Auteur :"
#: src/prefs_themes.c:1006
+#, fuzzy
msgid "URL"
-msgstr "URL"
+msgstr "URL :"
#: src/prefs_themes.c:1048
msgid "Preview"
@@ -18480,7 +18510,7 @@ msgid ""
"one contact in the address book"
msgstr ""
"la complétion depuis le carnet d'adresses fonctionne\n"
-"seulement avec la première adresse de l'entête.\n"
+"seulement avec la première adresse de l'en-tête.\n"
"Elle renseigne le nom complet du contact si l'adresse\n"
"correspond exactement à celle d'un contact du carnet"
@@ -18503,7 +18533,7 @@ msgid ""
"Override From header. This doesn't change the account used to compose the "
"new message."
msgstr ""
-"Forcer l'entête d'expéditeur. Cela ne changera pas le compte utilisé pour "
+"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé pour "
"les nouveaux messages."
#: src/quote_fmt.c:297
@@ -18513,7 +18543,7 @@ msgstr "Utiliser un modèle de formatage personnalisé lors d'une réponse"
#: src/quote_fmt.c:320
msgid "Override From header. This doesn't change the account used to reply."
msgstr ""
-"Forcer l'entête d'expéditeur. Cela ne changera pas le compte utilisé lors "
+"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé lors "
"d'une réponse."
#: src/quote_fmt.c:331 src/quote_fmt.c:459
@@ -18527,7 +18557,7 @@ msgstr "Utiliser un modèle de formatage personnalisé lors d'un transfert"
#: src/quote_fmt.c:448
msgid "Override From header. This doesn't change the account used to forward."
msgstr ""
-"Forcer l'entête d'expéditeur. Cela ne changera pas le compte utilisé lors "
+"Forcer l'en-tête d'expéditeur. Cela ne changera pas le compte utilisé lors "
"d'un transfert."
#: src/quote_fmt.c:539
@@ -18931,8 +18961,9 @@ msgid "To: %s, on %s"
msgstr "À : %s, le %s"
#: src/summaryview.c:4428
+#, fuzzy
msgid "You're not the author of the article."
-msgstr "Vous n'êtes pas l'auteur de cet article."
+msgstr "Vous n'êtes pas l'auteur de cet article.\n"
#: src/summaryview.c:4518
#, c-format
@@ -19031,16 +19062,19 @@ msgid "Processing configuration"
msgstr "Configuration du filtrage/traitement"
#: src/summaryview.c:6019
+#, fuzzy
msgid "Do you really want to reset the color label of all selected messages?"
-msgstr "Voulez-vous vraiment effacer la couleur des messages sélectionnés ?"
+msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
#: src/summaryview.c:6021
+#, fuzzy
msgid "Do you really want to apply this color label to all selected messages?"
-msgstr "Voulez-vous vraiment remplacer la couleur des messages sélectionnés ?"
+msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
#: src/summaryview.c:6022
+#, fuzzy
msgid "Set color label"
-msgstr "Assigner une couleur"
+msgstr "Par _couleur"
#: src/summaryview.c:6465
msgid "Ignored thread"
@@ -19410,12 +19444,14 @@ msgid "Check spelling"
msgstr "Vérifier l'orthographe"
#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#, fuzzy
msgid "Sign"
-msgstr "Signer"
+msgstr "Signé par"
#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#, fuzzy
msgid "Encrypt"
-msgstr "Chiffrer"
+msgstr "_Chiffrer"
#: src/toolbar.c:274
msgid "Claws Mail Actions Feature"
@@ -19545,20 +19581,24 @@ msgid "Learn ham"
msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
#: src/toolbar.c:1916
+#, fuzzy
msgid "Message will be signed"
-msgstr "Le message sera signé"
+msgstr "Message pour lequel une réponse a été envoyée"
#: src/toolbar.c:1918
+#, fuzzy
msgid "Message will not be signed"
-msgstr "Le message ne sera pas signé"
+msgstr "Message appartenant à un fil de discussion ignoré"
#: src/toolbar.c:1937
+#, fuzzy
msgid "Message will be encrypted"
-msgstr "Le message sera chiffré"
+msgstr "Même si le message doit être chiffré"
#: src/toolbar.c:1939
+#, fuzzy
msgid "Message will not be encrypted"
-msgstr "Le message ne sera pas chiffré"
+msgstr "Même si le message doit être chiffré"
#: src/toolbar.c:2289
msgid "Go to folder list"
commit 71d3173258c25cfbb449fee7a9c2ef49de869737
Author: wwp <wwp at free.fr>
Date: Tue Aug 14 16:25:14 2018 +0200
Update French translation (more to come).
diff --git a/po/fr.po b/po/fr.po
index cb8d5c4..6b54f99 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-05-25 18:50+0200\n"
-"PO-Revision-Date: 2018-05-25 19:01+0100\n"
+"POT-Creation-Date: 2018-08-08 07:59+0100\n"
+"PO-Revision-Date: 2018-08-14 16:24+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -26,7 +26,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Poedit 1.6.11\n"
-#: src/account.c:395 src/account.c:462
+#: src/account.c:401 src/account.c:468
msgid ""
"Some composing windows are open.\n"
"Please close all the composing windows before editing accounts."
@@ -34,15 +34,15 @@ msgstr ""
"Des fenêtres de composition de message sont ouvertes.\n"
"Veuillez toutes les fermer avant de pouvoir configurer les comptes."
-#: src/account.c:440
+#: src/account.c:446
msgid "Can't create folder."
msgstr "Impossible de créer le dossier."
-#: src/account.c:728
+#: src/account.c:734
msgid "Edit accounts"
msgstr "Édition des comptes"
-#: src/account.c:745
+#: src/account.c:751
msgid ""
"Using 'Get Mail' will retrieve messages from your Accounts in the order "
"given, the checkbox indicates which accounts will be included. Bold text "
@@ -52,61 +52,61 @@ msgstr ""
"comptes suivants, les cases à cocher de la colonne 'R' indiquant lesquels "
"seront concernés par cette relève. Le compte en gras est celui par défaut."
-#: src/account.c:816
+#: src/account.c:822
msgid " _Set as default account "
msgstr "Définir comme comp_te par défaut"
-#: src/account.c:908
+#: src/account.c:914
msgid "Accounts with remote folders cannot be copied."
msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
-#: src/account.c:915
+#: src/account.c:921
#, c-format
msgid "Copy of %s"
msgstr "Copie de %s"
-#: src/account.c:1098
+#: src/account.c:1118
#, c-format
msgid "Do you really want to delete the account '%s'?"
msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
-#: src/account.c:1100
+#: src/account.c:1120
msgid "(Untitled)"
msgstr "(Sans titre)"
-#: src/account.c:1101
+#: src/account.c:1121
msgid "Delete account"
msgstr "Supprimer le compte"
-#: src/account.c:1591
+#: src/account.c:1595
msgctxt "Accounts List Get Column Name"
msgid "G"
msgstr "R"
-#: src/account.c:1597
+#: src/account.c:1601
msgid "'Get Mail' retrieves mail from the checked accounts"
msgstr ""
"La fonctionnalité « Relever » récupèrera le courrier des comptes cochés"
-#: src/account.c:1604 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/account.c:1608 src/addrduplicates.c:471 src/addressadd.c:222
#: src/addressbook.c:127 src/compose.c:7413 src/editaddress.c:1472
#: src/editaddress.c:1501 src/editaddress.c:1517
-#: src/editaddress_other_attributes_ldap.c:387
-#: src/editaddress_other_attributes_ldap.c:408 src/editbook.c:170
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:469
#: src/plugins/pdf_viewer/poppler_viewer.c:1828
-#: src/plugins/pgpcore/select-keys.c:476 src/prefs_filtering.c:384
+#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
msgid "Name"
msgstr "Nom"
-#: src/account.c:1612 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1616 src/prefs_account.c:1200 src/prefs_account.c:4622
msgid "Protocol"
msgstr "Protocole"
-#: src/account.c:1620 src/ssl_manager.c:100
+#: src/account.c:1624 src/ssl_manager.c:100
msgid "Server"
msgstr "Serveur"
@@ -161,10 +161,10 @@ msgstr ""
#: src/action.c:988 src/compose.c:5222 src/compose.c:5227 src/ldaputil.c:333
#: src/plugins/bogofilter/bogofilter.c:857
#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1822
-#: src/plugins/vcalendar/vcal_folder.c:1826
-#: src/plugins/vcalendar/vcal_folder.c:1839
-#: src/plugins/vcalendar/vcal_folder.c:1842 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1823
+#: src/plugins/vcalendar/vcal_folder.c:1827
+#: src/plugins/vcalendar/vcal_folder.c:1845
+#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:62
msgid "Unknown error"
msgstr "Erreur inconnue"
@@ -370,7 +370,7 @@ msgid "Duplicate email addresses"
msgstr "Adresses email en double"
#: src/addrduplicates.c:442 src/addressadd.c:234
-#: src/plugins/pgpcore/select-keys.c:482 src/toolbar.c:529
+#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
msgid "Address"
msgstr "Adresse"
@@ -409,7 +409,7 @@ msgstr "Contact"
msgid "Remarks"
msgstr "Remarques"
-#: src/addressadd.c:286 src/addressbook_foldersel.c:180
+#: src/addressadd.c:286 src/addressbook_foldersel.c:158
msgid "Select Address Book Folder"
msgstr "Sélectionner un dossier"
@@ -433,17 +433,17 @@ msgstr "_Carnet"
#: src/addressbook.c:405 src/addressbook.c:436 src/addressbook.c:465
#: src/addressbook.c:482 src/compose.c:604 src/mainwindow.c:515
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/messageview.c:210 src/plugins/managesieve/sieve_editor.c:82
msgid "_Edit"
msgstr "_Édition"
#: src/addressbook.c:406 src/compose.c:609 src/mainwindow.c:518
-#: src/messageview.c:212
+#: src/messageview.c:213
msgid "_Tools"
msgstr "Ou_tils"
#: src/addressbook.c:407 src/compose.c:610 src/mainwindow.c:520
-#: src/messageview.c:213
+#: src/messageview.c:214
msgid "_Help"
msgstr "_Aide"
@@ -465,7 +465,7 @@ msgstr "Nouveau carnet _JPilot"
#: src/addressbook.c:419
msgid "New LDAP _Server"
-msgstr "Nouveau _serveur LDAP"
+msgstr "Configuration d'un nouveau _serveur LDAP"
#: src/addressbook.c:423
msgid "_Edit book"
@@ -482,13 +482,13 @@ msgstr "Supp_rimer le carnet"
msgid "_Save"
msgstr "Enregi_strer"
-#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:222
+#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:223
#: src/plugins/managesieve/sieve_editor.c:88
#: src/plugins/managesieve/sieve_editor.c:631
msgid "_Close"
msgstr "_Fermer"
-#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:227
msgid "_Select all"
msgstr "_Sélectionner tout"
@@ -497,7 +497,7 @@ msgid "C_ut"
msgstr "Co_uper"
#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:633 src/mainwindow.c:549 src/messageview.c:225
+#: src/compose.c:633 src/mainwindow.c:549 src/messageview.c:226
#: src/plugins/managesieve/sieve_editor.c:96
msgid "_Copy"
msgstr "_Copier"
@@ -552,7 +552,7 @@ msgid "Edit custom attributes..."
msgstr "Personnaliser les _attributs.."
#: src/addressbook.c:458 src/compose.c:711 src/mainwindow.c:814
-#: src/messageview.c:337
+#: src/messageview.c:338
msgid "_About"
msgstr "À _propos"
@@ -561,7 +561,7 @@ msgid "_Browse Entry"
msgstr "_Parcourir l'entrée"
#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:260 src/plugins/pgpcore/sgpgme.c:143
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:143
#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:403
#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
#: src/prefs_themes.c:851 src/prefs_themes.c:852
@@ -614,7 +614,7 @@ msgstr "Chemin non spécifié."
#: src/addressbook.c:535
msgid "Error connecting to LDAP server"
-msgstr "Erreur de connexion au serveur LDAP"
+msgstr "Erreur lors de la connexion au serveur LDAP"
#: src/addressbook.c:536
msgid "Error initializing LDAP"
@@ -622,31 +622,32 @@ msgstr "Erreur d'initialisation LDAP"
#: src/addressbook.c:537
msgid "Error binding to LDAP server"
-msgstr "Erreur de liaison au serveur LDAP"
+msgstr "Erreur lors de la liaison avec le serveur LDAP"
#: src/addressbook.c:538
msgid "Error searching LDAP database"
-msgstr "Erreur de recherche dans la base de données LDAP"
+msgstr "Erreur lors de la recherche de la base de données LDAP"
#: src/addressbook.c:539
msgid "Timeout performing LDAP operation"
-msgstr "Dépassement de délai d'attente lors d'une opération LDAP"
+msgstr "Délai excédé lors d'une opération LDAP"
#: src/addressbook.c:540
msgid "Error in LDAP search criteria"
-msgstr "Erreur de critère de recherche LDAP"
+msgstr "Erreur dans le critère de recherche LDAP"
#: src/addressbook.c:541
msgid "No LDAP entries found for search criteria"
-msgstr "Aucune entrée LDAP ne correspond au critère de recherche"
+msgstr ""
+"Aucune entrée LDAP correspondante au critère de recherche n'a été trouvée"
#: src/addressbook.c:542
msgid "LDAP search terminated on request"
-msgstr "Recherche LDAP interrompue par l'utilisateur"
+msgstr "Recherche LDAP interrompue conformément à la demande"
#: src/addressbook.c:543
msgid "Error starting STARTTLS connection"
-msgstr "Erreur de connexion STARTTLS"
+msgstr "Erreur lors de l'établissement de la connexion STARTTLS"
#: src/addressbook.c:544
msgid "Distinguished Name (dn) is missing"
@@ -669,7 +670,7 @@ msgid "Sources"
msgstr "Sources"
#: src/addressbook.c:919 src/prefs_matcher.c:631 src/prefs_other.c:488
-#: src/toolbar.c:268 src/toolbar.c:2519
+#: src/toolbar.c:268 src/toolbar.c:2522
msgid "Address book"
msgstr "Carnet d'adresses"
@@ -836,7 +837,7 @@ msgid "Person"
msgstr "Contact"
#: src/addressbook.c:5025 src/exporthtml.c:884 src/folderview.c:354
-#: src/folderview.c:442 src/prefs_account.c:2860 src/prefs_folder_column.c:77
+#: src/folderview.c:442 src/prefs_account.c:3169 src/prefs_folder_column.c:77
msgid "Folder"
msgstr "Dossier"
@@ -856,7 +857,7 @@ msgstr "Serveurs LDAP"
msgid "LDAP Query"
msgstr "Requête LDAP"
-#: src/addressbook_foldersel.c:222 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
#: src/exporthtml.c:984 src/importldif.c:541
msgid "Address Book"
msgstr "Carnet d'adresses"
@@ -968,12 +969,12 @@ msgstr "Information"
#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
#: src/compose.c:12180 src/file_checker.c:78 src/file_checker.c:101
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5015
+#: src/messageview.c:856 src/plugins/pgpcore/sgpgme.c:806
+#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5024
msgid "Warning"
msgstr "Alerte"
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:664
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:719
#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
msgid "Error"
msgstr "Erreur"
@@ -1096,7 +1097,7 @@ msgstr ""
"La version de Claws Mail actuellement utilisée est trop ancienne pour le "
"module."
-#: src/common/session.c:183 src/imap.c:1207
+#: src/common/session.c:202 src/imap.c:1225
msgid "SSL/TLS handshake failed\n"
msgstr "Échec de la négociation SSL/TLS\n"
@@ -1131,28 +1132,28 @@ msgstr "Impossible d'initier une session STARTTLS\n"
#: src/common/socket.c:573
msgid "Socket IO timeout.\n"
-msgstr "Dépassement du délai d'attente lors d'entrées/sorties socket.\n"
+msgstr "Dépassement du delai d'attente lors d'entrées/sorties socket.\n"
#: src/common/socket.c:602
msgid "Connection timed out.\n"
-msgstr "Dépassement du délai d'établissement de la connexion.\n"
+msgstr "Dépassement du délai d'attente de la connexion.\n"
-#: src/common/socket.c:736
+#: src/common/socket.c:742
#, c-format
msgid "%s:%d: connection failed (%s).\n"
msgstr "%s:%d : la connexion a échoué (%s).\n"
-#: src/common/socket.c:976
+#: src/common/socket.c:982
#, c-format
msgid "%s:%d: unknown host.\n"
msgstr "%s:%d : hôte inconnu.\n"
-#: src/common/socket.c:1068
+#: src/common/socket.c:1074
#, c-format
msgid "%s:%s: host lookup failed (%s).\n"
msgstr "%s:%s : échec de la recherche de l'hôte (%s).\n"
-#: src/common/socket.c:1372
+#: src/common/socket.c:1378
#, c-format
msgid "write on fd%d: %s\n"
msgstr "écriture sur fd%d : %s\n"
@@ -1242,232 +1243,232 @@ msgstr "<non spécifié dans le certificat>"
msgid "(Subject cleared by RegExp)"
msgstr "(Sujet supprimé par RegExp)"
-#: src/common/utils.c:238
+#: src/common/utils.c:220
#, c-format
msgid "%dB"
msgstr "%do"
-#: src/common/utils.c:239
+#: src/common/utils.c:221
#, c-format
msgid "%d.%02dKB"
msgstr "%d.%02dko"
-#: src/common/utils.c:240
+#: src/common/utils.c:222
#, c-format
msgid "%d.%02dMB"
msgstr "%d.%02dMo"
-#: src/common/utils.c:241
+#: src/common/utils.c:223
#, c-format
msgid "%.2fGB"
msgstr "%.2fGo"
-#: src/common/utils.c:4767
+#: src/common/utils.c:4749
msgctxt "Complete day name for use by strftime"
msgid "Sunday"
msgstr "Dimanche"
-#: src/common/utils.c:4768
+#: src/common/utils.c:4750
msgctxt "Complete day name for use by strftime"
msgid "Monday"
msgstr "Lundi"
-#: src/common/utils.c:4769
+#: src/common/utils.c:4751
msgctxt "Complete day name for use by strftime"
msgid "Tuesday"
msgstr "Mardi"
-#: src/common/utils.c:4770
+#: src/common/utils.c:4752
msgctxt "Complete day name for use by strftime"
msgid "Wednesday"
msgstr "Mercredi"
-#: src/common/utils.c:4771
+#: src/common/utils.c:4753
msgctxt "Complete day name for use by strftime"
msgid "Thursday"
msgstr "Jeudi"
-#: src/common/utils.c:4772
+#: src/common/utils.c:4754
msgctxt "Complete day name for use by strftime"
msgid "Friday"
msgstr "Vendredi"
-#: src/common/utils.c:4773
+#: src/common/utils.c:4755
msgctxt "Complete day name for use by strftime"
msgid "Saturday"
msgstr "Samedi"
-#: src/common/utils.c:4775
+#: src/common/utils.c:4757
msgctxt "Complete month name for use by strftime"
msgid "January"
msgstr "Janvier"
-#: src/common/utils.c:4776
+#: src/common/utils.c:4758
msgctxt "Complete month name for use by strftime"
msgid "February"
msgstr "Février"
-#: src/common/utils.c:4777
+#: src/common/utils.c:4759
msgctxt "Complete month name for use by strftime"
msgid "March"
msgstr "Mars"
-#: src/common/utils.c:4778
+#: src/common/utils.c:4760
msgctxt "Complete month name for use by strftime"
msgid "April"
msgstr "Avril"
-#: src/common/utils.c:4779
+#: src/common/utils.c:4761
msgctxt "Complete month name for use by strftime"
msgid "May"
msgstr "Mai"
-#: src/common/utils.c:4780
+#: src/common/utils.c:4762
msgctxt "Complete month name for use by strftime"
msgid "June"
msgstr "Juin"
-#: src/common/utils.c:4781
+#: src/common/utils.c:4763
msgctxt "Complete month name for use by strftime"
msgid "July"
msgstr "Juillet"
-#: src/common/utils.c:4782
+#: src/common/utils.c:4764
msgctxt "Complete month name for use by strftime"
msgid "August"
msgstr "Août"
-#: src/common/utils.c:4783
+#: src/common/utils.c:4765
msgctxt "Complete month name for use by strftime"
msgid "September"
msgstr "Septembre"
-#: src/common/utils.c:4784
+#: src/common/utils.c:4766
msgctxt "Complete month name for use by strftime"
msgid "October"
msgstr "Octobre"
-#: src/common/utils.c:4785
+#: src/common/utils.c:4767
msgctxt "Complete month name for use by strftime"
msgid "November"
msgstr "Novembre"
-#: src/common/utils.c:4786
+#: src/common/utils.c:4768
msgctxt "Complete month name for use by strftime"
msgid "December"
msgstr "Décembre"
-#: src/common/utils.c:4788
+#: src/common/utils.c:4770
msgctxt "Abbr. day name for use by strftime"
msgid "Sun"
msgstr "Dim"
-#: src/common/utils.c:4789
+#: src/common/utils.c:4771
msgctxt "Abbr. day name for use by strftime"
msgid "Mon"
msgstr "Lun"
-#: src/common/utils.c:4790
+#: src/common/utils.c:4772
msgctxt "Abbr. day name for use by strftime"
msgid "Tue"
msgstr "Mar"
-#: src/common/utils.c:4791
+#: src/common/utils.c:4773
msgctxt "Abbr. day name for use by strftime"
msgid "Wed"
msgstr "Mer"
-#: src/common/utils.c:4792
+#: src/common/utils.c:4774
msgctxt "Abbr. day name for use by strftime"
msgid "Thu"
msgstr "Jeu"
-#: src/common/utils.c:4793
+#: src/common/utils.c:4775
msgctxt "Abbr. day name for use by strftime"
msgid "Fri"
msgstr "Ven"
-#: src/common/utils.c:4794
+#: src/common/utils.c:4776
msgctxt "Abbr. day name for use by strftime"
msgid "Sat"
msgstr "Sam"
-#: src/common/utils.c:4796
+#: src/common/utils.c:4778
msgctxt "Abbr. month name for use by strftime"
msgid "Jan"
msgstr "Jan"
-#: src/common/utils.c:4797
+#: src/common/utils.c:4779
msgctxt "Abbr. month name for use by strftime"
msgid "Feb"
msgstr "Fév"
-#: src/common/utils.c:4798
+#: src/common/utils.c:4780
msgctxt "Abbr. month name for use by strftime"
msgid "Mar"
msgstr "Mar"
-#: src/common/utils.c:4799
+#: src/common/utils.c:4781
msgctxt "Abbr. month name for use by strftime"
msgid "Apr"
msgstr "Avr"
-#: src/common/utils.c:4800
+#: src/common/utils.c:4782
msgctxt "Abbr. month name for use by strftime"
msgid "May"
msgstr "Mai"
-#: src/common/utils.c:4801
+#: src/common/utils.c:4783
msgctxt "Abbr. month name for use by strftime"
msgid "Jun"
msgstr "Jun"
-#: src/common/utils.c:4802
+#: src/common/utils.c:4784
msgctxt "Abbr. month name for use by strftime"
msgid "Jul"
msgstr "Jui"
-#: src/common/utils.c:4803
+#: src/common/utils.c:4785
msgctxt "Abbr. month name for use by strftime"
msgid "Aug"
msgstr "Aoû"
-#: src/common/utils.c:4804
+#: src/common/utils.c:4786
msgctxt "Abbr. month name for use by strftime"
msgid "Sep"
msgstr "Sep"
-#: src/common/utils.c:4805
+#: src/common/utils.c:4787
msgctxt "Abbr. month name for use by strftime"
msgid "Oct"
msgstr "Oct"
-#: src/common/utils.c:4806
+#: src/common/utils.c:4788
msgctxt "Abbr. month name for use by strftime"
msgid "Nov"
msgstr "Nov"
-#: src/common/utils.c:4807
+#: src/common/utils.c:4789
msgctxt "Abbr. month name for use by strftime"
msgid "Dec"
msgstr "Déc"
-#: src/common/utils.c:4818
+#: src/common/utils.c:4800
msgctxt "For use by strftime (morning)"
msgid "AM"
msgstr "AM"
-#: src/common/utils.c:4819
+#: src/common/utils.c:4801
msgctxt "For use by strftime (afternoon)"
msgid "PM"
msgstr "PM"
-#: src/common/utils.c:4820
+#: src/common/utils.c:4802
msgctxt "For use by strftime (morning, lowercase)"
msgid "am"
msgstr "am"
-#: src/common/utils.c:4821
+#: src/common/utils.c:4803
msgctxt "For use by strftime (afternoon, lowercase)"
msgid "pm"
msgstr "pm"
@@ -1477,7 +1478,7 @@ msgid "_Add..."
msgstr "_Ajouter.."
#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/plugins/rssyl/rssyl_cb_menu.c:326
msgid "_Remove"
msgstr "Enleve_r"
@@ -1485,7 +1486,7 @@ msgstr "Enleve_r"
msgid "_Properties..."
msgstr "_Propriétés.."
-#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:211
+#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:212
msgid "_Message"
msgstr "_Message"
@@ -1618,7 +1619,7 @@ msgstr "_Effacer la ligne"
msgid "Delete to end of line"
msgstr "Supprimer _jusqu'à la fin de la ligne"
-#: src/compose.c:660 src/messageview.c:228
+#: src/compose.c:660 src/messageview.c:229
#: src/plugins/managesieve/sieve_editor.c:102
msgid "_Find"
msgstr "Chercher dans le _message.."
@@ -1663,47 +1664,47 @@ msgstr "S_ystème de confidentialité"
msgid "_Priority"
msgstr "_Priorité"
-#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:264
+#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:265
msgid "Character _encoding"
msgstr "_Jeux de caractères"
-#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:269
+#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:270
msgid "Western European"
msgstr "Europe de l'Ouest"
-#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:270
+#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:271
msgid "Baltic"
msgstr "Baltique"
-#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:271
+#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:272
msgid "Hebrew"
msgstr "Hébreu"
-#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:272
+#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:273
msgid "Arabic"
msgstr "Arabe"
-#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:273
+#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:274
msgid "Cyrillic"
msgstr "Cyrillique"
-#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:274
+#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:275
msgid "Japanese"
msgstr "Japonais"
-#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:275
+#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:276
msgid "Chinese"
msgstr "Chinois"
-#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:276
+#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:277
msgid "Korean"
msgstr "Coréen"
-#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:277
+#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:278
msgid "Thai"
msgstr "Thaïlandais"
-#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:313
+#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:314
msgid "_Address book"
msgstr "_Carnet d'adresses"
@@ -1711,7 +1712,7 @@ msgstr "_Carnet d'adresses"
msgid "_Template"
msgstr "_Modèles"
-#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:333
+#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:334
msgid "Actio_ns"
msgstr "_Actions"
@@ -1747,11 +1748,11 @@ msgstr "Afficher la _règle"
msgid "_Normal"
msgstr "_Normale"
-#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:302
+#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:303
msgid "_All"
msgstr "À _tous"
-#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:303
+#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:304
msgid "_Sender"
msgstr "À l'_expéditeur"
@@ -1775,27 +1776,27 @@ msgstr "Ba_sse"
msgid "_Lowest"
msgstr "La plus _basse"
-#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:350
+#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:351
msgid "_Automatic"
msgstr "_Détection automatique"
-#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:351
+#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:352
msgid "7bit ASCII (US-ASC_II)"
msgstr "ASC_II 7 bits (US-ASCII)"
-#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:352
+#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:353
msgid "Unicode (_UTF-8)"
msgstr "_Unicode (UTF-8)"
-#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:357
msgid "Central European (ISO-8859-_2)"
msgstr "Europe Centrale (ISO-8859-_2)"
-#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:359
+#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:360
msgid "Greek (ISO-8859-_7)"
msgstr "Grec (ISO-8859-_7)"
-#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:364
+#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:365
msgid "Turkish (ISO-8859-_9)"
msgstr "Turc (ISO-8859-_9)"
@@ -1875,7 +1876,7 @@ msgid "In-Reply-To:"
msgstr "En-réponse-à:"
#: src/compose.c:2619 src/compose.c:4968 src/compose.c:4976
-#: src/gtk/headers.h:13 src/summary_search.c:424
+#: src/gtk/headers.h:13 src/summary_search.c:423
msgid "To:"
msgstr "À:"
@@ -1968,7 +1969,7 @@ msgstr "[Pas de sujet] - Composition d'un message%s"
msgid "Compose message"
msgstr "Composition d'un message"
-#: src/compose.c:4853 src/messageview.c:903
+#: src/compose.c:4853 src/messageview.c:885
msgid ""
"Account for sending mail is not specified.\n"
"Please select a mail account before sending."
@@ -1984,14 +1985,13 @@ msgstr ""
"envoyer le message ?"
#: src/compose.c:5070 src/compose.c:5107 src/compose.c:5145 src/compose.c:5188
-#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
+#: src/prefs_account.c:3754 src/toolbar.c:487 src/toolbar.c:519
msgid "Send"
msgstr "Envoyer"
#: src/compose.c:5072 src/compose.c:5109 src/compose.c:5146 src/compose.c:5189
-#: src/compose.c:5751 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:218
-#: src/toolbar.c:3030
+#: src/compose.c:5751 src/folderview.c:2543 src/messageview.c:857
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3042
msgid "_Send"
msgstr "_Envoyer"
@@ -2062,7 +2062,7 @@ msgid ""
msgstr ""
"Impossible de mettre le message en file d'attente d'envoi :\n"
"\n"
-"Le chiffrage a échoué : %s"
+"Le chiffrement a échoué : %s"
#: src/compose.c:5230
msgid ""
@@ -2148,7 +2148,7 @@ msgstr ""
msgid "Attachment %s doesn't exist anymore. Ignore?"
msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
-#: src/compose.c:6342 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2560
+#: src/compose.c:6342 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
msgid "Cancel sending"
msgstr "Interrompre l'envoi"
@@ -2177,7 +2177,7 @@ msgstr "Taper <tab> pour utiliser à la complétion depuis le carnet d'adresse"
msgid "Mime type"
msgstr "Type Mime"
-#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:464
+#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:451
#: src/prefs_matcher.c:629 src/prefs_summaries.c:441
#: src/prefs_summary_column.c:84 src/summaryview.c:449
msgid "Size"
@@ -2302,7 +2302,7 @@ msgstr ""
"Voulez-vous forcer sa fermeture ?\n"
"Identifiant du groupe de processus : %d"
-#: src/compose.c:10202 src/messageview.c:1105
+#: src/compose.c:10202 src/messageview.c:1086
msgid "Claws Mail needs network access in order to send this email."
msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
@@ -2532,7 +2532,7 @@ msgstr "Édition des coordonnées d'un contact"
msgid "An Email address must be supplied."
msgstr "L'adresse email est requise."
-#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:221
+#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:205
msgid "A Name and Value must be supplied."
msgstr "Un nom et une valeur sont requis."
@@ -2595,8 +2595,8 @@ msgid "Alias"
msgstr "Alias"
#: src/editaddress.c:1477 src/editaddress.c:1510 src/editaddress.c:1526
-#: src/editaddress_other_attributes_ldap.c:392
-#: src/editaddress_other_attributes_ldap.c:429 src/prefs_customheader.c:221
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:221
msgid "Value"
msgstr "Valeur"
@@ -2642,7 +2642,7 @@ msgid " Check File "
msgstr " Vérifier le fichier "
#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2173
#: src/wizard.c:1197 src/wizard.c:1617
msgid "File"
msgstr "Fichier"
@@ -2726,12 +2726,14 @@ msgstr "Ajouter une donnée JPilot"
msgid "Edit LDAP - Select Search Base"
msgstr "LDAP - Sélection de bases de recherches"
-#: src/editldap_basedn.c:172 src/editldap.c:440
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2925
+#: src/prefs_proxy.c:98
msgid "Hostname"
msgstr "Hôte"
#: src/editldap_basedn.c:182 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/ssl_manager.c:108
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2932
+#: src/prefs_proxy.c:105 src/ssl_manager.c:108
msgid "Port"
msgstr "Port"
@@ -2791,7 +2793,7 @@ msgstr ""
msgid "STARTTLS"
msgstr "STARTTLS"
-#: src/editldap.c:469 src/prefs_account.c:3478
+#: src/editldap.c:469 src/prefs_account.c:3827
msgid "SSL/TLS"
msgstr "SSL/TLS"
@@ -2955,8 +2957,9 @@ msgstr "Mot de passe de connexion"
msgid "The password to be used when connecting as the \"Bind DN\" user."
msgstr "Le mot de passe de l'utilisateur « Bind DN »."
-#: src/editldap.c:738 src/prefs_account.c:1314 src/prefs_account.c:1868
-#: src/prefs_account.c:2587 src/prefs_account.c:2615
+#: src/editldap.c:738 src/prefs_account.c:1406 src/prefs_account.c:2018
+#: src/prefs_account.c:2737 src/prefs_account.c:2765 src/prefs_account.c:2970
+#: src/prefs_proxy.c:146
msgid "Show password"
msgstr "Afficher le mot de passe"
@@ -2977,7 +2980,7 @@ msgid ""
"The maximum number of entries that should be returned in the search result."
msgstr "Le nombre maximal d'entrées à retourner lors d'une recherche."
-#: src/editldap.c:792 src/prefs_account.c:3369
+#: src/editldap.c:792 src/prefs_account.c:3718
msgid "Basic"
msgstr "Général"
@@ -3053,13 +3056,13 @@ msgstr "Ajouter une entrée vCard"
msgid "Impossible to set the client certificate.\n"
msgstr "Impossible de définir le certificat client.\n"
-#: src/etpan/nntp-thread.c:865
+#: src/etpan/nntp-thread.c:939
msgid "couldn't get xover range\n"
-msgstr "impossible d'obtenir le xover range.\n"
+msgstr "Impossible d'obtenir le xover range\n"
-#: src/etpan/nntp-thread.c:964
+#: src/etpan/nntp-thread.c:1038
msgid "couldn't get xhdr range\n"
-msgstr "impossible d'obtenir le xhdr range\n"
+msgstr "Impossible d'obtenir le xhdr range\n"
#: src/exphtmldlg.c:105
msgid "Please specify output directory and file to create."
@@ -3123,8 +3126,8 @@ msgstr "Feuille de style"
#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1577
#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:125 src/mainwindow.c:1170
#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6188
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1041
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6197
msgid "None"
msgstr "Aucun"
@@ -3133,7 +3136,7 @@ msgstr "Aucun"
msgid "Default"
msgstr "Par défaut"
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:253
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
msgid "Full"
msgstr "Complet"
@@ -3364,7 +3367,7 @@ msgstr "Exporter le carnet d'adresses vers un ficher LDIF"
msgid "Distinguished Name"
msgstr "Nom absolu (DN)"
-#: src/export.c:113 src/summaryview.c:8360
+#: src/export.c:113 src/summaryview.c:8369
msgid "Export to mbox file"
msgstr "Exporter la sélection en fichier mbox"
@@ -3695,7 +3698,7 @@ msgstr "NouveauDossier"
#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2058
+#: src/plugins/vcalendar/vcal_folder.c:2064
#, c-format
msgid "'%c' can't be included in folder name."
msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
@@ -3703,7 +3706,7 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
#: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2065
+#: src/plugins/vcalendar/vcal_folder.c:2071
#, c-format
msgid "The folder '%s' already exists."
msgstr "Le dossier '%s' existe déjà."
@@ -3753,13 +3756,13 @@ msgstr "_Envoyer les messages.."
#: src/folderview.c:396 src/folderview.c:443
#: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6462
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6471
msgid "New"
msgstr "Nouveau"
#: src/folderview.c:397 src/folderview.c:444
#: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6464
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6473
#: src/toolbar.c:512
msgid "Unread"
msgstr "Non lu"
@@ -3778,7 +3781,7 @@ msgstr "#"
msgid "Setting folder info..."
msgstr "Initialisation des données des dossiers.."
-#: src/folderview.c:866 src/summaryview.c:4226
+#: src/folderview.c:866 src/summaryview.c:4235
msgid "Mark all as read"
msgstr "Marquer tous comme lus"
@@ -3790,12 +3793,12 @@ msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
"dossiers comme lus ?"
-#: src/folderview.c:869 src/summaryview.c:4227
+#: src/folderview.c:869 src/summaryview.c:4236
msgid "Do you really want to mark all mails in this folder as read?"
msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
-#: src/folderview.c:872 src/summaryview.c:4272
+#: src/folderview.c:872 src/summaryview.c:4281
msgid "Mark all as unread"
msgstr "Marquer tous comme non l_us"
@@ -3807,17 +3810,17 @@ msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
"dossiers comme non lus ?"
-#: src/folderview.c:875 src/summaryview.c:4273
+#: src/folderview.c:875 src/summaryview.c:4282
msgid "Do you really want to mark all mails in this folder as unread?"
msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier comme non lus ?"
-#: src/folderview.c:1065 src/imap.c:4614
+#: src/folderview.c:1065 src/imap.c:4631
#, c-format
msgid "Scanning folder %s/%s..."
msgstr "Analyse du dossier %s/%s.."
-#: src/folderview.c:1068 src/imap.c:4618 src/mainwindow.c:5237 src/setup.c:96
+#: src/folderview.c:1068 src/imap.c:4635 src/mainwindow.c:5235 src/setup.c:96
#, c-format
msgid "Scanning folder %s..."
msgstr "Analyse du dossier %s.."
@@ -3876,29 +3879,29 @@ msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
msgid "_Empty trash"
msgstr "_Vider"
-#: src/folderview.c:2529 src/inc.c:1534 src/toolbar.c:3008
+#: src/folderview.c:2529 src/inc.c:1635 src/toolbar.c:3020
msgid "Offline warning"
msgstr "Travail hors-ligne"
-#: src/folderview.c:2530 src/toolbar.c:3009
+#: src/folderview.c:2530 src/toolbar.c:3021
msgid "You're working offline. Override?"
msgstr ""
"Attention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
"l'avertissement ?"
-#: src/folderview.c:2541 src/toolbar.c:3028
+#: src/folderview.c:2541 src/toolbar.c:3040
msgid "Send queued messages"
msgstr "Envoyer les messages en file d'attente"
-#: src/folderview.c:2542 src/toolbar.c:3029
+#: src/folderview.c:2542 src/toolbar.c:3041
msgid "Send all queued messages?"
msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
-#: src/folderview.c:2551 src/toolbar.c:3048
+#: src/folderview.c:2551 src/toolbar.c:3060
msgid "Some errors occurred while sending queued messages."
msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
-#: src/folderview.c:2554 src/main.c:2787 src/toolbar.c:3051
+#: src/folderview.c:2554 src/main.c:2792 src/toolbar.c:3063
#, c-format
msgid ""
"Some errors occurred while sending queued messages:\n"
@@ -3967,7 +3970,7 @@ msgstr "Le déplacement a échoué."
msgid "Processing configuration for folder %s"
msgstr "Options de filtrage/traitement du dossier %s"
-#: src/folderview.c:3176 src/summaryview.c:4681 src/summaryview.c:4787
+#: src/folderview.c:3176 src/summaryview.c:4690 src/summaryview.c:4796
msgid "The destination folder can only be used to store subfolders."
msgstr ""
"Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4218,44 +4221,44 @@ msgstr ""
"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
"avec ce programme. Si ça n'était pas le cas, veuillez consulter "
-#: src/gtk/about.c:717 src/main.c:2611
+#: src/gtk/about.c:717 src/main.c:2616
msgid "Session statistics\n"
msgstr "Statistiques de la session\n"
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2621 src/main.c:2624
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2626 src/main.c:2629
#, c-format
msgid "Started: %s\n"
msgstr "Démarrée le : %s\n"
-#: src/gtk/about.c:737 src/main.c:2630
+#: src/gtk/about.c:737 src/main.c:2635
msgid "Incoming traffic\n"
msgstr "Trafic entrant\n"
-#: src/gtk/about.c:740 src/main.c:2633
+#: src/gtk/about.c:740 src/main.c:2638
#, c-format
msgid "Received messages: %d\n"
msgstr "Messages reçus : %d\n"
-#: src/gtk/about.c:747 src/main.c:2639
+#: src/gtk/about.c:747 src/main.c:2644
msgid "Outgoing traffic\n"
msgstr "Trafic sortant\n"
-#: src/gtk/about.c:750 src/main.c:2642
+#: src/gtk/about.c:750 src/main.c:2647
#, c-format
msgid "New/redirected messages: %d\n"
msgstr "Nouveaux messages et redirections : %d\n"
-#: src/gtk/about.c:755 src/main.c:2646
+#: src/gtk/about.c:755 src/main.c:2651
#, c-format
msgid "Replied messages: %d\n"
msgstr "Réponses : %d\n"
-#: src/gtk/about.c:760 src/main.c:2650
+#: src/gtk/about.c:760 src/main.c:2655
#, c-format
msgid "Forwarded messages: %d\n"
msgstr "Messages transférés : %d\n"
-#: src/gtk/about.c:765 src/main.c:2654
+#: src/gtk/about.c:765 src/main.c:2659
#, c-format
msgid "Total outgoing messages: %d\n"
msgstr "Total des messages sortants : %d\n"
@@ -4288,63 +4291,63 @@ msgstr "_Notes de version"
msgid "_Statistics"
msgstr "_Statistiques"
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:363
msgid "Orange"
msgstr "Orange"
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:367
msgid "Red"
msgstr "Rouge"
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:371
msgid "Pink"
msgstr "Rose"
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:375
msgid "Sky blue"
msgstr "Bleu ciel"
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:379
msgid "Blue"
msgstr "Bleu"
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:383
msgid "Green"
msgstr "Vert"
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:387
msgid "Brown"
msgstr "Brun"
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:391
msgid "Grey"
msgstr "Gris"
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:395
msgid "Light brown"
msgstr "Marron clair"
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:399
msgid "Dark red"
msgstr "Rouge foncé"
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:403
msgid "Dark pink"
msgstr "Rose foncé"
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:407
msgid "Steel blue"
msgstr "Bleu acier"
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:411
msgid "Gold"
msgstr "Or"
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:415
msgid "Bright green"
msgstr "Vert clair"
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:419
msgid "Magenta"
msgstr "Magenta"
@@ -4500,7 +4503,7 @@ msgstr "Date:"
msgid "From"
msgstr "De"
-#: src/gtk/headers.h:10 src/summary_search.c:417
+#: src/gtk/headers.h:10 src/summary_search.c:416
msgid "From:"
msgstr "De:"
@@ -4560,11 +4563,11 @@ msgid "Subject"
msgstr "Sujet"
#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:704
-#: src/summary_search.c:431
+#: src/summary_search.c:430
msgid "Subject:"
msgstr "Sujet:"
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:409
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
msgid "Comments"
msgstr "Commentaires"
@@ -4751,7 +4754,7 @@ msgstr "Précédence"
msgid "Precedence:"
msgstr "Précédence:"
-#: src/gtk/headers.h:46 src/prefs_account.c:1078
+#: src/gtk/headers.h:46 src/prefs_account.c:1170
msgid "Organization"
msgstr "Société"
@@ -5010,7 +5013,7 @@ msgstr "S'en souvenir"
#: src/gtk/logwindow.c:453
msgid "_Go to last error"
-msgstr "_Voir la dernière erreur"
+msgstr "_Atteindre la dernière erreur"
#: src/gtk/logwindow.c:460
msgid "Clear _Log"
@@ -5075,7 +5078,7 @@ msgstr ""
#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
#: src/plugins/gdata/cm_gdata_prefs.c:137
#: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:427
+#: src/plugins/managesieve/sieve_prefs.c:423
#: src/plugins/notification/notification_prefs.c:398
#: src/plugins/notification/notification_prefs.c:413
#: src/plugins/notification/notification_prefs.c:432
@@ -5084,7 +5087,7 @@ msgstr ""
#: src/plugins/notification/notification_prefs.c:486
#: src/plugins/notification/notification_prefs.c:504
#: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:685 src/plugins/pgpcore/prefs_gpg.c:705
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
#: src/plugins/rssyl/rssyl_prefs.c:70
#: src/plugins/spam_report/spam_report_prefs.c:82
#: src/plugins/spamassassin/spamassassin_gtk.c:670
@@ -5132,9 +5135,9 @@ msgid "_Hide"
msgstr "_Cacher"
#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:692
-#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
-#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
-#: src/prefs_account.c:3477 src/prefs_account.c:3570
+#: src/prefs_account.c:3717 src/prefs_account.c:3735 src/prefs_account.c:3753
+#: src/prefs_account.c:3771 src/prefs_account.c:3789 src/prefs_account.c:3807
+#: src/prefs_account.c:3826 src/prefs_account.c:3919 src/prefs_account.c:3937
#: src/prefs_filtering_action.c:1401 src/prefs_filtering.c:397
#: src/prefs_filtering.c:1883
msgid "Account"
@@ -5340,7 +5343,7 @@ msgstr ""
"Toutes les conditions de filtrage sont utilisables, mais ne peuvent être "
"combinées avec les expressions ci-dessus par des opérateurs logiques."
-#: src/gtk/quicksearch.c:537 src/summary_search.c:464
+#: src/gtk/quicksearch.c:537 src/summary_search.c:463
msgid "Extended Search"
msgstr "Recherche avancée"
@@ -5383,7 +5386,7 @@ msgstr "Sélection validante"
msgid "Clear the current search"
msgstr "Effacement de la recherche courante"
-#: src/gtk/quicksearch.c:794 src/summary_search.c:415
+#: src/gtk/quicksearch.c:794 src/summary_search.c:414
msgid "Edit search criteria"
msgstr "Édition des critères de recherche"
@@ -5551,14 +5554,14 @@ msgstr "Labels :"
#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
#: src/plugins/notification/notification_popup.c:620
#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3453
-#: src/summaryview.c:3471 src/summaryview.c:3501
+#: src/summaryview.c:3471 src/summaryview.c:3510
msgid "(No From)"
msgstr "(Pas d'expéditeur)"
#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
#: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3513
-#: src/summaryview.c:3516
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3522
+#: src/summaryview.c:3525
msgid "(No Subject)"
msgstr "(Pas de sujet)"
@@ -5853,16 +5856,16 @@ msgstr "La connexion vers %s a échoué."
msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
msgstr "La connexion IMAP vers %s a été rompue. Reconnexion..\n"
-#: src/imap.c:1039 src/imap.c:3664 src/imap.c:4323 src/imap.c:4417
-#: src/imap.c:4595 src/imap.c:5406
+#: src/imap.c:1039 src/imap.c:3681 src/imap.c:4340 src/imap.c:4434
+#: src/imap.c:4612 src/imap.c:5423
msgid "Claws Mail needs network access in order to access the IMAP server."
msgstr "Claws Mail nécessite un accès réseau pour accéder au serveur IMAP."
-#: src/imap.c:1148 src/inc.c:812 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1149 src/inc.c:869 src/news.c:400 src/send_message.c:284
msgid "Insecure connection"
msgstr "Connexion non sécurisée"
-#: src/imap.c:1149 src/inc.c:813 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1150 src/inc.c:870 src/news.c:401 src/send_message.c:285
msgid ""
"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
"not available in this build of Claws Mail. \n"
@@ -5876,108 +5879,108 @@ msgstr ""
"Voulez-vous quand même poursuivre la connexion à ce serveur même si la "
"communication ne peut pas être sécurisée ?"
-#: src/imap.c:1155 src/inc.c:819 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1156 src/inc.c:876 src/news.c:407 src/send_message.c:291
msgid "Con_tinue connecting"
msgstr "_Poursuivre la connexion"
-#: src/imap.c:1165
+#: src/imap.c:1166
#, c-format
msgid "Account '%s': Connecting to IMAP server: %s:%d..."
msgstr "Compte '%s' : Connexion au serveur IMA : %s:%d.."
-#: src/imap.c:1213
+#: src/imap.c:1231
#, c-format
msgid "Can't connect to IMAP server: %s:%d"
msgstr "Impossible de se connecter au serveur IMAP : %s:%d"
-#: src/imap.c:1216
+#: src/imap.c:1234
#, c-format
msgid "Can't connect to IMAP server: %s:%d\n"
msgstr "Impossible de se connecter au serveur IMAP : %s:%d\n"
-#: src/imap.c:1249 src/imap.c:4085
+#: src/imap.c:1266 src/imap.c:4102
msgid "Can't start STARTTLS session.\n"
msgstr "Impossible d'initier la session STARTTLS.\n"
-#: src/imap.c:1316
+#: src/imap.c:1333
#, c-format
msgid "Couldn't login to IMAP server %s.\n"
msgstr "Connexion impossible au serveur IMAP %s.\n"
-#: src/imap.c:1319
+#: src/imap.c:1336
#, c-format
msgid "Couldn't login to IMAP server %s."
msgstr "Authentification impossible au serveur IMAP %s."
-#: src/imap.c:1747
+#: src/imap.c:1764
msgid "Adding messages..."
msgstr "Ajout des messages en cours.."
-#: src/imap.c:1952 src/mh.c:529
+#: src/imap.c:1969 src/mh.c:529
msgid "Copying messages..."
msgstr "Copie des messages en cours.."
-#: src/imap.c:2474
+#: src/imap.c:2491
msgid "Search failed due to server error."
msgstr "Échec de la recherche dû à un problème de serveur."
-#: src/imap.c:2553
+#: src/imap.c:2570
msgid "can't set deleted flags\n"
msgstr "Impossible de marquer pour la suppression\n"
-#: src/imap.c:2560 src/imap.c:5036
+#: src/imap.c:2577 src/imap.c:5053
msgid "can't expunge\n"
msgstr "Impossible de purger\n"
-#: src/imap.c:2911
+#: src/imap.c:2928
#, c-format
msgid "Looking for unsubscribed folders in %s..."
msgstr "Recherche des dossiers non inscrits dans %s.."
-#: src/imap.c:2914
+#: src/imap.c:2931
#, c-format
msgid "Looking for subfolders of %s..."
msgstr "Recherche des sous-dossiers de %s.."
-#: src/imap.c:3204
+#: src/imap.c:3221
msgid "can't create mailbox: LIST failed\n"
msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
-#: src/imap.c:3219
+#: src/imap.c:3236
msgid "can't create mailbox\n"
msgstr "Impossible de créer la boîte aux lettres\n"
-#: src/imap.c:3350
+#: src/imap.c:3367
#, c-format
msgid "can't rename mailbox: %s to %s\n"
msgstr "Impossible de renommer la boîte aux lettres %s en %s.\n"
-#: src/imap.c:3463
+#: src/imap.c:3480
msgid "can't delete mailbox\n"
msgstr "Impossible de supprimer la boîte aux lettres.\n"
-#: src/imap.c:3742
+#: src/imap.c:3759
msgid "LIST failed\n"
msgstr "commande LIST échouée\n"
-#: src/imap.c:3827
+#: src/imap.c:3844
msgid "Flagging messages..."
msgstr "Marquage des messages en cours.."
-#: src/imap.c:3930
+#: src/imap.c:3947
#, c-format
msgid "can't select folder: %s\n"
msgstr "Impossible de sélectionner le dossier : %s.\n"
-#: src/imap.c:4082
+#: src/imap.c:4099
msgid "Server requires STARTTLS to log in.\n"
msgstr "Le serveur nécessite STARTTLS pour s'y connecter.\n"
-#: src/imap.c:4092
+#: src/imap.c:4109
msgid "Can't refresh capabilities.\n"
msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
-#: src/imap.c:4097
+#: src/imap.c:4114
#, c-format
msgid ""
"Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5986,20 +5989,20 @@ msgstr ""
"La connexion vers %s a échoué : le serveur nécessite STARTTLS, mais Claws "
"Mail a été compilé sans le support STARTTLS.\n"
-#: src/imap.c:4105
+#: src/imap.c:4122
msgid "Server logins are disabled.\n"
msgstr "Les connexions au serveur sont désactivées.\n"
-#: src/imap.c:4328
+#: src/imap.c:4345
msgid "Fetching message..."
msgstr "Lecture du message en cours.."
-#: src/imap.c:5029
+#: src/imap.c:5046
#, c-format
msgid "can't set deleted flags: %d\n"
msgstr "Impossible de marquer pour la suppression : %d.\n"
-#: src/imap.c:6064
+#: src/imap.c:6081
msgid ""
"You have one or more IMAP accounts defined. However this version of Claws "
"Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -6051,7 +6054,7 @@ msgstr "_Inscriptions"
msgid "_Subscribe..."
msgstr "S'_inscrire"
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:170
msgid "_Unsubscribe..."
msgstr "Se _désinscrire.."
@@ -6088,20 +6091,20 @@ msgstr "Hériter des options du dossier parent"
#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2050
+#: src/plugins/vcalendar/vcal_folder.c:2056
#, c-format
msgid "Input new name for '%s':"
msgstr "Saisir le nouveau nom pour '%s' :"
#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2057
msgid "Rename folder"
msgstr "Changement de nom de dossier"
#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2071
+#: src/plugins/vcalendar/vcal_folder.c:2077
msgid ""
"The folder could not be renamed.\n"
"The new folder name is not allowed."
@@ -6134,7 +6137,7 @@ msgstr ""
#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2004
+#: src/plugins/vcalendar/vcal_folder.c:2010
#, c-format
msgid "Can't remove the folder '%s'."
msgstr "Impossible de supprimer le dossier '%s'."
@@ -6400,142 +6403,142 @@ msgstr "Sélection d'un carnet d'adresses Pine"
msgid "Import Pine file into Address Book"
msgstr "Importation d'un carnet d'adresses Pine"
-#: src/inc.c:187 src/inc.c:295 src/inc.c:322
+#: src/inc.c:190 src/inc.c:298 src/inc.c:324
msgid "Claws Mail needs network access in order to get mails."
msgstr "Claws Mail nécessite un accès réseau pour relever le courrier."
-#: src/inc.c:344
+#: src/inc.c:343
#, c-format
msgid "%s failed\n"
msgstr "%s a échoué\n"
-#: src/inc.c:417
+#: src/inc.c:472
msgid "Retrieving new messages"
msgstr "Récupération des nouveaux messages"
-#: src/inc.c:475
+#: src/inc.c:530
msgid "Standby"
msgstr "Attente"
-#: src/inc.c:616 src/inc.c:670
+#: src/inc.c:671 src/inc.c:725
msgid "Cancelled"
msgstr "Annulé"
-#: src/inc.c:627
+#: src/inc.c:682
msgid "Retrieving"
msgstr "Récupération"
-#: src/inc.c:636
+#: src/inc.c:691
#, c-format
msgid "Done (%d message (%s) received)"
msgid_plural "Done (%d messages (%s) received)"
msgstr[0] "Terminé (%d message (%s) reçu)"
msgstr[1] "Terminé (%d messages (%s) reçus)"
-#: src/inc.c:642
+#: src/inc.c:697
msgid "Done (no new messages)"
msgstr "Terminé (aucun nouveau message)"
-#: src/inc.c:647
+#: src/inc.c:702
msgid "Connection failed"
msgstr "La connexion a échoué"
-#: src/inc.c:650 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:705 src/plugins/managesieve/managesieve.c:888
msgid "Auth failed"
msgstr "L'authentification a échoué"
-#: src/inc.c:657 src/prefs_matcher.c:397 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6488
+#: src/inc.c:712 src/prefs_matcher.c:397 src/prefs_summaries.c:453
+#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6497
msgid "Locked"
msgstr "Verrouillé"
-#: src/inc.c:667 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:722 src/plugins/spamassassin/spamassassin_gtk.c:394
msgid "Timeout"
msgstr "Délai d'attente dépassé"
-#: src/inc.c:753
+#: src/inc.c:808
#, c-format
msgid "Finished (%d new message)"
msgid_plural "Finished (%d new messages)"
msgstr[0] "Terminé (%d nouveau message)"
msgstr[1] "Terminé (%d nouveaux messages)"
-#: src/inc.c:757
+#: src/inc.c:812
msgid "Finished (no new messages)"
msgstr "Terminé (aucun nouveau message)"
-#: src/inc.c:796
+#: src/inc.c:853
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s : Récupération des nouveaux messages"
-#: src/inc.c:826
+#: src/inc.c:883
#, c-format
msgid "Account '%s': Connecting to POP3 server: %s:%d..."
msgstr "Compte '%s' : Connexion au serveur POP3 : %s:%d.."
-#: src/inc.c:844
+#: src/inc.c:917
#, c-format
msgid "Can't connect to POP3 server: %s:%d"
msgstr "Impossible de se connecter au serveur POP3 : %s:%d"
-#: src/inc.c:848
+#: src/inc.c:921
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "Impossible de se connecter au serveur POP3 : %s:%d.\n"
-#: src/inc.c:928 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1001 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:514
msgid "Authenticating..."
msgstr "Authentification.."
-#: src/inc.c:930
+#: src/inc.c:1003
#, c-format
msgid "Retrieving messages from %s (%s)..."
msgstr "Réception des messages de %s (%s).."
-#: src/inc.c:936
+#: src/inc.c:1009
msgid "Getting the number of new messages (STAT)..."
msgstr "Récupération du nombre de nouveaux messages (STAT).."
-#: src/inc.c:940
+#: src/inc.c:1013
msgid "Getting the number of new messages (LAST)..."
msgstr "Récupération du nombre de nouveaux messages (LAST).."
-#: src/inc.c:944
+#: src/inc.c:1017
msgid "Getting the number of new messages (UIDL)..."
msgstr "Récupération du nombre de nouveaux messages (UIDL).."
-#: src/inc.c:948
+#: src/inc.c:1021
msgid "Getting the size of messages (LIST)..."
msgstr "Récupération de la taille des messages"
-#: src/inc.c:955 src/send_message.c:514
+#: src/inc.c:1028 src/send_message.c:532
msgid "Quitting"
msgstr "Fermeture"
-#: src/inc.c:980
+#: src/inc.c:1053
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "Récupération du message (%d / %d) (%s / %s octets)"
-#: src/inc.c:993
+#: src/inc.c:1066
#, c-format
msgid "Retrieving (%d message (%s) received)"
msgid_plural "Retrieving (%d messages (%s) received)"
msgstr[0] "Récupération (%d message (%s) reçu)"
msgstr[1] "Récupération (%d messages (%s) reçus)"
-#: src/inc.c:1152
+#: src/inc.c:1225
#, c-format
msgid "Connection to %s:%d failed."
msgstr "La connexion vers %s:%d a échoué."
-#: src/inc.c:1157
+#: src/inc.c:1230
msgid "Error occurred while processing mail."
msgstr "Une erreur est survenue pendant le traitement du message."
-#: src/inc.c:1163
+#: src/inc.c:1236
#, c-format
msgid ""
"Error occurred while processing mail:\n"
@@ -6544,37 +6547,37 @@ msgstr ""
"Une erreur est survenue pendant le traitement du message :\n"
"%s"
-#: src/inc.c:1169
+#: src/inc.c:1242
msgid "No disk space left."
msgstr "Plus de place disponible sur le disque."
-#: src/inc.c:1174
+#: src/inc.c:1247
msgid "Can't write file."
msgstr "Impossible d'enregistrer le fichier."
-#: src/inc.c:1179
+#: src/inc.c:1252
msgid "Socket error."
msgstr "Erreur de « socket »."
-#: src/inc.c:1182
+#: src/inc.c:1255
#, c-format
msgid "Socket error on connection to %s:%d."
msgstr "Erreur de socket lors de la connexion vers %s:%d."
-#: src/inc.c:1187 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1260 src/send_message.c:443 src/send_message.c:706
msgid "Connection closed by the remote host."
msgstr "Connexion fermée par l'hôte distant."
-#: src/inc.c:1190
+#: src/inc.c:1263
#, c-format
msgid "Connection to %s:%d closed by the remote host."
msgstr "Connexion vers %s:%d fermée par l'hôte distant."
-#: src/inc.c:1195
+#: src/inc.c:1268
msgid "Mailbox is locked."
msgstr "Boîte aux lettres verrouillée."
-#: src/inc.c:1199
+#: src/inc.c:1272
#, c-format
msgid ""
"Mailbox is locked:\n"
@@ -6583,11 +6586,11 @@ msgstr ""
"La boîte aux lettres est verrouillée :\n"
"%s"
-#: src/inc.c:1205 src/send_message.c:673
+#: src/inc.c:1278 src/send_message.c:691
msgid "Authentication failed."
msgstr "L'authentification a échoué."
-#: src/inc.c:1211 src/send_message.c:676
+#: src/inc.c:1284 src/send_message.c:694
#, c-format
msgid ""
"Authentication failed:\n"
@@ -6596,7 +6599,7 @@ msgstr ""
"L'authentification a échoué\n"
"%s"
-#: src/inc.c:1216 src/send_message.c:692
+#: src/inc.c:1289 src/send_message.c:710
msgid ""
"Session timed out. You may be able to recover by increasing the timeout "
"value in Preferences/Other/Miscellaneous."
@@ -6604,30 +6607,30 @@ msgstr ""
"La session a expiré. Augmenter la valeur du délai d'expiration dans "
"Préférences/Autres/Divers peut dans certains cas être une solution."
-#: src/inc.c:1221
+#: src/inc.c:1294
#, c-format
msgid "Connection to %s:%d timed out."
msgstr "La connexion vers %s:%d a échoué."
-#: src/inc.c:1259
+#: src/inc.c:1332
msgid "Incorporation cancelled\n"
msgstr "Relève annulée\n"
-#: src/inc.c:1524
+#: src/inc.c:1625
#, c-format
msgid "%s%sYou're working offline. Override for %d minutes?"
msgstr ""
"%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
"l'avertissement pour %d minutes ?"
-#: src/inc.c:1530
+#: src/inc.c:1631
#, c-format
msgid "%s%sYou're working offline. Override?"
msgstr ""
"%s%sAttention, vous travaillez hors-ligne. Voulez-vous continuer et ignorer "
"l'avertissement ?"
-#: src/inc.c:1537
+#: src/inc.c:1638
msgid "On_ly once"
msgstr "_Seulement pour cette fois-ci"
@@ -6664,7 +6667,7 @@ msgstr "LDAP erreur (recherche) : %d (%s)\n"
msgid "Nick Name"
msgstr "Surnom"
-#: src/main.c:246
+#: src/main.c:247
#, c-format
msgid ""
"File '%s' already exists.\n"
@@ -6673,7 +6676,7 @@ msgstr ""
"Le fichier '%s' existe déjà.\n"
"Impossible de créer le dossier."
-#: src/main.c:367
+#: src/main.c:368
#, c-format
msgid ""
"Configuration for %s found.\n"
@@ -6682,7 +6685,7 @@ msgstr ""
"Une configuration pour %s a été trouvée.\n"
"Voulez-vous faire migrer cette configuration ?"
-#: src/main.c:369
+#: src/main.c:370
#, c-format
msgid ""
"\n"
@@ -6695,11 +6698,11 @@ msgstr ""
"Vos règles de filtrage pour Sylpheed peuvent être converties\n"
"par un script disponible ici : %s."
-#: src/main.c:381
+#: src/main.c:382
msgid "Keep old configuration"
msgstr "Conserver l'ancienne configuration"
-#: src/main.c:384
+#: src/main.c:385
msgid ""
"Keeping a backup will allow you to go back to an older version, but may take "
"a while if you have cached IMAP or News data, and will take some extra room "
@@ -6710,31 +6713,31 @@ msgstr ""
"IMAP ou provenant de serveurs de discussions, et occupera un espace "
"supplémentaire sur votre disque."
-#: src/main.c:392
+#: src/main.c:393
msgid "Migration of configuration"
msgstr "Migration de la configuration"
-#: src/main.c:403
+#: src/main.c:404
msgid "Copying configuration... This may take a while..."
msgstr "Copie de la configuration.. Cela peut prendre du temps.."
-#: src/main.c:412
+#: src/main.c:413
msgid "Migration failed!"
msgstr "La migration a échoué !"
-#: src/main.c:421
+#: src/main.c:422
msgid "Migrating configuration..."
msgstr "Migration de la configuration.."
-#: src/main.c:1129
+#: src/main.c:1130
msgid "g_thread is not supported by glib.\n"
msgstr "g_thread non supporté par glib.\n"
-#: src/main.c:1149 src/main.c:1153 src/main.c:1157
+#: src/main.c:1150 src/main.c:1154 src/main.c:1158
msgid "(or older)"
msgstr "(ou antérieure)"
-#: src/main.c:1492
+#: src/main.c:1494
#, c-format
msgid ""
"The following plugin failed to load. Check the Plugins configuration for "
@@ -6753,7 +6756,7 @@ msgstr[1] ""
"configuration des modules pour de plus amples informations :\n"
"%s"
-#: src/main.c:1534
+#: src/main.c:1536
msgid ""
"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6764,7 +6767,7 @@ msgstr ""
"Veuillez utiliser « Reconstruire l'_arborescence » depuis le menu contextuel "
"du dossier principal de la boîte aux lettres pour tenter de le résoudre."
-#: src/main.c:1540
+#: src/main.c:1542
msgid ""
"Claws Mail has detected a configured mailbox, but could not load it. It is "
"probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6774,36 +6777,36 @@ msgstr ""
"est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
"le module et essayer à nouveau."
-#: src/main.c:1784
+#: src/main.c:1789
msgid "Missing filename\n"
msgstr "Nom de fichier manquant\n"
-#: src/main.c:1791
+#: src/main.c:1796
msgid "Cannot open filename for reading\n"
msgstr "Impossible d'ouvrir le fichier en lecture\n"
-#: src/main.c:1802
+#: src/main.c:1807
msgid "Malformed header\n"
msgstr "En-tête non conforme\n"
-#: src/main.c:1809
+#: src/main.c:1814
msgid "Duplicated 'To:' header\n"
msgstr "En-tête « À: » en plusieurs exemplaires\n"
-#: src/main.c:1820
+#: src/main.c:1825
msgid "Missing required 'To:' header\n"
msgstr "L'en-tête « À: » est manquant\n"
-#: src/main.c:1966
+#: src/main.c:1971
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Utilisation : %s [OPTION]..\n"
-#: src/main.c:1968
+#: src/main.c:1973
msgid " --compose [address] open composition window"
msgstr " --compose [adresse] ouvrir une fenêtre de composition de message"
-#: src/main.c:1969
+#: src/main.c:1974
msgid ""
" --compose-from-file file\n"
" open composition window with data from given file;\n"
@@ -6823,7 +6826,7 @@ msgstr ""
" jusqu'à une ligne vide, puis le corps de message "
"jusqu'à la fin de fichier"
-#: src/main.c:1974
+#: src/main.c:1979
msgid " --subscribe [uri] subscribe to the given URI if possible"
msgstr ""
" --subscribe [uri] s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -6831,7 +6834,7 @@ msgstr ""
" de nouvelles, ou « vCalendar » , gestionnaire de\n"
" rendez-vous et calendriers en ligne)"
-#: src/main.c:1975
+#: src/main.c:1980
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6841,7 +6844,7 @@ msgstr ""
" ouvrir une fenêtre de composition avec les\n"
" fichiers spécifiés attachés"
-#: src/main.c:1978
+#: src/main.c:1983
msgid ""
" --insert file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6851,25 +6854,25 @@ msgstr ""
" ouvrir une fenêtre de composition avec les\n"
" fichiers spécifiés insérés"
-#: src/main.c:1981
+#: src/main.c:1986
msgid " --receive receive new messages"
msgstr ""
" --receive récupérer les nouveaux messages (du compte courant)"
-#: src/main.c:1982
+#: src/main.c:1987
msgid " --receive-all receive new messages of all accounts"
msgstr ""
" --receive-all récupérer les nouveaux messages de tous les comptes"
-#: src/main.c:1983
+#: src/main.c:1988
msgid " --cancel-receiving cancel receiving of messages"
msgstr " --cancel-receiving annuler la récupération des messages"
-#: src/main.c:1984
+#: src/main.c:1989
msgid " --cancel-sending cancel sending of messages"
msgstr " --cancel-sending annuler l'envoi des messages"
-#: src/main.c:1985
+#: src/main.c:1990
msgid ""
" --search folder type request [recursive]\n"
" searches mail\n"
@@ -6889,17 +6892,17 @@ msgstr ""
" récursif: aucune si l'argument commence par 0, n, "
"N, f ou F"
-#: src/main.c:1992
+#: src/main.c:1997
msgid " --send send all queued messages"
msgstr " --send envoyer les messages en attente"
-#: src/main.c:1993
+#: src/main.c:1998
msgid " --status [folder]... show the total number of messages"
msgstr ""
" --status [dossier].. afficher le nombre de messages\n"
" (nouveaux, non lus, total)"
-#: src/main.c:1994
+#: src/main.c:1999
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -6907,15 +6910,15 @@ msgstr ""
" --status-full [dossier]..\n"
" afficher le nombre de messages de chaque dossier"
-#: src/main.c:1996
+#: src/main.c:2001
msgid " --statistics show session statistics"
msgstr " --statistics affiche les statistiques de la session"
-#: src/main.c:1997
+#: src/main.c:2002
msgid " --reset-statistics reset session statistics"
msgstr " --reset-statistics réinitialise les statistiques de la session"
-#: src/main.c:1998
+#: src/main.c:2003
msgid ""
" --select folder[/msg] jumps to the specified folder/message\n"
" folder is a folder id like 'folder/sub_folder'"
@@ -6926,35 +6929,35 @@ msgstr ""
"voici\n"
" un exemple de syntaxe : 'dossier/sous_dossier'"
-#: src/main.c:2000
+#: src/main.c:2005
msgid " --online switch to online mode"
msgstr " --online travailler en ligne"
-#: src/main.c:2001
+#: src/main.c:2006
msgid " --offline switch to offline mode"
msgstr " --offline travailler hors-ligne"
-#: src/main.c:2002
+#: src/main.c:2007
msgid " --exit --quit -q exit Claws Mail"
msgstr " --exit --quit -q quitter Claws Mail"
-#: src/main.c:2003
+#: src/main.c:2008
msgid " --debug debug mode"
msgstr " --debug lancer Claws Mail en mode de déboguage"
-#: src/main.c:2004
+#: src/main.c:2009
msgid " --toggle-debug toggle debug mode"
msgstr " --toggle-debug changer le mode debug"
-#: src/main.c:2005
+#: src/main.c:2010
msgid " --help -h display this help and exit"
msgstr " --help -h afficher cette aide et terminer"
-#: src/main.c:2006
+#: src/main.c:2011
msgid " --version -v output version information and exit"
msgstr " --version -v afficher la version et terminer"
-#: src/main.c:2007
+#: src/main.c:2012
msgid ""
" --version-full -V output version and built-in features information "
"and exit"
@@ -6962,12 +6965,12 @@ msgstr ""
" --version-full -V afficher la version et les informations concernant\n"
" les options intégrées et terminer"
-#: src/main.c:2008
+#: src/main.c:2013
msgid " --config-dir output configuration directory"
msgstr ""
" --config-dir afficher le dossier contenant la configuration"
-#: src/main.c:2009
+#: src/main.c:2014
msgid ""
" --alternate-config-dir [dir]\n"
" use specified configuration directory"
@@ -6975,7 +6978,7 @@ msgstr ""
" --alternate-config-dir [dir]\n"
" utiliser le dossier de configuration spécifié"
-#: src/main.c:2011
+#: src/main.c:2016
msgid ""
" --geometry -geometry WxH+X+Y\n"
" set geometry for main window"
@@ -6983,44 +6986,44 @@ msgstr ""
" --geometry -geometry LxH+X+Y\n"
" définir la géométrie de la fenêtre principale"
-#: src/main.c:2064
+#: src/main.c:2069
msgid "Unknown option\n"
msgstr ""
"claws-mail: option non reconnue.\n"
"Pour en savoir davantage, faites: « claws-mail --help ».\n"
-#: src/main.c:2082
+#: src/main.c:2087
#, c-format
msgid "Processing (%s)..."
msgstr "Traitement (%s).."
-#: src/main.c:2085
+#: src/main.c:2090
msgid "top level folder"
msgstr "dossier racine"
-#: src/main.c:2167
+#: src/main.c:2172
msgid "Queued messages"
msgstr "Messages en file d'attente"
-#: src/main.c:2168
+#: src/main.c:2173
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "
"quitter maintenant ?"
-#: src/main.c:2915
+#: src/main.c:2920
msgid "NetworkManager: network is online.\n"
msgstr "Gestionnaire réseau : le réseau est activé.\n"
-#: src/main.c:2921
+#: src/main.c:2926
msgid "NetworkManager: network is offline.\n"
msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
-#: src/mainwindow.c:514 src/messageview.c:208
+#: src/mainwindow.c:514 src/messageview.c:209
msgid "_File"
msgstr "_Fichier"
-#: src/mainwindow.c:516 src/messageview.c:210 src/summaryview.c:438
+#: src/mainwindow.c:516 src/messageview.c:211 src/summaryview.c:438
msgid "_View"
msgstr "_Vue"
@@ -7056,19 +7059,19 @@ msgstr "_Exporter la sélection en fichier mbox.."
msgid "Empty all _Trash folders"
msgstr "_Vider toutes les corbeilles"
-#: src/mainwindow.c:537 src/messageview.c:217
+#: src/mainwindow.c:537 src/messageview.c:218
msgid "_Save email as..."
msgstr "Enregi_strer le message sous.."
-#: src/mainwindow.c:538 src/messageview.c:218
+#: src/mainwindow.c:538 src/messageview.c:219
msgid "_Save part as..."
msgstr "Enregi_strer la partie sous.."
-#: src/mainwindow.c:541 src/messageview.c:219
+#: src/mainwindow.c:541 src/messageview.c:220
msgid "Page setup..."
msgstr "Mise en _page.."
-#: src/mainwindow.c:542 src/messageview.c:220
+#: src/mainwindow.c:542 src/messageview.c:221
msgid "_Print..."
msgstr "_Imprimer.."
@@ -7132,99 +7135,99 @@ msgstr "Déplo_yer les fils de discussion"
msgid "Co_llapse all threads"
msgstr "Re_plier les fils de discussion"
-#: src/mainwindow.c:577 src/messageview.c:231
+#: src/mainwindow.c:577 src/messageview.c:232
msgid "_Go to"
msgstr "_Aller à"
-#: src/mainwindow.c:578 src/messageview.c:232
+#: src/mainwindow.c:578 src/messageview.c:233
msgid "_Previous message"
msgstr "Message _précédent"
-#: src/mainwindow.c:579 src/messageview.c:233
+#: src/mainwindow.c:579 src/messageview.c:234
msgid "_Next message"
msgstr "Message suiva_nt"
-#: src/mainwindow.c:581 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:236
msgid "P_revious unread message"
msgstr "Non l_u précédent"
-#: src/mainwindow.c:582 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:237
msgid "N_ext unread message"
msgstr "Non _lu suivant"
-#: src/mainwindow.c:584 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:239
msgid "Previous ne_w message"
msgstr "Message nouv_eau précédent"
-#: src/mainwindow.c:585 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:240
msgid "Ne_xt new message"
msgstr "Message nou_veau suivant"
-#: src/mainwindow.c:587 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:242
msgid "Previous _marked message"
msgstr "M_arqué précédent"
-#: src/mainwindow.c:588 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:243
msgid "Next m_arked message"
msgstr "_Marqué suivant"
-#: src/mainwindow.c:590 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:245
msgid "Previous _labeled message"
msgstr "C_olorié précédent"
-#: src/mainwindow.c:591 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:246
msgid "Next la_beled message"
msgstr "_Colorié suivant"
-#: src/mainwindow.c:593 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:248
msgid "Previous opened message"
msgstr "Message ouvert précédent"
-#: src/mainwindow.c:594 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:249
msgid "Next opened message"
msgstr "Message ouvert suivant"
-#: src/mainwindow.c:596 src/messageview.c:250
+#: src/mainwindow.c:596 src/messageview.c:251
msgid "Parent message"
msgstr "Message paren_t"
-#: src/mainwindow.c:598 src/messageview.c:252
+#: src/mainwindow.c:598 src/messageview.c:253
msgid "Next unread _folder"
msgstr "Do_ssier non lu suivant"
-#: src/mainwindow.c:599 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:254
msgid "F_older..."
msgstr "Dossier..."
-#: src/mainwindow.c:601 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:200
msgid "Next part"
msgstr "Partie suivante"
-#: src/mainwindow.c:602 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:257 src/mimeview.c:201
msgid "Previous part"
msgstr "Partie précédente"
-#: src/mainwindow.c:605 src/messageview.c:257
+#: src/mainwindow.c:605 src/messageview.c:258
msgid "Message scroll"
msgstr "Défilement du message"
-#: src/mainwindow.c:606 src/messageview.c:258
+#: src/mainwindow.c:606 src/messageview.c:259
msgid "Previous line"
msgstr "Ligne précédente"
-#: src/mainwindow.c:607 src/messageview.c:259
+#: src/mainwindow.c:607 src/messageview.c:260
msgid "Next line"
msgstr "Ligne suivante"
-#: src/mainwindow.c:608 src/messageview.c:260 src/printing.c:479
+#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:479
msgid "Previous page"
msgstr "Page précédente"
-#: src/mainwindow.c:609 src/messageview.c:261 src/printing.c:485
+#: src/mainwindow.c:609 src/messageview.c:262 src/printing.c:485
msgid "Next page"
msgstr "Page suivante"
-#: src/mainwindow.c:627 src/messageview.c:279
+#: src/mainwindow.c:627 src/messageview.c:280
msgid "Decode"
msgstr "Décoda_ge"
@@ -7232,27 +7235,27 @@ msgstr "Décoda_ge"
msgid "Open in new _window"
msgstr "Ouvrir dans une _nouvelle fenêtre"
-#: src/mainwindow.c:635 src/messageview.c:286
+#: src/mainwindow.c:635 src/messageview.c:287
msgid "Mess_age source"
msgstr "Code _source du message.."
-#: src/mainwindow.c:637 src/messageview.c:287
+#: src/mainwindow.c:637 src/messageview.c:288
msgid "Message part"
msgstr "Message"
-#: src/mainwindow.c:638 src/messageview.c:288
+#: src/mainwindow.c:638 src/messageview.c:289
msgid "View as text"
msgstr "Afficher comme du texte"
-#: src/mainwindow.c:639 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:639 src/messageview.c:290 src/toolbar.c:494
msgid "Open"
msgstr "Ouvrir"
-#: src/mainwindow.c:641 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:292
msgid "Open with..."
msgstr "Ouvrir avec.."
-#: src/mainwindow.c:645 src/messageview.c:294
+#: src/mainwindow.c:645 src/messageview.c:295
msgid "Quotes"
msgstr "_Citations"
@@ -7288,16 +7291,16 @@ msgstr "Composer un _nouveau message"
msgid "Compose a news message"
msgstr "Composer un _article de groupe de discussion"
-#: src/mainwindow.c:664 src/messageview.c:300
+#: src/mainwindow.c:664 src/messageview.c:301
#: src/plugins/notification/notification_banner.c:95
msgid "_Reply"
msgstr "_Répondre"
-#: src/mainwindow.c:665 src/messageview.c:301 src/summaryview.c:430
+#: src/mainwindow.c:665 src/messageview.c:302 src/summaryview.c:430
msgid "Repl_y to"
msgstr "Rép_ondre à"
-#: src/mainwindow.c:668 src/messageview.c:304
+#: src/mainwindow.c:668 src/messageview.c:305
msgid "Mailing _list"
msgstr "_Liste de diffusion"
@@ -7305,15 +7308,15 @@ msgstr "_Liste de diffusion"
msgid "Follow-up and reply to"
msgstr "Donner suite _et répondre à"
-#: src/mainwindow.c:672 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2449
msgid "_Forward"
msgstr "_Transférer"
-#: src/mainwindow.c:673 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2450
msgid "For_ward as attachment"
msgstr "Transférer en _pièce jointe"
-#: src/mainwindow.c:674 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:674 src/messageview.c:310 src/toolbar.c:2451
msgid "Redirec_t"
msgstr "Rediri_ger"
@@ -7439,11 +7442,11 @@ msgstr "La_bels"
msgid "Re-_edit"
msgstr "Rééd_iter"
-#: src/mainwindow.c:731 src/messageview.c:310 src/mimeview.c:1015
+#: src/mainwindow.c:731 src/messageview.c:311 src/mimeview.c:1015
msgid "Check signature"
msgstr "Vérifier la signature"
-#: src/mainwindow.c:736 src/messageview.c:314
+#: src/mainwindow.c:736 src/messageview.c:315
msgid "Add sender to address boo_k"
msgstr "A_jouter l'expéditeur au carnet d'adresses"
@@ -7471,35 +7474,35 @@ msgstr "Filtrer les messages _sélectionnés"
msgid "Run folder pr_ocessing rules"
msgstr "Exéc_uter les règles de traitement du dossier courant"
-#: src/mainwindow.c:747 src/messageview.c:317
+#: src/mainwindow.c:747 src/messageview.c:318
msgid "_Create filter rule"
msgstr "Créer une _règle de filtrage"
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:319
+#: src/messageview.c:325
msgid "_Automatically"
msgstr "_Automatiquement"
#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:319 src/messageview.c:325
+#: src/messageview.c:320 src/messageview.c:326
msgid "By _From"
msgstr "Par « De: »"
#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
-#: src/messageview.c:320 src/messageview.c:326
+#: src/messageview.c:321 src/messageview.c:327
msgid "By _To"
msgstr "Par « À: »"
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:322
+#: src/messageview.c:328
msgid "By _Subject"
msgstr "Par _Sujet"
-#: src/mainwindow.c:753 src/messageview.c:323 src/summaryview.c:436
+#: src/mainwindow.c:753 src/messageview.c:324 src/summaryview.c:436
msgid "Create processing rule"
msgstr "Créer une règle de traite_ment"
-#: src/mainwindow.c:760 src/messageview.c:330
+#: src/mainwindow.c:760 src/messageview.c:331
msgid "List _URLs..."
msgstr "_Liste d'URLs.."
@@ -7651,19 +7654,19 @@ msgstr "Cacher les messages supprimés"
msgid "_Fullscreen"
msgstr "Plei_n écran"
-#: src/mainwindow.c:830 src/messageview.c:342
+#: src/mainwindow.c:830 src/messageview.c:343
msgid "Show all _headers"
msgstr "Tous les _en-têtes"
-#: src/mainwindow.c:831 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:344
msgid "_Collapse all"
msgstr "Re_plier tout"
-#: src/mainwindow.c:832 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:345
msgid "Collapse from level _2"
msgstr "Replier à partir du niveau _2"
-#: src/mainwindow.c:833 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:346
msgid "Collapse from level _3"
msgstr "Replier à partir du niveau _3"
@@ -7763,11 +7766,11 @@ msgstr "Ascendant"
msgid "Descending"
msgstr "Descendant"
-#: src/mainwindow.c:916 src/messageview.c:387
+#: src/mainwindow.c:916 src/messageview.c:388
msgid "_Auto detect"
msgstr "Détection _automatique"
-#: src/mainwindow.c:1294 src/summaryview.c:6414
+#: src/mainwindow.c:1294 src/summaryview.c:6423
msgid "Apply tags..."
msgstr "Appliquer des labels.."
@@ -7862,51 +7865,51 @@ msgstr ""
msgid "No posting allowed"
msgstr "Envoi de message non autorisé"
-#: src/mainwindow.c:3994
+#: src/mainwindow.c:3993
msgid "Mbox import has failed."
msgstr "L'importation mbox a échoué."
-#: src/mainwindow.c:4003 src/mainwindow.c:4012
+#: src/mainwindow.c:4002 src/mainwindow.c:4011
msgid "Export to mbox has failed."
msgstr "L'exportation mbox a échoué."
-#: src/mainwindow.c:4053 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
msgid "Exit"
msgstr "Quitter"
-#: src/mainwindow.c:4053 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
msgid "Exit Claws Mail?"
msgstr "Voulez-vous vraiment quitter Claws Mail ?"
-#: src/mainwindow.c:4244
+#: src/mainwindow.c:4245
msgid "Folder synchronisation"
msgstr "Synchronisation de dossiers distants"
-#: src/mainwindow.c:4245
+#: src/mainwindow.c:4246
msgid "Do you want to synchronise your folders now?"
msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4247
msgid "_Synchronise"
msgstr "_Synchroniser"
-#: src/mainwindow.c:4694
+#: src/mainwindow.c:4692
msgid "Deleting duplicated messages..."
msgstr "Suppression des messages en double.."
-#: src/mainwindow.c:4704
+#: src/mainwindow.c:4702
msgid "No duplicate message found in selected folder.\n"
msgstr ""
"Aucun message en double n'a pu être trouvé dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4710
+#: src/mainwindow.c:4708
#, c-format
msgid "Deleted %d duplicate message in selected folder.\n"
msgid_plural "Deleted %d duplicate messages in selected folder.\n"
msgstr[0] "%d message en double supprimé dans le dossier sélectionné.\n"
msgstr[1] "%d messages en double supprimés dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4714
+#: src/mainwindow.c:4712
#, c-format
msgid "Marked %d duplicate message for deletion in selected folder.\n"
msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7915,61 +7918,61 @@ msgstr[0] ""
msgstr[1] ""
"%d messages en double marqués pour suppression dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4752
+#: src/mainwindow.c:4750
msgid "Deleting duplicated messages in all folders..."
msgstr "Suppression des messages en double dans tous les dossiers.."
-#: src/mainwindow.c:4758
+#: src/mainwindow.c:4756
#, c-format
msgid "Deleted %d duplicate message in %d folders.\n"
msgid_plural "Deleted %d duplicate messages in %d folders.\n"
msgstr[0] "%d message en double supprimé dans %d dossier.\n"
msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
-#: src/mainwindow.c:4763
+#: src/mainwindow.c:4761
#, c-format
msgid "No duplicate message found in %d folders.\n"
msgstr "Aucune message en double trouvé dans %d dossiers.\n"
-#: src/mainwindow.c:4925 src/messageview.c:2654
+#: src/mainwindow.c:4923 src/messageview.c:2658
msgid "Select folder to go to"
msgstr "Sélection du dossier à atteindre"
-#: src/mainwindow.c:5026 src/summaryview.c:5857
+#: src/mainwindow.c:5024 src/summaryview.c:5866
msgid "Processing rules to apply before folder rules"
msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
-#: src/mainwindow.c:5034
+#: src/mainwindow.c:5032
msgid "Processing rules to apply after folder rules"
msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
-#: src/mainwindow.c:5042 src/summaryview.c:5868
+#: src/mainwindow.c:5040 src/summaryview.c:5877
msgid "Filtering configuration"
msgstr "Règles de filtrage"
-#: src/mainwindow.c:5157
+#: src/mainwindow.c:5155
msgid "Can not register as default client: impossible to get executable path."
msgstr ""
"Impossible d'enregistrer le client par défaut : impossible de récupérer le "
"chemin du binaire."
-#: src/mainwindow.c:5216
+#: src/mainwindow.c:5214
msgid "Claws Mail has been registered as default client."
msgstr "Claws Mail est maintenant le client par défaut."
-#: src/mainwindow.c:5218
+#: src/mainwindow.c:5216
msgid ""
"Can not register as default client: impossible to write to the registry."
msgstr ""
"Impossible d'enregistrer le client par défaut : écriture impossible dans la "
"base de registre."
-#: src/mainwindow.c:5232 src/setup.c:91
+#: src/mainwindow.c:5230 src/setup.c:91
#, c-format
msgid "Scanning folder %s%c%s..."
msgstr "Analyse du dossier %s%c%s.."
-#: src/mainwindow.c:5376
+#: src/mainwindow.c:5374
#, c-format
msgid "Forgotten %d password in %d accounts.\n"
msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7999,7 +8002,7 @@ msgid "tag"
msgstr "label"
#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:203 src/prefs_matcher.c:738 src/summary_search.c:457
+#: src/message_search.c:203 src/prefs_matcher.c:738 src/summary_search.c:456
msgid "Case sensitive"
msgstr "Sensible à la casse"
@@ -8007,21 +8010,21 @@ msgstr "Sensible à la casse"
msgid "Case insensitive"
msgstr "Non sensible à la casse"
-#: src/matcher.c:1859
+#: src/matcher.c:1863
#, c-format
msgid "checking if message matches [ %s ]\n"
msgstr "Teste si le message valide la condition [ %s ]\n"
-#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
+#: src/matcher.c:1934 src/matcher.c:1953 src/matcher.c:1966
msgid "message matches\n"
msgstr "Le message correspond.\n"
-#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
+#: src/matcher.c:1941 src/matcher.c:1959 src/matcher.c:1968
msgid "message does not match\n"
msgstr "Le message ne correspond pas.\n"
-#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
+#: src/matcher.c:2235 src/matcher.c:2236 src/matcher.c:2237 src/matcher.c:2238
msgid "(none)"
msgstr "(aucun)"
@@ -8049,8 +8052,8 @@ msgstr "Écrasement du fichier mbox"
msgid "This file already exists. Do you want to overwrite it?"
msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
-#: src/mbox.c:551 src/messageview.c:1861 src/mimeview.c:1844
-#: src/prefs_themes.c:598 src/textview.c:3095
+#: src/mbox.c:551 src/messageview.c:1842 src/mimeview.c:1844
+#: src/prefs_themes.c:598 src/textview.c:3128
msgid "Overwrite"
msgstr "Écraser"
@@ -8075,11 +8078,11 @@ msgstr "Chercher dans le message"
msgid "Find text:"
msgstr "Chercher :"
-#: src/message_search.c:306 src/summary_search.c:781
+#: src/message_search.c:306 src/summary_search.c:780
msgid "Search failed"
msgstr "Recherche échouée"
-#: src/message_search.c:307 src/summary_search.c:782
+#: src/message_search.c:307 src/summary_search.c:781
msgid "Search string not found."
msgstr "Texte recherché introuvable."
@@ -8091,23 +8094,23 @@ msgstr "Début de message atteint, reprendre depuis la fin ?"
msgid "End of message reached; continue from beginning?"
msgstr "Fin de message atteint, reprendre depuis le début ?"
-#: src/message_search.c:322 src/summary_search.c:793
+#: src/message_search.c:322 src/summary_search.c:792
msgid "Search finished"
msgstr "Recherche terminée"
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:298 src/textview.c:252
msgid "Compose _new message"
msgstr "Composer un _nouveau message"
-#: src/messageview.c:712 src/messageview.c:1453 src/messageview.c:1604
+#: src/messageview.c:713 src/messageview.c:1434 src/messageview.c:1585
msgid "Claws Mail - Message View"
msgstr "Claws Mail - Message"
-#: src/messageview.c:842
+#: src/messageview.c:843
msgid "<No Return-Path found>"
msgstr "< « Return-Path: » introuvable>"
-#: src/messageview.c:849
+#: src/messageview.c:850
#, c-format
msgid ""
"The notification address to which the return receipt is\n"
@@ -8122,65 +8125,51 @@ msgstr ""
"Return-Path : %s\n"
"Il est conseillé de ne pas envoyer cet accusé de réception."
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:857
msgid "_Don't Send"
msgstr "_Ne pas envoyer"
-#: src/messageview.c:875
-#, c-format
-msgctxt "'%s' stands for 'To' then 'Cc'"
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not send the return receipt."
-msgstr ""
-"Ce message demande un accusé de réception, or d'après\n"
-"les en-têtes « %s » et « %s », vous n'en êtes pas le\n"
-"destinataire officiel.\n"
-"Il est conseillé de ne pas envoyer cet accusé de réception."
-
-#: src/messageview.c:1383
+#: src/messageview.c:1364
#, c-format
msgid "Fetching message (%s)..."
msgstr "Lecture du message (%s) en cours.."
-#: src/messageview.c:1419 src/procmime.c:1011
+#: src/messageview.c:1400 src/procmime.c:1016
#, c-format
msgid "Couldn't decrypt: %s"
msgstr "Déchiffrement impossible : %s"
-#: src/messageview.c:1500 src/messageview.c:1508
+#: src/messageview.c:1481 src/messageview.c:1489
msgid "Message doesn't conform to MIME standard. It may render wrongly."
msgstr ""
"Le message n'est pas conforme au standard MIME. Il pourrait être mal affiché."
-#: src/messageview.c:1853 src/messageview.c:1856 src/mimeview.c:2049
-#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4960
-#: src/summaryview.c:4963 src/textview.c:3083
+#: src/messageview.c:1834 src/messageview.c:1837 src/mimeview.c:2049
+#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4969
+#: src/summaryview.c:4972 src/textview.c:3116
msgid "Save as"
msgstr "Enregistrer sous"
-#: src/messageview.c:1862
+#: src/messageview.c:1843
msgid "Overwrite existing file?"
msgstr "Écraser le fichier existant ?"
-#: src/messageview.c:1870 src/summaryview.c:4980 src/summaryview.c:4983
-#: src/summaryview.c:4998
+#: src/messageview.c:1851 src/summaryview.c:4989 src/summaryview.c:4992
+#: src/summaryview.c:5007
#, c-format
msgid "Couldn't save the file '%s'."
msgstr "Impossible d'enregistrer le fichier « %s »."
-#: src/messageview.c:1923
+#: src/messageview.c:1904
#, c-format
msgid "Show all %s."
msgstr "Afficher l'ensemble des %s."
-#: src/messageview.c:1925
+#: src/messageview.c:1906
msgid "Only the first megabyte of text is shown."
msgstr "Seul le premier méga-octet de texte est affiché."
-#: src/messageview.c:1956
+#: src/messageview.c:1937
msgid ""
"You got a return receipt for this message: it has been displayed by the "
"recipient."
@@ -8188,19 +8177,19 @@ msgstr ""
"Vous avez demandé un accusé de réception pour ce message : cela a été mis en "
"évidence pour le destinataire."
-#: src/messageview.c:1959
+#: src/messageview.c:1940
msgid "You asked for a return receipt in this message."
msgstr "Vous avez demandé un accusé de réception pour ce message."
-#: src/messageview.c:1965
+#: src/messageview.c:1946
msgid "This message asks for a return receipt."
msgstr "Ce message demande l'envoi d'un accusé de réception."
-#: src/messageview.c:1966
+#: src/messageview.c:1947
msgid "Send receipt"
msgstr "Envoyer"
-#: src/messageview.c:2009
+#: src/messageview.c:1990
msgid ""
"This message has been partially retrieved,\n"
"and has been deleted from the server."
@@ -8208,7 +8197,7 @@ msgstr ""
"Ce message a été partiellement récupéré,\n"
"et a été supprimé du serveur."
-#: src/messageview.c:2015
+#: src/messageview.c:1996
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8217,16 +8206,16 @@ msgstr "Ce message a été partiellement récupéré ; il fait %s au total."
# NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
# la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
-#: src/messageview.c:2019 src/messageview.c:2041
+#: src/messageview.c:2000 src/messageview.c:2022
msgid "Mark for download"
msgstr "Télécharger"
# NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
-#: src/messageview.c:2020 src/messageview.c:2032
+#: src/messageview.c:2001 src/messageview.c:2013
msgid "Mark for deletion"
msgstr "Supprimer"
-#: src/messageview.c:2025
+#: src/messageview.c:2006
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8235,12 +8224,12 @@ msgstr ""
"Ce message a été partiellement récupéré ;\n"
"il fait %s au total et est marqué pour être téléchargé ultérieurement."
-#: src/messageview.c:2030 src/messageview.c:2043
+#: src/messageview.c:2011 src/messageview.c:2024
#: src/prefs_filtering_action.c:180 src/toolbar.c:506
msgid "Unmark"
msgstr "Démarquer"
-#: src/messageview.c:2036
+#: src/messageview.c:2017
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8249,11 +8238,34 @@ msgstr ""
"Ce message a été partiellement récupéré ;\n"
"il fait %s au total et est marqué pour être supprimé ultérieurement."
-#: src/messageview.c:2109
+#: src/messageview.c:2094
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
+msgstr ""
+"Ce message demande un accusé de réception, or d'après\n"
+"les en-têtes « %s » et « %s », vous n'en êtes pas le\n"
+"destinataire officiel.\n"
+"Il est conseillé de ne pas envoyer cet accusé de réception."
+
+#: src/messageview.c:2102 src/messageview.c:2110
msgid "Return Receipt Notification"
msgstr "Accusé de réception."
-#: src/messageview.c:2110
+#: src/messageview.c:2104 src/messageview.c:2115
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "A_nnuler"
+
+#: src/messageview.c:2104 src/messageview.c:2115
+msgid "_Send Notification"
+msgstr "_Envoyer"
+
+#: src/messageview.c:2111
msgid ""
"More than one of your accounts uses the address that this message was sent "
"to.\n"
@@ -8265,19 +8277,11 @@ msgstr ""
"Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
"de réception :"
-#: src/messageview.c:2114 src/plugins/rssyl/rssyl_feed_props.c:484
-msgid "_Cancel"
-msgstr "A_nnuler"
-
-#: src/messageview.c:2114
-msgid "_Send Notification"
-msgstr "_Envoyer"
-
-#: src/messageview.c:2203
+#: src/messageview.c:2207
msgid "Cannot print: the message doesn't contain text."
msgstr "Impossible d'imprimer : le message ne contient pas de texte."
-#: src/messageview.c:2964
+#: src/messageview.c:2968
msgid ""
"\n"
" There are no messages in this folder"
@@ -8285,7 +8289,7 @@ msgstr ""
"\n"
" Il n'y a pas de messages dans ce dossier"
-#: src/messageview.c:2972
+#: src/messageview.c:2976
msgid ""
"\n"
" Message has been deleted"
@@ -8293,7 +8297,7 @@ msgstr ""
"\n"
" Le message a été supprimé"
-#: src/messageview.c:2973
+#: src/messageview.c:2977
msgid ""
"\n"
" Message has been deleted or moved to another folder"
@@ -8301,8 +8305,8 @@ msgstr ""
"\n"
" Le message a été supprimé ou déplacé vers un autre dossier"
-#: src/messageview.c:3006 src/messageview.c:3012 src/summaryview.c:4358
-#: src/summaryview.c:7181
+#: src/messageview.c:3010 src/messageview.c:3016 src/summaryview.c:4367
+#: src/summaryview.c:7190
msgid "An error happened while learning.\n"
msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
@@ -8419,7 +8423,7 @@ msgid "Couldn't save the part of multipart message: %s"
msgstr ""
"Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
-#: src/mimeview.c:1841 src/textview.c:3093
+#: src/mimeview.c:1841 src/textview.c:3126
#, c-format
msgid "Overwrite existing file '%s'?"
msgstr "Écraser le fichier existant « %s » ?"
@@ -8476,11 +8480,11 @@ msgstr "Sélection du dossier de destination"
msgid "'%s' is not a directory."
msgstr "« %s » n'est pas un dossier."
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3010
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3043
msgid "Open with"
msgstr "Ouvrir avec"
-#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3011
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
#, c-format
msgid ""
"Enter the command-line to open file:\n"
@@ -8536,81 +8540,81 @@ msgstr "Taille :"
msgid "Description:"
msgstr "Description :"
-#: src/news.c:303
+#: src/news.c:299
#, c-format
msgid "NNTP connection to %s:%d has been disconnected.\n"
msgstr "La connexion NNTP vers %s:%d a été coupée.\n"
-#: src/news.c:336
+#: src/news.c:334
#, c-format
msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d..\n"
-#: src/news.c:357
+#: src/news.c:370
#, c-format
msgid "Error logging in to %s:%d...\n"
msgstr "Erreur de connexion à %s:%d..\n"
-#: src/news.c:438
+#: src/news.c:450
msgid ""
"Libetpan does not support return code 480 so for now we choose to continue\n"
msgstr ""
"Libetpan ne supporte pas le code retour 480 donc nous choisissons de "
"continuer\n"
-#: src/news.c:447
+#: src/news.c:459
msgid "Mode reader failed, continuing nevertheless\n"
msgstr "Le mode de lecture a échoué, erreur ignorée\n"
-#: src/news.c:451
+#: src/news.c:463
#, c-format
msgid "Error creating session with %s:%d\n"
msgstr "Erreur de création de session avec %s:%d\n"
-#: src/news.c:466
+#: src/news.c:478
#, c-format
msgid "Error authenticating to %s:%d...\n"
msgstr "Erreur d'authentification à %s:%d..\n"
-#: src/news.c:491
+#: src/news.c:503
msgid "Claws Mail needs network access in order to access the News server."
msgstr ""
"Claws Mail nécessite un accès réseau pour accéder au serveur de groupes de "
"discussion."
-#: src/news.c:862
+#: src/news.c:874
#, c-format
msgid "couldn't select group: %s\n"
msgstr "Impossible de sélectionner le groupe : %s\n"
-#: src/news.c:1054 src/news.c:1232
+#: src/news.c:1066 src/news.c:1244
#, c-format
msgid "couldn't set group: %s\n"
msgstr "Impossible de définir le groupe : %s\n"
-#: src/news.c:1063
+#: src/news.c:1075
#, c-format
msgid "invalid article range: %d - %d\n"
msgstr "Intervalle d'articles invalide : %d - %d\n"
-#: src/news.c:1133 src/news.c:1160 src/news.c:1187
+#: src/news.c:1145 src/news.c:1172 src/news.c:1199
msgid "couldn't get xhdr\n"
msgstr "Impossible d'obtenir xhdr\n"
-#: src/news.c:1225
+#: src/news.c:1237
#, c-format
msgid "getting xover %d - %d in %s...\n"
msgstr "Exécution de xover %d - %d sur %s..\n"
-#: src/news.c:1240
+#: src/news.c:1252
msgid "couldn't get xover\n"
msgstr "Impossible de faire un xover.\n"
-#: src/news.c:1257
+#: src/news.c:1269
msgid "invalid xover line\n"
msgstr "Ligne xover invalide\n"
-#: src/news.c:1459
+#: src/news.c:1471
msgid ""
"You have one or more News accounts defined. However this version of Claws "
"Mail has been built without News support; your News accounts are disabled.\n"
@@ -9142,7 +9146,7 @@ msgstr "Chemin et nom de l'archive"
#: src/plugins/archive/archiver_gtk.c:1097
#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:506
+#: src/plugins/pgpcore/select-keys.c:493
msgid "_Select"
msgstr "_Sélectionner"
@@ -9355,7 +9359,7 @@ msgstr "Les messages sélectionnés n'ont pas de pièces jointes."
#, c-format
msgid "Attachments removed from %d of the %d selected messages."
msgstr ""
-"Les pièces jointes ont été enlevées de %d des %d messages sélectionnés."
+"Les pièces jointes ont été enlevées à %d messages parmi les %d sélectionnés."
#: src/plugins/att_remover/att_remover.c:474
#, c-format
@@ -9629,7 +9633,7 @@ msgstr "Les messages d'un volume supérieur ne seront pas analysés."
#: src/plugins/bogofilter/bogofilter_gtk.c:181
#: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1640
msgid "KB"
msgstr "ko"
@@ -10164,7 +10168,8 @@ msgstr ""
msgid "Do nothing (remote content is disabled)"
msgstr "Ne rien faire (le chargement des données distantes est désactivé) "
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:209 src/prefs_account.c:3920
+#: src/prefs_proxy.c:241
msgid "Proxy"
msgstr "Serveur mandataire"
@@ -10214,7 +10219,7 @@ msgstr "Le CSS de ce fichiers sera appliqué à toutes les parties HTML"
#: src/plugins/fancy/fancy_prefs.c:308
#: src/plugins/notification/notification_prefs.c:1346
#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
+#: src/prefs_account.c:1574 src/prefs_account.c:1663 src/prefs_account.c:2205
#: src/prefs_customheader.c:234
msgid "Bro_wse"
msgstr "Pa_rcourir"
@@ -10497,32 +10502,40 @@ msgstr "Module GData : erreur d'authentification : %s\n"
msgid "GData plugin: Authorization successful\n"
msgstr "Module GData : authentification réussie\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
msgid "GData plugin: Starting interactive authorization\n"
msgstr "Module GData : lancement l'authentification interactive\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
msgid "GData plugin: Got authorization code, requesting authorization\n"
msgstr ""
"Module GData : code d'authentification reçu, authentification requise\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
msgid ""
"GData plugin: No authorization code received, authorization request "
"cancelled\n"
msgstr ""
"Module GData : code d'autorisation non reçu, requête d'autorisation annulée\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+"Module GData : autorisation interactive toujours en cours, nouvelle session "
+"non nécessaire\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
#, c-format
msgid "GData plugin: Authorization refresh error: %s\n"
msgstr "Module GData : erreur de renouvellement de l'authentification : %s\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
msgid "GData plugin: Authorization refresh successful\n"
msgstr "Module GData : succès du renouvellement de l'authentification\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
#, c-format
msgid ""
"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10530,12 +10543,12 @@ msgstr ""
"Module GData : temps écoulé depuis la dernière mise à jour : %d minutes, "
"nouvelle mise à jour en cours..\n"
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
msgid "GData plugin: Trying to refresh authorization\n"
msgstr "Module GData : tentative de renouvellement de l'authentification\n"
#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1936
msgid "Authentication"
msgstr "Authentification"
@@ -10590,30 +10603,30 @@ msgstr ""
msgid "GData integration"
msgstr "Intégration de GData"
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
#: src/plugins/libravatar/libravatar_prefs.c:546
msgid "Libravatar"
msgstr "Libravatar"
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
msgid "Failed to register avatar header update hook"
msgstr "Impossible d'enregistrer le connecteur 'avatar header update'"
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
msgid "Failed to register avatar image render hook"
msgstr "Impossible d'enregistrer le connecteur 'avatar image render'"
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
msgid "Failed to create avatar image cache directory"
msgstr "Impossible de créer le répertoire de cache des icônes d'avatar"
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
msgid "Failed to load missing items cache"
msgstr "Chargement à partir du cache des icônes impossible"
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
msgid ""
"Display libravatar profiles' images for mail messages. More\n"
"info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10723,8 +10736,8 @@ msgid "Cache refresh interval"
msgstr "Intervalle de rafraîchissement du cache"
#: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
-#: src/prefs_matcher.c:335 src/prefs_receive.c:178
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1619
+#: src/prefs_account.c:1776 src/prefs_matcher.c:335 src/prefs_receive.c:178
msgid "hours"
msgstr "heure(s)"
@@ -10868,65 +10881,65 @@ msgstr ""
"définitivement.\n"
"Voulez-vous vraiment les supprimer ?"
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
msgid "No Sieve auth method available\n"
msgstr "Aucune méthode d'authentification Sieve disponible\n"
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
msgid "Selected Sieve auth method not available\n"
msgstr "Méthode d'authentification Sieve sélectionnée non disponible\n"
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
msgid "Disconnected"
msgstr "Déconnecté"
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
#, c-format
msgid "Disconnected: %s"
msgstr "Déconnecté : %s"
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
#, c-format
msgid "unhandled message on Sieve session: %s\n"
msgstr "message non reconnu lors de la session Sieve : %s\n"
-#: src/plugins/managesieve/managesieve.c:732
+#: src/plugins/managesieve/managesieve.c:733
msgid "STARTTLS failed"
msgstr "Échec STARTTLS"
-#: src/plugins/managesieve/managesieve.c:797
-#: src/plugins/managesieve/managesieve.c:813
-#: src/plugins/managesieve/managesieve.c:840
-#: src/plugins/managesieve/managesieve.c:922
-#: src/plugins/managesieve/managesieve.c:940
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
msgid "error occurred on SIEVE session\n"
msgstr "erreur pendant la session Sieve\n"
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
#, c-format
msgid "error occurred on Sieve session. data: %s\n"
msgstr "erreur pendant la session Sieve. Données : %s\n"
-#: src/plugins/managesieve/managesieve.c:875
+#: src/plugins/managesieve/managesieve.c:876
#, c-format
msgid "unhandled message on Sieve session: %d\n"
msgstr "message non reconnu lors de la session Sieve : %d\n"
-#: src/plugins/managesieve/managesieve.c:1132
+#: src/plugins/managesieve/managesieve.c:1152
msgid "Sieve: retrying auth\n"
msgstr "Sieve : nouvel essai d'authentification\n"
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1154
msgid "Auth method not available"
msgstr "Méthode d'authentification non disponible"
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1171
#, c-format
msgid "sending error on Sieve session: %s\n"
msgstr "erreur d'envoi lors de la session Sieve : %s\n"
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5754
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5763
msgid "_Filter"
msgstr "_Filtrer"
@@ -11059,92 +11072,93 @@ msgstr ""
msgid "Enable Sieve"
msgstr "Activer Sieve"
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1194
msgid "Server information"
msgstr "Configuration des serveurs"
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
msgid "Server name"
msgstr "Nom du serveur"
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
msgid "Connect to this host instead of the host used for receiving mail"
msgstr ""
"Connection à cet hôte au lieu de l'hôte utilisé pour la réception des emails"
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
msgid "Server port"
msgstr "Port de serveur"
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
msgid "Connect to this port instead of the default"
msgstr "Connection à ce port au lieu du port par défaut"
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
msgid "Encryption"
-msgstr "Chiffrage"
+msgstr "Chiffrement"
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
msgid "No encryption"
-msgstr "Pas de chiffrage"
+msgstr "Pas de chiffrement"
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
msgid "Use STARTTLS when available"
msgstr "Utiliser STARTTLS quand disponible"
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
msgid "Require STARTTLS"
msgstr "STARTTLS requis"
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:257
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
msgid "No authentication"
msgstr "Pas d'authentification"
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
msgid "Use same authentication as for receiving mail"
msgstr "Utiliser la même authentification que pour la réception des emails"
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
msgid "Specify authentication"
msgstr "Utiliser l'authentification"
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
-#: src/prefs_account.c:1832
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1389
+#: src/prefs_account.c:1982
msgid "User ID"
msgstr "Nom d'utilisateur"
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:371
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
-#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
-#: src/wizard.c:1215 src/wizard.c:1635
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1395
+#: src/prefs_account.c:2005 src/prefs_account.c:2733 src/prefs_account.c:2761
+#: src/prefs_account.c:2958 src/prefs_proxy.c:134 src/wizard.c:1215
+#: src/wizard.c:1635
msgid "Password"
msgstr "Mot de passe"
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
-#: src/prefs_account.c:1804
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1702
+#: src/prefs_account.c:1954
msgid "Authentication method"
msgstr "Authentification"
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
-#: src/prefs_account.c:1813 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1712
+#: src/prefs_account.c:1963 src/prefs_send.c:265 src/prefs_send.c:336
#: src/prefs_themes.c:1114
msgid "Automatic"
msgstr "Automatique"
-#: src/plugins/managesieve/sieve_prefs.c:394
+#: src/plugins/managesieve/sieve_prefs.c:390
msgid "Sieve server must not contain a space."
msgstr "Le nom de serveur Sieve ne peut contenir d'espace."
-#: src/plugins/managesieve/sieve_prefs.c:400
+#: src/plugins/managesieve/sieve_prefs.c:396
msgid "Sieve server is not entered."
msgstr "Le serveur Sieve est non spécifié."
-#: src/plugins/managesieve/sieve_prefs.c:428
+#: src/plugins/managesieve/sieve_prefs.c:424
msgid "Sieve"
msgstr "Sieve"
@@ -11450,7 +11464,7 @@ msgid "Show banner"
msgstr "Montrer la bannière"
#: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:147
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:147
#: src/prefs_receive.c:229
msgid "Never"
msgstr "Jamais"
@@ -11850,7 +11864,7 @@ msgstr "Pivoter à droite"
#: src/plugins/pdf_viewer/poppler_viewer.c:1969
msgid "Print Document"
-msgstr "Imprimer le document"
+msgstr "Imprimer le Document"
#: src/plugins/pdf_viewer/poppler_viewer.c:1972
msgid "Document Info"
@@ -12070,8 +12084,8 @@ msgstr "Expirer après"
msgid "Setting to '0' will store the passphrase for the whole session"
msgstr "Mettre 0 pour la mémoriser pendant toute la session"
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:452
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:2071
#: src/prefs_receive.c:188
msgid "minutes"
msgstr "minute(s)"
@@ -12100,101 +12114,101 @@ msgstr ""
msgid "Select GnuPG executable"
msgstr "Sélection de l'exécutable GnuPG"
-#: src/plugins/pgpcore/prefs_gpg.c:360
+#: src/plugins/pgpcore/prefs_gpg.c:358
msgid "Sign key"
msgstr "Signer la clé"
-#: src/plugins/pgpcore/prefs_gpg.c:368
+#: src/plugins/pgpcore/prefs_gpg.c:366
msgid "Use default GnuPG key"
msgstr "Utiliser la clé GnuPG par défaut"
-#: src/plugins/pgpcore/prefs_gpg.c:379
+#: src/plugins/pgpcore/prefs_gpg.c:377
msgid "Select key by your email address"
msgstr "Choisir la clé en fonction de l'adresse email"
-#: src/plugins/pgpcore/prefs_gpg.c:390
+#: src/plugins/pgpcore/prefs_gpg.c:388
msgid "Specify key manually"
msgstr "Spécifier la clé manuellement"
-#: src/plugins/pgpcore/prefs_gpg.c:400
+#: src/plugins/pgpcore/prefs_gpg.c:398
msgid "User or key ID:"
msgstr "Identifiant d'utilisateur ou de clé :"
-#: src/plugins/pgpcore/prefs_gpg.c:444
+#: src/plugins/pgpcore/prefs_gpg.c:442
msgid "No secret key found."
msgstr "Pas de clé privée trouvée."
-#: src/plugins/pgpcore/prefs_gpg.c:447
+#: src/plugins/pgpcore/prefs_gpg.c:445
msgid "Generate a new key pair"
msgstr "Générer une nouvelle paire de clés"
-#: src/plugins/pgpcore/prefs_gpg.c:686
+#: src/plugins/pgpcore/prefs_gpg.c:688
msgid "GPG"
msgstr "GPG"
-#: src/plugins/pgpcore/prefs_gpg.c:706 src/plugins/smime/plugin.c:38
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:917
msgid "S/MIME"
msgstr "S/MIME"
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:98
#, c-format
msgid "No exact match for '%s'; please select the key."
msgstr "Pas de correspondance exacte pour '%s' ; veuillez sélectionner la clé."
-#: src/plugins/pgpcore/select-keys.c:104
+#: src/plugins/pgpcore/select-keys.c:101
#, c-format
msgid "Collecting info for '%s' ... %c"
msgstr "Récupération d'infos pour '%s' .. %c"
-#: src/plugins/pgpcore/select-keys.c:244 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:145
msgid "Undefined"
msgstr "Indéfinie"
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:149
#: src/plugins/pgpcore/sgpgme.c:165
msgid "Marginal"
msgstr "Marginale"
-#: src/plugins/pgpcore/select-keys.c:256 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:153
#: src/plugins/pgpcore/sgpgme.c:169
msgid "Ultimate"
msgstr "Ultime"
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/pgpcore/select-keys.c:408
msgid "Select Keys"
msgstr "Sélection de clés"
-#: src/plugins/pgpcore/select-keys.c:470
+#: src/plugins/pgpcore/select-keys.c:457
msgid "Key ID"
msgstr "ID de la clé"
-#: src/plugins/pgpcore/select-keys.c:488
+#: src/plugins/pgpcore/select-keys.c:475
msgid "Trust"
msgstr "Confiance"
-#: src/plugins/pgpcore/select-keys.c:507
+#: src/plugins/pgpcore/select-keys.c:494
msgid "_Other"
msgstr "_Autres"
-#: src/plugins/pgpcore/select-keys.c:508
+#: src/plugins/pgpcore/select-keys.c:495
msgid "Do_n't encrypt"
msgstr "_Ne pas chiffrer"
-#: src/plugins/pgpcore/select-keys.c:689
+#: src/plugins/pgpcore/select-keys.c:676
msgid "Add key"
msgstr "Ajouter une clé"
-#: src/plugins/pgpcore/select-keys.c:690
+#: src/plugins/pgpcore/select-keys.c:677
msgid "Enter another user or key ID:"
msgstr "Saisir un autre utilisateur ou l'ID de la clé :"
-#: src/plugins/pgpcore/select-keys.c:712
+#: src/plugins/pgpcore/select-keys.c:699
#, c-format
msgid "Encrypt to %s <%s>"
msgstr "Chiffrement vers %s <%s>"
-#: src/plugins/pgpcore/select-keys.c:713
+#: src/plugins/pgpcore/select-keys.c:700
#, c-format
msgid ""
"This encryption key is not fully trusted.\n"
@@ -12699,12 +12713,12 @@ msgid "Show Python console..."
msgstr "Afficher la console Python.."
#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_feed_props.c:471
msgid "Refresh"
msgstr "Rafraîchir"
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
-#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2722
+#: src/prefs_account.c:2750 src/prefs_account.c:3192 src/wizard.c:1205
#: src/wizard.c:1625
msgid "Browse"
msgstr "Pa_rcourir"
@@ -12882,7 +12896,7 @@ msgctxt "Empty RSS feed title placeholder"
msgid "(empty)"
msgstr "(vide)"
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
msgid "Refresh all feeds"
msgstr "Mettre à jour tous les flux"
@@ -12899,22 +12913,23 @@ msgstr "Saisir l'adresse du flux auquel vous voulez vous abonner :"
msgid "'%c' can't be used in folder name."
msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:251 src/plugins/rssyl/rssyl_cb_menu.c:298
+#: src/plugins/rssyl/rssyl_feed_props.c:201
msgid "Claws Mail needs network access in order to update the feed."
msgid_plural "Claws Mail needs network access in order to update feeds."
msgstr[0] "Claws Mail nécessite un accès réseau pour mettre à jour le flux."
msgstr[1] "Claws Mail nécessite un accès réseau pour mettre à jour les flux."
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:324
#, c-format
msgid "Really remove the feed tree `%s' ?\n"
msgstr "Voulez-vous vraiment supprimer le dossier du flux '%s' ?\n"
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:325
msgid "Remove feed tree"
msgstr "Supprimer l'arborescence du flux"
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
msgid "Select an OPML file"
msgstr "Sélection d'un fichier OPML"
@@ -12960,53 +12975,53 @@ msgstr ""
"RSSyl : L'application est en cours de fermeture, impossible de finir la mise "
"à jour du flux '%s'\n"
-#: src/plugins/rssyl/rssyl_feed_props.c:259
+#: src/plugins/rssyl/rssyl_feed_props.c:270
msgid "HTTP Basic authentication"
msgstr "Authentification HTTP simple"
-#: src/plugins/rssyl/rssyl_feed_props.c:280
+#: src/plugins/rssyl/rssyl_feed_props.c:292
msgid "Use default refresh interval"
msgstr "Utiliser l'intervalle de mise à jour par défaut"
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:304
msgid "Keep old items"
msgstr "Conserver les vieux articles"
-#: src/plugins/rssyl/rssyl_feed_props.c:298
+#: src/plugins/rssyl/rssyl_feed_props.c:310
msgid "_Trim"
msgstr "_Rognage"
-#: src/plugins/rssyl/rssyl_feed_props.c:300
+#: src/plugins/rssyl/rssyl_feed_props.c:312
msgid "Update feed, deleting items which are no longer in the source feed"
msgstr ""
"Mise à jour du flux, suppression des articles qui ne sont plus dans la liste "
"du flux"
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:315
msgid "Fetch comments if possible"
msgstr "Récupérer les commentaires si possible"
-#: src/plugins/rssyl/rssyl_feed_props.c:323
+#: src/plugins/rssyl/rssyl_feed_props.c:335
msgid "Always mark it as new"
msgstr "Toujours le marquer comme non lu"
-#: src/plugins/rssyl/rssyl_feed_props.c:325
+#: src/plugins/rssyl/rssyl_feed_props.c:337
msgid "Only mark it as new if its text has changed"
msgstr "Marquer comme nouveau seulement si le texte a changé"
-#: src/plugins/rssyl/rssyl_feed_props.c:327
+#: src/plugins/rssyl/rssyl_feed_props.c:339
msgid "Never mark it as new"
msgstr "Ne jamais le marquer comme non lu"
-#: src/plugins/rssyl/rssyl_feed_props.c:332
+#: src/plugins/rssyl/rssyl_feed_props.c:344
msgid "Add item title to the top of message"
msgstr "Ajouter le titre de l'article en haut du message"
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:351
msgid "Ignore title rename"
msgstr "Ignorer le changement de titre"
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:356
msgid ""
"Enable this to keep current folder name, even if feed author changes title "
"of the feed."
@@ -13014,54 +13029,54 @@ msgstr ""
"Si coché, conserve le nom de dossier actuel, même si le titre du flux change "
"à l'avenir."
-#: src/plugins/rssyl/rssyl_feed_props.c:348
+#: src/plugins/rssyl/rssyl_feed_props.c:360
#: src/plugins/vcalendar/vcal_prefs.c:593
msgid "Verify SSL/TLS certificate validity"
msgstr "Vérifier la validité du certificat SSL/TLS"
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:380
msgid "User name"
msgstr "Utilisateur"
-#: src/plugins/rssyl/rssyl_feed_props.c:381
+#: src/plugins/rssyl/rssyl_feed_props.c:393
msgid "Source URL"
msgstr "URL source :"
-#: src/plugins/rssyl/rssyl_feed_props.c:394
+#: src/plugins/rssyl/rssyl_feed_props.c:406
msgid "Fetch comments on posts aged less than"
msgstr "Récupérer les commentaires des articles de moins de"
-#: src/plugins/rssyl/rssyl_feed_props.c:402
+#: src/plugins/rssyl/rssyl_feed_props.c:414
#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1513 src/prefs_folder_item.c:567 src/prefs_matcher.c:336
+#: src/prefs_account.c:1609 src/prefs_folder_item.c:567 src/prefs_matcher.c:336
msgid "days"
msgstr "jour(s)"
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:415
msgid "Set to -1 to fetch all comments"
msgstr "Utiliser -1 pour récupérer tous les commentaires"
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:439
msgid "If an item changes"
msgstr "Si l'article a changé"
-#: src/plugins/rssyl/rssyl_feed_props.c:432
+#: src/plugins/rssyl/rssyl_feed_props.c:444
msgid "Items"
msgstr "Articles"
-#: src/plugins/rssyl/rssyl_feed_props.c:445
+#: src/plugins/rssyl/rssyl_feed_props.c:457
msgid "Refresh interval"
msgstr "Intervalle de rafraîchissement"
-#: src/plugins/rssyl/rssyl_feed_props.c:453
+#: src/plugins/rssyl/rssyl_feed_props.c:465
msgid "Set to 0 to disable automatic refreshing for this feed"
msgstr "Saisir 0 pour désactiver la mise à jour automatique de ce flux"
-#: src/plugins/rssyl/rssyl_feed_props.c:505
+#: src/plugins/rssyl/rssyl_feed_props.c:517
msgid "_OK"
msgstr "_Valider"
-#: src/plugins/rssyl/rssyl_feed_props.c:513
+#: src/plugins/rssyl/rssyl_feed_props.c:525
msgid "Set feed properties"
msgstr "Propriétés du flux"
@@ -13184,17 +13199,17 @@ msgid "Updating comments for '%s'..."
msgstr "Mise à jour des commentaires pour %s.."
#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1620
msgid "401 (Authorisation required)"
msgstr "401 (Autorisation requise)"
#: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1622
+#: src/plugins/vcalendar/vcal_folder.c:1623
msgid "403 (Unauthorised)"
msgstr "403 (Non autorisé)"
#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1625
+#: src/plugins/vcalendar/vcal_folder.c:1626
msgid "404 (Not found)"
msgstr "404 (Non trouvé)"
@@ -13500,13 +13515,13 @@ msgstr "Chemin du socket Unix"
#: src/plugins/spamassassin/spamassassin_gtk.c:364
msgid "Use compression"
-msgstr "Activer la compression"
+msgstr "Utiliser la compression"
#: src/plugins/spamassassin/spamassassin_gtk.c:368
msgid "Enable compression if spamd uses it, otherwise disable it."
msgstr ""
"N'activer la compression que si spamd la supporte, sinon la laisser "
-"désactivée"
+"désactivée."
#: src/plugins/spamassassin/spamassassin_gtk.c:403
msgid ""
@@ -13892,63 +13907,63 @@ msgstr "Invités :"
msgid "Action:"
msgstr "Action :"
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:167
msgid "_New meeting..."
msgstr "_Nouveau rendez-vous.."
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:168
msgid "_Export calendar..."
msgstr "_Exporter le calendrier.."
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:169
msgid "_Subscribe to Webcal..."
msgstr "_Souscrire à un calendrier en ligne.."
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:171
msgid "_Rename..."
msgstr "_Renommer.."
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:172
msgid "U_pdate subscriptions"
msgstr "Me_ttre à jour les calendriers"
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:173
msgid "_List view"
msgstr "Vue en _liste"
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:174
msgid "_Week view"
msgstr "Vue _hebdomadaire"
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:175
msgid "_Month view"
msgstr "Vue _mensuelle"
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1102
msgid "Meetings"
msgstr "Rendez-vous"
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1501
msgid "in the past"
msgstr "dans le passé"
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1504
msgid "today"
msgstr "aujourd'hui"
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1507
msgid "tomorrow"
msgstr "demain"
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1510
msgid "this week"
msgstr "cette semaine"
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1513
msgid "later"
msgstr "plus tard"
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1517
#, c-format
msgid ""
"\n"
@@ -13957,17 +13972,17 @@ msgstr ""
"\n"
"Voici les évènements planifiés %s :\n"
-#: src/plugins/vcalendar/vcal_folder.c:1610
+#: src/plugins/vcalendar/vcal_folder.c:1611
#, c-format
msgid "Timeout (%d seconds) connecting to %s\n"
msgstr "Délai d'attente dépassé (%d secondes) lors de la connexion à %s\n"
-#: src/plugins/vcalendar/vcal_folder.c:1628
+#: src/plugins/vcalendar/vcal_folder.c:1629
#, c-format
msgid "Error %ld"
msgstr "Erreur %ld"
-#: src/plugins/vcalendar/vcal_folder.c:1810
+#: src/plugins/vcalendar/vcal_folder.c:1811
#, c-format
msgid ""
"Could not retrieve the Webcal URL:\n"
@@ -13980,7 +13995,7 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1836
+#: src/plugins/vcalendar/vcal_folder.c:1842
#, c-format
msgid ""
"This URL does not look like a Webcal URL:\n"
@@ -13991,47 +14006,47 @@ msgstr ""
"%s\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
#, c-format
msgid "Could not create directory %s"
msgstr "Impossible de créer le dossier %s."
-#: src/plugins/vcalendar/vcal_folder.c:1910
+#: src/plugins/vcalendar/vcal_folder.c:1916
msgid "Claws Mail needs network access in order to update the Webcal feed."
msgstr ""
"Claws Mail nécessite un accès réseau pour accéder au calendrier Webcal."
-#: src/plugins/vcalendar/vcal_folder.c:1921
+#: src/plugins/vcalendar/vcal_folder.c:1927
#, c-format
msgid "Fetching calendar for %s..."
msgstr "Récupération du calendrier pour %s.."
-#: src/plugins/vcalendar/vcal_folder.c:1922
+#: src/plugins/vcalendar/vcal_folder.c:1928
msgid "new subscription"
msgstr "Nouvelle inscription"
-#: src/plugins/vcalendar/vcal_folder.c:1933
+#: src/plugins/vcalendar/vcal_folder.c:1939
msgid "Claws Mail needs network access in order to update the subscription."
msgstr "Claws Mail nécessite un accès réseau pour mettre à jour l'abonnement."
-#: src/plugins/vcalendar/vcal_folder.c:1945
+#: src/plugins/vcalendar/vcal_folder.c:1951
msgid "Subscribe to Webcal"
msgstr "Souscrire à un calendrier en ligne (Webcal)"
-#: src/plugins/vcalendar/vcal_folder.c:1945
+#: src/plugins/vcalendar/vcal_folder.c:1951
msgid "Enter the WebCal URL:"
msgstr "Saisir l'URL du calendrier en ligne (WebCal) :"
-#: src/plugins/vcalendar/vcal_folder.c:1957
+#: src/plugins/vcalendar/vcal_folder.c:1963
msgid "Could not parse the URL."
msgstr "Impossible de comprendre l'URL."
-#: src/plugins/vcalendar/vcal_folder.c:1985
+#: src/plugins/vcalendar/vcal_folder.c:1991
msgid "Do you really want to unsubscribe?"
msgstr "Voulez-vous vraiment vous désinscrire ?"
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1992
msgid "Delete subscription"
msgstr "Supprimer la souscription"
@@ -14548,56 +14563,56 @@ msgstr "Erreur pendant la session POP\n"
msgid "TOP command unsupported\n"
msgstr "Commande TOP non supportée\n"
-#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
+#: src/prefs_account.c:366 src/prefs_account.c:1583 src/prefs_account.c:2650
msgid "POP"
msgstr "POP"
-#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
+#: src/prefs_account.c:367 src/prefs_account.c:1696 src/prefs_account.c:2665
#: src/wizard.c:1500
msgid "IMAP"
msgstr "IMAP4"
-#: src/prefs_account.c:337
+#: src/prefs_account.c:368
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:338 src/wizard.c:1501
+#: src/prefs_account.c:369 src/wizard.c:1501
msgid "Local mbox file"
msgstr "Fichier mbox local"
-#: src/prefs_account.c:339
+#: src/prefs_account.c:370
msgid "None (SMTP only)"
msgstr "Aucun (SMTP seulement)"
-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1132
msgid "Name of account"
msgstr "Nom du compte"
-#: src/prefs_account.c:1049
+#: src/prefs_account.c:1141
msgid "Set as default"
msgstr "Définir comme compte par défaut"
-#: src/prefs_account.c:1057
+#: src/prefs_account.c:1149
msgid "Personal information"
msgstr "Informations personnelles"
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1158
msgid "Full name"
msgstr "Nom complet"
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1164
msgid "Mail address"
msgstr "Adresse email"
-#: src/prefs_account.c:1135 src/wizard.c:1524
+#: src/prefs_account.c:1227 src/wizard.c:1524
msgid "Auto-configure"
msgstr "Auto-configurer"
-#: src/prefs_account.c:1137 src/wizard.c:1525
+#: src/prefs_account.c:1229 src/wizard.c:1525
msgid "Cancel"
msgstr "Annuler"
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1246
msgid ""
"Warning: this version of Claws Mail\n"
"has been built without IMAP and News support."
@@ -14605,77 +14620,77 @@ msgstr ""
"Attention : la version de Claws Mail actuellement\n"
"utilisée a été compilée sans les supports IMAP et NNTP."
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1277
msgid "This server requires authentication"
msgstr "Ce serveur nécessite une authentification"
-#: src/prefs_account.c:1192
+#: src/prefs_account.c:1284
msgid "Authenticate on connect"
msgstr "Authentification à la connexion"
-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1346
msgid "News server"
msgstr "Serveur de groupes de discussion"
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1352
msgid "Server for receiving"
msgstr "Serveur de réception"
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1358
msgid "Local mailbox"
msgstr "Fichier mbox local"
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1365
msgid "SMTP server (send)"
msgstr "Serveur d'envoi (SMTP)"
-#: src/prefs_account.c:1281
+#: src/prefs_account.c:1373
msgid "Use mail command rather than SMTP server"
msgstr "Utiliser une commande externe plutôt que le serveur SMTP"
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1382
msgid "command to send mails"
msgstr "Commande externe :"
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1457
#, c-format
msgid "Account%d"
msgstr "Compte%d"
-#: src/prefs_account.c:1461
+#: src/prefs_account.c:1557
msgid "Local"
msgstr "Local"
-#: src/prefs_account.c:1467 src/prefs_account.c:1556
+#: src/prefs_account.c:1563 src/prefs_account.c:1652
msgid "Default Inbox"
msgstr "Dossier de réception par défaut"
-#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
-#: src/prefs_account.c:1570
+#: src/prefs_account.c:1570 src/prefs_account.c:1577 src/prefs_account.c:1659
+#: src/prefs_account.c:1666
msgid "Unfiltered messages will be stored in this folder"
msgstr "Les messages non filtrés seront placés dans ce dossier"
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1585
msgid "Use secure authentication (APOP)"
msgstr "Authentification sécurisée (APOP)"
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1588
msgid "Remove messages on server when received"
msgstr "Suppression des messages du serveur après réception"
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1599
msgid "Remove after"
msgstr "Suppression après"
-#: src/prefs_account.c:1510 src/prefs_account.c:1520
+#: src/prefs_account.c:1606 src/prefs_account.c:1616
msgid "0 days and 0 hours : remove immediately"
msgstr "0 jour et 0 heure : suppression immédiate"
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1629
msgid "Receive size limit"
msgstr "Taille maximale pour la réception"
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1632
msgid ""
"Messages over this limit will be partially retrieved. When selecting them "
"you will be able to download them fully or delete them."
@@ -14685,85 +14700,105 @@ msgstr ""
"de les marquer pour un téléchargement complet ou une suppression (effectif "
"qu'à la relève suivante)."
-#: src/prefs_account.c:1576 src/prefs_account.c:2530
+#: src/prefs_account.c:1672 src/prefs_account.c:2680
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1583
+#: src/prefs_account.c:1679
msgid "Maximum number of articles to download"
msgstr "Nombre maximum d'articles à récupérer"
-#: src/prefs_account.c:1593
+#: src/prefs_account.c:1689
msgid "unlimited if 0 is specified"
msgstr "pas de limite si 0 est spécifié"
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1714
msgid "Plain text"
msgstr "Texte simple"
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1727
msgid "IMAP server directory"
msgstr "Répertoire sur le serveur IMAP4"
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1731
msgid "(usually empty)"
msgstr "(généralement nul)"
-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1745
msgid "Show subscribed folders only"
msgstr "Afficher seulement les dossiers inscrits"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1752
msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
msgstr ""
"Mode économique en bande passante (évite récupération des tags distants)"
-#: src/prefs_account.c:1658
+#: src/prefs_account.c:1754
msgid "This mode uses less bandwidth, but can be slower with some servers."
msgstr ""
"Ce mode utilise moins de bande passante mais peut apporter un ralentissement "
"avec certains serveurs."
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1761 src/prefs_receive.c:162
+msgid "Automatic checking"
+msgstr "Relève automatique du courriel"
+
+#: src/prefs_account.c:1764
+msgid "Use global settings"
+msgstr "Utiliser les paramètres globaux"
+
+#: src/prefs_account.c:1770 src/prefs_receive.c:169
+msgid "Check for new mail every"
+msgstr "Relever automatiquement toutes les"
+
+#: src/prefs_account.c:1783
+msgid "mins"
+msgstr "mins"
+
+#: src/prefs_account.c:1790
+msgid "secs"
+msgstr "secs"
+
+#: src/prefs_account.c:1809
msgid "Filter messages on receiving"
msgstr "Filtrage des messages à la réception"
-#: src/prefs_account.c:1672
+#: src/prefs_account.c:1816
msgid "Allow filtering using plugins on receiving"
msgstr "Autoriser les modules à filtrer les messages à la réception"
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1820
msgid "'Get Mail' checks for new messages on this account"
msgstr ""
"Le bouton « Relever » de la barre d'outil principale relève le courrier pour "
"ce compte"
-#: src/prefs_account.c:1759 src/prefs_customheader.c:208
+#: src/prefs_account.c:1909 src/prefs_customheader.c:208
#: src/prefs_matcher.c:622 src/prefs_matcher.c:1965 src/prefs_matcher.c:1987
msgid "Header"
msgstr "En-tête"
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1911
msgid "Generate Message-ID"
msgstr "Génération de l'en-tête « Message-ID »"
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1914
msgid "Send account mail address in Message-ID"
msgstr "Mettre l'adresse email dans le « Message-ID »"
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1917
msgid "Add user agent header"
msgstr "Ajouter l'en-tête « User-Agent »"
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1924
msgid "Add user-defined header"
msgstr "Ajouter des en-têtes supplémentaires"
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1939
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "Authentification SMTP (SMTP AUTH)"
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:2037
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
@@ -14771,166 +14806,201 @@ msgstr ""
"Laisser ces champs vides pour utiliser le nom d'utilisateur et le mot de "
"passe spécifiés pour la réception."
-#: src/prefs_account.c:1898
+#: src/prefs_account.c:2048
msgid "Authenticate with POP before sending"
msgstr "S'authentifier sur le POP avant l'envoi"
-#: src/prefs_account.c:1913
+#: src/prefs_account.c:2063
msgid "POP authentication timeout"
msgstr "Délai maximal pour l'authentification POP"
-#: src/prefs_account.c:2001 src/prefs_account.c:2047
+#: src/prefs_account.c:2151 src/prefs_account.c:2197
msgid "Signature"
msgstr "Signature"
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2154
msgid "Automatically insert signature"
msgstr "Insérer automatiquement la signature"
-#: src/prefs_account.c:2009
+#: src/prefs_account.c:2159
msgid "Signature separator"
msgstr "Séparateur de signature"
-#: src/prefs_account.c:2034
+#: src/prefs_account.c:2184
msgid "Command output"
msgstr "Résultat d'une commande"
-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2217
msgid "Automatically set the following addresses"
msgstr "Définition automatique des adresses suivantes"
-#: src/prefs_account.c:2119
+#: src/prefs_account.c:2269
msgid "Spell check dictionaries"
msgstr "Dictionnaires de correction orthographique"
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1103
+#: src/prefs_account.c:2279 src/prefs_folder_item.c:1103
#: src/prefs_spelling.c:162
msgid "Default dictionary"
msgstr "Dictionnaire par défaut"
-#: src/prefs_account.c:2142 src/prefs_folder_item.c:1137
+#: src/prefs_account.c:2292 src/prefs_folder_item.c:1137
#: src/prefs_spelling.c:174
msgid "Default alternate dictionary"
msgstr "Dictionnaire alternatif par défaut"
-#: src/prefs_account.c:2228 src/prefs_account.c:3423
+#: src/prefs_account.c:2378 src/prefs_account.c:3772
#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1448
#: src/prefs_folder_item.c:1841 src/prefs_quote.c:119 src/prefs_quote.c:237
#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
msgid "Compose"
msgstr "Composition"
-#: src/prefs_account.c:2243 src/prefs_folder_item.c:1476 src/prefs_quote.c:134
+#: src/prefs_account.c:2393 src/prefs_folder_item.c:1476 src/prefs_quote.c:134
#: src/toolbar.c:490
msgid "Reply"
msgstr "Répondre"
-#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
+#: src/prefs_account.c:2408 src/prefs_filtering_action.c:191
#: src/prefs_folder_item.c:1504 src/prefs_quote.c:149 src/toolbar.c:495
msgid "Forward"
msgstr "Transférer"
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2455
msgid "Default privacy system"
msgstr "Système de confidentialité par défaut"
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2484
msgid "Always sign messages"
msgstr "Toujours signer les messages"
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2486
msgid "Always encrypt messages"
msgstr "Toujours chiffrer les messages"
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2488
msgid "Always sign messages when replying to a signed message"
msgstr "Toujours signer la réponse à un message signé"
-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2491
msgid "Always encrypt messages when replying to an encrypted message"
msgstr "Toujours chiffrer la réponse à un message chiffré"
-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2494
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr ""
"Chiffrer les messages envoyés avec votre propre clé en plus de celle du "
"destinataire"
-#: src/prefs_account.c:2346
+#: src/prefs_account.c:2496
msgid "Save sent encrypted messages as clear text"
msgstr "Enregistrer les messages chiffrés envoyés en texte clair"
-#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
+#: src/prefs_account.c:2654 src/prefs_account.c:2669 src/prefs_account.c:2683
msgid "Don't use SSL/TLS"
msgstr "Ne pas utiliser SSL/TLS"
-#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2657 src/prefs_account.c:2672 src/prefs_account.c:2692
+#: src/prefs_account.c:2703
msgid "Use SSL/TLS"
msgstr "Utiliser SSL/TLS"
-#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
+#: src/prefs_account.c:2660 src/prefs_account.c:2675 src/prefs_account.c:2706
msgid "Use STARTTLS command to start encrypted session"
msgstr "Utiliser la commande STARTTLS pour commencer une session chiffrée"
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2696
msgid "Send (SMTP)"
msgstr "Envoi (SMTP)"
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2700
msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
msgstr "Ne pas utiliser SSL/TLS (mais utiliser STARTTLS si nécessaire)"
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2711
msgid "Client certificates"
msgstr "Certificats client"
-#: src/prefs_account.c:2569
+#: src/prefs_account.c:2719
msgid "Certificate for receiving"
msgstr "Certificat pour la réception"
-#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
-#: src/prefs_account.c:2604
+#: src/prefs_account.c:2724 src/prefs_account.c:2726 src/prefs_account.c:2752
+#: src/prefs_account.c:2754
msgid "Client certificate file as a PKCS12 or PEM file"
msgstr "Fichier certificat client tel qu'un fichier PKCS12 ou PEM"
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2747
msgid "Certificate for sending"
msgstr "Certificat pour l'envoi"
-#: src/prefs_account.c:2637
+#: src/prefs_account.c:2787
msgid "Automatically accept valid SSL/TLS certificates"
msgstr "Accepter automatiquement les certificats SSL/TLS valides"
-#: src/prefs_account.c:2640
+#: src/prefs_account.c:2790
msgid "Use non-blocking SSL/TLS"
msgstr "Utiliser la communication SSL/TLS non bloquante"
-#: src/prefs_account.c:2652
+#: src/prefs_account.c:2802
msgid "Turn this off if you have SSL/TLS connection problems"
msgstr "À désactiver en cas de problème de connexion SSL/TLS"
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2894 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr "Utiliser un serveur mandataire"
+
+#: src/prefs_account.c:2903
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr "Remise à zéro des réglages"
+
+#: src/prefs_account.c:2905
+msgid "Use global proxy server settings"
+msgstr "Utiliser les paramètres de serveur mandataire globaux"
+
+#: src/prefs_account.c:2942 src/prefs_proxy.c:115 src/wizard.c:1119
+msgid "Use authentication"
+msgstr "Utiliser l'authentification (SMTP AUTH)"
+
+#: src/prefs_account.c:2947 src/prefs_proxy.c:123
+msgid "Username"
+msgstr "Utilisateur"
+
+#: src/prefs_account.c:2981
+msgid "Use proxy server for sending"
+msgstr "Utiliser le serveur mandataire pour l'envoi"
+
+#: src/prefs_account.c:2983
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+"Si l'option est désactivée, les messages seront envoyés directement au "
+"serveur d'envoi, sans utiliser les paramètres de serveur mandataire"
+
+#: src/prefs_account.c:3096
msgid "SMTP port"
msgstr "Port SMTP"
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:3103
msgid "POP port"
msgstr "Port POP"
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:3110
msgid "IMAP port"
msgstr "Port IMAP"
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:3117
msgid "NNTP port"
msgstr "Port NNTP"
-#: src/prefs_account.c:2814
+#: src/prefs_account.c:3123
msgid "Domain name"
msgstr "Nom de domaine"
-#: src/prefs_account.c:2817
+#: src/prefs_account.c:3126
msgid ""
"The domain name will be used in the generated Message-ID, and when "
"connecting to SMTP servers."
@@ -14938,133 +15008,134 @@ msgstr ""
"Le nom de domaine sera utilisé dans la partie droite des identifiants de "
"messages générés (« Message-ID ») et lors de la connexion aux serveurs SMTP."
-#: src/prefs_account.c:2831
+#: src/prefs_account.c:3140
msgid "Use command to communicate with server"
msgstr "Utiliser une commande externe pour communiquer avec le serveur"
-#: src/prefs_account.c:2840
+#: src/prefs_account.c:3149
msgid "Mark cross-posted messages as read and color:"
msgstr "Marquer les articles croisés comme lus et les colorier en"
-#: src/prefs_account.c:2896
+#: src/prefs_account.c:3205
msgid "Put sent messages in"
msgstr "Sauvegarder les messages envoyés dans "
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:3207
msgid "Put queued messages in"
msgstr "Sauvegarder les messages à envoyer (file d'attente) dans "
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3209
msgid "Put draft messages in"
msgstr "Sauvegarder les brouillons dans "
-#: src/prefs_account.c:2902
+#: src/prefs_account.c:3211
msgid "Put deleted messages in"
msgstr "Sauvegarder les messages supprimés dans "
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3270
msgid "Account name is not entered."
msgstr "Le nom du compte est non spécifié."
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3274
msgid "Mail address is not entered."
msgstr "L'adresse email est non spécifiée."
-#: src/prefs_account.c:2973
+#: src/prefs_account.c:3282
msgid "SMTP server is not entered."
msgstr "Le serveur d'envoi (SMTP) est non spécifié."
-#: src/prefs_account.c:2978
+#: src/prefs_account.c:3287
msgid "User ID is not entered."
msgstr "Le nom d'utilisateur est non spécifié."
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3292
msgid "POP server is not entered."
msgstr "Le serveur POP est non spécifié."
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3312
msgid "The default Inbox folder doesn't exist."
msgstr "Le dossier de réception par défaut n'existe pas."
-#: src/prefs_account.c:3009
+#: src/prefs_account.c:3318
msgid "IMAP server is not entered."
msgstr "Le serveur IMAP est non spécifié."
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3323
msgid "NNTP server is not entered."
msgstr "Le serveur NNTP est non spécifié."
-#: src/prefs_account.c:3020
+#: src/prefs_account.c:3329
msgid "local mailbox filename is not entered."
msgstr "Le fichier local mbox est non spécifié."
-#: src/prefs_account.c:3026
+#: src/prefs_account.c:3335
msgid "mail command is not entered."
msgstr "La commande externe d'envoi est non spécifiée."
-#: src/prefs_account.c:3036
+#: src/prefs_account.c:3345
msgid "User ID cannot contain a newline character."
msgstr ""
-"L'identifiant d'utilisateur ne peut contenir de caractère de retour à la "
+"L'identifiant utilisateur ne doit pas contenir de caractère de retour à la "
"ligne."
-#: src/prefs_account.c:3041
+#: src/prefs_account.c:3350
msgid "Password cannot contain a newline character."
-msgstr "Le mot de passe ne peut contenir de caractère de retour à la ligne."
+msgstr ""
+"Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
-#: src/prefs_account.c:3069
+#: src/prefs_account.c:3378
msgid "SMTP user ID cannot contain a newline character."
msgstr ""
-"L'identifiant d'utilisateur SMTP ne peut contenir de caractère de retour à "
+"L'identifiant utilisateur SMTP ne doit pas contenir de caractère de retour à "
"la ligne."
-#: src/prefs_account.c:3074
+#: src/prefs_account.c:3383
msgid "SMTP password cannot contain a newline character."
msgstr ""
-"Le mot de passe SMTP ne peut contenir de caractère de retour à la ligne."
+"Le mot de passe SMTP ne doit pas contenir de caractère de retour à la ligne."
-#: src/prefs_account.c:3387
+#: src/prefs_account.c:3736
msgid "Receive"
msgstr "Réception"
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
+#: src/prefs_account.c:3790 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
msgid "Templates"
msgstr "Modèles"
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3808
msgid "Privacy"
msgstr "Confidentialité"
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3938
msgid "Advanced"
msgstr "Avancé"
-#: src/prefs_account.c:3906
+#: src/prefs_account.c:4287
msgid "Preferences for new account"
msgstr "Configuration du nouveau compte"
-#: src/prefs_account.c:3908
+#: src/prefs_account.c:4289
#, c-format
msgid "%s - Account preferences"
msgstr "%s - Configuration du compte"
-#: src/prefs_account.c:4029 src/wizard.c:1389
+#: src/prefs_account.c:4410 src/wizard.c:1389
msgid "Failed (wrong address)"
msgstr "Échec (adresse incorrecte)"
-#: src/prefs_account.c:4114
+#: src/prefs_account.c:4495
msgid "Select signature file"
msgstr "Sélection du fichier signature"
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1066
+#: src/prefs_account.c:4513 src/prefs_account.c:4530 src/wizard.c:1066
msgid "Select certificate file"
msgstr "Choisir le fichier de certificat"
-#: src/prefs_account.c:4245
+#: src/prefs_account.c:4626
msgid "Protocol:"
msgstr "Protocole :"
-#: src/prefs_account.c:4385
+#: src/prefs_account.c:4797
#, c-format
msgid "%s (plugin not loaded)"
msgstr "%s (module non chargé)"
@@ -15334,15 +15405,15 @@ msgstr "Actions enregistrées"
msgid "Action string is not valid."
msgstr "La syntaxe de l'action est incorrecte."
-#: src/prefs_common.c:236 src/prefs_quote.c:69
+#: src/prefs_common.c:237 src/prefs_quote.c:69
msgid "Hello,\\n"
msgstr "Bonjour,\\n"
-#: src/prefs_common.c:314
+#: src/prefs_common.c:315
msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
msgstr "Le %d,\\n%f a écrit :\\n\\n%q\\n%X"
-#: src/prefs_common.c:320 src/prefs_quote.c:85
+#: src/prefs_common.c:321 src/prefs_quote.c:85
msgid ""
"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -15351,7 +15422,7 @@ msgstr ""
"t{À : %t\\n}?c{Cc : %c\\n}?n{Groupe de discussion : %n\\n}?s{Sujet : %s"
"\\n}\\n\\n%M"
-#: src/prefs_common.c:448
+#: src/prefs_common.c:449
msgid "%x(%a) %H:%M"
msgstr "%a %x %H:%M"
@@ -15631,7 +15702,7 @@ msgid "Mark as ham"
msgstr "Marquer comme courrier légitime"
#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1418
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
msgid "Execute"
msgstr "Exécuter"
@@ -15746,7 +15817,7 @@ msgstr "Chemin du fichier (ne doit pas être modifié)"
#: src/prefs_filtering_action.c:1247 src/prefs_matcher.c:2169
#: src/quote_fmt.c:87
msgid "new line"
-msgstr "Retour à la ligne"
+msgstr "Retour chariot"
#: src/prefs_filtering_action.c:1248 src/prefs_matcher.c:2170
msgid "escape character for quotes"
@@ -16127,7 +16198,7 @@ msgstr "Affichage"
msgid "Fonts"
msgstr "Polices"
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:908 src/toolbar.c:256 src/toolbar.c:517
msgid "Preferences"
msgstr "Préférences"
@@ -16350,11 +16421,11 @@ msgstr "corps du message"
msgid "whole message"
msgstr "tout le message"
-#: src/prefs_matcher.c:393 src/summaryview.c:6478
+#: src/prefs_matcher.c:393 src/summaryview.c:6487
msgid "Marked"
msgstr "Marqué"
-#: src/prefs_matcher.c:394 src/summaryview.c:6476
+#: src/prefs_matcher.c:394 src/summaryview.c:6485
msgid "Deleted"
msgstr "Supprimé"
@@ -16362,12 +16433,12 @@ msgstr "Supprimé"
msgid "Replied"
msgstr "Répondu"
-#: src/prefs_matcher.c:396 src/summaryview.c:6470
+#: src/prefs_matcher.c:396 src/summaryview.c:6479
msgid "Forwarded"
msgstr "Transféré"
-#: src/prefs_matcher.c:398 src/summaryview.c:6460 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2339
+#: src/prefs_matcher.c:398 src/summaryview.c:6469 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
msgid "Spam"
msgstr "Pourriel"
@@ -16375,7 +16446,7 @@ msgstr "Pourriel"
msgid "Has attachment"
msgstr "Contient une ou plusieurs pièces jointes"
-#: src/prefs_matcher.c:400 src/summaryview.c:6496
+#: src/prefs_matcher.c:400 src/summaryview.c:6505
msgid "Signed"
msgstr "Signé"
@@ -16842,10 +16913,9 @@ msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
msgstr ""
-"Sélection de la couleur des dossiers ciblés. (Les dossiers ciblés sont "
-"utilisés quand l'option « Configuration/Préférences/Affichage/Liste des "
-"messages/Exécuter immédiatement la suppression ou le déplacement de messages "
-"» est désactivée)"
+"Sélection de la couleur des dossiers ciblés. Les dossiers ciblés sont "
+"utilisés quand l'option « Exécuter immédiatement la suppression ou le "
+"déplacement de messages » est désactivée"
#: src/prefs_msg_colors.c:323
msgid "Target folder"
@@ -16964,7 +17034,7 @@ msgstr "En quittant"
#: src/prefs_other.c:498
msgid "Confirm on exit"
-msgstr "Confirmer avant de quitter"
+msgstr "Demander confirmation"
#: src/prefs_other.c:505
msgid "Empty trash on exit"
@@ -17026,7 +17096,7 @@ msgstr "Délai d'attente maximal de communication"
#: src/prefs_other.c:579
msgid "Ask before emptying trash"
-msgstr "Confirmer avant de vider la ou les corbeilles"
+msgstr "Demander une confirmation pour vider la ou les corbeilles"
#: src/prefs_other.c:581
msgid "Ask about account specific filtering rules when filtering manually"
@@ -17084,6 +17154,10 @@ msgstr "Changer la phrase secrète principale"
msgid "Miscellaneous"
msgstr "Divers"
+#: src/prefs_proxy.c:240 src/prefs_receive.c:413 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "Traitement du courrier"
+
#: src/prefs_quote.c:77
msgid "On %d\\n%f wrote:\\n\\n%q"
msgstr "Le %d,\\n%f a écrit :\\n\\n%q"
@@ -17096,14 +17170,6 @@ msgstr "Programme externe pour la réception du courriel"
msgid "Use external program for receiving mail"
msgstr "Utiliser le programme suivant"
-#: src/prefs_receive.c:162
-msgid "Automatic checking"
-msgstr "Relève automatique du courriel"
-
-#: src/prefs_receive.c:169
-msgid "Check for new mail every"
-msgstr "Relever automatiquement toutes les"
-
#: src/prefs_receive.c:213
msgid "Check for new mail on start-up"
msgstr "Relever au démarrage"
@@ -17157,10 +17223,6 @@ msgstr "après une relève manuelle"
msgid "Use %d as number of new mails"
msgstr "Utiliser %d pour le nombre de nouveaux messages"
-#: src/prefs_receive.c:413 src/prefs_send.c:419
-msgid "Mail Handling"
-msgstr "Traitement du courrier"
-
#: src/prefs_receive.c:414
msgid "Receiving"
msgstr "Réception"
@@ -17175,7 +17237,8 @@ msgstr "Ne jamais envoyer d'accusé de réception"
#: src/prefs_send.c:197
msgid "Confirm before sending queued messages"
-msgstr "Confirmer avant d'envoyer les messages en file d'attente"
+msgstr ""
+"Demander une confirmation avant d'envoyer les messages en file d'attente"
#: src/prefs_send.c:200
msgid "Show send dialog"
@@ -17187,7 +17250,7 @@ msgstr "Prévenir si le sujet est vide."
#: src/prefs_send.c:209
msgid "Warn when sending to more recipients than"
-msgstr "Prévenir quand le nombre de destinataires dépasse"
+msgstr "Prévenir lors de l'envoi à un nombre de destinataires plus grand que"
#: src/prefs_send.c:225
msgid "Outgoing encoding"
@@ -17335,8 +17398,8 @@ msgstr ""
"Spécifier le « Content-Transfer-Encoding » utilisé quand le corps du message "
"contient des caractères non ASCII."
-#: src/prefs_send.c:420 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:519 src/send_message.c:523
+#: src/send_message.c:528
msgid "Sending"
msgstr "Envoi"
@@ -18125,28 +18188,28 @@ msgstr "Aucune d'information trouvée"
msgid "No recipient keys defined."
msgstr "Pas de clé de destinataire spécifiée."
-#: src/procmime.c:435 src/procmime.c:437 src/procmime.c:438
+#: src/procmime.c:438 src/procmime.c:440 src/procmime.c:441
msgid "[Error decoding BASE64]\n"
msgstr "[Erreur de décodage BASE64]\n"
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:937 src/procmsg.c:940
msgid "Already trying to send."
msgstr "Les messages en file d'attente sont déjà en cours d'envoi."
-#: src/procmsg.c:1557 src/procmsg.c:1618
+#: src/procmsg.c:1558 src/procmsg.c:1619
#, c-format
msgid "Couldn't open file %s."
msgstr "Impossible d'ouvrir le fichier %s."
-#: src/procmsg.c:1628
+#: src/procmsg.c:1629
msgid "Queued message header is broken."
msgstr "L'en-tête de message en file d'attente est corrompue."
-#: src/procmsg.c:1648
+#: src/procmsg.c:1649
msgid "An error happened during SMTP session."
msgstr "Une erreur est survenue durant la session SMTP."
-#: src/procmsg.c:1662
+#: src/procmsg.c:1663
msgid ""
"No specific account has been found to send, and an error happened during "
"SMTP session."
@@ -18154,7 +18217,7 @@ msgstr ""
"Aucun compte précis n'a été trouvé pour l'envoi, et une erreur est survenue "
"durant la session SMTP."
-#: src/procmsg.c:1670
+#: src/procmsg.c:1671
msgid ""
"Couldn't determine sending information. Maybe the email hasn't been "
"generated by Claws Mail."
@@ -18162,22 +18225,22 @@ msgstr ""
"Impossible de déterminer les paramètres d'envoi. Le message n'a sans doute "
"pas été généré par Claws Mail."
-#: src/procmsg.c:1693
+#: src/procmsg.c:1694
msgid "Couldn't create temporary file for news sending."
msgstr "Impossible de créer un fichier temporaire pour l'envoi de l'article."
-#: src/procmsg.c:1706
+#: src/procmsg.c:1707
msgid "Error when writing temporary file for news sending."
msgstr ""
"Erreur pendant l'écriture du ficher temporaire nécessaire\n"
"à l'envoi de l'article."
-#: src/procmsg.c:1720
+#: src/procmsg.c:1721
#, c-format
msgid "Error occurred while posting the message to %s."
msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
-#: src/procmsg.c:2272
+#: src/procmsg.c:2273
msgid "Filtering messages...\n"
msgstr "Filtrage des messages..\n"
@@ -18491,97 +18554,97 @@ msgstr "Le « préfixe de citation » du modèle « Réponse » est invalide."
msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
msgstr "Le « préfixe de citation » du modèle « Transfert » est invalide."
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:543
#, c-format
msgid "Enter text to replace '%s'"
msgstr "Saisir le texte pour remplacer '%s'"
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:544
msgid "Enter variable"
msgstr "Remplacement de variable"
-#: src/send_message.c:152
+#: src/send_message.c:153
#, c-format
msgid "Sending message using command: %s\n"
msgstr "Envoi du message par la commande : %s\n"
-#: src/send_message.c:166
+#: src/send_message.c:167
#, c-format
msgid "Couldn't execute command: %s"
msgstr "Impossible de lancer la commande : %s"
-#: src/send_message.c:202
+#: src/send_message.c:203
#, c-format
msgid "Error occurred while executing command: %s"
msgstr "Une erreur est survenue pendant le lancement de la commande : %s"
-#: src/send_message.c:350
+#: src/send_message.c:352
msgid "Connecting"
msgstr "Connexion"
-#: src/send_message.c:355
+#: src/send_message.c:357
msgid "Doing POP before SMTP..."
msgstr "Connexion POP avant SMTP.."
-#: src/send_message.c:358
+#: src/send_message.c:360
msgid "POP before SMTP"
msgstr "POP avant SMTP"
-#: src/send_message.c:363
+#: src/send_message.c:365
#, c-format
msgid "Account '%s': Connecting to SMTP server: %s:%d..."
msgstr "Compte '%s' : Connexion au serveur SMTP : %s:%d.."
-#: src/send_message.c:420
+#: src/send_message.c:438
msgid "Mail sent successfully."
msgstr "Message envoyé avec succès."
-#: src/send_message.c:486
+#: src/send_message.c:504
msgid "Sending HELO..."
msgstr "Envoi de HELO.."
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:505 src/send_message.c:510 src/send_message.c:515
msgid "Authenticating"
msgstr "Authentification"
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:506 src/send_message.c:511
msgid "Sending message..."
msgstr "Envoi du message.."
-#: src/send_message.c:491
+#: src/send_message.c:509
msgid "Sending EHLO..."
msgstr "Envoi de EHLO.."
-#: src/send_message.c:500
+#: src/send_message.c:518
msgid "Sending MAIL FROM..."
msgstr "Envoi de MAIL FROM.."
-#: src/send_message.c:504
+#: src/send_message.c:522
msgid "Sending RCPT TO..."
msgstr "Envoi de RCPT TO.."
-#: src/send_message.c:509
+#: src/send_message.c:527
msgid "Sending DATA..."
msgstr "Envoi de DATA.."
-#: src/send_message.c:513
+#: src/send_message.c:531
msgid "Quitting..."
msgstr "Fermeture.."
-#: src/send_message.c:542
+#: src/send_message.c:560
#, c-format
msgid "Sending message (%d / %d bytes)"
msgstr "Envoi du message (%d / %d octets)"
-#: src/send_message.c:595
+#: src/send_message.c:613
msgid "Sending message"
msgstr "Envoi de message"
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:682 src/send_message.c:702
msgid "Error occurred while sending the message."
msgstr "Une erreur est survenue pendant l'envoi de message."
-#: src/send_message.c:667
+#: src/send_message.c:685
#, c-format
msgid ""
"Error occurred while sending the message:\n"
@@ -18627,42 +18690,42 @@ msgstr "Supprimer le certificat"
msgid "Do you really want to delete this certificate?"
msgstr "Voulez-vous vraiment supprimer le certificat sélectionné ?"
-#: src/summary_search.c:293
+#: src/summary_search.c:292
msgid "Search messages"
msgstr "Chercher dans le dossier"
-#: src/summary_search.c:315
+#: src/summary_search.c:314
msgid "Match any of the following"
msgstr "Messages validant au moins UN des critères suivants"
-#: src/summary_search.c:317
+#: src/summary_search.c:316
msgid "Match all of the following"
msgstr "Messages validant TOUS les critères suivants"
-#: src/summary_search.c:438
+#: src/summary_search.c:437
msgid "Body:"
msgstr ""
"Corps du\n"
"message :"
-#: src/summary_search.c:445
+#: src/summary_search.c:444
msgid "Condition:"
msgstr "Condition :"
-#: src/summary_search.c:479
+#: src/summary_search.c:478
msgid "Find _all"
msgstr "Chercher _tous"
-#: src/summary_search.c:694 src/summaryview.c:1092 src/summaryview.c:1354
+#: src/summary_search.c:693 src/summaryview.c:1092 src/summaryview.c:1354
#, c-format
msgid "Searching in %s... \n"
msgstr "Recherche en cours dans le dossier %s.. \n"
-#: src/summary_search.c:789
+#: src/summary_search.c:788
msgid "Beginning of list reached; continue from end?"
msgstr "Début de liste atteinte, reprise à la fin ?"
-#: src/summary_search.c:791
+#: src/summary_search.c:790
msgid "End of list reached; continue from beginning?"
msgstr "Fin de liste atteinte, reprise au début ?"
@@ -18857,71 +18920,71 @@ msgstr "(Pas de date)"
msgid "(No Recipient)"
msgstr "(Pas de destinataire)"
-#: src/summaryview.c:3521
+#: src/summaryview.c:3530
#, c-format
msgid "From: %s, on %s"
msgstr "De : %s, le %s"
-#: src/summaryview.c:3530
+#: src/summaryview.c:3539
#, c-format
msgid "To: %s, on %s"
msgstr "À : %s, le %s"
-#: src/summaryview.c:4419
+#: src/summaryview.c:4428
msgid "You're not the author of the article."
msgstr "Vous n'êtes pas l'auteur de cet article."
-#: src/summaryview.c:4509
+#: src/summaryview.c:4518
#, c-format
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the %d selected messages?"
msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
msgstr[1] "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
-#: src/summaryview.c:4512
+#: src/summaryview.c:4521
msgid "Delete message"
msgid_plural "Delete messages"
msgstr[0] "Supprimer le message"
msgstr[1] "Supprimer le(s) message(s) sélectionné(s)"
-#: src/summaryview.c:4676
+#: src/summaryview.c:4685
msgid "Destination is same as current folder."
msgstr "La destination est identique au dossier actuel."
-#: src/summaryview.c:4731
+#: src/summaryview.c:4740
msgid "Select folder to move selected message to"
msgid_plural "Select folder to move selected messages to"
msgstr[0] "Sélection du dossier où déplacer le message sélectionné"
msgstr[1] "Sélection du dossier où déplacer les messages sélectionnés"
-#: src/summaryview.c:4782
+#: src/summaryview.c:4791
msgid "Destination to copy is same as current folder."
msgstr "La destination et la source de la copie sont identiques"
-#: src/summaryview.c:4816
+#: src/summaryview.c:4825
msgid "Select folder to copy selected message to"
msgid_plural "Select folder to copy selected messages to"
msgstr[0] "Sélection du dossier où copier le message sélectionné"
msgstr[1] "Sélection du dossier où copier les messages sélectionnés"
-#: src/summaryview.c:4967
+#: src/summaryview.c:4976
msgid "Append or Overwrite"
msgstr "Ajouter ou écraser"
-#: src/summaryview.c:4968
+#: src/summaryview.c:4977
msgid "Append or overwrite existing file?"
msgstr ""
"Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
-#: src/summaryview.c:4969
+#: src/summaryview.c:4978
msgid "_Append"
msgstr "_Ajouter"
-#: src/summaryview.c:4969
+#: src/summaryview.c:4978
msgid "_Overwrite"
msgstr "_Écraser"
-#: src/summaryview.c:5010
+#: src/summaryview.c:5019
#, c-format
msgid ""
"You are about to print %d messages, one by one. Do you want to continue?"
@@ -18929,29 +18992,29 @@ msgstr ""
"Vous êtes sur le point d'imprimer %d messages un par un. Voulez-vous "
"continuer ?"
-#: src/summaryview.c:5468
+#: src/summaryview.c:5477
msgid "Building threads..."
msgstr "Construction des threads.."
-#: src/summaryview.c:5716
+#: src/summaryview.c:5725
msgid "Skip these rules"
msgstr "Ignorer ces règles"
-#: src/summaryview.c:5719
+#: src/summaryview.c:5728
msgid "Apply these rules regardless of the account they belong to"
msgstr ""
"Appliquer ces règles sans se soucier des comptes auxquels elles sont "
"rattachées"
-#: src/summaryview.c:5722
+#: src/summaryview.c:5731
msgid "Apply these rules if they apply to the current account"
msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
-#: src/summaryview.c:5751
+#: src/summaryview.c:5760
msgid "Filtering"
msgstr "Filtrage"
-#: src/summaryview.c:5752
+#: src/summaryview.c:5761
msgid ""
"There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"
@@ -18959,67 +19022,67 @@ msgstr ""
"Il y a des règles de filtrage rattachées à des comptes.\n"
"Veuillez sélectionner ce que vous voulez faire avec ces règles :"
-#: src/summaryview.c:5783
+#: src/summaryview.c:5792
msgid "Filtering..."
msgstr "Filtrage des messages.."
-#: src/summaryview.c:5862
+#: src/summaryview.c:5871
msgid "Processing configuration"
msgstr "Configuration du filtrage/traitement"
-#: src/summaryview.c:6010
+#: src/summaryview.c:6019
msgid "Do you really want to reset the color label of all selected messages?"
msgstr "Voulez-vous vraiment effacer la couleur des messages sélectionnés ?"
-#: src/summaryview.c:6012
+#: src/summaryview.c:6021
msgid "Do you really want to apply this color label to all selected messages?"
msgstr "Voulez-vous vraiment remplacer la couleur des messages sélectionnés ?"
-#: src/summaryview.c:6013
+#: src/summaryview.c:6022
msgid "Set color label"
-msgstr "Couleur"
+msgstr "Assigner une couleur"
-#: src/summaryview.c:6456
+#: src/summaryview.c:6465
msgid "Ignored thread"
msgstr "Fil de discussion ignoré"
-#: src/summaryview.c:6458
+#: src/summaryview.c:6467
msgid "Watched thread"
msgstr "Fil de discussion suivi"
-#: src/summaryview.c:6466
+#: src/summaryview.c:6475
msgid "Replied but also forwarded - click to see reply"
msgstr "Répondu mais aussi transféré - cliquer pour voir la réponse"
-#: src/summaryview.c:6468
+#: src/summaryview.c:6477
msgid "Replied - click to see reply"
msgstr "Répondu - cliquer pour voir la réponse"
-#: src/summaryview.c:6480
+#: src/summaryview.c:6489
msgid "To be moved"
msgstr "À deplacer"
-#: src/summaryview.c:6482
+#: src/summaryview.c:6491
msgid "To be copied"
msgstr "À copier"
-#: src/summaryview.c:6494
+#: src/summaryview.c:6503
msgid "Signed, has attachment(s)"
msgstr "Signé et contenant une ou plusieurs pièces jointes"
-#: src/summaryview.c:6498
+#: src/summaryview.c:6507
msgid "Encrypted, has attachment(s)"
msgstr "Chiffré et contenant une ou plusieurs pièces jointes"
-#: src/summaryview.c:6500
+#: src/summaryview.c:6509
msgid "Encrypted"
msgstr "Chiffré"
-#: src/summaryview.c:6502
+#: src/summaryview.c:6511
msgid "Has attachment(s)"
msgstr "Contient une ou plusieurs pièces jointes"
-#: src/summaryview.c:8173
+#: src/summaryview.c:8182
#, c-format
msgid ""
"Regular expression (regexp) error:\n"
@@ -19028,11 +19091,11 @@ msgstr ""
"Erreur dans l'expression régulière (regexp) :\n"
"%s"
-#: src/summaryview.c:8276
+#: src/summaryview.c:8285
msgid "Go back to the folder list (You have unread messages)"
msgstr "Revenir à la liste des dossiers (vous avez des messages non lus)"
-#: src/summaryview.c:8281
+#: src/summaryview.c:8290
msgid "Go back to the folder list"
msgstr "Revenir à la liste des dossiers"
@@ -19096,66 +19159,66 @@ msgstr "'Traces réseau'"
msgid " in the Tools menu for more information."
msgstr " dans le menu Outils."
-#: src/textview.c:986
+#: src/textview.c:989
msgid " The following can be performed on this part\n"
msgstr ""
" Les actions suivantes peuvent être effectuées sur l'élément actuellement "
"sélectionné\n"
-#: src/textview.c:988
+#: src/textview.c:991
msgid " by right-clicking the icon or list item:"
msgstr ""
" en cliquant avec le bouton droit sur l'icône ou l'élément de la liste :"
-#: src/textview.c:992
+#: src/textview.c:995
msgid " - To save, select "
msgstr " - Pour l'enregistrer, sélectionner « "
-#: src/textview.c:993
+#: src/textview.c:996
msgid "'Save as...'"
msgstr "Enregistrer sous.."
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:998 src/textview.c:1010 src/textview.c:1022
+#: src/textview.c:1032
msgid " (Shortcut key: '"
msgstr " (raccourci : '"
-#: src/textview.c:1003
+#: src/textview.c:1006
msgid " - To display as text, select "
msgstr " - Pour l'afficher en tant que texte, sélectionner « "
-#: src/textview.c:1004
+#: src/textview.c:1007
msgid "'Display as text'"
msgstr "Afficher comme du texte"
-#: src/textview.c:1015
+#: src/textview.c:1018
msgid " - To open with an external program, select "
msgstr ""
" - Pour l'ouvrir avec le programme externe correspondant, sélectionner « "
-#: src/textview.c:1016
+#: src/textview.c:1019
msgid "'Open'"
msgstr "Ouvrir"
-#: src/textview.c:1024
+#: src/textview.c:1027
msgid " (alternately double-click, or click the middle "
msgstr " (un double-clic ou un clic avec le bouton "
-#: src/textview.c:1025
+#: src/textview.c:1028
msgid "mouse button)\n"
msgstr "du milieu sont également possibles.);\n"
-#: src/textview.c:1027
+#: src/textview.c:1030
msgid " - Or use "
msgstr ""
" - Pour l'ouvrir avec un programme externe de votre choix, sélectionner "
"« "
-#: src/textview.c:1028
+#: src/textview.c:1031
msgid "'Open with...'"
msgstr "Ouvrir avec.."
-#: src/textview.c:1147
+#: src/textview.c:1152
#, c-format
msgid ""
"The command to view attachment as text failed:\n"
@@ -19166,47 +19229,47 @@ msgstr ""
" %s\n"
"Code de retour %d\n"
-#: src/textview.c:2206
+#: src/textview.c:2228
msgid "Tags: "
msgstr "Labels : "
-#: src/textview.c:2914
+#: src/textview.c:2947
msgid "The real URL is different from the displayed URL."
msgstr "L'URL réel est différent de l'URL affiché"
-#: src/textview.c:2915
+#: src/textview.c:2948
msgid "Displayed URL:"
msgstr "URL affiché :"
-#: src/textview.c:2916
+#: src/textview.c:2949
msgid "Real URL:"
msgstr "URL réel :"
-#: src/textview.c:2917
+#: src/textview.c:2950
msgid "Open it anyway?"
msgstr "Voulez-vous quand même l'ouvrir ?"
-#: src/textview.c:2918
+#: src/textview.c:2951
msgid "Phishing attempt warning"
msgstr "Attention : Tentative d'hameçonnage (phishing)"
-#: src/textview.c:2919
+#: src/textview.c:2952
msgid "_Open URL"
msgstr "_Ouvrir l'URL"
-#: src/toolbar.c:224 src/toolbar.c:2291
+#: src/toolbar.c:224 src/toolbar.c:2294
msgid "Receive Mail from all Accounts"
msgstr "Relever le courrier de tous les comptes"
-#: src/toolbar.c:225 src/toolbar.c:2296
+#: src/toolbar.c:225 src/toolbar.c:2299
msgid "Receive Mail from current Account"
msgstr "Relever le courrier du compte courant"
-#: src/toolbar.c:226 src/toolbar.c:2300
+#: src/toolbar.c:226 src/toolbar.c:2303
msgid "Send Queued Messages"
msgstr "Envoyer les messages en attente"
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
msgid "Compose Email"
msgstr "Composer un message"
@@ -19214,35 +19277,35 @@ msgstr "Composer un message"
msgid "Compose News"
msgstr "Composer un article"
-#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
msgid "Reply to Message"
msgstr "Répondre au message"
-#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
msgid "Reply to Sender"
msgstr "Répondre à l'expéditeur"
-#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
msgid "Reply to All"
msgstr "Répondre à tous"
-#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
msgid "Reply to Mailing-list"
msgstr "Répondre à la liste"
-#: src/toolbar.c:233 src/toolbar.c:2312
+#: src/toolbar.c:233 src/toolbar.c:2315
msgid "Open email"
msgstr "Ouvrir le message"
-#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
msgid "Forward Message"
msgstr "Transférer le(s) message(s) sélectionné(s)"
-#: src/toolbar.c:235 src/toolbar.c:2457
+#: src/toolbar.c:235 src/toolbar.c:2460
msgid "Trash Message"
msgstr "Déplacer le(s) message(s) sélectionné(s) vers la corbeille"
-#: src/toolbar.c:236 src/toolbar.c:2461
+#: src/toolbar.c:236 src/toolbar.c:2464
msgid "Delete Message"
msgstr "Supprimer le(s) message(s) sélectionné(s)"
@@ -19250,11 +19313,11 @@ msgstr "Supprimer le(s) message(s) sélectionné(s)"
msgid "Delete duplicate messages"
msgstr "Supprimer les messages en double"
-#: src/toolbar.c:239 src/toolbar.c:2469
+#: src/toolbar.c:239 src/toolbar.c:2472
msgid "Go to Previous Unread Message"
msgstr "Aller au message non lu précédent"
-#: src/toolbar.c:240 src/toolbar.c:2473
+#: src/toolbar.c:240 src/toolbar.c:2476
msgid "Go to Next Unread Message"
msgstr "Aller au message non lu suivant"
@@ -19302,55 +19365,55 @@ msgstr "Appliquer l'opération d'apprentissage de SpamAssassin"
msgid "Open folder/Go to folder list"
msgstr "Ouvrir le dossier / la liste des dossiers"
-#: src/toolbar.c:258 src/toolbar.c:2479
+#: src/toolbar.c:258 src/toolbar.c:2482
msgid "Send Message"
msgstr "Envoyer le message"
-#: src/toolbar.c:259 src/toolbar.c:2483
+#: src/toolbar.c:259 src/toolbar.c:2486
msgid "Put into queue folder and send later"
msgstr "Mettre en file d'attente et envoyer plus tard"
-#: src/toolbar.c:260 src/toolbar.c:2487
+#: src/toolbar.c:260 src/toolbar.c:2490
msgid "Save to draft folder"
msgstr "Enregistrer dans le dossier brouillon"
-#: src/toolbar.c:261 src/toolbar.c:2491
+#: src/toolbar.c:261 src/toolbar.c:2494
msgid "Insert file"
msgstr "Insérer un fichier"
-#: src/toolbar.c:262 src/toolbar.c:2495
+#: src/toolbar.c:262 src/toolbar.c:2498
msgid "Attach file"
msgstr "Adjoindre un fichier"
-#: src/toolbar.c:263 src/toolbar.c:2499
+#: src/toolbar.c:263 src/toolbar.c:2502
msgid "Insert signature"
msgstr "Insérer la signature"
-#: src/toolbar.c:264 src/toolbar.c:2503
+#: src/toolbar.c:264 src/toolbar.c:2506
msgid "Replace signature"
msgstr "Remplacer la signature"
-#: src/toolbar.c:265 src/toolbar.c:2507
+#: src/toolbar.c:265 src/toolbar.c:2510
msgid "Edit with external editor"
msgstr "Éditer avec un programme externe"
-#: src/toolbar.c:266 src/toolbar.c:2511
+#: src/toolbar.c:266 src/toolbar.c:2514
msgid "Wrap long lines of current paragraph"
msgstr "Justifier le paragraphe actuel"
-#: src/toolbar.c:267 src/toolbar.c:2515
+#: src/toolbar.c:267 src/toolbar.c:2518
msgid "Wrap all long lines"
msgstr "Justifier tout le message"
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
msgid "Check spelling"
msgstr "Vérifier l'orthographe"
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
msgid "Sign"
msgstr "Signer"
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
msgid "Encrypt"
msgstr "Chiffrer"
@@ -19358,15 +19421,15 @@ msgstr "Chiffrer"
msgid "Claws Mail Actions Feature"
msgstr "Actions Claws Mail"
-#: src/toolbar.c:275 src/toolbar.c:2556
+#: src/toolbar.c:275 src/toolbar.c:2559
msgid "Cancel receiving"
msgstr "Interrompre la relève du courrier"
-#: src/toolbar.c:277 src/toolbar.c:2564
+#: src/toolbar.c:277 src/toolbar.c:2567
msgid "Cancel receiving/sending"
msgstr "Interrompre la relève et/ou l'envoi"
-#: src/toolbar.c:278 src/toolbar.c:2304
+#: src/toolbar.c:278 src/toolbar.c:2307
msgid "Close window"
msgstr "Fermer la fenêtre"
@@ -19405,7 +19468,7 @@ msgstr "À tous"
msgid "List"
msgstr "À la liste"
-#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
msgid "Delete duplicates"
msgstr "Supprimer les doublons"
@@ -19497,71 +19560,71 @@ msgstr "Le message sera chiffré"
msgid "Message will not be encrypted"
msgstr "Le message ne sera pas chiffré"
-#: src/toolbar.c:2286
+#: src/toolbar.c:2289
msgid "Go to folder list"
msgstr "Ouvrir la liste des dossiers"
-#: src/toolbar.c:2292
+#: src/toolbar.c:2295
msgid "Receive Mail from selected Account"
msgstr "Relever le courrier du compte sélectionné"
-#: src/toolbar.c:2308
+#: src/toolbar.c:2311
msgid "Open preferences"
msgstr "Ouvrir les préférences"
-#: src/toolbar.c:2319
+#: src/toolbar.c:2322
msgid "Compose with selected Account"
msgstr "Composer un message avec le compte sélectionné"
-#: src/toolbar.c:2340
+#: src/toolbar.c:2343
msgid "Learn as..."
msgstr "Marquer comme.."
-#: src/toolbar.c:2350
+#: src/toolbar.c:2353
msgid "Learn as _Spam"
msgstr "Marquer comme _pourriel"
-#: src/toolbar.c:2351
+#: src/toolbar.c:2354
msgid "Learn as _Ham"
msgstr "Marquer comme _légitime"
-#: src/toolbar.c:2358
+#: src/toolbar.c:2361
msgid "Delete duplicates options"
msgstr "Options de supprimer des messages en double"
-#: src/toolbar.c:2362
+#: src/toolbar.c:2365
msgid "Delete duplicates in selected folder"
msgstr "Supprimer les doublons dans le dossier sélectionné"
-#: src/toolbar.c:2363
+#: src/toolbar.c:2366
msgid "Delete duplicates in all folders"
msgstr "Supprimer les doublons dans tous les dossiers"
-#: src/toolbar.c:2374
+#: src/toolbar.c:2377
msgid "Reply to Message options"
msgstr "Options de réponse à un message"
-#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
msgid "_Reply with quote"
msgstr "Répondre en _citant le message"
-#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
msgid "Reply without _quote"
msgstr "Répondre _sans citer le message"
-#: src/toolbar.c:2391
+#: src/toolbar.c:2394
msgid "Reply to Sender options"
msgstr "Options de réponse à l'expéditeur"
-#: src/toolbar.c:2408
+#: src/toolbar.c:2411
msgid "Reply to All options"
msgstr "Options de réponse à tous"
-#: src/toolbar.c:2425
+#: src/toolbar.c:2428
msgid "Reply to Mailing-list options"
msgstr "Options de réponse à la liste"
-#: src/toolbar.c:2442
+#: src/toolbar.c:2445
msgid "Forward Message options"
msgstr "Options de transfert d'un message"
@@ -19744,10 +19807,6 @@ msgstr ""
msgid "SMTP server address:"
msgstr "Adresse du serveur d'envoi (SMTP) :"
-#: src/wizard.c:1119
-msgid "Use authentication"
-msgstr "Utiliser l'authentification (SMTP AUTH)"
-
#: src/wizard.c:1128
msgid "(empty to use the same as receive)"
msgstr "(si non renseigné, utilise le même qu'en réception)"
commit e0473d3257478d345f0dd2f686e08e4e14ea5c4f
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Aug 13 20:52:45 2018 +0200
Fix an embarrassing mistake in rssyl_strreplace().
Closes bug #4068: Claws Mail hangs when getting news from a certain feed
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index e917b9a..7ef6098 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -80,7 +80,7 @@ gchar *rssyl_strreplace(gchar *source, gchar *pattern,
/* Go until either end of string is reached, or until the
* remaining text is shorter than the pattern. */
- while( *c != '\0' && strlen(c) <= len_pattern) {
+ while( *c != '\0' && strlen(c) >= len_pattern) {
if( !memcmp(c, pattern, len_pattern) ) {
int i;
for (i = 0; i < len_replacement; i++) {
commit ff726cd1aff7e80ff7071bfed51de0cdc3ff3620
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Aug 13 20:44:21 2018 +0200
Avoid a needless string copy in rssyl_replace_html_stuff().
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 441f4fd..e917b9a 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -180,8 +180,7 @@ gchar *rssyl_replace_html_stuff(gchar *text,
if( g_strstr_len(text, strlen(text), tag_list[i].key) ) {
tmp = rssyl_strreplace(wtext, tag_list[i].key, tag_list[i].val);
g_free(wtext);
- wtext = g_strdup(tmp);
- g_free(tmp);
+ wtext = tmp;
}
}
}
commit 2f9243b9b63d0fc9c14e4af89fffb5b03d132f86
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Aug 13 20:38:30 2018 +0200
Add <sub> and </sub> to list of HTML tags to remove from feed subjects.
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 96b05a1..441f4fd 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -124,6 +124,8 @@ static RSSyl_HTMLSymbol tag_list[] = {
{ "<nobr>", "" },
{ "</nobr>", "" },
{ "<wbr>", "" },
+ { "<sub>", "" },
+ { "</sub>", "" },
{ NULL, NULL }
};
commit 606145f4a91b1c0626fc2227dbdc06438aeccdf9
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Aug 13 20:32:49 2018 +0200
Return a copy of the string also when sanity checks fail.
Also, use GLib's g_return functions instead of ifs and
debug_prints.
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index b455a75..96b05a1 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -47,20 +47,11 @@ gchar *rssyl_strreplace(gchar *source, gchar *pattern,
replacement);
*/
- if( source == NULL || pattern == NULL ) {
- debug_print("RSSyl: source or pattern is NULL!!!\n");
- return source;
- }
-
- if( !g_utf8_validate(source, -1, NULL) ) {
- debug_print("RSSyl: source is not an UTF-8 encoded text\n");
- return source;
- }
+ g_return_val_if_fail(source != NULL, g_strdup(source));
+ g_return_val_if_fail(pattern != NULL, g_strdup(source));
- if( !g_utf8_validate(pattern, -1, NULL) ) {
- debug_print("RSSyl: pattern is not an UTF-8 encoded text\n");
- return source;
- }
+ g_return_val_if_fail(g_utf8_validate(source, -1, NULL), g_strdup(source));
+ g_return_val_if_fail(g_utf8_validate(pattern, -1, NULL), g_strdup(source));
len_pattern = strlen(pattern);
len_replacement = strlen(replacement);
commit 3f9089db78e742a8f28178382c89ad3c18513963
Author: wwp <wwp at free.fr>
Date: Mon Aug 13 12:54:08 2018 +0200
Fix buffer clash (one already present, one added in 3.16.0-254-gb9c4e27),
leading to broken To value in From column of message list.
diff --git a/src/summaryview.c b/src/summaryview.c
index 306972c..d6f179e 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3364,7 +3364,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
{
static gchar date_modified[80];
static gchar col_score[11];
- static gchar buf[BUFFSIZE], tmp1[BUFFSIZE], tmp2[BUFFSIZE], tmp3[BUFFSIZE];
+ static gchar from_buf[BUFFSIZE], to_buf[BUFFSIZE];
+ static gchar tmp1[BUFFSIZE], tmp2[BUFFSIZE], tmp3[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
gboolean should_swap = FALSE;
@@ -3454,9 +3455,9 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
} else {
gchar *tmp = summary_complete_address(msginfo->from);
if (tmp) {
- strncpy2(buf, tmp, sizeof(buf));
+ strncpy2(from_buf, tmp, sizeof(from_buf));
g_free(tmp);
- from_text = buf;
+ from_text = from_buf;
} else {
if (prefs_common.summary_from_show == SHOW_NAME)
from_text = msginfo->fromname;
@@ -3484,11 +3485,11 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
if (prefs_common.summary_from_show == SHOW_NAME) {
gchar *tmp = procheader_get_fromname(to_text);
/* need to keep to_text pointing to stack, so heap-allocated
- * string from procheader_get_fromname() will be copied to buf */
+ * string from procheader_get_fromname() will be copied to to_buf */
if (tmp != NULL) {
- strncpy2(buf, tmp, sizeof(buf));
+ strncpy2(to_buf, tmp, sizeof(to_buf));
g_free(tmp);
- to_text = buf;
+ to_text = to_buf;
}
} else if (prefs_common.summary_from_show == SHOW_ADDR)
extract_address(to_text);
@@ -3501,11 +3502,11 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
if (prefs_common.use_addr_book) {
gchar *tmp = summary_complete_address(to_text);
/* need to keep to_text pointing to stack, so heap-allocated
- * string from summary_complete_address() will be copied to buf */
+ * string from summary_complete_address() will be copied to to_buf */
if (tmp) {
- strncpy2(buf, tmp, sizeof(buf));
+ strncpy2(to_buf, tmp, sizeof(to_buf));
g_free(tmp);
- to_text = buf;
+ to_text = to_buf;
} else {
to_text = to_text ? to_text : _("(No From)");
}
commit 4ab13a1fadcff85c88a2d843c0004807bbe653a5
Author: Ricardo Mones <ricardo at mones.org>
Date: Tue Aug 7 11:06:39 2018 +0200
Some improvements upon translation
diff --git a/po/es.po b/po/es.po
index 22941a3..b1f54c3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -44,7 +44,7 @@ msgid ""
msgstr ""
"Usando «Recibir correo» se recuperarán los mensajes de las cuentas en el "
"orden dado, la casilla indica que cuentas se incluirán. El texto en negrita "
-"indica la cuenta por defecto."
+"indica la cuenta predeterminada."
#: src/account.c:815
msgid " _Set as default account "
@@ -282,7 +282,7 @@ msgstr "¿Quiere borrar realmente este nombre de atributo?"
#: src/addrcustomattr.c:191
msgid "Reset to default"
-msgstr "Valores por defecto"
+msgstr "Reiniciar valores"
#: src/addrcustomattr.c:192
msgid ""
@@ -290,7 +290,7 @@ msgid ""
"with the default set?"
msgstr ""
"¿Realmente quiere reemplazar todos los nombres de\n"
-"atributos con los valores por defecto?"
+"atributos con los valores iniciales predeterminados?"
#: src/addrcustomattr.c:212 src/addressbook.c:439 src/addressbook.c:467
#: src/addressbook.c:484 src/edittags.c:279
@@ -306,7 +306,7 @@ msgstr "_Borrar todo"
#: src/addrcustomattr.c:214
msgid "_Reset to default"
-msgstr "_Valores por defecto"
+msgstr "_Reiniciar valores"
#: src/addrcustomattr.c:403
msgid "Attribute name is not set."
@@ -2857,8 +2857,8 @@ msgid ""
"This resets the attribute names to a default value that should find most "
"names and addresses during a name or address search process."
msgstr ""
-"Reinicia los nombres de atributo al valor por omisión que debería encontrar "
-"la mayoría de nombres y direcciones durante un proceso de búsqueda."
+"Reinicia los nombres de atributo al valor predeterminado que debería "
+"encontrar la mayoría de nombres y direcciones durante un proceso de búsqueda."
#: src/editldap.c:599
msgid "Max Query Age (secs)"
@@ -2883,10 +2883,10 @@ msgstr ""
"eliminan. Esto mejorará el tiempo de respuesta intentando buscar el mismo "
"nombre o dirección en peticiones de autocompletar posteriores. Se buscará "
"primero en la caché antes de efectuar una nueva petición al servidor. El "
-"valor por omisión de 600 segundos (10 minutos), debería ser suficiente para "
-"la mayoría de los servidores. Un valor mayor reducirá el tiempo de búsqueda "
-"en las búsquedas siguientes. Esto es útil para servidores lentos a expensas "
-"de más memoria para almacenar los resultados."
+"valor predeterminado de 600 segundos (10 minutos), debería ser suficiente "
+"para la mayoría de los servidores. Un valor mayor reducirá el tiempo de "
+"búsqueda en las búsquedas siguientes. Esto es útil para los servidores lentos "
+"a costa de un mayor uso de memoria para almacenar los resultados."
#: src/editldap.c:630
msgid "Include server in dynamic search"
@@ -7506,7 +7506,7 @@ msgstr "_Leyenda de iconos"
#: src/mainwindow.c:810
msgid "Set as default client"
-msgstr "Establecer como cliente por defecto"
+msgstr "Establecer como cliente predeterminado"
#: src/mainwindow.c:817
msgid "Offline _mode"
@@ -7534,15 +7534,15 @@ msgstr "_Vista jerárquica"
#: src/mainwindow.c:825
msgid "Hide read threads"
-msgstr "Esconder los hilos leídos"
+msgstr "Ocultar los hilos leídos"
#: src/mainwindow.c:826
msgid "_Hide read messages"
-msgstr "_Esconder los mensajes leídos"
+msgstr "_Ocultar los mensajes leídos"
#: src/mainwindow.c:827
msgid "Hide deleted messages"
-msgstr "Ocultar mensajes borrados"
+msgstr "Ocultar los mensajes borrados"
#: src/mainwindow.c:828
msgid "_Fullscreen"
@@ -7845,18 +7845,18 @@ msgstr "Configuración de filtrado"
#: src/mainwindow.c:5165
msgid "Can not register as default client: impossible to get executable path."
msgstr ""
-"No se puede registrar como cliente por defecto: imposible obtener la ruta al "
-"ejecutable."
+"No se puede registrar como cliente predeterminado: imposible obtener la ruta "
+"al ejecutable."
#: src/mainwindow.c:5224
msgid "Claws Mail has been registered as default client."
-msgstr "Se ha registrado Claws Mail como cliente por defecto."
+msgstr "Se ha registrado Claws Mail como cliente predeterminado."
#: src/mainwindow.c:5226
msgid ""
"Can not register as default client: impossible to write to the registry."
msgstr ""
-"No se puede registrar como cliente por defecto: imposible escribir en el "
+"No se puede registrar como cliente predeterminado: imposible escribir en el "
"registro."
#: src/mainwindow.c:5240 src/setup.c:91
@@ -9124,7 +9124,7 @@ msgstr ""
#: src/plugins/archive/archiver_prefs.c:217
msgid "Default save folder"
-msgstr "Directorio de destino por defecto"
+msgstr "Directorio de destino predeterminado"
#: src/plugins/archive/archiver_prefs.c:229
msgid "Click this button to select the default location for saving archives"
@@ -9134,7 +9134,7 @@ msgstr ""
#: src/plugins/archive/archiver_prefs.c:238
msgid "Default compression"
-msgstr "Compresión por defecto"
+msgstr "Compresión predeterminada"
#: src/plugins/archive/archiver_prefs.c:249
#: src/plugins/archive/archiver_prefs.c:255
@@ -9149,11 +9149,11 @@ msgstr "Compresión por defecto"
#: src/plugins/archive/archiver_prefs.c:317
#, c-format
msgid "Choose this option to use %s compression by default"
-msgstr "Elija esta opción para usar la compresión %s por omisión"
+msgstr "Elija esta opción para usar la compresión %s de manera predeterminada"
#: src/plugins/archive/archiver_prefs.c:363
msgid "Default format"
-msgstr "Formato por defecto"
+msgstr "Formato predeterminado"
#: src/plugins/archive/archiver_prefs.c:374
#: src/plugins/archive/archiver_prefs.c:380
@@ -9161,15 +9161,15 @@ msgstr "Formato por defecto"
#: src/plugins/archive/archiver_prefs.c:392
#, c-format
msgid "Choose this option to use the %s as format by default"
-msgstr "Elija esta opción para usar el formato %s por omisión"
+msgstr "Elija esta opción para usar el formato %s de manera predeterminada"
#: src/plugins/archive/archiver_prefs.c:409
msgid "Default miscellaneous options"
-msgstr "Opciones adicionales por defecto"
+msgstr "Opciones adicionales predeterminadas"
#: src/plugins/archive/archiver_prefs.c:418
msgid "Choose this option to include subfolders in the archives by default"
-msgstr "Incluir por defecto las subcarpetas en los archivos"
+msgstr "Incluir las subcarpetas en los archivos de manera predeterminada"
#: src/plugins/archive/archiver_prefs.c:419
msgid "MD5sum"
@@ -9182,8 +9182,8 @@ msgid ""
"Be aware though, that this dramatically increases the time it\n"
"will take to create the archives"
msgstr ""
-"Incluir por defecto las sumas de control MD5 para cada fichero de los "
-"archivos.\n"
+"Incluir de manera predeterminada las sumas de control MD5 para cada fichero "
+"de los archivos.\n"
"Tenga en cuenta que esto incrementará dramáticamente el tiempo\n"
"necesario para crear los archivos"
@@ -9817,7 +9817,7 @@ msgid ""
"Folder for storing infected mail. Leave empty to use the default trash folder"
msgstr ""
"Carpeta para almacenar el correo infectado. Déjela vacía para usar la "
-"papelera por defecto"
+"papelera predeterminada"
#: src/plugins/clamd/clamav_plugin_gtk.c:304
msgid "Click this button to select a folder for storing infected mail"
@@ -10036,7 +10036,7 @@ msgstr "Permitir la carga de contenidos remotos"
#: src/plugins/fancy/fancy_prefs.c:276
msgid "When clicking on a link, by default"
-msgstr "Al pulsar en un enlace, por omisión"
+msgstr "Al pulsar en un enlace, de manera predeterminada"
#: src/plugins/fancy/fancy_prefs.c:284
msgid "Open in external browser"
@@ -10655,7 +10655,7 @@ msgstr "Caché de avatares"
#: src/plugins/libravatar/libravatar_prefs.c:459
msgid "Default missing icon mode"
-msgstr "Modo por omisión cuando no hay avatar"
+msgstr "Modo predeterminado cuando no hay avatar"
#: src/plugins/libravatar/libravatar_prefs.c:463
msgid "Network"
@@ -11926,7 +11926,7 @@ msgstr "Clave para firmar"
#: src/plugins/pgpcore/prefs_gpg.c:369
msgid "Use default GnuPG key"
-msgstr "Usar la clave GnuPG por omisión"
+msgstr "Usar la clave GnuPG predeterminada"
#: src/plugins/pgpcore/prefs_gpg.c:380
msgid "Select key by your email address"
@@ -12434,7 +12434,7 @@ msgstr ""
"«inline» (obsoleto). Puede descifrar correos, comprobar firmas o firmar y "
"cifrar sus propios correos.\n"
"\n"
-"Se puede seleccionar como sistema de privacidad por omisión en /"
+"Se puede seleccionar como sistema de privacidad predeterminado en /"
"Configuración/[Preferencias de la cuenta]/Privacidad y al componer un "
"mensaje en /Opciones/Privacidad\n"
"\n"
@@ -12495,7 +12495,7 @@ msgstr ""
"Este módulo gestiona los correos firmados y/o cifrados con PGP/MIME. Puede "
"descifrar correos, comprobar firmas o firmar y cifrar sus propios correos.\n"
"\n"
-"Se puede seleccionar como sistema de privacidad por omisión en /"
+"Se puede seleccionar como sistema de privacidad predeterminado en /"
"Configuración/[Preferencias de la cuenta]/Privacidad y al componer un "
"mensaje en /Opciones/Privacidad\n"
"\n"
@@ -13094,7 +13094,7 @@ msgstr ""
"Este módulo gestiona los correos firmados y/o cifrados con S/MIME. Puede "
"descifrar correos, comprobar firmas o firmar y cifrar sus propios correos.\n"
"\n"
-"Se puede seleccionar como sistema de privacidad por omisión en /"
+"Se puede seleccionar como sistema de privacidad predeterminado en /"
"Configuración/[Preferencias de la cuenta]/Privacidad y al componer un "
"mensaje en /Opciones/Privacidad\n"
"\n"
@@ -14437,7 +14437,7 @@ msgstr "Local"
#: src/prefs_account.c:1467 src/prefs_account.c:1556
msgid "Default Inbox"
-msgstr "Entrada por defecto"
+msgstr "Entrada predeterminada"
#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
#: src/prefs_account.c:1570
@@ -14591,7 +14591,7 @@ msgstr "Diccionarios de corrección ortográfica"
#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
#: src/prefs_spelling.c:162
msgid "Default dictionary"
-msgstr "Diccionario por omisión"
+msgstr "Diccionario predeterminado"
#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
#: src/prefs_spelling.c:174
@@ -14617,7 +14617,7 @@ msgstr "Reenviar"
#: src/prefs_account.c:2305
msgid "Default privacy system"
-msgstr "Sistema de privacidad por omisión"
+msgstr "Sistema de privacidad predeterminado"
#: src/prefs_account.c:2334
msgid "Always sign messages"
@@ -14769,7 +14769,7 @@ msgstr "No se especificó el servidor POP."
#: src/prefs_account.c:3003
msgid "The default Inbox folder doesn't exist."
-msgstr "La carpeta de entrada por omisión no existe."
+msgstr "La carpeta de entrada predeterminada no existe."
#: src/prefs_account.c:3009
msgid "IMAP server is not entered."
@@ -15173,7 +15173,7 @@ msgstr "Respuesta"
#: src/prefs_compose_writing.c:217
msgid "Reply will quote by default"
-msgstr "Responder con citación por omisión"
+msgstr "Responder con citación de manera predeterminada"
#: src/prefs_compose_writing.c:220
msgid "Reply button invokes mailing list reply"
@@ -15807,7 +15807,7 @@ msgstr "Guardar los mensajes salientes en esta carpeta en vez de en Enviado"
#, c-format
msgctxt "folder properties: %s stands for a header name"
msgid "Default %s"
-msgstr "Cabecera %s por omisión"
+msgstr "Cabecera %s predeterminada"
#: src/prefs_folder_item.c:950
#, c-format
@@ -15885,7 +15885,7 @@ msgstr "Mostrar las imágenes adjuntas automáticamente"
#: src/prefs_image_viewer.c:75
msgid "Resize attached images by default"
-msgstr "Redimensionar las imágenes adjuntas por omisión"
+msgstr "Redimensionar las imágenes adjuntas de manera predeterminada"
#: src/prefs_image_viewer.c:78
msgid "Clicking image toggles scaling"
@@ -17261,7 +17261,7 @@ msgstr "No ordenar"
#: src/prefs_summaries.c:471
msgid "Set default selection when entering a folder"
-msgstr "Establecer la selección por defecto al entrar en una carpeta"
+msgstr "Establecer la selección predeterminada al entrar en una carpeta"
#: src/prefs_summaries.c:484
msgid "Show \"no unread (or new) message\" dialog"
@@ -17525,7 +17525,7 @@ msgstr "Plantilla"
#: src/prefs_themes.c:400 src/prefs_themes.c:841
msgid "Default internal theme"
-msgstr "Tema interno por omisión"
+msgstr "Tema interno predeterminado"
#: src/prefs_themes.c:422
msgid "Themes"
@@ -17978,7 +17978,7 @@ msgstr "propiedad de la cuenta: ruta a la firma"
#: src/quote_fmt.c:75
msgid "account property: default dictionary"
-msgstr "propiedad de la cuenta: diccionario por omisión"
+msgstr "propiedad de la cuenta: diccionario predeterminado"
#: src/quote_fmt.c:76
msgid "address book <span style=\"oblique\">completion</span>: Cc"
commit 3d6e21305917de23c0901d3098a770f204e17ebe
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 3 14:15:47 2018 +0200
Fix a memory leak when saving last opened folder on exit.
diff --git a/src/main.c b/src/main.c
index 28640c9..1c7345e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1674,6 +1674,8 @@ static void exit_claws(MainWindow *mainwin)
if((item = folderview_get_opened_item(mainwin->folderview)) != NULL) {
summary_save_prefs_to_folderitem(
mainwin->summaryview, item);
+ if (prefs_common.last_opened_folder != NULL)
+ g_free(prefs_common.last_opened_folder);
prefs_common.last_opened_folder =
folder_item_get_identifier(item);
}
commit 37bbb866aa29525c5ea036f90239502b6a2cff0a
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 3 14:07:10 2018 +0200
Fix a memory leak in sc_html_parse_tag().
diff --git a/src/html.c b/src/html.c
index ca8fd4c..da8625e 100644
--- a/src/html.c
+++ b/src/html.c
@@ -353,7 +353,10 @@ static SC_HTMLState sc_html_parse_tag(SC_HTMLParser *parser)
parser->state = SC_HTML_BR;
} else if (!strcmp(tag->name, "a")) {
GList *cur;
- parser->href = NULL;
+ if (parser->href != NULL) {
+ g_free(parser->href);
+ parser->href = NULL;
+ }
for (cur = tag->attr; cur != NULL; cur = cur->next) {
if (cur->data && !strcmp(((SC_HTMLAttr *)cur->data)->name, "href")) {
g_free(parser->href);
commit 7009a9e482cc430e89e5827e0c9fb25cf4af61be
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 3 14:02:38 2018 +0200
Fix a memory leak in summary_set_header().
diff --git a/src/summaryview.c b/src/summaryview.c
index 9bf4420..306972c 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3481,9 +3481,16 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
if (!to_text)
to_text = _("(No Recipient)");
else {
- if (prefs_common.summary_from_show == SHOW_NAME)
- to_text = procheader_get_fromname(to_text);
- else if (prefs_common.summary_from_show == SHOW_ADDR)
+ if (prefs_common.summary_from_show == SHOW_NAME) {
+ gchar *tmp = procheader_get_fromname(to_text);
+ /* need to keep to_text pointing to stack, so heap-allocated
+ * string from procheader_get_fromname() will be copied to buf */
+ if (tmp != NULL) {
+ strncpy2(buf, tmp, sizeof(buf));
+ g_free(tmp);
+ to_text = buf;
+ }
+ } else if (prefs_common.summary_from_show == SHOW_ADDR)
extract_address(to_text);
}
@@ -3493,6 +3500,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
} else {
if (prefs_common.use_addr_book) {
gchar *tmp = summary_complete_address(to_text);
+ /* need to keep to_text pointing to stack, so heap-allocated
+ * string from summary_complete_address() will be copied to buf */
if (tmp) {
strncpy2(buf, tmp, sizeof(buf));
g_free(tmp);
commit 633236aab87ce4db5bb2fc33aa18fefcf83b8363
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 3 13:40:57 2018 +0200
Fixed a memory leak in stock_pixmap_widget_with_overlay().
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 593b502..87d640a 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1064,6 +1064,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
data = g_new0(OverlayData, 1);
stock_wid = stock_pixmap_widget(icon);
+ g_object_ref_sink(stock_wid);
gtk_widget_get_requisition(stock_wid, &requisition);
#if !GTK_CHECK_VERSION(3, 0, 0)
@@ -1081,7 +1082,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
data->base_pixmap = stock_pixmap;
data->base_height = requisition.height;
data->base_width = requisition.width;
- gtk_widget_destroy(stock_wid);
+ g_object_unref(stock_wid);
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
@@ -1104,7 +1105,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
data->base_pixbuf = stock_pixbuf;
data->base_height = requisition.height;
data->base_width = requisition.width;
- gtk_widget_destroy(stock_wid);
+ g_object_unref(stock_wid);
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
} else {
commit 537c51bf42a47a7b52b30bfb7abdf0838c3ff251
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Fri Aug 3 13:22:49 2018 +0200
Fix memory leaks in toolbar handling of alternate icons (mail/news, ham/spam).
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 67f9be2..ef8a280 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3882,8 +3882,7 @@ void main_window_destroy_all(void)
/* free toolbar stuff */
toolbar_clear_list(TOOLBAR_MAIN);
- TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
- TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
+ toolbar_destroy(mainwin->toolbar);
summaryview_destroy(mainwin->summaryview);
mainwin->folderview->mainwin = NULL;
diff --git a/src/toolbar.c b/src/toolbar.c
index 823a894..15b05b5 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2322,11 +2322,11 @@ Toolbar *toolbar_create(ToolbarType type,
_("Compose with selected Account"));
toolbar_data->compose_mail_btn = item;
toolbar_data->compose_mail_icon = icon_wid;
- g_object_ref(toolbar_data->compose_mail_icon);
+ g_object_ref_sink(toolbar_data->compose_mail_icon);
icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
- g_object_ref(toolbar_data->compose_news_icon);
+ g_object_ref_sink(toolbar_data->compose_news_icon);
#else
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
_("Compose Email"));
@@ -2343,11 +2343,11 @@ Toolbar *toolbar_create(ToolbarType type,
_("Learn as..."));
toolbar_data->learn_spam_btn = item;
toolbar_data->learn_spam_icon = icon_wid;
- g_object_ref(toolbar_data->learn_spam_icon);
+ g_object_ref_sink(toolbar_data->learn_spam_icon);
icon_ham = stock_pixmap_widget(STOCK_PIXMAP_HAM_BTN);
toolbar_data->learn_ham_icon = icon_ham;
- g_object_ref(toolbar_data->learn_ham_icon);
+ g_object_ref_sink(toolbar_data->learn_ham_icon);
menu = gtk_menu_new();
ADD_MENU_ITEM(_("Learn as _Spam"), toolbar_learn_menu_cb, TRUE);
@@ -2609,13 +2609,22 @@ Toolbar *toolbar_create(ToolbarType type,
/**
* Free toolbar structures
- */
-void toolbar_destroy(Toolbar * toolbar) {
+ */
+#define UNREF_ICON(icon) if (toolbar->icon != NULL) \
+ g_object_unref(toolbar->icon)
+
+void toolbar_destroy(Toolbar * toolbar) {
+ UNREF_ICON(compose_mail_icon);
+ UNREF_ICON(compose_news_icon);
+ UNREF_ICON(learn_spam_icon);
+ UNREF_ICON(learn_ham_icon);
TOOLBAR_DESTROY_ITEMS(toolbar->item_list);
TOOLBAR_DESTROY_ACTIONS(toolbar->action_list);
}
+#undef UNREF_ICON
+
void toolbar_update(ToolbarType type, gpointer data)
{
Toolbar *toolbar_data;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list