[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-187-gfe69add

ticho at claws-mail.org ticho at claws-mail.org
Sun May 6 23:33:12 CEST 2018


The branch, gtk3 has been updated
       via  fe69add11e46a3f49cdf6aa27709c661d3db90f0 (commit)
       via  2447b09124ba30ddf35a85b69cdb285f5901f0ff (commit)
       via  3034d055648a97be462a7b2f2f15584634037795 (commit)
       via  5d4a02d11b05036b703bbd9fef4758bf60564f97 (commit)
       via  c1b4e55544816df92e4a2d56297edf1747581094 (commit)
       via  dba845cc87c5e71f93ce1c4635b927cc78aecb5e (commit)
       via  5f227a4e11b5342943fe49d475d8d7cfffa57edd (commit)
       via  b2f2013865143101bd0b8ac418b9c929d490c8c1 (commit)
       via  eff426d039d5963ca387d59fd433681beac7ec5a (commit)
       via  5a8c25c06eb0a8133ab8bed1a389e4bc93a68ce5 (commit)
       via  10d3a71209592a9a9fa8ab2d98ebdbe56f3af282 (commit)
       via  30d36c7d21de99c6cddde1fe8a93197e8fc2686f (commit)
       via  afd4f400007a15472577868805ae8a5e5ac8e776 (commit)
       via  46661cf493424841e4c38688beab2a8791c748cc (commit)
       via  87bce1bef54f09d67ebf77e45b5c7bc06cf66aa1 (commit)
       via  ff49ed3a8e616732afbd37349b950e3841408df6 (commit)
       via  114dedd2a7394451b839db95cd0a05590f1381fc (commit)
      from  ccd8123f2f51703b01902a3faadc463891cdeb16 (commit)

Summary of changes:
 po/fr.po                                    | 4570 ++++++++++++++-------------
 src/account.c                               |    7 +-
 src/account.h                               |    2 +-
 src/action.c                                |   30 +-
 src/addr_compl.c                            |    2 +-
 src/addr_compl.h                            |    2 +-
 src/codeconv.c                              |  332 +-
 src/codeconv.h                              |    1 +
 src/compose.c                               |    4 +-
 src/ldapctrl.c                              |    4 +-
 src/main.c                                  |    2 +-
 src/mainwindow.c                            |    2 +-
 src/messageview.c                           |    2 +-
 src/plugins/clamd/clamav_plugin.h           |    4 +-
 src/plugins/managesieve/sieve_editor.c      |    1 +
 src/plugins/managesieve/sieve_manager.c     |    5 +-
 src/plugins/pdf_viewer/poppler_viewer.c     |    2 +-
 src/plugins/spamassassin/libspamc.c         |    4 +-
 src/plugins/spamassassin/spamassassin.c     |   20 +-
 src/plugins/spamassassin/spamassassin_gtk.c |    8 +-
 src/prefs_common.c                          |    7 +
 src/prefs_common.h                          |    3 +
 src/prefs_summaries.c                       |   14 +-
 src/procmsg.c                               |    5 +-
 src/procmsg.h                               |    7 +-
 src/summaryview.c                           |  116 +-
 src/summaryview.h                           |    4 +
 src/toolbar.c                               |  250 +-
 28 files changed, 2812 insertions(+), 2598 deletions(-)


- Log -----------------------------------------------------------------
commit fe69add11e46a3f49cdf6aa27709c661d3db90f0
Author: wwp <wwp at free.fr>
Date:   Sun May 6 16:02:43 2018 +0200

    Make Claws Mail conservative about color labels: ask for confirmation
    when user clears or override existing color labels to messages.
    Confirmation dialog is discardable.

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 6748b68..750ab47 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -876,6 +876,8 @@ static PrefParam param[] = {
 
 	{"ask_mark_all_read", "TRUE", &prefs_common.ask_mark_all_read, P_BOOL,
 	 NULL, NULL, NULL},
+	{"ask_override_colorlabel", "TRUE", &prefs_common.ask_override_colorlabel, P_BOOL,
+	 NULL, NULL, NULL},
 
 	{"ask_apply_per_account_filtering_rules", "TRUE", &prefs_common.ask_apply_per_account_filtering_rules, P_BOOL,
 	 NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 10c21b7..82e1b54 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -413,6 +413,7 @@ struct _PrefsCommon
 #endif
 	int hover_timeout; /* msecs mouse hover timeout */
 	gboolean ask_mark_all_read;
+	gboolean ask_override_colorlabel;
 	gboolean ask_apply_per_account_filtering_rules;
 	gint apply_per_account_filtering_rules;
 
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 3bdb61e..b6ccb52 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -74,6 +74,7 @@ typedef struct _SummariesPage
 	GtkWidget *spinbtn_mark_as_read_delay;
 	GtkWidget *checkbtn_immedexec;
 	GtkWidget *checkbtn_ask_mark_all_read;
+	GtkWidget *checkbtn_ask_override_colorlabel;
   	GtkWidget *optmenu_sort_key;
   	GtkWidget *optmenu_sort_type;
 	GtkWidget *optmenu_nextunreadmsgdialog;
@@ -344,6 +345,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	GtkAdjustment *spinbtn_mark_as_read_delay_adj;
 	GtkWidget *checkbtn_immedexec;
 	GtkWidget *checkbtn_ask_mark_all_read;
+	GtkWidget *checkbtn_ask_override_colorlabel;
 	GtkWidget *label, *label_fill;
 	GtkListStore *menu;
 	GtkTreeIter iter;
@@ -599,6 +601,9 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 		(vbox1, checkbtn_ask_mark_all_read,
 		 _("Confirm before marking all messages in a folder as read or unread"));
 	PACK_CHECK_BUTTON
+		(vbox1, checkbtn_ask_override_colorlabel,
+		 _("Confirm before overriding color label of messages"));
+	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_transhdr,
 		 _("Translate header names"));
 	CLAWS_SET_TIP(checkbtn_transhdr,
@@ -625,10 +630,11 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	prefs_summaries->checkbtn_show_on_deletemove = checkbtn_show_on_deletemove;
 	prefs_summaries->checkbtn_show_on_directional = checkbtn_show_on_directional;
 
-		prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
+	prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
 	prefs_summaries->spinbtn_mark_as_read_delay = spinbtn_mark_as_read_delay;
 	prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
 	prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
+	prefs_summaries->checkbtn_ask_override_colorlabel = checkbtn_ask_override_colorlabel;
 	prefs_summaries->optmenu_sort_key = optmenu_sort_key;
 	prefs_summaries->optmenu_sort_type = optmenu_sort_type;
 	prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
@@ -681,6 +687,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 			prefs_common.immediate_exec);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
 			prefs_common.ask_mark_all_read);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_override_colorlabel),
+			prefs_common.ask_override_colorlabel);
 
 	combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_key),
 			prefs_common.default_sort_key);
@@ -737,6 +745,8 @@ static void prefs_summaries_save(PrefsPage *_page)
 		GTK_TOGGLE_BUTTON(page->checkbtn_immedexec));
 	prefs_common.ask_mark_all_read = gtk_toggle_button_get_active(
 		GTK_TOGGLE_BUTTON(page->checkbtn_ask_mark_all_read));
+	prefs_common.ask_override_colorlabel = gtk_toggle_button_get_active(
+		GTK_TOGGLE_BUTTON(page->checkbtn_ask_override_colorlabel));
 	prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
 			GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
 
diff --git a/src/summaryview.c b/src/summaryview.c
index 66a0526..f4298a9 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4220,12 +4220,10 @@ void summary_msgs_unlock(SummaryView *summaryview)
 
 static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed)
 {
-	AlertValue val;
-
 	/* ask_if_needed is FALSE when user-asking is performed by caller,
 	   commonly when the caller is a mark-as-read-recursive func */
 	if (ask_if_needed && prefs_common.ask_mark_all_read) {
-		val = alertpanel_full(_("Mark all as read"),
+		AlertValue val = alertpanel_full(_("Mark all as read"),
 			  _("Do you really want to mark all mails in this folder as read?"),
 			  GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
 			  TRUE, NULL, ALERT_QUESTION);
@@ -4268,12 +4266,10 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
 
 static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed)
 {
-	AlertValue val;
-
 	/* ask_if_needed is FALSE when user-asking is performed by caller,
 	   commonly when the caller is a mark-as-unread-recursive func */
 	if (ask_if_needed && prefs_common.ask_mark_all_read) {
-		val = alertpanel_full(_("Mark all as unread"),
+		AlertValue val = alertpanel_full(_("Mark all as unread"),
 			  _("Do you really want to mark all mails in this folder as unread?"),
 			  GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
 			  TRUE, NULL, ALERT_QUESTION);
@@ -4420,7 +4416,7 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
 		}
 
 		if (!found) {
-			alertpanel_error(_("You're not the author of the article.\n"));
+			alertpanel_error(_("You're not the author of the article."));
 		}
 		
 		return found;
@@ -5916,7 +5912,7 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
 }
 
 /* summary_set_colorlabel_color() - labelcolor parameter is the color *flag*
- * for the messsage; not the color index */
+ * for the message; not the color index */
 void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
 				  guint labelcolor)
 {
@@ -5977,6 +5973,54 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
 	GList *cur;
 	gboolean froze = FALSE;
 
+	if (prefs_common.ask_override_colorlabel) {
+		GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+		gboolean ask = FALSE;
+		AlertValue val;
+		guint color;
+		gboolean already_this_color_everywhere = TRUE;
+
+		/* if clearing color labels (applying 'none', 0):
+		    - ask if at least one message has a non-0 color label set
+		   if applying a non-0 color label:
+		    - ask if at least one of the selected messages has a non-0 color label different
+			  from the one we want to apply.
+		    - don't ask if all messages have the same color label as the one we're applying
+		*/
+		for (cur = GTK_CMCLIST(ctree)->selection;
+			 !ask && cur != NULL && cur->data != NULL;
+			 cur = cur->next) {
+			MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(cur->data));
+			if (msginfo) {
+				color = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
+				if (labelcolor == 0) {
+					/* clearing color labels */
+					ask = (color != 0);
+				} else {
+					already_this_color_everywhere &= (color == labelcolor);
+					ask = ((color != 0) && (color != labelcolor)) && !already_this_color_everywhere;
+				}
+			}
+		}
+
+		if (ask) {
+			gchar *msg;
+
+			if (labelcolor == 0)
+				msg = _("Do you really want to reset the color label of all selected messages?");
+			else
+				msg = _("Do you really want to apply this color label to all selected messages?");
+			val = alertpanel_full(_("Set color label"), msg,
+				  GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_FIRST,
+				  TRUE, NULL, ALERT_QUESTION);
+
+			if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
+				return;
+			else if (val & G_ALERTDISABLE)
+				prefs_common.ask_override_colorlabel = FALSE;
+		}
+	}
+
 	START_LONG_OPERATION(summaryview, FALSE);
 	for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
 		summary_set_row_colorlabel(summaryview,

commit 2447b09124ba30ddf35a85b69cdb285f5901f0ff
Author: wwp <wwp at free.fr>
Date:   Sun May 6 15:48:39 2018 +0200

    Update French translation.

diff --git a/po/fr.po b/po/fr.po
index 1fc486c..8152b93 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: 2017-12-10 00:07+0000\n"
-"PO-Revision-Date: 2017-12-11 11:21+0100\n"
+"POT-Creation-Date: 2018-05-05 23:58+0200\n"
+"PO-Revision-Date: 2018-05-06 15:42+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"
@@ -38,11 +38,11 @@ msgstr ""
 msgid "Can't create folder."
 msgstr "Impossible de créer le dossier."
 
-#: src/account.c:727
+#: src/account.c:728
 msgid "Edit accounts"
 msgstr "Édition des comptes"
 
-#: src/account.c:744
+#: src/account.c:745
 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:815
+#: src/account.c:816
 msgid " _Set as default account "
 msgstr "Définir comme comp_te par défaut"
 
-#: src/account.c:907
+#: src/account.c:908
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Les comptes avec des dossiers distants ne peuvent pas être copiés."
 
-#: src/account.c:914
+#: src/account.c:915
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
-#: src/account.c:1097
+#: src/account.c:1098
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Voulez-vous vraiment supprimer le compte '%s' ?"
 
-#: src/account.c:1099
+#: src/account.c:1100
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: src/account.c:1100
+#: src/account.c:1101
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
-#: src/account.c:1590
+#: src/account.c:1591
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1596
+#: src/account.c:1597
 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:1603 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7424 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/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/account.c:1604 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/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:476 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:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1612 src/prefs_account.c:1108 src/prefs_account.c:4241
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account.c:1619 src/ssl_manager.c:100
+#: src/account.c:1620 src/ssl_manager.c:100
 msgid "Server"
 msgstr "Serveur"
 
@@ -158,7 +158,8 @@ 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
@@ -167,7 +168,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1206 src/action.c:1385
 msgid "Completed"
 msgstr "Terminé"
 
@@ -181,11 +182,11 @@ msgstr "--- En cours : %s\n"
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
-#: src/action.c:1279
+#: src/action.c:1292
 msgid "Action's input/output"
 msgstr "Entrées/Sorties d'Actions"
 
-#: src/action.c:1607
+#: src/action.c:1631
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -196,11 +197,11 @@ msgstr ""
 "(L'argument remplacera « %%h »)\n"
 "  %s"
 
-#: src/action.c:1612
+#: src/action.c:1636
 msgid "Action's hidden user argument"
 msgstr "Argument caché de l'action"
 
-#: src/action.c:1616
+#: src/action.c:1640
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -211,7 +212,7 @@ msgstr ""
 "(L'argument remplacera « %%u »)\n"
 "  %s"
 
-#: src/action.c:1621
+#: src/action.c:1645
 msgid "Action's user argument"
 msgstr "Argument pour l'action"
 
@@ -231,7 +232,7 @@ msgstr ""
 "Il n'est pas possible de déplacer un dossier vers lui-même ou vers un de ses "
 "sous-dossiers."
 
-#: src/addr_compl.c:689 src/addressbook.c:4945
+#: src/addr_compl.c:689 src/addressbook.c:5013
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Group"
 msgstr "Groupe"
@@ -272,31 +273,31 @@ msgstr "Numéro de fax"
 msgid "website"
 msgstr "Site internet"
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr "Noms d'attributs"
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr "Suppression de tous les noms d'attributs"
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr "Voulez-vous vraiment supprimer tous les noms d'attributs ?"
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Suppression d'un nom d'attribut"
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "Voulez-vous vraiment supprimer ce nom d'attribut ?"
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr "Réinitialisation par défaut"
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -304,36 +305,36 @@ msgstr ""
 "Voulez-vous vraiment réinitialiser tous les noms d'attributs\n"
 "par ceux par défaut ?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 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:1111
+#: 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 "_Supprimer"
 
-#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1698 src/prefs_template.c:1112
+#: 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 "_Tout supprimer.."
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr "_Réinitialiser par défaut.."
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "Le nom d'attribut n'est pas défini."
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Édition des noms d'attributs"
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nouvel attribut :"
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -368,8 +369,8 @@ msgstr "Aucune adresse email en double trouvée dans le carnet"
 msgid "Duplicate email addresses"
 msgstr "Adresses email en double"
 
-#: 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:482 src/toolbar.c:529
 msgid "Address"
 msgstr "Adresse"
 
@@ -377,147 +378,151 @@ msgstr "Adresse"
 msgid "Address book path"
 msgstr "Chemin dans le carnet"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1439 src/addressbook.c:1492
+#: src/addrduplicates.c:793 src/addressbook.c:1442 src/addressbook.c:1495
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1493
+#: src/addrduplicates.c:794 src/addressbook.c:1496
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:843
 msgid "Delete address"
 msgstr "Supprimer l'adresse"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1440
+#: src/addrduplicates.c:844 src/addressbook.c:1443
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 "Les données de cette adresse sont en lecture seule \n"
 "et ne peuvent pas être supprimées."
 
-#: 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 "Ajout au carnet d'adresses"
 
-#: src/addressadd.c:207
+#: src/addressadd.c:214
 msgid "Contact"
 msgstr "Contact"
 
-#: src/addressadd.c:238 src/addressbook.c:127 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 "Remarques"
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:286 src/addressbook_foldersel.c:180
 msgid "Select Address Book Folder"
 msgstr "Sélectionner un dossier"
 
-#: src/addressadd.c:534 src/addressbook.c:3214 src/addressbook.c:3265
+#: src/addressadd.c:596 src/addressbook.c:3261 src/addressbook.c:3312
 msgid "Add address(es)"
 msgstr "Ajout d'adresse(s)"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:597
 msgid "Can't add the specified address"
 msgstr "Impossible d'ajouter l'adresse spécifiée."
 
-#: src/addressbook.c:126 src/addressbook.c:4933 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 "Adresse email"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:404
 msgid "_Book"
 msgstr "_Carnet"
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:600 src/mainwindow.c:514
+#: 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
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/addressbook.c:407 src/compose.c:605 src/mainwindow.c:517
+#: src/addressbook.c:406 src/compose.c:609 src/mainwindow.c:518
 #: src/messageview.c:212
 msgid "_Tools"
 msgstr "Ou_tils"
 
-#: src/addressbook.c:408 src/compose.c:606 src/mainwindow.c:519
+#: src/addressbook.c:407 src/compose.c:610 src/mainwindow.c:520
 #: src/messageview.c:213
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:410 src/addressbook.c:468
 msgid "New _Book"
 msgstr "Nouveau c_arnet"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Folder"
 msgstr "Nouveau _dossier"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr "Nouveau carnet _vCard"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr "Nouveau carnet _JPilot"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
-msgstr "Configuration d'un nouveau _serveur LDAP"
+msgstr "Nouveau _serveur LDAP"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr "_Éditer"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr "Supp_rimer le carnet"
 
-#: src/addressbook.c:427 src/compose.c:617
+#: 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 "Enregi_strer"
 
-#: src/addressbook.c:428 src/compose.c:621 src/messageview.c:222
+#: src/addressbook.c:427 src/compose.c:625 src/messageview.c:222
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:430 src/addressbook.c:480 src/messageview.c:226
 msgid "_Select all"
 msgstr "_Sélectionner tout"
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:432 src/addressbook.c:472 src/addressbook.c:488
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:629 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:225
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copier"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:630 src/plugins/managesieve/sieve_editor.c:97
+#: 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 "Co_ller"
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:439 src/addressbook.c:485
 msgid "New _Address"
 msgstr "Nouvelle _adresse"
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:440 src/addressbook.c:470 src/addressbook.c:486
 msgid "New _Group"
 msgstr "Nouveau _groupe"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:442 src/addressbook.c:492
 msgid "_Mail To"
 msgstr "Co_mposer"
 
+#: src/addressbook.c:443 src/addressbook.c:496
+msgid "_Merge"
+msgstr "_Fusionner"
+
 #: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr "Importer un carnet d'adresses _LDIF.."
@@ -546,7 +551,7 @@ msgstr "_Chercher les contacts en double.."
 msgid "Edit custom attributes..."
 msgstr "Personnaliser les _attributs.."
 
-#: src/addressbook.c:458 src/compose.c:707 src/mainwindow.c:813
+#: src/addressbook.c:458 src/compose.c:711 src/mainwindow.c:814
 #: src/messageview.c:337
 msgid "_About"
 msgstr "À _propos"
@@ -555,129 +560,128 @@ msgstr "À _propos"
 msgid "_Browse Entry"
 msgstr "_Parcourir l'entrée"
 
-#: src/addressbook.c:507 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/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/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"
 msgstr "Inconnu"
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:515 src/addressbook.c:534 src/importldif.c:121
 msgid "Success"
 msgstr "Succès"
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:516 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Arguments incorrects"
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:517 src/importldif.c:123
 msgid "File not specified"
 msgstr "Fichier non spécifié."
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:518 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Erreur lors de l'ouverture du fichier"
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:519 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Erreur lors de la lecture du fichier"
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:520 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Fin de fichier inattendue"
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:521 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Erreur d'allocation de mémoire"
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:522 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Erreur dans le format du fichier"
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:523 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:524 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Erreur lors de l'ouverture du dossier"
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:525 src/importldif.c:131
 msgid "No path specified"
 msgstr "Chemin non spécifié."
 
-#: src/addressbook.c:534
+#: src/addressbook.c:535
 msgid "Error connecting to LDAP server"
-msgstr "Erreur lors de la connexion au serveur LDAP"
+msgstr "Erreur de connexion au serveur LDAP"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:536
 msgid "Error initializing LDAP"
 msgstr "Erreur d'initialisation LDAP"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:537
 msgid "Error binding to LDAP server"
-msgstr "Erreur lors de la liaison avec le serveur LDAP"
+msgstr "Erreur de liaison au serveur LDAP"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:538
 msgid "Error searching LDAP database"
-msgstr "Erreur lors de la recherche de la base de données LDAP"
+msgstr "Erreur de recherche dans la base de données LDAP"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:539
 msgid "Timeout performing LDAP operation"
-msgstr "Délai excédé lors d'une opération LDAP"
+msgstr "Dépassement de délai d'attente lors d'une opération LDAP"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:540
 msgid "Error in LDAP search criteria"
-msgstr "Erreur dans le critère de recherche LDAP"
+msgstr "Erreur de critère de recherche LDAP"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:541
 msgid "No LDAP entries found for search criteria"
-msgstr ""
-"Aucune entrée LDAP correspondante au critère de recherche n'a été trouvée"
+msgstr "Aucune entrée LDAP ne correspond au critère de recherche"
 
-#: src/addressbook.c:541
+#: 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"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:543
 msgid "Error starting STARTTLS connection"
-msgstr "Erreur lors de l'établissement de la connexion STARTTLS"
+msgstr "Erreur de connexion STARTTLS"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:544
 msgid "Distinguished Name (dn) is missing"
 msgstr "Le nom absolu (DN) est manquant"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:545
 msgid "Missing required information"
 msgstr "Information requise manquante"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:546
 msgid "Another contact exists with that key"
 msgstr "Un autre contact existe avec cette clé"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:547
 msgid "Strong(er) authentication required"
 msgstr "Forte authentification obligatoire"
 
-#: src/addressbook.c:914
+#: src/addressbook.c:915
 msgid "Sources"
 msgstr "Sources"
 
-#: src/addressbook.c:918 src/prefs_matcher.c:632 src/prefs_other.c:492
+#: src/addressbook.c:919 src/prefs_matcher.c:631 src/prefs_other.c:488
 #: src/toolbar.c:268 src/toolbar.c:2519
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:1113 src/editldap.c:798
+#: src/addressbook.c:1115 src/editldap.c:793
 msgid "Search"
 msgstr "Chercher"
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1487
 msgid "Delete group"
 msgstr "Suppression de groupe(s)"
 
-#: src/addressbook.c:1485
+#: src/addressbook.c:1488
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -685,30 +689,30 @@ msgstr ""
 "Voulez-vous supprimer ce(s) groupe(s) ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2193
+#: src/addressbook.c:2215
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "Impossible de coller. Le carnet d'adresses de destination est en lecture "
 "seule."
 
-#: src/addressbook.c:2203
+#: src/addressbook.c:2225
 msgid "Cannot paste into an address group."
 msgstr "Impossible de coller dans une adresse de groupe."
 
-#: src/addressbook.c:2911
+#: src/addressbook.c:2958
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 "Voulez-vous effacer les résultats de la recherche et les adresses dans « %s "
 "» ?"
 
-#: src/addressbook.c:2914 src/addressbook.c:2940 src/addressbook.c:2947
+#: 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 "Supprimer"
 
-#: src/addressbook.c:2923
+#: src/addressbook.c:2970
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -718,20 +722,20 @@ msgstr ""
 "uniquement le dossier, les adresses qu'il contient seront déplacées dans le "
 "dossier parent."
 
-#: src/addressbook.c:2926 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 "Suppression de dossier"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2974
 msgid "Delete _folder only"
 msgstr "Supprimer le _Dossier uniquement"
 
-#: src/addressbook.c:2927
+#: src/addressbook.c:2974
 msgid "Delete folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:2938
+#: src/addressbook.c:2985
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -740,7 +744,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront conservées."
 
-#: src/addressbook.c:2945
+#: src/addressbook.c:2992
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -749,29 +753,29 @@ msgstr ""
 "Voulez-vous vraiment supprimer '%s' ?\n"
 "Les adresses contenues seront définitivement perdues."
 
-#: src/addressbook.c:3059
+#: src/addressbook.c:3106
 #, c-format
 msgid "Search '%s'"
 msgstr "Recherche « %s »"
 
-#: src/addressbook.c:3197 src/addressbook.c:3246
+#: src/addressbook.c:3244 src/addressbook.c:3293
 msgid "New Contacts"
 msgstr "Nouveaux contacts"
 
-#: src/addressbook.c:4085
+#: src/addressbook.c:4132
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:4089
+#: 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."
 
-#: src/addressbook.c:4099
+#: src/addressbook.c:4146
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:4104
+#: src/addressbook.c:4151
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -779,7 +783,7 @@ msgstr ""
 "Ancien carnet d'adresses converti :\n"
 "Mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4117
+#: src/addressbook.c:4164
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -787,7 +791,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses :\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:4123
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -795,7 +799,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses :\n"
 "Impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4175
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -803,149 +807,132 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:4135 src/addressbook.c:4141
+#: src/addressbook.c:4182 src/addressbook.c:4188
 msgid "Addressbook conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:4256
+#: src/addressbook.c:4303
 msgid "Addressbook Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4304
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:4588
+#: src/addressbook.c:4635
 msgid "Busy searching..."
 msgstr "Recherche.."
 
-#: src/addressbook.c:4897 src/prefs_send.c:216
+#: src/addressbook.c:4965 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4909
+#: src/addressbook.c:4977
 msgid "Address Books"
 msgstr "Carnets d'adresses"
 
-#: src/addressbook.c:4921
+#: src/addressbook.c:4989
 msgid "Person"
 msgstr "Contact"
 
-#: src/addressbook.c:4957 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:2860 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:4969
+#: src/addressbook.c:5037
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4981 src/addressbook.c:4993
+#: src/addressbook.c:5049 src/addressbook.c:5061
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5005
+#: src/addressbook.c:5073
 msgid "LDAP servers"
 msgstr "Serveurs LDAP"
 
-#: src/addressbook.c:5017
+#: src/addressbook.c:5085
 msgid "LDAP Query"
 msgstr "Requête 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:222 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:984 src/importldif.c:541
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: 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 "Quelconque"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr "Veuillez spécifier le nom du carnet d'adresses."
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr "Pas de carnet d'adresses disponible."
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr "Veuillez sélectionner les en-têtes de message à utiliser."
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
 msgstr "Récupération des adresses.."
 
-#: src/addrgather.c:248
+#: src/addrgather.c:254
 msgid "address added by claws-mail"
 msgstr "adresse ajoutée par Claws Mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr "Adresses rassemblées avec succès."
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr "Dossier actuel :"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr "Nom du carnet d'adresses :"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr "Taille du dossier du carnet d'adresses :"
 
-#: 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 ""
 "Nombre maximum d'entrées par nouveau dossier créé dans le carnet d'adresses"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr "Chercher dans les en-têtes suivants"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1405
 msgid "Header Name"
 msgstr "En-tête"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr "Nombre d'adresses"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:585
 msgid "Header Fields"
 msgstr "En-têtes"
 
-#: 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 "Finir"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:644
 msgid "Collect email addresses from selected messages"
 msgstr "Récupération d'adresses email des messages sélectionnés"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:648
 msgid "Collect email addresses from folder"
 msgstr "Récupération d'adresses email d'un dossier"
 
@@ -975,47 +962,47 @@ msgstr ""
 "La mise à jour a échoué. Les modifications ne seront pas appliquées au "
 "répertoire."
 
-#: src/alertpanel.c:146 src/compose.c:9761
+#: src/alertpanel.c:144 src/compose.c:9740
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:159 src/compose.c:5848 src/compose.c:6376
-#: src/compose.c:12218 src/file_checker.c:78 src/file_checker.c:100
+#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
+#: src/compose.c:12186 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:125 src/summaryview.c:4937
+#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5019
 msgid "Warning"
 msgstr "Alerte"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5785 src/inc.c:663
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5750 src/inc.c:664
 #: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
 msgid "Error"
 msgstr "Erreur"
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Afficher les traces"
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr "Afficher ce message la prochaine fois"
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr "Parcourir le dossier"
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr "Nom du serveur :"
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr "Nom absolu (DN) :"
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr "Nom LDAP"
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr "Valeur de l'attribut"
 
@@ -1144,11 +1131,11 @@ msgstr "Impossible d'initier une session STARTTLS\n"
 
 #: src/common/socket.c:571
 msgid "Socket IO timeout.\n"
-msgstr "Dépassement du delai d'attente lors d'entrées/sorties socket.\n"
+msgstr "Dépassement du délai d'attente lors d'entrées/sorties socket.\n"
 
 #: src/common/socket.c:600
 msgid "Connection timed out.\n"
-msgstr "Dépassement du délai d'attente de la connexion.\n"
+msgstr "Dépassement du délai d'établissement de la connexion.\n"
 
 #: src/common/socket.c:734
 #, c-format
@@ -1485,420 +1472,420 @@ msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
 
-#: src/compose.c:589
+#: src/compose.c:593
 msgid "_Add..."
 msgstr "_Ajouter.."
 
-#: src/compose.c:590 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:316
 msgid "_Remove"
 msgstr "Enleve_r"
 
-#: src/compose.c:592 src/folderview.c:254
+#: src/compose.c:596 src/folderview.c:253
 msgid "_Properties..."
 msgstr "_Propriétés.."
 
-#: src/compose.c:599 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:603 src/mainwindow.c:517 src/messageview.c:211
 msgid "_Message"
 msgstr "_Message"
 
-#: src/compose.c:602
+#: src/compose.c:606
 msgid "_Spelling"
 msgstr "O_rthographe"
 
-#: src/compose.c:604 src/compose.c:671
+#: src/compose.c:608 src/compose.c:675
 msgid "_Options"
 msgstr "_Options"
 
-#: src/compose.c:608
+#: src/compose.c:612
 msgid "S_end"
 msgstr "_Envoyer"
 
-#: src/compose.c:609
+#: src/compose.c:613
 msgid "Send _later"
 msgstr "Envoyer _ultérieurement"
 
-#: src/compose.c:612
+#: src/compose.c:616
 msgid "_Attach file"
 msgstr "_Adjoindre un fichier"
 
-#: src/compose.c:613
+#: src/compose.c:617
 msgid "_Insert file"
 msgstr "_Insérer un fichier"
 
-#: src/compose.c:614
+#: src/compose.c:618
 msgid "Insert si_gnature"
 msgstr "Insérer la si_gnature"
 
-#: src/compose.c:615
+#: src/compose.c:619
 msgid "_Replace signature"
 msgstr "_Remplacer la signature"
 
-#: src/compose.c:619
+#: src/compose.c:623
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: src/compose.c:624 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "Ann_uler"
 
-#: src/compose.c:625 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:629 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refaire"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Co_uper"
 
-#: src/compose.c:632
+#: src/compose.c:636
 msgid "_Special paste"
 msgstr "Coller c_omme"
 
-#: src/compose.c:633
+#: src/compose.c:637
 msgid "As _quotation"
 msgstr "_Citation"
 
-#: src/compose.c:634
+#: src/compose.c:638
 msgid "_Wrapped"
 msgstr "Texte _justifié"
 
-#: src/compose.c:635
+#: src/compose.c:639
 msgid "_Unwrapped"
 msgstr "Texte _non justifié"
 
-#: src/compose.c:637 src/mainwindow.c:549
+#: src/compose.c:641 src/mainwindow.c:550
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Sélectionner tout"
 
-#: src/compose.c:639
+#: src/compose.c:643
 msgid "A_dvanced"
 msgstr "A_vancé"
 
-#: src/compose.c:640
+#: src/compose.c:644
 msgid "Move a character backward"
 msgstr "Reculer d'un _caractère"
 
-#: src/compose.c:641
+#: src/compose.c:645
 msgid "Move a character forward"
 msgstr "Avancer d'un c_aractère"
 
-#: src/compose.c:642
+#: src/compose.c:646
 msgid "Move a word backward"
 msgstr "Reculer d'un _mot"
 
-#: src/compose.c:643
+#: src/compose.c:647
 msgid "Move a word forward"
 msgstr "Avancer d'un m_ot"
 
-#: src/compose.c:644
+#: src/compose.c:648
 msgid "Move to beginning of line"
 msgstr "Aller en _début de ligne"
 
-#: src/compose.c:645
+#: src/compose.c:649
 msgid "Move to end of line"
 msgstr "Aller en _fin de ligne"
 
-#: src/compose.c:646
+#: src/compose.c:650
 msgid "Move to previous line"
 msgstr "Aller à la _ligne précédente"
 
-#: src/compose.c:647
+#: src/compose.c:651
 msgid "Move to next line"
 msgstr "Aller à la l_igne suivante"
 
-#: src/compose.c:648
+#: src/compose.c:652
 msgid "Delete a character backward"
 msgstr "Supprimer le caractère _précédent"
 
-#: src/compose.c:649
+#: src/compose.c:653
 msgid "Delete a character forward"
 msgstr "Supprimer le caractère _suivant"
 
-#: src/compose.c:650
+#: src/compose.c:654
 msgid "Delete a word backward"
 msgstr "Supprimer le mot p_récédent"
 
-#: src/compose.c:651
+#: src/compose.c:655
 msgid "Delete a word forward"
 msgstr "Supprimer le mot s_uivant"
 
-#: src/compose.c:652
+#: src/compose.c:656
 msgid "Delete line"
 msgstr "_Effacer la ligne"
 
-#: src/compose.c:653
+#: src/compose.c:657
 msgid "Delete to end of line"
 msgstr "Supprimer _jusqu'à la fin de la ligne"
 
-#: src/compose.c:656 src/messageview.c:228
+#: src/compose.c:660 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Chercher dans le _message.."
 
-#: src/compose.c:659
+#: src/compose.c:663
 msgid "_Wrap current paragraph"
 msgstr "Justifier le _paragraphe actuel"
 
-#: src/compose.c:660
+#: src/compose.c:664
 msgid "Wrap all long _lines"
 msgstr "_Justifier tout le message"
 
-#: src/compose.c:662
+#: src/compose.c:666
 msgid "Edit with e_xternal editor"
 msgstr "Éditer avec un programme e_xterne"
 
-#: src/compose.c:665
+#: src/compose.c:669
 msgid "_Check all or check selection"
 msgstr "_Vérifier la sélection ou tout le texte"
 
-#: src/compose.c:666
+#: src/compose.c:670
 msgid "_Highlight all misspelled words"
 msgstr "Montrer les mots _inconnus"
 
-#: src/compose.c:667
+#: src/compose.c:671
 msgid "Check _backwards misspelled word"
 msgstr "Vérifier les mots _précédents"
 
-#: src/compose.c:668
+#: src/compose.c:672
 msgid "_Forward to next misspelled word"
 msgstr "Vérifier les mots _suivants et avancer"
 
-#: src/compose.c:675
+#: src/compose.c:679
 msgid "Reply _mode"
 msgstr "_Mode de réponse"
 
-#: src/compose.c:677
+#: src/compose.c:681
 msgid "Privacy _System"
 msgstr "S_ystème de confidentialité"
 
-#: src/compose.c:681
+#: src/compose.c:685
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: src/compose.c:683 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:687 src/mainwindow.c:612 src/messageview.c:264
 msgid "Character _encoding"
 msgstr "_Jeux de caractères"
 
-#: src/compose.c:688 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:692 src/mainwindow.c:617 src/messageview.c:269
 msgid "Western European"
 msgstr "Europe de l'Ouest"
 
-#: src/compose.c:689 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:693 src/mainwindow.c:618 src/messageview.c:270
 msgid "Baltic"
 msgstr "Baltique"
 
-#: src/compose.c:690 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:694 src/mainwindow.c:619 src/messageview.c:271
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: src/compose.c:691 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:695 src/mainwindow.c:620 src/messageview.c:272
 msgid "Arabic"
 msgstr "Arabe"
 
-#: src/compose.c:692 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:696 src/mainwindow.c:621 src/messageview.c:273
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: src/compose.c:693 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:697 src/mainwindow.c:622 src/messageview.c:274
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/compose.c:694 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:698 src/mainwindow.c:623 src/messageview.c:275
 msgid "Chinese"
 msgstr "Chinois"
 
-#: src/compose.c:695 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:699 src/mainwindow.c:624 src/messageview.c:276
 msgid "Korean"
 msgstr "Coréen"
 
-#: src/compose.c:696 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:700 src/mainwindow.c:625 src/messageview.c:277
 msgid "Thai"
 msgstr "Thaïlandais"
 
-#: src/compose.c:699 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:703 src/mainwindow.c:735 src/messageview.c:313
 msgid "_Address book"
 msgstr "_Carnet d'adresses"
 
-#: src/compose.c:701
+#: src/compose.c:705
 msgid "_Template"
 msgstr "_Modèles"
 
-#: src/compose.c:703 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:707 src/mainwindow.c:763 src/messageview.c:333
 msgid "Actio_ns"
 msgstr "_Actions"
 
-#: src/compose.c:712
+#: src/compose.c:716
 msgid "Aut_o wrapping"
 msgstr "Justifier aut_omatiquement pendant la saisie"
 
-#: src/compose.c:713
+#: src/compose.c:717
 msgid "Auto _indent"
 msgstr "_Indentation automatique"
 
-#: src/compose.c:714
+#: src/compose.c:718
 msgid "Si_gn"
 msgstr "_signer"
 
-#: src/compose.c:715
+#: src/compose.c:719
 msgid "_Encrypt"
 msgstr "_Chiffrer"
 
-#: src/compose.c:716
+#: src/compose.c:720
 msgid "_Request Return Receipt"
 msgstr "Demander un _accusé de réception"
 
-#: src/compose.c:717
+#: src/compose.c:721
 msgid "Remo_ve references"
 msgstr "Supprimer les _références"
 
-#: src/compose.c:718
+#: src/compose.c:722
 msgid "Show _ruler"
 msgstr "Afficher la _règle"
 
-#: src/compose.c:723 src/compose.c:733
+#: src/compose.c:727 src/compose.c:737
 msgid "_Normal"
 msgstr "_Normale"
 
-#: src/compose.c:724 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:728 src/mainwindow.c:666 src/messageview.c:302
 msgid "_All"
 msgstr "À _tous"
 
-#: src/compose.c:725 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:729 src/mainwindow.c:667 src/messageview.c:303
 msgid "_Sender"
 msgstr "À l'_expéditeur"
 
-#: src/compose.c:726
+#: src/compose.c:730
 msgid "_Mailing-list"
 msgstr "La _liste"
 
-#: src/compose.c:731
+#: src/compose.c:735
 msgid "_Highest"
 msgstr "La plus _haute"
 
-#: src/compose.c:732
+#: src/compose.c:736
 msgid "Hi_gh"
 msgstr "Haute"
 
-#: src/compose.c:734
+#: src/compose.c:738
 msgid "Lo_w"
 msgstr "Ba_sse"
 
-#: src/compose.c:735
+#: src/compose.c:739
 msgid "_Lowest"
 msgstr "La plus _basse"
 
-#: src/compose.c:740 src/mainwindow.c:878 src/messageview.c:350
+#: src/compose.c:744 src/mainwindow.c:879 src/messageview.c:350
 msgid "_Automatic"
 msgstr "_Détection automatique"
 
-#: src/compose.c:741 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:745 src/mainwindow.c:880 src/messageview.c:351
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASC_II 7 bits (US-ASCII)"
 
-#: src/compose.c:742 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:746 src/mainwindow.c:881 src/messageview.c:352
 msgid "Unicode (_UTF-8)"
 msgstr "_Unicode (UTF-8)"
 
-#: src/compose.c:746 src/mainwindow.c:884 src/messageview.c:356
+#: src/compose.c:750 src/mainwindow.c:885 src/messageview.c:356
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europe Centrale (ISO-8859-_2)"
 
-#: src/compose.c:749 src/mainwindow.c:887 src/messageview.c:359
+#: src/compose.c:753 src/mainwindow.c:888 src/messageview.c:359
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:754 src/mainwindow.c:892 src/messageview.c:364
+#: src/compose.c:758 src/mainwindow.c:893 src/messageview.c:364
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1083
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr "Erreur de formatage du modèle d'expéditeur des nouveaux messages."
 
-#: src/compose.c:1176
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr "Erreur de formatage du modèle de sujet des nouveaux messages."
 
-#: src/compose.c:1208 src/quote_fmt.c:570
+#: 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 "Le corps du modèle « Nouveau message » a une erreur à la ligne %d."
 
-#: src/compose.c:1473
+#: src/compose.c:1430
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Impossible de répondre. Le message original n'existe probablement pas."
 
-#: src/compose.c:1656 src/quote_fmt.c:587
+#: src/compose.c:1613 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Le champ « De » du modèle « Réponse » contient une adresse email invalide."
 
-#: src/compose.c:1705 src/quote_fmt.c:590
+#: 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 "Le corps du modèle « Réponse » a une erreur à la ligne %d."
 
-#: src/compose.c:1839 src/compose.c:2031 src/quote_fmt.c:607
+#: 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."
 msgstr ""
 "Le champ « De » du modèle « Transfert » contient une adresse email invalide."
 
-#: src/compose.c:1900 src/quote_fmt.c:610
+#: 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 "Le corps du modèle « Transfert » a une erreur à la ligne %d."
 
-#: src/compose.c:2074
+#: src/compose.c:2031
 msgid "Fw: multiple emails"
 msgstr "Fw : emails multiples"
 
-#: src/compose.c:2576
+#: src/compose.c:2533
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Le corps du modèle « Redirection » a une erreur à la ligne %d."
 
-#: src/compose.c:2643 src/gtk/headers.h:14
+#: src/compose.c:2600 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2646 src/gtk/headers.h:15
+#: src/compose.c:2603 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cci:"
 
-#: src/compose.c:2649 src/gtk/headers.h:12
+#: src/compose.c:2606 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Répondre-à:"
 
-#: src/compose.c:2652 src/compose.c:5019 src/compose.c:5021
+#: src/compose.c:2609 src/compose.c:4971 src/compose.c:4973
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Groupe-de-discussion:"
 
-#: src/compose.c:2655 src/gtk/headers.h:34
+#: src/compose.c:2612 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Donnant-suite-à:"
 
-#: src/compose.c:2658 src/gtk/headers.h:17
+#: src/compose.c:2615 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "En-réponse-à:"
 
-#: src/compose.c:2662 src/compose.c:5016 src/compose.c:5024
-#: 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:424
 msgid "To:"
 msgstr "À:"
 
-#: src/compose.c:2852
+#: src/compose.c:2809
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Impossible d'adjoindre le fichier au message (échec de conversion de jeu de "
 "caractères)."
 
-#: src/compose.c:2858
+#: src/compose.c:2815
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1913,16 +1900,16 @@ msgstr[1] ""
 "Les fichiers suivants ont été joints au message :\n"
 "%s"
 
-#: src/compose.c:3138
+#: src/compose.c:3095
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Le « préfixe de citation » du modèle est invalide."
 
-#: src/compose.c:3667
+#: src/compose.c:3624
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Impossible de récupérer la taille du fichier '%s'."
 
-#: src/compose.c:3685
+#: src/compose.c:3642
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1931,57 +1918,57 @@ 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 ?"
 
-#: src/compose.c:3688
+#: src/compose.c:3645
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: src/compose.c:3689 src/compose.c:10817 src/compose.c:11695
+#: src/compose.c:3646 src/compose.c:10784 src/compose.c:11662
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: src/compose.c:3813
+#: src/compose.c:3771
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:3814
+#: src/compose.c:3772
 msgid "Empty file"
 msgstr "Fichier vide"
 
-#: src/compose.c:3815
+#: src/compose.c:3773
 msgid "_Attach anyway"
 msgstr "_Attacher quand même"
 
-#: src/compose.c:3824
+#: src/compose.c:3782
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:3851
+#: src/compose.c:3809
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:4856 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 " [modifié]"
 
-#: src/compose.c:4863 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 - Composition d'un message%s"
 
-#: src/compose.c:4866 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 "[Pas de sujet] - Composition d'un message%s"
 
-#: src/compose.c:4868 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4826 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Composition d'un message"
 
-#: src/compose.c:4895 src/messageview.c:903
+#: src/compose.c:4853 src/messageview.c:903
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1989,105 +1976,115 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez en sélectionner un avant d'envoyer du courrier."
 
-#: src/compose.c:5116 src/compose.c:5153
+#: src/compose.c:5068 src/compose.c:5105
 #, 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 ?"
 
-#: src/compose.c:5118 src/compose.c:5155 src/compose.c:5198 src/compose.c:5247
+#: 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
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:5120 src/compose.c:5157 src/compose.c:5191 src/compose.c:5240
-#: src/compose.c:5786 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
+#: 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
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:5174
+#: src/compose.c:5126
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:5193 src/compose.c:5242
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "_Mettre en file d'attente"
-
-#: src/compose.c:5194
+#: src/compose.c:5141
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Le sujet est vide. %s"
 
-#: src/compose.c:5195 src/compose.c:5244
-#: 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 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5196 src/compose.c:5245
-#: 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 "Voulez-vous quand même le mettre en file d'attente d'envoi ?"
 
-#: src/compose.c:5198 src/compose.c:5247 src/toolbar.c:520
+#: src/compose.c:5145 src/compose.c:5188 src/toolbar.c:520
 msgid "Send later"
 msgstr "Plus tard"
 
-#: src/compose.c:5243
+#: src/compose.c:5146 src/compose.c:5189
+msgid "_Queue"
+msgstr "_Mettre en file d'attente"
+
+#: src/compose.c:5184
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Le message sera envoyé à %d destinataires. %s"
 
-#: src/compose.c:5300 src/compose.c:10259
+#: src/compose.c:5213
+msgid "Could not queue message."
+msgstr "Impossible de mettre le message en file d'attente d'envoi."
+
+#: 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 ""
 "Impossible de mettre le message en file d'attente d'envoi :\n"
 "\n"
-"La conversion de jeu de caractères a échoué."
+"%s."
 
-#: src/compose.c:5303 src/compose.c:10262
+#: 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 ""
 "Impossible de mettre le message en file d'attente d'envoi :\n"
 "\n"
-"La clé de chiffrement du destinataire n'est pas disponible."
+"La signature a échoué : %s"
 
-#: src/compose.c:5309 src/compose.c:10256
+#: src/compose.c:5225
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 "Impossible de mettre le message en file d'attente d'envoi :\n"
 "\n"
-"Sa signature a échoué : %s"
+"Le chiffrage a échoué : %s"
 
-#: src/compose.c:5312
-#, c-format
+#: src/compose.c:5230
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
 "Impossible de mettre le message en file d'attente d'envoi :\n"
 "\n"
-"%s."
+"La conversion de jeu de caractères a échoué."
 
-#: src/compose.c:5314
-msgid "Could not queue message for sending."
-msgstr "Impossible de mettre le message en file d'attente d'envoi."
+#: src/compose.c:5234
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"Impossible de mettre le message en file d'attente d'envoi :\n"
+"\n"
+"La clé de chiffrement du destinataire n'est pas disponible."
 
-#: src/compose.c:5329 src/compose.c:5389
+#: 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."
@@ -2095,7 +2092,7 @@ msgstr ""
 "Le message a été mis dans la file d'attente mais n'a pas pu être envoyé.\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5385
+#: src/compose.c:5350
 #, c-format
 msgid ""
 "%s\n"
@@ -2104,7 +2101,7 @@ msgstr ""
 "%s\n"
 "Utilisez « Message / Envoyer les messages en file d'attente » pour réessayer."
 
-#: src/compose.c:5782
+#: src/compose.c:5747
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2115,7 +2112,7 @@ msgstr ""
 "message vers le jeu de caractères spécifié (%s).\n"
 "Voulez-vous l'envoyer en %s ?"
 
-#: src/compose.c:5844
+#: src/compose.c:5809
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2129,104 +2126,99 @@ msgstr ""
 "\n"
 "Voulez-vous quand même l'envoyer ?"
 
-#: src/compose.c:5955
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "Impossible de chiffrer le message : %s"
-
-#: src/compose.c:6076
+#: src/compose.c:6041
 msgid "Encryption warning"
 msgstr "Avertissement concernant le chiffrement"
 
-#: src/compose.c:6077
+#: src/compose.c:6042
 msgid "C_ontinue"
 msgstr "_Poursuivre"
 
-#: src/compose.c:6126
+#: src/compose.c:6091
 msgid "No account for sending mails available!"
 msgstr "Il n'existe pas de compte pour l'envoi de messages."
 
-#: src/compose.c:6135
+#: src/compose.c:6100
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "Le compte sélectionné n'est pas un compte NNTP : Poster est impossible."
 
-#: src/compose.c:6375
+#: src/compose.c:6340
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "La pièce jointe %s n'existe plus. Ignorer ?"
 
-#: src/compose.c:6376 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:2560
 msgid "Cancel sending"
 msgstr "Interrompre l'envoi"
 
-#: src/compose.c:6376
+#: src/compose.c:6342
 msgid "Ignore attachment"
 msgstr "Ignorer cette pièce jointe"
 
-#: src/compose.c:6432
+#: src/compose.c:6398
 #, c-format
 msgid "Original %s part"
 msgstr "Partie %s originale"
 
-#: src/compose.c:7032
+#: src/compose.c:6998
 msgid "Add to address _book"
 msgstr "Ajouter au carnet d'_adresses"
 
-#: src/compose.c:7193
+#: src/compose.c:7165
 msgid "Delete entry contents"
 msgstr "Effacer le contenu du champ"
 
-#: src/compose.c:7197 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 "Taper <tab> pour utiliser à la complétion depuis le carnet d'adresse"
 
-#: src/compose.c:7412
+#: src/compose.c:7401
 msgid "Mime type"
 msgstr "Type Mime"
 
-#: src/compose.c:7418 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:464
+#: src/prefs_matcher.c:629 src/prefs_summaries.c:439
+#: src/prefs_summary_column.c:84 src/summaryview.c:449
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:7481
+#: src/compose.c:7470
 msgid "Save Message to "
 msgstr "Enregistrer le message dans "
 
-#: src/compose.c:7518 src/editjpilot.c:276 src/editldap.c:519
+#: 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 "_Parcourir"
 
-#: src/compose.c:7540
+#: src/compose.c:7520
 msgid "Select folder to save message to"
 msgstr "Sélection du dossier où enregistrer le message"
 
-#: src/compose.c:7997
+#: src/compose.c:7977
 msgid "Hea_der"
 msgstr "E_n-tête"
 
-#: src/compose.c:8002
+#: src/compose.c:7982
 msgid "_Attachments"
 msgstr "Pièces _jointes"
 
-#: src/compose.c:8016
+#: src/compose.c:7996
 msgid "Othe_rs"
 msgstr "A_utres"
 
-#: src/compose.c:8031
+#: src/compose.c:8011
 msgid "S_ubject:"
 msgstr "S_ujet :"
 
-#: src/compose.c:8255
+#: src/compose.c:8235
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2235,19 +2227,19 @@ msgstr ""
 "Le correcteur orthographique n'a pu être lancé.\n"
 "%s"
 
-#: src/compose.c:8402
+#: src/compose.c:8382
 msgid "_From:"
 msgstr "_De :"
 
-#: src/compose.c:8419
+#: src/compose.c:8399
 msgid "Account to use for this email"
 msgstr "Compte à utiliser pour l'envoi de ce message"
 
-#: src/compose.c:8421
+#: src/compose.c:8401
 msgid "Sender address to be used"
 msgstr "Adresse email à utiliser en tant qu'expéditeur"
 
-#: src/compose.c:8603
+#: src/compose.c:8583
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2256,50 +2248,50 @@ msgstr ""
 "Le système de confidentialité '%s' ne peut être chargé. Il sera impossible "
 "de signer ou chiffrer ce message."
 
-#: src/compose.c:8714 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8694 src/plugins/archive/archiver_gtk.c:1179
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/compose.c:8815 src/prefs_template.c:752
+#: src/compose.c:8795 src/prefs_template.c:751
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Le corps du modèle a une erreur à la ligne %d."
 
-#: src/compose.c:8912
+#: src/compose.c:8892
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Erreur de formatage dans l'en-tête « %s » du modèle."
 
-#: src/compose.c:9331
+#: src/compose.c:9318
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:9346
+#: src/compose.c:9333
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:9420
+#: src/compose.c:9407
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:9437
+#: src/compose.c:9424
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:9478
+#: src/compose.c:9457
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:9498
+#: src/compose.c:9477
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:9499
+#: src/compose.c:9478
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:9758
+#: src/compose.c:9737
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2310,34 +2302,19 @@ msgstr ""
 "Voulez-vous forcer sa fermeture ?\n"
 "Identifiant du groupe de processus : %d"
 
-#: src/compose.c:10225 src/messageview.c:1105
+#: src/compose.c:10205 src/messageview.c:1105
 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."
 
-#: src/compose.c:10251
-msgid "Could not queue message."
-msgstr "Impossible de mettre le message en file d'attente d'envoi."
-
-#: src/compose.c:10253
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"Impossible de mettre le message en file d'attente d'envoi :\n"
-"\n"
-"%s."
-
-#: src/compose.c:10431
+#: src/compose.c:10398
 msgid "Could not save draft."
 msgstr "Impossible d'enregistrer le brouillon."
 
-#: src/compose.c:10435
+#: src/compose.c:10402
 msgid "Could not save draft"
 msgstr "Enregistrement impossible du brouillon"
 
-#: src/compose.c:10436
+#: src/compose.c:10403
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2346,24 +2323,24 @@ msgstr ""
 "Voulez-vous annuler la fermeture de l'application ou simplement interrompre "
 "l'édition de ce message ?"
 
-#: src/compose.c:10438
+#: src/compose.c:10405
 msgid "_Cancel exit"
 msgstr "A_nnuler"
 
-#: src/compose.c:10438
+#: src/compose.c:10405
 msgid "_Discard email"
 msgstr "_Interrompre"
 
-#: src/compose.c:10628 src/compose.c:10642
+#: src/compose.c:10594 src/compose.c:10608
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
-#: src/compose.c:10656
+#: src/compose.c:10622
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Échec lors de la lecture de « %s »."
 
-#: src/compose.c:10658
+#: src/compose.c:10624
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2372,54 +2349,54 @@ msgstr ""
 "Le fichier « %s » contient des caractères n'appartenant pas\n"
 "à l'encodage courant : l'insertion peut être incorrecte."
 
-#: src/compose.c:10737
+#: src/compose.c:10703
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:10738
+#: src/compose.c:10704
 msgid "This message has been modified. Discard it?"
 msgstr ""
 "Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
 "composition ?"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Interrompre"
 
-#: src/compose.c:10739 src/compose.c:10743
+#: src/compose.c:10705 src/compose.c:10710
 msgid "_Save to Drafts"
 msgstr "Enregi_strer un brouillon"
 
-#: src/compose.c:10741 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10708 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: src/compose.c:10742
+#: src/compose.c:10709
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/compose.c:10743
+#: src/compose.c:10710
 msgid "_Don't save"
 msgstr "_Ne pas enregistrer"
 
-#: src/compose.c:10814
+#: src/compose.c:10781
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voulez-vous utiliser le modèle « %s » ?"
 
-#: src/compose.c:10816
+#: src/compose.c:10783
 msgid "Apply template"
 msgstr "Utiliser le modèle"
 
-#: src/compose.c:10817 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:311
-#: src/prefs_toolbar.c:1063
+#: src/compose.c:10784 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:1017
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:11688
+#: src/compose.c:11655
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2434,20 +2411,20 @@ msgstr[1] ""
 "Voulez-vous insérer le contenu des %d fichiers directement dans le corps du "
 "message ou les adjoindre en tant que pièces jointes ?"
 
-#: src/compose.c:11694
+#: src/compose.c:11661
 msgid "Insert or attach?"
 msgstr "Insérer ou adjoindre ?"
 
-#: src/compose.c:11695
+#: src/compose.c:11662
 msgid "_Attach"
 msgstr "_Adjoindre"
 
-#: src/compose.c:11915
+#: src/compose.c:11883
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erreur de formatage de la citation à la ligne %d."
 
-#: src/compose.c:12212
+#: src/compose.c:12180
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2495,11 +2472,11 @@ msgstr "Création d'un rapport de bogue"
 msgid "Save crash information"
 msgstr "Enregistrer les données de l'interruption inattendue"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:149 src/editaddress.c:287
 msgid "Add New Person"
 msgstr "Ajout d'un contact"
 
-#: 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"
@@ -2525,7 +2502,7 @@ msgstr ""
 "Cliquez sur Valider pour continuer d'éditer ce contact ou\n"
 "sur Annuler pour fermer sans enregistrer."
 
-#: 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"
@@ -2547,35 +2524,35 @@ msgstr ""
 "Cliquez sur Valider pour continuer d'éditer ce contact ou\n"
 "sur Annuler pour fermer sans enregistrer."
 
-#: src/editaddress.c:232
+#: src/editaddress.c:288
 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'un contact"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:506
 msgid "An Email address must be supplied."
 msgstr "L'adresse email est requise."
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:709 src/editaddress_other_attributes_ldap.c:221
 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur sont requis."
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1694
+#: src/editaddress.c:819 src/prefs_folder_item.c:1693
 msgid "Discard"
 msgstr "Annuler"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:820
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:850 src/editaddress.c:899
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'un contact"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:928
 msgid "Choose a picture"
 msgstr "Choisir une image"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:947
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2584,58 +2561,58 @@ msgstr ""
 "Échec lors de l'ajout de l'image: \n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:989
 msgid "_Set picture"
 msgstr "_Définir la photo"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:990
 msgid "_Unset picture"
 msgstr "_Supprimer la photo"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1048
 msgid "Photo"
 msgstr "Photo"
 
-#: 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 "Nom affiché"
 
-#: 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 "Nom"
 
-#: 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 "Prénom"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1113 src/editaddress.c:1115
 msgid "Nickname"
 msgstr "Surnom"
 
-#: 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:222
+#: 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
 msgid "Value"
 msgstr "Valeur"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1592
 msgid "_User Data"
 msgstr "Nom d'_utilisateur"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1593
 msgid "_Email Addresses"
 msgstr "_Adresses Email"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1596 src/editaddress.c:1599
 msgid "O_ther Attributes"
 msgstr "Données _supplémentaires"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1767
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2666,7 +2643,7 @@ 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/wizard.c:1196 src/wizard.c:1616
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fichier"
 
@@ -2715,12 +2692,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisir le nouveau nom du dossier :"
 
-#: 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 "Nouveau dossier"
 
-#: 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 "Saisir le nom du nouveau dossier :"
@@ -2745,32 +2722,32 @@ msgstr "Adresses email supplémentaires"
 msgid "Add New JPilot Entry"
 msgstr "Ajouter une donnée JPilot"
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr "LDAP - Sélection de bases de recherches"
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:172 src/editldap.c:440
 msgid "Hostname"
 msgstr "Hôte"
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: 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/ssl_manager.c:108
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:176 src/editldap.c:503
+#: src/editldap_basedn.c:192 src/editldap.c:501
 msgid "Search Base"
 msgstr "Base de recherche"
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:220
 msgid "Available Search Base(s)"
 msgstr "Base(s) disponible(s)"
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:326
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Impossible d'obtenir les bases du serveur - définir manuellement"
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:330 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Impossible de se connecter au serveur"
 
@@ -2790,15 +2767,15 @@ msgstr "Au moins un attribut de recherche LDAP doit être spécifié."
 msgid "Connected successfully to server"
 msgstr "Connexion réussie vers le serveur"
 
-#: src/editldap.c:336 src/editldap.c:995
+#: src/editldap.c:335 src/editldap.c:990
 msgid "Edit LDAP Server"
 msgstr "Édition du serveur LDAP"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "Un nom permettant d'identifier le serveur."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2810,15 +2787,15 @@ msgstr ""
 "utilisée. Si le serveur se trouve sur la même machine exécutant Claws Mail, "
 "« localhost » peut être utilisé."
 
-#: src/editldap.c:470
+#: src/editldap.c:468
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:471 src/prefs_account.c:3478
+#: src/editldap.c:469 src/prefs_account.c:3478
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:475
+#: src/editldap.c:473
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2829,7 +2806,7 @@ msgstr ""
 "échoue, veuillez vérifiez la configuration dans le fichier ldap.conf (champs "
 "TLS_CACERTDIR et TLS_REQCERT)."
 
-#: src/editldap.c:480
+#: src/editldap.c:478
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2839,20 +2816,20 @@ msgstr ""
 "échoue, vérifier la configuration dans le fichier ldap.conf (champs "
 "TLS_CACERTDIR et TLS_REQCERT)."
 
-#: src/editldap.c:492
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 "Le numéro du port sur lequel le serveur répond. Le port par défault est 389."
 
-#: src/editldap.c:495
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr " Test serveur "
 
-#: src/editldap.c:499
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr "Tester la connexion au serveur."
 
-#: src/editldap.c:512
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2866,7 +2843,7 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Nom de l'organisation,c=Pays\n"
 
-#: src/editldap.c:523
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
@@ -2874,11 +2851,11 @@ msgstr ""
 "Cliquer sur ce bouton pour lister les noms des dossiers disponibles sur le "
 "serveur."
 
-#: src/editldap.c:579
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr "Attributs de recherche"
 
-#: src/editldap.c:588
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2886,11 +2863,11 @@ msgstr ""
 "Une liste d'attributs LDAP à utiliser pour la recherche de noms ou "
 "d'adresses."
 
-#: src/editldap.c:591
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr " Par défaut "
 
-#: src/editldap.c:595
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2898,11 +2875,11 @@ msgstr ""
 "Réinitialise les attributs en une valeur par défaut permettant de trouver la "
 "plupart des noms et adresses."
 
-#: src/editldap.c:601
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr "Durée de vie d'un résultat (secs)"
 
-#: src/editldap.c:616
+#: src/editldap.c:613
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2924,11 +2901,11 @@ msgstr ""
 "diminuera le temps des recherches ultérieures. Particulièrement utile pour "
 "des serveurs lents, au détriment d'une utilisation accrue de la mémoire."
 
-#: src/editldap.c:633
+#: src/editldap.c:630
 msgid "Include server in dynamic search"
 msgstr "Inclure le serveur dans la recherche dynamique"
 
-#: src/editldap.c:638
+#: src/editldap.c:635
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
@@ -2936,11 +2913,11 @@ msgstr ""
 "Activer cette option pour inclure ce serveur lors des recherches dynamiques "
 "pour la complétion d'adresse."
 
-#: src/editldap.c:644
+#: src/editldap.c:641
 msgid "Match names 'containing' search term"
 msgstr "Noms contenant un terme donné"
 
-#: src/editldap.c:649
+#: src/editldap.c:646
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2954,11 +2931,11 @@ msgstr ""
 "lent. Pour des raisons de performances, le critère « begins with » est "
 "néanmoins toujours utilisé pour la complétion d'adresse."
 
-#: src/editldap.c:712
+#: src/editldap.c:709
 msgid "Bind DN"
 msgstr "DN de connexion"
 
-#: src/editldap.c:721
+#: src/editldap.c:718
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2970,87 +2947,87 @@ msgstr ""
 "é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."
 
-#: src/editldap.c:728
+#: src/editldap.c:725
 msgid "Bind Password"
 msgstr "Mot de passe de connexion"
 
-#: src/editldap.c:738
+#: 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 »."
 
-#: src/editldap.c:741 src/prefs_account.c:1314 src/prefs_account.c:1868
+#: src/editldap.c:738 src/prefs_account.c:1314 src/prefs_account.c:1868
 #: src/prefs_account.c:2587 src/prefs_account.c:2615
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: src/editldap.c:750
+#: src/editldap.c:747
 msgid "Timeout (secs)"
 msgstr "Délai d'attente (secs)"
 
-#: src/editldap.c:764
+#: src/editldap.c:760
 msgid "The timeout period in seconds."
 msgstr "Durée maximale d'attente."
 
-#: src/editldap.c:768
+#: src/editldap.c:764
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:782
+#: src/editldap.c:777
 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:797 src/prefs_account.c:3369
+#: src/editldap.c:792 src/prefs_account.c:3369
 msgid "Basic"
 msgstr "Général"
 
-#: src/editldap.c:799 src/gtk/quicksearch.c:708
+#: src/editldap.c:794 src/gtk/quicksearch.c:708
 msgid "Extended"
 msgstr "Avancé"
 
-#: src/editldap.c:1000
+#: src/editldap.c:995
 msgid "Add New LDAP Server"
 msgstr "Configuration d'un nouveau serveur LDAP"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1450
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1426
+#: src/prefs_summaries.c:446
 msgid "Tag"
 msgstr "Label"
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr "Suppression du label"
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr "Voulez-vous vraiment supprimer le label sélectionné ?"
 
-#: src/edittags.c:251
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr "Suppression des labels"
 
-#: src/edittags.c:252
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr "Voulez-vous vraiment supprimer tous les labels ?"
 
-#: src/edittags.c:423
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Vous avez saisi un nom de tag réservé, veuillez en saisir un autre."
 
-#: src/edittags.c:465
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/edittags.c:530
+#: src/edittags.c:537
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "Appliquer des labels"
 
-#: src/edittags.c:544
+#: src/edittags.c:551
 msgid "New tag:"
 msgstr "Nouveau label :"
 
-#: src/edittags.c:577
+#: src/edittags.c:584
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 "Veuillez choisir le(s) tag(s) à appliquer/enlever aux messages actuellement\n"
@@ -3078,9 +3055,9 @@ msgstr "Impossible de définir le certificat client.\n"
 
 #: src/etpan/nntp-thread.c:865
 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:963
+#: src/etpan/nntp-thread.c:964
 msgid "couldn't get xhdr range\n"
 msgstr "impossible d'obtenir le xhdr range\n"
 
@@ -3135,7 +3112,7 @@ msgid "HTML Output File"
 msgstr "Fichier HTML destinataire"
 
 #: 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 "Pa_rcourir"
 
@@ -3143,20 +3120,20 @@ msgstr "Pa_rcourir"
 msgid "Stylesheet"
 msgstr "Feuille de style"
 
-#: 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/prefs_toolbar.c:768 src/prefs_toolbar.c:1434 src/summaryview.c:6144
 msgid "None"
 msgstr "Aucun"
 
-#: 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 "Par défaut"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:253
 #: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
 msgid "Full"
 msgstr "Complet"
@@ -3201,11 +3178,11 @@ msgstr "Adresses hyperliens (mailto:)"
 msgid "Format User Attributes"
 msgstr "Inclure les données supplémentaires"
 
-#: 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 "Carnet d'adresses :"
 
-#: 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 "Chemin du fichier :"
 
@@ -3217,7 +3194,7 @@ msgstr "Ouvrir avec le navigateur web"
 msgid "Export Address Book to HTML File"
 msgstr "Exporter le carnet d'adresses vers un ficher 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 "Informations fichier"
 
@@ -3387,7 +3364,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:8233
+#: src/export.c:113 src/summaryview.c:8316
 msgid "Export to mbox file"
 msgstr "Exporter la sélection en fichier mbox"
 
@@ -3427,8 +3404,8 @@ msgstr "Sélection du dossier pour l'export"
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: 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 "Attributs"
 
@@ -3459,12 +3436,12 @@ msgstr ""
 "Le fichier %s est manquant ! Voulez-vous utiliser le fichier de sauvegarde "
 "du %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 "Impossible de copier %s vers %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 "
@@ -3573,51 +3550,51 @@ msgstr "application de l'action impossible\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "pas de traitement après l'action [ %s ]\n"
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "règle de traitement '%s' [ %s]\n"
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "traitement de la règle <sansnom> [ %s ]\n"
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "règle '%s' désactivée [ %s ]\n"
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "règle <sansnom> désactivée [ %s ]\n"
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
 msgstr "indéfini"
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr "filtrage à la réception"
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr "manuellement"
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr "traitement du dossier"
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr "pré-traitement"
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr "post-traitement"
 
-#: src/filtering.c:909
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3634,11 +3611,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"
@@ -3647,73 +3624,74 @@ msgstr ""
 "filtrage du message (%s%s%s)\n"
 "%sfichier message : %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 "Réception"
 
-#: src/folder.c:1574
+#: src/folder.c:1595
 msgid "Sent"
 msgstr "Envoyés"
 
-#: 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 "File d'attente"
 
-#: src/folder.c:1582 src/prefs_folder_item.c:319
+#: src/folder.c:1603 src/prefs_folder_item.c:319
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/folder.c:1586 src/prefs_folder_item.c:317
+#: src/folder.c:1607 src/prefs_folder_item.c:317
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/folder.c:2017
+#: src/folder.c:2038
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Traitement (%s)..\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3283
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copie de %s vers %s..\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3283
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Déplacement de %s vers %s..\n"
 
-#: src/folder.c:3572
+#: src/folder.c:3593
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Mise à jour du cache pour %s.."
 
-#: src/folder.c:4434
+#: src/folder.c:4455
 msgid "Processing messages..."
 msgstr "Traitement des messages.."
 
-#: src/folder.c:4569
+#: src/folder.c:4590
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniser %s pour une utilisation hors-ligne..\n"
 
-#: src/folder.c:4828
+#: src/folder.c:4849
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nom de dossier ne peut commencer ou finir par un point."
 
-#: src/folder.c:4832
+#: src/folder.c:4853
 msgid "A folder name can not end with a space."
 msgstr "Un nom de dossier ne peut pas finir par un espace."
 
-#: src/foldersel.c:250
+#: src/foldersel.c:249
 msgid "Select folder"
 msgstr "Sélection d'un dossier"
 
-#: 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 "NouveauDossier"
 
-#: 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
@@ -3722,7 +3700,7 @@ msgstr "NouveauDossier"
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 
-#: 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
@@ -3730,81 +3708,81 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
 msgid "The folder '%s' already exists."
 msgstr "Le dossier '%s' existe déjà."
 
-#: 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 "Impossible de créer le dossier '%s'."
 
-#: src/folderview.c:247
+#: src/folderview.c:246
 msgid "Mark all re_ad"
 msgstr "Marquer tous comme _lus"
 
-#: src/folderview.c:248
+#: src/folderview.c:247
 msgid "Mark all u_nread"
 msgstr "Marquer tou_s comme non lus"
 
-#: src/folderview.c:249
+#: src/folderview.c:248
 msgid "Mark all read recursi_vely"
 msgstr "Marquer tous comme lus récursivement"
 
-#: src/folderview.c:250
+#: src/folderview.c:249
 msgid "Mark all unread recursi_vely"
 msgstr "Marquer tous comme non lus récursi_vement"
 
-#: src/folderview.c:252
+#: src/folderview.c:251
 msgid "R_un processing rules"
 msgstr "Exéc_uter les règles de traitement"
 
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:252 src/mainwindow.c:554
 msgid "_Search folder..."
 msgstr "Chercher dans le _dossier.."
 
-#: src/folderview.c:255
+#: src/folderview.c:254
 msgid "Process_ing..."
 msgstr "_Traitement.."
 
-#: src/folderview.c:256
+#: src/folderview.c:255
 msgid "Empty _trash..."
 msgstr "_Vider la corbeille.."
 
-#: src/folderview.c:257
+#: src/folderview.c:256
 msgid "Send _queue..."
 msgstr "_Envoyer les messages.."
 
-#: 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:6418
 msgid "New"
 msgstr "Nouveau"
 
-#: 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:6420
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "Non lu"
 
-#: 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 "#"
 
-#: src/folderview.c:782
+#: src/folderview.c:781
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers.."
 
-#: src/folderview.c:867 src/summaryview.c:4182
+#: src/folderview.c:866 src/summaryview.c:4228
 msgid "Mark all as read"
 msgstr "Marquer tous comme lus"
 
-#: 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?"
@@ -3812,16 +3790,16 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme lus ?"
 
-#: src/folderview.c:870 src/summaryview.c:4183
+#: src/folderview.c:869 src/summaryview.c:4229
 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:873 src/summaryview.c:4221
+#: src/folderview.c:872 src/summaryview.c:4276
 msgid "Mark all as unread"
-msgstr "Marquer tous comme non lus"
+msgstr "Marquer tous comme non l_us"
 
-#: 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?"
@@ -3829,76 +3807,76 @@ msgstr ""
 "Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
 "dossiers comme non lus ?"
 
-#: src/folderview.c:876 src/summaryview.c:4222
+#: src/folderview.c:875 src/summaryview.c:4277
 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:1066 src/imap.c:4606
+#: src/folderview.c:1065 src/imap.c:4614
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Analyse du dossier %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:4618 src/mainwindow.c:5236 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Analyse du dossier %s.."
 
-#: src/folderview.c:1100
+#: src/folderview.c:1099
 msgid "Rebuild folder tree"
 msgstr "Reconstruction de l'arborescence"
 
-#: src/folderview.c:1101
+#: src/folderview.c:1100
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "La reconstruction de l'arborescence supprimera les caches locaux. Voulez-"
 "vous continuer ?"
 
-#: src/folderview.c:1111
+#: src/folderview.c:1110
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence.."
 
-#: src/folderview.c:1113
+#: src/folderview.c:1112
 msgid "Scanning folder tree..."
 msgstr "Analyse de l'arborescence.."
 
-#: src/folderview.c:1204
+#: src/folderview.c:1203
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Impossible d'ouvrir le dossier '%s'\n"
 
-#: src/folderview.c:1258
+#: src/folderview.c:1257
 msgid "Checking for new messages in all folders..."
 msgstr "Examiner tous les dossiers pour nouveaux messages.."
 
-#: src/folderview.c:2229
+#: src/folderview.c:2228
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fermeture du dossier %s.."
 
-#: src/folderview.c:2324
+#: src/folderview.c:2323
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Ouverture du dossier %s.."
 
-#: src/folderview.c:2342
+#: src/folderview.c:2341
 msgid "Folder could not be opened."
 msgstr "Le dossier n'a pu être ouvert."
 
-#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
+#: src/folderview.c:2483 src/mainwindow.c:2879 src/mainwindow.c:2884
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2484
 msgid "Delete all messages in trash?"
 msgstr "Voulez-vous vraiment supprimer tous les messages de la corbeille ?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2485
 msgid "_Empty trash"
 msgstr "_Vider"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
+#: src/folderview.c:2529 src/inc.c:1534 src/toolbar.c:3008
 msgid "Offline warning"
 msgstr "Travail hors-ligne"
 
@@ -3920,7 +3898,7 @@ msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
 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:2780 src/toolbar.c:3051
+#: src/folderview.c:2554 src/main.c:2798 src/toolbar.c:3051
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3989,7 +3967,7 @@ msgstr "Le déplacement a échoué."
 msgid "Processing configuration for folder %s"
 msgstr "Options de filtrage/traitement du dossier %s"
 
-#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
+#: src/folderview.c:3177 src/summaryview.c:4685 src/summaryview.c:4791
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4015,7 +3993,7 @@ msgstr " Chercher "
 msgid "Newsgroup name"
 msgstr "Nom des groupes de discussion"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:184
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Messages"
 
@@ -4041,7 +4019,7 @@ msgstr "inconnu"
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: 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 "Terminé."
 
@@ -4119,7 +4097,7 @@ msgstr ""
 "Localisation : %s (jeu de caractère : %s)\n"
 "Système d'exploitation : (inconnu)"
 
-#: 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 "L'équipe de Claws Mail"
 
@@ -4240,44 +4218,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:2604
+#: src/gtk/about.c:717 src/main.c:2622
 msgid "Session statistics\n"
 msgstr "Statistiques de la session\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:2632 src/main.c:2635
 #, c-format
 msgid "Started: %s\n"
 msgstr "Démarrée le : %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2623
+#: src/gtk/about.c:737 src/main.c:2641
 msgid "Incoming traffic\n"
 msgstr "Trafic entrant\n"
 
-#: src/gtk/about.c:740 src/main.c:2626
+#: src/gtk/about.c:740 src/main.c:2644
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Messages reçus : %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2632
+#: src/gtk/about.c:747 src/main.c:2650
 msgid "Outgoing traffic\n"
 msgstr "Trafic sortant\n"
 
-#: src/gtk/about.c:750 src/main.c:2635
+#: src/gtk/about.c:750 src/main.c:2653
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nouveaux messages et redirections : %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2639
+#: src/gtk/about.c:755 src/main.c:2657
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Réponses : %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2643
+#: src/gtk/about.c:760 src/main.c:2661
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Messages transférés : %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2647
+#: src/gtk/about.c:765 src/main.c:2665
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total des messages sortants : %d\n"
@@ -4370,17 +4348,17 @@ msgstr "Vert clair"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:238
 msgid "Set mailbox order"
 msgstr "Définir l'ordre de tri des boîtes aux lettres"
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:272
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Monter ou descendre les boîtes aux lettres dans la liste pour changer "
 "l'ordre de tri dans la liste des dossiers."
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:306
 msgid "Mailboxes"
 msgstr "Boîtes aux lettres"
 
@@ -4406,16 +4384,16 @@ msgstr "Impossible d'initialiser le dictionnaire %s :"
 msgid "No misspelled word found."
 msgstr "Pas de mot incorrect."
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr "Remplacer le mot inconnu"
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Remplacer « %s » par :"
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4423,55 +4401,55 @@ msgstr ""
 "Presser la touche CTRL en même temps que [Entrée]\n"
 "permet de comprendre cette erreur.\n"
 
-#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "Autres.."
 
-#: src/gtk/gtkaspell.c:1861
+#: src/gtk/gtkaspell.c:1867
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "« %s » inconnu du dictionnaire '%s'"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
 msgstr "Accepter pour cette session seulement"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
 msgstr "Ajouter au dictionnaire personnel"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
 msgstr "Remplacer par.."
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "Check with %s"
 msgstr "Vérifier avec %s"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1938
 msgid "(no suggestions)"
 msgstr "(pas de suggestions)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2012
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Dictionnaire : %s"
 
-#: src/gtk/gtkaspell.c:2021
+#: src/gtk/gtkaspell.c:2027
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Utiliser le dictionnaire alternatif (%s)"
 
-#: src/gtk/gtkaspell.c:2032
+#: src/gtk/gtkaspell.c:2038
 msgid "Use both dictionaries"
 msgstr "Utiliser les deux dictionnaires"
 
-#: 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 "Vérifier pendant l'édition"
 
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4480,7 +4458,7 @@ msgstr ""
 "Le correcteur orthographique n'a pas pu changer le dictionnaire.\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"
@@ -4489,26 +4467,26 @@ msgstr ""
 "Le correcteur orthographique n'a pas pu changer le dictionnaire alternatif.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1939
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr "Échec : service non fourni."
 
-#: src/gtk/gtkutils.c:1942
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr "Échec : problème de connexion réseau."
 
-#: src/gtk/gtkutils.c:1945
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Échec : erreur inconnue (%d)."
 
-#: src/gtk/gtkutils.c:2015
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr "Configuration.."
 
-#: 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:440
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:448
 msgid "Date"
 msgstr "Date"
 
@@ -4516,13 +4494,13 @@ msgstr "Date"
 msgid "Date:"
 msgstr "Date:"
 
-#: 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:442
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:446
 msgid "From"
 msgstr "De"
 
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:417
 msgid "From:"
 msgstr "De:"
 
@@ -4538,14 +4516,14 @@ msgstr "Expéditeur:"
 msgid "Reply-To"
 msgstr "Répondre-à"
 
-#: 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:443
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:447
 msgid "To"
 msgstr "À"
 
-#: 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"
 
@@ -4553,8 +4531,8 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cci"
 
-#: 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 "Identifiant-du-message"
 
@@ -4566,8 +4544,8 @@ msgstr "Identifiant-du-message:"
 msgid "In-Reply-To"
 msgstr "En-réponse-à"
 
-#: 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 "Références"
 
@@ -4575,18 +4553,18 @@ msgstr "Références"
 msgid "References:"
 msgstr "Références:"
 
-#: 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:444
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:445
 msgid "Subject"
 msgstr "Sujet"
 
-#: 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:431
 msgid "Subject:"
 msgstr "Sujet:"
 
-#: 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:409
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -4598,7 +4576,7 @@ msgstr "Commentaires:"
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: 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 "Mots-clés:"
 
@@ -4674,8 +4652,8 @@ msgstr "Reçu"
 msgid "Received:"
 msgstr "Reçu:"
 
-#: 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 "Groupe-de-discussion"
 
@@ -4700,12 +4678,12 @@ msgid "Seen:"
 msgstr "Consulté:"
 
 #: 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/gtk/sslcertwindow.c:164 src/prefs_summaries.c:448
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/summaryview.c:2853
 msgid "Status"
 msgstr "État"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:1033
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr "État:"
 
@@ -5002,35 +4980,39 @@ msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr "Les icônes suivantes décrivent l'état des messages et des dossiers :"
 
-#: 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 "Saisir le mot de passe du compte %s sur le serveur %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 "Saisie du mot de passe pour %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 "Saisie du mot de passe :"
 
-#: 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 "Saisie du mot de passe"
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr "Retenir le mot de passe pour cette session"
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr "S'en souvenir"
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:453
+msgid "_Go to last error"
+msgstr "_Voir la dernière erreur"
+
+#: src/gtk/logwindow.c:460
 msgid "Clear _Log"
 msgstr "_Effacer les traces"
 
@@ -5082,13 +5064,13 @@ 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
@@ -5102,11 +5084,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:685 src/plugins/pgpcore/prefs_gpg.c:705
 #: 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:923
 msgid "Plugins"
 msgstr "Modules"
 
@@ -5116,7 +5098,7 @@ msgstr "_Charger.."
 
 #: src/gtk/pluginwindow.c:337
 msgid "_Unload"
-msgstr "Enle_ver"
+msgstr "_Enlever"
 
 #: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
 msgid "Description"
@@ -5145,16 +5127,16 @@ msgstr "Modules chargés"
 msgid "Page Index"
 msgstr "Préférences"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:842
 msgid "_Hide"
 msgstr "_Cacher"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
+#: 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_filtering_action.c:1425 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1879
+#: src/prefs_filtering_action.c:1401 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1883
 msgid "Account"
 msgstr "Compte"
 
@@ -5358,7 +5340,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:521
+#: src/gtk/quicksearch.c:537 src/summary_search.c:464
 msgid "Extended Search"
 msgstr "Recherche avancée"
 
@@ -5397,28 +5379,28 @@ msgstr "Dynamique"
 msgid "Run on select"
 msgstr "Sélection validante"
 
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:784
 msgid "Clear the current search"
 msgstr "Effacement de la recherche courante"
 
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:794 src/summary_search.c:415
 msgid "Edit search criteria"
 msgstr "Édition des critères de recherche"
 
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:803
 msgid "Information about extended symbols"
 msgstr "Informations sur la syntaxe avancée"
 
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:841 src/gtk/quicksearch.c:865
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:842 src/gtk/quicksearch.c:866
 msgid "E_dit"
 msgstr "É_dition"
 
-#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:330
+#: 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 "_Effacer"
 
@@ -5436,7 +5418,6 @@ msgid "Signer"
 msgstr "Signé par"
 
 #: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:989
 msgid "Name: "
 msgstr "Nom : "
 
@@ -5569,15 +5550,15 @@ 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: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:3501
 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:3474
-#: src/summaryview.c:3477
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3513
+#: src/summaryview.c:3516
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -5585,9 +5566,9 @@ msgstr "(Pas de sujet)"
 msgid "Error:"
 msgstr "Erreur : "
 
-#: src/image_viewer.c:299 src/mimeview.c:2611
+#: src/image_viewer.c:299 src/mimeview.c:2610
 #: 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 "Nom du fichier :"
 
@@ -5872,16 +5853,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:3656 src/imap.c:4315 src/imap.c:4409
-#: src/imap.c:4587 src/imap.c:5398
+#: src/imap.c:1039 src/imap.c:3664 src/imap.c:4323 src/imap.c:4417
+#: src/imap.c:4595 src/imap.c:5406
 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:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1148 src/inc.c:812 src/news.c:388 src/send_message.c:282
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1149 src/inc.c:813 src/news.c:389 src/send_message.c:283
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5895,7 +5876,7 @@ 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:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1155 src/inc.c:819 src/news.c:395 src/send_message.c:289
 msgid "Con_tinue connecting"
 msgstr "_Poursuivre la connexion"
 
@@ -5914,7 +5895,7 @@ msgstr "Impossible de se connecter au serveur IMAP : %s:%d"
 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:4077
+#: src/imap.c:1249 src/imap.c:4085
 msgid "Can't start STARTTLS session.\n"
 msgstr "Impossible d'initier la session STARTTLS.\n"
 
@@ -5936,63 +5917,67 @@ msgstr "Ajout des messages en cours.."
 msgid "Copying messages..."
 msgstr "Copie des messages en cours.."
 
-#: src/imap.c:2545
+#: src/imap.c:2474
+msgid "Search failed due to server error."
+msgstr "Échec de la recherche dû à un problème de serveur."
+
+#: src/imap.c:2553
 msgid "can't set deleted flags\n"
 msgstr "Impossible de marquer pour la suppression\n"
 
-#: src/imap.c:2552 src/imap.c:5028
+#: src/imap.c:2560 src/imap.c:5036
 msgid "can't expunge\n"
 msgstr "Impossible de purger\n"
 
-#: src/imap.c:2903
+#: src/imap.c:2911
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Recherche des dossiers non inscrits dans %s.."
 
-#: src/imap.c:2906
+#: src/imap.c:2914
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Recherche des sous-dossiers de %s.."
 
-#: src/imap.c:3196
+#: src/imap.c:3204
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:3211
+#: src/imap.c:3219
 msgid "can't create mailbox\n"
 msgstr "Impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:3342
+#: src/imap.c:3350
 #, 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:3455
+#: src/imap.c:3463
 msgid "can't delete mailbox\n"
 msgstr "Impossible de supprimer la boîte aux lettres.\n"
 
-#: src/imap.c:3734
+#: src/imap.c:3742
 msgid "LIST failed\n"
 msgstr "commande LIST échouée\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3827
 msgid "Flagging messages..."
 msgstr "Marquage des messages en cours.."
 
-#: src/imap.c:3922
+#: src/imap.c:3930
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s.\n"
 
-#: src/imap.c:4074
+#: src/imap.c:4082
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Le serveur nécessite STARTTLS pour s'y connecter.\n"
 
-#: src/imap.c:4084
+#: src/imap.c:4092
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossible de rafraîchir la liste des facilités IMAP.\n"
 
-#: src/imap.c:4089
+#: src/imap.c:4097
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6001,20 +5986,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:4097
+#: src/imap.c:4105
 msgid "Server logins are disabled.\n"
 msgstr "Les connexions au serveur sont désactivées.\n"
 
-#: src/imap.c:4320
+#: src/imap.c:4328
 msgid "Fetching message..."
 msgstr "Lecture du message en cours.."
 
-#: src/imap.c:5021
+#: src/imap.c:5029
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Impossible de marquer pour la suppression : %d.\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6064
 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"
@@ -6178,7 +6163,7 @@ msgstr "_Rechercher"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Choisir un sous-dossier de '%s' auquel vous voulez vous inscrire : "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:681
 msgid "Subscribe"
 msgstr "S'inscrire"
 
@@ -6212,8 +6197,8 @@ msgstr "inscrire au"
 msgid "unsubscribe"
 msgstr "désinscrire du"
 
-#: 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 "Appliquer aux sous-dossiers"
 
@@ -6221,7 +6206,7 @@ msgstr "Appliquer aux sous-dossiers"
 msgid "_Subscribe"
 msgstr "S'_inscrire"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "Supp_rimer le groupe"
 
@@ -6275,66 +6260,66 @@ msgstr "Sélectionner et renommer le champ LDIF à importer."
 msgid "File imported."
 msgstr "Fichier importé."
 
-#: 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 "Sélectionner un fichier."
 
-#: 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 "Le nom du carnet d'adresses doit être indiqué."
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr "Fichier LDIF importé avec succès."
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr "Sélection d'un fichier 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."
 msgstr ""
 "Spécifier le nom du carnet d'adresses qui sera créé à partir du fichier LDIF."
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr "Chemin du fichier"
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr "Spécification complète du fichier LDIF à importer."
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr "Sélectionner le fichier LDIF à importer."
 
-#: 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 "Champ LDIF"
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr "Nom de l'attribut"
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr "Champ LDIF"
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr "Attribut"
 
-#: 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 "
@@ -6353,37 +6338,37 @@ msgstr ""
 "également en dehors de cette colonne permet de sélectionner le champ pour "
 "l'import."
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "Le champ LDIF peut être renommé en Attribute Utilisateur (UA)"
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr "Sélectionner pour l'import"
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr "Sélectionner le champ LDIF pour l'importer dans le carnet d'adresses."
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr " Modifier "
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 "Ce bouton permet de mettre à jour la liste ci-dessus avec les données "
 "idoines."
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr "Fiches importées :"
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr "Importation d'un fichier LDIF"
 
-#: src/importldif.c:980
+#: src/importldif.c:939
 msgid "Proceed"
 msgstr "Poursuivre"
 
@@ -6415,142 +6400,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:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:187 src/inc.c:295 src/inc.c:322
 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:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s a échoué\n"
 
-#: src/inc.c:416
+#: src/inc.c:417
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:474
+#: src/inc.c:475
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:616 src/inc.c:670
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:626
+#: src/inc.c:627
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:635
+#: src/inc.c:636
 #, 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:641
+#: src/inc.c:642
 msgid "Done (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:646
+#: src/inc.c:647
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:650 src/plugins/managesieve/managesieve.c:887
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: 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:657 src/prefs_matcher.c:397 src/prefs_summaries.c:451
+#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6444
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:667 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "Délai d'attente dépassé"
 
-#: src/inc.c:752
+#: src/inc.c:753
 #, 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:756
+#: src/inc.c:757
 msgid "Finished (no new messages)"
 msgstr "Terminé (aucun nouveau message)"
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:825
+#: src/inc.c:826
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte '%s' : Connexion au serveur POP3 : %s:%d.."
 
-#: src/inc.c:843
+#: src/inc.c:844
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:848
 #, 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:927 src/plugins/managesieve/managesieve.c:423
+#: src/inc.c:928 src/plugins/managesieve/managesieve.c:423
 #: src/send_message.c:496
 msgid "Authenticating..."
 msgstr "Authentification.."
 
-#: src/inc.c:929
+#: src/inc.c:930
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Réception des messages de %s (%s).."
 
-#: src/inc.c:935
+#: src/inc.c:936
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT).."
 
-#: src/inc.c:939
+#: src/inc.c:940
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST).."
 
-#: src/inc.c:943
+#: src/inc.c:944
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL).."
 
-#: src/inc.c:947
+#: src/inc.c:948
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:955 src/send_message.c:514
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:979
+#: src/inc.c:980
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s octets)"
 
-#: src/inc.c:992
+#: src/inc.c:993
 #, 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:1151
+#: src/inc.c:1152
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1156
+#: src/inc.c:1157
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1162
+#: src/inc.c:1163
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6559,37 +6544,37 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1168
+#: src/inc.c:1169
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1173
+#: src/inc.c:1174
 msgid "Can't write file."
 msgstr "Impossible d'enregistrer le fichier."
 
-#: src/inc.c:1178
+#: src/inc.c:1179
 msgid "Socket error."
 msgstr "Erreur de « socket »."
 
-#: src/inc.c:1181
+#: src/inc.c:1182
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erreur de socket lors de la connexion vers %s:%d."
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1187 src/send_message.c:425 src/send_message.c:688
 msgid "Connection closed by the remote host."
 msgstr "Connexion fermée par l'hôte distant."
 
-#: src/inc.c:1189
+#: src/inc.c:1190
 #, 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:1194
+#: src/inc.c:1195
 msgid "Mailbox is locked."
 msgstr "Boîte aux lettres verrouillée."
 
-#: src/inc.c:1198
+#: src/inc.c:1199
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6598,11 +6583,11 @@ msgstr ""
 "La boîte aux lettres est verrouillée :\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1205 src/send_message.c:673
 msgid "Authentication failed."
 msgstr "L'authentification a échoué."
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1211 src/send_message.c:676
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6611,7 +6596,7 @@ msgstr ""
 "L'authentification a échoué\n"
 "%s"
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1216 src/send_message.c:692
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6619,37 +6604,62 @@ 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:1220
+#: src/inc.c:1221
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexion vers %s:%d a échoué."
 
-#: src/inc.c:1258
+#: src/inc.c:1259
 msgid "Incorporation cancelled\n"
 msgstr "Relève annulée\n"
 
-#: src/inc.c:1523
+#: src/inc.c:1524
 #, 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:1529
+#: src/inc.c:1530
 #, 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:1536
+#: src/inc.c:1537
 msgid "On_ly once"
 msgstr "_Seulement pour cette fois-ci"
 
-#: src/ldapupdate.c:1044
+#: 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"
+
+#: 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"
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 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"
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): succesful\n"
+msgstr "LDAP (recherche): succès\n"
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr "LDAP (recherche): %d (%s)\n"
+
 #: src/ldif.c:758
 msgid "Nick Name"
 msgstr "Surnom"
@@ -6716,15 +6726,15 @@ msgstr "La migration a échoué !"
 msgid "Migrating configuration..."
 msgstr "Migration de la configuration.."
 
-#: src/main.c:1138
+#: src/main.c:1139
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:1158 src/main.c:1162 src/main.c:1166
+#: src/main.c:1159 src/main.c:1163 src/main.c:1167
 msgid "(or older)"
 msgstr "(ou antérieure)"
 
-#: src/main.c:1483
+#: src/main.c:1502
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6743,7 +6753,7 @@ msgstr[1] ""
 "configuration des modules pour de plus amples informations :\n"
 "%s"
 
-#: src/main.c:1525
+#: src/main.c:1544
 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 "
@@ -6754,7 +6764,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:1531
+#: src/main.c:1550
 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 "
@@ -6764,36 +6774,36 @@ msgstr ""
 "est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
 "le module et essayer à nouveau."
 
-#: src/main.c:1776
+#: src/main.c:1795
 msgid "Missing filename\n"
 msgstr "Nom de fichier manquant\n"
 
-#: src/main.c:1783
+#: src/main.c:1802
 msgid "Cannot open filename for reading\n"
 msgstr "Impossible d'ouvrir le fichier en lecture\n"
 
-#: src/main.c:1794
+#: src/main.c:1813
 msgid "Malformed header\n"
 msgstr "En-tête non conforme\n"
 
-#: src/main.c:1801
+#: src/main.c:1820
 msgid "Duplicated 'To:' header\n"
 msgstr "En-tête « À: » en plusieurs exemplaires\n"
 
-#: src/main.c:1812
+#: src/main.c:1831
 msgid "Missing required 'To:' header\n"
 msgstr "L'en-tête « À: » est manquant\n"
 
-#: src/main.c:1958
+#: src/main.c:1977
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]..\n"
 
-#: src/main.c:1960
+#: src/main.c:1979
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:1961
+#: src/main.c:1980
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6813,7 +6823,7 @@ msgstr ""
 "                         jusqu'à une ligne vide, puis le corps de message "
 "jusqu'à la fin de fichier"
 
-#: src/main.c:1966
+#: src/main.c:1985
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -6821,7 +6831,7 @@ msgstr ""
 "                         de nouvelles, ou « vCalendar » , gestionnaire de\n"
 "                         rendez-vous et calendriers en ligne)"
 
-#: src/main.c:1967
+#: src/main.c:1986
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6831,7 +6841,7 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés attachés"
 
-#: src/main.c:1970
+#: src/main.c:1989
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6841,25 +6851,25 @@ msgstr ""
 "                         ouvrir une fenêtre de composition avec les\n"
 "                         fichiers spécifiés insérés"
 
-#: src/main.c:1973
+#: src/main.c:1992
 msgid "  --receive              receive new messages"
 msgstr ""
 "  --receive              récupérer les nouveaux messages (du compte courant)"
 
-#: src/main.c:1974
+#: src/main.c:1993
 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:1975
+#: src/main.c:1994
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuler la récupération des messages"
 
-#: src/main.c:1976
+#: src/main.c:1995
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuler l'envoi des messages"
 
-#: src/main.c:1977
+#: src/main.c:1996
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6879,17 +6889,17 @@ msgstr ""
 "                         récursif: aucune si l'argument commence par 0, n, "
 "N, f ou F"
 
-#: src/main.c:1984
+#: src/main.c:2003
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:1985
+#: src/main.c:2004
 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:1986
+#: src/main.c:2005
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6897,15 +6907,15 @@ msgstr ""
 "  --status-full [dossier]..\n"
 "                         afficher le nombre de messages de chaque dossier"
 
-#: src/main.c:1988
+#: src/main.c:2007
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           affiche les statistiques de la session"
 
-#: src/main.c:1989
+#: src/main.c:2008
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     réinitialise les statistiques de la session"
 
-#: src/main.c:1990
+#: src/main.c:2009
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6916,35 +6926,35 @@ msgstr ""
 "voici\n"
 "                         un exemple de syntaxe : 'dossier/sous_dossier'"
 
-#: src/main.c:1992
+#: src/main.c:2011
 msgid "  --online               switch to online mode"
 msgstr "  --online               travailler en ligne"
 
-#: src/main.c:1993
+#: src/main.c:2012
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              travailler hors-ligne"
 
-#: src/main.c:1994
+#: src/main.c:2013
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       quitter Claws Mail"
 
-#: src/main.c:1995
+#: src/main.c:2014
 msgid "  --debug                debug mode"
 msgstr "  --debug                lancer Claws Mail en mode de déboguage"
 
-#: src/main.c:1996
+#: src/main.c:2015
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         changer le mode debug"
 
-#: src/main.c:1997
+#: src/main.c:2016
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              afficher cette aide et terminer"
 
-#: src/main.c:1998
+#: src/main.c:2017
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           afficher la version et terminer"
 
-#: src/main.c:1999
+#: src/main.c:2018
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
@@ -6952,12 +6962,12 @@ msgstr ""
 "  --version-full -V      afficher la version et les informations concernant\n"
 "                         les options intégrées et terminer"
 
-#: src/main.c:2000
+#: src/main.c:2019
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 "  --config-dir           afficher le dossier contenant la configuration"
 
-#: src/main.c:2001
+#: src/main.c:2020
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
@@ -6965,7 +6975,7 @@ msgstr ""
 "  --alternate-config-dir [dir]\n"
 "                         utiliser le dossier de configuration spécifié"
 
-#: src/main.c:2003
+#: src/main.c:2022
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6973,852 +6983,852 @@ msgstr ""
 "  --geometry -geometry LxH+X+Y\n"
 "                         définir la géométrie de la fenêtre principale"
 
-#: src/main.c:2056
+#: src/main.c:2075
 msgid "Unknown option\n"
 msgstr ""
 "claws-mail: option non reconnue.\n"
 "Pour en savoir davantage, faites: « claws-mail --help ».\n"
 
-#: src/main.c:2074
+#: src/main.c:2093
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Traitement (%s).."
 
-#: src/main.c:2077
+#: src/main.c:2096
 msgid "top level folder"
 msgstr "dossier racine"
 
-#: src/main.c:2160
+#: src/main.c:2178
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:2161
+#: src/main.c:2179
 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:2908
+#: src/main.c:2926
 msgid "NetworkManager: network is online.\n"
 msgstr "Gestionnaire réseau : le réseau est activé.\n"
 
-#: src/main.c:2914
+#: src/main.c:2932
 msgid "NetworkManager: network is offline.\n"
 msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
 
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:514 src/messageview.c:208
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
+#: src/mainwindow.c:516 src/messageview.c:210 src/summaryview.c:438
 msgid "_View"
 msgstr "_Vue"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:519
 msgid "_Configuration"
 msgstr "_Configuration"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:523
 msgid "_Add mailbox"
 msgstr "_Ajouter une boîte aux lettres"
 
-#: 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 "Changer l'ordre des boîtes aux lettres.."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:530
 msgid "_Import mbox file..."
 msgstr "I_mporter un fichier mbox.."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:531
 msgid "_Export to mbox file..."
 msgstr "E_xporter vers un fichier mbox.."
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:532
 msgid "_Export selected to mbox file..."
 msgstr "_Exporter la sélection en fichier mbox.."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:534
 msgid "Empty all _Trash folders"
 msgstr "_Vider toutes les corbeilles"
 
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:537 src/messageview.c:217
 msgid "_Save email as..."
 msgstr "Enregi_strer le message sous.."
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:538 src/messageview.c:218
 msgid "_Save part as..."
 msgstr "Enregi_strer la partie sous.."
 
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:541 src/messageview.c:219
 msgid "Page setup..."
 msgstr "Mise en _page.."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:542 src/messageview.c:220
 msgid "_Print..."
 msgstr "_Imprimer.."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:544
 msgid "Synchronise folders"
 msgstr "S_ynchroniser les dossiers distants"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:546
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:551
 msgid "Select _thread"
 msgstr "Sélectionner la discussi_on"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:553
 msgid "_Find in current message..."
 msgstr "Chercher dans le _message.."
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:555
 msgid "_Quick search"
 msgstr "_Recherche rapide"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
 msgid "Show or hi_de"
 msgstr "Afficher _ou cacher"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:559
 msgid "_Toolbar"
 msgstr "Barre d'_outils"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
 msgid "Set displayed _columns"
 msgstr "Sélect_ion des éléments affichés"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:562
 msgid "In _folder list..."
 msgstr "Dans la liste des _dossiers.."
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:563
 msgid "In _message list..."
 msgstr "Dans la liste des _messages.."
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:568
 msgid "La_yout"
 msgstr "_Disposition"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:570
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:572
 msgid "_Attract by subject"
 msgstr "Attirer par s_ujet"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:574
 msgid "E_xpand all threads"
 msgstr "Déplo_yer les fils de discussion"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:575
 msgid "Co_llapse all threads"
 msgstr "Re_plier les fils de discussion"
 
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:577 src/messageview.c:231
 msgid "_Go to"
 msgstr "_Aller à"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:578 src/messageview.c:232
 msgid "_Previous message"
 msgstr "Message _précédent"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:579 src/messageview.c:233
 msgid "_Next message"
 msgstr "Message suiva_nt"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:235
 msgid "P_revious unread message"
 msgstr "Non l_u précédent"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:236
 msgid "N_ext unread message"
 msgstr "Non _lu suivant"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:238
 msgid "Previous ne_w message"
 msgstr "Message nouv_eau précédent"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:239
 msgid "Ne_xt new message"
 msgstr "Message nou_veau suivant"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:241
 msgid "Previous _marked message"
 msgstr "M_arqué précédent"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:242
 msgid "Next m_arked message"
 msgstr "_Marqué suivant"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:244
 msgid "Previous _labeled message"
 msgstr "C_olorié précédent"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:245
 msgid "Next la_beled message"
 msgstr "_Colorié suivant"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:247
 msgid "Previous opened message"
 msgstr "Message ouvert précédent"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:248
 msgid "Next opened message"
 msgstr "Message ouvert suivant"
 
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:596 src/messageview.c:250
 msgid "Parent message"
 msgstr "Message paren_t"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:598 src/messageview.c:252
 msgid "Next unread _folder"
 msgstr "Do_ssier non lu suivant"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:253
 msgid "F_older..."
 msgstr "Dossier..."
 
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:255 src/mimeview.c:200
 msgid "Next part"
 msgstr "Partie suivante"
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:256 src/mimeview.c:201
 msgid "Previous part"
 msgstr "Partie précédente"
 
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:605 src/messageview.c:257
 msgid "Message scroll"
 msgstr "Défilement du message"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:606 src/messageview.c:258
 msgid "Previous line"
 msgstr "Ligne précédente"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:607 src/messageview.c:259
 msgid "Next line"
 msgstr "Ligne suivante"
 
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:608 src/messageview.c:260 src/printing.c:479
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:609 src/messageview.c:261 src/printing.c:485
 msgid "Next page"
 msgstr "Page suivante"
 
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:627 src/messageview.c:279
 msgid "Decode"
 msgstr "Décoda_ge"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:634
 msgid "Open in new _window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:635 src/messageview.c:286
 msgid "Mess_age source"
 msgstr "Code _source du message.."
 
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:637 src/messageview.c:287
 msgid "Message part"
 msgstr "Message"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:638 src/messageview.c:288
 msgid "View as text"
 msgstr "Afficher comme du texte"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:639 src/messageview.c:289 src/toolbar.c:494
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:291
 msgid "Open with..."
 msgstr "Ouvrir avec.."
 
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:645 src/messageview.c:294
 msgid "Quotes"
 msgstr "_Citations"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:647
 msgid "_Update summary"
 msgstr "Mettre à jo_ur"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "Recei_ve"
 msgstr "Réce_ption"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:651
 msgid "Get from _current account"
 msgstr "Relever le courrier du compte _courant"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:652
 msgid "Get from _all accounts"
 msgstr "Relever le courrier de _tous les comptes"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
 msgid "Cancel receivin_g"
 msgstr "_Interrompre la relève du courrier"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:656
 msgid "_Send queued messages"
 msgstr "En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:661
 msgid "Compose a_n email message"
 msgstr "Composer un _nouveau message"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:662
 msgid "Compose a news message"
 msgstr "Composer un _article de groupe de discussion"
 
-#: src/mainwindow.c:663 src/messageview.c:300
+#: src/mainwindow.c:664 src/messageview.c:300
 #: src/plugins/notification/notification_banner.c:95
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
+#: src/mainwindow.c:665 src/messageview.c:301 src/summaryview.c:430
 msgid "Repl_y to"
 msgstr "Rép_ondre à"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:668 src/messageview.c:304
 msgid "Mailing _list"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:669
 msgid "Follow-up and reply to"
 msgstr "Donner suite _et répondre à"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:672 src/messageview.c:307 src/toolbar.c:2446
 msgid "_Forward"
 msgstr "_Transférer"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:673 src/messageview.c:308 src/toolbar.c:2447
 msgid "For_ward as attachment"
 msgstr "Transférer en _pièce jointe"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:674 src/messageview.c:309 src/toolbar.c:2448
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:676
 msgid "Mailing-_List"
 msgstr "_Liste de diffusion"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:677
 msgid "Post"
 msgstr "Écrire à la liste"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:679
 msgid "Help"
 msgstr "_Aide"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:683
 msgid "Unsubscribe"
 msgstr "Se _désinscrire"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:685
 msgid "View archive"
 msgstr "Voir l'archive"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:687
 msgid "Contact owner"
 msgstr "Contacter le _propriétaire"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:691
 msgid "M_ove..."
 msgstr "_Déplacer.."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:692
 msgid "_Copy..."
 msgstr "_Copier.."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:693
 msgid "Move to _trash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "_Delete..."
 msgstr "S_upprimer définitivement.."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "Move thread to tr_ash"
 msgstr "Déplacer ver_s la corbeille"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Delete t_hread"
 msgstr "S_upprimer la discussion"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
 msgid "Cancel a news message"
 msgstr "E_ffacer un article du serveur"
 
-#: 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 "_Marquer"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:702
 msgid "_Unmark"
 msgstr "_Démarquer"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
 msgid "Mark as rea_d"
 msgstr "Marquer comme _lu"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:706
 msgid "Mark as unr_ead"
 msgstr "Marquer comme _non lu"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:708
 msgid "Mark all read"
 msgstr "Marquer _tous comme lus"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:709
 msgid "Mark all unread"
 msgstr "Marquer _tous comme non lus"
 
-#: 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 "Ignorer du fil de discussion"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:712
 msgid "Unignore thread"
 msgstr "Inclure dans fil de discussion"
 
-#: 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 "Suivre le fil de discussion"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:714
 msgid "Unwatch thread"
 msgstr "Ne plus sui_vre le fil"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:717
 msgid "Mark as _spam"
 msgstr "Marquer comme _pourriel"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:718
 msgid "Mark as _ham"
 msgstr "Marquer comme courrier _légitime"
 
-#: 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 "Bloquer"
 
-#: 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 "Débloquer"
 
-#: src/mainwindow.c:723 src/summaryview.c:430
+#: src/mainwindow.c:724 src/summaryview.c:432
 msgid "Color la_bel"
 msgstr "C_olorier"
 
-#: src/mainwindow.c:724 src/summaryview.c:431
+#: src/mainwindow.c:725 src/summaryview.c:433
 msgid "Ta_gs"
 msgstr "La_bels"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:728
 msgid "Re-_edit"
 msgstr "Rééd_iter"
 
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:731 src/messageview.c:310 src/mimeview.c:1013
 msgid "Check signature"
 msgstr "Vérifier la signature"
 
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:736 src/messageview.c:314
 msgid "Add sender to address boo_k"
 msgstr "A_jouter l'expéditeur au carnet d'adresses"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:738
 msgid "C_ollect addresses"
 msgstr "Récupération des adresses"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:739
 msgid "From current _folder..."
 msgstr "À partir du dossier actuel.."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:740
 msgid "From selected _messages..."
 msgstr "À partir des _messages sélectionnés.."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:743
 msgid "_Filter all messages in folder"
 msgstr "_Filtrer tous les messages du dossier"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:744
 msgid "Filter _selected messages"
 msgstr "Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:745
 msgid "Run folder pr_ocessing rules"
 msgstr "Exéc_uter les règles de traitement du dossier courant"
 
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:747 src/messageview.c:317
 msgid "_Create filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:318
 #: src/messageview.c:324
 msgid "_Automatically"
 msgstr "_Automatiquement"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
 #: src/messageview.c:319 src/messageview.c:325
 msgid "By _From"
 msgstr "Par « De: »"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
 #: src/messageview.c:320 src/messageview.c:326
 msgid "By _To"
 msgstr "Par « À: »"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:321
 #: src/messageview.c:327
 msgid "By _Subject"
 msgstr "Par _Sujet"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
+#: src/mainwindow.c:753 src/messageview.c:323 src/summaryview.c:436
 msgid "Create processing rule"
 msgstr "Créer une règle de traite_ment"
 
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:760 src/messageview.c:330
 msgid "List _URLs..."
 msgstr "_Liste d'URLs.."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:767
 msgid "Ch_eck for new messages in all folders"
 msgstr "Recherche de _nouveaux messages dans tous les dossiers"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:768
 msgid "Delete du_plicated messages"
 msgstr "Supprimer les messages en _double"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:769
 msgid "In selected folder"
 msgstr "Dans le dossier sélectionné"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:770
 msgid "In all folders"
 msgstr "Dans tous les dossiers"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:773
 msgid "E_xecute"
 msgstr "E_xécuter"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:774
 msgid "Exp_unge"
 msgstr "P_urger"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:777
 msgid "SSL/TLS cer_tificates"
 msgstr "C_ertificats SSL/TLS"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:780
 msgid "Filtering Lo_g"
 msgstr "Traces de _filtrage"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:781
 msgid "Network _Log"
 msgstr "Traces _réseau"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "_Forget all session passwords"
 msgstr "Oublier tous mots de passe des sessions"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:785
 msgid "Forget _master passphrase"
 msgstr "Oublier la phrase secrète principale"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "C_hange current account"
 msgstr "_Sélectionner un autre compte"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:791
 msgid "_Preferences for current account..."
 msgstr "_Configuration du compte courant.."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:792
 msgid "Create _new account..."
 msgstr "Création d'un _nouveau compte.."
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:793
 msgid "_Edit accounts..."
 msgstr "Édition des _comptes.."
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:796
 msgid "P_references..."
 msgstr "_Préférences.."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:797
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-traitement.."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
 msgid "Post-pro_cessing..."
 msgstr "P_ost-traitement.."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:799
 msgid "_Filtering..."
 msgstr "_Filtrage des messages.."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:800
 msgid "_Templates..."
 msgstr "_Modèles.."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:801
 msgid "_Actions..."
 msgstr "_Actions.."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:802
 msgid "Tag_s..."
 msgstr "_Labels.."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
 msgid "Plu_gins..."
 msgstr "Mo_dules.."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:807
 msgid "_Manual"
 msgstr "_Manuel"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ en ligne autogérée"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:809
 msgid "Icon _Legend"
 msgstr "_Légende des icônes"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "Set as default client"
 msgstr "Définir comme client par défaut"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:818
 msgid "Offline _mode"
 msgstr "_Travailler hors-ligne"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:819
 msgid "Men_ubar"
 msgstr "Barre de Men_u"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:820
 msgid "_Message view"
 msgstr "Vue du _message"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:822
 msgid "Status _bar"
 msgstr "_Barre d'état"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:824
 msgid "Column headers"
 msgstr "_En-tête de colonnes"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:825
 msgid "Th_read view"
 msgstr "Vue par _fil de discussion"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:826
 msgid "Hide read threads"
 msgstr "Cacher les fils lus"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:827
 msgid "_Hide read messages"
 msgstr "Cacher les messages _lus"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:828
 msgid "Hide deleted messages"
 msgstr "Cacher les messages supprimés"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:829
 msgid "_Fullscreen"
 msgstr "Plei_n écran"
 
-#: src/mainwindow.c:829 src/messageview.c:342
+#: src/mainwindow.c:830 src/messageview.c:342
 msgid "Show all _headers"
 msgstr "Tous les _en-têtes"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:831 src/messageview.c:343
 msgid "_Collapse all"
 msgstr "Re_plier tout"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:832 src/messageview.c:344
 msgid "Collapse from level _2"
 msgstr "Replier à partir du niveau _2"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:833 src/messageview.c:345
 msgid "Collapse from level _3"
 msgstr "Replier à partir du niveau _3"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:837
 msgid "Text _below icons"
 msgstr "Texte _sous les icônes"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:838
 msgid "Text be_side icons"
 msgstr "Texte _contre les icônes"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:839
 msgid "_Icons only"
 msgstr "_Icônes seules"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:840
 msgid "_Text only"
 msgstr "_Texte seul"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:847
 msgid "_Standard"
 msgstr "_Classique"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:848
 msgid "_Three columns"
 msgstr "_Trois colonnes"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
 msgid "_Wide message"
 msgstr "Vue des _messages étendue"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:850
 msgid "W_ide message list"
 msgstr "_Liste des messages étendue"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:851
 msgid "S_mall screen"
 msgstr "_Petit écran"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:855
 msgid "By _number"
 msgstr "Par _numéro"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:856
 msgid "By s_ize"
 msgstr "Par taille"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:857
 msgid "By _date"
 msgstr "Par da_te"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:858
 msgid "By thread date"
 msgstr "Par date du _fil"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
 msgid "By s_ubject"
 msgstr "Par s_ujet"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
 msgid "By _color label"
 msgstr "Par _couleur"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
 msgid "By tag"
 msgstr "Par _label"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:864
 msgid "By _mark"
 msgstr "Par _marque"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:865
 msgid "By _status"
 msgstr "Par ét_at"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:866
 msgid "By a_ttachment"
 msgstr "Par _pièce jointe"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
 msgid "By score"
 msgstr "Par sc_ore"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
 msgid "By locked"
 msgstr "Par _verrouillés"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
 msgid "D_on't sort"
 msgstr "Ne pas tr_ier"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:462
+#: src/mainwindow.c:873 src/prefs_summaries.c:460
 msgid "Ascending"
 msgstr "Ascendant"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:463
+#: src/mainwindow.c:874 src/prefs_summaries.c:461
 msgid "Descending"
 msgstr "Descendant"
 
-#: src/mainwindow.c:915 src/messageview.c:387
+#: src/mainwindow.c:916 src/messageview.c:387
 msgid "_Auto detect"
 msgstr "Détection _automatique"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6287
+#: src/mainwindow.c:1294 src/summaryview.c:6370
 msgid "Apply tags..."
 msgstr "Appliquer des labels.."
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1942
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Une ou plusieurs erreurs sont survenues. Cliquer ici pour voir les traces."
 
-#: src/mainwindow.c:1973
+#: src/mainwindow.c:1957
 msgid "You are online. Click the icon to go offline"
 msgstr "Vous êtes en ligne. Cliquer sur l'icône pour aller hors-ligne."
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1960
 msgid "You are offline. Click the icon to go online"
 msgstr "Vous êtes hors-ligne. Cliquer sur l'icône pour aller en ligne."
 
-#: src/mainwindow.c:1990
+#: src/mainwindow.c:1974
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: src/mainwindow.c:2017 src/prefs_logging.c:136
+#: src/mainwindow.c:2001 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Traces réseau"
 
-#: src/mainwindow.c:2021
+#: src/mainwindow.c:2005
 msgid "Filtering/Processing debug log"
 msgstr "Traces de débogage du filtrage/traitement"
 
-#: src/mainwindow.c:2040 src/prefs_logging.c:378
+#: src/mainwindow.c:2024 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "Le traçage du filtrage est activé.\n"
 
-#: src/mainwindow.c:2042 src/prefs_logging.c:380
+#: src/mainwindow.c:2026 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "Le traçage du filtrage est désactivé.\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:2462 src/mainwindow.c:2469 src/mainwindow.c:2512
+#: src/mainwindow.c:2545 src/mainwindow.c:2577 src/mainwindow.c:2622
 #: 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 "Sans titre"
 
-#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2623 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "rien"
 
-#: src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/mainwindow.c:2880 src/mainwindow.c:2885
 msgid "Delete all messages in trash folders?"
 msgstr ""
 "Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2881
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:2934
+#: src/mainwindow.c:2913
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
@@ -7827,18 +7837,18 @@ msgstr ""
 "Saisir le chemin vers la boîte aux lettres :\n"
 "Si elle existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2919 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres '%s' existe déjà."
 
-#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2929 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 "
@@ -7848,55 +7858,55 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:3419
+#: src/mainwindow.c:3410
 msgid "No posting allowed"
 msgstr "Envoi de message non autorisé"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:3993
 msgid "Mbox import has failed."
 msgstr "L'importation mbox a échoué."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4002 src/mainwindow.c:4011
 msgid "Export to mbox has failed."
 msgstr "L'exportation mbox a échoué."
 
-#: 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 "Quitter"
 
-#: 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 "Voulez-vous vraiment quitter Claws Mail ?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4243
 msgid "Folder synchronisation"
 msgstr "Synchronisation de dossiers distants"
 
-#: src/mainwindow.c:4253
+#: src/mainwindow.c:4244
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
 
-#: src/mainwindow.c:4254
+#: src/mainwindow.c:4245
 msgid "_Synchronise"
 msgstr "_Synchroniser"
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double.."
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4703
 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:4718
+#: src/mainwindow.c:4709
 #, 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:4722
+#: src/mainwindow.c:4713
 #, 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"
@@ -7905,61 +7915,61 @@ msgstr[0] ""
 msgstr[1] ""
 "%d messages en double marqués pour suppression dans le dossier sélectionné.\n"
 
-#: src/mainwindow.c:4760
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suppression des messages en double dans tous les dossiers.."
 
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4757
 #, 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:4771
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Aucune message en double trouvé dans %d dossiers.\n"
 
-#: src/mainwindow.c:4933 src/messageview.c:2657
+#: src/mainwindow.c:4924 src/messageview.c:2657
 msgid "Select folder to go to"
 msgstr "Sélection du dossier à atteindre"
 
-#: src/mainwindow.c:5034 src/summaryview.c:5778
+#: src/mainwindow.c:5025 src/summaryview.c:5861
 msgid "Processing rules to apply before folder rules"
 msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
 
-#: src/mainwindow.c:5042
+#: src/mainwindow.c:5033
 msgid "Processing rules to apply after folder rules"
 msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
 
-#: src/mainwindow.c:5050 src/summaryview.c:5789
+#: src/mainwindow.c:5041 src/summaryview.c:5872
 msgid "Filtering configuration"
 msgstr "Règles de filtrage"
 
-#: src/mainwindow.c:5165
+#: src/mainwindow.c:5156
 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:5224
+#: src/mainwindow.c:5215
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail est maintenant le client par défaut."
 
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5217
 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:5240 src/setup.c:91
+#: src/mainwindow.c:5231 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Analyse du dossier %s%c%s.."
 
-#: src/mainwindow.c:5384
+#: src/mainwindow.c:5375
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7989,7 +7999,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: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:457
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
@@ -8039,7 +8049,7 @@ 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:1864 src/mimeview.c:1843
+#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1842
 #: src/prefs_themes.c:598 src/textview.c:3095
 msgid "Overwrite"
 msgstr "Écraser"
@@ -8065,23 +8075,23 @@ msgstr "Chercher dans le message"
 msgid "Find text:"
 msgstr "Chercher :"
 
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:306 src/summary_search.c:781
 msgid "Search failed"
 msgstr "Recherche échouée"
 
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:307 src/summary_search.c:782
 msgid "Search string not found."
 msgstr "Texte recherché introuvable."
 
-#: src/message_search.c:338
+#: src/message_search.c:316
 msgid "Beginning of message reached; continue from end?"
 msgstr "Début de message atteint, reprendre depuis la fin ?"
 
-#: src/message_search.c:341
+#: src/message_search.c:319
 msgid "End of message reached; continue from beginning?"
 msgstr "Fin de message atteint, reprendre depuis le début ?"
 
-#: src/message_search.c:344 src/summary_search.c:850
+#: src/message_search.c:322 src/summary_search.c:793
 msgid "Search finished"
 msgstr "Recherche terminée"
 
@@ -8145,9 +8155,9 @@ 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: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:1856 src/messageview.c:1859 src/mimeview.c:2047
+#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4964
+#: src/summaryview.c:4967 src/textview.c:3083
 msgid "Save as"
 msgstr "Enregistrer sous"
 
@@ -8155,8 +8165,8 @@ msgstr "Enregistrer sous"
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
-#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
-#: src/summaryview.c:4920
+#: src/messageview.c:1873 src/summaryview.c:4984 src/summaryview.c:4987
+#: src/summaryview.c:5002
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -8255,7 +8265,7 @@ msgstr ""
 "Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
 "de réception :"
 
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
+#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:484
 msgid "_Cancel"
 msgstr "A_nnuler"
 
@@ -8291,8 +8301,8 @@ msgstr ""
 "\n"
 " Le message a été supprimé ou déplacé vers un autre dossier"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
-#: src/summaryview.c:7054
+#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4362
+#: src/summaryview.c:7137
 msgid "An error happened while learning.\n"
 msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
 
@@ -8361,32 +8371,32 @@ msgstr "_Enregistrer tout sous.."
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1018 src/mimeview.c:1023 src/mimeview.c:1028
+#: src/mimeview.c:1033
 msgid "View full information"
 msgstr "Voir l'ensemble des informations"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1039
 msgid "Check again"
 msgstr "Vérifier à nouveau"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1051
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Cliquer sur l'icône pour la vérifier."
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1053
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Cliquer sur l'icône ou presser la touche '%s' pour la vérifier."
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1063
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône pour essayer à nouveau."
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1065
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8394,27 +8404,27 @@ msgstr ""
 "Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
 "l'icône ou appuyer sur '%s' pour essayer à nouveau."
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1305
 msgid "Checking signature..."
 msgstr "Vérification de la signature en cours.."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1346
 msgid "Go back to email"
 msgstr "Revenir à l'email"
 
-#: 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:1760 src/mimeview.c:1852 src/mimeview.c:2094
+#: src/mimeview.c:2130 src/mimeview.c:2242 src/plugins/fancy/fancy_viewer.c:447
 #, c-format
 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:1840 src/textview.c:3093
+#: src/mimeview.c:1839 src/textview.c:3093
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Écraser le fichier existant « %s » ?"
 
-#: src/mimeview.c:1864
+#: src/mimeview.c:1863
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8423,54 +8433,54 @@ msgstr ""
 "Une erreur est survenue lors de l'enregistrement de la partie #%d du "
 "message. Voulez-vous annuler l'opération, ou ignorer l'erreur et continuer ?"
 
-#: src/mimeview.c:1867
+#: src/mimeview.c:1866
 msgid "Error saving all message parts"
 msgstr "Erreur lors de l'enregistrement des parties du message"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1867
 msgid "Skip"
 msgstr "Ignorer"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1867
 msgid "Skip all"
 msgstr "Tout ignorer"
 
-#: src/mimeview.c:1878
+#: src/mimeview.c:1877
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fichier enregistré avec succès."
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1886
+#: src/mimeview.c:1885
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fichier enregistré avec succès"
 msgstr[1] "%d fichiers enregistrés avec succès."
 
-#: src/mimeview.c:1891
+#: src/mimeview.c:1890
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fichier en échec."
 msgstr[1] "%s, %d fichiers en échec."
 
-#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1300
+#: src/mimeview.c:1923 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1280
 msgid "Select destination folder"
 msgstr "Sélection du dossier de destination"
 
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1930 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "« %s » n'est pas un dossier."
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
+#: src/mimeview.c:2177 src/mimeview.c:2184 src/textview.c:3010
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3011
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8479,7 +8489,7 @@ msgstr ""
 "Sisir la ligne de commande pour ouvrir le fichier :\n"
 "('%s' sera remplacé par le chemin du fichier)"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2280
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8490,11 +8500,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2289
+#: src/mimeview.c:2288
 msgid "Execute untrusted binary?"
 msgstr "Exécuter un binaire inconnu ?"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2289
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -8507,22 +8517,22 @@ msgstr ""
 "\n"
 "Voulez-vous exécuter ce binaire ?"
 
-#: src/mimeview.c:2294
+#: src/mimeview.c:2293
 msgid "Run binary"
 msgstr "Exécuter le binaire"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2595 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "Type :"
 
-#: 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:2596 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:701 src/summaryview.c:2743
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
+#: src/mimeview.c:2610 src/plugins/vcalendar/vcalendar.c:1253
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
 msgid "Description:"
 msgstr "Description :"
 
@@ -8676,11 +8686,11 @@ msgstr "Nouvelle phrase secrète :"
 msgid "Confirm passphrase:"
 msgstr "Confirmer la phrase secrète :"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:52
 msgid "Acpi Notifier"
 msgstr "Agent de notification 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/"
@@ -8689,7 +8699,7 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante :\n"
 " 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/"
@@ -8698,19 +8708,19 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante : \n"
 " 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 "Vérifiez que le module 'asus_laptop' est chargé."
 
-#: 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 "Vérifiez que le module 'asus_acpi' est chargé."
 
-#: 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 "Vérifiez que le module 'ibm_acpi' est chargé."
 
-#: 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/"
@@ -8719,80 +8729,80 @@ msgstr ""
 "Vous pouvez le trouver à l'adresse suivante :\n"
 " 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 "Le fichier de contrôle n'existe pas."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:306
 msgid " : no new or unread mail"
 msgstr " : pas de messages nouveaux ou non lus"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : unread mail"
 msgstr " : messages non lus"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : new mail"
 msgstr " : nouveaux messages"
 
-#: 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 "éteinte"
 
-#: 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 "clignotante"
 
-#: 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 "allumée"
 
-#: 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 "DEL "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:387
 msgid "ACPI type: "
 msgstr "Type ACPI : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:396
 msgid "ACPI file: "
 msgstr "Fichier ACPI : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:407
 msgid "values - On: "
 msgstr "valeurs - Allumé : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:412
 msgid " - Off: "
 msgstr " - Éteint : "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: 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"
 
-#: 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 ""
 "Ce module gère différentes DELs de notification de messages sur certains "
 "portables avec ACPI."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:889
 msgid "Laptop LED"
 msgstr "DEL portable"
 
 #: 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 ""
 "Impossible d'enregistrer le connecteur 'check before send' dans le module "
@@ -8822,11 +8832,11 @@ msgid "Address book path where addresses are kept"
 msgstr "Dossier du carnet d'adresses où conserver les adresses"
 
 #: 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 "Sélectionner.."
 
@@ -8912,15 +8922,15 @@ msgstr "Archivage"
 msgid "Archiving"
 msgstr "Archivage"
 
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:126
 msgid "Press Cancel button to stop archiving"
 msgstr "Cliquer le bouton Annuler pour interrompre l'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:142
 msgid "Archiving:"
 msgstr "Archivage :"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:526
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8930,7 +8940,7 @@ msgstr ""
 "Des paramètres ne sont pas définis et empêchent dedémarrer l'archivage :\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"
@@ -8938,7 +8948,7 @@ msgstr ""
 "\n"
 "- le nom du dossier à archiver n'est pas défini"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8946,37 +8956,37 @@ msgstr ""
 "\n"
 "- le nom de l'archive à créer n'est pas défini"
 
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:553
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s : Existe déjà. Continuer ?"
 
-#: 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 : est un lien. Impossible de continuer"
 
-#: 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 : est un répertoire. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:562
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s : Pas de permissions. Impossible de continuer"
 
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:565
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s : Erreur inconnue. Impossible de continuer"
 
-#: 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 "Création de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:586
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8985,7 +8995,7 @@ msgstr ""
 "Nom de fichier invalide :\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"
@@ -8994,7 +9004,7 @@ msgstr ""
 "Ce n'est pas un dossier Claws Mail valide :\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"
@@ -9009,7 +9019,7 @@ msgstr ""
 "\n"
 "Continuer ?"
 
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:632
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -9018,178 +9028,178 @@ msgstr ""
 "Erreur lors de la création de l'archive :\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:745
 msgid "Archive result"
 msgstr "Rapport d'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:775
 msgid "Values"
 msgstr "Valeurs"
 
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:785
 msgid "Archive"
 msgstr "Archive"
 
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:791
 msgid "Archive format"
 msgstr "Format d'archive"
 
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:798
 msgid "Compression method"
 msgstr "Méthode de compression"
 
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:806
 msgid "Number of files"
 msgstr "Nombre de fichiers"
 
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:814
 msgid "Archive Size"
 msgstr "Taille de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:822
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:831
 msgid "Compression level"
 msgstr "Taux de compression"
 
-#: 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 "Oui"
 
-#: 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/prefs_summaries.c:380
+#: 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:378
 msgid "No"
 msgstr "Non"
 
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:839
 msgid "MD5 checksum"
 msgstr "Somme de contrôle MD5"
 
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:847
 msgid "Descriptive names"
 msgstr "Noms longs"
 
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:855
 msgid "Delete selected files"
 msgstr "Supprimer les fichiers sélectionnés"
 
-#: 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 "Sélectionner les emails avant"
 
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:920
 msgid "Select folder to archive"
 msgstr "Sélection du dossier à archiver"
 
-#: 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 ""
 "Nom du fichier archive (il est recommandé d'utiliser\n"
 "un suffixe en rapport avec le format de l'archive, par\n"
 "exemple .tgz)"
 
-#: src/plugins/archive/archiver_gtk.c:986
+#: src/plugins/archive/archiver_gtk.c:989
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld sur %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1042
 msgid "Create Archive"
 msgstr "Créer une archive"
 
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1057
 msgid "Enter Archiver arguments"
 msgstr "Paramètres d'archivage"
 
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1071
 msgid "Folder to archive"
 msgstr "Dossier à archiver"
 
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1078
 msgid "Folder which is the root of the archive"
 msgstr "Dossier racine de l'archive"
 
-#: 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 "Cliquer ce bouton pour sélectionner un dossier à archiver"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1089
 msgid "Name for archive"
 msgstr "Nom de l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1095
 msgid "Archive location and name"
 msgstr "Chemin et nom de l'archive"
 
-#: 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:506
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: 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 ""
 "Cliquer ce bouton pour sélectionner un chemin et un nom de fichier pour "
 "l'archive à créer"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1102
 msgid "Choose compression"
 msgstr "Choix de la compression"
 
-#: 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 "Choisir cette option pour compresser l'archive avec %s"
 
-#: src/plugins/archive/archiver_gtk.c:1226
+#: src/plugins/archive/archiver_gtk.c:1231
 msgid "Choose format"
 msgstr "Choix du format"
 
-#: 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 "Choisir cette option pour créer une archive au format %s"
 
-#: src/plugins/archive/archiver_gtk.c:1276
+#: src/plugins/archive/archiver_gtk.c:1281
 msgid "Miscellaneous options"
 msgstr "Autres options"
 
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1290
 msgid "_Recursive"
 msgstr "_Récursif"
 
-#: 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 "Inclure les sous-dossiers dans l'archive"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1296
 msgid "_MD5sum"
 msgstr "Somme de contrôle _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"
@@ -9199,11 +9209,11 @@ msgstr ""
 "Attention, activer cette option augmentera le temps nécessaire à la création "
 "de l'archive."
 
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1304
 msgid "R_ename"
 msgstr "R_enommer"
 
-#: 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"
@@ -9214,7 +9224,7 @@ msgstr ""
 "Les noms longs sont de la forme date_de@à@sujet.\n"
 "Les noms seront tronqués s'ils dépassent 96 caractères"
 
-#: 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"
@@ -9222,11 +9232,11 @@ msgstr ""
 "Choisir cette option pour effacer les emails après archivage\n"
 "(IMAP4, Mbox et POP3)"
 
-#: src/plugins/archive/archiver_gtk.c:1315
+#: src/plugins/archive/archiver_gtk.c:1320
 msgid "Selection options"
 msgstr "Options de sélection"
 
-#: 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]"
@@ -9300,7 +9310,7 @@ msgstr ""
 "de l'archive."
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:765
+#: src/plugins/managesieve/sieve_manager.c:769
 msgid "Rename"
 msgstr "Renommer"
 
@@ -9313,20 +9323,20 @@ msgid "Remove attachments"
 msgstr "Supprimer les pièces jointes"
 
 #: 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 "Supprimer"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2807
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:449
+#: src/prefs_summary_column.c:79 src/summaryview.c:2837
 msgid "Attachment"
 msgstr "Pièces jointes"
 
-#: src/plugins/att_remover/att_remover.c:422
+#: src/plugins/att_remover/att_remover.c:424
 msgid "Destroy attachments"
 msgstr "Détruire les pièces jointes"
 
-#: 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"
@@ -9337,20 +9347,35 @@ msgstr ""
 "\n"
 "Les données supprimées seront irrécupérables."
 
-#: 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 "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 de %d des %d messages sélectionnés."
+
+#: src/plugins/att_remover/att_remover.c:474
+#, 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."
+
+#: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
 msgstr "Ce message n'a pas de pièces jointes."
 
-#: src/plugins/att_remover/att_remover.c:499
+#: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
 msgstr "Supprimer les pièces jointes.."
 
-#: 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 "AttRemover"
 
-#: 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"
@@ -9362,11 +9387,11 @@ msgstr ""
 "Attention : cette opération est définitive et les pièces jointes supprimées "
 "seront définitivement perdues."
 
-#: src/plugins/att_remover/att_remover.c:600
+#: src/plugins/att_remover/att_remover.c:617
 msgid "Attachment handling"
 msgstr "Gestion des pièces jointes"
 
-#: 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 "
@@ -9379,17 +9404,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
 msgstr "Pièces jointes - avertissement"
 
-#: 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 "Attach warner"
 
-#: 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."
@@ -9441,7 +9466,7 @@ msgstr ""
 "Les expressions régulières ci-dessus ne seront pas vérifiées dans les "
 "messages transférés ainsi que dans les redirections"
 
-#: 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 "Signature"
 
@@ -9466,10 +9491,27 @@ msgid "Attach Warner"
 msgstr "Attach Warner"
 
 #: 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 "Quelconque"
+
 #: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter : recupération du corps des messages.."
@@ -9558,71 +9600,71 @@ msgstr ""
 "Préférences/Modules/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 "Analyse anti-SPAMs"
 
 #: 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 "Apprentissage de SPAMs"
 
 #: 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 "Analyse des messages à la réception"
 
 #: 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 "Taille maximale de message"
 
 #: 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 "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:370 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1544
 msgid "KB"
 msgstr "ko"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr "Suppression du pourriel"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
 msgstr "Enregistrer le pourriel dans.."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr "Marquer comme pourriel seulement"
 
-#: 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 ""
 "Dossier de stockage du pourriel. Laisser le champ vide pour utiliser la "
 "corbeille."
 
-#: 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 "Sélectionner un dossier de stockage pour le pourriel"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr "En cas de doute du statut de pourriel, déplacer vers"
 
-#: 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."
@@ -9630,29 +9672,29 @@ msgstr ""
 "Dossier de stockage des messages dont le statut de pourriel est INCERTAIN. "
 "Laisser le champ vide pour utiliser le dossier de réception."
 
-#: 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 ""
 "Utiliser ce bouton pour sélectionner un dossier de stockage des messages "
 "dont le statut de pourriel est INCERTAIN."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr "Insérer l'en-tête 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 "Concerne uniquement les messages de dossiers 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 "Liste blanche si Exp. présent dans le carnet"
 
-#: 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"
@@ -9660,21 +9702,21 @@ msgstr ""
 "Les messages provenant de contacts présents dans votre carnet d'adresses "
 "seront reçus dans un dossier normal même s'ils sont détectés comme pourriels."
 
-#: 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 ""
 "Utiliser ce bouton pour sélectionner un carnet ou dossier de votre carnet "
 "d'adresses."
 
-#: 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 ""
 "Faire apprendre les messages provenant de liste blanche comme légitimes"
 
-#: 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."
@@ -9683,17 +9725,17 @@ msgstr ""
 "fait partie de la liste blanche, le faire apprendre comme un courriel "
 "légitime."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr "Programme Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr "Chemin vers l'exécutable 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 "Marquer le pourriel comme lu"
 
@@ -9768,7 +9810,7 @@ msgstr ""
 "Préférences/Modules/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 "Enregistrer le pourriel dans"
 
@@ -9789,7 +9831,7 @@ msgid "Path to bsfilter executable"
 msgstr "Chemin complet vers l'exécutable 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 "Clam AntiVirus"
 
@@ -9910,56 +9952,56 @@ msgstr "Détection de virus"
 msgid "Select folder to store infected messages in"
 msgstr "Sélection du dossier où enregistrer les messages infectés"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:250
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr "Activer l'analyse virale"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
 msgstr "Taille maximale des pièces jointes"
 
-#: 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 "Taille maximale des pièces jointes pour l'analyse virale"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "Mo"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr "Enregistrer les messages infectés dans"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr "Conserver les messages infectés"
 
-#: 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 ""
 "Dossier de stockage des messages infectés. Laisser le champ vide pour "
 "utiliser la corbeille"
 
-#: 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 ""
 "Cliquer ce bouton pour sélectionner un dossier où conserver les messages "
 "infectés"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr "Configuration automatique"
 
-#: 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 "Configuration automatique ou manuelle"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr "Où 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"
@@ -9967,35 +10009,35 @@ msgstr ""
 "Chemin complet vers clamd.conf. Si cette valeur est pas renseignée, alors le "
 "module a pu trouver le fichier automatiquement"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr "Sélectionner"
 
-#: 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 "Cliquer ce bouton pour sélectionner le chemin d'accès à 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 "Vérifier les permissions des dossier et les ajuster si nécessaire"
 
-#: 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 "Cliquer ce bouton pour vérifier et ajuster les permissions du dossier"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr "Hôte distant"
 
-#: 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 "Nom d'hôte ou IP du serveur distant où le démon clamav tourne"
 
-#: 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 "Numéro de port sur lequel le démon clamav est en écoute"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -10005,7 +10047,7 @@ msgstr ""
 "Impossible d'obtenir des informations sur un quelconque socket.\n"
 "Antivirus désactivé."
 
-#: 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"
@@ -10037,26 +10079,26 @@ msgstr ""
 msgid "Could not create socket"
 msgstr "Impossible de créer la « socket »"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:441
 msgid ": File does not exist"
 msgstr " : Fichier inexistant"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:454
 msgid ": Unable to open"
 msgstr " : Impossible d'ouvrir le fichier"
 
-#: 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 "Erreur d'écriture sur la « socket »"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:485
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s : Erreur de lecture"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:499
 msgid "Socket read error"
 msgstr "Erreur de lecture sur la « socket »"
 
@@ -10171,9 +10213,9 @@ 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:209 src/plugins/rssyl/rssyl_prefs.c:186
+#: 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_customheader.c:236
+#: src/prefs_customheader.c:234
 msgid "Bro_wse"
 msgstr "Pa_rcourir"
 
@@ -10181,93 +10223,93 @@ msgstr "Pa_rcourir"
 msgid "Select stylesheet"
 msgstr "Choix de la feuille de style"
 
-#: src/plugins/fancy/fancy_viewer.c:418
+#: src/plugins/fancy/fancy_viewer.c:416
 msgid "Remote content loading is disabled."
 msgstr "Le chargement de données distantes est désactivé."
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:495
 msgid "Load images"
 msgstr "Charger les images"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:497
 msgid "Enable remote content"
 msgstr "Activer le chargement du contenu distant"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Enable Javascript"
 msgstr "Activer JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable Plugins"
 msgstr "Activer les modules"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Java"
 msgstr "Activer Java"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Open links with external browser"
 msgstr "Ouvrir les liens avec le navigateur externe"
 
-#: src/plugins/fancy/fancy_viewer.c:689
+#: src/plugins/fancy/fancy_viewer.c:687
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Une erreur s'est produite : %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 est un flux invalide ou non supporté"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:754
 msgid "Search the Web"
 msgstr "Chercher sur le Web"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr "Ouvrir ici"
 
-#: src/plugins/fancy/fancy_viewer.c:770
+#: src/plugins/fancy/fancy_viewer.c:768
 msgid "Open in Viewer (enable remote content)"
 msgstr "Ouvrir ici (activer le contenu distant)"
 
-#: src/plugins/fancy/fancy_viewer.c:779
+#: src/plugins/fancy/fancy_viewer.c:777
 msgid "Open in Browser"
 msgstr "Ouvrir avec le navigateur"
 
-#: src/plugins/fancy/fancy_viewer.c:789
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Open Image"
 msgstr "Ouvrir l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:796
 msgid "Copy Link"
 msgstr "Copier le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:802
+#: src/plugins/fancy/fancy_viewer.c:800
 msgid "Download Link"
 msgstr "Télécharger le lien"
 
-#: src/plugins/fancy/fancy_viewer.c:813
+#: src/plugins/fancy/fancy_viewer.c:811
 msgid "Save Image As"
 msgstr "Enregistrer l'image sous"
 
-#: src/plugins/fancy/fancy_viewer.c:823
+#: src/plugins/fancy/fancy_viewer.c:821
 msgid "Copy Image"
 msgstr "Copier l'image"
 
-#: src/plugins/fancy/fancy_viewer.c:841
+#: src/plugins/fancy/fancy_viewer.c:839
 msgid "Import feed"
 msgstr "Importer le flux"
 
-#: 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 "Fancy - rendu HTML"
 
-#: 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"
@@ -10498,7 +10540,7 @@ msgid "Authentication"
 msgstr "Authentification"
 
 #: 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 "Utilisateur :"
 
@@ -10682,7 +10724,7 @@ 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:336 src/prefs_receive.c:177
+#: src/prefs_matcher.c:335 src/prefs_receive.c:178
 msgid "hours"
 msgstr "heure(s)"
 
@@ -10770,7 +10812,7 @@ msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "Request timeout"
-msgstr "Délai d'expiration de requête"
+msgstr "Délai d'attente de requête"
 
 #: src/plugins/libravatar/libravatar_prefs.c:410
 msgid "second(s)"
@@ -10884,12 +10926,12 @@ msgstr "Méthode d'authentification non disponible"
 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:5676
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5758
 msgid "_Filter"
 msgstr "_Filtrer"
 
 #: 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 "Vérifier la syntaxe"
 
@@ -10898,7 +10940,7 @@ msgid "Re_vert"
 msgstr "Rétablir"
 
 #: 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 "Impossible d'obtenir le contenu du script"
@@ -10932,24 +10974,24 @@ msgstr "Enregistrement.."
 msgid "Checking syntax..."
 msgstr "Vérification de la syntaxe en cours.."
 
-#: 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 ""
 "Ce script a été modifié. Voulez-vous enregistrer les dernières "
 "modifications ?"
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Fitlre Sieve%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 "Chargement.."
 
 #: 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 "Ajout d'un filtre Sieve"
 
@@ -10957,44 +10999,44 @@ msgstr "Ajout d'un filtre Sieve"
 msgid "Enter name for a new Sieve filter script."
 msgstr "Saisir le nom du nouveau script Sieve."
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Enter new name for the script."
 msgstr "Saisir le nouveau nom pour le 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 "Voulez-vous vraiment supprimer le filtre '%s' ?"
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:328
 msgid "Delete filter"
 msgstr "Suppression du filtre"
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:482
 msgid "Active"
 msgstr "Actif"
 
-#: 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 "Un compte ne peut avoir qu'un seul script Sieve actif à la fois."
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:580
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:627
 msgid "Listing scripts..."
 msgstr "Établissement de la liste des scripts"
 
-#: src/plugins/managesieve/sieve_manager.c:626
+#: src/plugins/managesieve/sieve_manager.c:630
 msgid "Connecting..."
 msgstr "Connexion.."
 
-#: src/plugins/managesieve/sieve_manager.c:658
+#: src/plugins/managesieve/sieve_manager.c:662
 msgid "Manage Sieve Filters"
 msgstr "Gestion des filtres 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 "Afin d'utiliser Sieve, activer le dans les préférences de compte."
 
@@ -11055,7 +11097,7 @@ msgid "Require STARTTLS"
 msgstr "STARTTLS requis"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/rssyl/rssyl_feed_props.c:257
 msgid "No authentication"
 msgstr "Pas d'authentification"
 
@@ -11075,11 +11117,11 @@ msgid "User ID"
 msgstr "Nom d'utilisateur"
 
 #: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:371
 #: 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/wizard.c:1215 src/wizard.c:1635
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -11089,8 +11131,8 @@ 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:261 src/prefs_send.c:332
-#: src/prefs_themes.c:1112
+#: src/prefs_account.c:1813 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -11141,7 +11183,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Fichier de log"
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr "Dossier :"
 
@@ -11343,7 +11385,7 @@ msgid "Popup"
 msgstr "Popup"
 
 #: 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 "Commande"
 
@@ -11408,13 +11450,13 @@ msgid "Show banner"
 msgstr "Montrer la bannière"
 
 #: 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:247 src/plugins/pgpcore/sgpgme.c:147
+#: src/prefs_receive.c:229
 msgid "Never"
 msgstr "Jamais"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:227
+#: src/prefs_summaries.c:491 src/prefs_summaries.c:501
 msgid "Always"
 msgstr "Toujours"
 
@@ -11489,8 +11531,8 @@ msgstr "Couleur de premier plan"
 
 #: 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 "Fond du texte cité"
 
@@ -11512,8 +11554,8 @@ msgstr "Délai de disparition de la popup"
 #: 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:540
 msgid "seconds"
 msgstr "secondes"
 
@@ -11550,7 +11592,7 @@ msgstr "Sélectionner la commande"
 msgid "Enable command"
 msgstr "Activer la commande"
 
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:266
 msgid "Command to execute"
 msgstr "Commande à exécuter"
 
@@ -11699,130 +11741,130 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d nouvel article de flux RSS est arrivé"
 msgstr[1] "%d nouveaux articles de flux RSS sont arrivés"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:703
 msgid "Title:"
 msgstr "Titre :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Author:"
 msgstr "Auteur :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Creator:"
 msgstr "Créateur :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Producer:"
 msgstr "Producteur :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Created:"
 msgstr "Créé :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:715
 msgid "Modified:"
 msgstr "Modifié :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:718
 msgid "Format:"
 msgstr "Format :"
 
-#: 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 "Optimisé :"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1185
+#: src/plugins/pdf_viewer/poppler_viewer.c:1206
 msgid "PDF properties"
 msgstr "Propriétés du PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1355
 msgid "Enter password"
 msgstr "Saisie du mot de passe"
 
-#: 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 ""
 "Ce document est verrouillé, son ouverture nécessite la saisie d'un mot de "
 "passe"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 #, c-format
 msgid "%s Document"
 msgstr "Document %s"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1377
 #, c-format
 msgid "of %d"
 msgstr "sur %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 "Le rendu PDF a échoué pour une raison inconnue."
 
-#: 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 "Index du document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1940
 msgid "First Page"
 msgstr "Première page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1943
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1946
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1949
 msgid "Last Page"
 msgstr "Dernière page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1952
 msgid "Zoom In"
 msgstr "Zoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1954
 msgid "Zoom Out"
 msgstr "Dézoomer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1957
 msgid "Fit Page"
 msgstr "Adapter à la taille"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1960
 msgid "Fit Page Width"
 msgstr "Adapter à la largeur"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Rotate Right"
 msgstr "Pivoter à droite"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Print Document"
 msgstr "Imprimer le document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Document Info"
 msgstr "Informations"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Page Number"
 msgstr "Numéro de page"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1979
 msgid "Zoom Factor"
 msgstr "Facteur de zoom"
 
-#: 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 "
@@ -11835,13 +11877,13 @@ msgstr ""
 "\n"
 "Retours bienvenus: 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 "Lecteur 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 "
@@ -12024,29 +12066,29 @@ msgstr "Mémoriser temporairement la phrase secrète"
 msgid "Expire after"
 msgstr "Expirer après"
 
-#: 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 "Mettre 0 pour la mémoriser pendant toute la session"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
+#: 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/prefs_receive.c:187
+#: src/prefs_receive.c:188
 msgid "minutes"
 msgstr "minute(s)"
 
-#: src/plugins/pgpcore/prefs_gpg.c:193
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: 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 "Avertir au démarrage si GnuPG ne fonctionne pas"
 
-#: src/plugins/pgpcore/prefs_gpg.c:203
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr "Chemin complet vers l'exécutable 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."
@@ -12054,105 +12096,105 @@ msgstr ""
 "Laisser ce champ vide afin de laisser Claws Mail déterminer automatiquement "
 "l'emplacement de l'exécutable GnuPG."
 
-#: src/plugins/pgpcore/prefs_gpg.c:249
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr "Sélection de l'exécutable GnuPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:360
 msgid "Sign key"
 msgstr "Signer la clé"
 
-#: src/plugins/pgpcore/prefs_gpg.c:369
+#: src/plugins/pgpcore/prefs_gpg.c:368
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé GnuPG par défaut"
 
-#: src/plugins/pgpcore/prefs_gpg.c:380
+#: src/plugins/pgpcore/prefs_gpg.c:379
 msgid "Select key by your email address"
 msgstr "Choisir la clé en fonction de l'adresse email"
 
-#: src/plugins/pgpcore/prefs_gpg.c:391
+#: src/plugins/pgpcore/prefs_gpg.c:390
 msgid "Specify key manually"
 msgstr "Spécifier la clé manuellement"
 
-#: src/plugins/pgpcore/prefs_gpg.c:401
+#: src/plugins/pgpcore/prefs_gpg.c:400
 msgid "User or key ID:"
 msgstr "Identifiant d'utilisateur ou de clé :"
 
-#: src/plugins/pgpcore/prefs_gpg.c:445
+#: src/plugins/pgpcore/prefs_gpg.c:444
 msgid "No secret key found."
 msgstr "Pas de clé privée trouvée."
 
-#: src/plugins/pgpcore/prefs_gpg.c:448
+#: src/plugins/pgpcore/prefs_gpg.c:447
 msgid "Generate a new key pair"
 msgstr "Générer une nouvelle paire de clés"
 
-#: src/plugins/pgpcore/prefs_gpg.c:687
+#: src/plugins/pgpcore/prefs_gpg.c:686
 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:706 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:101
 #, 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:97
+#: src/plugins/pgpcore/select-keys.c:104
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Récupération d'infos pour '%s' .. %c"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:244 src/plugins/pgpcore/sgpgme.c:145
 msgid "Undefined"
 msgstr "Indéfinie"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
+#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:149
 #: src/plugins/pgpcore/sgpgme.c:165
 msgid "Marginal"
 msgstr "Marginale"
 
-#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
+#: src/plugins/pgpcore/select-keys.c:256 src/plugins/pgpcore/sgpgme.c:153
 #: src/plugins/pgpcore/sgpgme.c:169
 msgid "Ultimate"
 msgstr "Ultime"
 
-#: src/plugins/pgpcore/select-keys.c:381
+#: src/plugins/pgpcore/select-keys.c:421
 msgid "Select Keys"
 msgstr "Sélection de clés"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:470
 msgid "Key ID"
 msgstr "ID de la clé"
 
-#: src/plugins/pgpcore/select-keys.c:411
+#: src/plugins/pgpcore/select-keys.c:488
 msgid "Trust"
 msgstr "Confiance"
 
-#: src/plugins/pgpcore/select-keys.c:436
+#: src/plugins/pgpcore/select-keys.c:507
 msgid "_Other"
 msgstr "_Autres"
 
-#: src/plugins/pgpcore/select-keys.c:437
+#: src/plugins/pgpcore/select-keys.c:508
 msgid "Do_n't encrypt"
 msgstr "_Ne pas chiffrer"
 
-#: src/plugins/pgpcore/select-keys.c:596
+#: src/plugins/pgpcore/select-keys.c:689
 msgid "Add key"
 msgstr "Ajouter une clé"
 
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:690
 msgid "Enter another user or key ID:"
 msgstr "Saisir un autre utilisateur ou l'ID de la clé :"
 
-#: src/plugins/pgpcore/select-keys.c:619
+#: src/plugins/pgpcore/select-keys.c:712
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Chiffrement vers %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:620
+#: src/plugins/pgpcore/select-keys.c:713
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12451,7 +12493,7 @@ msgstr "Échec lors de la conversion du texte dans un jeu de caractère adapté.
 #: 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 "Impossible d'initialiser le contexte GPG, %s"
@@ -12588,11 +12630,11 @@ msgstr ""
 msgid "Signature boundary not found."
 msgstr "Séparateur de signature non trouvé."
 
-#: 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 "Impossible d'analyser le fichier déchiffré."
 
-#: 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 "Impossible d'analyser les parties du fichier déchiffré."
 
@@ -12657,13 +12699,13 @@ msgid "Show Python console..."
 msgstr "Afficher la console Python.."
 
 #: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/rssyl/rssyl_feed_props.c:459
 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:1204
-#: src/wizard.c:1624
+#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1205
+#: src/wizard.c:1625
 msgid "Browse"
 msgstr "Pa_rcourir"
 
@@ -12918,53 +12960,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:268
+#: src/plugins/rssyl/rssyl_feed_props.c:259
 msgid "HTTP Basic authentication"
 msgstr "Authentification HTTP simple"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:280
 msgid "Use default refresh interval"
 msgstr "Utiliser l'intervalle de mise à jour par défaut"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Keep old items"
 msgstr "Conserver les vieux articles"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:298
 msgid "_Trim"
 msgstr "_Rognage"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:300
 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:312
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Fetch comments if possible"
 msgstr "Récupérer les commentaires si possible"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:323
 msgid "Always mark it as new"
 msgstr "Toujours le marquer comme non lu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:325
 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:349
+#: src/plugins/rssyl/rssyl_feed_props.c:327
 msgid "Never mark it as new"
 msgstr "Ne jamais le marquer comme non lu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 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:361
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Ignore title rename"
 msgstr "Ignorer le changement de titre"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12972,54 +13014,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:370
+#: src/plugins/rssyl/rssyl_feed_props.c:348
 #: 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:390
+#: src/plugins/rssyl/rssyl_feed_props.c:368
 msgid "User name"
 msgstr "Utilisateur"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:381
 msgid "Source URL"
 msgstr "URL source :"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:394
 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: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:402
+#: 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
 msgid "days"
 msgstr "jour(s)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:403
 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:449
+#: src/plugins/rssyl/rssyl_feed_props.c:427
 msgid "If an item changes"
 msgstr "Si l'article a changé"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:432
 msgid "Items"
 msgstr "Articles"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:445
 msgid "Refresh interval"
 msgstr "Intervalle de rafraîchissement"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:453
 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:527
+#: src/plugins/rssyl/rssyl_feed_props.c:505
 msgid "_OK"
 msgstr "_Valider"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:513
 msgid "Set feed properties"
 msgstr "Propriétés du flux"
 
@@ -13141,27 +13183,27 @@ msgstr "Édition des propriétés du flux après souscription"
 msgid "Updating comments for '%s'..."
 msgstr "Mise à jour des commentaires pour %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 (Autorisation requise)"
 
-#: 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 (Non autorisé)"
 
-#: 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 (Non trouvé)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr "Erreur %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 ""
@@ -13175,7 +13217,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"
@@ -13184,21 +13226,21 @@ msgstr ""
 "Impossible de trouver un flux valide\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr "Flux sans titre"
 
-#: 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 : flux invalide sans titre '%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 "Mise à jour du flux '%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"
@@ -13211,7 +13253,7 @@ msgstr ""
 "\n"
 "Merci de reporter le problème aux développeurs."
 
-#: 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 nécessite un accès réseau pour mettre à jour les flux."
 
@@ -13261,24 +13303,24 @@ msgstr ""
 "\n"
 "GPGME est copyright 2001 par 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 "Impossible d'initialiser le contexte GPG, %s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:453
 msgid "Couldn't open temporary file"
 msgstr "Impossible de créer un fichier temporaire"
 
-#: 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 "Impossible d'écrire dans un fichier temporaire"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:490
 msgid "Couldn't close temporary file"
 msgstr "Impossible de fermer un fichier temporaire"
 
-#: 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."
@@ -13328,32 +13370,32 @@ msgstr "Activé"
 msgid "Forward to:"
 msgstr "Transférer à :"
 
-#: 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 "Mot de passe :"
 
 #: 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 "Le module SpamAssassin ne peut se connecter au serveur spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:197
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Le filtrage avec le module SpamAssassin a échoué.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:223
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Le module SpamAssassin est désactivé par ses propres préférences.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:216
+#: src/plugins/spamassassin/spamassassin.c:228
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin : analyse du(des) message(s).."
 
-#: 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 "
@@ -13363,7 +13405,7 @@ msgstr ""
 "cette erreur est sans doute l'inaccessibilité du démon spamd. Veuillez "
 "vérifier qu'il fonctionne bien et est accessible."
 
-#: 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."
@@ -13371,17 +13413,17 @@ msgstr ""
 "Claws Mail nécessite un accès réseau pour envoyer ce(s) courriel(s) à "
 "l'opérateur d'apprentissage de SpamAssassin."
 
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:560
 msgid "Failed to get username"
 msgstr "Échec lors de la récupération du nom d'utilisateur"
 
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:577
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "Le module SpamAssassin est bien chargé mais désactivé par ses propres "
 "préférences.\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 "
@@ -13404,59 +13446,69 @@ msgstr ""
 "Ce module est paramétrable via les options situées sous Configuration/"
 "Préférences/Modules/SpamAssassin."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr "Hôte 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 "Socket Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
 msgid "Select folder to save spam to"
 msgstr "Sélection du dossier où enregistrer les pourriels"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr "Activer la gestion du pourriel (module SpamAssassin)"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr "Transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr "Type de transport"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr "Nom d'utilisateur"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr "Utilisateur à fournir au serveur « spamd »"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr "Serveur « spamd »"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr "Nom ou adresse IP de l'hôte exécutant le serveur « spamd »"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr "Numéro du port du serveur « spamd »"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr "Chemin du socket Unix"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr "Activer 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 ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13528,11 +13580,11 @@ msgstr "Création du rendez-vous.."
 msgid "_Go to today"
 msgstr "_Aller à aujourd'hui"
 
-#: 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 "Début"
 
-#: 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 "Montrer"
 
@@ -13612,15 +13664,15 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Décembre"
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr "Numéro de semaine"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr "Mois précédent"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr "Mois suivant"
 
@@ -13660,11 +13712,11 @@ msgstr ""
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:99
 msgid "Create meeting from message..."
 msgstr "Créer un rendez-vous depuis le message.."
 
-#: 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?"
@@ -13698,7 +13750,7 @@ msgstr "Vous avez une tâche à effectuer."
 
 #: 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 "En voici les détails :"
 
@@ -13726,11 +13778,11 @@ msgstr "(cet évènement est récurrent)"
 msgid "(this event is part of a recurring event)"
 msgstr "(cet évènement fait partie d'un évènement récurrent)"
 
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:728
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Vous avez reçu une réponse à un rendez-vous inconnu. "
 
-#: 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"
@@ -13739,35 +13791,35 @@ msgstr ""
 "Vous avez reçu une réponse à un rendez-vous.\n"
 "%s a %s l'invitation dont les détails suivent :"
 
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:811
 msgid "Error - could not get the calendar MIME part."
 msgstr "Erreur - impossible de trouver la partie MIME calendrier"
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:818
 msgid "Error - no calendar part found."
 msgstr "Erreur - aucune partie calendrier trouvée."
 
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:832
 msgid "Error - Unknown calendar component type."
 msgstr "Error - Le composant calendrier n'est pas d'un type connu."
 
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:964
 msgid "Send a notification to the attendees"
 msgstr "Envoyer une notification aux invités"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:973
 msgid "Cancel meeting"
 msgstr "Annuler le rendez-vous"
 
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:974
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Voulez-vous réellement annuler ce rendez-vous ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1069
 msgid "No account found"
 msgstr "Pas de compte trouvé"
 
-#: 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?"
@@ -13775,68 +13827,68 @@ msgstr ""
 "Vous n'avez pas de compte correspondant à un invité. Voulez-vous tout de "
 "même répondre ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1072
 msgid "Reply anyway"
 msgstr "Répondre tout de même"
 
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1201
 msgid "Answer"
 msgstr "Réponse"
 
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1202
 msgid "Edit meeting..."
 msgstr "Modifier le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1203
 msgid "Cancel meeting..."
 msgstr "Annuler le rendez-vous.."
 
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1204
 msgid "Launch website"
 msgstr "Ouvrir le site web"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1208
 msgid "You are already busy at this time."
 msgstr "Vous n'êtes pas disponible actuellement."
 
-#: 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:1717
 msgid "Event:"
 msgstr "Évènement :"
 
-#: src/plugins/vcalendar/vcalendar.c:1260
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: src/plugins/vcalendar/vcalendar.c:1261
+#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
 msgid "Location:"
 msgstr "Endroit :"
 
-#: src/plugins/vcalendar/vcalendar.c:1262
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1251
 msgid "Starting:"
 msgstr "Début :"
 
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1252
 msgid "Ending:"
 msgstr "Fin :"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
+#: src/plugins/vcalendar/vcalendar.c:1254
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1700
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
 msgid "Attendees:"
 msgstr "Invités :"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1256
 msgid "Action:"
 msgstr "Action :"
 
@@ -14196,7 +14248,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 "Echec de la vérification de disponibilité"
 
@@ -14213,22 +14265,22 @@ msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 "Pas tout le monde n'est disponible. Voir les bulles d'aide pour plus d'info.."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1120
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Récupération du planning pour %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 "Tout le monde est disponible."
 
-#: 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."
@@ -14236,7 +14288,7 @@ msgstr ""
 "Tout le monde semble disponible, mais un ou des statuts de disponibilité "
 "n'ontpu être récupérés."
 
-#: 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."
@@ -14244,61 +14296,61 @@ msgstr ""
 "Impossible d'envoyer l'invitation.\n"
 "Veuillez vérifier les destinataires."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
 msgid "Save & Send"
 msgstr "Enregistrer & envoyer"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1452
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1575
 msgid "Starts at:"
 msgstr "Débute à :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1581
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "on:"
 msgstr "le :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1599
 msgid "Ends at:"
 msgstr "Se termine à :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1640
 msgid "New meeting"
 msgstr "Nouveau rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1642
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Modifier le rendez-vous"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
 msgid "Time:"
 msgstr "Période :"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1854
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1857
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Évènement en instance : %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1869
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14315,39 +14367,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1886
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "M'avertir à nouveau dans %d minute"
 msgstr[1] "M'avertir à nouveau dans %d minutes"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
 msgid "Empty calendar"
 msgstr "Calendrier vide"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2013
 msgid "There is nothing to export."
 msgstr "Il n'y a rien à exporter."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2053
 msgid "Could not export the calendar."
 msgstr "Impossible d'exporter le calendrier."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2070
 msgid "Export calendar to ICS"
 msgstr "Exporter le calendrier au format ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Impossible d'exporter le calendrier vers '%s'.\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2209
 msgid "Could not export the freebusy info."
 msgstr "Impossible d'exporter les informations de disponibilité."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2241
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Impossible d'exporter les informations de disponibilité vers '%s'\n"
@@ -14501,7 +14553,7 @@ msgid "POP"
 msgstr "POP"
 
 #: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
-#: src/wizard.c:1499
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP4"
 
@@ -14509,7 +14561,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:338 src/wizard.c:1500
+#: src/prefs_account.c:338 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Fichier mbox local"
 
@@ -14537,11 +14589,11 @@ msgstr "Nom complet"
 msgid "Mail address"
 msgstr "Adresse email"
 
-#: src/prefs_account.c:1135 src/wizard.c:1523
+#: src/prefs_account.c:1135 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Auto-configurer"
 
-#: src/prefs_account.c:1137 src/wizard.c:1524
+#: src/prefs_account.c:1137 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -14687,7 +14739,7 @@ msgstr ""
 "ce compte"
 
 #: 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_matcher.c:622 src/prefs_matcher.c:1965 src/prefs_matcher.c:1987
 msgid "Header"
 msgstr "En-tête"
 
@@ -14724,8 +14776,8 @@ msgid "Authenticate with POP before sending"
 msgstr "S'authentifier sur le POP avant l'envoi"
 
 #: src/prefs_account.c:1913
-msgid "POP authentication timeout: "
-msgstr "Délai maximal pour l'authentification POP :"
+msgid "POP authentication timeout"
+msgstr "Délai d'attente maximal pour l'authentification POP"
 
 #: src/prefs_account.c:2001 src/prefs_account.c:2047
 msgid "Signature"
@@ -14751,30 +14803,30 @@ msgstr "Définition automatique des adresses suivantes"
 msgid "Spell check dictionaries"
 msgstr "Dictionnaires de correction orthographique"
 
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_account.c:2129 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:1138
+#: src/prefs_account.c:2142 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_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_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:1477 src/prefs_quote.c:134
+#: src/prefs_account.c:2243 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_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_folder_item.c:1504 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "Transférer"
 
@@ -14953,30 +15005,29 @@ msgstr "La commande externe d'envoi est non spécifiée."
 #: src/prefs_account.c:3036
 msgid "User ID cannot contain a newline character."
 msgstr ""
-"L'identifiant utilisateur ne doit pas contenir de caractère de retour à la "
+"L'identifiant d'utilisateur ne peut contenir de caractère de retour à la "
 "ligne."
 
 #: src/prefs_account.c:3041
 msgid "Password cannot contain a newline character."
-msgstr ""
-"Le mot de passe ne doit pas contenir de caractère de retour à la ligne."
+msgstr "Le mot de passe ne peut contenir de caractère de retour à la ligne."
 
 #: src/prefs_account.c:3069
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
-"L'identifiant utilisateur SMTP ne doit pas contenir de caractère de retour à "
+"L'identifiant d'utilisateur SMTP ne peut contenir de caractère de retour à "
 "la ligne."
 
 #: src/prefs_account.c:3074
 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."
+"Le mot de passe SMTP ne peut contenir de caractère de retour à la ligne."
 
 #: src/prefs_account.c:3387
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
+#: src/prefs_account.c:3441 src/prefs_folder_item.c:1857 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modèles"
 
@@ -14997,7 +15048,7 @@ msgstr "Configuration du nouveau compte"
 msgid "%s - Account preferences"
 msgstr "%s - Configuration du compte"
 
-#: src/prefs_account.c:4029 src/wizard.c:1388
+#: src/prefs_account.c:4029 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Échec (adresse incorrecte)"
 
@@ -15005,7 +15056,7 @@ msgstr "Échec (adresse incorrecte)"
 msgid "Select signature file"
 msgstr "Sélection du fichier signature"
 
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
+#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Choisir le fichier de certificat"
 
@@ -15046,9 +15097,9 @@ msgstr "Ajoute la nouvelle action ci-dessus à la liste"
 msgid "Replace the selected action in list with the action above"
 msgstr "Remplace l'action sélectionnée dans la liste par l'action ci-dessus"
 
-#: 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:320
-#: 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:1023
 msgid "D_elete"
 msgstr "Supprim_er"
 
@@ -15056,7 +15107,7 @@ msgstr "Supprim_er"
 msgid "Delete the selected action from the list"
 msgstr "Supprime l'action sélectionnée dans la liste"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "Efface tous les champs de saisie de la boîte de dialogue"
 
@@ -15072,10 +15123,10 @@ msgstr "Déplace l'action sélectionnée d'une ligne vers le haut"
 msgid "Move selected action down"
 msgstr "Déplace l'action sélectionnée d'une ligne vers le bas"
 
-#: 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_template.c:472
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:892
+#: src/prefs_template.c:471
 msgid "(New)"
 msgstr "(Nouveau)"
 
@@ -15130,21 +15181,21 @@ msgstr "Suppression des actions"
 msgid "Do you really want to delete all the actions?"
 msgstr "Voulez-vous vraiment supprimer toutes les actions ?"
 
-#: 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:572
-#: src/prefs_template.c:597
+#: 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 "Règle non ajoutée"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
-#: src/prefs_filtering.c:1524 src/prefs_template.c:573 src/prefs_template.c:598
+#: 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 règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
 #: 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:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: 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 "_Poursuivre l'édition"
 
@@ -15255,7 +15306,7 @@ msgstr ""
 msgid "for a literal %"
 msgstr "caractère « % »"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1088
+#: src/prefs_actions.c:998 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "Actions"
 
@@ -15269,7 +15320,7 @@ msgstr ""
 "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:1699
+#: src/prefs_actions.c:1086 src/prefs_filtering.c:1701
 #: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr "_Dupliquer"
@@ -15404,71 +15455,71 @@ msgstr "Composer"
 msgid "Custom header configuration"
 msgstr "Configuration des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:506 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 "Le nom de l'en-tête n'est pas défini."
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:512
 msgid "This Header name is not allowed as a custom header."
 msgstr "Ce nom d'en-tête n'est pas autorisé en tant qu'en-tête supplémentaire."
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:559
 msgid "Choose a PNG file"
 msgstr "Choisir un fichier PNG"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:561
 msgid "Choose an XBM file"
 msgstr "Choisir un fichier XBM"
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:563
 msgid "Choose a text file"
 msgstr "Choisir un fichier texte"
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:576
 msgid "This file isn't an image."
 msgstr "Ce fichier n'est pas une image."
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:581
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "L'image choisie n'a pas une taille correcte (48x48)."
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:587
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "L'image est trop volumineuse; elle doit faire 725 octets maximum."
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:592
 msgid "The image isn't in the correct format (PNG)."
 msgstr "L'image n'est pas d'un format correct (PNG)."
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:601
 msgid "The image isn't in the correct format (XBM)."
 msgstr "L'image n'est pas d'un format correct (XBM)."
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:610
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Impossible d'atteindre l'utilitaire `compface`. Assurez-vous qu'il se trouve "
 "bien dans votre $PATH."
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:616
 #, c-format
 msgid "Compface error: %s"
 msgstr "Erreur compface : %s"
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:669
 msgid "This file contains newlines."
 msgstr "Ce fichier contient des retours à la ligne."
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:699
 msgid "Delete header"
 msgstr "Supprimer l'en-tête"
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:700
 msgid "Do you really want to delete this header?"
 msgstr "Voulez-vous vraiment supprimer l'en-tête sélectionné ?"
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:873
 msgid "Current custom headers"
 msgstr "En-têtes supplémentaires"
 
@@ -15480,19 +15531,19 @@ msgstr "Configuration de l'affichage des en-têtes"
 msgid "Header name"
 msgstr "En-tête"
 
-#: src/prefs_display_header.c:319
+#: src/prefs_display_header.c:311
 msgid "Displayed Headers"
 msgstr "En-têtes affichés"
 
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:373
 msgid "Hidden headers"
 msgstr "En-têtes cachés"
 
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
 msgstr "Afficher tous les en-têtes non spécifiés"
 
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:599
 msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
@@ -15531,7 +15582,7 @@ msgstr ""
 "Afficher comme du texte » du menu contextuel est choisi."
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr "Vue du message"
 
@@ -15558,8 +15609,8 @@ msgstr "Cacher"
 msgid "Message flags"
 msgstr "États de message"
 
-#: 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_filtering_action.c:179 src/prefs_summaries.c:447
+#: src/prefs_summary_column.c:77 src/summaryview.c:2843 src/toolbar.c:505
 msgid "Mark"
 msgstr "Marquer"
 
@@ -15579,12 +15630,12 @@ msgstr "Marquer comme pourriel"
 msgid "Mark as ham"
 msgstr "Marquer comme courrier légitime"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
+#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1418
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:445
 msgid "Color label"
 msgstr "Couleur"
 
@@ -15598,9 +15649,9 @@ msgid "Redirect"
 msgstr "Rediriger"
 
 #: 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_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:1422 src/prefs_matcher.c:628
+#: src/prefs_summaries.c:450 src/prefs_summary_column.c:86
+#: src/summaryview.c:451
 msgid "Score"
 msgstr "Score"
 
@@ -15613,8 +15664,8 @@ msgid "Set score"
 msgstr "Définir le score"
 
 #: 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 "Labels"
 
@@ -15642,8 +15693,8 @@ msgstr "Interrompre le filtrage"
 msgid "Action configuration"
 msgstr "Configuration de l'action"
 
-#: 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 "Règle"
 
@@ -15651,65 +15702,65 @@ msgstr "Règle"
 msgid "Action"
 msgstr "Action"
 
-#: src/prefs_filtering_action.c:938
+#: src/prefs_filtering_action.c:922
 msgid "Command-line not set"
 msgstr "La commande n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:939
+#: src/prefs_filtering_action.c:923
 msgid "Destination is not set."
 msgstr "La destination n'a pas été spécifiée."
 
-#: src/prefs_filtering_action.c:950
+#: src/prefs_filtering_action.c:934
 msgid "Recipient is not set."
 msgstr "Destinataire non spécifié."
 
-#: src/prefs_filtering_action.c:968
+#: src/prefs_filtering_action.c:952
 msgid "Score is not set"
 msgstr "Score non spécifié"
 
-#: src/prefs_filtering_action.c:976
+#: src/prefs_filtering_action.c:960
 msgid "Header is not set."
 msgstr "L'en-tête n'est pas défini."
 
-#: src/prefs_filtering_action.c:983
+#: src/prefs_filtering_action.c:967
 msgid "Target addressbook/folder is not set."
 msgstr "Le carnet/dossier de destination n'est pas défini."
 
-#: src/prefs_filtering_action.c:997
+#: src/prefs_filtering_action.c:977
 msgid "Tag name is empty."
 msgstr "Le nom du label n'est pas défini."
 
-#: src/prefs_filtering_action.c:1219
+#: src/prefs_filtering_action.c:1199
 msgid "No action was defined."
 msgstr "Aucune action n'a été spécifiée."
 
-#: 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 "caractère « % »"
 
-#: 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 "Chemin du fichier (ne doit pas être modifié)"
 
-#: 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 "Retour chariot"
+msgstr "Retour à la ligne"
 
-#: 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 "caractère d'échappement"
 
-#: 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 "Préfixes de citation"
 
-#: src/prefs_filtering_action.c:1278
+#: src/prefs_filtering_action.c:1258
 msgid "Filtering Action: 'Execute'"
 msgstr "Action de filtrage : « Exécuter »"
 
-#: 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"
@@ -15720,23 +15771,23 @@ msgstr ""
 "externe.\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1402
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1406
 msgid "Book/Folder"
 msgstr "Carnet/dossier"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1410
 msgid "Destination"
 msgstr "Destination"
 
-#: src/prefs_filtering_action.c:1438
+#: src/prefs_filtering_action.c:1414
 msgid "Color"
 msgstr "Colorier"
 
-#: src/prefs_filtering_action.c:1524
+#: src/prefs_filtering_action.c:1500
 msgid "Current action list"
 msgstr "Actions enregistrées"
 
@@ -15818,41 +15869,41 @@ msgstr "La condition est vide."
 msgid "Action string is empty."
 msgstr "L'action est vide."
 
-#: src/prefs_filtering.c:1209
+#: src/prefs_filtering.c:1210
 msgid "Delete rule"
 msgstr "Suppression d'une règle"
 
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1211
 msgid "Do you really want to delete this rule?"
 msgstr "Voulez-vous vraiment supprimer la règle sélectionnée ?"
 
-#: src/prefs_filtering.c:1228
+#: src/prefs_filtering.c:1229
 msgid "Delete all rules"
 msgstr "Suppression de toutes les règles"
 
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1230
 msgid "Do you really want to delete all the rules?"
 msgstr "Voulez-vous vraiment supprimer toutes les règles ?"
 
-#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1481
 msgid "Filtering rules not saved"
 msgstr "Règles de filtrage non enregistrées"
 
-#: src/prefs_filtering.c:1480
+#: src/prefs_filtering.c:1482
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr ""
 "La liste de règles de filtrage a été modifiée mais non enregistrée. Voulez-"
 "vous quand même fermer ?"
 
-#: src/prefs_filtering.c:1702
+#: src/prefs_filtering.c:1704
 msgid "Move one page up"
 msgstr "Déplacer une page plus haut"
 
-#: src/prefs_filtering.c:1703
+#: src/prefs_filtering.c:1705
 msgid "Move one page down"
 msgstr "Déplacer une page plus bas"
 
-#: src/prefs_filtering.c:1858
+#: src/prefs_filtering.c:1862
 msgid "Enable"
 msgstr "Activer"
 
@@ -15874,13 +15925,13 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Éléments masqués"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:591 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:414
+#: src/prefs_summaries.c:588 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr "Éléments affichés"
 
-#: 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:1031
 msgid " Use default "
 msgstr " Remise à zéro "
 
@@ -15895,7 +15946,7 @@ msgstr ""
 "Cependant, vous pouvez les utiliser pour les appliquer à l'ensemble des sous-"
 "dossiers de la boîte aux lettres en cochant « Appliquer aux sous-dossiers »."
 
-#: 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"
@@ -15920,12 +15971,12 @@ msgid "Simplify Subject RegExp"
 msgstr "Enlever la RegExp suivante du sujet"
 
 #: src/prefs_folder_item.c:370
-msgid "Test string:"
-msgstr "Chaîne de test :"
+msgid "Test string"
+msgstr "Chaîne de test"
 
 #: src/prefs_folder_item.c:387
-msgid "Result:"
-msgstr "Résultat :"
+msgid "Result"
+msgstr "Résultat"
 
 #: src/prefs_folder_item.c:402
 msgid "Folder chmod"
@@ -15935,23 +15986,23 @@ msgstr "Permissions chmod du dossier"
 msgid "Folder color"
 msgstr "Couleur du dossier"
 
-#: 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 "Sélection de la couleur pour le(s) dossier(s)"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:458
 msgid "Run Processing rules at start-up"
 msgstr "Exécuter les règles de traitement au démarrage"
 
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:473
 msgid "Run Processing rules when opening"
 msgstr "Exécuter les règles de traitement à l'ouverture du dossier"
 
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:487
 msgid "Scan for new mail"
 msgstr "Relever les nouveaux messages"
 
-#: 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"
@@ -15959,11 +16010,11 @@ msgstr ""
 "Activer cette option si les messages sont acheminés directement dans ce "
 "dossier par un filtrage IMAP depuis le serveur ou par une application externe"
 
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:509
 msgid "Select the HTML part of multipart messages"
 msgstr "Préférer la vue HTML pour les messages multipart"
 
-#: 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)"
@@ -15971,68 +16022,68 @@ msgstr ""
 "« Par défaut » respectera les préférences globales (modifiables dans /"
 "Préférences/Vue du message/Corps du message)"
 
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:536
 msgid "Synchronise for offline use"
 msgstr "Synchroniser pour une utilisation hors-ligne"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:557
 msgid "Fetch message bodies from the last"
 msgstr "Récupérer les corps de message des derniers"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:564
 msgid "0: all bodies"
 msgstr "0 pour tous les corps de message"
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:572
 msgid "Remove older messages bodies"
 msgstr "Supprimer les corps de message plus vieux"
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:589
 msgid "Discard folder cache"
 msgstr "Supprimer le cache du dossier"
 
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:894
 msgid "Request Return Receipt"
 msgstr "Demander un accusé de réception"
 
-#: 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 ""
 "Enregistrer la copie des messages envoyés dans ce dossier plutôt que dans « "
 "Envoyés »"
 
-#: 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 "%s par défaut"
 
-#: 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 "%s par défaut pour les réponses"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1052
 msgid "Default account"
 msgstr "Compte par défaut"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1690
 msgid "Discard cache"
 msgstr "Suppression du cache"
 
-#: 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 ""
 "Voulez-vous vraiment supprimer les données mises localement en cache pour ce "
 "dossier ?"
 
-#: src/prefs_folder_item.c:1825
+#: src/prefs_folder_item.c:1824
 msgid "General"
 msgstr "Général"
 
-#: src/prefs_folder_item.c:1904
+#: src/prefs_folder_item.c:1903
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Options du dossier %s"
@@ -16041,7 +16092,7 @@ msgstr "Options du dossier %s"
 msgid "Folder and Message Lists"
 msgstr "Listes de dossiers et de messages"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2033
 msgid "Message"
 msgstr "Message"
 
@@ -16067,7 +16118,7 @@ msgstr "Utiliser une police différente pour l'impression"
 msgid "Message Printing"
 msgstr "Impression d'un message"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:766
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:763
 #: src/prefs_themes.c:421
 msgid "Display"
 msgstr "Affichage"
@@ -16223,7 +16274,7 @@ msgstr "Messages d'erreur"
 msgid "Status messages for filtering/processing log"
 msgstr "Informations de déboguage du filtrage/traitement"
 
-#: 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 "Autres"
 
@@ -16231,247 +16282,247 @@ msgstr "Autres"
 msgid "Logging"
 msgstr "Traçage"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:330
 msgid "more than"
 msgstr "supérieur à"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:331
 msgid "less than"
 msgstr "inférieur à"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:337
 msgid "weeks"
 msgstr "semaine(s)"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
 msgid "higher than"
 msgstr "supérieur à"
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:342
 msgid "lower than"
 msgstr "inférieur à"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:343 src/prefs_matcher.c:349
 msgid "exactly"
 msgstr "exactement"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:347
 msgid "greater than"
 msgstr "supérieure à"
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:348
 msgid "smaller than"
 msgstr "inférieure à"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:353
 msgid "bytes"
 msgstr "octets"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:354
 msgid "kilobytes"
 msgstr "kilo-octets"
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:355
 msgid "megabytes"
 msgstr "méga-octets"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:359
 msgid "contains"
 msgstr "contient"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:360
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:384
 msgid "headers part"
 msgstr "en-têtes du message"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:385
 msgid "headers values"
 msgstr "valeurs d'en-tête"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:386
 msgid "body part"
 msgstr "corps du message"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:387
 msgid "whole message"
 msgstr "tout le message"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6351
+#: src/prefs_matcher.c:393 src/summaryview.c:6434
 msgid "Marked"
 msgstr "Marqué"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6349
+#: src/prefs_matcher.c:394 src/summaryview.c:6432
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
 msgid "Replied"
 msgstr "Répondu"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6343
+#: src/prefs_matcher.c:396 src/summaryview.c:6426
 msgid "Forwarded"
 msgstr "Transféré"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
+#: src/prefs_matcher.c:398 src/summaryview.c:6416 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2339
 msgid "Spam"
 msgstr "Pourriel"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:399
 msgid "Has attachment"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6369
+#: src/prefs_matcher.c:400 src/summaryview.c:6452
 msgid "Signed"
 msgstr "Signé"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
 msgid "set"
 msgstr "défini"
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:405
 msgid "not set"
 msgstr "non défini"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:409
 msgid "yes"
 msgstr "oui"
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:410
 msgid "no"
 msgstr "non"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
 msgid "Any tags"
 msgstr "n'importe quel label"
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:415
 msgid "Specific tag"
 msgstr "label précis"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
 msgid "ignored"
 msgstr "ignoré"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:420
 msgid "not ignored"
 msgstr "non ignoré"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:421
 msgid "watched"
 msgstr "suivi"
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:422
 msgid "not watched"
 msgstr "non suivi"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:426
 msgid "found"
 msgstr "trouvé"
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:427
 msgid "not found"
 msgstr "non trouvé"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
 msgid "0 (Passed)"
 msgstr "0 (succès)"
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:432
 msgid "non-0 (Failed)"
 msgstr "différent de 0 (échec)"
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:568
 msgid "Condition configuration"
 msgstr "Conditions de filtrage"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
-msgstr "Critère :"
+#: src/prefs_matcher.c:612
+msgid "Match criteria"
+msgstr "Critère"
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:621
 msgid "All messages"
 msgstr "Tous les messages"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:623
 msgid "Age"
 msgstr "Âge"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:624
 msgid "Phrase"
 msgstr "Expression"
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:625
 msgid "Flags"
 msgstr "États"
 
-#: 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 "Couleurs"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:627
 msgid "Thread"
 msgstr "Fil de discussion"
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:630
 msgid "Partially downloaded"
 msgstr "Partiellement téléchargé"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:633
 msgid "External program test"
 msgstr "Test par programme externe"
 
-#: 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 "Tous"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:739
 msgid "Use regexp"
 msgstr "Utiliser des expressions régulières"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:815
 msgid "Message must match"
 msgstr "Le message doit valider"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:819
 msgid "at least one"
 msgstr "au moins une des"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:820
 msgid "all"
 msgstr "toutes les"
 
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:823
 msgid "of above rules"
 msgstr "règles ci-dessus"
 
-#: 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 "Le terme cherché n'est pas défini."
 
-#: src/prefs_matcher.c:1545
+#: src/prefs_matcher.c:1540
 msgid "Test command is not set."
 msgstr "La commande de test n'est pas définie."
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1614
 msgid "all addresses in all headers"
 msgstr "toutes les adresses de toutes les en-têtes"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1617
 msgid "any address in any header"
 msgstr "n'importe quelle adresse de n'importe quel en-tête"
 
-#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:1619
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "l'(les) adresse(s) de l'en-tête '%s'"
 
-#: src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1620
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16485,93 +16536,93 @@ msgstr ""
 "d'adresse, vous devez sélectionner '%s' dans la liste déroulante « carnet/"
 "dossier »."
 
-#: src/prefs_matcher.c:1844
+#: src/prefs_matcher.c:1839
 msgid "Headers part"
 msgstr "En-têtes du message"
 
-#: src/prefs_matcher.c:1848
+#: src/prefs_matcher.c:1843
 msgid "Headers values"
 msgstr "Valeurs d'en-tête"
 
-#: src/prefs_matcher.c:1852
+#: src/prefs_matcher.c:1847
 msgid "Body part"
 msgstr "Corps du message"
 
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1851
 msgid "Whole message"
 msgstr "Tout le message"
 
-#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:1964 src/prefs_matcher.c:2006
 msgid "in"
 msgstr "dans"
 
-#: src/prefs_matcher.c:1971
+#: src/prefs_matcher.c:1966
 msgid "content is"
 msgstr "Le contenu est"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:1975
 msgid "Age is"
 msgstr "Âge"
 
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:1980
 msgid "Flag"
 msgstr "État"
 
-#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:1981 src/prefs_matcher.c:1996
 msgid "is"
 msgstr "est"
 
-#: src/prefs_matcher.c:1991
+#: src/prefs_matcher.c:1986
 msgid "Name:"
 msgstr "Nom d'en-tête"
 
-#: src/prefs_matcher.c:2000
+#: src/prefs_matcher.c:1995
 msgid "Label"
 msgstr "Couleur"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2001
 msgid "Value:"
 msgstr "Valeur"
 
-#: src/prefs_matcher.c:2021
+#: src/prefs_matcher.c:2016
 msgid "Score is"
 msgstr "Score"
 
-#: src/prefs_matcher.c:2022
+#: src/prefs_matcher.c:2017
 msgid "points"
 msgstr "points"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2027
 msgid "Size is"
 msgstr "Taille"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2032
 msgid "Scope:"
 msgstr "Portée"
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2034
 msgid "tags"
 msgstr "un(des) label(s)."
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2039
 msgid "type is"
 msgstr "est"
 
-#: src/prefs_matcher.c:2048
+#: src/prefs_matcher.c:2043
 msgid "Program returns"
 msgstr "Retourne"
 
-#: src/prefs_matcher.c:2118
+#: src/prefs_matcher.c:2113
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr "La règle n'a pas encore été ajoutée. Voulez-vous quand même fermer ?"
 
-#: src/prefs_matcher.c:2184
+#: src/prefs_matcher.c:2180
 msgid "Match Type: 'Test'"
 msgstr "Condition de filtrage : « Test »"
 
-#: 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"
@@ -16585,87 +16636,87 @@ msgstr ""
 "\n"
 "Il est possible d'utiliser les symboles suivants :"
 
-#: src/prefs_matcher.c:2284
+#: src/prefs_matcher.c:2280
 msgid "Current condition rules"
 msgstr "Conditions enregistrées"
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr "En-têtes"
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au-dessus du message"
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr "Afficher les petites images (X-)Face dans la fenêtre des messages"
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr "Afficher les petites images Face dans la fenêtre des messages"
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr "Afficher les en-têtes dans la fenêtre des messages"
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr "Messages HTML"
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr "Afficher les messages HTML en texte"
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Afficher les messages uniquement en HTML avec un module si possible"
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Préférer la vue HTML dans le cas d'un message multipart"
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr "pixels"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Montrer la description au lieu du nom des pièces jointes"
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr "Citation"
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
 msgstr "Replier les citations par un double-clic"
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
-msgstr "Traiter ces caractères comme préfixe de citation :"
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
+msgstr "Traiter ces caractères comme préfixe de citation"
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr "Corps du message"
 
@@ -16694,38 +16745,38 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Avertissement configuration"
 
-#: src/prefs_msg_colors.c:146
+#: src/prefs_msg_colors.c:153
 msgid "Message view"
 msgstr "Vue du message"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:160
 msgid "Enable coloration of message text"
 msgstr "Colorier le texte des messages"
 
-#: src/prefs_msg_colors.c:161
+#: src/prefs_msg_colors.c:168
 msgid "Quote"
 msgstr "Citation"
 
-#: src/prefs_msg_colors.c:173
+#: src/prefs_msg_colors.c:180
 msgid "Cycle quote colors"
 msgstr "Utiliser les couleurs en boucle"
 
-#: 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 plus de 3 niveaux de citation existent, les couleurs seront utilisées en "
 "boucle. (couleur niveau 4 = couleur niveau 1)"
 
-#: src/prefs_msg_colors.c:183
+#: src/prefs_msg_colors.c:190
 msgid "1st Level"
 msgstr "Niveau 1"
 
-#: 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 "Texte cité"
 
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:200
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 1"
@@ -16734,58 +16785,59 @@ msgstr "Sélection de la couleur du texte des citations de niveau 1"
 msgid "2nd Level"
 msgstr "Niveau 2"
 
-#: src/prefs_msg_colors.c:227
+#: src/prefs_msg_colors.c:218
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 2"
 
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:226
 msgid "3rd Level"
 msgstr "Niveau 3"
 
-#: src/prefs_msg_colors.c:252
+#: src/prefs_msg_colors.c:236
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 3"
 
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:245
 msgid "Enable coloration of text background"
 msgstr "Colorier le fond des citations"
 
-#: src/prefs_msg_colors.c:274
+#: src/prefs_msg_colors.c:254
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 1"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:267
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 2"
 
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:280
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 3"
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:292
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Sélection de la couleur des liens URI"
 
-#: src/prefs_msg_colors.c:335
+#: src/prefs_msg_colors.c:296
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_msg_colors.c:351
+#: src/prefs_msg_colors.c:304
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Sélection de la couleur des signatures"
 
-#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:363
 msgid "Folder list"
 msgstr "Liste des dossiers"
 
-#: 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"
@@ -16793,23 +16845,24 @@ 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.)"
+"» est désactivée)"
 
-#: src/prefs_msg_colors.c:374
+#: src/prefs_msg_colors.c:323
 msgid "Target folder"
 msgstr "Dossier ciblé"
 
-#: src/prefs_msg_colors.c:388
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Sélection de la couleur des dossiers contenant des nouveaux messages"
 
-#: src/prefs_msg_colors.c:390
+#: src/prefs_msg_colors.c:334
 msgid "Folder containing new messages"
 msgstr "Dossier contenant des nouveaux messages"
 
 #. 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'"
@@ -16817,70 +16870,70 @@ msgstr "Sélection de la couleur n°%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 "Saisir le nom de la couleur n°%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 "Sélection de la couleur n°%d"
-
-#: src/prefs_msg_colors.c:590
+#: src/prefs_msg_colors.c:490
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 1"
 
-#: src/prefs_msg_colors.c:593
+#: src/prefs_msg_colors.c:492
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 2"
 
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:494
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Sélection de la couleur du texte des citations de niveau 3"
 
-#: src/prefs_msg_colors.c:599
+#: src/prefs_msg_colors.c:496
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 1"
 
-#: src/prefs_msg_colors.c:602
+#: src/prefs_msg_colors.c:498
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 2"
 
-#: src/prefs_msg_colors.c:605
+#: src/prefs_msg_colors.c:500
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Sélection de la couleur du fond des citations de niveau 3"
 
-#: src/prefs_msg_colors.c:608
+#: src/prefs_msg_colors.c:502
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Sélection de la couleur des liens URI"
 
-#: src/prefs_msg_colors.c:611
+#: src/prefs_msg_colors.c:504
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Sélection de la couleur des dossiers ciblés"
 
-#: src/prefs_msg_colors.c:614
+#: src/prefs_msg_colors.c:506
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Sélection de la couleur des signatures"
 
-#: src/prefs_msg_colors.c:617
+#: src/prefs_msg_colors.c:508
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Sélection de la couleur des dossiers contenant des nouveaux messages"
 
-#: 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 "Sélection de la couleur n°%d"
+
+#: src/prefs_msg_colors.c:732
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -16901,35 +16954,35 @@ msgstr ""
 "de menu en pressant une combinaison de touches juste après\n"
 "lui avoir fait prendre le focus (sans cliquer)."
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:492
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:495
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:498
 msgid "Confirm on exit"
 msgstr "Demander confirmation"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:505
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:508
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:510
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:513
 msgid "Enable customisable keyboard shortcuts"
 msgstr "Permettre de modifier les raccourcis clavier"
 
-#: 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"
@@ -16941,15 +16994,15 @@ msgstr ""
 "Désactivez cette option si vous voulez figer les raccourcis de clavier "
 "existants (et ainsi éviter de les modifier par inadvertance)."
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:523
 msgid " Choose preset keyboard shortcuts... "
 msgstr "Pré-sélections de raccourcis clavier.."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:533
 msgid "Metadata handling"
 msgstr "Gestion des métadonnées"
 
-#: 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."
@@ -16959,33 +17012,33 @@ msgstr ""
 "Ce mode de fonctionnement réduit le risque de pertes de données\n"
 "en cas de crash système, mais peut se montrer plus lent."
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:538
 msgid "Safer"
 msgstr "Moins risqué"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:540
 msgid "Faster"
 msgstr "Plus rapide"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:558
 msgid "Socket I/O timeout"
 msgstr "Délai d'attente maximal de communication"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:579
 msgid "Ask before emptying trash"
 msgstr "Demander une confirmation pour vider la ou les corbeilles"
 
-#: src/prefs_other.c:585
+#: src/prefs_other.c:581
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 "Lors d'un filtrage manuel, demander comment appliquer les régles liées à des "
 "comptes"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:586
 msgid "Use secure file deletion if possible"
 msgstr "Utiliser la suppression de fichiers sécurisée si possible"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:590
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16993,7 +17046,7 @@ msgstr ""
 "Utiliser la suppression de fichiers sécurisée si possible\n"
 "(le programme 'shred' n'est pas 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."
@@ -17002,19 +17055,19 @@ msgstr ""
 "aléatoire avant de les effacer. Cela peut ralentir la suppression de façon "
 "significative. Consultez la documentation de shread pour en savoir plus."
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:599
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniser les dossiers en ligne dès que possible"
 
-#: src/prefs_other.c:606
+#: src/prefs_other.c:602
 msgid "Master passphrase"
 msgstr "Phrase secrète principale"
 
-#: src/prefs_other.c:609
+#: src/prefs_other.c:605
 msgid "Use a master passphrase"
 msgstr "Utiliser une phrase secrète principale"
 
-#: 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."
@@ -17023,11 +17076,11 @@ msgstr ""
 "principal. Si aucun mot de passe principal n'est défini, il vous sera "
 "demandé de le saisir."
 
-#: src/prefs_other.c:617
+#: src/prefs_other.c:613
 msgid "Change master passphrase"
 msgstr "Changer la phrase secrète principale"
 
-#: src/prefs_other.c:777
+#: src/prefs_other.c:773
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -17035,119 +17088,115 @@ msgstr "Divers"
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Le %d,\\n%f a écrit :\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:143
 msgid "External incorporation program"
 msgstr "Programme externe pour la réception du courriel"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:146
 msgid "Use external program for receiving mail"
 msgstr "Utiliser le programme suivant"
 
-#: src/prefs_receive.c:161
+#: src/prefs_receive.c:162
 msgid "Automatic checking"
 msgstr "Relève automatique du courriel"
 
-#: src/prefs_receive.c:168
+#: src/prefs_receive.c:169
 msgid "Check for new mail every"
 msgstr "Relever automatiquement toutes les"
 
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:213
 msgid "Check for new mail on start-up"
 msgstr "Relever au démarrage"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:216
 msgid "Dialogs"
 msgstr "Fenêtres"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:218
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:228
 msgid "Only on manual receiving"
 msgstr "Uniquement lors de la relève manuelle"
 
-#: src/prefs_receive.c:238
+#: src/prefs_receive.c:239
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception en fin d'opération"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:242
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre lors d'une erreur de réception"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:245
 msgid "After receiving new mail"
 msgstr "Après réception du courriel"
 
-#: src/prefs_receive.c:246
+#: src/prefs_receive.c:247
 msgid "Go to Inbox"
 msgstr "Aller dans le dossier de réception"
 
-#: src/prefs_receive.c:248
+#: src/prefs_receive.c:249
 msgid "Update all local folders"
 msgstr "Mettre à jour l'ensemble des dossiers locaux"
 
-#: src/prefs_receive.c:250
+#: src/prefs_receive.c:251
 msgid "Run command"
 msgstr "Exécution d'une commande si du courriel arrive"
 
-#: src/prefs_receive.c:255
+#: src/prefs_receive.c:256
 msgid "after automatic check"
 msgstr "après une relève automatique"
 
-#: src/prefs_receive.c:257
+#: src/prefs_receive.c:258
 msgid "after manual check"
 msgstr "après une relève manuelle"
 
-#: 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 ""
-"Commande à exécuter :\n"
-"(%d : nombre de nouveaux messages)"
+msgid "Use %d as number of new mails"
+msgstr "Utiliser %d pour le nombre de nouveaux messages"
 
-#: src/prefs_receive.c:408 src/prefs_send.c:415
+#: src/prefs_receive.c:413 src/prefs_send.c:419
 msgid "Mail Handling"
 msgstr "Traitement du courrier"
 
-#: src/prefs_receive.c:409
+#: src/prefs_receive.c:414
 msgid "Receiving"
 msgstr "Réception"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr "Enregistrer les messages envoyés"
 
-#: src/prefs_send.c:175
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr "Ne jamais envoyer d'accusé de réception"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr ""
 "Demander une confirmation avant d'envoyer les messages en file d'attente"
 
-#: src/prefs_send.c:196
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "Afficher une fenêtre lors de l'envoi"
 
-#: src/prefs_send.c:199
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr "Prévenir si le sujet est vide."
 
-#: src/prefs_send.c:205
+#: 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 quand le nombre de destinataires dépasse"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr ""
 "Pour l'envoi, utiliser le jeu\n"
 "de caractères suivant"
 
-#: 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"
@@ -17155,131 +17204,131 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères par défaut du "
 "système sera choisi automatiquement."
 
-#: src/prefs_send.c:263
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr "ASCII 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 "Europe de l'Ouest (ISO-8859-1)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe de l'Ouest (Euro) (ISO-8859-15)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe Centrale (ISO-8859-2)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: src/prefs_send.c:272
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr "Europe du Nord (ISO-8859-4)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabe (ISO-8859-6)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr "Arabe (Windows-1256)"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_send.c:285
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Cyrillique (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:287
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_send.c:293
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr "Chinois simplifié (GB18030)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_send.c:298
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_send.c:299
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_send.c:307
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr "Thaïlandais (TIS-620)"
 
-#: src/prefs_send.c:308
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr "Thaïlandais (Windows-874)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr "Encodage de transfert"
 
-#: src/prefs_send.c:323
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17287,7 +17336,7 @@ msgstr ""
 "Spécifier le « Content-Transfer-Encoding » utilisé quand le corps du message "
 "contient des caractères non ASCII."
 
-#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
+#: src/prefs_send.c:420 src/send_message.c:501 src/send_message.c:505
 #: src/send_message.c:510
 msgid "Sending"
 msgstr "Envoi"
@@ -17421,7 +17470,7 @@ msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
 #: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:563
 msgid "Date format"
 msgstr "Format de la date"
 
@@ -17433,100 +17482,100 @@ msgstr "Symbole"
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:369
 msgid "Display message count next to folder name"
 msgstr "Afficher le nombre de messages près du nom de dossier"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:379
 msgid "Unread messages"
 msgstr "Messages non lus"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:380
 msgid "Unread and Total messages"
 msgstr "Messages non lus et total"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:390
 msgid "Open last opened folder at start-up"
 msgstr "Ouvrir au démarrage le dernier dossier consulté"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:393
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:406
 msgid "letters"
 msgstr "lettres"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:424
 msgid "Message list"
 msgstr "Liste des messages"
 
-#: src/prefs_summaries.c:432
+#: src/prefs_summaries.c:430
 msgid "Sort new folders by"
 msgstr "Trier les nouveaux dossiers"
 
-#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:438 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Numéro"
 
-#: src/prefs_summaries.c:443
+#: src/prefs_summaries.c:441
 msgid "Thread date"
 msgstr "Par date de fil"
 
-#: src/prefs_summaries.c:454
+#: src/prefs_summaries.c:452
 msgid "Don't sort"
 msgstr "Ne pas trier"
 
-#: src/prefs_summaries.c:471
+#: src/prefs_summaries.c:469
 msgid "Set default selection when entering a folder"
 msgstr "Configurer la sélection par défaut à l'ouverture d'un dossier"
 
-#: src/prefs_summaries.c:484
+#: src/prefs_summaries.c:482
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Affichage de la fenêtre « Plus de message non lu (ou nouveau) »"
 
-#: src/prefs_summaries.c:494
+#: src/prefs_summaries.c:492
 msgid "Assume 'Yes'"
 msgstr "Supposer « Oui »"
 
-#: src/prefs_summaries.c:495
+#: src/prefs_summaries.c:493
 msgid "Assume 'No'"
 msgstr "Supposer « Non »"
 
-#: src/prefs_summaries.c:500
+#: src/prefs_summaries.c:498
 msgid "Open message when selected"
 msgstr "Ouvrir les messages lorsqu'ils sont sélectionnés"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:503
 msgid "When opening a folder"
 msgstr "À l'ouverture d'un dossier"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:505
 msgid "When displaying search results"
 msgstr "Lors de l'affichage des résultats de la recherche"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:507
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 "Lors de la sélection du message précédent ou suivant avec les raccourcis"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:509
 msgid "When deleting or moving messages"
 msgstr "À la suppression ou au déplacement de messages"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:511
 msgid "When using directional keys"
 msgstr "Lors de l'utilisation des touches de direction"
 
-#: src/prefs_summaries.c:517
+#: src/prefs_summaries.c:515
 msgid "Thread using subject in addition to standard headers"
 msgstr "Utiliser aussi le sujet pour la création des fils de discussion"
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:519
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_summaries.c:523
+#: src/prefs_summaries.c:521
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
@@ -17534,40 +17583,42 @@ msgstr ""
 "Permet (si désactivé) de retarder le déplacement, la copie et la suppression "
 "de messages jusqu'à la sélection de 'Outils/Exécuter'."
 
-#: src/prefs_summaries.c:526
+#: src/prefs_summaries.c:524
 msgid "Mark message as read"
 msgstr "Marquer le message comme lu"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:527
 msgid "when selected, after"
 msgstr "quand sélectionné, après"
 
-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:546
 msgid "only when opened in a new window, or replied to"
 msgstr ""
 "seulement quand il est ouvert dans une nouvelle fenêtre, ou en y répondant"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:553
 msgid "Display sender using address book"
 msgstr "Afficher le nom de l'expéditeur en utilisant le carnet d'adresses"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:557
 msgid "Show tooltips"
 msgstr "Afficher les bulles d'aide"
 
-#: src/prefs_summaries.c:585
+#: src/prefs_summaries.c:582
 msgid "Date format help"
 msgstr "Symboles pour formater la date"
 
-#: src/prefs_summaries.c:603
-msgid "Confirm before marking all messages in a folder as read"
-msgstr "Confirmer avant de marquer tous les messages d'un dossier comme lus"
+#: src/prefs_summaries.c:600
+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"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:603
 msgid "Translate header names"
 msgstr "Traduire les en-têtes"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:605
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17575,7 +17626,7 @@ msgstr ""
 "L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
 "traduit dans le language présentement utilisé."
 
-#: src/prefs_summaries.c:767
+#: src/prefs_summaries.c:764
 msgid "Summaries"
 msgstr "Liste des messages"
 
@@ -17594,38 +17645,50 @@ msgstr ""
 "faire glisser."
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
-msgstr "1er message marqué"
+msgid "oldest marked email"
+msgstr "message marqué le plus ancien"
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
-msgstr "1er nouveau message"
+msgid "oldest new email"
+msgstr "nouveau message le plus ancien"
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
-msgstr "1er message non lu"
+msgid "oldest unread email"
+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
-msgid "last email in the list"
-msgstr "dernier message dans la liste"
+msgid "newest email in the list"
+msgstr "message le plus récent dans la liste"
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
-msgstr "1er message dans la liste"
+msgid "oldest email in the list"
+msgstr "message le plus ancien dans la liste"
+
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr "message marqué le plus récent"
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr "nouveau message le plus récent"
+
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
+msgstr "message non lu le plus récent"
 
-#: src/prefs_summary_open.c:184
+#: src/prefs_summary_open.c:188
 msgid " Selection when entering a folder"
 msgstr "Configurer la sélection à l'ouverture d'un dossier"
 
-#: src/prefs_summary_open.c:230
+#: src/prefs_summary_open.c:233
 msgid "Possible selections"
 msgstr "Sélections possibles"
 
-#: src/prefs_summary_open.c:266
+#: src/prefs_summary_open.c:268
 msgid "Selection on folder opening"
 msgstr "Sélection à l'ouverture d'un dossier"
 
@@ -17641,94 +17704,94 @@ msgstr ""
 "Forcer l'entête « De: » du compte de composition. Cela ne changera pas le "
 "compte de composition pour l'envoi."
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:308
 msgid "Append the new template above to the list"
 msgstr "Ajoute le nouveau modèle ci-dessus à la liste"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:317
 msgid "Replace the selected template in list with the template above"
 msgstr "Remplace le modèle sélectionné dans la liste par le modèle ci-dessus"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:327
 msgid "Delete the selected template from the list"
 msgstr "Supprime le modèle sélectionné de la liste"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:345
 msgid "Show information on configuring templates"
 msgstr "Affiche une aide pour la configuration de modèles"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:369
 msgid "Move the selected template to the top"
 msgstr "Déplace le modèle sélectionné tout en haut"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:379
 msgid "Move the selected template up"
 msgstr "Déplace le modèle sélectionné une ligne plus haut"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:387
 msgid "Move the selected template down"
 msgstr "Déplace le modèle sélectionné une ligne plus bas"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:397
 msgid "Move the selected template to the bottom"
 msgstr "Déplace le modèle sélectionné tout en bas"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:413
 msgid "Template configuration"
 msgstr "Configuration des modèles"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:601
 msgid "Templates list not saved"
 msgstr "Liste des modèles non enregistrée"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:602
 msgid "The templates list has been modified. Close anyway?"
 msgstr ""
 "La liste de modèles a été modifiée mais non enregistrée. Voulez-vous quand "
 "même fermer ?"
 
-#: src/prefs_template.c:760
+#: src/prefs_template.c:759
 msgid "The template's name is not set."
 msgstr "Le nom du modèle n'est pas défini."
 
-#: src/prefs_template.c:803
+#: src/prefs_template.c:802
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "Le champ « De » du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:809
+#: src/prefs_template.c:808
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "Le champ « À » du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:815
+#: src/prefs_template.c:814
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "Le champ « Cc » du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:821
+#: src/prefs_template.c:820
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "Le champ « Bcc » du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:827
+#: src/prefs_template.c:826
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "Le champ « Reply-To » du modèle contient une adresse email invalide."
 
-#: src/prefs_template.c:833
+#: src/prefs_template.c:832
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "Le champ « Sujet » du modèle est invalide."
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:903
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:905
+#: src/prefs_template.c:904
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment supprimer le modèle sélectionné ?"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:916
 msgid "Delete all templates"
 msgstr "Suppression de tous les modèles"
 
-#: src/prefs_template.c:918
+#: src/prefs_template.c:917
 msgid "Do you really want to delete all the templates?"
 msgstr "Voulez-vous vraiment supprimer tous les modèles ?"
 
@@ -17886,31 +17949,31 @@ msgstr "Autres.."
 msgid "Information"
 msgstr "Informations"
 
-#: src/prefs_themes.c:997
-msgid "Author: "
-msgstr "Auteur :"
+#: src/prefs_themes.c:998
+msgid "Author"
+msgstr "Auteur"
 
-#: 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 "Prévisualisation"
 
-#: src/prefs_themes.c:1103
+#: src/prefs_themes.c:1105
 msgid "SVG rendering"
 msgstr "Rendu SVG"
 
-#: src/prefs_themes.c:1110
+#: src/prefs_themes.c:1112
 msgid "Enable alpha channel"
 msgstr "Utiliser le canal alpha"
 
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1113
 msgid "Force scaling"
 msgstr "Forcer la mise à l'échelle"
 
-#: src/prefs_themes.c:1117
+#: src/prefs_themes.c:1119
 msgid "Pixels per inch (PPI)"
 msgstr "Pixels par pouce (PPP)"
 
@@ -17930,67 +17993,67 @@ msgstr "L'élément n'a pas d'icône définie."
 msgid "Item has no text defined."
 msgstr "L'élément n'a pas de texte défini."
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:895
 msgid "Toolbar item"
 msgstr "Élément de barre d'outils"
 
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:911
 msgid "Item type"
 msgstr "Type d'élément"
 
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:921
 msgid "Internal Function"
 msgstr "Fonction interne"
 
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:922
 msgid "User Action"
 msgstr "Action"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:279
+#: src/prefs_toolbar.c:924 src/toolbar.c:279
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:931
 msgid "Event executed on click"
 msgstr "Fonction à exécuter"
 
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:958
 msgid "Toolbar text"
 msgstr "Texte de la barre d'outils"
 
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:973 src/prefs_toolbar.c:1350
 msgid "Icon"
 msgstr "Icône"
 
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1009
 msgid "A_dd"
 msgstr "A_jouter"
 
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243 src/prefs_toolbar.c:1257
 msgid "Toolbars"
 msgstr "Barre d'outils"
 
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1230
 msgid "Main Window"
 msgstr "Vue principale"
 
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1244
 msgid "Message Window"
 msgstr "Vue de messages"
 
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1258
 msgid "Compose Window"
 msgstr "Fenêtre de composition"
 
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1373
 msgid "Icon text"
 msgstr "Texte"
 
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1382
 msgid "Mapped event"
 msgstr "Fonction"
 
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1689
 msgid "Toolbar item icon"
 msgstr "Icône de l'élément de barre d'outils"
 
@@ -18018,35 +18081,35 @@ msgstr "Retour à la ligne après"
 msgid "Wrapping"
 msgstr "Justification du message"
 
-#: src/printing.c:436
+#: src/printing.c:434
 msgid "Print preview"
 msgstr "Aperçu avant impression"
 
-#: src/printing.c:479
+#: src/printing.c:477
 msgid "First page"
 msgstr "Première page"
 
-#: src/printing.c:490
+#: src/printing.c:487
 msgid "Last page"
 msgstr "Dernière page"
 
-#: src/printing.c:496
+#: src/printing.c:493
 msgid "Zoom 100%"
 msgstr "Zoom 100%"
 
-#: src/printing.c:498
+#: src/printing.c:495
 msgid "Zoom fit"
 msgstr "Zoom ajusté"
 
-#: src/printing.c:500
+#: src/printing.c:497
 msgid "Zoom in"
 msgstr "Zoom avant"
 
-#: src/printing.c:502
+#: src/printing.c:499
 msgid "Zoom out"
 msgstr "Zoom arrière"
 
-#: src/printing.c:701
+#: src/printing.c:698
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
@@ -18369,7 +18432,7 @@ msgstr ""
 "Utiliser un modèle de formatage personnalisé lors de la composition de "
 "nouveaux messages"
 
-#: src/quote_fmt.c:198
+#: src/quote_fmt.c:197
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18377,35 +18440,35 @@ msgstr ""
 "Forcer l'entête d'expéditeur. Cela ne changera pas le compte utilisé pour "
 "les nouveaux messages."
 
-#: src/quote_fmt.c:300
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr "Utiliser un modèle de formatage personnalisé lors d'une réponse"
 
-#: src/quote_fmt.c:324
+#: 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 "
 "d'une réponse."
 
-#: src/quote_fmt.c:335 src/quote_fmt.c:465
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
 msgstr "Préfixe de citation"
 
-#: src/quote_fmt.c:430
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr "Utiliser un modèle de formatage personnalisé lors d'un transfert"
 
-#: src/quote_fmt.c:454
+#: 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 "
 "d'un transfert."
 
-#: src/quote_fmt.c:546
+#: src/quote_fmt.c:539
 msgid "Defaults"
 msgstr "Par défaut"
 
-#: src/quote_fmt.c:564
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
@@ -18413,15 +18476,15 @@ msgstr ""
 "Le champ « De » du modèle « Nouveau message » contient une adresse email "
 "invalide."
 
-#: src/quote_fmt.c:567
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Le champ « Sujet » du modèle « Nouveau message » est invalide."
 
-#: src/quote_fmt.c:584
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "Le « préfixe de citation » du modèle « Réponse » est invalide."
 
-#: src/quote_fmt.c:604
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "Le « préfixe de citation » du modèle « Transfert » est invalide."
 
@@ -18553,309 +18616,309 @@ msgstr "%s - Code source"
 msgid "Saved SSL/TLS certificates"
 msgstr "Certificats SSL/TLS enregistrés"
 
-#: src/ssl_manager.c:410
+#: src/ssl_manager.c:406
 msgid "Delete certificate"
 msgstr "Supprimer le certificat"
 
-#: src/ssl_manager.c:411
+#: src/ssl_manager.c:407
 msgid "Do you really want to delete this certificate?"
 msgstr "Voulez-vous vraiment supprimer le certificat sélectionné ?"
 
-#: src/summary_search.c:305
+#: src/summary_search.c:293
 msgid "Search messages"
 msgstr "Chercher dans le dossier"
 
-#: src/summary_search.c:327
+#: src/summary_search.c:315
 msgid "Match any of the following"
 msgstr "Messages validant au moins UN des critères suivants"
 
-#: src/summary_search.c:329
+#: src/summary_search.c:317
 msgid "Match all of the following"
 msgstr "Messages validant TOUS les critères suivants"
 
-#: src/summary_search.c:495
+#: src/summary_search.c:438
 msgid "Body:"
 msgstr ""
 "Corps du\n"
 "message :"
 
-#: src/summary_search.c:502
+#: src/summary_search.c:445
 msgid "Condition:"
 msgstr "Condition :"
 
-#: src/summary_search.c:536
+#: src/summary_search.c:479
 msgid "Find _all"
 msgstr "Chercher _tous"
 
-#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#: src/summary_search.c:694 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:846
+#: src/summary_search.c:789
 msgid "Beginning of list reached; continue from end?"
 msgstr "Début de liste atteinte, reprise à la fin ?"
 
-#: src/summary_search.c:848
+#: src/summary_search.c:791
 msgid "End of list reached; continue from beginning?"
 msgstr "Fin de liste atteinte, reprise au début ?"
 
-#: src/summaryview.c:432
+#: src/summaryview.c:434
 msgid "Create _filter rule"
 msgstr "Créer une _règle de filtrage"
 
-#: src/summaryview.c:560
+#: src/summaryview.c:562
 msgid "Toggle quick search bar"
 msgstr "Affiche/cache la barre de recherche rapide"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:599
 msgid "Toggle multiple selection"
 msgstr "Activer la sélection multiple"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1282
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:1281
+#: src/summaryview.c:1283
 msgid "Some marks are left. Process them?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:1331
+#: src/summaryview.c:1333
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s).."
 
-#: src/summaryview.c:1883 src/summaryview.c:1931
+#: src/summaryview.c:1913 src/summaryview.c:1961
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1884
+#: src/summaryview.c:1914
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: 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 ""
 "Erreur interne : valeur inattendue de prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1908
+#: src/summaryview.c:1938
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1932
+#: src/summaryview.c:1962
 msgid "No unread message found. Go to next folder?"
 msgstr "Plus de messages non lus. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1968 src/summaryview.c:2016
+#: src/summaryview.c:1998 src/summaryview.c:2046
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1969
+#: src/summaryview.c:1999
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:2023
 msgid "No new messages."
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:2017
+#: src/summaryview.c:2047
 msgid "No new message found. Go to next folder?"
 msgstr "Pas de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2050 src/summaryview.c:2083
+#: src/summaryview.c:2080 src/summaryview.c:2113
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:2051
+#: src/summaryview.c:2081
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2090
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2114
 msgid "No marked message found. Go to next folder?"
 msgstr "Plus de messages marqués. Aller au dossier suivant ?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2146
+#: src/summaryview.c:2147 src/summaryview.c:2176
 msgid "No more labeled messages"
 msgstr "Plus de messages coloriés"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2148
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages coloriés. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:2127 src/summaryview.c:2160
+#: src/summaryview.c:2157 src/summaryview.c:2190
 msgid "No labeled messages."
 msgstr "Plus de messages coloriés."
 
-#: src/summaryview.c:2147
+#: src/summaryview.c:2177
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages coloriés. Rechercher depuis le début ?"
 
-#: src/summaryview.c:2464
+#: src/summaryview.c:2494
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet.."
 
-#: src/summaryview.c:2649
+#: src/summaryview.c:2679
 #, c-format
 msgid "%d deleted"
 msgstr "%d détruit(s)"
 
-#: src/summaryview.c:2653
+#: src/summaryview.c:2683
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé(s)"
 
-#: 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 copié(s)"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2703
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " objet sélectionné"
 msgstr[1] " sélection"
 
-#: 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 nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2709
+#: src/summaryview.c:2739
 msgid "Message summary"
 msgstr "Liste des messages"
 
-#: src/summaryview.c:2710
+#: src/summaryview.c:2740
 msgid "New:"
 msgstr "Nouveaux :"
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2741
 msgid "Unread:"
 msgstr "Non lus :"
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2742
 msgid "Total:"
 msgstr "Total :"
 
-#: src/summaryview.c:2714
+#: src/summaryview.c:2744
 msgid "Marked:"
 msgstr "Marqués :"
 
-#: src/summaryview.c:2715
+#: src/summaryview.c:2745
 msgid "Replied:"
 msgstr "Répondus :"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2746
 msgid "Forwarded:"
 msgstr "Transférés :"
 
-#: src/summaryview.c:2717
+#: src/summaryview.c:2747
 msgid "Locked:"
 msgstr "Verrouillés :"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2748
 msgid "Ignored:"
 msgstr "Ignorés :"
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2749
 msgid "Watched:"
 msgstr "Suivis :"
 
-#: src/summaryview.c:2729
+#: src/summaryview.c:2759
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d sélection(s) (%s/%s), %d non lu(s)"
 
-#: src/summaryview.c:3022
+#: src/summaryview.c:3052
 msgid "Sorting summary..."
 msgstr "Tri de la liste des messages.."
 
-#: src/summaryview.c:3190
+#: src/summaryview.c:3220
 msgid "Setting summary from message data..."
 msgstr "Définition de la liste des messages à partir des données du message.."
 
-#: src/summaryview.c:3395
+#: src/summaryview.c:3425
 msgid "(No Date)"
 msgstr "(Pas de date)"
 
-#: src/summaryview.c:3447
+#: src/summaryview.c:3482
 msgid "(No Recipient)"
 msgstr "(Pas de destinataire)"
 
-#: src/summaryview.c:3482
+#: src/summaryview.c:3521
 #, c-format
 msgid "From: %s, on %s"
 msgstr "De : %s, le %s"
 
-#: src/summaryview.c:3491
+#: src/summaryview.c:3530
 #, c-format
 msgid "To: %s, on %s"
 msgstr "À : %s, le %s"
 
-#: src/summaryview.c:4356
+#: src/summaryview.c:4423
 msgid "You're not the author of the article.\n"
 msgstr "Vous n'êtes pas l'auteur de cet article.\n"
 
-#: src/summaryview.c:4446
+#: src/summaryview.c:4513
 #, 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:4449
+#: src/summaryview.c:4516
 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:4613
+#: src/summaryview.c:4680
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:4668
+#: src/summaryview.c:4735
 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:4719
+#: src/summaryview.c:4786
 msgid "Destination to copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques"
 
-#: src/summaryview.c:4753
+#: src/summaryview.c:4820
 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:4889
+#: src/summaryview.c:4971
 msgid "Append or Overwrite"
 msgstr "Ajouter ou écraser"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:4972
 msgid "Append or overwrite existing file?"
 msgstr ""
 "Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:4973
 msgid "_Append"
 msgstr "_Ajouter"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:4973
 msgid "_Overwrite"
 msgstr "_Écraser"
 
-#: src/summaryview.c:4932
+#: src/summaryview.c:5014
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -18863,29 +18926,29 @@ msgstr ""
 "Vous êtes sur le point d'imprimer %d messages un par un. Voulez-vous "
 "continuer ?"
 
-#: src/summaryview.c:5390
+#: src/summaryview.c:5472
 msgid "Building threads..."
 msgstr "Construction des threads.."
 
-#: src/summaryview.c:5638
+#: src/summaryview.c:5720
 msgid "Skip these rules"
 msgstr "Ignorer ces règles"
 
-#: src/summaryview.c:5641
+#: src/summaryview.c:5723
 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:5644
+#: src/summaryview.c:5726
 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:5673
+#: src/summaryview.c:5755
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/summaryview.c:5674
+#: src/summaryview.c:5756
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18893,55 +18956,55 @@ 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:5704
+#: src/summaryview.c:5787
 msgid "Filtering..."
 msgstr "Filtrage des messages.."
 
-#: src/summaryview.c:5783
+#: src/summaryview.c:5866
 msgid "Processing configuration"
 msgstr "Configuration du filtrage/traitement"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6412
 msgid "Ignored thread"
 msgstr "Fil de discussion ignoré"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6414
 msgid "Watched thread"
 msgstr "Fil de discussion suivi"
 
-#: src/summaryview.c:6339
+#: src/summaryview.c:6422
 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:6341
+#: src/summaryview.c:6424
 msgid "Replied - click to see reply"
 msgstr "Répondu - cliquer pour voir la réponse"
 
-#: src/summaryview.c:6353
+#: src/summaryview.c:6436
 msgid "To be moved"
 msgstr "À deplacer"
 
-#: src/summaryview.c:6355
+#: src/summaryview.c:6438
 msgid "To be copied"
 msgstr "À copier"
 
-#: src/summaryview.c:6367
+#: src/summaryview.c:6450
 msgid "Signed, has attachment(s)"
 msgstr "Signé et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6371
+#: src/summaryview.c:6454
 msgid "Encrypted, has attachment(s)"
 msgstr "Chiffré et contenant une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:6373
+#: src/summaryview.c:6456
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: src/summaryview.c:6375
+#: src/summaryview.c:6458
 msgid "Has attachment(s)"
 msgstr "Contient une ou plusieurs pièces jointes"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8129
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18950,11 +19013,11 @@ msgstr ""
 "Erreur dans l'expression régulière (regexp) :\n"
 "%s"
 
-#: src/summaryview.c:8149
+#: src/summaryview.c:8232
 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:8154
+#: src/summaryview.c:8237
 msgid "Go back to the folder list"
 msgstr "Revenir à la liste des dossiers"
 
@@ -19405,7 +19468,7 @@ msgstr "Marquer le(s) courriel(s) sélectionné(s) comme légitime(s)"
 
 #: src/toolbar.c:1916
 msgid "Message will be signed"
-msgstr "Le Message sera signé"
+msgstr "Le message sera signé"
 
 #: src/toolbar.c:1918
 msgid "Message will not be signed"
@@ -19508,12 +19571,12 @@ msgstr "Veuillez sélectionner un URL à ouvrir."
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: src/wizard.c:521
+#: src/wizard.c:522
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Bienvenue dans Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:545
 #, c-format
 msgid ""
 "\n"
@@ -19605,48 +19668,48 @@ msgstr ""
 "le faire e écrivant à l'adresse <%s>.\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "Veuillez saisir le nom de la boîte aux lettres."
 
-#: src/wizard.c:647
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "Veuillez saisir votre nom et adresse email."
 
-#: src/wizard.c:658
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr ""
 "Veuillez saisir votre serveur de réception et votre compte utilisateur."
 
-#: src/wizard.c:668
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "Veuillez saisir l'emplacement de votre boîte aux lettres locale."
 
-#: src/wizard.c:678
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "Veuillez saisir votre serveur d'envoi (SMTP)."
 
-#: src/wizard.c:689
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "Veuillez saisir votre nom d'utilisateur sur le serveur d'envoi."
 
-#: src/wizard.c:974
+#: src/wizard.c:975
 msgid "Your name:"
 msgstr "Votre nom :"
 
-#: src/wizard.c:985
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr "Votre adresse email"
 
-#: src/wizard.c:996
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Votre société :"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1031
 msgid "Mailbox name:"
 msgstr "Nom de la boîte aux lettres"
 
-#: src/wizard.c:1038
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19654,7 +19717,7 @@ msgstr ""
 "Vous pouvez aussi spécifier un chemin absolu, comme par exemple : « /home/"
 "john/Documents/Mail »."
 
-#: 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\""
@@ -19662,55 +19725,55 @@ msgstr ""
 "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail."
 "exemple.com:25 »."
 
-#: src/wizard.c:1112
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr "Adresse du serveur d'envoi (SMTP) :"
 
-#: src/wizard.c:1118
+#: src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Utiliser l'authentification (SMTP AUTH)"
 
-#: src/wizard.c:1127
+#: src/wizard.c:1128
 msgid "(empty to use the same as receive)"
 msgstr "(si non renseigné, utilise le même qu'en réception)"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr "Nom d'utilisateur SMTP :"
 
-#: src/wizard.c:1152
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "Mot de passe SMTP :"
 
-#: src/wizard.c:1165
+#: src/wizard.c:1166
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "Utiliser SSL/TLS pour les connexions au serveur d'envoi (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 "Utiliser la commande STARTTLS pour initier le chiffrement"
 
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1189 src/wizard.c:1609
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "Certificat client SSL/TLS (optionnel)"
 
-#: 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 "Adresse du serveur :"
 
-#: src/wizard.c:1320
+#: src/wizard.c:1321
 msgid "Local mailbox:"
 msgstr "Boîte aux lettres locale"
 
-#: src/wizard.c:1489
+#: src/wizard.c:1490
 msgid "Server type:"
 msgstr "Type de serveur :"
 
-#: 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\""
@@ -19718,19 +19781,19 @@ msgstr ""
 "Vous pouvez spécifier le numéro du port en l'ajoutant à la fin : « mail."
 "exemple.com:110 »."
 
-#: src/wizard.c:1585
+#: src/wizard.c:1586
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "Utiliser SSL/TLS pour les connexions au serveur de réception"
 
-#: src/wizard.c:1650
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr "Répertoire IMAP4 :"
 
-#: src/wizard.c:1661
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr "Afficher seulement les dossiers inscrits"
 
-#: src/wizard.c:1669
+#: src/wizard.c:1670
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19738,7 +19801,7 @@ msgstr ""
 "Attention : la version de Claws Mail actuellement\n"
 "utilisée a été compilée sans le support IMAP."
 
-#: src/wizard.c:1787
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "Assistant de configuration de Claws Mail"
 
@@ -19797,6 +19860,21 @@ msgstr ""
 "débuter et apprécier.."
 
 #~ msgid ""
+#~ "Could not queue message for sending:\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Impossible de mettre le message en file d'attente d'envoi :\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Could not queue message for sending."
+#~ msgstr "Impossible de mettre le message en file d'attente d'envoi."
+
+#~ msgid "Couldn't encrypt the email: %s"
+#~ msgstr "Impossible de chiffrer le message : %s"
+
+#~ msgid ""
 #~ "Copyright (C) 1999-2017\n"
 #~ "The Claws Mail Team\n"
 #~ " and Hiroyuki Yamamoto"
@@ -19808,6 +19886,12 @@ msgstr ""
 #~ msgid "Change to..."
 #~ msgstr "Changer.."
 
+#~ msgid "first email in the list"
+#~ msgstr "1er message dans la liste"
+
+#~ msgid "Author: "
+#~ msgstr "Auteur :"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"

commit 3034d055648a97be462a7b2f2f15584634037795
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sun May 6 11:37:44 2018 +0200

    Fix warning: ‘struct sockaddr’ declared inside…
    
    By including our utils.h instead of spamassassin homonymous file.
    
    In file included from ../../../src/procmsg.h:32:0,
                     from spamassassin.c:42:
    ./utils.h:124:47: warning: ‘struct sockaddr’ declared inside parameter list will not be visible outside of this definition or declaration
     int timeout_connect (int sockfd, const struct sockaddr *serv_addr, size_t addrlen);
                                                   ^~~~~~~~

diff --git a/src/procmsg.c b/src/procmsg.c
index 3137f5f..3e989dd 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #include "defs.h"
diff --git a/src/procmsg.h b/src/procmsg.h
index 0f46515..d1cb479 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifndef __PROCMSG_H__
@@ -29,7 +28,7 @@
 #include <time.h>
 #include <sys/types.h>
 #include <string.h>
-#include "utils.h"
+#include "common/utils.h"
 #include "proctypes.h"
 
 #define MSG_NEW			(1U << 0)

commit 5d4a02d11b05036b703bbd9fef4758bf60564f97
Author: wwp <wwp at free.fr>
Date:   Sat May 5 23:56:13 2018 +0200

    Save and reuse Actions input/output dialog size.

diff --git a/src/action.c b/src/action.c
index a60a6b7..c6dd10f 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1255,6 +1255,18 @@ static void update_io_dialog(Children *children)
 	}
 }
 
+/*!
+ *\brief	Save Gtk object size to prefs dataset
+ */
+static void actions_io_size_allocate_cb(GtkWidget *widget,
+					 GtkAllocation *allocation)
+{
+	cm_return_if_fail(allocation != NULL);
+
+	prefs_common.actionsiodialog_width = allocation->width;
+	prefs_common.actionsiodialog_height = allocation->height;
+}
+
 static void create_io_dialog(Children *children)
 {
 	GtkWidget *dialog;
@@ -1269,6 +1281,7 @@ static void create_io_dialog(Children *children)
 	GtkWidget *progress_bar = NULL;
 	GtkWidget *abort_button;
 	GtkWidget *close_button;
+	static GdkGeometry geometry;
 
 	debug_print("Creating action IO dialog\n");
 
@@ -1284,6 +1297,8 @@ static void create_io_dialog(Children *children)
 	g_signal_connect(G_OBJECT(dialog), "destroy",
 			 G_CALLBACK(hide_io_dialog_cb),
 			 children);
+	g_signal_connect(G_OBJECT(dialog), "size_allocate",
+			 G_CALLBACK(actions_io_size_allocate_cb), NULL);
 
 	vbox = gtk_vbox_new(FALSE, 8);
 	gtk_container_add(GTK_CONTAINER(
@@ -1302,7 +1317,6 @@ static void create_io_dialog(Children *children)
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
 					    GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
-	gtk_widget_set_size_request(scrolledwin, 560, 200);
 	gtk_widget_hide(scrolledwin);
 
 	text = gtk_text_view_new();
@@ -1391,6 +1405,18 @@ static void create_io_dialog(Children *children)
 	gtk_container_add(GTK_CONTAINER(
 			gtk_dialog_get_action_area(GTK_DIALOG(dialog))), hbox);
 
+	if (!geometry.min_height) {
+		geometry.min_width = 582;
+		geometry.min_height = 310;
+	}
+
+	gtk_window_set_geometry_hints(GTK_WINDOW(dialog), NULL, &geometry,
+				      GDK_HINT_MIN_SIZE);
+	gtk_widget_set_size_request(dialog, prefs_common.actionsiodialog_width,
+				    prefs_common.actionsiodialog_height);
+
+	gtk_widget_show(dialog);
+
 	children->dialog       = dialog;
 	children->scrolledwin  = scrolledwin;
 	children->text         = text;
@@ -1399,8 +1425,6 @@ static void create_io_dialog(Children *children)
 	children->progress_bar = progress_bar;
 	children->abort_btn    = abort_button;
 	children->close_btn    = close_button;
-
-	gtk_widget_show(dialog);
 }
 
 static void catch_status(GPid pid, gint status, gpointer data)
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 995de27..6748b68 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1024,6 +1024,11 @@ static PrefParam param[] = {
 	{"templateswin_height", "-1", &prefs_common.templateswin_height, P_INT,
 	 NULL, NULL, NULL},
 
+	{"actionsiodialog_width", "582", &prefs_common.actionsiodialog_width, P_INT,
+	 NULL, NULL, NULL},
+	{"actionsiodialog_height", "310", &prefs_common.actionsiodialog_height, P_INT,
+	 NULL, NULL, NULL},
+
 	{"actionswin_width", "486", &prefs_common.actionswin_width, P_INT,
 	 NULL, NULL, NULL},
 	{"actionswin_height", "-1", &prefs_common.actionswin_height, P_INT,
diff --git a/src/prefs_common.h b/src/prefs_common.h
index e4b38a8..10c21b7 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -485,6 +485,8 @@ struct _PrefsCommon
 	gint templateswin_height;
 	gint actionswin_width;
 	gint actionswin_height;
+	gint actionsiodialog_width;
+	gint actionsiodialog_height;
 	gint tagswin_width;
 	gint tagswin_height;
 	gint addressbookwin_width;

commit c1b4e55544816df92e4a2d56297edf1747581094
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat May 5 21:59:55 2018 +0200

    Fix a couple of unused variable warnings
    
    - libspamc.c:491:19: warning: variable ‘family’ set but not used
      (used in a #ifdef block, fix by surrounding by same #ifdef)
    - libspamc.c:1911:35: warning: unused variable ‘addrp’
      (used in a commented code block, fix by commenting also declaration)

diff --git a/src/plugins/spamassassin/libspamc.c b/src/plugins/spamassassin/libspamc.c
index 623c1ab..09e52b0 100644
--- a/src/plugins/spamassassin/libspamc.c
+++ b/src/plugins/spamassassin/libspamc.c
@@ -488,6 +488,7 @@ static int _try_to_connect_tcp(const struct transport *tp, int *sockptr)
 #ifdef SPAMC_HAS_ADDRINFO
         res = tp->hosts[hostix];
         while(res) {
+#ifdef DO_CONNECT_DEBUG_SYSLOGS
             char *family = NULL;
             switch(res->ai_family) {
             case AF_INET:
@@ -500,6 +501,7 @@ static int _try_to_connect_tcp(const struct transport *tp, int *sockptr)
                 family = "Unknown";
                 break;
             }
+#endif
 
             if ((ret = _opensocket(tp->flags, res, &mysock)) != EX_OK) {
                 res = res->ai_next;
@@ -1908,7 +1910,7 @@ static void _randomize_hosts(struct transport *tp)
 int transport_setup(struct transport *tp, int flags)
 {
 #ifdef SPAMC_HAS_ADDRINFO
-    struct addrinfo hints, *res, *addrp;
+    struct addrinfo hints, *res; /* , *addrp; */
     char port[6];
     int origerr;
 #else

commit dba845cc87c5e71f93ce1c4635b927cc78aecb5e
Author: wwp <wwp at free.fr>
Date:   Sat May 5 14:21:53 2018 +0200

    Really ask for confirmation when marking *all* messages as read or
    unread from the message list (as it's done from the folder context
    menu). This confirmation dialog is still discardable and still
    obeys to the option "Confirm before marking all messages in a folder
    as read or unread" in preferences.
    A bit of code factorization.

diff --git a/src/summaryview.c b/src/summaryview.c
index cb3d125..66a0526 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -193,6 +193,8 @@ static void summary_mark_row_as_read	(SummaryView		*summaryview,
 					 GtkCMCTreeNode		*row);
 static void summary_mark_row_as_unread	(SummaryView		*summaryview,
 					 GtkCMCTreeNode		*row);
+static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed);
+static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed);
 static void summary_delete_row		(SummaryView		*summaryview,
 					 GtkCMCTreeNode		*row);
 static void summary_unmark_row		(SummaryView		*summaryview,
@@ -4142,6 +4144,11 @@ void summary_mark_as_read(SummaryView *summaryview)
 
 	if (summary_is_locked(summaryview))
 		return;
+
+	if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection))
+		 && !summary_mark_all_read_confirm(TRUE))
+		return;
+
 	START_LONG_OPERATION(summaryview, FALSE);
 	folder_item_set_batch(summaryview->folder_item, TRUE);
 	for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
@@ -4161,6 +4168,11 @@ void summary_mark_as_unread(SummaryView *summaryview)
 
 	if (summary_is_locked(summaryview))
 		return;
+
+	if ((summaryview->folder_item->total_msgs == (gint)g_list_length(GTK_CMCLIST(ctree)->selection))
+		 && !summary_mark_all_unread_confirm(TRUE))
+		return;
+
 	START_LONG_OPERATION(summaryview, FALSE);
 	folder_item_set_batch(summaryview->folder_item, TRUE);
 	for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
@@ -4206,12 +4218,9 @@ void summary_msgs_unlock(SummaryView *summaryview)
 	summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
+static gboolean summary_mark_all_read_confirm(gboolean ask_if_needed)
 {
-	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-	GtkCMCTreeNode *node;
 	AlertValue val;
-	gboolean froze = FALSE;
 
 	/* ask_if_needed is FALSE when user-asking is performed by caller,
 	   commonly when the caller is a mark-as-read-recursive func */
@@ -4222,13 +4231,25 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
 			  TRUE, NULL, ALERT_QUESTION);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
-			return;
+			return FALSE;
 		else if (val & G_ALERTDISABLE)
 			prefs_common.ask_mark_all_read = FALSE;
 	}
+	return TRUE;
+}
+
+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;
+
+	if (!summary_mark_all_read_confirm(ask_if_needed))
+		return;
+
 	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;
@@ -4245,12 +4266,9 @@ void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
 	summary_status_show(summaryview);
 }
 
-void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
+static gboolean summary_mark_all_unread_confirm(gboolean ask_if_needed)
 {
-	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-	GtkCMCTreeNode *node;
 	AlertValue val;
-	gboolean froze = FALSE;
 
 	/* ask_if_needed is FALSE when user-asking is performed by caller,
 	   commonly when the caller is a mark-as-unread-recursive func */
@@ -4261,13 +4279,25 @@ void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
 			  TRUE, NULL, ALERT_QUESTION);
 
 		if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
-			return;
+			return FALSE;
 		else if (val & G_ALERTDISABLE)
 			prefs_common.ask_mark_all_read = FALSE;
 	}
+	return TRUE;
+}
+
+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;
+
+	if (!summary_mark_all_unread_confirm(ask_if_needed))
+		return;
+
 	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;

commit 5f227a4e11b5342943fe49d475d8d7cfffa57edd
Author: wwp <wwp at free.fr>
Date:   Sat May 5 14:08:18 2018 +0200

    Fix French translation (unexpected accelerator used in dialog title).

diff --git a/po/fr.po b/po/fr.po
index 9efd3f3..1fc486c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3819,7 +3819,7 @@ msgstr ""
 
 #: src/folderview.c:873 src/summaryview.c:4221
 msgid "Mark all as unread"
-msgstr "Marquer tous comme non l_us"
+msgstr "Marquer tous comme non lus"
 
 #: src/folderview.c:874
 msgid ""

commit b2f2013865143101bd0b8ac418b9c929d490c8c1
Author: wwp <wwp at free.fr>
Date:   Sat May 5 13:46:36 2018 +0200

    Save few warnings around mistyped uses of g_list_length().

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 9cf536a..8ce1177 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -437,7 +437,7 @@ static void clear_completion_cache(void)
  * address completion.
  * \return The number of addresses in the completion list.
  */
-gint start_address_completion(gchar *folderpath)
+guint start_address_completion(gchar *folderpath)
 {
 	gboolean different_book = FALSE;
 	clear_completion_cache();
diff --git a/src/addr_compl.h b/src/addr_compl.h
index 741fa43..bd1ed78 100644
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -36,7 +36,7 @@ typedef struct
     GList *grp_emails;
 } address_entry;
 
-gint start_address_completion		(gchar *folderpath);
+guint start_address_completion		(gchar *folderpath);
 guint complete_address			(const gchar *str);
 guint complete_matches_found				(const gchar *str);
 gchar *get_complete_address		(gint index);
diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index ddc8c25..2bba4f6 100644
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -594,7 +594,7 @@ gchar *ldapctl_format_criteria( LdapControl *ctl, const gchar *searchVal ) {
 char **ldapctl_attribute_array( LdapControl *ctl ) {
 	char **ptrArray;
 	GList *node;
-	gint cnt, i;
+	guint cnt, i;
 	cm_return_val_if_fail( ctl != NULL, NULL );
 
 	node = ctl->listCriteria;
@@ -619,7 +619,7 @@ char **ldapctl_full_attribute_array( LdapControl *ctl ) {
 	char **ptrArray;
 	GList *node, *def;
 	GList *tmp = NULL;
-	gint cnt, i;
+	guint cnt, i;
 	cm_return_val_if_fail( ctl != NULL, NULL );
 
 	def = ctl->listCriteria;
diff --git a/src/main.c b/src/main.c
index 89e51e9..bf3a31e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -987,7 +987,7 @@ int main(int argc, char *argv[])
 	FolderView *folderview;
 	GdkPixbuf *icon;
 	gboolean crash_file_present = FALSE;
-	gint num_folder_class = 0;
+	guint num_folder_class = 0;
 	gboolean asked_for_migration = FALSE;
 	gboolean start_done = TRUE;
 	GSList *plug_list = NULL;
diff --git a/src/messageview.c b/src/messageview.c
index 4dfb090..95d851f 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1204,7 +1204,7 @@ static void messageview_register_nav(MessageView *messageview)
 			}
 		}
 		messageview->trail = g_list_append(messageview->trail, id);
-		messageview->trail_pos = g_list_length(messageview->trail) - 1;
+		messageview->trail_pos = (gint)g_list_length(messageview->trail) - 1;
 		
 		/* Cut the beginning if needed */
 		while (messageview->trail_pos > prefs_common.nav_history_length) {
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 5ecedf3..d861b69 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -449,7 +449,7 @@ static gboolean	pdf_viewer_text_search(MimeViewer *_viewer, gboolean backward,
 			if (viewer->page_results != NULL) {
 				debug_print("page_results %p\n", viewer->page_results);
 				/* store results for this page */
-				gint num_res = 0;
+				guint num_res = 0;
 				PageResult *res = g_new0(PageResult, 1);
 				res->results = viewer->page_results;
 				res->page_num = i;
diff --git a/src/summaryview.c b/src/summaryview.c
index 7a1bc87..cb3d125 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4478,7 +4478,7 @@ void summary_delete(SummaryView *summaryview)
 
 	if (!prefs_common.live_dangerously) {
 		gchar *buf = NULL;
-		int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
+		guint num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
 		buf = g_strdup_printf(ngettext(
 			"Do you really want to delete the selected message?",
 			"Do you really want to delete the %d selected messages?", num),

commit eff426d039d5963ca387d59fd433681beac7ec5a
Author: wwp <wwp at free.fr>
Date:   Sat May 5 12:54:29 2018 +0200

    Correct the label of the 'confirm before marking all messages in a
    folder as read' option: it's about marking all as read or UNread.

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 2e17df2..3bdb61e 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -597,7 +597,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
 	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_ask_mark_all_read,
-		 _("Confirm before marking all messages in a folder as read"));
+		 _("Confirm before marking all messages in a folder as read or unread"));
 	PACK_CHECK_BUTTON
 		(vbox1, checkbtn_transhdr,
 		 _("Translate header names"));

commit 5a8c25c06eb0a8133ab8bed1a389e4bc93a68ce5
Author: wwp <wwp at free.fr>
Date:   Sat May 5 09:35:11 2018 +0200

    Use a proper CharSet enum value for uninitialized state of static vars,
    reindent tables for increasing readability.

diff --git a/src/codeconv.c b/src/codeconv.c
index 4fb3f69..de939ed 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1081,131 +1081,131 @@ static const struct {
 	CharSet charset;
 	CharSet out_charset;
 } locale_table[] = {
-	{"ja_JP.eucJP"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.EUC-JP"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.EUC"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.ujis"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.SJIS"	, C_SHIFT_JIS	, C_ISO_2022_JP},
-	{"ja_JP.JIS"	, C_ISO_2022_JP	, C_ISO_2022_JP},
+	{"ja_JP.eucJP"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.EUC-JP"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.EUC"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.ujis"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.SJIS"		, C_SHIFT_JIS	, C_ISO_2022_JP},
+	{"ja_JP.JIS"		, C_ISO_2022_JP	, C_ISO_2022_JP},
 #ifdef G_OS_WIN32
-	{"ja_JP"	, C_SHIFT_JIS	, C_ISO_2022_JP},
+	{"ja_JP"		, C_SHIFT_JIS	, C_ISO_2022_JP},
 #else
-	{"ja_JP"	, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP"		, C_EUC_JP	, C_ISO_2022_JP},
 #endif
-	{"ko_KR.EUC-KR"	, C_EUC_KR	, C_EUC_KR},
-	{"ko_KR"	, C_EUC_KR	, C_EUC_KR},
+	{"ko_KR.EUC-KR"		, C_EUC_KR	, C_EUC_KR},
+	{"ko_KR"		, C_EUC_KR	, C_EUC_KR},
 	{"zh_CN.GB18030"	, C_GB18030	, C_GB18030},
-	{"zh_CN.GB2312"	, C_GB2312	, C_GB2312},
-	{"zh_CN.GBK"	, C_GBK		, C_GBK},
-	{"zh_CN"	, C_GB18030	, C_GB18030},
-	{"zh_HK"	, C_BIG5_HKSCS	, C_BIG5_HKSCS},
-	{"zh_TW.eucTW"	, C_EUC_TW	, C_BIG5},
-	{"zh_TW.EUC-TW"	, C_EUC_TW	, C_BIG5},
-	{"zh_TW.Big5"	, C_BIG5	, C_BIG5},
-	{"zh_TW"	, C_BIG5	, C_BIG5},
-
-	{"ru_RU.KOI8-R"	, C_KOI8_R	, C_KOI8_R},
-	{"ru_RU.KOI8R"	, C_KOI8_R	, C_KOI8_R},
-	{"ru_RU.CP1251"	, C_WINDOWS_1251, C_KOI8_R},
+	{"zh_CN.GB2312"		, C_GB2312	, C_GB2312},
+	{"zh_CN.GBK"		, C_GBK		, C_GBK},
+	{"zh_CN"		, C_GB18030	, C_GB18030},
+	{"zh_HK"		, C_BIG5_HKSCS	, C_BIG5_HKSCS},
+	{"zh_TW.eucTW"		, C_EUC_TW	, C_BIG5},
+	{"zh_TW.EUC-TW"		, C_EUC_TW	, C_BIG5},
+	{"zh_TW.Big5"		, C_BIG5	, C_BIG5},
+	{"zh_TW"		, C_BIG5	, C_BIG5},
+
+	{"ru_RU.KOI8-R"		, C_KOI8_R	, C_KOI8_R},
+	{"ru_RU.KOI8R"		, C_KOI8_R	, C_KOI8_R},
+	{"ru_RU.CP1251"		, C_WINDOWS_1251, C_KOI8_R},
 #ifdef G_OS_WIN32
-	{"ru_RU"	, C_WINDOWS_1251, C_KOI8_R},
+	{"ru_RU"		, C_WINDOWS_1251, C_KOI8_R},
 #else
-	{"ru_RU"	, C_ISO_8859_5	, C_KOI8_R},
+	{"ru_RU"		, C_ISO_8859_5	, C_KOI8_R},
 #endif
-	{"tg_TJ"	, C_KOI8_T	, C_KOI8_T},
-	{"ru_UA"	, C_KOI8_U	, C_KOI8_U},
-	{"uk_UA.CP1251"	, C_WINDOWS_1251, C_KOI8_U},
-	{"uk_UA"	, C_KOI8_U	, C_KOI8_U},
-
-	{"be_BY"	, C_WINDOWS_1251, C_WINDOWS_1251},
-	{"bg_BG"	, C_WINDOWS_1251, C_WINDOWS_1251},
-
-	{"yi_US"	, C_WINDOWS_1255, C_WINDOWS_1255},
-
-	{"af_ZA"	, C_ISO_8859_1  , C_ISO_8859_1},
-	{"br_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ca_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"da_DK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_AT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_DE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_LU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_AU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_BW"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_CA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_DK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_HK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_IE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_NZ"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_PH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_SG"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_US"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_ZA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_ZW"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_AR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_BO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_DO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_EC"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_GT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_HN"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_MX"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_NI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_SV"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_US"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_UY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_VE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"et_EE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"eu_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fi_FI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fo_FO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_CA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_LU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ga_IE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"gl_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"gv_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"id_ID"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"is_IS"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"it_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"it_IT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"kl_GL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"kw_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ms_MY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nl_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nl_NL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nb_NO"	, C_ISO_8859_1  , C_ISO_8859_1},
-	{"nn_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"no_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"oc_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"pt_BR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"pt_PT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sq_AL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sv_FI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sv_SE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"tl_PH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"uz_UZ"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"wa_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-
-	{"bs_BA"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"cs_CZ"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"hr_HR"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"hu_HU"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"pl_PL"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"ro_RO"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"sk_SK"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"sl_SI"	, C_ISO_8859_2	, C_ISO_8859_2},
+	{"tg_TJ"		, C_KOI8_T	, C_KOI8_T},
+	{"ru_UA"		, C_KOI8_U	, C_KOI8_U},
+	{"uk_UA.CP1251"		, C_WINDOWS_1251, C_KOI8_U},
+	{"uk_UA"		, C_KOI8_U	, C_KOI8_U},
+
+	{"be_BY"		, C_WINDOWS_1251, C_WINDOWS_1251},
+	{"bg_BG"		, C_WINDOWS_1251, C_WINDOWS_1251},
+
+	{"yi_US"		, C_WINDOWS_1255, C_WINDOWS_1255},
+
+	{"af_ZA"		, C_ISO_8859_1  , C_ISO_8859_1},
+	{"br_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ca_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"da_DK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_AT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_DE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_LU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_AU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_BW"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_CA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_DK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_HK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_IE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_NZ"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_PH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_SG"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_US"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_ZA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_ZW"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_AR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_BO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_DO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_EC"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_GT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_HN"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_MX"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_NI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_SV"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_US"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_UY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_VE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"et_EE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"eu_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fi_FI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fo_FO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_CA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_LU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ga_IE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"gl_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"gv_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"id_ID"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"is_IS"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"it_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"it_IT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"kl_GL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"kw_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ms_MY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nl_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nl_NL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nb_NO"		, C_ISO_8859_1  , C_ISO_8859_1},
+	{"nn_NO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"no_NO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"oc_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"pt_BR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"pt_PT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sq_AL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sv_FI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sv_SE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"tl_PH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"uz_UZ"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"wa_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+
+	{"bs_BA"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"cs_CZ"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"hr_HR"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"hu_HU"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"pl_PL"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"ro_RO"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"sk_SK"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"sl_SI"		, C_ISO_8859_2	, C_ISO_8859_2},
 
 	{"sr_YU at cyrillic"	, C_ISO_8859_5	, C_ISO_8859_5},
 	{"sr_YU"		, C_ISO_8859_2	, C_ISO_8859_2},
@@ -1217,49 +1217,49 @@ static const struct {
 	{"lt_LT.ISO_8859-4"	, C_ISO_8859_4	, C_ISO_8859_4},
 	{"lt_LT"		, C_ISO_8859_13	, C_ISO_8859_13},
 
-	{"mk_MK"	, C_ISO_8859_5	, C_ISO_8859_5},
-
-	{"ar_AE"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_BH"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_DZ"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_EG"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_IQ"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_JO"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_KW"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_LB"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_LY"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_MA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_OM"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_QA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SD"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SY"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_TN"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_YE"	, C_ISO_8859_6	, C_ISO_8859_6},
-
-	{"el_GR"	, C_ISO_8859_7	, C_ISO_8859_7},
-	{"he_IL"	, C_ISO_8859_8	, C_ISO_8859_8},
-	{"iw_IL"	, C_ISO_8859_8	, C_ISO_8859_8},
-	{"tr_TR"	, C_ISO_8859_9	, C_ISO_8859_9},
-
-	{"lv_LV"	, C_ISO_8859_13	, C_ISO_8859_13},
-	{"mi_NZ"	, C_ISO_8859_13	, C_ISO_8859_13},
-
-	{"cy_GB"	, C_ISO_8859_14	, C_ISO_8859_14},
-
-	{"ar_IN"	, C_UTF_8	, C_UTF_8},
-	{"en_IN"	, C_UTF_8	, C_UTF_8},
-	{"se_NO"	, C_UTF_8	, C_UTF_8},
-	{"ta_IN"	, C_UTF_8	, C_UTF_8},
-	{"te_IN"	, C_UTF_8	, C_UTF_8},
-	{"ur_PK"	, C_UTF_8	, C_UTF_8},
-
-	{"th_TH"	, C_TIS_620	, C_TIS_620},
-	/* {"th_TH"	, C_WINDOWS_874}, */
-	/* {"th_TH"	, C_ISO_8859_11}, */
-
-	{"ka_GE"	, C_GEORGIAN_PS	, C_GEORGIAN_PS},
-	{"vi_VN.TCVN"	, C_TCVN5712_1	, C_TCVN5712_1},
+	{"mk_MK"		, C_ISO_8859_5	, C_ISO_8859_5},
+
+	{"ar_AE"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_BH"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_DZ"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_EG"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_IQ"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_JO"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_KW"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_LB"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_LY"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_MA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_OM"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_QA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SD"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SY"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_TN"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_YE"		, C_ISO_8859_6	, C_ISO_8859_6},
+
+	{"el_GR"		, C_ISO_8859_7	, C_ISO_8859_7},
+	{"he_IL"		, C_ISO_8859_8	, C_ISO_8859_8},
+	{"iw_IL"		, C_ISO_8859_8	, C_ISO_8859_8},
+	{"tr_TR"		, C_ISO_8859_9	, C_ISO_8859_9},
+
+	{"lv_LV"		, C_ISO_8859_13	, C_ISO_8859_13},
+	{"mi_NZ"		, C_ISO_8859_13	, C_ISO_8859_13},
+
+	{"cy_GB"		, C_ISO_8859_14	, C_ISO_8859_14},
+
+	{"ar_IN"		, C_UTF_8	, C_UTF_8},
+	{"en_IN"		, C_UTF_8	, C_UTF_8},
+	{"se_NO"		, C_UTF_8	, C_UTF_8},
+	{"ta_IN"		, C_UTF_8	, C_UTF_8},
+	{"te_IN"		, C_UTF_8	, C_UTF_8},
+	{"ur_PK"		, C_UTF_8	, C_UTF_8},
+
+	{"th_TH"		, C_TIS_620	, C_TIS_620},
+	/* {"th_TH"		, C_WINDOWS_874}, */
+	/* {"th_TH"		, C_ISO_8859_11}, */
+
+	{"ka_GE"		, C_GEORGIAN_PS	, C_GEORGIAN_PS},
+	{"vi_VN.TCVN"		, C_TCVN5712_1	, C_TCVN5712_1},
 
 	{"C"			, C_US_ASCII	, C_US_ASCII},
 	{"POSIX"		, C_US_ASCII	, C_US_ASCII},
@@ -1326,12 +1326,12 @@ CharSet conv_get_charset_from_str(const gchar *charset)
 
 static CharSet conv_get_locale_charset(void)
 {
-	static CharSet cur_charset = -1;
+	static CharSet cur_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
 
-	if (cur_charset != -1)
+	if (cur_charset != C_UNINITIALIZED)
 		return cur_charset;
 
 	cur_locale = conv_get_current_locale();
@@ -1376,7 +1376,7 @@ static CharSet conv_get_locale_charset(void)
 
 static CharSet conv_get_locale_charset_no_utf8(void)
 {
-	static CharSet cur_charset = -1;
+	static CharSet cur_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
@@ -1448,12 +1448,12 @@ const gchar *conv_get_locale_charset_str_no_utf8(void)
 
 static CharSet conv_get_outgoing_charset(void)
 {
-	static CharSet out_charset = -1;
+	static CharSet out_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
 
-	if (out_charset != -1)
+	if (out_charset != C_UNINITIALIZED)
 		return out_charset;
 
 	cur_locale = conv_get_current_locale();
diff --git a/src/codeconv.h b/src/codeconv.h
index 9cf2596..4109a13 100644
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -31,6 +31,7 @@ typedef struct _CodeConverter	CodeConverter;
 
 typedef enum
 {
+	C_UNINITIALIZED,
 	C_AUTO,
 	C_US_ASCII,
 	C_UTF_8,

commit 10d3a71209592a9a9fa8ab2d98ebdbe56f3af282
Author: wwp <wwp at free.fr>
Date:   Fri May 4 19:11:14 2018 +0200

    One more fix for GENERIC_UMPC: summary menu entries list differ.

diff --git a/src/summaryview.c b/src/summaryview.c
index df982dc..7a1bc87 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1766,7 +1766,11 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 	gboolean sensitive;
 	gint i;
 
+#ifndef GENERIC_UMPC
 #define N_ENTRIES 39
+#else
+#define N_ENTRIES 28
+#endif
 	static struct {
 		const gchar *entry;
 		SensitiveCondMask cond;

commit 30d36c7d21de99c6cddde1fe8a93197e8fc2686f
Author: wwp <wwp at free.fr>
Date:   Fri May 4 15:33:24 2018 +0200

    Fix compilation using GENERIC_UMPC.

diff --git a/src/summaryview.h b/src/summaryview.h
index 9ff56cc..258672c 100644
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -26,6 +26,10 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "viewtypes.h"
 typedef struct _SummaryColumnState	SummaryColumnState;
 

commit afd4f400007a15472577868805ae8a5e5ac8e776
Author: wwp <wwp at free.fr>
Date:   Fri May 4 13:35:56 2018 +0200

    Fix code compilation when configure --enable-generic-umpc code has been used.

diff --git a/src/compose.c b/src/compose.c
index c7f79b0..01f459d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -10961,9 +10961,9 @@ static void compose_paste_cb(GtkAction *action, gpointer data)
 	gint prev_autowrap;
 	GtkTextBuffer *buffer;
 	BLOCK_WRAP();
-	if (compose->focused_editable &&
+	if (compose->focused_editable
 #ifndef GENERIC_UMPC
-	    gtk_widget_has_focus(compose->focused_editable)
+	    && gtk_widget_has_focus(compose->focused_editable)
 #endif
 		)
 		entry_paste_clipboard(compose, compose->focused_editable, 

commit 46661cf493424841e4c38688beab2a8791c748cc
Author: wwp <wwp at free.fr>
Date:   Fri May 4 09:04:04 2018 +0200

    Don't manage account list focus state when closing an account edit window,
    when this window has been called from main window's "Preferences for
    current account" menu item.
    Closes bug #4022: Closing "Account Preferences" window opens "Edit Accounts"
    window if "Edit Accounts" window has been opened before at least once.

diff --git a/src/account.c b/src/account.c
index be5967f..527b16d 100644
--- a/src/account.c
+++ b/src/account.c
@@ -450,7 +450,7 @@ void account_add(void)
 	}
 }
 
-void account_open(PrefsAccount *ac_prefs)
+void account_open(PrefsAccount *ac_prefs, gboolean called_from_acc_list)
 {
 	gboolean prev_default;
 	gchar *ac_name, *old_prefix, *new_prefix;
@@ -471,7 +471,8 @@ void account_open(PrefsAccount *ac_prefs)
 
 	prefs_account_open(ac_prefs, &account_dirty);
 
-	account_edit_focus();
+	if (called_from_acc_list)
+		account_edit_focus();
 
 	if (account_dirty) {
 		if (!prev_default && ac_prefs->is_default)
@@ -862,7 +863,7 @@ static void account_edit_prefs(GtkWidget *widget, gpointer data)
 	ac_prefs = account_list_view_get_selected_account(edit_account.list_view);
 	
 	if (ac_prefs) {
-		account_open(ac_prefs);
+		account_open(ac_prefs, TRUE);
 		account_list_view_set();
 	}		
 }
diff --git a/src/account.h b/src/account.h
index e7c7760..4462f66 100644
--- a/src/account.h
+++ b/src/account.h
@@ -60,7 +60,7 @@ GList	     *account_get_list		(void);
 
 void	      account_edit_open		(gpointer a, gpointer b);
 void	      account_add		(void);
-void	      account_open		(PrefsAccount	*ac_prefs);
+void	      account_open		(PrefsAccount	*ac_prefs, gboolean called_from_acc_list);
 void	      account_set_as_recv_at_get_all	(PrefsAccount	*ac_prefs);
 PrefsAccount *account_get_default	(void);
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 002c2f9..ed2abae 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -5075,7 +5075,7 @@ static void prefs_account_open_cb(GtkAction *action, gpointer data)
 	if (!cur_account) {
 		new_account_cb(NULL, mainwin);
 	} else {
-		account_open(cur_account);
+		account_open(cur_account, FALSE);
 	}
 }
 

commit 87bce1bef54f09d67ebf77e45b5c7bc06cf66aa1
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu May 3 13:05:46 2018 +0200

    Fix memory handling around SieveEditorPage.

diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index d322652..f7793ad 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -415,6 +415,7 @@ static void sieve_editor_destroy(SieveEditorPage *page)
 {
 	gtk_widget_destroy(page->window);
 	undo_destroy(page->undostruct);
+	g_free(page->script_name);
 	g_free(page);
 }
 
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 8a9af4c..0f7ec0e 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -198,13 +198,14 @@ static void filter_edit(GtkWidget *widget, SieveManagerPage *page)
 	editor = sieve_editor_get(session, filter_name);
 	if (editor) {
 		sieve_editor_present(editor);
+		g_free(filter_name);
 	} else {
 		editor = sieve_editor_new(session, filter_name);
+		/* filter_name becomes ownership of newly created
+		 * SieveEditorPage, so we do not need to free it here. */
 		sieve_editor_load(editor,
 			(sieve_session_cb_fn)filter_got_load_error, page);
 	}
-
-	g_free(filter_name);
 }
 
 static void filter_renamed(SieveSession *session, gboolean abort,

commit ff49ed3a8e616732afbd37349b950e3841408df6
Author: wwp <wwp at free.fr>
Date:   Thu May 3 10:44:02 2018 +0200

    Fix some plugins' code indentation.

diff --git a/src/plugins/clamd/clamav_plugin.h b/src/plugins/clamd/clamav_plugin.h
index d68782a..d6c6285 100644
--- a/src/plugins/clamd/clamav_plugin.h
+++ b/src/plugins/clamd/clamav_plugin.h
@@ -36,9 +36,9 @@ struct _ClamAvConfig
 	gchar		*clamav_save_folder;
 	gboolean	 clamd_config_type;
 	gchar		*clamd_host;
-	int		 clamd_port;
+	int			 clamd_port;
 	gchar		*clamd_config_folder;
-	gboolean	alert_ack;
+	gboolean	 alert_ack;
 };
 
 ClamAvConfig *clamav_get_config		  (void);
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index c33307b..e664adb 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -609,16 +609,16 @@ const gchar *plugin_name(void)
 const gchar *plugin_desc(void)
 {
 	return _("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 SpamAssassin Server (spamd) running "
-		 "somewhere.\n"
-	         "\n"
-		 "It can also be used for marking messages as Ham or Spam.\n"
-	         "\n"
-	         "When a message is identified as spam it can be deleted or "
-	         "saved in a specially designated folder.\n"
-	         "\n"
-		 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin");
+			 "IMAP, LOCAL or POP account for spam using a SpamAssassin "
+			 "server. You will need a SpamAssassin Server (spamd) running "
+			 "somewhere.\n"
+			 "\n"
+			 "It can also be used for marking messages as Ham or Spam.\n"
+			 "\n"
+		 	 "When a message is identified as spam it can be deleted or "
+		 	 "saved in a specially designated folder.\n"
+			 "\n"
+			 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin");
 }
 
 const gchar *plugin_type(void)
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 0276723..a71febb 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -87,11 +87,11 @@ enum {
 };
 
 struct Transport transports[] = {
-	/*{ N_("Disabled"),	SPAMASSASSIN_DISABLED,			PAGE_DISABLED, 0 },*/
-	{ N_("Localhost"),	SPAMASSASSIN_TRANSPORT_LOCALHOST,	PAGE_NETWORK, 0 },
-	{ N_("TCP"),		SPAMASSASSIN_TRANSPORT_TCP,		PAGE_NETWORK, NETWORK_HOSTNAME },
+	/*{ N_("Disabled"),		SPAMASSASSIN_DISABLED,				PAGE_DISABLED,	0 },*/
+	{ N_("Localhost"),		SPAMASSASSIN_TRANSPORT_LOCALHOST,	PAGE_NETWORK,	0 },
+	{ N_("TCP"),			SPAMASSASSIN_TRANSPORT_TCP,			PAGE_NETWORK,	NETWORK_HOSTNAME },
 #ifndef G_OS_WIN32
-	{ N_("Unix Socket"),	SPAMASSASSIN_TRANSPORT_UNIX,		PAGE_UNIX,    0 },
+	{ N_("Unix Socket"),	SPAMASSASSIN_TRANSPORT_UNIX,		PAGE_UNIX,		0 },
 #endif
 };
 

commit 114dedd2a7394451b839db95cd0a05590f1381fc
Author: wwp <wwp at free.fr>
Date:   Thu May 3 10:15:06 2018 +0200

    Reindent lists and arrays.

diff --git a/src/toolbar.c b/src/toolbar.c
index 75443ab..6212927 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -489,55 +489,55 @@ const gchar *toolbar_get_short_text(int action) {
 	case A_COMPOSE_NEWS: 	return C_("Toolbar", "Compose");
 	case A_REPLY_MESSAGE: 	return _("Reply");
 	case A_REPLY_SENDER: 	return C_("Toolbar", "Sender");
-	case A_REPLY_ALL: 	return _("All");
-	case A_REPLY_ML: 	return _("List");
-	case A_OPEN_MAIL: 	return _("Open");
-	case A_FORWARD: 	return _("Forward");
-	case A_TRASH: 		return C_("Toolbar", "Trash");
-	case A_DELETE_REAL:	return _("Delete");
-	case A_DELETE_DUP: 	return _("Delete duplicates");
-	case A_EXECUTE:		return _("Execute");
-	case A_GOTO_PREV: 	return _("Prev");
-	case A_GOTO_NEXT: 	return _("Next");
+	case A_REPLY_ALL: 		return _("All");
+	case A_REPLY_ML: 		return _("List");
+	case A_OPEN_MAIL: 		return _("Open");
+	case A_FORWARD: 		return _("Forward");
+	case A_TRASH: 			return C_("Toolbar", "Trash");
+	case A_DELETE_REAL:		return _("Delete");
+	case A_DELETE_DUP: 		return _("Delete duplicates");
+	case A_EXECUTE:			return _("Execute");
+	case A_GOTO_PREV: 		return _("Prev");
+	case A_GOTO_NEXT: 		return _("Next");
 
 	case A_IGNORE_THREAD: 	return _("Ignore thread");
 	case A_WATCH_THREAD: 	return _("Watch thread");
-	case A_MARK: 		return _("Mark");
-	case A_UNMARK: 		return _("Unmark");
-	case A_LOCK: 		return _("Lock");
-	case A_UNLOCK: 		return _("Unlock");
-	case A_ALL_READ: 	return _("All read");
-	case A_ALL_UNREAD: 	return _("All unread");
-	case A_READ: 		return _("Read");
-	case A_UNREAD: 		return _("Unread");
-
-	case A_PRINT:	 	return _("Print");
-	case A_LEARN_SPAM: 	return _("Spam");
-	case A_GO_FOLDERS: 	return _("Folders");
-	case A_PREFERENCES:	return _("Preferences");
-
-	case A_SEND: 		return _("Send");
-	case A_SEND_LATER:	return _("Send later");
-	case A_DRAFT: 		return _("Draft");
-	case A_INSERT: 		return _("Insert");
-	case A_ATTACH: 		return _("Attach");
-	case A_SIG: 		return _("Insert sig.");
-	case A_REP_SIG: 	return _("Replace sig.");
-	case A_EXTEDITOR:	return _("Edit");
+	case A_MARK: 			return _("Mark");
+	case A_UNMARK: 			return _("Unmark");
+	case A_LOCK: 			return _("Lock");
+	case A_UNLOCK: 			return _("Unlock");
+	case A_ALL_READ: 		return _("All read");
+	case A_ALL_UNREAD: 		return _("All unread");
+	case A_READ: 			return _("Read");
+	case A_UNREAD: 			return _("Unread");
+
+	case A_PRINT:	 		return _("Print");
+	case A_LEARN_SPAM: 		return _("Spam");
+	case A_GO_FOLDERS: 		return _("Folders");
+	case A_PREFERENCES:		return _("Preferences");
+
+	case A_SEND: 			return _("Send");
+	case A_SEND_LATER:		return _("Send later");
+	case A_DRAFT: 			return _("Draft");
+	case A_INSERT: 			return _("Insert");
+	case A_ATTACH: 			return _("Attach");
+	case A_SIG: 			return _("Insert sig.");
+	case A_REP_SIG: 		return _("Replace sig.");
+	case A_EXTEDITOR:		return _("Edit");
 	case A_LINEWRAP_CURRENT:return _("Wrap para.");
 	case A_LINEWRAP_ALL:	return _("Wrap all");
-	case A_ADDRBOOK: 	return _("Address");
+	case A_ADDRBOOK: 		return _("Address");
 	#ifdef USE_ENCHANT
 	case A_CHECK_SPELLING:	return _("Check spelling");
 	#endif
 	case A_PRIVACY_SIGN:	return _("Sign");
 	case A_PRIVACY_ENCRYPT:	return _("Encrypt");
 
-	case A_CANCEL_INC:	return _("Stop");
-	case A_CANCEL_SEND:	return _("Stop");
-	case A_CANCEL_ALL:	return _("Stop all");
-	case A_CLOSE: 		return _("Close");
-	default:		return "";
+	case A_CANCEL_INC:		return _("Stop");
+	case A_CANCEL_SEND:		return _("Stop");
+	case A_CANCEL_ALL:		return _("Stop all");
+	case A_CLOSE: 			return _("Close");
+	default:				return "";
 	}
 }
 
@@ -550,55 +550,55 @@ gint toolbar_get_icon(int action) {
 	case A_COMPOSE_NEWS: 	return STOCK_PIXMAP_NEWS_COMPOSE;
 	case A_REPLY_MESSAGE: 	return STOCK_PIXMAP_MAIL_REPLY;
 	case A_REPLY_SENDER: 	return STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR;
-	case A_REPLY_ALL: 	return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
-	case A_REPLY_ML: 	return STOCK_PIXMAP_MAIL_REPLY_TO_LIST;
-	case A_OPEN_MAIL: 	return STOCK_PIXMAP_OPEN_MAIL;
-	case A_FORWARD: 	return STOCK_PIXMAP_MAIL_FORWARD;
-	case A_TRASH: 		return STOCK_PIXMAP_TRASH;
-	case A_DELETE_REAL:	return STOCK_PIXMAP_DELETE;
-	case A_DELETE_DUP: 	return STOCK_PIXMAP_DELETE_DUP;
-	case A_EXECUTE:		return STOCK_PIXMAP_EXEC;
-	case A_GOTO_PREV: 	return STOCK_PIXMAP_UP_ARROW;
-	case A_GOTO_NEXT: 	return STOCK_PIXMAP_DOWN_ARROW;
+	case A_REPLY_ALL: 		return STOCK_PIXMAP_MAIL_REPLY_TO_ALL;
+	case A_REPLY_ML: 		return STOCK_PIXMAP_MAIL_REPLY_TO_LIST;
+	case A_OPEN_MAIL: 		return STOCK_PIXMAP_OPEN_MAIL;
+	case A_FORWARD: 		return STOCK_PIXMAP_MAIL_FORWARD;
+	case A_TRASH: 			return STOCK_PIXMAP_TRASH;
+	case A_DELETE_REAL:		return STOCK_PIXMAP_DELETE;
+	case A_DELETE_DUP: 		return STOCK_PIXMAP_DELETE_DUP;
+	case A_EXECUTE:			return STOCK_PIXMAP_EXEC;
+	case A_GOTO_PREV: 		return STOCK_PIXMAP_UP_ARROW;
+	case A_GOTO_NEXT: 		return STOCK_PIXMAP_DOWN_ARROW;
 
 	case A_IGNORE_THREAD: 	return STOCK_PIXMAP_MARK_IGNORETHREAD;
 	case A_WATCH_THREAD: 	return STOCK_PIXMAP_MARK_WATCHTHREAD;
-	case A_MARK:   		return STOCK_PIXMAP_MARK_MARK;
-	case A_UNMARK:   	return STOCK_PIXMAP_MARK_UNMARK;
-	case A_LOCK:   		return STOCK_PIXMAP_MARK_LOCKED;
-	case A_UNLOCK:   	return STOCK_PIXMAP_MARK_UNLOCKED;
-	case A_ALL_READ:	return STOCK_PIXMAP_MARK_ALLREAD;
-	case A_ALL_UNREAD:	return STOCK_PIXMAP_MARK_ALLUNREAD;
-	case A_READ:   		return STOCK_PIXMAP_MARK_READ;
-	case A_UNREAD:   	return STOCK_PIXMAP_MARK_UNREAD;
-
-	case A_PRINT:	 	return STOCK_PIXMAP_PRINTER_BTN;
-	case A_LEARN_SPAM: 	return STOCK_PIXMAP_SPAM_BTN;
-	case A_GO_FOLDERS: 	return STOCK_PIXMAP_GO_FOLDERS;
-	case A_PREFERENCES:	return STOCK_PIXMAP_PREFERENCES;
-
-	case A_SEND: 		return STOCK_PIXMAP_MAIL_SEND;
-	case A_SEND_LATER:	return STOCK_PIXMAP_MAIL_SEND_QUEUE;
-	case A_DRAFT: 		return STOCK_PIXMAP_MAIL_DRAFT;
-	case A_INSERT: 		return STOCK_PIXMAP_INSERT_FILE;
-	case A_ATTACH: 		return STOCK_PIXMAP_MAIL_ATTACH;
-	case A_SIG: 		return STOCK_PIXMAP_MAIL_SIGN;
-	case A_REP_SIG: 	return STOCK_PIXMAP_MAIL_SIGN;
-	case A_EXTEDITOR:	return STOCK_PIXMAP_EDIT_EXTERN;
+	case A_MARK:   			return STOCK_PIXMAP_MARK_MARK;
+	case A_UNMARK:   		return STOCK_PIXMAP_MARK_UNMARK;
+	case A_LOCK:   			return STOCK_PIXMAP_MARK_LOCKED;
+	case A_UNLOCK:   		return STOCK_PIXMAP_MARK_UNLOCKED;
+	case A_ALL_READ:		return STOCK_PIXMAP_MARK_ALLREAD;
+	case A_ALL_UNREAD:		return STOCK_PIXMAP_MARK_ALLUNREAD;
+	case A_READ:   			return STOCK_PIXMAP_MARK_READ;
+	case A_UNREAD:   		return STOCK_PIXMAP_MARK_UNREAD;
+
+	case A_PRINT:	 		return STOCK_PIXMAP_PRINTER_BTN;
+	case A_LEARN_SPAM: 		return STOCK_PIXMAP_SPAM_BTN;
+	case A_GO_FOLDERS: 		return STOCK_PIXMAP_GO_FOLDERS;
+	case A_PREFERENCES:		return STOCK_PIXMAP_PREFERENCES;
+
+	case A_SEND: 			return STOCK_PIXMAP_MAIL_SEND;
+	case A_SEND_LATER:		return STOCK_PIXMAP_MAIL_SEND_QUEUE;
+	case A_DRAFT: 			return STOCK_PIXMAP_MAIL_DRAFT;
+	case A_INSERT: 			return STOCK_PIXMAP_INSERT_FILE;
+	case A_ATTACH: 			return STOCK_PIXMAP_MAIL_ATTACH;
+	case A_SIG: 			return STOCK_PIXMAP_MAIL_SIGN;
+	case A_REP_SIG: 		return STOCK_PIXMAP_MAIL_SIGN;
+	case A_EXTEDITOR:		return STOCK_PIXMAP_EDIT_EXTERN;
 	case A_LINEWRAP_CURRENT:return STOCK_PIXMAP_LINEWRAP_CURRENT;
 	case A_LINEWRAP_ALL:	return STOCK_PIXMAP_LINEWRAP_ALL;
-	case A_ADDRBOOK: 	return STOCK_PIXMAP_ADDRESS_BOOK;
+	case A_ADDRBOOK: 		return STOCK_PIXMAP_ADDRESS_BOOK;
 	#ifdef USE_ENCHANT
 	case A_CHECK_SPELLING:	return STOCK_PIXMAP_CHECK_SPELLING;
 	#endif
 	case A_PRIVACY_SIGN:	return STOCK_PIXMAP_MAIL_PRIVACY_SIGNED;
 	case A_PRIVACY_ENCRYPT:	return STOCK_PIXMAP_MAIL_PRIVACY_ENCRYPTED;
 
-	case A_CANCEL_INC:	return STOCK_PIXMAP_CANCEL;
-	case A_CANCEL_SEND:	return STOCK_PIXMAP_CANCEL;
-	case A_CANCEL_ALL:	return STOCK_PIXMAP_CANCEL;
-	case A_CLOSE: 		return STOCK_PIXMAP_CLOSE;
-	default:		return -1;
+	case A_CANCEL_INC:		return STOCK_PIXMAP_CANCEL;
+	case A_CANCEL_SEND:		return STOCK_PIXMAP_CANCEL;
+	case A_CANCEL_ALL:		return STOCK_PIXMAP_CANCEL;
+	case A_CLOSE: 			return STOCK_PIXMAP_CLOSE;
+	default:				return -1;
 	}
 }
 
@@ -2035,60 +2035,60 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 		gint   index;
 		void (*func)(GtkWidget *widget, gpointer data);
 	} callbacks[] = {
-		{ A_RECEIVE_ALL,	toolbar_inc_all_cb		},
-		{ A_RECEIVE_CUR,	toolbar_inc_cb			},
-		{ A_SEND_QUEUED,	toolbar_send_queued_cb		},
-		{ A_COMPOSE_EMAIL,	toolbar_compose_cb		},
-		{ A_COMPOSE_NEWS,	toolbar_compose_cb		},
-		{ A_REPLY_MESSAGE,	toolbar_reply_cb		},
-		{ A_REPLY_SENDER,	toolbar_reply_to_sender_cb	},
-		{ A_REPLY_ALL,		toolbar_reply_to_all_cb		},
-		{ A_REPLY_ML,		toolbar_reply_to_list_cb	},
-		{ A_FORWARD,		toolbar_forward_cb		},
-		{ A_TRASH,       	toolbar_trash_cb		},
-		{ A_DELETE_REAL,       	toolbar_delete_cb		},
-		{ A_EXECUTE,        	toolbar_exec_cb			},
+		{ A_RECEIVE_ALL,		toolbar_inc_all_cb			},
+		{ A_RECEIVE_CUR,		toolbar_inc_cb				},
+		{ A_SEND_QUEUED,		toolbar_send_queued_cb		},
+		{ A_COMPOSE_EMAIL,		toolbar_compose_cb			},
+		{ A_COMPOSE_NEWS,		toolbar_compose_cb			},
+		{ A_REPLY_MESSAGE,		toolbar_reply_cb			},
+		{ A_REPLY_SENDER,		toolbar_reply_to_sender_cb	},
+		{ A_REPLY_ALL,			toolbar_reply_to_all_cb		},
+		{ A_REPLY_ML,			toolbar_reply_to_list_cb	},
+		{ A_FORWARD,			toolbar_forward_cb			},
+		{ A_TRASH,       		toolbar_trash_cb			},
+		{ A_DELETE_REAL,       	toolbar_delete_cb			},
+		{ A_EXECUTE,        	toolbar_exec_cb				},
 		{ A_GOTO_PREV,      	toolbar_prev_unread_cb		},
 		{ A_GOTO_NEXT,      	toolbar_next_unread_cb		},
-		{ A_IGNORE_THREAD,	toolbar_ignore_thread_cb	},
-		{ A_WATCH_THREAD,	toolbar_watch_thread_cb		},
-		{ A_MARK,			toolbar_mark_cb			},
-		{ A_UNMARK,			toolbar_unmark_cb		},
-		{ A_LOCK,			toolbar_lock_cb			},
-		{ A_UNLOCK,			toolbar_unlock_cb		},
-		{ A_ALL_READ,		toolbar_all_read_cb		},
-		{ A_ALL_UNREAD,		toolbar_all_unread_cb	},
-		{ A_READ,			toolbar_read_cb	},
-		{ A_UNREAD,			toolbar_unread_cb	},
-		{ A_PRINT,			toolbar_print_cb		},
-		{ A_LEARN_SPAM,		toolbar_learn_cb		},
-		{ A_DELETE_DUP,		toolbar_delete_dup_cb		},
-		{ A_GO_FOLDERS,		toolbar_go_folders_cb		},
-
-		{ A_SEND,		toolbar_send_cb       		},
-		{ A_SEND_LATER,	toolbar_send_later_cb 		},
-		{ A_DRAFT,		toolbar_draft_cb      		},
-		{ A_OPEN_MAIL,		toolbar_open_mail_cb		},
-		{ A_CLOSE,		toolbar_close_cb		},
-		{ A_PREFERENCES,	toolbar_preferences_cb		},
-		{ A_INSERT,		toolbar_insert_cb     		},
-		{ A_ATTACH,		toolbar_attach_cb     		},
-		{ A_SIG,		toolbar_sig_cb	      		},
-		{ A_REP_SIG,		toolbar_replace_sig_cb	      	},
-		{ A_EXTEDITOR,		toolbar_ext_editor_cb 		},
-		{ A_LINEWRAP_CURRENT,	toolbar_linewrap_current_cb   	},
-		{ A_LINEWRAP_ALL,	toolbar_linewrap_all_cb   	},
-		{ A_ADDRBOOK,		toolbar_addrbook_cb		},
+		{ A_IGNORE_THREAD,		toolbar_ignore_thread_cb	},
+		{ A_WATCH_THREAD,		toolbar_watch_thread_cb		},
+		{ A_MARK,				toolbar_mark_cb				},
+		{ A_UNMARK,				toolbar_unmark_cb			},
+		{ A_LOCK,				toolbar_lock_cb				},
+		{ A_UNLOCK,				toolbar_unlock_cb			},
+		{ A_ALL_READ,			toolbar_all_read_cb			},
+		{ A_ALL_UNREAD,			toolbar_all_unread_cb		},
+		{ A_READ,				toolbar_read_cb				},
+		{ A_UNREAD,				toolbar_unread_cb			},
+		{ A_PRINT,				toolbar_print_cb			},
+		{ A_LEARN_SPAM,			toolbar_learn_cb			},
+		{ A_DELETE_DUP,			toolbar_delete_dup_cb		},
+		{ A_GO_FOLDERS,			toolbar_go_folders_cb		},
+
+		{ A_SEND,				toolbar_send_cb	   			},
+		{ A_SEND_LATER,			toolbar_send_later_cb 		},
+		{ A_DRAFT,				toolbar_draft_cb	  		},
+		{ A_OPEN_MAIL,			toolbar_open_mail_cb		},
+		{ A_CLOSE,				toolbar_close_cb			},
+		{ A_PREFERENCES,		toolbar_preferences_cb		},
+		{ A_INSERT,				toolbar_insert_cb	 		},
+		{ A_ATTACH,				toolbar_attach_cb	 		},
+		{ A_SIG,				toolbar_sig_cb		  		},
+		{ A_REP_SIG,			toolbar_replace_sig_cb		},
+		{ A_EXTEDITOR,			toolbar_ext_editor_cb 		},
+		{ A_LINEWRAP_CURRENT,	toolbar_linewrap_current_cb	},
+		{ A_LINEWRAP_ALL,		toolbar_linewrap_all_cb   	},
+		{ A_ADDRBOOK,			toolbar_addrbook_cb			},
 #ifdef USE_ENCHANT
-		{ A_CHECK_SPELLING,     toolbar_check_spelling_cb       },
+		{ A_CHECK_SPELLING,     toolbar_check_spelling_cb	},
 #endif
-		{ A_PRIVACY_SIGN,	toolbar_privacy_sign_cb		},
+		{ A_PRIVACY_SIGN,		toolbar_privacy_sign_cb		},
 		{ A_PRIVACY_ENCRYPT,	toolbar_privacy_encrypt_cb	},
-		{ A_CLAWS_ACTIONS,	toolbar_actions_execute_cb	},
-		{ A_CANCEL_INC,		toolbar_cancel_inc_cb		},
-		{ A_CANCEL_SEND,	toolbar_cancel_send_cb		},
-		{ A_CANCEL_ALL,		toolbar_cancel_all_cb		},
-		{ A_CLAWS_PLUGINS,  toolbar_plugins_execute_cb  },
+		{ A_CLAWS_ACTIONS,		toolbar_actions_execute_cb	},
+		{ A_CANCEL_INC,			toolbar_cancel_inc_cb		},
+		{ A_CANCEL_SEND,		toolbar_cancel_send_cb		},
+		{ A_CANCEL_ALL,			toolbar_cancel_all_cb		},
+		{ A_CLAWS_PLUGINS,  	toolbar_plugins_execute_cb	},
 	};
 
 	num_items = sizeof(callbacks)/sizeof(callbacks[0]);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list